about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development')
-rw-r--r--nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix4
-rw-r--r--nixpkgs/pkgs/development/androidndk-pkgs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/arduino/arduino-ci/default.nix6
-rw-r--r--nixpkgs/pkgs/development/arduino/arduino-cli/default.nix6
-rw-r--r--nixpkgs/pkgs/development/arduino/arduino-core/default.nix14
-rw-r--r--nixpkgs/pkgs/development/arduino/arduino-mk/default.nix11
-rw-r--r--nixpkgs/pkgs/development/arduino/ino/default.nix10
-rw-r--r--nixpkgs/pkgs/development/arduino/platformio/core.nix2
-rw-r--r--nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix2
-rw-r--r--nixpkgs/pkgs/development/beam-modules/build-hex.nix4
-rw-r--r--nixpkgs/pkgs/development/beam-modules/build-mix.nix2
-rw-r--r--nixpkgs/pkgs/development/beam-modules/build-rebar3.nix4
-rw-r--r--nixpkgs/pkgs/development/beam-modules/default.nix22
-rw-r--r--nixpkgs/pkgs/development/beam-modules/fetch-hex.nix4
-rw-r--r--nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix6
-rw-r--r--nixpkgs/pkgs/development/beam-modules/hex/default.nix8
-rw-r--r--nixpkgs/pkgs/development/beam-modules/lib.nix4
-rw-r--r--nixpkgs/pkgs/development/beam-modules/pc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/beam-modules/pgsql/default.nix8
-rw-r--r--nixpkgs/pkgs/development/beam-modules/rebar3-release.nix14
-rw-r--r--nixpkgs/pkgs/development/beam-modules/webdriver/default.nix8
-rw-r--r--nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix8
-rw-r--r--nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix8
-rw-r--r--nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix8
-rw-r--r--nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/4th/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/abcl/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/acme/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/aldor/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/aliceml/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/asn1c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/aspectj/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/ats/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/ats2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/avian/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/avra/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/bigloo/default.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/binaryen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/bluespec/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/bs-platform/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/bupc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/cakelisp/default.nix42
-rw-r--r--nixpkgs/pkgs/development/compilers/carp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/cc65/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/ccl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/chez/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/ciao/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/clasp/default.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/clean/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/closure/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/cmdstan/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/cmucl/binary.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/colm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/compcert/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/computecpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/copper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/coreclr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/crystal/build-package.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/crystal/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/dale/default.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/dasm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/dev86/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/dmd/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/dtc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/ecl/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/eli/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/default.nix97
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/elm.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/indents.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/emscripten/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/eql/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/factor-lang/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/fasmg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/flasm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/flutter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/flutter/flutter.nix65
-rw-r--r--nixpkgs/pkgs/development/compilers/flux/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/fpc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/fpc/lazarus.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/fsharp/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/fsharp41/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/fstar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/gavrasm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/10/default.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix25
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix25
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/6/default.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/7/default.nix33
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/8/default.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/9/default.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/builder.sh5
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/gcl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/gforth/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix68
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix46
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix66
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix66
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix36
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix38
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix64
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix66
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix68
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix70
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix66
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/head.nix76
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/ghdl/default.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/gleam/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/glslang/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/gnatboot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix11
-rw-r--r--nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/go/1.14.nix17
-rw-r--r--nixpkgs/pkgs/development/compilers/go/1.15.nix17
-rw-r--r--nixpkgs/pkgs/development/compilers/go/1.4.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/go/2-dev.nix13
-rw-r--r--nixpkgs/pkgs/development/compilers/gprolog/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/graalvm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/haxe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/hhvm/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/hop/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/iasl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/idris2/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/inform6/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/inform7/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/intercal/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/ispc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/jasmin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/julia/1.0.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/julia/1.3.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/julia/1.5.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/jwasm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/kotlin/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/ldc/generic.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix29
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix24
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/lld.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix18
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix24
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/default.nix32
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix18
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix26
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/lld.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix26
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix11
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix18
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix29
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/lld.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix40
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix18
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix29
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/lld.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix18
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/default.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/lld.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix18
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix24
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/lld.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix30
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix20
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/libc++abi.nix24
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/libunwind.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/lld.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/lldb.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/9/openmp.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/multi.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix3
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/lobster/default.nix5
-rw-r--r--nixpkgs/pkgs/development/compilers/manticore/default.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/mcpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/mercury/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/mezzo/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/microscheme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/miranda/default.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/mit-scheme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/mkcl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/mlkit/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/mlton/20130715.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/mono/generic.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/mono/llvm.nix13
-rw-r--r--nixpkgs/pkgs/development/compilers/mosml/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/mozart/binary.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/mruby/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/nasm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/neko/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/nextpnr/default.nix1
-rw-r--r--nixpkgs/pkgs/development/compilers/obliv-c/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/4.12.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/generic.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/opa/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/opendylan/bin.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/opendylan/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/11.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/12.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/13.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/14.nix158
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/8.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/default.nix25
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix (renamed from nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix)20
-rw-r--r--nixpkgs/pkgs/development/compilers/openspin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/orc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/osl/default.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/owl-lisp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/pakcs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/pforth/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/picat/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/polyml/5.6.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/polyml/5.7.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/polyml/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/ponyc/default.nix22
-rw-r--r--nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/qbe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/rasm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/reason/default.nix11
-rw-r--r--nixpkgs/pkgs/development/compilers/rgbds/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/1_45.nix3
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/1_49.nix (renamed from nixpkgs/pkgs/development/compilers/rust/1_48.nix)26
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/binary.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/cargo.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/clippy.nix6
-rwxr-xr-xnixpkgs/pkgs/development/compilers/rust/print-hashes.sh2
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/rls/default.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/rustc.nix14
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/rustfmt.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/sbcl/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/scala/2.x.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/sdcc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/seexpr/default.nix7
-rw-r--r--nixpkgs/pkgs/development/compilers/serpent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/shaderc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/smlnj/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/solc/default.nix19
-rw-r--r--nixpkgs/pkgs/development/compilers/souffle/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/spasm-ng/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/squeak/default.nix12
-rw-r--r--nixpkgs/pkgs/development/compilers/stalin/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/swi-prolog/default.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/swift/default.nix16
-rw-r--r--nixpkgs/pkgs/development/compilers/terra/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/teyjus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/tvm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/unison/default.nix10
-rw-r--r--nixpkgs/pkgs/development/compilers/urn/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/urweb/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/vala/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/vlang/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/vyper/default.nix54
-rw-r--r--nixpkgs/pkgs/development/compilers/wcc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/wla-dx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/x11basic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/yap/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/yasm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/yosys/default.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch34
-rw-r--r--nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix32
-rw-r--r--nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix31
-rw-r--r--nixpkgs/pkgs/development/compilers/yosys/setup-hook.sh5
-rw-r--r--nixpkgs/pkgs/development/compilers/z88dk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/zasm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/zig/default.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/zulu/8.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/zulu/default.nix4
-rw-r--r--nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix35
-rw-r--r--nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix66
-rw-r--r--nixpkgs/pkgs/development/coq-modules/HoTT/default.nix33
-rw-r--r--nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix38
-rw-r--r--nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix120
-rw-r--r--nixpkgs/pkgs/development/coq-modules/StructTact/default.nix38
-rw-r--r--nixpkgs/pkgs/development/coq-modules/VST/default.nix27
-rw-r--r--nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix49
-rw-r--r--nixpkgs/pkgs/development/coq-modules/Verdi/default.nix48
-rw-r--r--nixpkgs/pkgs/development/coq-modules/autosubst/default.nix33
-rw-r--r--nixpkgs/pkgs/development/coq-modules/bignums/default.nix87
-rw-r--r--nixpkgs/pkgs/development/coq-modules/category-theory/default.nix58
-rw-r--r--nixpkgs/pkgs/development/coq-modules/contribs/default.nix48
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix34
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix60
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix84
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix61
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coqeal/default.nix24
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix81
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coqprime/default.nix77
-rw-r--r--nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix54
-rw-r--r--nixpkgs/pkgs/development/coq-modules/corn/default.nix31
-rw-r--r--nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix110
-rw-r--r--nixpkgs/pkgs/development/coq-modules/equations/default.nix113
-rw-r--r--nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix31
-rw-r--r--nixpkgs/pkgs/development/coq-modules/flocq/default.nix65
-rw-r--r--nixpkgs/pkgs/development/coq-modules/gappalib/default.nix38
-rw-r--r--nixpkgs/pkgs/development/coq-modules/heq/default.nix35
-rw-r--r--nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix49
-rw-r--r--nixpkgs/pkgs/development/coq-modules/interval/default.nix79
-rw-r--r--nixpkgs/pkgs/development/coq-modules/iris/default.nix36
-rw-r--r--nixpkgs/pkgs/development/coq-modules/ltac2/default.nix69
-rw-r--r--nixpkgs/pkgs/development/coq-modules/math-classes/default.nix29
-rw-r--r--nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix23
-rw-r--r--nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix28
-rw-r--r--nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix19
-rw-r--r--nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix36
-rw-r--r--nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix33
-rw-r--r--nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix310
-rw-r--r--nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix391
-rw-r--r--nixpkgs/pkgs/development/coq-modules/metalib/default.nix33
-rw-r--r--nixpkgs/pkgs/development/coq-modules/multinomials/default.nix34
-rw-r--r--nixpkgs/pkgs/development/coq-modules/paco/default.nix60
-rw-r--r--nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix70
-rw-r--r--nixpkgs/pkgs/development/coq-modules/simple-io/default.nix37
-rw-r--r--nixpkgs/pkgs/development/coq-modules/stdpp/default.nix37
-rw-r--r--nixpkgs/pkgs/development/coq-modules/tlc/default.nix46
-rw-r--r--nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/go-modules/generic/default.nix7
-rw-r--r--nixpkgs/pkgs/development/go-packages/generic/default.nix9
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix6
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix10
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix6
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix7
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/configuration-common.nix143
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix4
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml574
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix26
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/generic-builder.nix56
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix4
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix51951
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/hoogle.nix8
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/initial-packages.nix2
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/lib.nix2
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/make-package-set.nix18
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix2
-rw-r--r--nixpkgs/pkgs/development/idris-modules/glfw.nix2
-rw-r--r--nixpkgs/pkgs/development/idris-modules/sdl2.nix4
-rw-r--r--nixpkgs/pkgs/development/idris-modules/tparsec.nix2
-rw-r--r--nixpkgs/pkgs/development/idris-modules/with-packages.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/acl2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/alda/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/angelscript/default.nix12
-rw-r--r--nixpkgs/pkgs/development/interpreters/bats/default.nix30
-rw-r--r--nixpkgs/pkgs/development/interpreters/ceptre/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/chibi/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/cling/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/clips/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/clisp/default.nix46
-rw-r--r--nixpkgs/pkgs/development/interpreters/clisp/hg.nix44
-rw-r--r--nixpkgs/pkgs/development/interpreters/clojure/babashka.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/clojure/clooj.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/clojure/default.nix12
-rw-r--r--nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/cyclone/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/dart/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/duktape/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/eff/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/elixir/1.11.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/evcxr/default.nix16
-rw-r--r--nixpkgs/pkgs/development/interpreters/falcon/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/gauche/boot.nix43
-rw-r--r--nixpkgs/pkgs/development/interpreters/gauche/default.nix23
-rw-r--r--nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/groovy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/gtk-server/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/guile/1.8.nix16
-rw-r--r--nixpkgs/pkgs/development/interpreters/guile/2.0.nix24
-rw-r--r--nixpkgs/pkgs/development/interpreters/guile/default.nix23
-rw-r--r--nixpkgs/pkgs/development/interpreters/hugs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/hy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/icon-lang/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/io/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/j/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/janet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/jimtcl/default.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/joker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/jruby/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/jython/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/kona/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/lolcode/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/love/0.10.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/love/0.7.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/love/0.8.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/love/0.9.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/love/11.1.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/lua-5/default.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/luajit/default.nix12
-rw-r--r--nixpkgs/pkgs/development/interpreters/lush/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/maude/default.nix22
-rw-r--r--nixpkgs/pkgs/development/interpreters/metamath/default.nix16
-rw-r--r--nixpkgs/pkgs/development/interpreters/micropython/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/mujs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/nix-exec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/octave/default.nix49
-rw-r--r--nixpkgs/pkgs/development/interpreters/perl/default.nix14
-rw-r--r--nixpkgs/pkgs/development/interpreters/perl/wrapper.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/php/7.3.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/php/7.4.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/php/8.0.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/php/fix-opcache-configure.patch81
-rw-r--r--nixpkgs/pkgs/development/interpreters/php/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/picoc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/picolisp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/pixie/default.nix14
-rw-r--r--nixpkgs/pkgs/development/interpreters/pixie/dust.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix7
-rw-r--r--nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix17
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch79
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch54
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch54
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch44
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/cpython/default.nix85
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/default.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/pypy/default.nix14
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/tests.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/wrapper.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/qnial/default.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/quickjs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/racket/default.nix20
-rw-r--r--nixpkgs/pkgs/development/interpreters/rakudo/default.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix2
-rw-r--r--nixpkgs/pkgs/development/interpreters/rakudo/zef.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/rascal/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/rebol/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/red/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/regina/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/renpy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/ruby/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/scheme48/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/scsh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/self/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/shen-sources/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix8
-rw-r--r--nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix10
-rw-r--r--nixpkgs/pkgs/development/interpreters/supercollider/default.nix12
-rw-r--r--nixpkgs/pkgs/development/interpreters/tcl/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/tclreadline/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix6
-rw-r--r--nixpkgs/pkgs/development/interpreters/wasmer/default.nix6
-rw-r--r--nixpkgs/pkgs/development/java-modules/build-maven-package.nix6
-rw-r--r--nixpkgs/pkgs/development/java-modules/jogl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/java-modules/junit/default.nix8
-rw-r--r--nixpkgs/pkgs/development/java-modules/maven-hello/default.nix8
-rw-r--r--nixpkgs/pkgs/development/java-modules/maven-minimal.nix4
-rw-r--r--nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/CGAL/4.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/CGAL/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/CoinMP/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/LAStools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/LASzip/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/NSPlist/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/PlistCpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL2/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL2_image/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL2_net/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix34
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_image/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_net/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/Xaw3d/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/a52dec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/aalib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/accounts-qt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/accountsservice/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/ace/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/acl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/afflib/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/aften/default.nix30
-rw-r--r--nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/agg/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/alembic/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/alkimia/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/allegro/5.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/allegro/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/alure/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/alure2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/amdvlk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/aml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/amrnb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/amrwb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/amtk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/apache-activemq/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/appstream-glib/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/appstream/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/apr-util/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/apr/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/aqbanking/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/aravis/default.nix40
-rw-r--r--nixpkgs/pkgs/development/libraries/arb/default.nix13
-rw-r--r--nixpkgs/pkgs/development/libraries/argp-standalone/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/argtable/default.nix40
-rw-r--r--nixpkgs/pkgs/development/libraries/arguments/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/aribb25/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/armadillo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/arrayfire/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/asio/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/aspell/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/assimp/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/atk/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/atkmm/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/attr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/aubio/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/audiality2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix25
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/libbass/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/libgme/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/lilv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/lv2/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/ntk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/raul/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/sratom/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/suil/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/audiofile/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/avahi/default.nix30
-rw-r--r--nixpkgs/pkgs/development/libraries/avro-c++/default.nix17
-rw-r--r--nixpkgs/pkgs/development/libraries/avro-c/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix30
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-c-common/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-c-io/default.nix32
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-checksums/default.nix13
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch10
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix21
-rw-r--r--nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/babl/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/bamf/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/bashup-events/3.2.nix26
-rw-r--r--nixpkgs/pkgs/development/libraries/bashup-events/4.4.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/bashup-events/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/bashup-events/generic.nix83
-rw-r--r--nixpkgs/pkgs/development/libraries/bcg729/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/bctoolbox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/beecrypt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/beignet/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/belcard/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/belle-sip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/belr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/biblesync/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/bobcat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/boehm-gc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/boolstuff/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/boost-process/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/boost/1.67.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/boost/1.71.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/boost/generic.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/bootil/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/boringssl/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/botan/generic.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/box2d/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/boxfort/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/brigand/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/buddy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/bullet/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/bulletml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/bwidget/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/bzrtp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/c-ares/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/c-blosc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/caf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cairo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cairomm/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/capnproto/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/capstone/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/catch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/catch2/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/ccrtp/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/cctz/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cddlib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cdk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cdo/default.nix19
-rw-r--r--nixpkgs/pkgs/development/libraries/cegui/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/celt/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cereal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ceres-solver/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cfitsio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cgui/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/check/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/chipmunk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/chmlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/chromaprint/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/cimg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/civetweb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/classads/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/clearsilver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/clfft/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/clipp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/clipper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cln/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cloog/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/clucene-core/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/clutter-gst/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/clutter/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/cm256cc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cmark/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cminpack/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cmocka/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cmrt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/codec2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cogl/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/coin3d/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/comedilib/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/concurrencykit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/cppcms/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/cppdb/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/cpptest/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cppunit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cpputest/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cppzmq/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cracklib/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/crc32c/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/crcpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cre2/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/criterion/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/crypto++/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/csfml/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/ctl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ctpl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ctpp2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cudd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/curlcpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/curlpp/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/cutee/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cutelyst/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cwiid/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/cxxtest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/cxxtools/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/czmq/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/dav1d/default.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/db/db-4.8.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/db/db-5.3.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/db/db-6.0.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/db/db-6.2.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/db/generic.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dbus-glib/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dbus/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/dbxml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/dclib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/dclxvi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dconf/default.nix26
-rw-r--r--nixpkgs/pkgs/development/libraries/dee/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/directfb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/discord-rpc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dleyna-core/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/dleyna-server/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/dlib/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/doctest/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/dotconf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/dotnetfx35/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/dotnetfx40/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/double-conversion/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/dqlite/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/draco/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/drumstick/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/dssi/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/duckdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/dxflib/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/dyncall/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/eccodes/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/eclib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/editline/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/egl-wayland/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/eigen/2.0.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/eigen/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/elf-header/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/embree/2.x.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/embree/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/enchant/1.x.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/enchant/2.x.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/enet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/entt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/epoxy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ethash/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/eventlog/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/exempi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/exiv2/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/exosip/default.nix19
-rw-r--r--nixpkgs/pkgs/development/libraries/expat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/faac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/faad2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/farbfeld/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/farstream/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/default.nix26
-rw-r--r--nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in8
-rw-r--r--nixpkgs/pkgs/development/libraries/fastjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/faudio/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/fcft/default.nix17
-rw-r--r--nixpkgs/pkgs/development/libraries/fcgi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/fcppt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/fdk-aac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix21
-rw-r--r--nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ffms/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/fftw/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/filter-audio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/flann/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/flatbuffers/default.nix32
-rw-r--r--nixpkgs/pkgs/development/libraries/flatcc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/flatpak/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/flint/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/flite/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/fltk/1.4.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/fltk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/fmt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/folks/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/folly/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/fontconfig/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/forge/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/fox/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/fplll/20160331.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/fplll/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/frame/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/freealut/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/freeglut/default.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/freenect/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/freetds/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/freetype/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/frei0r/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/fribidi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/fstrcmp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/fstrm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ftgl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/funambol/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gaia/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/galario/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix32
-rw-r--r--nixpkgs/pkgs/development/libraries/gamin/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/ganv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/garmintools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gbenchmark/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/gcab/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gcr/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/gdal/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch25
-rw-r--r--nixpkgs/pkgs/development/libraries/gdbm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gdcm/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gdk-pixbuf/xlib.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gdl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gdome2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gecode/3.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gecode/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gegl/4.0.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gegl/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/geis/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/genann/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gensio/default.nix29
-rw-r--r--nixpkgs/pkgs/development/libraries/geoclue/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/geocode-glib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/geoip/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/geos/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/getdata/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/getdns/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gettext/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gexiv2/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gf2x/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/gfbgraph/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gflags/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/giblib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/giflib/4.1.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/giflib/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/giflib/libungif.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gio-sharp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/git2/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/givaro/3.7.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/givaro/3.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/givaro/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gjs/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gl2ps/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/glbinding/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gle/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/glew/1.10.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/glew/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/glfw/2.x.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/glfw/3.x.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/glib-networking/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/glib-testing/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/glib/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/glibc/2.32-25.patch.gz (renamed from nixpkgs/pkgs/development/libraries/glibc/2.32-10.patch.gz)bin24498 -> 42959 bytes
-rw-r--r--nixpkgs/pkgs/development/libraries/glibc/common.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/glibc/default.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/glibc/locales.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/glibmm/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/glm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/globalarrays/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/globalplatform/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/glog/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/gloox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/glpk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/glui/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gmime/2.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gmime/3.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gmm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gmp/6.x.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gmtk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gnet/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gnome-menus/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gnu-config/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gnu-efi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gnutls/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/goffice/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gom/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/goocanvas/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gperftools/default.nix35
-rw-r--r--nixpkgs/pkgs/development/libraries/gpgme/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch36
-rw-r--r--nixpkgs/pkgs/development/libraries/grail/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/grantlee/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/graphene/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/grib-api/default.nix17
-rw-r--r--nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/grilo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/grpc/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/gsasl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gsignond/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gsl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gsm/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/gsmlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gsoap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gsound/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gspell/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gss/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gssdp/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtdialog/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gtest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gthree/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-engines/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk/2.x.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gtk/3.x.nix114
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkd/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkimageview/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkmathview/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkspell/3.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkspell/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/gts/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/gumbo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/gupnp-av/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gupnp/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/gusb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/gvfs/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/half/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/hamlib/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/harfbuzz/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/hawknl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in13
-rw-r--r--nixpkgs/pkgs/development/libraries/hdf5-blosc/default.nix40
-rw-r--r--nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch26
-rw-r--r--nixpkgs/pkgs/development/libraries/hidapi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/highfive/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/hiredis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/hivex/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/hotpatch/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/hpx/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/hspell/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/htmlcxx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/http-parser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/hunspell/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix34
-rw-r--r--nixpkgs/pkgs/development/libraries/hwloc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/hyena/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/hyperscan/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/hyphen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/icu/base.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/id3lib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/idnkit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/igraph/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ijs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/iksemel/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ilbc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ilixi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ilmbase/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/iml/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/imlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/imlib2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/impy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/inchi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/incrtcl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/indicator-application/gtk3.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/indilib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/inih/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/iniparser/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix19
-rw-r--r--nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ip2location-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/irrlicht/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/irrlicht/mac.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/isl/0.11.1.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/isl/0.14.1.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/isl/0.17.1.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/isl/0.20.0.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/iso-codes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/itk/4.x.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/itk/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/itktcl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/jabcode/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/jama/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/jansson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/io/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/java/commons/math/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/cup/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/java/httpunit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/jdom/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/jflex/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/java/junit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/java/lombok/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/lucene/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/rhino/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/java/saxon/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/java/smack/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/java/swt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/jbig2dec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/jbigkit/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/jcal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/jemalloc/common.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/jemalloc/jemalloc450.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/jitterentropy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/jose/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/json-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/json-glib/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/jsoncpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/judy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/jxrlib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/kerberos/krb5.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/keybinder/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/keybinder3/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/keystone/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/kissfft/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/kmsxx/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/kpmcore/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/l-smash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/lame/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/frog.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/lasem/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/lasso/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/lcms/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/lcms2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ldacbt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ldb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ldns/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/leatherman/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/lensfun/default.nix43
-rw-r--r--nixpkgs/pkgs/development/libraries/leptonica/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/lesstif/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/leveldb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/levmar/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/lib3ds/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/lib3mf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libAfterImage/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libHX/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libLAS/default.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/libaacs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libaal/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libabigail/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libabw/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libaec/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libagar/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libantlr3c/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libao/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libaom/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libaosd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libappindicator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libarchive/default.nix22
-rw-r--r--nixpkgs/pkgs/development/libraries/libargon2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libasr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libass/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libassuan/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libast/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libasyncns/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/libaudclient/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libav/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libavc1394/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libavif/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libb2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libb64/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libbacktrace/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libbap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libbdplus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libbfd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libbladeRF/default.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/libblockdev/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libbluedevil/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/libbluray/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libbsd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libbson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libburn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libbytesize/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcaca/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libcacard/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcanberra/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libcangjie/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libcbor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcdaudio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcddb/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libcdio/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libcdr/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libcec/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libcec/platform.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcef/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcello/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libchamplain/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libchardet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libchewing/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libchop/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libcint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libck/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libclc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libclthreads/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libclxclient/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcmis/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libco-canonical/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcommuni/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libconfig/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libconfuse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcouchbase/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libcrafter/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libcredis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcrossguid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcryptui/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libcsptr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libctb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libctemplate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libcutl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libdaemon/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdatrie/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libdazzle/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdbi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdc1394/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libde265/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libdevil/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libdigidoc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdiscid/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libdmtx/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdnet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdrm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libdv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libdvdcss/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libdvdnav/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libdvdread/4.9.9.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libdvdread/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdwarf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libdwg/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libdynd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libe-book/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libe57format/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libeatmydata/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libeb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libebml/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libebur128/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libechonest/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/libedit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libee/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libelf/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libelfin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libepc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liberfa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/liberio/default.nix3
-rw-r--r--nixpkgs/pkgs/development/libraries/libesmtp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libestr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libetpan/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/libev/default.nix13
-rw-r--r--nixpkgs/pkgs/development/libraries/libevdev/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libevdevplus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libevent/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/libewf/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/libexecinfo/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libexif/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libextractor/default.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/libexttextcat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libf2c/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libfakekey/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libfaketime/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libff/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libffcall/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libffi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libfido2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libfilezilla/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/libfishsound/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libfive/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libfixposix/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libfm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libfprint/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libfpx/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libfreefare/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libfsm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libftdi/1.x.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libfyaml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libgadu/default.nix24
-rw-r--r--nixpkgs/pkgs/development/libraries/libgaminggear/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libgcrypt/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/libgda/default.nix24
-rw-r--r--nixpkgs/pkgs/development/libraries/libgdamm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgdata/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libgdiplus/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libgee/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgeotiff/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgepub/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgig/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgksu/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libglvnd/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgnurl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libgpg-error/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libgphoto2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libgpiod/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libgpod/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libgringotts/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libgroove/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/libgrss/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgsf/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libgssglue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libgtop/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libgudev/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libguestfs/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/libgumath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libgweather/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libgxps/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libhandy/0.x.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libhandy/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/libhangul/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libharu/default.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libheif/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libiberty/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libibmad/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libibumad/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libical/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libicns/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libid3tag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libidn/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libidn2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libiec61883/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libieee1284/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libiio/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libimagequant/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libime/default.nix63
-rw-r--r--nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libindicator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libinfinity/default.nix24
-rw-r--r--nixpkgs/pkgs/development/libraries/libinjection/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libinklevel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libinput/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libiodbc/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libipfix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libipt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libiptcdata/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libircclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libirecovery/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libiscsi/default.nix26
-rw-r--r--nixpkgs/pkgs/development/libraries/libisds/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libisoburn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libisofs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libite/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libivykis/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libixp-hg/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libjcat/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libjpeg/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libjreen/default.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix72
-rw-r--r--nixpkgs/pkgs/development/libraries/libjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libkate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libkml/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libksba/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libksi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libktorrent/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblangtag/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/liblastfm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblaxjson/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblcf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblinear/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblinphone/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liblo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liblockfile/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liblogging/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblognorm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblouis/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liblqr-1/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liblscp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libltc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/liblxi/default.nix34
-rw-r--r--nixpkgs/pkgs/development/libraries/libmad/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmanette/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libmatchbox/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmatheval/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libmatroska/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libmbim/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmcrypt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmediaart/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libmediainfo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmemcached/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libmesode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmhash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmicrodns/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmikmod/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmilter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libminc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmkv/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libmms/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmng/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmnl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmodbus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmodplug/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmodule/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libmodulemd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmongo-client/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmowgli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmp3splt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmpack/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libmpc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmpcdec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmpeg2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libmrss/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libmspack/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmtp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/libmwaw/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libmx/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libmypaint/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnabo/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/libnatpmp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libnats-c/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/libnatspec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libndctl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libndp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libndtypes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libnest2d/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libnet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnfc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnfs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnftnl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libngspice/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libnice/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libnih/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libnixxml/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnotify/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libnova/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libnsl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libnxml/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liboauth/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libodfgen/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libofa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libofx/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libogg/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liboggz/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liboil/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liboop/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libopcodes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libopenaptx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/liboping/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libopus/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libopusenc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libosinfo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libosmium/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libosmpbf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libotr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libow/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libowfat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libp11/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpaper/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpar2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libpcap/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpeas/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libpfm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpgf/default.nix30
-rw-r--r--nixpkgs/pkgs/development/libraries/libphonenumber/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpinyin/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libpipeline/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libplacebo/default.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/libplist/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/libpng/12.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libpng/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libportal/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libproxy/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libpseudo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libpsl/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libpst/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libqalculate/default.nix13
-rw-r--r--nixpkgs/pkgs/development/libraries/libqb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libqglviewer/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libqmi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libquotient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libr3/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libraw/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libraw1394/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/librdf/raptor.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/librdf/raptor2.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/librdf/rasqal.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/librdf/redland.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/libre/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/librealsense/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libredwg/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/librelp/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/librem/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/librep/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libresample/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libressl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/librest/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/librevenge/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/librevisa/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/librime/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libroxml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/librseq/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/librsvg/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/librsync/0.9.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/librsync/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/librtprocess/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libs3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsamplerate/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libsass/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libschrift/default.nix28
-rw-r--r--nixpkgs/pkgs/development/libraries/libscrypt/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libsearpc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libseccomp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsecret/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libserialport/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libshout/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsieve/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libsigcxx/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libsigsegv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libsixel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libskk/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libslirp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsmartcols/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libsmi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libsnark/default.nix13
-rw-r--r--nixpkgs/pkgs/development/libraries/libsndfile/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libsodium/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsolv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libsoundio/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libsoup/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libspatialindex/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libspatialite/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libspectre/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libspectrum/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libspf2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libspiro/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libspotify/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/libsrs2/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libssh/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libssh2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libstatgrab/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libstroke/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libstrophe/default.nix30
-rw-r--r--nixpkgs/pkgs/development/libraries/libsurvive/default.nix40
-rw-r--r--nixpkgs/pkgs/development/libraries/libsvm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libsystemtap/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libtap/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libtar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libtasn1/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libtcod/default.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/libtelnet/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libtermkey/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libthai/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libtheora/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libthreadar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libticables2/default.nix64
-rw-r--r--nixpkgs/pkgs/development/libraries/libticalcs2/default.nix50
-rw-r--r--nixpkgs/pkgs/development/libraries/libticonv/default.nix38
-rw-r--r--nixpkgs/pkgs/development/libraries/libtiff/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libtifiles2/default.nix38
-rw-r--r--nixpkgs/pkgs/development/libraries/libtiger/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libtins/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libtommath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libtoxcore/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libtsm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libu2f-host/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libu2f-server/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libubox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libuchardet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libucl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libuecc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libui/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/libuinputplus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libunarr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libunibreak/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libuninameslist/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libunique/3.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libunique/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libunistring/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libunity/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libunwind/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/liburcu/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/liburing/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libusb1/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libuv/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libuvc/default.nix30
-rw-r--r--nixpkgs/pkgs/development/libraries/libva/1.0.0.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libva/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libva/utils.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libvdpau/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libversion/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libviper/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch340
-rw-r--r--nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libvirt/default.nix137
-rw-r--r--nixpkgs/pkgs/development/libraries/libvisio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libvisual/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libvmaf/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/libvmi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libvncserver/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libvorbis/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libvpx/1_8.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libvpx/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libvterm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libwacom/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libwebp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libwebsockets/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libwhereami/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libwmf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libwnck/3.x.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libwnck/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libwpd/0.8.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libwpd/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libwpe/default.nix39
-rw-r--r--nixpkgs/pkgs/development/libraries/libwpe/fdo.nix52
-rw-r--r--nixpkgs/pkgs/development/libraries/libwpg/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libwps/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libx86/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libx86emu/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libxc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libxcomp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix35
-rw-r--r--nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libxklavier/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libxl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libxls/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libxmi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libxml2/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libxmlb/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libxmlxx/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libxmp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libxslt/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/libxsmm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libyaml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libykclient/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libykneomgr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libyubikey/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libzapojit/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/libzdb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libzen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libzip/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/libzmf/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libzra/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/lief/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/lightning/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/lime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/linbox/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/linenoise/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/liquidfun/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/lirc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/live555/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/lmdb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/lmdbxx/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/log4cplus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/log4cpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/log4cxx/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/log4shib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/loki/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/loudmouth/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/lrdf/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/luabind/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/lucene++/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/luksmeta/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/lyra/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/lzo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mailcore2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/malcontent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/malcontent/ui.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mapnik/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/marisa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/marl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/martyr/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/matio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mbedtls/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mdds/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/medfile/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mediastreamer/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/menu-cache/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mesa-glu/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/mesa/default.nix21
-rw-r--r--nixpkgs/pkgs/development/libraries/metal/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mimalloc/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/mimetic/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/miniball/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/minixml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/minizip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/minizip2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mlt/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/mlt/qt-5.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/mm-common/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mongoc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mono-addins/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/motif/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/movit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mp4v2/default.nix3
-rw-r--r--nixpkgs/pkgs/development/libraries/mp4v2/fix-build-clang.patch13
-rw-r--r--nixpkgs/pkgs/development/libraries/mpfi/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/mpfr/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/mpich/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mpir/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/mps/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/msgpack/generic.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/msgpuck/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/msilbc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/mtdev/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mtxclient/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mumlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/muparser/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/muparserx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mutest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/mygui/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/mysocketw/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/mythes/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/nanoflann/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/nanomsg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/nco/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/ncurses/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ndi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ndpi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/neardal/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/neatvnc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/neon/0.29.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/neon/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/netcdf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/nettle/generic.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/networking-ts-cxx/default.nix28
-rw-r--r--nixpkgs/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in8
-rw-r--r--nixpkgs/pkgs/development/libraries/newt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/nghttp2/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/ngt/default.nix17
-rw-r--r--nixpkgs/pkgs/development/libraries/nix-plugins/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/nlopt/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/notcurses/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/notify-sharp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/npth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/nspr/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/3.44.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/3.53.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/nsss/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ntbtls/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ntdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ntirpc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ntrack/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/nuraft/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/nuspell/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/oatpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ocl-icd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/odpic/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/ogdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/ogre/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/ogrepaged/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/ois/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/olm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/oniguruma/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/opae/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/openal-soft/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openbabel/2.nix31
-rw-r--r--nixpkgs/pkgs/development/libraries/openbabel/default.nix49
-rw-r--r--nixpkgs/pkgs/development/libraries/openbr/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/opencascade/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/opencl-clang/default.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/opencl-headers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/opencollada/default.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/opencolorio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/opencore-amr/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/opencsg/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/openct/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/opencv/3.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/opencv/4.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/opencv/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/opendbx/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/opendht/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/opendkim/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/opendmarc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openexr/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openfst/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openfx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openh264/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openhmd/default.nix43
-rw-r--r--nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix26
-rw-r--r--nixpkgs/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch11
-rw-r--r--nixpkgs/pkgs/development/libraries/openjpeg/generic.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/openldap/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/openmpi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/openpa/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/openscenegraph/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/openslp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openssl/chacha.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/openssl/default.nix24
-rw-r--r--nixpkgs/pkgs/development/libraries/opensubdiv/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/openvdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/openwsman/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/openxr-loader/default.nix5
-rw-r--r--nixpkgs/pkgs/development/libraries/openzwave/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/orcania/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ortp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/osip/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/p11-kit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/packr/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/pagmo2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pango/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/pangolin/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/pangomm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/pangoxsl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/partio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pcg-c/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pcl/default.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/pcre/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pcre2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pdal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pdf2xml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pe-parse/default.nix28
-rw-r--r--nixpkgs/pkgs/development/libraries/phash/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/phonetisaurus/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/phonon/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/physfs/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/apfel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/geant4/default.nix21
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/herwig/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/mela/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/pythia/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/rivet/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/physics/yoda/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/pipewire/0.2.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pipewire/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pixman/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/pkger/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/plib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/plplot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pmdk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/pmix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/png++/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/poco/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/podofo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/polkit/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/poppler/0.61.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/poppler/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/popt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/portaudio/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/portmidi/default.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/ppl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/precice/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/prison/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/proj/5.2.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/proj/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in10
-rw-r--r--nixpkgs/pkgs/development/libraries/properties-cpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/protobuf/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/protobufc/generic.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/prototypejs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/protozero/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pslib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/psol/generic.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/psqlodbc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pstreams/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ptex/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/pth/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/pupnp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pxlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/pyotherside/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/python-qt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qca-qt5/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/qca2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qhull/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qimageblitz/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/qjson/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/qoauth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qpdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qrcodegen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qrencode/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/qrupdate/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/qscintilla/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-3/default.nix24
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix20
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-mobility/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qtinstaller/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/qtkeychain/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/qtutilities/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/quazip/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/quesoglc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/quickder/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/quickfix/default.nix43
-rw-r--r--nixpkgs/pkgs/development/libraries/quickfix/disableUnitTests.patch65
-rw-r--r--nixpkgs/pkgs/development/libraries/qwt/6.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/qwt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/qxt/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/raft-canonical/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/randomx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rang/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/range-v3/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/rapidcheck/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/rapidjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rapidxml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rarian/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/rdkafka/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/re2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/readline/5.x.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/readline/6.2.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/readline/6.3.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/readline/7.0.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/readline/8.0.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/readosm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/redkite/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rep-gtk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/rlog/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/rlottie/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/robin-map/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rocclr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rocksdb/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rote/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rttr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/rubberband/default.nix19
-rw-r--r--nixpkgs/pkgs/development/libraries/s2n/default.nix29
-rw-r--r--nixpkgs/pkgs/development/libraries/safefile/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/sbc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/schroedinger/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/blas/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/blis/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/brial/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix43
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix28
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/magma/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/metis/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/osi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/osqp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/scs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix28
-rw-r--r--nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix20
-rwxr-xr-xnixpkgs/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh6
-rw-r--r--nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix29
-rw-r--r--nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/scmccid/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/scriptaculous/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/seasocks/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/sentencepiece/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/serd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/serf/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/serialdv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/sfml/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/sfsexp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/shapelib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/shhmsg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/shhopt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/silgraphite/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/simdjson/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/simgear/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/simpleitk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/skalibs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/slang/default.nix62
-rw-r--r--nixpkgs/pkgs/development/libraries/slib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/smarty3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/smesh/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/smpeg/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/smpeg2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/snack/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/snappy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/soci/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/sofia-sip/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/sonic/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/soprano/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/soqt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/sord/default.nix18
-rw-r--r--nixpkgs/pkgs/development/libraries/soxt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/spandsp/3.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/spandsp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/sparsehash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/spdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/spdlog/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/speech-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/speechd/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/speex/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/speexdsp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/sphinxbase/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/spice-gtk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/spice-protocol/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/spice/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/spirv-headers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/sqlcipher/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/sqlite/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/sqlite/tools.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/srt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/srtp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/startup-notification/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/stb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/stellarsolver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/stfl/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/stlport/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/stxxl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/subunit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/sundials/default.nix69
-rw-r--r--nixpkgs/pkgs/development/libraries/svrcore/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/swiften/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/swiftshader/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/sword/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/sycl-info/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/symengine/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/szip/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/t1lib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tachyon/default.nix22
-rw-r--r--nixpkgs/pkgs/development/libraries/taglib-extras/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/taglib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/talloc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/tbb/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/tclap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tcllib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tcltls/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tclx/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tdlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tecla/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/template-glib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/tepl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/termbox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tevent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/theft/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/thrift/0.10.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/thrift/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/ti-rpc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/ticpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tidyp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tiledb/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/timezonemap/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/tinycbor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/tix/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/tk/8.6.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tk/generic.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/tl-expected/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tnt/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/tntdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tntnet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/tracker-miners/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/tracker/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/tre/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tremor/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/trompeloeil/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/tsocks/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/tweeny/default.nix3
-rw-r--r--nixpkgs/pkgs/development/libraries/twolame/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/ubus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/uci/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ucl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/ucommon/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/ucx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/udns/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/udunits/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/uhttpmock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/umockdev/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/unibilium/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/unicap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/unicorn/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/unixODBC/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/unqlite/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/uri/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/uriparser/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/usbredir/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/ustr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/utf8cpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/utf8proc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/uthash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/uthenticode/default.nix37
-rw-r--r--nixpkgs/pkgs/development/libraries/utmps/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/v8/5_x.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/v8/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vapoursynth/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vc/0.7.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vcdimager/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/vcg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/vid-stab/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vigra/default.nix13
-rw-r--r--nixpkgs/pkgs/development/libraries/virglrenderer/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vmime/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/vmmlib/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/volume-key/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vrb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/vrpn/default.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/vsqlite/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vte/2.90.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/vte/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/vtk/7.x.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/vtk/8.x.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/vtk/generic.nix7
-rw-r--r--nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix23
-rw-r--r--nixpkgs/pkgs/development/libraries/vxl/default.nix13
-rw-r--r--nixpkgs/pkgs/development/libraries/waffle/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/wasilibc/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/wavpack/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/wayland/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/wayland/protocols.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/waylandpp/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/wcslib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/webkitgtk/default.nix17
-rw-r--r--nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/websocket++/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/wildmidi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/wiredtiger/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/wlroots/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/wolfssl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/wt/default.nix16
-rw-r--r--nixpkgs/pkgs/development/libraries/wtk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/wxSVG/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/x264/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/x265/default.nix15
-rw-r--r--nixpkgs/pkgs/development/libraries/xalanc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/xapian/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/xavs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/xbase/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix41
-rw-r--r--nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/xed/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xercesc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/xgboost/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xine-lib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xlslib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xml-security-c/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xmlsec/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/xsd/default.nix29
-rw-r--r--nixpkgs/pkgs/development/libraries/xvidcore/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/xxHash/default.nix11
-rw-r--r--nixpkgs/pkgs/development/libraries/xylib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/yajl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/yojimbo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/yubico-pam/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/zchunk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/zeitgeist/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/zeromq/4.x.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/zimg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/zimlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/zlib/default.nix32
-rw-r--r--nixpkgs/pkgs/development/libraries/zlog/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/zmqpp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/zziplib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix2
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix2
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/asdf/default.nix2
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix2
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix25
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix8
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix10
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix12
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt1
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix7
-rw-r--r--nixpkgs/pkgs/development/lua-modules/generated-packages.nix172
-rw-r--r--nixpkgs/pkgs/development/lua-modules/overrides.nix2
-rw-r--r--nixpkgs/pkgs/development/misc/avr/libc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix6
-rw-r--r--nixpkgs/pkgs/development/misc/breakpad/default.nix30
-rw-r--r--nixpkgs/pkgs/development/misc/google-clasp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix2
-rw-r--r--nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix2
-rw-r--r--nixpkgs/pkgs/development/misc/h3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix6
-rw-r--r--nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/loc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/misc/msp430/mspdebug.nix22
-rw-r--r--nixpkgs/pkgs/development/misc/rappel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/resholve/README.md158
-rw-r--r--nixpkgs/pkgs/development/misc/resholve/default.nix9
-rw-r--r--nixpkgs/pkgs/development/misc/resholve/deps.nix120
-rw-r--r--nixpkgs/pkgs/development/misc/resholve/resholve-package.nix97
-rw-r--r--nixpkgs/pkgs/development/misc/resholve/resholve.nix80
-rw-r--r--nixpkgs/pkgs/development/misc/rpiboot/unstable.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/stm32/inav/default.nix4
-rw-r--r--nixpkgs/pkgs/development/misc/yelp-tools/default.nix8
-rw-r--r--nixpkgs/pkgs/development/mobile/abootimg/default.nix8
-rw-r--r--nixpkgs/pkgs/development/mobile/adb-sync/default.nix6
-rw-r--r--nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix6
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/.gitignore2
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/cmake.nix4
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix197
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl128
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl116
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl76
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/emulator.nix2
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix145
-rwxr-xr-xnixpkgs/pkgs/development/mobile/androidenv/fetchrepo.sh26
-rwxr-xr-xnixpkgs/pkgs/development/mobile/androidenv/generate.sh37
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix964
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/packages.nix2563
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix114
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix44
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix64
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android.nix364
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix384
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix64
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/lldb.nix12
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb321
-rwxr-xr-xnixpkgs/pkgs/development/mobile/androidenv/mkrepo.sh19
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix32
-rwxr-xr-x[-rw-r--r--]nixpkgs/pkgs/development/mobile/androidenv/querypackages.sh36
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/repo.json5343
-rw-r--r--nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix2
-rw-r--r--nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/mobile/flashtool/default.nix10
-rw-r--r--nixpkgs/pkgs/development/mobile/genymotion/default.nix10
-rw-r--r--nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix14
-rw-r--r--nixpkgs/pkgs/development/mobile/titaniumenv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix4
-rw-r--r--nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix4
-rw-r--r--nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix4
-rw-r--r--nixpkgs/pkgs/development/mobile/webos/novacom.nix6
-rw-r--r--nixpkgs/pkgs/development/mobile/webos/novacomd.nix8
-rw-r--r--nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix24
-rw-r--r--nixpkgs/pkgs/development/mobile/xcodeenv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/mobile/xcodeenv/simulate-app.nix6
-rw-r--r--nixpkgs/pkgs/development/mobile/xpwn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/node-packages/default.nix10
-rw-r--r--nixpkgs/pkgs/development/node-packages/node-env.nix8
-rw-r--r--nixpkgs/pkgs/development/node-packages/node-packages.nix1215
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ansiterminal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/apron/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/astring/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/atd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/awa/default.nix38
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix15
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix15
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch (renamed from nixpkgs/pkgs/development/ocaml-modules/bap/dont-add-curses.patch)2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bap/default.nix31
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix25
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bin_prot/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix11
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix13
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix18
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/bos/default.nix36
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix32
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/charInfo_width/default.nix1
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cil/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix30
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix32
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix14
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix14
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix16
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix24
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix11
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/csv/default.nix26
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/curly/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/curses/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix34
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/dns/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix40
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/dum/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/either/default.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/elina/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix24
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/emile/default.nix39
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/estring/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/expat/default.nix46
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ezxmlm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/faillib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/fieldslib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/fix/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/functory/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/gen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/gg/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix16
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/git/default.nix42
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/hex/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/http/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix41
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix38
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix76
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/integers/default.nix24
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/iri/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix12
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix23
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lens/default.nix17
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix11
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/logs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix13
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix15
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix26
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/magick/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mew/default.nix27
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mew_vi/default.nix27
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix47
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix25
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/notty/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/num/default.nix42
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix12
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix42
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocplib-endian/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix32
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/octavius/default.nix32
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix12
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/odn/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/omd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/opium/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/optcomp/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/opti/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/optint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pa_ounit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/parany/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix26
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix30
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix15
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix25
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix30
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix21
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/process/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/react/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/repr/default.nix30
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix23
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/rope/default.nix12
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix34
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/seq/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix29
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/toml/default.nix9
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/torch/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/trie/default.nix23
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/twt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/typerep/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/variantslib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix47
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/vg/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix36
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/wodan/default.nix40
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/wodan/unix.nix27
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/x509/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix13
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix30
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix27
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix12
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/zed/default.nix48
-rw-r--r--nixpkgs/pkgs/development/perl-modules/MNI/default.nix4
-rw-r--r--nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix12
-rw-r--r--nixpkgs/pkgs/development/perl-modules/maatkit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix8
-rw-r--r--nixpkgs/pkgs/development/pharo/launcher/default.nix4
-rw-r--r--nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix14
-rw-r--r--nixpkgs/pkgs/development/pharo/vm/build-vm.nix8
-rw-r--r--nixpkgs/pkgs/development/pharo/vm/share.nix4
-rw-r--r--nixpkgs/pkgs/development/pharo/vm/vms.nix1
-rw-r--r--nixpkgs/pkgs/development/pharo/wrapper/default.nix12
-rw-r--r--nixpkgs/pkgs/development/php-packages/event/default.nix2
-rw-r--r--nixpkgs/pkgs/development/php-packages/igbinary/default.nix4
-rw-r--r--nixpkgs/pkgs/development/php-packages/imagick/default.nix2
-rw-r--r--nixpkgs/pkgs/development/php-packages/maxminddb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/php-packages/memcached/default.nix2
-rw-r--r--nixpkgs/pkgs/development/php-packages/mongodb/default.nix2
-rw-r--r--nixpkgs/pkgs/development/php-packages/oci8/default.nix6
-rw-r--r--nixpkgs/pkgs/development/php-packages/pdlib/default.nix24
-rw-r--r--nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/php-packages/phpstan/default.nix4
-rw-r--r--nixpkgs/pkgs/development/php-packages/protobuf/default.nix19
-rw-r--r--nixpkgs/pkgs/development/php-packages/psalm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/php-packages/rdkafka/default.nix4
-rw-r--r--nixpkgs/pkgs/development/php-packages/xdebug/default.nix4
-rw-r--r--nixpkgs/pkgs/development/php-packages/yaml/default.nix6
-rw-r--r--nixpkgs/pkgs/development/pure-modules/audio/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/avahi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/csv/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/doc/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/faust/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/ffi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/gen/default.nix12
-rw-r--r--nixpkgs/pkgs/development/pure-modules/gl/default.nix14
-rw-r--r--nixpkgs/pkgs/development/pure-modules/glpk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/gplot/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/gsl/default.nix12
-rw-r--r--nixpkgs/pkgs/development/pure-modules/gtk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/liblo/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/lilv/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/lv2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/midi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/mpfr/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/octave/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/odbc/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/pandoc/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/rational/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/readline/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/sockets/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/sql3/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/stldict/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/stllib/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/tk/default.nix10
-rw-r--r--nixpkgs/pkgs/development/pure-modules/xml/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/APScheduler/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/Cython/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/FormEncode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/HTSeq/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/IPy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/JPype1/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/MechanicalSoup/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/PyLD/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/Rtree/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/Theano/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/Wand/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/aadict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/aafigure/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/acebinf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/actdiag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix29
-rw-r--r--nixpkgs/pkgs/development/python-modules/adal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/adext/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/advantage-air/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/aenum/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/afdko/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/agate-sql/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/agent-py/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiodns/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioeafm/default.nix44
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioflo/default.nix45
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioguardian/default.nix62
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioh2/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix56
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix41
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiokef/default.nix44
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiolifx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioredis/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioshelly/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiostream/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix45
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/airly/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/ajpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/alabaster/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/alembic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/alerta-server/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/alerta/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/alot/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/altair/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/amcrest/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/amply/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/amqp/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/amqplib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/aniso8601/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/annoy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/anonip/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/ansi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ansicolor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ansicolors/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ansiconv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/apipkg/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/apprise/default.nix18
-rw-r--r--nixpkgs/pkgs/development/python-modules/approvaltests/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/apptools/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/apsw/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/archinfo/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/aresponses/default.nix40
-rw-r--r--nixpkgs/pkgs/development/python-modules/argh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/args/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/aria2p/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/asana/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/asgiref/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/asn1ate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/astral/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/astunparse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/asyncssh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/asysocks/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/atenpdu/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/atomiclong/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/atomman/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/attrdict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/authlib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/authres/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/autograd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/autologging/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/automat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/autopep8/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/av/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/avea/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/avro/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/avro3k/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix39
-rw-r--r--nixpkgs/pkgs/development/python-modules/awkward/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/awkward0/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/axis/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-core/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-identity/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/b2sdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/babelfish/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix23
-rw-r--r--nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/backports_csv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/backports_os/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bacpypes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/base36/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/base58/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/basemap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/batinfo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bayespy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix49
-rw-r--r--nixpkgs/pkgs/development/python-modules/bcdoc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bcrypt/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/beancount/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bedup/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/behave/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/bellows/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/bespon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/betacode/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/betamax/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bidict/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/billiard/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/binho-host-adapter/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/binwalk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/bitarray/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bitbox02/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bitmath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bitstring/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bjoern/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bleak/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/blessed/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/blessings/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/blinker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/blis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/blist/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/blivet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/block-io/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/blockdiag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bluepy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/boltons/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/boto3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/botocore/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bottle/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/box2d/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bpython/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bravado-core/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/breathe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bsblan/default.nix53
-rw-r--r--nixpkgs/pkgs/development/python-modules/bsddb3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/btchip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/btrees/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/btrfs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bugsnag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bugz/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bugzilla/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/build/default.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/buildout/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bumps/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bunch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/bwapy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cachelib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cachetools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cadquery/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cairosvg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/capstone/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/carbon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/carrot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/casbin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/case/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/casttube/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/catalogue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/catboost/default.nix56
-rw-r--r--nixpkgs/pkgs/development/python-modules/catboost/nix-support.patch181
-rw-r--r--nixpkgs/pkgs/development/python-modules/cattrs/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/cbor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cbor2/default.nix18
-rw-r--r--nixpkgs/pkgs/development/python-modules/cccolutils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cddb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/cdecimal/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/cement/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/censys/default.nix50
-rw-r--r--nixpkgs/pkgs/development/python-modules/cerberus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/certbot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/certifi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/certipy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cffi/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/cftime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/chai/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/chainmap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/chalice/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/chameleon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/channels-redis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/channels/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/chardet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/check-manifest/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/cheetah3/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/cherrypy/17.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/cherrypy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/cirq/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/clf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cliapp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/click-completion/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/click-log/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/click-plugins/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/click-repl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/clickclick/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/cliff/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/clifford/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/cligj/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/clint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/clize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/closure-linter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/clustershell/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cmd2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/cmdline/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cmdtest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cntk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/cocotb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/codecov/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/cogapp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/coilmq/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/colorama/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/colorcet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/colorclass/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/colored/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/colorlog/default.nix22
-rw-r--r--nixpkgs/pkgs/development/python-modules/colorlover/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/colour/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/commandparse/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/configobj/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/configparser/4.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/configparser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/configshell/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/constantly/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/construct/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/consul/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/contexter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/convertdate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cookies/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/coreapi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/coreschema/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cornice/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/coronavirus/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/cot/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/cov-core/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/crate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/crayons/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/crc16/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/crccheck/default.nix19
-rw-r--r--nixpkgs/pkgs/development/python-modules/crcmod/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/credstash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/croniter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cryptacular/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/cryptography/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/csscompressor/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/cssmin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cssselect/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cssutils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/csvw/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cupy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/curtsies/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/cymem/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cypari2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/daemonize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/daphne/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/darcsver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dask-glm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dask-image/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dask-ml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dask/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dataclasses/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/datadiff/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dateutil/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/datrie/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dbf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/dbfread/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dbus-next/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dbus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dbutils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dcmstack/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/deap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/debian/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/deep_merge/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/deluge-client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/demjson/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/deprecated/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/derpconf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/descartes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/deskcon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix49
-rw-r--r--nixpkgs/pkgs/development/python-modules/diff_cover/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/digitalocean/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/discid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/discogs_client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/discordpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/diskcache/default.nix18
-rw-r--r--nixpkgs/pkgs/development/python-modules/distlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/distorm3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/distro/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-allauth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-anymail/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-compat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-configurations/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-csp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-filter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-hijack/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-q/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-raster/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-storages/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django/2.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/django/3.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_appconf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_classytags/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_colorful/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_compressor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_environ/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_evolution/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_guardian/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_nose/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_redis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_reversion/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_silk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_taggit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/djangoql/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/dkimpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dlib/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/dnachisel/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/docker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dockerpty/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/docopt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/doit/default.nix48
-rw-r--r--nixpkgs/pkgs/development/python-modules/dot2tex/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/dpath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dpkt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dropbox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ds-store/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/dtopt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dufte/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dulwich/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/dyn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dynd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/easydict/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/easygui/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/easyprocess/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ecdsa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ed25519/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/editorconfig/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/edward/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/eggdeps/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/elementpath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/eliot/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/emcee/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/emoji/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/emv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/enum/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/enum34/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/enzyme/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/epc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ephem/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/etcd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/etebase/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/eth-utils/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/evdev/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/eve/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/eventlet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/eventlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/evernote/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/exchangelib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/execnet/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/exifread/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/eyed3/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/ezdxf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/face/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/face_recognition/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fake_factory/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/faker/default.nix48
-rw-r--r--nixpkgs/pkgs/development/python-modules/falcon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastapi/default.nix49
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastdiff/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/fasteners/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastimport/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastpair/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastprogress/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fastrlock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fasttext/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fdint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/feedgen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/feedparser/5.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/feedparser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/filebytes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/filelock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/filterpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fints/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fire/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/first/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fixerio/default.nix45
-rw-r--r--nixpkgs/pkgs/development/python-modules/flake8-blind-except/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flake8/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/flaky/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-babel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-common/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-compress/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-cors/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-login/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-silk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-testing/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flufl/i18n.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flup/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/flux-led/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fnvhash/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/folium/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/foolscap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fortiosapi/default.nix40
-rw-r--r--nixpkgs/pkgs/development/python-modules/foxdot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/freezegun/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/frozendict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ftfy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ftputil/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/fudge/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/funcsigs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/functools32/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/funcy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/furl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fuse-python/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/fusepy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gast/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gateone/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gcovr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gdata/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/geeknote/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/genanki/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/genome-collector/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/genpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/genshi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/geographiclib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/geojson-client/default.nix39
-rw-r--r--nixpkgs/pkgs/development/python-modules/geopandas/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/geopy/2.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/geopy/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gevent/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ghdiff/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gipc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/git-sweep/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/glances-api/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/globre/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/glom/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/glymur/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/gmpy2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gnureadline/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gnutls/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/goobook/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/goocalendar/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-api-core/default.nix (renamed from nixpkgs/pkgs/development/python-modules/google_api_core/default.nix)37
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-apputils/default.nix (renamed from nixpkgs/pkgs/development/python-modules/google_apputils/default.nix)10
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix29
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-auth/default.nix54
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix54
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix59
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix58
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix (renamed from nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix)10
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix (renamed from nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix)29
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix46
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix41
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix (renamed from nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix)31
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix64
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix (renamed from nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix)25
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix59
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix29
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix39
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix47
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix39
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix54
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix64
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix44
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix (renamed from nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix)12
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix44
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix46
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix45
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix41
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-music/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix46
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_auth/default.nix44
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix39
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix47
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix29
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix48
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix40
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/googlemaps/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/googletrans/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/gorilla/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gpapi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gphoto2/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/gplaycli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gps3/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gpyopt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/graphene/default.nix50
-rw-r--r--nixpkgs/pkgs/development/python-modules/graphite-web/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/graphviz/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch56
-rw-r--r--nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/grequests/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/grip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/grpcio/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/gsd/1.7.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gspread/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/gst-python/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/gtimelog/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/guestfs/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/gumath/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/gunicorn/19.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gunicorn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/gviz-api/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/gyp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/h11/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/h2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/h3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/h5py/default.nix21
-rw-r--r--nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/handout/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix41
-rw-r--r--nixpkgs/pkgs/development/python-modules/hatasmota/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/haversine/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hdmedians/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/heapdict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/helper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hetzner/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/heudiconv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/hg-git/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/hglib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hgsvn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hidapi/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hiredis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hiro/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hkdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/holidays/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/hpack/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/html2text/2018.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/html5-parser/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/htmlmin/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/httmock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/http_signature/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/httpauth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/httpbin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/httpretty/0.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/httpretty/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/httpx/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/hug/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/humanize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hupper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hwi/default.nix41
-rw-r--r--nixpkgs/pkgs/development/python-modules/hwi/relax-deps.patch16
-rw-r--r--nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/hyperframe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/hyperopt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/i3-py/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/i3ipc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/icalendar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/icmplib/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/ics/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/identify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ifaddr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ijson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/image-match/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imageio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/imagesize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imapclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imgaug/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imgsize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/importmagic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/imread/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/imutils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/inflection/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/influxdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/influxgraph/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/inifile/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/iniparse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/inquirer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/intervaltree/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipaddr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipaddress/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/iptools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipython/5.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipyvue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/isbnlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/iso3166/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/isodate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/itemloaders/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/itypes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/j2cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jabberbot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jc/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/jdatetime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jedi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jinja2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jmespath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch1194
-rw-r--r--nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix99
-rw-r--r--nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonfield/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonref/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jug/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/jupyter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kaa-base/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kafka-python/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kajiki/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kaptan/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kazoo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/keep/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/keepalive/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/keepkey/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/keras/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kerberos/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/keyring/2.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/kitchen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/koji/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/kubernetes/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/labelbox/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/larch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/lasagne/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/latexcodec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/lazy_import/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ldap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ldap3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ldappool/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/ldaptor/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/le/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/leather/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/libagent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libais/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libarcus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libasyncns/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/libcloud/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libcst/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/libevdev/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/libkeepass/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/liblarch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libmr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libnacl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/librosa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libsavitar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/libthumbor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libtmux/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libusb1/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/libversion/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/libvirt/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/lightblue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/lightgbm/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/lightning/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/limits/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/limnoria/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/linecache2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/linode-api/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/linode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/liquidctl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/livelossplot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/livestreamer/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/llfuse/default.nix20
-rw-r--r--nixpkgs/pkgs/development/python-modules/llvmlite/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/lmdb/default.nix20
-rw-r--r--nixpkgs/pkgs/development/python-modules/lmtpd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/localzone/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/locket/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/logilab/common.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/logilab/constraint.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/loguru/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/logutils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/lpod/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/lsassy/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/lsi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/lxc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/m2crypto/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/m2r/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/maestral/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/magic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mahotas/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mailchimp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/manhole/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/manticore/default.nix109
-rw-r--r--nixpkgs/pkgs/development/python-modules/manuel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/marionette-harness/mozdevice.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/marisa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/markdown2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/markerlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/markupsafe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/matplotlib/2.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/matplotlib/default.nix23
-rw-r--r--nixpkgs/pkgs/development/python-modules/matrix-client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mautrix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/maya/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mccabe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mdp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mechanize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/meinheld/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/meld3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/meliae/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/memcached/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mergedeep/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/mesa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/metaphone/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mezzanine/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/micawber/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/midiutil/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/milc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/minidump/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/minikerberos/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/minimock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mlflow/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mlrose/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mlxtend/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mmpython/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mocket/default.nix52
-rw-r--r--nixpkgs/pkgs/development/python-modules/mockito/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/modestmaps/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/mongodict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mongoengine/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/monotonic/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/moretools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/moviepy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/mox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mox3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mozsvc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mpd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mpd2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/mpi4py/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/mpmath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mpv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mrbob/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/msal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/msldap/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/msrest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/msrplib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mulpyplexer/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/munch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/munkres/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/murmurhash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mutag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/muttils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mwclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mwlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mxnet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mypy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mypy/extensions.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/namebench/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nameparser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nassl/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch14
-rw-r--r--nixpkgs/pkgs/development/python-modules/nbclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ncclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ndtypes/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/netaddr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/netcdf4/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/netdisco/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/netifaces/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/neuronpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nevow/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nibabel/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/nimfa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nine/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nipy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/nipype/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nitime/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/node-semver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/noise/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose-focus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nosejs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nosexcover/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/notebook/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/notify/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/notmuch/2.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/notmuch/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/ntplib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nuitka/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/numba/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/numericalunits/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nvchecker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nwdiag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nxt-python/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/oath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/oauth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/oauth2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/oauthlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/objgraph/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/offtrac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ofxclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ofxhome/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ofxparse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ofxtools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/olefile/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/omegaconf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/openant/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/openidc-client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/openrazer/common.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/optuna/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/opuslib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ordereddict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/orderedset/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/orm/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/orvibo/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/osc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/oset/default.nix6
-rwxr-xr-xnixpkgs/pkgs/development/python-modules/osmnx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/osqp/default.nix11
-rw-r--r--nixpkgs/pkgs/development/python-modules/ovito/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/packaging/2.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/packaging/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pagelabels/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pagerduty/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/palettable/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pamela/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pamqp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pandas/2.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/pandas/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/paperspace/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/parameterized/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/paramz/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/parse-type/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/parse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/parsimonious/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/paste/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pastescript/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/patator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/patch-ng/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/patch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/path-and-address/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pathos/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pathtools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/paver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pbr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pcpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pdf2image/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pdfkit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pdfposter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pdfrw/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pdfx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pecan/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/peewee/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pelican/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pep257/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pep517/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pep8/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/peppercorn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pex/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pexif/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pg8000/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pgpdump/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pgpy/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/pgsanity/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pgspecial/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/phe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/phonopy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pickleshare/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/piep/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/piexif/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/pika-pool/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pika/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pikepdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pilkit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pillow/6.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pillow/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pillowfight/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pims/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pint/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pip-tools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pipx/default.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/pivy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix15
-rw-r--r--nixpkgs/pkgs/development/python-modules/pkginfo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pkuseg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/plac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pluginbase/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/plyvel/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pocket/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/polib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pomegranate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pony/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pooch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/poolsense/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/portend/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/poster3/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/potr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/power/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/poyo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ppft/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ppscore/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/praw/6.3.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/praw/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/prawcore/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/preggy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/preshed/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pretend/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/prettytable/1.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/prettytable/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/primer3/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/privacyidea/ldap-proxy.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/proboscis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/process-tests/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/proglog/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/progress/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/progressbar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/progressbar2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/progressbar231/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/progressbar33/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/proto-plus/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/protobuf/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/prov/default.nix18
-rw-r--r--nixpkgs/pkgs/development/python-modules/psutil/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ptable/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ptest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ptpython/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pubnub/default.nix57
-rw-r--r--nixpkgs/pkgs/development/python-modules/pubnubsub-handler/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/pudb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pulp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/purepng/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pushover/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pvlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pweave/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pwntools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pxml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/py-radix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/py-sonic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/py/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/py3buddy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/py3dns/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/py3status/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/py4j/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyGithub/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyamf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyannotate/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyarlo/default.nix41
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyarrow/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyasn1/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyatmo/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyatspi/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyatv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyaudio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pybase64/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pybindgen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyblackbird/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyblock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pybluez/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pybotvac/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pybtex/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycangjie/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycapnp/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycarddav/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycares/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycassa/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycdio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycfdns/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/pychart/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pychef/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pychromecast/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyclipper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycognito/default.nix23
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycoin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycollada/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycontracts/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycountry/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycparser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycuda/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pydenticon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pydexcom/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/pydicom/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pydns/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pydotplus/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/pydub/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyechonest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyee/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyelftools/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyemd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyenchant/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyeverlights/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyexiv2/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyext/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyface/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfantom/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfftw/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfido/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyflakes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfnip/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfribidi/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyftdi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyfttt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygal/default.nix19
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygccxml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygeoip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyglet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygmt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygobject/3.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygobject/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygpgme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygreat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygtk/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix50
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyicu/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyinotify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix60
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyipp/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix53
-rw-r--r--nixpkgs/pkgs/development/python-modules/pykdtree/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pykerberos/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pykickstart/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pykira/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/pylast/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyliblo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pylibmc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/pylutron/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymaging/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymata-express/default.nix38
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymatgen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymeeus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymemoize/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymetar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymetno/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymodbus/default.nix59
-rw-r--r--nixpkgs/pkgs/development/python-modules/pympler/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymupdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymyq/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pynac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pynacl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pync/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pynest2d/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pynisher/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pynput/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pynzb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyobjc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyodbc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyopencl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyopengl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix45
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyosmium/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypandoc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyparsing/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyparted/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypass/default.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypck/default.nix45
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypdf2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypeg2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyphen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyplatec/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypoppler/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyprind/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyptlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypugjs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pypykatz/default.nix40
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix77
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyquery/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyregion/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyreport/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyres/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyro4/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyroma/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyroute2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyrr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysaml2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyscard/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyscss/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysendfile/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysensors/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysftp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyshp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyside/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyside2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysigset/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysmbc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysmf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysmi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysnmp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysocks/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysoma/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyspark/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyspice/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyspotify/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyspread/default.nix56
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysqlite/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysrt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyssim/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pystache/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pystemd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pystemmer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pysvn/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytabix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytado/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyte/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-check/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-django/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-html/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest/4.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest/5.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytestcache/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-doi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-editor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-efl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-engineio/default.nix29
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-etcd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-hosts/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-hpilo/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-http-client/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-igraph/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-jose/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-language-server/default.nix49
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-ly/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-lzf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-miio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-mnist/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-nomad/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-otr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-packer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-slugify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-socketio/default.nix42
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-twitter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-uinput/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-unshare/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-wifi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-wink/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python3-openid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python_fedora/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/python_statsd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pythondialog/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pythonix/default.nix18
-rw-r--r--nixpkgs/pkgs/development/python-modules/pythonnet/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytidylib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytile/default.nix59
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytmx/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytoml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytorch/bin.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytorch/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytrends/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytricia/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytun/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytzdata/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyunifi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyupdate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyusb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyutil/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyuv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyvera/default.nix54
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyvlx/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyvoro/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pywatchman/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pywebdav/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pywilight/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/pywizlight/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyzufall/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/qdldl/default.nix40
-rw-r--r--nixpkgs/pkgs/development/python-modules/qpid-python/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/qrcode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/qscintilla/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/qserve/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/qtawesome/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/qtpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/queuelib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/r2pipe/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rachiopy/default.nix35
-rw-r--r--nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ramlfications/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/random2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rarfile/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rawkit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rbtools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/rcssmin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/readchar/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/readme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rebulk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rednose/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/reedsolo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/reikna/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/remotecv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rencode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/repeated_test/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/repocheck/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/repoze_who/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/requests-cache/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/requests/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/resampy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/respx/default.nix50
-rw-r--r--nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/retrying/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rfc3986/default.nix15
-rw-r--r--nixpkgs/pkgs/development/python-modules/rfc3987/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rfc6555/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/rich/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/rjsmin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rl-coach/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/robomachine/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/roboschool/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robot-detection/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotframework/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/robotsuite/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/roku/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/roman/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/roombapy/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/rope/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ropper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/routes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rpdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rpkg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rply/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rpy2/default.nix41
-rw-r--r--nixpkgs/pkgs/development/python-modules/rpyc/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/rq/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rsa/4_0.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/rsa/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/rtslib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ruffus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/s3fs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/s3transfer/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/sacremoses/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/safe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/samplerate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sane/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/sanic/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/scales/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/schedule/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/schema/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/scipy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/scp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/scrapy/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/screeninfo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/scripttest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sdnotify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/seabreeze/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/secp256k1/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/seekpath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/segments/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/selectors2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/selectors34/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/selenium/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/semantic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/semver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/send2trash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sendgrid/default.nix49
-rw-r--r--nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix22
-rw-r--r--nixpkgs/pkgs/development/python-modules/sepaxml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/seqdiag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/serpent/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setproctitle/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptools/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sexpdata/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/shap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/shapely/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/shellingham/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/shiboken2/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/shippai/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/shortuuid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/should-dsl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/shouldbe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/signedjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sigtools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/simanneal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/simpleai/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/simplebayes/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/simpleparse/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sip/5.x.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/sipsimple/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/skein/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/slackclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/slicer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/slicerator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/slob/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/slowaes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/smartdc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/smartypants/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/snakeviz/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/snapcast/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/snappergui/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/snapshottest/default.nix33
-rw-r--r--nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/somajo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sopel/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/spacy/models.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/spark_parser/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/speaklater/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/spglib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix19
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/spyder/3.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/spyder/default.nix13
-rw-r--r--nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sqlobject/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/squaremap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/srptools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/srsly/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/srvlookup/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ssdeep/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ssdp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sseclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sslib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sslyze/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/starlette/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/staticjinja/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/statsd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/stdiomask/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/stompclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/strictyaml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/stringcase/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/subarulink/default.nix44
-rw-r--r--nixpkgs/pkgs/development/python-modules/subdownloader/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/suds/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sumo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sure/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/survey/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/svg-path/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/swspotify/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/sybase/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/sympy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/systemd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tables/3.5.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/tables/default.nix16
-rw-r--r--nixpkgs/pkgs/development/python-modules/tarman/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tasklib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/taskw/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tatsu/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/tblib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/telegram/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tenacity/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix22
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow-estimator/1/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix (renamed from nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix)8
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix (renamed from nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix)23
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix120
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix456
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch13
-rwxr-xr-xnixpkgs/pkgs/development/python-modules/tensorflow/1/prefetcher.sh33
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch16
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix (renamed from nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix)4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix (renamed from nixpkgs/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix)0
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch10
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/default.nix (renamed from nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix)147
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/no-saved-proto.patch14
-rwxr-xr-xnixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh (renamed from nixpkgs/pkgs/development/python-modules/tensorflow/2/prefetcher.sh)0
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/relax-dependencies.patch51
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch21
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/workspace.patch18
-rw-r--r--nixpkgs/pkgs/development/python-modules/termcolor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/terminaltables/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix39
-rw-r--r--nixpkgs/pkgs/development/python-modules/testpath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/testrepository/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/testscenarios/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/thinc/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/threadpool/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/three-merge/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/thrift/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tilestache/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/timelib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tissue/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tkinter/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/tld/default.nix54
-rw-r--r--nixpkgs/pkgs/development/python-modules/tlsh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tlslite/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tmb/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/todoist/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tokenizers/default.nix21
-rw-r--r--nixpkgs/pkgs/development/python-modules/tokenlib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/toml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/toonapi/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/toposort/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/torchvision/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/traceback2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tracing/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/trackpy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/traits/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/transaction/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/transformers/default.nix73
-rw-r--r--nixpkgs/pkgs/development/python-modules/transip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/transitions/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/translationstring/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/treq/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/trimesh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/trollius/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/trueskill/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/trytond/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/ttystatus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tubeup/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/tumpa/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tvnamer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twiggy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twilio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twisted/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/twitter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/txaio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/txamqp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/txdbus/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/txgithub/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/txrequests/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/typeguard/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/typesystem/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/typogrify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/tzlocal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ua-parser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/uamqp/default.nix30
-rw-r--r--nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/ujson/2.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/ujson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/umalqurra/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/umemcache/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/uncertainties/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/unicorn/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/unidecode/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/unifi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/unifiled/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/unittest2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/upass/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/update_checker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/upnpy/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/uproot3/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/uptime/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/uranium/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/uritools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/url-normalize/default.nix45
-rw-r--r--nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/urllib3/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/urwid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/usbtmc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/user-agents/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/utils/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/uvicorn/default.nix46
-rw-r--r--nixpkgs/pkgs/development/python-modules/validate-email/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/validictory/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vcversioner/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vega/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/venusian/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/versioneer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/versiontools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vidstab/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vine/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/virtkey/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/virtual-display/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vmprof/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vncdo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix34
-rw-r--r--nixpkgs/pkgs/development/python-modules/voluptuous/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/vsure/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/vultr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/vulture/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/vxi11/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/w3lib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/waitress/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/waqiasync/default.nix32
-rw-r--r--nixpkgs/pkgs/development/python-modules/warlock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wasabi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wasm/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/wasmer/default.nix71
-rw-r--r--nixpkgs/pkgs/development/python-modules/watchdog/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix43
-rw-r--r--nixpkgs/pkgs/development/python-modules/weasyprint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/web/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/webapp2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/webhelpers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/webob/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/websockify/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/webtest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/webthing/default.nix40
-rw-r--r--nixpkgs/pkgs/development/python-modules/werkzeug/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/wfuzz/default.nix48
-rw-r--r--nixpkgs/pkgs/development/python-modules/whisper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/whitenoise/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/whoosh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/willow/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/winacl/default.nix25
-rw-r--r--nixpkgs/pkgs/development/python-modules/winsspi/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/word2vec/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wordcloud/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/worldengine/default.nix17
-rw-r--r--nixpkgs/pkgs/development/python-modules/wrapio/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wrf-python/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/ws4py/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wtforms/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/x11_hash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/x256/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xapp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xattr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xcaplib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xcffib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xdg/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/xdot/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xknx/default.nix47
-rw-r--r--nixpkgs/pkgs/development/python-modules/xlib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/xlrd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xmlschema/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xmodem/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xmpppy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xnd/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/xxhash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/yamllint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/yanc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/yapf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/yapsy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/yarl/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/ydiff/default.nix37
-rw-r--r--nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix23
-rw-r--r--nixpkgs/pkgs/development/python-modules/yowsup/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zbaemon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zbase32/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zconfig/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/zdaemon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zerobin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zeroconf/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/zfec/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix27
-rw-r--r--nixpkgs/pkgs/development/python-modules/zict/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix31
-rw-r--r--nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix9
-rw-r--r--nixpkgs/pkgs/development/python-modules/zigpy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/zodb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_broken/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_component/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_event/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_interface/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix6
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_location/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_schema/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_size/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_testing/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/zstd/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/zulip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix2
-rw-r--r--nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix10
-rw-r--r--nixpkgs/pkgs/development/r-modules/bioc-packages.nix192
-rw-r--r--nixpkgs/pkgs/development/r-modules/cran-packages.nix6379
-rw-r--r--nixpkgs/pkgs/development/r-modules/default.nix101
-rwxr-xr-xnixpkgs/pkgs/development/r-modules/generate-r-packages.R8
-rw-r--r--nixpkgs/pkgs/development/r-modules/generic-builder.nix8
-rw-r--r--nixpkgs/pkgs/development/r-modules/patches/qtbase.patch13
-rw-r--r--nixpkgs/pkgs/development/r-modules/wrapper.nix32
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/bundix/default.nix11
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix49
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/rbenv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock39
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix74
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile13
-rw-r--r--nixpkgs/pkgs/development/tools/alloy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ameba/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/ammonite/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/cccc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/checkov/default.nix77
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/coan/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/codeql/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/coz/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/egypt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/emma/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/flow/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/hopper/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/ikos/default.nix3
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/kcov/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/lcov/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/pev/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/pmd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/radare2/default.nix31
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/randoop/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/retdec/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/rr/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/smatch/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/snowman/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/sparse/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/spin/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/splint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/swarm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/tflint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix16
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/apktool/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/asn2quickder/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/async/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/avro-tools/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix18
-rw-r--r--nixpkgs/pkgs/development/tools/azcopy/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/bazel-kazel/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/bazel-watcher/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/bazelisk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/bloaty/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/boomerang/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/boost-build/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bam/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bear/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/boot/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/buck/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/conan/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/doit/default.nix41
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/dub/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/fac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/gup/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/jam/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/kati/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/mage/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/meson/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/mill/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/mk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/pants/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/redo/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/remake/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/scons/common.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/shards/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/tup/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/waf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/buildah/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/buildkit/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/buildpack/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/cadre/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/cargo-web/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/cask/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/castxml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/cddl/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/cdecl/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/chefdk/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/chit/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/clang-tools/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/clog-cli/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/clpm/default.nix44
-rw-r--r--nixpkgs/pkgs/development/tools/cmake-language-server/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/compass/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/compile-daemon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/conftest/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/convco/default.nix26
-rw-r--r--nixpkgs/pkgs/development/tools/corgi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/corundum/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/coursier/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/cppclean/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/cucumber/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/cue/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/dapper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/dapr/cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/database/dbmate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/database/dbmate/deps.nix84
-rw-r--r--nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/database/liquibase/default.nix18
-rw-r--r--nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/database/pgcli/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/database/pyrseas/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/database/shmig/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/database/webdis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/dcadec/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/deis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/deisctl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/delve/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/dep/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/dep2nix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/detect-secrets/default.nix52
-rw-r--r--nixpkgs/pkgs/development/tools/devd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/devpi-client/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/devpi-server/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/devtodo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/diesel-cli/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/dive/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/doctl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/documentation/antora/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix18
-rw-r--r--nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/dot-http/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/drip/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/drm_info/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/dtools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/easyjson/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/eclipse-mat/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/ejson/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/electron/default.nix44
-rw-r--r--nixpkgs/pkgs/development/tools/electron/generic.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/eliot-tree/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/erlang/cuter/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/errcheck/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/fac/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/fac/deps.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/fedpkg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/flamegraph/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/flatpak-builder/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/flootty/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/flyway/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/fmbt/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/fusee-launcher/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/galen/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gamecube-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gauge/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gdm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ginkgo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gir/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/git-ftp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/git-quick-stats/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/git-series/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/github/cligh/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/github/github-release/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/glade/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/glide/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gllvm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/global-platform-pro/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/glock/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/glpaper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/glslviewer/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/gnulib/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-bindata/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-junit-report/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-langserver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-migrate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-minimock/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-motion/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/go-outline/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/go-protobuf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-repo-root/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/go-swagger/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/go-symbols/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/go-tools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/go2nix/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/goa/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gocode-gomod/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/gocode/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/goconvey/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/godef/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/godot/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/godot/headless.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/godot/server.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gofumpt/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/golangci-lint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/golint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/gomodifytags/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/gomplate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gopkgs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/gopkgs/deps.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/gopls/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/gore/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/gosec/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gotags/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gotests/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/gotestsum/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/gotools/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/govendor/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/govers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gox/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gron/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/halfempty/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix39
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix21
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix27
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix8
-rwxr-xr-xnixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh7
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/hcloud/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/hexio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/hobbes/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/iaca/2.1.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/iaca/3.0.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/icestorm/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/icr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/imatix_gsl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ineffassign/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/interfacer/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/irony-server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/java/cfr/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/java/dex2jar/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/java/fastjar/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/java/jhiccup/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/java/visualvm/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/jazzy/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/jbake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/jbang/default.nix40
-rw-r--r--nixpkgs/pkgs/development/tools/jd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/jid/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/jira_cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/jl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/jmespath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/jo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/jp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/jpexs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/jq/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/jtc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/just/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/k6/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/kafkacat/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/kcli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/kind/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/kcc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/kimg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/kpack/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/scas/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/knightos/z80e/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/krew/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ktlint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/kube-prompt/deps.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/kubectx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/kubeprompt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/kubicorn/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/kubie/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/kustomize/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/kythe/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/lattice-diamond/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/lazygit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/lc3tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/leaps/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/libsigrok/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/makerpm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/manul/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/mdk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/metals/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/micronaut/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/minizinc/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/minizinc/ide.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/act/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/arcanist/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/argbash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/asls/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/autobuild/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/autoconf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/autogen/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/automoc4/default.nix18
-rw-r--r--nixpkgs/pkgs/development/tools/misc/avrdude/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/awf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/bashdb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/binutils/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch21
-rw-r--r--nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/bossa/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ccache/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ccls/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cflow/default.nix17
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cgdb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/chrpath/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cli11/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/complexity/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cppi/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cproto/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/creduce/default.nix9
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cscope/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/csmith/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ctags/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/d-feet/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/dbench/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ddd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/dialog/default.nix23
-rw-r--r--nixpkgs/pkgs/development/tools/misc/direvent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/distcc/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/distcc/masq.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/doclifter/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/docopts/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/drush/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/epm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/findnewest/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/fswatch/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/fujprog/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gdb/default.nix26
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gede/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/global/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gnum4/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gob2/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gperf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gpshell/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gputils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix40
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/help2man/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/hound/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/hydra/common.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/misc/hydra/default.nix3
-rw-r--r--nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch18
-rw-r--r--nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/igprof/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/indent/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/intltool/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/iozone/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/itstool/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/kdbg/default.nix7
-rw-r--r--nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/libtool/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/libwhich/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/loccount/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/lsof/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ltrace/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/lttv/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/luarocks/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix9
-rw-r--r--nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/msitools/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix48
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ninka/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/objconv/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/opengrok/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/pahole/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/patchelf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/prelink/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/premake/3.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/premake/5.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/premake/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ptags/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix39
-rw-r--r--nixpkgs/pkgs/development/tools/misc/rman/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/rolespec/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/scc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/sccache/default.nix18
-rw-r--r--nixpkgs/pkgs/development/tools/misc/sipp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/sloccount/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/srecord/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/stlink/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/strace/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/swig/2.x.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/swig/3.x.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/swig/4.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/swig/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/sysbench/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/tet/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/misc/texi2html/default.nix19
-rw-r--r--nixpkgs/pkgs/development/tools/misc/texinfo/common.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/texlab/default.nix15
-rw-r--r--nixpkgs/pkgs/development/tools/misc/tie/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/tokei/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/misc/travis/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/uisp/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/unifdef/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/misc/unused/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix7
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ycmd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/yodl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/mmixware/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/mod/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/modd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/msgpack-tools/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/mustache-go/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/nailgun/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/nemiver/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/neoload/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/node-webkit/nw12.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/nrpl/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/nsis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/nwjs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix22
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix11
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/dune/2.nix22
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/dune/default.nix20
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix28
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix20
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/omake/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/opam/default.nix2
-rwxr-xr-xnixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl2
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/utop/default.nix16
-rw-r--r--nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/omniorb/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/open-policy-agent/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/operator-sdk/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/osslsigncode/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/out-of-tree/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/overcommit/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/packer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/packet-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/packet/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/parinfer-rust/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/bison/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/byacc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/flex/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/hammer/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/lemon/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/peg/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/ragel/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/re2c/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix1
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json8
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json10
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json8
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json8
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json8
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json8
-rw-r--r--nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/pax-rs/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/pew/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/pgformatter/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/pgloader/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/phantomjs/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/phantomjs2/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix44
-rw-r--r--nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/postiats-utilities/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/profiling/pprof/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/pry/Gemfile.lock10
-rw-r--r--nixpkgs/pkgs/development/tools/pry/gemset.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/purescript/spago/spago.nix43
-rw-r--r--nixpkgs/pkgs/development/tools/pxview/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/py-spy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/pydb/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/qtcreator/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/quicktemplate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/quilt/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/rdbtools/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rdocker/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/react-native-debugger/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/redis-dump/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/remarshal/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/renderizer/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/reno/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rep/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/richgo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ronn/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/rtags/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock22
-rw-r--r--nixpkgs/pkgs/development/tools/rubocop/gemset.nix30
-rw-r--r--nixpkgs/pkgs/development/tools/rucksack/default.nix7
-rw-r--r--nixpkgs/pkgs/development/tools/rufo/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/run/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rund/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rust/bindgen/default.nix12
-rwxr-xr-xnixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh2
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-binutils/Cargo.lock419
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix29
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix34
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/rust/maturin/default.nix16
-rw-r--r--nixpkgs/pkgs/development/tools/rust/racer/default.nix35
-rw-r--r--nixpkgs/pkgs/development/tools/rust/racerd/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix2
-rwxr-xr-xnixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh2
-rw-r--r--nixpkgs/pkgs/development/tools/rust/rustup/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/sass/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/sassc/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/sauce-connect/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/scaff/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/scalafix/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/scalafmt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/scss-lint/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/selenium/server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/shadered/default.nix45
-rw-r--r--nixpkgs/pkgs/development/tools/sigrok-cli/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/simavr/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/skopeo/default.nix15
-rw-r--r--nixpkgs/pkgs/development/tools/slimerjs/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/so/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix27
-rw-r--r--nixpkgs/pkgs/development/tools/sourcetrail/default.nix16
-rw-r--r--nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/spirv-tools/default.nix5
-rw-r--r--nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/sqlint/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/sqsh/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/sslmate/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/stagit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/summon/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix52
-rw-r--r--nixpkgs/pkgs/development/tools/sunxi-tools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/swiftformat/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/tabnine/default.nix21
-rw-r--r--nixpkgs/pkgs/development/tools/textql/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/the-way/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/thrust/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/toluapp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/tracy/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/tradcpp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/trellis/default.nix11
-rw-r--r--nixpkgs/pkgs/development/tools/turbogit/default.nix42
-rw-r--r--nixpkgs/pkgs/development/tools/tychus/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/tychus/deps.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/udis86/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/uftrace/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/unity3d/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/unityhub/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/vagrant/default.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/vagrant/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/vala-language-server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/vala-lint/default.nix8
-rw-r--r--nixpkgs/pkgs/development/tools/vcstool/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/vend/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/vogl/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/vultr-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/vultr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/wabt/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/wasm-pack/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/watchman/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/wiggle/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/wiiload/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/winpdb/default.nix7
-rw-r--r--nixpkgs/pkgs/development/tools/wllvm/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/wrangler/default.nix16
-rw-r--r--nixpkgs/pkgs/development/tools/ws/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/wxformbuilder/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/xcbuild/default.nix15
-rw-r--r--nixpkgs/pkgs/development/tools/xcpretty/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/tools/xib2nib/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/xqilla/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/yaml2json/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/yarn/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ydiff/default.nix45
-rw-r--r--nixpkgs/pkgs/development/tools/yj/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/yq-go/default.nix10
-rw-r--r--nixpkgs/pkgs/development/tools/yuicompressor/default.nix8
-rw-r--r--nixpkgs/pkgs/development/web/cog/default.nix70
-rw-r--r--nixpkgs/pkgs/development/web/csslint/default.nix4
-rw-r--r--nixpkgs/pkgs/development/web/cypress/default.nix2
-rw-r--r--nixpkgs/pkgs/development/web/deno/default.nix6
-rw-r--r--nixpkgs/pkgs/development/web/flyctl/default.nix6
-rw-r--r--nixpkgs/pkgs/development/web/grails/default.nix10
-rw-r--r--nixpkgs/pkgs/development/web/insomnia/default.nix6
-rw-r--r--nixpkgs/pkgs/development/web/kcgi/default.nix12
-rw-r--r--nixpkgs/pkgs/development/web/kore/default.nix8
-rw-r--r--nixpkgs/pkgs/development/web/mailcatcher/gemset.nix2
-rw-r--r--nixpkgs/pkgs/development/web/newman/node-composition.nix2
-rw-r--r--nixpkgs/pkgs/development/web/newman/node-packages.nix2
-rw-r--r--nixpkgs/pkgs/development/web/nodejs/nodejs.nix21
-rw-r--r--nixpkgs/pkgs/development/web/nodejs/v10.nix8
-rw-r--r--nixpkgs/pkgs/development/web/nodejs/v12.nix8
-rw-r--r--nixpkgs/pkgs/development/web/nodejs/v14.nix8
-rw-r--r--nixpkgs/pkgs/development/web/nodejs/v15.nix4
-rw-r--r--nixpkgs/pkgs/development/web/now-cli/default.nix2
-rw-r--r--nixpkgs/pkgs/development/web/postman/default.nix10
-rw-r--r--nixpkgs/pkgs/development/web/remarkjs/default.nix6
-rw-r--r--nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix2
-rw-r--r--nixpkgs/pkgs/development/web/shopify-themekit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix8
-rw-r--r--nixpkgs/pkgs/development/web/valum/default.nix6
-rw-r--r--nixpkgs/pkgs/development/web/wml/default.nix4
-rw-r--r--nixpkgs/pkgs/development/web/woff2/default.nix12
-rw-r--r--nixpkgs/pkgs/development/web/xmlindent/default.nix6
6132 files changed, 72649 insertions, 59293 deletions
diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 995789b8c1ba..04dfbcbedf0e 100644
--- a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , makeWrapper
 , runCommand, wrapBintoolsWith, wrapCCWith
 , buildAndroidndk, androidndk, targetAndroidndkPkgs
@@ -48,7 +48,7 @@ let
   hostInfo = ndkInfoFun stdenv.hostPlatform;
   targetInfo = ndkInfoFun stdenv.targetPlatform;
 
-  prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
+  prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
 in
 
 rec {
diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/default.nix b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix
index 10819d49ed30..5f71304d3855 100644
--- a/nixpkgs/pkgs/development/androidndk-pkgs/default.nix
+++ b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix
@@ -1,4 +1,4 @@
-{ androidenv, buildPackages, pkgs, targetPackages
+{ lib, androidenv, buildPackages, pkgs, targetPackages
 }:
 
 {
@@ -17,6 +17,7 @@
       };
     in
     import ./androidndk-pkgs.nix {
+      inherit lib;
       inherit (buildPackages)
         makeWrapper;
       inherit (pkgs)
@@ -46,6 +47,7 @@
       };
     in
     import ./androidndk-pkgs.nix {
+      inherit lib;
       inherit (buildPackages)
         makeWrapper;
       inherit (pkgs)
diff --git a/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix b/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix
index b6b1fc9c89d1..fe28a962e102 100644
--- a/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub,  makeWrapper, arduino-cli, ruby, python3 }:
+{ lib, stdenv, fetchFromGitHub,  makeWrapper, arduino-cli, ruby, python3 }:
 
 let
 
-  runtimePath = stdenv.lib.makeBinPath [
+  runtimePath = lib.makeBinPath [
     arduino-cli
     python3 # required by the esp8266 core
   ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/arduino-ci --prefix PATH ":" "${runtimePath}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CI for Arduino Libraries";
     homepage = src.meta.homepage;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix b/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix
index 1b1116a74b5d..95586d064d96 100644
--- a/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }:
 
 let
 
@@ -21,9 +21,9 @@ let
 
     buildFlagsArray = [
       "-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown"
-    ] ++ stdenv.lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
+    ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       inherit (src.meta) homepage;
       description = "Arduino from the command line";
       license = licenses.gpl3Only;
diff --git a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
index 456a8d8b81c5..4c440ab97dbb 100644
--- a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
@@ -47,7 +47,7 @@ let
   ;
   # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable
   ncurses5 = ncurses.override { abiVersion = "5"; };
-  teensy_libpath = stdenv.lib.makeLibraryPath [
+  teensy_libpath = lib.makeLibraryPath [
     atk
     cairo
     expat
@@ -76,7 +76,7 @@ let
                         else throw "${stdenv.hostPlatform.system} is not supported in teensy";
 
   flavor = (if withTeensyduino then "teensyduino" else "arduino")
-             + stdenv.lib.optionalString (!withGui) "-core";
+             + lib.optionalString (!withGui) "-core";
 in
 stdenv.mkDerivation rec {
   version = "1.8.13";
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
     zlib
     ncurses5
     readline
-  ] ++ stdenv.lib.optionals withTeensyduino [ upx ];
+  ] ++ lib.optionals withTeensyduino [ upx ];
   downloadSrcList = builtins.attrValues externalDownloads;
   downloadDstList = builtins.attrNames externalDownloads;
 
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
     cp -r ./build/linux/work/* "$out/share/arduino/"
     echo -n ${version} > $out/share/arduino/lib/version.txt
 
-    ${stdenv.lib.optionalString withGui ''
+    ${lib.optionalString withGui ''
       mkdir -p $out/bin
       substituteInPlace $out/share/arduino/arduino \
         --replace "JAVA=java" "JAVA=$javaPath/java" \
@@ -180,7 +180,7 @@ stdenv.mkDerivation rec {
         --replace '<ICON_NAME>' "$out/share/arduino/icons/128x128/apps/arduino.png"
     ''}
 
-    ${stdenv.lib.optionalString withTeensyduino ''
+    ${lib.optionalString withTeensyduino ''
       # Back up the original jars
       mv $out/share/arduino/lib/arduino-core.jar $out/share/arduino/lib/arduino-core.jar.bak
       mv $out/share/arduino/lib/pde.jar $out/share/arduino/lib/pde.jar.bak
@@ -235,7 +235,7 @@ stdenv.mkDerivation rec {
     mkdir $out/lib/
     ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5
 
-    ${stdenv.lib.optionalString withTeensyduino ''
+    ${lib.optionalString withTeensyduino ''
       # Patch the Teensy loader binary
       patchelf --debug \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
@@ -244,7 +244,7 @@ stdenv.mkDerivation rec {
     ''}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source electronics prototyping platform";
     homepage = "http://arduino.cc/";
     license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix
index cd3dd32f3806..d5f506038ca6 100644
--- a/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages, installShellFiles }:
+{ stdenv, lib, fetchFromGitHub, python3Packages, installShellFiles }:
 
 stdenv.mkDerivation rec {
   version = "1.6.0";
@@ -22,12 +22,11 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Makefile for Arduino sketches";
     homepage = "https://github.com/sudar/Arduino-Makefile";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.eyjhb ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.eyjhb ];
+    platforms = platforms.unix;
   };
 }
-
diff --git a/nixpkgs/pkgs/development/arduino/ino/default.nix b/nixpkgs/pkgs/development/arduino/ino/default.nix
index c51d3f89d070..c536ed8c2c02 100644
--- a/nixpkgs/pkgs/development/arduino/ino/default.nix
+++ b/nixpkgs/pkgs/development/arduino/ino/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, picocom
+{ stdenv, lib, fetchurl, python2Packages, picocom
 , avrdude, arduino-core }:
 
 python2Packages.buildPythonApplication rec {
@@ -36,11 +36,11 @@ python2Packages.buildPythonApplication rec {
       --replace "'-C', self.e['avrdude.conf']," ""
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Command line toolkit for working with Arduino hardware";
     homepage = "http://inotool.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ antono ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ antono ];
+    platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/arduino/platformio/core.nix b/nixpkgs/pkgs/development/arduino/platformio/core.nix
index a039314d753d..733e7e0b1462 100644
--- a/nixpkgs/pkgs/development/arduino/platformio/core.nix
+++ b/nixpkgs/pkgs/development/arduino/platformio/core.nix
@@ -107,7 +107,7 @@ in buildPythonApplication rec {
       --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     broken = stdenv.isAarch64;
     description = "An open source ecosystem for IoT development";
     homepage = "http://platformio.org";
diff --git a/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix b/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
index c2d1ebabae27..a94524276b26 100644
--- a/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -15,7 +15,7 @@
 , buildFlags ? []
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";
diff --git a/nixpkgs/pkgs/development/beam-modules/build-hex.nix b/nixpkgs/pkgs/development/beam-modules/build-hex.nix
index 27ce64582f34..e0d9dfc42889 100644
--- a/nixpkgs/pkgs/development/beam-modules/build-hex.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-hex.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildRebar3, fetchHex }:
+{ lib, stdenv, buildRebar3, fetchHex }:
 
 { name, version, sha256
 , builder ? buildRebar3
 , hexPkg ? name
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   pkg = self: builder (attrs // {
diff --git a/nixpkgs/pkgs/development/beam-modules/build-mix.nix b/nixpkgs/pkgs/development/beam-modules/build-mix.nix
index 9aebad2dabf7..45f5e3674421 100644
--- a/nixpkgs/pkgs/development/beam-modules/build-mix.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-mix.nix
@@ -15,7 +15,7 @@
 , enableDebugInfo ? false
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
 
diff --git a/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix b/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix
index 224d111026af..2e2f0a50b317 100644
--- a/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix
@@ -14,7 +14,7 @@
 , enableDebugInfo ? false
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
@@ -64,7 +64,7 @@ let
       HOME=. rebar3 compile
       ${if compilePorts then ''
         HOME=. rebar3 pc compile
-      '' else ''''}
+      '' else ""}
       runHook postBuild
     '';
 
diff --git a/nixpkgs/pkgs/development/beam-modules/default.nix b/nixpkgs/pkgs/development/beam-modules/default.nix
index a5de4dfb3bba..4f312129b387 100644
--- a/nixpkgs/pkgs/development/beam-modules/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, pkgs, erlang }:
+{ lib, stdenv, pkgs, erlang }:
 
 let
-  inherit (stdenv.lib) makeExtensible;
+  inherit (lib) makeExtensible;
 
-  lib = pkgs.callPackage ./lib.nix {};
+  lib' = pkgs.callPackage ./lib.nix {};
 
   # FIXME: add support for overrideScope
-  callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args;
+  callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args;
   mkScope = scope: pkgs // scope;
 
   packages = self:
@@ -38,27 +38,27 @@ let
         # BEAM-based languages.
         elixir = elixir_1_11;
 
-        elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix {
+        elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
+        elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
+        elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
+        elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
+        elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix {
           inherit erlang;
           debugInfo = true;
         };
@@ -67,8 +67,8 @@ let
         # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
 
         lfe = lfe_1_3;
-        lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
-        lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
+        lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
+        lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
 
         # Non hex packages. Examples how to build Rebar/Mix packages with and
         # without helper functions buildRebar3 and buildMix.
diff --git a/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix b/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix
index c55a7a80ff39..7f84e2360704 100644
--- a/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix
+++ b/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 { pkg, version, sha256
 , meta ? {}
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation ({
   name = "hex-source-${pkg}-${version}";
diff --git a/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix
index 389e07beca6c..d858b3d81aff 100644
--- a/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix
+++ b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix
@@ -1,10 +1,10 @@
-{ stdenv, rebar3 }:
+{ lib, stdenv, rebar3 }:
 
 { name, version, sha256, src
 , meta ? {}
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation ({
   name = "rebar-deps-${name}-${version}";
@@ -28,6 +28,6 @@ stdenv.mkDerivation ({
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
+  impureEnvVars = lib.fetchers.proxyImpureEnvVars;
   inherit meta;
 })
diff --git a/nixpkgs/pkgs/development/beam-modules/hex/default.nix b/nixpkgs/pkgs/development/beam-modules/hex/default.nix
index 26070ce73bfa..794b9e5cf222 100644
--- a/nixpkgs/pkgs/development/beam-modules/hex/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/hex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeText, elixir }:
+{ lib, stdenv, fetchFromGitHub, writeText, elixir }:
 
 let
   shell = drv: stdenv.mkDerivation {
@@ -45,13 +45,13 @@ let
 
     meta = {
       description = "Package manager for the Erlang VM https://hex.pm";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
       homepage = "https://github.com/hexpm/hex";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+      maintainers = with lib.maintainers; [ ericbmerritt ];
     };
 
     passthru = {
       env = shell self;
     };
 };
-in stdenv.lib.fix pkg
+in lib.fix pkg
diff --git a/nixpkgs/pkgs/development/beam-modules/lib.nix b/nixpkgs/pkgs/development/beam-modules/lib.nix
index db40c47794fa..7ae2e0e26066 100644
--- a/nixpkgs/pkgs/development/beam-modules/lib.nix
+++ b/nixpkgs/pkgs/development/beam-modules/lib.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs, lib, stdenv }:
 
 rec {
 
@@ -7,7 +7,7 @@ rec {
   callPackageWith = autoArgs: fn: args:
     let
       f = if pkgs.lib.isFunction fn then fn else import fn;
-      auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs;
+      auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
     in f (auto // args);
 
   callPackage = callPackageWith pkgs;
diff --git a/nixpkgs/pkgs/development/beam-modules/pc/default.nix b/nixpkgs/pkgs/development/beam-modules/pc/default.nix
index d30b0fbdbd28..a6d7c1c44de3 100644
--- a/nixpkgs/pkgs/development/beam-modules/pc/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/pc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildHex }:
+{ lib, buildHex }:
 
 buildHex {
   name = "pc";
@@ -6,8 +6,8 @@ buildHex {
   sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0";
 
   meta = {
-    description = ''a rebar3 port compiler for native code'';
-    license = stdenv.lib.licenses.mit;
+    description = "a rebar3 port compiler for native code";
+    license = lib.licenses.mit;
     homepage = "https://github.com/blt/port_compiler";
   };
 }
diff --git a/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix b/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix
index c7e7aee10019..df6561b7cf18 100644
--- a/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, buildRebar3 }:
+{ lib, stdenv, fetchFromGitHub, buildRebar3 }:
 
 let
   shell = drv: stdenv.mkDerivation {
@@ -21,9 +21,9 @@ let
 
     meta = {
       description = "Erlang PostgreSQL Driver";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
       homepage = "https://github.com/semiocast/pgsql";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+      maintainers = with lib.maintainers; [ ericbmerritt ];
     };
 
     passthru = {
@@ -31,4 +31,4 @@ let
     };
 
 };
-in stdenv.lib.fix pkg
+in lib.fix pkg
diff --git a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix
index 1ec9f244d6c1..1b0e27891d83 100644
--- a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix
+++ b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix
@@ -15,7 +15,7 @@
 , enableDebugInfo ? false
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   shell = drv: stdenv.mkDerivation {
@@ -46,25 +46,25 @@ let
     configurePhase = ''
       runHook preConfigure
       ${if checkouts != null then
-          ''cp --no-preserve=all -R ${checkouts}/_checkouts .''
+          "cp --no-preserve=all -R ${checkouts}/_checkouts ."
         else
-          ''''}
+          ""}
       runHook postConfigure
     '';
 
     buildPhase = ''
       runHook preBuild
       HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript"
-                                            then '' escriptize''
-                                            else '' release''}
+                                            then "escriptize"
+                                            else "release"}
       runHook postBuild
     '';
 
     installPhase = ''
       runHook preInstall
       dir=${if releaseType == "escript"
-            then ''bin''
-            else ''rel''}
+            then "bin"
+            else "rel"}
       mkdir -p "$out/$dir"
       cp -R --preserve=mode "_build/${profile}/$dir" "$out"
       runHook postInstall
diff --git a/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix b/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix
index 8f06f8ed7a85..1255ec59c3a2 100644
--- a/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, writeText, erlang }:
+{ lib, stdenv, fetchFromGitHub, writeText, erlang }:
 
 let
   shell = drv: stdenv.mkDerivation {
@@ -27,9 +27,9 @@ let
 
     meta = {
       description = "WebDriver implementation in Erlang";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
       homepage = "https://github.com/Quviq/webdrv";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+      maintainers = with lib.maintainers; [ ericbmerritt ];
     };
 
     passthru = {
@@ -37,4 +37,4 @@ let
     };
 
 };
-in stdenv.lib.fix pkg
+in lib.fix pkg
diff --git a/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix
index d3f4e3fbe636..d66f6133fb7d 100644
--- a/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, chez }:
+{ stdenv, lib, fetchFromGitHub, chez }:
 
 stdenv.mkDerivation rec {
   pname = "chez-matchable";
@@ -23,11 +23,11 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "This is a Library for ChezScheme providing the protable hygenic pattern matcher by Alex Shinn";
     homepage = "https://github.com/fedeinthemix/chez-matchable/";
-    maintainers = [ stdenv.lib.maintainers.jitwit ];
-    license = stdenv.lib.licenses.publicDomain;
+    maintainers = [ maintainers.jitwit ];
+    license = licenses.publicDomain;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix
index 63d6ef2c676f..b3a2a44d2780 100644
--- a/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, chez, chez-srfi }:
+{ stdenv, lib, fetchgit, chez, chez-srfi }:
 
 stdenv.mkDerivation {
   pname = "chez-mit";
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme";
     homepage = "https://github.com/fedeinthemix/chez-mit/";
-    maintainers = [ stdenv.lib.maintainers.jitwit ];
-    license = stdenv.lib.licenses.free;
+    maintainers = [ maintainers.jitwit ];
+    license = licenses.free;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix
index 19fe43da49eb..39c1f73003e9 100644
--- a/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, chez, chez-srfi, chez-mit }:
+{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }:
 
 stdenv.mkDerivation {
   pname = "chez-scmutils";
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme";
     homepage = "https://github.com/fedeinthemix/chez-scmutils/";
-    maintainers = [ stdenv.lib.maintainers.jitwit ];
-    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ maintainers.jitwit ];
+    license = licenses.gpl3;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix
index f055a14884a2..1d8579ae106e 100644
--- a/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, chez }:
+{ stdenv, lib, fetchgit, chez }:
 
 stdenv.mkDerivation {
   pname = "chez-srfi";
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "This package provides a collection of SRFI libraries for Chez Scheme";
     homepage = "https://github.com/fedeinthemix/chez-srfi/";
-    maintainers = [ stdenv.lib.maintainers.jitwit ];
-    license = stdenv.lib.licenses.free;
+    maintainers = [ maintainers.jitwit ];
+    license = licenses.free;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/compilers/4th/default.nix b/nixpkgs/pkgs/development/compilers/4th/default.nix
index ee3050b8ba69..7205a979e279 100644
--- a/nixpkgs/pkgs/development/compilers/4th/default.nix
+++ b/nixpkgs/pkgs/development/compilers/4th/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "4th";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "MANDIR=${placeholder "out"}/share/man"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A portable Forth compiler";
     homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/compilers/abcl/default.nix b/nixpkgs/pkgs/development/compilers/abcl/default.nix
index 22f6ca7a0dd2..fff88eddd19e 100644
--- a/nixpkgs/pkgs/development/compilers/abcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/abcl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ant, jre, jdk}:
+{lib, stdenv, fetchurl, ant, jre, jdk}:
 stdenv.mkDerivation rec {
   pname = "abcl";
   version = "1.8.0";
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
   buildInputs = [jre ant jdk jre];
   meta = {
     inherit version;
-    description = ''A JVM-based Common Lisp implementation'';
-    license = stdenv.lib.licenses.gpl3 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "A JVM-based Common Lisp implementation";
+    license = lib.licenses.gpl3 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "https://common-lisp.net/project/armedbear/";
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/acme/default.nix b/nixpkgs/pkgs/development/compilers/acme/default.nix
index 89c5620f5fce..f8731f554718 100644
--- a/nixpkgs/pkgs/development/compilers/acme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/acme/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchsvn }:
+{ lib, stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
   pname = "acme";
-  version = "120";
+  version = "unstable-2020-12-27";
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk";
-    rev = version;
-    sha256 = "0w17b8f8bis22m6l5bg8qg8nniy20f8yg2xmzjipblmc39vpv6s2";
+    rev = "314";
+    sha256 = "08zg26rh19nlif7id91nv0syx5n243ssxhfw0nk2r2bhjm5jrjz1";
   };
 
   sourceRoot = "code-0-r${src.rev}/src";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       --replace "= gcc" "?= gcc"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-platform cross assembler for 6502/6510/65816 CPUs";
     homepage = "https://sourceforge.net/projects/acme-crossass/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 5e402b2d728b..31a7346108e7 100644
--- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -1,7 +1,7 @@
 sourcePerArch:
 
 { swingSupport ? true # not used for now
-, stdenv
+, lib, stdenv
 , fetchurl
 }:
 
@@ -43,11 +43,11 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
 
   passthru.home = result;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
     platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
-    maintainers = with stdenv.lib.maintainers; [ taku0 ];
+    maintainers = with lib.maintainers; [ taku0 ];
   };
 
 }; in result
diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 00945e325351..0fcad6c333f8 100644
--- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -69,7 +69,7 @@ let result = stdenv.mkDerivation rec {
 
   passthru.home = result;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
     platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index b62b9c95ef6a..e20983380a43 100644
--- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:
+{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }:
 
 stdenv.mkDerivation rec {
   pname = "adoptopenjdk-icedtea-web";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig bc ];
+  nativeBuildInputs = [ autoreconfHook pkg-config bc ];
   buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ];
 
   preConfigure = ''
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
       based on the NetX project.
     '';
     homepage = "https://github.com/adoptopenjdk/icedtea-web";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/aldor/default.nix b/nixpkgs/pkgs/development/compilers/aldor/default.nix
index 09ccf9510bbd..2654cc467fe2 100644
--- a/nixpkgs/pkgs/development/compilers/aldor/default.nix
+++ b/nixpkgs/pkgs/development/compilers/aldor/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper
+{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper
 , autoconf, automake, libtool, jdk, perl }:
 
 stdenv.mkDerivation {
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     broken = true;
     homepage = "http://www.aldor.org/";
     description = "Programming language with an expressive type system";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
 
     longDescription = ''
       Aldor is a programming language with an expressive type system well-suited
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
       and powerful properties of functional, object-oriented and aspect-oriented styles.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/aliceml/default.nix b/nixpkgs/pkgs/development/compilers/aliceml/default.nix
index d3208b12dd68..8f560ef61981 100644
--- a/nixpkgs/pkgs/development/compilers/aliceml/default.nix
+++ b/nixpkgs/pkgs/development/compilers/aliceml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
+{lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
 
 stdenv.mkDerivation {
   name = "aliceml-1.4-7d44dc8e";
@@ -50,8 +50,8 @@ stdenv.mkDerivation {
       programming.
     '';
     homepage = "https://www.ps.uni-saarland.de/alice/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.doublec ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.doublec ];
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix b/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix
index ed6b2b2ff247..800b1ea55e38 100644
--- a/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 let
   playerglobal_ver = "27.0";
@@ -38,16 +38,16 @@ in stdenv.mkDerivation rec {
     for i in $out/bin/!(aasdoc|acompc|amxmlc); do
       wrapProgram $i \
         --set FLEX_HOME $t \
-        --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ 
+        --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/
     done
 
     mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/
     cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
   '';
-  
+
   fixupPhase = ":";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flex SDK for Adobe Flash / ActionScript";
     homepage = "https://flex.apache.org/";
     license = with licenses; [ asl20 ];
diff --git a/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
index 613f3fa186aa..030da03add84 100644
--- a/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, icestorm }:
+{ lib, stdenv, fetchFromGitHub, icestorm }:
 
 with builtins;
 
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
       the IceStorm [2] icepack command.
     '';
     homepage = "https://github.com/cseed/arachne-pnr";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ shell thoughtpolice ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/asn1c/default.nix b/nixpkgs/pkgs/development/compilers/asn1c/default.nix
index 230ed36fff51..a4e822eec6da 100644
--- a/nixpkgs/pkgs/development/compilers/asn1c/default.nix
+++ b/nixpkgs/pkgs/development/compilers/asn1c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "asn1c";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://lionet.info/asn1c/compiler.html";
     description = "Open Source ASN.1 Compiler";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/aspectj/default.nix b/nixpkgs/pkgs/development/compilers/aspectj/default.nix
index 8fd47e937c80..24ff50f558cd 100644
--- a/nixpkgs/pkgs/development/compilers/aspectj/default.nix
+++ b/nixpkgs/pkgs/development/compilers/aspectj/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre}:
+{lib, stdenv, fetchurl, jre}:
 
 stdenv.mkDerivation rec {
   pname = "aspectj";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.eclipse.org/aspectj/";
     description = "A seamless aspect-oriented extension to the Java programming language";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.epl10;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.epl10;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ats/default.nix b/nixpkgs/pkgs/development/compilers/ats/default.nix
index f086c36468d7..35e1b1dd1058 100644
--- a/nixpkgs/pkgs/development/compilers/ats/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ats/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   pname = "ats";
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Functional programming language with dependent types";
     homepage    = "http://www.ats-lang.org";
-    license     = stdenv.lib.licenses.gpl3Plus;
+    license     = lib.licenses.gpl3Plus;
     # TODO: it looks like ATS requires gcc specifically. Someone with more knowledge
     # will need to experiment.
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ats2/default.nix b/nixpkgs/pkgs/development/compilers/ats2/default.nix
index bbfbcdbbeb0e..c75600b5341a 100644
--- a/nixpkgs/pkgs/development/compilers/ats2/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ats2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp
+{ lib, stdenv, fetchurl, gmp
 , withEmacsSupport ? true
 , withContrib ? true }:
 
@@ -10,14 +10,14 @@ let
     sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d";
   };
 
-  postInstallContrib = stdenv.lib.optionalString withContrib
+  postInstallContrib = lib.optionalString withContrib
   ''
     local contribDir=$out/lib/ats2-postiats-*/ ;
     mkdir -p $contribDir ;
     tar -xzf "${contrib}" --strip-components 1 -C $contribDir ;
   '';
 
-  postInstallEmacs = stdenv.lib.optionalString withEmacsSupport
+  postInstallEmacs = lib.optionalString withEmacsSupport
   ''
     local siteLispDir=$out/share/emacs/site-lisp/ats2 ;
     mkdir -p $siteLispDir ;
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
-  setupHook = with stdenv.lib;
+  setupHook = with lib;
     let
       hookFiles =
         [ ./setup-hook.sh ]
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   postInstall = postInstallContrib + postInstallEmacs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Functional programming language with dependent types";
     homepage    = "http://www.ats-lang.org";
     license     = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/compilers/avian/default.nix b/nixpkgs/pkgs/development/compilers/avian/default.nix
index 7c5db45f31b4..d39aa2806a45 100644
--- a/nixpkgs/pkgs/development/compilers/avian/default.nix
+++ b/nixpkgs/pkgs/development/compilers/avian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
+{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
 
 stdenv.mkDerivation rec {
   pname = "avian";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ zlib jdk ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
       building self-contained applications.
     '';
     homepage = "https://readytalk.github.io/avian/";
-    license = stdenv.lib.licenses.isc;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.earldouglas ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.earldouglas ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/avra/default.nix b/nixpkgs/pkgs/development/compilers/avra/default.nix
index 56bf3e657bec..9d360780053c 100644
--- a/nixpkgs/pkgs/development/compilers/avra/default.nix
+++ b/nixpkgs/pkgs/development/compilers/avra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake }:
+{ lib, stdenv, fetchurl, autoconf, automake }:
 stdenv.mkDerivation rec {
   name = "avra-1.3.0";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     automake -a
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assembler for the Atmel AVR microcontroller family";
     homepage = "http://avra.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/compilers/bigloo/default.nix b/nixpkgs/pkgs/development/compilers/bigloo/default.nix
index a3bac2b1722c..a4f4287523f4 100644
--- a/nixpkgs/pkgs/development/compilers/bigloo/default.nix
+++ b/nixpkgs/pkgs/development/compilers/bigloo/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autoconf, automake, libtool, gmp
+{ fetchurl, lib, stdenv, autoconf, automake, libtool, gmp
 , darwin
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoconf automake libtool ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin
+  buildInputs = lib.optional stdenv.isDarwin
     darwin.apple_sdk.frameworks.ApplicationServices
   ;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     # For libuv on darwin
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export LIBTOOLIZE=libtoolize
     '' +
     # Help libgc's configure.
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
     # Fix absolute paths.
     sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g'			\
         -e 's=/tmp=$TMPDIR=g' -i autoconf/*		\
-	[Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
-	*/*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
-	comptime/Cc/cc.scm gc/install-*
+        [Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
+        */*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
+        comptime/Cc/cc.scm gc/install-*
 
     # Make sure we don't change string lengths in the generated
     # C files.
     sed -e 's=/bin/rm=     rm=g' -e 's=/bin/mv=     mv=g'	\
-	-i comptime/Cc/cc.c
+        -i comptime/Cc/cc.c
   '';
 
   checkTarget = "test";
@@ -50,9 +50,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Efficient Scheme compiler";
     homepage    = "http://www-sop.inria.fr/indes/fp/Bigloo/";
-    license     = stdenv.lib.licenses.gpl2Plus;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    license     = lib.licenses.gpl2Plus;
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ thoughtpolice ];
 
     longDescription = ''
       Bigloo is a Scheme implementation devoted to one goal: enabling
diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
index 6de4e0fb3047..d2d866a2804b 100644
--- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix
+++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
+{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
 
 stdenv.mkDerivation rec {
   pname = "binaryen";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/WebAssembly/binaryen";
     description = "Compiler infrastructure and toolchain library for WebAssembly, in C++";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/nixpkgs/pkgs/development/compilers/bluespec/default.nix
index df7b6585205a..defe78d7c318 100644
--- a/nixpkgs/pkgs/development/compilers/bluespec/default.nix
+++ b/nixpkgs/pkgs/development/compilers/bluespec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoconf
@@ -11,7 +11,7 @@
 , perl
 , flex
 , bison
-, pkgconfig
+, pkg-config
 , itktcl
 , incrtcl
 , tcl
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
     perl
     flex
     bison
-    pkgconfig
+    pkg-config
     ghcWithPackages
   ];
 
@@ -97,10 +97,10 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Toolchain for the Bluespec Hardware Definition Language";
     homepage    = "https://github.com/B-Lang-org/bsc";
-    license     = stdenv.lib.licenses.bsd3;
+    license     = lib.licenses.bsd3;
     platforms = [ "x86_64-linux" ];
     # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562
     # aarch64 fails, as GHC fails with "ghc: could not execute: opt"
-    maintainers = with stdenv.lib.maintainers; [ jcumming thoughtpolice ];
+    maintainers = with lib.maintainers; [ jcumming thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index 18c61d0d923c..c73bb72b9d0f 100644
--- a/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -1,12 +1,12 @@
 # This file is based on https://github.com/turboMaCk/bs-platform.nix/blob/master/build-bs-platform.nix
 # to make potential future updates simpler
 
-{ stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3,
+{ lib, stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3,
   ocaml-version, version, src,
   patches ? [],
   ocaml ? (import ./ocaml.nix {
     version = ocaml-version;
-    inherit stdenv;
+    inherit lib stdenv;
     src = "${src}/ocaml";
   }),
   custom-ninja ? (ninja.overrideAttrs (attrs: {
diff --git a/nixpkgs/pkgs/development/compilers/bs-platform/default.nix b/nixpkgs/pkgs/development/compilers/bs-platform/default.nix
index 6eb7d50bfc8c..50274c9eca67 100644
--- a/nixpkgs/pkgs/development/compilers/bs-platform/default.nix
+++ b/nixpkgs/pkgs/development/compilers/bs-platform/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }:
+{ lib, stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }:
 let
   build-bs-platform = import ./build-bs-platform.nix;
 in
 (build-bs-platform rec {
-  inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
+  inherit lib stdenv runCommand fetchFromGitHub ninja nodejs python3;
   version = "8.2.0";
   ocaml-version = "4.06.1";
 
@@ -17,7 +17,7 @@ in
     fetchSubmodules = true;
   };
 }).overrideAttrs (attrs: {
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code";
     homepage = "https://bucklescript.github.io";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix b/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
index 9aa34d02b362..d650d767a8d8 100644
--- a/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
+++ b/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
@@ -1,4 +1,4 @@
-{ stdenv, src, version }:
+{ lib, stdenv, src, version }:
 stdenv.mkDerivation rec {
   inherit src version;
   name = "ocaml-${version}+bs";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     make -j9 world.opt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "4.06";
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/development/compilers/bupc/default.nix b/nixpkgs/pkgs/development/compilers/bupc/default.nix
index ecdfe8d461a2..9b3a291a1a08 100644
--- a/nixpkgs/pkgs/development/compilers/bupc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/bupc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, coreutils }:
+{ lib, stdenv, fetchurl, perl, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "berkeley_upc-2.22.0";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ coreutils ];
   buildInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A compiler for the Berkely Unified Parallel C language";
     longDescription = ''
       Unified Parallel C (UPC) is an extension of the C programming language
diff --git a/nixpkgs/pkgs/development/compilers/cakelisp/default.nix b/nixpkgs/pkgs/development/compilers/cakelisp/default.nix
new file mode 100644
index 000000000000..15afb9fc25ec
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/cakelisp/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, fetchFromGitHub, gcc }:
+
+stdenv.mkDerivation rec {
+  pname = "cakelisp";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "makuto";
+    repo = "cakelisp";
+    rev = "v${version}";
+    sha256 = "126va59jy7rvy6c2wrf8j44m307f2d8jixqkc49s9wllxprj1dmg";
+  };
+
+  buildInputs = [ gcc ];
+
+  postPatch = ''
+    substituteInPlace runtime/HotReloading.cake \
+        --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
+    substituteInPlace src/ModuleManager.cpp \
+        --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic'
+    substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic'
+    substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic'
+  '';
+
+  buildPhase = ''
+    ./Build.sh
+  '';
+
+  installPhase = ''
+    install -Dm755 bin/cakelisp -t $out/bin
+  '';
+
+  meta = with lib; {
+    description = "A performance-oriented Lisp-like language";
+    homepage = "https://github.com/makuto/cakelisp";
+    license = licenses.gpl3Plus;
+    platforms = platforms.darwin ++ platforms.linux;
+    maintainers = [ maintainers.sbond75 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/compilers/carp/default.nix b/nixpkgs/pkgs/development/compilers/carp/default.nix
index f6c27436c767..0299c1797755 100644
--- a/nixpkgs/pkgs/development/compilers/carp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/carp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
 
 haskellPackages.mkDerivation rec {
 
@@ -39,10 +39,10 @@ haskellPackages.mkDerivation rec {
 
   description = "A statically typed lisp, without a GC, for real-time applications";
   homepage    = "https://github.com/carp-lang/Carp";
-  license     = stdenv.lib.licenses.asl20;
-  maintainers = with stdenv.lib.maintainers; [ jluttine ];
+  license     = lib.licenses.asl20;
+  maintainers = with lib.maintainers; [ jluttine ];
 
   # Windows not (yet) supported.
-  platforms   = with stdenv.lib.platforms; unix ++ darwin;
+  platforms   = with lib.platforms; unix ++ darwin;
 
 }
diff --git a/nixpkgs/pkgs/development/compilers/cc65/default.nix b/nixpkgs/pkgs/development/compilers/cc65/default.nix
index 1b5011365cf2..347382990d16 100644
--- a/nixpkgs/pkgs/development/compilers/cc65/default.nix
+++ b/nixpkgs/pkgs/development/compilers/cc65/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cc65.github.io/";
     description = "C compiler for processors of 6502 family";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/compilers/ccl/default.nix b/nixpkgs/pkgs/development/compilers/ccl/default.nix
index 8f292e358ae7..79e7d324ec94 100644
--- a/nixpkgs/pkgs/development/compilers/ccl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
+{ lib, stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
 
 let
   options = rec {
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Clozure Common Lisp";
     homepage    = "https://ccl.clozure.com/";
     maintainers = with maintainers; [ raskin muflax tohl ];
diff --git a/nixpkgs/pkgs/development/compilers/chez/default.nix b/nixpkgs/pkgs/development/compilers/chez/default.nix
index 550f754639e6..c1c8eced83ba 100644
--- a/nixpkgs/pkgs/development/compilers/chez/default.nix
+++ b/nixpkgs/pkgs/development/compilers/chez/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , coreutils, cctools
 , ncurses, libiconv, libX11, libuuid
 }:
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
+  nativeBuildInputs = [ coreutils ] ++ lib.optional stdenv.isDarwin cctools;
   buildInputs = [ ncurses libiconv libX11 libuuid ];
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
 
   /*
   ** We patch out a very annoying 'feature' in ./configure, which
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
   meta = {
     description  = "A powerful and incredibly fast R6RS Scheme compiler";
     homepage     = "https://cisco.github.io/ChezScheme/";
-    license      = stdenv.lib.licenses.asl20;
-    maintainers  = with stdenv.lib.maintainers; [ thoughtpolice ];
-    platforms    = stdenv.lib.platforms.unix;
+    license      = lib.licenses.asl20;
+    maintainers  = with lib.maintainers; [ thoughtpolice ];
+    platforms    = lib.platforms.unix;
     badPlatforms = [ "aarch64-linux" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix
index 50126fdac92c..8ea522a81a92 100644
--- a/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
+{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
 
 let
   version = "4.13.0";
@@ -8,7 +8,6 @@ let
     else if (isFreeBSD || isOpenBSD) then "bsd"
     else if isSunOS then "solaris"
     else "linux"; # Should be a sane default
-  lib = stdenv.lib;
 in
 stdenv.mkDerivation {
   pname = "chicken";
@@ -70,9 +69,9 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.call-cc.org/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ corngood ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.
diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix b/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
index 977f34692f90..2775666f14c3 100644
--- a/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -20,8 +20,8 @@ eggDerivation {
   meta = {
     description = "Generate nix-expression from CHICKEN scheme eggs";
     homepage = "https://github.com/the-kenny/egg2nix";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ corngood ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix b/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
index cd340c221743..4c84ef8c42b0 100644
--- a/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, chicken, makeWrapper }:
+{ lib, stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
@@ -8,7 +8,7 @@
 let
   libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
   overrides = import ./overrides.nix;
-  baseName = stdenv.lib.getName name;
+  baseName = lib.getName name;
   override = if builtins.hasAttr baseName overrides
    then
      builtins.getAttr baseName overrides
@@ -20,7 +20,7 @@ stdenv.mkDerivation ({
   propagatedBuildInputs = buildInputs;
   buildInputs = [ makeWrapper chicken ];
 
-  CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions;
+  CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
 
   CHICKEN_REPOSITORY = libPath;
   CHICKEN_INSTALL_PREFIX = "$out";
@@ -28,7 +28,7 @@ stdenv.mkDerivation ({
   installPhase = ''
     runHook preInstall
 
-    chicken-install -p $out ${stdenv.lib.concatStringsSep " " chickenInstallFlags}
+    chicken-install -p $out ${lib.concatStringsSep " " chickenInstallFlags}
 
     for f in $out/bin/*
     do
diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix
index 712012643f33..9f2554b73436 100644
--- a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
+{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
 
 let
   version = "5.2.0";
@@ -8,7 +8,6 @@ let
     else if (isFreeBSD || isOpenBSD) then "bsd"
     else if isSunOS then "solaris"
     else "linux"; # Should be a sane default
-  lib = stdenv.lib;
 in
 stdenv.mkDerivation {
   pname = "chicken";
@@ -51,9 +50,9 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.call-cc.org/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ corngood ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.
diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix b/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix
index 0c18b8db2ded..69e8d9e62c35 100644
--- a/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix
@@ -1,4 +1,4 @@
-{ stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
+{ lib, stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
 
 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
@@ -22,8 +22,8 @@ eggDerivation {
   meta = {
     description = "Generate nix-expression from CHICKEN scheme eggs";
     homepage = "https://github.com/the-kenny/egg2nix";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ corngood ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix b/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
index f5ed4b4b7f8b..7102126206ae 100644
--- a/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, chicken, makeWrapper }:
+{ lib, stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
@@ -7,7 +7,7 @@
 
 let
   overrides = import ./overrides.nix;
-  baseName = stdenv.lib.getName name;
+  baseName = lib.getName name;
   override = if builtins.hasAttr baseName overrides
    then
      builtins.getAttr baseName overrides
@@ -19,14 +19,14 @@ stdenv.mkDerivation ({
   propagatedBuildInputs = buildInputs;
   buildInputs = [ makeWrapper chicken ];
 
-  CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions;
+  CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
 
   installPhase = ''
     runHook preInstall
 
     export CHICKEN_INSTALL_PREFIX=$out
     export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion}
-    chicken-install ${stdenv.lib.concatStringsSep " " chickenInstallFlags}
+    chicken-install ${lib.concatStringsSep " " chickenInstallFlags}
 
     for f in $out/bin/*
     do
diff --git a/nixpkgs/pkgs/development/compilers/ciao/default.nix b/nixpkgs/pkgs/development/compilers/ciao/default.nix
index be39d81f5581..de8e73374c5e 100644
--- a/nixpkgs/pkgs/development/compilers/ciao/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ciao/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "ciao";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ./ciao-boot.sh install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ciao-lang.org/";
     description = "A general purpose, multi-paradigm programming language in the Prolog family";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/compilers/clasp/default.nix b/nixpkgs/pkgs/development/compilers/clasp/default.nix
index 664d84921135..31a669c313e0 100644
--- a/nixpkgs/pkgs/development/compilers/clasp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/clasp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchFromGitLab
+{ lib, stdenv, fetchFromGitHub, fetchFromGitLab
 , llvmPackages
 , cmake, boehmgc, gmp, zlib, ncurses, boost, libelf
 , python, git, sbcl
@@ -72,14 +72,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = with llvmPackages;
   (
-   builtins.map (x: stdenv.lib.overrideDerivation x
+   builtins.map (x: lib.overrideDerivation x
            (x: {NIX_CFLAGS_COMPILE= (x.NIX_CFLAGS_COMPILE or "") + " -frtti"; }))
    [ llvm clang clang-unwrapped clang ]) ++
   [
     gmp zlib ncurses
     boost boehmgc libelf
     (boost.override {enableStatic = true; enableShared = false;})
-    (stdenv.lib.overrideDerivation boehmgc
+    (lib.overrideDerivation boehmgc
       (x: {configureFlags = (x.configureFlags or []) ++ ["--enable-static"];}))
   ];
 
@@ -119,10 +119,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A Common Lisp implementation based on LLVM with C++ integration'';
-    license = stdenv.lib.licenses.lgpl21Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "A Common Lisp implementation based on LLVM with C++ integration";
+    license = lib.licenses.lgpl21Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     # Large, long to build, a private build of clang is needed, a prerelease.
     hydraPlatforms = [];
     homepage = "https://github.com/drmeister/clasp";
diff --git a/nixpkgs/pkgs/development/compilers/clean/default.nix b/nixpkgs/pkgs/development/compilers/clean/default.nix
index 0dfd05030b98..f8121958e292 100644
--- a/nixpkgs/pkgs/development/compilers/clean/default.nix
+++ b/nixpkgs/pkgs/development/compilers/clean/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "clean-3.0";
@@ -45,8 +45,8 @@ stdenv.mkDerivation {
     '';
 
     homepage = "http://wiki.clean.cs.ru.nl/Clean";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.kkallio ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/closure/default.nix b/nixpkgs/pkgs/development/compilers/closure/default.nix
index 7c0d42f1864e..b5ac2e187d8c 100644
--- a/nixpkgs/pkgs/development/compilers/closure/default.nix
+++ b/nixpkgs/pkgs/development/compilers/closure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "closure-compiler";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for making JavaScript download and run faster";
     homepage = "https://developers.google.com/closure/compiler/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
index 87d3f0ef00ce..df674b67db85 100644
--- a/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
+++ b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, runtimeShell }:
+{ lib, stdenv, fetchurl, python, runtimeShell }:
 
 stdenv.mkDerivation {
   name = "cmdstan-2.17.1";
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       likelihood estimation with Optimization (L-BFGS).
     '';
     homepage = "https://mc-stan.org/interfaces/cmdstan.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/cmucl/binary.nix b/nixpkgs/pkgs/development/compilers/cmucl/binary.nix
index 480a7e522b53..b09f5f41b67a 100644
--- a/nixpkgs/pkgs/development/compilers/cmucl/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/cmucl/binary.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 let
   inherit (stdenv.hostPlatform) system;
@@ -36,9 +36,9 @@ stdenv.mkDerivation {
       which runs on most major Unix platforms.  It mainly conforms to the
       ANSI Common Lisp standard.
     '';
-    license = stdenv.lib.licenses.free;		# public domain
+    license = lib.licenses.free;		# public domain
     homepage = "http://www.cons.org/cmucl/";
-    maintainers = [stdenv.lib.maintainers.tohl];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [lib.maintainers.tohl];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/colm/default.nix b/nixpkgs/pkgs/development/compilers/colm/default.nix
index 06a56dc42eaf..d7a0953a8035 100644
--- a/nixpkgs/pkgs/development/compilers/colm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/colm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
+{ lib, stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "colm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" ${gcc}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A programming language for the analysis and transformation of computer languages";
     homepage = "http://www.colm.net/open-source/colm";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/compilers/compcert/default.nix b/nixpkgs/pkgs/development/compilers/compcert/default.nix
index 99bd09d8d9e5..611efb11f445 100644
--- a/nixpkgs/pkgs/development/compilers/compcert/default.nix
+++ b/nixpkgs/pkgs/development/compilers/compcert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper
+{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper
 , coqPackages, ocamlPackages, coq2html
 , tools ? stdenv.cc
 , version ? "3.8"
@@ -8,7 +8,7 @@ let
   ocaml-pkgs      = with ocamlPackages; [ ocaml findlib menhir ];
   ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";
   inherit (coqPackages) coq flocq;
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 in
 
 let param = {
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "doc" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Formally verified C compiler";
     homepage    = "https://compcert.org";
     license     = licenses.inria-compcert;
diff --git a/nixpkgs/pkgs/development/compilers/computecpp/default.nix b/nixpkgs/pkgs/development/compilers/computecpp/default.nix
index 7cfc60f050e4..0f9e877201b4 100644
--- a/nixpkgs/pkgs/development/compilers/computecpp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/computecpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 , pkg-config
 , autoPatchelfHook
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "computecpp";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchzip {
     url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
-    hash = "sha256-niXNWbkXjd35col6dS66HdxFurXfJw/Xb2c5njukxcg=";
+    hash = "sha256-AUHSls4BOX20PVKzDAp3RqpeRDwgbgYzz6CRvRN+kdk=";
     stripRoot = true;
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     isClang = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards";
     homepage = "https://www.codeplay.com/products/computesuite/computecpp";
diff --git a/nixpkgs/pkgs/development/compilers/copper/default.nix b/nixpkgs/pkgs/development/compilers/copper/default.nix
index 67bc786e669c..dd6af73547af 100644
--- a/nixpkgs/pkgs/development/compilers/copper/default.nix
+++ b/nixpkgs/pkgs/development/compilers/copper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , libffi
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make BACKEND=elf64 install prefix=$out
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple imperative language, statically typed with type inference and genericity";
     homepage = "https://tibleiz.net/copper/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/coreclr/default.nix b/nixpkgs/pkgs/development/compilers/coreclr/default.nix
index 2a44279209c1..f38a38059624 100644
--- a/nixpkgs/pkgs/development/compilers/coreclr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/coreclr/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv
+{ config, lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , which
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dotnet/core/";
     description = ".NET is a general purpose development platform";
     platforms = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/development/compilers/crystal/build-package.nix b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix
index bcac4eeb9c46..67c8128f6b5d 100644
--- a/nixpkgs/pkgs/development/compilers/crystal/build-package.nix
+++ b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }:
+{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }:
 
 {
   # Some projects do not include a lock file, so you can pass one
@@ -61,12 +61,12 @@ stdenv.mkDerivation (mkDerivationArgs // {
   buildInputs = args.buildInputs or [ ] ++ [ crystal ]
     ++ lib.optional (format != "crystal") shards;
 
-  nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ];
+  nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ];
 
   buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([
     "runHook preBuild"
   ] ++ lib.optional (format == "make")
-    ''make ''${buildTargets:-build} $makeFlags''
+    "make \${buildTargets:-build} $makeFlags"
   ++ lib.optionals (format == "crystal") (lib.mapAttrsToList
     (bin: attrs: ''
       crystal ${lib.escapeShellArgs ([
@@ -84,14 +84,14 @@ stdenv.mkDerivation (mkDerivationArgs // {
   installPhase = args.installPhase or (lib.concatStringsSep "\n" ([
     "runHook preInstall"
   ] ++ lib.optional (format == "make")
-    ''make ''${installTargets:-install} $installFlags''
+    "make \${installTargets:-install} $installFlags"
   ++ lib.optionals (format == "crystal") (map
     (bin: ''
       install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]}
     '')
     (lib.attrNames crystalBinaries))
   ++ lib.optional (format == "shards")
-    ''install -Dm555 bin/* -t $out/bin''
+    "install -Dm555 bin/* -t $out/bin"
   ++ [
     ''
       for f in README* *.md LICENSE; do
@@ -111,9 +111,9 @@ stdenv.mkDerivation (mkDerivationArgs // {
   checkPhase = args.checkPhase or (lib.concatStringsSep "\n" ([
     "runHook preCheck"
   ] ++ lib.optional (format == "make")
-    ''make ''${checkTarget:-test} $checkFlags''
+    "make \${checkTarget:-test} $checkFlags"
   ++ lib.optional (format != "make")
-    ''crystal ''${checkTarget:-spec} $checkFlags''
+    "crystal \${checkTarget:-spec} $checkFlags"
   ++ [ "runHook postCheck" ]));
 
   doInstallCheck = args.doInstallCheck or true;
diff --git a/nixpkgs/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix
index fa8198fabad9..489e9d28cbcd 100644
--- a/nixpkgs/pkgs/development/compilers/crystal/default.nix
+++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix
@@ -18,7 +18,7 @@
 , makeWrapper
 , openssl
 , pcre
-, pkgconfig
+, pkg-config
 , readline
 , tzdata
 , which
@@ -63,7 +63,7 @@ let
   commonBuildInputs = extraBuildInputs: [
     boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl
   ] ++ extraBuildInputs
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   generic = (
     { version
@@ -134,7 +134,7 @@ let
 
         buildInputs = commonBuildInputs extraBuildInputs;
 
-        nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ];
+        nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ];
 
         makeFlags = [
           "CRYSTAL_CONFIG_VERSION=${version}"
@@ -158,7 +158,7 @@ let
 
           install -Dm755 .build/crystal $bin/bin/crystal
           wrapProgram $bin/bin/crystal \
-            --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \
+            --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \
             --suffix CRYSTAL_PATH : lib:$lib/crystal \
             --suffix CRYSTAL_LIBRARY_PATH : ${
               lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix
index 92a684a6fbf8..c18eb9d534a2 100644
--- a/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix
+++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     gtk2 glib fontconfig freetype unixODBC alsaLib
   ];
 
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
+  rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
 
   unpackPhase = ''
     sh $src --keep --noexec
@@ -232,7 +232,7 @@ stdenv.mkDerivation rec {
     majorVersion = lib.versions.majorMinor version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A compiler for NVIDIA GPUs, math libraries, and tools";
     homepage = "https://developer.nvidia.com/cuda-toolkit";
     platforms = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/development/compilers/dale/default.nix b/nixpkgs/pkgs/development/compilers/dale/default.nix
index cbe4e7ec9260..addd7997d366 100644
--- a/nixpkgs/pkgs/development/compilers/dale/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dale/default.nix
@@ -1,18 +1,16 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
-, pkgconfig
+, pkg-config
 , libffi
 , llvm_6
 , doCheck ? false
 , perl
 }:
 
-let version = "20181024";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   pname = "dale";
-  inherit version;
+  version = "20181024";
 
   src = fetchFromGitHub {
     owner = "tomhrr";
@@ -21,17 +19,15 @@ in stdenv.mkDerivation {
     sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake libffi llvm_6 ]
-             ++ stdenv.lib.optional doCheck perl;
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ libffi llvm_6 ];
 
   inherit doCheck;
+  checkInputs = [ perl ];
 
   checkTarget = "tests";
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lisp-flavoured C";
     longDescription = ''
       Dale is a system (no GC) programming language that uses
diff --git a/nixpkgs/pkgs/development/compilers/dasm/default.nix b/nixpkgs/pkgs/development/compilers/dasm/default.nix
index 627ac36329a0..7f57f47f2ed6 100644
--- a/nixpkgs/pkgs/development/compilers/dasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "dasm";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assembler for 6502 and other 8-bit microprocessors";
     homepage = "https://dasm-assembler.github.io";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/compilers/dev86/default.nix b/nixpkgs/pkgs/development/compilers/dev86/default.nix
index 88b46561241a..cea9ea37b4e5 100644
--- a/nixpkgs/pkgs/development/compilers/dev86/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dev86/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "dev86";
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Linux 8086 development environment";
     homepage = "http://v3.sk/~lkundrak/dev86/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/dmd/default.nix b/nixpkgs/pkgs/development/compilers/dmd/default.nix
index 4bfd6298c8f7..074646f5f416 100644
--- a/nixpkgs/pkgs/development/compilers/dmd/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix
@@ -16,7 +16,7 @@ let
       name = "dmd.conf";
       text = (lib.generators.toINI {} {
         Environment = {
-          DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
+          DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
         };
       });
   };
@@ -77,16 +77,16 @@ stdenv.mkDerivation rec {
   postPatch = ''
       substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
       substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
   '';
 
   nativeBuildInputs = [ makeWrapper unzip which gdb git ]
 
-  ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+  ++ lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
     Foundation
   ]);
 
@@ -163,7 +163,7 @@ stdenv.mkDerivation rec {
       substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official reference compiler for the D language";
     homepage = "http://dlang.org/";
     # Everything is now Boost licensed, even the backend.
diff --git a/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix
index 1162a75d0de2..56880826a19c 100644
--- a/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix
@@ -4,7 +4,7 @@
 }:
 
 assert builtins.elem type [ "aspnetcore" "netcore" "sdk"];
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , libunwind
 , openssl
@@ -41,7 +41,7 @@ let
 in stdenv.mkDerivation rec {
   inherit pname version;
 
-  rpath = stdenv.lib.makeLibraryPath [
+  rpath = lib.makeLibraryPath [
     curl
     icu
     libunwind
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet
     patchelf --set-rpath "${rpath}" $out/dotnet
     find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
     $out/bin/dotnet --info
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://dotnet.github.io/";
     description = builtins.getAttr type descriptions;
     platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
diff --git a/nixpkgs/pkgs/development/compilers/dtc/default.nix b/nixpkgs/pkgs/development/compilers/dtc/default.nix
index 0a694e29ee83..c5d33590daad 100644
--- a/nixpkgs/pkgs/development/compilers/dtc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dtc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which
+{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
 , pythonSupport ? false, python, swig
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0li992wwd7kgy71bikanqky49y4hq3p3vx35p2hvyxy1k0wfy7i8";
   };
 
-  nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
+  nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ];
 
   postPatch = ''
     patchShebangs pylibfdt/
diff --git a/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix
index a7b2aa6be748..0789addb337b 100644
--- a/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , libtool, autoconf, automake
 , gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false
@@ -23,7 +23,7 @@ let
   ];
   propagatedBuildInputs = [
     libffi gmp mpfr gcc
-  ] ++ stdenv.lib.optionals useBoehmgc [
+  ] ++ lib.optionals useBoehmgc [
     # replaces ecl's own gc which other packages can depend on, thus propagated
     boehmgc
   ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     "--with-libffi-prefix=${libffi.dev}"
     ]
     ++
-    (stdenv.lib.optional (! noUnicode)
+    (lib.optional (! noUnicode)
       "--enable-unicode")
     ;
 
@@ -77,8 +77,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Lisp implementation aiming to be small, fast and easy to embed";
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ecl/default.nix b/nixpkgs/pkgs/development/compilers/ecl/default.nix
index 40f3e38e506c..0b4ea9b83890 100644
--- a/nixpkgs/pkgs/development/compilers/ecl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ecl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl
+{lib, stdenv, fetchurl
 , libtool, autoconf, automake
 , texinfo
 , gmp, mpfr, libffi, makeWrapper
@@ -22,7 +22,7 @@ let
   propagatedBuildInputs = [
     libffi gmp mpfr gcc
     # replaces ecl's own gc which other packages can depend on, thus propagated
-  ] ++ stdenv.lib.optionals useBoehmgc [
+  ] ++ lib.optionals useBoehmgc [
     # replaces ecl's own gc which other packages can depend on, thus propagated
     boehmgc
   ];
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     "--with-libffi-prefix=${libffi.dev}"
     ]
     ++
-    (stdenv.lib.optional (! noUnicode)
+    (lib.optional (! noUnicode)
       "--enable-unicode")
     ;
 
@@ -94,8 +94,8 @@ stdenv.mkDerivation {
     inherit (s) version;
     description = "Lisp implementation aiming to be small, fast and easy to embed";
     homepage = "https://common-lisp.net/project/ecl/";
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/eli/default.nix b/nixpkgs/pkgs/development/compilers/eli/default.nix
index 61e5fd70a7c6..8920e34b6ee1 100644
--- a/nixpkgs/pkgs/development/compilers/eli/default.nix
+++ b/nixpkgs/pkgs/development/compilers/eli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , symlinkJoin
 , makeWrapper
@@ -84,8 +84,8 @@ stdenv.mkDerivation rec {
       arbitrary special cases. Output is the C subset of C++.
     '';
     homepage = "http://eli-project.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ timokau ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ timokau ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix
index 0dbf1a3306f3..7ee9e6e5d617 100644
--- a/nixpkgs/pkgs/development/compilers/elm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/default.nix
@@ -2,12 +2,13 @@
 , haskell, nodejs
 , fetchurl, fetchpatch, makeWrapper, writeScriptBin
   # Rust dependecies
-, rustPlatform, openssl, pkg-config }:
+, rustPlatform, openssl, pkg-config, Security
+}:
 let
   fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
 
   hsPkgs = haskell.packages.ghc883.override {
-    overrides = self: super: with haskell.lib;
+    overrides = self: super: with haskell.lib; with lib;
       let elmPkgs = rec {
             elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
               # sadly with parallelism most of the time breaks compilation
@@ -23,6 +24,11 @@ let
                 wrapProgram $out/bin/elm \
                   --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
               '';
+
+              description = "A delightful language for reliable webapps";
+              homepage = "https://elm-lang.org/";
+              license = licenses.bsd3;
+              maintainers = with maintainers; [ domenkozar turbomack ];
             });
 
             /*
@@ -31,6 +37,11 @@ let
             */
             elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: {
               jailbreak = true;
+
+              description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";
+              homepage = "https://github.com/avh4/elm-format";
+              license = licenses.bsd3;
+              maintainers = with maintainers; [ turbomack ];
             }));
 
             elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: {
@@ -39,6 +50,11 @@ let
                 hpack
               '';
               jailbreak = true;
+
+              description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler";
+              homepage = "https://github.com/stoeffel/elmi-to-json";
+              license = licenses.bsd3;
+              maintainers = [ maintainers.turbomack ];
             }));
 
             elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: {
@@ -48,6 +64,11 @@ let
               jailbreak = true;
               # Tests are failing because of missing instances for Eq and Show type classes
               doCheck = false;
+
+              description = "Instrument Elm code as a preprocessing step for elm-coverage";
+              homepage = "https://github.com/zwilias/elm-instrument";
+              license = licenses.bsd3;
+              maintainers = [ maintainers.turbomack ];
             }));
 
             inherit fetchElmDeps;
@@ -74,9 +95,17 @@ let
     inherit (hsPkgs.elmPkgs) elm;
   };
 
-  elmRustPackages = {
+  elmRustPackages =  {
     elm-json = import ./packages/elm-json.nix {
-      inherit rustPlatform fetchurl openssl stdenv pkg-config;
+      inherit lib rustPlatform fetchurl openssl stdenv pkg-config Security;
+    } // {
+      meta = with lib; {
+        description = "Install, upgrade and uninstall Elm dependencies";
+        homepage = "https://github.com/zwilias/elm-json";
+        license = licenses.mit;
+        maintainers = [ maintainers.turbomack ];
+        platforms = platforms.linux;
+      };
     };
   };
 
@@ -89,10 +118,24 @@ let
     in with hsPkgs.elmPkgs; {
 
       elm-test = patchBinwrap [elmi-to-json]
-        nodePkgs.elm-test;
+        nodePkgs.elm-test // {
+          meta = with lib; {
+            description = "Runs elm-test suites from Node.js";
+            homepage = "https://github.com/rtfeldman/node-test-runner";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
       elm-verify-examples = patchBinwrap [elmi-to-json]
-        nodePkgs.elm-verify-examples;
+        nodePkgs.elm-verify-examples // {
+          meta = with lib; {
+            description = "Verify examples in your docs";
+            homepage = "https://github.com/stoeffel/elm-verify-examples";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
       elm-coverage =
         let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage);
@@ -111,17 +154,51 @@ let
             mkdir -p unpacked_bin
             ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
           '';
+          meta = with lib; {
+            description = "Work in progress - Code coverage tooling for Elm";
+            homepage = "https://github.com/zwilias/elm-coverage";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
         });
 
       create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json]
-        nodePkgs.create-elm-app);
+        nodePkgs.create-elm-app) // {
+          meta = with lib; {
+            description = "Create Elm apps with no build configuration";
+            homepage = "https://github.com/halfzebra/create-elm-app";
+            license = licenses.mit;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
       elm-review = patchBinwrap [elmRustPackages.elm-json]
-        nodePkgs.elm-review;
+        nodePkgs.elm-review // {
+          meta = with lib; {
+            description = "Analyzes Elm projects, to help find mistakes before your users find them";
+            homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
-      elm-language-server = nodePkgs."@elm-tooling/elm-language-server";
+      elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // {
+        meta = with lib; {
+          description = "Language server implementation for Elm";
+          homepage = "https://github.com/elm-tooling/elm-language-server";
+          license = licenses.mit;
+          maintainers = [ maintainers.turbomack ];
+        };
+      };
 
-      elm-optimize-level-2 = nodePkgs."elm-optimize-level-2";
+      elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // {
+        meta = with lib; {
+          description = "A second level of optimization for the Javascript that the Elm Compiler produces";
+          homepage = "https://github.com/mdgriffith/elm-optimize-level-2";
+          license = licenses.bsd3;
+          maintainers = [ maintainers.turbomack ];
+        };
+      };
 
       inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
     };
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix
index ff944cc4b647..71386e00ef11 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -1,7 +1,7 @@
 { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary
 , bytestring, cmark, containers, directory, filepath, free, HUnit
 , indents, json, mtl, optparse-applicative, parsec, process
-, QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden
+, QuickCheck, quickcheck-io, split, lib, stdenv, tasty, tasty-golden
 , tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
@@ -36,5 +36,5 @@ mkDerivation {
   doHaddock = false;
   homepage = "https://elm-lang.org";
   description = "A source code formatter for Elm";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix
index 4d7efcf1083b..cd13eb4de4f1 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix
@@ -2,7 +2,7 @@
 , bytestring, Cabal, cmark, containers, directory, elm-format
 , fetchgit, filepath, free, HUnit, indents, json, mtl
 , optparse-applicative, parsec, process, QuickCheck, quickcheck-io
-, split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+, split, lib, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
 , text
 }:
 mkDerivation {
@@ -30,5 +30,5 @@ mkDerivation {
   ];
   homepage = "https://elm-lang.org";
   description = "Instrumentation library for Elm";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix
index 44d300d254b0..810c1a91a00b 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix
@@ -1,4 +1,4 @@
-{ rustPlatform, fetchurl, openssl, stdenv, pkg-config }:
+{ lib, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "elm-json";
   version = "0.2.7";
@@ -12,18 +12,10 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
 
   cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7";
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Install, upgrade and uninstall Elm dependencies";
-    homepage = "https://github.com/zwilias/elm-json";
-    license = licenses.mit;
-    maintainers = [ maintainers.turbomack ];
-    platforms = platforms.linux;
-  };
 }
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix
index 644a53fd6190..edb2ed6ed7a2 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix
@@ -3,7 +3,7 @@
 , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP
 , http-client, http-client-tls, http-types, language-glsl, mtl
 , network, parsec, process, raw-strings-qq, scientific, SHA
-, snap-core, snap-server, stdenv, template-haskell, time
+, snap-core, snap-server, lib, stdenv, template-haskell, time
 , unordered-containers, utf8-string, vector, zip-archive
 }:
 mkDerivation {
@@ -27,5 +27,5 @@ mkDerivation {
   ];
   homepage = "https://elm-lang.org";
   description = "The `elm` command line interface";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix
index eaed18c5297b..6788fce6a990 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, binary, bytestring, containers
 , directory, fetchgit, filepath, ghc-prim, hpack
-, optparse-applicative, stdenv, text, unliftio
+, optparse-applicative, lib, stdenv, text, unliftio
 , unordered-containers
 }:
 mkDerivation {
@@ -23,5 +23,5 @@ mkDerivation {
   testHaskellDepends = [ base ];
   prePatch = "hpack";
   homepage = "https://github.com/stoeffel/elmi-to-json#readme";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix b/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix
index 6bf7fa7890e8..80f3c08d9e33 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, concatenative, mtl, parsec, stdenv }:
+{ mkDerivation, base, concatenative, mtl, parsec, lib, stdenv }:
 mkDerivation {
   pname = "indents";
   version = "0.3.3";
@@ -7,5 +7,5 @@ mkDerivation {
   doCheck = false;
   homepage = "http://patch-tag.com/r/salazar/indents";
   description = "indentation sensitive parser-combinators for parsec";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix
index c970861a86f0..c43e7cc7f25c 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix
index c81d2acdf7f1..015958d1239e 100644
--- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -15513,4 +15513,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/default.nix
index ac13f9559305..648ec156abea 100644
--- a/nixpkgs/pkgs/development/compilers/emscripten/default.nix
+++ b/nixpkgs/pkgs/development/compilers/emscripten/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
+{ lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
 , jre, binaryen
 , llvmPackages_11
 , symlinkJoin, makeWrapper
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/emscripten-core/emscripten";
     description = "An LLVM-to-JavaScript Compiler";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/compilers/eql/default.nix b/nixpkgs/pkgs/development/compilers/eql/default.nix
index ce42c1021154..a3fefbc1f480 100644
--- a/nixpkgs/pkgs/development/compilers/eql/default.nix
+++ b/nixpkgs/pkgs/development/compilers/eql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }:
+{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   version = src.rev;
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Embedded Qt Lisp (ECL+Qt)";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/compilers/factor-lang/default.nix b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
index 2c7edb9c1703..fc5f478177cb 100644
--- a/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, glib, git,
-  rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
+{ lib, stdenv, fetchurl, glib, git,
+  rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses,
   pango, cairo, gtk2, gdk-pixbuf, gtkglext,
   mesa, xorg, openssl, unzip }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     ./fuel-dir.patch
   ];
 
-  buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
+  buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper
     libX11 pango cairo gtk2 gdk-pixbuf gtkglext
     mesa libXmu libXt libICE libSM openssl unzip ];
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     # out of known libraries. The side effect is that find-lib
     # will work only on the known libraries. There does not seem
     # to be a generic solution here.
-    find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [
+    find $(echo ${lib.makeLibraryPath (with xorg; [
         glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext
         mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
     cp ./factor $out/bin
     wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
-      "${stdenv.lib.makeLibraryPath (with xorg; [ glib
+      "${lib.makeLibraryPath (with xorg; [ glib
         libX11 pango cairo gtk2 gdk-pixbuf gtkglext
         mesa libXmu libXt libICE libSM openssl])}"
 
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     cp misc/fuel/*.el $out/share/emacs/site-lisp/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://factorcode.org";
     license = licenses.bsd2;
     description = "A concatenative, stack-based programming language";
diff --git a/nixpkgs/pkgs/development/compilers/fasmg/default.nix b/nixpkgs/pkgs/development/compilers/fasmg/default.nix
index 5233e248c074..611a2bdb8f14 100644
--- a/nixpkgs/pkgs/development/compilers/fasmg/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fasmg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     cp docs/*.txt $doc/share/doc/fasmg
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
     homepage = "https://flatassembler.net";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/flasm/default.nix b/nixpkgs/pkgs/development/compilers/flasm/default.nix
index 9393d4fc59f4..4257feb87b99 100644
--- a/nixpkgs/pkgs/development/compilers/flasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/flasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
+{ lib, stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "flasm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     install -Dm755 flasm -t $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assembler and disassembler for Flash (SWF) bytecode";
     homepage = "http://flasm.sourceforge.net/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix
index baab0583fb0c..3eea7f596b6b 100644
--- a/nixpkgs/pkgs/development/compilers/flutter/default.nix
+++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix
@@ -1,5 +1,4 @@
 { callPackage, dart }:
-
 let
   dart_stable = dart.override { version = "2.10.0"; };
   dart_beta = dart.override { version = "2.10.0"; };
@@ -8,7 +7,8 @@ let
   getPatches = dir:
     let files = builtins.attrNames (builtins.readDir dir);
     in map (f: dir + ("/" + f)) files;
-in {
+in
+{
   mkFlutter = mkFlutter;
   stable = mkFlutter rec {
     pname = "flutter";
diff --git a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix
index 7fda2d616f3e..a7ec87322507 100644
--- a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix
+++ b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix
@@ -1,10 +1,36 @@
-{ channel, pname, version, sha256Hash, patches, dart
-, filename ? "flutter_linux_${version}-${channel}.tar.xz"}:
-
-{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv
-, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb
-, libXcomposite, libXcursor, libXdamage, libXfixes, libGL, nspr, nss, systemd }:
-
+{ channel
+, pname
+, version
+, sha256Hash
+, patches
+, dart
+, filename ? "flutter_linux_${version}-${channel}.tar.xz"
+}:
+
+{ bash
+, buildFHSUserEnv
+, cacert
+, coreutils
+, git
+, runCommand
+, lib, stdenv
+, fetchurl
+, alsaLib
+, dbus
+, expat
+, libpulseaudio
+, libuuid
+, libX11
+, libxcb
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXfixes
+, libGL
+, nspr
+, nss
+, systemd
+}:
 let
   drvName = "flutter-${channel}-${version}";
   flutter = stdenv.mkDerivation {
@@ -16,7 +42,7 @@ let
       sha256 = sha256Hash;
     };
 
-    buildInputs = [ makeWrapper git ];
+    buildInputs = [ git ];
 
     inherit patches;
 
@@ -31,28 +57,27 @@ let
       SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
       STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
       SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
-      DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk"
-
-      DART="$DART_SDK_PATH/bin/dart"
-      PUB="$DART_SDK_PATH/bin/pub"
+      DART_SDK_PATH="${dart}"
 
       HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
                  # path is relative otherwise it's replaced by /build/flutter
 
-      (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline)
+      (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline)
 
       local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
-      "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
+      ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
       echo "$revision" > "$STAMP_PATH"
       echo -n "${version}" > version
 
-      rm -rf bin/cache/{artifacts,downloads}
+      rm -rf bin/cache/{artifacts,dart-sdk,downloads}
       rm -f  bin/cache/*.stamp
     '';
 
     installPhase = ''
       mkdir -p $out
       cp -r . $out
+      mkdir -p $out/bin/cache/
+      ln -sf ${dart} $out/bin/cache/dart-sdk
     '';
   };
 
@@ -100,7 +125,9 @@ let
       ];
   };
 
-in runCommand drvName {
+in
+runCommand drvName
+{
   startScript = ''
     #!${bash}/bin/bash
     export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
@@ -110,7 +137,7 @@ in runCommand drvName {
   preferLocalBuild = true;
   allowSubstitutes = false;
   passthru = { unwrapped = flutter; };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flutter is Google's SDK for building mobile, web and desktop with Dart";
     longDescription = ''
       Flutter is Google’s UI toolkit for building beautiful,
@@ -126,8 +153,4 @@ in runCommand drvName {
 
   echo -n "$startScript" > $out/bin/${pname}
   chmod +x $out/bin/${pname}
-
-  mkdir -p $out/bin/cache/dart-sdk/
-  cp -r ${dart}/* $out/bin/cache/dart-sdk/
-  ln $out/bin/cache/dart-sdk/bin/dart $out/bin/dart
 ''
diff --git a/nixpkgs/pkgs/development/compilers/flux/default.nix b/nixpkgs/pkgs/development/compilers/flux/default.nix
index c599c9f8baf5..75386f21f743 100644
--- a/nixpkgs/pkgs/development/compilers/flux/default.nix
+++ b/nixpkgs/pkgs/development/compilers/flux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "flux";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   meta = with lib; {
     description = "An interface description language used by DirectFB";
diff --git a/nixpkgs/pkgs/development/compilers/fpc/default.nix b/nixpkgs/pkgs/development/compilers/fpc/default.nix
index 6e7ffefca21f..5c8293866515 100644
--- a/nixpkgs/pkgs/development/compilers/fpc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gawk }:
+{ lib, stdenv, fetchurl, gawk }:
 
 let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     bootstrap = startFPC;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free Pascal Compiler from a source distribution";
     homepage = "https://www.freepascal.org";
     maintainers = [ maintainers.raskin ];
diff --git a/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
index 713033057911..0b7ac647529d 100644
--- a/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
+++ b/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ':' "${lib.makeBinPath [ fpc gdb gnumake binutils ]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graphical IDE for the FreePascal language";
     homepage = "https://www.lazarus.freepascal.org";
     license = licenses.gpl2Plus ;
diff --git a/nixpkgs/pkgs/development/compilers/fsharp/default.nix b/nixpkgs/pkgs/development/compilers/fsharp/default.nix
index 0c60403a6bee..19b79989dc23 100644
--- a/nixpkgs/pkgs/development/compilers/fsharp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fsharp/default.nix
@@ -1,6 +1,6 @@
 # Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
 
-{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:
+{ lib, stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }:
 
 stdenv.mkDerivation rec {
   pname = "fsharp";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ mono dotnetbuildhelpers autoconf automake which ];
 
   configurePhase = ''
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A functional CLI language";
     homepage = "https://fsharp.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thoughtpolice raskin ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/fsharp41/default.nix b/nixpkgs/pkgs/development/compilers/fsharp41/default.nix
index 6475deb1026b..e9f9088df3a6 100644
--- a/nixpkgs/pkgs/development/compilers/fsharp41/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fsharp41/default.nix
@@ -1,6 +1,6 @@
 # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
 
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
+{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
 
 stdenv.mkDerivation rec {
   pname = "fsharp";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     autoconf
     automake
@@ -119,8 +119,8 @@ EOF
   meta = {
     description = "A functional CLI language";
     homepage = "https://fsharp.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thoughtpolice raskin ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/fstar/default.nix b/nixpkgs/pkgs/development/compilers/fstar/default.nix
index 548abeff78d0..73bf001f7520 100644
--- a/nixpkgs/pkgs/development/compilers/fstar/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fstar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }:
 
 stdenv.mkDerivation rec {
   pname = "fstar";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ML-like functional programming language aimed at program verification";
     homepage = "https://www.fstar-lang.org";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/compilers/gavrasm/default.nix b/nixpkgs/pkgs/development/compilers/gavrasm/default.nix
index 58e8b45b61af..6bd813b56cfb 100644
--- a/nixpkgs/pkgs/development/compilers/gavrasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gavrasm/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchzip, fpc , lang ? "en" } :
-assert stdenv.lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"];
+{ lib, stdenv, fetchzip, fpc , lang ? "en" } :
+assert lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"];
 stdenv.mkDerivation rec {
   pname = "gavrasm";
   version = "4.5";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cp LiesMich.Txt $out/doc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.avr-asm-tutorial.net/gavrasm";
     description = "AVR Assembler for ATMEL AVR-Processors";
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
index b300a190e1c8..943ddd100a21 100644
--- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
index 7d8a4b5b14d9..266863d95b2e 100644
--- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
index 633ae054d050..4f2135446f61 100644
--- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
index 99ec9d1b549d..2d85113527c0 100644
--- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
index c4c1ebc1d8a6..944d7c7b1593 100644
--- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
index c31e7c426e02..cbc4e0e09e96 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langAda ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
@@ -48,7 +48,7 @@ assert langAda -> gnatboot != null;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "10";
@@ -90,7 +90,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -100,7 +100,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -134,13 +134,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
             makeFlagsArray+=(
                'LIMITS_H_TEST=false'
             )
@@ -177,20 +177,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform gnatboot langAda langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -262,7 +263,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -275,13 +276,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ synthetica ];
+    maintainers = with lib.maintainers; [ synthetica ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
index 617a19e238ba..69fdeefe87aa 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -20,7 +20,7 @@
 , libelf                      # optional, for link-time optimizations (LTO)
 , cloog ? null, isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, pkgconfig ? null
+, zip ? null, unzip ? null, pkg-config ? null
 , gtk2 ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
 , libXrender ? null, xorgproto ? null
@@ -58,7 +58,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "4";
@@ -161,7 +161,7 @@ stdenv.mkDerivation ({
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ texinfo which gettext ]
     ++ (optional (perl != null) perl)
-    ++ (optional javaAwtGtk pkgconfig);
+    ++ (optional javaAwtGtk pkg-config);
 
   # For building runtime libs
   depsBuildTarget =
@@ -190,17 +190,18 @@ stdenv.mkDerivation ({
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langJava langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -289,7 +290,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -302,13 +303,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ peti veprbl ];
+    maintainers = with lib.maintainers; [ peti veprbl ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
     badPlatforms = [ "x86_64-darwin" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
index 7ea80ffbeb3f..4c0a144f14d1 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -20,7 +20,7 @@
 , libelf                      # optional, for link-time optimizations (LTO)
 , cloog ? null, isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, pkgconfig ? null
+, zip ? null, unzip ? null, pkg-config ? null
 , gtk2 ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
 , libXrender ? null, xorgproto ? null
@@ -58,7 +58,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "4";
@@ -174,7 +174,7 @@ stdenv.mkDerivation ({
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ texinfo which gettext ]
     ++ (optional (perl != null) perl)
-    ++ (optional javaAwtGtk pkgconfig);
+    ++ (optional javaAwtGtk pkg-config);
 
   # For building runtime libs
   depsBuildTarget =
@@ -203,17 +203,18 @@ stdenv.mkDerivation ({
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langJava langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -301,7 +302,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -314,13 +315,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ peti veprbl ];
+    maintainers = with lib.maintainers; [ peti veprbl ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
     badPlatforms = [ "x86_64-darwin" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
index 029777430ffa..7d4cc2a3ea12 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langAda ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
@@ -23,7 +23,7 @@
 , isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
 , gnatboot ? null
-, zip ? null, unzip ? null, pkgconfig ? null
+, zip ? null, unzip ? null, pkg-config ? null
 , gtk2 ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
 , libXrender ? null, xorgproto ? null
@@ -61,7 +61,7 @@ assert langAda -> gnatboot != null;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "6";
@@ -148,7 +148,7 @@ stdenv.mkDerivation ({
   prePatch =
     # This should kill all the stdinc frameworks that gcc and friends like to
     # insert into default search paths.
-    stdenv.lib.optionalString hostPlatform.isDarwin ''
+    lib.optionalString hostPlatform.isDarwin ''
       substituteInPlace gcc/config/darwin-c.c \
         --replace 'if (stdinc)' 'if (0)'
 
@@ -177,7 +177,7 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
@@ -190,7 +190,7 @@ stdenv.mkDerivation ({
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ texinfo which gettext ]
     ++ (optional (perl != null) perl)
-    ++ (optional javaAwtGtk pkgconfig)
+    ++ (optional javaAwtGtk pkg-config)
     ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex);
 
   # For building runtime libs
@@ -219,20 +219,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform gnatboot langJava langAda langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -320,7 +321,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -333,13 +334,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ peti ];
+    maintainers = with lib.maintainers; [ peti ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
index d950d6ac35bb..051307e4842c 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -45,7 +45,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "7";
@@ -97,7 +97,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -107,7 +107,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -141,13 +141,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
         makeFlagsArray+=(
            'LIMITS_H_TEST=false'
         )
@@ -183,21 +183,22 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -272,7 +273,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -285,13 +286,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
index 683a9edfe09d..6a072267019d 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -45,7 +45,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "8";
@@ -87,7 +87,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -97,7 +97,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -131,13 +131,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
             makeFlagsArray+=(
                'LIMITS_H_TEST=false'
             )
@@ -173,20 +173,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -257,7 +258,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -270,13 +271,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ synthetica ];
+    maintainers = with lib.maintainers; [ synthetica ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
index 7827cb985053..ea5172184cc6 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langAda ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
@@ -54,7 +54,7 @@ assert langAda -> gnatboot != null;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "9";
@@ -103,7 +103,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -113,7 +113,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -147,13 +147,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
           makeFlagsArray+=(
              'LIMITS_H_TEST=false'
           )
@@ -190,20 +190,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform gnatboot langAda langGo langJit;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -276,7 +277,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -289,13 +290,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ synthetica ];
+    maintainers = with lib.maintainers; [ synthetica ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/nixpkgs/pkgs/development/compilers/gcc/builder.sh
index e1c4768413f4..7d104b96624e 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/builder.sh
+++ b/nixpkgs/pkgs/development/compilers/gcc/builder.sh
@@ -37,6 +37,9 @@ if test "$noSysDirs" = "1"; then
             # Figure out what extra flags when linking to pass to the gcc
             # compilers being generated to make sure that they use our libc.
             extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true))
+            if [ -e ${!curBintools}/nix-support/ld-set-dynamic-linker ]; then
+                extraLDFlags=-dynamic-linker=$(< ${!curBintools}/nix-support/dynamic-linker)
+            fi
 
             # The path to the Libc binaries such as `crti.o'.
             libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib"
@@ -252,7 +255,7 @@ postInstall() {
 
     if [[ targetConfig == *"linux"* ]]; then
         # For some reason, when building for linux on darwin, the libs retain
-	# RPATH to $out.
+        # RPATH to $out.
         for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do
             PREV_RPATH=`patchelf --print-rpath "$i"`
             NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
index 12d3f5d8987e..3f1866713e60 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , targetPackages
 
 , crossStageStatic, libcCross
@@ -24,8 +24,8 @@
 , langJit
 }:
 
-assert cloog != null -> stdenv.lib.versionOlder version "5";
-assert langJava -> stdenv.lib.versionOlder version "7";
+assert cloog != null -> lib.versionOlder version "5";
+assert langJava -> lib.versionOlder version "7";
 
 # Note [Windows Exception Handling]
 # sjlj (short jump long jump) exception handling makes no sense on x86_64,
@@ -171,7 +171,7 @@ let
     ++ lib.optional javaAwtGtk "--enable-java-awt=gtk"
     ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
 
-    ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; })
+    ++ (import ../common/platform-flags.nix { inherit (stdenv)  targetPlatform; inherit lib; })
     ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
     ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"
 
diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix
index 0a5a7a1bc1cb..6ced56cedc05 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix
@@ -11,7 +11,7 @@ in
   EXTRA_FLAGS_FOR_TARGET = let
       mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([
         "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}"
-      ] ++ stdenv.lib.optionals (! crossStageStatic) [
+      ] ++ lib.optionals (! crossStageStatic) [
         "-B${lib.getLib dep}${dep.libdir or "/lib"}"
       ]);
     in mkFlags libcCross langD
diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix
index f3cdce411939..66af8c4a4cc7 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,7 +1,7 @@
 { lib, targetPlatform }:
 
 let
-  p =  targetPlatform.platform.gcc or {}
+  p =  targetPlatform.gcc or {}
     // targetPlatform.parsed.abi;
 in lib.concatLists [
   (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
diff --git a/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix
index f4f63bc9b19f..50efbe5d3c54 100644
--- a/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
+{ lib, stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xorgproto, libXi, gmp, readline, strace
 , libXext, libXt, libXaw, libXmu } :
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/gcl/default.nix b/nixpkgs/pkgs/development/compilers/gcl/default.nix
index a8a1bf9fc1bd..6d0471dacbb5 100644
--- a/nixpkgs/pkgs/development/compilers/gcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
+{ lib, stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xorgproto, libXi, gmp
 , libXext, libXt, libXaw, libXmu } :
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-fgnu89-inline";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU Common Lisp compiler working via GCC";
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/compilers/gforth/default.nix b/nixpkgs/pkgs/development/compilers/gforth/default.nix
index d2a2a7a85e3c..bdf172cb9b99 100644
--- a/nixpkgs/pkgs/development/compilers/gforth/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gforth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4 }:
+{ lib, stdenv, fetchurl, m4 }:
 
 let
   version = "0.7.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ m4 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
+  configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The Forth implementation of the GNU project";
     homepage = "https://www.gnu.org/software/gforth/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix
index 42eb994b8fe2..661dd5cb0026 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -69,32 +69,32 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -128,7 +128,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,13 +138,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -164,29 +164,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
@@ -207,18 +207,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -228,7 +228,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -245,14 +245,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix
index 1a1a9ca0160e..02373d00b10f 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, perl, gcc
 , ncurses6, gmp, glibc, libiconv, numactl
 , llvmPackages
@@ -16,12 +16,12 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
 let
   useLLVM = !stdenv.targetPlatform.isx86;
 
-  libPath = stdenv.lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath ([
     ncurses6 gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isAarch64) numactl);
+  ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv
+    ++ lib.optional (stdenv.hostPlatform.isAarch64) numactl);
 
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY"
     + "LD_LIBRARY_PATH";
 
   glibcDynLinker = assert stdenv.isLinux;
@@ -29,7 +29,7 @@ let
        # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
        ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
     else
-      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+      "${lib.getLib glibc}/lib/ld-linux*";
 
 in
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
+  propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   postUnpack =
     # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
     # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export NIX_LDFLAGS+=" -no_dtrace_dof"
       # not enough room in the object files for the full path to libiconv :(
       for exe in $(find . -type f -executable); do
@@ -92,20 +92,20 @@ stdenv.mkDerivation rec {
     ''
       find . -name integer-gmp.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     '' +
     # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
     # FFI_LIB_DIR is a good indication of places it must be needed.
-    stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    lib.optionalString stdenv.hostPlatform.isAarch64 ''
       find . -name package.conf.in \
           -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
     '' +
     # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \
+          --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \
           --interpreter ${glibcDynLinker} {} \;
 
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
@@ -117,21 +117,21 @@ stdenv.mkDerivation rec {
     # (`__strdup` is defined to be an alias of `strdup` anyway[1]).
     # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
     # Use objcopy magic to make the change:
-    stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    lib.optionalString stdenv.hostPlatform.isMusl ''
       find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
     '';
 
   # fix for `configure: error: Your linker is affected by binutils #16177`
-  preConfigure = stdenv.lib.optionalString
+  preConfigure = lib.optionalString
     stdenv.targetPlatform.isAarch32
     "LD=ld.gold";
 
   configurePlatforms = [ ];
   configureFlags = [
-    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+    "--with-gmp-libraries=${lib.getLib gmp}/lib"
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+  ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
 
   # On Linux, use patchelf to modify the executables so that they can
   # find editline/gmp.
-  postFixup = stdenv.lib.optionalString stdenv.isLinux
+  postFixup = lib.optionalString stdenv.isLinux
     (if stdenv.hostPlatform.isAarch64 then
       # Keep rpath as small as possible on aarch64 for patchelf#244.  All Elfs
       # are 2 directories deep from $out/lib, so pooling symlinks there makes
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
           patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
         fi
       done
-    '') + stdenv.lib.optionalString stdenv.isDarwin ''
+    '') + lib.optionalString stdenv.isDarwin ''
     # not enough room in the object files for the full path to libiconv :(
     for exe in $(find "$out" -type f -executable); do
       isScript $exe && continue
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
       substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
     done
   '' +
-  stdenv.lib.optionalString minimal ''
+  lib.optionalString minimal ''
     # Remove profiling files
     find $out -type f -name '*.p_o' -delete
     find $out -type f -name '*.p_hi' -delete
@@ -215,8 +215,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
-    maintainers = with stdenv.lib.maintainers; [ lostnet ];
+    maintainers = with lib.maintainers; [ lostnet ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix
index fac12099d5db..6e194b68faa2 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -62,30 +62,30 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
   # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
   patches = [
     ./issue-18549.patch
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     # Make Block.h compile with c++ compilers. Remove with the next release
     (fetchpatch {
       url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
@@ -130,7 +130,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -140,13 +140,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -166,29 +166,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -209,18 +209,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -230,7 +230,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -247,12 +247,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix
index c24b72fb43bd..582817cca070 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -62,30 +62,30 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -107,7 +107,7 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "doc" ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     # Make Block.h compile with c++ compilers. Remove with the next release
     (fetchpatch {
       url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
@@ -127,7 +127,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -137,13 +137,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -163,29 +163,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -206,18 +206,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -227,7 +227,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -244,12 +244,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix
index 9f546bcb541c..5f83c2b2afc2 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll
+{ lib, stdenv, substituteAll
 , fetchurl, perl, gcc, llvm
 , ncurses5, gmp, glibc, libiconv
 , llvmPackages
@@ -10,11 +10,11 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
 let
   useLLVM = !stdenv.targetPlatform.isx86;
 
-  libPath = stdenv.lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath ([
     ncurses5 gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
+  ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
 
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY"
     + "LD_LIBRARY_PATH";
 
   glibcDynLinker = assert stdenv.isLinux;
@@ -22,7 +22,7 @@ let
        # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
        ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
     else
-      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+      "${lib.getLib glibc}/lib/ld-linux*";
 
 in
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
+  propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   postUnpack =
     # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
     # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export NIX_LDFLAGS+=" -no_dtrace_dof"
       # not enough room in the object files for the full path to libiconv :(
       for exe in $(find . -type f -executable); do
@@ -97,14 +97,14 @@ stdenv.mkDerivation rec {
     ''
       find . -name integer-gmp.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     '' +
     # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
+          --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
           --replace-needed libtinfo.so libtinfo.so.5 \
           --interpreter ${glibcDynLinker} {} \;
 
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
     # (`__strdup` is defined to be an alias of `strdup` anyway[1]).
     # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
     # Use objcopy magic to make the change:
-    stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    lib.optionalString stdenv.hostPlatform.isMusl ''
       find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
     '';
 
@@ -130,10 +130,10 @@ stdenv.mkDerivation rec {
       src = ./gcc-clang-wrapper.sh;
     };
   in
-  [ "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin            "--with-gcc=${gcc-clang-wrapper}"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+  [ "--with-gmp-libraries=${lib.getLib gmp}/lib"
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+  ] ++ lib.optional stdenv.isDarwin            "--with-gcc=${gcc-clang-wrapper}"
+    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # Stripping combined with patchelf breaks the executables (they die
   # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
@@ -145,14 +145,14 @@ stdenv.mkDerivation rec {
 
   # On Linux, use patchelf to modify the executables so that they can
   # find editline/gmp.
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  preFixup = lib.optionalString stdenv.isLinux ''
     for p in $(find "$out" -type f -executable); do
       if isELF "$p"; then
         echo "Patchelfing $p"
         patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
       fi
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # not enough room in the object files for the full path to libiconv :(
     for exe in $(find "$out" -type f -executable); do
       isScript $exe && continue
@@ -186,6 +186,6 @@ stdenv.mkDerivation rec {
     enableShared = true;
   };
 
-  meta.license = stdenv.lib.licenses.bsd3;
+  meta.license = lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix
index 9234e3b14571..ca984c36957d 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, perl, gcc
 , ncurses5, ncurses6, gmp, glibc, libiconv
 , llvmPackages
@@ -14,11 +14,11 @@ let
 
   ourNcurses = if useNcurses6 then ncurses6 else ncurses5;
 
-  libPath = stdenv.lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath ([
     ourNcurses gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
+  ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
 
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY"
     + "LD_LIBRARY_PATH";
 
   glibcDynLinker = assert stdenv.isLinux;
@@ -26,7 +26,7 @@ let
        # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
        ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
     else
-      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+      "${lib.getLib glibc}/lib/ld-linux*";
 
 in
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
+  propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   postUnpack =
     # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
     # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export NIX_LDFLAGS+=" -no_dtrace_dof"
       # not enough room in the object files for the full path to libiconv :(
       for exe in $(find . -type f -executable); do
@@ -90,17 +90,17 @@ stdenv.mkDerivation rec {
     ''
       find . -name integer-gmp.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     '' +
     # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 \
           -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
+          --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
           ${ # This isn't required for x86_64-linux where we use ncurses6
-             stdenv.lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5"
+             lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5"
            } \
           --interpreter ${glibcDynLinker} {} \;
 
@@ -113,16 +113,16 @@ stdenv.mkDerivation rec {
     # (`__strdup` is defined to be an alias of `strdup` anyway[1]).
     # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
     # Use objcopy magic to make the change:
-    stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    lib.optionalString stdenv.hostPlatform.isMusl ''
       find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
     '';
 
   configurePlatforms = [ ];
   configureFlags = [
-    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+    "--with-gmp-libraries=${lib.getLib gmp}/lib"
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+  ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
@@ -130,14 +130,14 @@ stdenv.mkDerivation rec {
 
   # On Linux, use patchelf to modify the executables so that they can
   # find editline/gmp.
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     for p in $(find "$out" -type f -executable); do
       if isELF "$p"; then
         echo "Patchelfing $p"
         patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
       fi
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # not enough room in the object files for the full path to libiconv :(
     for exe in $(find "$out" -type f -executable); do
       isScript $exe && continue
@@ -171,6 +171,6 @@ stdenv.mkDerivation rec {
     enableShared = true;
   };
 
-  meta.license = stdenv.lib.licenses.bsd3;
+  meta.license = lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix
index 7adacff597ca..219ace5a9164 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -32,7 +32,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -48,7 +48,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -66,28 +66,28 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -136,7 +136,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -146,13 +146,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -172,23 +172,23 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -209,14 +209,14 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   # See #63511 - the only unstripped file is the debug rts which isn't meant to
   # be stripped.
@@ -224,7 +224,7 @@ stdenv.mkDerivation (rec {
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -234,11 +234,11 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   ''
   # Temporary work-around for https://github.com/NixOS/nixpkgs/issues/66277
-  + stdenv.lib.optionalString hostPlatform.isAarch64 ''
+  + lib.optionalString hostPlatform.isAarch64 ''
     rm -rf "$doc/share/doc/ghc/html/libraries"
   '';
 
@@ -255,12 +255,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix
index fbb75637df65..94553e56a811 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -32,7 +32,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -48,7 +48,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -66,30 +66,30 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -123,7 +123,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -133,13 +133,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -159,29 +159,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -189,7 +189,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
@@ -202,18 +202,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -223,7 +223,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -240,14 +240,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix
index 538655a0d056..ca4dc35ccdc4 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -69,32 +69,32 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -128,7 +128,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,13 +138,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -164,29 +164,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
@@ -207,18 +207,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -228,7 +228,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -245,14 +245,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix
index e69766bccdaa..ab5f2c12e230 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -69,32 +69,32 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -119,7 +119,7 @@ stdenv.mkDerivation (rec {
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.
-  preConfigure = stdenv.lib.optionalString stdenv.isAarch64 ''
+  preConfigure = lib.optionalString stdenv.isAarch64 ''
     # Aarch64 allow backward bootstrapping since earlier versions are unstable.
     find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \
       -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \;
@@ -132,7 +132,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -142,13 +142,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -168,29 +168,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -198,7 +198,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
@@ -211,18 +211,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -232,7 +232,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -249,14 +249,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix
index d86cce9849ca..39abe9c760e3 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -19,7 +19,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -36,7 +36,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -52,7 +52,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -63,30 +63,30 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -123,7 +123,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -133,15 +133,15 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (stdenv.isLinux) ''
+  '' + lib.optionalString (stdenv.isLinux) ''
     export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -161,29 +161,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -204,18 +204,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -225,7 +225,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -242,12 +242,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix
index 6f9f577743f5..3ba88763117d 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/head.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -22,7 +22,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slightly slower native
   # bignum backend instead of the faster but GPLed gmp backend.
-  enableNativeBignum ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms)
+  enableNativeBignum ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms)
 , gmp
 
 , # If enabled, use -fPIC when compiling static libs.
@@ -41,7 +41,7 @@
 , version ? "8.11.20200824"
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -57,7 +57,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -68,33 +68,33 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableNativeBignum) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ lib.optional (!enableNativeBignum) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+    ++ lib.optional enableDwarf elfutils;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -131,7 +131,7 @@ stdenv.mkDerivation (rec {
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
     # and more generally have a faster linker.
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -144,13 +144,13 @@ stdenv.mkDerivation (rec {
     echo ${src.rev} > GIT_COMMIT_ID
     ./boot
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -170,40 +170,40 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optional disableLargeAddressSpace "--disable-large-address-space"
-    ++ stdenv.lib.optionals enableDwarf [
+  ] ++ lib.optional disableLargeAddressSpace "--disable-large-address-space"
+    ++ lib.optionals enableDwarf [
     "--enable-dwarf-unwind"
-    "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include"
-    "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib"
+    "--with-libdw-includes=${lib.getDev elfutils}/include"
+    "--with-libdw-libraries=${lib.getLib elfutils}/lib"
   ];
 
   # Make sure we never relax`$PATH` and hooks support for compatibility.
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf autoreconfHook automake m4 python3 sphinx
@@ -216,18 +216,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -237,7 +237,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -254,13 +254,13 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
index b957a6aa9e10..88630f996a94 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
@@ -55,7 +55,7 @@
         websockets yaml
       ];
       description = "Haskell to JavaScript compiler";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
     }) {};
 
   ghc-api-ghcjs = callPackage
@@ -76,7 +76,7 @@
       libraryToolDepends = [ alex happy ];
       homepage = "http://www.haskell.org/ghc/";
       description = "The GHC API (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   ghci-ghcjs = callPackage
@@ -93,7 +93,7 @@
         ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix
       ];
       description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   ghcjs-th = callPackage
@@ -109,7 +109,7 @@
         template-haskell-ghcjs
       ];
       homepage = "http://github.com/ghcjs";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
     }) {};
 
   haddock-api-ghcjs = callPackage
@@ -136,7 +136,7 @@
       testToolDepends = [ hspec-discover ];
       homepage = "http://www.haskell.org/haddock/";
       description = "A documentation-generation tool for Haskell libraries";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   haddock-library-ghcjs = callPackage
@@ -160,7 +160,7 @@
       testToolDepends = [ hspec-discover ];
       homepage = "http://www.haskell.org/haddock/";
       description = "Library exposing some functionality of Haddock";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   template-haskell-ghcjs = callPackage
@@ -171,7 +171,7 @@
       src = configuredSrc + /lib/template-haskell-ghcjs;
       libraryHaskellDepends = [ base ghc-boot-th pretty ];
       description = "Support library for Template Haskell (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
index c6c81491fe6d..8a04bc0c079c 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -12,7 +12,7 @@
 , makeWrapper
 , xorg
 , gmp
-, pkgconfig
+, pkg-config
 , gcc
 , lib
 , ghcjsDepOverrides ? (_:_:{})
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
       makeWrapper
       xorg.lndir
       gmp
-      pkgconfig
+      pkg-config
     ] ++ lib.optionals stdenv.isDarwin [
       gcc # https://github.com/ghcjs/ghcjs/issues/663
     ];
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
index 7c10ce6572f8..82c37bd86177 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
@@ -25,5 +25,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/ghcjs/ghcjs-base";
   description = "base library for GHCJS";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghdl/default.nix b/nixpkgs/pkgs/development/compilers/ghdl/default.nix
index 6d1fae337340..6181486f50c7 100644
--- a/nixpkgs/pkgs/development/compilers/ghdl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ghdl/default.nix
@@ -5,13 +5,15 @@ assert backend == "mcode" || backend == "llvm";
 
 stdenv.mkDerivation rec {
   pname = "ghdl-${backend}";
-  version = "0.37";
+  # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable
+  # version of the yosys plugin
+  version = "unstable-2021.01.14";
 
   src = fetchFromGitHub {
-    owner = "ghdl";
-    repo = "ghdl";
-    rev = "v${version}";
-    sha256 = "0b53yl4im33c1cd4mdyc4ks9cmrpixym17gzchfmplrl22w3l17y";
+    owner  = "ghdl";
+    repo   = "ghdl";
+    rev    = "4868294436574660552ccef50a5b0849559393de";
+    sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p";
   };
 
   LIBRARY_PATH = "${stdenv.cc.libc}/lib";
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
     sed -i 's/check_version 7.0/check_version 7/g' configure
   '';
 
-  configureFlags = lib.optional (backend == "llvm")
+  configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")
     "--with-llvm-config=${llvm}/bin/llvm-config";
 
   hardeningDisable = [ "format" ];
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/ghdl/ghdl";
     description = "VHDL 2008/93/87 simulator";
-    maintainers = with maintainers; [ lucus16 ];
+    maintainers = with maintainers; [ lucus16 thoughtpolice ];
     platforms = platforms.linux;
     license = licenses.gpl2;
   };
diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix
index f96f2f724a60..b9c7e7e1e3d2 100644
--- a/nixpkgs/pkgs/development/compilers/gleam/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "0.12.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0n23pn7jk4i2waczw5cczsb7v4lal4x6xqmp01y280hb2vk176fg";
+    sha256 = "sha256-ka1GxukX3HR40fMeiiXHguyPKrpGngG2tXDColR7eQA=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ] ++
-    stdenv.lib.optionals stdenv.isDarwin [ Security ];
+    lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "0rnf9agpzlvk53x8zrg32w6r0gxcbank3fs32ydv53frvqv1spj3";
+  cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc=";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A statically typed language for the Erlang VM";
     homepage = "https://gleam.run/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix
index b3364b185da9..0cfb2502a0d9 100644
--- a/nixpkgs/pkgs/development/compilers/glslang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv
+, fetchFromGitHub
 , bison
 , cmake
 , jq
@@ -10,7 +11,7 @@
 }:
 # glslang requires custom versions of spirv-tools and spirb-headers.
 # The exact versions are taken from:
-# https://github.com/KhronosGroup/glslang/blob/master/known_good.json
+# https://github.com/KhronosGroup/glslang/blob/${version}/known_good.json
 
 let
   localSpirv-tools = if argSpirv-tools == null
@@ -18,8 +19,8 @@ let
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "SPIRV-Tools";
-        rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
-        sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
+        rev = "b27b1afd12d05bf238ac7368bb49de73cd620a8e";
+        sha256 = "0v26ws6qx23jn4dcpsq6rqmdxgyxpl5pcvfm90wb3nz6iqbqx294";
       };
     })
     else argSpirv-tools;
@@ -29,8 +30,8 @@ let
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "SPIRV-Headers";
-        rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
-        sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
+        rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d";
+        sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q";
       };
     })
     else argSpirv-headers;
@@ -38,13 +39,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "8.13.3743";
+  version = "11.1.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    sha256 = "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry";
+    sha256 = "1j81pghy7whyr8ygk7lx6g6qph61rky7fkkc8xp87c7n695a48rw";
   };
 
   # These get set at all-packages, keep onto them for child drvs
@@ -54,7 +55,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake python3 bison jq ];
-  enableParallelBuilding = true;
 
   postPatch = ''
     cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools
@@ -71,11 +71,11 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Khronos reference front-end for GLSL and ESSL";
     license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.ralith ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/gnatboot/default.nix b/nixpkgs/pkgs/development/compilers/gnatboot/default.nix
index cb643d6123a6..d97298d02386 100644
--- a/nixpkgs/pkgs/development/compilers/gnatboot/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gnatboot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "gentoo-gnatboot";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     langAda = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gentoo.org";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.lucus16 ];
diff --git a/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix
index 146af98093d0..e208f262ebeb 100644
--- a/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchurl, gcc, makeWrapper
+{ lib, stdenv, fetchurl, gcc, makeWrapper
 , db, gmp, ncurses }:
 
 let
   version = "2.2";
-  lib = stdenv.lib;
 in
 stdenv.mkDerivation rec {
   pname = "gnu-cobol";
@@ -18,19 +17,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ db gmp ncurses ];
 
-  cflags  = stdenv.lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs;
-  ldflags = stdenv.lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs;
+  cflags  = lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs;
+  ldflags = lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs;
 
   cobolCCFlags = "-I$out/include ${ldflags} -L$out/lib ${cflags}";
 
-  postInstall = with stdenv.lib; ''
+  postInstall = with lib; ''
     wrapProgram "$out/bin/cobc" \
       --set COB_CC "${gcc}/bin/gcc" \
       --prefix COB_LDFLAGS " " "${cobolCCFlags}" \
       --prefix COB_CFLAGS " " "${cobolCCFlags}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open-source COBOL compiler";
     homepage = "https://sourceforge.net/projects/open-cobol/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix b/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
index f48cd6dfa1b1..cd33baad993b 100644
--- a/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, pkgconfig, libtool
+{ config, lib, stdenv, fetchurl, pkg-config, libtool
 , zip, libffi, libsigsegv, readline, gmp
 , gnutls, gnome2, cairo, SDL, sqlite
 , emacsSupport ? config.emacsSupport or false, emacs ? null }:
@@ -11,7 +11,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library.
     # Adding --enable-static=libsigsegv to the gnu-smalltalk configuration flags
     # does not help, the error still occurs. The only solution is to build a
     # shared version of libsigsegv.
-    libsigsegv-shared = stdenv.lib.overrideDerivation libsigsegv (oldAttrs: {
+    libsigsegv-shared = lib.overrideDerivation libsigsegv (oldAttrs: {
       configureFlags = [ "--enable-shared" ];
     });
 
@@ -27,24 +27,24 @@ in stdenv.mkDerivation rec {
 
   # The dependencies and their justification are explained at
   # http://smalltalk.gnu.org/download
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
     cairo SDL sqlite
   ]
-  ++ stdenv.lib.optional emacsSupport emacs;
+  ++ lib.optional emacsSupport emacs;
 
-  configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
+  configureFlags = lib.optional (!emacsSupport) "--without-emacs";
 
   hardeningDisable = [ "format" ];
 
-  installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
+  installFlags = lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
 
   # For some reason the tests fail if executated with nix-build, but pass if
   # executed within nix-shell --pure.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free implementation of the Smalltalk-80 language";
     longDescription = ''
       GNU Smalltalk is a free implementation of the Smalltalk-80 language. It
diff --git a/nixpkgs/pkgs/development/compilers/go/1.14.nix b/nixpkgs/pkgs/development/compilers/go/1.14.nix
index 34b37926ea6f..0811e4bc7013 100644
--- a/nixpkgs/pkgs/development/compilers/go/1.14.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.14.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, tzdata, iana-etc, runCommand
-, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
+{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand
+, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
 , mailcap, runtimeShell
 , buildPackages
 , pkgsBuildTarget
@@ -8,7 +8,7 @@
 
 let
 
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
@@ -36,15 +36,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.14.13";
+  version = "1.14.14";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds";
+    sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132";
   };
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch procps ];
+  nativeBuildInputs = [ perl which pkg-config patch procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+  GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
   # Hopefully avoids test timeouts on Hydra
@@ -246,8 +246,7 @@ stdenv.mkDerivation rec {
 
   disallowedReferences = [ goBootstrap ];
 
-  meta = with stdenv.lib; {
-    branch = "1.14";
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/go/1.15.nix b/nixpkgs/pkgs/development/compilers/go/1.15.nix
index b0803b6c7a7d..61ab1b020329 100644
--- a/nixpkgs/pkgs/development/compilers/go/1.15.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.15.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, tzdata, iana-etc, runCommand
-, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
+{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand
+, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
 , mailcap, runtimeShell
 , buildPackages
 , pkgsBuildTarget
@@ -8,7 +8,7 @@
 
 let
 
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
@@ -36,15 +36,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.15.6";
+  version = "1.15.7";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "05sqcx4fm1nxfm46j6xriq0fnnah4bm8bqw027xrzcg2qmrvl2w9";
+    sha256 = "1g1a39y1cnvw3y0bjwjms55cz0s9icm8myrgxi295jwfznmb6cc6";
   };
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch procps ];
+  nativeBuildInputs = [ perl which pkg-config patch procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+  GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
   # Hopefully avoids test timeouts on Hydra
@@ -249,8 +249,7 @@ stdenv.mkDerivation rec {
 
   disallowedReferences = [ goBootstrap ];
 
-  meta = with stdenv.lib; {
-    branch = "1.15";
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/go/1.4.nix b/nixpkgs/pkgs/development/compilers/go/1.4.nix
index 75667a6cb2b5..ec3fd97da9b9 100644
--- a/nixpkgs/pkgs/development/compilers/go/1.4.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.4.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross
-, pkgconfig
+, pkg-config
 , pcre
 , Security }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ pcre ];
   depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
            else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
            else if stdenv.isAarch32 then "arm"
            else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
+  GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 0;
 
@@ -83,8 +83,7 @@ stdenv.mkDerivation rec {
     ./all.bash
   '';
 
-  meta = with stdenv.lib; {
-    branch = "1.4";
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/go/2-dev.nix b/nixpkgs/pkgs/development/compilers/go/2-dev.nix
index 9af08dde19e8..3e09f7c0fad2 100644
--- a/nixpkgs/pkgs/development/compilers/go/2-dev.nix
+++ b/nixpkgs/pkgs/development/compilers/go/2-dev.nix
@@ -1,5 +1,5 @@
-{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
-, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
+{ pkgs, lib, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
+, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
 , mailcap, runtimeShell
 , buildPackages
 , pkgsBuildTarget
@@ -8,7 +8,7 @@
 
 let
 
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   };
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch procps ];
+  nativeBuildInputs = [ perl which pkg-config patch procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -184,7 +184,7 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+  GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
   # Hopefully avoids test timeouts on Hydra
@@ -251,8 +251,7 @@ stdenv.mkDerivation rec {
 
   disallowedReferences = [ goBootstrap ];
 
-  meta = with stdenv.lib; {
-    branch = "dev.go2go";
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/gprolog/default.nix b/nixpkgs/pkgs/development/compilers/gprolog/default.nix
index 0a1cc5128734..59f33db68cbd 100644
--- a/nixpkgs/pkgs/development/compilers/gprolog/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gprolog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "gprolog-1.4.5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z";
   };
 
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
+  hardeningDisable = lib.optional stdenv.isi686 "pic";
 
   patchPhase = ''
     sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/gprolog/";
     description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
     longDescription = ''
       GNU Prolog is a free Prolog compiler with constraint solving
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
       declarativity of logic programming.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.peti ];
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix b/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix
index 71f3b1560c67..76245a440817 100644
--- a/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix
+++ b/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }:
+{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }:
 
 let
   common = javaVersion:
@@ -111,7 +111,7 @@ let
                       "11" = "$out/lib/jli:$out/lib/server:$out/lib";
                     }.${javaVersion}
                  }:${
-            stdenv.lib.makeLibraryPath [
+            lib.makeLibraryPath [
               stdenv.cc.cc.lib # libstdc++.so.6
               zlib             # libz.so.1
             ]}"
@@ -128,7 +128,7 @@ let
 
         doInstallCheck = true;
         installCheckPhase = ''
-          echo ${stdenv.lib.escapeShellArg ''
+          echo ${lib.escapeShellArg ''
                    public class HelloWorld {
                      public static void main(String[] args) {
                        System.out.println("Hello World");
@@ -151,7 +151,7 @@ let
 
         passthru.home = graalvmXXX-ce;
 
-        meta = with stdenv.lib; {
+        meta = with lib; {
           homepage = "https://www.graalvm.org/";
           description = "High-Performance Polyglot VM";
           license = with licenses; [ upl gpl2Classpath bsd3 ];
diff --git a/nixpkgs/pkgs/development/compilers/graalvm/default.nix b/nixpkgs/pkgs/development/compilers/graalvm/default.nix
index 337e0f735ebe..fc30e37e4b7c 100644
--- a/nixpkgs/pkgs/development/compilers/graalvm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/graalvm/default.nix
@@ -270,7 +270,7 @@ in rec {
         --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
         --set    FINDBUGS_HOME ${findbugs}
     '';
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://github.com/graalvm/mx";
       description = "Command-line tool used for the development of Graal projects";
       license = licenses.gpl2;
@@ -527,7 +527,7 @@ in rec {
     enableParallelBuilding = true;
     passthru.home = graalvm8;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://github.com/oracle/graal";
       description = "High-Performance Polyglot VM";
       license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix b/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix
index 690bfdb425cf..c9c5206f6da3 100644
--- a/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
+{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
 
 let
   common = javaVersion:
@@ -124,7 +124,7 @@ let
                       "11" = "$out/lib/jli:$out/lib/server:$out/lib";
                     }.${javaVersion}
                  }:${
-            stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
+            lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
                                                  glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
 
           for f in $(find $out -type f -perm -0100); do
@@ -141,7 +141,7 @@ let
 
         doInstallCheck = true;
         installCheckPhase = ''
-          echo ${stdenv.lib.escapeShellArg ''
+          echo ${lib.escapeShellArg ''
                    public class HelloWorld {
                      public static void main(String[] args) {
                        System.out.println("Hello World");
@@ -167,7 +167,7 @@ let
 
         passthru.home = graalvmXXX-ee;
 
-        meta = with stdenv.lib; {
+        meta = with lib; {
           homepage = "https://www.graalvm.org/";
           description = "High-Performance Polyglot VM";
           license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix b/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
index 14bf940fadf1..e10d10120347 100644
--- a/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "gwt-java-2.4.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.gwtproject.org/";
     description = "A development toolkit for building and optimizing complex browser-based applications";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/haxe/default.nix b/nixpkgs/pkgs/development/compilers/haxe/default.nix
index a3110c0c1af1..584511923961 100644
--- a/nixpkgs/pkgs/development/compilers/haxe/default.nix
+++ b/nixpkgs/pkgs/development/compilers/haxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:
+{ lib, stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:
 
 let inherit (ocamlPackages) ocaml camlp4; in
 
@@ -74,7 +74,7 @@ let
         popd > /dev/null
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
         homepage = "https://haxe.org";
         license = with licenses; [ gpl2 bsd2 /*?*/ ];  # -> docs/license.txt
diff --git a/nixpkgs/pkgs/development/compilers/hhvm/default.nix b/nixpkgs/pkgs/development/compilers/hhvm/default.nix
index 08ba9e468147..d8495977e780 100644
--- a/nixpkgs/pkgs/development/compilers/hhvm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/hhvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached
+{ lib, stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached
 , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ cmake pkg-config flex bison ];
   buildInputs =
-    [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
-      libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
+    [ boost libunwind libmysqlclient libmemcached pcre gdb git perl
+      libevent gd curl libxml2 icu openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
       gmp libyaml libedit libvpx imagemagick fribidi gperf which
@@ -31,7 +32,6 @@ stdenv.mkDerivation rec {
     ./flexible-array-members-gcc6.patch
   ];
 
-  enableParallelBuilding = true;
   dontUseCmakeBuildDir = true;
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
 
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://hhvm.com";
     license     = "PHP/Zend";
     platforms   = [ "x86_64-linux" ];
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    maintainers = [ lib.maintainers.thoughtpolice ];
     broken = true; # Since 2018-04-21, see https://hydra.nixos.org/build/73059373
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/hop/default.nix b/nixpkgs/pkgs/development/compilers/hop/default.nix
index fd3ef137ae60..8e5bd6a7df03 100644
--- a/nixpkgs/pkgs/development/compilers/hop/default.nix
+++ b/nixpkgs/pkgs/development/compilers/hop/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, bigloo }:
+{ lib, stdenv, fetchurl, bigloo }:
 
 # Compute the “release” version of bigloo (before the first dash, if any)
 let bigloo-release =
-  let inherit (stdenv.lib) head splitString; in
+  let inherit (lib) head splitString; in
   head (splitString "-" (builtins.parseDrvName bigloo.name).version)
 ; in
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-tier programming language for the Web 2.0 and the so-called diffuse Web";
     homepage = "http://hop.inria.fr/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/compilers/iasl/default.nix b/nixpkgs/pkgs/development/compilers/iasl/default.nix
index d68fba1d624c..fb6bd41344ad 100644
--- a/nixpkgs/pkgs/development/compilers/iasl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/iasl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch, bison, flex}:
+{lib, stdenv, fetchurl, fetchpatch, bison, flex}:
 
 stdenv.mkDerivation rec {
   pname = "iasl";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Intel ACPI Compiler";
     homepage = "http://www.acpica.org/";
-    license = stdenv.lib.licenses.iasl;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.iasl;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/idris2/default.nix b/nixpkgs/pkgs/development/compilers/idris2/default.nix
index 275c29444621..ec0d8fe5c727 100644
--- a/nixpkgs/pkgs/development/compilers/idris2/default.nix
+++ b/nixpkgs/pkgs/development/compilers/idris2/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , clang, chez
 }:
 
 # Uses scheme to bootstrap the build of idris2
 stdenv.mkDerivation rec {
   pname = "idris2";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "idris-lang";
     repo = "Idris2";
     rev = "v${version}";
-    sha256 = "18m483vccijfh9z6x4zgi37fql3q765x3ypkwixv3rwq9nxnd6hm";
+    sha256 = "0sa2lpb7n6xqfknwld9rzm4bnb6qcd0ja1n63cnc5v8wdzr8q7kh";
   };
 
   strictDeps = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "OS=";
+    ++ lib.optional stdenv.isDarwin "OS=";
 
   # The name of the main executable of pkgs.chez is `scheme`
   buildFlags = [ "bootstrap-build" "SCHEME=scheme" ];
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A purely functional programming language with first class types";
     homepage = "https://github.com/idris-lang/Idris2";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ wchresta ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ wchresta ];
     inherit (chez.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/inform6/default.nix b/nixpkgs/pkgs/development/compilers/inform6/default.nix
index 1d339a2b14bf..f0c182f02077 100644
--- a/nixpkgs/pkgs/development/compilers/inform6/default.nix
+++ b/nixpkgs/pkgs/development/compilers/inform6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "inform6";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interactive fiction compiler and libraries";
     longDescription = ''
       Inform 6 is a C-like programming language for writing interactive fiction
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/DavidGriffith/inform6unix";
     changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS";
     license = licenses.artistic2;
-    maintainers = with stdenv.lib.maintainers; [ ddelabru ];
+    maintainers = with lib.maintainers; [ ddelabru ];
     platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/inform7/default.nix b/nixpkgs/pkgs/development/compilers/inform7/default.nix
index 8e5f02e792d6..80349b7e6dac 100644
--- a/nixpkgs/pkgs/development/compilers/inform7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/inform7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }:
+{ lib, stdenv, fetchzip, coreutils, perl, gnutar, gzip }:
 let
   version = "6M62";
 in stdenv.mkDerivation {
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
       --replace "/usr/bin/perl" "${perl}/bin/perl"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A design system for interactive fiction";
     homepage = "http://inform7.com/";
     license = licenses.artistic2;
diff --git a/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
index 8ca85817f9e4..ebba160fc95a 100644
--- a/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
-, pkgconfig
+, pkg-config
 
 , bison
 , flex
@@ -19,7 +19,7 @@ let
   };
   inherit (llvmPkgs) llvm;
   inherit (if buildWithPatches then opencl-clang else llvmPkgs) clang clang-unwrapped spirv-llvm-translator;
-  inherit (stdenv.lib) getVersion optional optionals versionOlder versions;
+  inherit (lib) getVersion optional optionals versionOlder versions;
 in
 
 stdenv.mkDerivation rec {
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/intel/intel-graphics-compiler";
     description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/compilers/intercal/default.nix b/nixpkgs/pkgs/development/compilers/intercal/default.nix
index 8b91e3f2c6d8..d696b6801ed5 100644
--- a/nixpkgs/pkgs/development/compilers/intercal/default.nix
+++ b/nixpkgs/pkgs/development/compilers/intercal/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl
-, pkgconfig
+{ lib, stdenv, fetchurl
+, pkg-config
 , bison, flex
 , makeWrapper }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "intercal";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-  [ pkgconfig bison flex makeWrapper ];
+  [ pkg-config bison flex makeWrapper ];
 
   # Intercal invokes gcc, so we need an explicit PATH
   postInstall = ''
diff --git a/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
index e64c0c912d94..cabdbd9dcc01 100644
--- a/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, clang,
+{ lib, stdenv, git, clang,
   fetchFromGitHub, requireFile,
   openssl, xz, gnutar,
   automake, autoconf, libtool, clangStdenv } :
@@ -57,9 +57,9 @@ clangStdenv.mkDerivation rec {
   meta = {
     description =
     "Provides an iOS cross compiler from 7.1 up to iOS-${version} and ldid";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
     hydraPlatforms = [];
-    maintainers = with stdenv.lib.maintainers; [ fxfactorial ];
-    license = stdenv.lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ fxfactorial ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix
index 01e1eaca6e1d..d1ac7bcd0efe 100644
--- a/nixpkgs/pkgs/development/compilers/ispc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, which, m4, python3, bison, flex, llvmPackages
 
   # the default test target is sse4, but that is not supported by all Hydra agents
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     "-DARM_ENABLED=FALSE"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://ispc.github.io/";
     description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/jasmin/default.nix b/nixpkgs/pkgs/development/compilers/jasmin/default.nix
index 7defdc5c689b..c61f267bf1af 100644
--- a/nixpkgs/pkgs/development/compilers/jasmin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jasmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , unzip
 , jdk8
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     minimal-module = callPackage ./test-assemble-hello-world {};
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An assembler for the Java Virtual Machine";
     homepage = "http://jasmin.sourceforge.net/";
     downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download";
diff --git a/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix
index 5b691530d34b..88371406387c 100644
--- a/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix
+++ b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook
+{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook
 , pcsclite
 }:
 
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
       For more details, please refer to the documentation by Oracle
     '';
     homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.ekleog ];
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.ekleog ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
index fd3270fa0d08..2edf93b7fc02 100644
--- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, openjdk11, fetchFromGitHub, jetbrains }:
+{ lib, stdenv, openjdk11, fetchFromGitHub, jetbrains }:
 
 openjdk11.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk";
@@ -6,11 +6,11 @@ openjdk11.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "JetBrains";
     repo = "JetBrainsRuntime";
-    rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}";
+    rev = "jb${lib.replaceStrings ["."] ["_"] version}";
     sha256 = "1gxqi6dkyriv9j29ppan638w1ns2g9m4q1sq7arf9kwqr05zim90";
   };
   patches = [];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenJDK fork to better support Jetbrains's products.";
     longDescription = ''
      JetBrains Runtime is a runtime environment for running IntelliJ Platform
diff --git a/nixpkgs/pkgs/development/compilers/julia/1.0.nix b/nixpkgs/pkgs/development/compilers/julia/1.0.nix
index a98b69f50e9f..98d7ce90de3b 100644
--- a/nixpkgs/pkgs/development/compilers/julia/1.0.nix
+++ b/nixpkgs/pkgs/development/compilers/julia/1.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, fetchzip
+{ lib, stdenv, fetchpatch, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , cmake
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     pcre2.dev blas lapack openlibm openspecfun readline utf8proc
     zlib
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+  ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
   ;
 
   patches = [
@@ -121,9 +121,9 @@ stdenv.mkDerivation rec {
 
   makeFlags =
     let
-      arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
+      arch = lib.head (lib.splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
@@ -166,13 +166,11 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_ZLIB=1"
     ];
 
-  LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (stdenv.lib.makeLibraryPath [
+  LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (lib.makeLibraryPath [
     arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm
     openspecfun pcre2
   ]);
 
-  enableParallelBuilding = true;
-
   doCheck = !stdenv.isDarwin;
   checkTarget = "testall";
   # Julia's tests require read/write access to $HOME
@@ -206,8 +204,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "https://julialang.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ raskin rob garrison ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/julia/1.3.nix b/nixpkgs/pkgs/development/compilers/julia/1.3.nix
index 406ea73f2aed..da60fa8b9888 100644
--- a/nixpkgs/pkgs/development/compilers/julia/1.3.nix
+++ b/nixpkgs/pkgs/development/compilers/julia/1.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , cmake
@@ -14,7 +14,7 @@
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
-with stdenv.lib;
+with lib;
 
 let
   majorVersion = "1";
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     pcre2.dev blas lapack openlibm openspecfun readline utf8proc
     zlib
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+  ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
   ;
 
   nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
@@ -119,8 +119,6 @@ stdenv.mkDerivation rec {
     openspecfun pcre2 lapack
   ];
 
-  enableParallelBuilding = true;
-
   # Other versions of Julia pass the tests, but we are not sure why these fail.
   doCheck = false;
   checkTarget = "testall";
@@ -155,8 +153,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "https://julialang.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ raskin rob garrison ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     broken = stdenv.isi686;
   };
diff --git a/nixpkgs/pkgs/development/compilers/julia/1.5.nix b/nixpkgs/pkgs/development/compilers/julia/1.5.nix
index 151cf83cecef..a523336b7b92 100644
--- a/nixpkgs/pkgs/development/compilers/julia/1.5.nix
+++ b/nixpkgs/pkgs/development/compilers/julia/1.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , cmake
@@ -14,7 +14,7 @@
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
-with stdenv.lib;
+with lib;
 
 let
   majorVersion = "1";
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     arpack fftw fftwSinglePrec libgit2 libunwind mpfr
     pcre2.dev blas lapack openlibm openspecfun readline utf8proc
     zlib
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices];
+  ] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices];
 
   nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ];
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
@@ -119,8 +119,6 @@ stdenv.mkDerivation rec {
     openspecfun pcre2 lapack
   ];
 
-  enableParallelBuilding = true;
-
   # Julia's tests require read/write access to $HOME
   preCheck = ''
     export HOME="$NIX_BUILD_TOP"
@@ -152,8 +150,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "https://julialang.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ raskin rob garrison ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
     broken = stdenv.isi686;
   };
diff --git a/nixpkgs/pkgs/development/compilers/jwasm/default.nix b/nixpkgs/pkgs/development/compilers/jwasm/default.nix
index 8ce55c757959..2f1727ae0de0 100644
--- a/nixpkgs/pkgs/development/compilers/jwasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jwasm/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "jwasm";
   version = "2.13";
diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix
index 934c9a848b92..cd613c1b33be 100644
--- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, unzip }:
+{ lib, stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
   version = "1.4.21";
@@ -38,9 +38,9 @@ in stdenv.mkDerivation {
       and has external contributors.
     '';
     homepage = "https://kotlinlang.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers;
       [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ldc/generic.nix b/nixpkgs/pkgs/development/compilers/ldc/generic.nix
index 214d64cfa76b..4261c2b65334 100644
--- a/nixpkgs/pkgs/development/compilers/ldc/generic.nix
+++ b/nixpkgs/pkgs/development/compilers/ldc/generic.nix
@@ -1,5 +1,5 @@
 { version, ldcSha256 }:
-{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
+{ lib, stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
 , libconfig, lit, gdb, unzip, darwin, bash
 , callPackage, makeWrapper, runCommand, targetPackages
 , ldcBootstrap ? callPackage ./bootstrap.nix { }
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
   pname = "ldc";
   inherit version;
 
-  enableParallelBuilding = true;
-
   src = fetchurl {
     url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
     sha256 = ldcSha256;
@@ -39,7 +37,7 @@ stdenv.mkDerivation rec {
       # test depends on current year
       rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # https://github.com/NixOS/nixpkgs/issues/34817
       rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
   '';
@@ -48,20 +46,20 @@ stdenv.mkDerivation rec {
     # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow
     substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
       substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
   '';
 
   nativeBuildInputs = [
     cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip
   ]
-  ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Foundation
   ]
-  ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
     gdb
   ];
@@ -79,7 +77,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DMD=$DMD" ];
 
-  fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin  ''
+  fixNames = lib.optionalString stdenv.hostPlatform.isDarwin  ''
     fixDarwinDylibNames() {
       local flags=()
 
@@ -99,7 +97,7 @@ stdenv.mkDerivation rec {
   '';
 
   # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746
-  additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin
+  additionalExceptions = lib.optionalString stdenv.hostPlatform.isDarwin
     "|druntime-test-shared";
 
   checkPhase = ''
@@ -128,7 +126,7 @@ stdenv.mkDerivation rec {
         --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
    '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The LLVM-based D compiler";
     homepage = "https://github.com/ldc-developers/ldc";
     # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix
index fef7720d726d..35b7ab313d8e 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,8 +19,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 lld ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
@@ -28,7 +28,7 @@ let
       "-DCMAKE_CXX_FLAGS=-std=c++14"
       "-DCLANGD_BUILD_XPC=OFF"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -49,9 +49,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -82,8 +82,6 @@ let
       rm $out/bin/c-index-test
     '';
 
-    enableParallelBuilding = true;
-
     passthru = {
       isClang = true;
       inherit llvm;
@@ -92,10 +90,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix
index e6882cbabb8b..37515b5039d8 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetch pname "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation rec {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ -62,13 +62,13 @@ stdenv.mkDerivation rec {
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -78,14 +78,13 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
     ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
   '';
 
-  enableParallelBuilding = true;
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix
index 3d2cb3544b9f..978f28956664 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -26,8 +26,6 @@ let
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
@@ -101,15 +99,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -161,12 +159,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -175,12 +173,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -188,7 +186,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix
index 3511783be896..a3fb09273451 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   preConfigure = ''
     # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -31,15 +31,13 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
-
-  enableParallelBuilding = true;
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -48,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix
index 7335d06e4fe3..61f778fbc55d 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -9,15 +9,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -61,8 +61,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix
index 75e42260b7fa..f0f45780a22c 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -10,7 +10,5 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix
index 5d513462820e..a94c1b5b0dd3 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix
index c728efeb2a9b..e7dd48a23ce7 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
   patches = [ ./lldb-procfs.patch ];
 
   nativeBuildInputs = [ cmake python3 which swig lit ]
-    ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+    ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
 
   buildInputs = [
     ncurses
@@ -34,7 +34,7 @@ stdenv.mkDerivation (rec {
     libxml2
     llvm
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     darwin.libobjc
     darwin.apple_sdk.libs.xpc
     darwin.apple_sdk.frameworks.Foundation
@@ -49,18 +49,16 @@ stdenv.mkDerivation (rec {
     "-DLLVM_ENABLE_RTTI=OFF"
     "-DClang_DIR=${clang-unwrapped}/lib/cmake"
     "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
-  ] ++ stdenv.lib.optionals enableManpages [
+  ] ++ lib.optionals enableManpages [
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
     "-DSPHINX_OUTPUT_HTML=OFF"
   ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     # Editor support
     # vscode:
@@ -69,13 +67,13 @@ stdenv.mkDerivation (rec {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage = "https://lldb.llvm.org";
     license = licenses.ncsa;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "lldb-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix
index 7394d4033d21..e951375a833e 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -22,10 +22,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitString "." release_version));
 
 in stdenv.mkDerivation (rec {
@@ -154,17 +154,15 @@ in stdenv.mkDerivation (rec {
 
   checkTarget = "check-all";
 
-  enableParallelBuilding = true;
-
   requiredSystemFeatures = [ "big-parallel" ];
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix
index 0927448d2b49..2946c51fafe2 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
@@ -15,12 +16,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
index 2de5f65b4a13..3a3e384ad982 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -8,27 +8,27 @@ let
     pname = "clang";
     inherit version;
 
-    src = fetch "clang" "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg";
+    src = fetch "clang" "0kab4zmkxffg98a3rx95756jlwhxflalin5w05g1anpwxv175xbk";
     inherit clang-tools-extra_src;
 
     unpackPhase = ''
       unpackFile $src
-      mv clang-${version}* clang
+      mv clang-* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
     nativeBuildInputs = [ cmake python3 lld ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++14"
       "-DCLANGD_BUILD_XPC=OFF"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -48,9 +48,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -81,8 +81,6 @@ let
       rm $out/bin/c-index-test
     '';
 
-    enableParallelBuilding = true;
-
     passthru = {
       isClang = true;
       inherit llvm;
@@ -91,10 +89,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix
index b8a5fcd5661c..091f327550b8 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -11,10 +11,10 @@ in
 stdenv.mkDerivation rec {
   pname = "compiler-rt";
   inherit version;
-  src = fetch pname "0d5j5l8phwqjjscmk8rmqn0i2i0abl537gdbkagl8fjpzy1gyjip";
+  src = fetch pname "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation rec {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [
+  ] ++ lib.optionals (stdenv.isDarwin) [
     "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
   ];
 
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ./compiler-rt-X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ -59,15 +59,15 @@ stdenv.mkDerivation rec {
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -77,14 +77,13 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
     ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
   '';
 
-  enableParallelBuilding = true;
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
index e6765ec68990..ca9ef4382b4b 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -6,18 +6,20 @@
 }:
 
 let
-  release_version = "11.0.0";
-  version = release_version; # differentiating these (variables) is important for RCs
+  release_version = "11.0.1";
+  candidate = ""; # empty or "rcN"
+  dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
+  version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
   targetConfig = stdenv.targetPlatform.config;
 
   fetch = name: sha256: fetchurl {
-    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
+    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "02bcwwn54661madhq4nxc069s7p7pj5gpqi8ww50w3anbpviilzy";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -26,8 +28,6 @@ let
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
@@ -101,15 +101,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -161,12 +161,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -175,12 +175,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -188,7 +188,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix
index 5c3ec87617c9..7a34977afe24 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   pname = "libc++";
   inherit version;
 
-  src = fetch "libcxx" "0ylbkcd38zrrz9xmkq9na3d9s8d96hc286dwfwd73wi205lyc7kc";
+  src = fetch "libcxx" "0gaybwkn76vhakvipxslp7pmv2wm7agxkqwk5f5aizhzc9lzdmcz";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     mv llvm-* llvm
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
     patchShebangs utils/cat_files.py
@@ -28,15 +28,13 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
-
-  enableParallelBuilding = true;
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -45,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix
index d173b1735cbe..22e4ac4abe4c 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -6,18 +6,18 @@ stdenv.mkDerivation {
   pname = "libc++abi";
   inherit version;
 
-  src = fetch "libcxxabi" "05ac7rkjbla03bc0lf92f901dfjgxdvp8cr9fpn59a5p4x27ssaq";
+  src = fetch "libcxxabi" "0gv8pxq95gvsybldj21hdfkmm0r5cn1z7jhd72l231n0lmb70saa";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -28,11 +28,11 @@ stdenv.mkDerivation {
     mv libcxx-* libcxx
     unpackFile ${llvm.src}
     mv llvm-* llvm
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d llvm -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -62,8 +62,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix
index b22da214417f..1b5fe0f57880 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -6,11 +6,9 @@ stdenv.mkDerivation rec {
   pname = "libunwind";
   inherit version;
 
-  src = fetch pname "0bwjd2xf51r2apn8p0f9shb6nc8hnqzq1n9gggjvyjmi6cf02mc4";
+  src = fetch pname "0zsixkaiwp007afxlpsf5dc7wfrv8sj9wxzjw6f1r4bjv1rv3cvd";
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix
index 20eb87c548f6..cead886f49b7 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -10,15 +10,13 @@ stdenv.mkDerivation rec {
   pname = "lld";
   inherit version;
 
-  src = fetch pname "077xyh7sij6mhp4dc4kdcmp9whrpz332fa12rwxnzp3wgd5bxrzg";
+  src = fetch pname "1dq82dkam8x2niha18v7ckh30zmzyclydzipqkf7h41r3ah0vfk0";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
 
   outputs = [ "out" "dev" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix
index 0ae55d45349a..fcc73cfdeb6d 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -20,12 +20,12 @@ stdenv.mkDerivation (rec {
   pname = "lldb";
   inherit version;
 
-  src = fetch pname "0wic9lyb2la9bkzdc13szkm4f793w1mddp50xvh237iraygw0w45";
+  src = fetch pname "1yzjbsn81l2r3v9js2fxrglkwvz1f2rxyxh6430nydbrs0bqklz8";
 
   patches = [ ./lldb-procfs.patch ];
 
   nativeBuildInputs = [ cmake python3 which swig lit ]
-    ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+    ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
 
   buildInputs = [
     ncurses
@@ -34,7 +34,7 @@ stdenv.mkDerivation (rec {
     libxml2
     llvm
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     darwin.libobjc
     darwin.apple_sdk.libs.xpc
     darwin.apple_sdk.frameworks.Foundation
@@ -49,18 +49,16 @@ stdenv.mkDerivation (rec {
     "-DLLVM_ENABLE_RTTI=OFF"
     "-DClang_DIR=${clang-unwrapped}/lib/cmake"
     "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
-  ] ++ stdenv.lib.optionals enableManpages [
+  ] ++ lib.optionals enableManpages [
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
     "-DSPHINX_OUTPUT_HTML=OFF"
   ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     # Editor support
     # vscode:
@@ -69,13 +67,13 @@ stdenv.mkDerivation (rec {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage = "https://lldb.llvm.org";
     license = licenses.ncsa;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "lldb-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
index c2b70a149bf5..868da1a5b207 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -22,22 +22,22 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitString "." release_version));
 
 in stdenv.mkDerivation (rec {
   pname = "llvm";
   inherit version;
 
-  src = fetch pname "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi";
-  polly_src = fetch "polly" "0h442ivcslr3dv3q3g1nw5avh77f8cxsp6zild1hgspj266xpynw";
+  src = fetch pname "0a5mb65xa5bal8q6cb37xgkqis2bip87fsafgq3wbsva9cjprn6c";
+  polly_src = fetch "polly" "1smrqm9s0r2g9h0v0nil6y9wn2ih4l5bddk4dhgn538ngc7cxpq8";
 
   unpackPhase = ''
     unpackFile $src
-    mv llvm-${version}* llvm
+    mv llvm-${release_version}* llvm
     sourceRoot=$PWD/llvm
   '' + optionalString enablePolly ''
     unpackFile $polly_src
@@ -122,7 +122,7 @@ in stdenv.mkDerivation (rec {
     "-DCAN_TARGET_i386=false"
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DCMAKE_CROSSCOMPILING=True"
-    "-DLLVM_TABLEGEN=${buildPackages.llvm_10}/bin/llvm-tblgen"
+    "-DLLVM_TABLEGEN=${buildPackages.llvm_11}/bin/llvm-tblgen"
   ];
 
   postBuild = ''
@@ -152,21 +152,19 @@ in stdenv.mkDerivation (rec {
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
   '';
 
-  doCheck = stdenv.isLinux && (!stdenv.isx86_32);
+  doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl);
 
   checkTarget = "check-all";
 
-  enableParallelBuilding = true;
-
   requiredSystemFeatures = [ "big-parallel" ];
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix
index 5fd6c62840db..5503a98ae5f6 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
@@ -10,17 +11,15 @@ stdenv.mkDerivation rec {
   pname = "openmp";
   inherit version;
 
-  src = fetch pname "0k389d0g9zlfyzh1kpb3i5jdawzpn0hrdxzbjinpvdv7rbw4sw1d";
+  src = fetch pname "19rcv25y41ww3zlfg0lwprzijl3cn7jgc0v5540jzpp7j0ds45ad";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix
index b5e7b54fa5be..21961f4f0413 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,15 +19,15 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -44,7 +44,7 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
     '';
 
@@ -72,8 +72,6 @@ let
       rm $out/bin/c-index-test
     '';
 
-    enableParallelBuilding = true;
-
     passthru = {
       isClang = true;
       inherit llvm;
@@ -82,10 +80,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 41f2b24b057e..909c6b190536 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,19 +53,19 @@ stdenv.mkDerivation {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ../7/compiler-rt-glibc.patch
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -75,14 +75,13 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
     ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o
   '';
 
-  enableParallelBuilding = true;
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix
index 36495249d16f..f03325cd4270 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
@@ -75,7 +73,7 @@ let
     lldb = callPackage ./lldb.nix {};
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix
index 9bebedbc0442..164836e1a4ce 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
     ../../libcxx-0001-musl-hacks.patch
   ];
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isMusl python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -35,9 +35,7 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
-
-  enableParallelBuilding = true;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
 
   passthru = {
     isLLVM = true;
@@ -46,7 +44,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix
index 96d6e78e01e4..8fc9ef9fded8 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
   pname = "libc++abi";
@@ -7,15 +7,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix
index 3d9ed6ee6635..244960cf41ba 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , llvm
@@ -16,8 +16,6 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
@@ -26,8 +24,8 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
     badPlatforms = [ "x86_64-darwin" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix
index e827f76231f1..61a9e60391c8 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
@@ -51,14 +51,12 @@ stdenv.mkDerivation {
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
   ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     mkdir -p $out/share/man/man1
     cp ../docs/lldb.1 $out/share/man/man1/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix
index 987e6258527a..c91e94204352 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -17,7 +17,7 @@
 
 let
   # Used when creating a versioned symlinks of libLLVM.dylib
-  versionSuffixes = with stdenv.lib;
+  versionSuffixes = with lib;
     let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
@@ -35,10 +35,10 @@ stdenv.mkDerivation ({
   '';
 
   outputs = [ "out" "python" ]
-    ++ stdenv.lib.optional enableSharedLibraries "lib";
+    ++ lib.optional enableSharedLibraries "lib";
 
   nativeBuildInputs = [ cmake python3 ]
-    ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+    ++ lib.optional enableManpages python3.pkgs.sphinx;
 
   buildInputs = [ libxml2 libffi ];
 
@@ -58,13 +58,13 @@ stdenv.mkDerivation ({
     #  stripLen = 1;
     #})
   ];
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/modules/AddLLVM.cmake \
       --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
       --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
   ''
   # Patch llvm-config to return correct library path based on --link-{shared,static}.
-  + stdenv.lib.optionalString (enableSharedLibraries) ''
+  + lib.optionalString (enableSharedLibraries) ''
     substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
     patch -p1 < ./llvm-outputs.patch
   '' + ''
@@ -72,9 +72,9 @@ stdenv.mkDerivation ({
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "Path.cpp" ""
     rm unittests/Support/Path.cpp
-  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
+  '' + lib.optionalString stdenv.isAarch64 ''
     patch -p0 < ${../aarch64.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../TLI-musl.patch}
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
@@ -98,18 +98,18 @@ stdenv.mkDerivation ({
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
   ]
-  ++ stdenv.lib.optional enableSharedLibraries
+  ++ lib.optional enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"
-  ++ stdenv.lib.optionals enableManpages [
+  ++ lib.optionals enableManpages [
     "-DLLVM_BUILD_DOCS=ON"
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
     "-DSPHINX_OUTPUT_HTML=OFF"
     "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
   ]
-  ++ stdenv.lib.optional (!isDarwin)
+  ++ lib.optional (!isDarwin)
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
-  ++ stdenv.lib.optionals (isDarwin) [
+  ++ lib.optionals (isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
   ];
@@ -126,18 +126,18 @@ stdenv.mkDerivation ({
     mkdir -p $python/share
     mv $out/share/opt-viewer $python/share/opt-viewer
   ''
-  + stdenv.lib.optionalString enableSharedLibraries ''
+  + lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
   ''
-  + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+  + lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
-    ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+    ${lib.concatMapStringsSep "\n" (v: ''
       ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
     '') versionSuffixes}
   '';
@@ -146,17 +146,15 @@ stdenv.mkDerivation ({
 
   checkTarget = "check-all";
 
-  enableParallelBuilding = true;
-
   requiredSystemFeatures = [ "big-parallel" ];
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix
index da328de24d13..169c9c50324e 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
@@ -15,12 +16,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix
index ec3effebfd77..41202dd3f5dc 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,15 +19,15 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -44,7 +44,7 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
     '';
 
@@ -72,8 +72,6 @@ let
       rm $out/bin/c-index-test
     '';
 
-    enableParallelBuilding = true;
-
     passthru = {
       isClang = true;
       inherit llvm;
@@ -82,10 +80,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix
index 8bd61f5d7f70..6e47ffe8acaf 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,21 +53,21 @@ stdenv.mkDerivation {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ../7/compiler-rt-glibc.patch
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -77,14 +77,13 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
     ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o
   '';
 
-  enableParallelBuilding = true;
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
index 4c2e87ec5e1a..a98314d1181f 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
@@ -75,7 +73,7 @@ let
     lldb = callPackage ./lldb.nix {};
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix
index 727a32260872..ac489db54fcf 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
     ../../libcxx-0001-musl-hacks.patch
   ];
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isMusl python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -35,9 +35,7 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
-
-  enableParallelBuilding = true;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
 
   passthru = {
     isLLVM = true;
@@ -46,7 +44,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix
index 246bc6153e59..6e99f2d287a6 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
   pname = "libc++abi";
@@ -7,15 +7,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix
index 81b94df31194..b80385248059 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -17,8 +17,6 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
@@ -27,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix
index 629749e10f3c..7c6f8b1bd979 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
@@ -51,14 +51,12 @@ stdenv.mkDerivation {
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
   ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     mkdir -p $out/share/man/man1
     cp ../docs/lldb.1 $out/share/man/man1/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix
index 22dbb75d2d50..7d429e3ecf30 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -17,10 +17,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a versioned symlinks of libLLVM.dylib
-  versionSuffixes = with stdenv.lib;
+  versionSuffixes = with lib;
     let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
@@ -136,7 +136,7 @@ stdenv.mkDerivation ({
   + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
-    ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+    ${lib.concatMapStringsSep "\n" (v: ''
       ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
     '') versionSuffixes}
   '';
@@ -145,17 +145,15 @@ stdenv.mkDerivation ({
 
   checkTarget = "check-all";
 
-  enableParallelBuilding = true;
-
   requiredSystemFeatures = [ "big-parallel" ];
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix
index c1a4480a5524..9de18065918c 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
@@ -15,12 +16,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix
index 969938681fe9..4ab13441e36f 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -20,21 +20,21 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm lld ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++ stdenv.lib.optionals enablePolly [
+    ] ++ lib.optionals enablePolly [
       "-DWITH_POLLY=ON"
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
@@ -52,9 +52,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -83,8 +83,6 @@ let
       rm $out/bin/c-index-test
     '';
 
-    enableParallelBuilding = true;
-
     passthru = {
       isClang = true;
       inherit llvm;
@@ -93,10 +91,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix
index ec9b7e6e6ad4..6320a3405d27 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -55,22 +55,22 @@ stdenv.mkDerivation {
     ./compiler-rt-glibc.patch
 
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
+    ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -80,14 +80,13 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
     ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o
   '';
 
-  enableParallelBuilding = true;
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix
index 3dd067ae607e..111ccbb9a38b 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
@@ -103,9 +101,9 @@ let
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -157,7 +155,7 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
@@ -172,12 +170,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix
index ed4192a232e3..fb50c4e24d72 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isMusl python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ] ;
 
@@ -36,10 +36,8 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"
-  ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ;
-
-  enableParallelBuilding = true;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"
+  ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ;
 
   passthru = {
     isLLVM = true;
@@ -48,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix
index 4c46aeaa1910..61879be91dad 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, llvm, version
 , standalone ? false
   # on musl the shared objects don't build
 , enableShared ? !stdenv.hostPlatform.isStatic
@@ -16,15 +16,15 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*) )
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
   cmakeFlags =
-     stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
-     stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
+     lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
+     lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
 
   installPhase = if stdenv.isDarwin
     then ''
@@ -42,17 +42,17 @@ stdenv.mkDerivation {
     else ''
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
-      ${stdenv.lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"}
+      ${lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"}
       install -m 644 ../include/cxxabi.h $out/include
-      ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"}
-      ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"}
+      ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"}
+      ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"}
     '';
 
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix
index bee9202ed6c1..f4c58abef8a3 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -17,8 +17,6 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
@@ -27,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix
index 8fadd3cf7849..3fa5b411f634 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake perl python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
 
   postPatch = ''
@@ -50,16 +50,14 @@ stdenv.mkDerivation {
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
-
-  enableParallelBuilding = true;
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
 
   postInstall = ''
     mkdir -p $out/share/man/man1
     cp ../docs/lldb.1 $out/share/man/man1/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
index dc57d0d6bd5c..2d6f0d187226 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -23,10 +23,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a versioned symlinks of libLLVM.dylib
-  versionSuffixes = with stdenv.lib;
+  versionSuffixes = with lib;
     let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 
@@ -158,7 +158,7 @@ in stdenv.mkDerivation ({
   + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
-    ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+    ${lib.concatMapStringsSep "\n" (v: ''
       ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
     '') versionSuffixes}
   '';
@@ -167,17 +167,15 @@ in stdenv.mkDerivation ({
 
   checkTarget = "check-all";
 
-  enableParallelBuilding = true;
-
   requiredSystemFeatures = [ "big-parallel" ];
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix
index 898d49dce834..53f52c326c55 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
@@ -15,12 +16,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix
index 5c1dca5e33b1..8f44ffc0615d 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -20,8 +20,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm lld ];
 
@@ -29,13 +29,13 @@ let
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DCLANGD_BUILD_XPC=OFF"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++ stdenv.lib.optionals enablePolly [
+    ] ++ lib.optionals enablePolly [
       "-DWITH_POLLY=ON"
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
@@ -62,9 +62,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -93,8 +93,6 @@ let
       rm $out/bin/c-index-test
     '';
 
-    enableParallelBuilding = true;
-
     passthru = {
       isClang = true;
       inherit llvm;
@@ -103,10 +101,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 3c6265c4fca0..2e49ef17346d 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,22 +53,22 @@ stdenv.mkDerivation {
   patches = [
     ../7/compiler-rt-glibc.patch
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -78,14 +78,13 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
     ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
   '';
 
-  enableParallelBuilding = true;
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix
index 6e80737f32ad..313b97455e50 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
@@ -100,15 +98,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -160,12 +158,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -174,12 +172,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -187,7 +185,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix
index 2ed54a22069b..70e4d9e1a65e 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -35,15 +35,13 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
-
-  enableParallelBuilding = true;
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -52,7 +50,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix
index 50a38dfa967b..5a74981eba8b 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -9,15 +9,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -61,8 +61,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix
index 3295d3922034..d1bd54fbd349 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -21,7 +21,5 @@ stdenv.mkDerivation {
     })
   ];
 
-  enableParallelBuilding = true;
-
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix
index ba9cf3c57d77..8009beb7bc13 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -17,8 +17,6 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
@@ -27,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix
index 298ce737fc73..83c171d2a572 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
@@ -41,8 +41,6 @@ stdenv.mkDerivation {
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
   ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     mkdir -p $out/share/man/man1
     cp ../docs/lldb.1 $out/share/man/man1/
@@ -52,7 +50,7 @@ stdenv.mkDerivation {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix
index fb928b67ad54..9c2c3416aeab 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -23,10 +23,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitVersion release_version));
 
 in stdenv.mkDerivation ({
@@ -151,17 +151,15 @@ in stdenv.mkDerivation ({
 
   checkTarget = "check-all";
 
-  enableParallelBuilding = true;
-
   requiredSystemFeatures = [ "big-parallel" ];
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix
index 42cc7adf4f00..b5d75d9c8724 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
@@ -15,12 +16,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix
index cfaee05944ca..87b29163f43e 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -20,8 +20,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm lld ];
 
@@ -29,13 +29,13 @@ let
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DCLANGD_BUILD_XPC=OFF"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++ stdenv.lib.optionals enablePolly [
+    ] ++ lib.optionals enablePolly [
       "-DWITH_POLLY=ON"
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
@@ -55,9 +55,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -88,8 +88,6 @@ let
       rm $out/bin/c-index-test
     '';
 
-    enableParallelBuilding = true;
-
     passthru = {
       isClang = true;
       inherit llvm;
@@ -98,10 +96,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 13b0b522771f..2ab9dc8ffa2e 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation rec {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,21 +53,21 @@ stdenv.mkDerivation rec {
   patches = [
     ../7/compiler-rt-glibc.patch
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -77,14 +77,12 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
     ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
   '';
-
-  enableParallelBuilding = true;
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix
index 6f5bdb8e8cc1..dfb4981a5b75 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
@@ -100,15 +98,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -160,12 +158,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -174,12 +172,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -187,7 +185,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix
index f5c3d21e7f1a..6ea1e28e7b4b 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   preConfigure = ''
     # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -31,15 +31,13 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
-
-  enableParallelBuilding = true;
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -48,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi.nix
index 13f033091be2..e8e08f848011 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -9,15 +9,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -61,8 +61,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/9/libunwind.nix
index 98df98838f13..4c4c85512e3d 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/libunwind.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -10,7 +10,5 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/9/lld.nix
index 488870e729a5..8b12642d2a70 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/9/lldb.nix
index a8e193c27b17..8da5c0bef68a 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     libxml2
     llvm
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     darwin.libobjc
     darwin.apple_sdk.libs.xpc
     darwin.apple_sdk.frameworks.Foundation
@@ -49,8 +49,6 @@ stdenv.mkDerivation rec {
     "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
   ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     # man page
     mkdir -p $out/share/man/man1
@@ -63,7 +61,7 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage = "https://llvm.org/";
     license = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix
index 013e5bb36b94..207dc242b91e 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -22,10 +22,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitString "." release_version));
 
 in stdenv.mkDerivation (rec {
@@ -159,17 +159,15 @@ in stdenv.mkDerivation (rec {
 
   checkTarget = "check-all";
 
-  enableParallelBuilding = true;
-
   requiredSystemFeatures = [ "big-parallel" ];
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/9/openmp.nix
index 84f898ec06a1..416916f57ff2 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/9/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
@@ -15,12 +16,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/llvm/multi.nix b/nixpkgs/pkgs/development/compilers/llvm/multi.nix
index b4f2f8f9d6f6..60db622a73ab 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/multi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/multi.nix
@@ -13,7 +13,12 @@ let
     chmod u+rw -R $out/lib
     cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*)
   '';
-  gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} ''
+  gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {
+    passthru = {
+      inherit (gcc64) version;
+      lib = gcc_multi_sysroot;
+    };
+  } ''
     mkdir -p $out/lib/gcc
 
     ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/
@@ -32,17 +37,16 @@ let
   '';
 
   clangMulti = clang.override {
-    # Only used for providing expected structure re:dynamic linkers, AFAIK
-    # Most of the magic is done by setting the --gcc-toolchain option below
+    # Only used for providing expected structure re:dynamic linkers, AFAIK Most
+    # of the magic is done by setting the --gcc-toolchain option via
+    # `gccForLibs`.
     libc = gcc_multi_sysroot;
 
     bintools = clang.bintools.override {
       libc = gcc_multi_sysroot;
     };
 
-    extraBuildCommands = ''
-      sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags
-    '';
+    gccForLibs = gcc_multi_sysroot;
   };
 
 in clangMulti
diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix
index 6bb23b77543a..789d4c055eb0 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , python
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     #undef CLANG_REPOSITORY
   '';
 
-  postUnpack = stdenv.lib.optionalString (!(isNull clang-tools-extra_src)) ''
+  postUnpack = lib.optionalString (!(isNull clang-tools-extra_src)) ''
     ln -s ${clang-tools-extra_src} $sourceRoot/tools/extra
   '';
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     echo "$VCSVersion" > lib/Basic/VCSVersion.inc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend";
     homepage = "https://llvm.org/";
     license = with licenses; [ ncsa ];
diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
index 36b42cef3926..94b6ee71032a 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
+{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
 
 let
   version = "4.0.0";
@@ -17,7 +17,6 @@ in rec {
       mkdir "$rsrc"
       ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-      echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags
       echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
       rm $out/nix-support/add-hardening.sh
       touch $out/nix-support/add-hardening.sh
diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix
index 34a094bf379c..2a05331f7a0f 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , cmake
 , libxml2
 , llvm
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       --replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ROCm fork of the LLVM Linker";
     homepage = "https://github.com/RadeonOpenCompute/llvm-project";
     license = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix
index 909284a3e919..d6fe211c4756 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , python3
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   pname = "rocm-llvm";
 
   outputs = [ "out" "python" ]
-    ++ stdenv.lib.optional enableSharedLibraries "lib";
+    ++ lib.optional enableSharedLibraries "lib";
 
   nativeBuildInputs = [ cmake python3 ];
 
@@ -44,10 +44,10 @@ in stdenv.mkDerivation rec {
     "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
   ]
   ++
-  stdenv.lib.optional
+  lib.optional
     enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"
-  ++ stdenv.lib.optionals enableManpages [
+  ++ lib.optionals enableManpages [
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
     "-DLLVM_BUILD_DOCS=ON"
     "-DLLVM_ENABLE_SPHINX=ON"
@@ -78,7 +78,7 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     moveToOutput share/opt-viewer "$python"
   ''
-  + stdenv.lib.optionalString enableSharedLibraries ''
+  + lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
 
   passthru.src = src;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ROCm fork of the LLVM compiler infrastructure";
     homepage = "https://github.com/RadeonOpenCompute/llvm-project";
     license = with licenses; [ ncsa ];
diff --git a/nixpkgs/pkgs/development/compilers/lobster/default.nix b/nixpkgs/pkgs/development/compilers/lobster/default.nix
index b87bec7ea2d9..b65d640b4751 100644
--- a/nixpkgs/pkgs/development/compilers/lobster/default.nix
+++ b/nixpkgs/pkgs/development/compilers/lobster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , unstableGitUpdater
 , cmake
@@ -45,14 +45,13 @@ stdenv.mkDerivation rec {
     ];
 
   preConfigure = "cd dev";
-  enableParallelBuilding = true;
 
   passthru = {
     tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {};
     updateScript = unstableGitUpdater { };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://strlen.com/lobster";
     description = "The Lobster programming language";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/compilers/manticore/default.nix b/nixpkgs/pkgs/development/compilers/manticore/default.nix
index 8d2ad8e6bbc5..1919f9998058 100644
--- a/nixpkgs/pkgs/development/compilers/manticore/default.nix
+++ b/nixpkgs/pkgs/development/compilers/manticore/default.nix
@@ -5,7 +5,7 @@ let
 in stdenv.mkDerivation {
   pname = "manticore";
   version = "2019.12.03";
- 
+
   src = fetchFromGitHub {
     owner = "ManticoreProject";
     repo = "manticore";
@@ -14,9 +14,9 @@ in stdenv.mkDerivation {
   };
 
   enableParallelBuilding = false;
- 
+
   nativeBuildInputs = [ autoreconfHook ];
-  
+
   buildInputs = [ coreutils smlnj ];
 
   autoreconfFlags = "-Iconfig -vfi";
@@ -28,8 +28,8 @@ in stdenv.mkDerivation {
     mv source repo_checkout
     cd repo_checkout
     chmod u+w . -R
-  ''; 
-  
+  '';
+
   postPatch = ''
     patchShebangs .
     substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout'
@@ -40,14 +40,14 @@ in stdenv.mkDerivation {
   meta = {
     description = "A parallel, pure variant of Standard ML";
 
-    longDescription = '' 
+    longDescription = ''
       Manticore is a high-level parallel programming language aimed at
       general-purpose applications running on multi-core
       processors. Manticore supports parallelism at multiple levels:
       explicit concurrency and coarse-grain parallelism via CML-style
       constructs and fine-grain parallelism via various light-weight
       notations, such as parallel tuple expressions and NESL/Nepal-style
-      parallel array comprehensions.  
+      parallel array comprehensions.
     '';
 
     homepage = "http://manticore.cs.uchicago.edu/";
diff --git a/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix b/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix
index 014fc226607a..2ef9e911b824 100644
--- a/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix
+++ b/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "0.5.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/compilers/mcpp/default.nix b/nixpkgs/pkgs/development/compilers/mcpp/default.nix
index 023bae48b3e9..efb5972e5421 100644
--- a/nixpkgs/pkgs/development/compilers/mcpp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "mcpp";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mcpp.sourceforge.net/";
     description = "A portable c preprocessor";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/mercury/default.nix b/nixpkgs/pkgs/development/compilers/mercury/default.nix
index d7029733381d..e063c4c09217 100644
--- a/nixpkgs/pkgs/development/compilers/mercury/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mercury/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper
+{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper
 , readline }:
 
 stdenv.mkDerivation rec {
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
       trade-offs.
     '';
     homepage    = "http://mercurylang.org";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license     = lib.licenses.gpl2;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
index a5c7054c3a61..34d8f98970e0 100644
--- a/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
+++ b/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{lib, stdenv, fetchurl}: stdenv.mkDerivation {
   name = "meta-build-env-0.1";
   src = fetchurl {
     url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz";
@@ -6,6 +6,6 @@
   };
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/mezzo/default.nix b/nixpkgs/pkgs/development/compilers/mezzo/default.nix
index a90076c9eccd..4c535be4d494 100644
--- a/nixpkgs/pkgs/development/compilers/mezzo/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mezzo/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "mezzo is not available for OCaml ${ocaml.version}"
 else
 
 let
-  check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml);
+  check-ocaml-version = with lib; versionAtLeast (getVersion ocaml);
 in
 
 assert check-ocaml-version "4";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildInputs = [ ocaml findlib ocamlbuild yojson menhir ulex pprint fix functory ];
 
   # Sets warning 3 as non-fatal
-  prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") ''
+  prePatch = lib.optionalString (check-ocaml-version "4.02") ''
     substituteInPlace myocamlbuild.pre.ml \
     --replace '@1..3' '@1..2+3'
   '';
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     cp mezzo $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://protz.github.io/mezzo/";
     description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/compilers/microscheme/default.nix b/nixpkgs/pkgs/development/compilers/microscheme/default.nix
index ba3e388c3992..ee2de8518f36 100644
--- a/nixpkgs/pkgs/development/compilers/microscheme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/microscheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, vim, makeWrapper }:
+{ lib, stdenv, fetchzip, vim, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "microscheme";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://microscheme.org";
     description = "A Scheme subset for Atmel microcontrollers";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/compilers/miranda/default.nix b/nixpkgs/pkgs/development/compilers/miranda/default.nix
index 55d3976858b7..298cb5e21ead 100644
--- a/nixpkgs/pkgs/development/compilers/miranda/default.nix
+++ b/nixpkgs/pkgs/development/compilers/miranda/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     patchShebangs quotehostinfo
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for Miranda -- a pure, non-strict, polymorphic, higher order functional programming language";
     homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
index a3b320c384f4..8cf709c10aea 100644
--- a/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake,
+{ fetchurl, lib, stdenv, makeWrapper, gnum4, texinfo, texLive, automake,
   enableX11 ? false, xlibsWrapper ? null }:
 
 let
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
   # XXX: The `check' target doesn't exist.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MIT/GNU Scheme, a native code Scheme compiler";
 
     longDescription =
diff --git a/nixpkgs/pkgs/development/compilers/mkcl/default.nix b/nixpkgs/pkgs/development/compilers/mkcl/default.nix
index baaf978d2984..3656f1e0dd82 100644
--- a/nixpkgs/pkgs/development/compilers/mkcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mkcl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
 
-with stdenv.lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation rec {
   pname = "mkcl";
   version = "1.1.11";
 
diff --git a/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/nixpkgs/pkgs/development/compilers/mlkit/default.nix
index 45cb09d5a2a1..5fc134f5ab26 100644
--- a/nixpkgs/pkgs/development/compilers/mlkit/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mlkit/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, mlton }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, mlton }:
 
 stdenv.mkDerivation rec {
   pname = "mlkit";
-  version = "4.5.2";
+  version = "4.5.6";
 
   src = fetchFromGitHub {
     owner = "melsman";
     repo = "mlkit";
     rev = "v${version}";
-    sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98";
+    sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc=";
   };
 
   nativeBuildInputs = [ autoreconfHook mlton ];
 
   buildFlags = ["mlkit" "mlkit_libs"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML Compiler and Toolkit";
     homepage = "https://elsman.com/mlkit/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/compilers/mlton/20130715.nix b/nixpkgs/pkgs/development/compilers/mlton/20130715.nix
index 52bb0a0775cf..98b4aeda5516 100644
--- a/nixpkgs/pkgs/development/compilers/mlton/20130715.nix
+++ b/nixpkgs/pkgs/development/compilers/mlton/20130715.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, gmp }:
+{ lib, stdenv, fetchurl, patchelf, gmp }:
 
 let
   version = "20130715";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "${pname}-${version}";
 
   buildInputs = [ gmp ];
-  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
+  nativeBuildInputs = lib.optional stdenv.isLinux patchelf;
 
   makeFlags = [ "all-no-docs" ];
 
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
     done
 
     substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
   '';
 
@@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
     # So the builder runs the binary compiler with gmp.
     export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
 
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     # Patch ELF interpreter.
     patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     for e in mllex mlyacc ; do
       patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # Patch libgmp linking
     install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
diff --git a/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix b/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix
index 2b4998f91c91..4846b58bf26b 100644
--- a/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, gmp }:
+{ lib, stdenv, fetchurl, patchelf, gmp }:
 let
   dynamic-linker = stdenv.cc.bintools.dynamicLinker;
 in
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     throw "Architecture not supported";
 
   buildInputs = [ gmp ];
-  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
+  nativeBuildInputs = lib.optional stdenv.isLinux patchelf;
 
   buildPhase = ''
     make update \
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
     patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
       patchelf --set-rpath ${gmp}/lib $out/bin/$e
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -change \
       /opt/local/lib/libgmp.10.dylib \
       ${gmp}/lib/libgmp.10.dylib \
diff --git a/nixpkgs/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix
index ca3b31478070..901848c693a4 100644
--- a/nixpkgs/pkgs/development/compilers/mono/generic.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which
+{ lib, stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which
 , gnumake42
 , enableParallelBuilding ? true
 , srcArchiveSuffix ? "tar.bz2"
@@ -17,18 +17,18 @@ stdenv.mkDerivation rec {
     url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}";
   };
 
-  nativeBuildInputs = [ gnumake42 ];
+  nativeBuildInputs = [ automake bison cmake pkg-config which gnumake42 ];
   buildInputs =
-    [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which
+    [ glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool
     ]
-    ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
+    ++ (lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
 
   configureFlags = [
     "--x-includes=${libX11.dev}/include"
     "--x-libraries=${libX11.out}/lib"
     "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"
   ]
-  ++ stdenv.lib.optionals withLLVM [
+  ++ lib.optionals withLLVM [
     "--enable-llvm"
     "--with-llvm=${llvm}"
   ];
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     makeFlagsArray=(INSTALL=`type -tp install`)
     substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share"
-  '' + stdenv.lib.optionalString withLLVM ''
+  '' + lib.optionalString withLLVM ''
     substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
   '';
 
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   inherit enableParallelBuilding;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://mono-project.com/";
     description = "Cross platform, open source .NET development framework";
     platforms = with platforms; darwin ++ linux;
diff --git a/nixpkgs/pkgs/development/compilers/mono/llvm.nix b/nixpkgs/pkgs/development/compilers/mono/llvm.nix
index d08a4ebef24d..c69a4021677e 100644
--- a/nixpkgs/pkgs/development/compilers/mono/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/llvm.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation {
     sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7";
   };
 
-  buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind;
 
   propagatedBuildInputs = [ ncurses zlib ];
 
@@ -38,15 +39,13 @@ stdenv.mkDerivation {
   cmakeFlags = with stdenv; [
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
-  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
-
-  enableParallelBuilding = true;
+  ] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies - Mono build";
     homepage    = "http://llvm.org/";
-    license     = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ thoughtpolice ];
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/mosml/default.nix b/nixpkgs/pkgs/development/compilers/mosml/default.nix
index 3d94303cbaa5..ec8fa793cfd4 100644
--- a/nixpkgs/pkgs/development/compilers/mosml/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mosml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, perl }:
+{ lib, stdenv, fetchurl, gmp, perl }:
 
 stdenv.mkDerivation rec {
   pname = "mosml";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp perl ];
 
-  makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
+  makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ];
 
   src = fetchurl {
     url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   setSourceRoot = ''export sourceRoot="$(echo */src)"'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A light-weight implementation of Standard ML";
     longDescription = ''
       Moscow ML is a light-weight implementation of Standard ML (SML), a strict
diff --git a/nixpkgs/pkgs/development/compilers/mozart/binary.nix b/nixpkgs/pkgs/development/compilers/mozart/binary.nix
index 66d642dbbbd1..8366fd77a47a 100644
--- a/nixpkgs/pkgs/development/compilers/mozart/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/mozart/binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ lib, stdenv, fetchurl, makeWrapper
 , boost, gmp
 , tcl-8_5, tk-8_5
 , emacs
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
-  libPath = stdenv.lib.makeLibraryPath
+  libPath = lib.makeLibraryPath
     [ stdenv.cc.cc
       boost
       gmp
@@ -51,8 +51,8 @@ stdenv.mkDerivation {
 
     wrapProgram $out/bin/ozemulator --set OZHOME $out
 
-    ${stdenv.lib.optionalString (emacs != null) ''
-      wrapProgram $out/bin/oz --suffix PATH ":" ${stdenv.lib.makeBinPath [ emacs ]}
+    ${lib.optionalString (emacs != null) ''
+      wrapProgram $out/bin/oz --suffix PATH ":" ${lib.makeBinPath [ emacs ]}
     ''}
 
     sed -i $out/share/applications/oz.desktop \
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     patchShebangs $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.mozart-oz.org/";
     description = "Multiplatform implementation of the Oz programming language";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/compilers/mruby/default.nix b/nixpkgs/pkgs/development/compilers/mruby/default.nix
index eee4f2c64eb7..25d35adff944 100644
--- a/nixpkgs/pkgs/development/compilers/mruby/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mruby/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ruby, bison, rake, fetchFromGitHub }:
+{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "mruby";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An embeddable implementation of the Ruby language";
     homepage = "https://mruby.org";
     maintainers = [ maintainers.nicknovitski ];
diff --git a/nixpkgs/pkgs/development/compilers/nasm/default.nix b/nixpkgs/pkgs/development/compilers/nasm/default.nix
index 89217db6818f..ce053e87130f 100644
--- a/nixpkgs/pkgs/development/compilers/nasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/nasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "nasm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     make test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nasm.us/";
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/compilers/neko/default.nix b/nixpkgs/pkgs/development/compilers/neko/default.nix
index 705b222a86cb..8b157fb4ca00 100644
--- a/nixpkgs/pkgs/development/compilers/neko/default.nix
+++ b/nixpkgs/pkgs/development/compilers/neko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
+{ lib, stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
 , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
 }:
 
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig git ];
+  nativeBuildInputs = [ cmake pkg-config git ];
   buildInputs =
     [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
       libmysqlclient mbedtls openssl libpthreadstubs ]
-      ++ stdenv.lib.optional stdenv.isLinux gtk2
-      ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
+      ++ lib.optional stdenv.isLinux gtk2
+      ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
                                                 pkgs.darwin.apple_sdk.frameworks.Carbon];
   cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high-level dynamically typed programming language";
     homepage = "https://nekovm.org";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix
index e50ac50dc57d..ebb6db31d5d1 100644
--- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix
@@ -43,7 +43,6 @@ with stdenv; mkDerivation rec {
     ++ (lib.optional enableGui qtbase)
     ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
 
-  enableParallelBuilding = true;
   cmakeFlags =
     [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}"
       "-DARCH=generic;ice40;ecp5"
diff --git a/nixpkgs/pkgs/development/compilers/obliv-c/default.nix b/nixpkgs/pkgs/development/compilers/obliv-c/default.nix
index 8fd6f33740e4..8a647a31c7cb 100644
--- a/nixpkgs/pkgs/development/compilers/obliv-c/default.nix
+++ b/nixpkgs/pkgs/development/compilers/obliv-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
+{ lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
 stdenv.mkDerivation rec {
   pname = "obliv-c";
   version = "0.0pre20180624";
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs'';
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix
index cd621c131ffa..5762bed41a4a 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   checkTarget = ["opt.opt"];
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix
index 8f26790020c8..e3778457fd3f 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -26,9 +26,9 @@ stdenv.mkDerivation (rec {
 
   meta = {
     homepage = "http://caml.inria.fr/ocaml";
-    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
+    license = with lib.licenses; [ qpl lgpl2 ];
     description = "Most popular variant of the Caml language";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 
 })
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix
index 946013562c22..642b0d91b7f8 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -3,7 +3,7 @@
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
    useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
-   inherit (stdenv.lib) optionals optionalString;
+   inherit (lib) optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     [ (fetchurl {
         name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
         url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
-	sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
+        sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
       })
     ];
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     license = with licenses; [
       qpl /* compiler */
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix
index f90d61744f56..781b5be09824 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -3,7 +3,7 @@
 let
    useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
-   inherit (stdenv.lib) optionals optionalString;
+   inherit (lib) optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     branch = "3.12";
     license = with licenses; [
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix
index 81a8e0034feb..93e08740ddd8 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, ncurses, xlibsWrapper }:
+{ lib, stdenv, fetchurl, ncurses, xlibsWrapper }:
 
 let
    useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
-   inherit (stdenv.lib) optional optionals optionalString;
+   inherit (lib) optional optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     branch = "4.00";
     license = with licenses; [
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix
index 16649f09869f..c422d2a15a3f 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix
@@ -1,9 +1,9 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "12";
-  patch_version = "0-alpha3";
+  patch_version = "0-beta1";
   src = fetchTarball {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz";
-    sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw";
+    url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~beta1.tar.xz";
+    sha256 = "1rny74mi0knl8byqg2naw1mgvn22c2zihlwvzbkd56j97flqsxsm";
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index a6ddcd8ce8f4..d3ab0d6e1c60 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , ncurses
 , libX11, xorgproto, buildEnv
 }:
@@ -6,7 +6,7 @@
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
    x11deps = [ libX11 xorgproto ];
-   inherit (stdenv.lib) optionals;
+   inherit (lib) optionals;
 
    baseOcamlBranch  = "4.07";
    baseOcamlVersion = "${baseOcamlBranch}.1";
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     nativeCompilers = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description     = "Multi-Stage Programming extension for OCaml";
     homepage        = "http://okmij.org/ftp/ML/MetaOCaml.html";
     license         = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ];
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
index 79aab1ffe831..d4a6b6250b52 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
@@ -6,17 +6,17 @@ let
   safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
 in
 
-{ stdenv, fetchurl, ncurses, buildEnv, libunwind
-, libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09"
+{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind
+, libX11, xorgproto, useX11 ? safeX11 stdenv && !lib.versionAtLeast version "4.09"
 , aflSupport ? false
 , flambdaSupport ? false
 , spaceTimeSupport ? false
 }:
 
 assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
-assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
-assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
-assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04";
+assert aflSupport -> lib.versionAtLeast version "4.05";
+assert flambdaSupport -> lib.versionAtLeast version "4.03";
+assert spaceTimeSupport -> lib.versionAtLeast version "4.04";
 
 let
   src = args.src or (fetchurl {
@@ -27,7 +27,7 @@ in
 
 let
    useNativeCompilers = !stdenv.isMips;
-   inherit (stdenv.lib) optional optionals optionalString;
+   inherit (lib) optional optionals optionalString;
    name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}";
 in
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (args // {
   prefixKey = "-prefix ";
   configureFlags =
     let flags = new: old:
-      if stdenv.lib.versionAtLeast version "4.08"
+      if lib.versionAtLeast version "4.08"
       then new else old
     ; in
     optionals useX11 (flags
@@ -59,11 +59,11 @@ stdenv.mkDerivation (args // {
   ;
 
   buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
-  buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
+  buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses
     ++ optionals useX11 [ libX11 xorgproto ];
   propagatedBuildInputs = optional spaceTimeSupport libunwind;
   installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
-  preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
+  preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
@@ -76,7 +76,7 @@ stdenv.mkDerivation (args // {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     branch = versionNoPatch;
     license = with licenses; [
@@ -105,7 +105,7 @@ stdenv.mkDerivation (args // {
       '';
 
     platforms = with platforms; linux ++ darwin;
-    broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06";
+    broken = stdenv.isAarch64 && !lib.versionAtLeast version "4.06";
   };
 
 })
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index 8459f26367e0..e13f3006be57 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, ncurses }:
+{ lib, stdenv, fetchurl, xlibsWrapper, ncurses }:
 
 stdenv.mkDerivation ({
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "http://www.metaocaml.org/";
-    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
+    license = with lib.licenses; [ qpl lgpl2 ];
     description = "A compiled, type-safe, multi-stage programming language";
     broken = true;
   };
diff --git a/nixpkgs/pkgs/development/compilers/opa/default.nix b/nixpkgs/pkgs/development/compilers/opa/default.nix
index 864bb8e1b263..5e648c9de4ad 100644
--- a/nixpkgs/pkgs/development/compilers/opa/default.nix
+++ b/nixpkgs/pkgs/development/compilers/opa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, perl, jdk
+{ lib, stdenv, fetchFromGitHub, which, perl, jdk
 , ocamlPackages, openssl
 , coreutils, zlib, ncurses, makeWrapper
 , gcc, binutils, gnumake, nodejs
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   # Paths so the opa compiler code generation will use the same programs as were
   # used to build opa.
-  codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
+  codeGeneratorPaths = lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
 
   preConfigure = ''
     patchShebangs .
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4
   ]);
 
-  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
   postInstall = ''
     # Have compiler use same tools for code generation as used to build it.
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
       Opa is concise, simple, concurrent, dynamically distributed, and secure.
     '';
     homepage = "http://opalang.org/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.kkallio ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.kkallio ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/opendylan/bin.nix b/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
index dbe7e44b1d78..9687f1b1a662 100644
--- a/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
+++ b/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
@@ -1,6 +1,6 @@
 # Binaries provided by Open Dylan to be used to bootstrap from source.
 # The binaries can also be used as is.
-{stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
+{lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
 
 stdenv.mkDerivation {
   name = "opendylan-2013.2";
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
     tar --strip-components=1 -xjf "$src" -C "$out"
 
     interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
-    for a in "$out"/bin/*; do 
+    for a in "$out"/bin/*; do
       patchelf --set-interpreter "$interpreter" "$a"
       patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
-    for a in "$out"/lib/*.so; do 
+    for a in "$out"/lib/*.so; do
       patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
     sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://opendylan.org";
     description = "A multi-paradigm functional and object-oriented programming language";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/opendylan/default.nix b/nixpkgs/pkgs/development/compilers/opendylan/default.nix
index 5abc40cc3bb5..45b2454259f7 100644
--- a/nixpkgs/pkgs/development/compilers/opendylan/default.nix
+++ b/nixpkgs/pkgs/development/compilers/opendylan/default.nix
@@ -1,5 +1,5 @@
 # Build Open Dylan from source using the binary builds to bootstrap.
-{stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
+{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
 
 stdenv.mkDerivation {
   name = "opendylan-2016.1pre";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://opendylan.org";
     description = "A multi-paradigm functional and object-oriented programming language";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/11.nix
index 326aef1a562c..18440a718d19 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/11.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/11.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip
+{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
 , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
 , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
@@ -25,7 +25,7 @@ let
       sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
     };
 
-    nativeBuildInputs = [ pkgconfig autoconf ];
+    nativeBuildInputs = [ pkg-config autoconf ];
     buildInputs = [
       cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
@@ -136,7 +136,7 @@ let
 
     disallowedReferences = [ openjdk11-bootstrap ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/nixpkgs/pkgs/development/compilers/openjdk/12.nix
index 1de5d84a13be..0b3a4db6c48f 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/12.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/12.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
 , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
 , libXcursor, libXrandr, fontconfig, openjdk11
@@ -22,7 +22,7 @@ let
       sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
     };
 
-    nativeBuildInputs = [ pkgconfig autoconf ];
+    nativeBuildInputs = [ pkg-config autoconf ];
     buildInputs = [
       cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
@@ -140,7 +140,7 @@ let
 
     disallowedReferences = [ openjdk11 ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/nixpkgs/pkgs/development/compilers/openjdk/13.nix
index 3c7ddfb8dd96..7c6fe633c49d 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/13.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/13.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
 , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
 , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap
@@ -22,7 +22,7 @@ let
       sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
     };
 
-    nativeBuildInputs = [ pkgconfig autoconf ];
+    nativeBuildInputs = [ pkg-config autoconf ];
     buildInputs = [
       cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
@@ -140,7 +140,7 @@ let
 
     disallowedReferences = [ openjdk13-bootstrap ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/14.nix b/nixpkgs/pkgs/development/compilers/openjdk/14.nix
new file mode 100644
index 000000000000..bda6444a8f98
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/openjdk/14.nix
@@ -0,0 +1,158 @@
+{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
+, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
+, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
+, setJavaClassPath
+, headless ? false
+, enableJavaFX ? openjfx.meta.available, openjfx
+, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+}:
+
+let
+  major = "14";
+  update = ".0.2";
+  build = "-ga";
+
+  openjdk = stdenv.mkDerivation rec {
+    pname = "openjdk" + lib.optionalString headless "-headless";
+    version = "${major}${update}${build}";
+
+    src = fetchurl {
+      url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
+      sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
+    };
+
+    nativeBuildInputs = [ pkg-config autoconf ];
+    buildInputs = [
+      cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
+      libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
+    ] ++ lib.optionals (!headless && enableGnome2) [
+      gtk3 gnome_vfs GConf glib
+    ];
+
+    patches = [
+      ./fix-java-home-jdk10.patch
+      ./read-truststore-from-env-jdk10.patch
+      ./currency-date-range-jdk10.patch
+      ./increase-javadoc-heap-jdk13.patch
+      # -Wformat etc. are stricter in newer gccs, per
+      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
+      # so grab the work-around from
+      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
+      (fetchurl {
+        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
+        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
+      })
+    ] ++ lib.optionals (!headless && enableGnome2) [
+      ./swing-use-gtk-jdk13.patch
+    ];
+
+    prePatch = ''
+      chmod +x configure
+      patchShebangs --build configure
+    '';
+
+    configureFlags = [
+      "--with-boot-jdk=${openjdk14-bootstrap.home}"
+      "--with-version-pre="
+      "--enable-unlimited-crypto"
+      "--with-native-debug-symbols=internal"
+      "--with-libjpeg=system"
+      "--with-giflib=system"
+      "--with-libpng=system"
+      "--with-zlib=system"
+      "--with-lcms=system"
+      "--with-stdc++lib=dynamic"
+    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+      ++ lib.optional headless "--enable-headless-only"
+      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+
+    separateDebugInfo = true;
+
+    NIX_CFLAGS_COMPILE = "-Wno-error";
+
+    NIX_LDFLAGS = toString (lib.optionals (!headless) [
+      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
+    ] ++ lib.optionals (!headless && enableGnome2) [
+      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ]);
+
+    buildFlags = [ "all" ];
+
+    installPhase = ''
+      mkdir -p $out/lib
+
+      mv build/*/images/jdk $out/lib/openjdk
+
+      # Remove some broken manpages.
+      rm -rf $out/lib/openjdk/man/ja*
+
+      # Mirror some stuff in top-level.
+      mkdir -p $out/share
+      ln -s $out/lib/openjdk/include $out/include
+      ln -s $out/lib/openjdk/man $out/share/man
+      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/linux/*_md.h $out/include/
+
+      # Remove crap from the installation.
+      rm -rf $out/lib/openjdk/demo
+      ${lib.optionalString headless ''
+        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
+      ''}
+
+      ln -s $out/lib/openjdk/bin $out/bin
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook so that any package
+      # that depends on the JDK has $CLASSPATH set up properly.
+      mkdir -p $out/nix-support
+      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+      EOF
+    '';
+
+    postFixup = ''
+      # Build the set of output library directories to rpath against
+      LIBDIRS=""
+      for output in $outputs; do
+        if [ "$output" = debug ]; then continue; fi
+        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
+      done
+      # Add the local library paths to remove dependencies on the bootstrap
+      for output in $outputs; do
+        if [ "$output" = debug ]; then continue; fi
+        OUTPUTDIR=$(eval echo \$$output)
+        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+        echo "$BINLIBS" | while read i; do
+          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+          patchelf --shrink-rpath "$i" || true
+        done
+      done
+    '';
+
+    disallowedReferences = [ openjdk14-bootstrap ];
+
+    meta = with lib; {
+      homepage = "https://openjdk.java.net/";
+      license = licenses.gpl2;
+      description = "The open-source Java Development Kit";
+      maintainers = with maintainers; [ edwtjo ];
+      platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+    };
+
+    passthru = {
+      architecture = "";
+      home = "${openjdk}/lib/openjdk";
+      inherit gtk3;
+    };
+  };
+in openjdk
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/8.nix
index 050ca2a564a1..96a01b0cd925 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/8.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/8.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip
+{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip
 , cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
 , libjpeg, giflib
@@ -83,7 +83,7 @@ let
 
     outputs = [ "out" "jre" ];
 
-    nativeBuildInputs = [ pkgconfig lndir ];
+    nativeBuildInputs = [ pkg-config lndir ];
     buildInputs = [
       cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
       libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
index 0b659b95aa8b..64654351886f 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
+{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jce-policies = fetchurl {
     # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
@@ -52,7 +52,7 @@ let
       home = jdk;
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       license = licenses.gpl2;
       platforms = platforms.darwin;
     };
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
index 8afaf90f9437..4df180c1f5a7 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
+{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jce-policies = fetchurl {
     # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
@@ -56,7 +56,7 @@ let
       home = jdk;
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       license = licenses.gpl2;
       platforms = platforms.darwin;
     };
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
index c6498cb45302..8885db4115ea 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
+{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jce-policies = fetchurl {
     # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
@@ -7,11 +7,11 @@ let
   };
 
   jdk = stdenv.mkDerivation rec {
-    name = "zulu14.28.21-ca-jdk14.0.1";
+    name = "zulu15.28.51-ca-jdk15.0.1";
 
     src = fetchurl {
       url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
-      sha256 = "1pc0y3fxhlf42a51qbdha1fabci61yzq70kk5c1rzk0ai78d92q8";
+      sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh";
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
     };
 
@@ -52,7 +52,7 @@ let
       home = jdk;
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       license = licenses.gpl2;
       platforms = platforms.darwin;
     };
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/default.nix
index 1dcd3e23e6fa..ddd523ad7871 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
 , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
+, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? openjfx.meta.available, openjfx
@@ -9,8 +9,8 @@
 }:
 
 let
-  major = "14";
-  update = ".0.2";
+  major = "15";
+  update = ".0.1";
   build = "-ga";
 
   openjdk = stdenv.mkDerivation rec {
@@ -18,15 +18,15 @@ let
     version = "${major}${update}${build}";
 
     src = fetchurl {
-      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
+      url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
+      sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
     };
 
-    nativeBuildInputs = [ pkgconfig autoconf ];
+    nativeBuildInputs = [ pkg-config autoconf ];
     buildInputs = [
       cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
+      libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
       gtk3 gnome_vfs GConf glib
     ];
@@ -54,7 +54,8 @@ let
     '';
 
     configureFlags = [
-      "--with-boot-jdk=${openjdk14-bootstrap.home}"
+      "--with-boot-jdk=${openjdk15-bootstrap.home}"
+      "--with-version-pre="
       "--enable-unlimited-crypto"
       "--with-native-debug-symbols=internal"
       "--with-libjpeg=system"
@@ -138,10 +139,10 @@ let
       done
     '';
 
-    disallowedReferences = [ openjdk14-bootstrap ];
+    disallowedReferences = [ openjdk15-bootstrap ];
 
-    meta = with stdenv.lib; {
-      homepage = "http://openjdk.java.net/";
+    meta = with lib; {
+      homepage = "https://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
       maintainers = with maintainers; [ edwtjo ];
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix
index 513f4d968f6f..8688831cdaac 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake
+{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
 , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby
 , openjdk11-bootstrap }:
 
@@ -20,7 +20,7 @@ let
     };
 
     buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
-    nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
+    nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
 
     dontUseCmakeConfigure = true;
 
@@ -103,7 +103,7 @@ in makePackage {
 
   passthru.deps = deps;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://openjdk.java.net/projects/openjfx/";
     license = licenses.gpl2;
     description = "The next-generation Java client toolkit";
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix
index 51512c5afcaf..21801b8ba3a7 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
-, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
+, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
 , ffmpeg_3, python, ruby }:
 
 let
-  major = "14";
-  update = "";
-  build = "-ga";
+  major = "15";
+  update = ".0.1";
+  build = "+1";
   repover = "${major}${update}${build}";
   gradle_ = (gradleGen.override {
     java = openjdk11_headless;
@@ -18,11 +18,11 @@ let
       owner = "openjdk";
       repo = "jfx";
       rev = repover;
-      sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr";
+      sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
     };
 
     buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
-    nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
+    nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
 
     dontUseCmakeConfigure = true;
 
@@ -64,8 +64,10 @@ let
     outputHashMode = "recursive";
     # Downloaded AWT jars differ by platform.
     outputHash = {
-      x86_64-linux = "077zss95iq6iskx7ghz1c57ymydpzj0wm7r1pkznw99l9xwvdmqi";
-      i686-linux = "03gglr2sh77cyg16qw9g45ji33dg7i93s5s30hz3mh420g112qa0";
+      x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw";
+      # The build-time dependencies don't currently build for i686, so no
+      # reason to fetch this one correctly either...
+      i686-linux = "0000000000000000000000000000000000000000000000000000";
     }.${stdenv.system} or (throw "Unsupported platform");
   };
 
@@ -105,7 +107,7 @@ in makePackage {
 
   passthru.deps = deps;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://openjdk.java.net/projects/openjfx/";
     license = licenses.gpl2;
     description = "The next-generation Java client toolkit";
diff --git a/nixpkgs/pkgs/development/compilers/openspin/default.nix b/nixpkgs/pkgs/development/compilers/openspin/default.nix
index fe10f43abd5e..abf5623b5821 100644
--- a/nixpkgs/pkgs/development/compilers/openspin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/openspin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "openspin";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     mv build/openspin $out/bin/openspin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU";
     homepage = "https://github.com/parallaxinc/OpenSpin";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 78fff4a59fba..c44d7fc116fe 100644
--- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -6,7 +6,7 @@
 }:
 
 { swingSupport ? true
-, stdenv
+, lib, stdenv
 , requireFile
 , makeWrapper
 , unzip
@@ -76,7 +76,7 @@ let result = stdenv.mkDerivation rec {
         i686-linux    = "linux-i586";
         x86_64-linux  = "linux-x64";
         armv7l-linux  = "linux-arm32-vfp-hflt";
-        aarch64-linux = "linux-arm64-vfp-hflt";
+        aarch64-linux = "linux-aarch64";
       }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
     in requireFile {
       name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
@@ -85,7 +85,7 @@ let result = stdenv.mkDerivation rec {
     };
 
   nativeBuildInputs = [ file ]
-    ++ stdenv.lib.optional installjce unzip;
+    ++ lib.optional installjce unzip;
 
   buildInputs = [ makeWrapper ];
 
@@ -149,7 +149,7 @@ let result = stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
+    rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
 
     # set all the dynamic linkers
     find $out -type f -perm -0100 \
@@ -174,7 +174,7 @@ let result = stdenv.mkDerivation rec {
     [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
     (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
 
-  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+  rpath = lib.strings.makeLibraryPath libraries;
 
   passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
 
@@ -184,7 +184,7 @@ let result = stdenv.mkDerivation rec {
 
   passthru.architecture = architecture;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
   };
diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
index b73270e8dd8c..7e0e5cae7ca5 100644
--- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , requireFile
 , xorg
 , zlib
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
+    rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
 
     for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
@@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec {
 
   dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
index 427c7cedad15..b1655cd8b8fe 100644
--- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , requireFile
 , xorg
 , zlib
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
+    rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
 
     for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
@@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec {
 
   dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index fdea10dcd7e4..01d1ee8e980c 100644
--- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,10 +1,10 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "261";
-  sha256.i686-linux = "1bl12hd5i53m8d4j8rwkk3bavmzw0ndr88ch5lf5syi7vs5pfjpm";
-  sha256.x86_64-linux = "0d7a92csz8ws5h0pzqmrxq3sz286s57vw0dqq3ciwsqz14df012s";
-  sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9";
-  sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n";
+  patchVersion = "271";
+  sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0=";
+  sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg=";
+  sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM=";
+  sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I=";
   jceName = "jce_policy-8.zip";
   sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w";
 }
diff --git a/nixpkgs/pkgs/development/compilers/orc/default.nix b/nixpkgs/pkgs/development/compilers/orc/default.nix
index 210aa786cddf..40c89d0cc59b 100644
--- a/nixpkgs/pkgs/development/compilers/orc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/orc/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, meson, ninja
+{ lib, stdenv, fetchurl, meson, ninja
 , gtk-doc ? null, file, docbook_xsl
 , buildDevDoc ? gtk-doc != null
 }: let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "orc";
   version = "0.4.32";
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Oil Runtime Compiler";
     homepage = "https://gstreamer.freedesktop.org/projects/orc.html";
     # The source code implementing the Marsenne Twister algorithm is licensed
diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix
index 2c00420c3626..d3de5cad2f69 100644
--- a/nixpkgs/pkgs/development/compilers/osl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/osl/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr,
+{ clangStdenv, lib, stdenv, fetchFromGitHub, cmake, zlib, openexr,
 openimageio, llvm, boost165, flex, bison, partio, pugixml,
 util-linux, python
 }:
@@ -18,18 +18,18 @@ in clangStdenv.mkDerivation rec {
   };
 
   cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
-  enableParallelBuilding = true;
 
-  preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash '';
-  
+  preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";
+
+  nativeBuildInputs = [ cmake boost_static flex bison];
   buildInputs = [
-     cmake zlib openexr openimageio llvm
-     boost_static flex bison partio pugixml
+     zlib openexr openimageio llvm
+     partio pugixml
      util-linux # needed just for hexdump
      python # CMake doesn't check this?
   ];
   # TODO: How important is partio? CMake doesn't seem to find it
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Advanced shading language for production GI renderers";
     homepage = "http://opensource.imageworks.com/?p=osl";
     maintainers = with maintainers; [ hodapp ];
diff --git a/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix
index 93713af99b46..1d8ba03e72fc 100644
--- a/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, coreutils, which }:
+{ lib, stdenv, fetchFromGitLab, coreutils, which }:
 
 stdenv.mkDerivation rec {
   pname = "owl-lisp";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # tests are run as part of the compilation process
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A functional Scheme for world domination";
     homepage    = "https://gitlab.com/owl-lisp/owl";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix b/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix
index b34a2146383c..660a4f2de40b 100644
--- a/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix
+++ b/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix
@@ -1,5 +1,5 @@
 { mkDerivation, base, Cabal, containers, directory, extra, filepath
-, mtl, parsec, pretty, stdenv, time, transformers
+, mtl, parsec, pretty, lib, stdenv, time, transformers
 }:
 mkDerivation {
   pname = "curry-base";
@@ -12,5 +12,5 @@ mkDerivation {
   testHaskellDepends = [ base Cabal filepath mtl ];
   homepage = "http://curry-language.org";
   description = "Functions for manipulating Curry programs";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix b/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix
index b169578c7c38..8fd1645ee704 100644
--- a/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix
+++ b/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, bytestring, Cabal, containers, curry-base
 , directory, extra, file-embed, filepath, mtl, network-uri, pretty
-, process, set-extra, stdenv, template-haskell, transformers
+, process, set-extra, lib, stdenv, template-haskell, transformers
 }:
 mkDerivation {
   pname = "curry-frontend";
@@ -22,5 +22,5 @@ mkDerivation {
   testHaskellDepends = [ base Cabal curry-base filepath ];
   homepage = "http://curry-language.org";
   description = "Compile the functional logic language Curry to several intermediate formats";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/compilers/pakcs/default.nix b/nixpkgs/pkgs/development/compilers/pakcs/default.nix
index 9f876ea914af..98fab9eb210b 100644
--- a/nixpkgs/pkgs/development/compilers/pakcs/default.nix
+++ b/nixpkgs/pkgs/development/compilers/pakcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ lib, stdenv, fetchurl, makeWrapper
 , haskellPackages, haskell
 , which, swiProlog, rlwrap, tk
 , curl, git, unzip, gnutar, coreutils, sqlite }:
@@ -74,10 +74,10 @@ in stdenv.mkDerivation {
 
     # List of dependencies from currytools/cpm/src/CPM/Main.curry
     wrapProgram $out/pakcs/bin/cypm \
-      --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}"
+      --prefix PATH ":" "${lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
     description = "An implementation of the multi-paradigm declarative language Curry";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/pforth/default.nix b/nixpkgs/pkgs/development/compilers/pforth/default.nix
index ce228c2f1cb5..44c6ea0a16a2 100644
--- a/nixpkgs/pkgs/development/compilers/pforth/default.nix
+++ b/nixpkgs/pkgs/development/compilers/pforth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation {
   version = "28";
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Portable ANSI style Forth written in ANSI C";
     homepage = "http://www.softsynth.com/pforth/";
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ yrashk ];
+    license = lib.licenses.publicDomain;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ yrashk ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/picat/default.nix b/nixpkgs/pkgs/development/compilers/picat/default.nix
index 4898f991079c..159dec05e293 100644
--- a/nixpkgs/pkgs/development/compilers/picat/default.nix
+++ b/nixpkgs/pkgs/development/compilers/picat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 let
   ARCH = {
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation {
   pname = "picat";
-  version = "3.0p3";
+  version = "3.0p4";
 
   src = fetchurl {
-    url    = "http://picat-lang.org/download/picat30_3_src.tar.gz";
-    sha256 = "052w0vk2xfmky5nv280ysb8in6vaph7i79yvbddqmahzszarq5hw";
+    url    = "http://picat-lang.org/download/picat30_4_src.tar.gz";
+    sha256 = "1rwin44m7ni2h2v51sh2r8gj2k6wm6f86zgaylrria9jr57inpqj";
   };
 
   buildInputs = [ zlib ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH";
   installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Logic-based programming langage";
     homepage    = "http://picat-lang.org/";
     license     = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/compilers/polyml/5.6.nix b/nixpkgs/pkgs/development/compilers/polyml/5.6.nix
index 714adfb0e4cb..7858e3f6dc11 100644
--- a/nixpkgs/pkgs/development/compilers/polyml/5.6.nix
+++ b/nixpkgs/pkgs/development/compilers/polyml/5.6.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, autoreconfHook}:
+{lib, stdenv, fetchurl, autoreconfHook}:
 
 let
   version = "5.6";
@@ -8,11 +8,11 @@ stdenv.mkDerivation {
   pname = "polyml";
   inherit version;
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  buildInputs = lib.optional stdenv.isDarwin autoreconfHook;
 
   src = fetchurl {
     url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
       Poly/ML is a full implementation of Standard ML.
     '';
     homepage = "https://www.polyml.org/";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.lgpl21;
+    platforms = with lib.platforms; linux;
     maintainers = [ #Add your name here!
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/polyml/5.7.nix b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix
index ce8c033e4bed..5ac6990383cc 100644
--- a/nixpkgs/pkgs/development/compilers/polyml/5.7.nix
+++ b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
   pname = "polyml";
   version = "5.7.1";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libffi gmp ];
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
 
   configureFlags = [
     "--enable-shared"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML compiler and interpreter";
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
diff --git a/nixpkgs/pkgs/development/compilers/polyml/default.nix b/nixpkgs/pkgs/development/compilers/polyml/default.nix
index 7b15a988e38a..d2a150334228 100644
--- a/nixpkgs/pkgs/development/compilers/polyml/default.nix
+++ b/nixpkgs/pkgs/development/compilers/polyml/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
   pname = "polyml";
   version = "5.8.1";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
   buildInputs = [ libffi gmp ];
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
 
   configureFlags = [
     "--enable-shared"
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gcx2fjiwsiazlyfhm7zlrd563blc4fy9w2mspib9divbavaxin6";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML compiler and interpreter";
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
diff --git a/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/nixpkgs/pkgs/development/compilers/ponyc/default.nix
index 0bfaba914a7b..3a2e3c4b944c 100644
--- a/nixpkgs/pkgs/development/compilers/ponyc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ponyc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll,
+{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll,
   cc ? stdenv.cc, lto ? !stdenv.isDarwin }:
 
 stdenv.mkDerivation (rec {
@@ -29,7 +29,8 @@ stdenv.mkDerivation (rec {
     name = "v1.5.0.tar.gz";
   };
 
-  buildInputs = [ makeWrapper which libxml2 cmake z3 ];
+  nativeBuildInputs = [ cmake makeWrapper which ];
+  buildInputs = [ libxml2 z3 ];
   propagatedBuildInputs = [ cc ];
 
   # Sandbox disallows network access, so disabling problematic networking tests
@@ -79,31 +80,28 @@ stdenv.mkDerivation (rec {
     "PONYC_VERSION=${version}"
     "prefix=${placeholder "out"}"
   ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ]
-    ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ];
-
-  enableParallelBuilding = true;
+    ++ lib.optionals stdenv.isDarwin [ "bits=64" ]
+    ++ lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ];
 
   doCheck = true;
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ];
 
-  installPhase = ''
-    make config=release prefix=$out ''
-    + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 ''
-    + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no ''
+  installPhase = "make config=release prefix=$out "
+    + lib.optionalString stdenv.isDarwin "bits=64 "
+    + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no "
     + '' install
 
     wrapProgram $out/bin/ponyc \
       --prefix PATH ":" "${stdenv.cc}/bin" \
       --set-default CC "$CC" \
-      --prefix PONYPATH : "${stdenv.lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}"
+      --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}"
   '';
 
   # Stripping breaks linking for ponyc
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
     homepage = "https://www.ponylang.org";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix b/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix
index 7cf3000e9db1..5da1ec77016c 100644
--- a/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix
+++ b/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ponyc }:
+{ lib, stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation ( rec {
   pname = "corral";
@@ -15,7 +15,7 @@ stdenv.mkDerivation ( rec {
 
   installFlags = [ "prefix=${placeholder "out"}" "install" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Corral is a dependency management tool for ponylang (ponyc)";
     homepage = "https://www.ponylang.io";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix
index 3c1b2a0f91b4..8e5810508971 100644
--- a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, ponyc }:
+{lib, stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation rec {
   pname = "pony-stable";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple dependency manager for the Pony language";
     homepage = "https://www.ponylang.org";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ dipinhora kamilchm patternspandemic ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
index 8dd19ecf8586..741d0ec7d1c3 100644
--- a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
     minimal-module = pkgs.callPackage ./test-minimal-module {};
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A strongly-typed functional programming language that compiles to JavaScript";
     homepage = "https://www.purescript.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/qbe/default.nix b/nixpkgs/pkgs/development/compilers/qbe/default.nix
index 436b03e499c3..9ebcb2242ddb 100644
--- a/nixpkgs/pkgs/development/compilers/qbe/default.nix
+++ b/nixpkgs/pkgs/development/compilers/qbe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , unstableGitUpdater
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://c9x.me/compile/";
     description = "A small compiler backend written in C";
     maintainers = with maintainers; [ fgaz ];
diff --git a/nixpkgs/pkgs/development/compilers/rasm/default.nix b/nixpkgs/pkgs/development/compilers/rasm/default.nix
index 37e07a230aec..c2415899f6b4 100644
--- a/nixpkgs/pkgs/development/compilers/rasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "rasm";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -Dt $out/bin rasm
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.roudoudou.com/rasm/";
     description = "Z80 assembler";
     # use -n option to display all licenses
diff --git a/nixpkgs/pkgs/development/compilers/reason/default.nix b/nixpkgs/pkgs/development/compilers/reason/default.nix
index 4c0e9c298519..2807ddb6b5fd 100644
--- a/nixpkgs/pkgs/development/compilers/reason/default.nix
+++ b/nixpkgs/pkgs/development/compilers/reason/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
+{ lib, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2
 , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
 }:
 
@@ -17,20 +17,19 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ];
 
-  buildInputs = [ ocaml findlib dune cppo fix utop menhir ];
+  buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
-  inherit (dune) installPhase;
-
-  postInstall = ''
+  installPhase = ''
+    dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR
     wrapProgram $out/bin/rtop \
       --prefix PATH : "${utop}/bin" \
       --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \
       --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://reasonml.github.io/";
     description = "Facebook's friendly syntax to OCaml";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/nixpkgs/pkgs/development/compilers/rgbds/default.nix
index 4c8a4cfd4efa..6bc74971c4e9 100644
--- a/nixpkgs/pkgs/development/compilers/rgbds/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rgbds/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}:
+{lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}:
 
 # TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333
 # it does not work for the moment. We should switch back to byacc as soon as the fix is integrated
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex pkg-config libpng ];
   installFlags = [ "PREFIX=\${out}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://rednex.github.io/rgbds/";
     description = "A free assembler/linker package for the Game Boy and Game Boy Color";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/compilers/rust/1_45.nix b/nixpkgs/pkgs/development/compilers/rust/1_45.nix
index b4d887f2e964..13b1b3ef488c 100644
--- a/nixpkgs/pkgs/development/compilers/rust/1_45.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/1_45.nix
@@ -33,10 +33,11 @@ import ./default.nix {
   # building
   bootstrapVersion = "1.44.1";
 
-  # fetch hashes by running `print-hashes.sh 1.45.0`
+  # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
   bootstrapHashes = {
     i686-unknown-linux-gnu = "e69689b0a1b66599cf83e7dd54f839419007e44376195e93e301a3175da3d854";
     x86_64-unknown-linux-gnu = "a41df89a461a580536aeb42755e43037556fba2e527dd13a1e1bb0749de28202";
+    x86_64-unknown-linux-musl = "7eeef2b7488ee96015db10bc52c43f6e023debc9a955ccb8efb382522bf35be9";
     arm-unknown-linux-gnueabihf = "ea18ccdfb62a153c2d43d013fdec56993cc9267f1cdc6f3834df8a2b9b468f08";
     armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54";
     aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49";
diff --git a/nixpkgs/pkgs/development/compilers/rust/1_48.nix b/nixpkgs/pkgs/development/compilers/rust/1_49.nix
index 6b4b10f12d3e..3e76cdfe9690 100644
--- a/nixpkgs/pkgs/development/compilers/rust/1_48.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/1_49.nix
@@ -19,8 +19,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.48.0";
-  rustcSha256 = "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf";
+  rustcVersion = "1.49.0";
+  rustcSha256 = "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm";
 
   llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
@@ -33,20 +33,22 @@ import ./default.nix {
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.47.0";
+  bootstrapVersion = "1.48.0";
 
-  # fetch hashes by running `print-hashes.sh 1.45.2`
+  # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "84bf092130ea5216fc701871e633563fc1c01b6528f60cb0767e96cd8eec30bf";
-    x86_64-unknown-linux-gnu = "d0e11e1756a072e8e246b05d54593402813d047d12e44df281fbabda91035d96";
-    arm-unknown-linux-gnueabihf = "82e12affb47596b68d0ca64045f4eb698c10ff15406afca604e12cdd07e17b26";
-    armv7-unknown-linux-gnueabihf = "19d0fe3892a8e98f99c5aa84f4d6f260853147650cb71f2bae985c91de6c29af";
-    aarch64-unknown-linux-gnu = "753c905e89a714ab9bce6fe1397b721f29c0760c32f09d2f328af3d39919c8e6";
-    x86_64-apple-darwin = "84e5be6c5c78734deba911dcf80316be1e4c7da2c59413124d039ad96620612f";
-    powerpc64le-unknown-linux-gnu = "5760c3b1897ea70791320c2565f3eef700a3d54059027b84bbe6b8d6157f81c8";
+    i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f";
+    x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b";
+    x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f";
+    arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5";
+    armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb";
+    aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a";
+    aarch64-unknown-linux-musl = "ac4de580a28e45a9773b389b296d13bfeeb08263cb1f8343859577a54940dae9";
+    x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113";
+    powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_48;
+  selectRustPackage = pkgs: pkgs.rust_1_49;
 
   rustcPatches = [
   ];
diff --git a/nixpkgs/pkgs/development/compilers/rust/binary.nix b/nixpkgs/pkgs/development/compilers/rust/binary.nix
index b84e390e0b0d..770cc3415f2c 100644
--- a/nixpkgs/pkgs/development/compilers/rust/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, bash, curl, darwin, zlib
+{ lib, stdenv, makeWrapper, bash, curl, darwin, zlib
 , version
 , src
 , platform
@@ -6,7 +6,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optionalString;
+  inherit (lib) optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
   bootstrapping = versionType == "bootstrap";
@@ -24,7 +24,7 @@ rec {
     inherit version;
     inherit src;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://www.rust-lang.org/";
       description = "A safe, concurrent, practical language";
       maintainers = with maintainers; [ qknight ];
@@ -32,7 +32,7 @@ rec {
     };
 
     buildInputs = [ bash ]
-      ++ stdenv.lib.optional stdenv.isDarwin Security;
+      ++ lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
@@ -46,7 +46,7 @@ rec {
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustc"
-        '' + optionalString (stdenv.lib.versionAtLeast version "1.46")
+        '' + optionalString (lib.versionAtLeast version "1.46")
         # rustc bootstrap needs libz starting from 1.46
         ''
           ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1
@@ -76,7 +76,7 @@ rec {
     inherit version;
     inherit src;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://www.rust-lang.org/";
       description = "A safe, concurrent, practical language";
       maintainers = with maintainers; [ qknight ];
@@ -84,7 +84,7 @@ rec {
     };
 
     buildInputs = [ makeWrapper bash ]
-      ++ stdenv.lib.optional stdenv.isDarwin Security;
+      ++ lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
diff --git a/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/nixpkgs/pkgs/development/compilers/rust/cargo.nix
index e820b982620a..3a7f29e32293 100644
--- a/nixpkgs/pkgs/development/compilers/rust/cargo.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/cargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
+{ lib, stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib
 , installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc
 , CoreFoundation, Security
 }:
@@ -16,9 +16,9 @@ rustPlatform.buildRustPackage {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ];
+  nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ];
   buildInputs = [ cacert file curl python3 openssl zlib ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
+    ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
 
   # cargo uses git-rs which is made for a version of libgit2 from recent master that
   # is not compatible with the current version in nixpkgs.
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage {
   # Disable check phase as there are failures (4 tests fail)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://crates.io";
     description = "Downloads your Rust project's dependencies and builds your project";
     maintainers = with maintainers; [ retrry ];
diff --git a/nixpkgs/pkgs/development/compilers/rust/clippy.nix b/nixpkgs/pkgs/development/compilers/rust/clippy.nix
index 0546ad9bac1a..a3597e9febf7 100644
--- a/nixpkgs/pkgs/development/compilers/rust/clippy.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/clippy.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  buildInputs = [ rustc rustc.llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ rustc rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ];
 
   # fixes: error: the option `Z` is only accepted on the nightly compiler
   RUSTC_BOOTSTRAP = 1;
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage {
   #   (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm)
   doCheck = false;
 
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  preFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://rust-lang.github.io/rust-clippy/";
     description = "A bunch of lints to catch common mistakes and improve your Rust code";
     maintainers = with maintainers; [ basvandijk ];
diff --git a/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh b/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh
index 9180ccb67d91..0639726f48d7 100755
--- a/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh
+++ b/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh
@@ -10,9 +10,11 @@ set -euo pipefail
 PLATFORMS=(
   i686-unknown-linux-gnu
   x86_64-unknown-linux-gnu
+  x86_64-unknown-linux-musl
   arm-unknown-linux-gnueabihf
   armv7-unknown-linux-gnueabihf
   aarch64-unknown-linux-gnu
+  aarch64-unknown-linux-musl
   x86_64-apple-darwin
   powerpc64le-unknown-linux-gnu
 )
diff --git a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
index 06b1b9b1e648..ee860d782580 100644
--- a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform
-, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
+{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform
+, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
 , CoreFoundation, Security }:
 
 rustPlatform.buildRustPackage {
@@ -28,9 +28,9 @@ rustPlatform.buildRustPackage {
   # rls-rustc links to rustc_private crates
   CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]
-    ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
+    ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
 
   doCheck = true;
 
@@ -39,12 +39,12 @@ rustPlatform.buildRustPackage {
     $out/bin/rls --version
   '';
 
-  RUST_SRC_PATH = rustPlatform.rustcSrc;
+  RUST_SRC_PATH = rustPlatform.rustLibSrc;
   postInstall = ''
-    wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc}
+    wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
     homepage = "https://github.com/rust-lang/rls/";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix
index 570cd8b796fd..315fe7c0c6d1 100644
--- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix
@@ -1,8 +1,8 @@
-{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
 , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
 , fetchurl, file, python3
 , darwin, cmake, rust, rustPlatform
-, pkgconfig, openssl
+, pkg-config, openssl
 , which, libffi
 , withBundledLLVM ? false
 , enableRustcDev ? true
@@ -12,7 +12,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optionals optional optionalString concatStringsSep;
+  inherit (lib) optionals optional optionalString concatStringsSep;
   inherit (darwin.apple_sdk.frameworks) Security;
 in stdenv.mkDerivation rec {
   pname = "rustc";
@@ -117,7 +117,7 @@ in stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs src/etc
 
-    ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
+    ${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
 
     # Fix the configure script to not require curl as we won't use it
     sed -i configure \
@@ -133,7 +133,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     file python3 rustPlatform.rust.rustc cmake
-    which libffi removeReferencesTo pkgconfig
+    which libffi removeReferencesTo pkg-config
   ];
 
   buildInputs = [ openssl ]
@@ -143,7 +143,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;
 
-  postInstall = stdenv.lib.optionalString enableRustcDev ''
+  postInstall = lib.optionalString enableRustcDev ''
     # install rustc-dev components. Necessary to build rls, clippy...
     python x.py dist rustc-dev
     tar xf build/dist/rustc-dev*tar.gz
@@ -172,7 +172,7 @@ in stdenv.mkDerivation rec {
 
   passthru.llvm = llvmShared;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.rust-lang.org/";
     description = "A safe, concurrent, practical language";
     maintainers = with maintainers; [ madjar cstrahan globin havvy ];
diff --git a/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix
index 6215c936c6d0..b3191c242fea 100644
--- a/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, Security }:
+{ lib, stdenv, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rustfmt";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler
   RUSTC_BOOTSTRAP = 1;
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly";
   CFG_RELEASE_CHANNEL = "nightly";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for formatting Rust code according to style guidelines";
     homepage = "https://github.com/rust-lang-nursery/rustfmt";
     license = with licenses; [ mit asl20 ];
diff --git a/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix
index dcc3457fe112..b421fe5d2eff 100644
--- a/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
-, pkgconfig
+, pkg-config
 , libffi
 , boehmgc
 , openssl
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
            # build extensions
            export ${platformLdLibraryPath}="$(pwd)/build"
            '';
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
-  buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc;
+  buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An R6RS/R7RS Scheme system";
     longDescription = ''
       Sagittarius Scheme is a free Scheme implementation supporting
diff --git a/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix b/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix
index 148ecccf1316..ada098ec1829 100644
--- a/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix
+++ b/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
+{ lib, stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
 , disableImmobileSpace ? false
@@ -70,17 +70,17 @@ stdenv.mkDerivation rec {
     export HOME=$PWD/test-home
   '';
 
-  enableFeatures = with stdenv.lib;
+  enableFeatures = with lib;
     optional threadSupport "sb-thread" ++
     optional stdenv.isAarch32 "arm";
 
-  disableFeatures = with stdenv.lib;
+  disableFeatures = with lib;
     optional (!threadSupport) "sb-thread" ++
     optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];
 
   buildPhase = ''
     sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${
-                  stdenv.lib.concatStringsSep " "
+                  lib.concatStringsSep " "
                     (builtins.map (x: "--with-${x}") enableFeatures ++
                      builtins.map (x: "--without-${x}") disableFeatures)
                 }
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     INSTALL_ROOT=$out sh install.sh
   ''
-  + stdenv.lib.optionalString (!purgeNixReferences) ''
+  + lib.optionalString (!purgeNixReferences) ''
     cp -r src $out/lib/sbcl
     cp -r contrib $out/lib/sbcl
     cat >$out/lib/sbcl/sbclrc <<EOF
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" ''
+  setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" ''
     addEnvHooks "$targetOffset" _setSbclHome
     _setSbclHome() {
       export SBCL_HOME='@out@/lib/sbcl/'
diff --git a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
index 81afe64ed537..cb42235bc8e2 100644
--- a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper }:
+{ lib, stdenv, fetchurl, makeWrapper }:
 
 let
   options = rec {
@@ -65,11 +65,11 @@ stdenv.mkDerivation rec {
       --add-flags "--core $out/share/sbcl/sbcl.core"
   '';
 
-  postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) ''
+  postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) ''
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lisp compiler";
     homepage = "http://www.sbcl.org";
     license = licenses.publicDomain; # and FreeBSD
diff --git a/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/nixpkgs/pkgs/development/compilers/sbcl/default.nix
index 3c7fca3c4b03..df80bb8af1d7 100644
--- a/nixpkgs/pkgs/development/compilers/sbcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
+{ lib, stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
 , disableImmobileSpace ? false
@@ -70,17 +70,17 @@ stdenv.mkDerivation rec {
     export HOME=$PWD/test-home
   '';
 
-  enableFeatures = with stdenv.lib;
+  enableFeatures = with lib;
     optional threadSupport "sb-thread" ++
     optional stdenv.isAarch32 "arm";
 
-  disableFeatures = with stdenv.lib;
+  disableFeatures = with lib;
     optional (!threadSupport) "sb-thread" ++
     optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];
 
   buildPhase = ''
     sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${
-                  stdenv.lib.concatStringsSep " "
+                  lib.concatStringsSep " "
                     (builtins.map (x: "--with-${x}") enableFeatures ++
                      builtins.map (x: "--without-${x}") disableFeatures)
                 }
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     INSTALL_ROOT=$out sh install.sh
   ''
-  + stdenv.lib.optionalString (!purgeNixReferences) ''
+  + lib.optionalString (!purgeNixReferences) ''
     cp -r src $out/lib/sbcl
     cp -r contrib $out/lib/sbcl
     cat >$out/lib/sbcl/sbclrc <<EOF
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" ''
+  setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" ''
     addEnvHooks "$targetOffset" _setSbclHome
     _setSbclHome() {
       export SBCL_HOME='@out@/lib/sbcl/'
diff --git a/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/nixpkgs/pkgs/development/compilers/scala/2.x.nix
index 15c73f814007..a747206dff8d 100644
--- a/nixpkgs/pkgs/development/compilers/scala/2.x.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/2.x.nix
@@ -22,8 +22,8 @@ let
     };
 
     "2.12" = {
-      version = "2.12.12";
-      sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis=";
+      version = "2.12.13";
+      sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc";
       tests = [ nixosTests.scala.scala_2_12 ];
       pname = "scala_2_12";
     };
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       #!${stdenv.shell}
       set -o errexit
       PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
           common-updater-scripts
           coreutils
           git
diff --git a/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix b/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
index cefa4537c361..b173de58049b 100644
--- a/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, ncurses }:
+{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "0.26.0-RC1";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
         done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Research platform for new language concepts and compiler technologies for Scala";
     longDescription = ''
        Dotty is a platform to try out new language concepts and compiler technologies for Scala.
diff --git a/nixpkgs/pkgs/development/compilers/sdcc/default.nix b/nixpkgs/pkgs/development/compilers/sdcc/default.nix
index 3d3d43a55e50..500c0b4d3951 100644
--- a/nixpkgs/pkgs/development/compilers/sdcc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/sdcc/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
+{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
 , excludePorts ? [] }:
 
-with stdenv.lib;
+with lib;
 
 let
   # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
diff --git a/nixpkgs/pkgs/development/compilers/seexpr/default.nix b/nixpkgs/pkgs/development/compilers/seexpr/default.nix
index 580fc3b761db..7fc1fc7b1b6d 100644
--- a/nixpkgs/pkgs/development/compilers/seexpr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/seexpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
+{ lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
 bison, flex, libGLU, pythonPackages
 }:
 
@@ -12,8 +12,9 @@ stdenv.mkDerivation {
     sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4";
   };
 
-  buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
-  meta = with stdenv.lib; {
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
+  meta = with lib; {
     description = "Embeddable expression evaluation engine from Disney Animation";
     homepage = "https://www.disneyanimation.com/technology/seexpr.html";
     maintainers = with maintainers; [ hodapp ];
diff --git a/nixpkgs/pkgs/development/compilers/serpent/default.nix b/nixpkgs/pkgs/development/compilers/serpent/default.nix
index 2459127f425a..775a78a97341 100644
--- a/nixpkgs/pkgs/development/compilers/serpent/default.nix
+++ b/nixpkgs/pkgs/development/compilers/serpent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ... }:
+{ lib, stdenv, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation {
   pname = "serpent";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     mv serpent $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for the Serpent language for Ethereum";
     longDescription = ''
       Serpent is one of the high-level programming languages used to
diff --git a/nixpkgs/pkgs/development/compilers/shaderc/default.nix b/nixpkgs/pkgs/development/compilers/shaderc/default.nix
index 23532cc84466..678ab3adb06c 100644
--- a/nixpkgs/pkgs/development/compilers/shaderc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/shaderc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3 }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3 }:
 # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use
 # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from
 # https://github.com/google/shaderc/blob/known-good/known_good.json
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A collection of tools, libraries and tests for shader compilation";
     license = [ licenses.asl20 ];
diff --git a/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix b/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
index 55d96266ac97..113b22768d9f 100644
--- a/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
+{ lib, stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "smlnj-bootstrap";
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Compiler for the Standard ML '97 programming language";
     homepage    = "http://www.smlnj.org";
-    license     = stdenv.lib.licenses.free;
-    platforms   = stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.jwiegley ];
+    license     = lib.licenses.free;
+    platforms   = lib.platforms.darwin;
+    maintainers = [ lib.maintainers.jwiegley ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/smlnj/default.nix b/nixpkgs/pkgs/development/compilers/smlnj/default.nix
index 18562bc487aa..3e987e8ccdaf 100644
--- a/nixpkgs/pkgs/development/compilers/smlnj/default.nix
+++ b/nixpkgs/pkgs/development/compilers/smlnj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 let
   version = "110.95";
   baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
@@ -79,7 +79,7 @@ in stdenv.mkDerivation {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML of New Jersey, a compiler";
     homepage    = "http://smlnj.org";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix
index 0f0af33e7001..546697d8efec 100644
--- a/nixpkgs/pkgs/development/compilers/solc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/solc/default.nix
@@ -1,13 +1,12 @@
-{ gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
+{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
 , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
 , cln ? null, gmp ? null
 }:
 
 # compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
 # general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
-let stdenv = gccStdenv; in
 
-assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0";
+assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
 assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
 
 let
@@ -18,7 +17,7 @@ let
     sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
   };
 in
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
 
   pname = "solc";
   version = "0.7.4";
@@ -36,20 +35,20 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
-  ] ++ stdenv.lib.optionals (!z3Support) [
+  ] ++ lib.optionals (!z3Support) [
     "-DUSE_Z3=OFF"
-  ] ++ stdenv.lib.optionals (!cvc4Support) [
+  ] ++ lib.optionals (!cvc4Support) [
     "-DUSE_CVC4=OFF"
   ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost ]
-    ++ stdenv.lib.optionals z3Support [ z3 ]
-    ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ];
+    ++ lib.optionals z3Support [ z3 ]
+    ++ lib.optionals cvc4Support [ cvc4 cln gmp ];
   checkInputs = [ ncurses python3 ];
 
   # Test fails on darwin for unclear reason
-  doCheck = stdenv.hostPlatform.isLinux;
+  doCheck = gccStdenv.hostPlatform.isLinux;
 
   checkPhase = ''
     while IFS= read -r -d ''' dir
@@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for Ethereum smart contract language Solidity";
     homepage = "https://github.com/ethereum/solidity";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/compilers/souffle/default.nix b/nixpkgs/pkgs/development/compilers/souffle/default.nix
index ba13cd7b4b27..e57062642ba4 100644
--- a/nixpkgs/pkgs/development/compilers/souffle/default.nix
+++ b/nixpkgs/pkgs/development/compilers/souffle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , perl, ncurses, zlib, sqlite, libffi
 , autoreconfHook, mcpp, bison, flex, doxygen, graphviz
 , makeWrapper
@@ -6,7 +6,7 @@
 
 
 let
-  toolsPath = stdenv.lib.makeBinPath [ mcpp ];
+  toolsPath = lib.makeBinPath [ mcpp ];
 in
 stdenv.mkDerivation rec {
   pname = "souffle";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A translator of declarative Datalog programs into the C++ language";
     homepage    = "https://souffle-lang.github.io/";
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix b/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix
index 8eb0ddb59ef7..bd31719731e9 100644
--- a/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix
+++ b/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }:
+{ lib, stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "spasm-ng";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -Dm755 spasm -t $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/alberthdev/spasm-ng";
     description = "Z80 assembler with extra features to support development for TI calculators";
     license     = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
index 73af5f0c9852..324e0b07ad87 100644
--- a/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
+++ b/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";
     description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR";
     license     = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/compilers/squeak/default.nix b/nixpkgs/pkgs/development/compilers/squeak/default.nix
index 4687ce86a90a..7d531181d1d0 100644
--- a/nixpkgs/pkgs/development/compilers/squeak/default.nix
+++ b/nixpkgs/pkgs/development/compilers/squeak/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
-, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
+{ lib, stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
+, libpthreadstubs, pango, pkg-config, libpulseaudio, which }:
 
 stdenv.mkDerivation rec {
   pname = "squeak";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
     pango libpulseaudio which ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   postPatch = ''
     for i in squeak.in squeak.sh.in; do
       substituteInPlace unix/cmake/$i --replace "PATH=" \
-        "PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #"
+        "PATH=${lib.makeBinPath [ coreutils gnused which ]} #"
     done
   '';
 
@@ -25,11 +25,9 @@ stdenv.mkDerivation rec {
     unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads}
   '';
 
-  enableParallelBuilding = true;
-
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smalltalk programming language and environment";
     longDescription = ''
       Squeak is a full-featured implementation of the Smalltalk programming
diff --git a/nixpkgs/pkgs/development/compilers/stalin/default.nix b/nixpkgs/pkgs/development/compilers/stalin/default.nix
index e37b207b4f2e..f47086b1ca25 100644
--- a/nixpkgs/pkgs/development/compilers/stalin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/stalin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncompress, libX11 }:
+{ fetchurl, lib, stdenv, ncompress, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "stalin-0.11";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncompress libX11 ];
 
-  buildPhase = '' ./build '';
+  buildPhase = "./build ";
 
   installPhase = ''
     mkdir -p "$out/bin"
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.ece.purdue.edu/~qobi/software.html";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     description = "An optimizing Scheme compiler";
 
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
index dadf374d5b67..ce666852e38a 100644
--- a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
+++ b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
+{ lib, stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
 , libarchive, db, pcre, libedit, libossp_uuid, libXpm
-, libSM, libXt, freetype, pkgconfig, fontconfig
+, libSM, libXt, freetype, pkg-config, fontconfig
 , cmake, libyaml, Security
 , libjpeg, libX11, libXext, libXft, libXinerama
 , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
@@ -26,14 +26,14 @@ stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ gmp readline openssl
     libarchive libyaml db pcre libedit libossp_uuid
     zlib ]
-  ++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
+  ++ lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
   ++ extraLibraries
-  ++ stdenv.lib.optional stdenv.isDarwin Security;
+  ++ lib.optional stdenv.isDarwin Security;
 
   hardeningDisable = [ "format" ];
 
@@ -46,9 +46,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.swi-prolog.org";
     description = "A Prolog compiler and interpreter";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.meditans ];
+    platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin;
+    maintainers = [ lib.maintainers.meditans ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix
index 2cabacadd756..26e9f2b87e1a 100644
--- a/nixpkgs/pkgs/development/compilers/swift/default.nix
+++ b/nixpkgs/pkgs/development/compilers/swift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , cmake
 , coreutils
 , glibc
@@ -7,7 +7,7 @@
 , perl
 , libedit
 , ninja
-, pkgconfig
+, pkg-config
 , sqlite
 , swig
 , bash
@@ -121,7 +121,7 @@ let
 
   cmakeFlags = [
     "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include"
-    "-DC_INCLUDE_DIRS=${stdenv.lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2"
+    "-DC_INCLUDE_DIRS=${lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2"
     "-DGCC_INSTALL_PREFIX=${gccForLibs}"
   ];
 
@@ -141,7 +141,7 @@ stdenv.mkDerivation {
     makeWrapper
     ninja
     perl
-    pkgconfig
+    pkg-config
     python
     rsync
     which
@@ -155,7 +155,7 @@ stdenv.mkDerivation {
     libgit2
     python
   ];
-  propagatedUserEnvPkgs = [ git pkgconfig ];
+  propagatedUserEnvPkgs = [ git pkg-config ];
 
   hardeningDisable = [ "format" ]; # for LLDB
 
@@ -282,7 +282,7 @@ stdenv.mkDerivation {
       installable_package=$INSTALLABLE_PACKAGE \
       install_prefix=$out \
       install_destdir=$SWIFT_INSTALL_DIR \
-      extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"
+      extra_cmake_options="${lib.concatStringsSep "," cmakeFlags}"
   '';
 
   doCheck = true;
@@ -321,9 +321,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack to avoid build and install directories in RPATHs.
-  preFixup = ''rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR'';
+  preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Swift Programming Language";
     homepage = "https://github.com/apple/swift";
     maintainers = with maintainers; [ dtzWill ];
diff --git a/nixpkgs/pkgs/development/compilers/terra/default.nix b/nixpkgs/pkgs/development/compilers/terra/default.nix
index e8478828c1b0..bd50ea9caaaf 100644
--- a/nixpkgs/pkgs/development/compilers/terra/default.nix
+++ b/nixpkgs/pkgs/development/compilers/terra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchFromGitHub
 , llvmPackages, ncurses, lua
 }:
 
@@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
       --replace '-lcurses' '-lncurses'
 
     substituteInPlace src/terralib.lua \
-      --subst-var-by NIX_LIBC_INCLUDE ${stdenv.lib.getDev stdenv.cc.libc}/include
+      --subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include
   '';
 
   preBuild = ''
     cat >Makefile.inc<<EOF
-    CLANG = ${stdenv.lib.getBin llvmPackages.clang-unwrapped}/bin/clang
-    LLVM_CONFIG = ${stdenv.lib.getBin llvmPackages.llvm}/bin/llvm-config
+    CLANG = ${lib.getBin llvmPackages.clang-unwrapped}/bin/clang
+    LLVM_CONFIG = ${lib.getBin llvmPackages.llvm}/bin/llvm-config
     EOF
 
     mkdir -p build
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     cp -rv release/include/terra $dev/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A low-level counterpart to Lua";
     homepage    = "http://terralang.org/";
     platforms   = platforms.x86_64;
diff --git a/nixpkgs/pkgs/development/compilers/teyjus/default.nix b/nixpkgs/pkgs/development/compilers/teyjus/default.nix
index 6768d0c1cbed..74ba1866b555 100644
--- a/nixpkgs/pkgs/development/compilers/teyjus/default.nix
+++ b/nixpkgs/pkgs/development/compilers/teyjus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, omake, ocaml, flex, bison }:
+{ lib, stdenv, fetchurl, omake, ocaml, flex, bison }:
 
 let
   version = "2.1";
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
 
   installPhase = "mkdir -p $out/bin && cp tj* $out/bin";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An efficient implementation of the Lambda Prolog language";
     homepage = "https://github.com/teyjus/teyjus";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
     maintainers = [ maintainers.bcdarwin ];
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/development/compilers/tvm/default.nix b/nixpkgs/pkgs/development/compilers/tvm/default.nix
index 01c44718f11a..2bb8b9d5be30 100644
--- a/nixpkgs/pkgs/development/compilers/tvm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/tvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "tvm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # not mangle the legitimate use of the opt/ folder.
   dontFixCmake = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://tvm.apache.org/";
     description = "An End to End Deep Learning Compiler Stack for CPUs, GPUs and accelerators";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/compilers/unison/default.nix b/nixpkgs/pkgs/development/compilers/unison/default.nix
index 7ae16a77a26f..433e07c68b07 100644
--- a/nixpkgs/pkgs/development/compilers/unison/default.nix
+++ b/nixpkgs/pkgs/development/compilers/unison/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoPatchelfHook
+{ lib, stdenv, fetchurl, autoPatchelfHook
 , ncurses5, zlib, gmp
 , makeWrapper
 , less
@@ -25,16 +25,16 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontConfigure = true;
 
-  nativeBuildInputs = [ makeWrapper ] ++ (stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook);
-  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ];
+  nativeBuildInputs = [ makeWrapper ] ++ (lib.optional (!stdenv.isDarwin) autoPatchelfHook);
+  buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ];
 
   installPhase = ''
     mkdir -p $out/bin
     mv ucm $out/bin
-    wrapProgram $out/bin/ucm --prefix PATH ":" "${stdenv.lib.makeBinPath [ less ]}";
+    wrapProgram $out/bin/ucm --prefix PATH ":" "${lib.makeBinPath [ less ]}";
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Modern, statically-typed purely functional language";
     homepage = "https://unisonweb.org/";
     license = with licenses; [ mit bsd3 ];
diff --git a/nixpkgs/pkgs/development/compilers/urn/default.nix b/nixpkgs/pkgs/development/compilers/urn/default.nix
index 812792a125ea..f7e338cf43ff 100644
--- a/nixpkgs/pkgs/development/compilers/urn/default.nix
+++ b/nixpkgs/pkgs/development/compilers/urn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline
+{ lib, stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline
 , useLuaJit ? false
 , extraLibraries ? []
 }:
@@ -17,7 +17,7 @@ let
               [ lua ];
   };
 
-  inherit (stdenv.lib) optionalString concatMapStringsSep;
+  inherit (lib) optionalString concatMapStringsSep;
 in
 
 stdenv.mkDerivation {
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       --prefix LD_LIBRARY_PATH : ${urn-rt}/lib/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://urn-lang.com";
     description = "Yet another Lisp variant which compiles to Lua";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/compilers/urweb/default.nix b/nixpkgs/pkgs/development/compilers/urweb/default.nix
index ac324167f97b..e2d9d1f226e7 100644
--- a/nixpkgs/pkgs/development/compilers/urweb/default.nix
+++ b/nixpkgs/pkgs/development/compilers/urweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, openssl, mlton
+{ lib, stdenv, fetchurl, file, openssl, mlton
 , libmysqlclient, postgresql, sqlite, gcc, icu
 }:
 
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Advanced purely-functional web programming language";
     homepage    = "http://www.impredicative.com/ur/";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.sheganinans ];
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = [ lib.maintainers.thoughtpolice lib.maintainers.sheganinans ];
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix
index 1964d74cf3af..222ad903ec14 100644
--- a/nixpkgs/pkgs/development/compilers/vala/default.nix
+++ b/nixpkgs/pkgs/development/compilers/vala/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook
+{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook
 , graphviz, glib, libiconv, libintl, libtool, expat, substituteAll
 }:
 
@@ -70,7 +70,7 @@ let
     outputs = [ "out" "devdoc" ];
 
     nativeBuildInputs = [
-      pkgconfig flex bison libxslt
+      pkg-config flex bison libxslt
     ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat
       ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
       ++ extraNativeBuildInputs;
@@ -92,7 +92,7 @@ let
     #  };
     # };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Compiler for GObject type system";
       homepage = "https://wiki.gnome.org/Projects/Vala";
       license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/compilers/vlang/default.nix b/nixpkgs/pkgs/development/compilers/vlang/default.nix
index fba11a06a6e9..f53d6d4c3825 100644
--- a/nixpkgs/pkgs/development/compilers/vlang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/vlang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }:
+{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }:
 
 assert stdenv.hostPlatform.isUnix -> upx != null;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   propagatedBuildInputs = [ glfw freetype openssl ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isUnix upx;
+    ++ lib.optional stdenv.hostPlatform.isUnix upx;
 
   buildPhase = ''
     runHook preBuild
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://vlang.io/";
     description = "Simple, fast, safe, compiled language for developing maintainable software";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/compilers/vyper/default.nix b/nixpkgs/pkgs/development/compilers/vyper/default.nix
new file mode 100644
index 000000000000..79702c01bee3
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/vyper/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi, writeText, asttokens
+, pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx
+, sphinx_rtd_theme, pytestrunner }:
+
+let
+  sample-contract = writeText "example.vy" ''
+    count: int128
+
+    @external
+    def __init__(foo: address):
+        self.count = 1
+  '';
+in
+
+buildPythonPackage rec {
+  pname = "vyper";
+  version = "0.2.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0d9fv630ayd1989qnklldh08vksa2lf0r06lm914qy5r5cvbl1v2";
+  };
+
+  nativeBuildInputs = [ pytestrunner ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'asttokens==' 'asttokens>=' \
+      --replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \
+      --replace 'commithash.decode("utf-8").strip()' "'069936fa3fee8646ff362145593128d7ef07da38'"
+  '';
+
+  propagatedBuildInputs = [
+    asttokens
+    pycryptodome
+    semantic-version
+
+    # docs
+    recommonmark
+    sphinx
+    sphinx_rtd_theme
+  ];
+
+  checkPhase = ''
+    $out/bin/vyper "${sample-contract}"
+  '';
+
+  meta = with lib; {
+    description = "Pythonic Smart Contract Language for the EVM";
+    homepage = "https://github.com/vyperlang/vyper";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ siraben ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/compilers/wcc/default.nix b/nixpkgs/pkgs/development/compilers/wcc/default.nix
index b6030da49d3f..644e9ad646a8 100644
--- a/nixpkgs/pkgs/development/compilers/wcc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/wcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
+{ lib, stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
 
 stdenv.mkDerivation {
   pname = "wcc-unstable";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/endrazine/wcc";
     description = "Witchcraft compiler collection: tools to convert and script ELF files";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/compilers/wla-dx/default.nix b/nixpkgs/pkgs/development/compilers/wla-dx/default.nix
index 0cebbfa520f0..b80b460d4def 100644
--- a/nixpkgs/pkgs/development/compilers/wla-dx/default.nix
+++ b/nixpkgs/pkgs/development/compilers/wla-dx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake}:
+{lib, stdenv, fetchFromGitHub, cmake}:
 
 stdenv.mkDerivation rec {
   pname = "wla-dx";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.villehelin.com/wla.html";
     description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/compilers/x11basic/default.nix b/nixpkgs/pkgs/development/compilers/x11basic/default.nix
index 9bf6b3d28749..e48bbc90d61f 100644
--- a/nixpkgs/pkgs/development/compilers/x11basic/default.nix
+++ b/nixpkgs/pkgs/development/compilers/x11basic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , automake, autoconf, readline
 , libX11, bluez, SDL2
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     cp -r ../examples $out/share/.
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://x11-basic.sourceforge.net/";
     description = "A Basic interpreter and compiler with graphics capabilities";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/compilers/yap/default.nix b/nixpkgs/pkgs/development/compilers/yap/default.nix
index 100fb236c838..da10125c2433 100644
--- a/nixpkgs/pkgs/development/compilers/yap/default.nix
+++ b/nixpkgs/pkgs/development/compilers/yap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, gmp, zlib }:
+{ lib, stdenv, fetchurl, readline, gmp, zlib }:
 
 stdenv.mkDerivation rec {
   version = "6.3.3";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
     description = "A ISO-compatible high-performance Prolog compiler";
-    license = stdenv.lib.licenses.artistic2;
+    license = lib.licenses.artistic2;
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.peti ];
+    platforms = lib.platforms.linux;
     broken = !stdenv.is64bit;   # the linux 32 bit build fails.
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/yasm/default.nix b/nixpkgs/pkgs/development/compilers/yasm/default.nix
index 923a11c1466a..48c251d828a2 100644
--- a/nixpkgs/pkgs/development/compilers/yasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/yasm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "yasm-1.3.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tortall.net/projects/yasm/";
     description = "Complete rewrite of the NASM assembler";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix
index 51f0b7ed45aa..7d2191f8f456 100644
--- a/nixpkgs/pkgs/development/compilers/yosys/default.nix
+++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix
@@ -1,11 +1,11 @@
-{ stdenv
+{ stdenv, lib
 , abc-verifier
 , bash
 , bison
 , fetchFromGitHub
 , flex
 , libffi
-, pkgconfig
+, pkg-config
 , protobuf
 , python3
 , readline
@@ -43,22 +43,21 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ];
+  nativeBuildInputs = [ pkg-config bison flex ];
+  buildInputs = [ tcl readline libffi python3 protobuf zlib ];
 
   makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
 
-  patchPhase = ''
+  patches = [
+    ./plugin-search-dirs.patch
+  ];
+
+  postPatch = ''
     substituteInPlace ./Makefile \
-      --replace 'CXX = clang' "" \
-      --replace 'LD = clang++' 'LD = $(CXX)' \
-      --replace 'CXX = gcc' "" \
-      --replace 'LD = gcc' 'LD = $(CXX)' \
-      --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
       --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
-    substituteInPlace ./misc/yosys-config.in \
-      --replace '/bin/bash' '${bash}/bin/bash'
-    patchShebangs tests
+
+    chmod +x ./misc/yosys-config.in
+    patchShebangs tests ./misc/yosys-config.in
   '';
 
   preBuild = let
@@ -76,7 +75,7 @@ stdenv.mkDerivation rec {
       exit 1
     fi
 
-    if ! grep -q "YOSYS_VER := ${version}" Makefile; then
+    if ! grep -q "YOSYS_VER := $version" Makefile; then
       echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
       exit 1
     fi
@@ -96,7 +95,9 @@ stdenv.mkDerivation rec {
   postBuild   = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc";
   postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc";
 
-  meta = with stdenv.lib; {
+  setupHook = ./setup-hook.sh;
+
+  meta = with lib; {
     description = "Open RTL synthesis framework and tools";
     homepage    = "http://www.clifford.at/yosys/";
     license     = licenses.isc;
diff --git a/nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch b/nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch
new file mode 100644
index 000000000000..0cb0aee9c7ed
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch
@@ -0,0 +1,34 @@
+diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
+index 3ed19497..f9534bd0 100644
+--- a/passes/cmds/plugin.cc
++++ b/passes/cmds/plugin.cc
+@@ -75,8 +75,27 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
+ 		#endif
+ 
+ 		void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL);
+-		if (hdl == NULL && orig_filename.find('/') == std::string::npos)
+-			hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL);
++		if (hdl == NULL && orig_filename.find('/') == std::string::npos) {
++			std::string install_dir = proc_share_dirname() + "plugins";
++
++			vector<string> all_dirs;
++			all_dirs.push_back(install_dir);
++
++			char* plugin_dirs = getenv("NIX_YOSYS_PLUGIN_DIRS");
++			if (plugin_dirs != NULL) {
++				std::string p(plugin_dirs), t;
++				std::stringstream ss(p);
++
++				while(std::getline(ss, t, ':')) {
++					all_dirs.push_back(t);
++				}
++			}
++
++			for (auto dir : all_dirs) {
++				hdl = dlopen((dir + "/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL);
++				if (hdl != NULL) break;
++			}
++		}
+ 		if (hdl == NULL)
+ 			log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror());
+ 		loaded_plugins[orig_filename] = hdl;
diff --git a/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix b/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix
new file mode 100644
index 000000000000..58fef968e46d
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, pkg-config
+, yosys, readline, zlib, bluespec
+}:
+
+stdenv.mkDerivation {
+  pname = "yosys-bluespec";
+  version = "2021.01.17";
+
+  src = fetchFromGitHub {
+    owner  = "thoughtpolice";
+    repo   = "yosys-bluespec";
+    rev    = "3cfa22c2810b840f406610efe3d7657477c1b0ed";
+    sha256 = "1r48128yisw5lpziaj3hq88acghwi94pvm4735xajx8dl79jkcng";
+  };
+
+  buildInputs = [ yosys readline zlib bluespec ];
+  nativeBuildInputs = [ pkg-config ];
+
+  doCheck = true;
+  makeFlags = [
+    "PREFIX=$(out)/share/yosys/plugins"
+    "STATIC_BSC_PATH=${bluespec}/bin/bsc"
+    "STATIC_BSC_LIBDIR=${bluespec}/lib"
+  ];
+
+  meta = with lib; {
+    description = "Bluespec plugin for Yosys";
+    license     = licenses.isc;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix b/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix
new file mode 100644
index 000000000000..ccf8efc7c805
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, pkg-config
+, yosys, readline, zlib, ghdl
+}:
+
+stdenv.mkDerivation {
+  pname = "yosys-ghdl";
+  version = "2021.01.01";
+
+  src = fetchFromGitHub {
+    owner  = "ghdl";
+    repo   = "ghdl-yosys-plugin";
+    rev    = "8b3e740fef9a653a20a838f1ade475960e1d379b";
+    sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x";
+  };
+
+  buildInputs = [ yosys readline zlib ghdl ];
+  nativeBuildInputs = [ pkg-config ];
+
+  doCheck = true;
+  installPhase = ''
+    mkdir -p $out/share/yosys/plugins
+    cp ghdl.so $out/share/yosys/plugins/ghdl.so
+  '';
+
+  meta = with lib; {
+    description = "GHDL plugin for Yosys";
+    license     = licenses.isc;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/compilers/yosys/setup-hook.sh b/nixpkgs/pkgs/development/compilers/yosys/setup-hook.sh
new file mode 100644
index 000000000000..d01bbdd1a8c1
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/yosys/setup-hook.sh
@@ -0,0 +1,5 @@
+addYosysPluginPath() {
+  addToSearchPath NIX_YOSYS_PLUGIN_DIRS "$1/share/yosys/plugins"
+}
+
+addEnvHooks "$targetOffset" addYosysPluginPath
diff --git a/nixpkgs/pkgs/development/compilers/z88dk/default.nix b/nixpkgs/pkgs/development/compilers/z88dk/default.nix
index 0fb73d42b7e2..026a205cd26d 100644
--- a/nixpkgs/pkgs/development/compilers/z88dk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/z88dk/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }:
+{ fetchFromGitHub, lib, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }:
 
 stdenv.mkDerivation rec {
   pname = "z88dk";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "libs" "install" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.z88dk.org";
     description = "z80 Development Kit";
     license = licenses.clArtistic;
diff --git a/nixpkgs/pkgs/development/compilers/zasm/default.nix b/nixpkgs/pkgs/development/compilers/zasm/default.nix
index 174092496bab..97c7aa3c2acf 100644
--- a/nixpkgs/pkgs/development/compilers/zasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/zasm/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, zlib, stdenv }:
+{ fetchFromGitHub, zlib, lib, stdenv }:
 let
   libs-src = fetchFromGitHub {
     owner = "megatokio";
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     mv zasm $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Z80 / 8080 assembler (for unix-style OS)";
     homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/compilers/zig/default.nix b/nixpkgs/pkgs/development/compilers/zig/default.nix
index 1a5cba37d477..bd96010e8bfb 100644
--- a/nixpkgs/pkgs/development/compilers/zig/default.nix
+++ b/nixpkgs/pkgs/development/compilers/zig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }:
 
 llvmPackages.stdenv.mkDerivation rec {
   version = "0.7.1";
@@ -32,7 +32,7 @@ llvmPackages.stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
     homepage = "https://ziglang.org/";
diff --git a/nixpkgs/pkgs/development/compilers/zulu/8.nix b/nixpkgs/pkgs/development/compilers/zulu/8.nix
index bea32475f9a8..e81cc4124287 100644
--- a/nixpkgs/pkgs/development/compilers/zulu/8.nix
+++ b/nixpkgs/pkgs/development/compilers/zulu/8.nix
@@ -62,13 +62,13 @@ in stdenv.mkDerivation {
     EOF
   '';
 
-  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+  rpath = lib.strings.makeLibraryPath libraries;
 
   passthru = {
     home = zulu;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.azul.com/products/zulu/";
     license = licenses.gpl2;
     description = "Certified builds of OpenJDK";
diff --git a/nixpkgs/pkgs/development/compilers/zulu/default.nix b/nixpkgs/pkgs/development/compilers/zulu/default.nix
index 73e7bd7d338a..63b95465c273 100644
--- a/nixpkgs/pkgs/development/compilers/zulu/default.nix
+++ b/nixpkgs/pkgs/development/compilers/zulu/default.nix
@@ -59,13 +59,13 @@ in stdenv.mkDerivation {
     EOF
   '';
 
-  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+  rpath = lib.strings.makeLibraryPath libraries;
 
   passthru = {
     home = zulu;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.azul.com/products/zulu/";
     license = licenses.gpl2;
     description = "Certified builds of OpenJDK";
diff --git a/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix
index 3f9f3b1ac9cd..6c5216f0d018 100644
--- a/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix
@@ -1,32 +1,13 @@
-{ stdenv, fetchFromGitHub, coq, StructTact }:
+{ lib, mkCoqDerivation, coq, StructTact, version ? null }:
 
-let param =
-  {
-      version = "20200201";
-      rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
-      sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";
-  };
-in
-
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-Cheerios-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "uwplse";
-    repo = "cheerios";
-    inherit (param) rev sha256;
-  };
-
-  buildInputs = [ coq ];
+with lib; mkCoqDerivation {
+  pname   = "cheerios";
+  owner   = "uwplse";
+  inherit version;
+  defaultVersion = if versions.isGe "8.6" coq.coq-version then "20200201" else null;
+  release."20200201".rev    = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
+  release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";
 
   propagatedBuildInputs = [ StructTact ];
-  enableParallelBuilding = true;
-
   preConfigure = "patchShebangs ./configure";
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
- };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix b/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix
index 1d3e5a07b03d..4c5b6a4f6a9a 100644
--- a/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix
@@ -1,58 +1,28 @@
-{ stdenv, fetchFromGitHub, coq, bignums }:
+{ lib, mkCoqDerivation, coq, bignums, version ? null }:
 
-let
-  coqVersions = {
-    "8.6" = "1.4.0";
-    "8.7" = "1.4.0";
-    "8.8" = "1.6.0";
-    "8.9" = "1.6.0";
-    "8.10" = "1.7.0";
-    "8.11" = "1.7.0";
-  };
-  params = {
-    "1.4.0" = {
-      version = "1.4.0";
-      rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";
-      sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
-    };
-    "1.6.0" = {
-      version = "1.6.0";
-      rev = "328aa06270584b578edc0d2925e773cced4f14c8";
-      sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
-    };
-    "1.7.0" = {
-      version = "1.7.0";
-      rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40";
-      sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3";
-    };
-  };
-  param = params.${coqVersions.${coq.coq-version}};
-in
+with lib; mkCoqDerivation {
+  pname = "color";
+  owner = "fblanqui";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    {case = range "8.10" "8.11"; out = "1.7.0"; }
+    {case = range "8.8"  "8.9";  out = "1.6.0"; }
+    {case = range "8.6"  "8.7";  out = "1.4.0"; }
+  ] null;
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-CoLoR-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "fblanqui";
-    repo = "color";
-    inherit (param) rev sha256;
-  };
+  release."1.7.0".rev    = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40";
+  release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3";
+  release."1.6.0".rev    = "328aa06270584b578edc0d2925e773cced4f14c8";
+  release."1.6.0".sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
+  release."1.4.0".rev    = "168c6b86c7d3f87ee51791f795a8828b1521589a";
+  release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
 
-  buildInputs = [ coq bignums ];
+  extraBuildInputs = [ bignums ];
   enableParallelBuilding = false;
 
-  installPhase = ''
-    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-  '';
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "http://color.inria.fr/";
     description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant.";
     maintainers = with maintainers; [ jpas jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v coqVersions;
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix
index 7b52838505e2..706943cf8d02 100644
--- a/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix
@@ -1,18 +1,14 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, coq }:
+{ lib, mkCoqDerivation, autoconf, automake, coq, version ? null }:
 
-stdenv.mkDerivation rec {
-  name = "coq${coq.coq-version}-HoTT-${version}";
-  version = "20170921";
+with lib; mkCoqDerivation {
+  pname = "HoTT";
+  owner = "HoTT";
+  inherit version;
+  defaultVersion = if coq.coq-version == "8.6" then "20170921" else null;
+  release."20170921".rev    = "e3557740a699167e6adb1a65855509d55a392fa1";
+  release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v";
 
-  src = fetchFromGitHub {
-    owner = "HoTT";
-    repo = "HoTT";
-    rev = "e3557740a699167e6adb1a65855509d55a392fa1";
-    sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v";
-  };
-
-  buildInputs = [ autoconf automake coq ];
-  enableParallelBuilding = true;
+  extraBuildInputs = [ autoconf automake ];
 
   preConfigure = ''
     patchShebangs ./autogen.sh
@@ -44,18 +40,9 @@ stdenv.mkDerivation rec {
     rmdir $out/share
   '';
 
-  installFlags = [
-    "COQBIN=${coq}/bin"
-  ];
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "http://homotopytypetheory.org/";
     description = "Homotopy type theory";
     maintainers = with maintainers; [ siddharthist ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: v == "8.6";
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix
index 387e41859039..8236705b58f2 100644
--- a/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -1,31 +1,11 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let param =
-  {
-      version = "20200131";
-      rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
-      sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
-  };
-in
-
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-InfSeqExt-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "DistributedComponents";
-    repo = "InfSeqExt";
-    inherit (param) rev sha256;
-  };
-
-  buildInputs = [ coq ];
-
-  enableParallelBuilding = true;
-
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+mkCoqDerivation {
+  pname = "InfSeqExt";
+  owner = "DistributedComponents";
+  inherit version;
+  defaultVersion = if lib.versions.isGe "8.5" coq.coq-version then "20200131" else null;
+  release."20200131".rev    = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
+  release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
   preConfigure = "patchShebangs ./configure";
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
- };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
index a167b7988dcd..32ef1ad633cf 100644
--- a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,96 +1,46 @@
-{ stdenv, fetchFromGitHub, coq, ssreflect, coq-ext-lib, simple-io }:
-
-let params =
-  {
-    "8.5" = {
-      version = "20170512";
-      rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03";
-      sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
-    };
-
-    "8.6" = {
-      version = "20171102";
-      rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf";
-      sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
-    };
-
-    "8.8" = {
-      version = "20190311";
-      rev = "22af9e9a223d0038f05638654422e637e863b355";
-      sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
-    };
-
-    "8.9" = rec {
-      version = "1.1.0";
-      rev = "v${version}";
-      sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
-    };
-
-    "8.10" = rec {
-      version = "1.2.1";
-      rev = "v${version}";
-      sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";
-    };
-
-    "8.11" = rec {
-      version = "1.3.2";
-      rev = "v${version}";
-      sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
-    };
-
-    "8.12" = rec {
-      version = "1.4.0";
-      rev = "v${version}";
-      sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
-    };
-  };
-  param = params.${coq.coq-version};
-in
-
-let inherit (stdenv.lib) maintainers optional optionals versionAtLeast; in
-
-let recent = versionAtLeast coq.coq-version "8.8"; in
-
-stdenv.mkDerivation {
-
-  name = "coq${coq.coq-version}-QuickChick-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "QuickChick";
-    repo = "QuickChick";
-    inherit (param) rev sha256;
-  };
-
-  preConfigure = stdenv.lib.optionalString recent
+{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io }:
+with lib;
+let recent = versions.isGe "8.7" coq.coq-version; in
+mkCoqDerivation {
+  pname = "QuickChick";
+  owner = "QuickChick";
+  defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [
+      { cases = [ "8.12" pred.true  ]; out = "1.4.0"; }
+      { cases = [ "8.11" pred.true  ]; out = "1.3.2"; }
+      { cases = [ "8.10" pred.true  ]; out = "1.2.1"; }
+      { cases = [ "8.9"  pred.true  ];  out = "1.1.0"; }
+      { cases = [ "8.8"  pred.true  ];  out = "20190311"; }
+      { cases = [ "8.7"  isLe "1.8" ];  out = "1.0.0"; }
+      { cases = [ "8.6"  pred.true  ];  out = "20171102"; }
+      { cases = [ "8.5"  pred.true  ];  out = "20170512"; }
+    ] null;
+  release."1.4.0".sha256    = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
+  release."1.3.2".sha256    = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
+  release."1.2.1".sha256    = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";
+  release."1.1.0".sha256    = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
+  release."1.0.0".sha256    = "1gqy9a4yavd0sa7kgysf9gf2lq4p8dmn4h89y8081f2j8zli0w5y";
+  release."20190311".rev    = "22af9e9a223d0038f05638654422e637e863b355";
+  release."20190311".sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
+  release."20171102".rev    = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf";
+  release."20171102".sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
+  release."20170512".rev    = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03";
+  release."20170512".sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
+  releaseRev = v: "v${v}";
+
+  preConfigure = optionalString recent
     "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
 
-  buildInputs = [ coq ]
-  ++ (with coq.ocamlPackages; [ ocaml findlib ])
-  ++ optionals (recent && !versionAtLeast coq.coq-version "8.10")
-       (with coq.ocamlPackages; [ camlp5 ocamlbuild ])
-  ++ optional recent coq.ocamlPackages.num
-  ;
+  mlPlugin = true;
+  extraBuildInputs = optional recent coq.ocamlPackages.num;
   propagatedBuildInputs = [ ssreflect ]
-  ++ optionals recent [ coq-ext-lib simple-io ]
-  ++ optional (versionAtLeast coq.coq-version "8.10")
-       coq.ocamlPackages.ocamlbuild
-  ;
+    ++ optionals recent [ coq-ext-lib simple-io ]
+    ++ optional  recent coq.ocamlPackages.ocamlbuild;
+  extraInstallFlags = [ "-f Makefile.coq" ];
 
   enableParallelBuilding = false;
 
-  installPhase = ''
-    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-  '';
-
   meta = {
-    homepage = "https://github.com/QuickChick/QuickChick";
     description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
   };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix
index 798aaabe6773..9770b9fb9c45 100644
--- a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix
@@ -1,31 +1,11 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let param =
-  {
-      version = "20181102";
-      rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
-      sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
-  };
-in
-
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-StructTact-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "uwplse";
-    repo = "StructTact";
-    inherit (param) rev sha256;
-  };
-
-  buildInputs = [ coq ];
-
-  enableParallelBuilding = true;
-
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "StructTact";
+  owner = "uwplse";
+  inherit version;
+  defaultVersion = if versions.isGe "8.5" coq.coq-version then "20181102" else null;
+  release."20181102".rev =    "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
+  release."20181102".sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
   preConfigure = "patchShebangs ./configure";
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  passthru = {
-    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
- };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/VST/default.nix b/nixpkgs/pkgs/development/coq-modules/VST/default.nix
index a625aa54c148..af560ec49a0b 100644
--- a/nixpkgs/pkgs/development/coq-modules/VST/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/VST/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchFromGitHub, coq, compcert }:
+{ lib, mkCoqDerivation, coq, compcert, version ? null }:
 
-stdenv.mkDerivation rec {
+with lib; mkCoqDerivation {
   pname = "coq${coq.coq-version}-VST";
-  version = "2.6";
-
-  src = fetchFromGitHub {
-    owner = "PrincetonUniversity";
-    repo = "VST";
-    rev = "v${version}";
-    sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk";
-  };
-
-  buildInputs = [ coq ];
+  namePrefix = [];
+  displayVersion = { coq = false; };
+  owner = "PrincetonUniversity";
+  repo = "VST";
+  inherit version;
+  defaultVersion = if coq.coq-version == "8.11" then "2.6" else null;
+  release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk";
+  releaseRev = v: "v${v}";
   propagatedBuildInputs = [ compcert ];
 
   preConfigure = "patchShebangs util";
@@ -30,14 +28,9 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  enableParallelBuilding = true;
-
-  passthru.compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.11" ];
-
   meta = {
     description = "Verified Software Toolchain";
     homepage = "https://vst.cs.princeton.edu/";
     inherit (compcert.meta) platforms;
   };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix b/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix
index 92c9b2569ca4..08322fb7fc40 100644
--- a/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix
@@ -1,41 +1,14 @@
-{ stdenv, fetchFromGitHub, coq }:
+{ lib, mkCoqDerivation, coq, version ? null }:
 
-let params =
-  {
-    "8.6" = {
-      version = "20180221";
-      rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
-      sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
-    };
+with lib; mkCoqDerivation {
+  pname = "Velisarios";
+  owner = "vrahli";
+  inherit version;
+  defaultVersion = if versions.range "8.6" "8.8" coq.coq-version then "20180221" else null;
 
-    "8.7" = {
-      version = "20180221";
-      rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
-      sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
-    };
-
-    "8.8" = {
-      version = "20180221";
-      rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
-      sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
-    };
-  };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-Velisarios-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "vrahli";
-    repo = "Velisarios";
-    inherit (param) rev sha256;
-  };
-
-  buildInputs = [
-    coq coq.ocaml coq.camlp5 coq.findlib
-  ];
-  enableParallelBuilding = true;
+  release."20180221".rev    = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+  release."20180221".sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+  mlPlugin = true;
 
   buildPhase = "make -j$NIX_BUILD_CORES";
   preBuild = "./create-makefile.sh";
@@ -43,8 +16,4 @@ stdenv.mkDerivation {
     mkdir -p $out/lib/coq/${coq.coq-version}/Velisarios
     cp -pR model/*.vo $out/lib/coq/${coq.coq-version}/Velisarios
   '';
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
- };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
index 927cd832452b..d3769eb2c4db 100644
--- a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
@@ -1,37 +1,19 @@
-{ stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }:
+{ lib, mkCoqDerivation, coq, Cheerios, InfSeqExt, ssreflect, version ? null }:
+
+
+with lib; mkCoqDerivation {
+  pname = "verdi";
+  owner = "uwplse";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = isGe "8.7"; out = "20200131"; }
+    { case = isEq "8.6"; out = "20181102"; }
+  ] null;
+  release."20200131".rev    = "fdb4ede19d2150c254f0ebcfbed4fb9547a734b0";
+  release."20200131".sha256 = "1a2k19f9q5k5djbxplqmmpwck49kw3lrm3aax920h4yb40czkd8m";
+  release."20181102".rev    = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
+  release."20181102".sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
 
-let param =
-  if stdenv.lib.versionAtLeast coq.coq-version "8.7" then
-  {
-      version = "20200131";
-      rev = "fdb4ede19d2150c254f0ebcfbed4fb9547a734b0";
-      sha256 = "1a2k19f9q5k5djbxplqmmpwck49kw3lrm3aax920h4yb40czkd8m";
-  } else {
-      version = "20181102";
-      rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
-      sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
-  };
-in
-
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-verdi-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "uwplse";
-    repo = "verdi";
-    inherit (param) rev sha256;
-  };
-
-  buildInputs = [ coq ];
   propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ];
-
-  enableParallelBuilding = true;
-
   preConfigure = "patchShebangs ./configure";
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
- };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix b/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix
index 9507dc6751ae..b2609d5dfc32 100644
--- a/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix
@@ -1,33 +1,22 @@
-{ stdenv, fetchgit, coq, mathcomp }:
+{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
 
-stdenv.mkDerivation rec {
+with lib; mkCoqDerivation {
+  pname   = "autosubst";
+  owner   = "uds-psl";
+  inherit version;
+  defaultVersion = with versions;
+    if range "8.5" "8.7" coq.coq-version then "5b40a32e" else null;
 
-  name = "coq-autosubst-${coq.coq-version}-${version}";
-  version = "5b40a32e";
+  release."5b40a32e".rev    = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
+  release."5b40a32e".sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0";
 
-  src = fetchgit {
-    url = "git://github.com/uds-psl/autosubst.git";
-    rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
-    sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341";
-  };
-
-  buildInputs = [ coq ];
-  propagatedBuildInputs = [ mathcomp ];
+  propagatedBuildInputs = [ mathcomp.ssreflect ];
 
   patches = [./0001-changes-to-work-with-Coq-8.6.patch];
 
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://www.ps.uni-saarland.de/autosubst/";
     description = "Automation for de Bruijn syntax and substitution in Coq";
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
-  };
-
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
index f0434c4ae471..84dc92a3cd5f 100644
--- a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
@@ -1,64 +1,25 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let params = {
-      "8.6" = {
-        rev = "v8.6.0";
-        sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";
-      };
-      "8.7" = {
-        rev = "V8.7.0";
-        sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
-      };
-      "8.8" = {
-        rev = "V8.8.0";
-        sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
-      };
-      "8.9" = {
-        rev = "V8.9.0";
-        sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01";
-      };
-      "8.10" = {
-        rev = "V8.10.0";
-        sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5";
-      };
-      "8.11" = {
-        rev = "V8.11.0";
-        sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp";
-      };
-      "8.12" = {
-        rev = "V8.12.0";
-        sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8";
-      };
-      "8.13" = {
-        rev = "V8.13.0";
-        sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";
-      };
-    };
-    param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation {
-
-  name = "coq${coq.coq-version}-bignums";
-
-  src = fetchFromGitHub {
-    owner = "coq";
-    repo = "bignums";
-    inherit (param) rev sha256;
-  };
-
-  buildInputs = with coq.ocamlPackages; [ ocaml findlib coq ]
-  ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") camlp5
-  ;
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  meta = with stdenv.lib; {
-    license = licenses.lgpl2;
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
-  };
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "bignums";
+  owner = "coq";
+  displayVersion = { bignums = ""; };
+  inherit version;
+  defaultVersion = if versions.isGe "8.5" coq.coq-version
+    then "${coq.coq-version}.0" else null;
+
+  release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";
+  release."8.12.0".sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8";
+  release."8.11.0".sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp";
+  release."8.10.0".sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5";
+  release."8.9.0".sha256  = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01";
+  release."8.8.0".sha256  = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
+  release."8.7.0".sha256  = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
+  release."8.6.0".rev     = "v8.6.0";
+  release."8.6.0".sha256  = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";
+  releaseRev = v: "V${v}";
+
+  mlPlugin = true;
+
+  meta = { license = licenses.lgpl2; };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix b/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix
index 1178b1558ff7..339bcb9d6b09 100644
--- a/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix
@@ -1,54 +1,26 @@
-{ stdenv, fetchgit, coq, ssreflect, equations }:
+{ lib, mkCoqDerivation, coq, ssreflect, equations, version ? null }:
 
-let
-  params =
-    let
-    v20180709 = {
-      version = "20180709";
-      rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
-      sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
-    };
-    v20190414 = {
-      version = "20190414";
-      rev = "706fdb4065cc2302d92ac2bce62cb59713253119";
-      sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay";
-    };
-  in {
-    "8.6" = v20180709;
-    "8.7" = v20180709;
-    "8.8" = v20190414;
-    "8.9" = v20190414;
-  };
-  param = params.${coq.coq-version};
-in
+with lib; mkCoqDerivation {
 
-stdenv.mkDerivation {
+  pname = "category-theory";
+  owner = "jwiegley";
 
-  name = "coq${coq.coq-version}-category-theory-${param.version}";
+  release."20190414".rev    = "706fdb4065cc2302d92ac2bce62cb59713253119";
+  release."20190414".sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay";
+  release."20180709".rev    = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
+  release."20180709".sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
 
-  src = fetchgit {
-    url = "git://github.com/jwiegley/category-theory.git";
-    inherit (param) rev sha256;
-  };
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = range "8.8" "8.9"; out = "20190414"; }
+    { case = range "8.6" "8.7"; out = "20180709"; }
+  ] null;
 
-  buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]);
+  mlPlugin = true;
   propagatedBuildInputs = [ ssreflect equations ];
 
-  buildFlags = [ "JOBS=$(NIX_BUILD_CORES)" ];
-
-  installPhase = ''
-    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/jwiegley/category-theory";
+  meta = {
     description = "A formalization of category theory in Coq for personal study and practical work";
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/contribs/default.nix b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
index d2787f0948e0..cb6dedca3551 100644
--- a/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
@@ -1,27 +1,16 @@
-{ stdenv, fetchFromGitHub, coq }:
+{ lib, mkCoqDerivation, coq, callPackage }:
 
-let mkContrib = repo: revs: param:
-  stdenv.mkDerivation rec {
-    name = "coq${coq.coq-version}-${repo}-${version}";
-    version = param.version;
-
-    src = fetchFromGitHub {
+with lib; let mkContrib = pname: coqs: param:
+  let contribVersion = {version ? null}: mkCoqDerivation ({
+      inherit pname version;
       owner = "coq-contribs";
-      repo = repo;
-      rev = param.rev;
-      sha256 = param.sha256;
-    };
-
-    buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
-
-    installFlags =
-       stdenv.lib.optional (stdenv.lib.versionAtLeast coq.coq-version "8.9") "-f Makefile.coq"
-    ++ [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-    passthru = {
-      compatibleCoqVersions = v: builtins.elem v revs;
-    };
-  }; in
+      mlPlugin = true;
+    } // optionalAttrs (builtins.elem coq.coq-version coqs) ({
+      defaultVersion = param.version;
+      release = { "${param.version}" = { inherit (param) rev sha256; }; };
+    } // (removeAttrs param [ "version" "rev" "sha256" ]))
+  ); in
+  makeOverridable contribVersion {} ; in
 {
   aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] {
     "8.7" = {
@@ -353,10 +342,10 @@ let mkContrib = repo: revs: param:
     sha256 = "02jcp74i5icv92xkq3mcx91786d56622ghgnjiz3b51wfqs6ldic";
   };
 
-  firing-squad = mkContrib "firing-squad" [ "8.6" "8.7" ] {
-    version = "v8.5.0-9-gbe728cd";
-    rev = "be728cddbee58088809b51c25425d2a4bdf9b823";
-    sha256 = "0i0v5x6lncjasxk22pras3644ff026q8jai45dbimf2fz73312c9";
+  firing-squad = mkContrib "firing-squad" [ "8.6" ] {
+      version = "v8.5.0-9-gbe728cd";
+      rev = "be728cddbee58088809b51c25425d2a4bdf9b823";
+      sha256 = "0i0v5x6lncjasxk22pras3644ff026q8jai45dbimf2fz73312c9";
   };
 
   float = mkContrib "float" [ "8.7" ] {
@@ -525,6 +514,7 @@ let mkContrib = repo: revs: param:
     version = "v8.6.0";
     rev = "6279ed83244dc4aec2e23ffb4c87e3f10a50326d";
     sha256 = "1yvlnqwa7ka4a0yg0j7zrzvayhsm1shvsjjawjv552sxc9519aag";
+    installFlags = [ "COQBIN=$(out)/lib/coq/${coq.coq-version}/bin/" ]; # hack
   };
 
   ipc = mkContrib "ipc" [ "8.6" "8.7" ] {
@@ -635,12 +625,6 @@ let mkContrib = repo: revs: param:
     sha256 = "19csz50846gvfwmhhc37nmlvf70g53cpb1kpmcnjlj82y8r63ajz";
   };
 
-  math-classes = mkContrib "math-classes" [ "8.6" ] {
-    version = "v8.6.0-19-ge2c6453";
-    rev = "e2c6453e2f6cc1b7f0e1371675f4a76b19fab2c7";
-    sha256 = "0das56i8wi7v0s30lbadjlfqas1jlq0mm13yxq6s7zqqbdl5r0bk";
-  };
-
   maths = mkContrib "maths" [ "8.5" "8.6" "8.7" ] {
     version = "v8.6.0";
     rev = "75a2f84990c1dc83a18ee7decc1445c122664222";
diff --git a/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix
index 9665c5400d85..410280925dcc 100644
--- a/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix
@@ -1,38 +1,24 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp-algebra }:
+{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
 
-let
-  version = "20190812";
-in
+with lib; mkCoqDerivation {
+  pname = "coq-bits";
+  repo = "bits";
+  inherit version;
+  defaultVersion = if versions.isGe "8.7" coq.version then "20190812" else null;
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-coq-bits-${version}";
+  release."20190812".rev    = "1.0.0";
+  release."20190812".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
 
-  src = fetchFromGitHub {
-    owner = "coq-community";
-    repo = "bits";
-    rev = "1.0.0";
-    sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
-  };
-
-  buildInputs = [ coq ];
-  propagatedBuildInputs = [ mathcomp-algebra ];
-
-  enableParallelBuilding = true;
+  propagatedBuildInputs = [ mathcomp.algebra ];
 
   installPhase = ''
     make -f Makefile CoqMakefile
     make -f CoqMakefile COQLIB=$out/lib/coq/${coq.coq-version}/ install
   '';
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/coq-community/bits";
+  meta = {
     description = "A formalization of bitset operations in Coq";
     license = licenses.asl20;
     maintainers = with maintainers; [ ptival ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
index 230320671a7f..18dbeaea201d 100644
--- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -1,43 +1,33 @@
-{ stdenv, fetchFromGitHub, which, coq }:
+{ lib, mkCoqDerivation, which, coq, version ? null }:
 
-let params = {
-  "8.11" = rec {
-    version = "1.6.0_8.11";
-    rev = "v${version}";
-    sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
-  };
-  "8.12" = rec {
-    version = "1.6.0";
-    rev = "v${version}";
-    sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
-  };
-};
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-  name = "coq${coq.coq-version}-elpi-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "LPCIC";
-    repo = "coq-elpi";
-    inherit (param) rev sha256;
-  };
+with builtins; with lib; let
+  elpi = coq.ocamlPackages.elpi.override (
+    optionalAttrs (coq.coq-version == "8.11") { version = "1.11.4"; }
+  );
+in mkCoqDerivation {
+  pname = "elpi";
+  repo  = "coq-elpi";
+  owner = "LPCIC";
+  inherit version;
+  defaultVersion = lib.switch coq.coq-version [
+    { case = "8.13"; out = "1.8.1"; }
+    { case = "8.12"; out = "1.8.0"; }
+    { case = "8.11"; out = "1.6.0_8.11"; }
+  ] null;
+  release."1.8.1".sha256      = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
+  release."1.8.0".sha256      = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
+  release."1.7.0".sha256      = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";
+  release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
+  release."1.6.0".sha256      = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
+  releaseRev = v: "v${v}";
 
   nativeBuildInputs = [ which ];
-  buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]);
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+  mlPlugin = true;
+  extraBuildInputs = [ elpi ];
 
   meta = {
     description = "Coq plugin embedding ELPI.";
-    maintainers = [ stdenv.lib.maintainers.cohencyril ];
-    license = stdenv.lib.licenses.lgpl21;
-    inherit (coq.meta) platforms;
-    inherit (src.meta) homepage;
-  };
-
-  passthru = {
-    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
+    maintainers = [ maintainers.cohencyril ];
+    license = licenses.lgpl21;
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix
index e0ca52086206..8acb0643781d 100644
--- a/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -1,63 +1,29 @@
-{ stdenv, fetchFromGitHub, coq, ...}@args:
-
-let
-  hashes = {
-    "0.9.4" = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0";
-    "0.9.5" = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg";
-    "0.9.7" = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag";
-    "0.10.0" = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a";
-    "0.10.1" = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95";
-    "0.10.2" = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f";
-    "0.10.3" = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb";
-    "0.11.1" = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5";
-    "0.11.2" = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6";
-    "0.11.3" = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42";
-  };
-
-  default-versions = {
-    "8.5" = "0.9.4";
-    "8.6" = "0.9.5";
-    "8.7" = "0.9.7";
-    "8.8" = "0.11.3";
-    "8.9" = "0.11.3";
-    "8.10" = "0.11.3";
-    "8.11" = "0.11.3";
-    "8.12" = "0.11.3";
-  };
-
-  param = rec {
-    version = args.version or default-versions.${coq.coq-version};
-    sha256 = hashes.${version};
-  };
-
-in
-
-stdenv.mkDerivation rec {
-
-  name = "coq${coq.coq-version}-coq-ext-lib-${version}";
-  inherit (param) version;
-
-  src = fetchFromGitHub {
-    owner = "coq-community";
-    repo = "coq-ext-lib";
-    rev = "v${version}";
-    inherit (param) sha256;
-  };
-
-  buildInputs = [ coq ];
-
-  enableParallelBuilding = true;
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/coq-ext-lib/coq-ext-lib";
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation rec {
+  pname = "coq-ext-lib";
+  owner = "coq-ext-lib";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = range "8.8" "8.12"; out = "0.11.3"; }
+    { case = "8.7";              out = "0.9.7"; }
+    { case = "8.6";              out = "0.9.5"; }
+    { case = "8.5";              out = "0.9.4"; }
+  ] null;
+  release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42";
+  release."0.11.2".sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6";
+  release."0.10.3".sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb";
+  release."0.11.1".sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5";
+  release."0.10.2".sha256 = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f";
+  release."0.10.1".sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95";
+  release."0.10.0".sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a";
+  release."0.9.7".sha256  = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag";
+  release."0.9.5".sha256  = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg";
+  release."0.9.4".sha256  = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0";
+  releaseRev = v: "v${v}";
+
+  meta = {
     description = "A collection of theories and plugins that may be useful in other Coq developments";
     maintainers = with maintainers; [ jwiegley ptival ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v default-versions;
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix
index 7c86a7d55f34..7caf754ae50a 100644
--- a/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -1,60 +1,21 @@
-{ stdenv, fetchgit, coq, ssreflect }:
+{ lib, mkCoqDerivation, coq, ssreflect, version ? null }:
 
-let params =
-  {
-    "8.5" = {
-      version = "20171215";
-      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
-      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
-    };
+with lib; mkCoqDerivation {
 
-    "8.6" = {
-      version = "20171215";
-      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
-      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
-    };
+  pname = "coq-haskell";
+  owner = "jwiegley";
+  inherit version;
+  defaultVersion = if versions.range "8.5" "8.8" coq.coq-version then "20171215" else null;
+  release."20171215".rev    = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
+  release."20171215".sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
 
-    "8.7" = {
-      version = "20171215";
-      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
-      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
-    };
-
-    "8.8" = {
-      version = "20171215";
-      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
-      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
-    };
-  };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation {
-
-  name = "coq${coq.coq-version}-coq-haskell-${param.version}";
-
-  src = fetchgit {
-    url = "git://github.com/jwiegley/coq-haskell.git";
-    inherit (param) rev sha256;
-  };
-
-  buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
+  mlPlugin = true;
+  extraInstallFlags = [ "-f Makefile.coq" ];
   propagatedBuildInputs = [ coq ssreflect ];
-
   enableParallelBuilding = false;
 
-  installPhase = ''
-    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/jwiegley/coq-haskell";
+  meta = {
     description = "A library for formalizing Haskell types and functions in Coq";
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix
new file mode 100644
index 000000000000..4c978a791db8
--- /dev/null
+++ b/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix
@@ -0,0 +1,24 @@
+{ coq, mkCoqDerivation, mathcomp, bignums, paramcoq, multinomials,
+  lib, which, version ? null }:
+
+with lib; mkCoqDerivation {
+
+  pname = "CoqEAL";
+  owner = "CoqEAL";
+  inherit version;
+  defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [
+      { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }
+      { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; }
+    ] null;
+
+  release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk";
+  release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";
+
+  extraBuildInputs = [ which ];
+  propagatedBuildInputs = [ mathcomp.algebra bignums paramcoq multinomials ];
+
+  meta = {
+    description = "CoqEAL - The Coq Effective Algebra Library";
+    license = licenses.mit;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix
index 56fce9ac526f..89aa8d74e85c 100644
--- a/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix
@@ -1,43 +1,28 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let
-  params = {
-    "8.8" = {
-      version = "1.1";
-      sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
-      buildInputs = [ coq.ocamlPackages.camlp5 ];
-    };
-    "8.9" = {
-      version = "1.1.1";
-      sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
-      buildInputs = [ coq.ocamlPackages.camlp5 ];
-    };
-    "8.10" = {
-      version = "1.3";
-      sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd";
-    };
-    "8.11" = {
-      version = "1.3";
-      sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b";
-    };
-    "8.12" = {
-      version = "1.3";
-      sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8";
-    };
-  };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-  inherit (param) version;
-  name = "coq${coq.coq-version}-coqhammer-${version}";
-
-  src = fetchFromGitHub {
-    owner = "lukaszcz";
-    repo = "coqhammer";
-    rev = "v${version}-coq${coq.coq-version}";
-    inherit (param) sha256;
-  };
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+  inherit version;
+  pname = "coqhammer";
+  owner = "lukaszcz";
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = "8.12"; out = "1.3-coq8.12"; }
+    { case = "8.11"; out = "1.3-coq8.11"; }
+    { case = "8.10"; out = "1.3-coq8.10"; }
+    { case = "8.9";  out = "1.1.1-coq8.9"; }
+    { case = "8.8";  out = "1.1-coq8.8"; }
+  ] null;
+  release."1.3-coq8.12".sha256   = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8";
+  release."1.3-coq8.11".sha256   = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b";
+  release."1.3-coq8.10".sha256   = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd";
+  release."1.1.1-coq8.9".sha256  = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
+  release."1.1-coq8.8".sha256    = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
+
+  release."1.3-coq8.12".version  = "1.3";
+  release."1.3-coq8.11".version  = "1.3";
+  release."1.3-coq8.10".version  = "1.3";
+  release."1.1.1-coq8.9".version = "1.1.1";
+  release."1.1-coq8.9".version   = "1.1";
+  releaseRev = v: "v${v}";
 
   postPatch = ''
     substituteInPlace Makefile.coq.local --replace \
@@ -46,26 +31,16 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile.coq.local --replace 'g++' 'c++' --replace 'gcc' 'cc'
   '';
 
-  buildInputs = [ coq ] ++ (with coq.ocamlPackages; [
-    ocaml findlib
-  ]) ++ (param.buildInputs or []);
-
   preInstall = ''
     mkdir -p $out/bin
   '';
 
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+  mlPlugin = true;
 
   meta = {
     homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/";
     description = "Automation for Dependent Type Theory";
-    license = stdenv.lib.licenses.lgpl21;
-    inherit (coq.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.vbgl ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix
index f16341ddbd1b..79db14610758 100644
--- a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix
@@ -1,60 +1,29 @@
-{ stdenv, which, fetchFromGitHub, coq, bignums }:
-
-let
-  params =
-    let v_8_8 = {
-          version = "8.8";
-          sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
-        };
-        v_8_10 = {
-          version = "8.10";
-          sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
-        };
-    in
-      {
-        "8.7" = {
-          version = "8.7.2";
-          sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
-        };
-        "8.8" = v_8_8;
-        "8.9" = v_8_8;
-        "8.10" = v_8_10;
-        "8.11" = v_8_10;
-	"8.12" = {
-	  version = "8.12";
-          sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj";
-	};
-      };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-
-  inherit (param) version;
-  name = "coq${coq.coq-version}-coqprime-${version}";
-
-  src = fetchFromGitHub {
-    owner = "thery";
-    repo = "coqprime";
-    rev = "v${version}";
-    inherit (param) sha256;
-  };
-
-  buildInputs = [ which coq ];
-
+{ which, lib, mkCoqDerivation, coq, bignums, version ? null }:
+
+with lib; mkCoqDerivation {
+
+  pname = "coqprime";
+  owner = "thery";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = "8.12";              out = "8.12"; }
+    { case = range "8.10" "8.11"; out = "8.10"; }
+    { case = range "8.8"  "8.9";  out = "8.8"; }
+    { case = "8.7";               out = "8.7.2"; }
+  ] null;
+
+  release."8.12".sha256  = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj";
+  release."8.10".sha256  = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
+  release."8.8".sha256   = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
+  release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
+  releaseRev = v: "v${v}";
+
+  extraBuildInputs = [ which ];
   propagatedBuildInputs = [ bignums ];
 
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate";
     license = licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (coq.meta) platforms;
-    inherit (src.meta) homepage;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
+    maintainers = [ maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix
index e45077f89fdd..b7f5802b9d40 100644
--- a/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix
@@ -1,43 +1,29 @@
-{ stdenv, fetchurl, which, coq, ssreflect }:
+{ lib, mkCoqDerivation, which, autoconf,
+  coq, ssreflect, version ? null }:
 
-let param =
-  if stdenv.lib.versionAtLeast coq.coq-version "8.8"
-  then {
-    version = "3.1.0";
-    uid = "38287";
-    sha256 = "07436wkvnq9jyf7wyhp77bpl157s3qhba1ay5xrkxdi26qdf3h14";
-  } else {
-    version = "3.0.2";
-    uid = "37523";
-    sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w";
-  }
-; in
+with lib; mkCoqDerivation {
+  pname = "coquelicot";
+  owner = "coquelicot";
+  domain = "gitlab.inria.fr";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = isGe "8.8" ;        out = "3.2.0"; }
+    { case = range "8.8" "8.13"; out = "3.1.0"; }
+    { case = range "8.5" "8.9";  out = "3.0.2"; }
+  ] null;
+  release."3.2.0".sha256 = "07w7dbl8x7xxnbr2q39wrdh054gvi3daqjpdn1jm53crsl1fjxm4";
+  release."3.1.0".sha256 = "02i0djar13yk01hzaqprcldhhscn9843x9nf6x3jkv4wv1jwnx9f";
+  release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl";
+  releaseRev = v: "coquelicot-${v}";
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-coquelicot-${param.version}";
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/${param.uid}/coquelicot-${param.version}.tar.gz";
-    inherit (param) sha256;
-  };
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ coq ];
+  nativeBuildInputs = [ which autoconf ];
   propagatedBuildInputs = [ ssreflect ];
-
-  configureFlags = [ "--libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Coquelicot" ];
-  buildPhase = "./remake";
-  installPhase = "./remake install";
+  useMelquiondRemake.logpath = "Coquelicot";
 
   meta = {
     homepage = "http://coquelicot.saclay.inria.fr/";
     description = "A Coq library for Reals";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (coq.meta) platforms;
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.vbgl ];
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/nixpkgs/pkgs/development/coq-modules/corn/default.nix
index 14ff74506f37..9f2316f3177d 100644
--- a/nixpkgs/pkgs/development/coq-modules/corn/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/corn/default.nix
@@ -1,17 +1,10 @@
-{ stdenv, fetchFromGitHub, coq, bignums, math-classes }:
+{ lib, mkCoqDerivation, coq, bignums, math-classes, version ? null }:
 
-stdenv.mkDerivation rec {
+with lib; mkCoqDerivation rec {
   pname = "corn";
-  version = "8.8.1";
-  name = "coq${coq.coq-version}-${pname}-${version}";
-  src = fetchFromGitHub {
-    owner = "coq-community";
-    repo = pname;
-    rev = version;
-    sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";
-  };
-
-  buildInputs = [ coq ];
+  inherit version;
+  defaultVersion = if versions.range "8.6" "8.9" coq.coq-version then "8.8.1" else null;
+  release."8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";
 
   preConfigure = "patchShebangs ./configure.sh";
   configureScript = "./configure.sh";
@@ -19,20 +12,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ bignums math-classes ];
 
-  enableParallelBuilding = true;
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
   meta = {
     homepage = "http://c-corn.github.io/";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     description = "A Coq library for constructive analysis";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (coq.meta) platforms;
+    maintainers = [ maintainers.vbgl ];
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
index 195a1c4eada5..c6cc0d34ed1c 100644
--- a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,88 +1,58 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, coq }:
-
-let params = {
-  "8.12" = {
-    version = "0.6.8";
-    sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps";
-  };
-  "8.11" = {
-    version = "0.6.7";
-    sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09";
-  };
-  "8.10" = {
-    version = "0.6.6";
-    sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w";
-  };
-  "8.9" = {
-    version = "0.6.5";
-    sha256 = "1f34z24yg05b1096gqv36jr3vffkcjkf9qncii3pzhhvagxd0w2f";
-  };
-  "8.8" = {
-    version = "0.6.3";
-    rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2";
-    sha256 = "0c95b0bz2kjm6swr5na4gs06lxxywradszxbr5ldh2zx02r3f3rx";
-  };
-  "8.7" = {
-    version = "0.6.2";
-    rev = "d76ddde37d918569945774733b7997e8b24daf51";
-    sha256 = "04lnf4b25yarysj848cfl8pd3i3pr3818acyp9hgwdgd1rqmhjwm";
-  };
-  "8.6" = {
-    version = "0.6.1";
-    rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
-    sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9";
-  };
-  "8.5" = {
-    version = "0.6";
-    sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
-  };
-};
-param = params.${coq.coq-version};
-in
-
-let hasWarning = stdenv.lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in
-
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-dpdgraph-${param.version}";
-  src = fetchFromGitHub {
-    owner = "Karmaki";
-    repo = "coq-dpdgraph";
-    rev = param.rev or "v${param.version}";
-    inherit (param) sha256;
-  };
+{ lib, mkCoqDerivation, autoreconfHook, coq, version ? null }:
+
+with lib;
+let hasWarning = versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in
+
+mkCoqDerivation {
+  pname = "dpdgraph";
+  owner = "Karmaki";
+  repo = "coq-dpdgraph";
+  inherit version;
+  defaultVersion = switch coq.coq-version [
+    { case = "8.12"; out = "0.6.8"; }
+    { case = "8.11"; out = "0.6.7"; }
+    { case = "8.10"; out = "0.6.6"; }
+    { case = "8.9";  out = "0.6.5"; }
+    { case = "8.8";  out = "0.6.3"; }
+    { case = "8.7";  out = "0.6.2"; }
+    { case = "8.6";  out = "0.6.1"; }
+    { case = "8.5";  out = "0.6"; }
+  ] null;
+
+  release."0.6.8".sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps";
+  release."0.6.7".sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09";
+  release."0.6.6".sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w";
+  release."0.6.5".sha256 = "1f34z24yg05b1096gqv36jr3vffkcjkf9qncii3pzhhvagxd0w2f";
+  release."0.6.3".rev    = "0acbd0a594c7e927574d5f212cc73a486b5305d2";
+  release."0.6.3".sha256 = "0c95b0bz2kjm6swr5na4gs06lxxywradszxbr5ldh2zx02r3f3rx";
+  release."0.6.2".rev    = "d76ddde37d918569945774733b7997e8b24daf51";
+  release."0.6.2".sha256 = "04lnf4b25yarysj848cfl8pd3i3pr3818acyp9hgwdgd1rqmhjwm";
+  release."0.6.1".rev    = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
+  release."0.6.1".sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9";
+  release."0.6".sha256   = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
+  releaseRev = v: "v${v}";
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ coq ]
-  ++ (with coq.ocamlPackages; [ ocaml findlib ocamlgraph ]
-    ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") camlp5);
+  mlPlugin = true;
+  extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ];
 
   # dpd_compute.ml uses deprecated Pervasives.compare
   # Versions prior to 0.6.5 do not have the WARN_ERR build flag
-  preConfigure = stdenv.lib.optionalString hasWarning ''
+  preConfigure = optionalString hasWarning ''
     substituteInPlace Makefile.in --replace "-warn-error +a " ""
   '';
 
-  buildFlags = stdenv.lib.optional hasWarning "WARN_ERR=";
+  buildFlags = optional hasWarning "WARN_ERR=";
 
   preInstall = ''
     mkdir -p $out/bin
   '';
 
-  installFlags = [
-    "COQLIB=$(out)/lib/coq/${coq.coq-version}/"
-    "BINDIR=$(out)/bin"
-  ];
+  extraInstallFlags = [ "BINDIR=$(out)/bin" ];
 
   meta = {
     description = "Build dependency graphs between Coq objects";
-    license = stdenv.lib.licenses.lgpl21;
-    homepage = "https://github.com/Karmaki/coq-dpdgraph/";
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
-    platforms = coq.meta.platforms;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ vbgl ];
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/nixpkgs/pkgs/development/coq-modules/equations/default.nix
index 5a07d537536c..352222e8aa62 100644
--- a/nixpkgs/pkgs/development/coq-modules/equations/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/equations/default.nix
@@ -1,79 +1,48 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let
-  params = {
-    "8.6" = {
-      version = "1.0";
-      rev = "v1.0";
-      sha256 = "19ylw9v9g35607w4hm86j7mmkghh07hmkc1ls5bqlz3dizh5q4pj";
-    };
-
-    "8.7" = {
-      version = "1.0";
-      rev = "v1.0-8.7";
-      sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h";
-    };
-
-    "8.8" = {
-      version = "1.2";
-      rev = "v1.2-8.8";
-      sha256 = "06452fyzalz7zcjjp73qb7d6xvmqb6skljkivf8pfm55fsc8s7kx";
-    };
-
-    "8.9" = {
-      version = "1.2.1";
-      rev = "v1.2.1-8.9";
-      sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij";
-    };
-
-    "8.10" = {
-      version = "1.2.1";
-      rev = "v1.2.1-8.10-2";
-      sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68";
-    };
-
-    "8.11" = {
-      version = "1.2.3";
-      rev = "v1.2.3-8.11";
-      sha256 = "1srxz1rws8jsh7402g2x2vcqgjbbsr64dxxj5d2zs48pmhb20csf";
-    };
-
-    "8.12" = {
-      version = "1.2.3";
-      rev = "v1.2.3-8.12";
-      sha256 = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643";
-    };
-  };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-
-  name = "coq${coq.coq-version}-equations-${version}";
-  version = param.version;
-
-  src = fetchFromGitHub {
-    owner = "mattam82";
-    repo = "Coq-Equations";
-    rev = param.rev;
-    sha256 = param.sha256;
-  };
-
-  buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
-
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "equations";
+  owner = "mattam82";
+  repo = "Coq-Equations";
+  inherit version;
+  defaultVersion = switch coq.coq-version [
+    { case = "8.12"; out = "1.2.3+coq8.12"; }
+    { case = "8.11"; out = "1.2.3+coq8.11"; }
+    { case = "8.10"; out = "1.2.1+coq8.10-2"; }
+    { case = "8.9";  out = "1.2.1+coq8.9"; }
+    { case = "8.8";  out = "1.2+coq8.8"; }
+    { case = "8.7";  out = "1.0+coq8.7"; }
+    { case = "8.6";  out = "1.0+coq8.6"; }
+  ] null;
+
+    release."1.0+coq8.6".version      = "1.0";
+    release."1.0+coq8.6".rev          = "v1.0";
+    release."1.0+coq8.6".sha256       = "19ylw9v9g35607w4hm86j7mmkghh07hmkc1ls5bqlz3dizh5q4pj";
+    release."1.0+coq8.7".version      = "1.0";
+    release."1.0+coq8.7".rev          = "v1.0-8.7";
+    release."1.0+coq8.7".sha256       = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h";
+    release."1.2+coq8.8".version      = "1.2";
+    release."1.2+coq8.8".rev          = "v1.2-8.8";
+    release."1.2+coq8.8".sha256       = "06452fyzalz7zcjjp73qb7d6xvmqb6skljkivf8pfm55fsc8s7kx";
+    release."1.2.1+coq8.9".version    = "1.2.1";
+    release."1.2.1+coq8.9".rev        = "v1.2.1-8.9";
+    release."1.2.1+coq8.9".sha256     = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij";
+    release."1.2.1+coq8.10-2".version = "1.2.1";
+    release."1.2.1+coq8.10-2".rev     = "v1.2.1-8.10-2";
+    release."1.2.1+coq8.10-2".sha256  = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68";
+    release."1.2.3+coq8.11".version   = "1.2.3";
+    release."1.2.3+coq8.11".rev       = "v1.2.3-8.11";
+    release."1.2.3+coq8.11".sha256    = "1srxz1rws8jsh7402g2x2vcqgjbbsr64dxxj5d2zs48pmhb20csf";
+    release."1.2.3+coq8.12".version   = "1.2.3";
+    release."1.2.3+coq8.12".rev       = "v1.2.3-8.12";
+    release."1.2.3+coq8.12".sha256    = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643";
+
+  mlPlugin = true;
   preBuild = "coq_makefile -f _CoqProject -o Makefile";
 
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://mattam82.github.io/Coq-Equations/";
     description = "A plugin for Coq to add dependent pattern-matching";
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
   };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix b/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix
index fd3ade0c64b5..47f097a34b2e 100644
--- a/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchgit, coq, python27}:
+{lib, mkCoqDerivation, coq, python27, version ? null }:
 
-stdenv.mkDerivation rec {
+with lib; mkCoqDerivation rec {
+  pname = "fiat";
+  owner = "mit-plv";
+  repo = "fiat";
+  displayVersion = { fiat = v: "unstable-${v}"; };
+  inherit version;
+  defaultVersion = if coq.coq-version == "8.5" then "2016-10-24" else null;
+  release."2016-10-24".rev    = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
+  release."2016-10-24".sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
 
-  name = "coq-fiat-${coq.coq-version}-unstable-${version}";
-  version = "2016-10-24";
-
-  src = fetchgit {
-    url = "https://github.com/mit-plv/fiat.git";
-    rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
-    sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
-  };
-
-  buildInputs = [ coq python27 ] ++ (with coq.ocamlPackages; [ ocaml camlp5 ]);
+  mlPlugin = true;
+  extraBuildInputs = [ python27 ];
 
   prePatch = "patchShebangs etc/coq-scripts";
 
@@ -26,14 +26,9 @@ stdenv.mkDerivation rec {
     cp -pR src/* $COQLIB/user-contrib/Fiat
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "http://plv.csail.mit.edu/fiat/";
     description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications";
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: v == "8.5";
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/flocq/default.nix b/nixpkgs/pkgs/development/coq-modules/flocq/default.nix
index c5d3a295f2bc..2598d4e233eb 100644
--- a/nixpkgs/pkgs/development/coq-modules/flocq/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/flocq/default.nix
@@ -1,49 +1,26 @@
-{ stdenv, bash, which, autoconf, automake, fetchzip, coq }:
-
-let params =
-  if stdenv.lib.versionAtLeast coq.coq-version "8.7" then {
-    version = "3.3.1";
-    sha256 = "0k1nfgiszmai5dihhpfa5mgq9rwigl0n38dw10jn79x89xbdpyh5";
-  } else {
-    version = "2.6.1";
-    sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
-  }
-; in
-
-stdenv.mkDerivation rec {
-
-  name = "coq${coq.coq-version}-flocq-${version}";
-  inherit (params) version;
-
-  src = fetchzip {
-    url = "https://gitlab.inria.fr/flocq/flocq/-/archive/flocq-${version}.tar.gz";
-    inherit (params) sha256;
-  };
-
-  nativeBuildInputs = [ bash which autoconf automake ];
-  buildInputs = [ coq ] ++ (with coq.ocamlPackages; [
-    ocaml camlp5
-  ]);
-
-  buildPhase = ''
-    ${bash}/bin/bash autogen.sh || autoconf
-    ${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq
-    ./remake
-  '';
-
-  installPhase = ''
-    ./remake install
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://flocq.gforge.inria.fr/";
+{ lib, bash, which, autoconf, automake,
+  mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "flocq";
+  owner = "flocq";
+  domain = "gitlab.inria.fr";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = isGe "8.7";        out = "3.3.1"; }
+    { case = range "8.5" "8.8"; out = "2.6.1"; }
+  ] null;
+  release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz";
+  release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
+  releaseRev = v: "flocq-${v}";
+
+  nativeBuildInputs = [ bash which autoconf ];
+  mlPlugin = true;
+  useMelquiondRemake.logpath = "Flocq";
+
+  meta = {
     description = "A floating-point formalization for the Coq system";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix b/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix
index f6109398da8e..a835d53fdedb 100644
--- a/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix
@@ -1,30 +1,24 @@
-{ stdenv, fetchurl, which, coq, flocq }:
+{ which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }:
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-gappalib-1.4.4";
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz";
-    sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn";
-  };
+with lib; mkCoqDerivation {
+  pname = "gappalib";
+  repo = "coq";
+  owner = "gappa";
+  domain = "gitlab.inria.fr";
+  inherit version;
+  defaultVersion = if versions.isGe "8.8" coq.coq-version then "1.4.5" else null;
+  release."1.4.5".sha256 = "081hib1d9wfm29kis390qsqch8v6fs3q71g2rgbbzx5y5cf48n9k";
+  release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l";
+  releaseRev = v: "gappalib-coq-${v}";
 
-  nativeBuildInputs = [ which ];
-  buildInputs = [ coq coq.ocamlPackages.ocaml ];
+  nativeBuildInputs = [ which autoconf ];
+  mlPlugin = true;
   propagatedBuildInputs = [ flocq ];
-
-  configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Gappa";
-  buildPhase = "./remake";
-  installPhase = "./remake install";
+  useMelquiondRemake.logpath = "Gappa";
 
   meta = {
     description = "Coq support library for Gappa";
-    license = stdenv.lib.licenses.lgpl21;
-    homepage = "http://gappa.gforge.inria.fr/";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (coq.meta) platforms;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.vbgl ];
   };
-
-  passthru = {
-    compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ];
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/heq/default.nix b/nixpkgs/pkgs/development/coq-modules/heq/default.nix
index d0445c83ca59..4bf9139b4947 100644
--- a/nixpkgs/pkgs/development/coq-modules/heq/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/heq/default.nix
@@ -1,30 +1,23 @@
-{stdenv, fetchurl, coq, unzip}:
-
-stdenv.mkDerivation rec {
-
-  name = "coq-heq-${coq.coq-version}-${version}";
-  version = "0.92";
-
-  src = fetchurl {
-    url = "https://www.mpi-sws.org/~gil/Heq/download/Heq-${version}.zip";
-    sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p";
-  };
-
-  buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
+{lib, fetchzip, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "heq";
+  repo = "Heq";
+  owner = "gil";
+  domain = "mpi-sws.org";
+  inherit version fetcher;
+  defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null;
+  release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74";
+
+  mlPlugin = true;
   propagatedBuildInputs = [ coq ];
 
+  extraInstallFlags = [ "COQLIB=$out/lib/coq/${coq.coq-version}" ];
   preBuild = "cd src";
 
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}" ];
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://www.mpi-sws.org/~gil/Heq/";
     description = "Heq : a Coq library for Heterogeneous Equality";
     maintainers = with maintainers; [ jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: !stdenv.lib.versionAtLeast v "8.8";
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix
index 9be8459ee9f0..530763c9439d 100644
--- a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -1,43 +1,24 @@
-{ stdenv, fetchFromGitHub, which, coq, coq-elpi }:
+{ lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }:
 
-let
-  versions = {
-      "0.10.0" =  {
-        rev = "v0.10.0";
-        sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
-      };
-  };
-  version = x: versions.${x} // {version = x;};
-  params = {
-   "8.11" = version "0.10.0";
-   "8.12" = version "0.10.0";
-  };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-  name = "coq${coq.coq-version}-hierarchy-builder-${param.version}";
-
-  src = fetchFromGitHub {
-    owner = "math-comp";
-    repo = "hierarchy-builder";
-    inherit (param) rev sha256;
-  };
+with lib; mkCoqDerivation {
+  pname = "hierarchy-builder";
+  owner = "math-comp";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = isGe "8.12";         out = "1.0.0"; }
+    { case = range "8.11" "8.12"; out = "0.10.0"; }
+  ] null;
+  release."1.0.0".sha256  = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp";
+  release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
+  releaseRev = v: "v${v}";
 
   propagatedBuildInputs = [ coq-elpi ];
-  buildInputs = [ coq coq.ocaml coq.ocamlPackages.elpi ];
 
-  installPhase = ''make -f Makefile.coq VFILES=structures.v COQLIB=$out/lib/coq/${coq.coq-version}/ install'';
+  extraInstallFlags = [ "VFILES=structures.v" ];
 
   meta = {
     description = "Coq plugin embedding ELPI.";
-    maintainers = [ stdenv.lib.maintainers.cohencyril ];
-    license = stdenv.lib.licenses.lgpl21;
-    inherit (coq.meta) platforms;
-    inherit (src.meta) homepage;
-  };
-
-  passthru = {
-    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
+    maintainers = [ maintainers.cohencyril ];
+    license = licenses.lgpl21;
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/interval/default.nix b/nixpkgs/pkgs/development/coq-modules/interval/default.nix
index e72fe7845c84..8671eba67241 100644
--- a/nixpkgs/pkgs/development/coq-modules/interval/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/interval/default.nix
@@ -1,62 +1,31 @@
-{ stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp
-, bignums ? null }:
-
-let params =
-  let
-  v3_3 = {
-    version = "3.3.0";
-    uid = "37077";
-    sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903";
-  };
-  v3_4 = {
-    version = "3.4.2";
-    uid = "38288";
-    sha256 = "00bgzbji0gkazwxhs4q8gz4ccqsa1y1r0m0ravr18ps2h8a8qva5";
-  };
-  v4_0 = {
-    version = "4.0.0";
-    uid = "38339";
-    sha256 = "19sbrv7jnzyxji7irfslhr9ralc0q3gx20nymig5vqbn3vssmgpz";
-  };
-  in {
-    "8.5" = v3_3;
-    "8.6" = v3_3;
-    "8.7" = v3_4;
-    "8.8" = v4_0;
-    "8.9" = v4_0;
-    "8.10" = v4_0;
-    "8.11" = v4_0;
-    "8.12" = v4_0;
-  };
-  param = params."${coq.coq-version}";
-in
-
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-interval-${param.version}";
-
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/${param.uid}/interval-${param.version}.tar.gz";
-    inherit (param) sha256;
-  };
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ coq ];
+{ lib, mkCoqDerivation, which, autoconf
+, coq, coquelicot, flocq, mathcomp
+, bignums ? null, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "interval";
+  owner = "coqinterval";
+  domain = "gitlab.inria.fr";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = isGe "8.8" ;        out = "4.1.0"; }
+    { case = range "8.8" "8.12"; out = "4.0.0"; }
+    { case = range "8.7" "8.11"; out = "3.4.2"; }
+    { case = range "8.5" "8.6";  out = "3.3.0"; }
+  ] null;
+  release."4.1.0".sha256 = "1jv27n5c4f3a9d8sizraa920iqi35x8cik8lm7pjp1dkiifz47nb";
+  release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp";
+  release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0";
+  release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz";
+  releaseRev = v: "interval-${v}";
+
+  nativeBuildInputs = [ which autoconf ];
   propagatedBuildInputs = [ bignums coquelicot flocq ];
+  useMelquiondRemake.logpath = "Interval";
 
-  configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Interval";
-  buildPhase = "./remake";
-  installPhase = "./remake install";
-
-  meta = with stdenv.lib; {
-    homepage = "http://coq-interval.gforge.inria.fr/";
+  meta = with lib; {
     description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant";
     license = licenses.cecill-c;
     maintainers = with maintainers; [ vbgl ];
-    platforms = coq.meta.platforms;
   };
-
-  passthru = {
-    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/nixpkgs/pkgs/development/coq-modules/iris/default.nix
index 6826e07d613e..b46383fa1679 100644
--- a/nixpkgs/pkgs/development/coq-modules/iris/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/iris/default.nix
@@ -1,33 +1,19 @@
-{ stdenv, fetchFromGitLab, coq, stdpp }:
+{ lib, mkCoqDerivation, coq, stdpp, version ? null }:
 
-stdenv.mkDerivation rec {
-  version = "3.3.0";
-  name = "coq${coq.coq-version}-iris-${version}";
-  src = fetchFromGitLab {
-    domain = "gitlab.mpi-sws.org";
-    owner = "iris";
-    repo = "iris";
-    rev = "iris-${version}";
-    sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp";
-  };
+with lib; mkCoqDerivation rec {
+  pname = "iris";
+  domain = "gitlab.mpi-sws.org";
+  owner = "iris";
+  inherit version;
+  defaultVersion = if versions.range "8.9" "8.12" coq.coq-version then "3.3.0" else null;
+  release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp";
+  releaseRev = v: "iris-${v}";
 
-  buildInputs = [ coq ];
   propagatedBuildInputs = [ stdpp ];
 
-  enableParallelBuilding = true;
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
   meta = {
-    homepage = "https://gitlab.mpi-sws.org/FP/iris-coq";
     description = "The Coq development of the Iris Project";
-    inherit (coq.meta) platforms;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.9" "8.10" "8.11" "8.12" ];
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix b/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix
index 92484f169c15..1d0d03fb7f7c 100644
--- a/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix
@@ -1,57 +1,28 @@
-{ stdenv, fetchFromGitHub, which, coq }:
+{ lib, mkCoqDerivation, which, coq, version ? null }:
 
-let params = {
-  "8.7" = {
-    version = "0.1";
-    rev = "v0.1-8.7";
-    sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0";
-  };
-  "8.8" = {
-    version = "0.1";
-    rev = "0.1";
-    sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7";
-  };
-  "8.9" = rec {
-    version = "0.2";
-    rev = version;
-    sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
-  };
-  "8.10" = rec {
-    version = "0.3";
-    rev = version;
-    sha256 = "0pzs5nsakh4l8ffwgn4ryxbnxdv2x0r1i7bc598ij621haxdirrr";
-  };
-};
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-  inherit (param) version;
-  name = "coq${coq.coq-version}-ltac2-${version}";
-
-  src = fetchFromGitHub {
-    owner = "coq";
-    repo = "ltac2";
-    inherit (param) rev sha256;
-  };
+with lib; mkCoqDerivation {
+  pname = "ltac2";
+  owner = "coq";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = "8.10"; out = "0.3"; }
+    { case = "8.9";  out = "0.2"; }
+    { case = "8.8";  out = "0.1"; }
+    { case = "8.7";  out = "0.1-8.7"; }
+  ] null;
+  release."0.3".sha256 = "0pzs5nsakh4l8ffwgn4ryxbnxdv2x0r1i7bc598ij621haxdirrr";
+  release."0.2".sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
+  release."0.1".sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7";
+  release."0.1-8.7".version = "0.1";
+  release."0.1-8.7".rev     = "v0.1-8.7";
+  release."0.1-8.7".sha256  = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0";
 
   nativeBuildInputs = [ which ];
-  buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib ])
-  ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10")
-     coq.ocamlPackages.camlp5
-  ;
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+  mlPlugin = true;
 
   meta = {
     description = "A robust and expressive tactic language for Coq";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    license = stdenv.lib.licenses.lgpl21;
-    inherit (coq.meta) platforms;
-    inherit (src.meta) homepage;
-  };
-
-  passthru = {
-    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
+    maintainers = [ maintainers.vbgl ];
+    license = licenses.lgpl21;
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix b/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix
index 73e420b326d9..c5bd1098c0b4 100644
--- a/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix
@@ -1,30 +1,17 @@
-{ stdenv, fetchFromGitHub, coq, bignums }:
+{ lib, mkCoqDerivation, coq, bignums, version ? null }:
 
-stdenv.mkDerivation rec {
+with lib; mkCoqDerivation {
 
-  name = "coq${coq.coq-version}-math-classes-${version}";
-  version = "8.11.0";
+  pname = "math-classes";
+  inherit version;
+  defaultVersion = if versions.range "8.6" "8.12" coq.coq-version then "8.12.0" else null;
+  release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425";
 
-  src = fetchFromGitHub {
-    owner = "coq-community";
-    repo = "math-classes";
-    rev = version;
-    sha256 = "1hjgncvm1m46lw6264w4dqsy8dbh74vhmzq52x0fba2yqlvy94sf";
-  };
-
-  buildInputs = [ coq bignums ];
-  enableParallelBuilding = true;
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+  extraBuildInputs = [ bignums ];
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://math-classes.github.io";
     description = "A library of abstract interfaces for mathematical structures in Coq.";
     maintainers = with maintainers; [ siddharthist jwiegley ];
-    platforms = coq.meta.platforms;
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ];
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix
new file mode 100644
index 000000000000..2a8c006b27cb
--- /dev/null
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix
@@ -0,0 +1,23 @@
+{ coq, mkCoqDerivation, mathcomp, mathcomp-real-closed, lib, version ? null }:
+
+mkCoqDerivation {
+
+  namePrefix = [ "coq" "mathcomp" ];
+  pname = "abel";
+  owner = "math-comp";
+
+  release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3";
+
+  inherit version;
+  defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ]  [
+      { cases = [ (range "8.10" "8.13") (range "1.11.0" "1.12.0") ]; out = "1.0.0"; }
+    ] null;
+
+  propagatedBuildInputs = [ mathcomp.field mathcomp-real-closed ];
+
+  meta = with lib; {
+    description = "Abel - Galois and Abel - Ruffini Theorems";
+    license = licenses.cecill-b;
+    maintainers = [ maintainers.cohencyril ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix
new file mode 100644
index 000000000000..7d63c903795c
--- /dev/null
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -0,0 +1,28 @@
+{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed,
+  lib, version ? null }:
+
+with lib; mkCoqDerivation {
+
+  namePrefix = [ "coq" "mathcomp" ];
+  pname = "analysis";
+  owner = "math-comp";
+
+  release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8";
+  release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966";
+
+  inherit version;
+  defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [
+      { cases = [ (range "8.10" "8.11") "1.11.0" ];             out = "0.3.1"; }
+      { cases = [ (range "8.8"  "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; }
+    ] null;
+
+  propagatedBuildInputs =
+    [ mathcomp.ssreflect mathcomp.field
+      mathcomp-finmap mathcomp-bigenough mathcomp-real-closed ];
+
+  meta = {
+    description = "Analysis library compatible with Mathematical Components";
+    maintainers = [ maintainers.cohencyril ];
+    license = licenses.cecill-c;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix
new file mode 100644
index 000000000000..296bd738928f
--- /dev/null
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix
@@ -0,0 +1,19 @@
+{ coq, mkCoqDerivation, mathcomp, lib, version ? null }:
+
+with lib; mkCoqDerivation {
+
+  namePrefix = [ "coq" "mathcomp" ];
+  pname = "bigenough";
+  owner = "math-comp";
+
+  release = { "1.0.0".sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; };
+  inherit version;
+  defaultVersion = "1.0.0";
+
+  propagatedBuildInputs = [ mathcomp.ssreflect ];
+
+  meta = {
+    description = "A small library to do epsilon - N reasonning";
+    license = licenses.cecill-b;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix
new file mode 100644
index 000000000000..c506d07e4574
--- /dev/null
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix
@@ -0,0 +1,36 @@
+{ coq, mkCoqDerivation, mathcomp, lib, version ? null }:
+
+with lib; mkCoqDerivation {
+
+  namePrefix = [ "coq" "mathcomp" ];
+  pname = "finmap";
+  owner = "math-comp";
+  inherit version;
+  defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [
+      { cases = [ (isGe "8.10")          (range "1.11" "1.12") ]; out = "1.5.1"; }
+      { cases = [ (range "8.7" "8.11")   "1.11.0" ];              out = "1.5.0"; }
+      { cases = [ (isEq "8.11")          (range "1.8" "1.10") ];  out = "1.4.0+coq-8.11"; }
+      { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ];  out = "1.4.0"; }
+      { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ];  out = "1.3.4"; }
+      { cases = [ (range "8.7" "8.9")    "1.7.0" ];               out = "1.1.0"; }
+      { cases = [ (range "8.6" "8.7")    (range "1.6.1" "1.7") ]; out = "1.0.0"; }
+    ] null;
+  release = {
+    "1.5.1".sha256          = "0ryfml4pf1dfya16d8ma80favasmrygvspvb923n06kfw9v986j7";
+    "1.5.0".sha256          = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq";
+    "1.4.1".sha256          = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p";
+    "1.4.0+coq-8.11".sha256 = "1fd00ihyx0kzq5fblh9vr8s5mr1kg7p6pk11c4gr8svl1n69ppmb";
+    "1.4.0".sha256          = "0mp82mcmrs424ff1vj3cvd8353r9vcap027h3p0iprr1vkkwjbzd";
+    "1.3.4".sha256          = "0f5a62ljhixy5d7gsnwd66gf054l26k3m79fb8nz40i2mgp6l9ii";
+    "1.2.1".sha256          = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf";
+    "1.1.0".sha256          = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
+    "1.0.0".sha256          = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa";
+  };
+
+  propagatedBuildInputs = [ mathcomp.ssreflect ];
+
+  meta = {
+    description = "A finset and finmap library";
+    license = licenses.cecill-b;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
new file mode 100644
index 000000000000..dbd1550c6a7a
--- /dev/null
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
@@ -0,0 +1,33 @@
+{ coq, mkCoqDerivation, mathcomp, mathcomp-bigenough,
+  lib, version ? null }:
+
+with lib; mkCoqDerivation {
+
+  namePrefix = [ "coq" "mathcomp" ];
+  pname = "real-closed";
+  owner = "math-comp";
+  inherit version;
+  release = {
+    "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn";
+    "1.1.1".sha256 = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b";
+    "1.0.5".sha256 = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2";
+    "1.0.4".sha256 = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b";
+    "1.0.3".sha256 = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb";
+    "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg";
+  };
+
+  defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [
+      { cases = [ (isGe "8.10")  "1.12.0" ]; out = "1.1.2"; }
+      { cases = [ (isGe "8.7")   "1.11.0" ]; out = "1.1.1"; }
+      { cases = [ (isGe "8.7")   (range "1.9.0" "1.10.0") ]; out = "1.0.4"; }
+      { cases = [ (isGe "8.7")   "1.8.0"  ]; out = "1.0.3"; }
+      { cases = [ (isGe "8.7")   "1.7.0"  ]; out = "1.0.1"; }
+    ] null;
+
+  propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.field mathcomp-bigenough ];
+
+  meta = {
+    description = "Mathematical Components Library on real closed fields";
+    license = licenses.cecill-c;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
index 542fac861c58..5b3501516e15 100644
--- a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,265 +1,93 @@
-#############################
-# Main derivation: mathcomp #
-########################################################################
-# This file mainly provides the `mathcomp` derivation, which is        #
-# essentially a meta-package containing all core mathcomp libraries    #
-# (ssreflect fingroup algebra solvable field character). They can be   #
-# accessed individually through the paththrough attributes of mathcomp #
-# bearing the same names (mathcomp.ssreflect, etc).                    #
-#                                                                      #
-# Do not use overrideAttrs, but overrideMathcomp instead, which        #
-# regenerate a full mathcomp derivation with sub-derivations, and      #
-# behave the same as `mathcomp_`, described below.                     #
-########################################################################
-
-############################################################
-# Compiling a custom version of mathcomp using `mathcomp_` #
-##############################################################################
-# The prefered way to compile a custom version of mathcomp (other than a     #
-# released version which should be added to `mathcomp-config-initial`        #
-# and pushed to nixpkgs), is to apply the function `coqPackages.mathcomp_`   #
-# to either:                                                                 #
-# - a string without slash, which is interpreted as a github revision,       #
-#   i.e. either a tag, a branch or a commit hash                             #
-# - a string with slashes "owner/p_1/.../p_n", which is interpreted as       #
-#   github owner "owner" and revision "p_1/.../p_n".                         #
-# - a path which is interpreted as a local source for the repository,        #
-#   the name of the version is taken to be the basename of the path          #
-#   i.e. if the path is /home/you/git/package/branch/,                       #
-#        then "branch" is the name of the version                            #
-# - an attribute set which overrides some attributes (e.g. the src)          #
-#   if the version is updated, the name is automatically regenerated using   #
-#   the conventional schema "coq${coq.coq-version}-${pkgname}-${version}"    #
-# - a "standard" override function (old: new_attrs) to override the default  #
-#   attribute set, so that you can use old.${field} to patch the derivation. #
-##############################################################################
-
-#########################################################################
-# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix #
-#########################################################################
-
-#################################
-# Adding a new mathcomp version #
-#############################################################################
-# When adding a new version of mathcomp, add an attribute to `sha256` (use  #
-# ```sh                                                                     #
-# nix-prefetch-url --unpack                                                 #
-# https://github.com/math-comp/math-comp/archive/version.tar.gz             #
-# ```                                                                       #
-# to get the corresponding `sha256`) and to `coq-version` (read the release #
-# notes to check which versions of coq it is compatible with). Then add     #
-# it in `preference version`, if not all mathcomp-extra packages are        #
-# ready, you might want to give new release secondary priority.             #
-#############################################################################
-
-
-{ stdenv, fetchFromGitHub, ncurses, which, graphviz,
-  recurseIntoAttrs, withDoc ? false,
-  coqPackages,
-  mathcomp_, mathcomp, mathcomp-config,
-}:
-with builtins // stdenv.lib;
+############################################################################
+# This file mainly provides the `mathcomp` derivation, which is            #
+# essentially a meta-package containing all core mathcomp libraries        #
+# (ssreflect fingroup algebra solvable field character). They can be       #
+# accessed individually through the passthrough attributes of mathcomp     #
+# bearing the same names (mathcomp.ssreflect, etc).                        #
+############################################################################
+# Compiling a custom version of mathcomp using `mathcomp.override`.        #
+# This is the replacement for the former `mathcomp_ config` function.      #
+# See the documentation at doc/languages-frameworks/coq.section.md.        #
+############################################################################
+
+{ lib, ncurses, which, graphviz, lua,
+  mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false,
+  coqPackages, coq, ocamlPackages, version ? null }@args:
+with builtins // lib;
 let
-  mathcomp-config-initial = rec {
-  #######################################################################
-  # CONFIGURATION (please edit this), it is exported as mathcomp-config #
-  #######################################################################
-    # sha256 of released mathcomp versions
-    sha256 = {
-      "1.12.0"       = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp";
-      "1.11.0"       = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c";
-      "1.11+beta1"   = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm";
-      "1.10.0"       = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
-      "1.9.0"        = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
-      "1.8.0"        = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
-      "1.7.0"        = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
-      "1.6.1"        = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
-    };
-    # versions of coq compatible with released mathcomp versions
-    coq-versions     = {
-      "1.12.0"       = flip elem [ "8.13" ];
-      "1.11.0"       = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
-      "1.11+beta1"   = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
-      "1.10.0"       = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
-      "1.9.0"        = flip elem [ "8.7" "8.8" "8.9" "8.10" ];
-      "1.8.0"        = flip elem [ "8.7" "8.8" "8.9" ];
-      "1.7.0"        = flip elem [ "8.6" "8.7" "8.8" "8.9" ];
-      "1.6.1"        = flip elem [ "8.5"];
-    };
-
-    # sets the default version of mathcomp given a version of Coq
-    # this is currently computed using version-perference below
-    # but it can be set to a fixed version number
-    preferred-version = let v = head (
-      filter (mc: mathcomp-config.coq-versions.${mc} coq.coq-version)
-        mathcomp-config.version-preferences ++ ["0.0.0"]);
-     in if v == "0.0.0" then head mathcomp-config.version-preferences else v;
-
-    # mathcomp preferred versions by decreasing order
-    # (the first version in the list will be tried first)
-    version-preferences =
-      [ "1.12.0" "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ];
-
-    # list of core mathcomp packages sorted by dependency order
-    packages = _version: # unused in current versions of mathcomp
-      # because the following list of packages is fixed for
-      # all versions of mathcomp up to 1.11.0
-      [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ];
-
-    # compute the dependencies of the core package pkg
-    # (assuming the total ordering above, change if necessary)
-    deps = version: pkg: if pkg == "single" then [] else
-      (pred-split-list (x: x == pkg) (mathcomp-config.packages version)).left;
+  repo  = "math-comp";
+  owner = "math-comp";
+  withDoc = single && (args.withDoc or false);
+  defaultVersion = with versions; switch coq.coq-version [
+      { case = isGe  "8.13";        out = "1.12.0"; } # lower version of coq to 8.10 when all mathcomp packages are ported
+      { case = range "8.7"  "8.12"; out = "1.11.0"; }
+      { case = range "8.7" "8.11";  out = "1.10.0"; }
+      { case = range "8.7" "8.11";  out = "1.9.0";  }
+      { case = range "8.7" "8.9";   out = "1.8.0";  }
+      { case = range "8.6" "8.9";   out = "1.7.0";  }
+      { case = range "8.5" "8.7";   out = "1.6.4";  }
+    ] null;
+  release = {
+    "1.12.0".sha256 = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp";
+    "1.11.0".sha256 = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c";
+    "1.10.0".sha256 = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
+    "1.9.0".sha256  = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
+    "1.8.0".sha256  = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
+    "1.7.0".sha256  = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
+    "1.6.4".sha256  = "09ww48qbjsvpjmy1g9yhm0rrkq800ffq21p6fjkbwd34qvd82raz";
+    "1.6.1".sha256  = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
   };
+  releaseRev = v: "mathcomp-${v}";
 
-  ##############################################################
-  # COMPUTED using the configuration above (edit with caution) #
-  ##############################################################
+  # list of core mathcomp packages sorted by dependency order
+  packages = [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ];
 
-  # generic split function (TODO: move to lib?)
-  pred-split-list = pred: l:
-    let loop = v: l: if l == [] then {left = v; right = [];}
-      else let hd = builtins.head l; tl = builtins.tail l; in
-      if pred hd then {left = v; right = tl;} else loop (v ++ [hd]) tl;
-    in loop [] l;
-
-  pkgUp = l: r: l // r // {
-    meta     = (l.meta or {}) // (r.meta or {});
-    passthru = (l.passthru or {}) // (r.passthru or {});
-  };
-
-  coq = coqPackages.coq;
-  mathcomp-deps = mathcomp-config.deps mathcomp.config.preferred-version;
-
-  # default set of attributes given a 'package' name.
-  # this attribute set will be extended using toOverrideFun
-  default-attrs = package:
-    let
+  mathcomp_ = package: let
+      mathcomp-deps = if package == "single" then []
+        else map mathcomp_ (head (splitList (pred.equal package) packages));
       pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}";
-      pkgname = if package == "single" then "mathcomp" else "mathcomp-${package}";
+      pname = if package == "single" then "mathcomp" else "mathcomp-${package}";
       pkgallMake = ''
         echo "all.v"  > Make
         echo "-I ." >>   Make
         echo "-R . mathcomp.all" >> Make
       '';
-    in
-      rec {
-        version = "master";
-        name = "coq${coq.coq-version}-${pkgname}-${version}";
+      derivation = mkCoqDerivation ({
+        inherit version pname defaultVersion release releaseRev repo owner;
 
-        nativeBuildInputs = optionals withDoc [ graphviz ];
-        buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
-        propagatedBuildInputs = [ coq ];
-        enableParallelBuilding = true;
+        nativeBuildInputs = optional withDoc graphviz;
+        mlPlugin = versions.isLe "8.6" coq.coq-version;
+        extraBuildInputs = [ ncurses which ] ++ optional withDoc lua;
+        propagatedBuildInputs = mathcomp-deps;
 
         buildFlags = optional withDoc "doc";
 
-        COQBIN = "${coq}/bin/";
-
         preBuild = ''
           patchShebangs etc/utils/ssrcoqdep || true
+        '' + ''
           cd ${pkgpath}
         '' + optionalString (package == "all") pkgallMake;
 
-        installPhase = ''
-          make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-        '' + optionalString withDoc ''
-          make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
-        '';
+        installTargets = "install" + optionalString withDoc " doc";
 
-        meta = with stdenv.lib; {
+        meta = {
           homepage    = "https://math-comp.github.io/";
           license     = licenses.cecill-b;
-          maintainers = [ maintainers.vbgl maintainers.jwiegley maintainers.cohencyril ];
-          platforms   = coq.meta.platforms;
-        };
-
-        passthru = {
-          mathcompDeps = mathcomp-deps package;
-          inherit package mathcomp-config;
-          compatibleCoqVersions = _: true;
-        };
-      };
-
-  # converts a string, path or attribute set into an override function
-  toOverrideFun = overrides:
-    if isFunction overrides then overrides else old:
-      let
-          pkgname = if old.passthru.package == "single" then "mathcomp"
-                    else "mathcomp-${old.passthru.package}";
-
-          string-attrs = if hasAttr overrides mathcomp-config.sha256 then
-                let version = overrides;
-                in {
-                  inherit version;
-                  src = fetchFromGitHub {
-                    owner  = "math-comp";
-                    repo   = "math-comp";
-                    rev    = "mathcomp-${version}";
-                    sha256 = mathcomp-config.sha256.${version};
-                  };
-                  passthru = old.passthru // {
-                    compatibleCoqVersions = mathcomp-config.coq-versions.${version};
-                    mathcompDeps = mathcomp-config.deps version old.passthru.package;
-                  };
-                }
-              else
-                let splitted = filter isString (split "/" overrides);
-                    owner    = head splitted;
-                    ref      = concatStringsSep "/" (tail splitted);
-                    version  = head (reverseList splitted);
-                in if length splitted == 1 then {
-                  inherit version;
-                  src = fetchTarball "https://github.com/math-comp/math-comp/archive/${version}.tar.gz";
-                } else {
-                  inherit version;
-                  src = fetchTarball "https://github.com/${owner}/math-comp/archive/${ref}.tar.gz";
-                };
-
-          attrs =
-            if overrides == null || overrides == "" then _: {}
-            else  if isString overrides then string-attrs
-            else  if isPath overrides then { version = baseNameOf overrides; src = overrides; }
-            else  if isAttrs overrides then pkgUp old overrides
-            else  let overridesStr = toString overrides; in
-                  abort "${overridesStr} not a legitimate overrides";
-      in
-        attrs // (if attrs?version && ! (attrs?name)
-                  then { name = "coq${coq.coq-version}-${pkgname}-${attrs.version}"; } else {});
-
-  # generates {ssreflect = «derivation ...» ; ... ; character = «derivation ...», ...}
-  mkMathcompGenSet = pkgs: o:
-    fold (pkg: pkgs: pkgs // {${pkg} = mkMathcompGen pkg o;}) {} pkgs;
-  # generates the derivation of one mathcomp package.
-  mkMathcompGen = package: overrides:
-    let
-      up = x: o: x // (toOverrideFun o x);
-      fixdeps = attrs:
-        let version = attrs.version or "master";
-            mcdeps  = if package == "single" then {}
-                      else mkMathcompGenSet (filter isString attrs.passthru.mathcompDeps) overrides;
-            allmc   = mkMathcompGenSet (mathcomp-config.packages version ++ [ "single" ]) overrides;
-        in {
-          propagatedBuildInputs = [ coq ]
-                                  ++ filter isDerivation attrs.passthru.mathcompDeps
-                                  ++ attrValues mcdeps
-          ;
-          passthru = allmc //
-                     { overrideMathcomp = o: mathcomp_ (old: up (up old overrides) o); };
+          maintainers = with maintainers; [ vbgl jwiegley cohencyril ];
         };
-    in
-      stdenv.mkDerivation (up (up (default-attrs package) overrides) fixdeps);
+      } // optionalAttrs (package != "single") { passthru = genAttrs packages mathcomp_; });
+    patched-derivation1 = derivation.overrideAttrs (o:
+      optionalAttrs (o.pname != null && o.pname == "mathcomp-all" &&
+         o.version != null && o.version != "dev" && versions.isLt "1.7" o.version)
+      { preBuild = ""; buildPhase = ""; installPhase = "echo doing nothing"; }
+    );
+    patched-derivation = patched-derivation1.overrideAttrs (o:
+      optionalAttrs (versions.isLe "8.7" coq.coq-version ||
+            (o.version != "dev" && versions.isLe "1.7" o.version))
+      {
+        installFlags = o.installFlags ++ [ "-f Makefile.coq" ];
+      }
+    );
+    in patched-derivation;
 in
-{
-  mathcomp-config    = mathcomp-config-initial;
-  mathcomp_          = mkMathcompGen "all";
-  mathcomp           = mathcomp_ mathcomp-config.preferred-version;
-  # mathcomp-single    = mathcomp.single;
-  ssreflect          = mathcomp.ssreflect;
-  mathcomp-ssreflect = mathcomp.ssreflect;
-  mathcomp-fingroup  = mathcomp.fingroup;
-  mathcomp-algebra   = mathcomp.algebra;
-  mathcomp-solvable  = mathcomp.solvable;
-  mathcomp-field     = mathcomp.field;
-  mathcomp-character = mathcomp.character;
-}
+mathcomp_ (if single then "single" else "all")
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix
deleted file mode 100644
index 6a2dfcda3456..000000000000
--- a/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix
+++ /dev/null
@@ -1,391 +0,0 @@
-##########################################################
-# Main derivation:                                       #
-#   mathcomp-finmap mathcomp-analysis mathcomp-bigenough #
-#   mathcomp-multinomials mathcomp-real-closed coqeal    #
-# Additionally:                                          #
-#   mathcomp-extra-all  contains all the extra packages  #
-#   mathcomp-extra-fast contains the one not marked slow #
-########################################################################
-# This file mainly provides the above derivations, which are packages  #
-# extra mathcomp libraries based on mathcomp.                          #
-########################################################################
-
-#####################################################
-# Compiling customs versions using `mathcomp-extra` #
-##############################################################################
-# The prefered way to compile a custom version of mathcomp extra packages    #
-# (other than released versions which should be added to                     #
-# `rec-mathcomp-extra-config` and pushed to nixpkgs, see below),             #
-# is to use `coqPackages.mathcomp-extra name version` where                  #
-# 1. `name` is a string representing the name of a declared package          #
-#    OR undeclared package.                                                  #
-# 2. `version` is either:                                                    #
-# - a string without slash, which is interpreted as a github revision,       #
-#   i.e. either a tag, a branch or a commit hash                             #
-# - a string with slashes "owner/p_1/.../p_n", which is interpreted as       #
-#   github owner "owner" and revision "p_1/.../p_n".                         #
-# - a path which is interpreted as a local source for the repository,        #
-#   the name of the version is taken to be the basename of the path          #
-#   i.e. if the path is /home/you/git/package/branch/,                       #
-#        then "branch" is the name of the version                            #
-# - an attribute set which overrides some attributes (e.g. the src)          #
-#   if the version is updated, the name is automatically regenerated using   #
-#   the conventional schema "coq${coq.coq-version}-${pkgname}-${version}"    #
-# - a "standard" override function (old: new_attrs) to override the default  #
-#   attribute set, so that you can use old.${field} to patch the derivation. #
-#                                                                            #
-# Should you choose to use `pkg.overrideAttrs` instead, we provide the       #
-# function mathcomp-extra-override which takes a name and a version exactly  #
-# as above and returns an override function.                                 #
-##############################################################################
-
-#########################################################################
-# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix #
-#########################################################################
-
-###########################################
-# Adding a new package or package version #
-################################################################################
-# 1. Update or add a `package` entry to `initial`, it must be a function       #
-#    taking the version as argument and returning an attribute set. Everything #
-#    is optional and the default for the sources of the repository and the     #
-#    homepage will be https://github.com/math-comp/${package}.                 #
-#                                                                              #
-# 2. Update or add a `package` entry to `sha256` for each release.             #
-#    You may use                                                               #
-#    ```sh                                                                     #
-#    nix-prefetch-url --unpack                                                 #
-#    https://github.com/math-comp/math-comp/archive/version.tar.gz             #
-#    ```                                                                       #
-#                                                                              #
-# 3. Update or create a new consistent set of extra packages.                  #
-#    /!\ They must all be co-compatible. /!\                                   #
-#    Do not use versions that may disappear: it must either be                 #
-#    - a tag from the main repository (e.g. version or tag), or                #
-#    - a revision hash that has been *merged in master*                        #
-################################################################################
-
-{ stdenv, fetchFromGitHub, recurseIntoAttrs,
-  which, mathcomp, coqPackages,
-  mathcomp-extra-config, mathcomp-extra-override,
-  mathcomp-extra, current-mathcomp-extra,
-}:
-with builtins // stdenv.lib;
-let
-  ##############################
-  # CONFIGURATION, please edit #
-  ##############################
-  ############################
-  # Packages base delaration #
-  ############################
-  rec-mathcomp-extra-config = {
-    initial = {
-      mathcomp-finmap = {version, coqPackages}: {
-        meta = {
-          description = "A finset and finmap library";
-          repo = "finmap";
-          homepage = "https://github.com/math-comp/finmap";
-        };
-        passthru.compatibleCoqVersions = flip elem [ "8.8" "8.9" "8.10" "8.11" ];
-      };
-
-      mathcomp-bigenough = {version, coqPackages}: {
-        meta = {
-          description = "A small library to do epsilon - N reasonning";
-          repo = "bigenough";
-          homepage = "https://github.com/math-comp/bigenough";
-        };
-        passthru.compatibleCoqVersions = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
-      };
-
-      multinomials = {version, coqPackages}: {
-        buildInputs = [ which ];
-        propagatedBuildInputs = with coqPackages;
-          [ mathcomp.algebra mathcomp-finmap mathcomp-bigenough ];
-        meta = {
-          description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
-          repo = "multinomials";
-          homepage = "https://github.com/math-comp/multinomials";
-        };
-        passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ];
-      };
-
-      mathcomp-analysis = {version, coqPackages}: {
-        propagatedBuildInputs = with coqPackages;
-          [ mathcomp.field mathcomp-finmap mathcomp-bigenough mathcomp-real-closed ];
-        meta = {
-          description = "Analysis library compatible with Mathematical Components";
-          homepage = "https://github.com/math-comp/analysis";
-          repo = "analysis";
-          license = stdenv.lib.licenses.cecill-c;
-        };
-        passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ];
-      };
-
-      mathcomp-real-closed = {version, coqPackages}: {
-        propagatedBuildInputs = with coqPackages;
-          [ mathcomp.field mathcomp-bigenough ];
-        meta = {
-          description = "Mathematical Components Library on real closed fields";
-          repo = "real-closed";
-          homepage = "https://github.com/math-comp/real-closed";
-        };
-        passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ];
-      };
-
-      coqeal = {version, coqPackages}: {
-        buildInputs = [ which ];
-        propagatedBuildInputs = with coqPackages;
-          [ mathcomp-algebra bignums paramcoq multinomials ];
-        meta = {
-          description = "CoqEAL - The Coq Effective Algebra Library";
-          homepage = "https://github.com/coqeal/coqeal";
-          license = stdenv.lib.licenses.mit;
-          owner = "CoqEAL";
-        };
-        passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ];
-      };
-    };
-
-    ###############################
-    # sha256 of released versions #
-    ###############################
-    sha256 = {
-      mathcomp-finmap = {
-        "1.5.0"          = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq";
-        "1.4.1"          = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p";
-        "1.4.0+coq-8.11" = "1fd00ihyx0kzq5fblh9vr8s5mr1kg7p6pk11c4gr8svl1n69ppmb";
-        "1.4.0"          = "0mp82mcmrs424ff1vj3cvd8353r9vcap027h3p0iprr1vkkwjbzd";
-        "1.3.4"          = "0f5a62ljhixy5d7gsnwd66gf054l26k3m79fb8nz40i2mgp6l9ii";
-        "1.3.3"          = "1n844zjhv354kp4g4pfbajix0plqh7yxv6471sgyb46885298am5";
-        "1.3.1"          = "14rvm0rm5hd3pd0srgak3jqmddzfv6n7gdpjwhady5xcgrc7gsx7";
-        "1.2.1"          = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf";
-        "1.2.0"          = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4";
-        "1.1.0"          = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
-        "1.0.0"          = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa";
-      };
-      mathcomp-bigenough = {
-        "1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";
-      };
-      mathcomp-analysis = {
-        "0.3.1" = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8";
-        "0.3.0" = "03klwi4fja0cqb4myp3kgycfbmdv00bznmxf8yg3zzzzw997hjqc";
-        "0.2.3" = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966";
-        "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk";
-        "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
-        "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
-      };
-      multinomials = {
-        "1.5.2" = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s";
-        "1.5.1" = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3";
-        "1.5"   = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw";
-        "1.4"   = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p";
-        "1.3"   = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";
-        "1.2"   = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";
-        "1.1"   = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";
-        "1.0"   = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
-      };
-      mathcomp-real-closed = {
-        "1.1.1" = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b";
-        "1.1.0" = "0zgfmrlximw77bw5w6w0xg2nampp02pmrwnrzx8m1n5pqljnv8fh";
-        "1.0.5" = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2";
-        "1.0.4" = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b";
-        "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb";
-        "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl";
-        "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg";
-      };
-      coqeal = {
-        "1.0.4" = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk";
-        "1.0.3" = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";
-        "1.0.2" = "1brmf3gj03iky1bcl3g9vx8vknny7xfvs0y2rfr85am0296sxsfj";
-        "1.0.1" = "19jhdrv2yp9ww0h8q73ihb2w1z3glz4waf2d2n45klafxckxi7bm";
-        "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii";
-      };
-    };
-
-    ################################
-    # CONSISTENT sets of packages. #
-    ################################
-    for-coq-and-mc = let
-      v6 = {
-        mathcomp-finmap       = "1.5.0";
-        mathcomp-bigenough    = "1.0.0";
-        mathcomp-analysis     = "0.3.1";
-        multinomials          = "1.5.2";
-        mathcomp-real-closed  = "1.1.1";
-        coqeal                = "1.0.4";
-      };
-      v5 = {
-        mathcomp-finmap       = "1.5.0";
-        mathcomp-bigenough    = "1.0.0";
-        mathcomp-analysis     = "0.3.0";
-        multinomials          = "1.5.1";
-        mathcomp-real-closed  = "1.0.5";
-        coqeal                = "1.0.4";
-      };
-      v4 = v3 // { coqeal = "1.0.3"; };
-      v3 = {
-        mathcomp-finmap       = "1.4.0";
-        mathcomp-bigenough    = "1.0.0";
-        mathcomp-analysis     = "0.2.3";
-        multinomials          = "1.5";
-        mathcomp-real-closed  = "1.0.4";
-        coqeal                = "1.0.0";
-      };
-      v2 = {
-        mathcomp-finmap       = "1.3.4";
-        mathcomp-bigenough    = "1.0.0";
-        mathcomp-analysis     = "0.2.3";
-        multinomials          = "1.4";
-        mathcomp-real-closed  = "1.0.3";
-        coqeal                = "1.0.0";
-      };
-      v1 = {
-        mathcomp-finmap       = "1.1.0";
-        mathcomp-bigenough    = "1.0.0";
-        multinomials          = "1.1";
-        mathcomp-real-closed  = "1.0.1";
-        coqeal                = "1.0.0";
-      };
-    in
-      {
-        "8.11" = {
-          "1.11.0"     = v6;
-          "1.11+beta1" = v5;
-          "1.10.0"       = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";};
-        };
-        "8.10" = {
-          "1.11.0"       = removeAttrs v6 ["coqeal"];
-          "1.11+beta1"   = removeAttrs v5 ["coqeal"];
-          "1.10.0"       = v4;
-          "1.9.0"        = removeAttrs v3 ["coqeal"];
-        };
-        "8.9" = {
-          "1.11.0"       = removeAttrs v6 ["mathcomp-analysis"];
-          "1.11+beta1"   = removeAttrs v5 ["mathcomp-analysis"];
-          "1.10.0"       = v4;
-          "1.9.0"        = removeAttrs v3 ["coqeal"];
-          "1.8.0"        = removeAttrs v2 ["coqeal"];
-        };
-        "8.8" = {
-          "1.11.0"       = removeAttrs v6 ["mathcomp-analysis"];
-          "1.11+beta1"   = removeAttrs v5 ["mathcomp-analysis"];
-          "1.10.0"       = removeAttrs v4 ["mathcomp-analysis"];
-          "1.9.0"        = removeAttrs v3 ["coqeal"];
-          "1.8.0"        = removeAttrs v2 ["coqeal"];
-          "1.7.0"        = removeAttrs v1 ["coqeal" "multinomials"];
-        };
-        "8.7" = {
-          "1.11.0"       = removeAttrs v6 ["mathcomp-analysis"];
-          "1.11+beta1"   = removeAttrs v5 ["mathcomp-analysis"];
-          "1.10.0"       = removeAttrs v4 ["mathcomp-analysis"];
-          "1.9.0"        = removeAttrs v3 ["coqeal" "mathcomp-analysis"];
-          "1.8.0"        = removeAttrs v2 ["coqeal" "mathcomp-analysis"];
-          "1.7.0"        = removeAttrs v1 ["coqeal" "multinomials"];
-        };
-      };
-  };
-
-  ##############################
-  # GENERATION, EDIT WITH CARE #
-  ##############################
-  coq = coqPackages.coq;
-
-  default-attrs = {
-    version = "master";
-    buildInputs = [];
-    propagatedBuildInputs = (with coqPackages; [ ssreflect ]);
-    installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-    meta = {
-      inherit (mathcomp.meta) platforms license;
-      owner = "math-comp";
-      maintainers = [ maintainers.vbgl maintainers.cohencyril ];
-    };
-    passthru.compatibleCoqVersions = (_: true);
-  };
-
-  pkgUp = recursiveUpdateUntil (path: l: r: !(isAttrs l && isAttrs r) || path == ["src"]);
-
-  # Fixes a partial attribute set using the configuration
-  # in the style of the above mathcomp-extra-config.initial,
-  # and generates a name according to the conventional naming scheme below
-  fix-attrs = pkgcfg:
-    let attrs = pkgUp default-attrs pkgcfg; in
-    pkgUp attrs (rec {
-      name = "coq${coq.coq-version}mathcomp${mathcomp.version}-${attrs.meta.repo or attrs.meta.package or "anonymous"}-${attrs.version}";
-      src = attrs.src or (fetchTarball "${meta.homepage}/archive/${attrs.version}.tar.gz");
-      meta = rec {
-        homepage = attrs.meta.homepage or attrs.src.meta.homepage or "https://github.com/${owner}/${repo}";
-        owner    = attrs.meta.owner or "math-comp";
-        repo     = attrs.meta.repo or attrs.meta.package or "math-comp-nix";
-      };
-    });
-
-  # Gets a version out of a string, path or attribute set.
-  getVersion = arg:
-    if isFunction arg then (arg {}).version
-    else  if arg == "" then "master"
-    else  if isDerivation arg then arg.drvAttrs.version or "master"
-    else  if isAttrs arg then arg.version or "master"
-    else  if isString arg then head (reverseList (split "/" arg))
-    else  if isPath arg   then (baseNameOf arg)
-    else "master";
-
-  # Converts a string, path or attribute set into an override function
-  # It tries to fill the `old` argument of the override function using
-  # `mathcomp-extra-config.initial` first and finishes with `fix-attrs`
-  rec-mathcomp-extra-override = generic: old: let
-    version = getVersion generic;
-    package = old.meta.package or "math-comp-nix";
-    cfg = pkgUp ((mathcomp-extra-config.initial.${package} or (_: {}))
-      { inherit version coqPackages; }) old
-          // { inherit version; };
-    fix = attrs: fix-attrs (pkgUp cfg attrs);
-  in
-    if isFunction generic then fix (generic cfg)
-    else  if generic == null || generic == "" then fix {}
-    else  if isDerivation generic then generic.drvAttrs
-    else  if isAttrs generic then fix generic
-    else  if generic == "broken" then fix { meta.broken = true; passthru.compatibleCoqVersions = _: false; }
-    else  let fixedcfg = fix cfg; in fixedcfg // (
-      if isString generic then
-        if (mathcomp-extra-config.sha256.${package} or {})?${generic} then {
-          src = fetchFromGitHub {
-            inherit (fixedcfg.meta) owner repo;
-            rev = version;
-            sha256 = mathcomp-extra-config.sha256.${package}.${version};
-          };
-        }
-        else  let splitted = filter isString (split "/" generic); in {
-        src = fetchTarball
-          ("https://github.com/" +
-           (if length splitted == 1 then "${fixedcfg.meta.owner}/${fixedcfg.meta.repo}/archive/${version}.tar.gz"
-            else "${head splitted}/${fixedcfg.meta.repo}/archive/${concatStringsSep "/" (tail splitted)}.tar.gz"));
-        }
-      else  if isPath generic then { src = generic; }
-      else abort "${toString generic} not a legitimate generic version/override");
-
-  # applies mathcomp-extra-config.for-coq-and-mc to the current mathcomp version
-  for-this = mathcomp-extra-config.for-coq-and-mc.${coq.coq-version}.${mathcomp.version} or {};
-
-  # specializes mathcomp-extra to the current mathcomp version.
-  rec-current-mathcomp-extra = package: mathcomp-extra package (for-this.${package} or {});
-in
-  {
-    mathcomp-extra-override = rec-mathcomp-extra-override;
-    mathcomp-extra-config   = rec-mathcomp-extra-config;
-    current-mathcomp-extra  = rec-current-mathcomp-extra;
-    mathcomp-extra          = package: version:
-      stdenv.mkDerivation (mathcomp-extra-override version {meta = {inherit package;};});
-
-    mathcomp-finmap       = current-mathcomp-extra "mathcomp-finmap";
-    mathcomp-analysis     = current-mathcomp-extra "mathcomp-analysis";
-    mathcomp-bigenough    = current-mathcomp-extra "mathcomp-bigenough";
-    multinomials          = current-mathcomp-extra "multinomials";
-    mathcomp-real-closed  = current-mathcomp-extra "mathcomp-real-closed";
-    coqeal                = current-mathcomp-extra "coqeal";
-
-    mathcomp-extra-fast    = map current-mathcomp-extra
-      (attrNames (filterAttrs (pkg: config: !(config?slow && config.slow)) for-this));
-    mathcomp-extra-all    = map current-mathcomp-extra (attrNames for-this);
-  }
diff --git a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix
index 862184c1460c..3ce3c625d268 100644
--- a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix
@@ -1,33 +1,18 @@
-{ stdenv, fetchFromGitHub, coq }:
+{ lib, mkCoqDerivation, coq, version ? null }:
 
-stdenv.mkDerivation rec {
-  name = "coq${coq.coq-version}-metalib-${version}";
-  version = "20200527";
-
-  src = fetchFromGitHub {
-    owner = "plclub";
-    repo = "metalib";
-    rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8";
-    sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs";
-  };
+with lib; mkCoqDerivation {
+  pname = "metalib";
+  owner = "plclub";
+  inherit version;
+  defaultVersion = if versions.range "8.10" "8.12" coq.coq-version then "20200527" else null;
+  release."20200527".rev    = "597fd7d0c93eb159274e84a39d554f10f1efccf8";
+  release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs";
 
   sourceRoot = "source/Metalib";
-
-  buildInputs = [ coq ];
-
-  enableParallelBuilding = true;
-
   installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}";
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/plclub/metalib";
+  meta = {
     license = licenses.mit;
     maintainers = [ maintainers.jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.10" "8.11" "8.12" ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix
new file mode 100644
index 000000000000..4958ad893e92
--- /dev/null
+++ b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix
@@ -0,0 +1,34 @@
+{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough,
+  lib, version ? null }:
+with lib; mkCoqDerivation {
+
+  namePrefix = [ "coq" "mathcomp" ];
+  pname = "multinomials";
+  owner = "math-comp";
+  inherit version;
+  defaultVersion =  with versions; switch [ coq.version mathcomp.version ] [
+      { cases = [ (range "8.7" "8.12")  "1.11.0" ];             out = "1.5.2"; }
+      { cases = [ (range "8.7" "8.11")  (range "1.8" "1.10") ]; out = "1.5.0"; }
+      { cases = [ (range "8.7" "8.10")  (range "1.8" "1.10") ]; out = "1.4"; }
+      { cases = [ "8.6"                 (range "1.6" "1.7") ];  out = "1.1"; }
+    ] null;
+  release = {
+    "1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s";
+    "1.5.1".sha256 = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3";
+    "1.5.0".sha256 = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw";
+    "1.5.0".rev    = "1.5";
+    "1.4".sha256   = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p";
+    "1.3".sha256   = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";
+    "1.2".sha256   = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";
+    "1.1".sha256   = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";
+    "1.0".sha256   = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
+  };
+
+  propagatedBuildInputs =
+    [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ];
+
+  meta = {
+    description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
+    license = licenses.cecill-c;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/nixpkgs/pkgs/development/coq-modules/paco/default.nix
index ac6eef2f3bd0..900e52f1682b 100644
--- a/nixpkgs/pkgs/development/coq-modules/paco/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/paco/default.nix
@@ -1,42 +1,16 @@
-{stdenv, fetchFromGitHub, coq, unzip}:
-
-let
-  versions = {
-    pre_8_6 = rec {
-      rev = "v${version}";
-      version = "1.2.8";
-      sha256 = "05fskx5x1qgaf9qv626m38y5izichzzqc7g2rglzrkygbskrrwsb";
-    };
-    post_8_6 = rec {
-      rev = "v${version}";
-      version = "4.0.2";
-      sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b";
-    };
-  };
-  params = {
-    "8.5" = versions.pre_8_6;
-    "8.6" = versions.post_8_6;
-    "8.7" = versions.post_8_6;
-    "8.8" = versions.post_8_6;
-    "8.9" = versions.post_8_6;
-    "8.10" = versions.post_8_6;
-    "8.11" = versions.post_8_6;
-    "8.12" = versions.post_8_6;
-  };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-  inherit (param) version;
-  name = "coq${coq.coq-version}-paco-${version}";
-
-  src = fetchFromGitHub {
-    inherit (param) rev sha256;
-    owner = "snu-sf";
-    repo = "paco";
-  };
-
-  buildInputs = [ coq ];
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "paco";
+  owner = "snu-sf";
+  inherit version;
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = isGe "8.6";         out = "4.0.2"; }
+    { case = range "8.5" "8.8";  out = "1.2.8"; }
+  ] null;
+  release."4.0.2".sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b";
+  release."1.2.8".sha256 = "05fskx5x1qgaf9qv626m38y5izichzzqc7g2rglzrkygbskrrwsb";
+  releaseRev = v: "v${v}";
 
   preBuild = "cd src";
 
@@ -46,15 +20,9 @@ stdenv.mkDerivation rec {
     cp -pR *.vo $COQLIB/user-contrib/Paco
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "http://plv.mpi-sws.org/paco/";
     description = "A Coq library implementing parameterized coinduction";
     maintainers = with maintainers; [ jwiegley ptival ];
-    platforms = coq.meta.platforms;
   };
-
-  passthru = {
-    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix
index 12d65bdb3d7b..342e4225a3c2 100644
--- a/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix
@@ -1,58 +1,22 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let params =
-  {
-    "8.7" = {
-      sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj";
-      buildInputs = [ coq.ocamlPackages.camlp5 ];
-    };
-    "8.8" = {
-      sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0";
-      buildInputs = [ coq.ocamlPackages.camlp5 ];
-    };
-    "8.9" = {
-      sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk";
-      buildInputs = [ coq.ocamlPackages.camlp5 ];
-    };
-    "8.10" = {
-      sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8";
-    };
-    "8.11" = {
-      sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa";
-    };
-    "8.12" = {
-      sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i";
-    };
-  };
-  param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation rec {
-  version = "1.1.2";
-  name = "coq${coq.coq-version}-paramcoq-${version}";
-  src = fetchFromGitHub {
-    owner = "coq-community";
-    repo = "paramcoq";
-    rev = "v${version}+coq${coq.coq-version}";
-    inherit (param) sha256;
-  };
-
-  buildInputs = [ coq ]
-  ++ (with coq.ocamlPackages; [ ocaml findlib ])
-  ++ (param.buildInputs or [])
-  ;
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.hasAttr v params;
-  };
+{ lib, mkCoqDerivation, coq, version ? null }:
 
+with lib; mkCoqDerivation {
+  pname = "paramcoq";
+  inherit version;
+  defaultVersion = if versions.range "8.7" "8.12" coq.coq-version
+    then "1.1.2+coq${coq.coq-version}" else null;
+  displayVersion = { paramcoq = "1.1.2"; };
+  release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i";
+  release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa";
+  release."1.1.2+coq8.10".sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8";
+  release."1.1.2+coq8.9".sha256  = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk";
+  release."1.1.2+coq8.8".sha256  = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0";
+  release."1.1.2+coq8.7".sha256  = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj";
+  releaseRev = v: "v${v}";
+  mlPlugin = true;
   meta = {
     description = "Coq plugin for parametricity";
-    inherit (src.meta) homepage;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (coq.meta) platforms;
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
index 82fa215ee9ca..42d4f782f1cf 100644
--- a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
@@ -1,34 +1,21 @@
-{ stdenv, fetchFromGitHub, coq, coq-ext-lib }:
-
-stdenv.mkDerivation rec {
-  version = "1.3.0";
-  name = "coq${coq.coq-version}-simple-io-${version}";
-  src = fetchFromGitHub {
-    owner = "Lysxia";
-    repo = "coq-simple-io";
-    rev = version;
-    sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
-  };
-
-  buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
-
+{ lib, mkCoqDerivation, coq, coq-ext-lib, version ? null }:
+
+with lib; mkCoqDerivation {
+  pname = "simple-io";
+  owner = "Lysxia";
+  repo = "coq-simple-io";
+  inherit version;
+  defaultVersion = if versions.range "8.7" "8.12" coq.coq-version then "1.3.0" else null;
+  release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
+  extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
   propagatedBuildInputs = [ coq-ext-lib ];
 
   doCheck = true;
   checkTarget = "test";
 
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
   meta = {
     description = "Purely functional IO for Coq";
-    inherit (src.meta) homepage;
-    inherit (coq.meta) platforms;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix
index 28917e73f29f..2caafa9cc555 100644
--- a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix
@@ -1,32 +1,17 @@
-{ stdenv, fetchFromGitLab, coq }:
+{ lib, mkCoqDerivation, coq, version ? null }:
 
-stdenv.mkDerivation rec {
-  name = "coq${coq.coq-version}-stdpp-${version}";
-  version = "1.4.0";
-  src = fetchFromGitLab {
-    domain = "gitlab.mpi-sws.org";
-    owner = "iris";
-    repo = "stdpp";
-    rev = "coq-stdpp-${version}";
-    sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
-  };
-
-  buildInputs = [ coq ];
-
-  enableParallelBuilding = true;
-
-  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+with lib; mkCoqDerivation rec {
+  pname = "stdpp";
+  inherit version;
+  domain = "gitlab.mpi-sws.org";
+  owner = "iris";
+  defaultVersion = if versions.range "8.8" "8.12" coq.coq-version then "1.4.0" else null;
+  release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
+  releaseRev = v: "coq-stdpp-${v}";
 
   meta = {
-    inherit (src.meta) homepage;
     description = "An extended “Standard Library” for Coq";
-    inherit (coq.meta) platforms;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
   };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.8" "8.9" "8.10" "8.11" "8.12" ];
-  };
-
 }
diff --git a/nixpkgs/pkgs/development/coq-modules/tlc/default.nix b/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
index 816b22050244..6bbad1c6c2b1 100644
--- a/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
@@ -1,41 +1,23 @@
-{ stdenv, fetchurl, fetchFromGitHub, coq }:
+{ lib, mkCoqDerivation, coq, version ? null }:
 
-let params =
-  if stdenv.lib.versionAtLeast coq.coq-version "8.10"
-  then rec {
-    version = "20200328";
-    src = fetchFromGitHub {
-      owner = "charguer";
-      repo = "tlc";
-      rev = version;
-      sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx";
-    };
-  } else rec {
-    version = "20181116";
-    src = fetchurl {
-      url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz";
-      sha256 = "0iv6f6zmrv2lhq3xq57ipmw856ahsql754776ymv5wjm88ld63nm";
-    };
-  }
-; in
-
-stdenv.mkDerivation {
-  inherit (params) version src;
-  pname = "coq${coq.coq-version}-tlc";
-
-  buildInputs = [ coq ];
+with lib; mkCoqDerivation {
+  pname = "tlc";
+  owner = "charguer";
+  inherit version;
+  displayVersion = { tlc = false; };
+  defaultVersion = with versions; switch coq.coq-version [
+    { case = range "8.10" "8.12"; out = "20200328"; }
+    { case = range "8.6"  "8.12"; out = "20181116"; }
+  ] null;
+  release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx";
+  release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl";
 
   installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ];
 
   meta = {
     homepage = "http://www.chargueraud.org/softs/tlc/";
     description = "A non-constructive library for Coq";
-    license = stdenv.lib.licenses.free;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (coq.meta) platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
+    license = licenses.free;
+    maintainers = [ maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix
index 286037b2cce2..526e93f84c42 100644
--- a/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix
+++ b/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchurl
 , makeWrapper
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
   # to find some of the packaged DLLs.
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Microsoft Language Server for Python";
     homepage = "https://github.com/microsoft/python-language-server";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/go-modules/generic/default.nix b/nixpkgs/pkgs/development/go-modules/generic/default.nix
index 26d9e1e830a8..d4a9b7078cbf 100644
--- a/nixpkgs/pkgs/development/go-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/go-modules/generic/default.nix
@@ -29,9 +29,6 @@ let
     # We want parallel builds by default
     , enableParallelBuilding ? true
 
-    # Disabled flag
-    , disabled ? false
-
     # Do not enable this without good reason
     # IE: programs coupled with the compiler
     , allowGoReference ? false
@@ -247,9 +244,7 @@ let
       }) // {
         overrideGoAttrs = f: buildGoPackage (args' // (f args'));
       };
-    in if disabled then
-      throw "${package.name} not supported for go ${go.meta.branch}"
-    else if (goPackagePath != null) then
+    in if (goPackagePath != null) then
       throw "`goPackagePath` not needed with `buildGoModule`"
     else
       package;
diff --git a/nixpkgs/pkgs/development/go-packages/generic/default.nix b/nixpkgs/pkgs/development/go-packages/generic/default.nix
index ab8ee9166f98..0a1b3a9a2948 100644
--- a/nixpkgs/pkgs/development/go-packages/generic/default.nix
+++ b/nixpkgs/pkgs/development/go-packages/generic/default.nix
@@ -10,9 +10,6 @@
 # We want parallel builds by default
 , enableParallelBuilding ? true
 
-# Disabled flag
-, disabled ? false
-
 # Go import path of the package
 , goPackagePath
 
@@ -86,7 +83,7 @@ let
     GO111MODULE = "off";
     GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ];
 
-    GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+    GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
 
     configurePhase = args.configurePhase or ''
       runHook preConfigure
@@ -249,7 +246,5 @@ let
       platforms = go.meta.platforms or lib.platforms.all;
     } // meta;
   });
-in if disabled then
-  throw "${package.name} not supported for go ${go.meta.branch}"
-else
+in
   package
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix
index 8864e014c6de..15e3ccbb9722 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
+{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }:
 
 stdenv.mkDerivation rec {
   pname = "guile-cairo";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ guile cairo expat ];
   enableParallelBuilding = true;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # Cannot find unit-test module from guile-lib
   checkInputs = [ guile-lib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cairo bindings for GNU Guile";
     longDescription = ''
       Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix
index 88ba443b6b8a..3521853187c4 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }:
 
 let
   version = "1.0.0";
@@ -13,12 +13,12 @@ in stdenv.mkDerivation {
     sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ guile texinfo ];
 
   autoreconfPhase = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Concurrent ML-like concurrency for Guile";
     homepage = "https://github.com/wingo/fibers";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix
index 17f03f67cef5..2dc07deac5c6 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, guile, guile-lib, gwrap
-, pkgconfig, gconf, glib, gnome_vfs, gtk2
+{ fetchurl, lib, stdenv, guile, guile-lib, gwrap
+, pkg-config, gconf, glib, gnome_vfs, gtk2
 , libglade, libgnome, libgnomecanvas, libgnomeui
 , pango, guile-cairo, texinfo
 }:
@@ -14,16 +14,16 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2
+    texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2
     libglade libgnome libgnomecanvas libgnomeui pango guile-cairo
-  ] ++ stdenv.lib.optional doCheck guile-lib;
+  ] ++ lib.optional doCheck guile-lib;
 
   # The test suite tries to open an X display, which fails.
   doCheck = false;
 
   GUILE_AUTO_COMPILE = 0;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNOME bindings for GNU Guile";
     longDescription = ''
       GNU guile-gnome brings the power of Scheme to your graphical application.
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
index 97f501f41db7..34299b345eeb 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guile, texinfo, pkgconfig }:
+{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }:
 
 assert stdenv ? cc && stdenv.cc.isGNU;
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ guile texinfo ];
 
   doCheck = true;
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
     "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of useful Guile Scheme modules";
     longDescription = ''
       guile-lib is intended as an accumulation place for pure-scheme Guile
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix
index 8f6018582670..8f879249a23e 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }:
+{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }:
 
 let
   name = "guile-ncurses-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
     sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ guile ncurses libffi ];
 
   preConfigure = ''
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
   # XXX: 1 of 65 tests failed.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scheme interface to the NCurses libraries";
     longDescription = ''
       GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix
index e1e04ecfe699..effa651b99c8 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, guile }:
+{ lib, stdenv, fetchurl, pkg-config, guile }:
 
 let
   name = "guile-opengl-${version}";
@@ -11,9 +11,9 @@ in stdenv.mkDerivation {
     sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim";
   };
 
-  nativeBuildInputs = [ pkgconfig guile ];
+  nativeBuildInputs = [ pkg-config guile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Guile bindings for the OpenGL graphics API";
     homepage = "https://www.gnu.org/software/guile-opengl/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
index 392babc096a4..eaf402a86058 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config
 , gperf, guile, guile-lib, libffi }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
 
   pname = "guile-reader";
@@ -12,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gperf guile guile-lib libffi ];
 
   GUILE_SITE="${guile-lib}/share/guile/site";
 
   configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple framework for building readers for GNU Guile";
     longDescription = ''
        Guile-Reader is a simple framework for building readers for GNU
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix
index eff4c699625a..8816e7b4ffcb 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, guile, buildEnv
+{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv
 , SDL, SDL_image, SDL_ttf, SDL_mixer
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01";
   };
 
-  nativeBuildInputs = [ pkgconfig guile ];
+  nativeBuildInputs = [ pkg-config guile ];
 
   buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ];
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     };
   in [ "SDLMINUSI=-I${sdl}/include/SDL" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Guile bindings for SDL";
     homepage = "https://www.gnu.org/software/guile-sdl/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix
index 061d3c4a1dba..c3f5fdaefbd2 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guile, libtool, pkgconfig
+{ lib, stdenv, fetchurl, guile, libtool, pkg-config
 , SDL2, SDL2_image, SDL2_ttf, SDL2_mixer
 }:
 
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
     sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m";
   };
 
-  nativeBuildInputs = [ libtool pkgconfig ];
+  nativeBuildInputs = [ libtool pkg-config ];
   buildInputs = [
     guile SDL2 SDL2_image SDL2_ttf SDL2_mixer
   ];
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
 
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bindings to SDL2 for GNU Guile";
     homepage = "https://dthompson.us/projects/guile-sdl2.html";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix
index b08d8313930b..2de445244259 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, guile, texinfo }:
+{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }:
 
 let
   name = "guile-xcb-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
     sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ guile texinfo ];
 
   preConfigure = ''
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
     ";
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XCB bindings for Guile";
     homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index 05740979b8ac..4c161c453c5b 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -217,7 +217,26 @@ self: super: {
   # building of the executable has been disabled for ghc < 8.10 in hnix.
   # Generating the completions should be activated again, once we default to
   # ghc 8.10.
-  hnix = dontCheck super.hnix;
+  hnix = dontCheck (super.hnix.override {
+
+    #  2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly.
+    # https://github.com/haskell-nix/hnix-store/issues/104
+    # Until unpin, which may hold off in time due to Stackage maintenence bottleneck
+    # the 0_4_0_0 is used
+    hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
+
+  });
+
+  #  2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly.
+  # https://github.com/haskell-nix/hnix-store/issues/104
+  # Until unpin, which may hold off in time due to Stackage maintenence bottleneck
+  # the 0_4_0_0 is used
+  hnix-store-remote = (super.hnix-store-remote.override {
+    hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
+  });
+
+  # https://github.com/haskell-nix/hnix-store/issues/127
+  hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover;
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;
@@ -504,6 +523,10 @@ self: super: {
      then self.buildHaskellPackages.tasty-discover
      else dontCheck super.tasty-discover);
 
+  # Known issue with nondeterministic test suite failure
+  # https://github.com/nomeata/tasty-expected-failure/issues/21
+  tasty-expected-failure = dontCheck super.tasty-expected-failure;
+
   # Waiting on https://github.com/RaphaelJ/friday/pull/36
   friday = doJailbreak super.friday;
 
@@ -664,34 +687,6 @@ self: super: {
   # The standard libraries are compiled separately.
   idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris);
 
-  # build servant docs from the repository
-  servant =
-    let
-      ver = super.servant.version;
-      docs = pkgs.stdenv.mkDerivation {
-        name = "servant-sphinx-documentation-${ver}";
-        src = "${pkgs.fetchFromGitHub {
-          owner = "haskell-servant";
-          repo = "servant";
-          rev = "v${ver}";
-          sha256 = "0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89";
-        }}/doc";
-        # Needed after sphinx 1.7.9 -> 1.8.3
-        postPatch = ''
-          substituteInPlace conf.py --replace "'.md': CommonMarkParser," ""
-        '';
-        nativeBuildInputs = with pkgs.buildPackages.python3Packages; [ sphinx recommonmark sphinx_rtd_theme ];
-        makeFlags = [ "html" ];
-        installPhase = ''
-          mv _build/html $out
-        '';
-      };
-    in overrideCabal super.servant (old: {
-      postInstall = old.postInstall or "" + ''
-        ln -s ${docs} ''${!outputDoc}/share/doc/servant
-      '';
-    });
-
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;
 
@@ -805,11 +800,20 @@ self: super: {
   # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
   pointfree = doJailbreak super.pointfree;
 
-  # Depends on base <4.12
-  # See https://github.com/haskell-hvr/cryptohash-sha512/pull/3
-  # , https://github.com/haskell-hvr/cryptohash-sha512/issues/4
-  # and https://github.com/haskell-hvr/cryptohash-sha512/pull/5
-  cryptohash-sha512 = doJailbreak super.cryptohash-sha512;
+  # The project is stale
+  #
+  # Archiving request: https://github.com/haskell-hvr/cryptohash-sha512/issues/6
+  #
+  # doJailbreak since base <4.12 && bytestring <0.11
+  # Request to support:
+  # https://github.com/haskell-hvr/cryptohash-sha512/issues/4
+  # PRs to support base <4.12:
+  # https://github.com/haskell-hvr/cryptohash-sha512/pull/3
+  # https://github.com/haskell-hvr/cryptohash-sha512/pull/5
+  #
+  # dontCheck since test suite does not support new `base16-bytestring` >= 1 format
+  # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913
+  cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512);
 
   # Depends on tasty < 1.x, which we don't have.
   cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
@@ -928,6 +932,10 @@ self: super: {
   # Work around overspecified constraint on github ==0.18.
   github-backup = doJailbreak super.github-backup;
 
+  # https://github.com/andrewthad/chronos/issues/62
+  # doctests are failing on newer GHC versions
+  chronos = dontCheck super.chronos;
+
   # Test suite depends on cabal-install
   doctest = dontCheck super.doctest;
 
@@ -937,8 +945,12 @@ self: super: {
 
   # Generate cli completions for dhall.
   dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
-  dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
+  # For reasons that are not quire clear 'dhall-json' won't compile without 'tasty 1.4' due to its tests
+  # https://github.com/commercialhaskell/stackage/issues/5795
+  # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation.
+  dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json);
   dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
+  dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml;
 
   # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
   netrc = doJailbreak super.netrc;
@@ -1309,7 +1321,7 @@ self: super: {
   commonmark-extensions = dontCheck super.commonmark-extensions;
 
   # Testsuite trying to run `which haskeline-examples-Test`
-  haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0;
+  haskeline_0_8_1_1 = dontCheck super.haskeline_0_8_1_1;
 
   # Tests for list-t, superbuffer, and stm-containers
   # depend on HTF and it is broken, 2020-08-23
@@ -1365,6 +1377,11 @@ self: super: {
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak super.pandoc-citeproc;
 
+  # 2021-01-17: Tests are broken because of a version mismatch.
+  # See here: https://github.com/jgm/pandoc/issues/7035
+  # This problem is fixed on master. Remove override when this assert fails.
+  pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc;
+
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
   domain-auth = dontCheck super.domain-auth;
 
@@ -1403,13 +1420,18 @@ self: super: {
     lsp-test = dontCheck self.lsp-test_0_11_0_7;
     fourmolu = self.fourmolu_0_3_0_0;
   });
+  # 2021-01-20
+  # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
+  # https://github.com/haskell/haskell-language-server/issues/1240
+  apply-refact = super.apply-refact_0_8_2_1;
 
   fourmolu = dontCheck super.fourmolu;
   # 1. test requires internet
   # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
   ghcide = doDistribute (unmarkBroken (dontCheck
-    (super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; })
-  ));
+  (super.ghcide_0_7_0_0.override {
+    lsp-test = dontCheck self.lsp-test_0_11_0_7;
+  })));
   refinery = doDistribute super.refinery_0_3_0_0;
   data-tree-print = doJailbreak super.data-tree-print;
 
@@ -1432,6 +1454,9 @@ self: super: {
   # https://github.com/adnelson/semver-range/issues/15
   semver-range = dontCheck super.semver-range;
 
+  # https://github.com/obsidiansystems/dependent-sum/issues/55
+  dependent-sum = doJailbreak super.dependent-sum;
+
   dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
     # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
     # Bump version bounds for ghc 8.10
@@ -1447,7 +1472,7 @@ self: super: {
   # base upper bound is incompatible with ghc 8.10
   neuron = doJailbreak super.neuron;
 
-  reflex = appendPatches super.reflex [
+  reflex = dontCheck (doJailbreak (appendPatches super.reflex [
     # https://github.com/reflex-frp/reflex/pull/444
     # Fixes for ghc 8.10
     (pkgs.fetchpatch {
@@ -1460,7 +1485,7 @@ self: super: {
       url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch;
       sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
     })
-  ];
+  ]));
 
   # 2020-11-19: jailbreaking because of pretty-simple bound out of date
   # https://github.com/kowainik/stan/issues/408
@@ -1477,28 +1502,18 @@ self: super: {
     sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1";
   });
 
+  # https://github.com/ekmett/half/issues/35
+  half = if pkgs.stdenv.isAarch64
+    then dontCheck super.half
+    else super.half;
+
   # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
   heist = doJailbreak super.heist;
 
   # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
   snap = doJailbreak super.snap;
 
-  # 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released
-  # https://github.com/cachix/cachix/pull/331
-  cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch {
-    url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
-    sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74";
-    stripLen = 2;
-    extraPrefix = "";
-    includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
-  });
-  cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch {
-    url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
-    sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
-    stripLen = 2;
-    extraPrefix = "";
-    excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
-  }));
+  cachix = generateOptparseApplicativeCompletion "cachix" super.cachix;
 
   # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
   pipes-text = doJailbreak super.pipes-text;
@@ -1518,7 +1533,7 @@ self: super: {
 
   # 2020-12-05: http-client is fixed on too old version
   essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
-    http-client = self.http-client_0_7_3;
+    http-client = self.http-client_0_7_4;
   };
 
   # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
@@ -1552,4 +1567,18 @@ self: super: {
   servant-client      = doJailbreak super.servant-client;
   servant-client-core = doJailbreak super.servant-client-core;
 
+  # overly strict dependency on aeson
+  # https://github.com/jaspervdj/profiteur/issues/33
+  profiteur = doJailbreak super.profiteur;
+
+  # Test suite has overly strict bounds on tasty.
+  # https://github.com/input-output-hk/nothunks/issues/9
+  nothunks = doJailbreak super.nothunks;
+
+  # Allow building with recent versions of tasty.
+  lukko = doJailbreak super.lukko;
+
+  # Allow building with older versions of http-client.
+  http-client-restricted = doJailbreak super.http-client-restricted;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 862b45299a63..00a8c8d520bb 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -92,7 +92,7 @@ self: super:
          base template-haskell ghcjs-base split containers text ghc-prim
        ];
        description = "FFI QuasiQuoter for GHCJS";
-       license = pkgs.stdenv.lib.licenses.mit;
+       license = pkgs.lib.licenses.mit;
      }) {};
   # experimental
   ghcjs-vdom = self.callPackage
@@ -112,7 +112,7 @@ self: super:
         base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split
         template-haskell
       ];
-      license = pkgs.stdenv.lib.licenses.mit;
+      license = pkgs.lib.licenses.mit;
       description = "bindings for https://github.com/Matt-Esch/virtual-dom";
     }) {};
 
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c23c4d54acb6..1587e1dba618 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # haskell-language-server 0.5.0.0 doesn't accept newer versions
   - fourmolu ==0.2.*
   - refinery ==0.2.*
-  # Stackage Nightly 2021-01-01
+  # Stackage Nightly 2021-01-20
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -86,7 +86,7 @@ default-package-overrides:
   - ad ==4.4.1
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
-  - aeson ==1.5.4.1
+  - aeson ==1.5.5.1
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.2.0.0
@@ -209,25 +209,25 @@ default-package-overrides:
   - amazonka-waf ==1.6.1
   - amazonka-workspaces ==1.6.1
   - amazonka-xray ==1.6.1
-  - amqp ==0.20.0
+  - amqp ==0.20.0.1
   - amqp-utils ==0.4.4.1
   - annotated-wl-pprint ==0.7.0
   - ansi-terminal ==0.10.3
   - ansi-wl-pprint ==0.6.9
   - ANum ==0.2.0.2
-  - ap-normalize ==0.1.0.0
   - apecs ==0.9.2
   - apecs-gloss ==0.2.4
   - apecs-physics ==0.4.5
   - api-field-json-th ==0.1.0.2
   - api-maker ==0.1.0.0
-  - app-settings ==0.2.0.12
+  - ap-normalize ==0.1.0.0
   - appar ==0.1.8
   - appendmap ==0.1.5
-  - apply-refact ==0.8.2.1
+  - apply-refact ==0.9.0.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.2
   - approximate-equality ==1.1.0.2
+  - app-settings ==0.2.0.12
   - arbor-lru-cache ==0.1.1.1
   - arbor-postgres ==0.0.5
   - arithmoi ==0.11.0.1
@@ -236,12 +236,12 @@ default-package-overrides:
   - ascii ==1.0.0.2
   - ascii-case ==1.0.0.2
   - ascii-char ==1.0.0.2
+  - asciidiagram ==1.3.3.3
   - ascii-group ==1.0.0.2
   - ascii-predicates ==1.0.0.2
   - ascii-progress ==0.3.3.0
   - ascii-superset ==1.0.0.2
   - ascii-th ==1.0.0.2
-  - asciidiagram ==1.3.3.3
   - asif ==6.0.4
   - asn1-encoding ==0.9.6
   - asn1-parse ==0.9.5
@@ -261,7 +261,7 @@ default-package-overrides:
   - attoparsec-base64 ==0.0.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
-  - attoparsec-iso8601 ==1.0.1.0
+  - attoparsec-iso8601 ==1.0.2.0
   - attoparsec-path ==0.0.0.1
   - audacity ==0.0.2
   - aur ==7.0.5
@@ -269,8 +269,8 @@ default-package-overrides:
   - authenticate ==1.3.5
   - authenticate-oauth ==1.6.0.1
   - auto ==0.4.3.1
-  - auto-update ==0.1.6
   - autoexporter ==1.1.19
+  - auto-update ==0.1.6
   - avers ==0.0.17.1
   - avro ==0.5.2.0
   - aws-cloudfront-signed-cookies ==0.2.0.6
@@ -278,11 +278,6 @@ default-package-overrides:
   - backtracking ==0.1.0
   - bank-holidays-england ==0.2.0.6
   - barbies ==2.0.2.0
-  - base-compat ==0.11.2
-  - base-compat-batteries ==0.11.2
-  - base-orphans ==0.8.4
-  - base-prelude ==1.4
-  - base-unicode-symbols ==0.2.4.2
   - base16 ==0.3.0.1
   - base16-bytestring ==0.1.1.7
   - base16-lens ==0.1.3.0
@@ -296,7 +291,12 @@ default-package-overrides:
   - base64-bytestring-type ==1.0.1
   - base64-lens ==0.3.0
   - base64-string ==0.2
+  - base-compat ==0.11.2
+  - base-compat-batteries ==0.11.2
   - basement ==0.0.11
+  - base-orphans ==0.8.4
+  - base-prelude ==1.4
+  - base-unicode-symbols ==0.2.4.2
   - basic-prelude ==0.7.0
   - bazel-runfiles ==0.12
   - bbdb ==0.8
@@ -309,8 +309,8 @@ default-package-overrides:
   - bibtex ==0.1.0.6
   - bifunctors ==5.5.9
   - bimap ==0.4.0
-  - bimap-server ==0.1.0.1
   - bimaps ==0.1.0.2
+  - bimap-server ==0.1.0.1
   - bin ==0.1
   - binary-conduit ==1.3.1
   - binary-ext ==2.0.4
@@ -323,7 +323,6 @@ default-package-overrides:
   - binary-search ==1.0.0.3
   - binary-shared ==0.8.3
   - binary-tagged ==0.3
-  - binaryen ==0.0.5.0
   - bindings-DSL ==1.0.25
   - bindings-GLFW ==3.3.2.0
   - bindings-libzip ==1.0.1
@@ -331,17 +330,17 @@ default-package-overrides:
   - bins ==0.1.2.0
   - bitarray ==0.0.1.1
   - bits ==0.5.2
-  - bits-extra ==0.0.2.0
   - bitset-word8 ==0.1.1.2
+  - bits-extra ==0.0.2.0
   - bitvec ==1.0.3.0
-  - bitwise-enum ==1.0.0.2
+  - bitwise-enum ==1.0.0.3
   - blake2 ==0.3.0
   - blanks ==0.5.0
   - blas-carray ==0.1.0.1
   - blas-comfort-array ==0.0.0.2
   - blas-ffi ==0.1
   - blaze-bootstrap ==0.1.0.1
-  - blaze-builder ==0.4.1.0
+  - blaze-builder ==0.4.2.1
   - blaze-html ==0.9.1.2
   - blaze-markup ==0.8.2.7
   - blaze-svg ==0.3.6.1
@@ -358,8 +357,8 @@ default-package-overrides:
   - boring ==0.1.3
   - both ==0.1.1.1
   - bound ==2.0.2
-  - bounded-queue ==1.0.0
   - BoundedChan ==1.0.3.0
+  - bounded-queue ==1.0.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
@@ -377,10 +376,10 @@ default-package-overrides:
   - butcher ==1.3.3.2
   - bv ==0.5
   - bv-little ==1.1.1
-  - byte-count-reader ==0.10.1.2
-  - byte-order ==0.1.2.0
   - byteable ==0.1.1
+  - byte-count-reader ==0.10.1.2
   - bytedump ==1.0
+  - byte-order ==0.1.2.0
   - byteorder ==1.0.4
   - bytes ==0.17
   - byteset ==0.1.1.0
@@ -396,7 +395,6 @@ default-package-overrides:
   - bzlib-conduit ==0.3.0.2
   - c14n ==0.1.0.1
   - c2hs ==0.28.7
-  - ca-province-codes ==1.0.0.0
   - cabal-doctest ==1.0.8
   - cabal-file ==0.1.1
   - cabal-flatpak ==0.1.0.2
@@ -407,12 +405,13 @@ default-package-overrides:
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.2.0
   - can-i-haz ==0.3.1.0
+  - ca-province-codes ==1.0.0.0
   - cardano-coin-selection ==1.0.1
   - carray ==0.1.6.8
   - casa-client ==0.0.1
   - casa-types ==0.0.1
-  - case-insensitive ==1.2.1.0
   - cased ==0.1.0.0
+  - case-insensitive ==1.2.1.0
   - cases ==0.1.4
   - casing ==0.1.4.1
   - cassava ==0.5.2.0
@@ -473,12 +472,12 @@ default-package-overrides:
   - cmark-gfm ==0.2.2
   - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.20
+  - codec-beam ==0.2.0
+  - codec-rpm ==0.2.2
+  - code-page ==0.2
   - co-log ==0.4.0.1
   - co-log-concurrent ==0.5.0.0
   - co-log-core ==0.2.1.1
-  - code-page ==0.2
-  - codec-beam ==0.2.0
-  - codec-rpm ==0.2.2
   - Color ==0.3.0
   - colorful-monoids ==0.2.1.3
   - colorize-haskell ==1.0.1
@@ -520,12 +519,12 @@ default-package-overrides:
   - conduit-extra ==1.3.5
   - conduit-parse ==0.2.1.0
   - conduit-zstd ==0.0.2.0
-  - conferer ==0.4.1.1
-  - conferer-hspec ==0.4.0.1
-  - conferer-source-json ==0.4.0.1
-  - conferer-warp ==0.4.0.1
-  - config-ini ==0.2.4.0
+  - conferer ==1.0.0.1
+  - conferer-aeson ==1.0.0.0
+  - conferer-hspec ==1.0.0.0
+  - conferer-warp ==1.0.0.0
   - ConfigFile ==1.1.4
+  - config-ini ==0.2.4.0
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - configurator-pg ==0.2.5
@@ -533,8 +532,8 @@ default-package-overrides:
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
   - constraint ==0.1.4.0
-  - constraint-tuples ==0.1.2
   - constraints ==0.12
+  - constraint-tuples ==0.1.2
   - construct ==0.3
   - contravariant ==1.5.3
   - contravariant-extras ==0.3.5.2
@@ -561,13 +560,8 @@ default-package-overrides:
   - cron ==0.7.0
   - crypto-api ==0.13.3
   - crypto-cipher-types ==0.0.9
-  - crypto-enigma ==0.1.1.6
-  - crypto-numbers ==0.2.7
-  - crypto-pubkey ==0.2.8
-  - crypto-pubkey-types ==0.4.3
-  - crypto-random ==0.0.9
-  - crypto-random-api ==0.2.0
   - cryptocompare ==0.1.2
+  - crypto-enigma ==0.1.1.6
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -576,6 +570,11 @@ default-package-overrides:
   - cryptonite ==0.27
   - cryptonite-conduit ==0.2.2
   - cryptonite-openssl ==0.7
+  - crypto-numbers ==0.2.7
+  - crypto-pubkey ==0.2.8
+  - crypto-pubkey-types ==0.4.3
+  - crypto-random ==0.0.9
+  - crypto-random-api ==0.2.0
   - csp ==1.4.0
   - css-syntax ==0.1.0.0
   - css-text ==0.1.3.0
@@ -612,6 +611,7 @@ default-package-overrides:
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==4.7.0.0
+  - datadog ==0.2.5.0
   - data-dword ==0.3.2
   - data-endian ==0.1.1
   - data-fix ==0.3.0
@@ -630,12 +630,12 @@ default-package-overrides:
   - data-reify ==0.6.3
   - data-serializer ==0.3.4.1
   - data-textual ==0.3.0.3
-  - datadog ==0.2.5.0
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
   - DBFunctor ==0.1.1.1
   - dbus ==1.2.17
   - dbus-hslogger ==0.1.0.1
+  - debian ==4.0.2
   - debian-build ==0.10.2.0
   - debug-trace-var ==0.2.0
   - dec ==0.0.3
@@ -648,8 +648,8 @@ default-package-overrides:
   - dense-linear-algebra ==0.1.0.0
   - depq ==0.4.1.0
   - deque ==0.4.3
-  - derive-topdown ==0.0.2.2
   - deriveJsonNoPrefix ==0.1.0.1
+  - derive-topdown ==0.0.2.2
   - deriving-aeson ==0.2.6
   - deriving-compat ==0.5.10
   - derulo ==1.0.9
@@ -658,17 +658,17 @@ default-package-overrides:
   - dhall-json ==1.7.4
   - dhall-lsp-server ==1.0.12
   - dhall-yaml ==1.2.4
-  - di-core ==1.0.4
-  - di-monad ==1.3.1
   - diagrams-solve ==0.1.2
   - dialogflow-fulfillment ==0.1.1.3
+  - di-core ==1.0.4
   - dictionary-sharing ==0.1.0.0
   - Diff ==0.4.0
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.3
-  - direct-sqlite ==2.3.26
+  - di-monad ==1.3.1
   - directory-tree ==0.12.1
+  - direct-sqlite ==2.3.26
   - dirichlet ==0.1.0.2
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
@@ -680,8 +680,6 @@ default-package-overrides:
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==4.0.1
-  - do-list ==1.0.1
-  - do-notation ==0.1.0.2
   - dockerfile ==0.2.0
   - doclayout ==0.3
   - doctemplates ==0.9
@@ -690,6 +688,9 @@ default-package-overrides:
   - doctest-exitcode-stdio ==0.0
   - doctest-lib ==0.1
   - doldol ==0.4.1.2
+  - do-list ==1.0.1
+  - do-notation ==0.1.0.2
+  - dot ==0.3
   - dotenv ==0.8.0.7
   - dotgen ==0.4.3
   - dotnet-timespan ==0.0.1.0
@@ -706,6 +707,7 @@ default-package-overrides:
   - dyre ==0.8.12
   - eap ==0.9.0.2
   - earcut ==0.1.0.4
+  - Earley ==0.13.0.1
   - easy-file ==0.2.2
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
@@ -727,10 +729,10 @@ default-package-overrides:
   - elerea ==2.9.0
   - elf ==0.30
   - eliminators ==0.7
+  - elm2nix ==0.2.1
   - elm-bridge ==0.6.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - elm2nix ==0.2.1
   - elynx ==0.5.0.1
   - elynx-markov ==0.5.0.1
   - elynx-nexus ==0.5.0.1
@@ -742,16 +744,16 @@ default-package-overrides:
   - enclosed-exceptions ==1.0.3
   - ENIG ==0.0.1.0
   - entropy ==0.4.1.6
-  - enum-subset-generate ==0.1.0.0
   - enummapset ==0.6.0.3
   - enumset ==0.0.5
+  - enum-subset-generate ==0.1.0.0
   - envelope ==0.2.2.0
   - envparse ==0.4.1
   - envy ==2.1.0.0
   - epub-metadata ==4.5
   - eq ==4.2.1
   - equal-files ==0.0.5.3
-  - equational-reasoning ==0.6.0.3
+  - equational-reasoning ==0.6.0.4
   - equivalence ==0.3.5
   - erf ==2.0.0.0
   - error-or ==0.1.2.0
@@ -766,25 +768,25 @@ default-package-overrides:
   - essence-of-live-coding-quickcheck ==0.2.4
   - etc ==0.4.1.0
   - eve ==0.1.9.0
-  - event-list ==0.1.2
   - eventful-core ==0.2.0
   - eventful-test-helpers ==0.2.0
+  - event-list ==0.1.2
   - eventstore ==1.4.1
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.9
   - exact-pi ==0.5.0.1
   - exception-hierarchy ==0.1.0.4
   - exception-mtl ==0.4.0.1
+  - exceptions ==0.10.4
   - exception-transformers ==0.4.0.9
   - exception-via ==0.1.0.0
-  - exceptions ==0.10.4
   - executable-path ==0.0.3.1
   - exit-codes ==1.0.0
   - exomizer ==1.0.0
-  - exp-pairs ==0.2.1.0
   - experimenter ==0.1.0.4
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.10
+  - exp-pairs ==0.2.1.0
   - express ==0.1.3
   - extended-reals ==0.2.4.0
   - extensible-effects ==5.0.0.1
@@ -811,10 +813,10 @@ default-package-overrides:
   - fgl ==5.7.0.3
   - file-embed ==0.0.13.0
   - file-embed-lzma ==0
-  - file-modules ==0.1.2.4
-  - file-path-th ==0.1.0.0
   - filelock ==0.1.1.5
   - filemanip ==0.3.6.3
+  - file-modules ==0.1.2.4
+  - file-path-th ==0.1.0.0
   - filepattern ==0.1.2
   - fileplow ==0.1.0.0
   - filtrable ==0.1.4.0
@@ -844,8 +846,9 @@ default-package-overrides:
   - fn ==0.3.0.2
   - focus ==1.0.2
   - focuslist ==0.1.0.2
-  - fold-debounce ==0.2.0.9
   - foldable1 ==0.1.0.0
+  - fold-debounce ==0.2.0.9
+  - fold-debounce-conduit ==0.2.0.5
   - foldl ==1.4.10
   - folds ==0.7.5
   - follow-file ==0.0.3
@@ -859,10 +862,10 @@ default-package-overrides:
   - foundation ==0.0.25
   - free ==5.1.5
   - free-categories ==0.2.0.2
-  - free-vl ==0.1.4
   - freenect ==1.2.1
   - freer-simple ==1.2.1.1
   - freetype2 ==0.2.0
+  - free-vl ==0.1.4
   - friendly-time ==0.4.1
   - from-sum ==0.2.3.0
   - frontmatter ==0.1.0.2
@@ -878,8 +881,8 @@ default-package-overrides:
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
   - fuzzy-dates ==0.1.1.2
-  - fuzzy-time ==0.1.0.0
   - fuzzyset ==0.2.0
+  - fuzzy-time ==0.1.0.0
   - gauge ==0.2.5
   - gd ==3000.7.3
   - gdp ==0.0.3.0
@@ -894,8 +897,8 @@ default-package-overrides:
   - generic-lens-core ==2.0.0.0
   - generic-monoid ==0.1.0.1
   - generic-optics ==2.0.0.0
-  - generic-random ==1.3.0.1
   - GenericPretty ==1.2.2
+  - generic-random ==1.3.0.1
   - generics-sop ==0.5.1.0
   - generics-sop-lens ==0.2.0.1
   - geniplate-mirror ==0.7.7
@@ -929,6 +932,9 @@ default-package-overrides:
   - ghc-core ==0.5.6
   - ghc-events ==0.15.1
   - ghc-exactprint ==0.6.3.3
+  - ghcid ==0.8.7
+  - ghci-hexcalc ==0.1.1.0
+  - ghcjs-codemirror ==0.0.0.2
   - ghc-lib ==8.10.3.20201220
   - ghc-lib-parser ==8.10.3.20201220
   - ghc-lib-parser-ex ==8.10.0.17
@@ -937,15 +943,12 @@ default-package-overrides:
   - ghc-prof ==1.4.1.7
   - ghc-source-gen ==0.4.0.0
   - ghc-syntax-highlighter ==0.0.6.0
-  - ghc-tcplugins-extra ==0.4
+  - ghc-tcplugins-extra ==0.4.1
   - ghc-trace-events ==0.1.2.1
-  - ghc-typelits-extra ==0.4.1
-  - ghc-typelits-knownnat ==0.7.3
-  - ghc-typelits-natnormalise ==0.7.2
-  - ghc-typelits-presburger ==0.3.0.1
-  - ghci-hexcalc ==0.1.1.0
-  - ghcid ==0.8.7
-  - ghcjs-codemirror ==0.0.0.2
+  - ghc-typelits-extra ==0.4.2
+  - ghc-typelits-knownnat ==0.7.4
+  - ghc-typelits-natnormalise ==0.7.3
+  - ghc-typelits-presburger ==0.5.0.0
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.22
   - gi-cairo ==1.0.24
@@ -963,18 +966,18 @@ default-package-overrides:
   - gi-gtk ==3.0.36
   - gi-gtk-hs ==0.3.9
   - gi-harfbuzz ==0.0.3
-  - gi-pango ==1.0.23
-  - gi-xlib ==2.0.9
   - ginger ==0.10.1.0
   - gingersnap ==0.3.1.0
+  - gi-pango ==1.0.23
   - githash ==0.1.5.0
   - github ==0.26
   - github-release ==1.3.5
   - github-rest ==1.0.3
   - github-types ==0.2.1
   - github-webhooks ==0.15.0
-  - gitlab-haskell ==0.2.4
+  - gitlab-haskell ==0.2.5
   - gitrev ==1.3.1
+  - gi-xlib ==2.0.9
   - gl ==0.9
   - glabrous ==2.0.2
   - GLFW-b ==3.3.0.0
@@ -982,21 +985,24 @@ default-package-overrides:
   - gloss ==1.13.2.1
   - gloss-rendering ==1.13.1.1
   - GLURaw ==2.0.0.4
-  - GLUT ==2.7.0.15
+  - GLUT ==2.7.0.16
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.6.1
   - google-isbn ==1.0.3
   - gothic ==0.1.5
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
-  - graph-wrapper ==0.2.6.0
   - graphite ==0.10.0.1
   - graphql-client ==1.1.0
   - graphs ==0.7.1
   - graphviz ==2999.20.1.0
+  - graph-wrapper ==0.2.6.0
   - gravatar ==0.8.0
+  - greskell ==1.2.0.0
+  - greskell-core ==0.1.3.5
+  - greskell-websocket ==0.1.2.5
   - groom ==0.1.2.1
-  - group-by-date ==0.1.0.3
+  - group-by-date ==0.1.0.4
   - groups ==0.5.2
   - gtk-sni-tray ==0.1.6.0
   - gtk-strut ==0.1.3.0
@@ -1008,7 +1014,7 @@ default-package-overrides:
   - hadolint ==1.19.0
   - hadoop-streaming ==0.2.0.3
   - hakyll-convert ==0.3.0.3
-  - half ==0.3
+  - half ==0.3.1
   - hall-symbols ==0.1.0.6
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
@@ -1022,7 +1028,7 @@ default-package-overrides:
   - hashing ==0.1.0.1
   - hashmap ==1.3.3
   - hashtables ==1.2.4.1
-  - haskeline ==0.8.1.0
+  - haskeline ==0.8.1.1
   - haskell-gi ==0.24.7
   - haskell-gi-base ==0.24.5
   - haskell-gi-overloading ==1.0
@@ -1054,7 +1060,6 @@ default-package-overrides:
   - heaps ==0.3.6.1
   - hebrew-time ==0.1.2
   - hedgehog ==1.0.4
-  - hedgehog-classes ==0.2.5.1
   - hedgehog-corpus ==0.2.0
   - hedgehog-fakedata ==0.0.1.3
   - hedgehog-fn ==1.0
@@ -1073,9 +1078,9 @@ default-package-overrides:
   - hgeometry ==0.11.0.0
   - hgeometry-combinatorial ==0.11.0.0
   - hgrev ==0.2.6
-  - hi-file-parser ==0.1.0.0
   - hidapi ==0.1.5
   - hie-bios ==0.7.2
+  - hi-file-parser ==0.1.0.0
   - higher-leveldb ==0.6.0.0
   - highlighting-kate ==0.6.4
   - hinfo ==0.0.3.0
@@ -1100,7 +1105,7 @@ default-package-overrides:
   - hoauth2 ==1.16.0
   - hocon ==0.1.0.4
   - hOpenPGP ==2.9.5
-  - hopenpgp-tools ==0.23.3
+  - hopenpgp-tools ==0.23.6
   - hopfli ==0.2.2.1
   - hosc ==0.18.1
   - hostname ==1.0
@@ -1110,20 +1115,19 @@ default-package-overrides:
   - hp2pretty ==0.9
   - hpack ==0.34.3
   - hpack-dhall ==0.5.2
-  - hpc-codecov ==0.2.0.0
+  - hpc-codecov ==0.2.0.1
   - hpc-lcov ==1.0.1
   - hprotoc ==2.4.17
   - hruby ==0.3.8
-  - hs-bibutils ==6.10.0.0
-  - hs-functors ==0.1.7.1
-  - hs-GeoIP ==0.3
-  - hs-php-session ==0.0.9.3
   - hsass ==0.8.0
+  - hs-bibutils ==6.10.0.0
   - hsc2hs ==0.68.7
   - hscolour ==1.24.4
   - hsdns ==1.8
   - hsebaysdk ==0.4.1.0
   - hsemail ==2.2.1
+  - hs-functors ==0.1.7.1
+  - hs-GeoIP ==0.3
   - hsini ==0.5.1.2
   - hsinstall ==2.6
   - HSlippyMap ==3.0.1
@@ -1136,12 +1140,12 @@ default-package-overrides:
   - HsOpenSSL ==0.11.5.1
   - HsOpenSSL-x509-system ==0.1.0.4
   - hsp ==0.10.0
-  - hspec ==2.7.4
+  - hspec ==2.7.8
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.5.1
-  - hspec-core ==2.7.4
-  - hspec-discover ==2.7.4
+  - hspec-core ==2.7.8
+  - hspec-discover ==2.7.8
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.5
@@ -1151,11 +1155,13 @@ default-package-overrides:
   - hspec-leancheck ==0.0.4
   - hspec-megaparsec ==2.2.0
   - hspec-meta ==2.6.0
+  - hspec-need-env ==0.1.0.5
   - hspec-parsec ==0
   - hspec-smallcheck ==0.5.2
   - hspec-tables ==0.0.1
   - hspec-wai ==0.10.1
   - hspec-wai-json ==0.10.1
+  - hs-php-session ==0.0.9.3
   - hsshellscript ==3.4.5
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.1.3.22
@@ -1168,6 +1174,7 @@ default-package-overrides:
   - html-entities ==1.1.4.3
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
+  - http2 ==2.0.5
   - HTTP ==4000.3.15
   - http-api-data ==0.4.1.1
   - http-client ==0.6.4.1
@@ -1179,14 +1186,13 @@ default-package-overrides:
   - http-date ==0.0.10
   - http-directory ==0.1.8
   - http-download ==0.2.0.0
+  - httpd-shed ==0.4.1.1
   - http-link-header ==1.0.3.1
   - http-media ==0.8.0.0
   - http-query ==0.1.0
   - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.7.2
   - http-types ==0.12.3
-  - http2 ==2.0.5
-  - httpd-shed ==0.4.1.1
   - human-readable-duration ==0.2.1.4
   - HUnit ==1.6.1.0
   - HUnit-approx ==1.1.1.1
@@ -1199,6 +1205,7 @@ default-package-overrides:
   - hw-conduit-merges ==0.2.1.0
   - hw-diagnostics ==0.0.1.0
   - hw-dsv ==0.4.1.0
+  - hweblib ==0.6.3
   - hw-eliasfano ==0.1.2.0
   - hw-excess ==0.2.3.0
   - hw-fingertree ==0.1.2.0
@@ -1211,7 +1218,7 @@ default-package-overrides:
   - hw-json-simd ==0.1.1.0
   - hw-json-simple-cursor ==0.1.1.0
   - hw-json-standard-cursor ==0.2.3.1
-  - hw-kafka-client ==4.0.0
+  - hw-kafka-client ==4.0.1
   - hw-mquery ==0.2.1.0
   - hw-packed-vector ==0.2.1.0
   - hw-parser ==0.1.1.0
@@ -1223,7 +1230,6 @@ default-package-overrides:
   - hw-string-parse ==0.0.0.4
   - hw-succinct ==0.1.0.1
   - hw-xml ==0.5.1.0
-  - hweblib ==0.6.3
   - hxt ==9.3.1.18
   - hxt-charproperties ==9.4.0.0
   - hxt-css ==0.1.0.3
@@ -1263,8 +1269,8 @@ default-package-overrides:
   - influxdb ==1.9.0
   - ini ==0.4.1
   - inj ==1.0
-  - inline-c ==0.9.1.3
-  - inline-c-cpp ==0.4.0.2
+  - inline-c ==0.9.1.4
+  - inline-c-cpp ==0.4.0.3
   - inline-r ==0.10.4
   - inliterate ==0.1.0
   - input-parsers ==0.1.0.1
@@ -1307,13 +1313,13 @@ default-package-overrides:
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
-  - it-has ==0.2.0.0
   - iterable ==3.0
-  - ix-shapable ==0.1.0
+  - it-has ==0.2.0.0
   - ixset-typed ==0.5
   - ixset-typed-binary-instance ==0.1.0.2
   - ixset-typed-conversions ==0.1.2.0
   - ixset-typed-hashable-instance ==0.1.0.2
+  - ix-shapable ==0.1.0
   - jack ==0.7.1.4
   - jalaali ==1.0.0.0
   - jira-wiki-markup ==1.3.2
@@ -1324,9 +1330,9 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json-feed ==1.0.11
+  - jsonpath ==0.2.0.0
   - json-rpc ==1.0.3
   - json-rpc-generic ==0.2.1.5
-  - jsonpath ==0.2.0.0
   - JuicyPixels ==3.3.5
   - JuicyPixels-blurhash ==0.1.0.3
   - JuicyPixels-extra ==0.4.1
@@ -1364,6 +1370,7 @@ default-package-overrides:
   - language-javascript ==0.7.1.0
   - language-protobuf ==1.0.1
   - language-python ==0.5.8
+  - language-thrift ==0.12.0.0
   - lapack ==0.3.2
   - lapack-carray ==0.0.3
   - lapack-comfort-array ==0.0.0.1
@@ -1399,14 +1406,14 @@ default-package-overrides:
   - libgit ==0.3.1
   - libgraph ==1.14
   - libjwt-typed ==0.2
-  - libmpd ==0.9.2.0
+  - libmpd ==0.9.3.0
   - liboath-hs ==0.0.1.2
   - libyaml ==0.1.2
   - LibZip ==1.0.1
   - life-sync ==1.1.1.0
-  - lift-generics ==0.2
   - lifted-async ==0.10.1.2
   - lifted-base ==0.2.3.12
+  - lift-generics ==0.2
   - line ==4.0.1
   - linear ==1.21.3
   - linear-circuit ==0.1.0.2
@@ -1415,10 +1422,11 @@ default-package-overrides:
   - linux-namespaces ==0.1.3.0
   - liquid-fixpoint ==0.8.10.2
   - List ==0.6.2
+  - ListLike ==4.7.4
   - list-predicate ==0.1.0.1
+  - listsafe ==0.1.0.1
   - list-singleton ==1.0.0.4
   - list-t ==1.0.4
-  - listsafe ==0.1.0.1
   - ListTree ==0.2.3
   - little-logger ==0.3.1
   - little-rio ==0.2.2
@@ -1435,7 +1443,7 @@ default-package-overrides:
   - logging ==3.0.5
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
-  - logict ==0.7.0.3
+  - logict ==0.7.1.0
   - logstash ==0.1.0.1
   - loop ==0.3.0
   - lrucache ==1.2.0.1
@@ -1444,15 +1452,15 @@ default-package-overrides:
   - lucid ==2.9.12
   - lucid-cdn ==0.2.2.0
   - lucid-extras ==0.2.2
-  - lukko ==0.1.1.2
+  - lukko ==0.1.1.3
   - lz4-frame-conduit ==0.1.0.1
   - lzma ==0.0.0.3
   - lzma-conduit ==1.2.1
   - machines ==0.7.1
   - magic ==1.1
   - magico ==0.0.2.1
-  - main-tester ==0.2.0.1
   - mainland-pretty ==0.7.0.1
+  - main-tester ==0.2.0.1
   - makefile ==1.1.0.0
   - managed ==1.0.8
   - MapWith ==0.2.0.0
@@ -1461,10 +1469,12 @@ default-package-overrides:
   - markov-chain ==0.0.3.4
   - massiv ==0.5.9.0
   - massiv-io ==0.4.0.0
+  - massiv-persist ==0.1.0.0
+  - massiv-serialise ==0.1.0.0
   - massiv-test ==0.1.6
+  - mathexpr ==0.3.0.0
   - math-extras ==0.1.1.0
   - math-functions ==0.3.4.1
-  - mathexpr ==0.3.0.0
   - matplotlib ==0.7.5
   - matrices ==0.5.0
   - matrix ==0.3.6.1
@@ -1476,9 +1486,9 @@ default-package-overrides:
   - mbox-utility ==0.0.3.1
   - mcmc ==0.4.0.0
   - mcmc-types ==1.0.3
-  - med-module ==0.1.2.1
   - medea ==1.2.0
   - median-stream ==0.7.0.0
+  - med-module ==0.1.2.1
   - megaparsec ==9.0.1
   - megaparsec-tests ==9.0.1
   - membrain ==0.0.0.2
@@ -1498,7 +1508,7 @@ default-package-overrides:
   - microlens-mtl ==0.2.0.1
   - microlens-platform ==0.4.1
   - microlens-process ==0.2.0.2
-  - microlens-th ==0.4.3.8
+  - microlens-th ==0.4.3.9
   - microspec ==0.2.1.3
   - microstache ==1.0.1.2
   - midair ==0.2.0.1
@@ -1507,12 +1517,12 @@ default-package-overrides:
   - mime-mail ==0.5.0
   - mime-mail-ses ==0.4.3
   - mime-types ==0.1.0.9
-  - min-max-pqueue ==0.1.0.2
   - mini-egison ==1.0.0
   - minimal-configuration ==0.1.4
   - minimorph ==0.3.0.0
   - minio-hs ==1.5.3
   - miniutter ==0.5.1.1
+  - min-max-pqueue ==0.1.0.2
   - mintty ==0.1.2
   - missing-foreign ==0.1.1
   - MissingH ==1.4.3.0
@@ -1524,8 +1534,8 @@ default-package-overrides:
   - mmark-ext ==0.2.1.2
   - mmorph ==1.1.3
   - mnist-idx ==0.1.2.8
-  - mock-time ==0.1.0
   - mockery ==0.3.5
+  - mock-time ==0.1.0
   - mod ==0.1.2.1
   - model ==0.5
   - modern-uri ==0.3.3.0
@@ -1535,7 +1545,9 @@ default-package-overrides:
   - monad-control-aligned ==0.0.1.1
   - monad-coroutine ==0.9.0.4
   - monad-extras ==0.6.0
+  - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
+  - monadlist ==0.0.2
   - monad-logger ==0.3.36
   - monad-logger-json ==0.1.0.0
   - monad-logger-logstash ==0.1.0.0
@@ -1544,28 +1556,26 @@ default-package-overrides:
   - monad-memo ==0.5.3
   - monad-metrics ==0.2.2.0
   - monad-par ==0.3.5
-  - monad-par-extras ==0.3.3
   - monad-parallel ==0.7.2.3
+  - monad-par-extras ==0.3.3
   - monad-peel ==0.2.1.2
   - monad-primitive ==0.1
   - monad-products ==4.0.1
+  - MonadPrompt ==1.0.0.5
+  - MonadRandom ==0.5.2
   - monad-resumption ==0.1.4.0
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
+  - monads-tf ==0.1.0.3
   - monad-time ==0.3.1.0
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - monadic-arrays ==0.2.2
-  - monadlist ==0.0.2
-  - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.5.2
-  - monads-tf ==0.1.0.3
   - mongoDB ==2.7.0.0
+  - monoid-subclasses ==1.0.1
+  - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.15.1
   - mono-traversable-instances ==0.1.1.0
   - mono-traversable-keys ==0.1.0
-  - monoid-subclasses ==1.0.1
-  - monoid-transformer ==0.0.4
   - more-containers ==0.2.2.0
   - morpheus-graphql ==0.16.0
   - morpheus-graphql-client ==0.16.0
@@ -1578,14 +1588,14 @@ default-package-overrides:
   - mpi-hs-cereal ==0.1.0.0
   - mtl-compat ==0.2.2
   - mtl-prelude ==2.0.3.1
-  - multi-containers ==0.1.1
   - multiarg ==0.30.0.10
+  - multi-containers ==0.1.1
   - multimap ==1.2.1
   - multipart ==0.2.1
   - multiset ==0.3.4.3
   - multistate ==0.8.0.3
-  - murmur-hash ==0.1.0.9
   - murmur3 ==1.0.4
+  - murmur-hash ==0.1.0.9
   - MusicBrainz ==0.4.1
   - mustache ==2.3.1
   - mutable-containers ==0.3.4
@@ -1633,16 +1643,16 @@ default-package-overrides:
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
-  - no-value ==1.0.0.0
-  - non-empty ==0.3.2
-  - non-empty-sequence ==0.2.0.4
-  - non-negative ==0.1.2
   - nonce ==1.0.7
   - nondeterminism ==1.4
+  - non-empty ==0.3.2
   - nonempty-containers ==0.3.4.1
-  - nonempty-vector ==0.2.1.0
   - nonemptymap ==0.0.6.0
+  - non-empty-sequence ==0.2.0.4
+  - nonempty-vector ==0.2.1.0
+  - non-negative ==0.1.2
   - not-gloss ==0.7.7.0
+  - no-value ==1.0.0.0
   - nowdoc ==0.1.1.0
   - nqe ==0.6.3
   - nri-env-parser ==0.1.0.3
@@ -1658,9 +1668,9 @@ default-package-overrides:
   - nvim-hs ==2.1.0.4
   - nvim-hs-contrib ==2.0.0.0
   - nvim-hs-ghcid ==2.0.0.0
-  - o-clock ==1.2.0
   - oauthenticated ==0.2.1.0
   - ObjectName ==1.1.0.1
+  - o-clock ==1.2.0.1
   - odbc ==0.2.2
   - oeis2 ==1.0.4
   - ofx ==0.4.4.0
@@ -1673,9 +1683,9 @@ default-package-overrides:
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.7.1.0
-  - open-browser ==0.2.1.0
   - OpenAL ==1.7.0.5
   - openapi3 ==3.0.1.0
+  - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.2
   - OpenGL ==3.0.3.0
   - OpenGLRaw ==3.3.4.0
@@ -1739,10 +1749,11 @@ default-package-overrides:
   - pattern-arrows ==0.0.2
   - pava ==0.1.1.0
   - pcg-random ==0.1.3.7
+  - pcre2 ==1.1.4
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.1.0
   - pcre-utils ==0.1.8.1.1
-  - pcre2 ==1.1.3.1
+  - pdfinfo ==1.5.4
   - peano ==0.1.0.1
   - pem ==0.2.4
   - percent-format ==0.0.1
@@ -1763,8 +1774,8 @@ default-package-overrides:
   - persistent-test ==2.0.3.5
   - persistent-typed-db ==0.1.0.2
   - pg-harness-client ==0.6.0
-  - pg-transact ==0.3.1.1
   - pgp-wordlist ==0.1.0.3
+  - pg-transact ==0.3.1.1
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
   - pinboard ==0.10.2.0
@@ -1803,36 +1814,36 @@ default-package-overrides:
   - port-utils ==0.2.1.0
   - posix-paths ==0.2.1.6
   - possibly ==1.0.0.0
-  - post-mess-age ==0.2.1.0
   - postgres-options ==0.2.0.0
   - postgresql-binary ==0.12.3.3
   - postgresql-libpq ==0.9.4.3
   - postgresql-libpq-notify ==0.2.0.0
   - postgresql-orm ==0.5.1
-  - postgresql-simple ==0.6.3
+  - postgresql-simple ==0.6.4
   - postgresql-typed ==0.6.1.2
   - postgrest ==7.0.1
+  - post-mess-age ==0.2.1.0
   - pptable ==0.3.0.0
   - pqueue ==1.4.1.3
   - prairie ==0.0.1.0
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.2
   - prelude-safeenum ==0.1.1.2
+  - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
   - pretty-diff ==0.2.0.3
   - pretty-hex ==1.1
-  - pretty-relative-time ==0.2.0.0
-  - pretty-show ==1.10
-  - pretty-simple ==4.0.0.0
-  - pretty-sop ==0.2.0.3
-  - pretty-terminal ==0.1.0.0
-  - prettyclass ==1.0.0.0
   - prettyprinter ==1.7.0
   - prettyprinter-ansi-terminal ==1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1.1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - prettyprinter-convert-ansi-wl-pprint ==1.1.1
+  - pretty-relative-time ==0.2.0.0
+  - pretty-show ==1.10
+  - pretty-simple ==4.0.0.0
+  - pretty-sop ==0.2.0.3
+  - pretty-terminal ==0.1.0.0
   - primes ==0.2.1.0
   - primitive ==0.7.1.0
   - primitive-addr ==0.1.0.2
@@ -1841,24 +1852,19 @@ default-package-overrides:
   - primitive-unlifted ==0.1.3.0
   - print-console-colors ==0.1.0.0
   - probability ==0.2.7
+  - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.3
   - product-profunctors ==0.11.0.1
   - profiterole ==0.1
   - profunctors ==5.5.2
-  - project-template ==0.2.1.0
   - projectroot ==0.2.0.1
+  - project-template ==0.2.1.0
   - prometheus ==2.2.2
   - prometheus-client ==1.0.1
   - prometheus-wai-middleware ==1.0.1.0
   - promises ==0.3
   - prompt ==0.1.1.2
   - prospect ==0.1.0.0
-  - proto-lens ==0.7.0.0
-  - proto-lens-optparse ==0.1.1.7
-  - proto-lens-protobuf-types ==0.7.0.0
-  - proto-lens-protoc ==0.7.0.0
-  - proto-lens-runtime ==0.7.0.0
-  - proto-lens-setup ==0.4.0.4
   - proto3-wire ==1.1.0
   - protobuf ==0.2.1.3
   - protobuf-simple ==0.1.1.0
@@ -1866,6 +1872,12 @@ default-package-overrides:
   - protocol-buffers-descriptor ==2.4.17
   - protocol-radius ==0.0.1.1
   - protocol-radius-test ==0.1.0.1
+  - proto-lens ==0.7.0.0
+  - proto-lens-optparse ==0.1.1.7
+  - proto-lens-protobuf-types ==0.7.0.0
+  - proto-lens-protoc ==0.7.0.0
+  - proto-lens-runtime ==0.7.0.0
+  - proto-lens-setup ==0.4.0.4
   - protolude ==0.3.0
   - proxied ==0.3.1
   - psqueues ==0.2.7.2
@@ -1889,7 +1901,7 @@ default-package-overrides:
   - quickcheck-classes ==0.6.4.0
   - quickcheck-classes-base ==0.6.1.0
   - quickcheck-higherorder ==0.1.0.0
-  - quickcheck-instances ==0.3.25.1
+  - quickcheck-instances ==0.3.25.2
   - quickcheck-io ==0.2.0
   - quickcheck-simple ==0.1.1.1
   - quickcheck-special ==0.1.0.6
@@ -1912,38 +1924,37 @@ default-package-overrides:
   - random-source ==0.3.0.8
   - random-tree ==0.6.0.5
   - range ==0.3.0.2
-  - range-set-list ==0.1.3.1
   - Ranged-sets ==0.4.0
+  - range-set-list ==0.1.3.1
   - rank1dynamic ==0.4.1
   - rank2classes ==1.4.1
   - Rasterific ==0.7.5.3
   - rasterific-svg ==0.3.3.2
-  - rate-limit ==1.4.2
   - ratel ==1.0.12
+  - rate-limit ==1.4.2
   - ratel-wai ==1.1.3
   - rattle ==0.2
-  - raw-strings-qq ==1.1
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
+  - raw-strings-qq ==1.1
   - rcu ==0.2.4
   - rdf ==0.1.0.4
   - rdtsc ==1.3.0.1
   - re2 ==0.3
+  - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - readable ==0.3.1
-  - reanimate ==1.1.2.1
+  - reanimate ==1.1.3.2
   - reanimate-svg ==0.13.0.0
   - rebase ==1.6.1
   - record-dot-preprocessor ==0.2.7
   - record-hasfield ==1.0
-  - record-wrangler ==0.1.1.0
   - records-sop ==0.1.0.3
+  - record-wrangler ==0.1.1.0
   - recursion-schemes ==5.2.1
   - reducers ==3.12.3
-  - ref-fd ==0.4.0.2
-  - ref-tf ==0.4.0.2
   - refact ==0.3.0.2
+  - ref-fd ==0.4.0.2
   - refined ==0.6.1
   - reflection ==2.1.6
   - reform ==0.2.7.4
@@ -1951,6 +1962,7 @@ default-package-overrides:
   - reform-hamlet ==0.0.5.3
   - reform-happstack ==0.2.5.4
   - RefSerialize ==0.4.0
+  - ref-tf ==0.4.0.2
   - regex ==1.1.0.0
   - regex-applicative ==0.3.4
   - regex-applicative-text ==0.1.0.1
@@ -1972,7 +1984,7 @@ default-package-overrides:
   - reliable-io ==0.0.1
   - relude ==0.7.0.0
   - renderable ==0.2.0.1
-  - replace-attoparsec ==1.4.2.0
+  - replace-attoparsec ==1.4.4.0
   - replace-megaparsec ==1.4.4.0
   - repline ==0.4.0.0
   - req ==3.8.0
@@ -2008,18 +2020,18 @@ default-package-overrides:
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.6
   - safe ==0.3.19
+  - safecopy ==0.10.3.1
   - safe-decimal ==0.2.0.0
   - safe-exceptions ==0.1.7.1
   - safe-foldable ==0.1.0.0
+  - safeio ==0.0.5.0
   - safe-json ==1.1.1.1
   - safe-money ==0.9
-  - safe-tensor ==0.2.1.0
-  - safecopy ==0.10.3
-  - safeio ==0.0.5.0
   - SafeSemaphore ==0.10.1
+  - safe-tensor ==0.2.1.0
   - salak ==0.3.6
   - salak-yaml ==0.3.5.3
-  - saltine ==0.1.1.0
+  - saltine ==0.1.1.1
   - salve ==1.0.10
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
@@ -2054,8 +2066,8 @@ default-package-overrides:
   - semigroupoid-extras ==5
   - semigroupoids ==5.3.5
   - semigroups ==0.19.1
+  - semirings ==0.6
   - semiring-simple ==1.0.0.1
-  - semirings ==0.5.4
   - semver ==0.4.0.1
   - sendfile ==0.7.11.1
   - seqalign ==0.2.0.4
@@ -2101,9 +2113,9 @@ default-package-overrides:
   - shared-memory ==0.2.0.0
   - shell-conduit ==5.0.0
   - shell-escape ==0.2.0
-  - shell-utility ==0.1
   - shellmet ==0.0.3.1
   - shelltestrunner ==1.9
+  - shell-utility ==0.1
   - shelly ==1.9.0
   - shikensu ==0.3.11
   - should-not-typecheck ==2.1.0
@@ -2125,10 +2137,10 @@ default-package-overrides:
   - singleton-bool ==0.1.5
   - singleton-nats ==0.4.5
   - singletons ==2.7
-  - singletons-presburger ==0.3.0.1
+  - singletons-presburger ==0.5.0.0
   - siphash ==1.0.3
   - sitemap-gen ==0.1.0.0
-  - sized ==0.8.0.0
+  - sized ==1.0.0.0
   - skein ==1.0.9.4
   - skews ==0.1.0.3
   - skip-var ==0.1.1.0
@@ -2138,7 +2150,7 @@ default-package-overrides:
   - slack-progressbar ==0.1.0.1
   - slist ==0.1.1.0
   - slynx ==0.5.0.1
-  - smallcheck ==1.2.0
+  - smallcheck ==1.2.1
   - smash ==0.1.1.0
   - smash-aeson ==0.1.0.0
   - smash-lens ==0.1.0.1
@@ -2153,7 +2165,7 @@ default-package-overrides:
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.4
   - socks ==0.6.1
-  - some ==1.0.1
+  - some ==1.0.2
   - sop-core ==0.5.0.1
   - sort ==1.0.0.0
   - sorted-list ==0.2.1.0
@@ -2173,16 +2185,16 @@ default-package-overrides:
   - splitmix ==0.1.0.3
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
-  - sql-words ==0.1.6.4
   - sqlcli ==0.2.2.0
   - sqlcli-odbc ==0.2.0.1
   - sqlite-simple ==0.4.18.0
+  - sql-words ==0.1.6.4
   - squeal-postgresql ==0.7.0.1
   - squeather ==0.6.0.0
   - srcloc ==0.5.1.2
   - stache ==2.2.0
-  - stack-templatizer ==0.1.0.2
   - stackcollapse-ghc ==0.0.1.3
+  - stack-templatizer ==0.1.0.2
   - stateref ==0.3
   - StateVar ==1.2.1
   - static-text ==0.2.0.6
@@ -2197,8 +2209,8 @@ default-package-overrides:
   - stm-extras ==0.1.0.3
   - stm-hamt ==1.2.0.4
   - stm-lifted ==2.5.0.0
-  - stm-split ==0.0.2.1
   - STMonadTrans ==0.4.5
+  - stm-split ==0.0.2.1
   - stopwatch ==0.1.0.6
   - storable-complex ==0.2.3.0
   - storable-endian ==0.2.6
@@ -2219,16 +2231,16 @@ default-package-overrides:
   - strict-list ==0.1.5
   - strict-tuple ==0.1.4
   - strict-tuple-lens ==0.1.0.1
+  - stringbuilder ==0.5.1
   - string-class ==0.1.7.0
   - string-combinators ==0.6.0.5
   - string-conv ==0.1.2
   - string-conversions ==0.4.0.1
   - string-interpolate ==0.3.0.2
   - string-qq ==0.0.4
-  - string-random ==0.1.3.0
-  - string-transform ==1.1.1
-  - stringbuilder ==0.5.1
+  - string-random ==0.1.4.0
   - stringsearch ==0.3.6.6
+  - string-transform ==1.1.1
   - stripe-concepts ==1.0.2.4
   - stripe-core ==2.6.2
   - stripe-haskell ==2.6.2
@@ -2253,10 +2265,10 @@ default-package-overrides:
   - symmetry-operations-symbols ==0.0.2.1
   - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
+  - systemd ==2.3.0
   - system-fileio ==0.3.16.4
   - system-filepath ==0.4.14
   - system-info ==0.5.1
-  - systemd ==2.3.0
   - tabular ==0.2.2.8
   - taffybar ==3.2.3
   - tagchup ==0.4.1.1
@@ -2275,7 +2287,7 @@ default-package-overrides:
   - tasty-ant-xml ==1.1.7
   - tasty-dejafu ==2.0.0.7
   - tasty-discover ==4.2.2
-  - tasty-expected-failure ==0.11.1.2
+  - tasty-expected-failure ==0.12.2
   - tasty-focus ==1.0.1
   - tasty-golden ==2.3.3.2
   - tasty-hedgehog ==1.0.0.2
@@ -2284,7 +2296,7 @@ default-package-overrides:
   - tasty-hunit-compat ==0.2.0.1
   - tasty-kat ==0.0.3
   - tasty-leancheck ==0.0.1
-  - tasty-lua ==0.2.3.1
+  - tasty-lua ==0.2.3.2
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.10.1.2
   - tasty-rerun ==1.1.18
@@ -2295,7 +2307,7 @@ default-package-overrides:
   - Taxonomy ==2.1.0
   - TCache ==0.12.1
   - tce-conf ==1.3
-  - tdigest ==0.2.1
+  - tdigest ==0.2.1.1
   - template-haskell-compat-v0208 ==0.1.5
   - temporary ==1.3
   - temporary-rc ==1.2.0.3
@@ -2313,7 +2325,7 @@ default-package-overrides:
   - test-fun ==0.1.0.0
   - testing-type-modifiers ==0.1.0.1
   - texmath ==0.12.1
-  - text-ansi ==0.1.0.2
+  - text-ansi ==0.1.1
   - text-binary ==0.2.1.1
   - text-builder ==0.6.6.1
   - text-conversions ==0.3.1
@@ -2321,6 +2333,7 @@ default-package-overrides:
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.13
+  - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
   - text-postgresql ==0.0.3.1
@@ -2330,10 +2343,9 @@ default-package-overrides:
   - text-short ==0.1.3
   - text-show ==3.9
   - text-show-instances ==3.8.4
-  - text-zipper ==0.10.1
-  - textlocal ==0.1.0.5
-  - tf-random ==0.5
+  - text-zipper ==0.11
   - tfp ==1.0.1.1
+  - tf-random ==0.5
   - th-abstraction ==0.4.2.0
   - th-bang-compat ==0.0.1.0
   - th-compat ==0.1
@@ -2341,6 +2353,10 @@ default-package-overrides:
   - th-data-compat ==0.1.0.0
   - th-desugar ==1.11
   - th-env ==0.1.0.2
+  - these ==1.1.1.1
+  - these-lens ==1.0.1.1
+  - these-optics ==1.0.1.1
+  - these-skinny ==0.7.4
   - th-expand-syns ==0.4.6.0
   - th-extras ==0.0.0.4
   - th-lift ==0.8.2
@@ -2348,37 +2364,33 @@ default-package-overrides:
   - th-nowq ==0.1.0.5
   - th-orphans ==0.13.11
   - th-printf ==0.7
-  - th-reify-compat ==0.0.1.5
-  - th-reify-many ==0.1.9
-  - th-strict-compat ==0.1.0.1
-  - th-test-utils ==1.1.0
-  - th-utilities ==0.2.4.1
-  - these ==1.1.1.1
-  - these-lens ==1.0.1.1
-  - these-optics ==1.0.1.1
-  - these-skinny ==0.7.4
   - thread-hierarchy ==0.3.0.2
   - thread-local-storage ==0.2
-  - thread-supervisor ==0.2.0.0
   - threads ==0.5.1.6
+  - thread-supervisor ==0.2.0.0
   - threepenny-gui ==0.9.0.0
+  - th-reify-compat ==0.0.1.5
+  - th-reify-many ==0.1.9
   - throttle-io-stream ==0.2.0.1
   - through-text ==0.1.0.0
   - throwable-exceptions ==0.1.0.9
+  - th-strict-compat ==0.1.0.1
+  - th-test-utils ==1.1.0
+  - th-utilities ==0.2.4.1
   - thyme ==0.3.5.5
   - tidal ==1.6.1
   - tile ==0.3.0.0
   - time-compat ==1.9.5
+  - timeit ==2.0
+  - timelens ==0.2.0.2
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.5
   - time-locale-vietnamese ==1.0.0.0
   - time-manager ==0.0.0
   - time-parsers ==0.1.2.1
-  - time-units ==1.0.0
-  - timeit ==2.0
-  - timelens ==0.2.0.2
-  - timer-wheel ==0.3.0
   - timerep ==2.0.1.0
+  - timer-wheel ==0.3.0
+  - time-units ==1.0.0
   - timezone-olson ==0.2.0
   - timezone-series ==0.1.9
   - tinylog ==0.15.0
@@ -2413,10 +2425,13 @@ default-package-overrides:
   - ttl-hashtables ==1.4.1.0
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
+  - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - tuples-homogenous-h98 ==0.1.1.0
   - turtle ==1.5.20
+  - TypeCompose ==0.9.14
+  - typed-process ==0.2.6.0
+  - typed-uuid ==0.0.0.2
   - type-equality ==1
   - type-errors ==0.2.0.0
   - type-errors-pretty ==0.0.1.1
@@ -2426,15 +2441,12 @@ default-package-overrides:
   - type-level-natural-number ==2.0
   - type-level-numbers ==0.1.1.1
   - type-map ==0.1.6.0
-  - type-natural ==0.9.0.0
+  - type-natural ==1.0.0.0
   - type-of-html ==1.6.1.2
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.2.0.0
-  - type-spec ==0.4.0.0
-  - TypeCompose ==0.9.14
-  - typed-process ==0.2.6.0
-  - typed-uuid ==0.0.0.2
   - typerep-map ==0.3.3.0
+  - type-spec ==0.4.0.0
   - tzdata ==0.2.20201021.0
   - ua-parser ==0.7.5.1
   - uglymemo ==0.1.0.1
@@ -2451,23 +2463,22 @@ default-package-overrides:
   - unicode ==0.0.1.1
   - unicode-show ==0.1.0.4
   - unicode-transforms ==0.3.7.1
-  - unification-fd ==0.10.0.1
   - union-find ==0.2
   - unipatterns ==0.0.0.0
   - uniplate ==1.6.13
   - uniprot-kb ==0.1.2.0
   - uniq-deep ==1.2.0
-  - unique ==0
+  - unique ==0.0.1
   - unique-logic ==0.4
   - unique-logic-tf ==0.5.1
   - unit-constraint ==0.0.0
-  - universe ==1.2
-  - universe-base ==1.1.1
+  - universe ==1.2.1
+  - universe-base ==1.1.2
   - universe-instances-base ==1.1
-  - universe-instances-extended ==1.1.1
+  - universe-instances-extended ==1.1.2
   - universe-instances-trans ==1.1
-  - universe-reverse-instances ==1.1
-  - universe-some ==1.2
+  - universe-reverse-instances ==1.1.1
+  - universe-some ==1.2.1
   - universum ==1.5.0
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.2
@@ -2486,7 +2497,7 @@ default-package-overrides:
   - users ==0.5.0.0
   - utf8-conversions ==0.1.0.4
   - utf8-light ==0.4.2
-  - utf8-string ==1.0.1.1
+  - utf8-string ==1.0.2
   - util ==0.1.17.1
   - utility-ht ==0.0.15
   - uuid ==1.3.13
@@ -2530,13 +2541,13 @@ default-package-overrides:
   - vinyl ==0.13.0
   - void ==0.7.3
   - vty ==5.32
-  - wai ==3.2.2.1
+  - wai ==3.2.3
   - wai-app-static ==3.1.7.2
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
   - wai-enforce-https ==0.0.2.1
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.1.4.1
+  - wai-extra ==3.1.6
   - wai-feature-flags ==0.1.0.1
   - wai-handler-launch ==3.0.3.1
   - wai-logger ==2.3.6
@@ -2561,29 +2572,31 @@ default-package-overrides:
   - webex-teams-api ==0.2.0.1
   - webex-teams-conduit ==0.2.0.1
   - webex-teams-pipes ==0.2.0.1
-  - webgear-server ==0.2.0
+  - webgear-server ==0.2.1
   - webrtc-vad ==0.1.0.3
   - websockets ==0.12.7.2
   - websockets-snap ==0.10.3.1
   - weigh ==0.0.16
   - wide-word ==0.1.1.2
   - wikicfp-scraper ==0.1.0.11
+  - wild-bind ==0.1.2.6
+  - wild-bind-x11 ==0.2.0.11
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
   - witch ==0.0.0.4
-  - with-location ==0.1.0
-  - with-utf8 ==1.0.2.1
   - witherable-class ==0
   - within ==0.2.0.1
+  - with-location ==0.1.0
+  - with-utf8 ==1.0.2.1
   - wizards ==1.0.3
   - wl-pprint-annotated ==0.1.0.1
   - wl-pprint-console ==0.1.0.2
   - wl-pprint-text ==1.2.0.1
-  - word-trie ==0.3.0
-  - word-wrap ==0.4.1
   - word24 ==2.0.1
   - word8 ==0.1.3
+  - word-trie ==0.3.0
+  - word-wrap ==0.4.1
   - world-peace ==1.0.2.0
   - wrap ==0.0.0
   - wreq ==0.5.3.2
@@ -2610,16 +2623,16 @@ default-package-overrides:
   - xml-basic ==0.1.3.1
   - xml-conduit ==1.9.0.0
   - xml-conduit-writer ==0.1.1.2
+  - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0.1
   - xml-helpers ==1.0.0
   - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
-  - xml-lens ==0.2
+  - xml-lens ==0.3
   - xml-picklers ==0.3.6
   - xml-to-json ==2.0.1
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.8
-  - xmlgen ==0.6.2.2
   - xmonad ==0.15
   - xmonad-contrib ==0.16
   - xmonad-extras ==0.15.2
@@ -2627,7 +2640,6 @@ default-package-overrides:
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.5.0
   - yamlparse-applicative ==0.1.0.2
-  - yes-precure5-command ==5.5.3
   - yesod ==1.6.1.0
   - yesod-auth ==1.6.10.1
   - yesod-auth-hashdb ==1.7.1.5
@@ -2638,13 +2650,14 @@ default-package-overrides:
   - yesod-form ==1.6.7
   - yesod-gitrev ==0.2.1
   - yesod-newsfeed ==1.7.0.0
-  - yesod-page-cursor ==2.0.0.0
+  - yesod-page-cursor ==2.0.0.2
   - yesod-paginator ==1.1.1.0
   - yesod-persistent ==1.6.0.5
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.1.0
   - yesod-test ==1.6.12
   - yesod-websockets ==0.3.0.2
+  - yes-precure5-command ==5.5.3
   - yi-rope ==0.11
   - yjsvg ==0.2.0.1
   - yjtools ==0.9.18
@@ -2657,11 +2670,11 @@ default-package-overrides:
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
   - zio ==0.1.0.2
-  - zip ==1.6.0
+  - zip ==1.7.0
   - zip-archive ==0.4.1
-  - zip-stream ==0.2.0.1
   - zipper-extra ==0.1.3.2
   - zippers ==0.3
+  - zip-stream ==0.2.0.1
   - zlib ==0.6.2.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
@@ -2686,6 +2699,8 @@ extra-packages:
   - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
   - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
   - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
+  - ghcide == 0.7.0.0                   # Needed for hls 0.8.0
+  - apply-refact == 0.8.2.1             # Needed for hls 0.8.0
 
 package-maintainers:
   peti:
@@ -3134,6 +3149,7 @@ broken-packages:
   - Annotations
   - anonymous-sums
   - anonymous-sums-tests
+  - ansi-terminal-game
   - ansigraph
   - antagonist
   - antfarm
@@ -3193,6 +3209,7 @@ broken-packages:
   - applicative-quoters
   - applicative-splice
   - approveapi
+  - approx
   - ApproxFun-hs
   - arb-fft
   - arbb-vm
@@ -3200,7 +3217,6 @@ broken-packages:
   - arbor-monad-counter
   - arbor-monad-metric
   - arbor-monad-metric-datadog
-  - arbtt
   - arch-hs
   - archive-libarchive
   - archiver
@@ -3399,6 +3415,7 @@ broken-packages:
   - basex-client
   - BASIC
   - basic
+  - basic-sop
   - baskell
   - batchd
   - battlenet
@@ -3497,6 +3514,7 @@ broken-packages:
   - bindings-K8055
   - bindings-libftdi
   - bindings-libg15
+  - bindings-libpci
   - bindings-librrd
   - bindings-libstemmer
   - bindings-libusb
@@ -3663,7 +3681,9 @@ broken-packages:
   - broker-haskell
   - bronyradiogermany-common
   - bronyradiogermany-streaming
+  - brotli
   - brotli-conduit
+  - brotli-streams
   - browscap
   - bsd-sysctl
   - bson
@@ -3783,6 +3803,7 @@ broken-packages:
   - cache-polysemy
   - cached
   - caching
+  - caching-vault
   - cacophony
   - cafeteria-prelude
   - caffegraph
@@ -3898,6 +3919,7 @@ broken-packages:
   - cgi-utils
   - cgrep
   - chainweb-mining-client
+  - chakra
   - chalkboard
   - chalkboard-viewer
   - character-cases
@@ -3942,13 +3964,13 @@ broken-packages:
   - ChristmasTree
   - chromatin
   - chronograph
-  - chronos
   - chronos-bench
   - chu2
   - chunks
   - chunky
   - church
   - church-maybe
+  - churros
   - cielo
   - cil
   - cinvoke
@@ -3956,6 +3978,7 @@ broken-packages:
   - cipher-blowfish
   - ciphersaber2
   - circlehs
+  - circular
   - citation-resolve
   - citeproc-hs
   - citeproc-hs-pandoc-filter
@@ -4053,7 +4076,6 @@ broken-packages:
   - cmt
   - cmv
   - cnc-spec-compiler
-  - co-log
   - co-log-polysemy
   - co-log-polysemy-formatting
   - co-log-sys
@@ -4172,9 +4194,13 @@ broken-packages:
   - conduit-vfs-zip
   - conf
   - confcrypt
+  - conferer-dhall
   - conferer-provider-dhall
   - conferer-provider-json
   - conferer-provider-yaml
+  - conferer-source-dhall
+  - conferer-source-json
+  - conferer-source-yaml
   - conffmt
   - confide
   - config-parser
@@ -4192,6 +4218,7 @@ broken-packages:
   - conkin
   - conlogger
   - connection-string
+  - connections
   - Conscript
   - consistent
   - console-program
@@ -4348,6 +4375,7 @@ broken-packages:
   - cspmchecker
   - cspretty
   - css
+  - css-easings
   - css-selectors
   - csv-enumerator
   - csv-nptools
@@ -4416,6 +4444,7 @@ broken-packages:
   - data-fin
   - data-fin-simple
   - data-flagset
+  - data-interval
   - data-ivar
   - data-kiln
   - data-layer
@@ -4430,6 +4459,7 @@ broken-packages:
   - data-object-yaml
   - data-pprint
   - data-quotientref
+  - data-r-tree
   - data-reify-cse
   - data-repr
   - data-result
@@ -4556,7 +4586,6 @@ broken-packages:
   - derive-gadt
   - derive-IG
   - derive-monoid
-  - derive-storable-plugin
   - derive-trie
   - derp-lib
   - describe
@@ -4573,6 +4602,7 @@ broken-packages:
   - dgim
   - dgs
   - dhall-check
+  - dhall-docs
   - dhall-fly
   - dhall-nix
   - dhall-nixpkgs
@@ -4642,6 +4672,7 @@ broken-packages:
   - direct-plugins
   - direct-rocksdb
   - directed-cubical
+  - directory-contents
   - direm
   - dirfiles
   - discogs-haskell
@@ -4810,6 +4841,7 @@ broken-packages:
   - dzen-utils
   - each
   - earclipper
+  - early
   - easy-api
   - easy-bitcoin
   - easyjson
@@ -4872,6 +4904,8 @@ broken-packages:
   - elm-street
   - elm-websocket
   - elsa
+  - elynx
+  - elynx-tree
   - emacs-keys
   - emacs-module
   - email
@@ -4942,6 +4976,7 @@ broken-packages:
   - ersatz
   - ersatz-toysat
   - ert
+  - escape-artist
   - escoger
   - esotericbot
   - EsounD
@@ -4993,6 +5028,7 @@ broken-packages:
   - exference
   - exherbo-cabal
   - exif
+  - exigo-schema
   - exinst-deepseq
   - exinst-hashable
   - exists
@@ -5043,6 +5079,8 @@ broken-packages:
   - FailureT
   - fake
   - fake-type
+  - fakedata
+  - fakedata-quickcheck
   - faktory
   - falling-turnip
   - fallingblocks
@@ -5144,6 +5182,7 @@ broken-packages:
   - filesystem-enumerator
   - filesystem-trees
   - fillit
+  - Fin
   - final-pretty-printer
   - Finance-Quote-Yahoo
   - Finance-Treasury
@@ -5420,6 +5459,7 @@ broken-packages:
   - generic-binary
   - generic-church
   - generic-enum
+  - generic-enumeration
   - generic-lens-labels
   - generic-lucid-scaffold
   - generic-maybe
@@ -5455,6 +5495,7 @@ broken-packages:
   - geolite-csv
   - geom2d
   - GeomPredicates-SSE
+  - geos
   - Get
   - getemx
   - getflag
@@ -5576,7 +5617,6 @@ broken-packages:
   - GLFW-OGL
   - GLFW-task
   - gli
-  - glicko
   - glider-nlp
   - GLMatrix
   - glob-posix
@@ -5790,6 +5830,7 @@ broken-packages:
   - hack2-handler-mongrel2-http
   - hack2-handler-snap-server
   - hack2-handler-warp
+  - hackage-api
   - hackage-diff
   - hackage-mirror
   - hackage-processing
@@ -5985,6 +6026,7 @@ broken-packages:
   - haskell-igraph
   - haskell-in-space
   - haskell-kubernetes
+  - haskell-language-server
   - haskell-lsp-client
   - haskell-ml
   - haskell-mpfr
@@ -6122,6 +6164,7 @@ broken-packages:
   - hasql-queue
   - hasql-simple
   - hasql-th
+  - hasql-url
   - hastache
   - hastache-aeson
   - haste
@@ -6174,6 +6217,7 @@ broken-packages:
   - hCM
   - hcoap
   - hcom
+  - hcount
   - hcron
   - hCsound
   - hcube
@@ -6219,6 +6263,7 @@ broken-packages:
   - heckle
   - hedgehog-checkers
   - hedgehog-checkers-lens
+  - hedgehog-fakedata
   - hedgehog-gen-json
   - hedgehog-generic
   - hedgehog-golden
@@ -6283,6 +6328,7 @@ broken-packages:
   - hexpress
   - hexquote
   - hext
+  - hextream
   - heyefi
   - heyting-algebras
   - hF2
@@ -6326,6 +6372,7 @@ broken-packages:
   - hid-examples
   - hidden-char
   - hie-core
+  - hiedb
   - hieraclus
   - hierarchical-clustering-diagrams
   - hierarchical-exceptions
@@ -6348,6 +6395,7 @@ broken-packages:
   - hinduce-classifier
   - hinduce-classifier-decisiontree
   - hinduce-examples
+  - hinit
   - hinquire
   - hinstaller
   - hint-server
@@ -6408,6 +6456,9 @@ broken-packages:
   - hlrdb
   - hlrdb-core
   - hls
+  - hls-explicit-imports-plugin
+  - hls-hlint-plugin
+  - hls-retrie-plugin
   - hlwm
   - hly
   - hmark
@@ -6437,7 +6488,6 @@ broken-packages:
   - hmt-diagrams
   - hmumps
   - hnetcdf
-  - hnix-store-remote
   - HNM
   - hnormalise
   - ho-rewriting
@@ -6446,6 +6496,7 @@ broken-packages:
   - hobbes
   - hobbits
   - hocilib
+  - hocker
   - hodatime
   - HODE
   - hoe
@@ -6460,7 +6511,6 @@ broken-packages:
   - hol
   - hold-em
   - hole
-  - holmes
   - Holumbus-Searchengine
   - holy-project
   - homeomorphic
@@ -6509,6 +6559,7 @@ broken-packages:
   - hp2any-graph
   - hp2any-manager
   - hpack-convert
+  - hpack-dhall
   - hpaco
   - hpaco-lib
   - hpage
@@ -6793,6 +6844,7 @@ broken-packages:
   - hugs2yc
   - hulk
   - HulkImport
+  - hum
   - human-parse
   - human-text
   - humble-prelude
@@ -6806,6 +6858,7 @@ broken-packages:
   - hunt-server
   - hup
   - hurdle
+  - hurl
   - hurriyet
   - husk-scheme
   - husk-scheme-libs
@@ -6822,6 +6875,7 @@ broken-packages:
   - hw-json-simd
   - hw-json-simple-cursor
   - hw-json-standard-cursor
+  - hw-kafka-avro
   - hw-prim-bits
   - hw-simd
   - hw-uri
@@ -7218,6 +7272,7 @@ broken-packages:
   - karps
   - katip-elasticsearch
   - katip-kafka
+  - katip-raven
   - katip-rollbar
   - katip-scalyr-scribe
   - katip-syslog
@@ -7261,6 +7316,7 @@ broken-packages:
   - kickchan
   - kif-parser
   - kit
+  - kleene
   - kmeans-par
   - kmeans-vector
   - kmonad
@@ -7397,6 +7453,7 @@ broken-packages:
   - latex-svg-image
   - latex-svg-pandoc
   - LATS
+  - lattices
   - launchdarkly-server-sdk
   - launchpad-control
   - lawless-concurrent-machines
@@ -7429,6 +7486,7 @@ broken-packages:
   - learn
   - learn-physics-examples
   - Learning
+  - leb128
   - leetify
   - legion
   - legion-discovery
@@ -7509,6 +7567,7 @@ broken-packages:
   - linda
   - linden
   - line-bot-sdk
+  - line-drawing
   - linear-algebra-cblas
   - linear-circuit
   - linear-code
@@ -7772,6 +7831,8 @@ broken-packages:
   - marvin-interpolate
   - masakazu-bot
   - MASMGen
+  - massiv-persist
+  - massiv-serialise
   - master-plan
   - matchers
   - math-grads
@@ -7803,6 +7864,7 @@ broken-packages:
   - mcl
   - mcm
   - mcmaster-gloss-examples
+  - mcmc
   - mcmc-samplers
   - mcmc-synthesis
   - mcpi
@@ -8204,6 +8266,7 @@ broken-packages:
   - neko-lib
   - Neks
   - nemesis-titan
+  - neptune-backend
   - nerf
   - nero
   - nero-wai
@@ -8213,6 +8276,11 @@ broken-packages:
   - nested-sequence
   - NestedFunctor
   - nestedmap
+  - net-mqtt
+  - net-mqtt-lens
+  - net-mqtt-rpc
+  - net-spider
+  - net-spider-cli
   - net-spider-pangraph
   - net-spider-rpl
   - net-spider-rpl-cli
@@ -8324,7 +8392,6 @@ broken-packages:
   - NoSlow
   - not-gloss-examples
   - notcpp
-  - nothunks
   - notifications-tray-icon
   - notmuch-haskell
   - notmuch-web
@@ -8427,6 +8494,7 @@ broken-packages:
   - open-union
   - OpenAFP
   - OpenAFP-Utils
+  - openai-hs
   - openapi-petstore
   - openapi-typed
   - openapi3
@@ -8473,6 +8541,7 @@ broken-packages:
   - orchid-demo
   - order-maintenance
   - order-statistics
+  - ordinal
   - Ordinary
   - ordrea
   - oref
@@ -8574,6 +8643,7 @@ broken-packages:
   - parcom-lib
   - parconc-examples
   - pareto
+  - parochial
   - parquet-hs
   - Parry
   - parse-help
@@ -8679,6 +8749,7 @@ broken-packages:
   - persistent-migration
   - persistent-mongoDB
   - persistent-mysql-haskell
+  - persistent-odbc
   - persistent-protobuf
   - persistent-ratelimit
   - persistent-relational-record
@@ -8729,6 +8800,7 @@ broken-packages:
   - pinboard
   - pinboard-notes-backup
   - pinch
+  - pinch-gen
   - pinchot
   - ping
   - pinpon
@@ -8806,6 +8878,7 @@ broken-packages:
   - pocket-dns
   - point-octree
   - pointedalternative
+  - pointfree-fancy
   - pointful
   - pointless-haskell
   - pointless-lenses
@@ -8836,6 +8909,7 @@ broken-packages:
   - polyseq
   - polytypeable
   - polytypeable-utils
+  - pomaps
   - pomodoro
   - pomohoro
   - ponder
@@ -8845,6 +8919,7 @@ broken-packages:
   - pool-conduit
   - pop3-client
   - popenhs
+  - popkey
   - poppler
   - porcupine-core
   - porcupine-http
@@ -8975,7 +9050,6 @@ broken-packages:
   - prof-flamegraph
   - prof2dot
   - prof2pretty
-  - profiteur
   - profunctor-monad
   - progress
   - progress-meter
@@ -9003,7 +9077,9 @@ broken-packages:
   - prosidyc
   - prosper
   - proteaaudio
+  - proteaaudio-sdl
   - proteome
+  - proto-lens-arbitrary
   - proto-lens-combinators
   - proto-lens-descriptors
   - proto3-suite
@@ -9012,6 +9088,7 @@ broken-packages:
   - protocol-buffers-descriptor-fork
   - protocol-buffers-fork
   - protolude-lifted
+  - proton
   - proton-haskell
   - prototype
   - prove-everywhere-server
@@ -9043,6 +9120,7 @@ broken-packages:
   - pure-io
   - pure-priority-queue
   - pure-priority-queue-tests
+  - pure-zlib
   - purescheme-wai-routing-core
   - purescript
   - purescript-iso
@@ -9112,6 +9190,7 @@ broken-packages:
   - quickcheck-report
   - quickcheck-state-machine
   - quickcheck-state-machine-distributed
+  - quickcheck-string-random
   - quickcheck-webdriver
   - QuickCheckVariant
   - QuickPlot
@@ -9204,6 +9283,7 @@ broken-packages:
   - raz
   - razom-text-util
   - rbr
+  - rbst
   - rc
   - rclient
   - rdioh
@@ -9277,6 +9357,7 @@ broken-packages:
   - reflex-fsnotify
   - reflex-gadt-api
   - reflex-ghci
+  - reflex-gi-gtk
   - reflex-gloss
   - reflex-gloss-scene
   - reflex-libtelnet
@@ -9463,6 +9544,7 @@ broken-packages:
   - roc-cluster-demo
   - rock
   - rocksdb-haskell
+  - rocksdb-query
   - roku-api
   - rollbar
   - rollbar-cli
@@ -9478,6 +9560,7 @@ broken-packages:
   - rope
   - rose-trees
   - rose-trie
+  - rosebud
   - roshask
   - rosmsg
   - rosmsg-bin
@@ -9520,6 +9603,7 @@ broken-packages:
   - runhs
   - runmany
   - runtime-arbitrary
+  - rv
   - rws
   - RxHaskell
   - s-expression
@@ -9627,6 +9711,7 @@ broken-packages:
   - scp-streams
   - scrabble-bot
   - scrapbook
+  - scrapbook-core
   - scrape-changes
   - ScratchFs
   - script-monad
@@ -9694,6 +9779,7 @@ broken-packages:
   - serv-wai
   - servant-aeson-specs
   - servant-auth-cookie
+  - servant-auth-docs
   - servant-auth-hmac
   - servant-auth-token
   - servant-auth-token-acid
@@ -9704,6 +9790,8 @@ broken-packages:
   - servant-auth-wordpress
   - servant-avro
   - servant-cassava
+  - servant-checked-exceptions
+  - servant-checked-exceptions-core
   - servant-cli
   - servant-client-js
   - servant-client-namedargs
@@ -9711,6 +9799,7 @@ broken-packages:
   - servant-db
   - servant-db-postgresql
   - servant-dhall
+  - servant-docs
   - servant-docs-simple
   - servant-ede
   - servant-ekg
@@ -9722,6 +9811,7 @@ broken-packages:
   - servant-github
   - servant-haxl-client
   - servant-hmac-auth
+  - servant-http-streams
   - servant-http2-client
   - servant-iCalendar
   - servant-jquery
@@ -9730,6 +9820,7 @@ broken-packages:
   - servant-kotlin
   - servant-matrix-param
   - servant-mock
+  - servant-multipart
   - servant-namedargs
   - servant-nix
   - servant-openapi3
@@ -9744,6 +9835,7 @@ broken-packages:
   - servant-py
   - servant-quickcheck
   - servant-rawm-client
+  - servant-rawm-docs
   - servant-reason
   - servant-reflex
   - servant-router
@@ -9779,6 +9871,7 @@ broken-packages:
   - Set
   - set-of
   - set-with
+  - setdown
   - setgame
   - setoid
   - setters
@@ -9839,7 +9932,10 @@ broken-packages:
   - show-prettyprint
   - showdown
   - Shpadoinkle-backend-pardiff
+  - Shpadoinkle-backend-snabbdom
   - Shpadoinkle-backend-static
+  - Shpadoinkle-developer-tools
+  - Shpadoinkle-disembodied
   - Shpadoinkle-examples
   - Shpadoinkle-html
   - Shpadoinkle-router
@@ -9852,6 +9948,7 @@ broken-packages:
   - sifflet
   - sifflet-lib
   - sigma-ij
+  - sign
   - signable
   - signals
   - signed-multiset
@@ -9915,6 +10012,7 @@ broken-packages:
   - sized-vector
   - sizes
   - sjsp
+  - SJW
   - skeletal-set
   - skeleton
   - skeletons
@@ -9938,6 +10036,7 @@ broken-packages:
   - slot-lambda
   - sloth
   - slug
+  - slynx
   - small-bytearray-builder
   - smallarray
   - smallcheck-kind-generics
@@ -10004,6 +10103,7 @@ broken-packages:
   - snaplet-mongodb-minimalistic
   - snaplet-mysql-simple
   - snaplet-oauth
+  - snaplet-persistent
   - snaplet-postgresql-simple
   - snaplet-postmark
   - snaplet-purescript
@@ -10125,6 +10225,7 @@ broken-packages:
   - sql-simple-sqlite
   - sqlcipher
   - sqlite
+  - sqlite-simple-errors
   - sqlite-simple-typed
   - sqlvalue-list
   - sqsd-local
@@ -10156,6 +10257,7 @@ broken-packages:
   - stack-run-auto
   - stack-type
   - stack-wrapper
+  - stack2cabal
   - stack2nix
   - stackage
   - stackage-build-plan
@@ -10256,6 +10358,7 @@ broken-packages:
   - streaming-utils
   - streaming-with
   - streamly-archive
+  - streamly-lmdb
   - streamproc
   - strelka
   - strict-base-types
@@ -10267,10 +10370,12 @@ broken-packages:
   - strictly
   - string-isos
   - string-quote
+  - string-random
   - string-typelits
   - stringlike
   - stringtable-atom
   - stripe
+  - stripe-hs
   - stripe-http-streams
   - stripe-scotty
   - stripe-wreq
@@ -10329,6 +10434,7 @@ broken-packages:
   - svg2q
   - svgcairo
   - SVGFonts
+  - svgone
   - svgutils
   - svm-light-utils
   - svm-simple
@@ -10359,6 +10465,7 @@ broken-packages:
   - symantic-http-server
   - symantic-http-test
   - symantic-lib
+  - symantic-parser
   - symantic-xml
   - symbiote
   - symbolic-link
@@ -10397,6 +10504,7 @@ broken-packages:
   - t3-server
   - ta
   - table
+  - table-layout
   - table-tennis
   - tableaux
   - Tables
@@ -10445,6 +10553,7 @@ broken-packages:
   - tasty-laws
   - tasty-lens
   - tasty-mgolden
+  - tasty-silver
   - tasty-stats
   - tateti-tateti
   - Taxonomy
@@ -10493,6 +10602,7 @@ broken-packages:
   - tensorflow-logging
   - tensorflow-opgen
   - tensorflow-ops
+  - term-rewriting
   - termbox-banana
   - termbox-bindings
   - terminal-text
@@ -10582,9 +10692,9 @@ broken-packages:
   - thih
   - thimk
   - Thingie
+  - thock
   - thorn
   - threadmanager
-  - threadscope
   - threepenny-editors
   - threepenny-gui-contextmenu
   - threepenny-gui-flexbox
@@ -10646,6 +10756,7 @@ broken-packages:
   - tkhs
   - tkyprof
   - tls-extra
+  - tlynx
   - tmp-postgres
   - tn
   - to-haskell
@@ -10667,6 +10778,8 @@ broken-packages:
   - tomato-rubato-openal
   - toml
   - tonatona-google-server-api
+  - tonatona-persistent-postgresql
+  - tonatona-persistent-sqlite
   - tonatona-servant
   - too-many-cells
   - toodles
@@ -10760,6 +10873,7 @@ broken-packages:
   - tsvsql
   - tsweb
   - ttask
+  - ttn-client
   - tttool
   - tubes
   - tuntap
@@ -10888,15 +11002,22 @@ broken-packages:
   - unicode-prelude
   - unicode-show
   - unicode-symbols
+  - unicode-tricks
   - uniform-io
   - union
   - union-map
+  - uniprot-kb
   - uniqueid
   - uniquely-represented-sets
   - units-attoparsec
   - unittyped
   - unitym-yesod
   - universal-binary
+  - universe
+  - universe-instances-base
+  - universe-instances-extended
+  - universe-instances-trans
+  - universe-reverse-instances
   - universe-th
   - unix-fcntl
   - unix-handle
@@ -11210,6 +11331,7 @@ broken-packages:
   - whitespace
   - whois
   - why3
+  - wide-word
   - WikimediaParser
   - wikipedia4epub
   - wild-bind-indicator
@@ -11237,6 +11359,7 @@ broken-packages:
   - woffex
   - wol
   - wolf
+  - word
   - word2vec-model
   - WordAlignment
   - wordchoice
@@ -11457,6 +11580,7 @@ broken-packages:
   - yesod-mangopay
   - yesod-markdown
   - yesod-media-simple
+  - yesod-page-cursor
   - yesod-paginate
   - yesod-pagination
   - yesod-paypal-rest
@@ -11523,9 +11647,11 @@ broken-packages:
   - yu-tool
   - yu-utils
   - yuuko
+  - yx
   - yxdb-utils
   - Z-Data
   - Z-IO
+  - Z-MessagePack
   - Z-YAML
   - z3-encoding
   - z85
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
index 9cc048125172..06578f565350 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,16 +94,6 @@ self: super: builtins.intersectAttrs super {
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
-  # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
-  cachix = overrideSrc (disableLibraryProfiling super.cachix) {
-    src = (pkgs.fetchFromGitHub {
-      owner = "cachix";
-      repo = "cachix";
-      rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17";
-      sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g";
-    }) + "/cachix";
-    version = "0.5.1";
-  };
   hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;
 
   # avoid compiling twice by providing executable as a separate output (with small closure size)
@@ -510,7 +500,7 @@ self: super: builtins.intersectAttrs super {
   # requires autotools to build
   secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
 
-  # requires libsecp256k1 in pkgconfig-depends
+  # requires libsecp256k1 in pkg-config-depends
   secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1;
 
   # tests require git and zsh
@@ -557,6 +547,12 @@ self: super: builtins.intersectAttrs super {
   # Break infinite recursion cycle between devtools and mprelude.
   devtools = super.devtools.override { mprelude = dontCheck super.mprelude; };
 
+  # Break dependency cycle between tasty-hedgehog and tasty-expected-failure
+  tasty-hedgehog = dontCheck super.tasty-hedgehog;
+
+  # Break dependency cycle between hedgehog, tasty-hedgehog and lifted-async
+  lifted-async = dontCheck super.lifted-async;
+
   # loc and loc-test depend on each other for testing. Break that infinite cycle:
   loc-test = super.loc-test.override { loc = dontCheck self.loc; };
 
@@ -614,12 +610,12 @@ self: super: builtins.intersectAttrs super {
 
   git-annex = with pkgs;
     if (!stdenv.isLinux) then
-      let path = stdenv.lib.makeBinPath [ coreutils ];
+      let path = lib.makeBinPath [ coreutils ];
       in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: {
         # This is an instance of https://github.com/NixOS/nix/pull/1085
         # Fails with:
         #   gpg: can't connect to the agent: File name too long
-        postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+        postPatch = lib.optionalString stdenv.isDarwin ''
           substituteInPlace Test.hs \
             --replace ', testCase "crypto" test_crypto' ""
         '';
@@ -721,7 +717,7 @@ self: super: builtins.intersectAttrs super {
 
   # mplayer-spot uses mplayer at runtime.
   mplayer-spot =
-    let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ];
+    let path = pkgs.lib.makeBinPath [ pkgs.mplayer ];
     in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: {
       postInstall = ''
         wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}"
@@ -733,7 +729,7 @@ self: super: builtins.intersectAttrs super {
   primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0;
 
   cut-the-crap =
-    let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
+    let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
     in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: {
       postInstall = ''
         wrapProgram $out/bin/cut-the-crap \
diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
index a221ce38c8a2..582cf6df010c 100644
--- a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, buildHaskellPackages, ghc
+{ lib, stdenv, buildPackages, buildHaskellPackages, ghc
 , jailbreak-cabal, hscolour, cpphs, nodejs
 , ghcWithHoogle, ghcWithPackages
 }:
@@ -7,7 +7,7 @@ let
   isCross = stdenv.buildPlatform != stdenv.hostPlatform;
   inherit (buildPackages)
     fetchurl removeReferencesTo
-    pkgconfig coreutils gnugrep gnused glibcLocales;
+    pkg-config coreutils gnugrep gnused glibcLocales;
 in
 
 { pname
@@ -22,10 +22,10 @@ in
 , buildFlags ? []
 , haddockFlags ? []
 , description ? null
-, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
+, doCheck ? !isCross && lib.versionOlder "7.4" ghc.version
 , doBenchmark ? false
 , doHoogle ? true
-, doHaddockQuickjump ? doHoogle && stdenv.lib.versionAtLeast ghc.version "8.6"
+, doHaddockQuickjump ? doHoogle && lib.versionAtLeast ghc.version "8.6"
 , editedCabalFile ? null
 # aarch64 outputs otherwise exceed 2GB limit
 , enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false)
@@ -33,17 +33,17 @@ in
 , profilingDetail ? "exported-functions"
 # TODO enable shared libs for cross-compiling
 , enableSharedExecutables ? false
-, enableSharedLibraries ? (ghc.enableShared or false)
+, enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
 , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm)
-, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
+, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 # On macOS, statically linking against system frameworks is not supported;
 # see https://developer.apple.com/library/content/qa/qa1118/_index.html
 # They must be propagated to the environment of any executable linking with the library
 , libraryFrameworkDepends ? [], executableFrameworkDepends ? []
 , homepage ? "https://hackage.haskell.org/package/${pname}"
-, platforms ? with stdenv.lib.platforms; all # GHC can cross-compile
+, platforms ? with lib.platforms; all # GHC can cross-compile
 , hydraPlatforms ? null
 , hyperlinkSource ? true
 , isExecutable ? false, isLibrary ? !isExecutable
@@ -54,7 +54,7 @@ in
 , doCoverage ? false
 , doHaddock ? !(ghc.isHaLVM or false)
 , passthru ? {}
-, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
+, pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? []
 , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? []
 , testTarget ? ""
@@ -71,7 +71,7 @@ in
 , shellHook ? ""
 , coreSetup ? false # Use only core packages to build Setup.hs.
 , useCpphs ? false
-, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all"
+, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
 , enableSeparateBinOutput ? false
 , enableSeparateDataOutput ? false
 , enableSeparateDocOutput ? doHaddock
@@ -95,7 +95,7 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false;
 
 let
 
-  inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast
+  inherit (lib) optional optionals optionalString versionOlder versionAtLeast
                        concatStringsSep enableFeature optionalAttrs;
 
   isGhcjs = ghc.isGhcjs or false;
@@ -182,7 +182,7 @@ let
   parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";
 
   crossCabalFlagsString =
-    stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
+    lib.optionalString isCross (" " + lib.concatStringsSep " " crossCabalFlags);
 
   buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
 
@@ -213,7 +213,7 @@ let
     (enableFeature doBenchmark "benchmarks")
     "--enable-library-vanilla"  # TODO: Should this be configurable?
     (enableFeature enableLibraryForGhci "library-for-ghci")
-  ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
+  ] ++ optionals (enableDeadCodeElimination && (lib.versionOlder "8.0.1" ghc.version)) [
      "--ghc-option=-split-sections"
   ] ++ optionals dontStrip [
     "--disable-library-stripping"
@@ -234,7 +234,7 @@ let
 
   isHaskellPkg = x: x ? isHaskellLibrary;
 
-  allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
+  allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
   depsBuildBuild = [ nativeGhc ];
@@ -243,7 +243,7 @@ let
     optionals doCheck testToolDepends ++
     optionals doBenchmark benchmarkToolDepends;
   nativeBuildInputs =
-    [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+    [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkg-config ++
     setupHaskellDepends ++ collectedToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
   otherBuildInputsHaskell =
@@ -283,9 +283,9 @@ let
       continue
     fi
   '';
-in stdenv.lib.fix (drv:
+in lib.fix (drv:
 
-assert allPkgconfigDepends != [] -> pkgconfig != null;
+assert allPkgconfigDepends != [] -> pkg-config != null;
 
 stdenv.mkDerivation ({
   name = "${pname}-${version}";
@@ -423,7 +423,7 @@ stdenv.mkDerivation ({
 
     echo configureFlags: $configureFlags
     ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
-    ${stdenv.lib.optionalString (!allowInconsistentDependencies) ''
+    ${lib.optionalString (!allowInconsistentDependencies) ''
       if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
         echo >&2 "*** abort because of serious configure-time warning from Cabal"
         exit 1
@@ -455,7 +455,7 @@ stdenv.mkDerivation ({
         ${optionalString doHoogle "--hoogle"} \
         ${optionalString doHaddockQuickjump "--quickjump"} \
         ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \
-        ${stdenv.lib.concatStringsSep " " haddockFlags}
+        ${lib.concatStringsSep " " haddockFlags}
     ''}
     runHook postHaddock
   '';
@@ -492,7 +492,7 @@ stdenv.mkDerivation ({
       done
     ''}
     ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
-    ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
+    ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") ''
       for exe in "${binDir}/"* ; do
         install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
       done
@@ -532,10 +532,10 @@ stdenv.mkDerivation ({
         libraryPkgconfigDepends
         librarySystemDepends
         libraryToolDepends
-        pkgconfigDepends
+        pkg-configDepends
         setupHaskellDepends
         ;
-    } // stdenv.lib.optionalAttrs doCheck {
+    } // lib.optionalAttrs doCheck {
       inherit
         testDepends
         testFrameworkDepends
@@ -544,7 +544,7 @@ stdenv.mkDerivation ({
         testSystemDepends
         testToolDepends
         ;
-    } // stdenv.lib.optionalAttrs doBenchmark {
+    } // lib.optionalAttrs doBenchmark {
       inherit
         benchmarkDepends
         benchmarkFrameworkDepends
@@ -561,7 +561,7 @@ stdenv.mkDerivation ({
       inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
       haskellBuildInputs = isHaskellPartition.right;
       systemBuildInputs = isHaskellPartition.wrong;
-      isHaskellPartition = stdenv.lib.partition
+      isHaskellPartition = lib.partition
         isHaskellPkg
         (propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs);
     };
@@ -608,22 +608,22 @@ stdenv.mkDerivation ({
         ghcEnv = withPackages (_:
           otherBuildInputsHaskell ++
           propagatedBuildInputs ++
-          stdenv.lib.optionals (!isCross) setupHaskellDepends);
+          lib.optionals (!isCross) setupHaskellDepends);
 
-        ghcCommandCaps = stdenv.lib.toUpper ghcCommand';
+        ghcCommandCaps = lib.toUpper ghcCommand';
       in stdenv.mkDerivation ({
         inherit name shellHook;
 
-        depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild;
+        depsBuildBuild = lib.optional isCross ghcEnvForBuild;
         nativeBuildInputs =
-          [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+          [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++
           collectedToolDepends;
         buildInputs =
           otherBuildInputsSystem;
         phases = ["installPhase"];
         installPhase = "echo $nativeBuildInputs $buildInputs > $out";
         LANG = "en_US.UTF-8";
-        LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+        LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
         "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
         "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
         # TODO: is this still valid?
diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix
index 45c1a8fbd333..8b3020f88613 100644
--- a/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, ghc, pkgconfig, glibcLocales
+{ stdenv, ghc, pkg-config, glibcLocales
 , cacert, stack, makeSetupHook, lib }@depArgs:
 
 { buildInputs ? []
@@ -28,7 +28,7 @@ in stdenv.mkDerivation (args // {
     ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales;
 
   nativeBuildInputs = nativeBuildInputs
-    ++ [ ghc pkgconfig stack stackHook ];
+    ++ [ ghc pkg-config stack stackHook ];
 
   STACK_PLATFORM_VARIANT = "nix";
   STACK_IN_NIX_SHELL = 1;
diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index 73090f7737bb..1c760b056e04 100644
--- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1,6 +1,6 @@
 /* hackage-packages.nix is an auto-generated file -- DO NOT EDIT! */
 
-{ pkgs, stdenv, callPackage }:
+{ pkgs, lib, callPackage }:
 
 self: {
 
@@ -14,7 +14,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "Examples of 3D graphics programming with OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "3dmodels" = callPackage
@@ -27,8 +27,8 @@ self: {
          attoparsec base bytestring linear packer
        ];
        description = "3D model parsers";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44,8 +44,8 @@ self: {
          base cairo containers gtk haskell98 mtl
        ];
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57,8 +57,8 @@ self: {
        sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh";
        libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76,7 +76,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "An alternating list of two types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Angle" = callPackage
@@ -87,7 +87,7 @@ self: {
        sha256 = "0ra97a4im3w2cq3mf17j8skn6bajs7rw7d0mmvcwgb9jd04b0idm";
        libraryHaskellDepends = [ base ];
        description = "Angles in degrees and radians";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Boolean" = callPackage
@@ -98,7 +98,7 @@ self: {
        sha256 = "0id19wgp2jg2pf1gdhfzkyknjj19jii3pz0lva29x3lcck38rw2b";
        libraryHaskellDepends = [ base ];
        description = "Handle Boolean values generatically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-BuildPlatform" = callPackage
@@ -109,8 +109,8 @@ self: {
        sha256 = "0vlhakc6mc4zzyvb54rgmskkj8hp43zy35giimk0g7i5068r2czh";
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122,7 +122,7 @@ self: {
        sha256 = "02v3b1pfhwnf3cl8kbxfkk0a7hdp0gqq5v4w9ka32zl1p007rz19";
        libraryHaskellDepends = [ base ];
        description = "Efficient RGB colour types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-EasyRaster-GTK" = callPackage
@@ -133,8 +133,8 @@ self: {
        sha256 = "082il76032biyan170p4qp13154nmkzil4v2wv7fmjn9z7v8w49b";
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148,8 +148,8 @@ self: {
        editedCabalFile = "02k1fg86iyzbb0bxfn8r6s7z8bkahr8y02wps1l5j958jpckd6c9";
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163,8 +163,8 @@ self: {
        editedCabalFile = "0faw83njfarccnad1hgy1cf3wmihfghk3qhw2s7zf6p84v6zc27y";
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176,7 +176,7 @@ self: {
        sha256 = "0y2wzwfnlx50rzkdigmjy3dg5f91pmkf4gmnzjhs3r916d296gkq";
        libraryHaskellDepends = [ base bytestring ];
        description = "Trivial package for writing PPM images";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Random" = callPackage
@@ -187,7 +187,7 @@ self: {
        sha256 = "1c00pcz0c4l2sdaj61zcmw68ckmqb7xlfykv489xms7ak4xl8nc1";
        libraryHaskellDepends = [ base ];
        description = "A pure Haskell PRNG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Terminal" = callPackage
@@ -200,8 +200,8 @@ self: {
        editedCabalFile = "1i9bjryhccdp8gfm9xs5bbfsy32hpyv2zckd95m7g6bc4jvp8cjm";
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213,8 +213,8 @@ self: {
        sha256 = "044kiwc5g2irky0k3fg9l2qqnvcnh9vdx0yz8m1awnkab6mk0i3v";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Immutable arrays with plain integer indicies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228,8 +228,8 @@ self: {
        editedCabalFile = "05l4sk0lz9iml7282zh9pxqr538s6kjhhl6zrbdwlry21sn14pc0";
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241,8 +241,8 @@ self: {
        sha256 = "0wcan2s75c89s1mxhcvvjgbpn8xqrhmwnfbsrszkzydw3x46465y";
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258,8 +258,8 @@ self: {
          base list-extras mtl random random-shuffle void
        ];
        description = "Essential features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -287,8 +287,8 @@ self: {
          transformers tuple vector
        ];
        description = "Efficient, high-level dynamic programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -315,8 +315,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ForestStructures ];
        description = "Dynamic programming on tree and forest structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -341,8 +341,8 @@ self: {
          tasty-th
        ];
        description = "Dynamic programming for Set data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -362,8 +362,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers directory ];
        description = "foundational type classes for approximating exact real numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -379,8 +379,8 @@ self: {
          AERN-Real AERN-RnToRm base binary containers html stm time
        ];
        description = "Compositional lazy dataflow networks for exact real number computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -397,8 +397,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "arbitrary precision real interval arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -422,8 +422,8 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "arbitrary precision real interval arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -440,8 +440,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "arbitrary precision real interval arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -458,8 +458,8 @@ self: {
          time
        ];
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -477,8 +477,8 @@ self: {
          glade glib gtk gtkglext mtl OpenGL stm time
        ];
        description = "GL plotting of polynomial function enclosures (PFEs)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -496,7 +496,7 @@ self: {
          base bytestring cereal monads-tf random transformers
        ];
        description = "Fast AES encryption/decryption for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AFSM" = callPackage
@@ -507,7 +507,7 @@ self: {
        sha256 = "0yy24nrl99b624x0d8k4w4505zx2b2n25frdq5ijn4j6fhjqwhz6";
        libraryHaskellDepends = [ base ];
        description = "Arrowized functional state machines";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "AGI" = callPackage
@@ -520,8 +520,8 @@ self: {
          base mtl network parsec random syb unix
        ];
        description = "A library for writing AGI scripts for Asterisk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -536,7 +536,7 @@ self: {
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
        description = "A binding for the OpenAL Utility Toolkit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
@@ -551,8 +551,8 @@ self: {
          base bytestring containers mtl network pureMD5 stm
        ];
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -565,7 +565,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Num instance for Applicatives provided via the ANum newtype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ASN1" = callPackage
@@ -580,7 +580,7 @@ self: {
          base containers HUnit mtl NewBinary old-time pretty QuickCheck
        ];
        description = "ASN.1 support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AVar" = callPackage
@@ -591,7 +591,7 @@ self: {
        sha256 = "0jggzjyms1w4p1ynv8m5yvya64kbxkjdis7wvy3lildmp0w0x0c7";
        libraryHaskellDepends = [ base ];
        description = "Mutable variables with Exception handling and concurrency support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AWin32Console" = callPackage
@@ -602,8 +602,8 @@ self: {
        sha256 = "0il5bngj4919mmpm0rwmbx74ih3sfbqkaph6w12p49fs466sxkh1";
        libraryHaskellDepends = [ base regex-compat Win32 ];
        description = "A binding to a part of the ANSI escape code for the console";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "AbortT-monadstf" = callPackage
@@ -614,8 +614,8 @@ self: {
        sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f";
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        description = "Monads-tf instances for the AbortT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -627,8 +627,8 @@ self: {
        sha256 = "1x2iw46nzfjj36pfdzv5n0q6f6l7kgz62gnxpsj2f5p7w10zlxai";
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
        description = "mtl instances for the AbortT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -646,8 +646,8 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "A monad and monadic transformer providing \"abort\" functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -671,8 +671,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "An easy-to-use video game framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -688,8 +688,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -704,8 +704,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -719,8 +719,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 mtl ];
        description = "Lisperati's adventure game in Lisp translated to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -750,8 +750,8 @@ self: {
          time uniplate wai wai-extra wl-pprint
        ];
        description = "Assessment services for the Advise-Me project";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -773,7 +773,7 @@ self: {
        ];
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Agata" = callPackage
@@ -788,8 +788,8 @@ self: {
          base containers mtl QuickCheck tagged template-haskell
        ];
        description = "Generator-generator for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -823,8 +823,8 @@ self: {
        executableToolDepends = [ emacs ];
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ abbradar ];
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
@@ -838,7 +838,7 @@ self: {
        executableHaskellDepends = [ Agda base ];
        description = "Command-line program for type-checking and compiling Agda programs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "AhoCorasick" = callPackage
@@ -852,8 +852,8 @@ self: {
          array base hashable mtl unordered-containers
        ];
        description = "Aho-Corasick string matching algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -875,8 +875,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Find the minimal subset/submap satisfying some property";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -905,8 +905,8 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "Algorithmic music composition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -920,8 +920,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl pretty ];
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -938,8 +938,8 @@ self: {
          PrimitiveArray vector
        ];
        description = "Collection of alignment algorithms";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -967,8 +967,8 @@ self: {
          async base filepath LambdaHack optparse-applicative
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad combat game";
-       license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -988,8 +988,8 @@ self: {
          process QuickCheck split transformers xml
        ];
        description = "Android view hierarchy importer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1001,8 +1001,8 @@ self: {
        sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm";
        libraryHaskellDepends = [ base random ];
        description = "Updated version of Yampa: a library for programming hybrid systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1015,8 +1015,8 @@ self: {
        libraryHaskellDepends = [ base mtl multirec parsec ];
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1030,7 +1030,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec xhtml ];
        description = "Convert ANSI Terminal Sequences to nice HTML markup";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Aoide" = callPackage
@@ -1044,7 +1044,7 @@ self: {
          base bytestring mtl process template-haskell
        ];
        description = "A simple music library with the capability of generating .ly and .mid files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ApplePush" = callPackage
@@ -1062,8 +1062,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1075,8 +1075,8 @@ self: {
        sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
        doHaddock = false;
        description = "Call AppleScript from Haskell, and then call back into Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1088,8 +1088,8 @@ self: {
        sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy";
        libraryHaskellDepends = [ base vector ];
        description = "Function approximation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1101,8 +1101,8 @@ self: {
        sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq";
        libraryHaskellDepends = [ base ];
        description = "Unboxed references, dynamic arrays and more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1114,8 +1114,8 @@ self: {
        sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb";
        libraryHaskellDepends = [ base process ];
        description = "A library to generate Netlist code from Arrow descriptions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1131,7 +1131,7 @@ self: {
          base containers mtl poly-rec requirements tagged template-haskell
        ];
        description = "Strongly typed Attribute Grammars implemented using type-level programming";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "AttoBencode" = callPackage
@@ -1151,8 +1151,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Fast Bencode encoding and parsing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1169,8 +1169,8 @@ self: {
          utf8-string
        ];
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1186,8 +1186,8 @@ self: {
          array base colour GLUT OpenGL random
        ];
        description = "Visualisation of Strange Attractors in 3-Dimensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1201,8 +1201,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1219,7 +1219,7 @@ self: {
        ];
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1231,8 +1231,8 @@ self: {
        sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx";
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1244,8 +1244,8 @@ self: {
        sha256 = "1ypq7m09ki5wbwkvmqdl7ch40cbdfhb91kq8n17im184r5liyxlc";
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1272,8 +1272,8 @@ self: {
          unordered-containers
        ];
        description = "Big Contact Map Tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1302,7 +1302,7 @@ self: {
        ];
        testToolDepends = [ alex happy hspec-discover ];
        description = "A compiler front-end generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BNFC-meta" = callPackage
@@ -1320,7 +1320,7 @@ self: {
          template-haskell
        ];
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "Baggins" = callPackage
@@ -1333,8 +1333,8 @@ self: {
        editedCabalFile = "16206xd8lm8fkvpxbm19h403264xyjki07s9lam3pgq985xbqk35";
        libraryHaskellDepends = [ base cairo containers mtl ];
        description = "Tools for self-assembly";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1350,8 +1350,8 @@ self: {
          base bifunctors hmidi mtl stm time transformers
        ];
        description = "A Drum Machine DSL for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1381,7 +1381,7 @@ self: {
        ];
        description = "An ad-hoc P2P chat program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1395,8 +1395,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base mtl random ];
        description = "An interpreter for the Befunge-93 Programming Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1414,8 +1414,8 @@ self: {
          base bytestring cassava deepseq directory statistics time vector
        ];
        description = "Benchmark functions with history";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1428,7 +1428,7 @@ self: {
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ db ];
        description = "Berkeley DB binding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) db;};
 
   "BerkeleyDBXML" = callPackage
@@ -1442,8 +1442,8 @@ self: {
        libraryHaskellDepends = [ base BerkeleyDB bytestring ];
        librarySystemDepends = [ db dbxml xercesc xqilla ];
        description = "Berkeley DB XML binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) db; inherit (pkgs) dbxml; 
          inherit (pkgs) xercesc; inherit (pkgs) xqilla;};
@@ -1456,8 +1456,8 @@ self: {
        sha256 = "14wjpfr9d8fpgl1jkpm2123lprr3hf3a6smkaflzkgxqlgcrkmyr";
        libraryHaskellDepends = [ base besout ];
        description = "Factorization of polynomials over finite field";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1472,8 +1472,8 @@ self: {
          base containers mtl template-haskell th-extras
        ];
        description = "The Bidirectional Generic Update Language";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1487,7 +1487,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base bmp bytestring gloss ];
        description = "Image editor for pixel art";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BinderAnn" = callPackage
@@ -1505,8 +1505,8 @@ self: {
          base containers ghc ghc-prim mtl split syb transformers
        ];
        description = "Source-to-source plugin for enhancing EDSLs with static annotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1518,7 +1518,7 @@ self: {
        sha256 = "0am0487l7njngp2k6h3qfbhjs61d9ir9rp8iw1r5448b20n4fxas";
        libraryHaskellDepends = [ base ];
        description = "Common bin-packing heuristics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BioHMM" = callPackage
@@ -1535,8 +1535,8 @@ self: {
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1558,8 +1558,8 @@ self: {
          vector-read-instances zlib
        ];
        description = "Base library for bioinformatics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1586,8 +1586,8 @@ self: {
          tasty-silver tasty-th text
        ];
        description = "BLAST-related tools";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1599,8 +1599,8 @@ self: {
        sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w";
        libraryHaskellDepends = [ base bytestring iteratee ];
        description = "Vienna / DotBracket / ExtSS parsers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1623,8 +1623,8 @@ self: {
          vector vector-th-unbox
        ];
        description = "European Nucleotide Archive data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1642,8 +1642,8 @@ self: {
          directory either-unwrap text vector word8
        ];
        description = "Ensembl related datastructures and functions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1659,8 +1659,8 @@ self: {
          base BiobaseXNA bytestring containers filemanip iteratee tuple
        ];
        description = "Importer for FR3D resources";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1685,8 +1685,8 @@ self: {
          text
        ];
        description = "streaming FASTA parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1704,8 +1704,8 @@ self: {
          http-conduit hxt mtl network Taxonomy text transformers
        ];
        description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1726,8 +1726,8 @@ self: {
          either-unwrap hxt text
        ];
        description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1766,8 +1766,8 @@ self: {
          base criterion lens text transformers
        ];
        description = "Infernal data structures and tools";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1779,8 +1779,8 @@ self: {
        sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r";
        libraryHaskellDepends = [ base bytestring containers iteratee ];
        description = "Multiple Alignment Format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1808,8 +1808,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Newick file format parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1829,8 +1829,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "RNA folding training data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1848,8 +1848,8 @@ self: {
          filepath lens primitive PrimitiveArray repa split vector
        ];
        description = "Import Turner RNA parameters";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1882,8 +1882,8 @@ self: {
          vector-binary-instances vector-th-unbox
        ];
        description = "Collection of types for bioinformatics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1899,8 +1899,8 @@ self: {
          base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector
        ];
        description = "Import Vienna energy parameters";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1942,8 +1942,8 @@ self: {
          text tuple vector vector-binary-instances vector-th-unbox
        ];
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1958,7 +1958,7 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1978,8 +1978,8 @@ self: {
          base bitstring bytestring mtl parallel primitive QuickCheck
          transformers vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1987,14 +1987,14 @@ self: {
     ({ mkDerivation, base, bytestring, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "BitSyntax";
-       version = "0.3.2.1";
-       sha256 = "0cc0nvmnybn68a1bvzqrvc5csaqvs3g50657slwjf2f686yi5q8r";
+       version = "0.3.2.2";
+       sha256 = "0615r1cb2sv9sj517vii3g2sf1k308q3r176i03jpjlb6vgfipkn";
        libraryHaskellDepends = [
          base bytestring QuickCheck template-haskell
        ];
        description = "A module to aid in the (de)serialisation of binary data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2006,8 +2006,8 @@ self: {
        sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari";
        libraryHaskellDepends = [ base HTTP json2 ];
        description = "A library to access bit.ly URL shortener.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2025,8 +2025,8 @@ self: {
          HTTP http-conduit hxt mtl network transformers zip-archive
        ];
        description = "Libary to interface with the NCBI blast REST interface";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2049,7 +2049,7 @@ self: {
        ];
        description = "Diagram editor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2074,8 +2074,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2097,8 +2097,8 @@ self: {
        ];
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2127,8 +2127,8 @@ self: {
          base containers criterion MissingH network-uri parsec
        ];
        description = "A markdown-like markup language designed for blog posts";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2140,7 +2140,7 @@ self: {
        sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c";
        libraryHaskellDepends = [ base mtl ];
        description = "Html document layout library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Blueprint" = callPackage
@@ -2151,8 +2151,8 @@ self: {
        sha256 = "16cfmy4ndc15p6jdmyy08nqgv143dvs9xf4qg4mxa6x5r326pi94";
        doHaddock = false;
        description = "Preview of a new build system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2174,7 +2174,7 @@ self: {
        testHaskellDepends = [ base process ];
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2186,7 +2186,7 @@ self: {
        sha256 = "1y7f8lqx86m06ccq1bjym2hywc7r17s2bvx16jswb2ibn09n08b7";
        libraryHaskellDepends = [ base ];
        description = "Generalized booleans and numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BoundedChan" = callPackage
@@ -2197,7 +2197,7 @@ self: {
        sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k";
        libraryHaskellDepends = [ array base ];
        description = "Implementation of bounded channels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Bravo" = callPackage
@@ -2213,8 +2213,8 @@ self: {
          template-haskell
        ];
        description = "Static text template generation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2226,8 +2226,8 @@ self: {
        sha256 = "13wwi7x898p51crzzp5rdrjgmsxsgbx7dgzgbaxdikxyrh216lmz";
        libraryHaskellDepends = [ base bytestring network text ];
        description = "A socker wrapper that makes the IO of sockets much cleaner";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2252,8 +2252,8 @@ self: {
          http-conduit http-types string-qq temporary unix yaml
        ];
        description = "Hits a set of urls periodically to bust caches";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2264,15 +2264,15 @@ self: {
      }:
      mkDerivation {
        pname = "C-structs";
-       version = "0.1.0.1";
-       sha256 = "0b3mqp20am2yn7jbgxxg08rds1c5mxx827app23hrhsl4ysslfkg";
+       version = "0.2.0.1";
+       sha256 = "1l7mygk0ia93wqcm61v8mdlnspxscdplxg4qpffvx4ldfafxc7x9";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [
          base doctest Glob HUnit QuickCheck template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "C-Structs implementation for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "CBOR" = callPackage
@@ -2292,8 +2292,8 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Encode/Decode values to/from CBOR";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2306,7 +2306,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "CC-delcont-alt" = callPackage
@@ -2323,8 +2323,8 @@ self: {
        testHaskellDepends = [ base doctest mtl ];
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2336,8 +2336,8 @@ self: {
        sha256 = "1s6bql9r78yfzgarm3i4f2glhc5w8qq91adhs15cnqj6h7768a5c";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2349,8 +2349,8 @@ self: {
        sha256 = "07v388bzs8x9k1p677310rbh8baj1fdq3bhbqyvxqzx93kv8g381";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2362,8 +2362,8 @@ self: {
        sha256 = "0fzjr73id8rlrcmf0j3y1qn4jnc8incqhhkp9wl35lig20kqy82m";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2375,8 +2375,8 @@ self: {
        sha256 = "0zavw824xcr1jhmlpz9hmabhhi459y0s7z434lxalzha01j1wfih";
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2394,8 +2394,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        executableToolDepends = [ happy ];
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2410,7 +2410,7 @@ self: {
          base bytestring hxt-regex-xmlschema utf8-string
        ];
        description = "A W3C compliant (X)HTML generating library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "CLASE" = callPackage
@@ -2425,8 +2425,8 @@ self: {
          base containers filepath mtl parsec template-haskell
        ];
        description = "Cursor Library for A Structured Editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2439,8 +2439,8 @@ self: {
        libraryHaskellDepends = [ base directory split time ];
        testHaskellDepends = [ base doctest ];
        description = "CLI tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2459,8 +2459,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "Infernal covariance model comparison";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2477,8 +2477,8 @@ self: {
          time
        ];
        description = "cwmwl udp message queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2490,8 +2490,8 @@ self: {
        sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8";
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2506,8 +2506,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2523,8 +2523,8 @@ self: {
          array base containers mtl parsec readline
        ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2536,7 +2536,7 @@ self: {
        sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255";
        libraryHaskellDepends = [ base ];
        description = "Definition of a CSP core-language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "CSPM-FiringRules" = callPackage
@@ -2552,8 +2552,8 @@ self: {
          QuickCheck random tree-monad
        ];
        description = "Firing rules semantic of CSPM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2571,8 +2571,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "A CSP-M parser compatible with FDR-2.91";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2589,8 +2589,8 @@ self: {
          prettyclass syb
        ];
        description = "An interpreter for CSPM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2604,8 +2604,8 @@ self: {
          array base containers CSPM-Frontend pretty
        ];
        description = "some modules specific for the ProB tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2631,8 +2631,8 @@ self: {
          prettyclass syb transformers xml
        ];
        description = "cspm command line tool for analyzing CSPM specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2649,7 +2649,7 @@ self: {
          base containers hashable mtl unordered-containers
        ];
        description = "Open records using closed type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "CV" = callPackage
@@ -2678,7 +2678,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "OpenCV based machine vision library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
@@ -2711,8 +2711,8 @@ self: {
        ];
        doCheck = false;
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Cabal_2_4_1_0" = callPackage
@@ -2742,8 +2742,8 @@ self: {
        ];
        doCheck = false;
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Cabal_3_2_1_0" = callPackage
@@ -2773,8 +2773,8 @@ self: {
        ];
        doCheck = false;
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Cabal-ide-backend" = callPackage
@@ -2798,8 +2798,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 unix
        ];
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2817,8 +2817,8 @@ self: {
          base bytestring directory filepath HDBC HDBC-sqlite3 process unix
        ];
        description = "Search cabal packages by name";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2830,8 +2830,8 @@ self: {
        sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04";
        libraryHaskellDepends = [ base compdata directory free unix ];
        description = "Separate and contain effects of IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2854,8 +2854,8 @@ self: {
        sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3";
        libraryHaskellDepends = [ base containers fgl parsec ];
        description = "An implementation and DSL for the Carneades argumentation model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2872,8 +2872,8 @@ self: {
          base CarneadesDSL cmdargs containers Dung fgl
        ];
        description = "A translation from the Carneades argumentation model into Dung's AFs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2885,8 +2885,8 @@ self: {
        sha256 = "1g2da90bna28hla9akpqsg5d2ag4p59zwxr6vqdizjbcpy4d7xkl";
        libraryHaskellDepends = [ base lens linear template-haskell ];
        description = "Coordinate systems";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2898,8 +2898,8 @@ self: {
        sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng";
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        description = "Playing with reified categorical composition";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2926,8 +2926,8 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "A CSV parsing and encoding library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2939,8 +2939,8 @@ self: {
        sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2952,7 +2952,7 @@ self: {
        sha256 = "183pghm74vk1vdcn0mdn6g5q284sncpl1cc49lpczz1wbr15s89y";
        libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
        description = "Generalized stream processors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart" = callPackage
@@ -2970,7 +2970,7 @@ self: {
          operational time vector
        ];
        description = "A library for generating 2D Charts and Plots";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-cairo" = callPackage
@@ -2988,7 +2988,7 @@ self: {
          old-locale operational time
        ];
        description = "Cairo backend for Charts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-diagrams" = callPackage
@@ -3011,8 +3011,8 @@ self: {
          text time
        ];
        description = "Diagrams backend for Charts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3031,8 +3031,8 @@ self: {
          base Chart colour data-default-class fltkhs operational text vector
        ];
        description = "A backend for the Chart library for FLTKHS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3049,7 +3049,7 @@ self: {
          mtl old-locale time
        ];
        description = "Utility functions for using the chart library with GTK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-gtk3" = callPackage
@@ -3065,7 +3065,7 @@ self: {
          mtl old-locale time
        ];
        description = "Utility functions for using the chart library with GTK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-simple" = callPackage
@@ -3081,8 +3081,8 @@ self: {
          data-default-class gtk mtl old-locale time
        ];
        description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3109,8 +3109,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Tests of the Charts library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3129,7 +3129,26 @@ self: {
          array base containers mtl QuickCheck random syb
        ];
        description = "For testing partial and infinite values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+     }) {};
+
+  "ChasingBottoms_1_3_1_10" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
+     , syb
+     }:
+     mkDerivation {
+       pname = "ChasingBottoms";
+       version = "1.3.1.10";
+       sha256 = "1flr56hd8ny0ddlv1agi0ikdjv5wgx0aba6xqdsn3nv6dyw9nbf3";
+       libraryHaskellDepends = [
+         base containers mtl QuickCheck random syb
+       ];
+       testHaskellDepends = [
+         array base containers mtl QuickCheck random syb
+       ];
+       description = "For testing partial and infinite values";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "CheatSheet" = callPackage
@@ -3143,7 +3162,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers directory ];
        description = "A Haskell cheat sheet in PDF and literate formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Checked" = callPackage
@@ -3154,8 +3173,8 @@ self: {
        sha256 = "1mr323rhh3lr6a5ni60n2kxz2k57763a3rrf7c6i18hxs9d4w2s4";
        libraryHaskellDepends = [ base text ];
        description = "Inbuilt checking for ultra reliable computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3169,8 +3188,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring mtl network ];
        description = "A platform independent mechanism to render graphics using vnc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3187,7 +3206,7 @@ self: {
        ];
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3199,7 +3218,7 @@ self: {
        sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
        libraryHaskellDepends = [ aeson base text vector ];
        description = "Cirru Parser in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Clash-Royale-Hack-Cheats" = callPackage
@@ -3221,8 +3240,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3234,8 +3253,8 @@ self: {
        sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk";
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        description = "Stating and checking laws for type class methods";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3247,8 +3266,8 @@ self: {
        sha256 = "1yvkrzd3l7ijh3fqvkbzqv5vp4nv5z26fbxy91sfwh3zqlscpim9";
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3260,8 +3279,8 @@ self: {
        sha256 = "0kr9i13ch2wbcnxchrnx562r8ar7kb84gmk3cqxc40x5w416205f";
        libraryHaskellDepends = [ base containers ];
        description = "A light, clean and powerful utility library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3273,7 +3292,7 @@ self: {
        sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz";
        libraryHaskellDepends = [ base directory unix utf8-string X11 ];
        description = "System clipboard interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ClustalParser" = callPackage
@@ -3293,8 +3312,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover parsec text ];
        testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3312,8 +3331,8 @@ self: {
          filepath mtl old-time pretty pureMD5 safe utf8-string
        ];
        description = "A generic build tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3325,7 +3344,7 @@ self: {
        sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn";
        libraryHaskellDepends = [ base ];
        description = "LZF compression bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Codec-Image-DevIL" = callPackage
@@ -3337,7 +3356,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libdevil;};
 
   "Color" = callPackage
@@ -3356,7 +3375,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base colour criterion deepseq random ];
        description = "Color spaces and conversions between them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Combinatorrent" = callPackage
@@ -3381,8 +3400,8 @@ self: {
          test-framework-quickcheck2 time
        ];
        description = "A concurrent bittorrent client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3394,8 +3413,8 @@ self: {
        sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d";
        libraryHaskellDepends = [ base directory process ];
        description = "A replacement for System.Exit and System.Process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3418,8 +3437,8 @@ self: {
          system-fileio system-filepath text
        ];
        description = "Watch some files; Rerun a command";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3437,8 +3456,8 @@ self: {
          IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers
        ];
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3450,8 +3469,8 @@ self: {
        sha256 = "0gizrl90jn5cmadxzpdvfg7h11pkb0l12k891xw9v36j5yf4saj0";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3463,8 +3482,8 @@ self: {
        sha256 = "0mca09afj36zm3b7q3xn4gzkj4ggrlaz2g0zpssy4siam5rlc208";
        libraryHaskellDepends = [ base ];
        description = "A Cached variable for IO functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3476,8 +3495,8 @@ self: {
        sha256 = "0xnnkz67hh4mqx09wh17jpr9isgpcrc5xwp28afn3n8sz2y2mnxd";
        libraryHaskellDepends = [ async base ];
        description = "Mix concurrent and sequential computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3499,8 +3518,8 @@ self: {
          base binary Cabal containers glider-nlp HUnit text
        ];
        description = "Information retrieval library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3514,7 +3533,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
        description = "Configuration file reading & writing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ConfigFileTH" = callPackage
@@ -3528,7 +3547,7 @@ self: {
        ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3540,8 +3559,8 @@ self: {
        sha256 = "0fk7165abh4rw4jk6wy4f6y0qpakxlrs4mwrs3r2q7lz03jsyig2";
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3553,8 +3572,8 @@ self: {
        sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb";
        libraryHaskellDepends = [ base ];
        description = "Declare types as Configurable then specialize them all in one place";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3566,7 +3585,7 @@ self: {
        sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz";
        libraryHaskellDepends = [ base Stream ];
        description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Conscript" = callPackage
@@ -3579,8 +3598,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Restart a command on STDIN activity";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3592,8 +3611,8 @@ self: {
        sha256 = "0rhy5wq3v5hdryjn8pcsgqy4k772agj1rgq3021pjki7n3zm3dza";
        libraryHaskellDepends = [ base dlist ghc-prim vector ];
        description = "Repackages standard type classes with the ConstraintKinds extension";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3605,8 +3624,8 @@ self: {
        sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad and monad transformer for consuming streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3618,8 +3637,8 @@ self: {
        sha256 = "1paj8wx2k86i5xb11scbyca4fb2fnxgln5d661mcwxvs0i91jj1b";
        libraryHaskellDepends = [ arrows base ];
        description = "Control.Arrow.Transformer.Cont";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3637,8 +3656,8 @@ self: {
          base containers criterion multiset QuickCheck statistics vector
        ];
        description = "Implementation of the context algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3650,8 +3669,8 @@ self: {
        sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Practical typed lazy contracts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3663,7 +3682,7 @@ self: {
        sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa";
        libraryHaskellDepends = [ base BoundedChan stm ];
        description = "A parallel producer/consumer engine (thread pool)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Control-Monad-MultiPass" = callPackage
@@ -3683,8 +3702,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "A Library for Writing Multi-Pass Algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3702,8 +3721,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A variation on the ST monad with two type parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3715,8 +3734,8 @@ self: {
        sha256 = "1r70whihxczscp8j406sr4qqkf0abn125azald4cshqnp81rl2i4";
        libraryHaskellDepends = [ base ghc pretty pretty-show ];
        description = "A GHC plugin for printing GHC's internal Core data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3728,8 +3747,8 @@ self: {
        sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z";
        libraryHaskellDepends = [ base parsec pretty ];
        description = "Manipulating Core Erlang source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3748,8 +3767,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to Mac OSX's CoreFoundation framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3761,8 +3780,8 @@ self: {
        sha256 = "1cad9j7ivd6mfcff44773v8z3z2ilparxfikbnv0gab6csc9p1nw";
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3783,8 +3802,8 @@ self: {
          utf8-string
        ];
        description = "CouchDB interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3801,8 +3820,8 @@ self: {
        ];
        doHaddock = false;
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3820,7 +3839,7 @@ self: {
        ];
        description = "Collects together existing Haskell cryptographic functions into a package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "CurryDB" = callPackage
@@ -3857,8 +3876,8 @@ self: {
          base bytestring mersenne-random-pure64 mtl
        ];
        description = "CurryDB: In-memory Key/Value Database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3877,7 +3896,7 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3907,7 +3926,7 @@ self: {
          transformers-compat utf8-string xml-conduit xml-hamlet
        ];
        description = "RFC 4918 WebDAV support";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "DBFunctor" = callPackage
@@ -3934,8 +3953,8 @@ self: {
          text time transformers unordered-containers vector
        ];
        description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3949,8 +3968,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3962,8 +3981,8 @@ self: {
        sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh";
        libraryHaskellDepends = [ base bytestring ];
        description = "D-Bus bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3975,7 +3994,7 @@ self: {
        sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx";
        libraryHaskellDepends = [ base deepseq HUnit parallel random ];
        description = "Communication Free Learning-based constraint solver";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "DMuCheck" = callPackage
@@ -3988,8 +4007,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base MuCheck ];
        description = "Distributed Mutation Analysis framework for MuCheck";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4015,7 +4034,7 @@ self: {
          unordered-containers
        ];
        description = "Complete API bindings for DigitalOcean API V2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "DOM" = callPackage
@@ -4026,8 +4045,8 @@ self: {
        sha256 = "13zj4jg78y5s05gfi3j83izxw6d2csbvznd7mq900zlv4xwddw2b";
        libraryHaskellDepends = [ base mtl WebBits ];
        description = "DOM Level 2 bindings for the WebBits package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4043,8 +4062,8 @@ self: {
          array base containers list-tries mtl QuickCheck safe semiring
        ];
        description = "Pragmatic framework for dynamic programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4069,7 +4088,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Darcs Patch Manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4107,7 +4126,7 @@ self: {
          transformers vector
        ];
        description = "utilities for DP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DRBG" = callPackage
@@ -4131,7 +4150,7 @@ self: {
          prettyclass QuickCheck tagged test-framework test-framework-hunit
        ];
        description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DSA" = callPackage
@@ -4154,8 +4173,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Implementation of DSA, based on the description of FIPS 186-4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4184,8 +4203,8 @@ self: {
          mtl semigroups template-haskell text time vector
        ];
        description = "Database Supported Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4208,7 +4227,7 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4220,8 +4239,8 @@ self: {
        sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Data To Class transformation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4233,8 +4252,8 @@ self: {
        sha256 = "0pnywhva7s5xp9xlxk6h56n3fjflna6zhk5qdb8wax7i1qbp85vs";
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4265,8 +4284,8 @@ self: {
          utf8-string
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4279,7 +4298,7 @@ self: {
        libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4291,7 +4310,7 @@ self: {
        sha256 = "0lk0w64hyqkg99r9ccn5k1nh6rmd99z8d925px4cl09nin7hnm71";
        libraryHaskellDepends = [ base ];
        description = "Geometric angles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Data-Hash-Consistent" = callPackage
@@ -4306,7 +4325,7 @@ self: {
          base bytestring digest utf8-string vector vector-algorithms
        ];
        description = "Provide a simple consistent hashing mechanism";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Data-Rope" = callPackage
@@ -4318,7 +4337,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4335,7 +4354,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A package for adding index column to data files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "DataTreeView" = callPackage
@@ -4352,8 +4371,8 @@ self: {
          MissingH monad-control mtl syb transformers-base
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4367,8 +4386,8 @@ self: {
        libraryHaskellDepends = [ base generic-lens microlens ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type safe data migrations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4397,8 +4416,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
        description = "Write clients for Meteor's DDP Protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4427,7 +4446,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Decimal numbers with variable precision";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DecisionTree" = callPackage
@@ -4439,7 +4458,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4451,8 +4470,8 @@ self: {
        sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc";
        libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        description = "Arrows for \"deep application\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4470,8 +4489,8 @@ self: {
        ];
        testHaskellDepends = [ base constraints mtl QuickCheck random ];
        description = "A DSL for creating neural network";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4492,7 +4511,7 @@ self: {
        ];
        description = "A simple RTS game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4515,8 +4534,8 @@ self: {
          mtl options parallel text wl-pprint
        ];
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4528,7 +4547,7 @@ self: {
        sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v";
        libraryHaskellDepends = [ base containers xmonad xmonad-contrib ];
        description = "A library for specifying xmonad key bindings with functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Dflow" = callPackage
@@ -4545,8 +4564,8 @@ self: {
          base HUnit QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Processing Real-time event streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4564,8 +4583,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "O(ND) diff algorithm in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Diff" = callPackage
@@ -4582,7 +4601,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "O(ND) diff algorithm in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DifferenceLogic" = callPackage
@@ -4595,8 +4614,8 @@ self: {
          base containers fgl FirstOrderTheory HUnit
        ];
        description = "A theory solver for conjunctions of literals in difference logic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4612,8 +4631,8 @@ self: {
          base deepseq fclabels mtl mwc-random parallel primitive vector
        ];
        description = "Global optimization using Differential Evolution";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4630,7 +4649,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A data-type representing digits 0-9";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DigitalOcean" = callPackage
@@ -4648,8 +4667,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec lens mtl text ];
        description = "A client library for the DigitalOcean API";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4661,8 +4680,8 @@ self: {
        sha256 = "0bbg9w5n3b296g884y8qvgzsndqhzwh0mkn3dlp9nx4a7i321c97";
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4675,8 +4694,8 @@ self: {
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ dsound ];
        description = "Partial binding to the Microsoft DirectSound API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {dsound = null;};
 
   "DisTract" = callPackage
@@ -4696,8 +4715,8 @@ self: {
          old-locale parsec pretty process template-haskell time xhtml
        ];
        description = "Distributed Bug Tracking System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4714,8 +4733,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Discussion support system";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4730,8 +4749,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Hash modules (currently Murmur3)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4744,8 +4763,8 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom ];
        testHaskellDepends = [ base containers MonadRandom ];
        description = "A Haskell library for probability distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4762,7 +4781,7 @@ self: {
          base HUnit test-framework test-framework-hunit vector
        ];
        description = "Distance transform function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DistanceUnits" = callPackage
@@ -4773,7 +4792,7 @@ self: {
        sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas";
        libraryHaskellDepends = [ base ];
        description = "A comprehensive distance library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DnaProteinAlignment" = callPackage
@@ -4799,8 +4818,8 @@ self: {
          PrimitiveArray repa split vector
        ];
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4818,8 +4837,8 @@ self: {
          base containers ghc ghc-paths haddock HUnit process
        ];
        description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4831,7 +4850,7 @@ self: {
        sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz";
        libraryHaskellDepends = [ base html ];
        description = "Documentation types library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DrHylo" = callPackage
@@ -4849,8 +4868,8 @@ self: {
        ];
        executableHaskellDepends = [ array base containers pretty ];
        description = "A tool for deriving hylomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4868,8 +4887,8 @@ self: {
          base filepath old-time process random
        ];
        description = "Program to derive type class instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4884,8 +4903,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base old-time process random ];
        description = "Program to derive type class instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4899,8 +4918,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base cmdargs containers parsec ];
        description = "An implementation of the Dung argumentation frameworks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4927,7 +4946,7 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4955,7 +4974,7 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -4981,7 +5000,7 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5004,7 +5023,7 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5022,8 +5041,8 @@ self: {
          array base criterion QuickCheck random vector
        ];
        description = "Dynamic time warping of sequences";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5037,8 +5056,8 @@ self: {
          base contravariant mtl time transformers
        ];
        description = "dysFunctional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5050,8 +5069,8 @@ self: {
        sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f";
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        description = "dysFunctional Reactive Programming on Cairo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5068,8 +5087,8 @@ self: {
          gtk
        ];
        description = "dysFunctional Reactive Programming on Craftwerk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5081,7 +5100,7 @@ self: {
        sha256 = "1bkkzj1d0j4nisdl9jfmadjx32w35ipdw3k12krhzzlf5aiwnrf1";
        libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ENIG" = callPackage
@@ -5100,7 +5119,7 @@ self: {
          unicode-transforms
        ];
        description = "Auto Korean conjugator/adjustor/adopter/converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Earley" = callPackage
@@ -5121,7 +5140,7 @@ self: {
          base criterion deepseq ListLike parsec
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -5139,7 +5158,7 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "Peter's Syntax Diagram Drawing Tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "EdisonAPI" = callPackage
@@ -5150,7 +5169,7 @@ self: {
        sha256 = "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm";
        libraryHaskellDepends = [ base mtl ];
        description = "A library of efficient, purely-functional data structures (API)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "EdisonCore" = callPackage
@@ -5165,7 +5184,7 @@ self: {
          array base containers EdisonAPI mtl QuickCheck
        ];
        description = "A library of efficient, purely-functional data structures (Core Implementations)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "EditTimeReport" = callPackage
@@ -5184,7 +5203,7 @@ self: {
        ];
        description = "Query language and report generator for edit logs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5207,8 +5226,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5226,8 +5245,8 @@ self: {
          base monad-control transformers transformers-base
        ];
        description = "EitherT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5268,7 +5287,7 @@ self: {
          union-find unordered-containers
        ];
        description = "The Elm language module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Emping" = callPackage
@@ -5284,7 +5303,7 @@ self: {
        ];
        description = "derives heuristic rules from nominal data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5296,8 +5315,8 @@ self: {
        sha256 = "0gcm29iafh3gpiqg34gcvyx2pyvgarp4kxl928c6f7x27hzbibv2";
        libraryHaskellDepends = [ base containers ];
        description = "A type class for empty containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5328,8 +5347,8 @@ self: {
          Taxonomy text transformers
        ];
        description = "Libary to interface with the NCBI Entrez REST service";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5342,7 +5361,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base smallcheck tasty tasty-hunit ];
        description = "Non-crashing `Enum` operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "EnumContainers" = callPackage
@@ -5353,8 +5372,8 @@ self: {
        sha256 = "14ckpgaviny3c0d1jn3blkkpri0cm8ac264y7kak965knjccq0k8";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Simple Enum-class-based int containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5366,8 +5385,8 @@ self: {
        sha256 = "1v3jp1l95kybvdlpvp6bd0ryihxrvlnpkqz7fl1n4vazhkqk6zjz";
        libraryHaskellDepends = [ base containers ];
        description = "More general IntMap replacement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5386,8 +5405,8 @@ self: {
          transformers
        ];
        description = "Render math formula in ASCII, and perform some simplifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5401,8 +5420,8 @@ self: {
          base containers HUnit mtl union-find-array
        ];
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5422,8 +5441,8 @@ self: {
          regions safer-file-handles storablevector transformers unix
        ];
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5435,8 +5454,8 @@ self: {
        sha256 = "15xijkc23sqakwa4qmf2hvcn07kd9ahx3z15a6lr18cs43pbjw93";
        libraryHaskellDepends = [ ansi-terminal base mtl ];
        description = "Methods for estimating the progress of functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5461,8 +5480,8 @@ self: {
        ];
        executablePkgconfigDepends = [ pcre ];
        description = "A new implementation of the LambdaMOO server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) pcre;};
 
@@ -5478,8 +5497,8 @@ self: {
          base containers ghc mtl operational random SafeSemaphore time unix
        ];
        description = "A general data-flow framework";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5498,8 +5517,8 @@ self: {
          array base containers deepseq Etage fgl mtl parallel random time
        ];
        description = "Data-flow based graph algorithms";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5514,8 +5533,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        description = "A 2-D shooting game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5538,7 +5557,7 @@ self: {
        executableSystemDepends = [ libpcap ];
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libpcap;};
 
@@ -5550,7 +5569,7 @@ self: {
        sha256 = "1a6bvi0y1pnzpx0x3arrardgkbs0m8ssfwcyxf6fim87wcb0jcgv";
        libraryHaskellDepends = [ base ];
        description = "Library for using euro currency, italian language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Euterpea" = callPackage
@@ -5566,7 +5585,7 @@ self: {
          heap PortMidi random stm
        ];
        description = "Library for computer music research and education";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "EventSocket" = callPackage
@@ -5581,8 +5600,8 @@ self: {
          base bytestring containers haskell98 mtl network
        ];
        description = "Interfaces with FreeSwitch Event Socket";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5602,8 +5621,8 @@ self: {
          random regex-compat time unix Unixutils zlib
        ];
        description = "A grab bag of modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5616,7 +5635,7 @@ self: {
        libraryHaskellDepends = [ base inline-c ];
        testHaskellDepends = [ base hspec inline-c ];
        description = "Haskell Foreign Accelerate Interface";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "FComp" = callPackage
@@ -5641,8 +5660,8 @@ self: {
          template-haskell time uu-parsinglib
        ];
        description = "Compose music";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5657,7 +5676,7 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5670,8 +5689,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fmodex64 ];
        description = "The Haskell FModEx raw API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {fmodex64 = null;};
 
@@ -5685,8 +5704,8 @@ self: {
        editedCabalFile = "0d6mjr7b37f5bgjijjgx4x4fgfmkbhksphzkaf0p5jyzxp45fasc";
        libraryHaskellDepends = [ base containers ];
        description = "Efficient simple pretty printing combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5698,7 +5717,7 @@ self: {
        sha256 = "0gsrfzk5g499r7xdhsaag53207bd015jwcrl2f9izmpa6gli5las";
        libraryHaskellDepends = [ base containers matrix vector ];
        description = "Basic concepts of finite state machines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FTGL" = callPackage
@@ -5710,8 +5729,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -5727,8 +5746,8 @@ self: {
        ];
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ftgl;};
 
@@ -5747,8 +5766,8 @@ self: {
          strict
        ];
        description = "A command-line FTP client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5773,8 +5792,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5790,8 +5809,8 @@ self: {
          AC-Angle base containers digits QuickCheck template-haskell
        ];
        description = "A collection of facts about the real world";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5803,8 +5822,8 @@ self: {
        sha256 = "1qhjqswx4qyfan3rpvvl1hgmf369krqprlr6x20hp34r2qw9s135";
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5816,8 +5835,8 @@ self: {
        sha256 = "0yxaqyn6nxbyfkn5pmd7wh951dhdvkg1xgh5757f7hn00bx87wv1";
        libraryHaskellDepends = [ base STMonadTrans vector ];
        description = "A monad and monad transformer for pushing things onto a stack very fast";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5834,8 +5853,8 @@ self: {
          pipes-bytestring
        ];
        description = "Fasta and Fastq streaming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5849,7 +5868,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        testHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Data structure for fast query and update of cumulative sums";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FermatsLastMargin" = callPackage
@@ -5869,7 +5888,7 @@ self: {
        ];
        description = "Annotate ps and pdf documents";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5886,8 +5905,8 @@ self: {
          template-haskell
        ];
        description = "Ferry Core Components";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5901,8 +5920,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Evaluation using F-Algebras";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5919,8 +5938,8 @@ self: {
          vector-space
        ];
        description = "Functional 3D";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5936,8 +5955,8 @@ self: {
          base bytestring directory extensible-exceptions filepath mtl unix
        ];
        description = "Expressive file and directory manipulation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5953,8 +5972,8 @@ self: {
          base bytestring directory filepath mtl unix-compat
        ];
        description = "Expressive file and directory manipulation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5971,8 +5990,8 @@ self: {
          transformers
        ];
        description = "Functions on System.FilePath";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5988,8 +6007,8 @@ self: {
          base binary bytestring directory filepath mtl old-time
        ];
        description = "File system data structure and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6006,8 +6025,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "File content extraction/rearrangement";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6025,7 +6044,9 @@ self: {
          alg base foldable1 natural-induction peano universe-base
        ];
        description = "Finite totally-ordered sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -6040,8 +6061,8 @@ self: {
          base bytestring http-conduit network old-locale time
        ];
        description = "Obtain quote data from finance.yahoo.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6058,8 +6079,8 @@ self: {
          time
        ];
        description = "Obtain Treasury yield curve data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6071,7 +6092,7 @@ self: {
        sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717";
        libraryHaskellDepends = [ base directory filepath ];
        description = "Locate directory of original program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FiniteMap" = callPackage
@@ -6082,8 +6103,8 @@ self: {
        sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky";
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
-       license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsdOriginal;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6095,8 +6116,8 @@ self: {
        sha256 = "1941ickx8aj3qbkry4gz8ni6snh26gkdrgabpx9z588518q4x27i";
        libraryHaskellDepends = [ base containers Proper ];
        description = "Grammar and typeclass for first order theories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6108,7 +6129,7 @@ self: {
        sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn";
        libraryHaskellDepends = [ base deepseq template-haskell ];
        description = "Fixed point, large word, and large int numerical representations (types and common class instances)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Flippi" = callPackage
@@ -6126,8 +6147,8 @@ self: {
          base cgi containers directory haskell98 old-time parsec xhtml
        ];
        description = "Wiki";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6139,7 +6160,7 @@ self: {
        sha256 = "0c38062vnjmy3fc5nxwg7sgbfabikaakgdsl34ka229s6w7pm8x3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Read and write hexadecimal floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Focus" = callPackage
@@ -6150,7 +6171,7 @@ self: {
        sha256 = "1f1ch6mxgaam1i4ryd1av879y2f8wn3wmg47h23w2l0pvgmxgrj1";
        libraryHaskellDepends = [ base MissingH split ];
        description = "Tools for focusing in on locations within numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Folly" = callPackage
@@ -6164,7 +6185,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base containers HUnit parsec ];
        description = "A first order logic library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FontyFruity" = callPackage
@@ -6180,7 +6201,7 @@ self: {
          vector xml
        ];
        description = "A true type file format loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ForSyDe" = callPackage
@@ -6201,8 +6222,8 @@ self: {
          template-haskell type-level
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6224,7 +6245,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Tree- and forest structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Forestry" = callPackage
@@ -6250,8 +6271,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Comparison of trees and forests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6263,8 +6284,8 @@ self: {
        sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj";
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
        description = "Forkable monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6289,8 +6310,8 @@ self: {
          transformers trifecta unordered-containers vector
        ];
        description = "(Context-free) grammars in formal language theory";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6313,8 +6334,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6335,8 +6356,8 @@ self: {
          array base cmdtheline containers criterion random strict
        ];
        description = "Utilities to generate and solve puzzles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6367,7 +6388,7 @@ self: {
        ];
        executableSystemDepends = [ libX11 ];
        description = "Generates colorful wallpapers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs.xorg) libX11;};
 
   "Fractaler" = callPackage
@@ -6383,8 +6404,8 @@ self: {
        executableHaskellDepends = [
          base FTGL GLFW-b OpenGLRaw parallel random time
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6416,7 +6437,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Frames-beam" = callPackage
@@ -6439,8 +6460,8 @@ self: {
          generics-sop hspec hspec-core QuickCheck text vinyl
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6458,8 +6479,8 @@ self: {
        ];
        testHaskellDepends = [ base Frames hspec pipes ];
        description = "Alternative CSV parser for the Frames package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6480,8 +6501,8 @@ self: {
          base foldl Frames random text vector vinyl
        ];
        description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6499,7 +6520,7 @@ self: {
        ];
        testHaskellDepends = [ base Frames streamly text vinyl ];
        description = "A streamly layer for Frames I/O";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Frank" = callPackage
@@ -6512,8 +6533,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl newtype she void ];
        description = "An experimental programming language with typed algebraic effects";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6528,8 +6549,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6547,7 +6568,7 @@ self: {
        libraryHaskellDepends = [ base base-compat GLUT OpenGL random ];
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "A lightweight, cross-platform, OpenGL-based game engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Fungi" = callPackage
@@ -6566,8 +6587,8 @@ self: {
          mwc-random old-time process random transformers tuple
        ];
        description = "Funge-98 interpreter written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6579,7 +6600,7 @@ self: {
        sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2";
        libraryHaskellDepends = [ base directory random transformers ];
        description = "Genetic algorithm library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GGg" = callPackage
@@ -6592,8 +6613,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bimap ];
        description = "GGg cipher";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6606,7 +6627,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
        description = "A graphical viewer for Hood";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GLFW" = callPackage
@@ -6618,8 +6639,8 @@ self: {
        libraryHaskellDepends = [ base OpenGL ];
        librarySystemDepends = [ libGL libX11 libXext libXfixes ];
        description = "A Haskell binding for GLFW";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;};
@@ -6634,8 +6655,8 @@ self: {
        libraryHaskellDepends = [ base mtl OGL ];
        librarySystemDepends = [ libX11 libXrandr ];
        description = "A binding for GLFW (OGL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
@@ -6653,7 +6674,7 @@ self: {
          test-framework-hunit
        ];
        description = "Bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GLFW-b-demo" = callPackage
@@ -6670,8 +6691,8 @@ self: {
          base GLFW-b mtl OpenGL pretty stm transformers
        ];
        description = "GLFW-b demo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6685,8 +6706,8 @@ self: {
          base GLFW monad-task OpenGL transformers
        ];
        description = "GLFW utility functions to use together with monad-task";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6699,7 +6720,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libGL libX11 ];
        description = "Open OpenGL context windows in X11 with libX11";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;};
 
   "GLM" = callPackage
@@ -6727,7 +6748,7 @@ self: {
          test-framework-th
        ];
        description = "Simple Gridlab-D GLM parser and utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "GLMatrix" = callPackage
@@ -6738,8 +6759,8 @@ self: {
        sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4";
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Utilities for working with OpenGL matrices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6752,7 +6773,7 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw transformers ];
        librarySystemDepends = [ libGL libGLU ];
        description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
   "GLUT" = callPackage
@@ -6761,15 +6782,15 @@ self: {
      }:
      mkDerivation {
        pname = "GLUT";
-       version = "2.7.0.15";
-       sha256 = "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9";
+       version = "2.7.0.16";
+       sha256 = "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
        description = "A binding for the OpenGL Utility Toolkit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GLUtil" = callPackage
@@ -6789,7 +6810,7 @@ self: {
        ];
        libraryToolDepends = [ hpp ];
        description = "Miscellaneous OpenGL utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GPX" = callPackage
@@ -6805,8 +6826,8 @@ self: {
          xsd
        ];
        description = "Parse GPX files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6824,8 +6845,8 @@ self: {
          transformers
        ];
        description = "Typesafe functional GPU graphics programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6839,8 +6860,8 @@ self: {
          array base containers GPipe HaXml mtl Vec
        ];
        description = "Load GPipe meshes from Collada files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6859,7 +6880,7 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6872,8 +6893,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        description = "GLFW OpenGL context creation for GPipe";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6885,8 +6906,8 @@ self: {
        sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4";
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        description = "Load GPipe textures from filesystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6905,8 +6926,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "A library for GTA programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6928,8 +6949,8 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Some kind of game library or set of utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6947,8 +6968,8 @@ self: {
          base containers directory filepath mtl parsec transformers
        ];
        description = "An Io interpreter in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6960,7 +6981,7 @@ self: {
        sha256 = "0v91q0m90338qpxg4hnvb7n6vm1jap3y1rvn9kyzmnxh03rarpx2";
        libraryHaskellDepends = [ base ];
        description = "Non-adaptive Gaussian quadrature for numeric integraton";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GeBoP" = callPackage
@@ -6976,8 +6997,8 @@ self: {
          array base directory random wx wxcore
        ];
        description = "Several games";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7012,7 +7033,7 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7026,8 +7047,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7047,7 +7068,7 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7073,8 +7094,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "Hox gene clustering";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7088,8 +7109,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "A general TicTacToe game implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7101,7 +7122,7 @@ self: {
        sha256 = "0g5frpzq8hr2wqbf91cxcyxqqsw06p1w9f1sm3k6v1hz13kpmspf";
        libraryHaskellDepends = [ base ghc-prim pretty ];
        description = "A generic, derivable, haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GenussFold" = callPackage
@@ -7128,8 +7149,8 @@ self: {
          test-framework-th
        ];
        description = "MCFGs for Genus-1 RNA Pseudoknots";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7142,7 +7163,7 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap syb ];
        description = "Pure bindings for the MaxMind IP database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "GeocoderOpenCage" = callPackage
@@ -7155,7 +7176,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7167,7 +7188,7 @@ self: {
        sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q";
        libraryHaskellDepends = [ base ];
        description = "Geodetic calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GeomPredicates" = callPackage
@@ -7178,7 +7199,7 @@ self: {
        sha256 = "19scirh2hy9y9kv16pcp44v31cs3868ig28r8blj39gdv4wqxwcy";
        libraryHaskellDepends = [ base ];
        description = "Geometric predicates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GeomPredicates-SSE" = callPackage
@@ -7189,8 +7210,8 @@ self: {
        sha256 = "18mdaf2j1svklka5ms9ihj07d9l92ivqjk0y8jv0l9ni44hrhxcq";
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7203,8 +7224,8 @@ self: {
        libraryHaskellDepends = [ base constraints singletons ];
        testHaskellDepends = [ base constraints singletons ];
        description = "get stuff out of stuff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7217,7 +7238,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7243,8 +7264,8 @@ self: {
          haskell-gi-base process temporary text transformers
        ];
        description = "GIF creation utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7256,7 +7277,7 @@ self: {
        sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf";
        libraryHaskellDepends = [ base directory extra old-time process ];
        description = "to auto-do somethings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Gleam" = callPackage
@@ -7267,8 +7288,8 @@ self: {
        sha256 = "08nabgn7v0rw4aihbihbijqgajrvyc7z7nl67jmka39fh5zm6blm";
        libraryHaskellDepends = [ base mtl split threepenny-gui ];
        description = "HTML Canvas graphics, animations and simulations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7291,7 +7312,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Globbing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GlomeTrace" = callPackage
@@ -7303,7 +7324,7 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Ray Tracing Library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7334,7 +7355,7 @@ self: {
        ];
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7346,7 +7367,7 @@ self: {
        sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9";
        libraryHaskellDepends = [ base ];
        description = "Generate web-based charts using the Google Chart API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GoogleCodeJam" = callPackage
@@ -7361,8 +7382,8 @@ self: {
          array base containers mtl parallel safe split transformers
        ];
        description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7378,8 +7399,8 @@ self: {
          AttoJson base bytestring containers dataenc download-curl
        ];
        description = "Haskell Interface to Google Directions API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7395,8 +7416,8 @@ self: {
          base binary Crypto haskell98 HTTP mtl network split
        ];
        description = "Interface to Google Safe Browsing API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7410,7 +7431,7 @@ self: {
          base dataenc download-curl utf8-string xml
        ];
        description = "Interface to Google Suggest API";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "GoogleTranslate" = callPackage
@@ -7424,8 +7445,8 @@ self: {
          AttoJson base bytestring dataenc download-curl
        ];
        description = "Interface to Google Translate API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7437,8 +7458,8 @@ self: {
        sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad and monadic transformer providing \"goto\" functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7450,8 +7471,8 @@ self: {
        sha256 = "167lr6ps5yy3243zfa4nl1jq369xcrrspcglz9xgnx2q1z305w8x";
        libraryHaskellDepends = [ base ];
        description = "Grafos Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7474,8 +7495,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Grammar products and higher-dimensional grammars";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7494,8 +7515,8 @@ self: {
        ];
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7510,8 +7531,8 @@ self: {
          array base containers Graph500 mtl stm time
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7529,8 +7550,8 @@ self: {
          array base containers Graph500 GraphHammer mtl
        ];
        description = "Test harness for TriangleCount analysis";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7542,7 +7563,7 @@ self: {
        sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
        libraryHaskellDepends = [ array base containers ];
        description = "Tarjan's algorithm for computing the strongly connected components of a graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Graphalyze" = callPackage
@@ -7559,7 +7580,7 @@ self: {
        ];
        description = "Graph-Theoretic Analysis library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Grempa" = callPackage
@@ -7574,8 +7595,8 @@ self: {
          array base containers mtl QuickCheck template-haskell th-lift
        ];
        description = "Embedded grammar DSL and LALR parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7593,8 +7614,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Parser and selection library for expression languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7617,7 +7638,7 @@ self: {
        ];
        description = "A declarative make-like interpreter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "GrowlNotify" = callPackage
@@ -7637,8 +7658,8 @@ self: {
          base binary bytestring Crypto haskell98 network
        ];
        description = "Notification utility for Growl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7655,7 +7676,7 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7671,8 +7692,8 @@ self: {
          base bitmap bitmap-opengl gtk gtkglext GtkTV OpenGL stb-image time
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7686,8 +7707,8 @@ self: {
          base gtk time TV TypeCompose vector-space
        ];
        description = "Gtk-based GUIs for Tangible Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7706,8 +7727,8 @@ self: {
          proplang
        ];
        description = "A graphical REPL and development environment for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7719,8 +7740,8 @@ self: {
        sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        description = "GUIs for Tangible Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7741,8 +7762,8 @@ self: {
          temporary vector
        ];
        description = "The Haskell/R mixed programming environment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7767,8 +7788,8 @@ self: {
          utility-ht vector
        ];
        description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7784,7 +7805,7 @@ self: {
        executableHaskellDepends = [ array base ];
        description = "A simple ARM emulator in haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HAppS-Data" = callPackage
@@ -7800,8 +7821,8 @@ self: {
          syb-with-class template-haskell
        ];
        description = "HAppS data manipulation libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7817,8 +7838,8 @@ self: {
          base containers HAppS-Data HAppS-State HAppS-Util hslogger mtl syb
          syb-with-class template-haskell
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7839,8 +7860,8 @@ self: {
          xhtml
        ];
        description = "Web related tools and services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7860,8 +7881,8 @@ self: {
          random stm syb template-haskell unix
        ];
        description = "Event-based distributed state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7878,8 +7899,8 @@ self: {
          template-haskell
        ];
        description = "Web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7891,7 +7912,7 @@ self: {
        sha256 = "1hwxh60b26chcd466vlpxc7hx3smdnfl40mfxpyh8j1597v2aqa3";
        doHaddock = false;
        description = "OBSOLETE. Please use happstack-helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HCL" = callPackage
@@ -7899,10 +7920,8 @@ self: {
      }:
      mkDerivation {
        pname = "HCL";
-       version = "1.7.1";
-       sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp";
-       revision = "1";
-       editedCabalFile = "1gl61kqccd909dif3644qi1whrcbkrfif6d52hrlf2vc3kwpjs0z";
+       version = "1.8";
+       sha256 = "1h5mrrpr6kma8k0mqzzjcyg3nd94f7lv6a2k5pfxcqs01qy3khgk";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -7914,8 +7933,8 @@ self: {
          base containers HUnit mtl QuickCheck random
        ];
        description = "High-level library for building command line interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7929,8 +7948,8 @@ self: {
          base mtl QuickCheck random random-shuffle
        ];
        description = "A library for implementing a Deck of Cards";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7949,7 +7968,7 @@ self: {
          array base bytestring fail QuickCheck random semigroups
        ];
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HDBC" = callPackage
@@ -7967,7 +7986,7 @@ self: {
          utf8-string
        ];
        description = "Haskell Database Connectivity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HDBC-mysql" = callPackage
@@ -7983,7 +8002,7 @@ self: {
        librarySystemDepends = [ mysqlclient openssl zlib ];
        description = "MySQL driver for HDBC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mysqlclient = null; inherit (pkgs) openssl; 
          inherit (pkgs) zlib;};
@@ -8003,7 +8022,7 @@ self: {
        ];
        librarySystemDepends = [ unixODBC ];
        description = "ODBC driver for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
@@ -8023,7 +8042,7 @@ self: {
        ];
        librarySystemDepends = [ postgresql ];
        description = "PostgreSQL driver for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
   "HDBC-postgresql-hstore" = callPackage
@@ -8034,8 +8053,8 @@ self: {
        sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8047,7 +8066,7 @@ self: {
        sha256 = "1qwnqb62zgmm4dy5qlcj04aczja6yn16c92jc63zkln9pcc7y1da";
        libraryHaskellDepends = [ base HDBC ];
        description = "Bracketed connection for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HDBC-sqlite3" = callPackage
@@ -8062,7 +8081,7 @@ self: {
        libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
        librarySystemDepends = [ sqlite ];
        description = "Sqlite v3 driver for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) sqlite;};
 
   "HDRUtils" = callPackage
@@ -8076,8 +8095,8 @@ self: {
        libraryHaskellDepends = [ array base colour containers mtl unix ];
        librarySystemDepends = [ pfstools ];
        description = "Utilities for reading, manipulating, and writing HDR images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) pfstools;};
 
@@ -8089,8 +8108,8 @@ self: {
        sha256 = "08lry7w4zb7j81q9d7rjpz0chcbr9laxi4h9dz327pfcgmy083sy";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mpfr;};
 
@@ -8107,8 +8126,8 @@ self: {
        ];
        librarySystemDepends = [ xlsxwriter zlib ];
        description = "Create Excel files with Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xlsxwriter = null; inherit (pkgs) zlib;};
 
@@ -8130,8 +8149,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "The library for generating a graphical interface on the web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8143,8 +8162,8 @@ self: {
        sha256 = "09h6wfalziw39c2sghj8qw82vyvnl01qlsam6ngkfkdirgj5sg5h";
        libraryHaskellDepends = [ base c-storable-deriving ];
        description = "A Queue with a random (weighted) pick function";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8162,8 +8181,8 @@ self: {
          sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
        '';
        description = "HFuse is a binding for the Linux FUSE library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fuse;};
 
   "HGE2D" = callPackage
@@ -8179,8 +8198,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "2D game engine written in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8192,7 +8211,7 @@ self: {
        sha256 = "087k8i0bha3mzpqa3z3c6npl5vmccg7xcwl28lbv0yzbvj1qkg38";
        libraryHaskellDepends = [ array base stm X11 ];
        description = "A simple graphics library based on X11 or Win32";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HGamer3D" = callPackage
@@ -8210,7 +8229,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-API" = callPackage
@@ -8227,7 +8246,7 @@ self: {
        ];
        description = "Library to enable 3D game development for Haskell - API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Audio" = callPackage
@@ -8243,7 +8262,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - Audio Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Bullet-Binding" = callPackage
@@ -8255,7 +8274,7 @@ self: {
        libraryHaskellDepends = [ base HGamer3D-Data ];
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-CAudio-Binding" = callPackage
@@ -8269,7 +8288,7 @@ self: {
        librarySystemDepends = [ HGamer3DCAudio015 ];
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {HGamer3DCAudio015 = null;};
 
   "HGamer3D-CEGUI-Binding" = callPackage
@@ -8286,7 +8305,7 @@ self: {
        ];
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {CEGUIBase = null; CEGUIOgreRenderer = null; 
          hg3dcegui050 = null;};
 
@@ -8304,7 +8323,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - Game Engine and Utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Data" = callPackage
@@ -8320,7 +8339,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - Data Definitions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Enet-Binding" = callPackage
@@ -8333,7 +8352,7 @@ self: {
        librarySystemDepends = [ enet hg3denet050 ];
        description = "Enet Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) enet; hg3denet050 = null;};
 
   "HGamer3D-GUI" = callPackage
@@ -8349,7 +8368,7 @@ self: {
        ];
        description = "GUI Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Graphics3D" = callPackage
@@ -8369,7 +8388,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - 3D Graphics Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-InputSystem" = callPackage
@@ -8386,7 +8405,7 @@ self: {
        ];
        description = "Joystick, Mouse and Keyboard Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Network" = callPackage
@@ -8402,7 +8421,7 @@ self: {
        ];
        description = "Networking Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-OIS-Binding" = callPackage
@@ -8419,7 +8438,7 @@ self: {
        librarySystemDepends = [ HGamer3DOIS015 ];
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {HGamer3DOIS015 = null;};
 
   "HGamer3D-Ogre-Binding" = callPackage
@@ -8438,7 +8457,7 @@ self: {
        ];
        description = "Ogre Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {OgreMain = null; OgrePaging = null; OgreProperty = null; 
          OgreRTShaderSystem = null; OgreTerrain = null; 
          hg3dogre050 = null;};
@@ -8457,7 +8476,7 @@ self: {
        librarySystemDepends = [ hg3dsdl2050 libX11 SDL2 ];
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; 
          inherit (pkgs.xorg) libX11;};
 
@@ -8475,7 +8494,7 @@ self: {
        ];
        description = "SFML Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; 
          sfml-system = null; sfml-window = null;};
 
@@ -8491,7 +8510,7 @@ self: {
        ];
        description = "Windowing and Event Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Wire" = callPackage
@@ -8509,7 +8528,7 @@ self: {
        ];
        description = "Wire Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGraphStorage" = callPackage
@@ -8539,8 +8558,8 @@ self: {
          transformers zlib
        ];
        description = "Graph database stored on disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8552,8 +8571,8 @@ self: {
        sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Hardware Description Language embedded in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8565,8 +8584,8 @@ self: {
        sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8";
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8589,8 +8608,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) jdk;};
 
@@ -8604,8 +8623,8 @@ self: {
        editedCabalFile = "05m2kgz0laxv9jl1qfc1sxndan9503010y3aadvfcsxi9cyg3j1j";
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8625,8 +8644,8 @@ self: {
          parallel random template-haskell vector vector-heterogenous
        ];
        description = "Algebraic foundation for homomorphic learning";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8645,8 +8664,8 @@ self: {
          base ConstraintKinds containers heap HLearn-algebra
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8669,8 +8688,8 @@ self: {
          math-functions MonadRandom normaldistribution parsec primitive
          QuickCheck statistics vector vector-th-unbox
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8686,8 +8705,8 @@ self: {
          base ConstraintKinds containers deepseq HLearn-algebra list-extras
          MonadRandom QuickCheck vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8711,8 +8730,8 @@ self: {
          statistics template-haskell vector vector-th-unbox
        ];
        description = "Distributions for use with the HLearn library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8738,8 +8757,8 @@ self: {
          mtl process QuickCheck semigroups syb template-haskell
        ];
        description = "Heterogeneous lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8753,7 +8772,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base regex-applicative ];
        description = "A preprocessor for HList labelable labels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HLogger" = callPackage
@@ -8767,8 +8786,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        executableHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent and easy-to-use logging library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8779,8 +8798,8 @@ self: {
        version = "0.2.1";
        sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
        description = "A hidden markov model library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8797,7 +8816,7 @@ self: {
          base data-default hashable mtl unordered-containers
        ];
        description = "Fast heterogeneous maps and unconstrained typeable-like functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HMarkov" = callPackage
@@ -8814,7 +8833,7 @@ self: {
          vector
        ];
        description = "Markov-generated sequences";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HNM" = callPackage
@@ -8836,8 +8855,8 @@ self: {
          base containers glib gtk haskell98 mtl process regex-posix unix
        ];
        description = "Happy Network Manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8856,7 +8875,7 @@ self: {
          base math-functions parallel parallel-io random
        ];
        description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HODE" = callPackage
@@ -8868,8 +8887,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ode;};
 
@@ -8886,8 +8905,8 @@ self: {
        executableHaskellDepends = [ base ];
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) opencv;};
 
@@ -8912,8 +8931,8 @@ self: {
        ];
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8936,8 +8955,8 @@ self: {
          parsec utf8-string
        ];
        description = "Extract Haskell declarations by name";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8955,7 +8974,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Phone number parser and validator - This is now DEPRECATED!";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HPi" = callPackage
@@ -8967,8 +8986,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bcm2835 ];
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bcm2835 = null;};
 
@@ -8986,8 +9005,8 @@ self: {
        executableHaskellDepends = [ base glade glib gtk ];
        executablePkgconfigDepends = [ plplotd-gnome2 ];
        description = "A minimal monadic PLplot interface for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {plplotd-gnome2 = null;};
 
@@ -9007,7 +9026,7 @@ self: {
        ];
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9025,8 +9044,8 @@ self: {
          HROOT-io HROOT-math HROOT-tree template-haskell
        ];
        description = "Haskell binding to the ROOT data analysis framework";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9040,8 +9059,8 @@ self: {
          base fficxx fficxx-runtime template-haskell
        ];
        description = "Haskell binding to ROOT Core modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9057,8 +9076,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell
        ];
        description = "Haskell binding to ROOT Graf modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9074,8 +9093,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT Hist modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9091,8 +9110,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT IO modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9108,8 +9127,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT Math modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9125,8 +9144,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT Tree modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9141,8 +9160,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory haskell98 ];
        description = "Haskell raytracer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9163,8 +9182,8 @@ self: {
          array base Cabal containers directory filepath parsec process unix
        ];
        description = "Generate FFI import declarations from C include files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9183,8 +9202,8 @@ self: {
        ];
        executableHaskellDepends = [ csv ];
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9222,7 +9241,7 @@ self: {
        ];
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9234,8 +9253,8 @@ self: {
        sha256 = "0snix2qdj1d66v6qj6fl0zizl617kjzbmxiswdd5i0b5lzjkpagb";
        libraryHaskellDepends = [ base containers hashable hashtables ];
        description = "Faux heterogeneous sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9247,7 +9266,7 @@ self: {
        sha256 = "03gb5dd59mirwb11b98vbg60w2zwfsbr8akk7qbq01z7n7rkgsr7";
        libraryHaskellDepends = [ base ];
        description = "OpenStreetMap Slippy Map";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HSmarty" = callPackage
@@ -9266,8 +9285,8 @@ self: {
        ];
        testHaskellDepends = [ aeson attoparsec base HTF text ];
        description = "Small template engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9284,7 +9303,7 @@ self: {
          markov-chain pure-fft random UISF
        ];
        description = "Library for computer music education";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HSoundFile" = callPackage
@@ -9299,8 +9318,8 @@ self: {
          base binary bytestring filepath haskell98 mtl parallel
        ];
        description = "Audio file reading/writing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9321,7 +9340,7 @@ self: {
          template-haskell text time void
        ];
        description = "StringTemplate implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HStringTemplateHelpers" = callPackage
@@ -9338,7 +9357,7 @@ self: {
        ];
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9350,7 +9369,7 @@ self: {
        sha256 = "0vij1xp3gm7s0d5hqlpl6jm949gpimaxz8cr3njaa4kkgpw8yd4g";
        libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HTF" = callPackage
@@ -9385,8 +9404,8 @@ self: {
          unordered-containers
        ];
        description = "The Haskell Test Framework";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9409,7 +9428,7 @@ self: {
          pureMD5 split test-framework test-framework-hunit
        ];
        description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -9421,7 +9440,7 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        doHaddock = false;
        description = "DEPRECATED Enable simple wrappers to Network.HTTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HTab" = callPackage
@@ -9439,8 +9458,8 @@ self: {
          base cmdargs containers deepseq hylolib mtl random strict
        ];
        description = "Tableau based theorem prover for hybrid logics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9458,8 +9477,8 @@ self: {
          array base mtl random SDL SDL-image SDL-ttf
        ];
        description = "An SDL tic-tac-toe game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9469,10 +9488,25 @@ self: {
        pname = "HUnit";
        version = "1.6.1.0";
        sha256 = "1rpi52rnjpyv379rm6n3s706z6mv114aychf03dq456wfa4b7123";
+       revision = "1";
+       editedCabalFile = "1pb42lix1fzhvcc2g7kz5lw8fsz6kcj9b7almr7kvv38f8vmbn5i";
        libraryHaskellDepends = [ base call-stack deepseq ];
        testHaskellDepends = [ base call-stack deepseq filepath ];
        description = "A unit testing framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "HUnit_1_6_2_0" = callPackage
+    ({ mkDerivation, base, call-stack, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.6.2.0";
+       sha256 = "1as4sw5y39c3zrmr6sb8zbw74c9gdn4401y0dx45ih7zf6457dxh";
+       libraryHaskellDepends = [ base call-stack deepseq ];
+       testHaskellDepends = [ base call-stack deepseq filepath ];
+       description = "A unit testing framework for Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -9483,8 +9517,8 @@ self: {
        sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6";
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        description = "Assertions for HUnit with difference reporting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9506,7 +9540,7 @@ self: {
          parsec text time timeit unordered-containers
        ];
        description = "A test framework building on HUnit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HUnit-approx" = callPackage
@@ -9518,7 +9552,7 @@ self: {
        libraryHaskellDepends = [ base call-stack HUnit ];
        testHaskellDepends = [ base call-stack HUnit ];
        description = "Approximate equality for floating point numbers with HUnit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HXMPP" = callPackage
@@ -9544,8 +9578,8 @@ self: {
          xml-enumerator xml-types
        ];
        description = "A (prototyped) easy to use XMPP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9563,8 +9597,8 @@ self: {
          template-haskell
        ];
        description = "A Compiler from XQuery to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9579,8 +9613,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9592,8 +9626,8 @@ self: {
        sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458";
        libraryHaskellDepends = [ base bytestring serialport stm ];
        description = "An Haskell library to drive the french Minitel through a serial port";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9605,8 +9639,8 @@ self: {
        sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz";
        libraryHaskellDepends = [ base template-haskell th-lift ];
        description = "Haskell bindings for Python";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9641,8 +9675,8 @@ self: {
          parsec turtle
        ];
        description = "the Haskell Refactorer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9663,7 +9697,7 @@ self: {
          base parsec QuickCheck tasty tasty-quickcheck text
        ];
        description = "The Haskell LaTeX library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -9681,8 +9715,8 @@ self: {
          haskell-src-exts mtl parsec
        ];
        description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9698,8 +9732,8 @@ self: {
          antiquoter base haskell-src-meta HaTeX template-haskell text
        ];
        description = "Quasiquoters for HaTeX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9719,8 +9753,8 @@ self: {
          test-framework-quickcheck
        ];
        description = "An implementation of the Version Space Algebra learning framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9757,8 +9791,8 @@ self: {
        libraryHaskellDepends = [ base containers network old-locale ];
        executableHaskellDepends = [ text time vty vty-ui ];
        description = "Simple chat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9779,8 +9813,8 @@ self: {
          base Crypto directory hdaemonize hint mtl old-time parsec
        ];
        description = "A Procmail Replacement as Haskell EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9798,8 +9832,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        description = "Aggression analysis for Tweets on Twitter";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9811,8 +9845,8 @@ self: {
        sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Haskell implementation of a HandlerSocket client (API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9833,7 +9867,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hxt ];
        description = "Work with HTML more easily in HXT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Hangman" = callPackage
@@ -9847,8 +9881,8 @@ self: {
        executableHaskellDepends = [ base random transformers ];
        testHaskellDepends = [ base hspec transformers ];
        description = "The classic game of Hangman";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9866,8 +9900,8 @@ self: {
          base constraints generics-sop safe singletons
        ];
        description = "Type Safe and End to End Decision Tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9891,8 +9925,8 @@ self: {
          process sox template-haskell uu-parsinglib vector
        ];
        description = "Harmony Analysis and Retrieval of Music";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9914,7 +9948,7 @@ self: {
          uu-parsinglib
        ];
        description = "Parsing and unambiguously representing musical chords";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "HasBigDecimal" = callPackage
@@ -9926,7 +9960,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A library for arbitrary precision decimal numbers";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "HasCacBDD" = callPackage
@@ -9942,8 +9976,8 @@ self: {
        librarySystemDepends = [ CacBDD ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell bindings for CacBDD";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {CacBDD = null;};
 
@@ -9960,8 +9994,8 @@ self: {
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
        description = "A Haskell library for inference using Gaussian processes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9980,8 +10014,8 @@ self: {
          array base list-tries monad-loops mtl numbers parsec
        ];
        description = "Minimalist R5RS Scheme interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10001,7 +10035,7 @@ self: {
        ];
        description = "Simple shell written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10018,8 +10052,8 @@ self: {
          base containers directory ghc-prim HList tagged
        ];
        description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10043,8 +10077,8 @@ self: {
          graphviz haskell-src-exts HUnit pretty split syb text vector
        ];
        description = "Haskell source code analysis program";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10056,7 +10090,7 @@ self: {
        sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz";
        libraryHaskellDepends = [ array base containers random ];
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HaskellLM" = callPackage
@@ -10068,7 +10102,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10081,7 +10115,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10098,8 +10132,8 @@ self: {
          network-bsd old-time pretty text
        ];
        description = "Client support for POP3, SMTP, and IMAP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10116,8 +10150,8 @@ self: {
          base bytestring connection data-default HaskellNet network tls
        ];
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10141,8 +10175,8 @@ self: {
          test-framework-quickcheck2 time
        ];
        description = "A concurrent bittorrent client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10156,8 +10190,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs text ];
        description = "Haskell Tutorials by Evgeny Ukhanov";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10175,8 +10209,8 @@ self: {
          base containers HGL hmatrix MonadRandom random Yampa
        ];
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10195,7 +10229,7 @@ self: {
          text transformers
        ];
        description = "mastodon client module for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Hate" = callPackage
@@ -10218,8 +10252,8 @@ self: {
          random transformers vect vect-opengl vector
        ];
        description = "A small 2D game framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10241,8 +10275,8 @@ self: {
          network regex-posix SHA template-haskell time utf8-string
        ];
        description = "Haskell Web Application Kit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10269,8 +10303,8 @@ self: {
          snap-core snap-server tar text transformers xhtml-combinators zlib
        ];
        description = "The Hayoo! search engine for Haskell API search on hackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10282,7 +10316,7 @@ self: {
        sha256 = "04ppwm7vfzndrys8x1n8vfb41vzwx59r9xp4dkbiqmrms390pj6q";
        libraryHaskellDepends = [ base mtl process strict ];
        description = "A small cross-platform library for reading and modifying the system clipboard";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Hedi" = callPackage
@@ -10303,8 +10337,8 @@ self: {
          base editline mtl parsec pretty process QuickCheck regex-posix
        ];
        description = "Line oriented editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10323,8 +10357,8 @@ self: {
        ];
        testHaskellDepends = [ base linear subhask ];
        description = "automatically improve your code's numeric stability";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10343,8 +10377,8 @@ self: {
          unamb yjtools
        ];
        description = "Message-based middleware layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10362,8 +10396,8 @@ self: {
          gtkglext IfElse mtl OpenGL parallel pretty random
        ];
        description = "Purely functional 2D graphics for visualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10380,8 +10414,8 @@ self: {
          vector
        ];
        description = "A multi-index set with advanced query capabilites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10396,7 +10430,7 @@ self: {
        ];
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Hipmunk-Utils" = callPackage
@@ -10408,8 +10442,8 @@ self: {
        libraryHaskellDepends = [ base Hipmunk linear StateVar ];
        testHaskellDepends = [ base ];
        description = "Useful functions for Hipmunk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10428,7 +10462,7 @@ self: {
        ];
        description = "A playground for testing Hipmunk";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Hish" = callPackage
@@ -10447,8 +10481,8 @@ self: {
        executableHaskellDepends = [
          base directory MissingH process regex-tdfa time
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10459,7 +10493,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl";
        libraryHaskellDepends = [ base containers gnuplot ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Hmpf" = callPackage
@@ -10477,7 +10511,7 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10502,8 +10536,8 @@ self: {
        ];
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10515,7 +10549,7 @@ self: {
        sha256 = "0y29gnbxrlj9fh0d5naa7ia1xs36fimszcbzif2zdw451jkk97r9";
        libraryHaskellDepends = [ base ];
        description = "Monoids with holes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Holumbus-Distribution" = callPackage
@@ -10535,7 +10569,7 @@ self: {
        ];
        description = "intra- and inter-program communication";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Holumbus-MapReduce" = callPackage
@@ -10557,7 +10591,7 @@ self: {
        ];
        description = "a distributed MapReduce framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Holumbus-Searchengine" = callPackage
@@ -10577,8 +10611,8 @@ self: {
          SHA unix
        ];
        description = "A search and indexing engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10599,7 +10633,7 @@ self: {
        ];
        description = "a distributed storage system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Homology" = callPackage
@@ -10629,8 +10663,8 @@ self: {
        ];
        testHaskellDepends = [ base process random ];
        description = "A Simple Key Value Store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10644,7 +10678,7 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Parser for host and port pairs like localhost:22";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Hricket" = callPackage
@@ -10657,8 +10691,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10686,8 +10720,8 @@ self: {
        ];
        testHaskellDepends = [ base directory filepath process ];
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10699,7 +10733,7 @@ self: {
        sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361";
        libraryHaskellDepends = [ array base random ];
        description = "A haskell interface to Lester Ingber's adaptive simulating annealing code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HsHTSLib" = callPackage
@@ -10719,8 +10753,8 @@ self: {
          base bytestring conduit tasty tasty-golden tasty-hunit vector
        ];
        description = "Bindings to htslib";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -10732,8 +10766,8 @@ self: {
        sha256 = "1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10750,8 +10784,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ hyperestraier qdbm ];
        description = "HyperEstraier binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hyperestraier = null; qdbm = null;};
 
@@ -10765,8 +10799,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ Judy ];
        description = "Judy bindings, and some nice APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Judy = null;};
 
@@ -10781,7 +10815,7 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base bytestring ];
        description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
@@ -10792,7 +10826,7 @@ self: {
        sha256 = "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr";
        libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
        description = "Use the system's native CA certificate store with HsOpenSSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HsParrot" = callPackage
@@ -10806,8 +10840,8 @@ self: {
          base bytestring HsSyck pretty pugs-DrIFT
        ];
        description = "Haskell integration with Parrot virtual machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10819,8 +10853,8 @@ self: {
        sha256 = "15j8zm12lcp4gm8kmciw3xy7qckqmlygn0d2difsdb598y5ijz2z";
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10832,8 +10866,8 @@ self: {
        sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
        libraryHaskellDepends = [ base bytestring mtl stm ];
        description = "Partial Subversion (SVN) binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10848,7 +10882,7 @@ self: {
          base bytestring hashtables syb utf8-string
        ];
        description = "Fast, lightweight YAML loader and dumper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "HsTools" = callPackage
@@ -10859,7 +10893,7 @@ self: {
        sha256 = "0banfivx4xc0j3c1qmda31gvvrqqsg12fzizcpman2fvdlk7kn5l";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell helper functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HsWebots" = callPackage
@@ -10882,8 +10916,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Webots bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Controller = null; driver = null;};
 
@@ -10907,7 +10941,7 @@ self: {
          text
        ];
        description = "Pure Haskell YAML 1.2 processor";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "HsYAML-aeson" = callPackage
@@ -10925,7 +10959,7 @@ self: {
          unordered-containers vector
        ];
        description = "JSON to YAML Adapter";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "Hsed" = callPackage
@@ -10948,8 +10982,8 @@ self: {
          regex-posix
        ];
        description = "Stream Editor in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10967,8 +11001,8 @@ self: {
          base containers parsec pretty process smtLib transformers
        ];
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10984,8 +11018,8 @@ self: {
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
        description = "API for controlling Philips Hue lights";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11003,8 +11037,8 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Easily bulk import CSV data to SQL Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11022,7 +11056,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ array base criterion Munkres random ];
        description = "A Linear Sum Assignment Problem (LSAP) solver";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Hydrogen" = callPackage
@@ -11042,8 +11076,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "The library for generating a WebGL scene for the web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11058,8 +11092,8 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Code for the Haskell course taught at the University of Seville";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11071,8 +11105,8 @@ self: {
        sha256 = "1p4h2hxwzp0bxkzh864vkqbwychi0j2c3rqck9vk5kfax5i1jfz8";
        libraryHaskellDepends = [ base containers directory ];
        description = "Indexable, serializable form of Data.Dynamic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11088,8 +11122,8 @@ self: {
          array base bytestring containers random
        ];
        description = "Iterated Function System generation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11110,7 +11144,7 @@ self: {
        ];
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11123,8 +11157,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11143,8 +11177,8 @@ self: {
          base bits-atomic ghc-prim HUnit QuickCheck time
        ];
        description = "Atomic compare and swap for IORefs and STRefs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11156,7 +11190,7 @@ self: {
        sha256 = "1w6f7jnjm4n0s4mr18yqv81rsnrh8f6806x523gnqljbyak18p1l";
        libraryHaskellDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "IPv6Addr" = callPackage
@@ -11174,7 +11208,7 @@ self: {
          base HUnit test-framework test-framework-hunit text
        ];
        description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "IPv6DB" = callPackage
@@ -11202,8 +11236,8 @@ self: {
          aeson base hspec http-client http-types vector
        ];
        description = "A RESTful microService for IPv6-related data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11216,7 +11250,7 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11228,7 +11262,7 @@ self: {
        sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
        libraryHaskellDepends = [ base mtl ];
        description = "Anaphoric and miscellaneous useful control-flow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Imlib" = callPackage
@@ -11239,7 +11273,7 @@ self: {
        sha256 = "075x1vcrxdwknzbad05l08i5c79svf714yvv6990ffvsfykiilry";
        libraryHaskellDepends = [ array base X11 ];
        librarySystemDepends = [ imlib2 ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) imlib2;};
 
   "ImperativeHaskell" = callPackage
@@ -11250,8 +11284,8 @@ self: {
        sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "A library for writing Imperative style haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11274,8 +11308,8 @@ self: {
        sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm";
        libraryHaskellDepends = [ base PeanoWitnesses ];
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11287,8 +11321,8 @@ self: {
        sha256 = "03c0jlnlnqm6faiandfg0kzajffk03aazkrqwav3g4vc3cdqwfgp";
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11301,8 +11335,8 @@ self: {
        libraryHaskellDepends = [ base parsec QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert integers in various bases to and from strings";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11315,7 +11349,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers ];
        description = "Dynamically sized graph library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "InternedData" = callPackage
@@ -11341,7 +11375,7 @@ self: {
          base bytestring containers criterion deepseq text
        ];
        description = "Data interning (with compact regions where possible)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Interpolation" = callPackage
@@ -11355,7 +11389,7 @@ self: {
        ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Interpolation-maxs" = callPackage
@@ -11367,7 +11401,7 @@ self: {
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "IntervalMap" = callPackage
@@ -11385,7 +11419,7 @@ self: {
          weigh
        ];
        description = "Containers for intervals, with efficient search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Irc" = callPackage
@@ -11401,8 +11435,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "DSL for IRC bots";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11434,8 +11468,8 @@ self: {
          vector
        ];
        description = "A typeclass to determine if a given value is null";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11453,8 +11487,8 @@ self: {
          hjson json JSONb parsec text vector
        ];
        description = "A combinator library on top of a generalised JSON type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11468,8 +11502,8 @@ self: {
          base bytestring json JSON-Combinator JSONb
        ];
        description = "Example uses of the JSON-Combinator library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11481,7 +11515,7 @@ self: {
        sha256 = "1xda2dy2mizpvxvn3gyhx7aql7pi26zvw044r3bm14xr5qj11q26";
        libraryHaskellDepends = [ base parsec ];
        description = "Parse JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JSONb" = callPackage
@@ -11501,8 +11535,8 @@ self: {
          containers utf8-string
        ];
        description = "JSON parser that uses byte strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11522,8 +11556,8 @@ self: {
          stm template-haskell unix zlib
        ];
        description = "Some utility functions for JYU projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11535,8 +11569,8 @@ self: {
        sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp";
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11553,8 +11587,8 @@ self: {
          base binary bytestring language-java-classfile
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11568,8 +11602,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11582,7 +11616,7 @@ self: {
        libraryHaskellDepends = [ base Euterpea random ];
        description = "Library for modeling jazz improvisation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Jdh" = callPackage
@@ -11593,8 +11627,8 @@ self: {
        sha256 = "0zg7xh3apm7x3c9gz876k5cis5jpng1bzf6g9ywbmmndry6dn1c0";
        libraryHaskellDepends = [ base ];
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11617,8 +11651,8 @@ self: {
          base containers mtl parsec pretty syb WebBits WebBits-Html
        ];
        description = "Design-by-contract for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11640,8 +11674,8 @@ self: {
          test-framework-hunit text
        ];
        description = "Combinators for bidirectional JSON parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11658,8 +11692,8 @@ self: {
          aeson base bytestring json-autotype text
        ];
        description = "JuPyTer notebook parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11676,7 +11710,7 @@ self: {
          transformers vector zlib
        ];
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-blp" = callPackage
@@ -11699,8 +11733,8 @@ self: {
          text-show unordered-containers
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11730,7 +11764,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Blurhash is a very compact represenation of a placeholder for an image";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -11741,8 +11775,8 @@ self: {
        sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm";
        libraryHaskellDepends = [ base containers JuicyPixels ];
        description = "Functions for drawing lines, squares and so on pixel by pixel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11760,7 +11794,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
        description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-repa" = callPackage
@@ -11773,7 +11807,7 @@ self: {
          base bytestring JuicyPixels repa vector
        ];
        description = "Convenience functions to obtain array representations of images";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-scale-dct" = callPackage
@@ -11792,7 +11826,7 @@ self: {
          base base-compat carray fft JuicyPixels time
        ];
        description = "Scale JuicyPixels images with DCT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-stbir" = callPackage
@@ -11808,7 +11842,7 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Scale JuicyPixels images with stb_image_resize";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-util" = callPackage
@@ -11819,7 +11853,7 @@ self: {
        sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
        libraryHaskellDepends = [ base JuicyPixels vector ];
        description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JunkDB" = callPackage
@@ -11834,8 +11868,8 @@ self: {
          aeson base binary bytestring conduit data-default directory
          filepath mtl network resourcet
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11850,8 +11884,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11866,8 +11900,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11879,8 +11913,8 @@ self: {
        sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa";
        libraryHaskellDepends = [ base ];
        description = "A simple and comprehensive Haskell parsing library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11893,7 +11927,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base Cabal ];
        description = "Knuth–Morris–Pratt string searching algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "KSP" = callPackage
@@ -11904,8 +11938,8 @@ self: {
        sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6";
        libraryHaskellDepends = [ base ];
        description = "A library with the kerbal space program universe and demo code";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11917,8 +11951,8 @@ self: {
        sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5";
        libraryHaskellDepends = [ base hmatrix ];
        description = "A slightly extended Kalman filter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11931,7 +11965,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "KdTree, for efficient search in K-dimensional point clouds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ketchup" = callPackage
@@ -11946,8 +11980,8 @@ self: {
          base base64-bytestring bytestring directory mime-types network text
        ];
        description = "A super small web framework for those who don't like big and fancy codebases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11974,7 +12008,7 @@ self: {
        ];
        description = "A compiler from Curry to Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {kics = null;};
 
   "KiCS-debugger" = callPackage
@@ -11996,7 +12030,7 @@ self: {
        ];
        description = "debug features for kics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "KiCS-prophecy" = callPackage
@@ -12012,7 +12046,7 @@ self: {
        executableHaskellDepends = [ base KiCS ];
        description = "a transformation used by the kics debugger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Kleislify" = callPackage
@@ -12023,7 +12057,7 @@ self: {
        sha256 = "0f7f6sxb774h9dx6xy6wbcrc5b2i27k9m5ay3hq9hqsjg86qmxyl";
        libraryHaskellDepends = [ base ];
        description = "Variants of Control.Arrow functions, specialised to kleislis.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Konf" = callPackage
@@ -12035,7 +12069,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec ];
        description = "A configuration language and a parser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Kriens" = callPackage
@@ -12046,8 +12080,8 @@ self: {
        sha256 = "1b6r4860qnnszs4giaidd8z1xch8vvq8qdyb9linrdhxpf5ad3sw";
        libraryHaskellDepends = [ base ];
        description = "Category for Continuation Passing Style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12064,7 +12098,7 @@ self: {
        ];
        description = "Library for automated composition and musical learning";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "KyotoCabinet" = callPackage
@@ -12078,8 +12112,8 @@ self: {
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ kyotocabinet ];
        description = "Kyoto Cabinet DB bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) kyotocabinet;};
 
@@ -12097,8 +12131,8 @@ self: {
          base cairo containers gtk mtl old-time parsec random
        ];
        description = "Plant growing programming game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12115,8 +12149,8 @@ self: {
        ];
        librarySystemDepends = [ openblasCompat ];
        description = "Linear Algebra on Typed Spaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openblasCompat;};
 
@@ -12132,7 +12166,7 @@ self: {
          base bytestring hspec lens mtl vector
        ];
        description = "LC-3 virtual machine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LDAP" = callPackage
@@ -12148,7 +12182,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        testSystemDepends = [ openldap ];
        description = "Haskell binding for C LDAP API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openldap;};
 
   "LDAPv3" = callPackage
@@ -12171,8 +12205,8 @@ self: {
          tasty-quickcheck text text-short
        ];
        description = "Lightweight Directory Access Protocol (LDAP) version 3";
-       license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12185,7 +12219,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "A continuation-based parser library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "LRU" = callPackage
@@ -12196,8 +12230,8 @@ self: {
        sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn";
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Implements an LRU data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12218,8 +12252,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "LTS: Labelled Transition System";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12231,7 +12265,7 @@ self: {
        sha256 = "0liqz3n2ycidwmg8iz7mbm0d087fcfgphvbip8bsn0hpwlf10dvw";
        libraryHaskellDepends = [ base transformers ];
        description = "Tree with only leaves carrying the data";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "LambdaCalculator" = callPackage
@@ -12248,7 +12282,7 @@ self: {
          base binary bytestring haskeline mtl parsec pretty
        ];
        description = "A basic lambda calculator with beta reduction and a REPL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LambdaDB" = callPackage
@@ -12263,7 +12297,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "On-memory Database using Lambda Function environment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LambdaDesigner" = callPackage
@@ -12280,8 +12314,8 @@ self: {
          lens-aeson matrix text transformers vector
        ];
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12314,8 +12348,8 @@ self: {
        ];
        testHaskellDepends = [ async base filepath optparse-applicative ];
        description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12335,8 +12369,8 @@ self: {
          vector
        ];
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12352,8 +12386,8 @@ self: {
          base binary bytestring hmatrix random random-shuffle split
        ];
        description = "A configurable and extensible neural network library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12378,8 +12412,8 @@ self: {
          test-framework-quickcheck2 th-instances transformers tuple uniplate
        ];
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12398,7 +12432,7 @@ self: {
        ];
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12411,8 +12445,8 @@ self: {
        libraryHaskellDepends = [ base filepath hspec mtl process text ];
        testHaskellDepends = [ base filepath hspec mtl process text ];
        description = "A library to easily host Haskell based programming competitions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12429,8 +12463,8 @@ self: {
          pipes-parse
        ];
        description = "Library for RedPitaya";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12443,7 +12477,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transfinite cardinal arithmetic library including all known large cardinals";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Lastik" = callPackage
@@ -12459,8 +12493,8 @@ self: {
          pureMD5 SHA zip-archive
        ];
        description = "A library for compiling programs in a variety of languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12497,7 +12531,7 @@ self: {
          base binary byteable bytestring criterion cryptonite memory
        ];
        description = "Lazy PBKDF2 generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "LazyVault" = callPackage
@@ -12510,8 +12544,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath unix ];
        description = "A simple sandboxing tool for Haskell packages";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12527,8 +12561,8 @@ self: {
        executableHaskellDepends = [ base containers hmatrix vector ];
        testHaskellDepends = [ base containers hmatrix vector ];
        description = "The most frequently used machine learning tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12542,8 +12576,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        description = "A Snake II clone written using SDL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12564,8 +12598,8 @@ self: {
        libraryPkgconfigDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libclang (a C++ parsing library)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;};
 
@@ -12585,7 +12619,7 @@ self: {
          utf8-string
        ];
        description = "Bindings to libzip, a library for manipulating zip archives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Limit" = callPackage
@@ -12596,8 +12630,8 @@ self: {
        sha256 = "1yd8c443ql17daicn3r9jiwxxjlpqnpnvkbxcszjha4i4ar94zq1";
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12612,8 +12646,8 @@ self: {
          array base cmdargs haskell98 QuickCheck
        ];
        description = "Partition the sequence of items to the subsequences in the order given";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12641,7 +12675,7 @@ self: {
          base bytestring containers criterion deepseq text
        ];
        description = "Collection of types for natural language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LinkChecker" = callPackage
@@ -12658,8 +12692,8 @@ self: {
          base containers haskell98 HTTP mtl network tagsoup
        ];
        description = "Check a bunch of local html files for broken links";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12672,8 +12706,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring HTF mtl ];
        testHaskellDepends = [ base binary bytestring HTF mtl ];
        description = "Algorithmic Doom map generation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12687,7 +12721,7 @@ self: {
        editedCabalFile = "11ws93cdzz7k4nvcld2d74155mdgcvyi6f6an7gpf9z4k523c11n";
        libraryHaskellDepends = [ base transformers ];
        description = "List monad transformer and class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListLike" = callPackage
@@ -12697,8 +12731,8 @@ self: {
      }:
      mkDerivation {
        pname = "ListLike";
-       version = "4.7.3";
-       sha256 = "1vk5mbpxzwzcnc4cgw3hvqn0g0pcq97hw4f3i2ki3hn3svap535a";
+       version = "4.7.4";
+       sha256 = "170yrz008ya4haj0i8z1c7ydjg8hcw3i9cqs6abainh8zxvc1lqi";
        libraryHaskellDepends = [
          array base bytestring containers deepseq dlist fmlist text
          utf8-string vector
@@ -12708,7 +12742,7 @@ self: {
          random text utf8-string vector
        ];
        description = "Generalized support for list-like structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListT" = callPackage
@@ -12726,8 +12760,8 @@ self: {
          base smallcheck tasty tasty-smallcheck transformers util
        ];
        description = "List transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12741,7 +12775,7 @@ self: {
          base directory filepath List transformers
        ];
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListWriter" = callPackage
@@ -12753,7 +12787,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
        description = "define a list constant using Monadic syntax other than overhead [,]";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListZipper" = callPackage
@@ -12764,7 +12798,7 @@ self: {
        sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple zipper for lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LiterateMarkdown" = callPackage
@@ -12780,8 +12814,8 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Converter to convert from .lhs to .md and vice versa.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12793,8 +12827,8 @@ self: {
        sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01";
        libraryHaskellDepends = [ base ];
        description = "Logic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12831,8 +12865,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12854,8 +12888,8 @@ self: {
        ];
        librarySystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openmpi;};
 
@@ -12881,8 +12915,8 @@ self: {
          random stm test-framework test-framework-hunit transformers
        ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12909,8 +12943,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12931,8 +12965,8 @@ self: {
          utf8-string
        ];
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12953,8 +12987,8 @@ self: {
          time-http unix zlib
        ];
        description = "HTTP Daemonic Library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12983,8 +13017,8 @@ self: {
          transformers
        ];
        description = "A static website and blog generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12997,8 +13031,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers mtl ];
        description = "Generate MASM code from haskell";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13010,8 +13044,8 @@ self: {
        sha256 = "0yh84vybrxs6bv3z4qx4n9m4xwsb4kw21l35s5v4gg8yllgbb79r";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13030,8 +13064,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs split ];
        description = "Folding algorithm based on nucleotide cyclic motifs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13057,8 +13091,8 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13070,8 +13104,8 @@ self: {
        sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva";
        libraryHaskellDepends = [ base transformers ];
        description = "The category of monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13099,8 +13133,8 @@ self: {
          tasty-quickcheck tasty-th
        ];
        description = "Library for using Mixed Integer Programming (MIP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13125,8 +13159,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "A GLPK backend to the MIP library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -13138,8 +13172,8 @@ self: {
        sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Michael-Scott queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13153,8 +13187,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Builds decks out of a meta";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13184,8 +13218,8 @@ self: {
          template-haskell tf-random time transformers unix
        ];
        description = "Automatic inductive functional programmer by systematic search";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13204,8 +13238,8 @@ self: {
          transformers vector
        ];
        description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13222,8 +13256,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of key-value maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13237,7 +13271,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
        description = "mapWith: like fmap, but with additional parameters (isFirst, isLast, etc)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Mapping" = callPackage
@@ -13248,8 +13282,8 @@ self: {
        sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn";
        libraryHaskellDepends = [ base ];
        description = "Mapping";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13263,8 +13297,8 @@ self: {
        editedCabalFile = "1045p10l7smabidysk52m16sgqgfpa70ny8nwyn56238i02cd7ir";
        libraryHaskellDepends = [ base mtl ];
        description = "MaybeT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13276,8 +13310,8 @@ self: {
        sha256 = "034v9n6ldjn1hsv4rphvysbykm8x0jqa2prbw7k28fkp6m30j74x";
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13289,8 +13323,8 @@ self: {
        sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily";
        libraryHaskellDepends = [ base monads-fd transformers ];
        description = "MaybeT monad transformer using transformers instead of mtl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13310,8 +13344,8 @@ self: {
          pretty random regex-posix time
        ];
        description = "Console-based Role Playing Game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13323,8 +13357,8 @@ self: {
        sha256 = "0rnbg7w3qc3xsbzpw5is7w7qdjl2kqbr1acc744aggwlibazl59w";
        libraryHaskellDepends = [ base vector ];
        description = "Mean shift algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13336,8 +13370,8 @@ self: {
        sha256 = "1vy8ykjy9cpv661byqv21775zbyciqx2hf77c1nl58nn34x0s2ds";
        libraryHaskellDepends = [ base ];
        description = "A library for units of measurement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13349,8 +13383,8 @@ self: {
        sha256 = "1qqdvrhqm187gi9dj78z9ijcrrk6wv0a9cx060aa0278nayr4b2w";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13362,8 +13396,8 @@ self: {
        sha256 = "00vmxrydynn8kjqn48q6kmd802m4q4y1n7cqq33vsi482ijrjak1";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13377,7 +13411,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
        description = "Trie-based memo functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MetaHDBC" = callPackage
@@ -13393,7 +13427,7 @@ self: {
        ];
        description = "Statically checked database access";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13405,8 +13439,8 @@ self: {
        sha256 = "0gbxayv4wv7zk53iqvsvsbby1js5zlwf6802rix6h3fx4xpzllab";
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13418,8 +13452,8 @@ self: {
        sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x";
        libraryHaskellDepends = [ base hstats ];
        description = "Evaluation metrics commonly used in supervised machine learning";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13438,8 +13472,8 @@ self: {
          process time
        ];
        description = "Haskell mailing list manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13456,8 +13490,8 @@ self: {
          WaveFront
        ];
        description = "OpenGL for dummies";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13474,8 +13508,8 @@ self: {
          transformers url wreq xml
        ];
        description = "Interface for Microsoft Translator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13496,7 +13530,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A toy dependently typed programming language with type-based termination";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "MissingH" = callPackage
@@ -13519,7 +13553,7 @@ self: {
          old-time parsec regex-compat time unix
        ];
        description = "Large utility library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MissingK" = callPackage
@@ -13530,7 +13564,7 @@ self: {
        sha256 = "1x8ygk64v1crj92zwdv2jh7rw5n53k0wx0bkjmkjn2x1vklsdinz";
        libraryHaskellDepends = [ base glib template-haskell ];
        description = "Useful types and definitions missing from other libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MissingM" = callPackage
@@ -13547,7 +13581,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "findM and other missing 'M's";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MissingPy" = callPackage
@@ -13558,8 +13592,8 @@ self: {
        sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6";
        libraryHaskellDepends = [ anydbm base MissingH ];
        description = "Haskell interface to Python";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13582,8 +13616,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13595,7 +13629,7 @@ self: {
        sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq";
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Modular arithmetic via Numeric-Prelude";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "Moe" = callPackage
@@ -13609,8 +13643,8 @@ self: {
        libraryHaskellDepends = [ base GLUT random ];
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13626,8 +13660,8 @@ self: {
          aeson base bytestring containers text unordered-containers
        ];
        description = "Utilities working with MoeDict.tw JSON dataset";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13643,8 +13677,8 @@ self: {
          base extensible-exceptions MonadCatchIO-transformers
        ];
        description = "Monad-transformer version of the Control.Exception module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13656,8 +13690,8 @@ self: {
        sha256 = "0jfq5v1jigxl9mnnvpqph9ayq840s9nyb5srym04mbicri4gbjan";
        libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        description = "Polymorphic combinators for working with foreign functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13673,8 +13707,8 @@ self: {
          base extensible-exceptions monads-tf transformers
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13690,8 +13724,8 @@ self: {
          base MonadCatchIO-transformers primitive transformers
        ];
        description = "Polymorphic combinators for working with foreign functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13703,8 +13737,8 @@ self: {
        sha256 = "1jq8ms16karqqa6qxp4n24f2v4bcc8n8mzfjm6b6q3n8hg7dj8yd";
        libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13721,8 +13755,8 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell ];
        executableHaskellDepends = [ base haskell98 process ];
        description = "Automatically generate layered monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13734,7 +13768,7 @@ self: {
        sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
        libraryHaskellDepends = [ base mtl ];
        description = "MonadPrompt, implementation & examples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MonadRandom" = callPackage
@@ -13749,7 +13783,7 @@ self: {
          base mtl primitive random transformers transformers-compat
        ];
        description = "Random-number generation monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MonadRandomLazy" = callPackage
@@ -13760,7 +13794,7 @@ self: {
        sha256 = "0zqw3g69dx72rjmmbjjgvv06jr7j64fy4c4zkqyra4h5hxflb282";
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MonadStack" = callPackage
@@ -13771,8 +13805,8 @@ self: {
        sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalizing lift to monad stacks";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13788,7 +13822,7 @@ self: {
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        description = "2-D arcade scroller";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13804,8 +13838,8 @@ self: {
        executableHaskellDepends = [ ansi-terminal base process time ];
        testHaskellDepends = [ ansi-terminal base doctest process time ];
        description = "A minimalistic CLI Pomodoro timer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13824,8 +13858,8 @@ self: {
          array base containers directory free free-game mtl
        ];
        description = "A simple tetris clone";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13837,8 +13871,8 @@ self: {
        sha256 = "0250xqc5fgl8mg9yb0ykbfmxnyxacqbvi692irgfw89gf9vkh886";
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13850,8 +13884,8 @@ self: {
        sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0";
        libraryHaskellDepends = [ base Monatron transformers ];
        description = "MonadIO instances for the Monatron transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13863,8 +13897,8 @@ self: {
        sha256 = "1p8s2agsni56h7vlydbhy7qhi0qkwafpcrsfafrlg44gvpwff15y";
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13876,7 +13910,7 @@ self: {
        sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z";
        libraryHaskellDepends = [ base containers split ];
        description = "Morse code";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "MuCheck" = callPackage
@@ -13896,8 +13930,8 @@ self: {
          temporary time
        ];
        description = "Automated Mutation Testing";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13912,8 +13946,8 @@ self: {
        libraryHaskellDepends = [ base HUnit MuCheck ];
        executableHaskellDepends = [ base HUnit MuCheck ];
        description = "Automated Mutation Testing for HUnit tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13928,8 +13962,8 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-core MuCheck ];
        executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        description = "Automated Mutation Testing for Hspec tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13944,8 +13978,8 @@ self: {
        libraryHaskellDepends = [ base MuCheck QuickCheck ];
        executableHaskellDepends = [ base MuCheck QuickCheck ];
        description = "Automated Mutation Testing for QuickCheck tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13960,8 +13994,8 @@ self: {
        libraryHaskellDepends = [ base MuCheck smallcheck ];
        executableHaskellDepends = [ base MuCheck smallcheck ];
        description = "Automated Mutation Testing for SmallCheck tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13973,7 +14007,7 @@ self: {
        sha256 = "169mgcyls0dsifnbp615r4i3g64ga2vbczsiv4aq17d1nma8sw19";
        libraryHaskellDepends = [ array base ];
        description = "Munkres' assignment algorithm (hungarian method)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Munkres-simple" = callPackage
@@ -13984,8 +14018,8 @@ self: {
        sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb";
        libraryHaskellDepends = [ array base bimap containers Munkres ];
        description = "Simple and typesafe layer over the Munkres package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14005,7 +14039,7 @@ self: {
          transformers unliftio-core vector xml-conduit xml-types
        ];
        description = "interface to MusicBrainz XML2 and JSON web services";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "MusicBrainz-libdiscid" = callPackage
@@ -14052,8 +14086,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "Most likely order of mutation events in RNA";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14069,8 +14103,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        benchmarkHaskellDepends = [ base time ];
        description = "Generate all primes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14084,8 +14118,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14098,7 +14132,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A transparent nested Map structure";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14139,8 +14173,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time
        ];
        description = "A Haskell interface to Lego Mindstorms NXT";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bluetooth = null;};
 
@@ -14159,8 +14193,8 @@ self: {
          unordered-containers
        ];
        description = "Generate NXC Code from DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14182,7 +14216,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "NameGenerator" = callPackage
@@ -14195,7 +14229,7 @@ self: {
        editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i";
        libraryHaskellDepends = [ base containers random ];
        description = "A name generator written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "NanoProlog" = callPackage
@@ -14209,8 +14243,8 @@ self: {
        libraryHaskellDepends = [ base containers ListLike uu-parsinglib ];
        executableHaskellDepends = [ base uu-parsinglib ];
        description = "Very small interpreter for a Prolog-like language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14223,7 +14257,7 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim vector ];
        description = "Naperian Functors for APL-like programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "NaperianNetCDF" = callPackage
@@ -14237,8 +14271,8 @@ self: {
        libraryHaskellDepends = [ base hnetcdf Naperian vector ];
        executableHaskellDepends = [ base hnetcdf Naperian split ];
        description = "Instances of NcStore for hypercuboids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14268,8 +14302,8 @@ self: {
          mwc-random random unordered-containers vector
        ];
        description = "Simple scoring schemes for word alignments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14283,8 +14317,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
        description = "Natural sorting for strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14302,8 +14336,8 @@ self: {
          base containers ContextAlgebra lattices multiset QuickCheck
        ];
        description = "Context Algebra of near";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14326,8 +14360,8 @@ self: {
          network stm vector
        ];
        description = "Simple networked key/value store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14339,8 +14373,8 @@ self: {
        sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735";
        libraryHaskellDepends = [ base comonad distributive ];
        description = "Nested composition of functors with a type index tracking nesting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14352,7 +14386,7 @@ self: {
        sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv";
        libraryHaskellDepends = [ base random vector ];
        description = "A port of John Skilling's nested sampling C code to Haskell";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "NetSNMP" = callPackage
@@ -14365,8 +14399,8 @@ self: {
        librarySystemDepends = [ net_snmp ];
        testHaskellDepends = [ base bytestring HUnit process ];
        description = "Bindings for net-snmp's C API for clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {net_snmp = null;};
 
@@ -14387,7 +14421,7 @@ self: {
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "NewBinary" = callPackage
@@ -14399,7 +14433,7 @@ self: {
        libraryHaskellDepends = [ array base integer ];
        description = "A binary I/O library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {integer = null;};
 
@@ -14411,7 +14445,7 @@ self: {
        sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab";
        libraryHaskellDepends = [ base binary ];
        description = "9P2000 in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ninjas" = callPackage
@@ -14430,8 +14464,8 @@ self: {
          networked-game random
        ];
        description = "Ninja game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14443,7 +14477,7 @@ self: {
        sha256 = "0g9vqkpcmn66922z2yqp29h4kp2n2xnz1rva294h0kh39hiklrlv";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Placeholder package to preserve debug ability via conditional builds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "NoSlow" = callPackage
@@ -14462,8 +14496,8 @@ self: {
          storablevector template-haskell uvector vector
        ];
        description = "Microbenchmarks for various array libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14476,8 +14510,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14489,7 +14523,7 @@ self: {
        sha256 = "0sjyq8nilqhmlhbagi1ms2zh7fyhzci9w5hj3dyxpd2ccq1bbvyq";
        libraryHaskellDepends = [ array base data-default vector ];
        description = "A Haskell coherent noise generator based on libnoise";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Nomyx" = callPackage
@@ -14508,8 +14542,8 @@ self: {
          Nomyx-Core Nomyx-Language Nomyx-Web safe stm time
        ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14536,8 +14570,8 @@ self: {
          template-haskell temporary text time unix
        ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14557,8 +14591,8 @@ self: {
          time-recurrence
        ];
        description = "Language to express rules for Nomic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14576,8 +14610,8 @@ self: {
          time time-recurrence
        ];
        description = "Language to express rules for Nomic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14602,8 +14636,8 @@ self: {
          web-routes-happstack web-routes-regular web-routes-th
        ];
        description = "Web gui for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14615,8 +14649,8 @@ self: {
        sha256 = "0nycv791c6b5bcaz5y9wm3wxn1p930p163qs1rpdiix04fnaxgxl";
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14633,8 +14667,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A list with a length of at least one";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14646,7 +14680,7 @@ self: {
        sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
        libraryHaskellDepends = [ base ];
        description = "Instances of numeric classes for functions and tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "NumLazyByteString" = callPackage
@@ -14657,7 +14691,7 @@ self: {
        sha256 = "17ca34hxaz9xk3ykkzp14n7wb31aiza12859k3rmvwhnq4j89jqs";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Num, Enum, Eq, Integral, Ord, Real, and Show instances for Lazy ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "NumberSieves" = callPackage
@@ -14668,8 +14702,8 @@ self: {
        sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2";
        libraryHaskellDepends = [ array base ];
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14682,8 +14716,8 @@ self: {
        libraryHaskellDepends = [ base containers primes ];
        testHaskellDepends = [ base containers HUnit primes ];
        description = "A library for number theoretic computations, written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14712,8 +14746,8 @@ self: {
          ADPfusion base ghc-prim mtl primitive PrimitiveArray vector
        ];
        description = "Nussinov78 using the ADPfusion library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14725,8 +14759,8 @@ self: {
        sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j";
        libraryHaskellDepends = [ base ];
        description = "A little library to calculate nutrition values of food items";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14738,8 +14772,8 @@ self: {
        sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm";
        libraryHaskellDepends = [ base mtl ];
        description = "A context aware binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14764,8 +14798,8 @@ self: {
        ];
        executableHaskellDepends = [ base filepath ];
        description = "ONC RPC (aka Sun RPC) and XDR library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14781,8 +14815,8 @@ self: {
          base comonad-transformers containers data-lens hxt newtype
        ];
        description = "Parse OpenStreetMap files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14802,8 +14836,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14815,8 +14849,8 @@ self: {
        sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9";
        libraryHaskellDepends = [ base containers ghc template-haskell ];
        description = "Object oriented programming for haskell using multiparameter typeclasses";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14832,8 +14866,8 @@ self: {
          comctl32 comdlg32 gdi32 kernel32 ole32 shell32 user32 winmm
          winspool
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
@@ -14847,7 +14881,7 @@ self: {
        sha256 = "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj";
        libraryHaskellDepends = [ base transformers ];
        description = "Explicitly handled object names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Obsidian" = callPackage
@@ -14864,8 +14898,8 @@ self: {
          mwc-random process rdtsc text value-supply vector
        ];
        description = "Embedded language for GPU Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Octree" = callPackage
@@ -14882,8 +14916,8 @@ self: {
          base criterion deepseq ghc-prim lens linear QuickCheck
        ];
        description = "Simple unbalanced Octree for storing data about 3D points";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14897,8 +14931,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14911,8 +14945,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14949,8 +14983,8 @@ self: {
          text text-zipper time transformers vector vty
        ];
        description = "Text UI library for performing parallel remote SSH operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14962,7 +14996,7 @@ self: {
        sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc";
        libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Only" = callPackage
@@ -14975,7 +15009,7 @@ self: {
        editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr";
        libraryHaskellDepends = [ base deepseq ];
        description = "The 1-tuple type or single-value \"collection\"";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "OpenAFP" = callPackage
@@ -14991,8 +15025,8 @@ self: {
          hashtables mtl process regex-compat
        ];
        description = "IBM AFP document format parser and generator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15013,8 +15047,8 @@ self: {
          xhtml
        ];
        description = "Assorted utilities to work with AFP data streams";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15033,7 +15067,7 @@ self: {
        ];
        librarySystemDepends = [ openal ];
        description = "A binding to the OpenAL cross-platform 3D audio API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
@@ -15047,8 +15081,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell high-level wrapper for OpenCL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OpenCL = null;};
 
@@ -15060,8 +15094,8 @@ self: {
        sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07";
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15073,8 +15107,8 @@ self: {
        sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s";
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15093,7 +15127,7 @@ self: {
          text transformers
        ];
        description = "A binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -15106,8 +15140,8 @@ self: {
          base checkers haskell98 OpenGL QuickCheck
        ];
        description = "Quickcheck instances for various data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15124,7 +15158,7 @@ self: {
        ];
        librarySystemDepends = [ libGL ];
        description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
   "OpenGLRaw21" = callPackage
@@ -15136,7 +15170,7 @@ self: {
        libraryHaskellDepends = [ OpenGLRaw ];
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "OpenSCAD" = callPackage
@@ -15155,8 +15189,8 @@ self: {
          tasty tasty-hunit testpack
        ];
        description = "ADT wrapper and renderer for OpenSCAD models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15168,8 +15202,8 @@ self: {
        sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj";
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        description = "OpenVG (ShivaVG-0.2.1) binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15181,8 +15215,8 @@ self: {
        sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2";
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15194,8 +15228,8 @@ self: {
        sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk";
        libraryHaskellDepends = [ array base containers mtl ];
        description = "Groebner basis computation for Operads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15207,7 +15241,7 @@ self: {
        sha256 = "07l2fagp60ykhsr3dxclkfgg1pxawj2xf0wxrn3dksjdlx0hg5j5";
        libraryHaskellDepends = [ base hashable syb ];
        description = "The OptDir type for representing optimization directions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "OrPatterns" = callPackage
@@ -15223,8 +15257,8 @@ self: {
          template-haskell
        ];
        description = "A quasiquoter for or-patterns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15244,8 +15278,8 @@ self: {
          random
        ];
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15265,7 +15299,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Efficient ordered (by popcount) enumeration of bits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ordinals" = callPackage
@@ -15276,7 +15310,7 @@ self: {
        sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi";
        libraryHaskellDepends = [ base ];
        description = "Ordinal arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ordinary" = callPackage
@@ -15291,8 +15325,8 @@ self: {
        executableHaskellDepends = [ base safe threepenny-gui ];
        testHaskellDepends = [ base safe threepenny-gui ];
        description = "A Programming Language in Construction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15308,8 +15342,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15321,7 +15355,7 @@ self: {
        sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Arrow parser combinators similar to Parsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PBKDF2" = callPackage
@@ -15334,8 +15368,8 @@ self: {
        editedCabalFile = "0gnvhijrjj39z9y4m1ic2nys2yi3ida7yh93b9q88r6i02m2k23f";
        libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15350,7 +15384,7 @@ self: {
        ];
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15368,7 +15402,7 @@ self: {
        ];
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15382,7 +15416,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "A library for analysis of 3-D protein coordinates";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "PPrinter" = callPackage
@@ -15393,8 +15427,8 @@ self: {
        sha256 = "1fcvjrsq40nc2z4dg5f3bkz9h8psp89ay28k1jnwxqgh74xnylzc";
        libraryHaskellDepends = [ base containers ];
        description = "A generic derivable Haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15408,7 +15442,7 @@ self: {
        editedCabalFile = "0n1yrv1x1dxbjn9hjr8lk4k5in9c75ixzldlmszayi26bvax7329";
        libraryHaskellDepends = [ base ];
        description = "Priority Search Queue";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PTQ" = callPackage
@@ -15426,7 +15460,7 @@ self: {
        ];
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15446,8 +15480,8 @@ self: {
          random smtp-mail text time transformers
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15474,8 +15508,8 @@ self: {
          stringtable-atom utf8-string uuid
        ];
        description = "Page-oriented extraction and composition library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15494,8 +15528,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "a simple Paillier cryptosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15516,8 +15550,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Pandoc support for literate Agda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15542,8 +15576,8 @@ self: {
          typelevel-tensor vector
        ];
        description = "a code generator for partial differential equations solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15562,7 +15596,7 @@ self: {
          base hspec Parallel-Arrows-Definition split
        ];
        description = "BaseSpecs used for @Parallel-Arrows-Definition@ and Co";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parallel-Arrows-Definition" = callPackage
@@ -15573,7 +15607,7 @@ self: {
        sha256 = "1zdsvg0nx2vnvgx9vcwq8l1kanfp056mmiscs3716lswkrvhdlbf";
        libraryHaskellDepends = [ base deepseq split ];
        description = "Multithreaded evaluation using Arrows";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parallel-Arrows-Eden" = callPackage
@@ -15593,8 +15627,8 @@ self: {
          Parallel-Arrows-Definition QuickCheck split
        ];
        description = "Eden based backend for @Parallel-Arrows-Definition@";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15614,7 +15648,7 @@ self: {
          Parallel-Arrows-Definition split
        ];
        description = "GpH based backend for @Parallel-Arrows-Definition@ in a multicore variant";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parallel-Arrows-ParMonad" = callPackage
@@ -15633,7 +15667,7 @@ self: {
          Parallel-Arrows-Definition split
        ];
        description = "Par Monad (@monad-par@) based backend for @Parallel-Arrows-Definition@";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parry" = callPackage
@@ -15650,8 +15684,8 @@ self: {
          old-locale process random RSA SafeSemaphore time unix
        ];
        description = "A proven synchronization server for high performance computing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15663,7 +15697,7 @@ self: {
        sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g";
        libraryHaskellDepends = [ base parsec ];
        description = "Parsec combinators for more complex objects";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "ParserFunction" = callPackage
@@ -15674,7 +15708,7 @@ self: {
        sha256 = "0l0j1mdycqsb5d32l7h0giwrj5yj54523gdn0bvim2vz67qrbxrq";
        libraryHaskellDepends = [ base containers parsec ];
        description = "Parse and evaluate mathematical expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PartialTypeSignatures" = callPackage
@@ -15685,7 +15719,7 @@ self: {
        sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "emulate partial type signatures with template haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PasswordGenerator" = callPackage
@@ -15696,8 +15730,8 @@ self: {
        sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple library for generating passwords";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15712,7 +15746,7 @@ self: {
        libraryHaskellDepends = [ base cmdargs HTTP network network-uri ];
        executableHaskellDepends = [ base cmdargs ];
        description = "CLI for pasting to lpaste.net";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "PathTree" = callPackage
@@ -15728,8 +15762,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A tree used to merge and maintain paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15742,8 +15776,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libxml2;};
 
@@ -15755,7 +15789,7 @@ self: {
        sha256 = "0ss4p40gkqcw9bdh5iy0yar56gpsanrxld74q5dxvakrf8m6cqmz";
        libraryHaskellDepends = [ base ];
        description = "simple Peano numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PeanoWitnesses" = callPackage
@@ -15766,8 +15800,8 @@ self: {
        sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg";
        libraryHaskellDepends = [ base ];
        description = "GADT type witnesses for Peano-style natural numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15784,8 +15818,8 @@ self: {
        ];
        librarySystemDepends = [ cmph ];
        description = "A perfect hashing library for mapping bytestrings to values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cmph = null;};
 
@@ -15797,8 +15831,8 @@ self: {
        sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l";
        libraryHaskellDepends = [ base ReplicateEffects ];
        description = "Permutations of effectful computations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15817,8 +15851,8 @@ self: {
          base containers maximal-cliques parallel vector
        ];
        description = "A versatile library for topological data analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15843,8 +15877,8 @@ self: {
          string-conversions temporary text time
        ];
        description = "Personal Happstack Server Utils";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15856,8 +15890,8 @@ self: {
        sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr";
        libraryHaskellDepends = [ base filepath process unix ];
        description = "Process piping library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15869,8 +15903,8 @@ self: {
        sha256 = "07rzwkhz4b6nymygrhcz07dxl8fnvfrmfpcdj9qz3mwrcyf1kp9n";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15889,7 +15923,7 @@ self: {
          base containers directory mtl random regex-compat
        ];
        description = "Play Hangman Game";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PlayingCards" = callPackage
@@ -15904,8 +15938,8 @@ self: {
          base HUnit MonadRandom QuickCheck random-shuffle
        ];
        description = "Playing cards api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15927,8 +15961,8 @@ self: {
          transformers vector
        ];
        description = "Real-time line plotter for generic data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15948,8 +15982,8 @@ self: {
          process random
        ];
        description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15961,7 +15995,7 @@ self: {
        sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w";
        libraryHaskellDepends = [ base containers regex-tdfa ];
        description = "Pluralize English words";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Pollutocracy" = callPackage
@@ -15975,7 +16009,7 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15989,8 +16023,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network splice ];
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16005,8 +16039,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        description = "A binding for PortMedia/PortMidi";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -16018,7 +16052,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Thin wrapper over the C postgresql library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Prelude" = callPackage
@@ -16031,8 +16065,8 @@ self: {
        editedCabalFile = "14z8gv75jnvykk5naqcqqrdcx7160kzd3gnfdvx6rw4nqzsi6hw1";
        libraryHaskellDepends = [ base ];
        description = "A Prelude module replacement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16066,7 +16100,7 @@ self: {
          vector-th-unbox
        ];
        description = "Efficient multidimensional arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
@@ -16088,8 +16122,8 @@ self: {
          test-framework-th
        ];
        description = "Pretty-printing for primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16101,7 +16135,7 @@ self: {
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16114,7 +16148,7 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16126,8 +16160,8 @@ self: {
        sha256 = "0vmjg91yq4p0121ypjx4l1hh77j8xj6ha7awdvrjk5fjmz9xryh3";
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16142,7 +16176,7 @@ self: {
        libraryHaskellDepends = [ base old-time random ];
        executableHaskellDepends = [ base old-time random ];
        description = "Propositional Logic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Proper" = callPackage
@@ -16156,8 +16190,8 @@ self: {
        libraryHaskellDepends = [ base containers syb ];
        executableHaskellDepends = [ base containers HUnit parsec syb ];
        description = "An implementation of propositional logic in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16169,7 +16203,7 @@ self: {
        sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid";
        libraryHaskellDepends = [ base mtl ];
        description = "Proximity sets in N dimensions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Pugs" = callPackage
@@ -16193,8 +16227,8 @@ self: {
          random stm stringtable-atom text time utf8-string
        ];
        description = "A Perl 6 Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16214,8 +16248,8 @@ self: {
        executableHaskellDepends = [ base ];
        doHaddock = false;
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16231,7 +16265,7 @@ self: {
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Pup-Events-Demo" = callPackage
@@ -16249,8 +16283,8 @@ self: {
          Pup-Events-Server stm
        ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16262,7 +16296,7 @@ self: {
        sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx";
        libraryHaskellDepends = [ base stm ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Pup-Events-Server" = callPackage
@@ -16277,8 +16311,8 @@ self: {
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16301,8 +16335,8 @@ self: {
          process template-haskell temporary text
        ];
        description = "Quasiquotations for a python like interpolated string formater";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16314,8 +16348,8 @@ self: {
        sha256 = "19xbnqm90b1wsxbjhjm1q1mld0rv4p6ga1chzl4i00yccpwsh7g8";
        libraryHaskellDepends = [ base containers mtl old-time random ];
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16327,8 +16361,8 @@ self: {
        sha256 = "0vbkvc0d7j4awvdiqs0kgz3fa9m0991zlzhs3w7rxi8if2crkn47";
        libraryHaskellDepends = [ base random vector ];
        description = "A library for fast, easy-to-use Q-learning";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16340,8 +16374,8 @@ self: {
        sha256 = "1f3wxc8ipb8ka02xq2snjs5wgl10mk528zjkpwdw5wf3fldhz037";
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16354,8 +16388,8 @@ self: {
        libraryHaskellDepends = [ base composition lens ];
        testHaskellDepends = [ base composition lens QuickCheck ];
        description = "QuadTree library for Haskell, with lens support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16372,7 +16406,7 @@ self: {
          th-lift-instances
        ];
        description = "A QuasiQuoter for Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Quelea" = callPackage
@@ -16391,8 +16425,8 @@ self: {
          time transformers tuple unix uuid z3 zeromq4-haskell
        ];
        description = "Programming with Eventual Consistency over Cassandra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16407,8 +16441,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Annotation Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16426,7 +16460,7 @@ self: {
        ];
        testHaskellDepends = [ base deepseq process ];
        description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "QuickCheck-GenT" = callPackage
@@ -16437,7 +16471,7 @@ self: {
        sha256 = "0bn594bgvavbphm5543kqljcc7hgxk4ir0fcdjw399sbfaxpn5yz";
        libraryHaskellDepends = [ base mtl QuickCheck random ];
        description = "A GenT monad transformer for QuickCheck library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "QuickCheck-safe" = callPackage
@@ -16450,7 +16484,7 @@ self: {
        editedCabalFile = "0my9s0kcxkizbfckb35l5hyr1pmhx32l2lviy7zqh93mlmv9ig4s";
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "QuickCheckVariant" = callPackage
@@ -16462,8 +16496,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16487,8 +16521,8 @@ self: {
          websockets-snap
        ];
        description = "Quick and easy data visualization with Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16503,8 +16537,8 @@ self: {
          aeson attoparsec base bytestring either text
        ];
        description = "Quick JSON extractions with Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16522,8 +16556,8 @@ self: {
          base directory filepath pandoc-types process split
        ];
        executableHaskellDepends = [ base pandoc-types ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16540,7 +16574,7 @@ self: {
          base HUnit lens linear test-framework test-framework-hunit vector
        ];
        description = "The RANSAC algorithm for parameter estimation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RBTree" = callPackage
@@ -16551,7 +16585,7 @@ self: {
        sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq";
        libraryHaskellDepends = [ base ];
        description = "Pure haskell Red-Black-Tree implemetation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RESTng" = callPackage
@@ -16568,7 +16602,7 @@ self: {
        ];
        description = "A framework for writing RESTful applications";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "RFC1751" = callPackage
@@ -16584,7 +16618,7 @@ self: {
          base bytestring cereal hspec QuickCheck vector
        ];
        description = "RFC-1751 library for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "RJson" = callPackage
@@ -16599,8 +16633,8 @@ self: {
          array base bytestring containers iconv mtl parsec syb-with-class
        ];
        description = "A reflective JSON serializer/parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16613,8 +16647,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16635,8 +16669,8 @@ self: {
        ];
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {canlib = null; ftd2xx = null;};
 
@@ -16659,8 +16693,8 @@ self: {
          base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
        ];
        description = "RNA secondary structure prediction";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16680,8 +16714,8 @@ self: {
          containers HsTools primitive PrimitiveArray RNAFold split vector
        ];
        description = "RNA secondary structure folding";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16707,8 +16741,8 @@ self: {
        ];
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16728,8 +16762,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "Draw RNA secondary structures";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16762,8 +16796,8 @@ self: {
          text time vector ViennaRNAParser
        ];
        description = "Unsupervized construction of RNA family models";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16784,8 +16818,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs split ];
        description = "RNA folding with non-canonical basepairs and base-triplets";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16806,7 +16840,7 @@ self: {
          SHA tagged test-framework test-framework-quickcheck2
        ];
        description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RSolve" = callPackage
@@ -16820,7 +16854,7 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl ];
        executableHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers lens mtl ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "RabbitMQ" = callPackage
@@ -16841,7 +16875,7 @@ self: {
        ];
        description = "AMQP 0-9-1 client library for RabbitMQ servers";
        license = "BSD-3-Clause AND GPL-3.0-or-later";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16861,8 +16895,8 @@ self: {
          sdl2-image sdl2-mixer time
        ];
        description = "A puzzle game written in Haskell with a cat in lead role";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Random123" = callPackage
@@ -16881,7 +16915,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Haskell port of Random123 library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "RandomDotOrg" = callPackage
@@ -16892,8 +16926,8 @@ self: {
        sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c";
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16907,7 +16941,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random-fu ];
        description = "Randomness intuition trainer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Range" = callPackage
@@ -16918,8 +16952,8 @@ self: {
        sha256 = "0759508s75zba89jjr56sqpm7idgwsxynmf9zl9hwrz9q11fxrqh";
        libraryHaskellDepends = [ base ];
        description = "Data structure for managing ranges";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16934,7 +16968,7 @@ self: {
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "Ranged sets for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ranka" = callPackage
@@ -16951,7 +16985,7 @@ self: {
        ];
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16972,8 +17006,8 @@ self: {
          filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
        ];
        description = "Soccer simulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16991,23 +17025,24 @@ self: {
          primitive transformers vector vector-algorithms
        ];
        description = "A pure haskell drawing engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Rattus" = callPackage
-    ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space
+    ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim
+     , simple-affine-space
      }:
      mkDerivation {
        pname = "Rattus";
-       version = "0.3.1";
-       sha256 = "1sfjnfd3jsr095gkzxldb65ivxpyzsaphw2bv2f6svczhjc5b414";
+       version = "0.4";
+       sha256 = "1sgr33yq5l43k3b8nwx7m6wrygv5k8d8yigzms3p6pq5pk3g5sq1";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
-         base containers ghc simple-affine-space
+         base containers ghc ghc-prim simple-affine-space
        ];
        testHaskellDepends = [ base containers ];
        description = "A modal FRP language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ReadArgs" = callPackage
@@ -17022,7 +17057,7 @@ self: {
        executableHaskellDepends = [ base system-filepath text ];
        testHaskellDepends = [ base hspec system-filepath text ];
        description = "Simple command line argument parsing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Redmine" = callPackage
@@ -17045,8 +17080,8 @@ self: {
          transformers
        ];
        description = "Library to access Redmine's REST services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17058,8 +17093,8 @@ self: {
        sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17075,7 +17110,7 @@ self: {
          base binary bytestring containers hashtables stringsearch
        ];
        description = "Write to and read from ByteStrings maintaining internal memory references";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Referees" = callPackage
@@ -17095,8 +17130,8 @@ self: {
          base cmdargs cond containers directory
        ];
        description = "A utility for computing distributions of material to review among reviewers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17112,8 +17147,8 @@ self: {
          base containers mtl template-haskell transformers
        ];
        description = "Generic programming library with representation types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17125,8 +17160,8 @@ self: {
        sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527";
        libraryHaskellDepends = [ base ];
        description = "Composable replication schemes of applicative functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17145,8 +17180,8 @@ self: {
          base directory HTTP json mtl network process random
        ];
        description = "Haskell bindings to ReviewBoard";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17158,8 +17193,8 @@ self: {
        sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw";
        libraryHaskellDepends = [ base ];
        description = "Tiny library to replace classic if/else";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17188,8 +17223,8 @@ self: {
          algebra base criterion deepseq massiv scheduler sscript
        ];
        description = "Parallel implementation of Ritt-Wu's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17213,8 +17248,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest hspec lens vector ];
        description = "quasiquoter for inline-R code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17239,8 +17274,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Limits the size of a directory's contents";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17252,7 +17287,7 @@ self: {
        sha256 = "1gixw6793i4bcf1fsawfqdgvib5q7b1972fi0prrcwq7cp7nrgwr";
        libraryHaskellDepends = [ base ];
        description = "All hail the Royal Monad!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RtMidi" = callPackage
@@ -17270,8 +17305,8 @@ self: {
        executableHaskellDepends = [ base pretty-simple vector ];
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alsaLib;};
 
@@ -17283,8 +17318,8 @@ self: {
        sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl";
        libraryHaskellDepends = [ base containers stm transformers ];
        description = "Reactive Extensions for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17305,8 +17340,8 @@ self: {
          Prelude text text-short time X
        ];
        description = "Library for accessing S3 compatible storage services";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17324,8 +17359,8 @@ self: {
          gnuplot hp2any-core parsec process utf8-string vector
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17345,8 +17380,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17363,8 +17398,8 @@ self: {
          base containers hspec QuickCheck scalendar text time
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17379,7 +17414,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
@@ -17393,7 +17428,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_gfx;};
 
   "SDL-image" = callPackage
@@ -17407,7 +17442,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_image;};
 
   "SDL-mixer" = callPackage
@@ -17421,7 +17456,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_mixer;};
 
   "SDL-mpeg" = callPackage
@@ -17434,7 +17469,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
@@ -17448,7 +17483,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_ttf;};
 
   "SDL2-ttf" = callPackage
@@ -17460,8 +17495,8 @@ self: {
        libraryHaskellDepends = [ base SDL2 ];
        librarySystemDepends = [ SDL2_ttf ];
        description = "Binding to libSDL-ttf";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {SDL2 = null; inherit (pkgs) SDL2_ttf;};
 
@@ -17480,8 +17515,8 @@ self: {
          sfml-audio sfml-graphics sfml-network sfml-system sfml-window
        ];
        description = "SFML bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
@@ -17496,8 +17531,8 @@ self: {
        sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g";
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
        description = "Higher level library on top of SFML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17509,8 +17544,8 @@ self: {
        sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i";
        libraryHaskellDepends = [ array base SDL Sprig ];
        description = "SFont SDL Bitmap Fonts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17522,8 +17557,8 @@ self: {
        sha256 = "0aj15lp5wbldaa9ndfvni1iq7kcrjv1syln9yz77jg6p8ndk61jv";
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17538,7 +17573,7 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL SG ];
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17550,8 +17585,8 @@ self: {
        sha256 = "1qwrhb7nw22v7j6d9x3a1ps9l7mjpwjy13zxssmimwfhbch055v3";
        libraryHaskellDepends = [ base mtl ];
        description = "(updated) Small geometry library for dealing with vectors and collision detection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17571,7 +17606,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementations of the SHA suite of message digest functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SHA2" = callPackage
@@ -17584,7 +17619,7 @@ self: {
          AES base bytestring monads-tf transformers
        ];
        description = "Fast, incremental SHA hashing for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SJW" = callPackage
@@ -17593,8 +17628,8 @@ self: {
      }:
      mkDerivation {
        pname = "SJW";
-       version = "0.1.2.2";
-       sha256 = "0ffwlsm8ynmi1nyx1a8j65p9llk7s68g3srkgk1i47rvddn70h6q";
+       version = "0.1.2.3";
+       sha256 = "10ky2pd83wng5bgpqimdyxvhlfpwbssgh576ss28f1rzm6b8wqcm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17607,7 +17642,9 @@ self: {
        testHaskellDepends = [ base Cabal directory filepath random ];
        benchmarkHaskellDepends = [ base directory filepath random time ];
        description = "The Simple Javascript Wrench";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "SMTPClient" = callPackage
@@ -17623,8 +17660,8 @@ self: {
          old-time
        ];
        description = "A simple SMTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17641,8 +17678,8 @@ self: {
        ];
        libraryToolDepends = [ c2hsc ];
        description = "Declarative coördination language for streaming networks";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17658,7 +17695,7 @@ self: {
          base hashable HDBC HDBC-sqlite3 mtl unordered-containers
        ];
        description = "Calculate db-data dependencies of functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SSTG" = callPackage
@@ -17673,8 +17710,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers ];
        description = "STG Symbolic Execution";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17686,8 +17723,8 @@ self: {
        sha256 = "18bz9qxsl7lq3j18ilczi175j3djwlpckzj5a65l4dj7d1sw1c35";
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        description = "STL 3D geometry format parsing and pretty-printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17703,8 +17740,8 @@ self: {
          base binary bytestring transformers usb vector
        ];
        description = "STLink USB interface in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17721,8 +17758,8 @@ self: {
          transformers
        ];
        description = "control a STM32F103 microcontroller";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17734,7 +17771,7 @@ self: {
        sha256 = "0m6vvj4mfmmn1r21aglwdb6801bwr0ks60vbwz7y1cb97vsdad9v";
        libraryHaskellDepends = [ base ];
        description = "Definition for Peripherals,Registers and Fields from STM32F103xx.svd";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "STMonadTrans" = callPackage
@@ -17750,7 +17787,7 @@ self: {
          array base tasty tasty-hunit tasty-quickcheck transformers
        ];
        description = "A monad transformer version of the ST monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SVD2HS" = callPackage
@@ -17765,8 +17802,8 @@ self: {
          base containers pretty text xml-conduit xml-lens
        ];
        description = "translate a SVD of a Microcontroller to Haskell tables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17784,8 +17821,8 @@ self: {
          base haskell98 language-c pretty svgutils syb xml
        ];
        description = "Code generation tool for Quartz code from a SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17806,8 +17843,8 @@ self: {
          diagrams-lib directory parsec split text vector xml
        ];
        description = "Fonts from the SVG-Font format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17819,7 +17856,7 @@ self: {
        sha256 = "1a4rmp1rn6jv8nkab688i146ywiv4w6fp5bpm0slwgda2x0h6lp4";
        libraryHaskellDepends = [ base parsec ];
        description = "Parsing the path command of SVG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SWMMoutGetMB" = callPackage
@@ -17835,7 +17872,7 @@ self: {
          pipes-bytestring pipes-parse split
        ];
        description = "A parser for SWMM 5 binary .OUT files";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "SableCC2Hs" = callPackage
@@ -17854,8 +17891,8 @@ self: {
          wl-pprint-text xml
        ];
        description = "Generate a parser (in Haskell) with the SableCC parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17867,7 +17904,7 @@ self: {
        sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623";
        libraryHaskellDepends = [ base ];
        description = "Library for safe (pattern match free) functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SafeSemaphore" = callPackage
@@ -17881,7 +17918,7 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ base HUnit ];
        description = "Much safer replacement for QSemN, QSem, and SampleVar";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Salsa" = callPackage
@@ -17893,8 +17930,8 @@ self: {
        libraryHaskellDepends = [ base bytestring file-embed ];
        librarySystemDepends = [ glib mono ];
        description = "A .NET Bridge for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
@@ -17918,8 +17955,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base data-default either hlint hspec mtl ];
        description = "Saturnin CI / Job System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17948,8 +17985,8 @@ self: {
          semirings vector vector-th-unbox
        ];
        description = "Base types and classes for statistics, sciences and humanities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17974,8 +18011,8 @@ self: {
          text th-lift-instances time unordered-containers
        ];
        description = "Scientific workflow management system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17992,8 +18029,8 @@ self: {
          random SciFlow stm unordered-containers
        ];
        description = "Scientific workflow management system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18012,8 +18049,8 @@ self: {
          regex-compat sqlite-simple unix
        ];
        description = "Size limited temp filesystem based on fuse";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18032,8 +18069,8 @@ self: {
          random stm time unix
        ];
        description = "A cross platform P2P VPN application built using Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18047,8 +18084,8 @@ self: {
        editedCabalFile = "0rvalvvjadb0i0rh9z5lgw2hca4a9yw3cg2f6gcx7h30f5dp8x1j";
        libraryHaskellDepends = [ base bytestring ];
        description = "simple static linked SHA3 using private symbols and the ref impl";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18062,7 +18099,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Data structure for querying the set (or count) of intervals covering given point";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SelectSequencesFromMSA" = callPackage
@@ -18086,8 +18123,8 @@ self: {
          base cmdargs directory either-unwrap
        ];
        description = "Selects a representative subset of sequences from multiple sequence alignment";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18106,8 +18143,8 @@ self: {
          split tagsoup text
        ];
        description = "Command-line tool for maintaining the Semantique database";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18119,8 +18156,8 @@ self: {
        sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6";
        libraryHaskellDepends = [ base bytestring containers mtl ];
        description = "A semigroup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18132,8 +18169,8 @@ self: {
        sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18149,8 +18186,8 @@ self: {
          base directory filepath hslogger mtl old-locale random time
        ];
        description = "Easy Loggingframework";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18164,8 +18201,8 @@ self: {
        testHaskellDepends = [ base containers util ];
        benchmarkHaskellDepends = [ base containers gauge util ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18193,7 +18230,7 @@ self: {
          filepath mtl parsec QuickCheck regex-tdfa
        ];
        description = "Shell script analysis tool";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Shellac" = callPackage
@@ -18206,8 +18243,8 @@ self: {
        editedCabalFile = "1nq7j00vfrhfzkbsgr6j28zr339gx5bcvq6x9mvh9qvs2jmcdz1z";
        libraryHaskellDepends = [ base directory mtl unix ];
        description = "A framework for creating shell envinronments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18221,8 +18258,8 @@ self: {
        editedCabalFile = "0ws8prjzj4j9yf1mqdnvlpv367cx4wfqa5jq5n6x7g9npwmd5ya0";
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
        description = "\"compatline\" backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18236,8 +18273,8 @@ self: {
        editedCabalFile = "1wyal7nqnl5sj74d9mid2dw35d37b40v132cg3zhw9ys24k0jl6v";
        libraryHaskellDepends = [ base editline Shellac ];
        description = "Editline backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18249,8 +18286,8 @@ self: {
        sha256 = "0lhm2j8gl2vk4qasb2d6ips6qnvb4bg0mpb7mczqhahzq3i38sh4";
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        description = "Haskeline backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18264,8 +18301,8 @@ self: {
        editedCabalFile = "019p7q1nmi2v7rb1rjnch4zaz506c4ry28mkivhkqiq3ay1m86hs";
        libraryHaskellDepends = [ base readline Shellac ];
        description = "Readline backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18286,8 +18323,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "grammars for TSP and SHP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18299,71 +18336,75 @@ self: {
        sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh";
        libraryHaskellDepends = [ base ];
        description = "Show for * -> *";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle" = callPackage
-    ({ mkDerivation, base, category, ghcjs-dom, jsaddle, jsaddle-warp
-     , text, transformers, unliftio
+    ({ mkDerivation, base, category, containers, ghcjs-dom, jsaddle
+     , jsaddle-warp, text, transformers, unliftio, wai, wai-app-static
+     , warp
      }:
      mkDerivation {
        pname = "Shpadoinkle";
-       version = "0.2.0.0";
-       sha256 = "10dgd5723mc7nbwvvzvl5jy09wdcjwhi0miyvgkr7jgppkg402dl";
+       version = "0.3.0.0";
+       sha256 = "083ly6xpdcf7wgrb3shcw26zk0d8rm8issyvki1rwvd29rwj0k41";
        libraryHaskellDepends = [
-         base category ghcjs-dom jsaddle jsaddle-warp text transformers
-         unliftio
+         base category containers ghcjs-dom jsaddle jsaddle-warp text
+         transformers unliftio wai wai-app-static warp
        ];
        description = "A programming model for declarative, high performance user interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle-backend-pardiff" = callPackage
-    ({ mkDerivation, base, compactable, containers, file-embed
-     , ghcjs-dom, jsaddle, lens, monad-control, mtl, neat-interpolation
-     , random, semialign, Shpadoinkle, text, these, transformers-base
-     , unliftio, uuid
+    ({ mkDerivation, base, compactable, containers, exceptions
+     , file-embed, ghcjs-dom, jsaddle, lens, monad-control, mtl, random
+     , semialign, Shpadoinkle, text, these, transformers-base, unliftio
      }:
      mkDerivation {
        pname = "Shpadoinkle-backend-pardiff";
-       version = "0.2.0.0";
-       sha256 = "1dkj035k1kwhgd9z7p9jhbnahd9d8mb16ydgd1l7xnrfxg215zsq";
+       version = "0.3.0.0";
+       sha256 = "1m12m4qbivh0srdzwzcqr8s6s1hi1blk3x15ljv5c9viriznfy6z";
        libraryHaskellDepends = [
-         base compactable containers file-embed ghcjs-dom jsaddle lens
-         monad-control mtl neat-interpolation random semialign Shpadoinkle
-         text these transformers-base unliftio uuid
+         base compactable containers exceptions file-embed ghcjs-dom jsaddle
+         lens monad-control mtl random semialign Shpadoinkle text these
+         transformers-base unliftio
        ];
        description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "Shpadoinkle-backend-snabbdom" = callPackage
-    ({ mkDerivation, base, file-embed, ghcjs-dom, jsaddle, mtl
-     , Shpadoinkle, text, unliftio
+    ({ mkDerivation, base, exceptions, file-embed, ghcjs-dom, jsaddle
+     , monad-control, mtl, Shpadoinkle, text, transformers-base
+     , unliftio
      }:
      mkDerivation {
        pname = "Shpadoinkle-backend-snabbdom";
-       version = "0.2.0.0";
-       sha256 = "1zhxj26i711218ixfclmakjv943gkkmvjvvvi5ya4p26bjaw7p3x";
+       version = "0.3.0.0";
+       sha256 = "0ff87nxa7ff3j400k5a65in8jj00m6bk46pmana0a8k1d7ln7fsk";
        libraryHaskellDepends = [
-         base file-embed ghcjs-dom jsaddle mtl Shpadoinkle text unliftio
+         base exceptions file-embed ghcjs-dom jsaddle monad-control mtl
+         Shpadoinkle text transformers-base unliftio
        ];
        description = "Use the high-performance Snabbdom virtual dom library written in JavaScript";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shpadoinkle-backend-static" = callPackage
     ({ mkDerivation, base, compactable, Shpadoinkle, text }:
      mkDerivation {
        pname = "Shpadoinkle-backend-static";
-       version = "0.1.0.2";
-       sha256 = "0sfj092lhmkzrjvklpvbcldpc3wfp8d1n5jw7gpdzqs8fcpffz8q";
+       version = "0.2.0.0";
+       sha256 = "0kxfsm4g6mwwcrpq8bm83v32jpp97bsvl6ay0ynnmss0yf70ymmi";
        libraryHaskellDepends = [ base compactable Shpadoinkle text ];
        description = "A backend for rendering Shpadoinkle as Text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18371,11 +18412,11 @@ self: {
     ({ mkDerivation, aeson, base, jsaddle, lens, text, unliftio }:
      mkDerivation {
        pname = "Shpadoinkle-console";
-       version = "0.0.1.1";
-       sha256 = "0gs21vkmxxnk3ybzasjgcrhraiyjbab3xkpzp4266h54wz1r5grj";
+       version = "0.0.1.3";
+       sha256 = "0zkiv0h37a3x3569xfvfzdy0dywxhcfx12jddqf9bpfyqsxmf42a";
        libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ];
        description = "Support for the native browser console";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle-debug" = callPackage
@@ -18386,56 +18427,104 @@ self: {
        sha256 = "1yvr3d40aa6sl3gpyr24a5hij63jm2p0jrx0kac7asjihvd6fk2g";
        libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ];
        description = "Debugging tools for Shpadoinkle applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "Shpadoinkle-developer-tools" = callPackage
+    ({ mkDerivation, base, containers, jsaddle, lens, pretty-show
+     , Shpadoinkle, Shpadoinkle-backend-pardiff, Shpadoinkle-html, stm
+     , text, time, unliftio
+     }:
+     mkDerivation {
+       pname = "Shpadoinkle-developer-tools";
+       version = "0.0.0.1";
+       sha256 = "14lcmxkaxsa42dcyn13cb83lfw48n7139gvppsngzrbn1w9lwrl0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers jsaddle lens pretty-show Shpadoinkle
+         Shpadoinkle-backend-pardiff Shpadoinkle-html stm text time unliftio
+       ];
+       executableHaskellDepends = [
+         base containers jsaddle lens pretty-show Shpadoinkle
+         Shpadoinkle-backend-pardiff Shpadoinkle-html stm text time unliftio
+       ];
+       description = "Chrome extension to aide in development";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "Shpadoinkle-disembodied" = callPackage
+    ({ mkDerivation, base, directory, filepath, servant, Shpadoinkle
+     , Shpadoinkle-backend-static, Shpadoinkle-html, Shpadoinkle-router
+     , text, unliftio
+     }:
+     mkDerivation {
+       pname = "Shpadoinkle-disembodied";
+       version = "0.0.0.1";
+       sha256 = "0hiwiv4l1k1al0d9fjk48fay6c33shf213yc9blwm15mfj5kh77c";
+       libraryHaskellDepends = [
+         base directory filepath servant Shpadoinkle
+         Shpadoinkle-backend-static Shpadoinkle-html Shpadoinkle-router text
+         unliftio
+       ];
+       description = "Shpadoinkle as a static site";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shpadoinkle-examples" = callPackage
     ({ mkDerivation, aeson, base, beam-core, beam-sqlite, bytestring
-     , containers, ease, exceptions, file-embed, generic-lens, ghcjs-dom
-     , jsaddle, lens, mtl, optparse-applicative, safe, servant
-     , servant-client, servant-server, Shpadoinkle
-     , Shpadoinkle-backend-pardiff, Shpadoinkle-backend-static
+     , containers, ease, exceptions, file-embed, generic-lens
+     , generic-monoid, ghcjs-dom, jsaddle, lens, mtl
+     , optparse-applicative, pretty-show, safe, servant, servant-client
+     , servant-server, Shpadoinkle, Shpadoinkle-backend-pardiff
+     , Shpadoinkle-backend-snabbdom, Shpadoinkle-backend-static
      , Shpadoinkle-console, Shpadoinkle-html, Shpadoinkle-lens
      , Shpadoinkle-router, Shpadoinkle-widgets, split, sqlite-simple
      , stm, text, unliftio, wai, wai-app-static, warp
      }:
      mkDerivation {
        pname = "Shpadoinkle-examples";
-       version = "0.0.0.2";
-       sha256 = "1nj5wl8liw9q89hrry6dpvsw32sc27nplxfcwkyfkwjyqaxp5sfh";
+       version = "0.0.0.3";
+       sha256 = "1ym3wnqqj07v0w07af6z9yiccx95bbljna36z37pz8gp35dxamlh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base beam-core beam-sqlite bytestring containers ease
-         exceptions file-embed generic-lens ghcjs-dom jsaddle lens mtl
-         optparse-applicative safe servant servant-client servant-server
-         Shpadoinkle Shpadoinkle-backend-pardiff Shpadoinkle-backend-static
-         Shpadoinkle-console Shpadoinkle-html Shpadoinkle-lens
-         Shpadoinkle-router Shpadoinkle-widgets split sqlite-simple stm text
-         unliftio wai wai-app-static warp
+         exceptions file-embed generic-lens generic-monoid ghcjs-dom jsaddle
+         lens mtl optparse-applicative pretty-show safe servant
+         servant-client servant-server Shpadoinkle
+         Shpadoinkle-backend-pardiff Shpadoinkle-backend-snabbdom
+         Shpadoinkle-backend-static Shpadoinkle-console Shpadoinkle-html
+         Shpadoinkle-lens Shpadoinkle-router Shpadoinkle-widgets split
+         sqlite-simple stm text unliftio wai wai-app-static warp
        ];
        description = "Example usages of Shpadoinkle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "Shpadoinkle-html" = callPackage
     ({ mkDerivation, base, bytestring, compactable, containers
-     , ghcjs-dom, jsaddle, regex-pcre, Shpadoinkle, stm
-     , template-haskell, text, time, transformers, unliftio
+     , ghcjs-dom, jsaddle, lens, raw-strings-qq, regex-pcre, Shpadoinkle
+     , stm, template-haskell, text, time, transformers, unliftio
      }:
      mkDerivation {
        pname = "Shpadoinkle-html";
-       version = "0.2.0.1";
-       sha256 = "1dk17v1c6nv2p3zzg09gmv4qvpjmlx782a6gx7whx9p28037v34f";
+       version = "0.3.0.0";
+       sha256 = "17n675m9gqfhi2rd8c60bcbljd4nknfrwb02zlw9jwgj1kv7l06k";
        libraryHaskellDepends = [
-         base bytestring compactable containers ghcjs-dom jsaddle regex-pcre
-         Shpadoinkle stm template-haskell text time transformers unliftio
+         base bytestring compactable containers ghcjs-dom jsaddle lens
+         raw-strings-qq regex-pcre Shpadoinkle stm template-haskell text
+         time transformers unliftio
        ];
        description = "A typed, template generated Html DSL, and helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18443,55 +18532,60 @@ self: {
     ({ mkDerivation, base, lens, Shpadoinkle, text }:
      mkDerivation {
        pname = "Shpadoinkle-lens";
-       version = "0.0.0.2";
-       sha256 = "00zd6m9lvskbf7w4bnqhhy59gz9169rzmd1x8y4lxckjda172sqr";
+       version = "0.0.0.3";
+       sha256 = "1310ipmw2z8gdnvaqx1bydvc4p1iyhc7xv31vwbx2aszhmi873kq";
        libraryHaskellDepends = [ base lens Shpadoinkle text ];
        description = "Lens combinators for Shpadoinkle applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle-router" = callPackage
     ({ mkDerivation, aeson, base, bytestring, compactable, exceptions
-     , ghcjs-dom, http-api-data, http-media, jsaddle, lens, network-uri
-     , servant, servant-client, servant-client-js, servant-server
-     , Shpadoinkle, Shpadoinkle-backend-static, text, unliftio, wai
-     , wai-app-static, warp
+     , ghcjs-dom, http-api-data, http-media, http-types, jsaddle
+     , jsaddle-warp, lens, network-uri, servant, servant-client
+     , servant-client-js, servant-rawm, servant-rawm-server
+     , servant-server, Shpadoinkle, Shpadoinkle-backend-static, text
+     , unliftio, wai, wai-app-static, warp
      }:
      mkDerivation {
        pname = "Shpadoinkle-router";
-       version = "0.2.0.0";
-       sha256 = "024g9s01kjzvxq6yfhi640v1zly6wvk3v8m3xzxi4flgff2syf8b";
+       version = "0.3.0.0";
+       sha256 = "1wdr71khi7nmyz4ksf7hy6ya470687wmv4x7bvv7qq2z2dsy5ns2";
        libraryHaskellDepends = [
          aeson base bytestring compactable exceptions ghcjs-dom
-         http-api-data http-media jsaddle lens network-uri servant
-         servant-client servant-client-js servant-server Shpadoinkle
+         http-api-data http-media http-types jsaddle jsaddle-warp lens
+         network-uri servant servant-client servant-client-js servant-rawm
+         servant-rawm-server servant-server Shpadoinkle
          Shpadoinkle-backend-static text unliftio wai wai-app-static warp
        ];
        description = "A single page application rounter for Shpadoinkle based on Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "Shpadoinkle-widgets" = callPackage
     ({ mkDerivation, aeson, base, compactable, containers
      , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck
-     , Shpadoinkle, Shpadoinkle-html, stm, template-haskell, text
-     , unliftio
+     , quickcheck-classes, quickcheck-classes-base, Shpadoinkle
+     , Shpadoinkle-html, stm, template-haskell, text, unliftio
      }:
      mkDerivation {
        pname = "Shpadoinkle-widgets";
-       version = "0.1.0.0";
-       sha256 = "1w1ibm75288rh001bxkdp04hidx8lkz4p4id91bjadsax8chy718";
+       version = "0.2.0.0";
+       sha256 = "0q82m3gffcw89xyl0h9ayp2v4k9l1zwpnlpq7kvirl1ahhp2iypy";
        libraryHaskellDepends = [
          aeson base compactable containers edit-distance email-validate
          jsaddle mtl Shpadoinkle Shpadoinkle-html stm template-haskell text
          unliftio
        ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck quickcheck-classes
+         quickcheck-classes-base
+       ];
        description = "A collection of common reusable types and components";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18503,7 +18597,7 @@ self: {
        sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858";
        libraryHaskellDepends = [ base ];
        description = "4-way trie fuzzy search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shu-thing" = callPackage
@@ -18516,7 +18610,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT ];
        description = "A vector shooter game";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SimpleAES" = callPackage
@@ -18527,7 +18621,7 @@ self: {
        sha256 = "0s85xgwrhldyr2w3kcn9f72yjajmpz3d4dizq9p9z97rx4qva4vj";
        libraryHaskellDepends = [ base binary bytestring mwc-random ];
        description = "Fast AES encryption/decryption for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SimpleEA" = callPackage
@@ -18540,7 +18634,7 @@ self: {
          base mersenne-random-pure64 MonadRandom
        ];
        description = "Simple evolutionary algorithm framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SimpleGL" = callPackage
@@ -18554,8 +18648,8 @@ self: {
          base GLFW JuicyPixels OpenGL SimpleH vector
        ];
        description = "A Simple Graphics Library from the SimpleH framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18573,7 +18667,7 @@ self: {
        ];
        description = "A light, clean and powerful Haskell utility library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "SimpleLog" = callPackage
@@ -18592,8 +18686,8 @@ self: {
          template-haskell text th-lift time transformers transformers-base
        ];
        description = "Simple, configurable logging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18614,8 +18708,8 @@ self: {
          base cmdargs dyre transformers wai-routes warp
        ];
        description = "A simple static file server, for when apache is overkill";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18628,29 +18722,28 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base Cabal ];
        description = "Simple table generator";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Sit" = callPackage
-    ({ mkDerivation, alex, array, base, containers, data-lens-light
-     , happy, mtl
-     }:
+    ({ mkDerivation, array, base, containers, data-lens-light, mtl }:
      mkDerivation {
        pname = "Sit";
-       version = "0.2017.5.2";
-       sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff";
-       revision = "2";
-       editedCabalFile = "1chbiyvp02yn03pvqd4r4z3yprb7yiwmxmw2kl6gr5aml9923w41";
-       isLibrary = false;
+       version = "0.2021.1.18";
+       sha256 = "045xbxf0jyxr6510mcfhnfbj2p0kka5l45cydlxchhwg75z8snmi";
+       revision = "1";
+       editedCabalFile = "0vd1j410rp27g9cbzd3b1ymv02gfmi7pcnqzgpnppi9kc0nrr6kl";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          array base containers data-lens-light mtl
        ];
-       executableToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "Prototypical type checker for Type Theory with Sized Natural Numbers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "SizeCompare" = callPackage
@@ -18677,8 +18770,8 @@ self: {
        ];
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18694,8 +18787,8 @@ self: {
          base containers DifferenceLogic FirstOrderTheory HUnit Proper
        ];
        description = "A tiny, lazy SMT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18707,8 +18800,8 @@ self: {
        sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1";
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Library for parsing SMTLIB2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18731,8 +18824,8 @@ self: {
        executableSystemDepends = [ zip ];
        executableToolDepends = [ cpphs ];
        description = "E-library directory based on FUSE virtual file system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zip;};
 
@@ -18749,8 +18842,8 @@ self: {
          transformers
        ];
        description = "Abstract full system simulator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18770,8 +18863,8 @@ self: {
          random zlib
        ];
        description = "Football simulation framework for teaching functional programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18791,8 +18884,8 @@ self: {
          SoccerFun
        ];
        description = "OpenGL UI for the SoccerFun framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18805,8 +18898,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Sonnex is an alternative to Soundex for french language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18826,7 +18919,7 @@ self: {
        ];
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18844,7 +18937,7 @@ self: {
          JuicyPixels OpenAL OpenGL vector Win32
        ];
        description = "Assorted utility modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "SpaceInvaders" = callPackage
@@ -18859,8 +18952,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base HGL random Yampa ];
        description = "Video game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18882,8 +18975,8 @@ self: {
          text
        ];
        description = "Simple space pirate roguelike";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18895,8 +18988,8 @@ self: {
        sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        description = "Lock free Spin Counter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18910,7 +19003,7 @@ self: {
          attoparsec base extra mtl mwc-random text
        ];
        description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock" = callPackage
@@ -18935,8 +19028,8 @@ self: {
          unordered-containers vault wai wai-extra
        ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18948,7 +19041,7 @@ self: {
        sha256 = "1wqbq8vgq5sifybw32prkmcjwm2dqz4z3sv8ci4s603a2sril7h7";
        libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock-api-ghcjs" = callPackage
@@ -18963,8 +19056,8 @@ self: {
          aeson base bytestring ghcjs-base hvect Spock-api text
        ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18976,7 +19069,7 @@ self: {
        sha256 = "0ra8y036vilsb75jb0lsfbdraygz6jm7b5l9002n7ixypbp2adya";
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock-auth" = callPackage
@@ -18987,8 +19080,8 @@ self: {
        sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0";
        libraryHaskellDepends = [ base http-types Spock text time ];
        description = "Provides authentification helpers for Spock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19017,7 +19110,7 @@ self: {
          unordered-containers wai
        ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock-digestive" = callPackage
@@ -19033,7 +19126,7 @@ self: {
          unordered-containers wai
        ];
        description = "Digestive functors support for Spock";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Spock-lucid" = callPackage
@@ -19044,8 +19137,8 @@ self: {
        sha256 = "15r3vk78vbhqi09liq0a3zabya845zfmblqahgw6r2jjx49da9ii";
        libraryHaskellDepends = [ base lucid Spock transformers ];
        description = "Lucid support for Spock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19063,8 +19156,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HTF stm vector ];
        description = "Background workers for Spock";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19076,7 +19169,7 @@ self: {
        sha256 = "14d3fk0cal0svb2clbhbbk48fygwvb0k01aawfm72576mrz9mb18";
        libraryHaskellDepends = [ base xml ];
        description = "Write support for Excel's SpreadsheetML format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Sprig" = callPackage
@@ -19087,8 +19180,8 @@ self: {
        sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to Sprig";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19102,7 +19195,7 @@ self: {
        editedCabalFile = "1n4zyl9iagzjx3i3zb5w24mf5x51nwwnnzrrc1rgkflvxlirm9md";
        libraryHaskellDepends = [ base deepseq nats stm ];
        description = "Stack data structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Stasis" = callPackage
@@ -19116,8 +19209,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
        description = "A simple MVCC like library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19129,7 +19222,7 @@ self: {
        sha256 = "12qg01aksbnc7cdh01y4z4jwrrhhwcakc9gh6ywxhq1bj591a9pf";
        libraryHaskellDepends = [ base stm transformers ];
        description = "State variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "StateVar-transformer" = callPackage
@@ -19140,7 +19233,7 @@ self: {
        sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "State variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "StatisticalMethods" = callPackage
@@ -19151,7 +19244,7 @@ self: {
        sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6";
        libraryHaskellDepends = [ base statistics tuple vector ];
        description = "Collection of useful statistical methods";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "StockholmAlignment" = callPackage
@@ -19167,8 +19260,8 @@ self: {
          vector
        ];
        description = "Libary for Stockholm aligmnent format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19184,8 +19277,8 @@ self: {
          base binary bytestring network time utf8-string
        ];
        description = "Client library for Stomp brokers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19197,8 +19290,8 @@ self: {
        sha256 = "1cicz4d5kyl9j4y3p79m3fk56vcqk3220a6y536dw525x6180dzw";
        libraryHaskellDepends = [ base containers ];
        description = "An abstract data type designed for the exchange of tree-like data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19218,8 +19311,8 @@ self: {
          Strafunski-StrategyLib template-haskell
        ];
        description = "Converts SDF to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19233,8 +19326,8 @@ self: {
        editedCabalFile = "1g9ksfgcz8fjasn78zq7w1yw9wk87i4gd5i0pf31gnf4l3963yz8";
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19252,8 +19345,8 @@ self: {
        ];
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "General purpose templates in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19265,7 +19358,7 @@ self: {
        sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk";
        libraryHaskellDepends = [ base mtl ];
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Stream" = callPackage
@@ -19276,7 +19369,7 @@ self: {
        sha256 = "1l87l0kl4awzdyx6b28npwy6xf03r39d89iharsh06zgnd4y42wr";
        libraryHaskellDepends = [ base lazysmallcheck QuickCheck ];
        description = "A library for manipulating infinite lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "StrictBench" = callPackage
@@ -19289,7 +19382,7 @@ self: {
        libraryHaskellDepends = [ base benchpress parallel ];
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19308,8 +19401,8 @@ self: {
          base deepseq generics-sop HUnit QuickCheck
        ];
        description = "StrictCheck: Keep Your Laziness In Check";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19321,7 +19414,7 @@ self: {
        sha256 = "1wbixjgzad3s9jj16kl0gvwg82g3hqvkag9wr5j58w98a4qyqw8i";
        libraryHaskellDepends = [ base ];
        description = "String manipulation utilities";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "SuffixStructures" = callPackage
@@ -19347,8 +19440,8 @@ self: {
          base bytestring cmdargs criterion deepseq mwc-random vector
        ];
        description = "Suffix array construction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19365,7 +19458,7 @@ self: {
        ];
        description = "Library which aids constructing generic (SYB3-based) widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19383,7 +19476,7 @@ self: {
        ];
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19404,8 +19497,8 @@ self: {
          pretty statistics template-haskell time vector
        ];
        description = "Sybase 15 sysmon reports processor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19426,8 +19519,8 @@ self: {
          base Cabal directory filepath process unix
        ];
        description = "Testing By Convention";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19444,8 +19537,8 @@ self: {
          mtl numeric-tools parallel
        ];
        description = "Utilities for condensed matter physics tight binding calculations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19462,7 +19555,7 @@ self: {
          RefSerialize stm text
        ];
        description = "A Transactional cache with user-defined persistence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "THEff" = callPackage
@@ -19473,7 +19566,7 @@ self: {
        sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8";
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH implementation of effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TORCS" = callPackage
@@ -19495,7 +19588,7 @@ self: {
        executableHaskellDepends = [ base bytestring Yampa ];
        description = "Bindings to the TORCS vehicle simulator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19518,8 +19611,8 @@ self: {
        sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb";
        libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        description = "Tangible Values -- composable interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19535,8 +19628,8 @@ self: {
          array base containers mtl template-haskell transformers
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19552,7 +19645,7 @@ self: {
          base containers HaXml mtl pretty template-haskell
        ];
        description = "Ferry Table Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Tables" = callPackage
@@ -19565,8 +19658,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cookbook ];
        description = "A client for Quill databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19580,8 +19673,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec xhtml ];
        description = "Tool to render CSV into tables of various formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19601,7 +19694,7 @@ self: {
          mtl optparse-applicative text
        ];
        description = "Tahin Password Generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Tainted" = callPackage
@@ -19612,7 +19705,7 @@ self: {
        sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb";
        libraryHaskellDepends = [ base mtl ];
        description = "Tainted type, and associated operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Takusen" = callPackage
@@ -19625,8 +19718,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19638,8 +19731,8 @@ self: {
        sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp";
        libraryHaskellDepends = [ base comonad distributive Stream ];
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19658,8 +19751,8 @@ self: {
          xmonad-contrib
        ];
        description = "A collection of tools which can be used to access taskwarrior from xmonad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19675,8 +19768,8 @@ self: {
          aeson base bytestring either-unwrap fgl parsec text vector
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19696,8 +19789,8 @@ self: {
          EntrezHTTP fgl hxt parsec process Taxonomy text vector
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19708,8 +19801,10 @@ self: {
      }:
      mkDerivation {
        pname = "TeX-my-math";
-       version = "0.202.0.0";
-       sha256 = "0aiw7ag87kcwz47hasr0k79b9dvm0waf3j2qf5p7l2lld438chsb";
+       version = "0.202.1.0";
+       sha256 = "1cp3spzlssnnzvnxvkg59h4nnv2icvld9mdkhn97b043kvmbp4hl";
+       revision = "2";
+       editedCabalFile = "1j3nbbljj89mhhcld7dzgmixilfikwng05zcndsisnz75r1kp1gv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19724,8 +19819,8 @@ self: {
          template-haskell text
        ];
        description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19741,8 +19836,8 @@ self: {
          array base containers mtl SDL SDL-image SDL-mixer SFont Sprig
        ];
        description = "TeaHS Game Creation Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19754,7 +19849,7 @@ self: {
        sha256 = "0kyg43ah15fpvy8gypacimjnhb7j250jqksg6w5znz57fg0rari4";
        libraryHaskellDepends = [ base ];
        description = "Tensor data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TernaryTrees" = callPackage
@@ -19768,7 +19863,7 @@ self: {
        libraryHaskellDepends = [ base binary ];
        executableHaskellDepends = [ base ];
        description = "Efficient pure ternary tree Sets and Maps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TestExplode" = callPackage
@@ -19786,7 +19881,7 @@ self: {
          process text
        ];
        description = "Generates testcases from program-snippets";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "Theora" = callPackage
@@ -19798,7 +19893,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ogg = null; theora = null;};
 
@@ -19810,8 +19905,8 @@ self: {
        sha256 = "0fl6pk2vp765gyzc4afjdg0lgbnh5v08gfbp0kzny4ng25bmxqwa";
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19823,7 +19918,7 @@ self: {
        sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz";
        libraryHaskellDepends = [ base ];
        description = "Mutable objects that reside in their own threads";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Thrift" = callPackage
@@ -19840,7 +19935,7 @@ self: {
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Tic-Tac-Toe" = callPackage
@@ -19853,7 +19948,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base safe ];
        description = "Tic Tac Toe in your command line!";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "TicTacToe" = callPackage
@@ -19869,8 +19964,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A sub-project (exercise) for a functional programming course";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19882,7 +19977,7 @@ self: {
        sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik";
        libraryHaskellDepends = [ base binary bytestring dataenc ];
        description = "TigerHash with C implementation";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "TimePiece" = callPackage
@@ -19905,8 +20000,8 @@ self: {
          SDL-ttf
        ];
        description = "A simple tile-based digital clock screen saver";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19918,8 +20013,8 @@ self: {
        sha256 = "1xxadd8pqbgl0z8vrqn8fm6x0c9l2y3a7irjmjkh9750x6hdb4b9";
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19931,8 +20026,8 @@ self: {
        sha256 = "0y8bl6w3ix2zjhm10wazgi70sr02ydc3hrwjbr6whk341n140wsh";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19946,8 +20041,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers matrix random ];
        description = "Game for Lounge Marmelade";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19963,7 +20058,7 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19983,8 +20078,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A total map datatype";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20002,8 +20097,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Tournament related algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20015,7 +20110,7 @@ self: {
        sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16";
        libraryHaskellDepends = [ base ];
        description = "Functions that should have been in Debug.Trace";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TransformeR" = callPackage
@@ -20032,8 +20127,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "eDSL in R for Safe Variable Transformarion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20047,8 +20142,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl ];
        description = "Tutorial on monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20060,7 +20155,7 @@ self: {
        sha256 = "04n1ld6h3q71iqnvwyabzj69vdy2x98w0drriyx13ykywbd31036";
        libraryHaskellDepends = [ base containers ];
        description = "A library to apply transformation to containers so as to maximize sharing of unchanged subcomponents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TreeCounter" = callPackage
@@ -20071,8 +20166,8 @@ self: {
        sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
        libraryHaskellDepends = [ base ref-mtl stm ];
        description = "Wait-free Tree Counter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20084,8 +20179,8 @@ self: {
        sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx";
        libraryHaskellDepends = [ base ];
        description = "A collection of heaps and search trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20097,7 +20192,7 @@ self: {
        sha256 = "0d1k4nblcnksh2j6b4v14r2xd2kn6cmqmyqhmy6wyz3kr0lyzxqd";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Transformer for Data.Tree";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "Treiber" = callPackage
@@ -20108,8 +20203,8 @@ self: {
        sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Lock free Treiber stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20126,8 +20221,8 @@ self: {
          optparse-applicative time
        ];
        description = "A simple trend Graph script";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20145,8 +20240,8 @@ self: {
          th-expand-syns transformers unpack-funcs vector
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20166,7 +20261,7 @@ self: {
          tagged
        ];
        description = "An implementation of the Twofish Symmetric-key cipher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TypeClass" = callPackage
@@ -20185,8 +20280,8 @@ self: {
          SDL SDL-ttf transformers
        ];
        description = "Typing speed game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20200,7 +20295,7 @@ self: {
        editedCabalFile = "1pxg6az5vkl0zvs3zdvvvnhxqawd9fkkd44jmzzzyyibppgni6x4";
        libraryHaskellDepends = [ base base-orphans ];
        description = "Type composition classes & instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TypeIlluminator" = callPackage
@@ -20213,8 +20308,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20226,8 +20321,8 @@ self: {
        sha256 = "1css4pb2x514s396c35brghgn3pgysdps8k09k1wcx5k2qpg90cx";
        libraryHaskellDepends = [ base ];
        description = "Some Nat-indexed types for GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20241,7 +20336,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers directory time ];
        description = "Command Line Typing speed tester";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "UISF" = callPackage
@@ -20256,7 +20351,7 @@ self: {
          array arrows base containers deepseq GLUT OpenGL stm transformers
        ];
        description = "Library for Arrowized Graphical User Interfaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "UMM" = callPackage
@@ -20274,7 +20369,7 @@ self: {
        ];
        description = "A small command-line accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20292,8 +20387,8 @@ self: {
          QuickCheck regular template-haskell
        ];
        description = "Library for maintaining correctness of URLs within an application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20305,8 +20400,8 @@ self: {
        sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "DEPRECATED A simple, liberal URL parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20330,8 +20425,8 @@ self: {
          base bytestring directory filepath hspec JuicyPixels time
        ];
        description = "Processing popular picture formats into .c or .raw format in RGB565";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20352,8 +20447,8 @@ self: {
          base bytestring criterion hashable QuickCheck quickcheck-instances
        ];
        description = "It provides the functionality like unix \"uniq\" utility";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "Unixutils" = callPackage
@@ -20369,7 +20464,7 @@ self: {
          process-extras pureMD5 regex-tdfa unix zlib
        ];
        description = "A crude interface between Haskell and Unix-like operating systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Unixutils-shadow" = callPackage
@@ -20380,7 +20475,7 @@ self: {
        sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7";
        libraryHaskellDepends = [ base unix ];
        description = "A simple interface to shadow passwords (aka, shadow.h)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Updater" = callPackage
@@ -20391,8 +20486,8 @@ self: {
        sha256 = "0iry59pyd4iy0cmj6flr05lbk3696l1z8wswqcfp8q8m5ibykkz0";
        libraryHaskellDepends = [ base ];
        description = "Monadic FRP library based on stm";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20404,8 +20499,8 @@ self: {
        sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp";
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20417,7 +20512,7 @@ self: {
        sha256 = "01xb68qh29q6b0pdxvadqw7q1p855k14jdz1qjlhg6785n0qp954";
        libraryHaskellDepends = [ base containers random ];
        description = "Some useful functions and shorthands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "UtilityTM" = callPackage
@@ -20428,7 +20523,7 @@ self: {
        sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85";
        libraryHaskellDepends = [ base ];
        description = "Utility functions that are missing from the standard library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "VKHS" = callPackage
@@ -20458,8 +20553,8 @@ self: {
          regexpr text
        ];
        description = "Provides access to Vkontakte social network via public API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20483,8 +20578,8 @@ self: {
          aeson base doctest megaparsec prettyprinter text
        ];
        description = "VRML parser and generator for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20498,8 +20593,8 @@ self: {
          base bifunctors semigroupoids semigroups
        ];
        description = "A data-type like Either but with an accumulating Applicative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20511,7 +20606,7 @@ self: {
        sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Fixed-length lists and low-dimensional linear algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Vec-Boolean" = callPackage
@@ -20522,8 +20617,8 @@ self: {
        sha256 = "0zxxpychddmlrv7r190gn4dl282ak4qfk2d92l24qxi9fds1rshk";
        libraryHaskellDepends = [ base Boolean Vec ];
        description = "Provides Boolean instances for the Vec package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20535,8 +20630,8 @@ self: {
        sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm";
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
        description = "Instances and functions to interoperate Vec and OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20548,8 +20643,8 @@ self: {
        sha256 = "0jwi9kgij8xd0419nkksgffwcn94fz6ijdq8s29b771409a1pkfc";
        doHaddock = false;
        description = "This package is obsolete";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20561,7 +20656,7 @@ self: {
        sha256 = "1hv8idxv9gniwwjs67q75bbcc5ry9r05cxjmsxk0q54l8zscdss2";
        libraryHaskellDepends = [ base Peano ];
        description = "a simple peano-indexed vector type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Verba" = callPackage
@@ -20575,8 +20670,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20597,7 +20692,7 @@ self: {
        testToolDepends = [ c2hs ];
        description = "ViennaRNA v2 bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ViennaRNA-extras" = callPackage
@@ -20620,8 +20715,8 @@ self: {
          tasty-th vector
        ];
        description = "ViennaRNA v2 extensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20638,7 +20733,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Villefort" = callPackage
@@ -20668,8 +20763,8 @@ self: {
          unbounded-delays webdriver
        ];
        description = "Villefort is a task manager and time tracker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20681,20 +20776,20 @@ self: {
        sha256 = "1jpw465n1abwi17s0yixg31f2zx28a24k3vh3kx59lknrw8q9jz1";
        libraryHaskellDepends = [ base ];
        description = "A binding for the Vulkan API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "VulkanMemoryAllocator" = callPackage
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "VulkanMemoryAllocator";
-       version = "0.3.11";
-       sha256 = "0xlw2znk6lzblc9iv13fiy2zxngglc9ylzb1lj6qcfdnbi1sr9n0";
+       version = "0.3.12";
+       sha256 = "0j46hhwfqbry6w8l8wj0p486rsyvxkk6dbvhd1sjkha6cy5cvar4";
        libraryHaskellDepends = [
          base bytestring transformers vector vulkan
        ];
        description = "Bindings to the VulkanMemoryAllocator library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
@@ -20711,8 +20806,8 @@ self: {
          base bytestring containers parseargs
        ];
        description = "WAVE audio file IO library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20726,8 +20821,8 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        doHaddock = false;
        description = "Generic text-editor logic for use with fixed-width fonts";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20742,8 +20837,8 @@ self: {
        libraryHaskellDepends = [ base brick microlens vty WEditor ];
        executableHaskellDepends = [ base brick vty WEditor ];
        description = "Text-editor widget with dynamic line-wrapping for use with Brick";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20756,8 +20851,8 @@ self: {
        libraryHaskellDepends = [ base hyphenation WEditor ];
        testHaskellDepends = [ base directory hyphenation WEditor ];
        description = "Language-specific hyphenation policies for WEditor";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20774,8 +20869,8 @@ self: {
          base directory filepath mtl unix WL500gPLib
        ];
        description = "A simple command line tools to control the Asus WL500gP router";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20790,8 +20885,8 @@ self: {
        libraryHaskellDepends = [ base curl mtl tagsoup ];
        executableHaskellDepends = [ base ];
        description = "A simple library to access to the WL 500gP router from the Haskell code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20811,8 +20906,8 @@ self: {
          base bytestring cryptohash hspec lens random split vector
        ];
        description = "WebMoney authentication module";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20824,8 +20919,8 @@ self: {
        sha256 = "13vfszyfyxwz4zi8zilifd0jad1gwlr75x931q8qbpi1kwr7mivk";
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20838,8 +20933,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers wx wxcore ];
        description = "WXDiffCtrl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20858,8 +20953,8 @@ self: {
        ];
        executableHaskellDepends = [ directory ghc-paths process ];
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20876,8 +20971,8 @@ self: {
          QuickCheck text transformers vector
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20893,7 +20988,7 @@ self: {
          aeson base bytestring HTTP text unordered-containers
        ];
        description = "Library for interacting with the Weather Underground JSON API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "WebBits" = callPackage
@@ -20904,8 +20999,8 @@ self: {
        sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        description = "JavaScript analysis tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20922,7 +21017,7 @@ self: {
        ];
        description = "JavaScript analysis tools";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20939,8 +21034,8 @@ self: {
          base multiplate multiplate-simplified transformers WebBits
        ];
        description = "A Multiplate instance for JavaScript";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20959,8 +21054,8 @@ self: {
          xhtml
        ];
        description = "Continuation based web programming for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20975,8 +21070,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        executableHaskellDepends = [ base parsec ];
        description = "Logic interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21003,8 +21098,8 @@ self: {
          template-haskell text transformers unordered-containers vector
        ];
        description = "Regexp-like engine to scrap web data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21029,8 +21124,8 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "The frictionless WAI Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21042,8 +21137,8 @@ self: {
        sha256 = "0rzpf8z414qvkbks16zizsxsinvbdxbm1n0dbav11p286791xx1j";
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21056,19 +21151,19 @@ self: {
        revision = "1";
        editedCabalFile = "1ia6dk2fvxg3gzqdmcypdka6fcnnrza23hq1rhslj53jy3qzs3kn";
        description = "A binding to part of the Win32 library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = lib.platforms.none;
      }) {};
 
-  "Win32_2_10_1_0" = callPackage
+  "Win32_2_11_0_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "Win32";
-       version = "2.10.1.0";
-       sha256 = "1il70gh3ysmp4pnhk7dxcbd0c0mh5ay33b9ijmmj0ikmbw0nfpbv";
+       version = "2.11.0.0";
+       sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm";
        description = "A binding to Windows Win32 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = lib.platforms.none;
      }) {};
 
   "Win32-console" = callPackage
@@ -21079,8 +21174,8 @@ self: {
        sha256 = "0117f413db3qr09m7rc09q44mbhahjkaqczb04g5f24x7fbwrn39";
        libraryHaskellDepends = [ base Win32 ];
        description = "Binding to the Win32 console API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-dhcp-server" = callPackage
@@ -21091,8 +21186,8 @@ self: {
        sha256 = "0r0629nnjmlw245czxf4gyzrl0zhgm3fjgjy1bs8622zsvfdavrz";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        description = "Win32 DHCP Server Management API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-errors" = callPackage
@@ -21106,8 +21201,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell text Win32 ];
        testHaskellDepends = [ base hspec QuickCheck Win32 ];
        description = "Alternative error handling for Win32 foreign calls";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-extras" = callPackage
@@ -21121,8 +21216,8 @@ self: {
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ imm32 msimg32 ];
        description = "Provides missing Win32 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {imm32 = null; msimg32 = null;};
 
   "Win32-junction-point" = callPackage
@@ -21133,8 +21228,8 @@ self: {
        sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        description = "Support for manipulating NTFS junction points";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-notify" = callPackage
@@ -21147,8 +21242,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers directory Win32 ];
        description = "A binding to part of the Win32 library for file notification";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-security" = callPackage
@@ -21161,8 +21256,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        description = "Haskell bindings to a security-related functions of the Windows API";
-       license = stdenv.lib.licenses.mit;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-services" = callPackage
@@ -21174,8 +21269,8 @@ self: {
        libraryHaskellDepends = [ base Win32 Win32-errors ];
        librarySystemDepends = [ Advapi32 ];
        description = "Windows service applications";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {Advapi32 = null;};
 
   "Win32-services-wrapper" = callPackage
@@ -21190,8 +21285,8 @@ self: {
          base directory filepath Win32 Win32-errors Win32-services
        ];
        description = "Wrapper code for making a Win32 service";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-shortcut" = callPackage
@@ -21205,8 +21300,8 @@ self: {
        libraryHaskellDepends = [ base mtl th-utilities Win32 ];
        librarySystemDepends = [ libossp_uuid ole32 ];
        description = "Support for manipulating shortcuts (.lnk files) on Windows";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = lib.platforms.none;
      }) {inherit (pkgs) libossp_uuid; ole32 = null;};
 
   "Wired" = callPackage
@@ -21222,8 +21317,8 @@ self: {
          base chalmers-lava2000 containers mtl QuickCheck
        ];
        description = "Wire-aware hardware description";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21263,8 +21358,8 @@ self: {
          tasty-th text
        ];
        description = "Bigram word pair alignments";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21278,8 +21373,8 @@ self: {
        editedCabalFile = "08i5izbni7xism94h6ncmdvfy88gny2vybapv0fkzgw3wyf6arhq";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21293,8 +21388,8 @@ self: {
        editedCabalFile = "1wdx2xv6zxvwkz3jkkd4vcdf9hyyivbfwyln9dd30m67ip7illp3";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21310,7 +21405,7 @@ self: {
        executableHaskellDepends = [ base boxes cmdargs ];
        description = "Plaintext prose redundancy linter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Workflow" = callPackage
@@ -21329,8 +21424,8 @@ self: {
          extensible-exceptions mtl old-time RefSerialize stm TCache vector
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21346,7 +21441,7 @@ self: {
        ];
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21378,7 +21473,7 @@ self: {
          libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
        ];
        description = "A binding to the X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
@@ -21394,8 +21489,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ libX11 ];
        description = "Missing bindings to the X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libX11;};
 
@@ -21407,8 +21502,8 @@ self: {
        sha256 = "11jxlaad9jgjddd5v8ygy2rdrajrbm9dlp6f0mslvxa2wzn4v4r3";
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21421,8 +21516,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xdamage ];
        description = "A binding to the Xdamage X11 extension library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Xdamage = null;};
 
@@ -21435,8 +21530,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xfixes ];
        description = "A binding to the Xfixes X11 extension library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Xfixes = null;};
 
@@ -21460,7 +21555,7 @@ self: {
        sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h";
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the Xshape X11 extension library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "XAttr" = callPackage
@@ -21483,8 +21578,8 @@ self: {
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ xinput ];
        description = "Bindings for the DirectX XInput library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {inherit (pkgs.xorg) xinput;};
 
   "XML" = callPackage
@@ -21503,8 +21598,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Extensible Markup Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "XMLParser" = callPackage
@@ -21515,7 +21610,7 @@ self: {
        sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik";
        libraryHaskellDepends = [ base parsec ];
        description = "A library to parse xml";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "XMMS" = callPackage
@@ -21529,7 +21624,7 @@ self: {
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        description = "XMMS2 client library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
@@ -21546,8 +21641,8 @@ self: {
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
        description = "XMPP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21574,8 +21669,8 @@ self: {
          rdf4h text unordered-containers vector
        ];
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21588,7 +21683,7 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXau;};
 
   "Xec" = callPackage
@@ -21606,8 +21701,8 @@ self: {
          old-time SHA unix
        ];
        description = "Gtk command launcher with identicon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21619,8 +21714,8 @@ self: {
        sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A library for writing XML and HTML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21632,8 +21727,8 @@ self: {
        sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx";
        libraryHaskellDepends = [ base ];
        description = "Pure haskell implementation of xorshift128plus random number generator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21654,8 +21749,8 @@ self: {
          SDL-image SDL-mixer SDL-ttf transformers
        ];
        description = "Yet Another Pong Clone using SDL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21667,8 +21762,8 @@ self: {
        sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif";
        libraryHaskellDepends = [ array base HGL Yampa ];
        description = "Yampa-based library for programming robots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21703,8 +21798,8 @@ self: {
          yesod-recaptcha yesod-static
        ];
        description = "A simple blog engine powered by Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21733,7 +21828,7 @@ self: {
        ];
        description = "YAML reference implementation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21750,7 +21845,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Yampa-core" = callPackage
@@ -21763,7 +21858,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
        description = "Library for programming hybrid systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "YampaSynth" = callPackage
@@ -21781,8 +21876,8 @@ self: {
          array base bytestring containers HCodecs Yampa
        ];
        description = "Software synthesizer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21794,7 +21889,7 @@ self: {
        sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p";
        libraryHaskellDepends = [ base containers parsec ];
        description = "A Minimal JSON Parser & Printer for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Yogurt" = callPackage
@@ -21810,8 +21905,8 @@ self: {
          syb time
        ];
        description = "A MUD client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21831,35 +21926,36 @@ self: {
        ];
        executableSystemDepends = [ readline ];
        description = "A functional MUD client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) readline;};
 
   "Z-Data" = callPackage
-    ({ mkDerivation, base, Cabal, case-insensitive, deepseq, ghc-prim
-     , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive
-     , QuickCheck, quickcheck-instances, scientific, tagged
+    ({ mkDerivation, base, Cabal, case-insensitive, containers, deepseq
+     , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp
+     , primitive, QuickCheck, quickcheck-instances, scientific, tagged
      , template-haskell, time, unordered-containers
      }:
      mkDerivation {
        pname = "Z-Data";
-       version = "0.3.0.0";
-       sha256 = "09pai7qhw6pjzrs05ac51f3v1ms0gdhkyp01jqkxzr9sllsbrgaq";
+       version = "0.4.0.0";
+       sha256 = "0vgphl16hq35cs12rvx663bxn88h4hx25digwy6h0yrc0j2yj9ls";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
-         base case-insensitive deepseq ghc-prim hashable integer-gmp
-         primitive QuickCheck scientific tagged template-haskell time
-         unordered-containers
+         base case-insensitive containers deepseq ghc-prim hashable
+         integer-gmp primitive QuickCheck scientific tagged template-haskell
+         time unordered-containers
        ];
        testHaskellDepends = [
-         base hashable hspec HUnit integer-gmp primitive QuickCheck
-         quickcheck-instances scientific time
+         base containers hashable hspec HUnit integer-gmp primitive
+         QuickCheck quickcheck-instances scientific time
+         unordered-containers
        ];
        testToolDepends = [ hspec-discover ];
        description = "Array, vector and text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21867,12 +21963,12 @@ self: {
     ({ mkDerivation, base, bytestring, containers, exceptions, hashable
      , hspec, hspec-discover, HUnit, primitive, QuickCheck
      , quickcheck-instances, scientific, stm, time, unix-time
-     , unordered-containers, word8, Z-Data, zlib
+     , unordered-containers, Z-Data, zlib
      }:
      mkDerivation {
        pname = "Z-IO";
-       version = "0.3.0.0";
-       sha256 = "0nsjqs9xyj8rw2wqml48la5mv7haf5117r4cqi02g35b57f7dq40";
+       version = "0.4.0.0";
+       sha256 = "0jyx2mghm40llcvilg6m9120wfngvpmsggy7xy6zdf29lz3v9bd5";
        libraryHaskellDepends = [
          base containers exceptions primitive stm time unix-time
          unordered-containers Z-Data
@@ -21880,12 +21976,40 @@ self: {
        libraryToolDepends = [ hspec-discover ];
        testHaskellDepends = [
          base bytestring hashable hspec HUnit primitive QuickCheck
-         quickcheck-instances scientific word8 Z-Data zlib
+         quickcheck-instances scientific Z-Data zlib
        ];
        testToolDepends = [ hspec-discover ];
        description = "Simple and high performance IO toolkit for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "Z-MessagePack" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, hspec
+     , hspec-discover, HUnit, integer-gmp, primitive, QuickCheck
+     , quickcheck-instances, scientific, tagged, time
+     , unordered-containers, Z-Data, Z-IO
+     }:
+     mkDerivation {
+       pname = "Z-MessagePack";
+       version = "0.1.0.0";
+       sha256 = "0ck21z1yqjx4w86h7z4ndj0fkpx7bfxfr9p5ls8687b71wxyzn6z";
+       revision = "2";
+       editedCabalFile = "14p2w38wrc8m66421wdl7q7fn21vk4b5m2mi2sa79wnaibv43d1n";
+       libraryHaskellDepends = [
+         base containers deepseq hashable integer-gmp primitive QuickCheck
+         scientific tagged time unordered-containers Z-Data Z-IO
+       ];
+       testHaskellDepends = [
+         base containers hashable hspec HUnit primitive QuickCheck
+         quickcheck-instances scientific time unordered-containers Z-Data
+         Z-IO
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "MessagePack";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21895,15 +22019,15 @@ self: {
      }:
      mkDerivation {
        pname = "Z-YAML";
-       version = "0.2.0.0";
-       sha256 = "0q0hyqvkirmlfbs6j1b892p1m3nf7n44nj7mbv0c9b5y2cjr44zi";
+       version = "0.3.0.0";
+       sha256 = "1z5k6qd9hsbwlvxcmy442g8fk7707fccwa9l8b518psp29nd7kzm";
        libraryHaskellDepends = [
          base primitive scientific transformers unordered-containers Z-Data
          Z-IO
        ];
        description = "YAML tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21917,8 +22041,8 @@ self: {
        editedCabalFile = "17dsvvbv3kf0b85l15fdkbvfpjhcmqw3j54j8av59wqhqncgnx2r";
        libraryHaskellDepends = [ base vect ];
        description = "Polymer growth simulation method";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21934,8 +22058,8 @@ self: {
          base CC-delcont containers mtl network unix
        ];
        description = "Oleg's Zipper FS";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21950,8 +22074,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21963,7 +22087,7 @@ self: {
        sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0";
        libraryHaskellDepends = [ base TypeCompose ];
        description = "Zipping folds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ZipperAG" = callPackage
@@ -21974,7 +22098,7 @@ self: {
        sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9";
        libraryHaskellDepends = [ base syz ];
        description = "An implementationg of Attribute Grammars using Functional Zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Zora" = callPackage
@@ -21991,7 +22115,7 @@ self: {
        ];
        testHaskellDepends = [ base containers random tasty tasty-hunit ];
        description = "Graphing library wrapper + assorted useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Zwaluw" = callPackage
@@ -22002,8 +22126,8 @@ self: {
        sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
        libraryHaskellDepends = [ base ];
        description = "Combinators for bidirectional URL routing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22023,7 +22147,7 @@ self: {
        ];
        description = "Compare genome assemblies";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22037,7 +22161,7 @@ self: {
        testHaskellDepends = [ base HUnit text ];
        description = "Parser for a language similar to Cucumber's Gherkin";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "abc-puzzle" = callPackage
@@ -22053,7 +22177,7 @@ self: {
          array base minisat random random-shuffle Safe
        ];
        description = "Generate instances of the ABC Logic Puzzle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abcBridge" = callPackage
@@ -22077,8 +22201,8 @@ self: {
          tasty-hunit tasty-quickcheck vector
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {abc = null;};
 
@@ -22092,8 +22216,8 @@ self: {
          base parsec prettify process semigroups
        ];
        description = "Haskell representation and parser for ABC notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22113,8 +22237,8 @@ self: {
          scientific text time unordered-containers uuid vector
        ];
        description = "interconversion between aeson and bson";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22127,8 +22251,8 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
        description = "Simple boolean tests to see if a value abides by certain properties";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22148,8 +22272,8 @@ self: {
          test-framework test-framework-hunit text
        ];
        description = "Parse ABNF and generate parsers for the specified document";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22161,7 +22285,7 @@ self: {
        sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
        libraryHaskellDepends = [ array base containers random time ];
        description = "Abstract, parameterized interface to mutable Deques";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abstract-deque-tests" = callPackage
@@ -22181,7 +22305,7 @@ self: {
          test-framework-hunit time
        ];
        description = "A test-suite for any queue or double-ended queue satisfying an interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abstract-par" = callPackage
@@ -22192,7 +22316,7 @@ self: {
        sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
        libraryHaskellDepends = [ base deepseq ];
        description = "Type classes generalizing the functionality of the 'monad-par' library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abstract-par-accelerate" = callPackage
@@ -22205,8 +22329,8 @@ self: {
          abstract-par accelerate array base vector
        ];
        description = "Provides the class ParAccelerate, nothing more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22222,8 +22346,8 @@ self: {
          base profunctors transformers transformers-compat vinyl
        ];
        description = "Abstract binding trees for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22237,8 +22361,8 @@ self: {
          base hashable unordered-containers vector
        ];
        description = "Aho-Corasick string matching algorithm in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22250,8 +22374,8 @@ self: {
        sha256 = "1nsnbvllwznbqycw33f09vfgqvqmqfkcbi367clm6k4v6rfswzl3";
        libraryHaskellDepends = [ ac-machine base conduit text ];
        description = "Drive Aho-Corasick machines in Conduit pipelines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22271,8 +22395,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Sequence optimized for monoidal construction and folding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22300,7 +22424,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "An embedded language for accelerated array processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -22318,8 +22442,8 @@ self: {
          accelerate accelerate-utility base QuickCheck
        ];
        description = "Linear algebra and interpolation using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22348,8 +22472,8 @@ self: {
          vector-th-unbox wide-word
        ];
        description = "Fixed-length large integer arithmetic for Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-blas" = callPackage
@@ -22377,8 +22501,8 @@ self: {
          criterion deepseq hmatrix mwc-random mwc-random-accelerate
        ];
        description = "Numeric Linear Algebra in Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-cublas" = callPackage
@@ -22405,8 +22529,8 @@ self: {
          base cuda hmatrix pooled-io random timeit utility-ht
        ];
        description = "Basic Linear Algebra using native CUBLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-cuda" = callPackage
@@ -22430,8 +22554,8 @@ self: {
          template-haskell text transformers unix unordered-containers
        ];
        description = "Accelerate backend for NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-cufft" = callPackage
@@ -22449,8 +22573,8 @@ self: {
          accelerate-utility base cuda cufft
        ];
        description = "Accelerate frontend to the CUFFT library (Fourier transform)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-examples" = callPackage
@@ -22490,8 +22614,8 @@ self: {
          repa-io scientific vector vector-algorithms
        ];
        description = "Examples using the Accelerate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-fft" = callPackage
@@ -22515,8 +22639,8 @@ self: {
          tasty tasty-hedgehog
        ];
        description = "FFT using the Accelerate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-fftw" = callPackage
@@ -22531,8 +22655,8 @@ self: {
          accelerate accelerate-io base carray fft storable-complex
        ];
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22558,8 +22682,8 @@ self: {
          accelerate-utility base criterion utility-ht
        ];
        description = "Fast Fourier transform and convolution using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22578,8 +22702,8 @@ self: {
          accelerate-fourier base criterion
        ];
        description = "Compare different implementations of the Fast Fourier Transform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io" = callPackage
@@ -22590,7 +22714,7 @@ self: {
        sha256 = "048md40pfacxa1mbzncybxzwp9fzmsaq8i94pd8ai677n2zyw5cg";
        libraryHaskellDepends = [ accelerate base ];
        description = "Convert between Accelerate arrays and raw pointers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-io-JuicyPixels" = callPackage
@@ -22605,8 +22729,8 @@ self: {
          accelerate accelerate-io-vector base JuicyPixels vector
        ];
        description = "Convert between Accelerate arrays and JuicyPixels images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-array" = callPackage
@@ -22622,8 +22746,8 @@ self: {
          accelerate array base hedgehog tasty tasty-hedgehog
        ];
        description = "Convert between Accelerate and array";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-bmp" = callPackage
@@ -22636,8 +22760,8 @@ self: {
          accelerate accelerate-io-bytestring base bmp
        ];
        description = "Convert between Accelerate arrays and BMP images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-bytestring" = callPackage
@@ -22648,8 +22772,8 @@ self: {
        sha256 = "15j42ahdcqpy4xbpp1xibfbjcrijy0hpfxp4k53qkb9bcqaknyq1";
        libraryHaskellDepends = [ accelerate base bytestring ];
        description = "Convert between Accelerate and ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-cereal" = callPackage
@@ -22663,8 +22787,8 @@ self: {
          accelerate accelerate-io-bytestring base cereal
        ];
        description = "Binary serialisation of Accelerate arrays using cereal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-repa" = callPackage
@@ -22675,8 +22799,23 @@ self: {
        sha256 = "084gzvfwz6prwra5393lfm5hgvssxwij0cdf24fq5nahzn7x2wrp";
        libraryHaskellDepends = [ accelerate base repa ];
        description = "Convert between Accelerate and Repa arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "accelerate-io-serialise" = callPackage
+    ({ mkDerivation, accelerate, accelerate-io-bytestring, base
+     , serialise
+     }:
+     mkDerivation {
+       pname = "accelerate-io-serialise";
+       version = "0.1.0.0";
+       sha256 = "1i85x6dqz7ihvi8b9rnlgjqnliq98cbv5fd1pf03n18kdbflzvm8";
+       libraryHaskellDepends = [
+         accelerate accelerate-io-bytestring base serialise
+       ];
+       description = "Binary serialisation of Accelerate arrays using serialise";
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-io-vector" = callPackage
@@ -22692,8 +22831,8 @@ self: {
          accelerate base hedgehog tasty tasty-hedgehog vector
        ];
        description = "Convert between Accelerate and vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-kullback-liebler" = callPackage
@@ -22719,8 +22858,8 @@ self: {
        benchmarkToolDepends = [ cpphs ];
        doHaddock = false;
        description = "Kullback-Liebler divergence";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -22740,7 +22879,7 @@ self: {
          unordered-containers vector
        ];
        description = "Accelerate backend component generating LLVM IR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -22762,8 +22901,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for multicore CPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22785,8 +22924,8 @@ self: {
        ];
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-random" = callPackage
@@ -22797,8 +22936,8 @@ self: {
        sha256 = "1wqy11aw99gq7hd0g539synsh6kv8j4a09p9b1k29hpanjr009kd";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22821,8 +22960,8 @@ self: {
          smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "a typesafe way encode accelerate matrices and vectors";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22834,8 +22973,8 @@ self: {
        sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh";
        libraryHaskellDepends = [ accelerate base utility-ht ];
        description = "Utility functions for the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22847,8 +22986,8 @@ self: {
        sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy";
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        description = "A Haskell implementation of the Accentuate.us API.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22860,8 +22999,8 @@ self: {
        sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs";
        libraryHaskellDepends = [ base filepath old-time time unix ];
        description = "Cross-platform support for retrieving file access times";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22888,8 +23027,8 @@ self: {
          th-format unliftio unliftio-core uuid
        ];
        description = "Provides Access Token for Services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22901,7 +23040,7 @@ self: {
        sha256 = "0dlszai5bz05algxm98kjhnjwa7mwj620d52vrsc4fxds8q84sjg";
        libraryHaskellDepends = [ base bifunctors lens semigroups ];
        description = "Data type like Either but with accumulating error type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ace" = callPackage
@@ -22919,7 +23058,7 @@ self: {
          base bifunctors hspec HUnit mtl parsec text
        ];
        description = "Attempto Controlled English parser and printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "achille" = callPackage
@@ -22942,8 +23081,8 @@ self: {
          tasty-hunit text time
        ];
        description = "A library for building static site generators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22975,7 +23114,7 @@ self: {
          base criterion directory mtl random system-fileio system-filepath
        ];
        description = "Add ACID guarantees to any serializable Haskell data structure";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acid-state-dist" = callPackage
@@ -23000,8 +23139,8 @@ self: {
          acid-state base criterion directory mtl safecopy
        ];
        description = "A replication backend for acid-state";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23017,8 +23156,8 @@ self: {
          acid-state base directory HsOpenSSL network safecopy
        ];
        description = "Add TLS support for Data.Acid.Remote";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23030,7 +23169,7 @@ self: {
        sha256 = "0bwlsdxk3lbir90xhar7xd83cwarqcm0a86gvwaghknpil2ay4cg";
        libraryHaskellDepends = [ base process ];
        description = "Writing and calling ACL2 from Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-all-monad" = callPackage
@@ -23041,8 +23180,8 @@ self: {
        sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad which is powerful enough to interpret any action";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23058,7 +23197,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A full featured empty project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-cadre" = callPackage
@@ -23069,7 +23208,7 @@ self: {
        sha256 = "1nclcq48r547rgmd4h0hf498z27d15lp4da9yb3a3sy7qk6m92bi";
        libraryHaskellDepends = [ base ];
        description = "car, cdr and more";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-circular-containers" = callPackage
@@ -23087,7 +23226,7 @@ self: {
          base containers doctest doctest-discover graph-wrapper
        ];
        description = "Spineless containers which are fast to read but inefficient to update";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-cofunctor" = callPackage
@@ -23098,7 +23237,7 @@ self: {
        sha256 = "0ydlnp0bbl5haci3a5x59sj2biylmpkqwzy749fhp8jn1cr8fg4x";
        libraryHaskellDepends = [ base ];
        description = "A Cofunctor is a structure from category theory dual to Functor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-colosson" = callPackage
@@ -23109,7 +23248,7 @@ self: {
        sha256 = "0mfnav0wb0ks365n3kghaic6nasp3qaznhmsdccx35h164ixj9vc";
        libraryHaskellDepends = [ base random ];
        description = "Determines whether it is numberwang";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-comonad" = callPackage
@@ -23120,8 +23259,8 @@ self: {
        sha256 = "1sc0alwdgfls18y4q4y0qkbzqm4fgzd9yv6dwwnzw3472vsz2x8s";
        libraryHaskellDepends = [ base comonad ];
        description = "A more efficient dualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23136,7 +23275,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Maybe gives you a cute boy";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-cutegirl" = callPackage
@@ -23150,7 +23289,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Maybe gives you a cute girl";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "acme-default" = callPackage
@@ -23161,7 +23300,7 @@ self: {
        sha256 = "0hkx2zpk3w9vh1jdhpwkd7x7hwr3zf5z9n6f30rjrbyqmxnicpip";
        libraryHaskellDepends = [ base ];
        description = "A class for types with a distinguished aesthetically pleasing value";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "acme-dont" = callPackage
@@ -23173,7 +23312,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A \"don't\" construct";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-flipping-tables" = callPackage
@@ -23184,8 +23323,8 @@ self: {
        sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757";
        libraryHaskellDepends = [ base ];
        description = "Stop execution with rage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23197,7 +23336,7 @@ self: {
        sha256 = "0b99f1js5w5904rw20xfmg8sfv0l8fdcnp90jx4rrczcirp6h6iq";
        libraryHaskellDepends = [ base ];
        description = "The best applicative functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-grawlix" = callPackage
@@ -23208,7 +23347,7 @@ self: {
        sha256 = "170cvi3b13wb8imfz3yc3323v2dnyhrr080syjqam477ahwggwsn";
        libraryHaskellDepends = [ base ];
        description = "More readable names for commonly used symbols";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-hq9plus" = callPackage
@@ -23219,8 +23358,8 @@ self: {
        sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187";
        libraryHaskellDepends = [ base ];
        description = "An embedded DSL for the HQ9+ programming language";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23238,8 +23377,8 @@ self: {
          base bytestring extensible-exceptions mtl network pretty
        ];
        description = "fastest Haskell PONG server in the world";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23254,8 +23393,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23268,7 +23407,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The only true way to do IO in Haskell!";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "acme-iot" = callPackage
@@ -23279,7 +23418,7 @@ self: {
        sha256 = "0y43prc9ykkbyvrq879ys753cijphmya7ig1m3v1g7fwyy9n23gx";
        libraryHaskellDepends = [ base ghc-prim mtl transformers ];
        description = "IO monad transformer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "acme-kitchen-sink" = callPackage
@@ -23290,8 +23429,8 @@ self: {
        sha256 = "0b587ryd63zyap7c3a1dnm25y0k9a6i2sx26xzg0wrq8hfh0f815";
        libraryHaskellDepends = [ base ];
        description = "A place for dumping that does-not-feel-right code while you improve it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23303,8 +23442,8 @@ self: {
        sha256 = "039pz5lw3p8iy1gaijvbc8296djxcziw70a0rnw0iz3iy29w1fmc";
        libraryHaskellDepends = [ base text ];
        description = "free your haskell from the tyranny of npm!";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23316,7 +23455,7 @@ self: {
        sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32";
        libraryHaskellDepends = [ base parsec random random-shuffle text ];
        description = "LOLSPEAK translator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-lookofdisapproval" = callPackage
@@ -23327,7 +23466,7 @@ self: {
        sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
        libraryHaskellDepends = [ base ];
        description = "Express your disapproval";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-memorandom" = callPackage
@@ -23338,7 +23477,7 @@ self: {
        sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi";
        libraryHaskellDepends = [ base MemoTrie random ];
        description = "Memoized random number generation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "acme-microwave" = callPackage
@@ -23349,7 +23488,7 @@ self: {
        sha256 = "136lwxcimj241nq9l0x7icxk1q9xz826sg07d40yj87shir52j39";
        libraryHaskellDepends = [ base ];
        description = "The eighth wonder of the world, kitchen math!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-miscorder" = callPackage
@@ -23360,8 +23499,8 @@ self: {
        sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4";
        libraryHaskellDepends = [ base random ];
        description = "Miscellaneous newtypes for orderings of discutable use";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23373,7 +23512,7 @@ self: {
        sha256 = "0nvkgdj04i21gq5k541an8zjz0hzzy7dpi384yrhcyh14jsxhqz5";
        libraryHaskellDepends = [ base stm ];
        description = "Cause serious international side effects";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-mutable-package" = callPackage
@@ -23387,8 +23526,8 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base ];
        description = "A mutable package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23400,8 +23539,8 @@ self: {
        sha256 = "0lnrsndx7r00b7vgh9jmp5j635m4pb2bzx0lfhqidkzfc2llzwsm";
        libraryHaskellDepends = [ base time ];
        description = "An interface to the philosophical and metaphysical \"now\"";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23413,8 +23552,8 @@ self: {
        sha256 = "1p5rdssdmds6yqgv3yvlh835h180h9q9430j8i6qrhygqn8lmv87";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Define the less than and add and subtract for nats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23427,7 +23566,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A name for omitted definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-one" = callPackage
@@ -23438,7 +23577,7 @@ self: {
        sha256 = "11sgx648g5594w8m8x8r25x7s61jyyxazp5dcfyglvhc7zlrrvbb";
        doHaddock = false;
        description = "The identity element of package dependencies";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-operators" = callPackage
@@ -23449,8 +23588,8 @@ self: {
        sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w";
        libraryHaskellDepends = [ base ];
        description = "Operators of base, all in one place!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23462,8 +23601,8 @@ self: {
        sha256 = "1kjfpihicb6f3kn5gzr0ya8f73g4y3kvw7y4plv67cpbc1icnpjl";
        libraryHaskellDepends = [ acme-left-pad base ];
        description = "The flexibility of Haskell and the safety of PHP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23475,7 +23614,7 @@ self: {
        sha256 = "02gml2db5vigkwkx99lqzjkpfaqdc74x16bgdx62kf7r3nn37my9";
        libraryHaskellDepends = [ base split ];
        description = "Make more than one point in numeric literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-realworld" = callPackage
@@ -23486,7 +23625,7 @@ self: {
        sha256 = "0ffhichjhhic7d5cjypmd2zmcq0dpqiz5ygsw0y67v83hry0vf8r";
        libraryHaskellDepends = [ base ];
        description = "Primitives for manipulating the state of the universe";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-safe" = callPackage
@@ -23498,7 +23637,7 @@ self: {
        libraryHaskellDepends = [ acme-dont base ];
        description = "Safe versions of some infamous haskell functions such as fromJust";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "acme-schoenfinkel" = callPackage
@@ -23515,8 +23654,8 @@ self: {
          test-framework-th
        ];
        description = "Proper names for curry and uncurry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23529,7 +23668,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Smuggle arbitrary values in arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-strfry" = callPackage
@@ -23540,8 +23679,8 @@ self: {
        sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb";
        libraryHaskellDepends = [ base bytestring ];
        description = "A binding to the glibc strfry function";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23555,8 +23694,8 @@ self: {
        editedCabalFile = "0i5hark97zl45iyiijxj07d2pg112kh3jcmjmscpbss5l5n02h23";
        libraryHaskellDepends = [ base ];
        description = "Stringly Typed Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23568,7 +23707,7 @@ self: {
        sha256 = "1anj8yygzcqkl4nwqwbrmwsqda84qcl8yzq7pgx2b7p895xcfa68";
        libraryHaskellDepends = [ base mtl ];
        description = "A Haskell port of the C/PHP strtok function";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-this" = callPackage
@@ -23581,8 +23720,8 @@ self: {
        editedCabalFile = "1xizmz9yyhxkkaynlk9x0l1nv5maz0shk3d1ipaphc9c6q4b1mjq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "import This";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23594,7 +23733,7 @@ self: {
        sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb";
        libraryHaskellDepends = [ base ghc-prim mtl transformers ];
        description = "An easy way to perform and unperform IO and other stateful actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-year" = callPackage
@@ -23607,7 +23746,7 @@ self: {
        testHaskellDepends = [ base time ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Get the current year";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-zalgo" = callPackage
@@ -23620,7 +23759,7 @@ self: {
        editedCabalFile = "1l2m9hh6mbc59h17z17gcfzgza25jj912d413pw1q37r3v4y0a1c";
        libraryHaskellDepends = [ array base random ];
        description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "acme-zero" = callPackage
@@ -23631,8 +23770,8 @@ self: {
        sha256 = "06d4hpda8qwwq9wzkgx6fpiq39l1md8sfm9hnvh4r95xyg5q53f6";
        doHaddock = false;
        description = "The absorbing element of package dependencies";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23656,8 +23795,8 @@ self: {
          relude tasty tasty-golden text
        ];
        description = "AcousticBrainz API client";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23669,7 +23808,7 @@ self: {
        sha256 = "1spw70dw8x6d9dy5wg47fim4kpsvzgr25nmwpv8c4wd8g3gmnqmw";
        libraryHaskellDepends = [ base transformers ];
        description = "Abstraction over management of resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "action-permutations" = callPackage
@@ -23680,7 +23819,7 @@ self: {
        sha256 = "0rhlzpwshixpnqma7sk28f22dkwz39b6lcwnzmd31rcnz5cyw6d4";
        libraryHaskellDepends = [ base ];
        description = "Execute a set of actions (e.g. parsers) in each possible order";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "active" = callPackage
@@ -23700,8 +23839,8 @@ self: {
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
        description = "Abstractions for animation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23730,8 +23869,8 @@ self: {
          utf8-string xhtml
        ];
        description = "Haskell code presentation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23745,8 +23884,8 @@ self: {
        editedCabalFile = "1v2sw9n9kiqc7cy0v1923ld645dykmk57bgdrgdgfv6qkfp6ghdd";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23758,8 +23897,8 @@ self: {
        sha256 = "1a9x42x0bysia00672qala6q6g5dgdfzwlzk2969c7q9gsxf63y9";
        libraryHaskellDepends = [ aeson base network-uri text time ];
        description = "ActivityPub Haskell Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23773,8 +23912,8 @@ self: {
          aeson base text time unordered-containers
        ];
        description = "An interface to the ActivityStreams specification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23787,8 +23926,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm time ];
        description = "Actors with multi-headed receive clauses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23804,8 +23943,8 @@ self: {
        ];
        doHaddock = false;
        description = "Semigroup actions and torsors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23826,7 +23965,7 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        benchmarkHaskellDepends = [ base criterion erf ];
        description = "Automatic Differentiation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -23837,8 +23976,8 @@ self: {
        sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk";
        libraryHaskellDepends = [ base ];
        description = "Self optimizing container types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23850,8 +23989,8 @@ self: {
        sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1";
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Self-optimizing tuple types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23866,8 +24005,8 @@ self: {
          base bytestring cereal containers mtl network
        ];
        description = "Android Debug Bridge (ADB) protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23889,7 +24028,7 @@ self: {
          parsec-permutation strict text time
        ];
        description = "Convert adblock config files to privoxy format";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -23902,7 +24041,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Adds license info to the top of a file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "addy" = callPackage
@@ -23923,8 +24062,8 @@ self: {
          tasty tasty-hedgehog tasty-hunit text text-icu validation-selective
        ];
        description = "A full-featured library for parsing, validating, and rendering email addresses";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23943,7 +24082,7 @@ self: {
        ];
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23965,8 +24104,8 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Approximate dictionary searching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23982,8 +24121,8 @@ self: {
        testHaskellDepends = [ base hs-functors ];
        benchmarkHaskellDepends = [ base gauge hs-functors ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24007,7 +24146,7 @@ self: {
        testHaskellDepends = [ base distributive generic-deriving hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Adjunctions and representable functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "adler32" = callPackage
@@ -24020,7 +24159,7 @@ self: {
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "An implementation of Adler-32, supporting rolling checksum operation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
   "adobe-swatch-exchange" = callPackage
@@ -24040,8 +24179,8 @@ self: {
          base binary bytestring data-binary-ieee754 language-css mtl pretty
        ];
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24062,8 +24201,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "ADP for multiple context-free languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24083,8 +24222,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Subword construction in adp-multi using monadiccp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24096,8 +24235,8 @@ self: {
        sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg";
        libraryHaskellDepends = [ base ];
        description = "Modelling, rendering and quantitative analysis on attack defense trees";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24120,8 +24259,8 @@ self: {
        ];
        testHaskellDepends = [ base directory filepath HUnit text ];
        description = "Advent of Code REST API bindings and servant API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24153,7 +24292,7 @@ self: {
          template-haskell th-lift th-lift-instances
        ];
        description = "Parse Advent of Code ASCII art letters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aern2-mp" = callPackage
@@ -24171,8 +24310,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24196,8 +24335,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exact real numbers via Cauchy sequences and MPFR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24213,8 +24352,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.5.4.1";
-       sha256 = "1zgycrai15vlf6drphcb2ff8fs7s6g6hjyxi20h98qkzij5drb0d";
+       version = "1.5.5.1";
+       sha256 = "0iqnzh9xh2vx9viqvs528i24zm9sdpvh8kjbpfxgrca38v6ds5m2";
        libraryHaskellDepends = [
          attoparsec base base-compat-batteries bytestring containers
          data-fix deepseq dlist ghc-prim hashable primitive scientific
@@ -24230,7 +24369,7 @@ self: {
          these time time-compat unordered-containers uuid-types vector
        ];
        description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -24241,8 +24380,8 @@ self: {
        sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz";
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        description = "make To/From JSOn instances from an applicative description";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24255,7 +24394,7 @@ self: {
        libraryHaskellDepends = [ aeson attoparsec base ];
        testHaskellDepends = [ base ];
        description = "Embed an Attoparsec text parser into an Aeson parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-better-errors" = callPackage
@@ -24272,7 +24411,7 @@ self: {
          transformers-compat unordered-containers vector void
        ];
        description = "Better error messages when decoding JSON values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-bson" = callPackage
@@ -24289,7 +24428,7 @@ self: {
        ];
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "aeson-casing" = callPackage
@@ -24305,7 +24444,7 @@ self: {
          aeson base tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Tools to change the formatting of field names in Aeson instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-coerce" = callPackage
@@ -24316,7 +24455,7 @@ self: {
        sha256 = "0i6pv9hkwp4h7wwmnr6lwaqjkwykdgqkvpycm7fpyrlw5ipkp728";
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-combinators" = callPackage
@@ -24336,7 +24475,7 @@ self: {
          aeson base bytestring doctest hspec text utf8-string
        ];
        description = "Aeson combinators for dead simple JSON decoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-commit" = callPackage
@@ -24352,7 +24491,7 @@ self: {
          aeson aeson-qq base tasty tasty-hspec text
        ];
        description = "Parse Aeson data with commitment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-compat" = callPackage
@@ -24380,7 +24519,7 @@ self: {
          time-locale-compat unordered-containers vector
        ];
        description = "Compatibility layer for aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-decode" = callPackage
@@ -24398,8 +24537,8 @@ self: {
          aeson-qq base containers hedgehog text time
        ];
        description = "Easy functions for converting from Aeson.Value";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24412,7 +24551,7 @@ self: {
        libraryHaskellDepends = [ aeson base containers ];
        testHaskellDepends = [ aeson base containers ];
        description = "Apply default value to FromJSON instacnes' Maybe fields";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-deriving" = callPackage
@@ -24430,7 +24569,7 @@ self: {
          aeson base hedgehog regex-tdfa text unordered-containers
        ];
        description = "data types for compositional, type-directed serialization";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-diff" = callPackage
@@ -24457,7 +24596,7 @@ self: {
          quickcheck-instances text unordered-containers vector
        ];
        description = "Extract and apply patches to JSON documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-diff-generic" = callPackage
@@ -24476,8 +24615,8 @@ self: {
          th-abstraction time unordered-containers uuid-types vector
        ];
        description = "Apply a json-patch to any haskell datatype";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24506,7 +24645,7 @@ self: {
          tasty-quickcheck time time-parsers unordered-containers vector
        ];
        description = "Extra goodies for aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -24524,8 +24663,8 @@ self: {
          aeson base bytestring doctest text time unordered-containers
        ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24540,7 +24679,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Tools for creating flat JSON serializations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-flatten" = callPackage
@@ -24554,7 +24693,7 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "JSON flatten for Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-flowtyped" = callPackage
@@ -24575,8 +24714,8 @@ self: {
          unordered-containers vector
        ];
        description = "Create Flow type definitions from Haskell data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24602,7 +24741,7 @@ self: {
          aeson aeson-qq base dependent-sum hspec HUnit
        ];
        description = "Derivation of Aeson instances for GADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-generic-compat" = callPackage
@@ -24613,7 +24752,7 @@ self: {
        sha256 = "1kr3waa46k3619yvif0zh4lx7s0zhyghlr1c5kkrvg432i8wmdm6";
        libraryHaskellDepends = [ aeson base ];
        description = "Compatible generic class names of Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-helper" = callPackage
@@ -24626,7 +24765,7 @@ self: {
          aeson base text unordered-containers vector
        ];
        description = "Aeson helper func";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-injector" = callPackage
@@ -24650,8 +24789,8 @@ self: {
          scientific swagger2 tasty tasty-hunit tasty-quickcheck text vector
        ];
        description = "Injecting fields into aeson values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24668,7 +24807,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Aeson instances for iproute types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-json-ast" = callPackage
@@ -24679,7 +24818,7 @@ self: {
        sha256 = "0p9da4cpbj811b9va2rhhn95cqckhabhr9k4fjfd536dzrxqjigz";
        libraryHaskellDepends = [ aeson base json-ast ];
        description = "Integration layer for \"json-ast\" and \"aeson\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-lens" = callPackage
@@ -24695,7 +24834,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Lens of Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-match-qq" = callPackage
@@ -24715,8 +24854,8 @@ self: {
          aeson aeson-qq base hspec unordered-containers
        ];
        description = "Declarative JSON matchers";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24737,8 +24876,8 @@ self: {
          unordered-containers vector
        ];
        description = "Fast JSON parsing and encoding (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24758,7 +24897,7 @@ self: {
          optics-extra scientific text unordered-containers vector
        ];
        description = "Law-abiding optics for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-options" = callPackage
@@ -24771,8 +24910,8 @@ self: {
        editedCabalFile = "0sibi1vhgkx0v082iffpqxg1mshrwd1d1s3xnpaqn0rdpfpja31d";
        libraryHaskellDepends = [ aeson base ];
        description = "Options to derive FromJSON/ToJSON instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24788,7 +24927,7 @@ self: {
          aeson base parsec scientific text unordered-containers vector
        ];
        description = "Alternative JSON parser based on Parsec and Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-picker" = callPackage
@@ -24800,7 +24939,7 @@ self: {
        libraryHaskellDepends = [ aeson base lens lens-aeson text ];
        testHaskellDepends = [ base hspec text ];
        description = "Tiny library to get fields from JSON format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-prefix" = callPackage
@@ -24816,8 +24955,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec mtl text ];
        description = "Hiearchical prefixing for aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24839,7 +24978,7 @@ self: {
          aeson attoparsec base bytestring cmdargs
        ];
        description = "JSON pretty-printing library and command-line tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-qq" = callPackage
@@ -24860,7 +24999,7 @@ self: {
          parsec scientific template-haskell text vector
        ];
        description = "JSON quasiquoter for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-quick" = callPackage
@@ -24880,7 +25019,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ aeson base bytestring criterion text ];
        description = "Quick JSON extractions with Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-result" = callPackage
@@ -24891,7 +25030,7 @@ self: {
        sha256 = "10bnzh7vlh42sip0z7mvx5jxrsi7p2s3vqy55pfg2pb17czzly2y";
        libraryHaskellDepends = [ aeson aeson-helper base text ];
        description = "API Result for aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-schema" = callPackage
@@ -24920,8 +25059,8 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "Haskell JSON schema validator and parser generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24951,8 +25090,8 @@ self: {
          megaparsec template-haskell text th-test-utils unordered-containers
        ];
        description = "Easily consume JSON data on-demand with type-safety";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24965,7 +25104,7 @@ self: {
        libraryHaskellDepends = [ aeson base cereal ];
        testHaskellDepends = [ aeson base cereal hspec HUnit ];
        description = "Simple serialization functions for aeson types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-smart" = callPackage
@@ -24981,8 +25120,8 @@ self: {
          vector
        ];
        description = "Smart derivation of Aeson instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24998,8 +25137,8 @@ self: {
          aeson attoparsec base bytestring HsOpenSSL http-streams io-streams
        ];
        description = "An HTTP client library for JSON-based APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25019,8 +25158,8 @@ self: {
          vector
        ];
        description = "Transform JSON";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25040,8 +25179,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ aeson base hspec ];
        description = "Aeson instances for the Tiled map editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25054,7 +25193,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring failure text ];
        testHaskellDepends = [ base hspec ];
        description = "A generalization of Aeson over Failure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-typescript" = callPackage
@@ -25076,8 +25215,8 @@ self: {
          th-abstraction unordered-containers
        ];
        description = "Generate TypeScript definition files from your ADTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25095,8 +25234,8 @@ self: {
          aeson attoparsec base bytestring scientific text
        ];
        description = "Utilities for working with Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25114,7 +25253,7 @@ self: {
          text text-builder transformers unordered-containers vector
        ];
        description = "API for parsing \"aeson\" JSON tree into Haskell types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-via" = callPackage
@@ -25128,7 +25267,7 @@ self: {
          aeson aeson-casing base newtype-generics text
        ];
        description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-with" = callPackage
@@ -25144,7 +25283,7 @@ self: {
          vector
        ];
        description = "withXField combinators for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-yak" = callPackage
@@ -25155,7 +25294,7 @@ self: {
        sha256 = "0x5a5z0bmiljl9rfapyq6srffp6v3g25qvy0x692a5as66y5ahxg";
        libraryHaskellDepends = [ aeson base ];
        description = "Handle JSON that may or may not be a list, or exist";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-yaml" = callPackage
@@ -25178,7 +25317,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Output any Aeson value as YAML (pure Haskell library)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "affection" = callPackage
@@ -25197,8 +25336,8 @@ self: {
          monad-parallel mtl OpenGL sdl2 stm text uuid vector
        ];
        description = "A simple Game Engine using SDL";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25212,7 +25351,7 @@ self: {
        editedCabalFile = "1avxd17y9k0afqjgb8gq254a6ys7dpncgiyrp6mxbngdcvjyahyc";
        libraryHaskellDepends = [ alg base ];
        description = "Affine spaces (generalized)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "affine-invariant-ensemble-mcmc" = callPackage
@@ -25227,8 +25366,8 @@ self: {
          base containers mwc-random primitive split vector
        ];
        description = "General-purpose sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25239,7 +25378,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1bldljkgsb9v7ss3l87mm4r9wjpp3z02hjnfdnp84pmaj0b34vam";
        libraryHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "afis" = callPackage
@@ -25261,7 +25400,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Anti-forensic Information Splitter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "afv" = callPackage
@@ -25278,8 +25417,8 @@ self: {
          base bytestring directory language-c mtl process yices
        ];
        description = "Infinite state model checking of iterative C programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25293,8 +25432,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers uuagc uulib ];
        description = "Attribute Grammar picture generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25315,8 +25454,8 @@ self: {
          pandoc snap-core snap-server transformers utf8-string xhtml
        ];
        description = "Http server for Agda (prototype)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25337,8 +25476,8 @@ self: {
        ];
        executableHaskellDepends = [ Agda base network-uri transformers ];
        description = "Render just the Agda snippets of a literate Agda file to HTML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25355,8 +25494,8 @@ self: {
          pandoc-types
        ];
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25379,8 +25518,8 @@ self: {
        ];
        testHaskellDepends = [ base containers filepath hspec text ];
        description = "Check for unused code in an Agda project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25396,7 +25535,7 @@ self: {
          base directory filepath optparse-applicative
        ];
        description = "Translate .agda files into .lagda.tex files.";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "agentx" = callPackage
@@ -25417,8 +25556,8 @@ self: {
          snmp time transformers unix
        ];
        description = "AgentX protocol for write SNMP subagents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25451,8 +25590,8 @@ self: {
          base QuickCheck tasty tasty-ant-xml tasty-quickcheck
        ];
        description = "And-inverter graphs in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25481,8 +25620,8 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Aeronautical Information Package (AIP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25498,7 +25637,7 @@ self: {
          array base bytestring containers directory filepath mtl text time
        ];
        description = "air";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "air-extra" = callPackage
@@ -25514,7 +25653,7 @@ self: {
          parsec regexpr text time
        ];
        description = "air-extra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "air-spec" = callPackage
@@ -25526,7 +25665,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hspec text ];
        description = "air spec helper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "air-th" = callPackage
@@ -25537,8 +25676,8 @@ self: {
        sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq";
        libraryHaskellDepends = [ air base template-haskell ];
        description = "air";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25558,8 +25697,8 @@ self: {
          transformers utf8-string wai
        ];
        description = "An Airbrake notifier for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25589,8 +25728,8 @@ self: {
          transformers wai
        ];
        description = "A Webmachine-inspired HTTP library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25608,8 +25747,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Requesting and introspecting Tables within an Airtable project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25626,7 +25765,7 @@ self: {
          random semigroups vector
        ];
        description = "A multi-method simulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-branches" = callPackage
@@ -25641,7 +25780,7 @@ self: {
          aivika aivika-transformers base containers mtl mwc-random random
        ];
        description = "Nested discrete event simulation module for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-distributed" = callPackage
@@ -25658,8 +25797,8 @@ self: {
          distributed-process exceptions mtl mwc-random random stm time
        ];
        description = "Parallel distributed discrete event simulation module for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25676,7 +25815,7 @@ self: {
          network-uri parallel-io split
        ];
        description = "Simulation experiments for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-experiment-cairo" = callPackage
@@ -25692,7 +25831,7 @@ self: {
          colour lens
        ];
        description = "Cairo-based charting backend for the Aivika simulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-experiment-chart" = callPackage
@@ -25709,7 +25848,7 @@ self: {
          data-default-class filepath lens mtl split
        ];
        description = "Simulation experiments with charting for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-experiment-diagrams" = callPackage
@@ -25725,8 +25864,8 @@ self: {
          colour containers filepath lens
        ];
        description = "Diagrams-based charting backend for the Aivika simulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25743,7 +25882,7 @@ self: {
          unordered-containers
        ];
        description = "GPSS-like DSL for Aivika";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-lattice" = callPackage
@@ -25759,7 +25898,7 @@ self: {
          random
        ];
        description = "Nested discrete event simulation module for the Aivika library using lattice";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-realtime" = callPackage
@@ -25775,7 +25914,7 @@ self: {
          random stm time vector
        ];
        description = "Soft real-time simulation module for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-transformers" = callPackage
@@ -25791,7 +25930,7 @@ self: {
          semigroups vector
        ];
        description = "Transformers for the Aivika simulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ajhc" = callPackage
@@ -25818,8 +25957,8 @@ self: {
          regex-compat syb temporary unix utf8-string zlib
        ];
        description = "Haskell compiler that produce binary through C language";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25833,7 +25972,7 @@ self: {
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
        description = "OpenAL 1.1 raw API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
@@ -25851,7 +25990,7 @@ self: {
          async base clock hspec stm time unbounded-delays
        ];
        description = "Wake up and perform an action at a certain time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alea" = callPackage
@@ -25867,7 +26006,7 @@ self: {
          base optparse-applicative random text
        ];
        description = "a diceware passphrase generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "alerta" = callPackage
@@ -25885,8 +26024,8 @@ self: {
          servant-server text time
        ];
        description = "Bindings to the alerta REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25898,7 +26037,7 @@ self: {
        sha256 = "14fyckdwwhp786z2gg6m92xmz0rbvqwalj0bylqagi9n295ni74f";
        libraryHaskellDepends = [ base blaze-html text ];
        description = "Alert messages for web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alex" = callPackage
@@ -25915,7 +26054,7 @@ self: {
        executableToolDepends = [ happy ];
        testHaskellDepends = [ base process ];
        description = "Alex is a tool for generating lexical analysers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alex-meta" = callPackage
@@ -25931,7 +26070,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Quasi-quoter for Alex lexers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alex-prelude" = callPackage
@@ -25942,8 +26081,8 @@ self: {
        sha256 = "1ngxkr7jvy48pgq0sjqpi7a84qjm4fjny64hxksyvbj08l2rn7ha";
        libraryHaskellDepends = [ base time ];
        description = "Collection of useful functions for writing console applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25952,16 +26091,14 @@ self: {
      }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.5";
-       sha256 = "06ghkigqabz9h17wjpc3jwv1f4k6fajpzblzvysqzg71pfncx88m";
-       revision = "1";
-       editedCabalFile = "0br92hrl0pxw2a5k9wgzk3zwyz2dimcwwjxijgzrd2yg0s1vnm9p";
+       version = "0.5.0.1";
+       sha256 = "0rc56hvmlnym620pc8i7539wig50glms537kcwlmhd89c9cib8iy";
        libraryHaskellDepends = [
          base bytestring deepseq template-haskell text
        ];
        description = "A set of functions for a common use case of Alex";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25980,8 +26117,8 @@ self: {
          text xmlgen
        ];
        description = "utility library for Alfred version 2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26003,7 +26140,7 @@ self: {
          quickcheck-instances text
        ];
        description = "Fast Aho-Corasick string searching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alg" = callPackage
@@ -26016,7 +26153,7 @@ self: {
        editedCabalFile = "0rm66k502d8la140ffawd38yaf0hr92h8x7xrq6krn6ypljwql0v";
        libraryHaskellDepends = [ base dual util ];
        description = "Algebraic structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alga" = callPackage
@@ -26048,8 +26185,8 @@ self: {
          tf-random transformers
        ];
        description = "Algorithmic automation for various DAWs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26068,7 +26205,7 @@ self: {
          semigroupoids semigroups tagged transformers void
        ];
        description = "Constructive abstract algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebra-checkers" = callPackage
@@ -26085,8 +26222,8 @@ self: {
          syb template-haskell th-instance-reification transformers
        ];
        description = "Model and test API surfaces algebraically";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26102,8 +26239,8 @@ self: {
          aeson base containers fgl mtl parsec template-haskell transformers
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26122,7 +26259,7 @@ self: {
          QuickCheck quickspec
        ];
        description = "Companion library for the book Algebra-Driven Design by Sandy Maguire";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebra-sql" = callPackage
@@ -26148,8 +26285,8 @@ self: {
          process template-haskell text time transformers
        ];
        description = "Relational Algebra and SQL Code Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26161,8 +26298,8 @@ self: {
        sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh";
        libraryHaskellDepends = [ accelerate base ];
        description = "General linear algebra structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26176,7 +26313,7 @@ self: {
        editedCabalFile = "0w3845hl7cppdk3zvhmz0zic7sbcklfircx97wf9dhh40q3qdcmi";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Conversions between algebraic classes and F-algebras";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebraic-graphs" = callPackage
@@ -26195,7 +26332,7 @@ self: {
          QuickCheck transformers
        ];
        description = "A library for algebraic graph construction and transformation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "algebraic-graphs-io" = callPackage
@@ -26221,7 +26358,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "I/O utilities and datasets for algebraic-graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -26236,8 +26373,8 @@ self: {
          algebra base basic-prelude lens semigroups
        ];
        description = "Algebraically structured Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26263,8 +26400,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26290,8 +26427,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A client implementing the Algolia search API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26303,7 +26440,7 @@ self: {
        sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "Sequence alignment algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "align-text" = callPackage
@@ -26316,8 +26453,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A simple unix filter to align text on specified substrings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26329,7 +26466,7 @@ self: {
        sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00";
        libraryHaskellDepends = [ base ];
        description = "An aligned ForeignPtr type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "alist" = callPackage
@@ -26340,7 +26477,7 @@ self: {
        sha256 = "0ydq2sxyfgij0rf54i3ajj4hdqjawhcdsgi822yrkq86xjvsxc4w";
        libraryHaskellDepends = [ base ];
        description = "lists with O(1) append";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "allocated-processor" = callPackage
@@ -26351,7 +26488,7 @@ self: {
        sha256 = "0jhz3q0972snrgd9c7lr934ddkwllwgw6anj7ax8hj4zi0zc615m";
        libraryHaskellDepends = [ base vector-space ];
        description = "Functional combinators for monadic actions that require allocation and de-allocation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alloy" = callPackage
@@ -26362,7 +26499,7 @@ self: {
        sha256 = "0hy3x87idw60rx2plv69i7hd22qxircvasvx9cjbd1w603vqk8zh";
        libraryHaskellDepends = [ base containers mtl syb vector ];
        description = "Generic programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alloy-proxy-fd" = callPackage
@@ -26373,7 +26510,7 @@ self: {
        sha256 = "1fhk5ydnf0l0n579gqg5lfg2cc9z8xbgqsqzgkpcw0046kp53rjw";
        libraryHaskellDepends = [ alloy base mtl ];
        description = "Some add-on instances for the Alloy library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ally-invest" = callPackage
@@ -26393,8 +26530,8 @@ self: {
          http-client-tls safe text time
        ];
        description = "Ally Invest integration library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26406,7 +26543,7 @@ self: {
        sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90";
        libraryHaskellDepends = [ base ];
        description = "Recurse while a predicate is satisfied";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alms" = callPackage
@@ -26428,8 +26565,8 @@ self: {
          stm syb template-haskell transformers tuple
        ];
        description = "a practical affine language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26450,8 +26587,8 @@ self: {
          transformers unix
        ];
        description = "A compiler for the Alpha language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26472,8 +26609,8 @@ self: {
          tasty-hedgehog tasty-hspec tasty-hunit text
        ];
        description = "A character between a-z";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26497,7 +26634,7 @@ self: {
        ];
        description = "Alpino data manipulation tools";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "alsa" = callPackage
@@ -26513,8 +26650,8 @@ self: {
        ];
        librarySystemDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alsaLib;};
 
@@ -26527,8 +26664,8 @@ self: {
        libraryHaskellDepends = [ base extensible-exceptions ];
        libraryPkgconfigDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API (Exceptions)";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
@@ -26545,8 +26682,8 @@ self: {
          alsa-core alsa-seq base midi midi-alsa wx wxcore
        ];
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26568,7 +26705,7 @@ self: {
        executableSystemDepends = [ alsaLib ];
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alsaLib;};
 
@@ -26582,8 +26719,8 @@ self: {
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the ALSA simple mixer API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -26602,8 +26739,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API (PCM audio)";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -26616,8 +26753,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26638,8 +26775,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API (MIDI sequencer)";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -26652,8 +26789,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA sequencer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26665,8 +26802,8 @@ self: {
        sha256 = "1jcc6cx0jj5ddvyq8xii9ar67ic3vlmy351qgybn74clpipgdyrm";
        libraryHaskellDepends = [ base composition ];
        description = "Alternative combinators for unorthodox function composition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26678,8 +26815,8 @@ self: {
        sha256 = "1l6fjvh38qh3jqz3hvf4km3bzyp9x9w6hn9qk0rvs2z7bkasssl9";
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for alternatives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26697,8 +26834,8 @@ self: {
          base lifted-base monad-control transformers transformers-base
        ];
        description = "IO as Alternative instance (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26710,7 +26847,7 @@ self: {
        sha256 = "1cf7akvr9nac1483chh7rd3xp5i5zk78f245lw9ixj6v133lnis2";
        libraryHaskellDepends = [ base vector ];
        description = "Use vectors instead of lists for many and some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alternators" = callPackage
@@ -26725,7 +26862,7 @@ self: {
          base lens mmorph mtl newtype-generics stm transformers
        ];
        description = "Handy functions when using transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "altfloat" = callPackage
@@ -26737,7 +26874,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Alternative floating point support for GHC";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "alto" = callPackage
@@ -26761,8 +26898,8 @@ self: {
        ];
        executableHaskellDepends = [ base warp ];
        description = "Implement a menu experience fit for web users";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26779,7 +26916,7 @@ self: {
          base bytestring cereal tasty tasty-hunit tasty-quickcheck
        ];
        description = "HTTP Alternative Services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alure" = callPackage
@@ -26792,10 +26929,20 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alure;};
 
+  "always" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "always";
+       version = "0.1";
+       sha256 = "15fwq1pmb3d46cgsj59q3iz2qs0lgvq5b9d6gxfysnjlm3sp0ivw";
+       description = "provides a typeclass that is always satisfied";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "amazon-emailer" = callPackage
     ({ mkDerivation, base, bytestring, configurator, http-conduit
      , lifted-base, mime-mail, mime-mail-ses, postgresql-simple
@@ -26812,8 +26959,8 @@ self: {
          mime-mail-ses postgresql-simple resourcet text time
        ];
        description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26828,8 +26975,8 @@ self: {
          base mtl snap snaplet-postgresql-simple text
        ];
        description = "Client library for amazon-emailer daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26855,8 +27002,8 @@ self: {
          base bytestring http-conduit text transformers
        ];
        description = "Connector for Amazon Products API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26881,8 +27028,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Comprehensive Amazon Web Services SDK";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26900,7 +27047,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Alexa For Business SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-apigateway" = callPackage
@@ -26917,7 +27064,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon API Gateway SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
@@ -26934,7 +27081,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Application Auto Scaling SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -26951,7 +27098,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon AppStream SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-appsync" = callPackage
@@ -26968,7 +27115,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon AppSync SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-athena" = callPackage
@@ -26985,7 +27132,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Athena SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-autoscaling" = callPackage
@@ -27002,7 +27149,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Auto Scaling SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-autoscaling-plans" = callPackage
@@ -27019,7 +27166,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Auto Scaling Plans SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-batch" = callPackage
@@ -27036,7 +27183,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Batch SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -27053,7 +27200,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Budgets SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-certificatemanager" = callPackage
@@ -27070,7 +27217,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Certificate Manager SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-certificatemanager-pca" = callPackage
@@ -27087,7 +27234,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Certificate Manager Private Certificate Authority SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloud9" = callPackage
@@ -27104,7 +27251,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cloud9 SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-clouddirectory" = callPackage
@@ -27121,7 +27268,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudDirectory SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudformation" = callPackage
@@ -27138,7 +27285,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudFormation SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudfront" = callPackage
@@ -27155,7 +27302,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudFront SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
@@ -27172,7 +27319,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudHSM SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudhsmv2" = callPackage
@@ -27189,7 +27336,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudHSM V2 SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
@@ -27206,7 +27353,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudSearch SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
@@ -27223,7 +27370,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudSearch Domain SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
@@ -27240,7 +27387,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudTrail SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
@@ -27257,7 +27404,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudWatch SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
@@ -27274,7 +27421,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudWatch Events SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
@@ -27291,7 +27438,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudWatch Logs SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -27308,7 +27455,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeBuild SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codecommit" = callPackage
@@ -27325,7 +27472,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeCommit SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codedeploy" = callPackage
@@ -27342,7 +27489,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeDeploy SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codepipeline" = callPackage
@@ -27359,7 +27506,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodePipeline SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codestar" = callPackage
@@ -27376,7 +27523,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeStar SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
@@ -27393,7 +27540,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cognito Identity SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
@@ -27410,7 +27557,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cognito Identity Provider SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
@@ -27427,7 +27574,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cognito Sync SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-comprehend" = callPackage
@@ -27444,7 +27591,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Comprehend SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-config" = callPackage
@@ -27461,7 +27608,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Config SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-connect" = callPackage
@@ -27478,7 +27625,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Connect Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-core" = callPackage
@@ -27510,7 +27657,7 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell text time
        ];
        description = "Core data types and functionality for Amazonka libraries";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cost-explorer" = callPackage
@@ -27527,7 +27674,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cost Explorer Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cur" = callPackage
@@ -27544,7 +27691,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cost and Usage Report Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-datapipeline" = callPackage
@@ -27561,7 +27708,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Data Pipeline SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-devicefarm" = callPackage
@@ -27578,7 +27725,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Device Farm SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-directconnect" = callPackage
@@ -27595,7 +27742,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Direct Connect SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-discovery" = callPackage
@@ -27612,7 +27759,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Application Discovery Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dms" = callPackage
@@ -27629,7 +27776,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Database Migration Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ds" = callPackage
@@ -27646,7 +27793,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Directory Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dynamodb" = callPackage
@@ -27663,7 +27810,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon DynamoDB SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dynamodb-dax" = callPackage
@@ -27680,7 +27827,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon DynamoDB Accelerator (DAX) SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
@@ -27697,7 +27844,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon DynamoDB Streams SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ec2" = callPackage
@@ -27714,7 +27861,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Compute Cloud SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -27731,7 +27878,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon EC2 Container Registry SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ecs" = callPackage
@@ -27748,7 +27895,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon EC2 Container Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-efs" = callPackage
@@ -27765,7 +27912,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic File System SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elasticache" = callPackage
@@ -27782,7 +27929,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon ElastiCache SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
@@ -27799,7 +27946,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Beanstalk SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
@@ -27816,7 +27963,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elasticsearch Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
@@ -27833,7 +27980,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Transcoder SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elb" = callPackage
@@ -27850,7 +27997,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Load Balancing SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -27867,7 +28014,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Load Balancing SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -27884,7 +28031,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic MapReduce SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-fms" = callPackage
@@ -27901,7 +28048,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Firewall Management Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-gamelift" = callPackage
@@ -27918,7 +28065,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon GameLift SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-glacier" = callPackage
@@ -27935,7 +28082,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Glacier SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-glue" = callPackage
@@ -27952,7 +28099,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Glue SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-greengrass" = callPackage
@@ -27969,7 +28116,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Greengrass SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-guardduty" = callPackage
@@ -27986,7 +28133,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon GuardDuty SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-health" = callPackage
@@ -28003,7 +28150,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Health APIs and Notifications SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iam" = callPackage
@@ -28020,7 +28167,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Identity and Access Management SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iam-policy" = callPackage
@@ -28041,7 +28188,7 @@ self: {
          aeson aeson-pretty base bytestring doctest hspec
        ];
        description = "Amazon IAM Policy Document DSL and Combinators";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-importexport" = callPackage
@@ -28058,7 +28205,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Import/Export SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-inspector" = callPackage
@@ -28075,7 +28222,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Inspector SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot" = callPackage
@@ -28092,7 +28239,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot-analytics" = callPackage
@@ -28109,7 +28256,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT Analytics SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot-dataplane" = callPackage
@@ -28126,7 +28273,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT Data Plane SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot-jobs-dataplane" = callPackage
@@ -28143,7 +28290,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT Jobs Data Plane SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis" = callPackage
@@ -28160,7 +28307,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -28177,7 +28324,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Analytics SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -28194,7 +28341,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Firehose SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-video" = callPackage
@@ -28211,7 +28358,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Video Streams SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-video-archived-media" = callPackage
@@ -28228,7 +28375,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Video Streams Archived Media SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-video-media" = callPackage
@@ -28245,7 +28392,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Video Streams Media SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kms" = callPackage
@@ -28262,7 +28409,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Key Management Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lambda" = callPackage
@@ -28279,7 +28426,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lambda SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lex-models" = callPackage
@@ -28296,7 +28443,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lex Model Building Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lex-runtime" = callPackage
@@ -28313,7 +28460,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lex Runtime Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -28330,7 +28477,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lightsail SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
@@ -28347,7 +28494,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Marketplace Commerce Analytics SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-marketplace-entitlement" = callPackage
@@ -28364,7 +28511,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Marketplace Entitlement Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
@@ -28381,7 +28528,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Marketplace Metering SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mechanicalturk" = callPackage
@@ -28398,7 +28545,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Mechanical Turk SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediaconvert" = callPackage
@@ -28415,7 +28562,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaConvert SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-medialive" = callPackage
@@ -28432,7 +28579,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaLive SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediapackage" = callPackage
@@ -28449,7 +28596,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaPackage SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediastore" = callPackage
@@ -28466,7 +28613,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaStore SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediastore-dataplane" = callPackage
@@ -28483,7 +28630,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaStore Data Plane SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-migrationhub" = callPackage
@@ -28500,7 +28647,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Migration Hub SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ml" = callPackage
@@ -28517,7 +28664,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Machine Learning SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mobile" = callPackage
@@ -28534,7 +28681,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Mobile SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mq" = callPackage
@@ -28551,7 +28698,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon MQ SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-opsworks" = callPackage
@@ -28568,7 +28715,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon OpsWorks SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -28585,7 +28732,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon OpsWorks for Chef Automate SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-organizations" = callPackage
@@ -28602,7 +28749,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Organizations SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-pinpoint" = callPackage
@@ -28619,7 +28766,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Pinpoint SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-polly" = callPackage
@@ -28636,7 +28783,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Polly SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-pricing" = callPackage
@@ -28653,7 +28800,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Price List Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-rds" = callPackage
@@ -28670,7 +28817,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Relational Database Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -28687,7 +28834,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Redshift SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -28704,7 +28851,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Rekognition SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-resourcegroups" = callPackage
@@ -28721,7 +28868,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Resource Groups SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-resourcegroupstagging" = callPackage
@@ -28738,7 +28885,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Resource Groups Tagging API SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-route53" = callPackage
@@ -28755,7 +28902,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Route 53 SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-route53-autonaming" = callPackage
@@ -28772,7 +28919,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Route 53 Auto Naming SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-route53-domains" = callPackage
@@ -28789,7 +28936,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Route 53 Domains SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-s3" = callPackage
@@ -28806,7 +28953,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Storage Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -28825,8 +28972,8 @@ self: {
          dlist exceptions http-client lens mmorph mtl
        ];
        description = "Provides conduits to upload data to S3 using the Multipart API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -28844,7 +28991,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon SageMaker Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sagemaker-runtime" = callPackage
@@ -28861,7 +29008,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon SageMaker Runtime SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -28878,7 +29025,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon SimpleDB SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-secretsmanager" = callPackage
@@ -28895,7 +29042,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Secrets Manager SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-serverlessrepo" = callPackage
@@ -28912,7 +29059,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon ServerlessApplicationRepository SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-servicecatalog" = callPackage
@@ -28929,7 +29076,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Service Catalog SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -28946,7 +29093,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Email Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -28963,7 +29110,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Shield SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sms" = callPackage
@@ -28980,7 +29127,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Server Migration Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-snowball" = callPackage
@@ -28997,7 +29144,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Import/Export Snowball SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -29014,7 +29161,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Notification Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sqs" = callPackage
@@ -29031,7 +29178,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Queue Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -29048,7 +29195,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Systems Manager (SSM) SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -29065,7 +29212,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Step Functions SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-storagegateway" = callPackage
@@ -29082,7 +29229,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Storage Gateway SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sts" = callPackage
@@ -29099,7 +29246,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Security Token Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-support" = callPackage
@@ -29116,7 +29263,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Support SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-swf" = callPackage
@@ -29133,7 +29280,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Workflow Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-test" = callPackage
@@ -29154,7 +29301,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Common functionality for Amazonka library test-suites";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-transcribe" = callPackage
@@ -29171,7 +29318,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Transcribe Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-translate" = callPackage
@@ -29188,7 +29335,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Translate SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-waf" = callPackage
@@ -29205,7 +29352,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WAF SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-waf-regional" = callPackage
@@ -29222,7 +29369,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WAF Regional SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-workdocs" = callPackage
@@ -29239,7 +29386,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WorkDocs SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-workmail" = callPackage
@@ -29256,7 +29403,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WorkMail SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-workspaces" = callPackage
@@ -29273,7 +29420,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WorkSpaces SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -29290,7 +29437,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon X-Ray SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amby" = callPackage
@@ -29315,8 +29462,8 @@ self: {
        testHaskellDepends = [ base doctest tasty tasty-hunit vector ];
        benchmarkHaskellDepends = [ base statistics ];
        description = "Statistical data visualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29348,7 +29495,7 @@ self: {
        ];
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29360,8 +29507,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.20.0";
-       sha256 = "1vi8kccvvnym8v4cnsghkiicbjzvkbc7binr12priqmvwvis34rv";
+       version = "0.20.0.1";
+       sha256 = "10qj4776b3sjifij3qic2bafd01jn8s0pfgm1yd74nyhjx50s19p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29376,7 +29523,7 @@ self: {
          split stm text vector
        ];
        description = "Client library for AMQP servers (currently only RabbitMQ)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -29396,8 +29543,8 @@ self: {
          amqp base bytestring conduit hspec HUnit resourcet transformers
        ];
        description = "Conduit bindings for AMQP (see amqp package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29414,8 +29561,8 @@ self: {
          amqp base bytestring hspec process streamly testcontainers text
        ];
        description = "A simple streamly wrapper for amqp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29436,7 +29583,7 @@ self: {
          utf8-string x509-system
        ];
        description = "AMQP toolset for the command line";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "amqp-worker" = callPackage
@@ -29462,8 +29609,8 @@ self: {
          aeson amqp base bytestring data-default exceptions monad-control
          monad-loops mtl resource-pool server split text transformers-base
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {server = null;};
 
@@ -29499,7 +29646,7 @@ self: {
        testHaskellDepends = [ base case-insensitive hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Find strings with permutations (anagrams) that match a regular expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "analyze" = callPackage
@@ -29521,8 +29668,8 @@ self: {
          tasty-quickcheck text unordered-containers vector
        ];
        description = "making data science easy and safe with data frames";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29539,8 +29686,8 @@ self: {
          snap-core time
        ];
        description = "Client for analyze service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29563,7 +29710,7 @@ self: {
          system-fileio system-filepath text
        ];
        description = "Simple literate programming preprocessor";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "anansi-hscolour" = callPackage
@@ -29578,7 +29725,7 @@ self: {
          anansi base bytestring containers hscolour monads-tf text
        ];
        description = "Colorized looms for Anansi";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "anansi-pandoc" = callPackage
@@ -29593,8 +29740,8 @@ self: {
          anansi base bytestring containers monads-tf pandoc text
        ];
        description = "Looms which use Pandoc to parse and produce a variety of formats";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29621,8 +29768,8 @@ self: {
          tagsoup text time vector
        ];
        description = "Anatomy: Atomo documentation system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29634,8 +29781,8 @@ self: {
        sha256 = "1wn0kap7bw6sp9yi1awcmxh11s5ra4b44qbf97plsvrmpfz15cc5";
        libraryHaskellDepends = [ base process ];
        description = "Android methods exposed to Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29647,8 +29794,8 @@ self: {
        sha256 = "07mgmpcwj7xi3ibmlcz45l645s5cbfnkr1brlhrzbnbyx72x7dr6";
        libraryHaskellDepends = [ base data-default ];
        description = "Turn regular Haskell programs into Android Activities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29675,8 +29822,8 @@ self: {
          base basic-prelude directory hspec hxt QuickCheck stringable
        ];
        description = "A pretty printer for Android Lint errors";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29704,8 +29851,8 @@ self: {
          unordered-containers
        ];
        description = "Process management and supervision daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29734,8 +29881,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29747,7 +29894,7 @@ self: {
        sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Convert camelCase to snake_case and vice versa";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "animascii" = callPackage
@@ -29768,8 +29915,8 @@ self: {
        ];
        testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
        description = "text-file based ASCII animator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29786,8 +29933,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base containers hspec vector ];
        description = "Animation for sprites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29806,8 +29953,8 @@ self: {
          text
        ];
        description = "Animation for sprites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29829,8 +29976,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Convert sprite frames to animate files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29856,8 +30003,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Preview tool for sprite animation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29869,8 +30016,8 @@ self: {
        sha256 = "0wpx0jv2zyphhxi84bw4h1bw6apbazcadfxzzj90ddc3cb5lhv9n";
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
        description = "sdl2 + animate auxiliary library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29891,7 +30038,7 @@ self: {
        ];
        executableHaskellDepends = [ base data-default ];
        description = "Tools for interacting with Anki database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "annah" = callPackage
@@ -29914,8 +30061,8 @@ self: {
          base morte optparse-applicative system-fileio system-filepath text
        ];
        description = "Medium-level language that desugars to Morte";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29927,7 +30074,7 @@ self: {
        sha256 = "00f0pyf2fxdvwwz9bz3mpp7db39p1m83frvlif74kp0y1x8r20yp";
        libraryHaskellDepends = [ base ];
        description = "Semigroups with annihilators and utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "annotated-fix" = callPackage
@@ -29938,8 +30085,8 @@ self: {
        sha256 = "1lhyllmi8j9r5mdr5pngw1s1xzs1cwv2hh2ym8kkdrxvrq93dk2i";
        libraryHaskellDepends = [ base recursion-schemes ];
        description = "A fixpoint of a functor that can be annotated";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29953,7 +30100,7 @@ self: {
        editedCabalFile = "138k24qxvl90l7dwdw1b3w36mpw93n0xi0nljblqg88pxg7jcvjx";
        libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "anonymous-sums" = callPackage
@@ -29964,8 +30111,8 @@ self: {
        sha256 = "1bf27vzv21wi634vridxm2mvfjp3wwfwv50pcbdpzscwn4yc3if7";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Anonymous sum types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29977,8 +30124,8 @@ self: {
        sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b";
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        description = "QuickCheck functions to accompany the anonymous-sums package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29990,7 +30137,7 @@ self: {
        sha256 = "1aj7p937c48laz5kkhil45lgkjiivcidky6vxxp3q5yvkymsijvb";
        libraryHaskellDepends = [ base ];
        description = "Haskell package to generate ANSI escape codes for styling strings in the terminal";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ansi-pretty" = callPackage
@@ -30010,7 +30157,7 @@ self: {
          vector
        ];
        description = "AnsiPretty for ansi-wl-pprint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ansi-terminal" = callPackage
@@ -30023,7 +30170,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
        description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ansi-terminal_0_11" = callPackage
@@ -30036,8 +30183,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
        description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ansi-terminal-game" = callPackage
@@ -30063,7 +30210,9 @@ self: {
          linebreak mtl QuickCheck random split terminal-size timers-tick
        ];
        description = "sdl-like functions for terminal applications, based on ansi-terminal";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "ansi-wl-pprint" = callPackage
@@ -30078,7 +30227,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ansigraph" = callPackage
@@ -30092,8 +30241,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Terminal-based graphing via ANSI and Unicode";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30119,8 +30268,8 @@ self: {
          time time-locale-compat yesod yesod-auth
        ];
        description = "A web interface to Antisplice dungeons";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30143,8 +30292,8 @@ self: {
          transformers
        ];
        description = "Referring expressions for definitions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30170,8 +30319,8 @@ self: {
          ironforge mtl network plugins time transformers
        ];
        description = "This is an IRC bot for Mafia and Resistance";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30189,8 +30338,8 @@ self: {
          http-conduit resourcet safe text transformers
        ];
        description = "Interface for antigate.com captcha recognition API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30206,7 +30355,7 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30228,8 +30377,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30243,8 +30392,8 @@ self: {
          aeson antiope-s3 avro base bytestring text
        ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30271,8 +30420,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30295,8 +30444,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30316,8 +30465,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30342,8 +30491,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30365,8 +30514,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30395,8 +30544,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30426,8 +30575,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30451,8 +30600,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30479,8 +30628,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30496,7 +30645,7 @@ self: {
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "antiprimes" = callPackage
@@ -30508,7 +30657,7 @@ self: {
        libraryHaskellDepends = [ base primes ];
        testHaskellDepends = [ base hspec ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "antiquoter" = callPackage
@@ -30519,8 +30668,8 @@ self: {
        sha256 = "1qv5iid7az7bn1jf6r7ffg5qqbcs8ypf78j4vrs5ajwp39jnbiiy";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Combinator library for quasi- and anti-quoting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30537,8 +30686,8 @@ self: {
          transformers
        ];
        description = "An engine for text-based dungeons";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30563,8 +30712,8 @@ self: {
          unordered-containers
        ];
        description = "A Haskell implementation of the ANTLR top-down parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30585,8 +30734,8 @@ self: {
          base bytestring enumerator haskell98 regex-posix
        ];
        description = "Haskell binding to the ANTLR parser generator C runtime library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {antlr3c = null;};
 
@@ -30603,7 +30752,7 @@ self: {
        libraryHaskellDepends = [ base containers MissingH mtl ];
        description = "Interface for DBM-like database systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30616,8 +30765,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base ghc-prim ];
        description = "prelude for Algebra of Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30638,8 +30787,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck
        ];
        description = "An implementation of the AOS signatures";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30660,8 +30809,8 @@ self: {
          base colour language-haskell-extract pango template-haskell
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libaosd;};
 
@@ -30674,7 +30823,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base inspection-testing transformers ];
        description = "Self-normalizing applicative expressions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ap-reflect" = callPackage
@@ -30685,7 +30834,7 @@ self: {
        sha256 = "16hh3ava0qc8w2y04a8gdh2qfxclh2mhim9zv17d16wlx9dq9qgs";
        libraryHaskellDepends = [ base ];
        description = "Partial evaluation reflection a la simple-reflect";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apache-md5" = callPackage
@@ -30711,7 +30860,7 @@ self: {
        ];
        benchmarkSystemDepends = [ openssl ];
        description = "Apache specific MD5 digest algorighm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "apart" = callPackage
@@ -30734,8 +30883,8 @@ self: {
          base comonad contravariant free hedgehog lens semigroupoids
        ];
        description = "Get all your structure and rip it apart";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30753,7 +30902,7 @@ self: {
        testHaskellDepends = [ base containers linear QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion linear ];
        description = "Fast Entity-Component-System library for game programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-gloss" = callPackage
@@ -30768,7 +30917,7 @@ self: {
          apecs apecs-physics base containers gloss linear
        ];
        description = "Simple gloss renderer for apecs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-physics" = callPackage
@@ -30784,7 +30933,7 @@ self: {
          apecs base containers inline-c linear template-haskell vector
        ];
        description = "2D physics for apecs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-physics-gloss" = callPackage
@@ -30795,7 +30944,7 @@ self: {
        sha256 = "075rpm4l1na7j79vkh7n5c806zj7vvj2qxrxq6pkb6k6364ff249";
        libraryHaskellDepends = [ apecs apecs-physics base gloss ];
        description = "Gloss rendering for apecs-physics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-stm" = callPackage
@@ -30811,8 +30960,8 @@ self: {
          vector
        ];
        description = "STM stores for apecs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30834,8 +30983,8 @@ self: {
          xdg-basedir
        ];
        description = "Server and community browser for the game Tremulous";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30857,8 +31006,8 @@ self: {
          text transformers
        ];
        description = "Library for easily building REST API wrappers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30875,7 +31024,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base HUnit lens ];
        description = "option of aeson's deriveJSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "api-maker" = callPackage
@@ -30898,7 +31047,7 @@ self: {
          transformers-base
        ];
        description = "Package to make APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "api-monobank" = callPackage
@@ -30920,8 +31069,8 @@ self: {
          aeson base bytestring http-client http-conduit stm text time
        ];
        testHaskellDepends = [ base bytestring hs-coindesk-api ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hs-coindesk-api = null;};
 
@@ -30937,7 +31086,7 @@ self: {
          base bytestring directory opentheory-unicode
        ];
        description = "OpenTheory unicode character API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "api-rpc-factom" = callPackage
@@ -30962,8 +31111,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        description = "RPC API client for Factom";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30987,8 +31136,8 @@ self: {
          remote-monad text time transformers
        ];
        description = "simple json-rpc client for PegNet";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31023,8 +31172,8 @@ self: {
          tasty-quickcheck template-haskell text time unordered-containers
        ];
        description = "DSL for generating API boilerplate and docs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31045,8 +31194,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring text ];
        description = "Api bindings for Yoti services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31079,8 +31228,8 @@ self: {
          tasty-hunit tasty-quickcheck wai wai-extra
        ];
        description = "Simple and type safe web framework that generate web API documentation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31100,8 +31249,8 @@ self: {
          monad-control resourcet text wai
        ];
        description = "authenticate support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31119,8 +31268,8 @@ self: {
          clientsession data-default-class time unix-compat vault
        ];
        description = "clientsession support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31136,8 +31285,8 @@ self: {
          apiary base blaze-builder blaze-html bytestring cookie time wai
        ];
        description = "Cookie support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31149,8 +31298,8 @@ self: {
        sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm";
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        description = "eventsource support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31170,8 +31319,8 @@ self: {
          monad-control text transformers types-compat vault wai
        ];
        description = "helics support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31188,8 +31337,8 @@ self: {
          text transformers wai
        ];
        description = "A http client for Apiary";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31207,8 +31356,8 @@ self: {
          monad-control monad-logger transformers transformers-base
        ];
        description = "fast-logger support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31227,8 +31376,8 @@ self: {
          monad-control text transformers types-compat
        ];
        description = "memcached client for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31246,8 +31395,8 @@ self: {
          mongoDB resource-pool text time transformers
        ];
        description = "mongoDB support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31265,8 +31414,8 @@ self: {
          resource-pool resourcet transformers transformers-base
        ];
        description = "persistent support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31286,8 +31435,8 @@ self: {
          purescript text transformers types-compat unordered-containers
        ];
        description = "purescript compiler for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31299,8 +31448,8 @@ self: {
        sha256 = "0b9m165qs7nd9iisbkkx0vpdkv37bh0vvrwq769bjc2k8qkqspwl";
        libraryHaskellDepends = [ apiary base hedis transformers ];
        description = "redis support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31312,8 +31461,8 @@ self: {
        sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4";
        libraryHaskellDepends = [ apiary base wai ];
        description = "session support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31325,8 +31474,8 @@ self: {
        sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw";
        libraryHaskellDepends = [ apiary base wai-websockets websockets ];
        description = "websockets support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31339,7 +31488,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring lens wreq ];
        testHaskellDepends = [ base ];
        description = "Consumer library for anapioficeandfire.com";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apis" = callPackage
@@ -31359,8 +31508,8 @@ self: {
          unordered-containers utf8-string yql
        ];
        description = "A Template Haskell library for generating type safe API calls";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31389,7 +31538,7 @@ self: {
          x509-store x509-system x509-validation
        ];
        description = "Apple Push Notification service HTTP/2 integration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apotiki" = callPackage
@@ -31418,8 +31567,8 @@ self: {
          wai-middleware-static zlib
        ];
        description = "a faster debian repository";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31434,8 +31583,8 @@ self: {
          base containers criterion deepseq lens mtl
        ];
        description = "applicative (functional) bidirectional programming beyond composition chains";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31454,7 +31603,7 @@ self: {
          base containers directory hspec HUnit mtl parsec text
        ];
        description = "A library to manage application settings (INI file-like)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "appar" = callPackage
@@ -31465,7 +31614,7 @@ self: {
        sha256 = "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4";
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "appc" = callPackage
@@ -31490,8 +31639,8 @@ self: {
          aeson base hspec hspec-smallcheck semver smallcheck text uuid
        ];
        description = "app container types and tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31504,7 +31653,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "applicative-extras" = callPackage
@@ -31515,7 +31664,7 @@ self: {
        sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8";
        libraryHaskellDepends = [ base ];
        description = "Instances for Applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "applicative-fail" = callPackage
@@ -31533,8 +31682,8 @@ self: {
          base checkers mtl QuickCheck tasty tasty-quickcheck
        ];
        description = "Applicative functor and monad which collects all your fails";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31546,7 +31695,7 @@ self: {
        sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0";
        libraryHaskellDepends = [ base ];
        description = "Applicative-based numeric instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "applicative-parsec" = callPackage
@@ -31562,8 +31711,8 @@ self: {
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "An applicative parser combinator library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31577,8 +31726,8 @@ self: {
        editedCabalFile = "0ccdnkl3pxkwcg7m3xalqwax1gzaj3hg85zb219y7cfva2pvz1jp";
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31594,12 +31743,12 @@ self: {
          base haskell-src-exts haskell-src-meta mtl syb template-haskell
        ];
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
-  "apply-refact" = callPackage
+  "apply-refact_0_8_2_1" = callPackage
     ({ mkDerivation, base, containers, directory, extra, filemanip
      , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative
      , process, refact, silently, syb, tasty, tasty-expected-failure
@@ -31626,7 +31775,39 @@ self: {
          tasty tasty-expected-failure tasty-golden transformers unix-compat
        ];
        description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "apply-refact" = callPackage
+    ({ mkDerivation, base, containers, directory, extra, filemanip
+     , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative
+     , process, refact, silently, syb, tasty, tasty-expected-failure
+     , tasty-golden, transformers, uniplate, unix-compat
+     }:
+     mkDerivation {
+       pname = "apply-refact";
+       version = "0.9.0.0";
+       sha256 = "1w6andxlap50vi2cwdy7x5xp2q1qyd67g4vs860gddcv8nir69qc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory extra filemanip ghc ghc-boot-th
+         ghc-exactprint process refact syb transformers uniplate unix-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory extra filemanip filepath ghc ghc-boot-th
+         ghc-exactprint optparse-applicative process refact syb transformers
+         uniplate unix-compat
+       ];
+       testHaskellDepends = [
+         base containers directory extra filemanip filepath ghc ghc-boot-th
+         ghc-exactprint optparse-applicative process refact silently syb
+         tasty tasty-expected-failure tasty-golden transformers uniplate
+         unix-compat
+       ];
+       description = "Perform refactorings specified by the refact library";
+       license = lib.licenses.bsd3;
      }) {};
 
   "apportionment" = callPackage
@@ -31637,7 +31818,7 @@ self: {
        sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg";
        libraryHaskellDepends = [ base containers utility-ht ];
        description = "Round a set of numbers while maintaining its sum";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "approveapi" = callPackage
@@ -31664,8 +31845,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "ApproveAPI Haskell Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31692,7 +31873,9 @@ self: {
          vector
        ];
        description = "Easy-to-use reasonable way of emulating approximate in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "approx-rand-test" = callPackage
@@ -31723,7 +31906,7 @@ self: {
        ];
        description = "Approximate randomization test";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "approximate" = callPackage
@@ -31745,7 +31928,7 @@ self: {
          base directory doctest filepath semigroups simple-reflect
        ];
        description = "Approximate discrete values and numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "approximate-equality" = callPackage
@@ -31756,7 +31939,7 @@ self: {
        sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883";
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Newtype wrappers for approximate equality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ar-timestamp-wiper" = callPackage
@@ -31770,7 +31953,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Wipes time stamps from .a files (like ar -D)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arb-fft" = callPackage
@@ -31793,8 +31976,8 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck vector
        ];
        description = "Pure Haskell arbitrary length FFT library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31811,8 +31994,8 @@ self: {
        ];
        librarySystemDepends = [ arbb_dev ];
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {arbb_dev = null;};
 
@@ -31837,8 +32020,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Datadog client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31856,7 +32039,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "LRU cache based on STM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arbor-monad-counter" = callPackage
@@ -31877,8 +32060,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Counter library for submitting metrics to a backend such as datadog";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31902,7 +32085,7 @@ self: {
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
        testToolDepends = [ hspec-discover ];
        description = "Simple logging library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arbor-monad-metric" = callPackage
@@ -31925,8 +32108,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Core metric library for publishing metrics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31952,8 +32135,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Metric library backend for datadog";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31972,7 +32155,7 @@ self: {
          postgresql-simple text
        ];
        description = "Convenience types and functions for postgresql-simple";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arbtt" = callPackage
@@ -31985,10 +32168,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.10.2";
-       sha256 = "02izfga7nv2saq4d1xwigq41hhbc02830sjppqsqw6vcb8082vs1";
-       revision = "2";
-       editedCabalFile = "138lacpwzf5xc1cbxric90k1yn0g91hz0vm2v50pbbr7jr2147km";
+       version = "0.10.4";
+       sha256 = "18lpwhkhw0nxzif9dyc29b9s8i0v26y9vdgh0laj3z9yyp805syc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32003,9 +32184,7 @@ self: {
          transformers unix utf8-string
        ];
        description = "Automatic Rule-Based Time Tracker";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.gpl2;
      }) {};
 
   "arcgrid" = callPackage
@@ -32019,7 +32198,7 @@ self: {
        libraryHaskellDepends = [ base parsec parsec-numeric ];
        executableHaskellDepends = [ base ];
        description = "Parse ESRI/ArcInfo (ArcGrid) raster GIS files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arcgrid-viewer" = callPackage
@@ -32034,43 +32213,69 @@ self: {
          arcgrid base bytestring gloss transformers
        ];
        description = "Simple viewer for ESRI/ArcInfo (ArcGrid) geospatial data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arch-hs" = callPackage
-    ({ mkDerivation, aeson, algebraic-graphs, base, bytestring, Cabal
-     , conduit, conduit-extra, containers, deepseq, Diff, directory
-     , filepath, hackage-db, megaparsec, microlens, microlens-th
+    ({ mkDerivation, aeson, algebraic-graphs, arch-web, base
+     , bytestring, Cabal, conduit, conduit-extra, containers, deepseq
+     , Diff, directory, filepath, hackage-db, http-client
+     , http-client-tls, megaparsec, microlens, microlens-th
      , neat-interpolation, optparse-applicative, polysemy, prettyprinter
-     , prettyprinter-ansi-terminal, req, split, tar-conduit
+     , prettyprinter-ansi-terminal, servant-client, split, tar-conduit
      , template-haskell, text
      }:
      mkDerivation {
        pname = "arch-hs";
-       version = "0.6.2.0";
-       sha256 = "10v2n1m5608g2lqgn16bwwhlafbj2hhnsnvm22pfff4ahnvj7880";
+       version = "0.7.0.0";
+       sha256 = "0nlsxlqmjg0nw9dgd3l8s1zphzcwrbcvmv30s5y5xbfm06zc5wc7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson algebraic-graphs base bytestring Cabal conduit conduit-extra
-         containers deepseq Diff directory filepath hackage-db megaparsec
-         microlens microlens-th neat-interpolation optparse-applicative
-         polysemy prettyprinter prettyprinter-ansi-terminal req split
-         tar-conduit template-haskell text
+         aeson algebraic-graphs arch-web base bytestring Cabal conduit
+         conduit-extra containers deepseq Diff directory filepath hackage-db
+         http-client http-client-tls megaparsec microlens microlens-th
+         neat-interpolation optparse-applicative polysemy prettyprinter
+         prettyprinter-ansi-terminal servant-client split tar-conduit
+         template-haskell text
        ];
        executableHaskellDepends = [
-         aeson algebraic-graphs base bytestring Cabal conduit conduit-extra
-         containers deepseq Diff directory filepath hackage-db megaparsec
-         microlens microlens-th neat-interpolation optparse-applicative
-         polysemy prettyprinter prettyprinter-ansi-terminal req split
-         tar-conduit template-haskell text
+         aeson algebraic-graphs arch-web base bytestring Cabal conduit
+         conduit-extra containers deepseq Diff directory filepath hackage-db
+         http-client http-client-tls megaparsec microlens microlens-th
+         neat-interpolation optparse-applicative polysemy prettyprinter
+         prettyprinter-ansi-terminal servant-client split tar-conduit
+         template-haskell text
        ];
        description = "Distribute hackage packages to archlinux";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "arch-web" = callPackage
+    ({ mkDerivation, aeson, base, deriving-aeson, exceptions
+     , http-client, http-client-tls, http-types, HUnit, lens, mtl
+     , servant, servant-client, servant-client-core, text, time
+     }:
+     mkDerivation {
+       pname = "arch-web";
+       version = "0.1.0";
+       sha256 = "1wiy4swpi3ca8sri2drycfr6i674da2kgiplfng7jcjlxr5nmdpz";
+       libraryHaskellDepends = [
+         aeson base deriving-aeson exceptions http-client http-client-tls
+         http-types lens mtl servant servant-client servant-client-core text
+         time
+       ];
+       testHaskellDepends = [
+         aeson base deriving-aeson exceptions http-client http-client-tls
+         http-types HUnit lens mtl servant servant-client
+         servant-client-core text time
+       ];
+       description = "Arch Linux official and AUR web interface binding";
+       license = lib.licenses.mit;
+     }) {};
+
   "archive" = callPackage
     ({ mkDerivation, base, bytestring, debian, debian-mirror, directory
      , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty
@@ -32089,8 +32294,8 @@ self: {
          regex-posix time unix Unixutils xhtml
        ];
        description = "A library and programs for creating hardlinked incremental archives or backups";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {debian-mirror = null; help = null;};
 
@@ -32107,8 +32312,8 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Common interface using libarchive";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32124,7 +32329,7 @@ self: {
          base bytestring composition-prelude dir-traverse
        ];
        description = "Backpack signature for archive libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "archive-tar" = callPackage
@@ -32139,7 +32344,7 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Common interface using the tar package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "archive-tar-bytestring" = callPackage
@@ -32155,7 +32360,7 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Common interface using the tar-bytestring package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "archiver" = callPackage
@@ -32173,8 +32378,8 @@ self: {
          base bytestring containers process random
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32190,8 +32395,8 @@ self: {
          base Cabal containers directory filepath pretty
        ];
        description = "Support for working with Arch Linux packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32217,8 +32422,8 @@ self: {
          strict-concurrency xhtml
        ];
        description = "Website maintenance for Arch Linux packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32234,8 +32439,8 @@ self: {
          base containers download-curl feed tagsoup
        ];
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32246,16 +32451,16 @@ self: {
      }:
      mkDerivation {
        pname = "arduino-copilot";
-       version = "1.5.2";
-       sha256 = "04qy06aws4qwg5slakj12jkwvfcrg960spj0g1c42lfb582ybrm6";
+       version = "1.5.3";
+       sha256 = "18aa6qqgk1cd5adydyby7xm3imrg739hhmdl0m67b61gf7f3ch3x";
        libraryHaskellDepends = [
          base containers copilot copilot-c99 copilot-language directory
          filepath mtl optparse-applicative temporary
        ];
        testHaskellDepends = [ base directory process temporary ];
        description = "Arduino programming in haskell using the Copilot stream DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32281,8 +32486,8 @@ self: {
          base criterion directory mtl semigroups
        ];
        description = "A journaled data store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32299,8 +32504,8 @@ self: {
          time
        ];
        description = "Generate Attribute-Relation File Format (ARFF) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32314,8 +32519,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory wx ];
        description = "An interpreter for the Argh! programming language in wxHaskell";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32342,8 +32547,8 @@ self: {
          QuickCheck
        ];
        description = "Measure your code's complexity";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32362,8 +32567,8 @@ self: {
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Memory-hard password hash and proof-of-work function";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32376,8 +32581,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32395,8 +32600,8 @@ self: {
          base bimap containers glib gtk HDBC indents mtl parsec
        ];
        description = "A computer assisted argumentation transcription and editing software";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32424,8 +32629,8 @@ self: {
          tasty-hunit utf8-string
        ];
        description = "Go-to-definition for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32449,8 +32654,8 @@ self: {
          regex-posix safe split system-filepath text time
        ];
        description = "Watcher and runner for Hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32479,8 +32684,8 @@ self: {
          lens-aeson process protolude QuickCheck temporary text unix
        ];
        description = "Run docker-compose with help from Nix/NixOS";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {};
 
   "arith-encode" = callPackage
@@ -32502,7 +32707,7 @@ self: {
          base binary containers hashable HUnit-Plus unordered-containers
        ];
        description = "A practical arithmetic encoding (aka Godel numbering) library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arithmatic" = callPackage
@@ -32513,7 +32718,7 @@ self: {
        sha256 = "0pxlla3jmpb4ll0hn8xvfb32kqx8053alvis9cryq060m3bd09aq";
        libraryHaskellDepends = [ base ];
        description = "do things with numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arithmetic" = callPackage
@@ -32540,7 +32745,7 @@ self: {
          opentheory-prime opentheory-primitive QuickCheck random
        ];
        description = "Natural number arithmetic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arithmetic-circuits" = callPackage
@@ -32574,8 +32779,8 @@ self: {
          process-extras protolude semirings text vector wl-pprint-text
        ];
        description = "Arithmetic circuits for zkSNARKs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32606,7 +32811,7 @@ self: {
          mod random semirings vector
        ];
        description = "Efficient basic number-theoretic functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arity-generic-liftA" = callPackage
@@ -32620,7 +32825,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Provides an arity-generic version of the liftA2, liftA3... liftAn functions.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "armada" = callPackage
@@ -32634,7 +32839,7 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32655,8 +32860,8 @@ self: {
          aeson base bytestring containers directory hspec HUnit lens text
        ];
        description = "Prevent serialization backwards compatibility problems using golden tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32671,8 +32876,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Library for reading ARPA n-gram models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32696,8 +32901,8 @@ self: {
          base hmatrix hspec QuickCheck vector vector-algorithms
        ];
        description = "Solve large scale eigenvalue problems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) arpack;};
 
@@ -32709,8 +32914,8 @@ self: {
        sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "array-builder" = callPackage
@@ -32724,8 +32929,8 @@ self: {
        libraryHaskellDepends = [ array-chunks base primitive run-st ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Builders for arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32743,8 +32948,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Lists of chunks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32770,8 +32975,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32786,8 +32991,8 @@ self: {
          array base doctest doctest-driver-gen hspec
        ];
        description = "IsList instances of Array for OverloadedLists extension";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32799,7 +33004,7 @@ self: {
        sha256 = "1p05vg8mdyad03aa7s1nrgw5xqgl80f6l7v0llhmi1q4xnrqrj3n";
        libraryHaskellDepends = [ array base ];
        description = "Memoization combinators using arrays for finite sub-domains of functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "array-primops" = callPackage
@@ -32816,8 +33021,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32829,7 +33034,7 @@ self: {
        sha256 = "1gh7gmbm0djr78dqkf8q3ap9yk4gm3dq48k8jad9ssp3w19wpkan";
        libraryHaskellDepends = [ array base ];
        description = "Primitive functions for updating many elements in mutable arrays at once";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arrayfire" = callPackage
@@ -32853,8 +33058,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings to the ArrayFire general-purpose GPU library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {af = null;};
 
@@ -32872,8 +33077,8 @@ self: {
          tasty-smallcheck
        ];
        description = "Memory-efficient ArrayList implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32885,7 +33090,7 @@ self: {
        sha256 = "0v3ab3h3rg38dvmyqqfsysgfpib8i81s87wr965cf7lxhfx3lg61";
        libraryHaskellDepends = [ base ];
        description = "Extra functions for Control.Arrow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arrow-improve" = callPackage
@@ -32899,8 +33104,8 @@ self: {
          arrows base pointed profunctors semigroupoids
        ];
        description = "Improved arrows";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32912,8 +33117,8 @@ self: {
        sha256 = "11rzpq8mml00amb0hd09bwwhpn199jr8mxp0454ljkpbgqc5jm9s";
        libraryHaskellDepends = [ base containers fail mtl ];
        description = "List arrows for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32925,8 +33130,8 @@ self: {
        sha256 = "02zampc6cc5a9fvdvxkz2r6i5sxf5w0qilsvsx8jxiw4kprbghii";
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32941,7 +33146,7 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32963,7 +33168,7 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts NoHoed ];
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32975,7 +33180,7 @@ self: {
        sha256 = "02db4byzz8xb4c36y0v867g9kd3a9p04r4cj1np717k20qrwjnpn";
        libraryHaskellDepends = [ base Stream ];
        description = "Arrow classes and transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "artery" = callPackage
@@ -32988,8 +33193,8 @@ self: {
          base containers profunctors transformers
        ];
        description = "A simple, arrow-based reactive programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33003,8 +33208,8 @@ self: {
        editedCabalFile = "09hmx0x4fz80kby7w1n9rc7sibbmpsvl4i3rc3h91hs53ban4yd4";
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Basic types and instances for Valve's Artifact Card-set API";
-       license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33028,7 +33233,7 @@ self: {
          file-embed hashable parsec process shell-escape template-haskell
        ];
        description = "Archive execution tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arxiv" = callPackage
@@ -33055,8 +33260,8 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog jwt mtl text time ];
        description = "Atlassian Service Authentication Protocol";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33068,7 +33273,7 @@ self: {
        sha256 = "1c5ip8q9b6xnvh3li03iilmqz33rrlis78zs0lh4jva67b37akqk";
        libraryHaskellDepends = [ base MissingH ];
        description = "Generic markup builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ascii" = callPackage
@@ -33085,7 +33290,7 @@ self: {
          ascii-th base bytestring data-ascii text
        ];
        description = "The ASCII character set and encoding";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-art-to-unicode" = callPackage
@@ -33100,7 +33305,7 @@ self: {
        executableHaskellDepends = [ base strict ];
        testHaskellDepends = [ base doctest ];
        description = "ASCII Art to Unicode Box Drawing converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ascii-case" = callPackage
@@ -33111,7 +33316,7 @@ self: {
        sha256 = "1qs1rccslixsg4szgp7y98sqhhn0asp9qmk9vfrwdjfipmf3z72p";
        libraryHaskellDepends = [ ascii-char base hashable ];
        description = "ASCII letter case";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-char" = callPackage
@@ -33122,7 +33327,7 @@ self: {
        sha256 = "0pglcppji9irbz0fjc6hb1fv7qjbjcii6k4qdv389l7kbb77w318";
        libraryHaskellDepends = [ base hashable ];
        description = "A Char type representing an ASCII character";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-cows" = callPackage
@@ -33133,7 +33338,7 @@ self: {
        sha256 = "0ddnjsqmaqrs2kxys32zqpmvkyway4dqj35x2q3gqxmsir3qg8zq";
        libraryHaskellDepends = [ base random-extras random-fu text ];
        description = "A collection of ASCII cows. Moo.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ascii-flatten" = callPackage
@@ -33147,8 +33352,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base text ];
        description = "Flattens European non-ASCII characaters into ASCII";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33160,7 +33365,7 @@ self: {
        sha256 = "19l50ksqa7jdsl0pmrmy8q8jbgmb1j3hr63jjzys220f0agsgcwr";
        libraryHaskellDepends = [ ascii-char base hashable ];
        description = "ASCII character groups";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-holidays" = callPackage
@@ -33175,7 +33380,7 @@ self: {
          base random random-shuffle terminfo time
        ];
        description = "ASCII animations for the holidays!";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "ascii-predicates" = callPackage
@@ -33186,7 +33391,7 @@ self: {
        sha256 = "0dzrxqhq7vqplg4aanc4kindwpizv3d777ri81sj1m1zn3vzvrrq";
        libraryHaskellDepends = [ ascii-char base ];
        description = "Various categorizations of ASCII characters";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-progress" = callPackage
@@ -33206,7 +33411,7 @@ self: {
          async base concurrent-output data-default hspec QuickCheck time
        ];
        description = "A simple progress bar for the console";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ascii-string" = callPackage
@@ -33228,8 +33433,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Compact representation of ASCII strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33243,7 +33448,7 @@ self: {
          ascii-char base bytestring hashable text
        ];
        description = "Representing ASCII with refined supersets";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-table" = callPackage
@@ -33259,8 +33464,8 @@ self: {
          vector wl-pprint-extras
        ];
        description = "ASCII table";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33275,7 +33480,7 @@ self: {
          ascii-char ascii-superset base template-haskell
        ];
        description = "Template Haskell support for ASCII";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-vector-avc" = callPackage
@@ -33297,8 +33502,8 @@ self: {
          split zlib
        ];
        description = "Process Ascii Vectors for Advantest 93k";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33311,8 +33516,8 @@ self: {
        libraryHaskellDepends = [ base bytestring conduit ];
        testHaskellDepends = [ base bytestring conduit hspec ];
        description = "Conduit for encoding ByteString into Ascii85";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33327,7 +33532,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base hspec random raw-strings-qq silently ];
        description = "Line charts in terminal";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "asciidiagram" = callPackage
@@ -33350,7 +33555,7 @@ self: {
          optparse-applicative rasterific-svg svg-tree text
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asic" = callPackage
@@ -33364,7 +33569,7 @@ self: {
        executableHaskellDepends = [ asil base bytestring utf8-string ];
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33407,7 +33612,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Library for creating and querying segmented feeds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "asil" = callPackage
@@ -33426,7 +33631,7 @@ self: {
        ];
        description = "Action Script Instrumentation Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33441,8 +33646,8 @@ self: {
          aeson base hashable primitive scientific text
        ];
        description = "asn type and encoding/decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33467,8 +33672,8 @@ self: {
          test-framework test-framework-hunit text vector
        ];
        description = "Encode and decode ASN.1";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33485,8 +33690,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33505,7 +33710,7 @@ self: {
          asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
        ];
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asn1-parse" = callPackage
@@ -33518,7 +33723,7 @@ self: {
          asn1-encoding asn1-types base bytestring
        ];
        description = "Simple monadic parser for ASN1 stream types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asn1-types" = callPackage
@@ -33529,7 +33734,7 @@ self: {
        sha256 = "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq";
        libraryHaskellDepends = [ base bytestring hourglass memory ];
        description = "ASN.1 types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asn1dump" = callPackage
@@ -33546,7 +33751,7 @@ self: {
          asn1-encoding asn1-types base bytestring pem
        ];
        description = "Dump ASN1 structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aspell-pipe" = callPackage
@@ -33557,7 +33762,7 @@ self: {
        sha256 = "09dw4v4j5pmqi8pdh3p7kk7f8pph5w33s7vd21fgvhv3arnrj6p8";
        libraryHaskellDepends = [ async base process text ];
        description = "Pipe-based interface to the Aspell program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "assembler" = callPackage
@@ -33571,8 +33776,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-binary parsec ];
        executableHaskellDepends = [ base containers ghc-binary parsec ];
        description = "Haskell Assembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -33589,8 +33794,8 @@ self: {
          base bytestring Cabal directory filepath system-posix-redirect
        ];
        description = "Helpers for Control.Exception.assert";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33603,7 +33808,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty-show text ];
        description = "Syntactic sugar improving 'assert' and 'error'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "assertions" = callPackage
@@ -33618,8 +33823,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base containers ];
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33631,7 +33836,7 @@ self: {
        sha256 = "1c0678qjkr1q3pi20ch05k8ri4zxcc1drc4j44fvb1sz7b8y260c";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A build-time Cabal library that bundles executables with assets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asset-map" = callPackage
@@ -33648,8 +33853,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Asset map support for the JavaScript broccoli-asset-rev library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33663,8 +33868,8 @@ self: {
        librarySystemDepends = [ assimp ];
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) assimp;};
 
@@ -33676,7 +33881,7 @@ self: {
        sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q";
        libraryHaskellDepends = [ base bifunctors tagged ];
        description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "assoc-list" = callPackage
@@ -33688,7 +33893,7 @@ self: {
        libraryHaskellDepends = [ base contravariant ];
        testHaskellDepends = [ base contravariant doctest hedgehog ];
        description = "Association lists (lists of tuples)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "assoc-listlike" = callPackage
@@ -33701,7 +33906,7 @@ self: {
        libraryHaskellDepends = [ base contravariant ListLike ];
        testHaskellDepends = [ base contravariant doctest hedgehog ];
        description = "Association lists (list-like collections of tuples)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "assumpta" = callPackage
@@ -33722,8 +33927,8 @@ self: {
          quickcheck-io
        ];
        description = "An SMTP client library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33742,7 +33947,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec mtl QuickCheck text ];
        description = "Core functionality for an SMTP client";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ast-monad" = callPackage
@@ -33756,8 +33961,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33772,8 +33977,8 @@ self: {
        libraryHaskellDepends = [ ast-monad base text ];
        testHaskellDepends = [ ast-monad base hspec text ];
        description = "A library for writing JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33786,7 +33991,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "vocabulary representation for predicting program properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astar" = callPackage
@@ -33799,7 +34004,7 @@ self: {
          base hashable psqueues unordered-containers
        ];
        description = "General A* search algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astar-monad" = callPackage
@@ -33810,7 +34015,7 @@ self: {
        sha256 = "1df99k3c299nzfxbqnzkqggagf7l8p2fwa9igxy9ydg8b0rqc6xf";
        libraryHaskellDepends = [ base logict mtl ];
        testHaskellDepends = [ base hspec lens logict mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astrds" = callPackage
@@ -33829,8 +34034,8 @@ self: {
          SDL-image SDL-mixer SDL-ttf unix
        ];
        description = "an incomplete 2d space game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33848,7 +34053,7 @@ self: {
          test-framework-quickcheck2 time
        ];
        description = "Amateur astronomical computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astview" = callPackage
@@ -33868,8 +34073,8 @@ self: {
          glib Glob gtk gtksourceview2 hint mtl process syb
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
-       license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsdOriginal;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33881,7 +34086,7 @@ self: {
        sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn";
        libraryHaskellDepends = [ base containers syb ];
        description = "Interfacing between hint and astview";
-       license = stdenv.lib.licenses.bsdOriginal;
+       license = lib.licenses.bsdOriginal;
      }) {};
 
   "async" = callPackage
@@ -33901,7 +34106,7 @@ self: {
          base HUnit stm test-framework test-framework-hunit
        ];
        description = "Run IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-ajax" = callPackage
@@ -33912,7 +34117,7 @@ self: {
        sha256 = "012j2kbf4829g4xzbzc1vqb9ybhr05v4zlipvhcn4pqmfb3vgshi";
        libraryHaskellDepends = [ async base ghcjs-ajax text ];
        description = "Crossbrowser async AJAX Bindings for GHCJS";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "async-combinators" = callPackage
@@ -33933,8 +34138,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33951,8 +34156,8 @@ self: {
          base concurrency dejafu HUnit hunit-dejafu
        ];
        description = "Run MonadConc operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33964,7 +34169,7 @@ self: {
        sha256 = "0hyc27mphjpc7m9khs47ch0q6j6hy2hmibk82vzrfmc3rfjxa1hd";
        libraryHaskellDepends = [ async base deepseq split ];
        description = "Useful concurrent combinators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "async-extras" = callPackage
@@ -33980,7 +34185,7 @@ self: {
          transformers-base
        ];
        description = "Extra Utilities for the Async Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-io-either" = callPackage
@@ -33991,7 +34196,7 @@ self: {
        sha256 = "0sksphy0i46w83kw3fhksiyhz9nn337d4xc3ppihdksi79a6ncph";
        libraryHaskellDepends = [ async base retry transformers ];
        description = "Could be useful";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-manager" = callPackage
@@ -34005,8 +34210,8 @@ self: {
        libraryHaskellDepends = [ async base stm unordered-containers ];
        executableHaskellDepends = [ async base stm unordered-containers ];
        description = "A thread manager for async";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34027,7 +34232,7 @@ self: {
          transformers-base
        ];
        description = "A modified version of async that supports worker groups and many-to-many task dependencies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "async-refresh" = callPackage
@@ -34049,7 +34254,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Package implementing core logic for refreshing of expiring data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-refresh-tokens" = callPackage
@@ -34071,7 +34276,7 @@ self: {
          test-framework-hunit unliftio
        ];
        description = "Package implementing core logic for refreshing of expiring access tokens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-timer" = callPackage
@@ -34089,8 +34294,8 @@ self: {
          async base containers criterion tasty tasty-hunit
        ];
        description = "Provides API for timer based execution of IO actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34102,8 +34307,8 @@ self: {
        sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s";
        libraryHaskellDepends = [ base ];
        description = "Distinguish between synchronous and asynchronous exceptions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34117,7 +34322,7 @@ self: {
        editedCabalFile = "0vh6k6397f3y03y28shx0gf0lvdlb6pdcdhd1j8r1svhjbyphfdp";
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "serialisation for Haskell values with sharing support";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "aterm-utils" = callPackage
@@ -34131,8 +34336,8 @@ self: {
        libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ];
        executableHaskellDepends = [ aterm base transformers wl-pprint ];
        description = "Utility functions for working with aterms as generated by Minitermite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34146,7 +34351,7 @@ self: {
        editedCabalFile = "0h3y24p4296qxwcmynsrqwnxpk024p9c835yh8s366skcjwmhk4x";
        libraryHaskellDepends = [ base ];
        description = "Arrow Transformer Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atlassian-connect-core" = callPackage
@@ -34171,8 +34376,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ zlib ];
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -34194,8 +34399,8 @@ self: {
          scientific text time-units unordered-containers vector
        ];
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34212,7 +34417,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "1976 US Standard Atmosphere Model";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "atmos-dimensional" = callPackage
@@ -34223,7 +34428,7 @@ self: {
        sha256 = "19rlcp1zn3k838c5ixsn6i09nclfwvd9prbirxy5fmch0yjlp39d";
        libraryHaskellDepends = [ atmos base dimensional ];
        description = "dimensional wrapper on atmos package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atmos-dimensional-tf" = callPackage
@@ -34234,8 +34439,8 @@ self: {
        sha256 = "05g2v7ppbcvaw0dk9f0z0gb7k33c4lk2cm2ziyqahxmwsz928khm";
        libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34260,8 +34465,8 @@ self: {
          QuickCheck resourcet text time transformers
        ];
        description = "An interface of ATND API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34273,7 +34478,7 @@ self: {
        sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807";
        libraryHaskellDepends = [ base bimap containers mtl process syb ];
        description = "An EDSL for embedded hard realtime applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atom-basic" = callPackage
@@ -34288,7 +34493,7 @@ self: {
          base base64-bytestring bytestring network network-uri text time
        ];
        description = "Basic Atom feed construction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atom-conduit" = callPackage
@@ -34315,7 +34520,7 @@ self: {
          uri-bytestring xml-conduit xml-types
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
-       license = stdenv.lib.licenses.cc0;
+       license = lib.licenses.cc0;
      }) {};
 
   "atom-msp430" = callPackage
@@ -34326,8 +34531,8 @@ self: {
        sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs";
        libraryHaskellDepends = [ atom base mtl ];
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34343,7 +34548,7 @@ self: {
          base directory filelock filepath io-string-like
        ];
        description = "Functions to atomically write to files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atomic-modify" = callPackage
@@ -34354,8 +34559,8 @@ self: {
        sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5";
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34367,7 +34572,7 @@ self: {
        sha256 = "0gidqyk913vhcz3q4vnpadx3vkkrwb66rqhsxvdba8g2p5z63a12";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        description = "A safe approach to CAS and other atomic ops in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atomic-primops-foreign" = callPackage
@@ -34385,8 +34590,8 @@ self: {
          base bits-atomic HUnit test-framework test-framework-hunit time
        ];
        description = "An atomic counter implemented using the FFI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34399,8 +34604,8 @@ self: {
        libraryHaskellDepends = [ atomic-primops base primitive vector ];
        testHaskellDepends = [ base vector ];
        description = "Atomic operations on Data.Vector types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34419,7 +34624,7 @@ self: {
          base bytestring filepath hspec temporary text unix-compat
        ];
        description = "Atomically write to a file";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "atomo" = callPackage
@@ -34444,8 +34649,8 @@ self: {
          time vector
        ];
        description = "A highly dynamic, extremely simple, very fun programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34463,8 +34668,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit time ];
        description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34476,7 +34681,7 @@ self: {
        sha256 = "0rlv4ikz8k1yjwnqq6yrk1cf4dv9y8jw5i1qaa9m7k6sya2dy6ci";
        libraryHaskellDepends = [ base mtl ];
        description = "A small collection of monad (transformer) instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ats-format" = callPackage
@@ -34496,7 +34701,7 @@ self: {
          process text toml-parser
        ];
        description = "A source-code formatter for ATS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ats-pkg" = callPackage
@@ -34530,8 +34735,8 @@ self: {
        ];
        doHaddock = false;
        description = "A build tool for ATS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34550,8 +34755,8 @@ self: {
          zlib
        ];
        description = "ATS scripts for Cabal builds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34569,8 +34774,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {storable = null;};
 
@@ -34582,8 +34787,8 @@ self: {
        sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
        libraryHaskellDepends = [ base failure ];
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34603,8 +34808,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "A script I use to run \"attic\" for my backups";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34628,8 +34833,8 @@ self: {
          test-framework-hunit text
        ];
        description = "Efficient parsing and serialisation of S-Expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34652,8 +34857,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob QuickCheck ];
        description = "Minimal mail delivery agent (MDA) for local mail with maildir support";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34684,7 +34889,7 @@ self: {
          transformers unordered-containers vector
        ];
        description = "Fast combinator parsing for bytestrings and text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-arff" = callPackage
@@ -34695,7 +34900,7 @@ self: {
        sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "An ARFF file parser using Attoparsec";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "attoparsec-base64" = callPackage
@@ -34706,7 +34911,7 @@ self: {
        sha256 = "1rvkc7kaya42a8djkyj642r5dq952gwkhinif9r22ijaic656cq8";
        libraryHaskellDepends = [ attoparsec base bytestring text word8 ];
        description = "Fetch only base64 characters, erroring in the attoparsec monad on failure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-binary" = callPackage
@@ -34717,7 +34922,7 @@ self: {
        sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Binary processing extensions to Attoparsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-conduit" = callPackage
@@ -34729,7 +34934,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Consume attoparsec parsers via conduit. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-csv" = callPackage
@@ -34741,7 +34946,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        description = "A parser for CSV files that uses Attoparsec";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "attoparsec-data" = callPackage
@@ -34757,7 +34962,7 @@ self: {
          uuid
        ];
        description = "Parsers for the standard Haskell data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-enumerator" = callPackage
@@ -34770,8 +34975,8 @@ self: {
          attoparsec base bytestring enumerator text
        ];
        description = "Pass input from an enumerator to an Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34783,7 +34988,7 @@ self: {
        sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d";
        libraryHaskellDepends = [ attoparsec base ];
        description = "Port of parsec's expression parser to attoparsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-ip" = callPackage
@@ -34799,22 +35004,24 @@ self: {
          attoparsec base ip QuickCheck tasty tasty-quickcheck text vector
        ];
        description = "Parse IP data types with attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "attoparsec-iso8601" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, text, time }:
+    ({ mkDerivation, attoparsec, base, base-compat-batteries, text
+     , time, time-compat
+     }:
      mkDerivation {
        pname = "attoparsec-iso8601";
-       version = "1.0.1.0";
-       sha256 = "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9";
-       revision = "1";
-       editedCabalFile = "1rjhscmczgs1bwyqx7lvkm8py3ylxjd2797mrzgnq60fvm292750";
-       libraryHaskellDepends = [ attoparsec base base-compat text time ];
+       version = "1.0.2.0";
+       sha256 = "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582";
+       libraryHaskellDepends = [
+         attoparsec base base-compat-batteries text time time-compat
+       ];
        description = "Parsing of ISO 8601 dates, originally from aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-iteratee" = callPackage
@@ -34829,8 +35036,8 @@ self: {
          attoparsec base bytestring iteratee transformers
        ];
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34848,7 +35055,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "An Attoparsec compatibility layer for Parsec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-path" = callPackage
@@ -34864,7 +35071,7 @@ self: {
          attoparsec base QuickCheck quickcheck-instances text
        ];
        description = "Convenience bindings between path and attoparsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-text" = callPackage
@@ -34875,8 +35082,8 @@ self: {
        sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315";
        libraryHaskellDepends = [ array attoparsec base containers text ];
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34888,8 +35095,8 @@ self: {
        sha256 = "0cffcwji141js09r7avb15b08xl4s8cgk5vxyrqaq7zw40hhb1gz";
        libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        description = "(deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34905,7 +35112,7 @@ self: {
          attoparsec base bytestring scientific text time
        ];
        description = "Attoparsec parsers of time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-trans" = callPackage
@@ -34916,8 +35123,8 @@ self: {
        sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7";
        libraryHaskellDepends = [ attoparsec base transformers ];
        description = "Interleaved effects for attoparsec parsers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34939,8 +35146,8 @@ self: {
          quickcheck-instances strict tasty tasty-quickcheck text vector
        ];
        description = "URI parser / printer using attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34958,7 +35165,7 @@ self: {
          QuickCheck
        ];
        description = "Variable-length integer decoding for Attoparsec";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "attosplit" = callPackage
@@ -34969,8 +35176,8 @@ self: {
        sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34987,8 +35194,8 @@ self: {
          array base Cabal directory epic haskell98
        ];
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35010,7 +35217,7 @@ self: {
          transformers utility-ht xml-basic
        ];
        description = "Interchange with the Audacity sound signal editor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "audiovisual" = callPackage
@@ -35030,8 +35237,8 @@ self: {
          random template-haskell transformers vector void WAVE
        ];
        description = "A battery-included audiovisual framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35052,7 +35259,7 @@ self: {
        executablePkgconfigDepends = [ augeas ];
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) augeas;};
 
@@ -35071,8 +35278,8 @@ self: {
          process
        ];
        description = "Renaming media collections in a breeze";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35093,8 +35300,8 @@ self: {
          base http-client http-client-tls tasty tasty-hunit
        ];
        description = "Access metadata from the Arch Linux User Repository";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35111,8 +35318,8 @@ self: {
          mtl text
        ];
        description = "ArchLinux AUR json v5 API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35149,8 +35356,8 @@ self: {
          versions
        ];
        description = "A secure package manager for Arch Linux and the AUR";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35170,7 +35377,7 @@ self: {
          resourcet text transformers unordered-containers xml-conduit
        ];
        description = "Authentication methods for Haskell web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "authenticate-kerberos" = callPackage
@@ -35181,7 +35388,7 @@ self: {
        sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq";
        libraryHaskellDepends = [ base process text ];
        description = "Authentication methods for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "authenticate-ldap" = callPackage
@@ -35192,8 +35399,8 @@ self: {
        sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5";
        libraryHaskellDepends = [ base LDAP text transformers ];
        description = "LDAP authentication for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35214,7 +35421,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Library to authenticate with OAuth for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "authinfo-hs" = callPackage
@@ -35225,8 +35432,8 @@ self: {
        sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5";
        libraryHaskellDepends = [ attoparsec base network text ];
        description = "Password querying for .authinfo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35245,8 +35452,8 @@ self: {
          transformers trifecta
        ];
        description = "A library for writing papers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35264,7 +35471,7 @@ self: {
          profunctors random semigroups transformers
        ];
        description = "Denotative, locally stateful programming DSL & platform";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "auto-update" = callPackage
@@ -35276,7 +35483,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base exceptions hspec HUnit retry ];
        description = "Efficiently run periodic, on-demand actions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "autoapply" = callPackage
@@ -35294,7 +35501,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Template Haskell to automatically pass values to functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "autoexporter" = callPackage
@@ -35308,7 +35515,7 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ base ];
        description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "autom" = callPackage
@@ -35323,8 +35530,8 @@ self: {
          base bytestring colour ghc-prim gloss JuicyPixels random vector
        ];
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35349,8 +35556,8 @@ self: {
          tasty tasty-hunit tasty-leancheck tasty-quickcheck
        ];
        description = "automata";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35369,7 +35576,7 @@ self: {
          base bytestring cryptonite quickcheck-simple
        ];
        description = "Automotive CSE emulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "automotive-cse" = callPackage
@@ -35388,7 +35595,7 @@ self: {
          quickcheck-simple
        ];
        description = "Automotive CSE emulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "autonix-deps" = callPackage
@@ -35409,8 +35616,8 @@ self: {
          regex-tdfa resourcet semigroups text transformers xml
        ];
        description = "Library for Nix expression dependency generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35434,8 +35641,8 @@ self: {
          autonix-deps base containers lens mtl
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35447,8 +35654,8 @@ self: {
        sha256 = "1z1w6bvsfhnia2dxihcay6a9va2ik1bg805zkfb0vn4vcxn76dcc";
        libraryHaskellDepends = [ base Cabal dir-traverse filepath ];
        description = "Custom Setup to automate package modules discovery";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35463,7 +35670,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process unix ];
        description = "EDSL for Procmail scripts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avahi" = callPackage
@@ -35477,7 +35684,7 @@ self: {
        libraryHaskellDepends = [ base bytestring dbus text ];
        executableHaskellDepends = [ base bytestring dbus text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avatar-generator" = callPackage
@@ -35490,8 +35697,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base JuicyPixels random ];
        description = "A simple random avatar icon generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35505,7 +35712,7 @@ self: {
        editedCabalFile = "0x6inm86nkc8cnsgnblfxhmhld0mpbvvx9pi8cdiysp7xkac3j4h";
        libraryHaskellDepends = [ base semigroups vector-space ];
        description = "An average (arithmetic mean) monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avers" = callPackage
@@ -35538,8 +35745,8 @@ self: {
          rethinkdb-client-driver text
        ];
        description = "Server-side implementation of the Avers storage model";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35556,8 +35763,8 @@ self: {
          vector
        ];
        description = "Types describing the core and extended Avers APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35576,8 +35783,8 @@ self: {
          swagger2 text unordered-containers
        ];
        description = "Swagger documentation for the Avers API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35598,8 +35805,8 @@ self: {
          transformers wai wai-websockets websockets
        ];
        description = "Server implementation of the Avers API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35625,7 +35832,7 @@ self: {
        ];
        description = "Diagrams for the Cessna 172 aircraft in aviation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {aviation-cessna172-weight-balance = null; 
          aviation-units = null; aviation-weight-balance = null;};
@@ -35643,8 +35850,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A compile-time balanced AVL tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35656,8 +35863,8 @@ self: {
        sha256 = "1k2nw0ibxbr8dhw9css6vryqd8p5klfvk5vxz6h9w61z8y32f430";
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        description = "AVR Crosspack actions for shake build systems";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35695,7 +35902,7 @@ self: {
          random raw-strings-qq text transformers unordered-containers vector
        ];
        description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avro-piper" = callPackage
@@ -35729,8 +35936,8 @@ self: {
          unordered-containers
        ];
        description = "Tool for decoding avro";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35750,7 +35957,7 @@ self: {
        ];
        testHaskellDepends = [ attoparsec base lens pretty-show text ];
        description = "Parse aviation weather reports";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "awesome-prelude" = callPackage
@@ -35761,8 +35968,8 @@ self: {
        sha256 = "0mvfirb41jnjvq4mpky0xpdrh238hjwslfqg82ksnam001sxnpng";
        libraryHaskellDepends = [ base ];
        description = "A prelude which I can be happy with. Based on base-prelude.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35778,8 +35985,8 @@ self: {
          aeson attoparsec awesomium-raw base containers text vector
        ];
        description = "High-level Awesomium bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35791,8 +35998,8 @@ self: {
        sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd";
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35806,8 +36013,8 @@ self: {
        librarySystemDepends = [ awesomium ];
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {awesomium = null;};
 
@@ -35845,7 +36052,7 @@ self: {
          tasty-quickcheck text time transformers transformers-base
        ];
        description = "Amazon Web Services (AWS) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aws-cloudfront-signed-cookies" = callPackage
@@ -35868,7 +36075,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog neat-interpolation ];
        description = "Generate signed cookies for AWS CloudFront";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -35884,8 +36091,8 @@ self: {
          crypto-pubkey-types RSA time
        ];
        description = "For signing AWS CloudFront HTTP URL requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35905,8 +36112,8 @@ self: {
          configuration-tools mtl text transformers
        ];
        description = "Configuration types, parsers & renderers for AWS services";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35924,8 +36131,8 @@ self: {
          http-conduit http-types json-togo resourcet text transformers
        ];
        description = "Conduit-based interface for AWS DynamoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35948,8 +36155,8 @@ self: {
          resourcet scientific text time
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35973,8 +36180,8 @@ self: {
          unordered-containers
        ];
        description = "Helper function and types for working with amazonka";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36004,8 +36211,8 @@ self: {
          unordered-containers vector yaml
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36028,8 +36235,8 @@ self: {
          aeson base io-streams system-filepath turtle
        ];
        description = "Capture and manage AWS EC2 known_host pubkeys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36052,8 +36259,8 @@ self: {
          aeson base Cabal containers QuickCheck regex-compat safe text
        ];
        description = "Haskell suite for the Elastic Transcoder service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36079,8 +36286,8 @@ self: {
          tagged tasty tasty-quickcheck text time transformers
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36106,8 +36313,8 @@ self: {
          tasty tasty-quickcheck text transformers
        ];
        description = "Bindings for Amazon Kinesis";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36142,8 +36349,8 @@ self: {
          monad-control mtl optparse-applicative text transformers
        ];
        description = "A producer & consumer client library for AWS Kinesis";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36172,8 +36379,8 @@ self: {
          time transformers
        ];
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36193,8 +36400,8 @@ self: {
          lens-aeson mtl old-locale text time wreq zip-archive
        ];
        description = "Haskell bindings for AWS Lambda";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36214,7 +36421,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Haskell runtime for AWS Lambda";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "aws-lambda-haskell-runtime-wai" = callPackage
@@ -36237,8 +36444,8 @@ self: {
          unordered-containers vault wai
        ];
        description = "Run wai applications on AWS Lambda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36261,8 +36468,8 @@ self: {
        ];
        executableHaskellDepends = [ aeson base lens lens-aeson text ];
        description = "Haskell on AWS Lambda Runtime API";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36284,8 +36491,8 @@ self: {
          process text time unordered-containers
        ];
        description = "Keep your AWS credentials file up to date with MFA-carrying credentials";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36311,8 +36518,8 @@ self: {
          resourcet statistics text time transformers vector
        ];
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36330,8 +36537,8 @@ self: {
          resourcet text time xml-conduit xml-hamlet
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36360,8 +36567,8 @@ self: {
          transformers
        ];
        description = "AWS SDK for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36383,8 +36590,8 @@ self: {
          template-haskell text time time-locale-compat
        ];
        description = "The text converter for aws-sdk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36405,8 +36612,8 @@ self: {
          base bytestring conduit hspec mtl resourcet text xml-conduit
        ];
        description = "The xml parser for aws-sdk package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36426,8 +36633,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Wrapper over Amazonka's SES";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36451,8 +36658,8 @@ self: {
          filepath http-types old-locale safe text time
        ];
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36470,8 +36677,8 @@ self: {
          conduit lens mtl resourcet text timespan unordered-containers
        ];
        description = "Dead simple bindings to commonly used AWS Services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36495,8 +36702,8 @@ self: {
          tasty tasty-quickcheck text transformers
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36548,8 +36755,8 @@ self: {
        ];
        testToolDepends = [ hpack tasty-discover ];
        description = "The Axel programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36566,8 +36773,8 @@ self: {
          transient transient-universe
        ];
        description = "Web EDSL for running in browsers and server nodes using transient";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36587,8 +36794,8 @@ self: {
          semigroups template-haskell th-printf transformers
        ];
        description = "Specify axioms for type classes and quickCheck all available instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {control-invariants = null;};
 
@@ -36607,8 +36814,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec shelly text urbit-hob ];
        description = "Interact with Azimuth from Haskell";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36627,8 +36834,8 @@ self: {
          base Diff directory filepath hspec options process unix
        ];
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36646,8 +36853,8 @@ self: {
          http-conduit http-types network time
        ];
        description = "Windows Azure ACS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36666,8 +36873,8 @@ self: {
          wreq
        ];
        description = "send email with microsoft azure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36695,8 +36902,8 @@ self: {
        libraryToolDepends = [ proto-lens-protoc ];
        testHaskellDepends = [ base ];
        description = "Azure Functions Worker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36715,8 +36922,8 @@ self: {
          tls-extra transformers
        ];
        description = "Haskell bindings for the Microsoft Azure Service Management API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36734,8 +36941,8 @@ self: {
          conduit connection http-client http-conduit http-types network text
        ];
        description = "Haskell wrapper over Microsoft Azure ServiceBus REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36765,8 +36972,8 @@ self: {
          unix-compat utf8-string
        ];
        description = "A simple library for accessing Azure blob storage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36792,7 +36999,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion pipes ];
        description = "Immutable disk-based B* trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "b9" = callPackage
@@ -36833,8 +37040,8 @@ self: {
          text unordered-containers vector yaml
        ];
        description = "A tool and library for building virtual machine images";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36848,7 +37055,7 @@ self: {
        librarySystemDepends = [ babl ];
        libraryPkgconfigDepends = [ babl ];
        description = "Haskell bindings to BABL library";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) babl;};
 
   "babylon" = callPackage
@@ -36865,7 +37072,7 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36898,8 +37105,8 @@ self: {
          unliftio-core
        ];
        description = "A client library to access Backblaze B2 cloud storage in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36918,7 +37125,7 @@ self: {
        ];
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36940,7 +37147,7 @@ self: {
          mwc-random time vector
        ];
        description = "Heterogeneous automatic differentation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "backstop" = callPackage
@@ -36963,8 +37170,8 @@ self: {
          base filepath HUnit process QuickCheck unix
        ];
        description = "Backstop a target directory by source directories";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36980,7 +37187,7 @@ self: {
        testHaskellDepends = [ base primes tasty tasty-hunit ];
        testToolDepends = [ tasty-discover ];
        description = "A backtracking monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -36996,8 +37203,8 @@ self: {
          transformers
        ];
        description = "A monad transformer for backtracking exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37009,8 +37216,8 @@ self: {
        sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam";
        libraryHaskellDepends = [ base transformers ];
        description = "A state monad that runs the state in reverse through the computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37025,7 +37232,7 @@ self: {
        executableHaskellDepends = [ base gd X11 ];
        description = "braindead utility to compose Xinerama backgrounds";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bag" = callPackage
@@ -37036,8 +37243,8 @@ self: {
        sha256 = "18n7ggrfm39mn4rva661hkxj75gjx2p3jcm0hlzpcshxyk93iblr";
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37071,8 +37278,8 @@ self: {
          wai wai-extra warp
        ];
        description = "Continuous integration system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37096,8 +37303,8 @@ self: {
          http-client-tls text time
        ];
        description = "Shipwire API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37119,7 +37326,7 @@ self: {
        ];
        description = "A blog engine on Hack";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37141,7 +37348,7 @@ self: {
        ];
        description = "bamboo-launcher";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37160,7 +37367,7 @@ self: {
        ];
        description = "A highlight middleware";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37179,8 +37386,8 @@ self: {
          haskell98 hxt mps utf8-string xhtml
        ];
        description = "A photo album middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37199,8 +37406,8 @@ self: {
          hack-contrib hcheat mps network rss utf8-string xhtml
        ];
        description = "bamboo blueprint theme";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37224,7 +37431,7 @@ self: {
        ];
        description = "bamboo mini html5 theme";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37242,8 +37449,8 @@ self: {
          base com directory filepath old-time pretty process regex-compat
        ];
        description = "A Windows Installer (MSI) generator framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37258,7 +37465,7 @@ self: {
        executableHaskellDepends = [ base cmdargs samtools ];
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37273,8 +37480,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "For when a type should never be an instance of a class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37287,8 +37494,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        description = "A library for determining US bank holidays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37301,7 +37508,7 @@ self: {
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "Calculation of bank holidays in England and Wales";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "banwords" = callPackage
@@ -37320,8 +37527,8 @@ self: {
          vector
        ];
        description = "Generalized word blacklister";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37338,19 +37545,19 @@ self: {
          base distributive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Classes for working with types that can change clothes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "barbies-th" = callPackage
     ({ mkDerivation, barbies, base, split, template-haskell }:
      mkDerivation {
        pname = "barbies-th";
-       version = "0.1.7";
-       sha256 = "1wzy8j4i9mp1vlfkrixc49nv1c6prqspvhkjdwp16bvdz4fgbvpq";
+       version = "0.1.8";
+       sha256 = "19cznyjds09l8k844bhc1k2m50w455j7n13826z0np01a23qhyad";
        libraryHaskellDepends = [ barbies base split template-haskell ];
        testHaskellDepends = [ barbies base ];
        description = "Create strippable HKD via TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "barbly" = callPackage
@@ -37370,8 +37577,8 @@ self: {
          text
        ];
        description = "Create status bar menus for macOS from executables";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "x86_64-darwin" ];
      }) {};
 
   "barchart" = callPackage
@@ -37385,8 +37592,8 @@ self: {
        libraryHaskellDepends = [ base csv diagrams filepath ];
        executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        description = "Creating Bar Charts in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37398,8 +37605,8 @@ self: {
        sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg";
        libraryHaskellDepends = [ base bytestring HPDF ];
        description = "Generate Code 128 barcodes as PDFs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37411,8 +37618,8 @@ self: {
        sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7";
        libraryHaskellDepends = [ base containers QuickCheck text time ];
        description = "QuickCheck implementations for common types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37434,7 +37641,7 @@ self: {
        ];
        description = "A web based environment for learning and tinkering with Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "barrie" = callPackage
@@ -37446,7 +37653,7 @@ self: {
        libraryHaskellDepends = [ base containers filepath glib gtk ];
        description = "Declarative Gtk GUI library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37471,8 +37678,8 @@ self: {
          base bytestring lens-family-core tasty tasty-golden
        ];
        description = "Shields.io style badge generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37484,8 +37691,8 @@ self: {
        sha256 = "014nc21wnrklsvy5z7w4v9p9psn6bl210l7v97gj42cv6a8jk5nm";
        libraryHaskellDepends = [ base comonad mtl transformers ];
        description = "Implementation of barrier monad, can use custom front/back type";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37499,8 +37706,8 @@ self: {
          ghc-prim invalid-cabal-flag-settings rts
        ];
        description = "Basic libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {invalid-cabal-flag-settings = null;};
 
@@ -37512,7 +37719,7 @@ self: {
        sha256 = "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk";
        libraryHaskellDepends = [ base unix ];
        description = "A compatibility layer for base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-compat-batteries" = callPackage
@@ -37527,7 +37734,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "base-compat with extra batteries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-compat-migrate" = callPackage
@@ -37541,8 +37748,8 @@ self: {
        libraryHaskellDepends = [ base base-compat ];
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37558,7 +37765,7 @@ self: {
          base base16-bytestring base64-bytestring bytestring text
        ];
        description = "Binary-to-text encodings (e.g. base64)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base-feature-macros" = callPackage
@@ -37570,8 +37777,8 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37583,8 +37790,8 @@ self: {
        sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms";
        libraryHaskellDepends = [ base ];
        description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37596,8 +37803,8 @@ self: {
        sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
        libraryHaskellDepends = [ base ];
        description = "The IO functions included in base delimited into small, composable classes";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37610,7 +37817,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base-orphans" = callPackage
@@ -37624,7 +37831,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Backwards-compatible orphan instances for base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-prelude" = callPackage
@@ -37635,7 +37842,7 @@ self: {
        sha256 = "0nn5v2y9kl7i3n21250m7cvn55lvkmzj22wx6q4kaag5ycwwczrs";
        libraryHaskellDepends = [ base ];
        description = "The most complete prelude formed solely from the \"base\" package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-unicode-symbols" = callPackage
@@ -37646,7 +37853,7 @@ self: {
        sha256 = "0qkhp4ybmx4nbqqkrmw3hkm47bv61i2wpi20qb09wvk10g2dcr23";
        libraryHaskellDepends = [ base ];
        description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base16" = callPackage
@@ -37672,7 +37879,7 @@ self: {
          random-bytestring text
        ];
        description = "Fast RFC 4648-compliant Base16 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base16-bytestring" = callPackage
@@ -37686,7 +37893,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring ];
        description = "Fast base16 (hex) encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base16-bytestring_1_0_1_0" = callPackage
@@ -37705,8 +37912,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "RFC 4648-compliant Base16 encodings for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base16-lens" = callPackage
@@ -37723,7 +37930,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest lens ];
        description = "Optics for the Base16 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base32" = callPackage
@@ -37748,7 +37955,7 @@ self: {
          base bytestring criterion deepseq memory random-bytestring text
        ];
        description = "Fast RFC 4648-compliant Base32 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base32-bytestring" = callPackage
@@ -37763,8 +37970,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast base32 and base32hex codec for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37782,7 +37989,7 @@ self: {
        libraryHaskellDepends = [ base base32 bytestring lens text ];
        testHaskellDepends = [ base doctest lens ];
        description = "Optics for the Base32 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base32-z-bytestring" = callPackage
@@ -37802,8 +38009,8 @@ self: {
          base bytestring criterion z-base32-bytestring
        ];
        description = "Fast z-base32 and z-base32hex codec for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {z-base32-bytestring = null;};
 
@@ -37817,7 +38024,7 @@ self: {
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        description = "Fast and safe representation of a Base-32 string";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base58-bytestring" = callPackage
@@ -37835,7 +38042,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implementation of BASE58 transcoding for ByteStrings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "base58address" = callPackage
@@ -37855,7 +38062,7 @@ self: {
        ];
        description = "Parsing and serialization for Base58 addresses (Bitcoin and Ripple)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base58string" = callPackage
@@ -37868,7 +38075,7 @@ self: {
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        description = "Fast and safe representation of a Base-58 string";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base62" = callPackage
@@ -37888,8 +38095,8 @@ self: {
          wide-word
        ];
        description = "Base62 encoding and decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37916,7 +38123,7 @@ self: {
          random-bytestring text
        ];
        description = "Fast RFC 4648-compliant Base64 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-bytes" = callPackage
@@ -37940,8 +38147,8 @@ self: {
          random
        ];
        description = "Base64 encoding of byte sequences";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37963,7 +38170,7 @@ self: {
          base bytestring containers criterion deepseq
        ];
        description = "Fast base64 encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-bytestring_1_2_0_1" = callPackage
@@ -37982,8 +38189,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Fast base64 encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base64-bytestring-type" = callPackage
@@ -38006,7 +38213,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A newtype around ByteString, for base64 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-conduit" = callPackage
@@ -38025,8 +38232,8 @@ self: {
          transformers
        ];
        description = "Base64-encode and decode streams of bytes. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38042,7 +38249,7 @@ self: {
        libraryHaskellDepends = [ base base64 bytestring lens text ];
        testHaskellDepends = [ base doctest lens ];
        description = "Optics for the Base64 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-string" = callPackage
@@ -38054,7 +38261,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Base64 implementation for String's";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base91" = callPackage
@@ -38075,7 +38282,7 @@ self: {
          base bytestring mono-traversable QuickCheck text
        ];
        description = "A Generic Base91 Encoder & Decoder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "basement" = callPackage
@@ -38088,7 +38295,7 @@ self: {
        editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Foundation scrap box of array & string";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basen" = callPackage
@@ -38106,7 +38313,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "basen-bytestring" = callPackage
@@ -38117,7 +38324,7 @@ self: {
        sha256 = "131aamd4kq7jdmpl4ammgqgykbh81mkziaf0kpic5c20al4a73lp";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring QuickCheck ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "baserock-schema" = callPackage
@@ -38144,8 +38351,8 @@ self: {
          yaml-pretty-extras
        ];
        description = "Baserock Definitions Schema";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38157,8 +38364,8 @@ self: {
        sha256 = "038xxyjy3c9rpz1cf811dy1yxjyjq3cjphq7h6ivj73qpfx6bwch";
        libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38175,7 +38382,7 @@ self: {
          shell-escape
        ];
        description = "Bash generation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basic" = callPackage
@@ -38190,8 +38397,8 @@ self: {
          base stm template-haskell transformers util
        ];
        description = "Lifting values from base types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38203,7 +38410,7 @@ self: {
        sha256 = "0gz4jpdp0zjn5yils4wplrg2mghpmxsh9f9yv07n81qb8mxwhg5p";
        libraryHaskellDepends = [ base ];
        description = "A small package to access the cpuid instruction directly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basic-lens" = callPackage
@@ -38214,7 +38421,7 @@ self: {
        sha256 = "1qnlzxbwz9fh78sw78xs0sf3wx94m5ipw1adfaf02d291z81mrys";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Basic lens type and functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basic-prelude" = callPackage
@@ -38230,7 +38437,7 @@ self: {
          unordered-containers vector
        ];
        description = "An enhanced core prelude; a common foundation for alternate preludes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "basic-sop" = callPackage
@@ -38243,7 +38450,9 @@ self: {
          base deepseq generics-sop QuickCheck text
        ];
        description = "Basic examples and functions for generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "baskell" = callPackage
@@ -38260,7 +38469,7 @@ self: {
        ];
        description = "An interpreter for a small functional language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38278,7 +38487,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec stm timespan ];
        description = "Simplify queuing up data and processing it in batch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "batch-rename" = callPackage
@@ -38291,7 +38500,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath Glob ];
        description = "Make Linux or MacOS do things like \"rename *.mp3 *.mp4\"";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "batchd" = callPackage
@@ -38322,8 +38531,8 @@ self: {
          wai-middleware-static warp x509-store yaml
        ];
        description = "Batch processing toolset for Linux / Unix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38337,8 +38546,8 @@ self: {
          aeson base containers http-conduit text
        ];
        description = "API client for Battle.Net";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38352,8 +38561,8 @@ self: {
          base battlenet http-conduit text yesod-core
        ];
        description = "Yesod integration for the battlenet package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38371,8 +38580,8 @@ self: {
          swagger2 template-haskell text vector
        ];
        description = "Core definitions for BattlePlace.io service";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38386,8 +38595,8 @@ self: {
          base battleplace servant servant-client
        ];
        description = "Public API definitions of BattlePlace.io service";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38411,8 +38620,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Compute number of possible arrangements in the battleship game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38445,8 +38654,8 @@ self: {
          wai-handler-fastcgi yesod
        ];
        description = "A web-based implementation of battleships including an AI opponent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38466,8 +38675,8 @@ self: {
          statistics stm transformers vector
        ];
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38485,8 +38694,8 @@ self: {
          base cmdargs directory filepath hxt hxt-xpath listsafe MissingH
        ];
        description = "HTML Coverage Reports for Rules_Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38501,7 +38710,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath transformers ];
        executableHaskellDepends = [ base filepath ];
        description = "Locate Bazel runfiles location";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "bbdb" = callPackage
@@ -38513,7 +38722,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Ability to read, write, and modify BBDB files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "bbi" = callPackage
@@ -38533,8 +38742,8 @@ self: {
          tasty-golden tasty-hunit vector
        ];
        description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38554,8 +38763,8 @@ self: {
          aeson base containers country doctest hspec iso639 QuickCheck text
        ];
        description = "Language tags as specified by BCP 47";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38575,8 +38784,8 @@ self: {
          base bcp47 cassava hspec path-pieces persistent QuickCheck
        ];
        description = "BCP47 orphan instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38590,7 +38799,7 @@ self: {
          base bytestring data-default entropy memory
        ];
        description = "Haskell bindings to the bcrypt password hash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bdcs" = callPackage
@@ -38635,8 +38844,8 @@ self: {
          persistent-sqlite persistent-template resourcet text time unix
        ];
        description = "Tools for managing a content store of software packages";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ostree;};
 
@@ -38673,8 +38882,8 @@ self: {
          string-conversions string-qq temporary text time wai warp
        ];
        description = "BDCS API Server";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
@@ -38692,8 +38901,8 @@ self: {
          test-framework-hunit
        ];
        description = "Behavior-Driven Development DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38705,7 +38914,7 @@ self: {
        sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww";
        libraryHaskellDepends = [ base bytestring ];
        description = "Simple, fast binary diff/patch";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bdo" = callPackage
@@ -38720,8 +38929,8 @@ self: {
        libraryHaskellDepends = [ aeson base network text url ];
        executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38741,8 +38950,8 @@ self: {
          pretty semigroups tagged text time uniplate
        ];
        description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38780,8 +38989,8 @@ self: {
          postgresql-simple QuickCheck splitmix
        ];
        description = "DB migration library for beam, targeting Postgres";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38803,8 +39012,8 @@ self: {
          base bytestring tasty tasty-hunit text time
        ];
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38825,8 +39034,8 @@ self: {
          uuid-types vector
        ];
        description = "SQL DDL support and migrations support library for Beam";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38844,8 +39053,8 @@ self: {
          hashable mtl mysql network-uri scientific text time
        ];
        description = "Connection layer between beam and MySQL/MariaDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38861,8 +39070,8 @@ self: {
          base beam-core beam-migrate lens postgresql-simple
        ];
        description = "A newtype for wrapping newtypes into beam schemas";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38889,8 +39098,8 @@ self: {
          postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector
        ];
        description = "Connection layer between beam and postgres";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38913,8 +39122,8 @@ self: {
          tasty-expected-failure tasty-hunit text time
        ];
        description = "Beam driver for SQLite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38936,8 +39145,8 @@ self: {
          template-haskell text
        ];
        description = "Template Haskell utilities for beam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38962,8 +39171,8 @@ self: {
          integer-gmp murmur-hash
        ];
        description = "Generic serializer/deserializer with compact representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38979,7 +39188,7 @@ self: {
          base dunai MonadRandom mtl simple-affine-space transformers
        ];
        description = "FRP Yampa replacement implemented with Monadic Stream Functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "beautifHOL" = callPackage
@@ -38993,7 +39202,7 @@ self: {
        executableHaskellDepends = [ array base haskell98 mtl ];
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39021,8 +39230,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39040,8 +39249,8 @@ self: {
        testHaskellDepends = [ base bech32 hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Template Haskell extensions to the Bech32 library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39058,8 +39267,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Efficient Matrix and Vector operations in 100% Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39083,8 +39292,8 @@ self: {
          unordered-containers vector
        ];
        description = "Bindings to the beeminder.com JSON API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39108,8 +39317,8 @@ self: {
          utf8-string xhtml
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39138,8 +39347,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "HTTP client DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39159,7 +39368,7 @@ self: {
          base criterion optparse-applicative process silently text turtle
        ];
        description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bench-graph" = callPackage
@@ -39175,8 +39384,8 @@ self: {
        ];
        testHaskellDepends = [ base split text ];
        description = "Plot and compare benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39203,8 +39412,8 @@ self: {
        ];
        testHaskellDepends = [ base split text ];
        description = "Show, plot and compare benchmark results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39216,7 +39425,7 @@ self: {
        sha256 = "1zwk05lf76xcdbqrbaid3whmn04injrg7dnlji2v2i5li0pnpr3c";
        libraryHaskellDepends = [ base process random time ];
        description = "Test the time it takes to run a haskell function";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "benchpress" = callPackage
@@ -39230,7 +39439,7 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        executableHaskellDepends = [ base bytestring time ];
        description = "Micro-benchmarking with detailed statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bencode" = callPackage
@@ -39249,7 +39458,7 @@ self: {
          base bytestring containers hspec QuickCheck
        ];
        description = "Parsers and printers for bencoded data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bencodex" = callPackage
@@ -39272,8 +39481,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bencodex reader/writer for Haskell";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39297,7 +39506,7 @@ self: {
          attoparsec base bencode bytestring criterion deepseq ghc-prim
        ];
        description = "A library for encoding and decoding of BEncode data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bento" = callPackage
@@ -39308,7 +39517,7 @@ self: {
        sha256 = "14li436dp33r4fygkbxr6rjljdamc0yhxv34wafsy4xsv8h898pb";
        libraryHaskellDepends = [ base ];
        description = "🍱 Manage stateful components";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "berkeleydb" = callPackage
@@ -39320,8 +39529,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) db;};
 
@@ -39347,8 +39556,8 @@ self: {
          parseargs process transformers
        ];
        description = "An implementation of Python 3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39371,8 +39580,8 @@ self: {
          tasty-hunit tasty-smallcheck
        ];
        description = "BERT implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39384,8 +39593,8 @@ self: {
        sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1";
        libraryHaskellDepends = [ base ];
        description = "Extended GCD of polynomials over F_p[x]";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39412,8 +39621,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39430,8 +39639,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39454,8 +39663,8 @@ self: {
          random stm time-units vty
        ];
        description = "A horizontal version of tetris for braille users";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39467,7 +39676,7 @@ self: {
        sha256 = "0pa6f7vadslvff0hlm939r2h8k130f16l2sjnzci79n54q9kadw3";
        libraryHaskellDepends = [ base ];
        description = "Function combinator \"between\" and derived combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bf-cata" = callPackage
@@ -39495,8 +39704,8 @@ self: {
          template-haskell unix
        ];
        description = "Bidirectionalization for Free! (POPL'09)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39508,7 +39717,7 @@ self: {
        sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr";
        libraryHaskellDepends = [ base containers mtl ];
        description = "\"Bidirectionalization for Free\" for Monomorphic Transformations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bglib" = callPackage
@@ -39529,7 +39738,7 @@ self: {
          serialport stm
        ];
        description = "Implementation of the BGAPI serial protocol";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bgmax" = callPackage
@@ -39540,8 +39749,8 @@ self: {
        sha256 = "0cgxdq5dfs9dvj5ly9sd52pf75yslrnds45hg9nwv5zrfld90rdv";
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39557,8 +39766,8 @@ self: {
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39581,7 +39790,7 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39604,8 +39813,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "A database based bibliography manager for BibTeX";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39619,7 +39828,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
        description = "Parse, format and processing BibTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bidirectional" = callPackage
@@ -39631,8 +39840,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [ base hedgehog mtl ];
        description = "Simple bidirectional serialization and deserialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39652,8 +39861,8 @@ self: {
          template-haskell unix utf8-string xhtml
        ];
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39666,7 +39875,7 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39679,7 +39888,7 @@ self: {
        libraryHaskellDepends = [ base bytestring dataenc mtl ];
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39693,7 +39902,7 @@ self: {
        editedCabalFile = "1yc56avikf0xnmd7cm2hh93vgwcpxyiw1d208s4hp80i8iprkp2n";
        libraryHaskellDepends = [ base category ];
        description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bifunctors" = callPackage
@@ -39715,7 +39924,30 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "bifunctors_5_5_10" = callPackage
+    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
+     , hspec-discover, QuickCheck, tagged, template-haskell
+     , th-abstraction, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "bifunctors";
+       version = "5.5.10";
+       sha256 = "03d96df4j1aq9z7hrk3n519g3h7fjgjf82fmgp6wxxbaigyrqwp7";
+       libraryHaskellDepends = [
+         base base-orphans comonad containers tagged template-haskell
+         th-abstraction transformers
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck template-haskell transformers
+         transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bifunctors";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -39748,8 +39980,8 @@ self: {
          uu-parsinglib
        ];
        description = "A parser for the Billboard chord dataset";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39768,7 +40000,7 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39788,7 +40020,7 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39811,7 +40043,7 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {leksah-dummy = null; leksah-main = null; 
          leksah-plugin-pane = null;};
@@ -39830,7 +40062,7 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39847,7 +40079,7 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39866,7 +40098,7 @@ self: {
          base containers deepseq exceptions QuickCheck template-haskell
        ];
        description = "Bidirectional mapping between two key types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bimap-server" = callPackage
@@ -39881,7 +40113,7 @@ self: {
          aeson base bimap binary directory http-types unix wai warp
        ];
        description = "Two-column database server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bimaps" = callPackage
@@ -39908,7 +40140,7 @@ self: {
          vector
        ];
        description = "bijections with multiple implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bin" = callPackage
@@ -39923,7 +40155,7 @@ self: {
          base dec deepseq fin hashable QuickCheck
        ];
        description = "Bin: binary natural numbers";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "binary_0_8_8_0" = callPackage
@@ -39949,8 +40181,8 @@ self: {
          unordered-containers zlib
        ];
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "binary-bits" = callPackage
@@ -39969,8 +40201,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bit parsing/writing on top of binary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39982,8 +40214,8 @@ self: {
        sha256 = "1w3cwnliaw1dxgg1zgsg13hp4qdhxb18pfrm99bhmfq81p26ghk8";
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Flexible way to ease transmission of binary data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40003,7 +40235,7 @@ self: {
          quickcheck-assertions resourcet
        ];
        description = "data serialization/deserialization conduit library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "binary-derive" = callPackage
@@ -40014,8 +40246,8 @@ self: {
        sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl";
        libraryHaskellDepends = [ base binary ghc-prim ];
        description = "Automatic deriving of Binary using GHC.Generics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40027,7 +40259,7 @@ self: {
        sha256 = "1246lsk6bfwkrcspdsavmbz5ym3dvjc8ik3r0nc2if9x55cx5rqm";
        libraryHaskellDepends = [ base binary ];
        description = "Simple wrappers around enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-ext" = callPackage
@@ -40052,8 +40284,8 @@ self: {
          transformers-base
        ];
        description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40069,8 +40301,8 @@ self: {
          base bytestring monads-tf peggy template-haskell
        ];
        description = "read/write binary file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40086,7 +40318,7 @@ self: {
          base binary bytestring data-binary-ieee754 syb text
        ];
        description = "Generic binary serialisation using binary and syb";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-ieee754" = callPackage
@@ -40097,7 +40329,7 @@ self: {
        sha256 = "0m2dxr5a4rb18jh1xj5yxjpjybn6bz5pjxd2cx06nd6dif4qki0m";
        libraryHaskellDepends = [ array base binary ];
        description = "Backport ieee754 float double combinators to older binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-indexed-tree" = callPackage
@@ -40109,7 +40341,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40135,7 +40367,7 @@ self: {
          time-compat unordered-containers vector
        ];
        description = "Orphan instances for binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-io" = callPackage
@@ -40154,7 +40386,7 @@ self: {
          async base binary bytestring hspec process stm
        ];
        description = "Read and write values of types that implement Binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-list" = callPackage
@@ -40170,7 +40402,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lists of length a power of two";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-literal-qq" = callPackage
@@ -40183,7 +40415,7 @@ self: {
        editedCabalFile = "0rs6ymklp25lmk0hs8paxi4d8qjxjqpmbg2jbpzdagci39h3m9b1";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Extends Haskell with binary literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-orphans" = callPackage
@@ -40202,7 +40434,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Compatibility package for binary; provides instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-parser" = callPackage
@@ -40220,7 +40452,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A highly-efficient but limited parser API specialised for bytestrings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "binary-parsers" = callPackage
@@ -40249,7 +40481,7 @@ self: {
          unordered-containers vector
        ];
        description = "Extends binary with parsec/attoparsec style parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-protocol" = callPackage
@@ -40260,8 +40492,8 @@ self: {
        sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h";
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Monad to ease implementing a binary network protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40277,8 +40509,8 @@ self: {
          base binary bytestring mtl zeromq-haskell
        ];
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40295,8 +40527,8 @@ self: {
          base directory doctest filepath hspec QuickCheck
        ];
        description = "Binary and exponential searches";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40308,7 +40540,7 @@ self: {
        sha256 = "0qdbz2qvvqiaqp859fn00470gzxpvw8k3v0wqclgqps3zj9g9854";
        libraryHaskellDepends = [ base bytestring cborg serialise ];
        description = "Yet Another Binary Serialisation Library (compatibility shim)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-shared" = callPackage
@@ -40330,7 +40562,7 @@ self: {
        sha256 = "06v3qxyl2mvwi3y29rxxf91b2vxvlh5gfznwlnzb4mxzd00aakgl";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
        description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-store" = callPackage
@@ -40350,8 +40582,8 @@ self: {
          base binary-list QuickCheck tasty tasty-quickcheck
        ];
        description = "Format to store data using the binary transform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {binary-transform = null;};
 
@@ -40369,8 +40601,8 @@ self: {
          QuickCheck
        ];
        description = "data serialization/deserialization io-streams library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40383,7 +40615,7 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl ];
        testHaskellDepends = [ base bytestring ];
        description = "Binary deserialisation using strict ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-tagged" = callPackage
@@ -40413,8 +40645,8 @@ self: {
          unordered-containers
        ];
        description = "Tagged binary serialisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40433,7 +40665,7 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "binary-typed" = callPackage
@@ -40454,8 +40686,8 @@ self: {
          base binary bytestring criterion deepseq
        ];
        description = "Type-safe binary serialization";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40467,7 +40699,7 @@ self: {
        sha256 = "1i183ab4bbq3yarijnb2pwgbi9k1w1nc0fs6ph8d8xnysj6ws8l8";
        libraryHaskellDepends = [ base binary ];
        description = "VarInt encoding/decoding via Data.Binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binarydefer" = callPackage
@@ -40478,20 +40710,20 @@ self: {
        sha256 = "06q255kip3j31bmj01fqkikvjxbklvcaa1kv3al8v04nkqx6rg3p";
        libraryHaskellDepends = [ base ];
        description = "Binary serialization with deferred loading";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binaryen" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "binaryen";
-       version = "0.0.5.0";
-       sha256 = "0n3w222k1jbijqgjy1kngwx4hjny7qzw3w2gx82qxycbmm1sb1qg";
+       version = "0.0.6.0";
+       sha256 = "0jc61n8piz75032d9h6azswkvnhlfvxpn3lhl7jj5ry0xm4g3a7p";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Haskell bindings to binaryen";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bind-marshal" = callPackage
@@ -40508,8 +40740,8 @@ self: {
          numeric-prelude random stm strict transformers type-level-tf unix
        ];
        description = "Data marshaling library that uses type level equations to optimize buffering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40524,8 +40756,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base HTF HUnit QuickCheck random ];
        description = "Data Binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40540,8 +40772,8 @@ self: {
        libraryHaskellDepends = [ base binding-core gtk mtl ];
        testHaskellDepends = [ base binding-core directory gtk ];
        description = "Data Binding in Gtk2Hs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40556,8 +40788,8 @@ self: {
        libraryHaskellDepends = [ base binding-core stm wx wxcore ];
        testHaskellDepends = [ base binding-core directory wx ];
        description = "Data Binding in WxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40569,7 +40801,7 @@ self: {
        sha256 = "0zczf1yfjnfzdzv33j33vcc71zsf88a5qxsdmswxrpzika3rs6i0";
        libraryHaskellDepends = [ base ];
        description = "Deprecated package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-DSL" = callPackage
@@ -40580,7 +40812,7 @@ self: {
        sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3";
        libraryHaskellDepends = [ base ];
        description = "FFI domain specific language, on top of hsc2hs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-EsounD" = callPackage
@@ -40592,8 +40824,8 @@ self: {
        libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ];
        libraryPkgconfigDepends = [ esound ];
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {esound = null;};
 
@@ -40615,7 +40847,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Low-level bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
          inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; 
@@ -40632,8 +40864,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ K8055D ];
        description = "Bindings to Velleman K8055 dll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {K8055D = null;};
 
@@ -40646,8 +40878,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ apr ];
        description = "Low level bindings to Apache Portable Runtime (APR)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) apr;};
 
@@ -40660,8 +40892,8 @@ self: {
        libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
        libraryPkgconfigDepends = [ apr-util ];
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {apr-util = null;};
 
@@ -40674,7 +40906,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ audiofile ];
        description = "Low level bindings to audiofile";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {inherit (pkgs) audiofile;};
 
   "bindings-bfd" = callPackage
@@ -40689,8 +40921,8 @@ self: {
        librarySystemDepends = [ bfd opcodes ];
        libraryToolDepends = [ alex happy ];
        description = "Bindings for libbfd, a library of the GNU `binutils'";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bfd = null; opcodes = null;};
 
@@ -40703,8 +40935,8 @@ self: {
        libraryHaskellDepends = [ bindings-DSL ];
        librarySystemDepends = [ dttools ];
        description = "Bindings to the CCTools WorkQueue C library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dttools = null;};
 
@@ -40724,7 +40956,7 @@ self: {
        librarySystemDepends = [ codec2 ];
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Very low-level FFI bindings for Codec2";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {inherit (pkgs) codec2;};
 
   "bindings-common" = callPackage
@@ -40735,8 +40967,8 @@ self: {
        sha256 = "1zbm8v5xp4pay6h0y24ngf8nw96ab0zr754b9n2zczadiarccmcb";
        libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40750,8 +40982,8 @@ self: {
        librarySystemDepends = [ dc1394 ];
        libraryToolDepends = [ c2hs ];
        description = "Library for using firewire (iidc-1394) cameras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dc1394 = null;};
 
@@ -40764,8 +40996,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL bindings-posix ];
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -40778,8 +41010,8 @@ self: {
        librarySystemDepends = [ eskit ];
        libraryPkgconfigDepends = [ eskit ];
        description = "Bindings to ESKit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {eskit = null;};
 
@@ -40792,8 +41024,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {fann = null;};
 
@@ -40806,8 +41038,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ fluidsynth ];
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
@@ -40820,8 +41052,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {friso = null;};
 
@@ -40834,7 +41066,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings to GLib";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) glib;};
 
   "bindings-gobject" = callPackage
@@ -40846,7 +41078,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings supporting GObject and derived libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) glib;};
 
   "bindings-gpgme" = callPackage
@@ -40858,7 +41090,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ gpgme ];
        description = "Project bindings-* raw interface to gpgme";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gpgme;};
 
   "bindings-gsl" = callPackage
@@ -40870,8 +41102,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gsl;};
 
@@ -40884,7 +41116,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
        libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) gts;};
 
   "bindings-hamlib" = callPackage
@@ -40901,8 +41133,8 @@ self: {
        librarySystemDepends = [ hamlib ];
        executableHaskellDepends = [ base ];
        description = "Hamlib bindings for Haskell";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) hamlib;};
 
@@ -40914,8 +41146,8 @@ self: {
        sha256 = "1d94irqliswjqx65k147mj8i9j34xhfn5lyk5xa7ycf3m5b1g95z";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40929,7 +41161,7 @@ self: {
        librarySystemDepends = [ blas liblapack ];
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "bindings-libcddb" = callPackage
@@ -40941,7 +41173,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libcddb ];
        description = "Low level binding to libcddb";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libcddb;};
 
   "bindings-libffi" = callPackage
@@ -40953,7 +41185,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libffi ];
        description = "Low level bindings to libffi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libffi;};
 
   "bindings-libftdi" = callPackage
@@ -40966,7 +41198,7 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libftdi; libusb = null;};
 
@@ -40979,8 +41211,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ g15 ];
        description = "Bindings to libg15";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {g15 = null;};
 
@@ -40992,7 +41224,9 @@ self: {
        sha256 = "18vjsgvndmxbxvyapxkgkx36qgh2yrdg8dfaqpcd9zr3yl84kxnq";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to libpci";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-librrd" = callPackage
@@ -41004,8 +41238,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ librrd ];
        description = "Low level bindings to RRDtool";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {librrd = null;};
 
@@ -41022,8 +41256,8 @@ self: {
        ];
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {stemmer = null;};
 
@@ -41036,8 +41270,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libusb ];
        description = "Low level bindings to libusb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libusb = null;};
 
@@ -41050,8 +41284,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ v4l2 ];
        description = "bindings to libv4l2 for Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {v4l2 = null;};
 
@@ -41064,7 +41298,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libzip ];
        description = "Low level bindings to libzip";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libzip;};
 
   "bindings-linux-videodev2" = callPackage
@@ -41075,8 +41309,8 @@ self: {
        sha256 = "0k8h0i8qfmx6fg5d7mbh57brp8h896j9070bss9jmds4bhizhpw9";
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41089,8 +41323,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ lxc ];
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
@@ -41101,7 +41335,7 @@ self: {
        sha256 = "19qdf5z6mf8j8inlnax0nv1wiv4va27z4a303hpkbgda459093nd";
        libraryHaskellDepends = [ bindings-posix ];
        description = "(deprecated) see bindings-posix instead";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-monetdb-mapi" = callPackage
@@ -41113,8 +41347,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {monetdb-mapi = null;};
 
@@ -41126,8 +41360,8 @@ self: {
        sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "bindings to mpdecimal library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41145,7 +41379,7 @@ self: {
          base bytestring hspec HUnit QuickCheck quickcheck-io
        ];
        description = "bindings to nettle crypto library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) nettle;};
 
   "bindings-parport" = callPackage
@@ -41156,7 +41390,7 @@ self: {
        sha256 = "1q404clpqzv0gik80ycipl94hvj27397z5cw1cs7b0yxlypllg3j";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "parport bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-portaudio" = callPackage
@@ -41168,7 +41402,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL vector ];
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
@@ -41179,7 +41413,7 @@ self: {
        sha256 = "02bcb40jpwylcl48g48r2yd3j7pmij94975r3dcnmyk76kyp3fc3";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to Posix";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-potrace" = callPackage
@@ -41191,7 +41425,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ potrace ];
        description = "Low-level bindings to the potrace bitmap tracing library";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {inherit (pkgs) potrace;};
 
   "bindings-ppdev" = callPackage
@@ -41202,8 +41436,8 @@ self: {
        sha256 = "18px429hplpabfhapwasbdgw8ynfm3vr5rf81pp173j1z0bv4ygq";
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41224,7 +41458,7 @@ self: {
          base cmdargs containers directory filepath process text unix
        ];
        description = "Wrapping saga_cmd";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "bindings-sane" = callPackage
@@ -41236,7 +41470,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ sane-backends ];
        description = "FFI bindings to libsane";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) sane-backends;};
 
   "bindings-sc3" = callPackage
@@ -41250,7 +41484,7 @@ self: {
        librarySystemDepends = [ scsynth ];
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {scsynth = null;};
 
@@ -41267,7 +41501,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Low level bindings to SIPC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sipc = null;};
 
@@ -41279,7 +41513,7 @@ self: {
        sha256 = "0fiibm7nrsx9pzi2lvhhbw71bah6s22h3jvn417ng3lj6ghhzii6";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low-level bindings to sophia library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-sqlite3" = callPackage
@@ -41291,7 +41525,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ sqlite ];
        description = "Low level bindings to sqlite3";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) sqlite;};
 
   "bindings-svm" = callPackage
@@ -41302,7 +41536,7 @@ self: {
        sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to libsvm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-uname" = callPackage
@@ -41313,7 +41547,7 @@ self: {
        sha256 = "1lsw4dh5vgmfvrx62ns5kmngzlmjzbxkx43x5i2k5qlmzp1pa3hk";
        libraryHaskellDepends = [ base ];
        description = "Low-level binding to POSIX uname(3)";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "bindings-wlc" = callPackage
@@ -41326,8 +41560,8 @@ self: {
        librarySystemDepends = [ wlc ];
        testHaskellDepends = [ base ];
        description = "Bindings against the wlc library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {wlc = null;};
 
@@ -41340,8 +41574,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "bindynamic" = callPackage
@@ -41354,8 +41588,8 @@ self: {
        editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41374,8 +41608,8 @@ self: {
          base containers directory dlist filepath
        ];
        description = "Embed data into object files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41392,8 +41626,8 @@ self: {
          base binembed bytestring containers filepath
        ];
        description = "Example project using binembed to embed data in object files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41407,7 +41641,7 @@ self: {
          base binary bytestring data-binary-ieee754
        ];
        description = "A collection of various methods for reading and writing bini files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bins" = callPackage
@@ -41425,7 +41659,7 @@ self: {
          tagged vector-sized
        ];
        description = "Aggregate continuous values into discrete bins";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binsm" = callPackage
@@ -41443,7 +41677,7 @@ self: {
        ];
        description = "binary files splitter and merger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bio" = callPackage
@@ -41464,7 +41698,7 @@ self: {
        executableHaskellDepends = [ base bytestring random ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41481,8 +41715,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41497,7 +41731,7 @@ self: {
        ];
        description = "Library for reading ace assembly files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41510,7 +41744,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41525,7 +41759,7 @@ self: {
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41538,7 +41772,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Library for reading fasta sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41551,7 +41785,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "A library for reading FASTQ files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41574,25 +41808,25 @@ self: {
          unordered-containers vector vector-algorithms zlib
        ];
        description = "bioinformatics support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , bytestring-lexing, case-insensitive, clustering, conduit
-     , conduit-combinators, conduit-extra, containers, criterion
-     , data-default-class, data-ordlist, double-conversion, hexpat
-     , HsHTSLib, http-conduit, IntervalMap, math-functions, matrices
-     , microlens, microlens-th, mtl, parallel, primitive, random, split
-     , statistics, tasty, tasty-golden, tasty-hunit, text, transformers
+     , conduit-extra, containers, criterion, data-default-class
+     , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit
+     , IntervalMap, math-functions, matrices, microlens, microlens-th
+     , mtl, parallel, primitive, random, split, statistics, tasty
+     , tasty-golden, tasty-hunit, text, transformers
      , unordered-containers, vector, vector-algorithms, word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.9.3.1";
-       sha256 = "106aiq3147zrd6dh689zamqi8q03cfvsmsvjlivwcdgybg7zrdr4";
+       version = "0.9.5";
+       sha256 = "03nra5ngirlkfm9xhndiwsl51ixcgp5rf7xfwgvw0bfvzddrc6i9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring bytestring-lexing
@@ -41603,8 +41837,8 @@ self: {
          transformers unordered-containers vector vector-algorithms word8
        ];
        testHaskellDepends = [
-         base bytestring conduit conduit-combinators data-default-class
-         matrices microlens mtl random tasty tasty-golden tasty-hunit
+         base bytestring conduit conduit-extra data-default-class matrices
+         microlens mtl random tasty tasty-golden tasty-hunit
          unordered-containers vector
        ];
        benchmarkHaskellDepends = [
@@ -41612,8 +41846,8 @@ self: {
          random
        ];
        description = "A collection of bioinformatics tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41630,7 +41864,7 @@ self: {
        ];
        description = "Library for reading phd sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41648,7 +41882,7 @@ self: {
        executableHaskellDepends = [ cmdargs unordered-containers ];
        description = "Library and executables for working with PSL files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41665,8 +41899,8 @@ self: {
        libraryHaskellDepends = [ array base binary biocore bytestring ];
        executableHaskellDepends = [ array base cmdargs mtl ];
        description = "Library and executables for working with SFF files";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41689,8 +41923,8 @@ self: {
          transformers zlib-conduit
        ];
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41711,7 +41945,7 @@ self: {
          bytestring hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "birch-beer" = callPackage
@@ -41745,8 +41979,8 @@ self: {
          lens optparse-generic sparse-linear-algebra text text-show vector
        ];
        description = "Plot a colorful tree";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41767,8 +42001,8 @@ self: {
          haskell98 MissingH mtl parsec process rallod
        ];
        description = "A simple, sinatra-inspired web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41781,8 +42015,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Birds of Paradise";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41800,7 +42034,7 @@ self: {
          base configurator directory filepath mtl selda selda-sqlite text
        ];
        description = "A small tool that clears qutebrowser cookies";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "bisect-binary" = callPackage
@@ -41820,8 +42054,8 @@ self: {
          yaml
        ];
        description = "Determine relevant parts of binary data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41833,8 +42067,8 @@ self: {
      }:
      mkDerivation {
        pname = "bishbosh";
-       version = "0.0.0.7";
-       sha256 = "1ihnq7smjk0d18gmkgl70qzqwljmb5nr9hhzwfmkakh3p2x24g3i";
+       version = "0.0.0.8";
+       sha256 = "0mk0mki02m8nvk667wbrk954qnb6qxdfzyz10bfcyvfbz1afg702";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -41853,7 +42087,7 @@ self: {
        ];
        description = "Plays chess";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41866,8 +42100,8 @@ self: {
        libraryHaskellDepends = [ base numeric-qq ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41887,7 +42121,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Encode binary protocols with some odd bit numbers into a bytestring";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bit-stream" = callPackage
@@ -41907,8 +42141,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41925,7 +42159,7 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "Simple bit vectors for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitarray" = callPackage
@@ -41938,7 +42172,7 @@ self: {
        editedCabalFile = "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45";
        libraryHaskellDepends = [ array base ];
        description = "Mutable and immutable bit arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitcoin-address" = callPackage
@@ -41959,8 +42193,8 @@ self: {
          hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        description = "Bitcoin address generation and rendering. Parsing coming soon.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41985,8 +42219,8 @@ self: {
          http-client lens text wreq
        ];
        description = "Provides access to the RPC API of Bitcoin Core";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42009,8 +42243,8 @@ self: {
          lens text wreq
        ];
        description = "Higher level constructs on top of the bitcoin-api package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42031,32 +42265,32 @@ self: {
          base bitcoin-tx bitcoin-types bytestring hexstring hspec
        ];
        description = "Utility functions for manipulating bitcoin blocks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "bitcoin-compact-filters" = callPackage
-    ({ mkDerivation, aeson, base, bitstream, bytestring, cereal
-     , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text
-     , transformers
+    ({ mkDerivation, aeson, base, base16-bytestring, bitstream
+     , bytestring, cereal, haskoin-core, memory, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers
      }:
      mkDerivation {
        pname = "bitcoin-compact-filters";
-       version = "0.1.0.0";
-       sha256 = "0ikirjf0n0np0l6mjfyfxvp367imbmb3g092m4mq457ja8yp7r8m";
+       version = "0.1.0.1";
+       sha256 = "1ifs7yi34x5nfhy0bs9w6arz7f6kwfxl0wgl6s0iwd1z94s5ysk1";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bitstream bytestring cereal haskoin-core memory text
-         transformers
+         base base16-bytestring bitstream bytestring cereal haskoin-core
+         memory text transformers
        ];
        testHaskellDepends = [
          aeson base bytestring cereal haskoin-core tasty tasty-hunit
          tasty-quickcheck text
        ];
        description = "BIP 158 compact block filters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42071,7 +42305,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cryptonite memory ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "Bitcoin hash primitives";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "bitcoin-hs" = callPackage
@@ -42094,8 +42328,8 @@ self: {
          random tasty tasty-hunit tasty-quickcheck time transformers
        ];
        description = "Partial implementation of the Bitcoin protocol (as of 2013)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42113,7 +42347,7 @@ self: {
          tasty-hunit
        ];
        description = "Bitcoin keys";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "bitcoin-payment-channel" = callPackage
@@ -42154,7 +42388,7 @@ self: {
        ];
        description = "Instant, two-party Bitcoin payments";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {blockchain-restful-address-index-api = null;};
 
@@ -42178,8 +42412,8 @@ self: {
          test-framework-quickcheck2 text unix unordered-containers watchdog
        ];
        description = "Library to communicate with the Satoshi Bitcoin daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42197,8 +42431,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42211,6 +42445,8 @@ self: {
        pname = "bitcoin-scripting";
        version = "0.1.0";
        sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707";
+       revision = "1";
+       editedCabalFile = "002i80rqigg3avydg9xhsa8ppyjw6a0r39hbimdghmv8db4wnpbl";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring cereal containers
          haskoin-core text transformers
@@ -42220,8 +42456,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Resources for working with miniscript, and script descriptors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42242,8 +42478,8 @@ self: {
          base bitcoin-script bytestring hexstring hspec
        ];
        description = "Utility functions for manipulating bitcoin transactions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42263,7 +42499,7 @@ self: {
          base base58string bytestring hexstring hspec
        ];
        description = "Provides consistent low-level types used commonly among Bitcoin implementations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bitcoind-regtest" = callPackage
@@ -42275,6 +42511,8 @@ self: {
        pname = "bitcoind-regtest";
        version = "0.2.0.0";
        sha256 = "06sk8kb3vjf7a2k7rhqpc7j1lbqd69xyhb25dc8bk7110m5l38cf";
+       revision = "1";
+       editedCabalFile = "15qqqvrx3ikbzvws2n5mywqlpsg8g437gsdj19cdfa6cc4bd8kqh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42290,8 +42528,8 @@ self: {
          servant-client tasty tasty-hunit temporary text
        ];
        description = "A library for working with bitcoin-core regtest networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42305,14 +42543,16 @@ self: {
        pname = "bitcoind-rpc";
        version = "0.2.0.0";
        sha256 = "0y5y5bdbhc1kcdk2nwjv2x5nz9vg5j38mc3l9pjyizz1s5yzn9rc";
+       revision = "1";
+       editedCabalFile = "0zg4ym032v3bzr24ap9afl05difcxgd4wwipbvfbjybka1dwwr97";
        libraryHaskellDepends = [
          aeson base base16-bytestring bitcoin-compact-filters bytestring
          cereal haskoin-core http-client scientific servant servant-client
          servant-jsonrpc-client text time transformers
        ];
        description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42328,8 +42568,8 @@ self: {
          base Bitly directory filepath regexpr
        ];
        description = "A command line tool to access bit.ly URL shortener.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42341,7 +42581,7 @@ self: {
        sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitmap-opengl" = callPackage
@@ -42352,7 +42592,7 @@ self: {
        sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv";
        libraryHaskellDepends = [ base bitmap OpenGL ];
        description = "OpenGL support for Data.Bitmap.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitmaps" = callPackage
@@ -42368,8 +42608,8 @@ self: {
          stb-image string-class tagged zlib
        ];
        description = "Bitmap library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42387,7 +42627,7 @@ self: {
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
        description = "Various bit twiddling and bitwise serialization primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-atomic" = callPackage
@@ -42400,8 +42640,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42417,7 +42657,7 @@ self: {
        testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Bits instance for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-bytestring-lazy" = callPackage
@@ -42434,7 +42674,7 @@ self: {
          base bits-bytestring bytestring criterion
        ];
        description = "Bits instance for lazy bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-conduit" = callPackage
@@ -42451,8 +42691,8 @@ self: {
          base bytestring conduit criterion random
        ];
        description = "Bitstream support for Conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42473,7 +42713,7 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
        description = "Useful bitwise operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-extras" = callPackage
@@ -42487,8 +42727,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcc_s = null;};
 
@@ -42511,8 +42751,8 @@ self: {
        ];
        benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp;};
 
@@ -42537,7 +42777,7 @@ self: {
          th-lift-instances vector
        ];
        description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bitspeak" = callPackage
@@ -42556,7 +42796,7 @@ self: {
        executablePkgconfigDepends = [ gtk2 pango ];
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
 
@@ -42575,7 +42815,7 @@ self: {
          base base-unicode-symbols bytestring QuickCheck vector
        ];
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "bitstring" = callPackage
@@ -42586,7 +42826,7 @@ self: {
        sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8";
        libraryHaskellDepends = [ base bytestring ];
        description = "Lazy bit strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bittorrent" = callPackage
@@ -42618,8 +42858,8 @@ self: {
          network QuickCheck quickcheck-instances text time
        ];
        description = "Bittorrent protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42640,7 +42880,7 @@ self: {
        ];
        executableHaskellDepends = [ base text turtle ];
        description = "Bindings for the Bittrex API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitvec" = callPackage
@@ -42664,7 +42904,7 @@ self: {
          base containers gauge integer-gmp random vector
        ];
        description = "Space-efficient bit vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
   "bitvec_1_1_0_0" = callPackage
@@ -42687,8 +42927,8 @@ self: {
          base containers gauge integer-gmp random vector
        ];
        description = "Space-efficient bit vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bitwise" = callPackage
@@ -42703,7 +42943,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitwise-enum" = callPackage
@@ -42713,8 +42953,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitwise-enum";
-       version = "1.0.0.2";
-       sha256 = "1y63qpxkh8k019vj2b1qz1jnssld5lik5cjhf6dzj2bal4013lii";
+       version = "1.0.0.3";
+       sha256 = "0ykrr8x1hc1lsj8cn19jcypvww4598g1v0vrn3z3b7n6hp6wfyis";
        libraryHaskellDepends = [
          aeson array base deepseq mono-traversable vector
        ];
@@ -42726,8 +42966,8 @@ self: {
          aeson array base deepseq gauge mono-traversable vector wide-word
        ];
        description = "Bitwise operations on bounded enumerations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42751,8 +42991,8 @@ self: {
          http-types microlens safe text time
        ];
        description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42768,8 +43008,8 @@ self: {
          base-noprelude containers directory regexpr text
        ];
        description = "A lousy Prelude replacement by a lousy dude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42781,8 +43021,8 @@ self: {
        sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij";
        libraryHaskellDepends = [ base containers text ];
        description = "A lousy Prelude replacement by a lousy dude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42794,7 +43034,7 @@ self: {
        sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4";
        libraryHaskellDepends = [ base containers ];
        description = "BK-tree implementation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "bkr" = callPackage
@@ -42817,8 +43057,8 @@ self: {
          http-conduit MissingH pureMD5 random strict text unix utf8-string
        ];
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42830,7 +43070,7 @@ self: {
        sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
        libraryHaskellDepends = [ array base containers ];
        description = "A set data structure with approximate searching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bla" = callPackage
@@ -42844,8 +43084,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 unix ];
        description = "a stupid cron";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42866,7 +43106,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "The pirate bay client";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "blacktip" = callPackage
@@ -42887,7 +43127,7 @@ self: {
          async base criterion network-info time
        ];
        description = "Decentralized, k-ordered unique ID generator";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "blake2" = callPackage
@@ -42905,7 +43145,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A library providing BLAKE2";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "blake3" = callPackage
@@ -42917,7 +43157,7 @@ self: {
        libraryHaskellDepends = [ base memory ];
        testHaskellDepends = [ base memory tasty tasty-hunit ];
        description = "BLAKE3 hashing algorithm";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "blakesum" = callPackage
@@ -42928,8 +43168,8 @@ self: {
        sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g";
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42947,8 +43187,8 @@ self: {
          base blakesum bytestring haskell98 text vector
        ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42963,8 +43203,8 @@ self: {
        pname = "blank-canvas";
        version = "0.7.3";
        sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2";
-       revision = "1";
-       editedCabalFile = "0ji3z1582rhflcdi49hd83mkwkyz432h1b1vvhyfgq9ccckmwp2p";
+       revision = "2";
+       editedCabalFile = "00nv87d38agrnqp1bhlk5id78r23k2fk7pqnar1lzg2wr39b1mvi";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat-batteries base64-bytestring bytestring
@@ -42973,7 +43213,7 @@ self: {
          wai wai-extra warp
        ];
        description = "HTML5 Canvas Graphics Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blanks" = callPackage
@@ -42992,7 +43232,7 @@ self: {
          tasty tasty-hunit text
        ];
        description = "Fill-in-the-blanks - A library factoring out substitution from ASTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blas" = callPackage
@@ -43003,8 +43243,8 @@ self: {
        sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli";
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        description = "Bindings to the BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43021,7 +43261,7 @@ self: {
          transformers
        ];
        description = "Auto-generated interface to Fortran BLAS via CArrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blas-comfort-array" = callPackage
@@ -43037,7 +43277,7 @@ self: {
          storable-complex transformers
        ];
        description = "Auto-generated interface to Fortran BLAS via comfort-array";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blas-ffi" = callPackage
@@ -43051,7 +43291,7 @@ self: {
        libraryHaskellDepends = [ base netlib-ffi ];
        libraryPkgconfigDepends = [ blas ];
        description = "Auto-generated interface to Fortran BLAS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) blas;};
 
   "blas-hs" = callPackage
@@ -43064,7 +43304,7 @@ self: {
        librarySystemDepends = [ blas ];
        testHaskellDepends = [ base vector ];
        description = "Low-level Haskell bindings to Blas";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -43078,7 +43318,7 @@ self: {
        ];
        description = "Library for reading Blast XML output";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43096,8 +43336,8 @@ self: {
          base blaze-html dates directory HaTeX process split tagsoup text
        ];
        description = "Blog in LaTeX";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43109,7 +43349,7 @@ self: {
        sha256 = "01n6cw3fjmlj5pmdy122ch4kbf6srvwlz356rr6nxfrm0ndcxp38";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-bootstrap" = callPackage
@@ -43120,7 +43360,7 @@ self: {
        sha256 = "0qsis1hwd8sqcciibxwy8p6irszwa2fy5m75qxp46ymfal5lrdak";
        libraryHaskellDepends = [ base blaze-html text ];
        description = "Blaze helper functions for bootstrap pages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "blaze-builder" = callPackage
@@ -43130,17 +43370,15 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-builder";
-       version = "0.4.1.0";
-       sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i";
-       revision = "1";
-       editedCabalFile = "1p66mh9z3aqgind755xzf39pvl2hwjnwrlwiwyj653yzb1gn6c9j";
+       version = "0.4.2.1";
+       sha256 = "01hbx82djckj2x74sk9kc79111djq7f2af3zl5i21y9zkjy8js3f";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text utf8-string
        ];
        description = "Efficient buffered output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-builder-conduit" = callPackage
@@ -43152,7 +43390,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Convert streams of builders to streams of bytestrings. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-builder-enumerator" = callPackage
@@ -43170,8 +43408,8 @@ self: {
          streaming-commons transformers
        ];
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43190,8 +43428,8 @@ self: {
        ];
        testHaskellDepends = [ base colonnade doctest ];
        description = "blaze-html backend for colonnade";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43207,7 +43445,7 @@ self: {
          base containers directory filepath tagsoup
        ];
        description = "Tool to convert HTML to BlazeHtml code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-html" = callPackage
@@ -43228,7 +43466,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-html-contrib" = callPackage
@@ -43243,8 +43481,8 @@ self: {
          base blaze-html cgi data-default network safe text
        ];
        description = "Some contributions to add handy things to blaze html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43256,8 +43494,8 @@ self: {
        sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg";
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        description = "A hexpat backend for blaze-html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43273,8 +43511,8 @@ self: {
          base blaze-markup bytestring html-truncate tagsoup text
        ];
        description = "A truncator for blaze-html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43296,8 +43534,8 @@ self: {
          text unordered-containers vector
        ];
        description = "tiny library for encoding json";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43315,7 +43553,7 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "A blazingly fast markup combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-shields" = callPackage
@@ -43328,7 +43566,7 @@ self: {
          base blaze-html blaze-markup blaze-svg text
        ];
        description = "create svg by Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-svg" = callPackage
@@ -43339,7 +43577,7 @@ self: {
        sha256 = "0q5a4wam0sidng0cfsivwkyph9snyilk7rsdx4vb6wz9l6xz397n";
        libraryHaskellDepends = [ base blaze-markup mtl ];
        description = "SVG combinator library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-textual" = callPackage
@@ -43360,7 +43598,7 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        description = "Fast rendering of common datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-textual-native" = callPackage
@@ -43376,8 +43614,8 @@ self: {
          time vector
        ];
        description = "Fast rendering of common datatypes (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43389,7 +43627,7 @@ self: {
        sha256 = "03gx3ylxz7xa86ngi33dm347ni6a4mcq4fizlx3majpfdk5fs38c";
        libraryHaskellDepends = [ base blaze-html blaze-markup ];
        description = "...";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "blazeT" = callPackage
@@ -43406,8 +43644,8 @@ self: {
          transformers
        ];
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43439,8 +43677,8 @@ self: {
          quickcheck-instances random text transformers uuid
        ];
        description = "Bluetooth Low Energy (BLE) peripherals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43456,7 +43694,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Password entry tool";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "blink1" = callPackage
@@ -43474,8 +43712,8 @@ self: {
          base bytestring text unix usb vector
        ];
        description = "Control library for blink(1) LED from ThingM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43494,8 +43732,8 @@ self: {
          old-time parseargs pretty
        ];
        description = "Python to bytecode compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43511,8 +43749,8 @@ self: {
          base binary bytestring containers mtl pretty utf8-string
        ];
        description = "Support code for Blip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43536,8 +43774,8 @@ self: {
          text time transformers unordered-containers
        ];
        description = "Generic blockchain implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43559,8 +43797,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Blockhash perceptual image hash algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43572,7 +43810,7 @@ self: {
        sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps";
        libraryHaskellDepends = [ base containers parallel ];
        description = "Composable, blocking transactions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blogination" = callPackage
@@ -43593,8 +43831,8 @@ self: {
        ];
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43623,8 +43861,8 @@ self: {
          unix-compat unordered-containers vector
        ];
        description = "Elasticsearch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43647,8 +43885,8 @@ self: {
          http-client-tls lens retry tasty tasty-hunit text time
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43666,7 +43904,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Pure and impure Bloom Filter implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bloomfilter-redis" = callPackage
@@ -43687,8 +43925,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43710,8 +43948,8 @@ self: {
          text
        ];
        description = "BLOSUM generator";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43727,7 +43965,7 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43745,8 +43983,8 @@ self: {
          base blubber-server bytestring cereal containers gloss network unix
        ];
        description = "The blubber client; connects to the blubber server";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43768,8 +44006,8 @@ self: {
          process random scotty text transformers unix
        ];
        description = "The blubber server, serves blubber clients";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43796,7 +44034,7 @@ self: {
          base data-default deepseq hspec mtl QuickCheck time
        ];
        description = "Configurable blue light filter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "bludigon" = callPackage
@@ -43822,7 +44060,7 @@ self: {
          base data-default deepseq hspec mtl QuickCheck time
        ];
        description = "Configurable blue light filter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "bluemix-sdk" = callPackage
@@ -43837,7 +44075,7 @@ self: {
          aeson base bytestring http-client http-types text vector
        ];
        description = "Bindings to Bluemix APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bluetile" = callPackage
@@ -43859,8 +44097,8 @@ self: {
        ];
        executablePkgconfigDepends = [ gtk2 ];
        description = "full-featured tiling for the GNOME desktop environment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2;};
 
@@ -43874,8 +44112,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gtk ];
        description = "Utilities for Bluetile";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43891,8 +44129,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43914,8 +44152,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Convert between pointfree and pointful expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43927,7 +44165,7 @@ self: {
        sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Read and write uncompressed BMP image files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bno055-haskell" = callPackage
@@ -43940,8 +44178,8 @@ self: {
          base bytestring cereal h2c mtl resourcet
        ];
        description = "Library for communication with the Bosch BNO055 orientation sensor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43993,7 +44231,7 @@ self: {
          transformers unix
        ];
        description = "Copy a directory tree, making zero-size sparse copies of big files";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "bogre-banana" = callPackage
@@ -44010,8 +44248,8 @@ self: {
          base hogre hois monad-control random reactive-banana
        ];
        executableHaskellDepends = [ base hogre hois random ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44040,8 +44278,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Generate Haskell boilerplate";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44065,8 +44303,8 @@ self: {
          unordered-containers vector
        ];
        description = "Bolt driver for Neo4j";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44092,8 +44330,8 @@ self: {
          aeson base bytestring containers directory filepath megaparsec text
        ];
        description = "Analytic sampler compiler for combinatorial systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44111,7 +44349,7 @@ self: {
          QuickCheck transformers unordered-containers vector
        ];
        description = "Uniform random generators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bond" = callPackage
@@ -44144,8 +44382,8 @@ self: {
          tasty-golden tasty-hunit tasty-quickcheck text unordered-containers
        ];
        description = "Bond schema compiler and code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44174,8 +44412,8 @@ self: {
          base bytestring criterion filepath vector
        ];
        description = "Runtime support for BOND serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44197,8 +44435,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Bond code generator for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44226,8 +44464,8 @@ self: {
          base criterion data-default-class type-level-sets
        ];
        description = "Anonymous records and overloaded labels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44239,8 +44477,8 @@ self: {
        sha256 = "1d3wzj4nh8f436wfqhdlhrpxhrrhqh97wrfyykm26bnngy4kdsk6";
        libraryHaskellDepends = [ base bookkeeper type-level-sets ];
        description = "Permissions for bookkeeper records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44257,7 +44495,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A module for bookkeeping by double entry";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bookkeeping-jp" = callPackage
@@ -44273,7 +44511,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Helper functions for Japanese bookkeeping";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bool-extras" = callPackage
@@ -44284,7 +44522,7 @@ self: {
        sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
        libraryHaskellDepends = [ base ];
        description = "A fold function for Bool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bool8" = callPackage
@@ -44295,7 +44533,7 @@ self: {
        sha256 = "0hrh3sh19hjdjjm5g1xwvhkf8l13qdrdrxvnylh8sn3d54krhixw";
        libraryHaskellDepends = [ base ];
        description = "Alternative Bool type stored as byte";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boolean-like" = callPackage
@@ -44310,7 +44548,7 @@ self: {
          attoparsec base bytestring containers semigroups text vector
        ];
        description = "Logical combinatory operations dealing with datatypes representing booleans by their constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boolean-list" = callPackage
@@ -44321,7 +44559,7 @@ self: {
        sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs";
        libraryHaskellDepends = [ base bytestring HUnit ];
        description = "convert numbers to binary coded lists";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "boolean-normal-forms" = callPackage
@@ -44337,8 +44575,8 @@ self: {
          base cond containers QuickCheck tasty tasty-quickcheck
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44358,8 +44596,8 @@ self: {
        testHaskellDepends = [ base ];
        testSystemDepends = [ boolector ];
        description = "Haskell bindings for the Boolector SMT solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) boolector;};
 
   "boolexpr" = callPackage
@@ -44370,8 +44608,8 @@ self: {
        sha256 = "14v894clplpcc1visqn337p7vmacj5hgx41vr60pwvflmv98d8xn";
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44383,7 +44621,7 @@ self: {
        sha256 = "0057303m23p81v60jcsc3p7n2rs2rzrvbg5m18pc0fk95q2q2rim";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boolsimplifier" = callPackage
@@ -44396,7 +44634,7 @@ self: {
        editedCabalFile = "0xqm0vn9i49b75fnvnvcnr9m4zwvhqynrkcjdxghrsxayg420lnh";
        libraryHaskellDepends = [ base containers ];
        description = "Simplification tools for simple propositional formulas";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boomange" = callPackage
@@ -44414,7 +44652,7 @@ self: {
          base containers descrilo directory filepath simtreelo
        ];
        description = "A bookmarks manager with an HTML generator";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "boombox" = callPackage
@@ -44429,8 +44667,8 @@ self: {
          base bytestring comonad semigroupoids semigroups transformers
        ];
        description = "Chronokinetic stream sources and incremental consumers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44444,7 +44682,7 @@ self: {
          base mtl semigroups template-haskell text
        ];
        description = "Library for invertible parsing and printing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boomslang" = callPackage
@@ -44463,8 +44701,8 @@ self: {
          font-opengl-basic4x6 GLFW-b MonadRandom mtl OpenGL
        ];
        description = "Boomshine clone";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44477,7 +44715,7 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base ];
        description = "OOP primitives for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boopadoop" = callPackage
@@ -44500,8 +44738,8 @@ self: {
          base bytestring containers primes semialign split vector WAVE
        ];
        description = "Mathematically sound sound synthesis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44514,7 +44752,7 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        testHaskellDepends = [ base exceptions hspec mtl ];
        description = "IoC Monad in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "boots-app" = callPackage
@@ -44538,8 +44776,8 @@ self: {
        ];
        executableHaskellDepends = [ base time ];
        description = "Factory for quickly building an application";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44557,8 +44795,8 @@ self: {
          servant servant-client text unordered-containers
        ];
        description = "Factory for quickly building a microservice";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44578,8 +44816,8 @@ self: {
          servant-swagger swagger2 text unordered-containers vault wai warp
        ];
        description = "Factory for quickly building a web application";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44591,7 +44829,7 @@ self: {
        sha256 = "19dm3l8v8ggllpgvq20avna6wph6i2w50aabxynvw4kw9m6c3c44";
        libraryHaskellDepends = [ base text ];
        description = "Bootstrap CSS Framework type-safe interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bordacount" = callPackage
@@ -44603,7 +44841,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Implementation of the Borda count election method";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "borel" = callPackage
@@ -44634,8 +44872,8 @@ self: {
          zeromq4-haskell
        ];
        description = "Metering System for OpenStack metrics provided by Vaultaire";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44656,7 +44894,7 @@ self: {
          vec
        ];
        description = "Boring and Absurd types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boring-game" = callPackage
@@ -44671,7 +44909,7 @@ self: {
        executableHaskellDepends = [ base gloss ];
        testHaskellDepends = [ base ];
        description = "An educational game";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boring-window-switcher" = callPackage
@@ -44685,8 +44923,8 @@ self: {
        libraryHaskellDepends = [ base gtk transformers X11 ];
        executableHaskellDepends = [ base ];
        description = "A boring window switcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44698,8 +44936,8 @@ self: {
        sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc";
        libraryHaskellDepends = [ arrows base Stream ];
        description = "bots for functional reactive programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44711,7 +44949,7 @@ self: {
        sha256 = "0kdqz901fpdgggmkm9rpnpv7gma9c8d887bszhnz6xd3v96gg7xn";
        libraryHaskellDepends = [ base semigroups zero ];
        description = "Like Maybe, but with a different Monoid instance";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "botpp" = callPackage
@@ -44725,7 +44963,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Build tool for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44751,7 +44989,7 @@ self: {
          transformers-compat vector void
        ];
        description = "Making de Bruijn Succ Less";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bound-extras" = callPackage
@@ -44773,7 +45011,7 @@ self: {
          transformers utf8-string
        ];
        description = "ScopeH and ScopeT extras for bound";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bound-gen" = callPackage
@@ -44784,7 +45022,7 @@ self: {
        sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp";
        libraryHaskellDepends = [ base bound monad-gen mtl ];
        description = "Unwrap Scope's with globally fresh values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bounded-array" = callPackage
@@ -44795,8 +45033,8 @@ self: {
        sha256 = "0zv5a82rm6hwikgls2hw9d18igvfgw655s5pw5h1xbwcv1d8d0ji";
        libraryHaskellDepends = [ array base ];
        description = "Arrays with a value for every index";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44809,7 +45047,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A strict, immutable, thread-safe, single-ended, bounded queue";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bounded-tchan" = callPackage
@@ -44820,7 +45058,7 @@ self: {
        sha256 = "12c78dz3y1ly05hckd9pf0j4fpknk383qyb5yrhps4sc2m3i9k9w";
        libraryHaskellDepends = [ base stm ];
        description = "Bounded Transactional channels (queues)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boundingboxes" = callPackage
@@ -44831,7 +45069,7 @@ self: {
        sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8";
        libraryHaskellDepends = [ base lens ];
        description = "A generic boundingbox for an arbitrary vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bower-json" = callPackage
@@ -44851,7 +45089,7 @@ self: {
          aeson base bytestring tasty tasty-hunit text unordered-containers
        ];
        description = "Read bower.json from Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bowntz" = callPackage
@@ -44866,8 +45104,8 @@ self: {
          base containers GLUT hosc hsc3 random
        ];
        description = "audio-visual pseudo-physical simulation of colliding circles";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44895,8 +45133,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "boxes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44913,8 +45151,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44938,8 +45176,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Box websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44951,7 +45189,7 @@ self: {
        sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "A hack to use GHC.Prim primitives in GHCi";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "boxes" = callPackage
@@ -44963,7 +45201,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bpann" = callPackage
@@ -44974,7 +45212,7 @@ self: {
        sha256 = "02c8xyzs4kz9cx7ql48kq5cxf686vvd5mqrprkikynif9r4dk7w8";
        libraryHaskellDepends = [ base random split ];
        description = "backpropagation neuronal network";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bpath" = callPackage
@@ -44991,7 +45229,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A minimal typed unix path library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "braid" = callPackage
@@ -45013,8 +45251,8 @@ self: {
          diagrams-svg split
        ];
        description = "Types and functions to work with braids and Khovanov homology";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45028,8 +45266,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers parsec ];
        description = "primitive imperative language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45055,7 +45293,7 @@ self: {
        sha256 = "1c1xg56dh0qbiy7jga436pmp8x8rhkkpf3gb54kqg8asajswdh0s";
        libraryHaskellDepends = [ base directory process ];
        description = "BrainFuck monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brainfuck-tut" = callPackage
@@ -45069,7 +45307,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
        description = "A simple BF interpreter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brainheck" = callPackage
@@ -45088,7 +45326,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Brainh*ck interpreter in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "break" = callPackage
@@ -45099,7 +45337,7 @@ self: {
        sha256 = "0wpj29a8lpimb0mjif4f6jmx6q9pkpkn5xplmkbjzkqgxi0bp23n";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Break from a loop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "breakout" = callPackage
@@ -45113,7 +45351,7 @@ self: {
        executableHaskellDepends = [ base haskgame mtl SDL ];
        description = "A simple Breakout game implementation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45137,8 +45375,8 @@ self: {
          warp-tls
        ];
        description = "a url shortener";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45152,8 +45390,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base parallel random SDL ];
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45180,7 +45418,7 @@ self: {
          base containers microlens QuickCheck vector
        ];
        description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brick-dropdownmenu" = callPackage
@@ -45198,8 +45436,8 @@ self: {
          pointedlist vector vty
        ];
        description = "A drop-down menu widget for brick";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45219,7 +45457,7 @@ self: {
          base brick comonad containers directory directory-tree filepath
          free vector vty
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brick-skylighting" = callPackage
@@ -45236,7 +45474,7 @@ self: {
          base brick containers skylighting-core text vty
        ];
        description = "Show syntax-highlighted text in your Brick UI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bricks" = callPackage
@@ -45259,8 +45497,8 @@ self: {
          parsec template-haskell text transformers
        ];
        description = "Bricks is a lazy functional language based on Nix";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45279,8 +45517,8 @@ self: {
          base containers doctest either-list-functions text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45296,8 +45534,8 @@ self: {
          base bricks-internal containers hedgehog template-haskell text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45318,8 +45556,8 @@ self: {
          bricks-syntax containers doctest hedgehog parsec text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45340,8 +45578,8 @@ self: {
          doctest hedgehog template-haskell text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45362,8 +45600,8 @@ self: {
          exceptions hint text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45384,8 +45622,8 @@ self: {
          base binary cmdargs containers directory filepath text
        ];
        description = "Simple part of speech tagger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45418,8 +45656,8 @@ self: {
          yaml
        ];
        description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.agpl3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.agpl3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "broadcast-chan" = callPackage
@@ -45435,7 +45673,7 @@ self: {
        libraryHaskellDepends = [ base transformers unliftio-core ];
        benchmarkHaskellDepends = [ async base criterion deepseq stm ];
        description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broadcast-chan-conduit" = callPackage
@@ -45455,7 +45693,7 @@ self: {
          base broadcast-chan-tests conduit containers
        ];
        description = "Conduit-based parallel streaming code for broadcast-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broadcast-chan-pipes" = callPackage
@@ -45473,7 +45711,7 @@ self: {
          base broadcast-chan-tests containers foldl pipes pipes-safe
        ];
        description = "Pipes-based parallel streaming code for broadcast-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broadcast-chan-tests" = callPackage
@@ -45497,7 +45735,7 @@ self: {
          base broadcast-chan containers foldl monad-loops random
        ];
        description = "Helpers for generating tests for broadcast-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broccoli" = callPackage
@@ -45508,8 +45746,8 @@ self: {
        sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh";
        libraryHaskellDepends = [ base containers stm time ];
        description = "Small library for interactive functional programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45537,8 +45775,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Finds broken links in text files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45552,8 +45790,8 @@ self: {
        librarySystemDepends = [ broker ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Haskell bindings to Broker, Bro's messaging library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {broker = null;};
 
@@ -45571,8 +45809,8 @@ self: {
          aeson base bytestring network-uri text time tz uuid-types
        ];
        description = "Common types and URIs for the BronyRadioGermany API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45593,8 +45831,8 @@ self: {
          time uuid
        ];
        description = "Streaming interface for the BronyRadioGermany API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45614,7 +45852,9 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Brotli (RFC7932) compression and decompression";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) brotli;};
 
   "brotli-conduit" = callPackage
@@ -45634,8 +45874,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Conduit interface for Brotli (RFC7932) compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45656,7 +45896,9 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "IO-Streams interface for Brotli (RFC7932) compression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "browscap" = callPackage
@@ -45672,8 +45914,8 @@ self: {
          unordered-containers wreq
        ];
        description = "A reader and interface for the Browser Capabilities Project data files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45697,7 +45939,7 @@ self: {
          base blaze-builder bytestring deepseq gauge semigroups
        ];
        description = "Chunked HTTP transfer encoding for bytestring builders";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bsd-sysctl" = callPackage
@@ -45708,8 +45950,8 @@ self: {
        sha256 = "0wflh3ncd47j2v70m6lbdmaif974fimv3dd4wyj6krb03vq6lvpd";
        libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45731,8 +45973,8 @@ self: {
          test-framework-quickcheck2 text time
        ];
        description = "BSON documents are JSON-like objects with a standard binary encoding";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45744,8 +45986,8 @@ self: {
        sha256 = "11a8k6rngz5rdgccwnifiydsfc87hlgy4mp6chi30m2jvdq92imb";
        libraryHaskellDepends = [ base bson ghc-prim text ];
        description = "Generic functionality for BSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45757,8 +45999,8 @@ self: {
        sha256 = "03ifgmifk0dx6fzws1qlx3c1nslrkvwman5g3c4iag842bl03gxp";
        libraryHaskellDepends = [ base bson ghc-prim ];
        description = "Generics functionality for BSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45770,8 +46012,8 @@ self: {
        sha256 = "0q5ixrfgybf80q0x2p80qjy1kqarm2129hmzzqgcpn7jvqbv8fyp";
        libraryHaskellDepends = [ base bson lens text ];
        description = "BSON lenses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45786,7 +46028,7 @@ self: {
        ];
        description = "Mapping between BSON and algebraic data types";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bspack" = callPackage
@@ -45805,7 +46047,7 @@ self: {
          base blaze-builder bytestring criterion sandi
        ];
        description = "A simple and fast bytestring packer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bsparse" = callPackage
@@ -45818,8 +46060,8 @@ self: {
        editedCabalFile = "0vlcwcgmlk4ghwhiyy4234driyvq5ap5g587nmf23fh8b54g7j3q";
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple unassuming parser for bytestring";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45839,8 +46081,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
        description = "B-Tree on Unmanaged Heap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45864,7 +46106,7 @@ self: {
        ];
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45878,7 +46120,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
        description = "Bindings to the btrfs API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "buchhaltung" = callPackage
@@ -45916,8 +46158,8 @@ self: {
          text time transformers unordered-containers vector yaml
        ];
        description = "Automates most of your plain text accounting data entry in ledger format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45939,8 +46181,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Simple mutable low-level buffer for IO";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45965,8 +46207,8 @@ self: {
          text vector
        ];
        description = "Library for efficiently building up buffers, one piece at a time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45995,8 +46237,8 @@ self: {
          aeson base buffer-builder bytestring criterion deepseq text vector
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46010,7 +46252,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Read from stdin and write to stdout in large blocks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "buffet" = callPackage
@@ -46039,8 +46281,8 @@ self: {
        ];
        doHaddock = false;
        description = "Assembles many Dockerfiles in one";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46057,8 +46299,8 @@ self: {
          transformers
        ];
        description = "An implementation of Buffon machines";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46072,7 +46314,7 @@ self: {
          base mtl multiset random template-haskell
        ];
        description = "Perfect simulation of discrete random variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bug" = callPackage
@@ -46083,7 +46325,7 @@ self: {
        sha256 = "1xfynvp5fyn46gg3p5qq9cmb1dnw2dyf3bz6w5wdvikfvs19dwhq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Better alternatives to the \"error\" function";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bugsnag-haskell" = callPackage
@@ -46108,8 +46350,8 @@ self: {
          aeson aeson-qq base doctest hspec text time unliftio yaml
        ];
        description = "Bugsnag error reporter for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46127,7 +46369,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hedgehog ];
        description = "A Bugsnag client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bugzilla" = callPackage
@@ -46147,8 +46389,8 @@ self: {
          time transformers unordered-containers vector
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46171,7 +46413,7 @@ self: {
          transformers unordered-containers vector
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "build" = callPackage
@@ -46188,8 +46430,8 @@ self: {
        ];
        testHaskellDepends = [ base containers extra mtl transformers ];
        description = "Build systems a la carte";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46201,8 +46443,8 @@ self: {
        sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx";
        libraryHaskellDepends = [ base bytestring containers dlist text ];
        description = "Typeclass for builders of linear data structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46219,8 +46461,8 @@ self: {
          process stm temporary text time
        ];
        description = "Rehackable components for writing buildbots and test harnesses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46234,8 +46476,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base buildbox parseargs ];
        description = "Tools for working with buildbox benchmark result files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46250,8 +46492,8 @@ self: {
          base byte-order primitive primitive-unaligned
        ];
        description = "bounded ByteArray builder type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46289,8 +46531,8 @@ self: {
          vector
        ];
        description = "A library and an executable that provide an easy API for a Haskell IDE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46304,8 +46546,8 @@ self: {
        libraryPkgconfigDepends = [ bullet ];
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the Bullet physics engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) bullet;};
 
@@ -46343,8 +46585,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Bulletproofs are short zero-knowledge proofs without a trusted setup";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46369,8 +46611,8 @@ self: {
          reflex-dom-helpers text time witherable
        ];
        description = "Reflex infused with bulma (css)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46390,8 +46632,8 @@ self: {
          base Cabal containers fclabels process regex-compat split strict
        ];
        description = "Automatically bump package versions, also transitively";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46407,8 +46649,8 @@ self: {
        executableHaskellDepends = [ base cmdargs text unix ];
        testHaskellDepends = [ base doctest hspec ];
        description = "CLI tool to beautify JSON string";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46426,8 +46668,8 @@ self: {
          aeson base bitcoin-script bytestring cassava process scientific
        ];
        description = "List OP_RETURN cryptocurrency transaction outputs";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46445,7 +46687,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec QuickCheck text ];
        description = "Parse and render URI templates";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "burst-detection" = callPackage
@@ -46458,8 +46700,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Burst detection algorithms";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46476,8 +46718,8 @@ self: {
          base bytestring errors serialport transformers
        ];
        description = "Haskell interface to the Bus Pirate binary interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46494,8 +46736,8 @@ self: {
          pretty time
        ];
        description = "Almost but not quite entirely unlike FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46512,8 +46754,8 @@ self: {
          parsec pretty time
        ];
        description = "Almost but not quite entirely unlike FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46530,8 +46772,8 @@ self: {
          network old-locale pretty time
        ];
        description = "Almost but not quite entirely unlike FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46564,7 +46806,7 @@ self: {
        testSystemDepends = [ libpcap ];
        testPkgconfigDepends = [ gio-unix ];
        description = "Draw sequence diagrams of D-Bus traffic";
-       license = stdenv.lib.licenses.lgpl21Plus;
+       license = lib.licenses.lgpl21Plus;
      }) {gio-unix = null; inherit (pkgs) libpcap; 
          system-glib = pkgs.glib;};
 
@@ -46586,7 +46828,7 @@ self: {
          multistate pretty transformers unsafe
        ];
        description = "Chops a command or program invocation into digestable pieces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "butter" = callPackage
@@ -46607,8 +46849,8 @@ self: {
          network-simple stm template-haskell text transformers
        ];
        description = "Monad Transformer for Asyncronous Message Passing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46630,8 +46872,8 @@ self: {
          base bytestring gl-capture GLUT OpenGLRaw repa repa-devil
        ];
        description = "butterfly tilings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46645,7 +46887,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Bit-vector arithmetic library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bv-embed" = callPackage
@@ -46656,7 +46898,7 @@ self: {
        sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79";
        libraryHaskellDepends = [ base ];
        description = "Define embeddings of small bit vectors into larger ones";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bv-little" = callPackage
@@ -46683,7 +46925,7 @@ self: {
          smallcheck
        ];
        description = "Efficient little-endian bit vector library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bv-sized" = callPackage
@@ -46701,8 +46943,8 @@ self: {
          base bytestring hedgehog parameterized-utils tasty tasty-hedgehog
        ];
        description = "a bitvector datatype that is parameterized by the vector width";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46726,8 +46968,8 @@ self: {
          optparse-applicative relude tasty tasty-hunit terminfo-hs text
        ];
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46739,8 +46981,8 @@ self: {
        sha256 = "0x4yh9li0pi2r9pjih000a143iw9kaz7r4z72510kv6kzkkcr9mn";
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46756,7 +46998,7 @@ self: {
          base extra hspec parsec parsec-numbers text
        ];
        description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
      }) {};
 
   "byte-order" = callPackage
@@ -46768,7 +47010,7 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unaligned ];
        testHaskellDepends = [ base primitive ];
        description = "Portable big-endian and little-endian conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "byteable" = callPackage
@@ -46780,7 +47022,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Type class for sequence of bytes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytearray-parsing" = callPackage
@@ -46791,8 +47033,8 @@ self: {
        sha256 = "1b1lz0y1a20v05bpa4xlxchc6k025gmm17hj3ysmv6j2i3k8micd";
        libraryHaskellDepends = [ base bytestring primitive text ];
        description = "Parsing of bytearray-based data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46823,8 +47065,8 @@ self: {
          base byteslice gauge natural-arithmetic primitive text-short
        ];
        description = "Serialize to a small byte arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46839,7 +47081,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Flexible byte dump helpers for human readers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytehash" = callPackage
@@ -46865,8 +47107,8 @@ self: {
          primitive-unlifted split unordered-containers
        ];
        description = "Universal hashing of bytes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46882,8 +47124,8 @@ self: {
          base bytebuild byteslice natural-arithmetic posix-api primitive
        ];
        description = "Fast logging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46895,7 +47137,7 @@ self: {
        sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
        libraryHaskellDepends = [ base ];
        description = "Exposes the native endianness or byte ordering of the system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytes" = callPackage
@@ -46908,8 +47150,8 @@ self: {
        pname = "bytes";
        version = "0.17";
        sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3";
-       revision = "2";
-       editedCabalFile = "1i49q0zdh1a1pnbhcrbla9l8xgays6gvq9bbx9k5iv469n4ppjbd";
+       revision = "4";
+       editedCabalFile = "0vxmahjxskyddq3gmr2b2ix5h33ywk6fmv17vqfbh8mhfbb26113";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary binary-orphans bytestring cereal containers hashable
@@ -46918,7 +47160,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Sharing code for serialization between binary and cereal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "byteset" = callPackage
@@ -46931,7 +47173,7 @@ self: {
        editedCabalFile = "1lgxxxrmw4g32pa861n6qbfpzwv14wfjrlp4hv5zd9hygy6v6q2p";
        libraryHaskellDepends = [ base binary ];
        description = "Set of bytes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "byteslice" = callPackage
@@ -46953,8 +47195,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge primitive ];
        description = "Slicing managed and unmanaged memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46979,8 +47221,8 @@ self: {
          base byteslice bytestring gauge primitive
        ];
        description = "Nonresumable byte parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46994,8 +47236,8 @@ self: {
        editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr";
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        description = "Fast, compact, strict and lazy byte strings with a list interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring-arbitrary" = callPackage
@@ -47012,8 +47254,8 @@ self: {
          base bytestring criterion cryptohash QuickCheck
        ];
        description = "Arbitrary instances for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47026,7 +47268,7 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        doHaddock = false;
        description = "The new bytestring builder, packaged outside of GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-builder-varword" = callPackage
@@ -47042,8 +47284,8 @@ self: {
          attoparsec attoparsec-varword base bytestring hspec QuickCheck
        ];
        description = "Variable-length integer encoding";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47057,8 +47299,8 @@ self: {
        editedCabalFile = "05q4ilixyd4zc15imh7x7gqwv4pmicyjj9zx5fhx1p1ps89jiap3";
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47083,7 +47325,7 @@ self: {
          base bytestring criterion text transformers
        ];
        description = "Type-classes to convert values to and from ByteString";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "bytestring-csv" = callPackage
@@ -47094,8 +47336,8 @@ self: {
        sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r";
        libraryHaskellDepends = [ array base bytestring dlist ];
        description = "Parse CSV formatted data efficiently";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47107,7 +47349,7 @@ self: {
        sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q";
        libraryHaskellDepends = [ base bytestring ];
        description = "Simple, fast binary diff/patch";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-encoding" = callPackage
@@ -47124,7 +47366,7 @@ self: {
          tasty-th text
        ];
        description = "ByteString ↔ Text converter based on GHC.IO.Encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-encodings" = callPackage
@@ -47138,7 +47380,7 @@ self: {
        testHaskellDepends = [ base bytestring hedgehog ];
        benchmarkHaskellDepends = [ base bytestring gauge text ];
        description = "checks to see if a given bytestring adheres to a certain encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-from" = callPackage
@@ -47157,7 +47399,7 @@ self: {
        ];
        description = "A type-class to convert values from ByteString";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring-handle" = callPackage
@@ -47176,7 +47418,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "ByteString-backed Handles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-lexing" = callPackage
@@ -47189,7 +47431,7 @@ self: {
        editedCabalFile = "0icnbv83h542vkmn51ykzc4w1g7nl4w6d6lj79909hnwr2g10616";
        libraryHaskellDepends = [ base bytestring ];
        description = "Parse and produce literals efficiently from strict or lazy bytestrings";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "bytestring-mmap" = callPackage
@@ -47200,7 +47442,7 @@ self: {
        sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "mmap support for strict ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-nums" = callPackage
@@ -47213,7 +47455,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Parse numeric literals from ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-plain" = callPackage
@@ -47228,8 +47470,8 @@ self: {
          base bytestring deepseq ghc-prim hashable
        ];
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47246,7 +47488,7 @@ self: {
          base bytestring terminal-progress-bar text time
        ];
        description = "A library for tracking the consumption of a lazy ByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-read" = callPackage
@@ -47269,8 +47511,8 @@ self: {
          text
        ];
        description = "fast ByteString to number converting library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47284,8 +47526,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit rematch ];
        doHaddock = false;
        description = "Rematch support for ByteString";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47298,7 +47540,7 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Backport copy of ShortByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-show" = callPackage
@@ -47315,8 +47557,8 @@ self: {
          array base binary bytestring containers integer-gmp
        ];
        description = "Efficient conversion of values into readable byte strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47340,7 +47582,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "An efficient strict bytestring builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-substring" = callPackage
@@ -47351,8 +47593,8 @@ self: {
        sha256 = "1vn1r8m0ldydnrazyckkn4lpv3g5ns37j91a5649jnrprjpy08dn";
        libraryHaskellDepends = [ base bytestring pipes primitive ];
        description = "break bytestrings up into substrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47369,8 +47611,8 @@ self: {
          attoparsec base bytestring Cabal hspec QuickCheck text time
        ];
        description = "Library for Time parsing from ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47385,7 +47627,7 @@ self: {
          base byteorder bytestring QuickCheck vector
        ];
        description = "Convert between ByteString and Vector.Storable without copying";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-tree-builder" = callPackage
@@ -47406,7 +47648,7 @@ self: {
          base-prelude bytestring criterion deepseq
        ];
        description = "A very efficient ByteString builder implementation based on the binary tree";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-trie" = callPackage
@@ -47419,8 +47661,8 @@ self: {
        editedCabalFile = "1qpv52ywp8r30s3m9qyjiqiwa6clg3zp095yhs2d4533amprryly";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "An efficient finite map from (byte)strings to values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47439,8 +47681,8 @@ self: {
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        description = "Bytestrings with typenat lengths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47452,8 +47694,8 @@ self: {
        sha256 = "1g99vbp14ki563lb41y1fxlgvdmrmq1y0xsk0ia1m438rdpnh2qd";
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47465,8 +47707,8 @@ self: {
        sha256 = "019axq65hmgmszkc1lyyyy8rpv5xkjbf1pmgz1bz0hnc8lgv58pd";
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47478,8 +47720,8 @@ self: {
        sha256 = "07hx3072zg9y3kj6h99yl8fd3n115x4z8z411c1cpx1hj292d57f";
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47492,7 +47734,7 @@ self: {
        libraryHaskellDepends = [ base safe ];
        testHaskellDepends = [ base Cabal HUnit QuickCheck ];
        description = "Human friendly conversion between byte units (KB, MB, GB...)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bz2" = callPackage
@@ -47516,7 +47758,7 @@ self: {
        ];
        benchmarkToolDepends = [ cpphs ];
        description = "Bindings to libbz2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bzip-signature" = callPackage
@@ -47529,7 +47771,7 @@ self: {
          base bytestring composition-prelude lens
        ];
        description = "Backpack signature for BZip compression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bzlib" = callPackage
@@ -47541,7 +47783,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
@@ -47567,7 +47809,7 @@ self: {
          resourcet
        ];
        description = "Streaming compression/decompression via conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
@@ -47578,8 +47820,8 @@ self: {
        sha256 = "04hj3d26rp7ibv15n48y4xkfld3nnh6dqn8shxvw1h546z1316pw";
        libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47591,8 +47833,8 @@ self: {
        sha256 = "1za4wcrjrxqk8yqy1bddzxw8xxx0vlxyy31dj1glb5azx6qh7qp2";
        libraryHaskellDepends = [ base ];
        description = "C IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47613,8 +47855,8 @@ self: {
        executableHaskellDepends = [ base options ];
        testHaskellDepends = [ base ];
        description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mosquitto;};
 
@@ -47627,7 +47869,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "CStorable class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "c-storable-deriving" = callPackage
@@ -47638,7 +47880,7 @@ self: {
        sha256 = "0zx6r7sfaxl4k2s2b213vm12fskcssy01b828i8rqxixwfjjshv8";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generate C-like storable instances from datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "c0check" = callPackage
@@ -47652,7 +47894,7 @@ self: {
        executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47665,7 +47907,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47677,8 +47919,8 @@ self: {
        sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9";
        libraryHaskellDepends = [ base network unix ];
        description = "C10k server library using prefork";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47692,7 +47934,7 @@ self: {
        librarySystemDepends = [ libxml2 ];
        libraryPkgconfigDepends = [ libxml2 ];
        description = "Bindings to the c14n implementation in libxml";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libxml2;};
 
   "c2ats" = callPackage
@@ -47714,8 +47956,8 @@ self: {
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        description = "Translate C code into ATS";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47740,7 +47982,7 @@ self: {
          transformers
        ];
        description = "C->Haskell FFI tool that gives some cross-language type safety";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "c2hs-extra" = callPackage
@@ -47752,7 +47994,7 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
        description = "Convenient marshallers for complicate C types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "c2hsc" = callPackage
@@ -47777,7 +48019,7 @@ self: {
        ];
        testHaskellDepends = [ base here hspec logging monad-logger text ];
        description = "Convert C API header files to .hsc and .hsc.helper.c files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ca" = callPackage
@@ -47790,7 +48032,7 @@ self: {
        editedCabalFile = "1s7qxji4a44qrsmfajrpzjfg06aksxxf41b5y8bgrc93m2iyn4xw";
        libraryHaskellDepends = [ alg base ];
        description = "Cellular Automata";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ca-province-codes" = callPackage
@@ -47802,7 +48044,7 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
        description = "ISO 3166-2:CA Province Codes and Names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cab" = callPackage
@@ -47825,8 +48067,8 @@ self: {
          directory filepath process
        ];
        description = "A maintenance command of Haskell cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47841,8 +48083,8 @@ self: {
        libraryHaskellDepends = [ base youProbablyWantCapitalCabal ];
        doHaddock = false;
        description = "placeholder for Cabal package, you want the upper case Cabal";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {youProbablyWantCapitalCabal = null;};
 
@@ -47854,8 +48096,8 @@ self: {
        sha256 = "0m3xq3k4s6rn90vd2sp115jyb722vi9wgih3lz05fnc2bypyg6zi";
        libraryHaskellDepends = [ base Cabal filepath ];
        description = "Cabal support for creating AppImage applications";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47873,8 +48115,8 @@ self: {
          base Cabal directory filepath HTTP optparse-applicative
        ];
        description = "Check how up-to-date your .cabal dependencies are.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47886,7 +48128,7 @@ self: {
        sha256 = "16hhvsqdj91pgzlgmwpba8ajjp2jssyf71rw9pwrixshj6826ps2";
        libraryHaskellDepends = [ base Cabal directory extra filepath ];
        description = "Build time library that autodetects exposed modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cabal-bounds" = callPackage
@@ -47910,8 +48152,8 @@ self: {
          base directory filepath Glob process tasty tasty-golden
        ];
        description = "A command line program for managing the dependency versions in a cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47923,7 +48165,7 @@ self: {
        sha256 = "004xr0f59fg6h6rxlf7sf6m2mi6p32h2z3vs9b56hddmxp3gn4vl";
        libraryHaskellDepends = [ base Cabal ];
        description = "Adds executable dependencies to the Cabal build";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-bundle-clib" = callPackage
@@ -47939,8 +48181,8 @@ self: {
          time
        ];
        description = "Bundling C/C++ projects in Cabal package made easy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47976,8 +48218,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "CI Assistant for Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48000,8 +48242,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48015,8 +48257,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Repeatable builds for cabalized Haskell projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48036,8 +48278,8 @@ self: {
          mtl optparse-applicative pretty process tar utf8-string
        ];
        description = "query tools for the local cabal database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48062,7 +48304,7 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
        description = "Create a Debianization for a Cabal package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -48077,8 +48319,8 @@ self: {
          base Cabal containers directory filepath
        ];
        description = "Compose a list of a project's transitive dependencies with their licenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48101,8 +48343,8 @@ self: {
        ];
        executableToolDepends = [ cabal-install ];
        description = "Manage sandboxed Haskell build environments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48116,8 +48358,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48131,7 +48373,7 @@ self: {
        editedCabalFile = "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A Setup.hs helper for doctests running";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-edit" = callPackage
@@ -48152,7 +48394,7 @@ self: {
          optparse-applicative process store time
        ];
        description = "Cabal utility";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cabal-file" = callPackage
@@ -48175,7 +48417,7 @@ self: {
          simple-cabal simple-cmd simple-cmd-args
        ];
        description = "Cabal file access";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-file-th" = callPackage
@@ -48190,8 +48432,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "Template Haskell expressions for reading fields from a project's cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48216,7 +48458,7 @@ self: {
          zlib
        ];
        description = "Generate a FlatPak manifest from a Cabal package description";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-fmt" = callPackage
@@ -48244,7 +48486,7 @@ self: {
        doHaddock = false;
        description = "Format .cabal files";
        license = "GPL-3.0-or-later AND BSD-3-Clause";
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "cabal-ghc-dynflags" = callPackage
@@ -48255,8 +48497,8 @@ self: {
        sha256 = "13kxlmz5w0aazafrlignd55zclwl9sb213jry4vhfibgjrg18w8f";
        libraryHaskellDepends = [ base Cabal ghc transformers ];
        description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48273,8 +48515,8 @@ self: {
          base Cabal directory filepath process
        ];
        description = "Set up ghci with options taken from a .cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48292,8 +48534,8 @@ self: {
          base containers directory options parsec process split temporary
        ];
        description = "Generate graphs of install-time Cabal dependencies";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48324,7 +48566,7 @@ self: {
        ];
        doCheck = false;
        description = "Give Haskell development tools access to Cabal project environment";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cabal-info" = callPackage
@@ -48344,8 +48586,8 @@ self: {
          base Cabal filepath optparse-applicative
        ];
        description = "Read information from cabal files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48377,8 +48619,8 @@ self: {
          mv bash-completion $out/share/bash-completion/completions
        '';
        description = "The command-line interface for Cabal and Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install-bundle" = callPackage
@@ -48397,8 +48639,8 @@ self: {
        ];
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -48418,8 +48660,8 @@ self: {
          old-time pretty process random time unix zlib
        ];
        description = "Temporary version of cabal-install for ghc-7.2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48439,8 +48681,8 @@ self: {
          old-time pretty process random time unix zlib
        ];
        description = "Temporary version of cabal-install for ghc-7.4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48470,7 +48712,7 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48487,8 +48729,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Lenses and traversals for the Cabal library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48515,7 +48757,7 @@ self: {
          test-framework test-framework-hunit text
        ];
        description = "Cabal support for creating Mac OSX application bundles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-meta" = callPackage
@@ -48536,8 +48778,8 @@ self: {
          base hspec shelly system-filepath text unix
        ];
        description = "build multiple packages at once";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48555,8 +48797,8 @@ self: {
          base containers directory filepath process simple-get-opt vty
        ];
        description = "A monitor for cabal builds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48574,8 +48816,8 @@ self: {
          base bytestring containers directory HTTP process tar
        ];
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48603,7 +48845,7 @@ self: {
          semialign singleton-bool text these topograph transformers vector
        ];
        description = "Library and utility for processing cabal's plan.json file";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "cabal-progdeps" = callPackage
@@ -48616,8 +48858,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Show dependencies of program being built in current directory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48634,8 +48876,8 @@ self: {
          uniplate
        ];
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48657,7 +48899,7 @@ self: {
          simple-cabal simple-cmd simple-cmd-args time unix
        ];
        description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -48670,7 +48912,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of Cabal maintenance";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-setup" = callPackage
@@ -48683,8 +48925,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
        description = "The user interface for building and installing Cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48702,7 +48944,7 @@ self: {
          base bytestring cereal directory filepath process tar zlib
        ];
        description = "Sign and verify Cabal packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-sort" = callPackage
@@ -48721,8 +48963,8 @@ self: {
          filepath process transformers utility-ht
        ];
        description = "Topologically sort cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48744,8 +48986,8 @@ self: {
          system-fileio system-filepath tar text transformers
        ];
        description = "Alternative install procedure to avoid the diamond dependency issue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48761,8 +49003,8 @@ self: {
          base Cabal filepath ghc pqc QuickCheck
        ];
        description = "Automated test tool for cabal projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48780,7 +49022,7 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        testHaskellDepends = [ base hspec process regex-posix ];
        description = "A program for finding temporary build file during cabal-test";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-test-compat" = callPackage
@@ -48791,7 +49033,7 @@ self: {
        sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        description = "Compatibility interface of cabal test-suite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-test-quickcheck" = callPackage
@@ -48804,8 +49046,8 @@ self: {
        editedCabalFile = "1q0zs98z8wvr0gzy27ff688fpsgwxjypwjsyzs8v2v6gqd49iwri";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        description = "QuickCheck for Cabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48821,7 +49063,7 @@ self: {
          base binary bytestring Cabal containers ghc template-haskell
        ];
        description = "Helper functions for writing custom Setup.hs scripts.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -48834,7 +49076,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath mtl process ];
        description = "Uninstall cabal packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-upload" = callPackage
@@ -48847,8 +49089,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath HTTP network ];
        description = "Command-line tool for uploading packages to Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48868,8 +49110,8 @@ self: {
          filepath mtl pretty process
        ];
        description = "Create Arch Linux packages from Cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48885,8 +49127,8 @@ self: {
          base Cabal hsemail hxt parsec process
        ];
        description = "Cabal to Description-of-a-Project (DOAP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48901,8 +49143,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ base curl directory ];
        description = "make gentoo's .ebuild file from .cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48921,8 +49163,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "A tool to generate .ghci file from .cabal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48935,8 +49177,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.15.6";
-       sha256 = "0jkdy36qpi7b7a14dg0iqgn4k3cia8wj1yi8pg82v430rspnkfdb";
+       version = "2.16.0";
+       sha256 = "0kxxn218r1r9fia72zv8xzb8yji5y2jbwzqz033ljvwbm3abxp2k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48959,8 +49201,8 @@ self: {
          export HOME="$TMPDIR/home"
        '';
        description = "Convert Cabal files into Nix build instructions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "cabal2spec" = callPackage
@@ -48981,8 +49223,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
        description = "Convert Cabal files into rpm spec files";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "cabalQuery" = callPackage
@@ -49000,8 +49242,8 @@ self: {
          base Cabal containers directory MissingH
        ];
        description = "A simple tool to query cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49017,7 +49259,7 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        testHaskellDepends = [ base directory doctest filepath process ];
        description = "alias for cabal install from given git repo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cabalgraph" = callPackage
@@ -49036,8 +49278,8 @@ self: {
          base bytestring Cabal containers directory filepath pretty process
        ];
        description = "Generate pretty graphs of module trees from cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49056,8 +49298,8 @@ self: {
          text
        ];
        description = "Provides access to the cabal file data for shell scripts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49073,7 +49315,7 @@ self: {
        executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49089,7 +49331,7 @@ self: {
        executableHaskellDepends = [ base Cabal filepath haskell98 ];
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49103,8 +49345,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49123,8 +49365,8 @@ self: {
          process unix
        ];
        description = "Cabal binary sandboxes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49137,8 +49379,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cabocha = null;};
 
@@ -49155,7 +49397,7 @@ self: {
        ];
        testHaskellDepends = [ base clock hspec stm transformers ];
        description = "An in-memory key/value store with expiration support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cache-polysemy" = callPackage
@@ -49173,8 +49415,8 @@ self: {
          base cache clock hashable polysemy polysemy-plugin
        ];
        description = "cached hashmaps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49192,8 +49434,8 @@ self: {
          quickcheck-assertions shake text
        ];
        description = "Cache values to disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49208,7 +49450,7 @@ self: {
        libraryHaskellDepends = [ base stm time transformers ];
        executableHaskellDepends = [ base ];
        description = "A simple library to cache a single IO action with timeout";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cached-traversable" = callPackage
@@ -49223,7 +49465,7 @@ self: {
          base binary bytestring containers directory filepath mtl
        ];
        description = "Transparent, persistent caching of lazy, traversable structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "caching" = callPackage
@@ -49241,38 +49483,56 @@ self: {
          base dlist hashable mtl psqueues ref-tf transformers
        ];
        description = "Cache combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "caching-vault" = callPackage
+    ({ mkDerivation, base, hspec, stm, stm-containers, text, time
+     , timespan
+     }:
+     mkDerivation {
+       pname = "caching-vault";
+       version = "0.1.0.0";
+       sha256 = "1wqk7gfkpsry21d0qn6qjjrr7n6cj3raddx76nmhgy5xn8q36vbr";
+       libraryHaskellDepends = [ base stm stm-containers text time ];
+       testHaskellDepends = [
+         base hspec stm stm-containers text time timespan
+       ];
+       description = "A vault-style cache implementation";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "cachix" = callPackage
     ({ mkDerivation, async, base, base64-bytestring, boost, bytestring
-     , cachix-api, conduit, conduit-extra, containers, cookie
-     , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here
-     , hspec, hspec-discover, http-client, http-client-tls, http-conduit
-     , http-types, inline-c, inline-c-cpp, lzma-conduit, megaparsec
-     , memory, mmorph, netrc, nix, optparse-applicative, process
-     , protolude, resourcet, retry, safe-exceptions, servant
+     , cachix-api, concurrent-extra, conduit, conduit-extra, containers
+     , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
+     , here, hspec, hspec-discover, http-client, http-client-tls
+     , http-conduit, http-types, inline-c, inline-c-cpp, lzma-conduit
+     , megaparsec, memory, mmorph, netrc, nix, optparse-applicative
+     , process, protolude, resourcet, retry, safe-exceptions, servant
      , servant-auth, servant-auth-client, servant-client
-     , servant-client-core, servant-conduit, temporary, text, unix
+     , servant-client-core, servant-conduit, stm, temporary, text, unix
      , uri-bytestring, vector, versions
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.5.1";
-       sha256 = "13xl87jgpa1swgppr86dylp8ndisasdr8zcmk1l2jjb7vgyly8mb";
+       version = "0.6.0";
+       sha256 = "1ay3k2npnplvgc44vn3zcyd5rgyfigvij4zil3nwrpdi0psd76nl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base base64-bytestring bytestring cachix-api conduit
-         conduit-extra containers cookie cryptonite dhall directory ed25519
-         filepath fsnotify here http-client http-client-tls http-conduit
-         http-types inline-c inline-c-cpp lzma-conduit megaparsec memory
-         mmorph netrc optparse-applicative process protolude resourcet retry
-         safe-exceptions servant servant-auth servant-auth-client
-         servant-client servant-client-core servant-conduit text unix
-         uri-bytestring vector versions
+         async base base64-bytestring bytestring cachix-api concurrent-extra
+         conduit conduit-extra containers cookie cryptonite dhall directory
+         ed25519 filepath fsnotify here http-client http-client-tls
+         http-conduit http-types inline-c inline-c-cpp lzma-conduit
+         megaparsec memory mmorph netrc optparse-applicative process
+         protolude resourcet retry safe-exceptions servant servant-auth
+         servant-auth-client servant-client servant-client-core
+         servant-conduit stm text unix uri-bytestring vector versions
        ];
        librarySystemDepends = [ boost ];
        libraryPkgconfigDepends = [ nix ];
@@ -49283,7 +49543,7 @@ self: {
          temporary
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "cachix-api" = callPackage
@@ -49291,31 +49551,30 @@ self: {
      , conduit, cookie, cryptonite, deepseq, exceptions, hspec
      , hspec-discover, http-api-data, http-media, jose, lens, memory
      , nix-narinfo, protolude, resourcet, servant, servant-auth
-     , servant-auth-server, servant-auth-swagger, servant-client
-     , servant-swagger, servant-swagger-ui-core, string-conv, swagger2
-     , text, time, transformers
+     , servant-auth-swagger, servant-client, servant-swagger
+     , servant-swagger-ui-core, string-conv, swagger2, text, time
+     , transformers
      }:
      mkDerivation {
        pname = "cachix-api";
-       version = "0.5.0";
-       sha256 = "14b4vg6wv7kzxkfbh64ml2wvm9w8fyv2k2sm7ncaa0pp0f26pswy";
+       version = "0.6.0";
+       sha256 = "0q6kl5lb05c1m62yqj0d8vimlghhrc3avl3bz5wjp70azs28jcd3";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring conduit cookie cryptonite
          deepseq exceptions http-api-data http-media jose lens memory
          nix-narinfo protolude resourcet servant servant-auth
-         servant-auth-server servant-client string-conv swagger2 text time
+         servant-auth-swagger servant-client string-conv swagger2 text time
          transformers
        ];
        testHaskellDepends = [
          aeson base base16-bytestring bytestring conduit cookie cryptonite
          hspec http-api-data http-media lens memory protolude servant
-         servant-auth servant-auth-server servant-auth-swagger
-         servant-swagger servant-swagger-ui-core string-conv swagger2 text
-         transformers
+         servant-auth servant-auth-swagger servant-swagger
+         servant-swagger-ui-core string-conv swagger2 text transformers
        ];
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cacophony" = callPackage
@@ -49342,8 +49601,8 @@ self: {
          async base base16-bytestring bytestring criterion deepseq
        ];
        description = "A library implementing the Noise protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49360,7 +49619,7 @@ self: {
          base binary bytestring hspec QuickCheck random
        ];
        description = "That rabbit's got a vicious streak a mile wide!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "caf" = callPackage
@@ -49371,7 +49630,7 @@ self: {
        sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8";
        libraryHaskellDepends = [ base ];
        description = "A library of Concurrency Abstractions using Futures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cafeteria-prelude" = callPackage
@@ -49382,8 +49641,8 @@ self: {
        sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl";
        libraryHaskellDepends = [ base ];
        description = "Prelude subsets—take only what you want!";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49402,8 +49661,8 @@ self: {
          mtl optparse-applicative process protocol-buffers
          protocol-buffers-descriptor template-haskell temporary text
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49422,7 +49681,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ cairo ];
        description = "Binding to the Cairo library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) cairo;};
 
   "cairo-appbase" = callPackage
@@ -49436,7 +49695,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cairo-canvas" = callPackage
@@ -49449,7 +49708,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random time ];
        description = "Simpler drawing API for Cairo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cairo-core" = callPackage
@@ -49469,8 +49728,8 @@ self: {
        libraryPkgconfigDepends = [ cairo ];
        libraryToolDepends = [ c2hs ];
        description = "Cairo Haskell binding (partial)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) cairo;};
 
@@ -49494,7 +49753,7 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49524,8 +49783,8 @@ self: {
          transformers utf8-string
        ];
        description = "Third cake the Makefile EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49543,8 +49802,8 @@ self: {
          base GLUT gluturtle lojbanParser yjsvg yjtools
        ];
        description = "run turtle like LOGO with lojban";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49559,8 +49818,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
        description = "Calendar Layout Algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49574,7 +49833,7 @@ self: {
        librarySystemDepends = [ cal3d ];
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cal3d = null;};
 
@@ -49590,7 +49849,7 @@ self: {
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        description = "Examples for the Cal3d animation library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49603,38 +49862,39 @@ self: {
        libraryHaskellDepends = [ base cal3d OpenGL ];
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "calamity" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, colour
-     , concurrent-extra, containers, data-default-class, data-flags
-     , deepseq, deque, df1, di-core, di-polysemy, exceptions, fmt, focus
-     , generic-lens, generic-override, generic-override-aeson, hashable
-     , http-date, http-types, lens, lens-aeson, megaparsec, mime-types
-     , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions
+     , concurrent-extra, connection, containers, data-default-class
+     , data-flags, deepseq, deque, df1, di-core, di-polysemy, exceptions
+     , fmt, focus, generic-lens, generic-override
+     , generic-override-aeson, hashable, http-client, http-date
+     , http-types, lens, lens-aeson, megaparsec, mime-types, mtl
+     , polysemy, polysemy-plugin, reflection, req, safe-exceptions
      , scientific, stm, stm-chans, stm-containers, text, text-show, time
-     , typerep-map, unagi-chan, unboxing-vector, unordered-containers
-     , vector, websockets, wreq, wuss
+     , tls, typerep-map, unagi-chan, unboxing-vector
+     , unordered-containers, vector, websockets, x509-system
      }:
      mkDerivation {
        pname = "calamity";
-       version = "0.1.23.1";
-       sha256 = "162vjlzd2w98c5w8smjy6y7sywa7dfmv780g6ij4spzn1611l2z5";
-       libraryHaskellDepends = [
-         aeson async base bytestring colour concurrent-extra containers
-         data-default-class data-flags deepseq deque df1 di-core di-polysemy
-         exceptions fmt focus generic-lens generic-override
-         generic-override-aeson hashable http-date http-types lens
-         lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
-         reflection safe-exceptions scientific stm stm-chans stm-containers
-         text text-show time typerep-map unagi-chan unboxing-vector
-         unordered-containers vector websockets wreq wuss
+       version = "0.1.24.1";
+       sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2";
+       libraryHaskellDepends = [
+         aeson async base bytestring colour concurrent-extra connection
+         containers data-default-class data-flags deepseq deque df1 di-core
+         di-polysemy exceptions fmt focus generic-lens generic-override
+         generic-override-aeson hashable http-client http-date http-types
+         lens lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
+         reflection req safe-exceptions scientific stm stm-chans
+         stm-containers text text-show time tls typerep-map unagi-chan
+         unboxing-vector unordered-containers vector websockets x509-system
        ];
        description = "A library for writing discord bots in haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49648,8 +49908,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49671,8 +49931,8 @@ self: {
          base containers gtk parsec plot-gtk-ui QuickCheck
        ];
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49694,7 +49954,7 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49712,8 +49972,8 @@ self: {
          base containers cpphs lens mtl parsec transformers
        ];
        description = "a logic programming language based on the calculus of constructions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49729,7 +49989,7 @@ self: {
          base containers html old-time utility-ht
        ];
        description = "List years with the same calendars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "calenderweek" = callPackage
@@ -49744,8 +50004,8 @@ self: {
          base megaparsec optparse-generic text time
        ];
        description = "Commandline tool to get week of the year";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49771,8 +50031,8 @@ self: {
          WAVE
        ];
        description = "The call game engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49794,8 +50054,8 @@ self: {
          hspec lens mtl process split trifecta unix
        ];
        description = "A simple library to call Alloy given a specification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49814,8 +50074,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring data-msgpack mtl ];
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49828,7 +50088,20 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base nanospec ];
        description = "Use GHC call-stacks in a backward compatible way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+     }) {};
+
+  "call-stack_0_3_0" = callPackage
+    ({ mkDerivation, base, nanospec }:
+     mkDerivation {
+       pname = "call-stack";
+       version = "0.3.0";
+       sha256 = "0ski7ihdxah7x4x07qgkjljg8hzqs9d6aa5k4cmr40bzp3i8s3mq";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base nanospec ];
+       description = "Use GHC call-stacks in a backward compatible way";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "camfort" = callPackage
@@ -49865,8 +50138,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "CamFort - Cambridge Fortran infrastructure";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) flint;};
 
@@ -49881,7 +50154,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring Imlib terminfo ];
        description = "write image files onto 256(or 24bit) color terminals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "campfire" = callPackage
@@ -49899,8 +50172,8 @@ self: {
          transformers unordered-containers url
        ];
        description = "Haskell implementation of the Campfire API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49913,7 +50186,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base deepseq hspec HUnit mtl ];
        description = "Generic implementation of the Has and CoHas patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "candid" = callPackage
@@ -49945,8 +50218,8 @@ self: {
          tasty-smallcheck template-haskell text unordered-containers vector
        ];
        description = "Candid integration";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49958,8 +50231,8 @@ self: {
        sha256 = "1srixf1m7pzgr16y2xfckhi0xk9js68ps9zw8kvnw01c37x85f48";
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49971,8 +50244,8 @@ self: {
        sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf";
        libraryHaskellDepends = [ base deepseq directory filepath ];
        description = "Abstract data type for canonical file paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49996,8 +50269,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring containers criterion ];
        description = "Canonical JSON for signing and hashing JSON values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50009,7 +50282,7 @@ self: {
        sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559";
        libraryHaskellDepends = [ base unix yaml ];
        description = "A pattern for configuring programs";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "canteven-http" = callPackage
@@ -50028,8 +50301,8 @@ self: {
          transformers unix uuid wai wai-extra
        ];
        description = "Utilities for HTTP programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50041,8 +50314,8 @@ self: {
        sha256 = "1vcax1ipkd8s44pasr8qdrgjav4n2jnxd2qwamrl7kf6lm1i8n18";
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50060,8 +50333,8 @@ self: {
          template-haskell text time transformers yaml
        ];
        description = "A canteven way of setting up logging for your program";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50077,8 +50350,8 @@ self: {
          base Cabal old-locale time timezone-series tz
        ];
        description = "Date / time parsing utilities that try to guess the date / time format";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50095,7 +50368,7 @@ self: {
          text
        ];
        description = "A few utilites and helpers for using Template Haskell in your projects";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cantor" = callPackage
@@ -50117,8 +50390,8 @@ self: {
          hxt-xpath parsec QuickCheck split
        ];
        description = "Application for analysis of java source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50136,7 +50409,7 @@ self: {
        testHaskellDepends = [ base containers hspec mtl ];
        testToolDepends = [ hspec-discover ];
        description = "Convert data to and from a natural number representation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cao" = callPackage
@@ -50158,7 +50431,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "CAO Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50173,8 +50446,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50198,8 +50471,8 @@ self: {
          unliftio
        ];
        description = "Extensional capabilities and deriving combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50221,7 +50494,7 @@ self: {
          tasty-hunit tasty-smallcheck teardown time uuid
        ];
        description = "OTP-like supervision trees in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "capnp" = callPackage
@@ -50260,8 +50533,8 @@ self: {
          safe-exceptions stm supervisors text transformers vector
        ];
        description = "Cap'n Proto for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50273,8 +50546,8 @@ self: {
        sha256 = "0sik7svknaam6fhlvb4p1ijwaiwrgssrdl9gmq1wmfx66g069xi9";
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50290,8 +50563,8 @@ self: {
          base Cabal directory filepath process
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50314,8 +50587,8 @@ self: {
          transformers utility-ht
        ];
        description = "Simple web-server for organizing car-pooling for an event";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50340,8 +50613,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "High-level OpenGL bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50356,8 +50629,8 @@ self: {
          base mysql-simple postgresql-simple split time
        ];
        description = "some spaghetti code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50375,8 +50648,8 @@ self: {
          base bytestring filepath haskell98 IfElse MissingH
        ];
        description = "Drop emails from threads being watched into special CC folder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50398,8 +50671,8 @@ self: {
          QuickCheck quiet random text transformers vector
        ];
        description = "Algorithms for coin selection and fee balancing";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50432,8 +50705,8 @@ self: {
        ];
        testToolDepends = [ cardano-tx ];
        description = "Library utilities for constructing and signing Cardano transactions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cardano-binary = null; cardano-crypto = null; 
          cardano-crypto-wrapper = null; cardano-ledger = null; 
@@ -50456,8 +50729,8 @@ self: {
          highlighting-kate mtl pandoc pango process text time
        ];
        description = "A presentation tool written with Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50475,7 +50748,7 @@ self: {
        testHaskellDepends = [ array base ix-shapable QuickCheck ];
        benchmarkHaskellDepends = [ array base ];
        description = "A C-compatible array library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "carte" = callPackage
@@ -50493,8 +50766,8 @@ self: {
          time transformers tuple
        ];
        description = "Carte: A commandline pastebin server";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50523,8 +50796,8 @@ self: {
          time transformers
        ];
        description = "Specify Cabal files in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50544,7 +50817,7 @@ self: {
          time unix unordered-containers vector
        ];
        description = "A hashing class for content-addressed storage";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cas-hashable-s3" = callPackage
@@ -50560,7 +50833,7 @@ self: {
          resourcet
        ];
        description = "ContentHashable instances for S3 objects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cas-store" = callPackage
@@ -50584,7 +50857,7 @@ self: {
          tasty tasty-hunit unix
        ];
        description = "A content-addressed storage";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "casa-abbreviations-and-acronyms" = callPackage
@@ -50606,8 +50879,8 @@ self: {
          optparse-applicative wreq
        ];
        description = "CASA Abbreviations and Acronyms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50629,7 +50902,7 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "Client for Casa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "casa-types" = callPackage
@@ -50647,7 +50920,7 @@ self: {
          path-pieces persistent text
        ];
        description = "Types for Casa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "casa-types_0_0_2" = callPackage
@@ -50663,8 +50936,8 @@ self: {
          path-pieces persistent text
        ];
        description = "Types for Casa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casadi-bindings" = callPackage
@@ -50688,8 +50961,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "mid-level bindings to CasADi";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi = null;};
 
@@ -50706,8 +50979,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ casadi_control ];
        description = "low level bindings to casadi-control";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi_control = null;};
 
@@ -50724,8 +50997,8 @@ self: {
        ];
        librarySystemDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi = null;};
 
@@ -50738,8 +51011,8 @@ self: {
        libraryHaskellDepends = [ base containers vector ];
        librarySystemDepends = [ casadi ];
        description = "low level bindings to CasADi";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi = null;};
 
@@ -50756,8 +51029,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi_ipopt_interface = null;};
 
@@ -50774,8 +51047,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi_snopt_interface = null;};
 
@@ -50792,8 +51065,8 @@ self: {
          utf8-string web-routes
        ];
        description = "DSL for HTML CSS (Cascading Style Sheets)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50809,7 +51082,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Convert between different cases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "case-insensitive" = callPackage
@@ -50826,7 +51099,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Case insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "case-insensitive-match" = callPackage
@@ -50847,7 +51120,7 @@ self: {
          text
        ];
        description = "A simplified, faster way to do case-insensitive matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cased" = callPackage
@@ -50858,8 +51131,8 @@ self: {
        sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543";
        libraryHaskellDepends = [ base text ];
        description = "Track string casing in its type";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ jb55 ];
      }) {};
 
   "caseof" = callPackage
@@ -50870,8 +51143,8 @@ self: {
        sha256 = "1j8r8ldaxgyvka3zpqfl8qp0mbwrnh1s1xl5fgx3jjzqxlisfdp3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Combinators for casing on constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50890,8 +51163,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
        description = "A converter for spinal, snake and camel cases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50908,8 +51181,8 @@ self: {
          base deepseq haskell98 HaXml network parallel pretty
        ];
        description = "the Computer Algebra SHell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50924,7 +51197,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Convert between various source code casing conventions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "casr-logbook" = callPackage
@@ -50939,7 +51212,7 @@ self: {
        ];
        description = "CASR 61.345 Pilot Personal Logbook";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-html" = callPackage
@@ -50959,7 +51232,7 @@ self: {
        ];
        description = "CASR 61.345 Pilot Personal Logbook HTML output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-meta" = callPackage
@@ -50976,7 +51249,7 @@ self: {
        ];
        description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-meta-html" = callPackage
@@ -50997,7 +51270,7 @@ self: {
        ];
        description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook) HTML output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports" = callPackage
@@ -51016,7 +51289,7 @@ self: {
        ];
        description = "CASR 61.345 logbook (casr-logbook) reports.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-html" = callPackage
@@ -51037,7 +51310,7 @@ self: {
        ];
        description = "CASR 61.345 logbook reports HTML output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-meta" = callPackage
@@ -51056,7 +51329,7 @@ self: {
        ];
        description = "Reports on meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-meta-html" = callPackage
@@ -51079,7 +51352,7 @@ self: {
        ];
        description = "HTML output for reports on meta-information about entries in a CASR 61.345 logbook";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-types" = callPackage
@@ -51098,7 +51371,7 @@ self: {
        ];
        description = "CASR 61.345 Pilot Personal Logbook";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cassandra-cql" = callPackage
@@ -51116,8 +51389,8 @@ self: {
          uuid
        ];
        description = "Haskell client for Cassandra's CQL protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51130,7 +51403,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers Thrift ];
        description = "thrift bindings to the cassandra database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cassava" = callPackage
@@ -51157,7 +51430,7 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "A CSV parsing and encoding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassava-conduit" = callPackage
@@ -51177,8 +51450,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51197,7 +51470,7 @@ self: {
          base bytestring cassava template-haskell vector
        ];
        description = "CSV-file embedding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassava-generic" = callPackage
@@ -51213,7 +51486,7 @@ self: {
          unordered-containers vector
        ];
        description = "Cassave instances for functor-like datatypes like `Either String a`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassava-megaparsec" = callPackage
@@ -51231,7 +51504,7 @@ self: {
          base bytestring cassava hspec hspec-megaparsec vector
        ];
        description = "Megaparsec parser of CSV files that plays nicely with Cassava";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cassava-records" = callPackage
@@ -51253,8 +51526,8 @@ self: {
          unordered-containers vector
        ];
        description = "Auto-generation of records data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51276,7 +51549,7 @@ self: {
          tasty-quickcheck vector
        ];
        description = "io-streams interface for the cassava CSV library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassette" = callPackage
@@ -51287,8 +51560,8 @@ self: {
        sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x";
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51316,8 +51589,8 @@ self: {
          test-framework-quickcheck2 text Thrift time
        ];
        description = "A high level driver for the Cassandra datastore";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51329,7 +51602,7 @@ self: {
        sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94";
        libraryHaskellDepends = [ base ];
        description = "Abstact cast pattern";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "castagnoli" = callPackage
@@ -51347,8 +51620,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring primitive text ];
        description = "Portable CRC-32C";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {primitive-slice = null;};
 
@@ -51371,7 +51644,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Multicast, thread-safe, and fast logger";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "castle" = callPackage
@@ -51389,8 +51662,8 @@ self: {
          system-filepath text
        ];
        description = "A tool to manage shared cabal-install sandboxes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51405,8 +51678,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        description = "Equation Manipulator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51419,8 +51692,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exposes a Template Haskell function for generating catamorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51432,8 +51705,8 @@ self: {
        sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "MonadThrow and MonadCatch, using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51445,8 +51718,8 @@ self: {
        sha256 = "1kx6195mfnw4aqmcd1m4s8z5l1s8zh69in00p9a0mxm3xj3pfvpl";
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51458,7 +51731,7 @@ self: {
        sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2";
        libraryHaskellDepends = [ base void ];
        description = "Categories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "category" = callPackage
@@ -51469,7 +51742,7 @@ self: {
        sha256 = "0iya7q3b1z1bxv4amsibmc1lrmf7dng76nzcnanwy300jm1n42w7";
        libraryHaskellDepends = [ alg base dual transformers ];
        description = "Categorical types and classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "category-extras" = callPackage
@@ -51496,8 +51769,8 @@ self: {
        ];
        doHaddock = false;
        description = "A meta-package documenting various packages inspired by category theory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51509,7 +51782,7 @@ self: {
        sha256 = "198bpnmmkwzx9z0n850pgzr2i9yw0kmd4g2m3fhifkhgy6zfidji";
        libraryHaskellDepends = [ base bytestring comonad text ];
        description = "Highbrow approach to type-safe printf format specifications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "category-traced" = callPackage
@@ -51522,8 +51795,8 @@ self: {
        editedCabalFile = "0c4bb2wa3yd1blnji9i1bpx883y2q7aklqckyr5n8c5bzwwyb9ql";
        libraryHaskellDepends = [ base categories ];
        description = "Traced monoidal categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51543,8 +51816,8 @@ self: {
          template-haskell terminal-size transformers vcs-revision
        ];
        description = "Simple tool to display text files with line numbers and paging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51556,7 +51829,7 @@ self: {
        sha256 = "0kydmb5f714pfgjz6drqi91m43bgs2sfap2nbww92xxyjbcls3j6";
        libraryHaskellDepends = [ aeson base transformers validity ];
        description = "Keep track of warnings and errors during calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cautious-file" = callPackage
@@ -51574,8 +51847,8 @@ self: {
          base bytestring directory filepath unix
        ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51592,8 +51865,8 @@ self: {
          base cautious genvalidity genvalidity-hspec genvalidity-hspec-aeson
          hspec QuickCheck
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51610,8 +51883,8 @@ self: {
        ];
        testHaskellDepends = [ base base16-bytestring hspec ];
        description = "Cayenne Low Power Payload";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "cayley-client" = callPackage
@@ -51630,8 +51903,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec unordered-containers ];
        description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51644,7 +51917,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base random ];
        description = "Complex numbers, quaternions, octonions, sedenions, etc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cblrepo" = callPackage
@@ -51667,7 +51940,7 @@ self: {
        ];
        description = "Tool to maintain a database of CABAL packages and their dependencies";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cbor-tool" = callPackage
@@ -51688,7 +51961,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "A tool for manipulating CBOR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cborg" = callPackage
@@ -51712,7 +51985,7 @@ self: {
          tasty-hunit tasty-quickcheck text vector
        ];
        description = "Concise Binary Object Representation (CBOR)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cborg-json" = callPackage
@@ -51735,7 +52008,7 @@ self: {
          zlib
        ];
        description = "A library for encoding JSON as CBOR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ccast" = callPackage
@@ -51746,7 +52019,7 @@ self: {
        sha256 = "1yls8b1kjmdc8gh1i4vaaav1sgvfccyjfqxjpvb7gw27ivma3v7l";
        libraryHaskellDepends = [ base template-haskell ];
        description = "typesafe c-style casts; useful for FFI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cci" = callPackage
@@ -51768,8 +52041,8 @@ self: {
          process random time
        ];
        description = "Bindings for the CCI networking library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cci = null;};
 
@@ -51781,8 +52054,8 @@ self: {
        sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7";
        libraryHaskellDepends = [ base bytestring ];
        description = "A Haskell implementation of the CCNx network protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51799,8 +52072,8 @@ self: {
        ];
        librarySystemDepends = [ dttools ];
        description = "High-level interface to CCTools' WorkQueue library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dttools = null;};
 
@@ -51822,7 +52095,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Extract dependencies from C code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cedict" = callPackage
@@ -51840,7 +52113,7 @@ self: {
        ];
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51855,8 +52128,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text time ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "CEF log format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51870,8 +52143,8 @@ self: {
        librarySystemDepends = [ cef ];
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cef = null; inherit (pkgs) gtk2;};
 
@@ -51883,8 +52156,8 @@ self: {
        sha256 = "0h4k5mcbpxxv7nd9vf3nc2ynsnncc97q3q5s58gj10q2qpmvl1v7";
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51908,8 +52181,8 @@ self: {
          text transformers vaultaire-common
        ];
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51923,8 +52196,8 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ c2hs ];
        description = "Cairo-based CellRenderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2;};
 
@@ -51949,8 +52222,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "A tool to build a novel";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51978,8 +52251,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Protect and control API access with cerberus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51999,7 +52272,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A binary serialization library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cereal-conduit" = callPackage
@@ -52019,7 +52292,7 @@ self: {
          base bytestring cereal conduit HUnit mtl transformers
        ];
        description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cereal-data-dword" = callPackage
@@ -52030,7 +52303,7 @@ self: {
        sha256 = "14z0h7hz170l1zhz7add01q9n0v2diijskdrwfzqhvcka7a69566";
        libraryHaskellDepends = [ base cereal data-dword ];
        description = "Integration of \"cereal\" and \"data-dword\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cereal-derive" = callPackage
@@ -52041,8 +52314,8 @@ self: {
        sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb";
        libraryHaskellDepends = [ base cereal ghc-prim ];
        description = "Automatic deriving of Serialize using GHC.Generics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52054,8 +52327,8 @@ self: {
        sha256 = "0lpsj4f7v4sgrr6lf8jl07xwj8j3i3wj23as0imswk71f7xwfnnk";
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52067,8 +52340,8 @@ self: {
        sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s";
        libraryHaskellDepends = [ array base cereal ];
        description = "Floating point support for the 'cereal' serialization library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52091,8 +52364,8 @@ self: {
          criterion io-streams
        ];
        description = "io-streams support for the cereal binary serialization library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52116,8 +52389,8 @@ self: {
          unordered-containers vector
        ];
        description = "An extended serialization library on top of \"cereal\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52140,8 +52413,8 @@ self: {
          criterion io-streams transformers
        ];
        description = "Use cereal to encode/decode io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52153,7 +52426,7 @@ self: {
        sha256 = "0k1ml0z5rksvrhz15i9afld7bybgylqmy5nmvik3p98zd3s1ayiw";
        libraryHaskellDepends = [ base cereal text ];
        description = "Data.Text instances for the cereal serialization library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cereal-time" = callPackage
@@ -52165,8 +52438,8 @@ self: {
        libraryHaskellDepends = [ base cereal time ];
        testHaskellDepends = [ base cereal hspec QuickCheck time ];
        description = "Serialize instances for types from `time` package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52180,7 +52453,7 @@ self: {
          base cereal hashable unordered-containers
        ];
        description = "Integration of \"cereal\" and \"unordered-containers\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cereal-uuid" = callPackage
@@ -52191,7 +52464,7 @@ self: {
        sha256 = "1jg8rkndb1q1l0dnqrkkl0mlsxkcyqcfldb5k8kk9d2lg3plz030";
        libraryHaskellDepends = [ base cereal uuid ];
        description = "Integration of \"cereal\" and \"uuid\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cereal-vector" = callPackage
@@ -52203,7 +52476,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [ base cereal QuickCheck vector ];
        description = "Serialize instances for Data.Vector types.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "certificate" = callPackage
@@ -52224,8 +52497,8 @@ self: {
          directory filepath mtl pem process time
        ];
        description = "Certificates and Key Reader/Writer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52243,8 +52516,8 @@ self: {
          test-framework-th
        ];
        description = "Exact real arithmetic using continued fractions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52261,8 +52534,8 @@ self: {
          aeson base containers hspec raw-strings-qq
        ];
        description = "A library getting the environment when running on Cloud Foundry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52280,8 +52553,8 @@ self: {
          base bytestring containers data-default dequeue mtl
        ];
        description = "cfipu processor for toy brainfuck-like language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52300,8 +52573,8 @@ self: {
          value-supply
        ];
        description = "Constraint Functional-Logic Programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52319,8 +52592,8 @@ self: {
          base bytestring containers data-default dequeue mtl
        ];
        description = "cfopu processor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52341,8 +52614,8 @@ self: {
          unordered-containers utf8-string void
        ];
        description = "Parser for categorial grammars";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52362,8 +52635,8 @@ self: {
        ];
        doHaddock = false;
        description = "generates Haskell bindings and C wrappers for C++ libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52382,7 +52655,7 @@ self: {
          parsec time xhtml
        ];
        description = "A library for writing CGI programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cgi-undecidable" = callPackage
@@ -52393,7 +52666,7 @@ self: {
        sha256 = "1xh3q0s7398gd3513ycxypnj0m9jn0kdbb7459dsb459kbvzdpab";
        libraryHaskellDepends = [ base cgi mtl ];
        description = "Undecidable instances for the cgi package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cgi-utils" = callPackage
@@ -52406,8 +52679,8 @@ self: {
        editedCabalFile = "0lnx7n8pagi3pw57cz4nz01lhfjmsyhk3z3kwgfrmdyrb3kb276z";
        libraryHaskellDepends = [ base cgi containers mtl random ];
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52433,8 +52706,8 @@ self: {
          unordered-containers utf8-string yaml
        ];
        description = "Command line tool";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52447,7 +52720,7 @@ self: {
        libraryHaskellDepends = [ base containers JuicyPixels ];
        testHaskellDepends = [ base containers hspec JuicyPixels ];
        description = "Library decoding chain codes from images";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "chainweb-mining-client" = callPackage
@@ -52473,8 +52746,57 @@ self: {
          wai-extra
        ];
        description = "Mining Client for Kadena Chainweb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "chakra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cryptonite
+     , data-default, data-has, dotenv, envy, fast-logger, hspec
+     , http-types, iproute, jose, lens, mtl, network, network-uri
+     , options, optparse-simple, prometheus-client
+     , prometheus-metrics-ghc, rio, servant-auth, servant-auth-server
+     , servant-server, streaming-commons, string-conversions, text, time
+     , transformers, unordered-containers, wai, wai-cli, wai-extra
+     , wai-middleware-prometheus, warp
+     }:
+     mkDerivation {
+       pname = "chakra";
+       version = "0.1.0";
+       sha256 = "00ygnyvif8z8x9xasa3s9yahsawdmkjg43afczd5i0p3clfg6385";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger http-types iproute jose lens mtl
+         network network-uri options prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       executableHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger http-types iproute jose lens mtl
+         network network-uri options optparse-simple prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger hspec http-types iproute jose lens
+         mtl network network-uri options prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       description = "A REST Web Api server template for building (micro)services";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52486,7 +52808,7 @@ self: {
        sha256 = "1iyyz3rmnry3myw985qmqjyikhq41dw16rjs5gfgqbx7j1wrykpj";
        libraryHaskellDepends = [ base ];
        description = "Terminal string styling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chalkboard" = callPackage
@@ -52504,8 +52826,8 @@ self: {
          data-reify directory GLUT OpenGLRaw process time
        ];
        description = "Combinators for building and processing 2D images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52517,8 +52839,8 @@ self: {
        sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2";
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        description = "OpenGL based viewer for chalkboard rendered images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52531,7 +52853,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process random ];
        description = "Hardware description EDSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chan" = callPackage
@@ -52543,7 +52865,7 @@ self: {
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base stm ];
        description = "Some extra kit for Chans";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chan-split" = callPackage
@@ -52554,7 +52876,7 @@ self: {
        sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc";
        libraryHaskellDepends = [ base stm ];
        description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "change-monger" = callPackage
@@ -52568,7 +52890,7 @@ self: {
        libraryHaskellDepends = [ base process ];
        executableHaskellDepends = [ directory ];
        description = "Parse VCS changelogs into ChangeLogs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "changelogged" = callPackage
@@ -52597,7 +52919,7 @@ self: {
          unordered-containers
        ];
        description = "Changelog manager for Git projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "char-decode" = callPackage
@@ -52611,7 +52933,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Convert legacy byte encodings to and from Unicode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "char-qq" = callPackage
@@ -52622,7 +52944,7 @@ self: {
        sha256 = "01mbavg50g64bmlvjr499hzv1975imri2zwj91964g58xghfba9q";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Quasiquoters for characters and codepoints";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "character-cases" = callPackage
@@ -52641,8 +52963,8 @@ self: {
          template-haskell
        ];
        description = "Exposes subspecies types of Char. And naming cases.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52666,8 +52988,8 @@ self: {
          random snap snap-core snap-extras snap-server text xmlhtml
        ];
        description = "Rapid prototyping websites with Snap and Heist";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52679,13 +53001,13 @@ self: {
        pname = "charset";
        version = "0.3.7.1";
        sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
-       revision = "1";
-       editedCabalFile = "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy";
+       revision = "2";
+       editedCabalFile = "002x3yan7632nqgwk0a7f3wvchgm95pdwqh225va8dnn1lr9pi1z";
        libraryHaskellDepends = [
          array base bytestring containers semigroups unordered-containers
        ];
        description = "Fast unicode character sets based on complemented PATRICIA tries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "charsetdetect" = callPackage
@@ -52726,8 +53048,8 @@ self: {
          filepath hashable lens optparse-applicative text time
        ];
        description = "Command-line utility to draw charts from input data easily";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52739,35 +53061,40 @@ self: {
        sha256 = "0sfv86c9sj8ihrrv56kk61fkzikxh765rz4lrp5paymri5l0m408";
        libraryHaskellDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "chart-svg" = callPackage
-    ({ mkDerivation, attoparsec, base, Color, containers, doctest
-     , generic-lens, lens, lucid, numhask, numhask-space, pretty-simple
+    ({ mkDerivation, attoparsec, base, bytestring, Color, concurrency
+     , cubicbezier, doctest, foldl, generic-lens, JuicyPixels, lens
+     , linear, lucid, numhask, numhask-space, reanimate, reanimate-svg
      , scientific, tagsoup, text, time, transformers
-     , unordered-containers, web-rep
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "chart-svg";
-       version = "0.1.3";
-       sha256 = "0b3hpxm7xjw8pjhpcla46jdsjhqxxb3ga0jmmj97wn6w971yphi1";
+       version = "0.2.0";
+       sha256 = "1w7381r9zfj02c5r6fbza1x2qdxyqpgb3dj2wld73pzcladszp34";
+       revision = "1";
+       editedCabalFile = "18ilaajn42jni3pgzyc9f7z6ph3jyf0wrjfv9jnsp3ypyjj7yjn3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base Color generic-lens lens lucid numhask numhask-space
-         pretty-simple scientific tagsoup text time transformers web-rep
+         attoparsec base Color cubicbezier foldl generic-lens JuicyPixels
+         lens linear lucid numhask numhask-space reanimate reanimate-svg
+         scientific tagsoup text time transformers unordered-containers
        ];
        executableHaskellDepends = [
-         base containers generic-lens lens lucid numhask numhask-space text
-         transformers unordered-containers web-rep
+         attoparsec base bytestring concurrency foldl JuicyPixels lens
+         linear lucid numhask numhask-space reanimate reanimate-svg text
+         time transformers unordered-containers vector
        ];
        testHaskellDepends = [ base doctest numhask ];
-       description = "Charts in SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       description = "Charting library targetting SVGs";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52791,8 +53118,8 @@ self: {
        executableHaskellDepends = [ base numhask ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52817,8 +53144,8 @@ self: {
          tasty-hspec
        ];
        description = "Native haskell charts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52846,8 +53173,8 @@ self: {
          aeson async base bytestring containers http-types mtl one-liner
          process scientific text wai warp
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52870,7 +53197,7 @@ self: {
          vector
        ];
        description = "Chase & Lev work-stealing lock-free double-ended queues (deques)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chassis" = callPackage
@@ -52889,7 +53216,7 @@ self: {
          profunctors rio text time vinyl
        ];
        description = "Prelude with algebraic constructs and polykinds on";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chatter" = callPackage
@@ -52923,8 +53250,8 @@ self: {
          tasty-quickcheck text tokenize unordered-containers
        ];
        description = "A library of simple NLP algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52935,16 +53262,14 @@ self: {
      }:
      mkDerivation {
        pname = "chatty";
-       version = "0.7.0.1";
-       sha256 = "0d7cfp3vvrmn7b6lc83j5pi7a90sk1rc1y48zb78f8plipp7ngb6";
-       revision = "1";
-       editedCabalFile = "1vh058qw0wphwn0l1lchhxms96p9bhsjna4j7lyvczmc9ba2mgdp";
+       version = "0.8.0.0";
+       sha256 = "1sq8d1irxrrhrfk874snfvwskh4ng6cm3nain99wcx5d3w4ch3rn";
        libraryHaskellDepends = [
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
        ];
-       description = "Some monad transformers and typeclasses for abstraction of global dependencies";
-       license = stdenv.lib.licenses.agpl3;
+       description = "Some monad transformers and typeclasses for text in- and output abstraction";
+       license = lib.licenses.agpl3;
      }) {};
 
   "chatty-text" = callPackage
@@ -52957,8 +53282,8 @@ self: {
        editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v";
        libraryHaskellDepends = [ base chatty transformers ];
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52966,13 +53291,11 @@ self: {
     ({ mkDerivation, base, mtl, text, transformers }:
      mkDerivation {
        pname = "chatty-utils";
-       version = "0.7.3.4";
-       sha256 = "1dp1k641sryzp7zh5l3f8v4dajc71ly8l9fyv1c45cf0s81cxhys";
-       revision = "1";
-       editedCabalFile = "0b1bvxkp1yhw3ws12mkdys5dnml03phzj03sqkrk1289jm5nlfn9";
+       version = "0.7.3.5";
+       sha256 = "1pzg0bf73shwl91x4011khw62wgv33y5862gq110q8g913w4jrjw";
        libraryHaskellDepends = [ base mtl text transformers ];
        description = "Some utilities every serious chatty-based application may need";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "chatwork" = callPackage
@@ -53000,8 +53323,8 @@ self: {
          servant-server text warp
        ];
        description = "The ChatWork API in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53023,7 +53346,7 @@ self: {
        ];
        executableHaskellDepends = [ base blaze-html bytestring text ];
        description = "Experimental markdown processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cheapskate-highlight" = callPackage
@@ -53040,7 +53363,7 @@ self: {
          base blaze-html cheapskate highlighting-kate text
        ];
        description = "Code highlighting for cheapskate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cheapskate-lucid" = callPackage
@@ -53053,7 +53376,7 @@ self: {
        editedCabalFile = "197nx95xw21i7zyvgzcgnr36ab6vrk17c66iz8ndwz61vp1jf6hc";
        libraryHaskellDepends = [ base blaze-html cheapskate lucid ];
        description = "Use cheapskate with Lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cheapskate-terminal" = callPackage
@@ -53079,8 +53402,8 @@ self: {
          hscolour terminal-size text
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53093,7 +53416,7 @@ self: {
        libraryHaskellDepends = [ base bytestring email-validate ];
        librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {resolv = null;};
 
   "check-pvp" = callPackage
@@ -53112,8 +53435,8 @@ self: {
          haskell-src-exts hse-cpp non-empty tagged transformers utility-ht
        ];
        description = "Check whether module and package imports conform to the PVP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53127,8 +53450,8 @@ self: {
        editedCabalFile = "110g32gvn5cjdf4cbvv642asziinsh50b1c5675qzza77jg7hwid";
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53142,7 +53465,7 @@ self: {
          array base QuickCheck random semigroupoids
        ];
        description = "Check properties on standard classes and data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "checkmate" = callPackage
@@ -53172,8 +53495,8 @@ self: {
          QuickCheck quickcheck-text temporary text
        ];
        description = "Generate checklists relevant to a given patch";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53185,7 +53508,7 @@ self: {
        sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik";
        libraryHaskellDepends = [ base explicit-exception utility-ht ];
        description = "Compute and verify checksums of ISBN, IBAN, etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chell" = callPackage
@@ -53203,7 +53526,7 @@ self: {
          template-haskell text transformers
        ];
        description = "A simple and intuitive library for automated testing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chell-hunit" = callPackage
@@ -53214,7 +53537,7 @@ self: {
        sha256 = "18p9rhs81b43jb95dqg650h3cajsw45w7cgsavkm18h0qhrz41kb";
        libraryHaskellDepends = [ base chell HUnit ];
        description = "HUnit support for the Chell testing library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chell-quickcheck" = callPackage
@@ -53225,37 +53548,37 @@ self: {
        sha256 = "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03";
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "cherry-core-alpha" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
-     , case-insensitive, cherry-core, containers, directory, ghc-prim
-     , hspec, hspec-discover, http-client, http-client-tls, http-types
-     , mtl, network, safe-exceptions, scientific, stm, text-utf8, time
-     , unix, utf8-string, vector, wai, wai-extra, wai-middleware-static
-     , warp
+    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
+     , bytestring, case-insensitive, cherry-core, containers, directory
+     , ghc-prim, hspec, hspec-discover, http-client, http-client-tls
+     , http-types, jose-jwt, mtl, network, postgresql-libpq
+     , safe-exceptions, scientific, stm, text, text-utf8, time, unix
+     , utf8-string, vector, wai, wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "cherry-core-alpha";
-       version = "0.3.0.0";
-       sha256 = "03plsrwzji653psjwsxmafsl24cyx6260x15cfpmb7fka5rdfs5i";
+       version = "0.4.0.0";
+       sha256 = "1rrmglzxvfq67ymgy7jifx8rgk33qq82vrcsbaqwcsjc95c3kfdx";
        libraryHaskellDepends = [
-         async base base64-bytestring binary bytestring case-insensitive
-         containers directory ghc-prim http-client http-client-tls
-         http-types mtl network safe-exceptions scientific stm text-utf8
-         time unix utf8-string vector wai wai-extra wai-middleware-static
-         warp
+         aeson async base base64-bytestring binary bytestring
+         case-insensitive containers directory ghc-prim http-client
+         http-client-tls http-types jose-jwt mtl network postgresql-libpq
+         safe-exceptions scientific stm text text-utf8 time unix utf8-string
+         vector wai wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
          base cherry-core containers hspec text-utf8
        ];
        testToolDepends = [ hspec-discover ];
        description = "The core library for Cherry Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cherry-core = null;};
 
@@ -53289,8 +53612,8 @@ self: {
          process random stm text time unordered-containers vector
        ];
        description = "Basic chess library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53304,7 +53627,7 @@ self: {
          array attoparsec base bytestring containers
        ];
        description = "Simple library for validating chess moves and parsing PGN files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chevalier-common" = callPackage
@@ -53321,8 +53644,8 @@ self: {
          protobuf text unordered-containers vaultaire-common zeromq4-haskell
        ];
        description = "Query interface for Chevalier";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53347,8 +53670,8 @@ self: {
          typed-process unix unliftio
        ];
        description = "tmux api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53370,7 +53693,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mtl random ];
        description = "Lazy infinite streams with O(1) indexing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chiphunk" = callPackage
@@ -53388,8 +53711,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for Chipmunk2D physics engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53409,8 +53732,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Helper for the Major System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53422,7 +53745,7 @@ self: {
        sha256 = "0qcyf6nqi0nyhbf3xwyib95y29j5ir94d5vg449mkpr92crf8ryk";
        libraryHaskellDepends = [ base ];
        description = "A solution to boolean blindness";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "choose" = callPackage
@@ -53433,8 +53756,8 @@ self: {
        sha256 = "1kzyl1n7shrsagkaqxb9ac9iyjzxn4f1f7hmxgid12iwfd5yqsg3";
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Choose random elements from a stream";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53451,8 +53774,8 @@ self: {
          base choose optparse-applicative text
        ];
        description = "Command-line program to choose random element from a stream";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53470,8 +53793,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A module containing basic functions that the prelude does not offer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53489,8 +53812,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A module containing basic geo functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53506,8 +53829,8 @@ self: {
          base containers deepseq extensible-exceptions pretty stm
        ];
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53519,8 +53842,8 @@ self: {
        sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z";
        libraryHaskellDepends = [ base chp chp-plus mtl ];
        description = "MTL class instances for the CHP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53537,8 +53860,8 @@ self: {
          QuickCheck stm
        ];
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53554,8 +53877,8 @@ self: {
          base containers deepseq mtl pretty TypeCompose
        ];
        description = "A mirror implementation of chp that generates a specification of the program";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53567,8 +53890,8 @@ self: {
        sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23";
        libraryHaskellDepends = [ base chp chp-plus transformers ];
        description = "Transformers instances for the CHP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53585,8 +53908,8 @@ self: {
          pqueue unordered-containers
        ];
        description = "Constraint Handling Rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53605,7 +53928,7 @@ self: {
          unordered-containers vector
        ];
        description = "Datatypes required for chr library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chr-lang" = callPackage
@@ -53624,8 +53947,8 @@ self: {
        ];
        executableHaskellDepends = [ base chr-data ];
        description = "AST + surface language around chr";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53639,8 +53962,8 @@ self: {
        editedCabalFile = "0h3qyn306sxqsvxmz9hfba169nkc3hx7ygkxr5j2sz033fvi31jc";
        libraryHaskellDepends = [ base containers uulib ];
        description = "Parsing for chr library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53654,7 +53977,7 @@ self: {
        editedCabalFile = "15v5bv7azi7qw33rg849wggpy07ingd8fp24dm0azwgwsqd05mb9";
        libraryHaskellDepends = [ base containers ];
        description = "Pretty printing for chr library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chromatin" = callPackage
@@ -53689,8 +54012,8 @@ self: {
          strings transformers typed-process unliftio
        ];
        description = "neovim package manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53704,8 +54027,8 @@ self: {
          base deepseq ghc-prim thyme vector-space
        ];
        description = "measure timings of data evaluation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53722,7 +54045,7 @@ self: {
          aeson base bytestring hourglass hspec QuickCheck vector
        ];
        description = "Time to manipulate time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chronos" = callPackage
@@ -53750,9 +54073,7 @@ self: {
          text thyme time vector
        ];
        description = "A performant time library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chronos-bench" = callPackage
@@ -53772,8 +54093,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        benchmarkHaskellDepends = [ base ];
        description = "Benchmarking tool with focus on comparing results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53787,7 +54108,7 @@ self: {
        editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10";
        libraryHaskellDepends = [ base Cabal chs-deps ];
        description = "Cabal with c2hs dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chs-deps" = callPackage
@@ -53804,7 +54125,7 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "c2hs dependency analyzer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chu2" = callPackage
@@ -53821,8 +54142,8 @@ self: {
          utf8-string
        ];
        description = "FFI for Chu2 Agda Web Server Interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53841,7 +54162,7 @@ self: {
        testHaskellDepends = [ base HUnit text transformers unix ];
        description = "Behaviour Driven Development like Cucumber for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "chunked-data" = callPackage
@@ -53856,7 +54177,7 @@ self: {
          base bytestring containers semigroups text transformers vector
        ];
        description = "Typeclasses for dealing with various chunked data representations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chunks" = callPackage
@@ -53868,7 +54189,7 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        description = "Simple template library with static safety";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53884,8 +54205,8 @@ self: {
        executableHaskellDepends = [ base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring HUnit text ];
        description = "Human-readable storage of text/binary objects";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53897,8 +54218,8 @@ self: {
        sha256 = "018k9a014q4zprsla5k5hrdq1zwpp7hmckc0ldaj7nf6vg1hxas2";
        libraryHaskellDepends = [ base ];
        description = "Automatically convert Generic instances to and from church representations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53911,7 +54232,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Removed; please see fmlist";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "church-maybe" = callPackage
@@ -53922,8 +54243,8 @@ self: {
        sha256 = "0zcpqsaq5ic8zw88r1kqjb592qy174b0ljjhj5qp90cvzmm7bwyz";
        libraryHaskellDepends = [ base deepseq semigroupoids semigroups ];
        description = "Church encoded Maybe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53937,7 +54258,7 @@ self: {
          base bifunctors semigroups transformers
        ];
        description = "Church encoded pair";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "churros" = callPackage
@@ -53955,7 +54276,9 @@ self: {
          async base containers doctest random stm time unagi-chan
        ];
        description = "Channel/Arrow based streaming computation library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "cielo" = callPackage
@@ -53977,8 +54300,8 @@ self: {
          uuid wreq
        ];
        description = "Cielo API v3 Bindings for Haskell";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53990,8 +54313,8 @@ self: {
        sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az";
        libraryHaskellDepends = [ base bytestring language-c ];
        description = "An interface to CIL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54012,7 +54335,7 @@ self: {
        executableHaskellDepends = [ base bytestring groom text ];
        testHaskellDepends = [ base hspec ];
        description = "Simple C-like programming language";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cinvoke" = callPackage
@@ -54024,8 +54347,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ cinvoke ];
        description = "A binding to cinvoke";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cinvoke = null;};
 
@@ -54037,8 +54360,8 @@ self: {
        sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb";
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        description = "A monad for concurrent IO on a thread pool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54064,7 +54387,7 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "Fast AES cipher implementation with advanced mode of operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-aes128" = callPackage
@@ -54087,7 +54410,7 @@ self: {
          base bytestring cereal criterion crypto-api entropy tagged
        ];
        description = "AES and common modes using AES-NI when available";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-blowfish" = callPackage
@@ -54112,8 +54435,8 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "Blowfish cipher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54139,7 +54462,7 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "Camellia block cipher primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-des" = callPackage
@@ -54164,7 +54487,7 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "DES and 3DES primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-rc4" = callPackage
@@ -54189,7 +54512,7 @@ self: {
          crypto-cipher-types deepseq mtl
        ];
        description = "Fast RC4 cipher implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-rc5" = callPackage
@@ -54200,7 +54523,7 @@ self: {
        sha256 = "0l9lhyqn74mlgwm4mplm94i0x2xjmvnxnp8nm3h6aj8v5ishl1md";
        libraryHaskellDepends = [ base split ];
        description = "Pure RC5 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ciphersaber2" = callPackage
@@ -54214,8 +54537,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring ];
        executableHaskellDepends = [ array base bytestring parseargs ];
        description = "Implementation of CipherSaber2 RC4 cryptography";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54227,7 +54550,7 @@ self: {
        sha256 = "0n3m7kjyqic10dl06zic5qjb1yb1ff8jn9d1wchrarkprcw25knc";
        libraryHaskellDepends = [ base directory mtl ];
        description = "A Compiler IR Compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "circle-packing" = callPackage
@@ -54240,7 +54563,7 @@ self: {
        editedCabalFile = "1jp1b6l5v1llmggy316s4bb78wjvgq8iya0i2zz4k5v6l5dl8ln2";
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "circlehs" = callPackage
@@ -54257,8 +54580,8 @@ self: {
          text time transformers unordered-containers
        ];
        description = "The CircleCI REST API for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54287,7 +54610,7 @@ self: {
          unordered-containers
        ];
        description = "An implementation of the \"circuit breaker\" pattern to disable repeated calls to a failing system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "circular" = callPackage
@@ -54304,7 +54627,9 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Circular fixed-sized mutable vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "cirru-parser" = callPackage
@@ -54315,7 +54640,7 @@ self: {
        sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
        libraryHaskellDepends = [ aeson base text vector ];
        description = "Cirru Parser in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cisco-spark-api" = callPackage
@@ -54343,7 +54668,7 @@ self: {
          http-conduit http-types network-uri text wai warp
        ];
        description = "DEPRECATED in favor of webex-teams-api";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "citation-resolve" = callPackage
@@ -54366,8 +54691,8 @@ self: {
          base directory doctest filepath hspec MissingH QuickCheck
        ];
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54380,8 +54705,8 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.3.0.3";
-       sha256 = "0ck7hw1md1bwfl0qzkj0vg8ippmymcmvw84srr15rhaqgiqx9v4n";
+       version = "0.3.0.4";
+       sha256 = "13rx1919hnk26jpnqcdfqmd8hkvhg8504aq7abiyxy0diy28mvz7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -54394,7 +54719,7 @@ self: {
          text timeit transformers
        ];
        description = "Generates citations and bibliography from CSL styles";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "citeproc-hs" = callPackage
@@ -54413,8 +54738,8 @@ self: {
          syb time utf8-string
        ];
        description = "A Citation Style Language implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54434,8 +54759,8 @@ self: {
          pandoc pandoc-types parsec tagsoup texmath utf8-string yaml
        ];
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54453,7 +54778,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bindings to CityHash";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cj-token" = callPackage
@@ -54475,8 +54800,8 @@ self: {
          base hspec jwt QuickCheck text text-conversions time
        ];
        description = "A new Haskeleton package";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54494,8 +54819,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Data about Chinese, Japanese and Korean characters and languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54509,8 +54834,8 @@ self: {
        testHaskellDepends = [ base criterion random ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Clifford Algebra of three dimensional space";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54522,8 +54847,8 @@ self: {
        sha256 = "0sa1gaclh7b3mpqiiyqqn2gqfwkwj2ig5yzjk1y0hkzyc7rz4l3k";
        libraryHaskellDepends = [ base cl3 hmatrix ];
        description = "Interface to/from Cl3 and HMatrix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54535,8 +54860,8 @@ self: {
        sha256 = "15431azhvwk2fcd3aca5snpqrp8kf7zdlbyxh99i1xfdhvq4vc78";
        libraryHaskellDepends = [ base cl3 linear ];
        description = "Interface to/from Cl3 and Linear";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54555,8 +54880,8 @@ self: {
          split
        ];
        description = "Simple CLI RPN calculator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54591,8 +54916,8 @@ self: {
          tasty-th transformers-compat
        ];
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54625,8 +54950,8 @@ self: {
          tasty-hunit tasty-th transformers transformers-compat
        ];
        description = "claferIG is an interactive tool that generates instances of Clafer models";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54646,8 +54971,8 @@ self: {
          utf8-string
        ];
        description = "A wiki-based IDE for literate modeling with Clafer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54660,8 +54985,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "JSON Compilation Database Format encoding and decoding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54684,8 +55009,8 @@ self: {
        librarySystemDepends = [ clang ];
        testHaskellDepends = [ base bytestring lens ];
        description = "Pure C++ code analysis with libclang";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (self.llvmPackages) clang;};
 
@@ -54701,8 +55026,8 @@ self: {
          base bytestring directory safe strict time
        ];
        description = "Command-line spaced-repetition software";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54720,8 +55045,8 @@ self: {
          lens-aeson scientific text unordered-containers vector wreq
        ];
        description = "API Client for the Clarifai API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54741,8 +55066,8 @@ self: {
          th-lift time transformers utility-ht vhdl
        ];
        description = "CAES Language for Synchronous Hardware (CLaSH)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54772,8 +55097,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "CAES Language for Synchronous Hardware";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54811,8 +55136,8 @@ self: {
          tasty-hunit template-haskell text transformers unordered-containers
        ];
        description = "CAES Language for Synchronous Hardware - As a Library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54827,8 +55152,8 @@ self: {
        libraryHaskellDepends = [
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54867,8 +55192,8 @@ self: {
          base criterion deepseq template-haskell
        ];
        description = "CAES Language for Synchronous Hardware - Prelude library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54882,7 +55207,7 @@ self: {
        libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-systemverilog" = callPackage
@@ -54899,8 +55224,8 @@ self: {
          unordered-containers wl-pprint-text
        ];
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54918,8 +55243,8 @@ self: {
          unordered-containers wl-pprint-text
        ];
        description = "CAES Language for Synchronous Hardware - Verilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54937,8 +55262,8 @@ self: {
          unordered-containers wl-pprint-text
        ];
        description = "CAES Language for Synchronous Hardware - VHDL backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54950,7 +55275,7 @@ self: {
        sha256 = "03d4ygqhqbg4cvfjp8c5cyy0fkgf1fpzc1li45bqc555jrxwszwr";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Library for classification of media files";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "classify-frog" = callPackage
@@ -54981,8 +55306,8 @@ self: {
          xml-basic
        ];
        description = "Classify sounds produced by Xenopus laevis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54999,8 +55324,8 @@ self: {
          vector wreq
        ];
        description = "Super simple InfluxDB package in Classy-MTL style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55021,8 +55346,8 @@ self: {
        executableHaskellDepends = [ base miso rfc ];
        testHaskellDepends = [ base miso rfc ];
        description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55038,8 +55363,8 @@ self: {
          base lifted-base monad-control parallel resourcet transformers
        ];
        description = "Fork of the monad-parallel package using monad-control";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55066,7 +55391,7 @@ self: {
          base containers hspec QuickCheck transformers unordered-containers
        ];
        description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "classy-prelude-conduit" = callPackage
@@ -55085,7 +55410,7 @@ self: {
          base bytestring conduit hspec QuickCheck transformers
        ];
        description = "classy-prelude together with conduit functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "classy-prelude-yesod" = callPackage
@@ -55103,7 +55428,7 @@ self: {
          yesod-static
        ];
        description = "Provide a classy prelude including common Yesod functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "classyplate" = callPackage
@@ -55117,8 +55442,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        benchmarkHaskellDepends = [ base criterion parallel uniplate ];
        description = "Fuseable type-class based generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55132,7 +55457,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover mtl text ];
        testToolDepends = [ hspec-discover ];
        description = "CSS preprocessor as embedded Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clckwrks" = callPackage
@@ -55166,8 +55491,8 @@ self: {
        librarySystemDepends = [ openssl ];
        libraryToolDepends = [ hsx2hs ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -55190,8 +55515,8 @@ self: {
          parsec
        ];
        description = "a command-line interface for adminstrating some aspects of clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55213,8 +55538,8 @@ self: {
        ];
        executableToolDepends = [ hsx2hs ];
        description = "clckwrks.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55240,8 +55565,8 @@ self: {
        ];
        libraryToolDepends = [ hsx2hs ];
        description = "bug tracking plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55265,8 +55590,8 @@ self: {
        ];
        libraryToolDepends = [ hsx2hs ];
        description = "ircbot plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55291,8 +55616,8 @@ self: {
          uuid uuid-orphans web-plugins web-routes web-routes-th
        ];
        description = "mailing list plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55315,8 +55640,8 @@ self: {
          web-routes web-routes-th
        ];
        description = "media plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55342,8 +55667,8 @@ self: {
        ];
        libraryToolDepends = [ hsx2hs ];
        description = "support for CMS/Blogging in clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55368,8 +55693,8 @@ self: {
          web-routes-th
        ];
        description = "support redirects for CMS/Blogging in clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55387,8 +55712,8 @@ self: {
          mtl text web-plugins
        ];
        description = "simple bootstrap based template for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55406,8 +55731,8 @@ self: {
          web-plugins
        ];
        description = "simple bootstrap based template for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55420,8 +55745,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base clckwrks hsp text ];
        description = "geo bootstrap based template for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55433,8 +55758,8 @@ self: {
        sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd";
        libraryHaskellDepends = [ base bytestring hashable text ];
        description = "Haskell bindings to Google's Compact Language Detector 2";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55452,7 +55777,7 @@ self: {
          base cmdargs containers directory HSH IfElse
        ];
        description = "Keep your home dir clean by finding old conf files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clean-unions" = callPackage
@@ -55463,8 +55788,8 @@ self: {
        sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
        libraryHaskellDepends = [ base ];
        description = "Open unions without need for Typeable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55483,8 +55808,8 @@ self: {
          wl-pprint-extras wl-pprint-terminfo
        ];
        description = "Colorized LESS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55499,8 +55824,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        executableHaskellDepends = [ parsec ];
        description = "A CSS preprocessor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55512,8 +55837,8 @@ self: {
        sha256 = "1x2q496jqvgqjbwncszl1h9ylkq6rn8h2fsp7w771xkyslfq46xy";
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Lexes C++ code into simple tokens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55530,7 +55855,7 @@ self: {
        libraryHaskellDepends = [ base basement foundation ];
        executableHaskellDepends = [ base basement foundation ];
        description = "CLI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cli-builder" = callPackage
@@ -55546,8 +55871,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55567,8 +55892,8 @@ self: {
          terminal-size text time transformers which
        ];
        description = "Miscellaneous utilities for building and working with command line interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55585,8 +55910,8 @@ self: {
          logging-effect megaparsec mtl text
        ];
        description = "Bindings to the git command-line interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55603,8 +55928,8 @@ self: {
          text
        ];
        description = "Bindings to the nix command-line interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55616,7 +55941,7 @@ self: {
        sha256 = "09ycy8500si810ysn70khc2np1zy21a1647kva8lkcj4pjbb1bvx";
        libraryHaskellDepends = [ base directory process ];
        description = "Helper setup scripts for packaging command-line tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "click-clack" = callPackage
@@ -55635,7 +55960,7 @@ self: {
        ];
        description = "Toy game (tetris on billiard board). Hipmunk in action.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clickhouse-haskell" = callPackage
@@ -55671,8 +55996,8 @@ self: {
          unordered-containers uri-encode uuid vector word8
        ];
        description = "A Haskell library as database client for Clickhouse";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55698,7 +56023,7 @@ self: {
          transformers
        ];
        description = "Securely store session data in a client-side cookie";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "clif" = callPackage
@@ -55715,8 +56040,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55749,8 +56074,8 @@ self: {
          base criterion numeric-prelude stream-fusion
        ];
        description = "A Clifford algebra library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55770,8 +56095,8 @@ self: {
          optparse-applicative pointedlist process time vector vty
        ];
        description = "Command Line Interface File Manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55794,7 +56119,7 @@ self: {
          unliftio-core
        ];
        description = "Building blocks for a GHCi-like REPL with colon-commands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clingo" = callPackage
@@ -55813,8 +56138,8 @@ self: {
        ];
        librarySystemDepends = [ clingo ];
        description = "Haskell bindings to the Clingo ASP solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) clingo;};
 
@@ -55826,8 +56151,8 @@ self: {
        sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538";
        libraryHaskellDepends = [ base process ];
        description = "A simple Haskell library for copying text to the clipboard in a cross-platform way";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55839,8 +56164,8 @@ self: {
        sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0";
        libraryHaskellDepends = [ base ];
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55866,8 +56191,8 @@ self: {
          assertions base data-default filepath old-locale parsec time
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55880,8 +56205,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Tiny library to pretty print sparklines onto the CLI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55894,7 +56219,7 @@ self: {
        libraryHaskellDepends = [ base natural-induction peano ];
        description = "Counted list";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clit" = callPackage
@@ -55916,8 +56241,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Post tweets from stdin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55935,7 +56260,7 @@ self: {
          base foldl process system-filepath temporary text turtle
        ];
        description = "Clone and benchmark Haskell cabal projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clock" = callPackage
@@ -55948,7 +56273,21 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "High-resolution clock functions: monotonic, realtime, cputime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "clock_0_8_2" = callPackage
+    ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "clock";
+       version = "0.8.2";
+       sha256 = "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "High-resolution clock functions: monotonic, realtime, cputime";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clock-extras" = callPackage
@@ -55960,7 +56299,7 @@ self: {
        libraryHaskellDepends = [ base clock ];
        testHaskellDepends = [ base hspec ];
        description = "A couple functions that probably should be in the 'clock' package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clocked" = callPackage
@@ -55976,8 +56315,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ QtCore ];
        description = "timer functionality to clock IO commands";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {QtCore = null;};
 
@@ -55994,8 +56333,8 @@ self: {
          timezone-series
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56015,8 +56354,8 @@ self: {
          system-fileio system-filepath text transformers
        ];
        description = "Clone all github repositories from a given user";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56036,7 +56375,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Integers bounded by a closed interval";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "closure" = callPackage
@@ -56047,8 +56386,8 @@ self: {
        sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "Depth- and breadth-first set closures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56072,8 +56411,8 @@ self: {
        ];
        doHaddock = false;
        description = "The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56102,8 +56441,8 @@ self: {
          optparse-applicative text these transformers yaml
        ];
        description = "A tool for interacting with AWS CloudFormation";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56120,8 +56459,8 @@ self: {
          crypto-pubkey-types old-locale RSA time
        ];
        description = "CloudFront URL signer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56137,7 +56476,7 @@ self: {
          array base binary bytestring containers network time unix zlib
        ];
        description = "Haskell CloudI API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cloudyfs" = callPackage
@@ -56157,7 +56496,7 @@ self: {
        ];
        description = "A cloud in the file system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clr-bindings" = callPackage
@@ -56173,7 +56512,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Glue between clr-host and clr-typed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clr-host" = callPackage
@@ -56193,7 +56532,7 @@ self: {
        librarySystemDepends = [ glib mono ];
        testHaskellDepends = [ base ];
        description = "Hosting the Common Language Runtime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "clr-inline" = callPackage
@@ -56222,8 +56561,8 @@ self: {
          pipes process split template-haskell temporary text transformers
        ];
        description = "Quasiquoters for inline C# and F#";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56235,7 +56574,7 @@ self: {
        sha256 = "1mnwxfmhz548bb1g17bddhmvd6lzl66bfi1a7f0j3phh7lgna4s1";
        libraryHaskellDepends = [ base text ];
        description = "Marshaling for the clr";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clr-typed" = callPackage
@@ -56247,7 +56586,7 @@ self: {
        libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ];
        testHaskellDepends = [ base clr-marshal hspec text ];
        description = "A strongly typed Haskell interface to the CLR type system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clr-win-linker" = callPackage
@@ -56262,7 +56601,7 @@ self: {
          base directory pipes pipes-safe process
        ];
        description = "A GHC linker wrapper tool to workaround a GHC >8.2 bug";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cltw" = callPackage
@@ -56275,7 +56614,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base curl mtl random tagsoup ];
        description = "Command line Twitter utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clua" = callPackage
@@ -56292,8 +56631,8 @@ self: {
          base bytestring containers haskell98 language-c pretty pretty-show
        ];
        description = "C to Lua data wrapper generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56305,7 +56644,7 @@ self: {
        sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc";
        libraryHaskellDepends = [ base containers tree-fun ];
        description = "Calculate the clumpiness of leaf properties in a tree";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cluss" = callPackage
@@ -56316,8 +56655,8 @@ self: {
        sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg";
        libraryHaskellDepends = [ base template-haskell ];
        description = "simple alternative to type classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56343,8 +56682,8 @@ self: {
          base criterion hierarchical-clustering matrices mwc-random vector
        ];
        description = "High performance clustering algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56364,7 +56703,7 @@ self: {
        ];
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56383,7 +56722,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
 
@@ -56402,7 +56741,7 @@ self: {
        ];
        description = "CMA-ES wrapper in Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cmake-syntax" = callPackage
@@ -56419,7 +56758,7 @@ self: {
          base bytestring hspec raw-strings-qq trifecta
        ];
        description = "Parser for the CMake syntax (CMakeLists.txt and .cmake files)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark" = callPackage
@@ -56436,7 +56775,7 @@ self: {
          base blaze-html cheapskate criterion discount markdown sundown text
        ];
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark-gfm" = callPackage
@@ -56453,7 +56792,7 @@ self: {
          base blaze-html cheapskate criterion discount markdown sundown text
        ];
        description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark-highlight" = callPackage
@@ -56469,8 +56808,8 @@ self: {
          base blaze-html cmark highlighting-kate text
        ];
        description = "Code highlighting for cmark";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56484,7 +56823,7 @@ self: {
        editedCabalFile = "1mizbv18bl8qrgz27wlz7sb6cfhblmp7p7gh7dqq8g0r4djrvqg5";
        libraryHaskellDepends = [ base cmark lucid ];
        description = "Use cmark with Lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark-patterns" = callPackage
@@ -56495,8 +56834,8 @@ self: {
        sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f";
        libraryHaskellDepends = [ base cmark ];
        description = "Pattern synonyms for cmark";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56515,8 +56854,8 @@ self: {
          base base-prelude cmark containers hspec QuickCheck text
        ];
        description = "Represent cmark-parsed Markdown as a tree of sections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56528,8 +56867,8 @@ self: {
        sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm";
        libraryHaskellDepends = [ base ];
        description = "A binding to the standard C math library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56549,8 +56888,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56567,8 +56906,8 @@ self: {
          base hspec hspec-laws HUnit QuickCheck quickcheck-instances text
        ];
        description = "Library to compose and reuse command line fragments";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56586,7 +56925,7 @@ self: {
          base filepath process template-haskell transformers
        ];
        description = "Command line argument processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmdargs-browser" = callPackage
@@ -56606,7 +56945,7 @@ self: {
          process text transformers wai wai-handler-launch
        ];
        description = "Helper to enter cmdargs command lines using a web browser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmdlib" = callPackage
@@ -56619,8 +56958,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56642,8 +56981,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Declarative command-line option parsing and documentation library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56656,8 +56995,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hedgehog ];
        description = "(C)oncurrent (M)onoidal (F)olds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56669,7 +57008,7 @@ self: {
        sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph";
        libraryHaskellDepends = [ base ];
        description = "Events and Channels as in Concurrent ML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmonad" = callPackage
@@ -56680,8 +57019,8 @@ self: {
        sha256 = "07adwhpsmg3q4nhifjpdjv2dy1m08n0qkvlssmbl3b6gklvb82sk";
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56700,8 +57039,8 @@ self: {
        ];
        testSystemDepends = [ cmph ];
        description = "low level interface to CMPH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cmph = null;};
 
@@ -56716,8 +57055,8 @@ self: {
          base ghc magic-tyfams should-not-typecheck
        ];
        description = "Compare types of any kinds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56744,8 +57083,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Write consistent git commit messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56788,8 +57127,8 @@ self: {
          parsec StockholmAlignment template-haskell text vector
        ];
        description = "Detailed visualization of CMs, HMMs and their comparisions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56811,8 +57150,8 @@ self: {
          prettyclass process split stringtable-atom unix zlib
        ];
        description = "Compiler/Translator for CnC Specification Files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56824,7 +57163,7 @@ self: {
        sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m";
        libraryHaskellDepends = [ array base bytestring file-embed text ];
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "co-log" = callPackage
@@ -56850,9 +57189,7 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [ base co-log-core hedgehog ];
        description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-concurrent" = callPackage
@@ -56863,7 +57200,7 @@ self: {
        sha256 = "07z4aklk7dc2fhbc30kd9hbdvq71sa4ip6r2pyifcpn3p2pr3mna";
        libraryHaskellDepends = [ base co-log-core stm ];
        description = "Asynchronous backend for co-log library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-core" = callPackage
@@ -56877,7 +57214,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-json" = callPackage
@@ -56892,7 +57229,7 @@ self: {
          aeson base bytestring co-log-core containers string-conv text
        ];
        description = "Structured messages support in co-log ecosystem";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-polysemy" = callPackage
@@ -56906,8 +57243,8 @@ self: {
        libraryHaskellDepends = [ base co-log-core polysemy ];
        executableHaskellDepends = [ base co-log-core polysemy ];
        description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56931,8 +57268,8 @@ self: {
          polysemy-plugin
        ];
        description = "A Polysemy logging effect for high quality (unstructured) logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56953,8 +57290,8 @@ self: {
          universum unix
        ];
        description = "Syslog implementation on top of 'co-log-core'";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56973,8 +57310,8 @@ self: {
          base generic-random tasty tasty-quickcheck tasty-travis
        ];
        description = "Command-line options and DSV parsing and printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57000,7 +57337,7 @@ self: {
          linear megaparsec mtl parallel random split template-haskell text
        ];
        description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cobot-io" = callPackage
@@ -57011,8 +57348,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.3.12";
-       sha256 = "1jj9ip12zmy8qh080skm9fawasxprfbwiyzywilga7lr573wxb88";
+       version = "0.1.3.13";
+       sha256 = "0qi07canqwnwfvmbsp1j9lyklnn8h909r6js94xlpin1qa7dpjda";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -57023,8 +57360,8 @@ self: {
          neat-interpolation QuickCheck split text vector
        ];
        description = "Biological data file formats and IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57048,8 +57385,8 @@ self: {
          regex-tdfa text
        ];
        description = "Biological data file formats and IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {RNA = null;};
 
@@ -57061,8 +57398,8 @@ self: {
        sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57075,7 +57412,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Windows code page library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "codec" = callPackage
@@ -57097,8 +57434,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Simple bidirectional serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57113,8 +57450,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text zlib ];
        testHaskellDepends = [ base bytestring filepath process text ];
        description = "Erlang VM byte code assembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57137,8 +57474,8 @@ self: {
          QuickCheck regex-compat
        ];
        description = "Cross-platform structure serialisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57150,7 +57487,7 @@ self: {
        sha256 = "0kbn76g6ly1pjd9higi0k0f26hplm0jhz85b23inn0bjli14n2cl";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library to read and write mailboxes in mbox format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "codec-rpm" = callPackage
@@ -57173,8 +57510,8 @@ self: {
          HUnit parsec pretty text
        ];
        description = "A library for manipulating RPM files";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57198,8 +57535,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Codecov.io support for Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57218,8 +57555,8 @@ self: {
          MissingH process regex-posix time
        ];
        description = "Tool that automatically runs arbitrary commands when files change on disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57233,8 +57570,8 @@ self: {
        editedCabalFile = "11kw4xs61c5d3kvlanx9waws8sj5k4d5445a8w1p5zx69x9im7bg";
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        description = "Submit and retrieve paste output from CodePad.org.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57262,8 +57599,8 @@ self: {
          test-framework test-framework-hunit text time witherable
        ];
        description = "Graphics library for CodeWorld";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57289,8 +57626,8 @@ self: {
          http-client-tls network process transformers yaml
        ];
        description = "A ctags file generator for cabal project dependencies";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57306,8 +57643,8 @@ self: {
          base comonad haskell-src-meta parsec template-haskell uniplate
        ];
        description = "A notation for comonads, analogous to the do-notation for monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57320,7 +57657,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base unliftio ];
        description = "Having trouble deriving instances because of type roles? Solve it here!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "coerce-util" = callPackage
@@ -57331,7 +57668,7 @@ self: {
        sha256 = "0v4ymcrqij8q9s8pcgbfrnl8y379fki3zp80lg4xqvbx0i89vsxf";
        libraryHaskellDepends = [ base ];
        description = "utils for Data.Coerce";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "coercible-subtypes" = callPackage
@@ -57344,7 +57681,7 @@ self: {
        editedCabalFile = "05bd9lp5jp31ac039vq0p58kr03g5ai3cyymc4ikhbnl3x44hx4d";
        libraryHaskellDepends = [ base profunctors ];
        description = "Coercible but only in one direction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "coercible-utils" = callPackage
@@ -57357,8 +57694,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "Utility functions for Coercible types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57371,7 +57708,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers ];
        description = "Extra utilities for manipulating nominal and representational coercions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "coformat" = callPackage
@@ -57409,7 +57746,7 @@ self: {
          xml-conduit yaml
        ];
        description = "Generate clang-format config based on some existing code base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cofunctor" = callPackage
@@ -57420,7 +57757,7 @@ self: {
        sha256 = "0xn4k1c7l9z3g0slbwvlfg9kpfq8jbk0qf9363qz7azv7ks1149p";
        libraryHaskellDepends = [ base ];
        description = "DEPRECATED: use the \"contravariant\" package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cognimeta-utils" = callPackage
@@ -57447,7 +57784,7 @@ self: {
        ];
        description = "Utilities for Cognimeta products (such as perdure). API may change often.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "coin" = callPackage
@@ -57471,7 +57808,7 @@ self: {
        ];
        description = "Simple account manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57510,8 +57847,8 @@ self: {
          transformers unordered-containers uuid websockets
        ];
        description = "Connector library for the coinbase exchange";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57544,8 +57881,8 @@ self: {
          unagi-streams unordered-containers uuid vector websockets wuss
        ];
        description = "Client for Coinbase Pro";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57564,8 +57901,8 @@ self: {
          array base combinat containers tasty tasty-hunit
        ];
        description = "Equivariant CSM classes of coincident root loci";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57589,8 +57926,8 @@ self: {
          ListZipper monad-atom mtl nlp-scores split swift-lda text vector
        ];
        description = "Colada implements incremental word class class induction using online LDA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57608,8 +57945,8 @@ self: {
          pipes-attoparsec pipes-network text transformers
        ];
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57625,7 +57962,7 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "File transfer via QR Codes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "collada-output" = callPackage
@@ -57642,8 +57979,8 @@ self: {
          base collada-types containers SVGPath time vector xml
        ];
        description = "Generate animated 3d objects in COLLADA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57655,7 +57992,7 @@ self: {
        sha256 = "1qs1bxxkjb6clszv8mahbmwdwbqpdr5hcxwn3nq5d6wc2xgb4y6r";
        libraryHaskellDepends = [ base containers OpenGL tuple vector ];
        description = "Data exchange between graphics applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "collapse-duplication" = callPackage
@@ -57677,8 +58014,8 @@ self: {
          base bytestring cassava containers lens optparse-generic split
        ];
        description = "Collapse the duplication output into clones and return their frequencies";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57692,8 +58029,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "utility for collapsing adjacent writes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57716,8 +58053,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Collection+JSON—Hypermedia Type Tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57731,8 +58068,8 @@ self: {
          array base bytestring containers QuickCheck
        ];
        description = "Useful standard collections types and related functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57746,8 +58083,8 @@ self: {
        editedCabalFile = "073x7vwgsj2xcqpywqdwk7pbj9zc9sinm17sknafgyxacx1r15xl";
        libraryHaskellDepends = [ array base QuickCheck ];
        description = "API for collection data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57763,8 +58100,8 @@ self: {
          array base bytestring collections-api containers
        ];
        description = "Useful standard collections types and related functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57797,8 +58134,8 @@ self: {
          ansi-wl-pprint base doctest fast-logger QuickCheck semigroupoids
        ];
        description = "Generic types and functions for columnar encoding and decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57823,8 +58160,8 @@ self: {
          friday-devil split v4l2 vector vector-space yaml
        ];
        description = "Count colors in images";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57837,7 +58174,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Styled console text output using ANSI escape sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "colorize-haskell" = callPackage
@@ -57851,7 +58188,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base haskell-lexer ];
        executableHaskellDepends = [ ansi-terminal base haskell-lexer ];
        description = "Highligt Haskell source";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "colorless" = callPackage
@@ -57873,8 +58210,8 @@ self: {
          aeson base containers hspec scientific text tuple vector
        ];
        description = "Colorless | The Programmatic IDL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57891,8 +58228,8 @@ self: {
          text-conversions
        ];
        description = "Http Client addon for Colorless";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57906,8 +58243,8 @@ self: {
          aeson base colorless mtl scotty text wai
        ];
        description = "Scotty server add-on for Colorless";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57921,7 +58258,7 @@ self: {
        editedCabalFile = "0q152j8ybnga46azvfg3xmsjk01lz4wkhlli07cd92803vc4d6dl";
        libraryHaskellDepends = [ base lens linear profunctors ];
        description = "A type for colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "colour" = callPackage
@@ -57938,7 +58275,7 @@ self: {
          base QuickCheck random test-framework test-framework-quickcheck2
        ];
        description = "A model for human colour/color perception";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "colour-accelerate" = callPackage
@@ -57949,7 +58286,7 @@ self: {
        sha256 = "1j7ff2wb58yf346z2abr1v1yq498fxm498rdf1g62ppf6vkdplw8";
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "colour-space" = callPackage
@@ -57966,8 +58303,8 @@ self: {
          linear linearmap-category manifolds semigroups vector-space
        ];
        description = "Instances of the manifold-classes for colour types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57979,7 +58316,7 @@ self: {
        sha256 = "1iglvl6k8vrq45h5r8r2ng575dgg30jfw1zq19zld72914mmvjdz";
        libraryHaskellDepends = [ ansi-terminal base bytestring text ];
        description = "Convenient interface for printing colourful messages";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "coltrane" = callPackage
@@ -57995,8 +58332,8 @@ self: {
          wai-extra warp
        ];
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58017,8 +58354,8 @@ self: {
        ];
        doHaddock = false;
        description = "Enhanced serialization using seeking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58036,8 +58373,8 @@ self: {
          template-haskell text time unordered-containers vector
        ];
        description = "A CSV toolkit based on cassava and enum-text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58049,8 +58386,8 @@ self: {
        sha256 = "1y6zm63jyigf631f2b0bqw1yhmr6hifaspqivy7qy30brmr5a27m";
        doHaddock = false;
        description = "Haskell COM support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58069,8 +58406,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Commonmark processing in pure haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "comark-html" = callPackage
@@ -58089,8 +58426,8 @@ self: {
          base cmark comark-syntax comark-testutils criterion deepseq text
        ];
        description = "Commonmark (markdown) to HTML renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {comark-testutils = null;};
 
@@ -58116,8 +58453,8 @@ self: {
          text
        ];
        description = "Parser for Commonmark (markdown)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {comark-testutils = null;};
 
@@ -58129,8 +58466,8 @@ self: {
        sha256 = "0y1fp6griivzzxwp621cm2mrizxmrnjazhayl21aqfp7mb5i4ib2";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Definitions of AST that represents a Commonmark (markdown) document";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58154,8 +58491,8 @@ self: {
          transformers
        ];
        description = "Generate and manipulate various combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58175,7 +58512,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "Generate and manipulate various combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -58191,8 +58528,8 @@ self: {
          linear transformers
        ];
        description = "Graphical representations for various combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58214,8 +58551,8 @@ self: {
          template-haskell th-lift trifecta void
        ];
        description = "SKI Combinator interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58234,7 +58571,7 @@ self: {
          array base containers QuickCheck transformers utility-ht
        ];
        description = "Count, enumerate, rank and unrank combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "combinatorial-problems" = callPackage
@@ -58250,7 +58587,7 @@ self: {
        ];
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58262,7 +58599,7 @@ self: {
        sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a";
        libraryHaskellDepends = [ base ];
        description = "Efficient computation of common combinatoric functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "combobuffer" = callPackage
@@ -58277,8 +58614,8 @@ self: {
          base containers template-haskell vector vector-space
        ];
        description = "Various buffer implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58301,7 +58638,7 @@ self: {
          base ChasingBottoms containers QuickCheck tagged
        ];
        description = "Arrays where the index type is a function of the shape type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comfort-graph" = callPackage
@@ -58319,7 +58656,7 @@ self: {
          base containers QuickCheck transformers utility-ht
        ];
        description = "Graph structure with type parameters for nodes and edges";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comic" = callPackage
@@ -58335,8 +58672,8 @@ self: {
          time uuid
        ];
        description = "A format for describing comics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58350,7 +58687,7 @@ self: {
        testHaskellDepends = [ base QuickCheck text ];
        description = "CSV Parser & Producer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "command" = callPackage
@@ -58361,7 +58698,7 @@ self: {
        sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw";
        libraryHaskellDepends = [ base deepseq process ];
        description = "Conveniently run shell commands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "command-qq" = callPackage
@@ -58377,7 +58714,7 @@ self: {
          base doctest hspec template-haskell text transformers
        ];
        description = "Quasiquoters for external commands";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "commander" = callPackage
@@ -58392,8 +58729,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "pattern matching against string based commands";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58410,7 +58747,7 @@ self: {
        ];
        testHaskellDepends = [ base commandert text unordered-containers ];
        description = "A command line argument/option parser library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "commandert" = callPackage
@@ -58422,7 +58759,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad for commanders";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "commodities" = callPackage
@@ -58445,8 +58782,8 @@ self: {
          lens QuickCheck semigroups thyme transformers
        ];
        description = "Library for working with commoditized amounts and price histories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58457,8 +58794,8 @@ self: {
      }:
      mkDerivation {
        pname = "commonmark";
-       version = "0.1.1.2";
-       sha256 = "13gk08gigih75zq7kwc101yxmxvj3hvfyi67ap13nrabv70l6zjm";
+       version = "0.1.1.3";
+       sha256 = "1hwbii1d56979l0svvjayzhmwa25s66l36bb08hjq6p36lkv2a1v";
        libraryHaskellDepends = [
          base bytestring containers parsec text transformers
        ];
@@ -58469,7 +58806,7 @@ self: {
          base bytestring containers criterion text transformers
        ];
        description = "Pure Haskell commonmark parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commonmark-cli" = callPackage
@@ -58489,7 +58826,7 @@ self: {
          pretty-simple text
        ];
        description = "Command-line commonmark converter and highlighter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commonmark-extensions" = callPackage
@@ -58513,7 +58850,7 @@ self: {
          base bytestring commonmark containers criterion text transformers
        ];
        description = "Pure Haskell commonmark parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commonmark-pandoc" = callPackage
@@ -58528,7 +58865,7 @@ self: {
          base commonmark commonmark-extensions containers pandoc-types text
        ];
        description = "Bridge between commonmark and pandoc AST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commsec" = callPackage
@@ -58543,8 +58880,8 @@ self: {
          base bytestring cipher-aes128 crypto-api network
        ];
        description = "Provide communications security using symmetric ephemeral keys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58563,8 +58900,8 @@ self: {
          network RSA
        ];
        description = "Key agreement for commsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58582,7 +58919,7 @@ self: {
          tasty-hunit tasty-quickcheck vector
        ];
        description = "Commutative binary operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonad" = callPackage
@@ -58598,7 +58935,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Comonads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonad-extras" = callPackage
@@ -58614,7 +58951,7 @@ self: {
          transformers
        ];
        description = "Exotic comonad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonad-random" = callPackage
@@ -58626,7 +58963,7 @@ self: {
        libraryHaskellDepends = [ base category-extras random ];
        description = "Comonadic interface for random values";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "comonad-transformers" = callPackage
@@ -58638,7 +58975,7 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        doHaddock = false;
        description = "This package has been merged into comonad 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonads-fd" = callPackage
@@ -58650,7 +58987,7 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        doHaddock = false;
        description = "This package has been merged into comonad 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compact" = callPackage
@@ -58663,7 +59000,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ghc-compact ];
        testHaskellDepends = [ base directory ];
        description = "Non-GC'd, contiguous storage for immutable data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compact-list" = callPackage
@@ -58675,8 +59012,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ];
        description = "An append only list in a compact region";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58690,8 +59027,8 @@ self: {
          array base binary bytestring containers
        ];
        description = "Compact Data.Map implementation using Data.Binary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58711,8 +59048,8 @@ self: {
          transformers
        ];
        description = "Mutable arrays living on the compact heap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58726,8 +59063,8 @@ self: {
        libraryHaskellDepends = [ base compact ghc-prim primitive vector ];
        testHaskellDepends = [ base compact hspec ];
        description = "Mutable vector with different GC characteristics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58742,7 +59079,7 @@ self: {
        libraryHaskellDepends = [ base mtl primitive transformers ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Stacks, queues, and deques with compact representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compact-socket" = callPackage
@@ -58758,8 +59095,8 @@ self: {
          unix
        ];
        description = "Socket functions for compact normal form";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58773,8 +59110,8 @@ self: {
        editedCabalFile = "03cw0x4dg0qwaysf2sndyzm27sva6x415dxd70fs2vcbys5m1j8j";
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58788,8 +59125,8 @@ self: {
        editedCabalFile = "1akx1kzpirl1fc3lfcrsa88jvrk023f9qyj2b2fbpz4p11d07qfc";
        libraryHaskellDepends = [ base bytestring ];
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58806,8 +59143,8 @@ self: {
          base primitive QuickCheck random tasty tasty-hunit tasty-quickcheck
        ];
        description = "Small vectors of small integers stored very compactly";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58819,8 +59156,8 @@ self: {
        sha256 = "1qw47ps6bnp6xwaksqq7plry0ivsm18f0vf79yi1n755w6p49648";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58833,7 +59170,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A read-only memory-efficient key-value store";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compare-type" = callPackage
@@ -58844,7 +59181,7 @@ self: {
        sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb";
        libraryHaskellDepends = [ base ];
        description = "compare types of any kinds in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compdata" = callPackage
@@ -58871,8 +59208,8 @@ self: {
          template-haskell th-expand-syns transformers uniplate
        ];
        description = "Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58888,8 +59225,8 @@ self: {
          base compdata containers criterion projection
        ];
        description = "Tree automata on Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58911,8 +59248,8 @@ self: {
          unordered-containers vector
        ];
        description = "Compositional Data Types on DAGs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58928,7 +59265,7 @@ self: {
          base composition containers deriving-compat fixplate tree-view
        ];
        description = "Compdata basics implemented on top of Fixplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compdata-param" = callPackage
@@ -58948,8 +59285,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Parametric Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58967,7 +59304,7 @@ self: {
          pandoc pandoc-throw path rio vinyl
        ];
        description = "Parse a Pandoc to a composite value";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "compdoc-dhall-decoder" = callPackage
@@ -58985,7 +59322,7 @@ self: {
          text
        ];
        description = "Allows you to write FromDhall instances for Compdoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compendium-client" = callPackage
@@ -59001,8 +59338,8 @@ self: {
          servant-client text
        ];
        description = "Client for the Compendium schema server";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59026,7 +59363,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Compensated floating-point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "competition" = callPackage
@@ -59037,8 +59374,8 @@ self: {
        sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn";
        libraryHaskellDepends = [ base filepath parsec ];
        description = "Helpers and runners for code competitions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59050,8 +59387,8 @@ self: {
        sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril";
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59068,7 +59405,7 @@ self: {
          base binary parsec tasty tasty-hunit tasty-quickcheck tasty-th text
        ];
        description = "Parser for common compiler warning formats";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "complex-generic" = callPackage
@@ -59081,8 +59418,8 @@ self: {
        editedCabalFile = "00v0mr5fc090wph3s9ks3ppf81nqbkd0yfa347fkn3zrq3daqr8f";
        libraryHaskellDepends = [ base template-haskell ];
        description = "complex numbers with non-mandatory RealFloat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59094,7 +59431,7 @@ self: {
        sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj";
        libraryHaskellDepends = [ base ];
        description = "A simple integration function to integrate a complex-valued complex functions";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "complexity" = callPackage
@@ -59110,8 +59447,8 @@ self: {
          transformers
        ];
        description = "Empirical algorithmic complexity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59132,7 +59469,7 @@ self: {
          teardown
        ];
        description = "Monad for allocation and cleanup of application resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "componentm-devel" = callPackage
@@ -59145,7 +59482,7 @@ self: {
          base componentm foreign-store rio teardown
        ];
        description = "Easy REPL driven development using ComponentM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composable-associations" = callPackage
@@ -59157,7 +59494,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base lens tasty tasty-hunit ];
        description = "Types and helpers for composing types into a single larger key-value type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composable-associations-aeson" = callPackage
@@ -59176,7 +59513,7 @@ self: {
          aeson base bytestring doctest tasty tasty-hunit tasty-quickcheck
        ];
        description = "Aeson ToJSON/FromJSON implementation for the types of composable-associations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compose-ltr" = callPackage
@@ -59188,7 +59525,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "More intuitive, left-to-right function composition";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "compose-trans" = callPackage
@@ -59199,8 +59536,8 @@ self: {
        sha256 = "0p2fd0knfbfjk4s0aalzrsrzpxffrykmaprxyakbgs1lmp4jyq9z";
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59228,7 +59565,7 @@ self: {
          unordered-containers vector vinyl
        ];
        description = "JSON for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-aeson-cofree-list" = callPackage
@@ -59243,7 +59580,7 @@ self: {
          aeson base composite-aeson composite-aeson-writeonly free vector
        ];
        description = "Print a Cofree [] as a JSON value";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-aeson-path" = callPackage
@@ -59254,7 +59591,7 @@ self: {
        sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx";
        libraryHaskellDepends = [ base composite-aeson path ];
        description = "Formatting data for the path library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-aeson-refined" = callPackage
@@ -59269,7 +59606,7 @@ self: {
          aeson-better-errors base composite-aeson mtl refined
        ];
        description = "composite-aeson support for Refined from the refined package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-aeson-throw" = callPackage
@@ -59284,7 +59621,7 @@ self: {
          aeson aeson-better-errors base composite-aeson exceptions
        ];
        description = "MonadThrow behaviour for composite-aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-aeson-writeonly" = callPackage
@@ -59298,7 +59635,7 @@ self: {
          aeson aeson-better-errors base composite-aeson
        ];
        description = "WriteOnly indicators for composite-aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-base" = callPackage
@@ -59321,7 +59658,7 @@ self: {
          unliftio-core vinyl
        ];
        description = "Shared utilities for composite-* packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-binary" = callPackage
@@ -59332,7 +59669,7 @@ self: {
        sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp";
        libraryHaskellDepends = [ base binary composite-base ];
        description = "Orphan binary instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-ekg" = callPackage
@@ -59346,7 +59683,7 @@ self: {
          base composite-base ekg-core lens text vinyl
        ];
        description = "EKG Metrics for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-hashable" = callPackage
@@ -59357,7 +59694,7 @@ self: {
        sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1";
        libraryHaskellDepends = [ base composite-base hashable ];
        description = "Orphan hashable instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-opaleye" = callPackage
@@ -59379,8 +59716,8 @@ self: {
          vinyl
        ];
        description = "Opaleye SQL for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59402,8 +59739,8 @@ self: {
          lens QuickCheck swagger2 template-haskell text vinyl
        ];
        description = "Swagger for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59415,7 +59752,7 @@ self: {
        sha256 = "0y5xz4q5z2lw3jy3fdm5rl19sd969cdpq1a44ar45dpab0qffr41";
        libraryHaskellDepends = [ base composite-base ];
        description = "Tuple functions for composite records";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-xstep" = callPackage
@@ -59426,7 +59763,7 @@ self: {
        sha256 = "18q75ynlywr6yap6nn11x5kzxncn0b6ghmvbg642617pznznpfm9";
        libraryHaskellDepends = [ base composite-base vinyl ];
        description = "ReaderT transformer pattern for higher kinded composite data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composition" = callPackage
@@ -59436,7 +59773,7 @@ self: {
        version = "1.0.2.1";
        sha256 = "0smdyzcnfwiab1wnazmk4szali1ckh7dqcdp9vn7qnnabq7k08vi";
        description = "Combinators for unorthodox function composition";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composition-extra" = callPackage
@@ -59447,7 +59784,7 @@ self: {
        sha256 = "0abipab6bx138rynpkh4daj53bv5yqbw94zfswysyq6iix529669";
        libraryHaskellDepends = [ base composition contravariant ];
        description = "Combinators for unorthodox structure composition";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composition-prelude" = callPackage
@@ -59458,7 +59795,7 @@ self: {
        sha256 = "151inlk43m96pnasc6llsjh8vxyc9b1i7xdgf1sp5p5072bzq305";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composition-tree" = callPackage
@@ -59470,8 +59807,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Composition trees for arbitrary monoids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59491,8 +59828,8 @@ self: {
        testHaskellDepends = [ base c smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base c criterion ];
        description = "Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {c = null;};
 
@@ -59505,7 +59842,7 @@ self: {
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base-prelude ];
        description = "Sum and Product types and such";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "comprehensions-ghc" = callPackage
@@ -59519,8 +59856,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols ghc syb util ];
        testHaskellDepends = [ base ];
        description = "Plugin to generalize comprehensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59540,8 +59877,8 @@ self: {
          semigroupoids semigroups unordered-containers
        ];
        description = "Compressed containers and reducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59554,7 +59891,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Common compression algorithms";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "compstrat" = callPackage
@@ -59569,8 +59906,8 @@ self: {
          base compdata mtl template-haskell th-expand-syns transformers
        ];
        description = "Strategy combinators for compositional data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59588,8 +59925,8 @@ self: {
          template-haskell th-expand-syns
        ];
        description = "Automatically converting ASTs into compositional data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59641,8 +59978,8 @@ self: {
          test-framework-hunit transformers type-natural vector
        ];
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59659,8 +59996,8 @@ self: {
          vector
        ];
        description = "Collection of algorithms in Computational Geometry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59672,8 +60009,8 @@ self: {
        sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260";
        libraryHaskellDepends = [ base ];
        description = "Advanced notions of computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59685,7 +60022,7 @@ self: {
        sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A library for postfix control flow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conceit" = callPackage
@@ -59699,7 +60036,7 @@ self: {
          base bifunctors semigroupoids semigroups void
        ];
        description = "Concurrent actions that may fail with a value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concise" = callPackage
@@ -59716,7 +60053,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Utilities for Control.Lens.Cons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concorde" = callPackage
@@ -59727,7 +60064,7 @@ self: {
        sha256 = "0903lrj6bzajjdr01hbld1jm6vf7assn84hqk4kgrrs1mr3ykc20";
        libraryHaskellDepends = [ base containers process safe temporary ];
        description = "Simple interface to the Concorde solver for the Traveling Salesperson Problem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concraft" = callPackage
@@ -59751,8 +60088,8 @@ self: {
          transformers vector vector-binary zlib
        ];
        description = "Morphological disambiguation based on constrained CRFs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59774,8 +60111,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "Part-of-speech tagger for Croatian";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59804,8 +60141,8 @@ self: {
          dhall filepath pedestrian-dag sgd tagset-positional text
        ];
        description = "Morphological tagger for Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59850,7 +60187,7 @@ self: {
        ];
        description = "Library for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59868,7 +60205,7 @@ self: {
        ];
        description = "Automatically generated Thrift definitions for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59889,7 +60226,7 @@ self: {
        ];
        description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59909,8 +60246,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Binary and Hashable instances for TypeRep";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59926,7 +60263,7 @@ self: {
          base free mtl natural-transformation stm transformers
        ];
        description = "A client side web UI framework for Haskell. Core framework.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrency" = callPackage
@@ -59942,7 +60279,7 @@ self: {
          transformers
        ];
        description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "concurrency-benchmarks" = callPackage
@@ -59964,8 +60301,8 @@ self: {
          async base deepseq gauge mtl random streamly transformers
        ];
        description = "Benchmarks to compare concurrency APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59977,7 +60314,7 @@ self: {
        sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv";
        libraryHaskellDepends = [ base ];
        description = "Simple thread barriers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-batch" = callPackage
@@ -59988,7 +60325,7 @@ self: {
        sha256 = "1f77p053hpiaf7xp916rff9hp29hisk7cwxcq72l5v4h4g3ps59d";
        libraryHaskellDepends = [ base clock stm ];
        description = "Concurrent batching queue based on STM with timeout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-buffer" = callPackage
@@ -60007,8 +60344,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Concurrent expanding buffer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60033,7 +60370,7 @@ self: {
        ];
        testHaskellDepends = [ async base dns hspec ];
        description = "Concurrent DNS cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-extra" = callPackage
@@ -60050,7 +60387,7 @@ self: {
          unbounded-delays
        ];
        description = "Extra concurrency primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-hashtable" = callPackage
@@ -60074,8 +60411,8 @@ self: {
          hashable random stm stm-containers unordered-containers vector
        ];
        description = "Thread-safe hash tables for multi-cores!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dictionary-type = null;};
 
@@ -60097,8 +60434,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60115,7 +60452,7 @@ self: {
          terminal-size text transformers unix
        ];
        description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "concurrent-resource-map" = callPackage
@@ -60127,7 +60464,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers random stm ];
        description = "Concurrent resource map";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -60138,7 +60475,7 @@ self: {
        sha256 = "0k0iwax6nx4jvqh7rawis5dp7lxx8bc3r3x0rr8qy7vsp14lmvgg";
        libraryHaskellDepends = [ base ];
        description = "An abstraction for inter-thread RPC based on MVars";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "concurrent-sa" = callPackage
@@ -60149,7 +60486,7 @@ self: {
        sha256 = "1szvw0vih5jx2hvgb3h7mqh05im3pw687h7dshiy4ii5vs9pi6d6";
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Concurrent simulated annealing system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-split" = callPackage
@@ -60160,7 +60497,7 @@ self: {
        sha256 = "0i9gak7q3ay8g1kzq7dg0bs36bg88n7kwy3h1r6jrni7mz7jh05f";
        libraryHaskellDepends = [ base ];
        description = "MVars and Channels with distinguished input and output side";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-st" = callPackage
@@ -60171,7 +60508,7 @@ self: {
        sha256 = "08zjpyf1jrsn161z9dngag63s47vrvz4m8aani9lvmlacbzpjfwd";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Concurrent Haskell in ST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-state" = callPackage
@@ -60184,8 +60521,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        description = "MTL-like library using TVars";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60200,7 +60537,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim hashable ];
        testHaskellDepends = [ base containers ];
        description = "A fast concurrent unique identifier supply with a pure API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-utilities" = callPackage
@@ -60213,7 +60550,7 @@ self: {
        editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15";
        libraryHaskellDepends = [ base ];
        description = "More utilities and broad-used datastructures for concurrency";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrentoutput" = callPackage
@@ -60224,7 +60561,7 @@ self: {
        sha256 = "0fd372awmxrngbcb2phyzy3az9j2327kdhjnm7c5mm808vix67a8";
        libraryHaskellDepends = [ base ];
        description = "Ungarble output from several threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cond" = callPackage
@@ -60235,7 +60572,7 @@ self: {
        sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
        libraryHaskellDepends = [ base ];
        description = "Basic conditional and boolean operators with monadic variants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "condor" = callPackage
@@ -60256,8 +60593,8 @@ self: {
          base binary Cabal containers glider-nlp HUnit text
        ];
        description = "Information retrieval library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60269,8 +60606,8 @@ self: {
        sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd";
        libraryHaskellDepends = [ array base ];
        description = "Library for Condorcet voting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60282,8 +60619,8 @@ self: {
        sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp";
        libraryHaskellDepends = [ array base containers random stm time ];
        description = "a library for live coding and real-time musical applications";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60295,7 +60632,7 @@ self: {
        sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p";
        doHaddock = false;
        description = "a library for displaying musical time in a terminal-based clock";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "conductive-hsc3" = callPackage
@@ -60311,8 +60648,8 @@ self: {
          hosc hsc3 random
        ];
        description = "a library with examples of using Conductive with hsc3";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60324,8 +60661,8 @@ self: {
        sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi";
        libraryHaskellDepends = [ base conductive-base random ];
        description = "a library of functions which are useful for composing music";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60342,7 +60679,7 @@ self: {
          transformers
        ];
        description = "Lightweight composable continuation-based stream processors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit" = callPackage
@@ -60370,7 +60707,7 @@ self: {
          transformers vector
        ];
        description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -60405,7 +60742,7 @@ self: {
          streaming-commons transformers unliftio-core vector
        ];
        description = "Conduit-based algorithms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-audio" = callPackage
@@ -60418,7 +60755,7 @@ self: {
        editedCabalFile = "0zldqx1r2wmvqwg8r6x7v65h2nqr7fjcxab74f0f5i1nqsd5b51a";
        libraryHaskellDepends = [ base conduit vector ];
        description = "Combinators to efficiently slice and dice audio streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-audio-lame" = callPackage
@@ -60437,8 +60774,8 @@ self: {
        librarySystemDepends = [ mp3lame ];
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the LAME MP3 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mp3lame = null;};
 
@@ -60458,8 +60795,8 @@ self: {
        librarySystemDepends = [ samplerate ];
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the libsamplerate resampling library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {samplerate = null;};
 
@@ -60476,7 +60813,7 @@ self: {
          transformers
        ];
        description = "conduit-audio interface to the libsndfile audio file library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-combinators" = callPackage
@@ -60488,7 +60825,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "DEPRECATED Functionality merged into the conduit package itself";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-concurrent-map" = callPackage
@@ -60504,7 +60841,7 @@ self: {
        ];
        testHaskellDepends = [ base conduit hspec HUnit say ];
        description = "Concurrent, order-preserving mapping Conduit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-connection" = callPackage
@@ -60524,7 +60861,7 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Conduit source and sink for Network.Connection.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-extra" = callPackage
@@ -60552,7 +60889,7 @@ self: {
          base bytestring bytestring-builder conduit gauge transformers
        ];
        description = "Batteries included conduit: adapters for common libraries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-find" = callPackage
@@ -60586,8 +60923,8 @@ self: {
          transformers-base unix-compat
        ];
        description = "A file-finding conduit that allows user control over traversals";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60608,8 +60945,8 @@ self: {
          base bytestring conduit criterion mtl text
        ];
        description = "Conduit for character encoding conversion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60621,7 +60958,7 @@ self: {
        sha256 = "0ys65vs5wb412bimmsmkmf14krk2339n9rswynnwy3rdb74bsswf";
        libraryHaskellDepends = [ base conduit mtl ];
        description = "Merge multiple sorted conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-network-stream" = callPackage
@@ -60636,8 +60973,8 @@ self: {
          base bytestring conduit mtl network-conduit resourcet
        ];
        description = "A base layer for network protocols using Conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60660,7 +60997,7 @@ self: {
          tasty-hunit
        ];
        description = "Parsing framework based on conduit";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "conduit-resumablesink" = callPackage
@@ -60676,8 +61013,8 @@ self: {
          base bytestring conduit hspec resourcet transformers void
        ];
        description = "Allows conduit to resume sinks to feed multiple sources into it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60701,8 +61038,8 @@ self: {
          test-framework-hunit throttle-io-stream unliftio unliftio-core
        ];
        description = "Throttle Conduit Producers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60722,8 +61059,8 @@ self: {
        executableHaskellDepends = [ attoparsec base conduit resourcet ];
        testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
        description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60748,8 +61085,8 @@ self: {
          resourcet text transformers unix unliftio unordered-containers
        ];
        description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60776,8 +61113,8 @@ self: {
          zip-archive
        ];
        description = "Zip archive interface for the Conduit Virtual File System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60796,7 +61133,7 @@ self: {
          quickcheck-instances tasty tasty-quickcheck zstd
        ];
        description = "Conduit-based ZStd Compression";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conf" = callPackage
@@ -60812,8 +61149,8 @@ self: {
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        description = "Parser for Haskell-based configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60830,7 +61167,7 @@ self: {
          aeson base binary bytestring directory hspec QuickCheck
        ];
        description = "read, parse json config";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "confcrypt" = callPackage
@@ -60865,37 +61202,19 @@ self: {
          parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck
          text transformers
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "conferer" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , hspec, text
-     }:
-     mkDerivation {
-       pname = "conferer";
-       version = "0.4.1.1";
-       sha256 = "1fi3sflfkzgxzjv5s0w6ja9dqrlc72lli382j6phqdw3h4qja10d";
-       libraryHaskellDepends = [
-         base bytestring containers directory text
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory hspec text
-       ];
-       description = "Configuration management library";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "conferer_1_0_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , filepath, hspec, QuickCheck, text
      }:
      mkDerivation {
        pname = "conferer";
-       version = "1.0.0.0";
-       sha256 = "0hxlr45yfzv1lxw9lz7mk5risshdhmznxz0xqx5bsdyl7nbd79pv";
+       version = "1.0.0.1";
+       sha256 = "0cfn6aj265qs1qk5z942g5l2cz2gsj35bapxynj4c90wjl89wz5r";
        libraryHaskellDepends = [
          base bytestring containers directory filepath text
        ];
@@ -60904,8 +61223,7 @@ self: {
          QuickCheck text
        ];
        description = "Configuration management library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-aeson" = callPackage
@@ -60925,7 +61243,7 @@ self: {
          unordered-containers vector
        ];
        description = "conferer's source for reading json files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-dhall" = callPackage
@@ -60945,7 +61263,9 @@ self: {
          hspec text
        ];
        description = "Configuration for reading dhall files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-hedis" = callPackage
@@ -60957,32 +61277,19 @@ self: {
        libraryHaskellDepends = [ base conferer hedis text ];
        testHaskellDepends = [ base conferer hedis hspec text ];
        description = "conferer's FromConfig instances for hedis settings";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-hspec" = callPackage
     ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
      mkDerivation {
        pname = "conferer-hspec";
-       version = "0.4.0.1";
-       sha256 = "1g2dglsvj7caqrvbg1yc08j98ljf71l885kxmmk469ab07j1c5sz";
-       libraryHaskellDepends = [ base conferer hspec-core text ];
-       testHaskellDepends = [ base conferer hspec hspec-core text ];
-       description = "conferer's FromConfig instances for hspec Config";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "conferer-hspec_1_0_0_0" = callPackage
-    ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
-     mkDerivation {
-       pname = "conferer-hspec";
        version = "1.0.0.0";
        sha256 = "02c4z2999pa04r78n8xzx7idvgg028wlb2fgyk0878wb1gahzsxp";
        libraryHaskellDepends = [ base conferer hspec-core text ];
        testHaskellDepends = [ base conferer hspec hspec-core text ];
        description = "conferer's FromConfig instances for hspec Config";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-provider-dhall" = callPackage
@@ -61002,8 +61309,8 @@ self: {
          directory hspec text
        ];
        description = "Configuration for reading dhall files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61024,8 +61331,8 @@ self: {
          unordered-containers vector
        ];
        description = "conferer's provider for reading json files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61044,8 +61351,8 @@ self: {
          base conferer conferer-provider-json hspec yaml
        ];
        description = "Configuration for reading yaml files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61064,7 +61371,7 @@ self: {
          base conferer hspec snap-core snap-server text
        ];
        description = "conferer's FromConfig instances for snap Config";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-source-dhall" = callPackage
@@ -61084,7 +61391,9 @@ self: {
          directory hspec text
        ];
        description = "Configuration for reading dhall files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-source-json" = callPackage
@@ -61104,7 +61413,9 @@ self: {
          unordered-containers vector
        ];
        description = "conferer's source for reading json files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-source-yaml" = callPackage
@@ -61121,7 +61432,9 @@ self: {
          base conferer conferer-source-json hspec yaml
        ];
        description = "Configuration for reading yaml files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-warp" = callPackage
@@ -61129,21 +61442,6 @@ self: {
      }:
      mkDerivation {
        pname = "conferer-warp";
-       version = "0.4.0.1";
-       sha256 = "1swvrkfqvpnpw2nihqzgn8rxv0pfbc9cl8wlyfshrqirjm0lhbj3";
-       libraryHaskellDepends = [ base conferer http-types text wai warp ];
-       testHaskellDepends = [
-         base conferer hspec http-types text wai warp
-       ];
-       description = "conferer's FromConfig instances for warp settings";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "conferer-warp_1_0_0_0" = callPackage
-    ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp
-     }:
-     mkDerivation {
-       pname = "conferer-warp";
        version = "1.0.0.0";
        sha256 = "14wrd50dfgc2m6lyfvsx4w605r8krf6ha96j3685vgy6fylff1bd";
        libraryHaskellDepends = [ base conferer http-types text wai warp ];
@@ -61151,8 +61449,7 @@ self: {
          base conferer hspec http-types text wai warp
        ];
        description = "conferer's FromConfig instances for warp settings";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-yaml" = callPackage
@@ -61164,7 +61461,7 @@ self: {
        libraryHaskellDepends = [ base conferer conferer-aeson yaml ];
        testHaskellDepends = [ base conferer conferer-aeson hspec yaml ];
        description = "Configuration for reading yaml files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "confetti" = callPackage
@@ -61185,7 +61482,7 @@ self: {
          base tasty tasty-hunit tasty-smallcheck text
        ];
        description = "A simple config file swapping tool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conffmt" = callPackage
@@ -61202,8 +61499,8 @@ self: {
          base language-conf megaparsec optparse-applicative pretty text
        ];
        description = "A .conf file formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61218,8 +61515,8 @@ self: {
        libraryHaskellDepends = [ base deiko-config exceptions text ];
        testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
        description = "derive typeclass instances for decoding types from HOCON conf";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61240,7 +61537,7 @@ self: {
          base containers directory hedgehog ini text unordered-containers
        ];
        description = "A library for simple INI-based configuration files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "config-manager" = callPackage
@@ -61261,7 +61558,7 @@ self: {
          text time unordered-containers
        ];
        description = "Configuration management";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "config-parser" = callPackage
@@ -61273,8 +61570,8 @@ self: {
        libraryHaskellDepends = [ base parsec text ];
        testHaskellDepends = [ base extra hspec lens parsec text ];
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61292,8 +61589,8 @@ self: {
        ];
        testHaskellDepends = [ base config-value text ];
        description = "Schema definitions for the config-value package";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "config-select" = callPackage
@@ -61308,8 +61605,8 @@ self: {
          base directory filepath unix vty-menu
        ];
        description = "A small program for swapping out dot files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61324,8 +61621,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base text ];
        description = "Simple, layout-based value language similar to YAML or JSON";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "config-value-getopt" = callPackage
@@ -61338,8 +61635,8 @@ self: {
        editedCabalFile = "1b5wfbqjjx6y8ll5h3vp2cmcdrcnjd3295y8ykd25yjx6f3swsja";
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61368,8 +61665,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "parser for config files, shell variables, command line args";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61381,8 +61678,8 @@ self: {
        sha256 = "1jqc5xpbxrlnpxk2yci861gpxl5c9vm9lffchrpp1hk8ag5wkxk1";
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61414,7 +61711,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Tools for specifying and parsing configurations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "configurator" = callPackage
@@ -61436,7 +61733,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Configuration management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "configurator-export" = callPackage
@@ -61453,7 +61750,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Pretty printer and exporter for configurations from the \"configurator\" library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "configurator-ng" = callPackage
@@ -61476,8 +61773,8 @@ self: {
          test-framework-hunit text
        ];
        description = "The next generation of configuration management";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61498,7 +61795,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Reduced parser for configurator-ng config files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "confsolve" = callPackage
@@ -61516,8 +61813,8 @@ self: {
          time unordered-containers
        ];
        description = "A command line tool for resolving conflicts of file synchronizers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61529,8 +61826,8 @@ self: {
        sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v";
        libraryHaskellDepends = [ array base containers ];
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61542,7 +61839,7 @@ self: {
        sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya";
        libraryHaskellDepends = [ base containers random ];
        description = "Sparse matrix linear-equation solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conjure" = callPackage
@@ -61562,8 +61859,8 @@ self: {
          old-time parsec pretty random stm unix
        ];
        description = "A BitTorrent client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61581,8 +61878,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Tools for functors from Hask^k to Hask";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61597,8 +61894,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
        description = "A logger for a concurrent program";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61618,7 +61915,7 @@ self: {
          socks tls x509 x509-store x509-system x509-validation
        ];
        description = "Simple and easy network connections API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "connection-pool" = callPackage
@@ -61635,7 +61932,7 @@ self: {
          streaming-commons time transformers-base
        ];
        description = "Connection pool built on top of resource-pool and streaming-commons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "connection-string" = callPackage
@@ -61651,8 +61948,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest text ];
        description = "A library for parsing connection strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61669,7 +61966,9 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Orders, Galois connections, and lattices";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "consistent" = callPackage
@@ -61686,8 +61985,8 @@ self: {
        ];
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61705,8 +62004,8 @@ self: {
          parsec parsec-extra split transformers unix utility-ht
        ];
        description = "Interpret the command line and a config file as commands and options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61718,7 +62017,7 @@ self: {
        sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw";
        libraryHaskellDepends = [ base ];
        description = "console user prompts";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "console-style" = callPackage
@@ -61729,7 +62028,7 @@ self: {
        sha256 = "0zxxs59bzgf81d3ww285znmmciij3rswfgyc89ngxb6p86l8x0bd";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Styled console text output using ANSI escape sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "const-math-ghc-plugin" = callPackage
@@ -61741,8 +62040,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc ];
        testHaskellDepends = [ base directory process ];
        description = "Compiler plugin for constant math elimination";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61754,7 +62053,7 @@ self: {
        sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd";
        libraryHaskellDepends = [ attoparsec base bytestring vector ];
        description = "Parse ByteStrings of a prescribed length";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constr-eq" = callPackage
@@ -61765,8 +62064,8 @@ self: {
        sha256 = "0vk3cz6897vjnn1q7y1sqxy42ii4pq5h7jxw1zyybi99p6c4vgm6";
        libraryHaskellDepends = [ base ];
        description = "Equality by only Constructor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61778,7 +62077,7 @@ self: {
        sha256 = "00bd12gkv5yrqn52dyw3yjk2yind3m6d11k2d517gxanq9jqyx2c";
        libraryHaskellDepends = [ base ];
        description = "Generalization of standard Functor, Foldable, and Traversable classes";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "constrained-categories" = callPackage
@@ -61793,8 +62092,8 @@ self: {
          base contravariant fail semigroups tagged trivial-constraint void
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61814,8 +62113,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constrained Categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61828,8 +62127,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dynamic typing with retained constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61853,8 +62152,8 @@ self: {
          smallcheck transformers vector
        ];
        description = "Typeclasses and instances for monads with constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61868,7 +62167,7 @@ self: {
        editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj";
        libraryHaskellDepends = [ base ];
        description = "Normalised Deep Embeddings for Constrained Type-Class Instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constrained-platform-instances" = callPackage
@@ -61881,7 +62180,7 @@ self: {
          array base constrained containers vector
        ];
        description = "Instances of standard platform types for 'constrained' package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "constraint" = callPackage
@@ -61894,7 +62193,7 @@ self: {
        editedCabalFile = "0ivca43m1lqi75462z4hacvzs27whqzjnby7y7jjji8kqaw8wlda";
        libraryHaskellDepends = [ base category unconstrained ];
        description = "Reified constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraint-classes" = callPackage
@@ -61905,7 +62204,7 @@ self: {
        sha256 = "08b9rsvrmwkb1gl3x7d24cpghfband7cgzw4ldvxzjqvgmnyf9jy";
        libraryHaskellDepends = [ base constraints transformers ];
        description = "Various typeclasses using ConstraintKinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraint-manip" = callPackage
@@ -61916,8 +62215,8 @@ self: {
        sha256 = "1kxg2iid906rw53r12rha8q3031ixdi3wlviprswig911x9c0zbk";
        libraryHaskellDepends = [ base indextype ];
        description = "Some conviencience type functions for manipulating constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61929,7 +62228,7 @@ self: {
        sha256 = "1v1m5vvicjmmz7mdp6fqf75fi2vf0hy25fyxgxpd4d7fbbyjvnh1";
        libraryHaskellDepends = [ base category constraint reflection ];
        description = "Constraint reflection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraint-tuples" = callPackage
@@ -61940,7 +62239,7 @@ self: {
        sha256 = "16f9y0q771f3mc38g8jpr875c8grjav6sg9lwbhg7nmcvcczwqk2";
        libraryHaskellDepends = [ base ];
        description = "Partially applicable constraint tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraints" = callPackage
@@ -61959,7 +62258,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Constraint manipulation";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "constraints-deriving" = callPackage
@@ -61980,7 +62279,7 @@ self: {
          base bytestring filepath ghc ghc-paths path path-io
        ];
        description = "Manipulating constraints and deriving class instances programmatically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraints-emerge" = callPackage
@@ -61996,8 +62295,8 @@ self: {
        ];
        testHaskellDepends = [ base constraints hspec transformers ];
        description = "Defer instance lookups until runtime";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62014,7 +62313,7 @@ self: {
        libraryHaskellDepends = [ base constraints template-haskell ];
        executableHaskellDepends = [ aeson base constraints ];
        description = "Utility package for constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constrictor" = callPackage
@@ -62025,7 +62324,7 @@ self: {
        sha256 = "17vdyc2r9fgblh2pjwdrya7iyrb83ay09zhpfvn80rrrj3d2nd8x";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "strict versions of many things in base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "construct" = callPackage
@@ -62051,7 +62350,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Haskell version of the Construct library for easy specification of file formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constructible" = callPackage
@@ -62066,8 +62365,8 @@ self: {
          base binary-search complex-generic integer-roots
        ];
        description = "Exact computation with constructible real numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62079,8 +62378,8 @@ self: {
        sha256 = "17ab0vkq5w3zwh76ws7b82wbc0871qdmvrxhxga78h3h0axjiz1x";
        libraryHaskellDepends = [ base QuickCheck type-level ];
        description = "A library of constructive algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62105,8 +62404,8 @@ self: {
          tasty-hunit text transformers typed-process unliftio uuid
        ];
        description = "A consul client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62133,8 +62432,8 @@ self: {
          transformers transformers-base
        ];
        description = "Concurrent PostgreSQL data consumers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62148,8 +62447,8 @@ self: {
          base containers convert lens text vector
        ];
        description = "Containers abstraction and utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62161,7 +62460,7 @@ self: {
        sha256 = "1vlwaf363ymxpq0ry3h1lbn1dlyvf0dmja1q410ks0byz8kc77r7";
        libraryHaskellDepends = [ base vector ];
        description = "Functions for building containers from a known number of elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "container-classes" = callPackage
@@ -62172,7 +62471,7 @@ self: {
        sha256 = "18mx50mp9pv1a33kcwmckz6r4a0j6rlc1165ivn9cj8iiwpmd6pv";
        libraryHaskellDepends = [ base ];
        description = "Generic classes for interacting with different container types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "containers_0_6_4_1" = callPackage
@@ -62183,8 +62482,8 @@ self: {
        sha256 = "0vn43a7bf49pih9b65b359xf3658d96dpm9j35i8x8j61vlrcsid";
        libraryHaskellDepends = [ array base deepseq ];
        description = "Assorted concrete container types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "containers-accelerate" = callPackage
@@ -62202,8 +62501,8 @@ self: {
          hashable-accelerate hedgehog tasty tasty-hedgehog
        ];
        description = "Hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "containers-benchmark" = callPackage
@@ -62220,8 +62519,8 @@ self: {
          base bytestring containers criterion deepseq ghc-prim random
        ];
        description = "Extensive benchmark suite for containers package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62233,7 +62532,7 @@ self: {
        sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Provide orphan NFData instances for containers as needed. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "containers-unicode-symbols" = callPackage
@@ -62244,7 +62543,7 @@ self: {
        sha256 = "006znsrwz3sssvg53mail2xd98hq6y4l83140sd2fzyg4df25js7";
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "containers-verified" = callPackage
@@ -62255,8 +62554,8 @@ self: {
        sha256 = "08cwfn71ffvjfp252l3whic90rqyq1jvrk0m9xp54kh3g2rdqma9";
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62281,8 +62580,8 @@ self: {
          hspec memory mtl resourcet temporary
        ];
        description = "Store and retrieve data from an on-disk store";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62298,7 +62597,7 @@ self: {
        testHaskellDepends = [ async base ghc-prim hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Thread-indexed, nested contexts";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "context-free-art" = callPackage
@@ -62321,7 +62620,7 @@ self: {
          base bifunctors blaze-markup blaze-svg HUnit random text text-show
        ];
        description = "Generate art from context-free grammars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "context-free-grammar" = callPackage
@@ -62344,8 +62643,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Basic algorithms on context-free grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62364,7 +62663,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Modify HTTP requests/responses using context";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "context-resource" = callPackage
@@ -62377,7 +62676,7 @@ self: {
        testHaskellDepends = [ async base context hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Thread-safe, pool-compatible resource provider";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "context-stack" = callPackage
@@ -62390,8 +62689,8 @@ self: {
          base classy-prelude mtl unordered-containers
        ];
        description = "An abstraction of a stack and stack-based monadic context";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62410,7 +62709,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Add request-specific (or not!) context to your WAI applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "contiguous" = callPackage
@@ -62433,8 +62732,8 @@ self: {
          base primitive random random-shuffle weigh
        ];
        description = "Unified interface for primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62446,8 +62745,8 @@ self: {
        sha256 = "0jfqxz0v107xw6mjr0wb1abb6v5zd3siy7z0gk9nqcvyacb80z4a";
        libraryHaskellDepends = [ base contiguous primitive ];
        description = "contiguous with bounds checks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62459,8 +62758,8 @@ self: {
        sha256 = "0nnxr6yihb82c7in0hsb7k9jkjccx5040pvxj5gb06ahzz5ls5yn";
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "dft of contiguous memory structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62477,8 +62776,8 @@ self: {
          transformers-base
        ];
        description = "Monads with suspension and arbitrary-spot reentry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62492,7 +62791,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Types and functions for working with continued fractions in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "continued-fractions" = callPackage
@@ -62509,7 +62808,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Continued fractions";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "continuum" = callPackage
@@ -62525,8 +62824,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62541,11 +62840,22 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "contra-tracer" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "contra-tracer";
+       version = "0.1.0.0";
+       sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br";
+       libraryHaskellDepends = [ base ];
+       description = "Arrow and contravariant tracers";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "contracheck-applicative" = callPackage
     ({ mkDerivation, base, containers, contravariant, generics-sop
      , microlens, mmorph
@@ -62558,7 +62868,7 @@ self: {
          base containers contravariant generics-sop microlens mmorph
        ];
        description = "Validation types/typeclass based on the contravariance";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contravariant" = callPackage
@@ -62569,7 +62879,7 @@ self: {
        sha256 = "1haxsq7jl95gzmbjdr2pgza9b7j0j3f26wwkf494gphz6c76yls4";
        libraryHaskellDepends = [ base StateVar transformers ];
        description = "Contravariant functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contravariant-extras" = callPackage
@@ -62584,7 +62894,7 @@ self: {
          base contravariant template-haskell template-haskell-compat-v0208
        ];
        description = "Extras for the \"contravariant\" package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "control" = callPackage
@@ -62600,8 +62910,8 @@ self: {
          base basic stm template-haskell transformers
        ];
        description = "Class of monad transformers which control operations can be lifted thru";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62613,7 +62923,7 @@ self: {
        sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
        libraryHaskellDepends = [ base ];
        description = "Useful combinators for boolean expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-dotdotdot" = callPackage
@@ -62624,7 +62934,7 @@ self: {
        sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
        libraryHaskellDepends = [ base ];
        description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-dsl" = callPackage
@@ -62642,7 +62952,7 @@ self: {
          base containers doctest doctest-discover temporary
        ];
        description = "An alternative to monads in do-notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-event" = callPackage
@@ -62654,7 +62964,7 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        testHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-iso" = callPackage
@@ -62669,8 +62979,8 @@ self: {
          base bytestring newtype-generics profunctors text
        ];
        description = "A typeclass for type isomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62682,8 +62992,8 @@ self: {
        sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
        libraryHaskellDepends = [ attempt base transformers ];
        description = "Monad transformer for attempt. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62700,7 +63010,7 @@ self: {
          transformers-base
        ];
        description = "Explicitly typed, checked exceptions with stack traces";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-exception-monadsfd" = callPackage
@@ -62715,8 +63025,8 @@ self: {
          base control-monad-exception monads-fd transformers
        ];
        description = "Monads-fd instances for the EMT exceptions monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62732,7 +63042,7 @@ self: {
          base control-monad-exception monads-tf transformers
        ];
        description = "Monads-tf instances for the EMT exceptions monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-exception-mtl" = callPackage
@@ -62744,7 +63054,7 @@ self: {
        libraryHaskellDepends = [ base control-monad-exception mtl ];
        doHaddock = false;
        description = "MTL instances for the EMT exceptions monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-failure" = callPackage
@@ -62755,8 +63065,8 @@ self: {
        sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq";
        libraryHaskellDepends = [ base failure transformers ];
        description = "A class for monads which can fail with an error. (deprecated)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62768,8 +63078,8 @@ self: {
        sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j";
        libraryHaskellDepends = [ base failure mtl ];
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62781,7 +63091,7 @@ self: {
        sha256 = "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33";
        libraryHaskellDepends = [ base transformers ];
        description = "Free monads and monad transformers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-loop" = callPackage
@@ -62792,7 +63102,7 @@ self: {
        sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
        libraryHaskellDepends = [ base transformers transformers-base ];
        description = "Simple monad transformer for imperative-style loops";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-monad-omega" = callPackage
@@ -62803,7 +63113,7 @@ self: {
        sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n";
        libraryHaskellDepends = [ base ];
        description = "A breadth-first list monad";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-queue" = callPackage
@@ -62814,7 +63124,7 @@ self: {
        sha256 = "1dfiys93i7wnbf33dgb324gp57ab5y7pn405hq8iciq2c7kzfa6l";
        libraryHaskellDepends = [ base ];
        description = "Reusable corecursive queues, via continuations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-timeout" = callPackage
@@ -62825,7 +63135,7 @@ self: {
        sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg";
        libraryHaskellDepends = [ base containers stm time ];
        description = "Timeout handling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contstuff" = callPackage
@@ -62836,7 +63146,7 @@ self: {
        sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003";
        libraryHaskellDepends = [ base transformers ];
        description = "Fast, easy to use CPS-based monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contstuff-monads-tf" = callPackage
@@ -62847,8 +63157,8 @@ self: {
        sha256 = "0j4y76ar0m642jxcyrvlrxagawrlq637cvx3fqprw5sl5cslgxh5";
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62860,8 +63170,8 @@ self: {
        sha256 = "0b5vskp1bxqpi4ffcxwjw6kr0jd6n8v8jlhf03p54ckfd5ym4ai6";
        libraryHaskellDepends = [ base contstuff transformers ];
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62873,7 +63183,7 @@ self: {
        sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
        libraryHaskellDepends = [ base ];
        description = "Limit operations for converging sequences";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "conversion" = callPackage
@@ -62886,7 +63196,7 @@ self: {
        editedCabalFile = "17hrwyhlcch970vb4gk793xhcpg035n0gxypbjz58vkka04j3d4d";
        libraryHaskellDepends = [ base-prelude ];
        description = "Universal converter between values of different types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversion-bytestring" = callPackage
@@ -62897,7 +63207,7 @@ self: {
        sha256 = "0ybh702mrwjvm48i03bb5hfiiz5qypyxyz5n14wai0kjn4ks1qwh";
        libraryHaskellDepends = [ base-prelude bytestring conversion ];
        description = "\"Conversion\" instances for the \"bytestring\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversion-case-insensitive" = callPackage
@@ -62908,7 +63218,7 @@ self: {
        sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp";
        libraryHaskellDepends = [ case-insensitive conversion ];
        description = "\"Conversion\" instances for the \"case-insensitive\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversion-text" = callPackage
@@ -62923,7 +63233,7 @@ self: {
          base-prelude bytestring conversion conversion-bytestring text
        ];
        description = "\"Conversion\" instances for the \"text\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversions" = callPackage
@@ -62944,8 +63254,8 @@ self: {
          source-constraints template-haskell text unliftio-core
        ];
        description = "Injective explicit total and partial conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62963,8 +63273,8 @@ self: {
          lens template-haskell text utf8-string
        ];
        description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62988,8 +63298,8 @@ self: {
          pipes-bytestring pipes-csv text vector
        ];
        description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63007,7 +63317,7 @@ self: {
          base bytestring containers mtl old-locale old-time text time
        ];
        description = "Typeclasses and instances for converting between types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "convertible-ascii" = callPackage
@@ -63023,8 +63333,8 @@ self: {
          convertible-text failure text
        ];
        description = "convertible instances for ascii";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63045,8 +63355,8 @@ self: {
          time
        ];
        description = "Typeclasses and instances for converting between types (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63058,7 +63368,7 @@ self: {
        sha256 = "0bdsdq5m4skh3sh6dfz7jrdcsnyg5vb392n6gcqm9s1m0749r4b3";
        libraryHaskellDepends = [ base directory strict ];
        description = "Tiered general-purpose libraries with domain-specific applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cookie" = callPackage
@@ -63078,7 +63388,7 @@ self: {
          text time
        ];
        description = "HTTP cookie parsing and rendering";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cookies" = callPackage
@@ -63091,8 +63401,8 @@ self: {
          base bytestring chronos hashable text time
        ];
        description = "web cookies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63105,8 +63415,8 @@ self: {
        libraryHaskellDepends = [ base lens papa transformers ];
        testHaskellDepends = [ base HUnit lens ];
        description = "A representation of latitude and longitude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63127,8 +63437,8 @@ self: {
        ];
        executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
        description = "A stream DSL for writing embedded C programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63151,8 +63461,8 @@ self: {
          language-c99-simple pretty process QuickCheck
        ];
        description = "A compiler for Copilot targeting C99";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63169,8 +63479,8 @@ self: {
          pretty process
        ];
        description = "Copilot interface to a C model-checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63182,7 +63492,7 @@ self: {
        sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga";
        libraryHaskellDepends = [ base dlist mtl pretty ];
        description = "An intermediate representation for Copilot";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "copilot-language" = callPackage
@@ -63198,8 +63508,8 @@ self: {
          ghc-prim mtl
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63215,8 +63525,8 @@ self: {
          array base containers copilot-language data-reify mtl parsec
        ];
        description = "Libraries for the Copilot language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63232,8 +63542,8 @@ self: {
          base containers copilot-core directory filepath pretty sbv
        ];
        description = "A compiler for CoPilot targeting SBV";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63251,8 +63561,8 @@ self: {
          directory mtl parsec pretty process random transformers xml
        ];
        description = "k-induction for Copilot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63272,8 +63582,8 @@ self: {
        ];
        testHaskellDepends = [ base hlint ];
        description = "Haskell interface to the Fedora Copr system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63300,7 +63610,7 @@ self: {
          which
        ];
        description = "Yet another shell monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "core" = callPackage
@@ -63311,8 +63621,8 @@ self: {
        sha256 = "1fqgfbd3in8l84250kda67paakz4sr2ywf5qzsy403546w7q9ccz";
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63332,7 +63642,7 @@ self: {
        executableHaskellDepends = [ array base ];
        executableToolDepends = [ alex happy ];
        description = "compile your own mini functional language with Core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "core-data" = callPackage
@@ -63349,7 +63659,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "Convenience wrappers around common data structures and encodings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "core-haskell" = callPackage
@@ -63364,8 +63674,8 @@ self: {
          base haskeline haskell-src-exts hint
        ];
        description = "A subset of Haskell using in UCC for teaching purpose";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63387,7 +63697,7 @@ self: {
          transformers unix
        ];
        description = "Opinionated Haskell Interoperability";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "core-text" = callPackage
@@ -63404,7 +63714,7 @@ self: {
          prettyprinter template-haskell text text-short
        ];
        description = "A rope type based on a finger tree over UTF-8 fragments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "corebot-bliki" = callPackage
@@ -63430,8 +63740,8 @@ self: {
          yesod
        ];
        description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63449,7 +63759,7 @@ self: {
        executableHaskellDepends = [ base process unix ];
        testHaskellDepends = [ base process ];
        description = "Write your main like it can call itself back";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "corenlp-parser" = callPackage
@@ -63469,8 +63779,8 @@ self: {
        ];
        librarySystemDepends = [ rocksdb ];
        description = "Launches CoreNLP and parses the JSON output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) rocksdb;};
 
@@ -63493,7 +63803,7 @@ self: {
        ];
        description = "classy optical monadic state";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "coroutine-enumerator" = callPackage
@@ -63505,7 +63815,7 @@ self: {
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
        description = "Bridge between the monad-coroutine and enumerator packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63518,7 +63828,7 @@ self: {
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63530,8 +63840,8 @@ self: {
        sha256 = "1hgpy3fswhars994mz3756firiy0g5brx7w9is4nfhg8mr5vf3yg";
        libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63550,8 +63860,8 @@ self: {
          vector
        ];
        description = "A CouchDB view server for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63578,8 +63888,8 @@ self: {
        ];
        testToolDepends = [ couchdb ];
        description = "A modern, lightweight, complete client for CouchDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -63608,8 +63918,8 @@ self: {
          unordered-containers
        ];
        description = "Couch DB client library using http-conduit and aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63637,8 +63947,8 @@ self: {
          utf8-string vector
        ];
        description = "Couch DB client library using http-enumerator and aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63650,7 +63960,7 @@ self: {
        sha256 = "1az2vr1rjq4pfgzswwbwgfq4kcb8kq759vn5kl7ghzaqr7b6vkgx";
        libraryHaskellDepends = [ base ];
        description = "Bijective mappings between values and possibly infinite prefixes of [0..]";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "countable" = callPackage
@@ -63666,7 +63976,7 @@ self: {
          base bytestring silently tasty tasty-golden tasty-hunit
        ];
        description = "Countable, Searchable, Finite, Empty classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "countable-inflections" = callPackage
@@ -63682,8 +63992,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Countable Text Inflections";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63695,8 +64005,8 @@ self: {
        sha256 = "0jc34nrbzxzilrr1s2k7krrp9g5xc40hpf2srw6mccfrcsyacsnc";
        libraryHaskellDepends = [ base containers ];
        description = "An object frequency counter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63717,7 +64027,7 @@ self: {
          base QuickCheck quickcheck-classes tasty tasty-quickcheck
        ];
        description = "Country data type and functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "country-codes" = callPackage
@@ -63733,8 +64043,8 @@ self: {
        libraryHaskellDepends = [ aeson base deepseq shakespeare text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
        description = "ISO 3166 country codes and i18n names";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63759,8 +64069,8 @@ self: {
          test-framework test-framework-hunit
        ];
        description = "A message-passing library for simplifying network applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63780,8 +64090,8 @@ self: {
          optparse-applicative process stm text time unix
        ];
        description = "Simple and flexible CI system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63794,8 +64104,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Exhaustivity Checking Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63809,7 +64119,7 @@ self: {
          base groups primitive refined semirings
        ];
        description = "Coya monoids";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cparsing" = callPackage
@@ -63825,8 +64135,8 @@ self: {
          split template-haskell transformers
        ];
        description = "A simple C++ parser with preprocessor features. C++ refactorings included.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63846,8 +64156,8 @@ self: {
          resourcet
        ];
        description = "Conduit-based CPIO";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63878,8 +64188,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63897,8 +64207,8 @@ self: {
        ];
        librarySystemDepends = [ cplex ];
        description = "high-level CPLEX interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) cplex;};
 
   "cplusplus-th" = callPackage
@@ -63914,8 +64224,8 @@ self: {
        ];
        testHaskellDepends = [ base process QuickCheck ];
        description = "C++ Foreign Import Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63929,7 +64239,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Bindings for C++ demangling routines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cpphs" = callPackage
@@ -63962,7 +64272,7 @@ self: {
          base bytestring criterion crypto-random mtl
        ];
        description = "Crypto Pseudo Random Number Generator using AES in counter mode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cprng-aes-effect" = callPackage
@@ -63980,8 +64290,8 @@ self: {
          extensible-effects
        ];
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63996,7 +64306,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers directory parallel ];
        description = "Symbolic cryptographic protocol analyzer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cpu" = callPackage
@@ -64010,7 +64320,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Cpu information and properties helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cpuid" = callPackage
@@ -64034,7 +64344,7 @@ self: {
        sha256 = "0mans1i26w3rl1vvf9isn8y6lvmn9dlf2c0znbgjxj605jcy7cyi";
        libraryHaskellDepends = [ attoparsec base bytestring deepseq ];
        description = "Haskell Library for Checking CPU Information";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cpuperf" = callPackage
@@ -64047,8 +64357,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl process ];
        description = "Modify the cpu frequency on OpenBSD systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64056,16 +64366,16 @@ self: {
     ({ mkDerivation, base, bytestring, c2hs, python3, text }:
      mkDerivation {
        pname = "cpython";
-       version = "3.5.0";
-       sha256 = "0ivvz6f824d2g4pk3qglz8fhzahp0kfjyv2wy6qpwfwcf1gvw7lg";
+       version = "3.5.1";
+       sha256 = "13vb65vgd9jncys1phgm3d9jmn3nq5k4ln2my34gc8vqpp7qxyh1";
        libraryHaskellDepends = [ base bytestring text ];
        libraryPkgconfigDepends = [ python3 ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base text ];
        testPkgconfigDepends = [ python3 ];
        description = "Bindings for libpython";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python3;};
 
@@ -64088,7 +64398,7 @@ self: {
        ];
        description = "Cassandra CQL binary protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cql-io" = callPackage
@@ -64115,8 +64425,8 @@ self: {
        ];
        doHaddock = false;
        description = "Cassandra CQL client";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64128,8 +64438,8 @@ self: {
        sha256 = "14mr1i7g61h25fn2xa02iyzq1mxcgzkisfmiakdakiya4zxjk10f";
        libraryHaskellDepends = [ base bytestring cql-io tinylog ];
        description = "Tinylog integration for cql-io";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64142,7 +64452,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Command-Query Responsibility Segregation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cqrs-core" = callPackage
@@ -64158,8 +64468,8 @@ self: {
          uuid-types
        ];
        description = "Command-Query Responsibility Segregation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64181,8 +64491,8 @@ self: {
          transformers uuid-types wai-extra wai-middleware-static warp
        ];
        description = "Example for cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64199,8 +64509,8 @@ self: {
        ];
        testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ];
        description = "Memory backend for the cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64224,8 +64534,8 @@ self: {
          pg-harness-client postgresql-libpq random resource-pool uuid-types
        ];
        description = "PostgreSQL backend for the cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64246,8 +64556,8 @@ self: {
          text transformers
        ];
        description = "SQLite3 backend for the cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64264,8 +64574,8 @@ self: {
          transformers
        ];
        description = "Command-Query Responsibility Segregation Test Support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64283,8 +64593,8 @@ self: {
          lifted-base random transformers uuid-types
        ];
        description = "Command-Query Responsibility Segregation Test Support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64297,7 +64607,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Command-Query Responsibility Segregation. Modules for the basic types.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cr" = callPackage
@@ -64315,8 +64625,8 @@ self: {
          base cmdargs directory process shelly text transformers unix
        ];
        description = "Code review tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64330,7 +64640,7 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {crack = null;};
 
@@ -64345,7 +64655,7 @@ self: {
        libraryHaskellDepends = [ array base FloatingHex ];
        executableHaskellDepends = [ array base FloatingHex ];
        description = "Crack various integer, floating-point data formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "craft" = callPackage
@@ -64376,8 +64686,8 @@ self: {
          base hspec hspec-megaparsec megaparsec QuickCheck
        ];
        description = "A UNIX configuration management library in Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64391,8 +64701,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base colour mtl vector-space ];
        description = "2D graphics library with integrated TikZ output";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64404,8 +64714,8 @@ self: {
        sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z";
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
        description = "Cairo backend for Craftwerk";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64423,8 +64733,8 @@ self: {
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
        description = "Gtk UI for Craftwerk";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64445,8 +64755,8 @@ self: {
          tagsoup text time
        ];
        description = "Simulation user crawl paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64479,8 +64789,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "HTTP Racing Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64498,8 +64808,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implements various Cyclic Redundancy Checks (CRC)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64511,8 +64821,8 @@ self: {
        sha256 = "15x3xwq2vyg474m09jak1c2zx9w5acpfjgmy5jj4asxj33z9n7bz";
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64524,7 +64834,7 @@ self: {
        sha256 = "0x943wmcbj679kj7q2a2ipjycq17ajm71m487vkb8b6gdrdy8f2z";
        libraryHaskellDepends = [ array base ];
        description = "Compute CRC16 checksums using a lookup table";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crc32c" = callPackage
@@ -64541,7 +64851,7 @@ self: {
          base bytestring hspec hspec-core QuickCheck
        ];
        description = "Haskell bindings for crc32c";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crdt" = callPackage
@@ -64557,8 +64867,8 @@ self: {
          safe stm time vector
        ];
        description = "Conflict-free replicated data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64569,16 +64879,16 @@ self: {
      }:
      mkDerivation {
        pname = "crdt-event-fold";
-       version = "1.3.0.0";
-       sha256 = "0zpbn7rx9zywrfhpaj7lji0is0sb61al7q8fddrxy8vvirvhbb85";
+       version = "1.4.0.0";
+       sha256 = "0hagrbsgw58kchiifhq69s4hii7pv8zsvfzl3ijgxkb8iqp515gc";
        libraryHaskellDepends = [
          aeson base binary containers data-default-class data-dword
          monad-logger mtl transformers
        ];
        testHaskellDepends = [ base hspec ];
        description = "Garbage collected event folding CRDT";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64604,8 +64914,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Framework for artificial life experiments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64625,8 +64935,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "Library to access secure credential storage providers";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64648,7 +64958,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Secure Credentials Storage and Distribution";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "credentials-cli" = callPackage
@@ -64673,7 +64983,7 @@ self: {
        ];
        description = "Secure Credentials Administration";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "crf-chain1" = callPackage
@@ -64690,8 +65000,8 @@ self: {
          parallel random sgd vector vector-binary-instances vector-th-unbox
        ];
        description = "First-order, linear-chain conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64711,8 +65021,8 @@ self: {
          vector-binary vector-th-unbox
        ];
        description = "First-order, constrained, linear-chain conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64730,8 +65040,8 @@ self: {
          logfloat monad-codec parallel sgd vector vector-binary
        ];
        description = "Second-order, generic, constrained, linear conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64750,8 +65060,8 @@ self: {
          vector-binary vector-th-unbox
        ];
        description = "Second-order, tiered, constrained, linear conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64780,8 +65090,8 @@ self: {
          vector
        ];
        description = "Crit-bit maps and sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64819,7 +65129,7 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Robust, reliable performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "criterion-compare" = callPackage
@@ -64840,8 +65150,8 @@ self: {
          data-default filepath lens lucid optparse-applicative text vector
        ];
        description = "A simple tool for visualising differences in Criterion benchmark results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64857,7 +65167,7 @@ self: {
          aeson base base-compat binary containers deepseq vector
        ];
        description = "Criterion measurement functionality and associated types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "criterion-plus" = callPackage
@@ -64884,8 +65194,8 @@ self: {
          transformers transformers-base vector
        ];
        description = "Enhancement of the \"criterion\" benchmarking library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64904,8 +65214,8 @@ self: {
          aeson base blaze-html blaze-markup bytestring containers filepath
        ];
        description = "Convert criterion output to HTML reports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64922,8 +65232,8 @@ self: {
          unix
        ];
        description = "CRIU RPC client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64937,8 +65247,8 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
        libraryPkgconfigDepends = [ protobuf ];
        description = "Criu RPC protocol buffer types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) protobuf;};
 
@@ -64954,8 +65264,8 @@ self: {
        libraryHaskellDepends = [ base containers free mtl text ];
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64967,8 +65277,8 @@ self: {
        sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26";
        libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64987,8 +65297,8 @@ self: {
          mersenne-random-pure64 mtl parallel
        ];
        description = "An offline renderer supporting ray tracing and photon mapping";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65011,7 +65321,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ attoparsec base criterion text time ];
        description = "Cron datatypes and Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cron-compat" = callPackage
@@ -65032,8 +65342,8 @@ self: {
          text time transformers
        ];
        description = "Cron datatypes and Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65051,7 +65361,7 @@ self: {
          text transformers unordered-containers vector
        ];
        description = "Another bloated standard library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cruncher-types" = callPackage
@@ -65063,8 +65373,8 @@ self: {
        libraryHaskellDepends = [ aeson base containers lens text ];
        testHaskellDepends = [ base hlint ];
        description = "Request and Response types for Eval.so's API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65083,8 +65393,8 @@ self: {
          transformers unix
        ];
        description = "A runghc replacement with transparent caching";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65106,8 +65416,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65125,7 +65435,7 @@ self: {
          base bytestring cereal entropy tagged transformers
        ];
        description = "A generic interface for cryptographic operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-api-tests" = callPackage
@@ -65144,7 +65454,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A test framework and KATs for cryptographic operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-cipher-benchmarks" = callPackage
@@ -65160,8 +65470,8 @@ self: {
          securemem
        ];
        description = "Generic cryptography cipher benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65184,7 +65494,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Generic cryptography cipher tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-cipher-types" = callPackage
@@ -65196,7 +65506,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base byteable bytestring securemem ];
        description = "Generic cryptography cipher types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-classical" = callPackage
@@ -65213,8 +65523,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "An educational tool for studying classical cryptography schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65236,8 +65546,8 @@ self: {
          cryptocipher cryptohash-cryptoapi hspec skein transformers
        ];
        description = "Conduit interface for cryptographic operations (from crypto-api)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65259,7 +65569,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-keys-ssh" = callPackage
@@ -65272,8 +65582,8 @@ self: {
          base base64-bytestring binary bytestring
        ];
        description = "Like crypto-pubkey-openssh but not dependent on any specific crypto library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65294,8 +65604,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65319,7 +65629,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion mtl ];
        description = "Cryptographic numbers: functions and algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-pubkey" = callPackage
@@ -65345,7 +65655,7 @@ self: {
          cryptohash deepseq mtl
        ];
        description = "Public Key cryptography";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-pubkey-openssh" = callPackage
@@ -65368,8 +65678,8 @@ self: {
          QuickCheck tasty tasty-quickcheck temporary
        ];
        description = "OpenSSH keys decoder/encoder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65381,7 +65691,7 @@ self: {
        sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby";
        libraryHaskellDepends = [ asn1-encoding asn1-types base ];
        description = "Generic cryptography Public keys algorithm types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-random" = callPackage
@@ -65394,7 +65704,7 @@ self: {
        editedCabalFile = "1ax1iafbbqkcrvjnnxlvqh2zgpx8xzcbxl6l870207bpzwrja2f1";
        libraryHaskellDepends = [ base bytestring securemem unix vector ];
        description = "Simple cryptographic random related types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-random-api" = callPackage
@@ -65405,7 +65715,7 @@ self: {
        sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
        libraryHaskellDepends = [ base bytestring entropy ];
        description = "Simple random generators API for cryptography related code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-random-effect" = callPackage
@@ -65423,8 +65733,8 @@ self: {
          transformers
        ];
        description = "A random effect using crypto-random";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65441,7 +65751,7 @@ self: {
          transformers-base
        ];
        description = "Cryptographic random number generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-simple" = callPackage
@@ -65455,8 +65765,8 @@ self: {
          base bytestring cryptonite hspec QuickCheck
        ];
        description = "A simple high level encryption interface based on cryptonite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65478,18 +65788,18 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Easy-and-safe-to-use high-level cryptography based on Sodium";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "crypto-token" = callPackage
     ({ mkDerivation, array, base, cryptonite, memory }:
      mkDerivation {
        pname = "crypto-token";
-       version = "0.0.0.0";
-       sha256 = "1azvzzf4w6q76fbggw4f4inqibkvzy9chpdd01349rm8b0nyfh50";
+       version = "0.0.1";
+       sha256 = "1djn3fhxm639qarjjrax60p3kva54baj8sdcdlng02034kjzx6i6";
        libraryHaskellDepends = [ array base cryptonite memory ];
        description = "crypto tokens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-totp" = callPackage
@@ -65504,7 +65814,7 @@ self: {
          base bytestring cereal containers cryptohash tagged unix
        ];
        description = "Provides generation and verification services for time-based one-time keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptocipher" = callPackage
@@ -65520,8 +65830,8 @@ self: {
          cipher-rc4 crypto-cipher-types
        ];
        description = "Symmetrical block and stream ciphers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65540,8 +65850,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-expectations MissingH ];
        description = "Haskell wrapper for the cryptocompare API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65565,8 +65875,8 @@ self: {
          tasty-hunit text transformers
        ];
        description = "Interledger Crypto-Conditions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65588,7 +65898,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base byteable bytestring criterion ];
        description = "collection of crypto hashes, fast, pure and practical";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-conduit" = callPackage
@@ -65604,7 +65914,7 @@ self: {
          transformers
        ];
        description = "cryptohash conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-cryptoapi" = callPackage
@@ -65620,7 +65930,7 @@ self: {
          base bytestring cereal crypto-api cryptonite memory tagged
        ];
        description = "Crypto-api interfaces for cryptohash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-md5" = callPackage
@@ -65640,7 +65950,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical MD5 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha1" = callPackage
@@ -65660,7 +65970,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-1 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha256" = callPackage
@@ -65682,7 +65992,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-256 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha512" = callPackage
@@ -65693,8 +66003,8 @@ self: {
        pname = "cryptohash-sha512";
        version = "0.11.100.1";
        sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h";
-       revision = "4";
-       editedCabalFile = "0iqs51a58w71j1zz3rn9kical63yvvqqqrc6971mh6wfscyi1gqr";
+       revision = "5";
+       editedCabalFile = "0ccvr3sp7mnllbd430l91b5ij70gg3g05nm9n6qaxzx2vaqdlyc2";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -65702,7 +66012,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-512 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptoids" = callPackage
@@ -65721,8 +66031,8 @@ self: {
          directory exceptions filepath memory
        ];
        description = "Reversable and secure encoding of object ids as a bytestring";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65736,8 +66046,8 @@ self: {
        editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld";
        libraryHaskellDepends = [ base cryptoids-types exceptions ];
        description = "Typeclass-based interface to cryptoids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65755,8 +66065,8 @@ self: {
          aeson base binary deepseq hashable http-api-data path-pieces
        ];
        description = "Shared types for encrypting internal object identifiers before exposure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65793,8 +66103,8 @@ self: {
          base criterion deepseq directory filepath sbv text
        ];
        description = "Cryptol: The Language of Cryptography";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65817,7 +66127,7 @@ self: {
          base bytestring deepseq gauge memory random
        ];
        description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptonite-conduit" = callPackage
@@ -65840,7 +66150,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "cryptonite conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptonite-openssl" = callPackage
@@ -65860,7 +66170,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Crypto stuff using OpenSSL cryptographic library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "cryptostore" = callPackage
@@ -65881,7 +66191,7 @@ self: {
          tasty-hunit tasty-quickcheck x509
        ];
        description = "Serialization of cryptographic data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptsy-api" = callPackage
@@ -65902,8 +66212,8 @@ self: {
          unordered-containers vector
        ];
        description = "Bindings for Cryptsy cryptocurrency exchange API";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65915,8 +66225,8 @@ self: {
        sha256 = "14mh098kgckncips17bdsbg08q78xk1114174zq860z4znmc1gxv";
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65944,8 +66254,8 @@ self: {
        sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f";
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for common subexpression elimination";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65977,8 +66287,8 @@ self: {
          base criterion simple-vec3 strict vector
        ];
        description = "Analytical CSG (Constructive Solid Geometry) library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65994,7 +66304,7 @@ self: {
          base csound-expression csound-sampler sharc-timbre transformers
        ];
        description = "a gallery of Csound instruments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-controllers" = callPackage
@@ -66005,7 +66315,7 @@ self: {
        sha256 = "1p2fa00djwyrv7fdrngawmk3r41q6a4mlsqgdm4qajmivbj0sg9m";
        libraryHaskellDepends = [ base csound-expression ];
        testHaskellDepends = [ base csound-expression ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression" = callPackage
@@ -66024,7 +66334,7 @@ self: {
          process temporal-media transformers
        ];
        description = "library to make electronic music";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression-dynamic" = callPackage
@@ -66041,7 +66351,7 @@ self: {
          deriving-compat hashable transformers wl-pprint
        ];
        description = "dynamic core for csound-expression library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression-opcodes" = callPackage
@@ -66056,7 +66366,7 @@ self: {
          base csound-expression-dynamic csound-expression-typed transformers
        ];
        description = "opcodes for the library csound-expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression-typed" = callPackage
@@ -66076,7 +66386,7 @@ self: {
          NumInstances temporal-media transformers wl-pprint
        ];
        description = "typed core for the library csound-expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-sampler" = callPackage
@@ -66087,7 +66397,7 @@ self: {
        sha256 = "0mi7w39adkn5l1h05arfap3c0ddb8j65wv96i3jrswpc3ljf3b2y";
        libraryHaskellDepends = [ base csound-expression transformers ];
        description = "A musical sampler based on Csound";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csp" = callPackage
@@ -66117,8 +66427,8 @@ self: {
          base directory filepath haskeline libcspm mtl
        ];
        description = "A command line type checker for CSPM files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66130,8 +66440,8 @@ self: {
        sha256 = "029r1a6w76v9nqf70w3p5yqjmmnba4xyi3ldx10wl526d247r9r9";
        libraryHaskellDepends = [ base containers pretty ];
        description = "AST and pretty printer for CSPm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66143,8 +66453,8 @@ self: {
        sha256 = "150gdsf059x658z6cbclrydzbynw06nhrpf4i1l9gwb6siarvjv9";
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66161,7 +66471,9 @@ self: {
          shakespeare text
        ];
        description = "Defining and manipulating css easing strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "css-selectors" = callPackage
@@ -66183,8 +66495,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 text
        ];
        description = "Parsing, rendering and manipulating css selectors in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66206,7 +66518,7 @@ self: {
          base criterion deepseq directory scientific text
        ];
        description = "High-performance CSS tokenizer and serializer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "css-text" = callPackage
@@ -66218,7 +66530,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
        description = "CSS parser and renderer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "csv" = callPackage
@@ -66229,7 +66541,7 @@ self: {
        sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
        libraryHaskellDepends = [ base filepath parsec ];
        description = "CSV loader and dumper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "csv-conduit" = callPackage
@@ -66255,7 +66567,7 @@ self: {
          test-framework test-framework-hunit text transformers vector
        ];
        description = "A flexible, fast, conduit-based CSV parser library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csv-enumerator" = callPackage
@@ -66272,8 +66584,8 @@ self: {
          directory enumerator safe transformers unix-compat
        ];
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66292,7 +66604,7 @@ self: {
        ];
        description = "A collection of CSV tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66304,7 +66616,7 @@ self: {
        sha256 = "1p5waqb9sj3xjrc01isqbii282sxs865ciyy03f7kzi66as5j6g9";
        libraryHaskellDepends = [ base containers csv filepath process ];
        description = "Scripts for manipulating tables stored as CSV files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "csv-to-qif" = callPackage
@@ -66325,7 +66637,7 @@ self: {
          split spreadsheet
        ];
        description = "A small program that will read csv files and create qif files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ctemplate" = callPackage
@@ -66337,8 +66649,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ ctemplate ];
        description = "Binding to the Google ctemplate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ctemplate = null;};
 
@@ -66350,8 +66662,8 @@ self: {
        sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m";
        libraryHaskellDepends = [ array base ];
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66368,8 +66680,8 @@ self: {
        libraryHaskellDepends = [ array base chatty-text chatty-utils ];
        executableHaskellDepends = [ array base chatty-text chatty-utils ];
        description = "A programming language for text modification";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66393,7 +66705,7 @@ self: {
          random-shuffle stm transformers unordered-containers
        ];
        description = "Non-blocking concurrent map";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cube" = callPackage
@@ -66410,8 +66722,8 @@ self: {
          base bytestring cereal containers hspec STL
        ];
        description = "Cubic DSL for 3D printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66430,7 +66742,7 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Implementation of Univalence in Cubical Sets";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cubicbezier" = callPackage
@@ -66448,7 +66760,7 @@ self: {
        ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cubicspline" = callPackage
@@ -66459,7 +66771,7 @@ self: {
        sha256 = "0ycv395qskjw8xryzam6skc92m4iixf6065grvfh23avlsffsv2v";
        libraryHaskellDepends = [ base hmatrix safe ];
        description = "Natural cubic spline interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cublas" = callPackage
@@ -66476,8 +66788,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to the CUDA BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cuboid" = callPackage
@@ -66490,8 +66802,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66514,8 +66826,8 @@ self: {
        ];
        doHaddock = false;
        description = "Haskell Implementation of Cuckoo Filters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66542,7 +66854,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck time
        ];
        description = "Pure and impure Cuckoo Filter";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cuda" = callPackage
@@ -66562,8 +66874,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base pretty ];
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cudd" = callPackage
@@ -66576,7 +66888,7 @@ self: {
        librarySystemDepends = [ cudd ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the CUDD binary decision diagrams library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) cudd;};
 
   "cue-sheet" = callPackage
@@ -66588,8 +66900,8 @@ self: {
        pname = "cue-sheet";
        version = "2.0.1";
        sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i";
-       revision = "2";
-       editedCabalFile = "0kblqr8mjmps56a7pbjwnby5ik8grmj15l1qir7q9kbn44x4s8l3";
+       revision = "3";
+       editedCabalFile = "1v8yvvb9sdpkg7m6z5a4sf0hcss7swb318700ap0qc79qn4ifdqb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers exceptions megaparsec mtl QuickCheck
@@ -66601,7 +66913,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Support for construction, rendering, and parsing of CUE sheets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cufft" = callPackage
@@ -66618,8 +66930,8 @@ self: {
        libraryHaskellDepends = [ base cuda ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the CUFFT library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "curl" = callPackage
@@ -66633,7 +66945,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) curl;};
 
   "curl-aeson" = callPackage
@@ -66644,7 +66956,7 @@ self: {
        sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx";
        libraryHaskellDepends = [ aeson base curl text utf8-string ];
        description = "Communicate with HTTP service using JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curl-cookiejar" = callPackage
@@ -66659,7 +66971,7 @@ self: {
          attoparsec base bytestring conduit conduit-extra http-client time
        ];
        description = "Parsing and pretty-printing of cURL/wget cookie jars";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "curl-runnings" = callPackage
@@ -66691,8 +67003,8 @@ self: {
          raw-strings-qq text
        ];
        description = "A framework for declaratively writing curl based API tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66708,7 +67020,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "bindings to libcurl, the multiprotocol file transfer library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "currencies" = callPackage
@@ -66720,7 +67032,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Currencies representation, pretty printing and conversion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "currency" = callPackage
@@ -66735,7 +67047,7 @@ self: {
        ];
        description = "Types representing standard and non-standard currencies";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "currency-codes" = callPackage
@@ -66751,8 +67063,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        description = "ISO-4217 Currency Codes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66768,8 +67080,8 @@ self: {
          aeson base http-conduit text unordered-containers
        ];
        description = "Typesafe currency conversion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66781,7 +67093,7 @@ self: {
        sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5";
        libraryHaskellDepends = [ base old-locale process split ];
        description = "Get the current system locale in System.Locale format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "curry" = callPackage
@@ -66794,7 +67106,7 @@ self: {
        editedCabalFile = "15blz8y7jvxznm3j6sak4kcqq5c4apd4fkh60ixc36pbgc2q9kip";
        libraryHaskellDepends = [ base ];
        description = "Curry types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curry-base" = callPackage
@@ -66811,7 +67123,7 @@ self: {
        ];
        testHaskellDepends = [ base Cabal filepath mtl ];
        description = "Functions for manipulating Curry programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curry-frontend" = callPackage
@@ -66838,8 +67150,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal curry-base filepath ];
        description = "Compile the functional logic language Curry to several intermediate formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66857,7 +67169,7 @@ self: {
          http-types mtl regex-pcre text transformers wai warp
        ];
        description = "A simple HTTP server framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curryer-rpc" = callPackage
@@ -66887,8 +67199,8 @@ self: {
          async base bytestring criterion network winery
        ];
        description = "Fast, Haskell RPC";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66903,7 +67215,7 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Easy to use FFI Bridge for using Rust in Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cursedcsv" = callPackage
@@ -66922,8 +67234,8 @@ self: {
          natural-sort parseargs primitive regex-tdfa safe unix vector
        ];
        description = "Terminal tool for viewing tabular data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66940,7 +67252,7 @@ self: {
          validity-text
        ];
        description = "Purely Functional Cursors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cursor-brick" = callPackage
@@ -66950,7 +67262,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "018i8yrdcj69qf00vz1sx7is5cx1a7vn5b8kr9b226n7vxlr3nzd";
        libraryHaskellDepends = [ base brick cursor text ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cursor-fuzzy-time" = callPackage
@@ -66965,7 +67277,7 @@ self: {
          base containers cursor deepseq fuzzy-time megaparsec microlens text
          time validity validity-time
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cursor-fuzzy-time-gen" = callPackage
@@ -66991,8 +67303,8 @@ self: {
        benchmarkHaskellDepends = [
          base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67018,7 +67330,7 @@ self: {
          base criterion cursor genvalidity-criterion
        ];
        description = "Generators for Purely Functional Cursors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "curve25519" = callPackage
@@ -67036,7 +67348,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Fast implementations of the curve25519 elliptic curve primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curves" = callPackage
@@ -67052,8 +67364,8 @@ self: {
          base bytestring containers filepath HaXml JuicyPixels QuickCheck
        ];
        description = "Library for drawing curve based images";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67071,8 +67383,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to CUDA Solver, a LAPACK-like library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cusparse" = callPackage
@@ -67087,8 +67399,8 @@ self: {
        libraryHaskellDepends = [ base cuda half storable-complex ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to the CUDA Sparse BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "custom-prelude" = callPackage
@@ -67100,7 +67412,7 @@ self: {
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
        description = "An enhanced prelude, serving as a foundation for my projects";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67138,7 +67450,7 @@ self: {
        testPkgconfigDepends = [ pocketsphinx sphinxbase ];
        testToolDepends = [ c2hs ];
        description = "Cuts out uninteresting parts of videos by detecting silences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;};
 
   "cutter" = callPackage
@@ -67155,7 +67467,7 @@ self: {
          base bytestring explicit-exception spreadsheet utility-ht
        ];
        description = "Cut files according to a position list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cv-combinators" = callPackage
@@ -67174,8 +67486,8 @@ self: {
          allocated-processor base HOpenCV vector-space
        ];
        description = "Functional Combinators for Computer Vision";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67187,7 +67499,7 @@ self: {
        sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm";
        libraryHaskellDepends = [ aeson base text ];
        description = "simple and efficient cve datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cyclotomic" = callPackage
@@ -67205,7 +67517,7 @@ self: {
          test-framework-quickcheck2 test-framework-smallcheck
        ];
        description = "A subfield of the complex numbers for exact calculation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cypher" = callPackage
@@ -67224,8 +67536,8 @@ self: {
          transformers-base unordered-containers vector
        ];
        description = "Haskell bindings for the neo4j \"cypher\" query language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67238,7 +67550,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
        description = "CZipWith class and deriving via TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "d-bus" = callPackage
@@ -67268,8 +67580,8 @@ self: {
          tasty-quickcheck tasty-th text xml-hamlet
        ];
        description = "Permissively licensed D-Bus client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67282,7 +67594,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base doctest ];
        description = "Digits 0-9";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "d3d11binding" = callPackage
@@ -67301,8 +67613,8 @@ self: {
        ];
        executableHaskellDepends = [ base c-storable-deriving vect Win32 ];
        description = "A raw binding for the directX 11";
-       license = stdenv.lib.licenses.mit;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       platforms = [ "armv7l-linux" ];
      }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; 
          d3dxof = null; dxgi = null; dxguid = null;};
 
@@ -67314,8 +67626,8 @@ self: {
        sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2";
        libraryHaskellDepends = [ base mtl random text ];
        description = "Declarative visualization on a web browser with DSL approach";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67328,7 +67640,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory unix ];
        description = "Start background daemons by double-forking";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "daemons" = callPackage
@@ -67356,7 +67668,7 @@ self: {
          test-framework-hunit unix
        ];
        description = "Daemons in Haskell made fun and easy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "dag" = callPackage
@@ -67372,8 +67684,8 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Compile-time, type-safe directed acyclic graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67392,8 +67704,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        description = "Parsing dAmn messages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67416,8 +67728,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67448,8 +67760,8 @@ self: {
          utf8-string
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67468,8 +67780,8 @@ self: {
          prednote rainbow text time transformers
        ];
        description = "Prints a series of dates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67519,7 +67831,7 @@ self: {
          mv contrib/darcs_completion $out/share/bash-completion/completions/darcs
        '';
        description = "a distributed, interactive, smart revision control system";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "darcs-benchmark" = callPackage
@@ -67541,8 +67853,8 @@ self: {
          zlib
        ];
        description = "Comparative benchmark suite for darcs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67575,7 +67887,7 @@ self: {
        executableSystemDepends = [ curl ];
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) curl;};
 
@@ -67595,7 +67907,7 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67618,7 +67930,7 @@ self: {
        executableSystemDepends = [ curl ncurses zlib ];
        description = "David's Advanced Version Control System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
@@ -67639,8 +67951,8 @@ self: {
          directory filepath hashed-storage mtl old-time utf8-string
        ];
        description = "Import/export git fast-import streams to/from darcs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67659,8 +67971,8 @@ self: {
          time
        ];
        description = "Generate graphs of darcs repository activity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67679,7 +67991,7 @@ self: {
        ];
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67693,7 +68005,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of darcs workflow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "darcs2dot" = callPackage
@@ -67710,8 +68022,8 @@ self: {
          base containers darcs graph-wrapper string-conversions
        ];
        description = "Outputs dependencies of darcs patches in dot format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67740,7 +68052,7 @@ self: {
        ];
        description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67764,7 +68076,7 @@ self: {
        ];
        description = "Track application of Darcs patches";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67792,8 +68104,8 @@ self: {
          base binary bytestring criterion transformers
        ];
        description = "Utility and parser for DarkPlaces demo files";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67810,8 +68122,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec hspec-core ];
        description = "Darkplaces rcon client library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67841,8 +68153,8 @@ self: {
          text
        ];
        description = "Darplaces rcon utility";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67860,8 +68172,8 @@ self: {
        libraryToolDepends = [ alex ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Parser for darkplaces colorful text";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67882,8 +68194,8 @@ self: {
          text transformers
        ];
        description = "Convert package Haddock to Dash docsets (IDE docs)";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67895,7 +68207,7 @@ self: {
        sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x";
        libraryHaskellDepends = [ array base containers transformers ];
        description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-accessor-monadLib" = callPackage
@@ -67907,7 +68219,7 @@ self: {
        libraryHaskellDepends = [ base data-accessor monadLib ];
        description = "Accessor functions for monadLib's monads";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "data-accessor-monads-fd" = callPackage
@@ -67920,8 +68232,8 @@ self: {
          base data-accessor monads-fd transformers
        ];
        description = "Use Accessor to access state in monads-fd State monad class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67935,8 +68247,8 @@ self: {
          base data-accessor monads-tf transformers
        ];
        description = "Use Accessor to access state in monads-tf State monad type family";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67948,7 +68260,7 @@ self: {
        sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
        libraryHaskellDepends = [ base data-accessor mtl ];
        description = "Use Accessor to access state in mtl State monad class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-accessor-template" = callPackage
@@ -67964,7 +68276,7 @@ self: {
          base data-accessor template-haskell utility-ht
        ];
        description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-accessor-transformers" = callPackage
@@ -67975,7 +68287,7 @@ self: {
        sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10";
        libraryHaskellDepends = [ base data-accessor transformers ];
        description = "Use Accessor to access state in transformers State monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-as" = callPackage
@@ -67986,7 +68298,7 @@ self: {
        sha256 = "1rqdffwyxrnvsrqchnknjdmdz7afzhplyalnrclrm5zm6gj0dlia";
        libraryHaskellDepends = [ base profunctors ];
        description = "Simple extensible sum";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-ascii" = callPackage
@@ -68002,7 +68314,7 @@ self: {
          text
        ];
        description = "Type-safe, bytestring-based ASCII values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-aviary" = callPackage
@@ -68013,8 +68325,8 @@ self: {
        sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn";
        libraryHaskellDepends = [ base ];
        description = "Combinator birds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68026,8 +68338,8 @@ self: {
        sha256 = "1l95mrl6333hp46vsv54fglg4gwz8p14z3rysx6115blc81yx18x";
        libraryHaskellDepends = [ base ];
        description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68051,8 +68363,8 @@ self: {
          aeson base lens postgresql-simple string-conv time
        ];
        description = "A database library with a focus on ease of use, type safety and useful error messages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68064,7 +68376,7 @@ self: {
        sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
        libraryHaskellDepends = [ base binary ];
        description = "Parser/Serialiser for IEEE-754 floating-point values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-bword" = callPackage
@@ -68076,7 +68388,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Extra operations on binary words of fixed length";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-carousel" = callPackage
@@ -68089,7 +68401,7 @@ self: {
        editedCabalFile = "1sk3qvn9pb1l170qqrxwv9mxj80p5276zzwl0rfn5403mpa1gajn";
        libraryHaskellDepends = [ base containers lens ];
        description = "A rotating sequence data structure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-category" = callPackage
@@ -68099,7 +68411,7 @@ self: {
        version = "0.10";
        sha256 = "1mb72r17982w2sslmvi5nzpf7i702iikc7j4h68gzlfnm426jk9q";
        description = "Category theory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-cell" = callPackage
@@ -68110,7 +68422,7 @@ self: {
        sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr";
        libraryHaskellDepends = [ base ];
        description = "Generic cellular data representation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-check" = callPackage
@@ -68122,8 +68434,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Library for checking and normalization of data (e.g. from web forms)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68135,7 +68447,7 @@ self: {
        sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
        libraryHaskellDepends = [ base deepseq ];
        description = "Type-indexed runtime-checked properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-clist" = callPackage
@@ -68148,7 +68460,7 @@ self: {
        editedCabalFile = "13hg7a3d4ky8b765dl03ryxg28lq8iaqj5ky3j51r0i1i4f2a9hy";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
        description = "Simple functional ring type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-combinator-gen" = callPackage
@@ -68159,8 +68471,8 @@ self: {
        sha256 = "0f1qw5rk9x3yd7nfhkwmpig7a6dc46yzl78fi8aaxpwqbsazpkjy";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special combinator from any data type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68172,7 +68484,7 @@ self: {
        sha256 = "15bifxba0yddpq5yz23hq9k2s7vkzcrwjpwvbw0kkjf3wjjay5bp";
        libraryHaskellDepends = [ base constraints ];
        description = "Define Backwards Compatibility Schemes for Arbitrary Data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-concurrent-queue" = callPackage
@@ -68183,8 +68495,8 @@ self: {
        sha256 = "0rmn4pq5pgvam78vxp4y7431jai8dklml322r4nw47jjc1m20kmv";
        libraryHaskellDepends = [ base stm ];
        description = "A Library for directional queues";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68196,8 +68508,8 @@ self: {
        sha256 = "0hdkj8fpa0mmi57ljl744kkh6hk99d4x8dbm2djprw7rvrj5irg8";
        libraryHaskellDepends = [ base ];
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68213,7 +68525,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Generically compare data by their constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-cycle" = callPackage
@@ -68227,8 +68539,8 @@ self: {
          base collections-api collections-base-instances
        ];
        description = "a cyclic doubly linked list";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68246,7 +68558,7 @@ self: {
          data-default-instances-dlist data-default-instances-old-locale
        ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-class" = callPackage
@@ -68257,7 +68569,7 @@ self: {
        sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag";
        libraryHaskellDepends = [ base ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-extra" = callPackage
@@ -68283,7 +68595,7 @@ self: {
          data-default-instances-vector
        ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-generics" = callPackage
@@ -68304,7 +68616,7 @@ self: {
          text time unordered-containers vector
        ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-base" = callPackage
@@ -68315,7 +68627,7 @@ self: {
        sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Default instances for types in base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-bytestring" = callPackage
@@ -68328,7 +68640,7 @@ self: {
        editedCabalFile = "0gpdba4y17rp0kp9pd2qj6r4pnrc86vx47fkk3zfkggmv73pa82r";
        libraryHaskellDepends = [ base bytestring data-default-class ];
        description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-case-insensitive" = callPackage
@@ -68341,7 +68653,7 @@ self: {
        editedCabalFile = "0w8k7zjxwbj1y2acxadg956pfpf7y70jc23wgjivqvafbv69ra25";
        libraryHaskellDepends = [ case-insensitive data-default-class ];
        description = "Default instance for CI type from case-insensitive package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-containers" = callPackage
@@ -68352,7 +68664,7 @@ self: {
        sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
        libraryHaskellDepends = [ base containers data-default-class ];
        description = "Default instances for types in containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-dlist" = callPackage
@@ -68363,7 +68675,7 @@ self: {
        sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
        libraryHaskellDepends = [ base data-default-class dlist ];
        description = "Default instances for types in dlist";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-new-base" = callPackage
@@ -68374,7 +68686,7 @@ self: {
        sha256 = "0hzi7szmjf2df3v4aaid6pk6i4ma25k78v5mcxkhd6w52ifg67c3";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Default instances for types in newer versions of base package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-old-locale" = callPackage
@@ -68385,7 +68697,7 @@ self: {
        sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
        libraryHaskellDepends = [ base data-default-class old-locale ];
        description = "Default instances for types in old-locale";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-text" = callPackage
@@ -68398,7 +68710,7 @@ self: {
        editedCabalFile = "01125vbzwq35rkppm96x8fnwjyfid7x6ay6wq8n0qhr0skhcp2js";
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Default instances for (lazy and strict) Text and Text Builder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-unordered-containers" = callPackage
@@ -68413,7 +68725,7 @@ self: {
          data-default-class unordered-containers
        ];
        description = "Default instances for unordered-containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-vector" = callPackage
@@ -68426,7 +68738,7 @@ self: {
        editedCabalFile = "0piq9b9ywzyk12glndy9w6dka6d5zrc1mywq5j032li3j6sbwy4a";
        libraryHaskellDepends = [ data-default-class vector ];
        description = "Default instances for types defined in vector package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-dispersal" = callPackage
@@ -68447,8 +68759,8 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68466,7 +68778,7 @@ self: {
        testHaskellDepends = [ base hspec tagged ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Extensible records and polymorphic variants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-diverse-lens" = callPackage
@@ -68482,8 +68794,8 @@ self: {
        ];
        testHaskellDepends = [ base data-diverse hspec lens tagged ];
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68500,7 +68812,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Stick two binary words together to get a bigger one";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-easy" = callPackage
@@ -68518,8 +68830,8 @@ self: {
          QuickCheck safe text transformers unix
        ];
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68533,8 +68845,8 @@ self: {
          base data-flags data-serializer data-sword
        ];
        description = "Executable and Linkable Format (ELF) data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68559,8 +68871,8 @@ self: {
          hashable utf8-string
        ];
        description = "Embed files and other binary blobs inside executables without Template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68572,8 +68884,8 @@ self: {
        sha256 = "0brfvlx7hihgnlc87r3n17dncbydfwxs49dc8kgppxycqqss6vh1";
        libraryHaskellDepends = [ base ];
        description = "Combinator emoticons: data-aviary in the flavor of emoticons";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68585,7 +68897,7 @@ self: {
        sha256 = "1h1abz87nha7cpw50yvf8fwvcca350wnnz2d3z9k30sg6wq4y7cc";
        libraryHaskellDepends = [ base ];
        description = "Endian-sensitive data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-extend-generic" = callPackage
@@ -68599,7 +68911,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Extend Haskell data or newtype like in OOP languages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-extra" = callPackage
@@ -68610,7 +68922,7 @@ self: {
        sha256 = "0py4a3mzqga25y6y1sirvc9369n3b7y5kpm5f9m613yjlypv6pc1";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-filepath" = callPackage
@@ -68625,8 +68937,8 @@ self: {
          base bifunctors ghc-prim semigroups split template-haskell
        ];
        description = "A type safe file path data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68646,7 +68958,7 @@ self: {
        executableHaskellDepends = [ base containers data-default ];
        testHaskellDepends = [ base containers data-default hspec ];
        description = "Generate data-files Cabal file field from existing files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-filter" = callPackage
@@ -68657,7 +68969,7 @@ self: {
        sha256 = "1yz22b42rqsf4i9p4lnl06l8id3f1a84dng96q2nk1mmih9v3pbm";
        libraryHaskellDepends = [ base data-default ];
        description = "Utilities for filtering";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "data-fin" = callPackage
@@ -68673,8 +68985,8 @@ self: {
          smallcheck tagged
        ];
        description = "Finite totally ordered sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68687,8 +68999,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Simple integral finite set";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68700,7 +69012,7 @@ self: {
        sha256 = "184rz8ypgrb3sxy9wiaq321d82p689w7dcwkc0qkjlabd7nv6ncy";
        libraryHaskellDepends = [ base deepseq hashable ];
        description = "Fixpoint data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-fix-cse" = callPackage
@@ -68711,7 +69023,7 @@ self: {
        sha256 = "1v8ffi5c0sz8q2fla6fab4css3pkjmi0knx5d04mvffhw66bjhbz";
        libraryHaskellDepends = [ base containers data-fix transformers ];
        description = "Common subexpression elimination for the fixploint types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-flags" = callPackage
@@ -68722,7 +69034,7 @@ self: {
        sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package for working with bit masks and flags in general";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-flagset" = callPackage
@@ -68733,8 +69045,8 @@ self: {
        sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2";
        libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68746,7 +69058,7 @@ self: {
        sha256 = "1415cf59wkf1599qcqmrpn9m4v9br3d763v1809mwg9bm2310x65";
        libraryHaskellDepends = [ base containers ];
        description = "Fold function applications. Framework for variadic functions.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-forest" = callPackage
@@ -68758,7 +69070,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "A simple multi-way tree data structure";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "data-fresh" = callPackage
@@ -68769,7 +69081,7 @@ self: {
        sha256 = "1hz30myv78mw4sf19k1yg4qikrnxsa5ng0ff4naxyz1zyi2m87f1";
        libraryHaskellDepends = [ base free transformers ];
        description = "Interface and functor transformers for fresh values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-function-meld" = callPackage
@@ -68780,7 +69092,7 @@ self: {
        sha256 = "0gnnd23cwhg8l46a4y3brb059mhh9a05l8qbwpf6avl5cj5jkgwd";
        libraryHaskellDepends = [ base ];
        description = "Map the arguments and return value of functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-function-tacit" = callPackage
@@ -68791,7 +69103,7 @@ self: {
        sha256 = "0fxmacmcnzvzspscliqbx31rmvif7ymc1knjijmx9pb92yaibcla";
        libraryHaskellDepends = [ base ];
        description = "Write functions in tacit (pointless) style using Applicative and De Bruijn index notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-has" = callPackage
@@ -68803,7 +69115,7 @@ self: {
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Simple extensible product";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-hash" = callPackage
@@ -68819,7 +69131,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Combinators for building fast hashing functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-index" = callPackage
@@ -68831,7 +69143,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest ];
        description = "Extending the concept of indices for lists and other containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-interval" = callPackage
@@ -68851,7 +69163,9 @@ self: {
          QuickCheck syb tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Interval datatype, interval arithmetic and interval-based containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-inttrie" = callPackage
@@ -68862,7 +69176,7 @@ self: {
        sha256 = "0m5xww8zvsa0whxl89wndpbdz9p5n03q3h3a904nqrxh966psfkb";
        libraryHaskellDepends = [ base ];
        description = "A simple lazy, infinite trie from integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-ivar" = callPackage
@@ -68873,8 +69187,8 @@ self: {
        sha256 = "1vnbmvihkrcknys33sam9zlb5qk5qqkxz6w3wamsbdmpp0q6zfb2";
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68890,7 +69204,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Json Token datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-kiln" = callPackage
@@ -68905,8 +69219,8 @@ self: {
          base containers data-fix IfElse mtl transformers
        ];
        description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68918,8 +69232,8 @@ self: {
        sha256 = "0vck7a3vgdqml2pg3ilkw41d52pmx452sgh2h2q4qzysq26vw49w";
        libraryHaskellDepends = [ base convert data-construction lens ];
        description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68931,7 +69245,7 @@ self: {
        sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-lens" = callPackage
@@ -68946,8 +69260,8 @@ self: {
          base comonad containers semigroupoids transformers
        ];
        description = "Used to be Haskell 98 Lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68961,8 +69275,8 @@ self: {
          base comonad data-lens mtl transformers
        ];
        description = "Lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68975,8 +69289,8 @@ self: {
        libraryHaskellDepends = [ base data-lens ixset ];
        testHaskellDepends = [ QuickCheck ];
        description = "A Lens for IxSet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68988,7 +69302,7 @@ self: {
        sha256 = "0vmkvhl7zcsaxnx7d7b59cnrdnlnr9cfn910rpn34jny7fkydlvj";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Simple lenses, minimum dependencies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-lens-template" = callPackage
@@ -68999,8 +69313,8 @@ self: {
        sha256 = "1w1a32298naha7sv8d0v018l8z1bmwpwnb3jg09a3n65ci9hy2zm";
        libraryHaskellDepends = [ base data-lens template-haskell ];
        description = "Utilities for Data.Lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69012,7 +69326,7 @@ self: {
        sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8";
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with sequences within lists";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "data-list-zigzag" = callPackage
@@ -69023,7 +69337,7 @@ self: {
        sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q";
        libraryHaskellDepends = [ base ];
        description = "A list but with a balanced enumeration of Cartesian product";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-map-multikey" = callPackage
@@ -69034,8 +69348,8 @@ self: {
        sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf";
        libraryHaskellDepends = [ base containers ];
        description = "Data.Map with multiple, unique keys";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69047,7 +69361,7 @@ self: {
        sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
        libraryHaskellDepends = [ array base data-inttrie ];
        description = "Combinators for building memo tables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-msgpack" = callPackage
@@ -69073,7 +69387,7 @@ self: {
          base bytestring criterion deepseq QuickCheck
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-msgpack-types" = callPackage
@@ -69090,7 +69404,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-named" = callPackage
@@ -69101,7 +69415,7 @@ self: {
        sha256 = "03f4xc4ayql17s48ajza2ny79j885mcmp0x3mrwcfdc42dlnd7nb";
        libraryHaskellDepends = [ attoparsec base binary containers text ];
        description = "Data types for named entities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-nat" = callPackage
@@ -69112,8 +69426,8 @@ self: {
        sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m";
        libraryHaskellDepends = [ base semigroups ];
        description = "data Nat = Zero | Succ Nat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69125,8 +69439,8 @@ self: {
        sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
        libraryHaskellDepends = [ base bytestring failure text time ];
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69143,8 +69457,8 @@ self: {
          failure JSONb text
        ];
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69163,8 +69477,8 @@ self: {
          failure text transformers yaml
        ];
        description = "Serialize data to and from Yaml files (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69176,7 +69490,7 @@ self: {
        sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
        libraryHaskellDepends = [ base ];
        description = "A data type for non-exclusive disjunction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-ordlist" = callPackage
@@ -69187,7 +69501,7 @@ self: {
        sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
        libraryHaskellDepends = [ base ];
        description = "Set and bag operations on ordered lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-partition" = callPackage
@@ -69198,7 +69512,7 @@ self: {
        sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb";
        libraryHaskellDepends = [ base containers ];
        description = "A pure disjoint set (union find) data structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-pprint" = callPackage
@@ -69211,8 +69525,8 @@ self: {
        editedCabalFile = "0gk2x4z7m0816gq6p22y5y8r1iydi4154xbn474i9nsbk56kp2by";
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69224,8 +69538,8 @@ self: {
        sha256 = "0ylimakhw37klz2axg8qrdhwag34mfa1byb2z2mz2i8z0w4737j8";
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69244,7 +69558,9 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-ref" = callPackage
@@ -69255,7 +69571,7 @@ self: {
        sha256 = "0xqgzcpp9b0y2w5h1nln529dizdplhpfl41vxvbhxxcdkng3j53v";
        libraryHaskellDepends = [ base data-accessor stm transformers ];
        description = "Unify STRef and IORef in plain Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-reify" = callPackage
@@ -69274,7 +69590,7 @@ self: {
        testHaskellDepends = [ base base-compat hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Reify a recursive data structure into an explicit graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-reify-cse" = callPackage
@@ -69285,8 +69601,8 @@ self: {
        sha256 = "0vjfpbp0maqwirvi8j21z9qbs396l76dk5npn8zxac56j0i6l62r";
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69298,8 +69614,8 @@ self: {
        sha256 = "14k4agv5z8vlvb21vmfz9x1dcz6cgph6ix6qrac9mfyylywdffa9";
        libraryHaskellDepends = [ base generic-deriving lens ];
        description = "Alternative to Show data printing utility";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69311,8 +69627,8 @@ self: {
        sha256 = "0186py0zj9k987vxbsaxbckc7ik64rx87kq3mzkjzvam9qcc0rmj";
        libraryHaskellDepends = [ base poly-control prologue ];
        description = "Data types for returning results distinguishable by types";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69324,8 +69640,8 @@ self: {
        sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "A typeclass for reversing order of contents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69338,7 +69654,7 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69350,8 +69666,8 @@ self: {
        sha256 = "01gv16yz5y3wyc370a2snihz95wdnl7sk1jz9k7aypixsaw28a2f";
        libraryHaskellDepends = [ base lens typelevel ];
        description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69370,7 +69686,7 @@ self: {
          base binary bytestring cereal tasty tasty-quickcheck
        ];
        description = "Common API for serialization libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-size" = callPackage
@@ -69383,8 +69699,8 @@ self: {
          base bytestring containers deepseq text
        ];
        description = "Profiling of data structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69396,8 +69712,8 @@ self: {
        sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk";
        libraryHaskellDepends = [ base vector-space ];
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69409,8 +69725,8 @@ self: {
        sha256 = "1xllcy2yn26shmcibnjczi7nm3mp9rqa6685iqc8a8vcic7mqcj9";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69437,8 +69753,8 @@ self: {
          pretty-simple text time
        ];
        description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "data-store" = callPackage
@@ -69464,8 +69780,8 @@ self: {
          vector
        ];
        description = "Type safe, in-memory dictionary with multidimensional keys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69484,8 +69800,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "An efficient implementation of maps from strings to arbitrary values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69506,8 +69822,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Program that infers the fastest data structure available for your program";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69524,8 +69840,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Shorter binary words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69537,7 +69853,7 @@ self: {
        sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8";
        libraryHaskellDepends = [ base ];
        description = "Tensor and Group typeclasses";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-textual" = callPackage
@@ -69557,7 +69873,7 @@ self: {
          text-printer type-hint
        ];
        description = "Human-friendly textual representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-timeout" = callPackage
@@ -69572,7 +69888,7 @@ self: {
          base data-textual parsers stm tagged text-printer transformers-base
        ];
        description = "64-bit timeouts of nanosecond precision";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-transform" = callPackage
@@ -69583,7 +69899,7 @@ self: {
        sha256 = "0l0pbr0fg7i09lv05bhv0gl80x2mxxyvxa0n5jdknh5xfphqga96";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-tree-print" = callPackage
@@ -69596,7 +69912,7 @@ self: {
        editedCabalFile = "00qpzhm3lndhpql8aj93aj6r3x9n0gw3nx6n0q60xxrd6agyjifq";
        libraryHaskellDepends = [ base pretty syb ];
        description = "Print Data instances as a nested tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-treify" = callPackage
@@ -69607,7 +69923,7 @@ self: {
        sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9";
        libraryHaskellDepends = [ base containers ty ];
        description = "Reify a recursive data structure into an explicit graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-type" = callPackage
@@ -69618,8 +69934,8 @@ self: {
        sha256 = "1x3wsnilp9sxy061sfmyyg0f6b0k2lxvi0g4qf2gkldrz32c4qvj";
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69631,8 +69947,8 @@ self: {
        sha256 = "0zhpr40sf1vqa4k7f4j5crjkd701xls86whxrhdq8v8h08ssxvxj";
        libraryHaskellDepends = [ base ];
        description = "utilities for handle data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69649,8 +69965,8 @@ self: {
          base containers hspec regex-tdfa template-haskell
        ];
        description = "A library for creating type safe validations";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69662,8 +69978,8 @@ self: {
        sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk";
        libraryHaskellDepends = [ base safe ];
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69680,7 +69996,7 @@ self: {
        ];
        testHaskellDepends = [ async base vector ];
        description = "Dynamic growable resizable mutable generic vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "database-id-class" = callPackage
@@ -69691,8 +70007,8 @@ self: {
        sha256 = "0zm053ll1vwd5gdwq4p3zpl9f010q894nk3djaad3ry4y2mirsc4";
        libraryHaskellDepends = [ aeson base ];
        description = "Class for types with a database id";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69708,8 +70024,8 @@ self: {
          aeson base database-id-class groundhog template-haskell
        ];
        description = "HasId/Groundhog interop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69727,7 +70043,7 @@ self: {
          postgresql-simple text time transformers
        ];
        description = "Database versioning and migration (experimental)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "database-study" = callPackage
@@ -69738,8 +70054,8 @@ self: {
        sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7";
        libraryHaskellDepends = [ base containers ];
        description = "Demonstrate how a database can be implemented the functional way";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69767,8 +70083,8 @@ self: {
          transformers-base unliftio unordered-containers vector
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69804,8 +70120,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Datadog tracing client and mock agent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69819,7 +70135,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
        description = "Data encoding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "datafix" = callPackage
@@ -69851,8 +70167,8 @@ self: {
          filepath ghc ghc-paths lattices primitive text transformers turtle
        ];
        description = "Fixing data-flow problems";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69876,8 +70192,8 @@ self: {
          aeson base bytestring containers hspec HUnit parsec vector
        ];
        description = "Generate Graphviz documents from a Haskell representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69895,7 +70211,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck stm ];
        benchmarkHaskellDepends = [ base criterion stm ];
        description = "A Pure-Haskell Timely Dataflow System";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "datalog" = callPackage
@@ -69922,8 +70238,8 @@ self: {
          text
        ];
        description = "An implementation of datalog in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69942,7 +70258,7 @@ self: {
        ];
        description = "Tool to help pack files into the minimum number of CDs/DVDs/etc";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69964,7 +70280,7 @@ self: {
          scientific string-conversions text unordered-containers vector wreq
        ];
        description = "Client for DataRobot API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "datasets" = callPackage
@@ -69994,8 +70310,8 @@ self: {
          req safe-exceptions streaming
        ];
        description = "Classical data sets for statistics and machine learning";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70014,8 +70330,8 @@ self: {
          attoparsec base base64-bytestring bytestring HTF text
        ];
        description = "Handle data-urls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70027,7 +70343,7 @@ self: {
        sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb";
        libraryHaskellDepends = [ base bytestring ];
        description = "Date cacher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "date-conversions" = callPackage
@@ -70039,8 +70355,8 @@ self: {
        libraryHaskellDepends = [ base dates time ];
        testHaskellDepends = [ base dates hspec QuickCheck time ];
        description = "Date conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70057,8 +70373,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Small library for parsing different dates formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70078,7 +70394,7 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70098,7 +70414,7 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70113,8 +70429,8 @@ self: {
        libraryHaskellDepends = [ base parsec pretty text time ];
        executableHaskellDepends = [ base filepath parsec pretty text ];
        description = "Generates DDL suggestions based on a CSV file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70130,8 +70446,8 @@ self: {
          base binary containers mtl transformers vector vector-binary
        ];
        description = "Directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70152,7 +70468,7 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbcleaner" = callPackage
@@ -70164,8 +70480,8 @@ self: {
        libraryHaskellDepends = [ base postgresql-simple text ];
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70179,8 +70495,8 @@ self: {
          base binary bytestring monad-loops rwlock
        ];
        description = "Read and write XBase \".dbf\" files";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70201,8 +70517,8 @@ self: {
          base binary bytestring haskell98 process uulib
        ];
        description = "Decompiler Bytecode Java";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70221,8 +70537,8 @@ self: {
          text time
        ];
        description = "A *simple* database migration tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70249,7 +70565,7 @@ self: {
          yaml-light
        ];
        description = "An implementation of relational database \"migrations\"";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbmigrations-mysql" = callPackage
@@ -70270,8 +70586,8 @@ self: {
          base dbmigrations HUnit mysql mysql-simple process
        ];
        description = "The dbmigrations tool built for MySQL databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70290,8 +70606,8 @@ self: {
          base dbmigrations HDBC HDBC-postgresql HUnit process
        ];
        description = "The dbmigrations tool built for PostgreSQL databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70306,8 +70622,8 @@ self: {
        executableHaskellDepends = [ base dbmigrations HDBC-sqlite3 ];
        testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
        description = "The dbmigrations tool built for SQLite databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70335,7 +70651,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        doCheck = false;
        description = "A client library for the D-Bus IPC system";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "dbus-client" = callPackage
@@ -70350,8 +70666,8 @@ self: {
          base containers dbus-core monads-tf text transformers
        ];
        description = "Monadic and object-oriented interfaces to DBus";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70369,8 +70685,8 @@ self: {
          network parsec text unix vector xml-types
        ];
        description = "Low-level D-Bus protocol implementation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70387,7 +70703,7 @@ self: {
          base dbus hslogger optparse-applicative
        ];
        description = "Expose a dbus server to control hslogger";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbus-qq" = callPackage
@@ -70403,8 +70719,8 @@ self: {
        ];
        testHaskellDepends = [ base containers dbus QuickCheck ];
        description = "Quasi-quoter for DBus functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70420,7 +70736,7 @@ self: {
          base containers dbus syb template-haskell text
        ];
        description = "TemplateHaskell generator of DBus bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbus-th-introspection" = callPackage
@@ -70440,7 +70756,7 @@ self: {
          base cmdargs containers dbus dbus-th template-haskell
        ];
        description = "Generate bindings for DBus calls by using DBus introspection and dbus-th";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dclabel" = callPackage
@@ -70462,8 +70778,8 @@ self: {
          quickcheck-instances
        ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70475,8 +70791,8 @@ self: {
        sha256 = "1bfc9ip4fqzjzlzppkrnspnm6gc50f4rkf0wngnxyj7f79fvjr6k";
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70496,8 +70812,8 @@ self: {
        executableHaskellDepends = [ base filepath optparse-applicative ];
        testHaskellDepends = [ base ];
        description = "DCPU-16 Emulator & Assembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70509,8 +70825,8 @@ self: {
        sha256 = "1mw0qn7c6ag2w6gn6pwpjf979m3p5v3p9a1kal2x8g8ncx98dcn5";
        libraryHaskellDepends = [ base dates time ];
        description = "Discordian Date Types for Haskell";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70526,8 +70842,8 @@ self: {
          base containers deepseq parsec transformers wl-pprint
        ];
        description = "Disciplined Disciple Compiler common utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70547,8 +70863,8 @@ self: {
          deepseq directory filepath mtl process text time
        ];
        description = "Disciplined Disciple Compiler build framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70561,8 +70877,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ];
        description = "Disciplined Disciple Compiler base libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70579,8 +70895,8 @@ self: {
          parsec text transformers wl-pprint
        ];
        description = "Disciplined Disciple Compiler core language and type checker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70594,8 +70910,8 @@ self: {
          base containers ddc-core ddc-core-tetra
        ];
        description = "Disciplined Disciple Compiler PHP code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70611,8 +70927,8 @@ self: {
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70630,8 +70946,8 @@ self: {
          ddc-core-tetra deepseq limp limp-cbc mtl transformers
        ];
        description = "Disciplined Disciple Compiler data flow compiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70648,8 +70964,8 @@ self: {
          ddc-core-simpl mtl text transformers
        ];
        description = "Disciplined Disciple Compiler LLVM code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70665,8 +70981,8 @@ self: {
          array base containers ddc-core deepseq mtl text transformers
        ];
        description = "Disciplined Disciple Compiler C code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70682,8 +70998,8 @@ self: {
          array base containers ddc-core deepseq mtl transformers
        ];
        description = "Disciplined Disciple Compiler code transformations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70700,8 +71016,8 @@ self: {
          mtl pretty-show text transformers
        ];
        description = "Disciplined Disciple Compiler intermediate language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70721,8 +71037,8 @@ self: {
          deepseq directory filepath mtl process time transformers
        ];
        description = "Disciplined Disciple Compiler top-level driver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70734,8 +71050,8 @@ self: {
        sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f";
        libraryHaskellDepends = [ base containers ddc-base directory ];
        description = "Disciplined Disciple Compiler user interface support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70752,8 +71068,8 @@ self: {
          mtl pretty-show text transformers
        ];
        description = "Disciplined Disciple Compiler source language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70776,8 +71092,8 @@ self: {
          process transformers
        ];
        description = "Disciplined Disciple Compiler command line tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70795,8 +71111,8 @@ self: {
          base buildbox containers directory filepath process random stm
        ];
        description = "Disciplined Disciple Compiler test driver and buildbot";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70815,8 +71131,8 @@ self: {
          haskeline haskell-src-exts
        ];
        description = "Disciple Core language interactive interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70843,7 +71159,7 @@ self: {
          base criterion free-vector-spaces lens linear vector
        ];
        description = "Delay differential equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dead-code-detection" = callPackage
@@ -70868,8 +71184,8 @@ self: {
          string-conversions uniplate
        ];
        description = "detect dead code in haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70885,8 +71201,8 @@ self: {
          base containers parsec template-haskell transformers vector
        ];
        description = "Dead simple JSON parser, with some Template Haskell sugar";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70916,7 +71232,7 @@ self: {
          base Cabal HUnit parsec pretty regex-tdfa text
        ];
        description = "Modules for working with the Debian package system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debian-binary" = callPackage
@@ -70930,7 +71246,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath HSH ];
        description = "Utilities to work with debian binary packages";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "debian-build" = callPackage
@@ -70948,7 +71264,7 @@ self: {
        ];
        executableHaskellDepends = [ base filepath transformers ];
        description = "Debian package build sequence tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debug" = callPackage
@@ -70976,8 +71292,8 @@ self: {
          aeson base bytestring containers directory extra filepath text
        ];
        description = "Simple trace-based debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70989,7 +71305,7 @@ self: {
        sha256 = "19k9f92pjh52qnr31l0468hn2klkb8wszs7azwczvxzg8aq7krld";
        libraryHaskellDepends = [ base groom process temporary ];
        description = "Display a colorized diff between two Haskell values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debug-dump" = callPackage
@@ -71000,7 +71316,7 @@ self: {
        sha256 = "0il889gy8fdi1yxm7f1nmj4s5gxqyq35jm8p5fax6yhj6lmyciwl";
        libraryHaskellDepends = [ base bytestring directory random text ];
        description = "File-based debug output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debug-me" = callPackage
@@ -71028,8 +71344,8 @@ self: {
          wai-websockets warp websockets
        ];
        description = "secure remote debugging";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71046,8 +71362,8 @@ self: {
          aeson base debug-hoed directory filepath yaml
        ];
        description = "A preprocessor for the debug package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {debug-hoed = null;};
 
@@ -71060,7 +71376,7 @@ self: {
        libraryHaskellDepends = [ base clock containers ];
        testHaskellDepends = [ base ];
        description = "Debug.Trace equivalent for timing computations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "debug-trace-var" = callPackage
@@ -71071,8 +71387,8 @@ self: {
        sha256 = "12dlnvzvnjk6z37pnajmghd5wcrzkf4pkpc0r2nrjp4h3p9pjkqp";
        libraryHaskellDepends = [ base template-haskell unicode-show ];
        description = "You do not have to write variable names twice in Debug.Trace";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71087,8 +71403,8 @@ self: {
        libraryHaskellDepends = [ base lens random transformers ];
        executableHaskellDepends = [ base ];
        description = "More useful trace functions for investigating bugs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71101,7 +71417,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert Unicode characters with burrs to their ASCII counterparts";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dec" = callPackage
@@ -71114,7 +71430,7 @@ self: {
        editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs";
        libraryHaskellDepends = [ base ];
        description = "Decidable propositions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "decepticons" = callPackage
@@ -71125,8 +71441,8 @@ self: {
        sha256 = "1fnp2c2rdpihvxm5j22z1mrf8pnpcnasvfsrlg7lvg5m76md7k3v";
        libraryHaskellDepends = [ base comonad-transformers ];
        description = "The categorical dual of transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71142,8 +71458,8 @@ self: {
          base functor-products microlens singletons vinyl
        ];
        description = "Combinators for manipulating dependently-typed predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71158,8 +71474,8 @@ self: {
        libraryHaskellDepends = [ base binary binary-bits deepseq mtl ];
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        description = "An implementation of the General Decimal Arithmetic Specification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71174,8 +71490,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71195,7 +71511,7 @@ self: {
        ];
        testHaskellDepends = [ base mwc-probability ];
        description = "DIY Markov Chains";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "decode-utf8" = callPackage
@@ -71211,7 +71527,7 @@ self: {
          api-opentheory-unicode base opentheory-unicode
        ];
        description = "Decode a UTF-8 byte stream on standard input";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "decoder-conduit" = callPackage
@@ -71222,8 +71538,8 @@ self: {
        sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7";
        libraryHaskellDepends = [ base binary bytestring conduit ];
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71247,7 +71563,7 @@ self: {
        ];
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71266,8 +71582,8 @@ self: {
        testHaskellDepends = [ base doctest rank2classes ];
        testToolDepends = [ markdown-unlit ];
        description = "Deep natural and unnatural tree transformations, including attribute grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71284,8 +71600,8 @@ self: {
          base containers doctest HUnit mtl QuickCheck safe transformers
        ];
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71313,8 +71629,8 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Deep Learning in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71333,8 +71649,8 @@ self: {
          array base ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "Deep evaluation of data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "deepseq-bounded" = callPackage
@@ -71357,8 +71673,8 @@ self: {
          parallel random syb template-haskell
        ];
        description = "Bounded deepseq, including support for generic deriving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71377,7 +71693,7 @@ self: {
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deepseq-instances" = callPackage
@@ -71388,7 +71704,7 @@ self: {
        sha256 = "0shhk3hqy02qkrbbd85sbzhga7pvk6fwjnadnp6dkip55gllm24z";
        libraryHaskellDepends = [ array base deepseq stm ];
        description = "Candidate NFData Instances for Types in base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "deepseq-magic" = callPackage
@@ -71399,8 +71715,8 @@ self: {
        sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp";
        libraryHaskellDepends = [ base ];
        description = "Deep evaluation of data structures without NFData";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71413,8 +71729,8 @@ self: {
        libraryHaskellDepends = [ base deepseq template-haskell ];
        testHaskellDepends = [ base deepseq template-haskell ];
        description = "Template Haskell based deriver for optimised NFData instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71426,8 +71742,8 @@ self: {
        sha256 = "1hisk6yfq4182ak7d1mi1kmnwwlcl8w7gwc8wqkq4l8m3zfyij8k";
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71439,8 +71755,8 @@ self: {
        sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg";
        libraryHaskellDepends = [ base cluss ];
        description = "default arguments in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71463,7 +71779,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Abstractions over deferred folds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "definitive-base" = callPackage
@@ -71480,7 +71796,7 @@ self: {
        ];
        description = "The base modules of the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-filesystem" = callPackage
@@ -71501,7 +71817,7 @@ self: {
        ];
        description = "A library that enable you to interact with the filesystem in a definitive way";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-graphics" = callPackage
@@ -71524,7 +71840,7 @@ self: {
        ];
        description = "A definitive package allowing you to open windows, read image files and render text to be displayed or saved";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-parser" = callPackage
@@ -71542,7 +71858,7 @@ self: {
        ];
        description = "A parser combinator library for the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-reactive" = callPackage
@@ -71561,7 +71877,7 @@ self: {
        ];
        description = "A simple Reactive library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-sound" = callPackage
@@ -71581,7 +71897,7 @@ self: {
        ];
        description = "A definitive package to handle sound and play it back";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "deiko-config" = callPackage
@@ -71596,7 +71912,7 @@ self: {
          array base containers exceptions mtl parsec text transformers
        ];
        description = "Small and typesafe configuration library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dejafu" = callPackage
@@ -71612,7 +71928,7 @@ self: {
          leancheck profunctors random transformers
        ];
        description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "deka" = callPackage
@@ -71624,8 +71940,8 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec transformers ];
        librarySystemDepends = [ mpdec ];
        description = "Decimal floating point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mpdec = null;};
 
@@ -71646,8 +71962,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        description = "Tests for deka, decimal floating point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71664,8 +71980,8 @@ self: {
        ];
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        description = "Build a Delaunay triangulation of a set of points";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71682,7 +71998,7 @@ self: {
        ];
        testHaskellDepends = [ async base dimensional exceptions time ];
        description = "More useful and humain delaying functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "delicious" = callPackage
@@ -71696,8 +72012,8 @@ self: {
          base bytestring curl feed json nano-md5 xml
        ];
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71713,8 +72029,8 @@ self: {
          attoparsec base binary bytestring bytestring-show
        ];
        description = "Parse character delimited textual data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71727,8 +72043,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base uhc-util uulib ];
        description = "Library for dealing with tab and/or comma (or other) separated files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71752,8 +72068,8 @@ self: {
        ];
        testHaskellDepends = [ base directory filepath hspec ];
        description = "A library for detecting file changes";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71775,8 +72091,8 @@ self: {
          base binary bytestring containers monad-atom nlp-scores text
        ];
        description = "Online entropy-based model of lexical category acquisition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71788,8 +72104,8 @@ self: {
        sha256 = "0kq6kz064jy6x1b7x46h2a9mf9n5irzbkzr4dd2by4yvac9yc5kw";
        libraryHaskellDepends = [ base ];
        description = "Generalized the Prelude more functionally";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71802,8 +72118,8 @@ self: {
        libraryHaskellDepends = [ base free transformers ];
        testHaskellDepends = [ base hspec ];
        description = "Demarcating transformed monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71818,8 +72134,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
        description = "Functions supporting bulk file and directory name normalization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71844,8 +72160,8 @@ self: {
          transformers transformers-compat vector
        ];
        description = "Mutable and immutable dense multidimensional arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71867,8 +72183,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Dense int-set";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71887,7 +72203,24 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Simple and incomplete pure haskell implementation of linear algebra";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
+     }) {};
+
+  "dep-t" = callPackage
+    ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit
+     , template-haskell, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "dep-t";
+       version = "0.1.0.2";
+       sha256 = "0vzf37gmhvpv43xybzn7lms0jgl12ch7mz04a05a1arn3ljh89c9";
+       libraryHaskellDepends = [ base mtl transformers unliftio-core ];
+       testHaskellDepends = [
+         base mtl rank2classes tasty tasty-hunit template-haskell
+         transformers unliftio-core
+       ];
+       description = "Reader-like monad transformer for dependency injection";
+       license = lib.licenses.bsd3;
      }) {};
 
   "dependency" = callPackage
@@ -71904,7 +72237,7 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Dependency resolution for package management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dependent-hashmap" = callPackage
@@ -71923,8 +72256,8 @@ self: {
          mtl unordered-containers
        ];
        description = "Dependent hash maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71939,7 +72272,7 @@ self: {
        libraryHaskellDepends = [ base containers dependent-sum ];
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dependent-map" = callPackage
@@ -71955,7 +72288,7 @@ self: {
        ];
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dependent-monoidal-map" = callPackage
@@ -71971,8 +72304,8 @@ self: {
          dependent-sum dependent-sum-aeson-orphans
        ];
        description = "Dependent map that uses semigroup mappend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71984,8 +72317,8 @@ self: {
        sha256 = "0rvl1svd0ya8wrmlimkcb7iki33gvpm5h0ix9vac2id38l4a4fh9";
        libraryHaskellDepends = [ base lens mtl prologue ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71997,8 +72330,8 @@ self: {
        sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8";
        libraryHaskellDepends = [ base ];
        description = "Dependent sum type";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dependent-sum" = callPackage
@@ -72009,7 +72342,7 @@ self: {
        sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1";
        libraryHaskellDepends = [ base constraints-extras some ];
        description = "Dependent sum type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "dependent-sum-aeson-orphans" = callPackage
@@ -72025,7 +72358,7 @@ self: {
          dependent-sum some
        ];
        description = "JSON instances for DSum, DMap, and Some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dependent-sum-template" = callPackage
@@ -72041,7 +72374,7 @@ self: {
        ];
        testHaskellDepends = [ base constraints-extras dependent-sum ];
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "depends" = callPackage
@@ -72062,8 +72395,8 @@ self: {
          transformers yaml-config
        ];
        description = "A simple configuration management tool for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72083,7 +72416,7 @@ self: {
        ];
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72100,7 +72433,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Double-ended priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deptrack-core" = callPackage
@@ -72111,8 +72444,8 @@ self: {
        sha256 = "11v9yvvsp3m3igpqqqqkx1cp648s87xpa4d06vbsxnz4k6yp4bjj";
        libraryHaskellDepends = [ base containers dlist mtl parsec ];
        description = "DepTrack Core types and model";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72131,8 +72464,8 @@ self: {
          text
        ];
        description = "DepTrack applied to DevOps";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72145,8 +72478,8 @@ self: {
        libraryHaskellDepends = [ base containers deptrack-core dotgen ];
        testHaskellDepends = [ base containers deptrack-core dotgen ];
        description = "Facilitate Graphviz representations of DepTrack dependencies";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72165,7 +72498,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Double-ended queues";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dequeue" = callPackage
@@ -72179,8 +72512,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck safe ];
        testHaskellDepends = [ base Cabal cabal-test-quickcheck ];
        description = "A typeclass and an implementation for double-ended queues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72193,7 +72526,7 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72208,7 +72541,7 @@ self: {
        ];
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72229,8 +72562,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72242,8 +72575,8 @@ self: {
        sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr";
        libraryHaskellDepends = [ base instant-generics template-haskell ];
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72255,8 +72588,8 @@ self: {
        sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
        libraryHaskellDepends = [ base data-default ];
        description = "Generic instances for enumerating complex data types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72278,8 +72611,8 @@ self: {
          base haskell-src-exts haskell-src-meta template-haskell
        ];
        description = "Instance deriving for (a subset of) GADTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72293,7 +72626,7 @@ self: {
          base bifunctors reflection template-haskell
        ];
        description = "Derive class instances though various kinds of lifting";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "derive-monoid" = callPackage
@@ -72308,8 +72641,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base semigroups ];
        description = "derive Semigroup/Monoid/IsList";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72323,7 +72656,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Derive Storable instances with GHC.Generics.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "derive-storable-plugin" = callPackage
@@ -72342,9 +72675,7 @@ self: {
          base criterion deepseq derive-storable
        ];
        description = "GHC core plugin supporting the derive-storable package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.mit;
      }) {};
 
   "derive-topdown" = callPackage
@@ -72359,7 +72690,7 @@ self: {
          base mtl primitive syb template-haskell th-expand-syns transformers
        ];
        description = "Help Haskellers derive class instances for composited data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "derive-trie" = callPackage
@@ -72370,8 +72701,8 @@ self: {
        sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc";
        libraryHaskellDepends = [ array base containers template-haskell ];
        description = "Automatic derivation of Trie implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72388,7 +72719,7 @@ self: {
          aeson base hspec template-haskell text unordered-containers
        ];
        description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "deriving-aeson" = callPackage
@@ -72400,7 +72731,7 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "Type driven generic aeson instance customisation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deriving-compat" = callPackage
@@ -72423,7 +72754,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deriving-show-simple" = callPackage
@@ -72435,7 +72766,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Derive a Show instance without field selector names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "derp" = callPackage
@@ -72446,7 +72777,7 @@ self: {
        sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
        libraryHaskellDepends = [ base containers ];
        description = "Derivative Parsing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "derp-lib" = callPackage
@@ -72457,8 +72788,8 @@ self: {
        sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x";
        libraryHaskellDepends = [ base derp ];
        description = "combinators based on parsing with derivatives (derp) package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72474,7 +72805,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Parse and render JSON simply";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "describe" = callPackage
@@ -72495,8 +72826,8 @@ self: {
          profunctors QuickCheck template-haskell text transformers
        ];
        description = "Combinators for describing binary data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72508,7 +72839,7 @@ self: {
        sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap";
        libraryHaskellDepends = [ base ];
        description = "Loads a list of items with fields";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "descript-lang" = callPackage
@@ -72542,8 +72873,8 @@ self: {
          transformers yaml
        ];
        description = "Library, interpreter, and CLI for Descript programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72563,7 +72894,7 @@ self: {
          aeson base bifunctors containers hspec HUnit mtl text transformers
        ];
        description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "desert" = callPackage
@@ -72583,7 +72914,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "a simple build tool for OCaml projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "despair" = callPackage
@@ -72594,7 +72925,7 @@ self: {
        sha256 = "0nl1sgbvxgg5ajgwj24l6qxlsin5g0bly50j8w7sg7jkn3v0r9kc";
        libraryHaskellDepends = [ base random ];
        description = "Despair";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deterministic-game-engine" = callPackage
@@ -72606,8 +72937,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
        description = "Simple deterministic game engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72630,7 +72961,7 @@ self: {
          template-haskell
        ];
        description = "JSON and CSV encoding for rationals as decimal point numbers";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "detour-via-uom" = callPackage
@@ -72651,8 +72982,8 @@ self: {
          uom-plugin
        ];
        description = "JSON and CSV encoding for quantities";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72671,7 +73002,7 @@ self: {
          unordered-containers zlib
        ];
        description = "Markov chain text generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deunicode" = callPackage
@@ -72684,8 +73015,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72704,8 +73035,8 @@ self: {
          text unix unordered-containers
        ];
        description = "A small tool to make it easier to update program managed by Angel";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72727,8 +73058,8 @@ self: {
          source-constraints tasty tasty-mgolden text typed-process
        ];
        description = "Haskell development tool agregate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72742,8 +73073,8 @@ self: {
          base bytestring containers elf hdis86 syb
        ];
        description = "Find gadgets for return-oriented programming on x86";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72763,7 +73094,7 @@ self: {
          time
        ];
        description = "Type, render and parse the df1 hierarchical structured log format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "df1-html" = callPackage
@@ -72783,7 +73114,7 @@ self: {
          text time xmlbf
        ];
        description = "Render and parse df1 logs as HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dfinity-radix-tree" = callPackage
@@ -72818,8 +73149,8 @@ self: {
          tasty-quickcheck temporary text transformers unordered-containers
        ];
        description = "A generic data integrity layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) leveldb;};
 
@@ -72831,7 +73162,7 @@ self: {
        sha256 = "1ybq5bnh85dbr9lfx5d6qw87x9qc8fs0yvbi1a6860an13lvrzy7";
        libraryHaskellDepends = [ base scientific ];
        description = "A package for precise decimal arithmatic using rationals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dfsbuild" = callPackage
@@ -72851,7 +73182,7 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72864,8 +73195,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Implementation of DGIM algorithm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72877,8 +73208,8 @@ self: {
        sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx";
        libraryHaskellDepends = [ base HTTP mtl network split ];
        description = "Haskell front-end for DGS' bot interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72930,8 +73261,8 @@ self: {
        ];
        doCheck = false;
        description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dhall" = callPackage
@@ -72987,7 +73318,7 @@ self: {
        ];
        doCheck = false;
        description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-bash" = callPackage
@@ -73008,7 +73339,7 @@ self: {
          base bytestring dhall optparse-generic text
        ];
        description = "Compile Dhall to Bash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-check" = callPackage
@@ -73025,8 +73356,8 @@ self: {
          base containers dhall directory filepath fsnotify text trifecta
        ];
        description = "Check all dhall files in a project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73058,7 +73389,9 @@ self: {
          turtle
        ];
        description = "Generate HTML docs from a dhall package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-fly" = callPackage
@@ -73090,8 +73423,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Translate concourse config from Dhall to YAML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73123,7 +73456,7 @@ self: {
          aeson base bytestring dhall tasty tasty-hunit tasty-silver text
        ];
        description = "Convert between Dhall and JSON or YAML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-lex" = callPackage
@@ -73142,7 +73475,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec hspec-dirstream ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Lexer for the Dhall language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-lsp-server" = callPackage
@@ -73157,8 +73490,8 @@ self: {
        pname = "dhall-lsp-server";
        version = "1.0.12";
        sha256 = "0gp9pa3pdm49ya6awdi1qjbycxdihz2z11mzmfnr5m2gf0vrjzpp";
-       revision = "1";
-       editedCabalFile = "1yiazwsvbz2yzc8jdvr6nq7p882pkcr2hfyxsn73j288cwdyl02r";
+       revision = "2";
+       editedCabalFile = "0nn30rkmdxacankwvmagfxaha6532ikwpz7w18s27xw4qpkhp6v9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73173,7 +73506,7 @@ self: {
          QuickCheck tasty tasty-hspec text
        ];
        description = "Language Server Protocol (LSP) server for Dhall";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dhall-nix" = callPackage
@@ -73184,6 +73517,8 @@ self: {
        pname = "dhall-nix";
        version = "1.1.19";
        sha256 = "0w3vxqn1h39f17mg246ydxni02civ3fm85s0wi4ks6iy1ng4dw0a";
+       revision = "1";
+       editedCabalFile = "0m0xpxc7nm962b0vkw7i88dnwihjza82cybqjzjk24dgp8v48cqs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73194,8 +73529,8 @@ self: {
          base dhall hnix optparse-generic text
        ];
        description = "Dhall to Nix compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73209,6 +73544,8 @@ self: {
        pname = "dhall-nixpkgs";
        version = "1.0.3";
        sha256 = "03apykbil3x3j7ndapfgmf39p7l62d1lrn2ad1m6k5xqnd8nqlxf";
+       revision = "1";
+       editedCabalFile = "1wqh5l2rydb2ag1k514p3p8dq19m3mbv6i2cha4xr8ykwcwbwi0j";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -73217,8 +73554,8 @@ self: {
          prettyprinter text transformers turtle
        ];
        description = "Convert Dhall projects to Nix packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73236,8 +73573,8 @@ self: {
          base dhall optparse-applicative text
        ];
        description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73266,8 +73603,8 @@ self: {
          tasty tasty-golden tasty-hunit text
        ];
        description = "Compile Dhall expressions to Cabal files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73298,7 +73635,7 @@ self: {
          tasty-hunit text
        ];
        description = "Convert between Dhall and YAML";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -73316,8 +73653,8 @@ self: {
          attoparsec base bytestring chronos ip tasty tasty-hunit
        ];
        description = "Parse a DHCP lease file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73351,8 +73688,8 @@ self: {
        ];
        doHaddock = false;
        description = "Dhall/YAML configurable concurrent integration test executor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73368,7 +73705,7 @@ self: {
          base containers df1 di-core di-df1 di-handle di-monad exceptions
        ];
        description = "Typeful hierarchical structured logging using di, mtl and df1";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-core" = callPackage
@@ -73387,7 +73724,7 @@ self: {
          tasty-quickcheck time
        ];
        description = "Typeful hierarchical structured logging without monad towers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-df1" = callPackage
@@ -73406,7 +73743,7 @@ self: {
          time
        ];
        description = "Write logs in the df1 format using the di logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-handle" = callPackage
@@ -73419,7 +73756,7 @@ self: {
          base bytestring di-core exceptions unix
        ];
        description = "IO support for file handles in di-core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-monad" = callPackage
@@ -73434,7 +73771,7 @@ self: {
          base containers di-core exceptions mtl pipes stm transformers
        ];
        description = "mtl flavoured typeful hierarchical structured logging for di-core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-polysemy" = callPackage
@@ -73447,7 +73784,7 @@ self: {
          base df1 di-core di-df1 di-handle polysemy
        ];
        description = "DI logger wrapped for Polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dia-base" = callPackage
@@ -73460,8 +73797,8 @@ self: {
        editedCabalFile = "0jp6vxj2m984dl7gnphs7119zxs8pplhq73nnicvbhjcliixyl6w";
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73479,8 +73816,8 @@ self: {
          base containers data-pprint deepseq dia-base mtl xhtml
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73497,8 +73834,8 @@ self: {
        ];
        doHaddock = false;
        description = "Embedded domain-specific language for declarative vector graphics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73512,8 +73849,8 @@ self: {
        editedCabalFile = "1cqibxx1a00m8nl9k48c0m0ln589rr4qw3f41xl1jk68b83r3x1k";
        libraryHaskellDepends = [ base cubicbezier diagrams-lib ];
        description = "deprecated, part of diagrams-contrib since 1.4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73539,8 +73876,8 @@ self: {
          Rasterific time
        ];
        description = "Braille diagrams with plain text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73569,8 +73906,8 @@ self: {
          filepath JuicyPixels lens svg-builder
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73593,8 +73930,8 @@ self: {
          vector
        ];
        description = "Cairo backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73613,8 +73950,8 @@ self: {
          optparse-applicative statestack text
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73643,8 +73980,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Collection of user contributions to diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73664,8 +74001,8 @@ self: {
          monoid-extras mtl profunctors semigroups unordered-containers
        ];
        description = "Core libraries for diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73681,8 +74018,8 @@ self: {
          base containers diagrams-lib fgl graphviz split
        ];
        description = "Graph layout and drawing with GraphViz and diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73698,8 +74035,8 @@ self: {
          base cairo diagrams-cairo diagrams-lib gtk
        ];
        description = "Backend for rendering diagrams directly to GTK windows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73730,8 +74067,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73748,8 +74085,8 @@ self: {
          transformers
        ];
        description = "HsQML (Qt5) backend for Diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -73767,8 +74104,8 @@ self: {
          statestack static-canvas text
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73802,8 +74139,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion diagrams-core ];
        description = "Embedded domain-specific language for declarative graphics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73829,8 +74166,8 @@ self: {
          filepath linear optparse-applicative pandoc-types text
        ];
        description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73848,8 +74185,8 @@ self: {
          monoid-extras mtl semigroups split vector-space
        ];
        description = "PDF backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73869,8 +74206,8 @@ self: {
          optparse-applicative process split texrunner time vector zlib
        ];
        description = "PGF backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73891,8 +74228,8 @@ self: {
          statestack
        ];
        description = "Postscript backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73907,8 +74244,8 @@ self: {
          array base colour diagrams-core diagrams-lib
        ];
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73931,8 +74268,8 @@ self: {
        ];
        testHaskellDepends = [ base diagrams-core diagrams-lib ];
        description = "Rasterific backend for diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73950,8 +74287,8 @@ self: {
          monoid-extras mtl reflex reflex-dom reflex-dom-contrib
        ];
        description = "reflex backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diagrams-rubiks-cube" = callPackage
@@ -73966,8 +74303,8 @@ self: {
          adjunctions base data-default-class diagrams-lib distributive lens
        ];
        description = "Library for drawing the Rubik's Cube";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73984,7 +74321,7 @@ self: {
          base deepseq tasty tasty-hunit tasty-quickcheck
        ];
        description = "Pure Haskell solver routines used by diagrams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diagrams-svg" = callPackage
@@ -74005,8 +74342,8 @@ self: {
          optparse-applicative semigroups split svg-builder text
        ];
        description = "SVG backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74020,8 +74357,8 @@ self: {
          base diagrams-core diagrams-lib dlist mtl
        ];
        description = "TikZ backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74039,8 +74376,8 @@ self: {
          base cairo diagrams-cairo diagrams-lib wx wxcore
        ];
        description = "Backend for rendering diagrams in wxWidgets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74058,8 +74395,8 @@ self: {
          webkitgtk3
        ];
        description = "Simple dialog-based user interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dialogflow-fulfillment" = callPackage
@@ -74079,7 +74416,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A Dialogflow Fulfillment library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dib" = callPackage
@@ -74102,8 +74439,8 @@ self: {
          base containers directory filepath mtl process time
        ];
        description = "A simple, forward build system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74117,7 +74454,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parsec random-fu transformers ];
        description = "Simplistic D&D style dice-rolling system";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "dice-entropy-conduit" = callPackage
@@ -74136,7 +74473,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "Cryptographically secure n-sided dice via rejection sampling";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "dice2tex" = callPackage
@@ -74149,8 +74486,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74164,8 +74501,8 @@ self: {
          base binary bytestring pretty safe time
        ];
        description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74194,8 +74531,8 @@ self: {
          random tagged text time
        ];
        description = "Tools to handle StarDict dictionaries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74209,7 +74546,7 @@ self: {
        editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439";
        libraryHaskellDepends = [ base containers ];
        description = "Sharing/memoization of class members";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dictparser" = callPackage
@@ -74224,8 +74561,8 @@ self: {
        executableHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74243,8 +74580,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Discrete Interval Encoding Trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74256,8 +74593,8 @@ self: {
        sha256 = "19sn53b4sb0sa7ibcz9wvpn3vhja0yx62p8f9ibawrycm4cpbpzl";
        libraryHaskellDepends = [ base Enum util ];
        description = "Diff and patch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74273,7 +74610,7 @@ self: {
        testHaskellDepends = [ base Diff ];
        description = "A diff algorithm based on recursive longest common substrings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diff-parse" = callPackage
@@ -74285,7 +74622,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
        description = "A parser for diff file formats";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "diff3" = callPackage
@@ -74301,7 +74638,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Perform a 3-way difference of documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diffarray" = callPackage
@@ -74312,7 +74649,7 @@ self: {
        sha256 = "0p95i1xzp0bdm0zrdil79rfxfyz372y2qjdxyvxdzxvfb1mvalcm";
        libraryHaskellDepends = [ array base ];
        description = "DiffArray";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diffcabal" = callPackage
@@ -74330,8 +74667,8 @@ self: {
          process
        ];
        description = "Diff two .cabal files syntactically";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74351,7 +74688,7 @@ self: {
          parallel-io process process-extras unix
        ];
        description = "Tools for diffing stdout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "difference-monoid" = callPackage
@@ -74370,8 +74707,8 @@ self: {
          adjunctions base comonad containers deepseq distributive doctest
          groups hedgehog hedgehog-checkers QuickCheck semigroupoids
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74383,8 +74720,8 @@ self: {
      }:
      mkDerivation {
        pname = "differential";
-       version = "0.1.2.1";
-       sha256 = "164s372c7pfqnzhvrhxmic0csx3lgwqi06zz5w8zfvkw76md8qh3";
+       version = "0.2.0.0";
+       sha256 = "1dzxqva176dw22bb4hlv8dfizkzqsj5z9qdv7piwdh171nd9bwqd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74397,8 +74734,8 @@ self: {
          text-show vector
        ];
        description = "Finds out whether an entity comes from different distributions (statuses)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74412,8 +74749,8 @@ self: {
        editedCabalFile = "0gkcsdf9jrfs5lwhayl808flwlv446mixdn3n91v5gsxbcqqrsi7";
        libraryHaskellDepends = [ base containers ];
        description = "diff on maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74439,8 +74776,8 @@ self: {
          tasty-hunit text
        ];
        description = "Generate todo lists from source code";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74452,7 +74789,7 @@ self: {
        sha256 = "1156jr67fjpp68r2qnq0py80cmk42cz356aarqsd8al98dnvxxn6";
        libraryHaskellDepends = [ base math-functions ];
        description = "A (deprecated) implementation of the digamma function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digest" = callPackage
@@ -74464,7 +74801,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
   "digest-pure" = callPackage
@@ -74477,7 +74814,7 @@ self: {
        testHaskellDepends = [ array base bytestring digest QuickCheck ];
        description = "Pure hash functions for bytestrings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "digest-sig" = callPackage
@@ -74491,7 +74828,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        doHaddock = false;
        description = "Signature for digest";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-bootstrap" = callPackage
@@ -74507,8 +74844,8 @@ self: {
          digestive-functors-blaze http-types text
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74525,8 +74862,8 @@ self: {
          lucid-foundation text
        ];
        description = "Speed up form designing using digestive functors and foundation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74548,7 +74885,7 @@ self: {
          test-framework-quickcheck2 text time
        ];
        description = "A practical formlet library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-aeson" = callPackage
@@ -74569,8 +74906,8 @@ self: {
          tasty-hunit text
        ];
        description = "Run digestive-functors forms against JSON";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74586,7 +74923,7 @@ self: {
          base blaze-html blaze-markup digestive-functors text
        ];
        description = "Blaze frontend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-happstack" = callPackage
@@ -74601,8 +74938,8 @@ self: {
          base bytestring digestive-functors happstack-server text
        ];
        description = "Happstack backend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74619,7 +74956,7 @@ self: {
          xmlhtml
        ];
        description = "Heist frontend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-hsp" = callPackage
@@ -74631,8 +74968,8 @@ self: {
        libraryHaskellDepends = [ base digestive-functors hsp hsx text ];
        libraryToolDepends = [ trhsx ];
        description = "HSP support for digestive-functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74644,7 +74981,7 @@ self: {
        sha256 = "176vc7gsm0379100imk1i8y8r2gx0l66dijgmxkqbq1qwkjfizs5";
        libraryHaskellDepends = [ base digestive-functors lucid text ];
        description = "Lucid frontend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-scotty" = callPackage
@@ -74662,7 +74999,7 @@ self: {
          wai-extra
        ];
        description = "Scotty backend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-snap" = callPackage
@@ -74678,7 +75015,7 @@ self: {
          mtl snap-core text
        ];
        description = "Snap backend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digit" = callPackage
@@ -74699,7 +75036,7 @@ self: {
          tasty tasty-hedgehog tasty-hspec tasty-hunit text
        ];
        description = "A data-type representing digits 0-9 and other combinations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digitalocean-kzs" = callPackage
@@ -74716,8 +75053,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest hspec ];
        description = "digitalocean api for haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74730,8 +75067,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74750,7 +75087,7 @@ self: {
        ];
        testHaskellDepends = [ base fgl hashable massiv QuickCheck ];
        description = "Directed Graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dihaa" = callPackage
@@ -74767,7 +75104,7 @@ self: {
          base FontyFruity JuicyPixels Rasterific vector
        ];
        description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "dijkstra-simple" = callPackage
@@ -74779,7 +75116,7 @@ self: {
        libraryHaskellDepends = [ base containers fingertree ];
        testHaskellDepends = [ base containers fingertree hspec ];
        description = "A simpler Dijkstra shortest paths implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dimensional" = callPackage
@@ -74802,7 +75139,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dimensional-codata" = callPackage
@@ -74813,8 +75150,8 @@ self: {
        sha256 = "1bmal7i0zvfivri5w7fbl4n0gyybnr2wy2cvz21b33jrzjblr1g0";
        libraryHaskellDepends = [ base dimensional numtype-dk ];
        description = "CODATA Recommended Physical Constants with Dimensional Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74826,8 +75163,8 @@ self: {
        sha256 = "052daw4kj1ivj3h2lvs39m3xz1xy5ra8fj5pmpfnjmjgg5kfv2w1";
        libraryHaskellDepends = [ base numtype-tf time ];
        description = "Statically checked physical dimensions, implemented using type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74843,7 +75180,7 @@ self: {
          base Cabal constraints-deriving QuickCheck
        ];
        description = "Safe type-level dimensionality for multidimensional data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dingo-core" = callPackage
@@ -74866,8 +75203,8 @@ self: {
          unordered-containers wai wai-eventsource wai-extra warp web-css
        ];
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74887,8 +75224,8 @@ self: {
          shakespeare-js template-haskell text transformers
        ];
        description = "Dingo Example";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74907,8 +75244,8 @@ self: {
          unordered-containers
        ];
        description = "Dingo Widgets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74929,7 +75266,7 @@ self: {
          base tasty tasty-quickcheck tasty-th text unordered-containers
        ];
        description = "A convenient tagless EDSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diohsc" = callPackage
@@ -74954,7 +75291,7 @@ self: {
          unix x509 x509-store x509-validation
        ];
        description = "Gemini client";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "diophantine" = callPackage
@@ -74966,8 +75303,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        description = "A quadratic diophantine equation solving library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74983,8 +75320,8 @@ self: {
          base containers HUnit parsec transformers TypeNat
        ];
        description = "Diplomacy board game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75008,8 +75345,8 @@ self: {
          TypeNat wai warp warp-tls
        ];
        description = "Play Diplomacy over HTTP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75026,7 +75363,7 @@ self: {
          base criterion directory dirstream pipes pipes-safe system-filepath
        ];
        description = "Simple directory traversal library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direct-binary-files" = callPackage
@@ -75037,8 +75374,8 @@ self: {
        sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr";
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Serialization and deserialization monads for streams and ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75050,7 +75387,7 @@ self: {
        sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh";
        libraryHaskellDepends = [ base unix ];
        description = "Library to switch to daemon mode using built-in OS facilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direct-fastcgi" = callPackage
@@ -75065,8 +75402,8 @@ self: {
          base bytestring containers mtl network utf8-string
        ];
        description = "Native implementation of the FastCGI protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75085,8 +75422,8 @@ self: {
          transformers-base unix utf8-string
        ];
        description = "Native webserver that acts as a library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75098,7 +75435,7 @@ self: {
        sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q";
        libraryHaskellDepends = [ base bytestring ];
        description = "An implementation of the MurmurHash3 algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direct-plugins" = callPackage
@@ -75109,8 +75446,8 @@ self: {
        sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr";
        libraryHaskellDepends = [ base ghc ghc-paths ];
        description = "Lightweight replacement for Plugins, specific to GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75130,8 +75467,8 @@ self: {
          base bytestring directory filepath safe-exceptions
        ];
        description = "Bindings to RocksDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75148,7 +75485,7 @@ self: {
          base base16-bytestring bytestring directory HUnit temporary text
        ];
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "directed-cubical" = callPackage
@@ -75164,8 +75501,8 @@ self: {
          unordered-containers vector
        ];
        description = "Finite directed cubical complexes and associated algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75178,8 +75515,8 @@ self: {
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "directory-contents" = callPackage
@@ -75198,7 +75535,9 @@ self: {
        executableHaskellDepends = [ base filepath text ];
        testHaskellDepends = [ base filepath ];
        description = "Recursively build, navigate, and operate on a tree of directory contents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "directory-layout" = callPackage
@@ -75222,7 +75561,7 @@ self: {
          transformers unix unordered-containers
        ];
        description = "Directory layout DSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "directory-listing-webpage-parser" = callPackage
@@ -75236,7 +75575,7 @@ self: {
          base bytestring network-uri tagsoup text time
        ];
        description = "directory listing webpage parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "directory-tree" = callPackage
@@ -75248,7 +75587,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [ base directory filepath process ];
        description = "A simple directory-like tree datatype, with useful IO functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direm" = callPackage
@@ -75261,8 +75600,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory ];
        description = "Deletes a directory and retains its contents in the parent directory";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75278,8 +75617,8 @@ self: {
          aeson base containers hblock safecopy text time
          unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75296,7 +75635,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec log-domain mwc-random vector ];
        description = "Multivariate Dirichlet distribution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dirstream" = callPackage
@@ -75313,7 +75652,7 @@ self: {
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
        description = "Easily stream directory contents in constant memory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dirtree" = callPackage
@@ -75335,7 +75674,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "disassembler" = callPackage
@@ -75346,7 +75685,7 @@ self: {
        sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c";
        libraryHaskellDepends = [ array base containers mtl parsec ];
        description = "Disassembler for X86 & AMD64 machine code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "discogs-haskell" = callPackage
@@ -75369,8 +75708,8 @@ self: {
          transformers
        ];
        description = "Client for Discogs REST API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75382,7 +75721,7 @@ self: {
        sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj";
        libraryHaskellDepends = [ base containers ];
        description = "DisCoCat implementation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "discord-gateway" = callPackage
@@ -75399,8 +75738,8 @@ self: {
          aeson base discord-types hslogger transformers url websockets wuss
        ];
        description = "An API wrapper for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75424,7 +75763,7 @@ self: {
        ];
        executableHaskellDepends = [ base text unliftio ];
        description = "Write bots for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "discord-hs" = callPackage
@@ -75440,8 +75779,8 @@ self: {
          websockets
        ];
        description = "An API wrapper for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75473,8 +75812,8 @@ self: {
          unboxing-vector unordered-containers vector
        ];
        description = "Discord verification bot";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75494,8 +75833,8 @@ self: {
          hslogger http-client mtl req stm text time url
        ];
        description = "An API wrapper for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75514,8 +75853,8 @@ self: {
          vector
        ];
        description = "Type information for discord-hs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75527,8 +75866,8 @@ self: {
        sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d";
        libraryHaskellDepends = [ base time ];
        description = "library for handling Discordian calendar dates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75541,7 +75880,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the discount Markdown library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {markdown = null;};
 
   "discrete" = callPackage
@@ -75554,8 +75893,8 @@ self: {
        editedCabalFile = "1ary1xyh2gy099p1madapfqhw2r1ys1pd8xg396xxaas4vjmqqkh";
        libraryHaskellDepends = [ base ];
        description = "replacement for enum";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75567,7 +75906,7 @@ self: {
        sha256 = "1in70wlm6qcmc743v0w1lha4wffjinbwsgcyq44gzk0lb79ix6lb";
        libraryHaskellDepends = [ base ];
        description = "Discrete Intervals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "discrete-space-map" = callPackage
@@ -75582,32 +75921,35 @@ self: {
          adjunctions base comonad distributive keys semigroupoids
        ];
        description = "A discrete space map";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "discrimination" = callPackage
     ({ mkDerivation, array, base, containers, contravariant, criterion
-     , deepseq, ghc-prim, hashable, integer-gmp, primitive, profunctors
-     , promises, semigroups, transformers, transformers-compat
-     , unordered-containers, vector, void
+     , deepseq, ghc-prim, hashable, integer-gmp, primitive, promises
+     , QuickCheck, quickcheck-instances, splitmix, tasty
+     , tasty-quickcheck, transformers, unordered-containers, vector
+     , vector-algorithms
      }:
      mkDerivation {
        pname = "discrimination";
-       version = "0.4";
-       sha256 = "085lhsvyp4d135p9yhgyl2s92f4cjdsghk1nsp8mjjddh6hxl20a";
-       revision = "1";
-       editedCabalFile = "0xi8c19cz3gm208g0dl6f2pks3skqmif2zml8j40r77ajxnf6anl";
+       version = "0.4.1";
+       sha256 = "0p0hryrp15bc8cjfr2hypkg35fy1m30hr19s9p6rj91cxxgjbfq2";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
-         integer-gmp primitive profunctors promises semigroups transformers
-         transformers-compat vector void
+         integer-gmp primitive promises transformers
+       ];
+       testHaskellDepends = [
+         base containers criterion deepseq hashable QuickCheck
+         quickcheck-instances splitmix tasty tasty-quickcheck
+         unordered-containers vector vector-algorithms
        ];
        benchmarkHaskellDepends = [
-         base containers criterion deepseq ghc-prim primitive
-         unordered-containers
+         base containers criterion deepseq ghc-prim hashable primitive
+         splitmix unordered-containers vector vector-algorithms
        ];
        description = "Fast generic linear-time sorting, joins and container construction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "disjoint-containers" = callPackage
@@ -75626,8 +75968,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Disjoint containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75644,8 +75986,8 @@ self: {
          base containers HUnit mtl QuickCheck transformers
        ];
        description = "Persistent disjoint-sets, a.k.a union-find.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75658,8 +76000,8 @@ self: {
        libraryHaskellDepends = [ base primitive ref-tf vector ];
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        description = "Monadic disjoint set";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75671,7 +76013,7 @@ self: {
        sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m";
        libraryHaskellDepends = [ array base ];
        description = "Imperative ST/IO based disjoint set data structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "disk-free-space" = callPackage
@@ -75684,7 +76026,7 @@ self: {
        editedCabalFile = "0x0wjycr3rhw9vcq51b4sz8cf7mcvx7whhywv72y25r9385lxb3i";
        libraryHaskellDepends = [ base ];
        description = "Retrieve information about disk space usage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diskhash" = callPackage
@@ -75702,7 +76044,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
        description = "Disk-based hash table";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "display" = callPackage
@@ -75713,7 +76055,7 @@ self: {
        sha256 = "0hn1zdis621h87r4mr35vic9473iwqcdjnmmfgs1j5dfsh62kd6b";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Display things for humans to read";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "display-haskell-do" = callPackage
@@ -75724,7 +76066,7 @@ self: {
        sha256 = "0j2rsmgmkfwy0w96y1qzr5vmhr16qgd46rka8ya17rakb4rzvi3q";
        libraryHaskellDepends = [ aeson base text ];
        description = "A display API for HaskellDO";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "disposable" = callPackage
@@ -75735,7 +76077,7 @@ self: {
        sha256 = "0kzyzbhhjm005fi2n59j4in58kps4rciaza9pzi0qd2xnn9j5iqv";
        libraryHaskellDepends = [ base ghcjs-base-stub stm ];
        description = "Allows storing different resource-releasing actions together";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dist-upload" = callPackage
@@ -75749,8 +76091,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath process ];
        doHaddock = false;
        description = "Generate/Upload cabal package to Hackage";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75764,8 +76106,8 @@ self: {
        editedCabalFile = "0iysmnl4p1fsb4zd0mmr6q7zc7w90jrwcxxm7vi38658x19r8qmq";
        libraryHaskellDepends = [ base ];
        description = "Useful distance datatype and functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75778,7 +76120,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Generate readable distances between times";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "distributed-closure" = callPackage
@@ -75797,7 +76139,7 @@ self: {
        executableHaskellDepends = [ async base binary bytestring ];
        testHaskellDepends = [ base binary hspec QuickCheck ];
        description = "Serializable closures for distributed programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distributed-fork" = callPackage
@@ -75815,7 +76157,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Like 'forkIO', but uses remote machines instead of local threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distributed-fork-aws-lambda" = callPackage
@@ -75841,8 +76183,8 @@ self: {
          base distributed-fork tasty tasty-hunit text
        ];
        description = "AWS Lambda backend for distributed-fork";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75867,8 +76209,8 @@ self: {
          base binary bytestring network-transport-tcp
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75896,8 +76238,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Cloud Haskell Async API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75920,8 +76262,8 @@ self: {
          rank1dynamic transformers unix
        ];
        description = "Microsoft Azure backend for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75951,8 +76293,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75968,8 +76310,8 @@ self: {
          base distributed-process ekg-core text unordered-containers
        ];
        description = "Collect node stats for EKG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76005,8 +76347,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "Execution Framework for The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76037,8 +76379,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Cloud Haskell Extras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76071,8 +76413,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76098,8 +76440,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76116,8 +76458,8 @@ self: {
          transformers-base
        ];
        description = "Orphan instances for MonadBase and MonadBaseControl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76138,8 +76480,8 @@ self: {
        ];
        executableHaskellDepends = [ base distributed-process mtl ];
        description = "Peer-to-peer node discovery for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76170,8 +76512,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76204,8 +76546,8 @@ self: {
          unordered-containers
        ];
        description = "Cloud Haskell Extended Process Registry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76228,8 +76570,8 @@ self: {
          transformers
        ];
        description = "Simple zero-configuration backend for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76261,8 +76603,8 @@ self: {
          test-framework-hunit time transformers unordered-containers
        ];
        description = "Supervisors for The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76282,8 +76624,8 @@ self: {
          stm test-framework test-framework-hunit
        ];
        description = "Cloud Haskell Test Support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76320,8 +76662,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "Task Framework for The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76345,8 +76687,8 @@ self: {
          test-framework
        ];
        description = "Tests and test support tools for distributed-process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76375,8 +76717,8 @@ self: {
          network-transport-tcp transformers
        ];
        description = "A Zookeeper back-end for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76392,7 +76734,7 @@ self: {
          base binary bytestring containers deepseq rank1dynamic
        ];
        description = "Compositional, type-safe, polymorphic static values and closures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distribution" = callPackage
@@ -76405,8 +76747,8 @@ self: {
          array base containers MonadRandom random
        ];
        description = "Finite discrete probability distributions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76416,16 +76758,16 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-nixpkgs";
-       version = "1.3.1";
-       sha256 = "1113qizh931inpim0ajfwihcvlp26n1l4bf36v0jakd34k70mm8g";
+       version = "1.4.0";
+       sha256 = "1935lg05bfzwrvppi11r05nhwa1gkmvv0xqv1kqkbc87bk6pvp5g";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq language-nix lens
          pretty process split
        ];
        testHaskellDepends = [ base deepseq hspec lens ];
        description = "Types and functions to manipulate the Nixpkgs distribution";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "distribution-opensuse" = callPackage
@@ -76446,7 +76788,7 @@ self: {
        executableHaskellDepends = [ base containers text turtle ];
        testHaskellDepends = [ base ];
        description = "Types, functions, and tools to manipulate the openSUSE distribution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distribution-plot" = callPackage
@@ -76462,8 +76804,8 @@ self: {
          distribution lens
        ];
        description = "Easily plot distributions from the distribution package..";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76479,7 +76821,7 @@ self: {
        testHaskellDepends = [ base generic-deriving hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Distributive functors -- Dual to Traversable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ditto" = callPackage
@@ -76492,7 +76834,7 @@ self: {
          base containers mtl semigroups text torsor
        ];
        description = "ditto is a type-safe HTML form generation and validation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ditto-lucid" = callPackage
@@ -76503,7 +76845,7 @@ self: {
        sha256 = "1if543wf7div8ww90ifdh75i2w99lhbfh8pfnzmd1yaw2j1m35ff";
        libraryHaskellDepends = [ base ditto lucid path-pieces text ];
        description = "Add support for using lucid with Ditto";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diversity" = callPackage
@@ -76525,8 +76867,8 @@ self: {
          base containers fasta optparse-applicative pipes semigroups
        ];
        description = "Quantify the diversity of a population";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76564,8 +76906,8 @@ self: {
          time vector
        ];
        description = "A wiki implemented with a firm theoretical foundation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76581,8 +76923,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Hit drums with haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76598,7 +76940,7 @@ self: {
          array base containers haskeline mtl pretty
        ];
        description = "Generate Haskell code from a type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "djinn-ghc" = callPackage
@@ -76613,7 +76955,7 @@ self: {
          async base containers djinn-lib ghc mtl transformers
        ];
        description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "djinn-lib" = callPackage
@@ -76626,7 +76968,7 @@ self: {
        editedCabalFile = "0zz4q631wpxdm4h499j0m1kin4n1ahnwzb0x2jh6vd463i89xlbk";
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Generate Haskell code from a type. Library extracted from djinn package.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "djinn-th" = callPackage
@@ -76639,8 +76981,8 @@ self: {
          base containers logict template-haskell
        ];
        description = "Generate executable Haskell code from a type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76661,8 +77003,30 @@ self: {
          time unix xdg-userdirs
        ];
        description = "Fedora image download tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "dl-fedora_0_7_6" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath
+     , http-directory, http-types, optparse-applicative, regex-posix
+     , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
+     }:
+     mkDerivation {
+       pname = "dl-fedora";
+       version = "0.7.6";
+       sha256 = "03npp2cq1259w590am87v0r4q48pfjq2zb2b04hymlr6hi3a8xw5";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory extra filepath http-directory http-types
+         optparse-applicative regex-posix simple-cmd simple-cmd-args text
+         time unix xdg-userdirs
+       ];
+       description = "Fedora image download tool";
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76675,7 +77039,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Difference lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dlist_1_0" = callPackage
@@ -76687,8 +77051,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Difference lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dlist-instances" = callPackage
@@ -76699,7 +77063,7 @@ self: {
        sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni";
        libraryHaskellDepends = [ base dlist semigroups ];
        description = "Difference lists instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dlist-nonempty" = callPackage
@@ -76723,7 +77087,7 @@ self: {
          base base-compat criterion dlist dlist-instances
        ];
        description = "Non-empty difference lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dmc" = callPackage
@@ -76735,7 +77099,7 @@ self: {
        libraryHaskellDepends = [ base process ];
        testHaskellDepends = [ base hspec process QuickCheck ];
        description = "cmd for common cases";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "dmcc" = callPackage
@@ -76763,8 +77127,8 @@ self: {
          monad-control monad-logger random stm text unix unliftio websockets
        ];
        description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76780,8 +77144,8 @@ self: {
          base containers directory lens mtl process transformers
        ];
        description = "Complete bindings to the dmenu and dmenu2 command line tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76799,8 +77163,8 @@ self: {
          base containers directory dmenu lens mtl process transformers
        ];
        description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76818,8 +77182,8 @@ self: {
          base containers directory dmenu lens mtl process transformers
        ];
        description = "Mounting and unmounting linux devices as user with dmenu and pmount";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76837,8 +77201,8 @@ self: {
          base containers directory dmenu lens mtl process transformers
        ];
        description = "dmenu script for searching the web with customizable search engines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76863,7 +77227,7 @@ self: {
        doHaddock = false;
        testTarget = "spec";
        description = "DNS library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dnscache" = callPackage
@@ -76881,8 +77245,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Caching DNS resolver library and mass DNS resolver utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76895,8 +77259,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        description = "Asynchronous DNS RBL lookup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76909,8 +77273,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ dns_sd ];
        description = "DNS service discovery bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dns_sd = null;};
 
@@ -76924,7 +77288,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion mtl text ];
        description = "Do notation for free";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "do-notation" = callPackage
@@ -76936,7 +77300,7 @@ self: {
        libraryHaskellDepends = [ base indexed ];
        testHaskellDepends = [ base indexed ];
        description = "Generalize do-notation to work on monads and indexed monads simultaneously";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "do-notation-dsl" = callPackage
@@ -76952,7 +77316,7 @@ self: {
          base containers doctest doctest-discover temporary
        ];
        description = "An alternative to monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dobutok" = callPackage
@@ -76963,8 +77327,8 @@ self: {
        sha256 = "06wi9p4gyxqiwaih1hg5p4wypi77si5y8c1akqsvh3ssr0sds74r";
        libraryHaskellDepends = [ base ];
        description = "Creates the time intervals for CLI changing messages on the screen";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76976,7 +77340,7 @@ self: {
        sha256 = "1qps4zvk3qn2d93778cs2b6kf1k9fjgw5248hyx9v0n05crfw2i8";
        libraryHaskellDepends = [ base ];
        description = "The library is intended to print updated messages on the terminal screen";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-effects" = callPackage
@@ -76987,7 +77351,7 @@ self: {
        sha256 = "10xpr7nqhx1djsgcgfr40v7axkl8a0fxx16vrpvr7h525ygyibp5";
        libraryHaskellDepends = [ base dobutokO-frequency ];
        description = "A library to deal with SoX effects and possibilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-frequency" = callPackage
@@ -76998,7 +77362,7 @@ self: {
        sha256 = "11ngz39dqdcv6xkff9b590cbhd94gx1q71v6cz3birmhvbf8qwrm";
        libraryHaskellDepends = [ base ];
        description = "Helps to create experimental music. Working with frequencies and types.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-poetry" = callPackage
@@ -77020,7 +77384,7 @@ self: {
          uniqueness-periods vector
        ];
        description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-poetry-general" = callPackage
@@ -77031,7 +77395,7 @@ self: {
        sha256 = "0gdhihblshxq70av2x8ni7vywdfic750kwq7qsbhagrqr71fvqb1";
        libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ];
        description = "Helps to order the 7 or less words (first of all the Ukrainian ones) to obtain somewhat suitable for poetry or music text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-poetry-general-languages" = callPackage
@@ -77047,7 +77411,7 @@ self: {
          uniqueness-periods-general vector
        ];
        description = "Helps to order the 7 or less words to obtain somewhat suitable for poetry or music text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO2" = callPackage
@@ -77070,7 +77434,7 @@ self: {
          mmsyn7ukr process uniqueness-periods vector
        ];
        description = "Helps to create experimental music from a file (or its part) and a Ukrainian text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO3" = callPackage
@@ -77086,7 +77450,7 @@ self: {
          mmsyn7s mmsyn7ukr process vector
        ];
        description = "Helps to create more complex experimental music from a file (especially timbre)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO4" = callPackage
@@ -77102,7 +77466,7 @@ self: {
          vector-doublezip
        ];
        description = "Helps to create experimental music. Uses SoX inside.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doc-review" = callPackage
@@ -77127,8 +77491,8 @@ self: {
          xml-basic
        ];
        description = "Document review Web application, like http://book.realworldhaskell.org/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77147,8 +77511,8 @@ self: {
          text
        ];
        description = "Checks Haddock comments for pitfalls and version changes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77167,8 +77531,8 @@ self: {
          old-locale tagsoup time
        ];
        description = "Generate an HTML index of installed Haskell packages and their documentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77202,8 +77566,8 @@ self: {
          vector
        ];
        description = "An API client for docker written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77226,8 +77590,8 @@ self: {
          turtle
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77261,8 +77625,8 @@ self: {
        ];
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77275,7 +77639,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A Haskell DSL for generating Dockerfiles";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dockerfile-creator" = callPackage
@@ -77296,7 +77660,7 @@ self: {
          hspec language-docker megaparsec mtl process template-haskell text
          th-lift th-lift-instances time
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "doclayout" = callPackage
@@ -77314,7 +77678,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion mtl text ];
        description = "A prettyprinting library for laying out text documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "docopt" = callPackage
@@ -77334,8 +77698,8 @@ self: {
          template-haskell text th-lift
        ];
        description = "A command-line interface parser that will make you smile";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77356,7 +77720,7 @@ self: {
          unordered-containers vinyl yaml
        ];
        description = "Vinyl-based records with hierarchical field names, default values and documentation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "docstrings" = callPackage
@@ -77369,7 +77733,7 @@ self: {
          base containers heredoc template-haskell
        ];
        description = "Docstrings for documentation in the repl";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doctemplates" = callPackage
@@ -77395,7 +77759,7 @@ self: {
          aeson base containers criterion doclayout filepath mtl text
        ];
        description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "doctest" = callPackage
@@ -77424,7 +77788,7 @@ self: {
          stringbuilder syb transformers
        ];
        description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doctest_0_17" = callPackage
@@ -77453,8 +77817,8 @@ self: {
          stringbuilder syb transformers
        ];
        description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -77476,7 +77840,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
        description = "Easy way to run doctests via cabal";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "doctest-discover-configurator" = callPackage
@@ -77500,8 +77864,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77517,8 +77881,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Generate driver file for doctest's cabal integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77534,7 +77898,7 @@ self: {
          base doctest-lib QuickCheck semigroups transformers
        ];
        description = "Run doctest's in a Cabal.Test.exitcode-stdio environment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "doctest-lib" = callPackage
@@ -77545,7 +77909,7 @@ self: {
        sha256 = "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2";
        libraryHaskellDepends = [ base ];
        description = "Parts of doctest exposed as library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doctest-prop" = callPackage
@@ -77557,8 +77921,8 @@ self: {
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77575,8 +77939,8 @@ self: {
          servant-client text
        ];
        description = "Low-level bindings to the DocuSign API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77593,8 +77957,8 @@ self: {
          servant-client text
        ];
        description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77614,8 +77978,8 @@ self: {
          http-types servant-client servant-client-core text uuid
        ];
        description = "Client bindings for the DocuSign API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77634,8 +77998,8 @@ self: {
          optparse-generic text uuid
        ];
        description = "DocuSign examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77662,8 +78026,8 @@ self: {
          tasty-hunit temporary
        ];
        description = "Documentation generator for Vim plug-ins";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77692,8 +78056,8 @@ self: {
          urlencoded utility-ht
        ];
        description = "Automatic Bibtex and fulltext of scientific articles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77714,7 +78078,7 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Flag packer & handler for flaggable data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dollaridoos" = callPackage
@@ -77725,7 +78089,7 @@ self: {
        sha256 = "1pipbyfpny8mq540rpfkgkwbc3mc13yf6xm1h9vxm0fnaa8kcbw9";
        libraryHaskellDepends = [ base profunctors semigroups ];
        description = "A newtype for monetary values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dom-events" = callPackage
@@ -77737,7 +78101,7 @@ self: {
        libraryHaskellDepends = [ base text unordered-containers ];
        testHaskellDepends = [ base ];
        description = "DOM Events expressed as Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dom-lt" = callPackage
@@ -77751,7 +78115,7 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dom-parser" = callPackage
@@ -77772,7 +78136,7 @@ self: {
          xml-conduit
        ];
        description = "Simple monadic DOM parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dom-selector" = callPackage
@@ -77792,7 +78156,7 @@ self: {
          template-haskell text th-lift xml-conduit
        ];
        description = "DOM traversal by CSS selectors for xml-conduit package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "domain" = callPackage
@@ -77816,8 +78180,8 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell text th-orphans
        ];
        description = "Codegen helping you define domain models";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77836,7 +78200,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest pretty-simple ];
        description = "Domain authentication library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "domain-core" = callPackage
@@ -77852,8 +78216,8 @@ self: {
          th-lift-instances
        ];
        description = "Low-level API of \"domain\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77872,8 +78236,8 @@ self: {
        ];
        testHaskellDepends = [ domain optics rerebase ];
        description = "Integration of domain with optics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77889,7 +78253,7 @@ self: {
        executableHaskellDepends = [ base containers lens mtl random ];
        testHaskellDepends = [ base containers hspec lens mtl random ];
        description = "A simulator for the board game Dominion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "domplate" = callPackage
@@ -77905,8 +78269,8 @@ self: {
          yaml
        ];
        description = "A simple templating library using HTML5 as its template language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77920,7 +78284,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
        description = "Datatypes and encoding for graphviz dot files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dot-linker" = callPackage
@@ -77946,8 +78310,8 @@ self: {
          unordered-containers
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77961,7 +78325,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers graphviz hxt text ];
        description = "Converter from GraphViz .dot format to yEd GraphML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dotenv" = callPackage
@@ -77989,7 +78353,7 @@ self: {
          hspec-megaparsec megaparsec process text transformers yaml
        ];
        description = "Loads environment variables from dotenv files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dotfs" = callPackage
@@ -78020,8 +78384,8 @@ self: {
        ];
        doHaddock = false;
        description = "Filesystem to manage and parse dotfiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78035,7 +78399,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        description = "A simple interface for building .dot graph files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dotnet-timespan" = callPackage
@@ -78046,7 +78410,7 @@ self: {
        sha256 = "1hws424hf4ifijmz2xn3jvwvayll5jig83bgkl9zavwipkzqvjnq";
        libraryHaskellDepends = [ base ];
        description = ".NET TimeSpan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "double-conversion" = callPackage
@@ -78063,7 +78427,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Fast conversion between double precision floating point and text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "double-extra" = callPackage
@@ -78079,7 +78443,7 @@ self: {
          rawstring-qm text
        ];
        description = "Missing presentations for Double numbers (fixed, scientific etc.)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "double-metaphone" = callPackage
@@ -78101,8 +78465,8 @@ self: {
        sha256 = "0libb7w3a8ffcr08x6s3xqzhbkxb8n111f53g638jr0xpz3r98yv";
        libraryHaskellDepends = [ base ];
        description = "Doublify API toolkit for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78114,7 +78478,7 @@ self: {
        sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
        libraryHaskellDepends = [ acl2 base ];
        description = "The Dove verification language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dovin" = callPackage
@@ -78124,8 +78488,8 @@ self: {
      }:
      mkDerivation {
        pname = "dovin";
-       version = "3.0";
-       sha256 = "1avyls9yzvnxcs0lz05kh8bv7vdgfrziy0nvn378r7s12ynpwy7w";
+       version = "3.0.1";
+       sha256 = "1qdqzy3h4zwg1b36h5q5qnrpyki9fjhda6jk3izcj829805ya1i9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -78141,7 +78505,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A proof assistant for Magic: The Gathering puzzles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dow" = callPackage
@@ -78159,8 +78523,8 @@ self: {
          array base directory elerea GLFW mersenne-random OpenGL
        ];
        description = "Dungeons of Wor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78173,7 +78537,7 @@ self: {
        libraryHaskellDepends = [ base bytestring feed tagsoup xml ];
        testHaskellDepends = [ base hspec ];
        description = "High-level file download based on URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "download-curl" = callPackage
@@ -78186,7 +78550,7 @@ self: {
        editedCabalFile = "032f19gn7bnx3fpfdwclm1z1hsxaya6yml7p2hcg3b2ad6d11pyl";
        libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
        description = "High-level file download based on URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "download-media-content" = callPackage
@@ -78203,8 +78567,8 @@ self: {
          base bytestring filepath http-enumerator tagsoup text
        ];
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78221,8 +78585,8 @@ self: {
          base directory filepath network-uri process safe
        ];
        description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78234,8 +78598,8 @@ self: {
        sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
        libraryHaskellDepends = [ base ];
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78255,8 +78619,8 @@ self: {
          reflection scientific text transformers
        ];
        description = "dozens api library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78270,8 +78634,8 @@ self: {
          array base ghc-prim pretty random vector
        ];
        description = "Data Parallel Haskell common config and debugging functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78290,8 +78654,8 @@ self: {
          old-time parseargs random vector
        ];
        description = "Data Parallel Haskell example programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78308,8 +78672,8 @@ self: {
          template-haskell vector
        ];
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78325,8 +78689,8 @@ self: {
          array base dph-base dph-prim-par ghc random template-haskell vector
        ];
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78343,8 +78707,8 @@ self: {
          pretty random template-haskell vector
        ];
        description = "Data Parallel Haskell lifted array combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78356,7 +78720,7 @@ self: {
        sha256 = "0csgd8ghbxv1vwp95dn98qv1zp8229fffm9j274bmjg857588i97";
        doHaddock = false;
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dph-prim-interface" = callPackage
@@ -78367,8 +78731,8 @@ self: {
        sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j";
        libraryHaskellDepends = [ base dph-base random vector ];
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78385,8 +78749,8 @@ self: {
          vector
        ];
        description = "Data Parallel Haskell segmented arrays. (production version)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78402,8 +78766,8 @@ self: {
          base dph-base dph-prim-interface ghc-prim primitive random vector
        ];
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78415,7 +78779,7 @@ self: {
        sha256 = "10s6qq4ayh85wvhnyl7dfdr72a76irvg83s71lww8ig988599ygp";
        doHaddock = false;
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dpkg" = callPackage
@@ -78435,8 +78799,8 @@ self: {
        testSystemDepends = [ dpkg ];
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
@@ -78450,8 +78814,8 @@ self: {
          base containers deepseq random semigroups
        ];
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78475,7 +78839,7 @@ self: {
          optparse-applicative streaming-commons unix unordered-containers
        ];
        description = "a lightweight DNS proxy server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "drClickOn" = callPackage
@@ -78486,8 +78850,8 @@ self: {
        sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3";
        libraryHaskellDepends = [ base containers ];
        description = "Monadic FRP";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78508,8 +78872,8 @@ self: {
          template-haskell text transformers
        ];
        description = "Automatic derivation of optimized QuickCheck random generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78527,7 +78891,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "playing draw poker";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "drawille" = callPackage
@@ -78541,8 +78905,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A port of asciimoo's drawille to haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78565,8 +78929,8 @@ self: {
          time unordered-containers vector
        ];
        description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78583,8 +78947,8 @@ self: {
          base tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Simple schema management for arbitrary databases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78605,8 +78969,8 @@ self: {
          base drifter either postgresql-simple tasty tasty-hunit text
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78626,8 +78990,8 @@ self: {
          tasty-hunit text time transformers
        ];
        description = "SQLite support for the drifter schema migraiton tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78639,7 +79003,7 @@ self: {
        sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Boozy streaming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "drmaa" = callPackage
@@ -78652,8 +79016,8 @@ self: {
        librarySystemDepends = [ drmaa ];
        libraryToolDepends = [ c2hs ];
        description = "A Haskell bindings to the DRMAA C library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {drmaa = null;};
 
@@ -78672,8 +79036,8 @@ self: {
          aeson base bytestring containers extensible formatting hspec
          microlens req servant-server text warp
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78702,8 +79066,8 @@ self: {
          servant-client-core text
        ];
        description = "Dropbox API client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78725,8 +79089,8 @@ self: {
          urlencoded utf8-string
        ];
        description = "A library to access the Dropbox HTTP API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78745,8 +79109,8 @@ self: {
          time
        ];
        description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78762,7 +79126,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring pureMD5 ];
        description = "An implementation of the Drunken Bishop visual fingerprinting algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ds-kanren" = callPackage
@@ -78776,8 +79140,8 @@ self: {
        libraryHaskellDepends = [ base containers logict ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78797,8 +79161,8 @@ self: {
          string-conversions
        ];
        description = "Helper functions for setting up Double Submit Cookie defense for forms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78826,8 +79190,8 @@ self: {
          test-framework-quickcheck2 text vector
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78845,8 +79209,8 @@ self: {
          parallel primitive repa strict transformers vector
        ];
        description = "DSMC library for rarefied gas dynamics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78866,8 +79230,8 @@ self: {
          mtl repa strict transformers vector
        ];
        description = "DSMC toolkit for rarefied gas dynamics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78879,8 +79243,8 @@ self: {
        sha256 = "1vv32n736ncjsy4psp8zlqmpp0r7mncjq65zwkhq5i99jx4chb1q";
        libraryHaskellDepends = [ base parsec ];
        description = "Haskell Doge Serialized Object Notation Parser";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78892,8 +79256,8 @@ self: {
        sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y";
        libraryHaskellDepends = [ base parsec ];
        description = "DSON parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78908,7 +79272,7 @@ self: {
        libraryHaskellDepends = [ array base containers random ];
        testHaskellDepends = [ array base containers QuickCheck ];
        description = "Haskell Digital Signal Processing";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2Only;
      }) {};
 
   "dstring" = callPackage
@@ -78919,8 +79283,8 @@ self: {
        sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        description = "Difference strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78943,7 +79307,7 @@ self: {
          text vector
        ];
        description = "DSV (delimiter-separated values)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dtab" = callPackage
@@ -78963,7 +79327,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dtd" = callPackage
@@ -78982,8 +79346,8 @@ self: {
          uri-conduit xml-catalog xml-conduit xml-types
        ];
        description = "Parse and render DTD files (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78999,8 +79363,8 @@ self: {
          attoparsec base containers dtd-types text xml-types
        ];
        description = "Parse and render XML DTDs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79012,7 +79376,7 @@ self: {
        sha256 = "1h5ypjnpjim2lwlc6jfp8ixqg7zbkj7fg2kpnlwnyj29n9g58rka";
        libraryHaskellDepends = [ base text xml-types ];
        description = "Basic types for representing XML DTDs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dtrace" = callPackage
@@ -79025,7 +79389,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to the DTrace system tracing utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dtw" = callPackage
@@ -79042,8 +79406,8 @@ self: {
          test-framework-quickcheck2 thyme vector vector-space
        ];
        description = "(Fast) Dynamic Time Warping";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79057,7 +79421,7 @@ self: {
        editedCabalFile = "1cm80lc3p8bpzj0crxccx2fp33p171gz4j56r9fc5g5kza390nrb";
        libraryHaskellDepends = [ base ];
        description = "Dual category";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dual-game" = callPackage
@@ -79076,7 +79440,7 @@ self: {
          base bifunctors cereal gloss network websockets
        ];
        description = "Network multiplayer 2D shooting game";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dual-tree" = callPackage
@@ -79094,8 +79458,8 @@ self: {
          base monoid-extras QuickCheck semigroups testing-feat
        ];
        description = "Rose trees with cached and accumulating monoidal annotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79113,7 +79477,7 @@ self: {
        ];
        description = "Automatically generate dual constructions";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79139,7 +79503,7 @@ self: {
          tasty-quickcheck text time uri-bytestring xml-conduit xml-types
        ];
        description = "XML streaming parser/renderer for the Dublin Core standard elements";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "duckling" = callPackage
@@ -79170,7 +79534,7 @@ self: {
        ];
        description = "A Haskell library for parsing text into structured data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "duet" = callPackage
@@ -79197,8 +79561,8 @@ self: {
          monad-logger mtl parsec syb text
        ];
        description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79208,18 +79572,16 @@ self: {
      }:
      mkDerivation {
        pname = "dumb-cas";
-       version = "0.2.0.0";
-       sha256 = "1zcq9r2p5gjpfivprjp9hspqpayrj9in2jck5vf5ibxpc671isb4";
-       revision = "2";
-       editedCabalFile = "1a6xj7qszi815xr5nks13593kc90wqalq78kxsnmmhn2m2r1aq2q";
+       version = "0.2.1.0";
+       sha256 = "1fxamg2npi1arhsjyxgbzcn50m3y9kn9ganc79gbn8xcx252rp63";
        libraryHaskellDepends = [
          base containers decimal-literals hashable template-haskell
          unordered-containers
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79240,7 +79602,7 @@ self: {
          template-haskell text
        ];
        description = "Dumps the names and values of expressions to ease debugging";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dump-core" = callPackage
@@ -79257,8 +79619,8 @@ self: {
          text
        ];
        description = "A plug-in for rendering GHC core";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79275,7 +79637,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit transformers ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dunai-core" = callPackage
@@ -79289,8 +79651,8 @@ self: {
          base MonadRandom transformers transformers-base
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79304,7 +79666,7 @@ self: {
          base dunai normaldistribution QuickCheck
        ];
        description = "Testing library for Dunai";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "duplo" = callPackage
@@ -79340,8 +79702,8 @@ self: {
          base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Frontend development build tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79355,8 +79717,8 @@ self: {
        editedCabalFile = "018pwi48hx6jcy9gkbbc4gcbjxa2n8b4lbfmd18mnm49ymwyyqlv";
        libraryHaskellDepends = [ base bytestring directory filepath ];
        description = "durable/atomic file system writes (from rio package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79373,7 +79735,7 @@ self: {
          base doctest hspec parsec template-haskell time
        ];
        description = "A tiny compile-time time utility library inspired by zeit/ms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dustme" = callPackage
@@ -79395,7 +79757,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dvault" = callPackage
@@ -79413,8 +79775,8 @@ self: {
          process vector
        ];
        description = "Dead simple password manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79437,8 +79799,8 @@ self: {
          test-framework-quickcheck2 unordered-containers
        ];
        description = "Efficient automatic differentiation and code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79452,8 +79814,8 @@ self: {
        libraryPkgconfigDepends = [ dvdread ];
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dvdread = null;};
 
@@ -79465,8 +79827,8 @@ self: {
        sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43";
        libraryHaskellDepends = [ base bytestring filepath transformers ];
        description = "Read/write DVI and TFM file";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79479,7 +79841,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Dvorak encoding for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dwarf" = callPackage
@@ -79491,8 +79853,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79508,7 +79870,7 @@ self: {
          base binary bytestring containers text text-show transformers
        ];
        description = "Parser for DWARF debug format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dwarfadt" = callPackage
@@ -79527,8 +79889,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79541,7 +79903,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A minimal testing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dx9base" = callPackage
@@ -79552,8 +79914,8 @@ self: {
        sha256 = "16gwlpxfgh78sx7cb2ryqklhz5smhwk51ma260d6rg082nhy5y3i";
        libraryHaskellDepends = [ base Win32 ];
        description = "Backend for a binding to the Microsoft DirectX 9 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "dx9d3d" = callPackage
@@ -79565,8 +79927,8 @@ self: {
        libraryHaskellDepends = [ base dx9base Win32 ];
        librarySystemDepends = [ d3d9 ];
        description = "A binding to the Microsoft DirectX 9 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {d3d9 = null;};
 
   "dx9d3dx" = callPackage
@@ -79578,8 +79940,8 @@ self: {
        libraryHaskellDepends = [ base dx9base dx9d3d Win32 ];
        librarySystemDepends = [ d3dx9 ];
        description = "A binding to the Microsoft DirectX 9 D3DX API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {d3dx9 = null;};
 
   "dyckword" = callPackage
@@ -79595,8 +79957,8 @@ self: {
        libraryHaskellDepends = [ base exact-combinatorics text ];
        testHaskellDepends = [ ansi-terminal base hspec text ];
        description = "A library for working with binary Dyck words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79610,8 +79972,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base generics-sop ];
        description = "Programatically identify space leaks in your program";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79628,7 +79990,7 @@ self: {
          text unordered-containers vector
        ];
        description = "A dynamic type for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-cabal" = callPackage
@@ -79649,8 +80011,8 @@ self: {
          tasty-hunit tasty-th
        ];
        description = "Access the functions from the Cabal library without depending on it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79667,7 +80029,7 @@ self: {
          base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers
        ];
        description = "Draw and update graphs in real time with OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-graphs" = callPackage
@@ -79694,8 +80056,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion primitive ];
        description = "Dynamic graph algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79707,7 +80069,7 @@ self: {
        sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz";
        libraryHaskellDepends = [ base containers template-haskell unix ];
        description = "Automatically derive dynamic linking methods from a data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-loader" = callPackage
@@ -79723,7 +80085,7 @@ self: {
          base directory ghc-prim hashable hashtables time transformers
        ];
        description = "lightweight loader of GHC-based modules or packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-mvector" = callPackage
@@ -79734,8 +80096,8 @@ self: {
        sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2";
        libraryHaskellDepends = [ base primitive vector ];
        description = "A wrapper around MVector that enables pushing, popping and extending";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79754,8 +80116,8 @@ self: {
          base doctest ghc hspec lens QuickCheck transformers
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79782,8 +80144,8 @@ self: {
          vector-space
        ];
        description = "Interactive diagram windows";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79804,8 +80166,8 @@ self: {
          HUnit-Plus unordered-containers utf8-string
        ];
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79821,7 +80183,7 @@ self: {
          base binary bytestring hashable unordered-containers
        ];
        description = "Optionally serializable dynamic state keyed by type";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "dynamodb-simple" = callPackage
@@ -79848,8 +80210,8 @@ self: {
          unordered-containers
        ];
        description = "Typesafe library for working with DynamoDB database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79862,8 +80224,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-paths ];
        testHaskellDepends = [ base ghc ghc-paths hspec ];
        description = "Dynamically runtime loading packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79895,8 +80257,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "your dynamic optimization buddy";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79913,7 +80275,7 @@ self: {
          process time unix xdg-basedir
        ];
        description = "Dynamic reconfiguration in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dywapitchtrack" = callPackage
@@ -79924,8 +80286,8 @@ self: {
        sha256 = "1fmn8aypgcvmbpfs0dr8yfkqq4p5jw2mh0wldjhhl6bffymkszgf";
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Bindings to the dywapitchtrack pitch tracking library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79961,8 +80323,8 @@ self: {
          unordered-containers vector
        ];
        description = "Configure dzen2 bars in Dhall language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79975,7 +80337,7 @@ self: {
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79989,8 +80351,8 @@ self: {
        libraryHaskellDepends = [ base dlist template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Template Haskell library for writing monadic expressions more easily";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80005,7 +80367,7 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Socket operations with timeouts";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "eap" = callPackage
@@ -80022,7 +80384,7 @@ self: {
          base binary bytestring cryptonite memory mtl pretty-hex
        ];
        description = "Extensible Authentication Protocol (EAP)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "earclipper" = callPackage
@@ -80037,8 +80399,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base filepath hspec ];
        description = "Ear Clipping Triangulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80050,7 +80412,30 @@ self: {
        sha256 = "0nssl7n697rzwlfb5lq4kl64j4mrb4i19rp5kzjpmc7iin9fzxsf";
        libraryHaskellDepends = [ base vector ];
        description = "Binding to C++ earcut library";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
+     }) {};
+
+  "early" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-lib-parser, syb, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "early";
+       version = "0.0.0";
+       sha256 = "0nx12376py2jc7yd94lfjbjxw3824fm3v2iviv406a2svkayw7pm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers ghc syb text transformers
+       ];
+       executableHaskellDepends = [
+         base ghc-lib-parser text unordered-containers
+       ];
+       testHaskellDepends = [ base ];
+       description = "Early return syntax in do-notation (GHC plugin)";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "ease" = callPackage
@@ -80061,7 +80446,7 @@ self: {
        sha256 = "1psg2d64igvjgskzk8y92xxbh14rzlnvcpv8l3nqx8x5950hxdxk";
        libraryHaskellDepends = [ base data-default ];
        description = "Robert Penner's easing equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "easy-api" = callPackage
@@ -80076,8 +80461,8 @@ self: {
          aeson base bytestring either http-conduit mtl resourcet text
        ];
        description = "Utility code for building HTTP API bindings more quickly";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80090,7 +80475,7 @@ self: {
        libraryHaskellDepends = [ base hspec ];
        testHaskellDepends = [ base hspec ];
        description = "Parses command line arguments";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "easy-bitcoin" = callPackage
@@ -80107,8 +80492,8 @@ self: {
          deepseq lens postgresql-simple safe text
        ];
        description = "types and functions for bitcoin applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80120,7 +80505,7 @@ self: {
        sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
        libraryHaskellDepends = [ base directory filepath time unix ];
        description = "Cross-platform File handling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "easyjson" = callPackage
@@ -80135,8 +80520,8 @@ self: {
          base mtl parsec text unordered-containers vector
        ];
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80148,8 +80533,8 @@ self: {
        sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk";
        libraryHaskellDepends = [ base process ];
        description = "A tiny plotting library, utilizes gnuplot for plotting";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80161,7 +80546,7 @@ self: {
        sha256 = "0vj9j41706lalxc2sankpnxrn3mg650wfd4rl6yw32pns6bdq86f";
        libraryHaskellDepends = [ base bytestring containers mtl zlib ];
        description = "User-friendly creation of EPS, PostScript, and PDF files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "easytensor" = callPackage
@@ -80182,8 +80567,8 @@ self: {
          base constraints-deriving dimensions time
        ];
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80195,8 +80580,8 @@ self: {
        sha256 = "0gi8p76x7h78frv3yrg6a7qnzjczx3j7warqclc36pkwv050dn3i";
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80216,8 +80601,8 @@ self: {
          base directory hedgehog profunctors transformers unix
        ];
        description = "Simple, expressive testing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80229,8 +80614,8 @@ self: {
        sha256 = "0r3pl63fxrrfafwp3791xh0c47pb4jqqcm9lk52g0gaqg0s8x5qk";
        libraryHaskellDepends = [ base time ];
        description = "Time in ebeats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80249,8 +80634,8 @@ self: {
          aeson base bytestring cond directory parsec
        ];
        description = "Parser combinators & EBNF, BFFs!";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80270,7 +80655,7 @@ self: {
          QuickCheck SHA
        ];
        description = "The Amazon EC2 style signature calculator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ec2-unikernel" = callPackage
@@ -80289,8 +80674,8 @@ self: {
          directory filepath lens process semigroups temporary text time unix
        ];
        description = "A handy tool for uploading unikernels to Amazon's EC2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80309,8 +80694,8 @@ self: {
        testHaskellDepends = [ base base16-bytestring bytestring Cabal ];
        benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Elliptic Curve Cryptography for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80322,8 +80707,8 @@ self: {
        sha256 = "1j2h568k2j8kpclvam3hghi13ddyas5d7c8nf469gwr80wmnyqxs";
        libraryHaskellDepends = [ base bytestring eccrypto ];
        description = "provides \"ed25519\" API using \"eccrypto\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80340,7 +80725,7 @@ self: {
        ];
        description = "Basic ECDSA signing implementation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "echo" = callPackage
@@ -80355,7 +80740,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
        description = "A cross-platform, cross-console way to handle echoing terminal input";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ecma262" = callPackage
@@ -80373,8 +80758,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A ECMA-262 interpreter library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80390,7 +80775,7 @@ self: {
          base containers kan-extensions mtl transformers
        ];
        description = "A GHC.Generics based entity component system.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ecu" = callPackage
@@ -80408,8 +80793,8 @@ self: {
        ];
        executableSystemDepends = [ canlib ];
        description = "Tools for automotive ECU development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {canlib = null;};
 
@@ -80429,7 +80814,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Ed25519 cryptographic signatures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ed25519-donna" = callPackage
@@ -80440,7 +80825,7 @@ self: {
        sha256 = "0kpqh4fzij9152sazbwxmbzv1b16ih17lwmr1bkii2xi5kkjbnvd";
        libraryHaskellDepends = [ base bytestring crypto-api ];
        description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eddie" = callPackage
@@ -80457,8 +80842,8 @@ self: {
          base bifunctors classy-prelude hint optparse-applicative safe
        ];
        description = "Command line file filtering with haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80490,8 +80875,8 @@ self: {
          tasty-golden text
        ];
        description = "Templating language with similar syntax and features to Liquid or Jinja2";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80503,8 +80888,8 @@ self: {
        sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj";
        libraryHaskellDepends = [ base containers deepseq parallel ];
        description = "Semi-explicit parallel programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80516,8 +80901,8 @@ self: {
        sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q";
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80538,8 +80923,8 @@ self: {
          ghc-events-parallel gtk mtl text zip-archive
        ];
        description = "A Tool to Visualize Parallel Functional Program Executions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80551,7 +80936,7 @@ self: {
        sha256 = "0zxg57381wi23r17mgzl16ajgg61icxyy25kxyxyji9hw5aw22nw";
        libraryHaskellDepends = [ base binary bytestring text ];
        description = "EDF parsing library";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "edge" = callPackage
@@ -80569,8 +80954,8 @@ self: {
          ALUT base cmdtheline containers gloss OpenAL random wraparound
        ];
        description = "Top view space combat arcade game";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80598,8 +80983,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Tools for efficient immutable graphs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80611,8 +80996,8 @@ self: {
        sha256 = "1bznnqa4jmaj315sp1r0zr8g15s91yxbzdglki733hvwrsir05dj";
        libraryHaskellDepends = [ base bytestring cereal hedis ];
        description = "Statically typechecked client for Redis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80633,8 +81018,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80658,7 +81043,7 @@ self: {
          array base containers criterion deepseq process random time unix
        ];
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "edit-distance-linear" = callPackage
@@ -80679,7 +81064,7 @@ self: {
          array base bytestring criterion text text-metrics
        ];
        description = "Efficient implementation of the Levenshtein edit distance in linear memory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "edit-distance-vector" = callPackage
@@ -80693,7 +81078,7 @@ self: {
          base QuickCheck quickcheck-instances vector
        ];
        description = "Calculate edit distances and edit scripts between vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "edit-lenses" = callPackage
@@ -80706,8 +81091,8 @@ self: {
          base containers data-default lattices mtl
        ];
        description = "Symmetric, stateful edit lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80721,7 +81106,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Programs demoing the use of symmetric, stateful edit lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "editable" = callPackage
@@ -80732,8 +81117,8 @@ self: {
        sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi";
        libraryHaskellDepends = [ base text vty vty-ui ];
        description = "Interactive editors for Generics";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80745,8 +81130,8 @@ self: {
        sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
        libraryHaskellDepends = [ base ];
        description = "Bindings to the editline library (libedit)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80769,7 +81154,7 @@ self: {
          base bytestring conduit conduit-extra resourcet
        ];
        description = "Open the user's $VISUAL or $EDITOR for text input";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "editpipe" = callPackage
@@ -80786,7 +81171,7 @@ self: {
          base optparse-applicative process temporary unix
        ];
        description = "Edit stdin using an editor before sending to stdout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effect-handlers" = callPackage
@@ -80804,8 +81189,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80817,8 +81202,8 @@ self: {
        sha256 = "0lrx586ij1c09hv1rj14l2xi3papzdg8496kas6czdld0kfj8kw1";
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80830,8 +81215,8 @@ self: {
        sha256 = "08zalj8svp78ykqbf5nhd6khgygz8dplcvjd19w3hvgm08y4kxqi";
        libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80853,7 +81238,7 @@ self: {
        ];
        description = "A monadic embedding of aspect oriented programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "effective-aspects-mzv" = callPackage
@@ -80874,7 +81259,7 @@ self: {
        ];
        description = "A monadic embedding of aspect oriented programming, using \"Monads, Zippers and Views\" instead of mtl";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "effects" = callPackage
@@ -80885,7 +81270,7 @@ self: {
        sha256 = "06cx0l9vxpjpgc1cxai19hw9rxfq89m61qvf7wxp1w2xd6yqa7xk";
        libraryHaskellDepends = [ base containers newtype-generics void ];
        description = "Computational Effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effects-parser" = callPackage
@@ -80896,7 +81281,7 @@ self: {
        sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r";
        libraryHaskellDepends = [ base effects ];
        description = "Parser Effect for the Control.Effects Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effet" = callPackage
@@ -80916,7 +81301,7 @@ self: {
          transformers-base
        ];
        description = "An Effect System based on Type Classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effin" = callPackage
@@ -80927,8 +81312,8 @@ self: {
        sha256 = "1kq5n25m7bzw4zrz35b5zc8r4q0p0ai801hdf7r537fim0ia973x";
        libraryHaskellDepends = [ base mtl ];
        description = "A Typeable-free implementation of extensible effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80964,8 +81349,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Programming language with non-linear pattern-matching against non-free data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80987,8 +81372,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81008,8 +81393,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81032,8 +81417,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions to use with TH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81047,8 +81432,8 @@ self: {
          base egison mtl parsec template-haskell
        ];
        description = "A quasi quotes for using Egison expression in Haskell code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81067,8 +81452,8 @@ self: {
          transformers
        ];
        description = "A tutorial program for the Egison programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81080,7 +81465,7 @@ self: {
        sha256 = "05yjwrywpmh58rgx2if1za78g0x9xziv74cpvwnp7pr9b4s9i6zv";
        libraryHaskellDepends = [ base ];
        description = "Egyptian fractions in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ehaskell" = callPackage
@@ -81099,7 +81484,7 @@ self: {
        ];
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81120,8 +81505,8 @@ self: {
          transformers
        ];
        description = "Embedded haskell template using quasiquotes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81140,8 +81525,8 @@ self: {
        ];
        librarySystemDepends = [ eibclient ];
        description = "EIBd Client";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {eibclient = null;};
 
@@ -81161,8 +81546,8 @@ self: {
          base binary bytestring ghc-prim mtl primitive transformers vector
        ];
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81183,7 +81568,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Combinators for working with sums";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "either-both" = callPackage
@@ -81195,7 +81580,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Either or both";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "either-list-functions" = callPackage
@@ -81207,8 +81592,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81224,7 +81609,7 @@ self: {
        testHaskellDepends = [ base doctest hspec transformers ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "‘MonadFail’ instance for a wrapper of ‘ExceptT String m a’";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "either-unwrap" = callPackage
@@ -81235,8 +81620,8 @@ self: {
        sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc";
        libraryHaskellDepends = [ base ];
        description = "Functions for probing and unwrapping values inside of Either";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81248,7 +81633,7 @@ self: {
        sha256 = "069w3qbyghs1w8wqimj54dwblq5rx1ylgflzzc4cwnjn0aqzgs45";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ejdb2-binding" = callPackage
@@ -81268,8 +81653,8 @@ self: {
          aeson base directory tasty tasty-hunit unordered-containers vector
        ];
        description = "Binding to EJDB2 C library, an embedded JSON noSQL database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ejdb2 = null; libejdb2 = null;};
 
@@ -81290,7 +81675,7 @@ self: {
          snap-server text time transformers unordered-containers
        ];
        description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-bosun" = callPackage
@@ -81307,8 +81692,8 @@ self: {
          text time unordered-containers vector wreq
        ];
        description = "Send ekg metrics to a Bosun instance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81325,8 +81710,8 @@ self: {
          vector
        ];
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81344,8 +81729,8 @@ self: {
          lens resourcet semigroups text time unordered-containers
        ];
        description = "An ekg backend for Amazon Cloudwatch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81364,7 +81749,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base ];
        description = "Tracking of system metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-elastic" = callPackage
@@ -81380,8 +81765,8 @@ self: {
          unordered-containers wreq
        ];
        description = "Push metrics to elastic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81399,8 +81784,8 @@ self: {
          http-client lens req text time unordered-containers
        ];
        description = "Push metrics to elasticsearch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81417,7 +81802,7 @@ self: {
          unordered-containers vector
        ];
        description = "An EKG backend to send statistics to influxdb";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-json" = callPackage
@@ -81433,7 +81818,7 @@ self: {
          aeson base ekg-core text unordered-containers
        ];
        description = "JSON encoding of ekg metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-log" = callPackage
@@ -81449,8 +81834,8 @@ self: {
          time unix unordered-containers
        ];
        description = "Push metrics to a log file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81470,7 +81855,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Easily expose your EKG metrics to Prometheus";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ekg-push" = callPackage
@@ -81487,8 +81872,8 @@ self: {
          base bytestring ekg-core text time unordered-containers
        ];
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81509,8 +81894,8 @@ self: {
          unordered-containers
        ];
        description = "Passes ekg statistics to rrdtool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81526,7 +81911,7 @@ self: {
          base bytestring ekg-core network text time unordered-containers
        ];
        description = "Push metrics to statsd";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-wai" = callPackage
@@ -81546,8 +81931,8 @@ self: {
          text time transformers unordered-containers wai wai-app-static warp
        ];
        description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81559,7 +81944,7 @@ self: {
        sha256 = "1am1j05z79prlybq3hg8vr4gwhl354af4dg9y1qr57vpp6gcpfwv";
        libraryHaskellDepends = [ base hmatrix safe ];
        description = "Find the elbow point";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "electrum-mnemonic" = callPackage
@@ -81571,7 +81956,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "elenco-albero" = callPackage
@@ -81583,7 +81968,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "make tree from a list";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "elerea" = callPackage
@@ -81597,7 +81982,7 @@ self: {
          base containers transformers transformers-base
        ];
        description = "A minimalistic FRP library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elerea-examples" = callPackage
@@ -81610,8 +81995,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81624,7 +82009,7 @@ self: {
        libraryHaskellDepends = [ base elerea SDL ];
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "elevator" = callPackage
@@ -81635,8 +82020,8 @@ self: {
        sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2";
        libraryHaskellDepends = [ base extensible transformers ];
        description = "Immediately lifts to a desired level";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81649,7 +82034,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base bytestring containers hspec ];
        description = "An Elf parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eliminators" = callPackage
@@ -81669,7 +82054,7 @@ self: {
        testHaskellDepends = [ base hspec singleton-nats singletons ];
        testToolDepends = [ hspec-discover ];
        description = "Dependently typed elimination functions using singletons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elision" = callPackage
@@ -81683,8 +82068,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        executableHaskellDepends = [ base ];
        description = "Arrows with holes";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81710,8 +82095,8 @@ self: {
          tasty-quickcheck text wl-pprint-text
        ];
        description = "Elliptic curve library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81728,7 +82113,7 @@ self: {
          aeson base containers hspec QuickCheck text
        ];
        description = "Derive Elm types and Json code from Haskell types, using aeson's options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -81744,7 +82129,7 @@ self: {
          template-haskell
        ];
        description = "Compile Elm code to JS within Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-compiler" = callPackage
@@ -81782,7 +82167,7 @@ self: {
          unordered-containers
        ];
        description = "Values to help with elm-package, elm-make, and elm-lang.org.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-core-sources" = callPackage
@@ -81797,7 +82182,7 @@ self: {
          base bytestring containers file-embed template-haskell
        ];
        description = "Source files for the Elm runtime and standard libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-export" = callPackage
@@ -81819,7 +82204,7 @@ self: {
        ];
        description = "A library to generate Elm types from Haskell source";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "elm-export-persistent" = callPackage
@@ -81828,15 +82213,15 @@ self: {
      }:
      mkDerivation {
        pname = "elm-export-persistent";
-       version = "0.2.0";
-       sha256 = "09by77av5p18q89ryzid52zcr153mgx0zsksp5vg8ps6an5apirc";
+       version = "1.0.0";
+       sha256 = "1x7h7q4yplczf53d91z7v0s7rb0j4fz7v0rbh4k6sz5yyjj22k1c";
        libraryHaskellDepends = [
          aeson base elm-export persistent scientific text
          unordered-containers
        ];
        description = "elm-export persistent entities";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ jb55 ];
      }) {};
 
   "elm-get" = callPackage
@@ -81861,7 +82246,7 @@ self: {
          mtl network optparse-applicative process vector
        ];
        description = "Tool for sharing and using Elm libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-hybrid" = callPackage
@@ -81875,7 +82260,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Combine Elm with Haskell for data based applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-init" = callPackage
@@ -81895,7 +82280,7 @@ self: {
          directory file-embed filepath process text time
        ];
        description = "Set up basic structure for an elm project";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "elm-make" = callPackage
@@ -81915,7 +82300,7 @@ self: {
          optparse-applicative text
        ];
        description = "A build tool for Elm projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-package" = callPackage
@@ -81944,7 +82329,7 @@ self: {
          time unordered-containers vector zip-archive
        ];
        description = "Package manager for Elm libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-reactor" = callPackage
@@ -81968,7 +82353,7 @@ self: {
          unordered-containers websockets websockets-snap
        ];
        description = "Interactive development tool for Elm programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-repl" = callPackage
@@ -81993,7 +82378,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "a REPL for Elm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-server" = callPackage
@@ -82012,7 +82397,7 @@ self: {
          process snap-core snap-server unordered-containers
        ];
        description = "Server for developing Elm projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-street" = callPackage
@@ -82035,8 +82420,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        doHaddock = false;
        description = "Crossing the road between Haskell and Elm";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82057,7 +82442,7 @@ self: {
          unordered-containers
        ];
        description = "Elm syntax and pretty-printing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-websocket" = callPackage
@@ -82086,8 +82471,8 @@ self: {
          warp websockets
        ];
        description = "Generate ELM code from a Wai websocket application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82103,7 +82488,7 @@ self: {
          base blaze-markup Elm shakespeare-js text yesod-core
        ];
        description = "The Elm language Yesod compatibility module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm2nix" = callPackage
@@ -82128,7 +82513,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Turn your Elm project into buildable Nix project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elminator" = callPackage
@@ -82146,7 +82531,7 @@ self: {
          aeson base containers mtl template-haskell text
        ];
        description = "Generate ELM types/encoders/decoders from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elo" = callPackage
@@ -82158,7 +82543,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty ];
        description = "Elo Rating Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elocrypt" = callPackage
@@ -82181,7 +82566,7 @@ self: {
        ];
        description = "Generate easy-to-remember, hard-to-guess passwords";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "elsa" = callPackage
@@ -82202,8 +82587,8 @@ self: {
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
        description = "A tiny language for understanding the lambda-calculus";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82221,7 +82606,9 @@ self: {
          aeson base bytestring elynx-tools optparse-applicative slynx tlynx
        ];
        description = "Validate and (optionally) redo ELynx analyses";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "elynx-markov" = callPackage
@@ -82243,7 +82630,7 @@ self: {
          base containers elynx-tools hmatrix hspec mwc-random vector
        ];
        description = "Simulate molecular sequences along trees";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-nexus" = callPackage
@@ -82255,7 +82642,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [ base hspec ];
        description = "Import and export Nexus files";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-seq" = callPackage
@@ -82275,7 +82662,7 @@ self: {
          base bytestring elynx-tools hspec matrices vector
        ];
        description = "Handle molecular sequences";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-tools" = callPackage
@@ -82297,7 +82684,7 @@ self: {
          vector zlib
        ];
        description = "Tools for ELynx";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-tree" = callPackage
@@ -82322,7 +82709,9 @@ self: {
          base criterion elynx-tools microlens mwc-random parallel
        ];
        description = "Handle phylogenetic trees";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "emacs-keys" = callPackage
@@ -82340,8 +82729,8 @@ self: {
          base doctest tasty tasty-hspec tasty-quickcheck xkbcommon
        ];
        description = "library to parse emacs style keybinding into the modifiers and the chars";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82361,8 +82750,8 @@ self: {
          transformers-base vector void
        ];
        description = "Utilities to write Emacs dynamic modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82379,8 +82768,8 @@ self: {
          old-time parsec process time
        ];
        description = "Sending eMail in Haskell made easy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82402,8 +82791,8 @@ self: {
          tasty-quickcheck text time
        ];
        description = "Parsing and rendering of email and MIME headers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82419,8 +82808,8 @@ self: {
          aeson attoparsec base bytestring containers HTTP network
        ];
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82437,7 +82826,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
        description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "email-validate-json" = callPackage
@@ -82448,7 +82837,7 @@ self: {
        sha256 = "06fwm2m83pqp1l4sij7vmxhcry2w8dcp52cwwvpkfimw8iszxqqc";
        libraryHaskellDepends = [ aeson base email-validate text ];
        description = "Aeson instances for email-validate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "email-validator" = callPackage
@@ -82473,7 +82862,7 @@ self: {
          parallel-io pcre-light tasty tasty-hunit
        ];
        description = "Perform basic syntax and deliverability checks on email addresses";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "emailaddress" = callPackage
@@ -82493,8 +82882,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Wrapper around email-validate library adding instances for common type classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82517,8 +82906,8 @@ self: {
          text-icu time word8
        ];
        description = "An email parser that will parse everything";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82535,8 +82924,8 @@ self: {
          base filepath her-lexer MissingH process
        ];
        description = "Embed the values in scope in the haddock documentation of the module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82548,8 +82937,8 @@ self: {
        sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0";
        libraryHaskellDepends = [ base embeddock time ];
        description = "Example of using embeddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82561,8 +82950,8 @@ self: {
        sha256 = "1nk689j21ghaiymqnddlf4j8pgb9z61xflfrcgxw3zrxiv5jslk6";
        libraryHaskellDepends = [ base chronos ];
        description = "execute actions periodically while avoiding drift";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82581,8 +82970,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "support for embroidery formats in haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82613,7 +83002,7 @@ self: {
          vector vector-sized
        ];
        description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "emgm" = callPackage
@@ -82625,8 +83014,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit QuickCheck syb ];
        description = "Extensible and Modular Generics for the Masses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82645,7 +83034,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "emoji utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "emojis" = callPackage
@@ -82657,7 +83046,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base HUnit text ];
        description = "Conversion between emoji characters and their names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "empty" = callPackage
@@ -82668,7 +83057,7 @@ self: {
        sha256 = "0ap7qby3n5qiwf791z4li05h0l6p6xi899wkmg6x8z6bb8z9q2d9";
        doHaddock = false;
        description = "Ceci n'est pas une package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "empty-monad" = callPackage
@@ -82679,8 +83068,8 @@ self: {
        sha256 = "0h68fff0qpyapkpsqcd6mgg8nyxcbjsw389dv8z8vm4hrqh1pip5";
        libraryHaskellDepends = [ base ];
        description = "A container that always has no values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82697,8 +83086,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) enchant;};
 
@@ -82719,7 +83108,7 @@ self: {
          transformers transformers-base
        ];
        description = "Catching all exceptions from within an enclosed computation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "encode-string" = callPackage
@@ -82735,7 +83124,7 @@ self: {
          base bytestring QuickCheck quickcheck-instances text
        ];
        description = "Safe string conversion and encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "encoding" = callPackage
@@ -82756,8 +83145,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        description = "A library for various character encodings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82771,8 +83160,8 @@ self: {
          base chunked-data deepseq transformers-base
        ];
        description = "Encoding-aware file I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82796,8 +83185,8 @@ self: {
          universum
        ];
        description = "Typed encryption with persistent support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82815,7 +83204,7 @@ self: {
          base between data-default-class mtl transformers
        ];
        description = "Endomorphism utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eng-stemmer" = callPackage
@@ -82834,7 +83223,7 @@ self: {
          base containers doctest tasty tasty-hunit text
        ];
        description = "An English language stemmer (Porter2)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "engine-io" = callPackage
@@ -82852,8 +83241,8 @@ self: {
          unordered-containers vector websockets
        ];
        description = "A Haskell implementation of Engine.IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82872,8 +83261,8 @@ self: {
          pipes-attoparsec pipes-wai socket-io text transformers
          unordered-containers wai wai-websockets websockets
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82890,8 +83279,8 @@ self: {
          base bytestring containers engine-io io-streams lifted-base
          snap-core unordered-containers websockets websockets-snap
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82910,8 +83299,8 @@ self: {
          wai-websockets websockets
        ];
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82928,8 +83317,8 @@ self: {
          base bytestring conduit conduit-extra engine-io http-types text
          unordered-containers wai wai-websockets websockets yesod-core
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82941,7 +83330,7 @@ self: {
        sha256 = "1akk15q4nn1c0d36x224qikq7639kz05dfvnxck71h4y3hkl1inj";
        libraryHaskellDepends = [ base ];
        description = "A numeric type for managing and automating engineering units";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "entangle" = callPackage
@@ -82957,8 +83346,8 @@ self: {
        ];
        executableHaskellDepends = [ base matrix quipper-core ];
        description = "An application (and library) to convert quipper circuits into Qpmc models";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82973,7 +83362,7 @@ self: {
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A platform independent entropy source";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "entwine" = callPackage
@@ -83002,8 +83391,8 @@ self: {
          transformers-either
        ];
        description = "entwine - Concurrency tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83020,7 +83409,7 @@ self: {
          base generic-random hspec microlens QuickCheck template-haskell
        ];
        description = "Generate an ADT being a subset of another ADT, and the corresponding mappings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enum-text" = callPackage
@@ -83036,8 +83425,8 @@ self: {
          unordered-containers
        ];
        description = "A text rendering and parsing toolkit for enumerated types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83054,8 +83443,8 @@ self: {
          base bytestring enum-text fmt rio text
        ];
        description = "Making fmt available with rio";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83067,7 +83456,7 @@ self: {
        sha256 = "1m3f79acnrssz89490vwxp1dabqadzda3a95yg6gh6mpn7x0gkw5";
        libraryHaskellDepends = [ base ];
        description = "small enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enum-utf8" = callPackage
@@ -83083,8 +83472,8 @@ self: {
          unordered-containers
        ];
        description = "An experimental Utf8 parsing toolkit for enumerated types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83096,7 +83485,7 @@ self: {
        sha256 = "1v94y0a3rlkg3qlbv70d1zj2vjhssf1f89xlgb5cnsy9az07517q";
        libraryHaskellDepends = [ base control-monad-omega tagged ];
        description = "A typeclass for enumerating all values a type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enumerate" = callPackage
@@ -83115,8 +83504,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "enumerate all the values in a finite type (automatically)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83137,8 +83526,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "simple package for inverting functions and testing totality, via brute enumeration of the domain";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83155,7 +83544,7 @@ self: {
        ];
        testHaskellDepends = [ arith-encode base binary HUnit-Plus ];
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enumerator" = callPackage
@@ -83171,8 +83560,8 @@ self: {
          base bytestring containers text transformers
        ];
        description = "Reliable, high-performance processing with left-fold enumerators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83184,8 +83573,8 @@ self: {
        sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p";
        libraryHaskellDepends = [ base enumerator mtl ];
        description = "Enumerator instances for monads-fd classes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83197,8 +83586,8 @@ self: {
        sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp";
        libraryHaskellDepends = [ base enumerator monads-tf ];
        description = "Enumerator instances for monads-tf classes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83210,8 +83599,8 @@ self: {
        sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc";
        libraryHaskellDepends = [ base enummapset-th ];
        description = "Finitely represented /total/ EnumMaps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83236,8 +83625,8 @@ self: {
          base containers criterion deepseq mtl
        ];
        description = "Map of maps using Enum types as keys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83249,7 +83638,7 @@ self: {
        sha256 = "0p4klnhwr10yiv3w209vl1j09280257z0pz626ynbxbff4mh9wg4";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Enum wrappers for IntMap and IntSet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enummapset" = callPackage
@@ -83267,7 +83656,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "IntMap and IntSet with Enum keys/elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enummapset-th" = callPackage
@@ -83280,7 +83669,7 @@ self: {
          base containers deepseq template-haskell
        ];
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enumset" = callPackage
@@ -83294,7 +83683,7 @@ self: {
          base data-accessor semigroups storable-record
        ];
        description = "Sets of enumeration values represented by machine words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "env-extra" = callPackage
@@ -83312,8 +83701,8 @@ self: {
          base exceptions tasty tasty-hunit text transformers
        ];
        description = "Safe helpers for accessing and modifying environment variables";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83343,8 +83732,8 @@ self: {
          transformers
        ];
        description = "Pull configuration information from the ENV";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83359,7 +83748,7 @@ self: {
        libraryHaskellDepends = [ aeson base http-api-data mtl text ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "envparse" = callPackage
@@ -83371,7 +83760,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec text ];
        description = "Parse environment variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "envstatus" = callPackage
@@ -83392,8 +83781,8 @@ self: {
          base ConfigFile parsec PyF tasty tasty-hspec
        ];
        description = "Display efficiently the state of the local environment";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83413,7 +83802,7 @@ self: {
          transformers
        ];
        description = "An environmentally friendly way to deal with environment variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "envy-extensible" = callPackage
@@ -83430,7 +83819,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Provides FromEnv in envy instance for Record of extensible";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "epanet-haskell" = callPackage
@@ -83441,8 +83830,8 @@ self: {
        sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx";
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for EPANET";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83454,8 +83843,8 @@ self: {
        sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym";
        libraryHaskellDepends = [ base stm time ];
        description = "Baisc, Erlang-like message passing supporting sockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83476,8 +83865,8 @@ self: {
          trifecta vector
        ];
        description = "A library for simulating epidemics as birth-death processes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83495,8 +83884,8 @@ self: {
          array base Cabal directory mtl process
        ];
        description = "Compiler for a simple functional language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83511,7 +83900,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "epoll bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83524,8 +83913,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83543,7 +83932,7 @@ self: {
          base bytestring filepath old-time utf8-string xml zip-archive
        ];
        description = "EPUB E-Book construction support library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "epub-metadata" = callPackage
@@ -83566,7 +83955,7 @@ self: {
          utf8-string zip-archive
        ];
        description = "Library for parsing epub document metadata";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "epub-tools" = callPackage
@@ -83587,7 +83976,7 @@ self: {
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
        description = "Command line utilities for working with epub files";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "epubname" = callPackage
@@ -83603,8 +83992,8 @@ self: {
          base directory epub-metadata mtl regex-compat
        ];
        description = "Rename epub ebook files based on meta information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83616,7 +84005,7 @@ self: {
        sha256 = "1bcvjpbdis79dd09i07l7rjkh7j79qbpwb731rgr9k9215268wfa";
        libraryHaskellDepends = [ base semigroupoids ];
        description = "Leibnizian equality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "equal-files" = callPackage
@@ -83639,17 +84028,17 @@ self: {
 
   "equational-reasoning" = callPackage
     ({ mkDerivation, base, containers, template-haskell, th-desugar
-     , th-extras, void
+     , void
      }:
      mkDerivation {
        pname = "equational-reasoning";
-       version = "0.6.0.3";
-       sha256 = "003prif9pjjcj67nv6hxr0y70ik5qg1sddzh82y97a1l7m6kigfq";
+       version = "0.6.0.4";
+       sha256 = "1dv9di6p7pqmxys9c2d3rv36qhafgji0rxf52v0240zvfqhg8wn4";
        libraryHaskellDepends = [
-         base containers template-haskell th-desugar th-extras void
+         base containers template-haskell th-desugar void
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "equational-reasoning-induction" = callPackage
@@ -83662,8 +84051,8 @@ self: {
          base singletons template-haskell th-extras
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83685,8 +84074,8 @@ self: {
          tasty-hunit time
        ];
        description = "Application level triggered, and edge triggered event multiqueues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83707,7 +84096,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Maintaining an equivalence relation implemented as union-find using STT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "erd" = callPackage
@@ -83730,7 +84119,7 @@ self: {
          parsec raw-strings-qq tasty tasty-hunit text yaml
        ];
        description = "An entity-relationship diagram generator from a plain text description";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "erf" = callPackage
@@ -83741,7 +84130,7 @@ self: {
        sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
        libraryHaskellDepends = [ base ];
        description = "The error function, erf, and related functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "erf-native" = callPackage
@@ -83753,7 +84142,7 @@ self: {
        libraryHaskellDepends = [ base polynomial ];
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83770,7 +84159,7 @@ self: {
        ];
        description = "FFI interface to Erlang";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83783,8 +84172,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83803,8 +84192,8 @@ self: {
          aeson aeson-pretty base bytestring containers eros text
        ];
        description = "DEPRECATED in favor of eros-http";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83824,8 +84213,8 @@ self: {
          warp
        ];
        description = "JSON HTTP interface to Eros";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83840,7 +84229,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        executableHaskellDepends = [ base containers text ];
        description = "Source code error pretty printing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "errno" = callPackage
@@ -83851,7 +84240,7 @@ self: {
        sha256 = "0jix16b2c24pfbc3rig01nl68zdwpi28zzbciscalmq8lkpp10fa";
        libraryHaskellDepends = [ base mtl ];
        description = "a FFI utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-analyze" = callPackage
@@ -83863,7 +84252,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Parse ghc and cabal error messages and give their causes for easier resolution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-codes" = callPackage
@@ -83875,8 +84264,8 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        testHaskellDepends = [ base ];
        description = "Error code functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83899,8 +84288,8 @@ self: {
          unordered-containers
        ];
        description = "Provides API for enriching errors with contexts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83912,8 +84301,8 @@ self: {
        sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s";
        libraryHaskellDepends = [ base either mtl transformers ];
        description = "Error Continuations";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83925,8 +84314,8 @@ self: {
        sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j";
        libraryHaskellDepends = [ base mtl text text-render ];
        description = "A useful type for collecting error messages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83938,8 +84327,8 @@ self: {
        sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5";
        libraryHaskellDepends = [ base template-haskell ];
        description = "An error replacement with call-site metadata";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83951,7 +84340,7 @@ self: {
        sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid";
        libraryHaskellDepends = [ base template-haskell ];
        description = "error functions that show file location information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-message" = callPackage
@@ -83966,8 +84355,8 @@ self: {
          ansi-wl-pprint base containers either-unwrap InfixApplicative mtl
        ];
        description = "Composable error messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83979,7 +84368,7 @@ self: {
        sha256 = "0ry06vhz7mrl7i587vw3pv2ralh8aw7km6jfhagww0hmckwdjqmm";
        libraryHaskellDepends = [ base containers text ];
        description = "Composable, hierarchical errors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-or-utils" = callPackage
@@ -83990,7 +84379,7 @@ self: {
        sha256 = "14n5h69wknns3b6ij8avdijwlpwykalkpvx2q57cg6zv0ywnvmwz";
        libraryHaskellDepends = [ base containers error-or text ];
        description = "Utilities using ErrorOr datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-util" = callPackage
@@ -84001,8 +84390,8 @@ self: {
        sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz";
        libraryHaskellDepends = [ base transformers ];
        description = "Set of utils and operators for error handling";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84015,7 +84404,7 @@ self: {
        libraryHaskellDepends = [ base base-orphans ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "An orphan Eq instance for ErrorCall";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "errors" = callPackage
@@ -84030,7 +84419,7 @@ self: {
          base exceptions safe text transformers transformers-compat
        ];
        description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "errors-ext" = callPackage
@@ -84049,8 +84438,8 @@ self: {
          monad-control monad-loops mtl transformers
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84074,8 +84463,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "A script to concatenate AIP ERSA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84102,8 +84491,8 @@ self: {
        ];
        testHaskellDepends = [ array base directory doctest filepath ];
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84121,8 +84510,8 @@ self: {
          array base containers ersatz toysolver transformers
        ];
        description = "toysat driver as backend for ersatz";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84145,8 +84534,8 @@ self: {
          aeson attoparsec base bytestring yaml
        ];
        description = "Easy Runtime Templates";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84163,7 +84552,9 @@ self: {
          base bytestring hspec QuickCheck silently text
        ];
        description = "ANSI Escape Sequence Text Decoration Made Easy";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "escaped" = callPackage
@@ -84184,7 +84575,7 @@ self: {
          base doctest hspec QuickCheck quickcheck-properties
        ];
        description = "Produce Text with terminal escape sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "escoger" = callPackage
@@ -84210,8 +84601,8 @@ self: {
        ];
        doHaddock = false;
        description = "Terminal fuzzy selector";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84235,8 +84626,8 @@ self: {
        ];
        doHaddock = false;
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84301,8 +84692,8 @@ self: {
          yesod-form yesod-static yesod-test
        ];
        description = "Espial is an open-source, web-based bookmarking server";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84331,7 +84722,7 @@ self: {
          tagged text time transformers unliftio unordered-containers vector
        ];
        description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ess" = callPackage
@@ -84342,8 +84733,8 @@ self: {
        sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq";
        libraryHaskellDepends = [ base ];
        description = "The type-level S combinator in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84367,7 +84758,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "General purpose live coding framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-gloss" = callPackage
@@ -84382,7 +84773,7 @@ self: {
          base essence-of-live-coding foreign-store gloss syb transformers
        ];
        description = "General purpose live coding framework - Gloss backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-gloss-example" = callPackage
@@ -84400,7 +84791,7 @@ self: {
          transformers
        ];
        description = "General purpose live coding framework - Gloss example";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-pulse" = callPackage
@@ -84415,7 +84806,7 @@ self: {
          base essence-of-live-coding foreign-store pulse-simple transformers
        ];
        description = "General purpose live coding framework - pulse backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-pulse-example" = callPackage
@@ -84433,7 +84824,7 @@ self: {
          pulse-simple transformers vector
        ];
        description = "General purpose live coding framework - pulse backend example";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-quickcheck" = callPackage
@@ -84449,7 +84840,7 @@ self: {
          transformers
        ];
        description = "General purpose live coding framework - QuickCheck integration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-warp" = callPackage
@@ -84465,7 +84856,7 @@ self: {
        ];
        testHaskellDepends = [ base essence-of-live-coding http-client ];
        description = "General purpose live coding framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "estimator" = callPackage
@@ -84479,7 +84870,7 @@ self: {
          ad base distributive lens linear reflection
        ];
        description = "State-space estimation algorithms such as Kalman Filters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "estimators" = callPackage
@@ -84495,8 +84886,8 @@ self: {
          prettyclass QuickCheck text
        ];
        description = "Tool for managing probability estimation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84514,7 +84905,7 @@ self: {
        ];
        description = "Repeats from ESTs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84532,7 +84923,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base rio tasty tasty-hunit ];
        description = "Declarative configuration spec for Haskell projects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "etcd" = callPackage
@@ -84551,7 +84942,7 @@ self: {
        testHaskellDepends = [ async base hspec MonadRandom mtl text ];
        description = "Client for etcd, a highly-available key value store";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "eternal" = callPackage
@@ -84567,8 +84958,8 @@ self: {
          base base-unicode-symbols transformers utf8-string
        ];
        description = "everything breaking the Fairbairn threshold";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84589,8 +84980,8 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
        ];
        description = "Native event-sourcing database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84608,8 +84999,8 @@ self: {
          potoki QuickCheck text time timestamp
        ];
        description = "Automatic timestamping for Eternity";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84638,8 +85029,8 @@ self: {
          base criterion deepseq lens mtl transformers
        ];
        description = "Monad transformers and classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84663,8 +85054,8 @@ self: {
          hspec protolude text wl-pprint-text
        ];
        description = "A Ethereum contract analyzer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84692,8 +85083,8 @@ self: {
          base ethereum-analyzer-deps hflags monad-logger protolude
        ];
        description = "A CLI frontend for ethereum-analyzer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84711,7 +85102,7 @@ self: {
          containers deepseq fast-logger global-lock monad-logger split text
        ];
        description = "Stripped dependencies of ethereum-analyzer";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ethereum-analyzer-webui" = callPackage
@@ -84739,8 +85130,8 @@ self: {
          base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger
        ];
        description = "A web frontend for ethereum-analyzer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84769,8 +85160,8 @@ self: {
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "A Haskell version of an Ethereum client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84795,8 +85186,8 @@ self: {
          transformers
        ];
        description = "A modified Merkle Patricia DB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84815,7 +85206,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "eths-rlp" = callPackage
@@ -84831,7 +85222,7 @@ self: {
          base bytestring doctest hspec QuickCheck quickcheck-instances
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ety" = callPackage
@@ -84851,7 +85242,7 @@ self: {
          base bytestring curl random text-icu utf8-string xml
        ];
        description = "Random etymology online entry";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "euler" = callPackage
@@ -84864,7 +85255,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Mathematics utilities for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "euler-tour-tree" = callPackage
@@ -84887,7 +85278,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Euler tour trees";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "euphoria" = callPackage
@@ -84911,8 +85302,8 @@ self: {
          base criterion deepseq enummapset-th unordered-containers
        ];
        description = "Dynamic network FRP with events and continuous values";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84930,8 +85321,8 @@ self: {
          http-types monad-control mtl time
        ];
        description = "Free foreign exchange/currency feed from the European Central Bank";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84949,7 +85340,7 @@ self: {
        libraryPkgconfigDepends = [ libevdev ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to libevdev";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libevdev;};
 
   "evdev-streamly" = callPackage
@@ -84965,7 +85356,7 @@ self: {
          streamly streamly-fsnotify unix
        ];
        description = "Bridge for working with evdev and streamly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eve" = callPackage
@@ -84983,7 +85374,7 @@ self: {
          base data-default hspec hspec-core lens mtl
        ];
        description = "An extensible event framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eve-cli" = callPackage
@@ -84999,8 +85390,8 @@ self: {
          base bytestring eve lens mtl text vty
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85012,7 +85403,7 @@ self: {
        sha256 = "1d0bxg1dg66g1yv291cp4jh3xv3caxrddqrwb0g6g1929dl019fa";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        description = "Efficient effect handlers based on evidence translation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "event" = callPackage
@@ -85025,8 +85416,8 @@ self: {
          base containers semigroups transformers
        ];
        description = "Monoidal, monadic and first-class events";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85038,8 +85429,8 @@ self: {
        sha256 = "1jkrc1k0ixjs95fvj36gr08igpx5vqff5zc6bi9f04ldxqz4wbap";
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85051,7 +85442,7 @@ self: {
        sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld";
        libraryHaskellDepends = [ base containers ];
        description = "Event handlers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "event-list" = callPackage
@@ -85086,8 +85477,8 @@ self: {
          prettyclass priority-queue stateref
        ];
        description = "Event-graph simulation monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85103,7 +85494,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventful-core" = callPackage
@@ -85125,7 +85516,7 @@ self: {
          uuid
        ];
        description = "Core module for eventful";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventful-dynamodb" = callPackage
@@ -85148,8 +85539,8 @@ self: {
          quickcheck-instances safe text unordered-containers vector
        ];
        description = "Library for eventful DynamoDB event stores";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85169,7 +85560,7 @@ self: {
          safe stm
        ];
        description = "In-memory implementations for eventful";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventful-postgresql" = callPackage
@@ -85191,8 +85582,8 @@ self: {
          persistent-postgresql text
        ];
        description = "Postgres implementations for eventful";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85211,8 +85602,8 @@ self: {
          persistent-template text uuid
        ];
        description = "Common library for SQL event stores";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85235,8 +85626,8 @@ self: {
          text uuid
        ];
        description = "SQLite implementations for eventful";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85252,7 +85643,7 @@ self: {
          aeson aeson-casing base eventful-core extra hspec monad-logger text
        ];
        description = "Common module used for eventful tests";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventlog2html" = callPackage
@@ -85275,8 +85666,8 @@ self: {
        ];
        executableHaskellDepends = [ aeson base filepath text ];
        description = "Visualise an eventlog";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85295,8 +85686,8 @@ self: {
          suspend text timers websockets
        ];
        description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85316,7 +85707,7 @@ self: {
          string-conversions text transformers-base unordered-containers uuid
        ];
        description = "Provides an eventsourcing high level API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventsource-geteventstore-store" = callPackage
@@ -85340,8 +85731,8 @@ self: {
          tasty tasty-hspec transformers-base
        ];
        description = "GetEventStore store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85358,7 +85749,7 @@ self: {
          text transformers-base uuid
        ];
        description = "Provides common test specification for Store implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventsource-stub-store" = callPackage
@@ -85379,7 +85770,7 @@ self: {
          streaming tasty tasty-hspec
        ];
        description = "An in-memory stub store implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventsourced" = callPackage
@@ -85400,7 +85791,7 @@ self: {
          base blaze-builder bytestring HUnit wai-extra
        ];
        description = "Server-Sent Events the UNIX way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventsourcing" = callPackage
@@ -85421,7 +85812,7 @@ self: {
          unordered-containers
        ];
        description = "CQRS/ES library";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "eventsourcing-postgresql" = callPackage
@@ -85437,7 +85828,7 @@ self: {
          stm unordered-containers
        ];
        description = "PostgreSQL adaptor for eventsourcing";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "eventstore" = callPackage
@@ -85471,9 +85862,9 @@ self: {
          unordered-containers uuid vector
        ];
        description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85485,7 +85876,7 @@ self: {
        sha256 = "1rc0g5rn8hzglm2b4biaf8jvj5kb2j1s5vsxnm24q2gvrvjg03sx";
        libraryHaskellDepends = [ async base stm ];
        description = "Run a process every so often";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "every-bit-counts" = callPackage
@@ -85496,8 +85887,8 @@ self: {
        sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj";
        libraryHaskellDepends = [ base haskell98 ];
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85517,8 +85908,8 @@ self: {
        ];
        executableToolDepends = [ alex happy uuagc ];
        description = "An interpreter for EWE programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85534,7 +85925,7 @@ self: {
          base exceptions hashable stm time transformers vector
        ];
        description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exact-combinatorics" = callPackage
@@ -85545,7 +85936,7 @@ self: {
        sha256 = "1ay98m9prmd1pi85v2n0rs2432hzb7mxizzg79sv0ln24an8amvj";
        libraryHaskellDepends = [ base ];
        description = "Efficient exact computation of combinatoric functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exact-cover" = callPackage
@@ -85559,8 +85950,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        description = "Efficient exact cover solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85579,7 +85970,7 @@ self: {
          base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Exact rational multiples of pi (and integer powers of pi)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exact-real" = callPackage
@@ -85599,7 +85990,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Exact real arithmetic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exact-real-positional" = callPackage
@@ -85610,8 +86001,8 @@ self: {
        sha256 = "0qh1aqyi2k7djwqykj888hxjisip9ahg2ap43cj0xmdvfh9p0351";
        libraryHaskellDepends = [ base ];
        description = "Framework for Exact Real Arithmetic in the Positional Number System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85626,7 +86017,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Example Haskell Project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "except-exceptions" = callPackage
@@ -85639,8 +86030,8 @@ self: {
        editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk";
        libraryHaskellDepends = [ base exceptions transformers ];
        description = "Safely deal with exceptions in ExceptT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85652,7 +86043,7 @@ self: {
        sha256 = "0hph7mng5llcvazq9mqh9pndgbjjwivgmhpqlbf4r1xii7c0ymnx";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Exception type hierarchy with TemplateHaskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-mailer" = callPackage
@@ -85663,7 +86054,7 @@ self: {
        sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23";
        libraryHaskellDepends = [ base hslogger mime-mail text ];
        description = "Catch all runtime exceptions and send an email";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-monads-fd" = callPackage
@@ -85678,8 +86069,8 @@ self: {
          base exception-transformers monads-fd transformers
        ];
        description = "Exception monad transformer instances for monads-fd classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85695,7 +86086,7 @@ self: {
          base exception-transformers monads-tf transformers
        ];
        description = "Exception monad transformer instances for monads-tf classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-mtl" = callPackage
@@ -85708,7 +86099,7 @@ self: {
          base exception-transformers mtl transformers
        ];
        description = "Exception monad transformer instances for mtl classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-transformers" = callPackage
@@ -85725,7 +86116,7 @@ self: {
          transformers-compat
        ];
        description = "Type classes and monads for unchecked extensible exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-via" = callPackage
@@ -85736,7 +86127,7 @@ self: {
        sha256 = "046f787jw3v1c61q9c9canq0m266wv39rsk0613fyrhl96sss66m";
        libraryHaskellDepends = [ base template-haskell ];
        description = "DerivingVia for your hierarchical exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exceptional" = callPackage
@@ -85747,8 +86138,8 @@ self: {
        sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
        libraryHaskellDepends = [ base exceptions ];
        description = "Essentially the Maybe type with error messages";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85764,8 +86155,8 @@ self: {
        testHaskellDepends = [ base hspec process temporary ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "An exception-free readFile for use with '+RTS -xc -RTS' projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85788,8 +86179,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "Extensible optionally-pure exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "exchangerates" = callPackage
@@ -85817,8 +86208,8 @@ self: {
          validity-containers validity-time yaml
        ];
        description = "A Haskell client for https://exchangeratesapi.io/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85833,8 +86224,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base directory process text ];
        description = "Tool to run stack exec prj-exe more easy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85859,7 +86250,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Provides the SHA1 hash of the program executable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "executable-path" = callPackage
@@ -85870,7 +86261,7 @@ self: {
        sha256 = "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww";
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Finding out the full path of the executable";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "executor" = callPackage
@@ -85882,8 +86273,8 @@ self: {
        libraryHaskellDepends = [ async base process ];
        testHaskellDepends = [ async base doctest hspec process ];
        description = "Shell helpers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85914,11 +86305,38 @@ self: {
          mtl multistate process transformers
        ];
        description = "Tool to search/generate (haskell) expressions with a given type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "exh" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , exceptions, hspec, html-conduit, http-client, http-client-tls
+     , http-conduit, lens, megaparsec, monad-control, monad-time, mtl
+     , quickjs-hs, retry, text, time, transformers, transformers-base
+     , xml-conduit, xml-lens
+     }:
+     mkDerivation {
+       pname = "exh";
+       version = "0.2.0";
+       sha256 = "1pka39mzzbvxl0d60115hwyg2vgpznf1kk7z97p4k2m8kf2b668z";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers exceptions html-conduit
+         http-client http-client-tls http-conduit lens megaparsec
+         monad-control monad-time mtl quickjs-hs retry text time
+         transformers transformers-base xml-conduit xml-lens
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit containers exceptions hspec
+         html-conduit http-client http-client-tls http-conduit lens
+         megaparsec monad-control monad-time mtl quickjs-hs retry text time
+         transformers transformers-base xml-conduit xml-lens
+       ];
+       description = "A library for crawling exhentai";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "exhaustive" = callPackage
     ({ mkDerivation, base, generics-sop, template-haskell, transformers
      }:
@@ -85930,7 +86348,7 @@ self: {
          base generics-sop template-haskell transformers
        ];
        description = "Compile time checks that a computation considers producing data through all possible constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exherbo-cabal" = callPackage
@@ -85954,8 +86372,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85968,8 +86386,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) exif;};
 
@@ -85989,7 +86407,7 @@ self: {
          string-conversions temporary text unordered-containers vector
        ];
        description = "Haskell bindings to ExifTool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exigo-schema" = callPackage
@@ -86014,7 +86432,9 @@ self: {
          resourcet template-haskell temporary text
        ];
        description = "database schema for exigo marking/assessment tools";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst" = callPackage
@@ -86035,7 +86455,7 @@ self: {
          QuickCheck singletons tasty tasty-hunit tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -86053,7 +86473,7 @@ self: {
          aeson base bytestring exinst QuickCheck tasty tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-bytes" = callPackage
@@ -86073,7 +86493,7 @@ self: {
          tasty tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-cereal" = callPackage
@@ -86092,7 +86512,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-deepseq" = callPackage
@@ -86103,8 +86523,8 @@ self: {
        sha256 = "0q9fq5w6lir3qqybf8d0j0hhs33zsvv1xg49669cv5irl9hixh9z";
        libraryHaskellDepends = [ base constraints deepseq exinst ];
        description = "Derive instances for the `deepseq` library for your existential types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86118,8 +86538,8 @@ self: {
          base constraints exinst hashable singletons
        ];
        description = "Derive instances for the `hashable` library for your existential types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86138,7 +86558,7 @@ self: {
          base binary exinst QuickCheck serialise tasty tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exist" = callPackage
@@ -86149,7 +86569,7 @@ self: {
        sha256 = "0w2ip29f99qzi3wxicydkv991ws0lhnar3w0qka54r2mjb3xzrk9";
        libraryHaskellDepends = [ base base-unicode-symbols util ];
        description = "Dependent sum type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exist-instances" = callPackage
@@ -86164,7 +86584,7 @@ self: {
          base base-unicode-symbols constraint exist util
        ];
        description = "Instances for \"exist\" package (requires more language extensions and dependencies)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "existential" = callPackage
@@ -86184,8 +86604,8 @@ self: {
          unordered-containers
        ];
        description = "Existential types with lens-like accessors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {control-invariants = null;};
 
@@ -86197,8 +86617,8 @@ self: {
        sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy";
        libraryHaskellDepends = [ base contravariant ];
        description = "Existential datatypes holding evidence of constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86210,7 +86630,7 @@ self: {
        sha256 = "00cyli96zkyqhjr3lqzrislqyk72xwm2dcqvjagklidh32d4k8ja";
        libraryHaskellDepends = [ base ];
        description = "Exit codes as defined by BSD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exitcode" = callPackage
@@ -86230,8 +86650,8 @@ self: {
          tasty-hunit tasty-quickcheck transformers
        ];
        description = "Monad transformer for exit codes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86246,7 +86666,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Compression and decompression in the exomizer format";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "exotic-list-monads" = callPackage
@@ -86261,7 +86681,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Non-standard monads on lists and non-empty lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exp-cache" = callPackage
@@ -86283,7 +86703,7 @@ self: {
        testHaskellDepends = [
          base HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exp-extended" = callPackage
@@ -86294,8 +86714,8 @@ self: {
        sha256 = "14bz6wfzd8b51s09d2psg5hv5zq4f8lplgx0yvd3n0z704x3mcy6";
        libraryHaskellDepends = [ base ];
        description = "floating point with extended exponent range";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86320,7 +86740,7 @@ self: {
          base bimap containers gauge prettyprinter raw-strings-qq
        ];
        description = "Linear programming over exponent pairs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "expand" = callPackage
@@ -86334,7 +86754,7 @@ self: {
        ];
        description = "Extensible Pandoc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86350,8 +86770,8 @@ self: {
          base bytestring enumerator hexpat text transformers xml-types
        ];
        description = "Enumerator-based API for Expat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86384,7 +86804,7 @@ self: {
          unliftio-core vector
        ];
        description = "Perform scientific experiments stored in a DB, and generate reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -86402,7 +86822,7 @@ self: {
          base bytestring containers hashable time unordered-containers
        ];
        description = "General purpose simple caching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "expiring-containers" = callPackage
@@ -86425,8 +86845,8 @@ self: {
          tasty-hunit tasty-quickcheck timestamp
        ];
        description = "Expiring containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86438,7 +86858,7 @@ self: {
        sha256 = "0mkc7d346vdsjg83a253986w4pps53r262w1if91q16kx6qci7yy";
        libraryHaskellDepends = [ base ];
        description = "Create values which expire after a period of time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "explain" = callPackage
@@ -86453,8 +86873,8 @@ self: {
          ansi-wl-pprint base haskell-src-exts
        ];
        description = "Show how expressions are parsed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86469,8 +86889,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86482,8 +86902,8 @@ self: {
        sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
        libraryHaskellDepends = [ base ];
        description = "explicit computation of determinant of small matrices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86497,7 +86917,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq semigroups transformers ];
        description = "Exceptions which are explicit in the type signature";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "explicit-iomodes" = callPackage
@@ -86508,8 +86928,8 @@ self: {
        sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd";
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        description = "File handles with explicit IOModes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86521,8 +86941,8 @@ self: {
        sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj";
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        description = "Extends explicit-iomodes with ByteString operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86534,8 +86954,8 @@ self: {
        sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg";
        libraryHaskellDepends = [ base explicit-iomodes text ];
        description = "Extends explicit-iomodes with Text operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86549,8 +86969,8 @@ self: {
          base containers derive mtl template-haskell
        ];
        description = "Explicit Sharing of Monadic Effects";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86564,8 +86984,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base directory pngload ];
        description = "Experimental Plot data Reconstructor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86586,8 +87006,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "A distribution of the 'containers' package, with all modules exposed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86601,7 +87021,7 @@ self: {
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
        description = "Dynamically-typed expressions involving applications and variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "expression-parser" = callPackage
@@ -86612,8 +87032,8 @@ self: {
        sha256 = "1ldp1f2c823byx4ag8jpmq9bhw26lq98fz7ljqslffs37pc098qs";
        libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86631,8 +87051,8 @@ self: {
        ];
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86651,8 +87071,8 @@ self: {
          base containers expressions singletons transformers z3
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86681,8 +87101,8 @@ self: {
          tasty tasty-hunit text unordered-containers wl-pprint
        ];
        description = "A simple expressions language based on row types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86700,8 +87120,8 @@ self: {
          pretty syb
        ];
        description = "Libraries for processing GHC Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86724,8 +87144,8 @@ self: {
          xml
        ];
        description = "automated printing for extemp speakers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86738,7 +87158,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base template-haskell text ];
        testHaskellDepends = [ attoparsec base template-haskell text ];
        description = "TH to define a new record data type that extends the existing record data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extended-categories" = callPackage
@@ -86749,8 +87169,8 @@ self: {
        sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72";
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        description = "Extended Categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86763,7 +87183,7 @@ self: {
        libraryHaskellDepends = [ base transformers vector ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Heap and Vector container types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extended-containers-lens" = callPackage
@@ -86774,7 +87194,7 @@ self: {
        sha256 = "107nfyrp62h6qwc3ra08cd9vyaanc7442wcbfmm83aw05fav3p43";
        libraryHaskellDepends = [ base extended-containers lens ];
        description = "lens instances for extended-containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extended-reals" = callPackage
@@ -86791,7 +87211,7 @@ self: {
          tasty-th
        ];
        description = "Extension of real numbers with positive/negative infinities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extensible" = callPackage
@@ -86813,7 +87233,7 @@ self: {
        ];
        testHaskellDepends = [ base lens QuickCheck template-haskell ];
        description = "Extensible, efficient, optics-friendly data types and effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extensible-data" = callPackage
@@ -86828,8 +87248,8 @@ self: {
          base data-lens hashable template-haskell unordered-containers
        ];
        description = "Sums/products/lists/trees which can be extended in other modules";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86855,7 +87275,7 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "An Alternative to Monad Transformers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "extensible-effects-concurrent" = callPackage
@@ -86889,8 +87309,8 @@ self: {
          base criterion deepseq extensible-effects text unliftio
        ];
        description = "Message passing concurrency as extensible-effect";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86902,7 +87322,7 @@ self: {
        sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
        libraryHaskellDepends = [ base ];
        description = "Extensible exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extensible-skeleton" = callPackage
@@ -86920,8 +87340,8 @@ self: {
        ];
        testHaskellDepends = [ base extensible ];
        description = "Operational-based extensible effect library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86933,7 +87353,7 @@ self: {
        sha256 = "0s51rvsg41dymk173fxf7065yynlgx234xjs149lzm00gcwv92r6";
        libraryHaskellDepends = [ base lens ];
        description = "light-weight, extensible sums and products over types and kinds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "extensions" = callPackage
@@ -86960,7 +87380,7 @@ self: {
          hspec-hedgehog text
        ];
        description = "Parse Haskell Language Extensions";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "external-sort" = callPackage
@@ -86973,8 +87393,8 @@ self: {
          base binary bytestring EdisonAPI EdisonCore
        ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86993,7 +87413,7 @@ self: {
          base directory filepath QuickCheck quickcheck-instances unix
        ];
        description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -87013,8 +87433,8 @@ self: {
          async base Cabal containers package-description-remote
        ];
        description = "Given a hackage package outputs the list of its dependencies";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87026,7 +87446,7 @@ self: {
        sha256 = "1bf0naqx0gb66dr7g58lfaba87zmg09ynzdb3cyyymwcv4l1knp8";
        libraryHaskellDepends = [ base transformers ];
        description = "A functor, where the \"stored\" value is isomorphic to Identity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extractelf" = callPackage
@@ -87044,8 +87464,8 @@ self: {
          optparse-applicative
        ];
        description = "Extract an ELF's metadata and sections into files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87061,8 +87481,8 @@ self: {
          aeson base bytestring http-client http-client-tls text time
        ];
        description = "API Client for ExtraLife team and user data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87079,7 +87499,7 @@ self: {
        ];
        testHaskellDepends = [ base express leancheck speculate ];
        description = "generalize counter-examples of test properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ez-couch" = callPackage
@@ -87102,8 +87522,8 @@ self: {
          vector
        ];
        description = "A high level static library for working with CouchDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87117,8 +87537,8 @@ self: {
        editedCabalFile = "1x0fskz64l9xvywiif9jmmnjkkr7pbdri9y6k3cxgl47yipi0kf2";
        libraryHaskellDepends = [ base transformers z3 ];
        description = "Z3 bonds with pure interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87130,8 +87550,8 @@ self: {
        sha256 = "1vxhfr4wqm2bclnq15lp4q496w3916ll9chj6mcqbn0r64bmmkn8";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special f-algebra combinator from any data type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87147,8 +87567,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87160,8 +87580,8 @@ self: {
        sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03";
        libraryHaskellDepends = [ base free ];
        description = "Faceted computation for dynamic information flow security";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87171,8 +87591,8 @@ self: {
      }:
      mkDerivation {
        pname = "factor";
-       version = "1.4";
-       sha256 = "013f1h796ngp21pm3kd318vw4ah42bv6sbhjl18szk3sik88vd6z";
+       version = "1.5";
+       sha256 = "0fn7dlyaxa2pwf3xakszs75j0fvc7lsdzp4x2cm4hsnyyn1x5v9z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87185,7 +87605,7 @@ self: {
          base containers parsec pretty QuickCheck random time
        ];
        description = "Factoring integers and polynomials";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "factory" = callPackage
@@ -87211,7 +87631,7 @@ self: {
        ];
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87225,8 +87645,8 @@ self: {
        editedCabalFile = "03v6p3vlilz6vk5xlvw3r31cqicx3m1xjii9shcqpacxvlh2zzlp";
        libraryHaskellDepends = [ base exceptions mtl template-haskell ];
        description = "Refined types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87244,8 +87664,8 @@ self: {
          HTTP MissingH text unordered-containers utf8-string vector
        ];
        description = "A driver for the Factual API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87257,7 +87677,7 @@ self: {
        sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm";
        libraryHaskellDepends = [ base ];
        description = "Forward Automatic Differentiation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fadno" = callPackage
@@ -87277,8 +87697,8 @@ self: {
          base containers fadno-xml hspec hspec-contrib HUnit lens
        ];
        description = "Minimal library for music generation and notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87295,8 +87715,8 @@ self: {
          diagrams-rasterific lens random
        ];
        description = "Braid representations in Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87311,8 +87731,8 @@ self: {
          base containers Decimal lens mtl parsec xml
        ];
        description = "XML/XSD combinators/schemas/codegen";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87324,7 +87744,7 @@ self: {
        sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d";
        doHaddock = false;
        description = "Forward-compatible MonadFail class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "failable" = callPackage
@@ -87335,7 +87755,7 @@ self: {
        sha256 = "1vffrjywaxwfpzb6a34il772mkkaqwv9372aibijnvwf82rnglwg";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A 'Failable' error monad class to unify failure across monads that can fail";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "failable-list" = callPackage
@@ -87346,8 +87766,8 @@ self: {
        sha256 = "0bq0q9n4wnacjqs517i12kl56m16n5ff4gk8kamh87gqkd58w06x";
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87359,7 +87779,7 @@ self: {
        sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
        libraryHaskellDepends = [ base transformers ];
        description = "A simple type class for success/failure computations. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "failure-detector" = callPackage
@@ -87375,8 +87795,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck time
        ];
        description = "Failure Detectors implimented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87394,7 +87814,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lists with fair choice";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fair-predicates" = callPackage
@@ -87406,7 +87826,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Fair Predicates";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "fake" = callPackage
@@ -87422,8 +87842,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec random text time ];
        description = "Randomly generated fake data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87436,8 +87856,8 @@ self: {
        libraryHaskellDepends = [ base base-prelude split X11 ];
        librarySystemDepends = [ libXtst ];
        description = "A crossplatform library to simulate keyboard input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libXtst;};
 
@@ -87470,7 +87890,9 @@ self: {
          template-haskell text time unordered-containers vector yaml
        ];
        description = "Library for producing fake data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "fakedata-parser" = callPackage
@@ -87481,7 +87903,7 @@ self: {
        sha256 = "0rf4mr9977p70vsinr3iga6l5wzkxnkxd52j4jmdmrk5b6i3flcp";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fakedata-quickcheck" = callPackage
@@ -87497,7 +87919,9 @@ self: {
          base fakedata hspec hspec-core QuickCheck random regex-tdfa text
        ];
        description = "Fake a -> Gen a";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "fakefs" = callPackage
@@ -87513,7 +87937,7 @@ self: {
          base containers exceptions hspec QuickCheck
        ];
        description = "Extensible fake file system for testing";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "fakepull" = callPackage
@@ -87525,7 +87949,7 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        testHaskellDepends = [ base exceptions hspec mtl QuickCheck ];
        description = "Monad to pull from fake stream-like objects";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "faker" = callPackage
@@ -87537,7 +87961,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base gimlh random split ];
        description = "Pure Haskell library for generating fake data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "faktory" = callPackage
@@ -87547,8 +87971,8 @@ self: {
      }:
      mkDerivation {
        pname = "faktory";
-       version = "1.0.1.3";
-       sha256 = "1mxgkf54hxlj753dva21gxdqamq4mgfslcq5gqhp154gi0xmm79w";
+       version = "1.0.1.4";
+       sha256 = "151jlcrp80f8riyf8rxzvggyxq3k2mg2fi81r7wnc4in6gzsc0qj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87559,8 +87983,8 @@ self: {
        testHaskellDepends = [ aeson base hspec markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
        description = "Faktory Worker for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87572,7 +87996,7 @@ self: {
        sha256 = "0jj806klxagv65ddxb85gdy89m46p4yqxr9y5s5gc4arb5xzlwjq";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base transformers ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "falling-turnip" = callPackage
@@ -87591,8 +88015,8 @@ self: {
          repa-algorithms vector
        ];
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87612,7 +88036,7 @@ self: {
        ];
        description = "A fun falling blocks game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87624,7 +88048,7 @@ self: {
        sha256 = "1yqbq038axx9a2j3kbdm11w3fgvkix2w7dqhrbf353r2n8vigxg8";
        libraryHaskellDepends = [ base ];
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "family-tree" = callPackage
@@ -87640,8 +88064,8 @@ self: {
          unordered-containers
        ];
        description = "A family tree library for the Haskell programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87655,7 +88079,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast hash functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-arithmetic" = callPackage
@@ -87673,8 +88097,8 @@ self: {
        ];
        doHaddock = false;
        description = "Fast functions on integers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87694,7 +88118,7 @@ self: {
          scientific template-haskell text unordered-containers vector
        ];
        description = "Fast ByteString Builder";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "fast-combinatorics" = callPackage
@@ -87712,8 +88136,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Fast combinatorics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87733,8 +88157,8 @@ self: {
        benchmarkHaskellDepends = [ base digits gauge ];
        doHaddock = false;
        description = "Integer-to-digits conversion";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87750,7 +88174,7 @@ self: {
          base containers mtl process temporary text transformers
        ];
        description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-logger" = callPackage
@@ -87769,7 +88193,7 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec ];
        testToolDepends = [ hspec-discover ];
        description = "A fast logging system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-math" = callPackage
@@ -87780,7 +88204,7 @@ self: {
        sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425";
        libraryHaskellDepends = [ base ];
        description = "Non IEEE-754 compliant compile-time floating-point optimisations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-mult" = callPackage
@@ -87791,7 +88215,7 @@ self: {
        sha256 = "0lpgfb1a2kf0c9w9br2izzqn0f66pchydnq87a7z74lzs5jm1bba";
        libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ];
        description = "Numeric type with asymptotically faster multiplications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-nats" = callPackage
@@ -87802,8 +88226,8 @@ self: {
        sha256 = "1kp34h0ghpr3hwkbybwy954kbbdkbychzhjh4g1q44b2a8rgi5w1";
        libraryHaskellDepends = [ base ];
        description = "Natural Numbers with no overhead";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87830,7 +88254,7 @@ self: {
          base bytestring tasty tasty-hunit text void
        ];
        description = "Fast incremental vi and emacs tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-tagsoup" = callPackage
@@ -87845,7 +88269,7 @@ self: {
          base bytestring containers tagsoup text text-icu
        ];
        description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-tagsoup-utf8-only" = callPackage
@@ -87856,7 +88280,7 @@ self: {
        sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4";
        libraryHaskellDepends = [ base bytestring tagsoup text ];
        description = "Fast parser for tagsoup package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fasta" = callPackage
@@ -87873,8 +88297,8 @@ self: {
          pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
        ];
        description = "A simple, mindless parser for fasta files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87886,8 +88310,8 @@ self: {
        sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm";
        libraryHaskellDepends = [ base hmatrix vector ];
        description = "Bayesian modeling algorithms accelerated for particular model structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87900,7 +88324,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cgi ];
        librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fcgi;};
 
   "fastedit" = callPackage
@@ -87921,8 +88345,8 @@ self: {
          QuickCheck
        ];
        description = "find nearest neighbours by edit-distance";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87939,8 +88363,8 @@ self: {
          network-fancy
        ];
        description = "Fast Internet Relay Chat (IRC) library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87960,8 +88384,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "A highly experimental Fastly API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87980,7 +88404,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A fast, but bare bones, bytestring parser combinators library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fastpbkdf2" = callPackage
@@ -88000,7 +88424,7 @@ self: {
          base bytestring criterion cryptonite pbkdf
        ];
        description = "Haskell bindings to the fastpbkdf2 C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "fastsum" = callPackage
@@ -88019,8 +88443,8 @@ self: {
          base deepseq ghc-prim hashable template-haskell
        ];
        description = "A fast open-union type suitable for 100+ contained alternatives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88035,8 +88459,8 @@ self: {
          base bytestring cassava hxt network-uri text
        ];
        description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88048,8 +88472,8 @@ self: {
        sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0";
        libraryHaskellDepends = [ base yices ];
        description = "A fault tree analysis library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88064,8 +88488,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.24.1.0";
-       sha256 = "0cihrggbxmjfz34kbf7nbzn20v2sapfjql6hc5m68rbiiysb8jk3";
+       version = "0.24.2.0";
+       sha256 = "08s7cp2nq9nbr56jzapjf3vylnc6vb4xmf6qwcwvnjwzlvzfv96c";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -88080,8 +88504,8 @@ self: {
        ];
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88089,13 +88513,13 @@ self: {
     ({ mkDerivation, base, fay }:
      mkDerivation {
        pname = "fay-base";
-       version = "0.21.1.1";
-       sha256 = "09fnivdghxc750gpsa3hr7vgj3hff21zj7k73dfkxbkaj48bpf7q";
+       version = "0.21.2.0";
+       sha256 = "04dzwjwli88mxjl1cdmqbmnqjyn9mvc808vpf0lhv5kxky90078c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base fay ];
        description = "The base package for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88113,8 +88537,8 @@ self: {
          base Cabal data-default directory fay filepath safe split text
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88129,8 +88553,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88143,8 +88567,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "W3C compliant implementation of GeoPosition API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88157,8 +88581,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Clientside HTML generation for fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88171,8 +88595,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "jQuery bindings for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88185,8 +88609,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "Like IORef but for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88199,8 +88623,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "SimpleJSON library for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88215,8 +88639,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88229,8 +88653,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "Persistent FFI bindings for using jsUri in Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88243,8 +88667,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88271,7 +88695,7 @@ self: {
          unliftio
        ];
        description = "Bindings to Facebook's API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fb-persistent" = callPackage
@@ -88282,8 +88706,8 @@ self: {
        sha256 = "1il06mlvvjybfnqpdnir9nr1g0irf84fa4q8lzavrlqgny8f294s";
        libraryHaskellDepends = [ base cereal fb persistent text time ];
        description = "Provides Persistent instances to Facebook types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88312,8 +88736,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
        description = "High-level bindings to Facebook Messenger Platform API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88330,8 +88754,8 @@ self: {
          unordered-containers
        ];
        description = "Algo for Formal Concept Analysis";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88348,8 +88772,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl ];
        description = "Cache a function (a -> b)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88369,8 +88793,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A faster way to navigate directories using the command line";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88386,8 +88810,8 @@ self: {
        executableHaskellDepends = [ base first-class-families ];
        testHaskellDepends = [ base doctest first-class-families Glob ];
        description = "Data structures and algorithms for first-class-families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88400,8 +88824,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88413,8 +88837,8 @@ self: {
        sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x";
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
        description = "Server-Side Integration for FCKeditor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88434,7 +88858,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "First class accessor labels implemented as lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fclabels-monadlib" = callPackage
@@ -88445,8 +88869,8 @@ self: {
        sha256 = "1j15fxrpwnjnbjkswsy6jxn8f0bj2nhcdsf5976i7rka7gsjzr3d";
        libraryHaskellDepends = [ base fclabels monadLib ];
        description = "MonadLib monadic interface for the \"fclabels\" package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88478,8 +88902,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Admin API for Firebase Cloud Messaging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88491,7 +88915,7 @@ self: {
        sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
        libraryHaskellDepends = [ base containers dbus ];
        description = "Desktop Notifications client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fdo-trash" = callPackage
@@ -88511,8 +88935,8 @@ self: {
          base Diff directory filepath old-locale parsec time unix url
        ];
        description = "Utilities related to freedesktop Trash standard";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88524,7 +88948,7 @@ self: {
        sha256 = "03jpdg50g43lb3akfyfs0yh630igqfm0dg62bk4s5yv23cmbn8vf";
        libraryHaskellDepends = [ base containers microlens-platform mtl ];
        testHaskellDepends = [ base containers microlens-platform mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "feature-flags" = callPackage
@@ -88535,7 +88959,7 @@ self: {
        sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f";
        libraryHaskellDepends = [ base text ];
        description = "A simple library for dynamically enabling and disabling functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "feature-flipper" = callPackage
@@ -88553,8 +88977,8 @@ self: {
          base bytestring containers digest hspec mtl text
        ];
        description = "A minimally obtrusive feature flag library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88576,8 +89000,8 @@ self: {
          persistent persistent-postgresql
        ];
        description = "A minimally obtrusive feature flag library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88600,7 +89024,7 @@ self: {
        sha256 = "0hynmwic940vmna0czavbp1wx856ad9am7i6r0d2hq8jynrsin5w";
        libraryHaskellDepends = [ base ];
        description = "Library for Fedora distribution versions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fedora-haskell-tools" = callPackage
@@ -88619,7 +89043,7 @@ self: {
          process simple-cmd simple-cmd-args split time unix
        ];
        description = "Building and maintenance tools for Fedora Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fedora-img-dl" = callPackage
@@ -88639,8 +89063,8 @@ self: {
          xdg-userdirs
        ];
        description = "Fedora image download tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88663,8 +89087,8 @@ self: {
          io-streams lens text
        ];
        description = "Haskell interface to the Fedora Packages webapp API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88680,7 +89104,7 @@ self: {
        executableHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Short description of your package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "feed" = callPackage
@@ -88706,7 +89130,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "feed-cli" = callPackage
@@ -88724,8 +89148,8 @@ self: {
          base directory feed old-locale old-time time xml
        ];
        description = "A simple command line interface for creating and updating feeds like RSS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88743,8 +89167,8 @@ self: {
          time-interval time-units timerep transformers utf8-string
        ];
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88761,8 +89185,8 @@ self: {
          network-uri text transformers
        ];
        description = "Utility for fetching feeds with redirect info and HTML link detection";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88801,8 +89225,8 @@ self: {
          tasty-smallcheck temporary text transformers
        ];
        description = "CI service around gipeda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88824,8 +89248,8 @@ self: {
          raw-strings-qq scotty text transformers wai warp wreq xml
        ];
        description = "Translate syndication feeds";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88844,8 +89268,8 @@ self: {
          regex-posix tagsoup time utf8-string
        ];
        description = "(unsupported)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88862,8 +89286,8 @@ self: {
          base bytestring download-curl feed hs-twitter
        ];
        description = "Send posts from a feed to Twitter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88891,8 +89315,8 @@ self: {
        executableSystemDepends = [ mxnet ];
        executableToolDepends = [ c2hs ];
        description = "FFI to MXNet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -88920,8 +89344,8 @@ self: {
          optparse-applicative palette Rasterific repa rio store
        ];
        description = "Cocodataset with cocoapi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88948,8 +89372,8 @@ self: {
        executableSystemDepends = [ mxnet ];
        testHaskellDepends = [ base fei-base hspec streaming ];
        description = "mxnet dataiters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -88979,8 +89403,8 @@ self: {
          stm-conduit vector
        ];
        description = "Some datasets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89001,8 +89425,8 @@ self: {
          optparse-applicative random-source repa resourcet rio store
        ];
        description = "fei examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89019,8 +89443,8 @@ self: {
          text transformers-base vector
        ];
        description = "A collection of standard models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89042,8 +89466,8 @@ self: {
          transformers-base type-combinators uuid wl-pprint-text
        ];
        description = "Train a neural network with MXNet in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89072,8 +89496,8 @@ self: {
          base criterion data-default deepseq feldspar-language
        ];
        description = "Compiler for the Feldspar language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcc_s = null;};
 
@@ -89097,8 +89521,8 @@ self: {
          tasty-quickcheck tasty-th utf8-string
        ];
        description = "A functional embedded language for DSP and parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89116,8 +89540,8 @@ self: {
          feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
        ];
        description = "Signal Processing extension for Feldspar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {feldspar-compiler-shim = null; monadic-edsl-priv = null;};
 
@@ -89140,7 +89564,7 @@ self: {
          api-opentheory-unicode base opentheory-unicode
        ];
        description = "Converting a chess position from FEN notation to text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fences" = callPackage
@@ -89152,7 +89576,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "To be written";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fenfire" = callPackage
@@ -89172,7 +89596,7 @@ self: {
        executableSystemDepends = [ raptor ];
        description = "Graph-based notetaking system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {raptor = null;};
 
@@ -89198,8 +89622,8 @@ self: {
          tasty-hunit tasty-quickcheck time
        ];
        description = "Generate and verify HMAC-based authentication tokens";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89230,8 +89654,8 @@ self: {
          yesod yesod-test
        ];
        description = "Remote multi-db SQLCipher server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89243,8 +89667,8 @@ self: {
        sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b";
        libraryHaskellDepends = [ base containers regex-compat ];
        description = "Simple functions for loading config files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89259,8 +89683,8 @@ self: {
        libraryHaskellDepends = [ base HTTP json network utf8-string ];
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89282,8 +89706,8 @@ self: {
          unordered-containers
        ];
        description = "automatic C++ binding generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89295,7 +89719,7 @@ self: {
        sha256 = "05ljkq3zv8nfx4xhvqql13qd81v46bnxnja8f8590yrf3zfqg87x";
        libraryHaskellDepends = [ base bytestring template-haskell ];
        description = "Runtime for fficxx-generated library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ffmpeg-light" = callPackage
@@ -89317,7 +89741,7 @@ self: {
          ffmpeg libavcodec libavdevice libavformat libswscale
        ];
        description = "Minimal bindings to the FFmpeg library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -89334,8 +89758,8 @@ self: {
          base bytestring haskell98 hs-ffmpeg SDL stm
        ];
        description = "Tutorials on ffmpeg usage to play video/audio";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89353,7 +89777,7 @@ self: {
        libraryPkgconfigDepends = [ fftw fftwFloat ];
        testHaskellDepends = [ base carray QuickCheck storable-complex ];
        description = "Bindings to the FFTW library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
@@ -89365,7 +89789,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fftw ];
        description = "Low level bindings to FFTW";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
 
   "ffunctor" = callPackage
@@ -89384,8 +89808,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "FFunctor typeclass";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89403,7 +89827,7 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        benchmarkHaskellDepends = [ base deepseq microbench ];
        description = "Martin Erwig's Functional Graph Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fgl-arbitrary" = callPackage
@@ -89415,7 +89839,7 @@ self: {
        libraryHaskellDepends = [ base fgl QuickCheck ];
        testHaskellDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fgl-extras-decompositions" = callPackage
@@ -89426,8 +89850,8 @@ self: {
        sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s";
        libraryHaskellDepends = [ base containers fgl ];
        description = "Graph decomposition algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89439,7 +89863,7 @@ self: {
        sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq";
        libraryHaskellDepends = [ base dotgen fgl ];
        description = "Convert FGL graphs to dot (graphviz) files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fib" = callPackage
@@ -89450,7 +89874,7 @@ self: {
        sha256 = "17pk2fzgr4jjmpam52vmqg69927gfsl81w61h7q9zsf1vzd0qnix";
        libraryHaskellDepends = [ base-noprelude integer-gmp semirings ];
        description = "fibonacci algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fibon" = callPackage
@@ -89471,8 +89895,8 @@ self: {
          process regex-compat statistics syb tabular time vector
        ];
        description = "Tools for running and analyzing Haskell benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89484,7 +89908,7 @@ self: {
        sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k";
        libraryHaskellDepends = [ base ];
        description = "Fast computation of Fibonacci numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ficketed" = callPackage
@@ -89504,8 +89928,8 @@ self: {
          wai wai-app-static warp
        ];
        description = "update statically hosted file in a push stule through socketed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89521,8 +89945,8 @@ self: {
          array base containers fclabels monads-fd transformers
        ];
        description = "First-class record field combinators with infix record field syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89538,7 +89962,7 @@ self: {
          base base64-bytestring containers json mtl utf8-string
        ];
        description = "Abusing monadic syntax JSON objects generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fieldwise" = callPackage
@@ -89550,8 +89974,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89563,8 +89987,8 @@ self: {
        sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq";
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "Manipulation of FIG files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89578,8 +90002,8 @@ self: {
          base bytestring clock directory zip-archive
        ];
        description = "Provide a uniform interface over file archives and directories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89595,8 +90019,8 @@ self: {
          base parsec process system-filepath template-haskell text
        ];
        description = "Quasiquoter for system commands involving filepaths";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89613,7 +90037,7 @@ self: {
        ];
        testHaskellDepends = [ base filepath ];
        description = "Use Template Haskell to embed file contents directly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "file-embed-lzma" = callPackage
@@ -89632,7 +90056,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        description = "Use Template Haskell to embed (LZMA compressed) data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "file-embed-poly" = callPackage
@@ -89650,8 +90074,8 @@ self: {
          base bytestring directory file-embed filepath hspec
        ];
        description = "Use Template Haskell to embed file contents directly";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89669,8 +90093,8 @@ self: {
        ];
        testHaskellDepends = [ base lifted-base process ];
        description = "common functions that show file location information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89693,7 +90117,7 @@ self: {
          regex-compat regex-pcre
        ];
        description = "Takes a Haskell source-code file and outputs its modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "file-path-th" = callPackage
@@ -89710,7 +90134,7 @@ self: {
          base directory file-embed filepath template-haskell
        ];
        description = "Template Haskell utilities for filepaths";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "file-templates" = callPackage
@@ -89728,7 +90152,7 @@ self: {
          transformers unordered-containers
        ];
        description = "Use templates for files and directories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filecache" = callPackage
@@ -89747,8 +90171,8 @@ self: {
          base containers directory filepath hspec stm temporary
        ];
        description = "A cache system associating values to files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89770,8 +90194,8 @@ self: {
          base directory either mtl tasty tasty-hunit text time transformers
        ];
        description = "Diffing and patching module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89784,7 +90208,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ async base process ];
        description = "Portable interface to file locking (flock / LockFileEx)";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "filemanip" = callPackage
@@ -89799,7 +90223,7 @@ self: {
          base bytestring directory filepath mtl unix-compat
        ];
        description = "Expressive file and directory manipulation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fileneglect" = callPackage
@@ -89810,8 +90234,8 @@ self: {
        sha256 = "1s00jlq6cbab0fasx0ngg1n3ilzi634d4a4aday4jngsnvbwb735";
        libraryHaskellDepends = [ base hinotify stm ];
        description = "Block thread until a file stops being modified";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89826,8 +90250,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Library for manipulating FilePaths in a cross platform way";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "filepath-bytestring" = callPackage
@@ -89839,7 +90263,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring filepath QuickCheck ];
        description = "Library for manipulating RawFilePaths in a cross platform way";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filepath-crypto" = callPackage
@@ -89858,8 +90282,8 @@ self: {
          cryptoids-types exceptions filepath sandi template-haskell
        ];
        description = "Reversable and secure encoding of object ids as filepaths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89871,8 +90295,8 @@ self: {
        sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp";
        libraryHaskellDepends = [ base base-io-access filepath ];
        description = "IO Access for filepath";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89889,8 +90313,8 @@ self: {
          transformers
        ];
        description = "Functions on System.FilePath";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89903,7 +90327,7 @@ self: {
        libraryHaskellDepends = [ base directory extra filepath ];
        testHaskellDepends = [ base directory extra filepath QuickCheck ];
        description = "File path glob-like matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fileplow" = callPackage
@@ -89919,8 +90343,8 @@ self: {
          base bytestring hspec mtl QuickCheck temporary
        ];
        description = "Library to process and search large files or a collection of files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89941,7 +90365,7 @@ self: {
          base Diff directory filepath HUnit mtl time
        ];
        description = "Interface for versioning file stores";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filesystem-abstractions" = callPackage
@@ -89958,8 +90382,8 @@ self: {
          base bytestring list-tries posix-paths semigroups
        ];
        description = "A shared set of abstractions and types for representing filessytem data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89981,8 +90405,8 @@ self: {
          transformers
        ];
        description = "Use system-filepath data types with conduits. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89998,8 +90422,8 @@ self: {
          base enumerator system-fileio system-filepath transformers unix
        ];
        description = "Enumerator-based API for manipulating the filesystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90016,8 +90440,8 @@ self: {
          filepath mtl unix
        ];
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90034,8 +90458,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest hspec unordered-containers ];
        description = "Flexible string substitution";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90057,7 +90481,7 @@ self: {
        executableHaskellDepends = [ aeson base bytestring scotty ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Filterable request logging wai middleware. Change how data is logged and when.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "filters-basic" = callPackage
@@ -90068,7 +90492,7 @@ self: {
        sha256 = "09q6fb8cv7di67wb8zhky8qpbwivzax59xik1zbcjf3sp465a337";
        libraryHaskellDepends = [ base ];
        description = "Allows to change the structure of the function output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "filtrable" = callPackage
@@ -90079,7 +90503,7 @@ self: {
        sha256 = "11jas9w611pslc3hanybsdwrh4292zvgigng8y4cv7gm0j908xng";
        libraryHaskellDepends = [ base transformers ];
        description = "Class of filtrable containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filtrable_0_1_6_0" = callPackage
@@ -90093,8 +90517,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of filtrable containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fin" = callPackage
@@ -90110,7 +90534,7 @@ self: {
        libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ];
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "final" = callPackage
@@ -90121,7 +90545,7 @@ self: {
        sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
        libraryHaskellDepends = [ base stm transformers ];
        description = "utility to add extra safety to monadic returns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "final-pretty-printer" = callPackage
@@ -90136,8 +90560,8 @@ self: {
          ansi-terminal base containers exceptions mtl temporary text
        ];
        description = "Extensible pretty printing with semantic annotations and proportional fonts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90163,8 +90587,8 @@ self: {
          optparse-applicative text tree-fun unordered-containers
        ];
        description = "Find the clumpiness of labels in a tree";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90199,8 +90623,8 @@ self: {
          transformers-base unix-compat
        ];
        description = "A file-finding conduit that allows user control over traversals";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90212,8 +90636,8 @@ self: {
        sha256 = "1iiyfp8p0iaf39brii95wp6887ds63bx8qrrm4raks8y4b1hflrc";
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90232,8 +90656,8 @@ self: {
          http-directory simple-cmd-args text
        ];
        description = "List http/html files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90251,7 +90675,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Generic finger-tree structure, with example instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fingertree-psqueue" = callPackage
@@ -90262,8 +90686,8 @@ self: {
        sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z";
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90275,8 +90699,8 @@ self: {
        sha256 = "1ja8cqxpqhvssbcywph3zna946g1li5hlzsqab9lhg6vw0baakdn";
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90301,7 +90725,7 @@ self: {
          template-haskell typelits-witnesses vector vector-sized
        ];
        description = "A better, more type-safe Enum";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "finitary-derive" = callPackage
@@ -90324,8 +90748,8 @@ self: {
          hedgehog-classes
        ];
        description = "Flexible and easy deriving of type classes for finitary types";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90344,7 +90768,7 @@ self: {
          base hedgehog hspec hspec-hedgehog optics-core
        ];
        description = "Prisms and Isos between finitary types";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "finite-field" = callPackage
@@ -90354,10 +90778,8 @@ self: {
      }:
      mkDerivation {
        pname = "finite-field";
-       version = "0.9.0";
-       sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643";
-       revision = "2";
-       editedCabalFile = "11zivn1cjwxc7xy8q50raz1wpfgl0b459ai0f4j304rv7yiwrhdp";
+       version = "0.10.0";
+       sha256 = "1cw2d04dgbx8sk081xpnzla3im7ybvyd7v04wp53knj72h0aqydj";
        libraryHaskellDepends = [
          base deepseq hashable singletons template-haskell
        ];
@@ -90366,7 +90788,7 @@ self: {
          tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Finite Fields";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "finite-typelits" = callPackage
@@ -90377,7 +90799,7 @@ self: {
        sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj";
        libraryHaskellDepends = [ base deepseq ];
        description = "A type inhabited by finitely many values, indexed by type-level naturals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "finito" = callPackage
@@ -90395,7 +90817,7 @@ self: {
          base numeric-domains propeller split transformers
        ];
        description = "Constraint Solver for Finite Domains";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "firebase-database" = callPackage
@@ -90422,7 +90844,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Google Firebase Database SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {nano-http = null;};
 
@@ -90440,7 +90862,7 @@ self: {
          http-types mtl regex-pcre text transformers wai warp
        ];
        description = "A simple HTTP server framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "firefly-example" = callPackage
@@ -90456,8 +90878,8 @@ self: {
          aeson base blaze-html firefly mtl text wai
        ];
        description = "A simple example using Firefly";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90470,8 +90892,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "First and Last generalized to return up to n values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90486,7 +90908,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "First class type families";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "first-class-instances" = callPackage
@@ -90503,8 +90925,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "First class typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90516,7 +90938,7 @@ self: {
        sha256 = "1bh8ndf77pfh851d7szx0q2lpima6zm1d652s9j7jzchr7icyjvs";
        libraryHaskellDepends = [ base transformers ];
        description = "First class patterns and pattern matching, using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "firstify" = callPackage
@@ -90533,8 +90955,8 @@ self: {
          base containers directory filepath homeomorphic mtl Safe yhccore
        ];
        description = "Defunctionalisation for Yhc Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90559,7 +90981,7 @@ self: {
        ];
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90579,8 +91001,8 @@ self: {
          QuickCheck text
        ];
        description = "FIT file decoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90604,8 +91026,8 @@ self: {
          statistics vector
        ];
        description = "Parse FITS files";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90619,7 +91041,7 @@ self: {
        librarySystemDepends = [ cfitsio ];
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) cfitsio;};
 
@@ -90636,7 +91058,7 @@ self: {
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base pretty ];
        description = "refining property sets for testing Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fix-imports" = callPackage
@@ -90659,8 +91081,8 @@ self: {
          mtl pretty process split test-karya text time uniplate
        ];
        description = "Program to manage the imports of a haskell module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90675,7 +91097,7 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90687,8 +91109,8 @@ self: {
        sha256 = "01fxzhd2wqzp0paba64q5psfc4qvc4b8i88rdkn6mxlkm21gkp6y";
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90700,7 +91122,7 @@ self: {
        sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j";
        libraryHaskellDepends = [ base ];
        description = "Signed 15.16 precision fixed point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-length" = callPackage
@@ -90714,7 +91136,7 @@ self: {
          base non-empty storable-record tfp utility-ht
        ];
        description = "Lists with statically known length based on non-empty package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-list" = callPackage
@@ -90725,7 +91147,7 @@ self: {
        sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
        libraryHaskellDepends = [ base ];
        description = "A fixed length list type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-point" = callPackage
@@ -90736,8 +91158,8 @@ self: {
        sha256 = "010gx32av4cn5bqq1zrrcah50ay528vw01fvv1xhfpkrx1ll9wka";
        libraryHaskellDepends = [ base ];
        description = "Binary fixed-point arithmetic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90749,8 +91171,8 @@ self: {
        sha256 = "029mn44d1i794b1pbpa0zmf6b20zl0cvsf77mbfdkqnyx8986883";
        libraryHaskellDepends = [ base fixed-point vector ];
        description = "Unbox instances for the fixed-point package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90762,8 +91184,8 @@ self: {
        sha256 = "10b29gqy3rpwd5wf2b65p0llm8ksyp1p7k43rm1n5g5z67wkd7dx";
        libraryHaskellDepends = [ base fixed-point vector-space ];
        description = "vector-space instances for the fixed-point package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90779,8 +91201,8 @@ self: {
          base hmpfr integer-gmp reflection tagged template-haskell
        ];
        description = "Fixed Precision Arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90792,8 +91214,8 @@ self: {
        sha256 = "0vb5h2v2qx19d7xibf7ksv2cha2pngh49mfpkh43f9vrwc6042ph";
        libraryHaskellDepends = [ array base tagged ];
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90805,8 +91227,8 @@ self: {
        sha256 = "0rk5ym38m48khss38v8x09sdfz2nyhw7bw3dbjzy5qad09nzsipl";
        libraryHaskellDepends = [ async base clock time ];
        description = "Pure Haskell library to repeat an action at a specific frequency";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90819,7 +91241,7 @@ self: {
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [ base doctest filemanip primitive ];
        description = "Generic vectors with statically known size";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-vector-binary" = callPackage
@@ -90835,8 +91257,8 @@ self: {
          base binary fixed-vector tasty tasty-quickcheck
        ];
        description = "Binary instances for fixed-vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90853,8 +91275,8 @@ self: {
          base fixed-vector serialise tasty tasty-quickcheck
        ];
        description = "Binary instances for fixed-vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90871,8 +91293,8 @@ self: {
          base cereal fixed-vector tasty tasty-quickcheck
        ];
        description = "Cereal instances for fixed-vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90890,7 +91312,7 @@ self: {
        libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
        testHaskellDepends = [ base doctest fixed-vector ];
        description = "Library for working with product types generically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-width" = callPackage
@@ -90901,8 +91323,8 @@ self: {
        sha256 = "0gxmw70d1bdqjqrz3d1an009x7bqzlv41dfydp7b49ina5as9ry7";
        libraryHaskellDepends = [ base ];
        description = "Fixed width subsets of an Int64/Word64";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90914,7 +91336,7 @@ self: {
        sha256 = "01ss9rzg2r4gii6f7771n4vdyg022skyws6ncc3l62xycgz153a7";
        libraryHaskellDepends = [ base random ];
        description = "A fixed-precision real number type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixedwidth-hs" = callPackage
@@ -90930,7 +91352,7 @@ self: {
          aeson attoparsec base bytestring text
        ];
        description = "Quick parsing of fixed-width data formats";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fixer" = callPackage
@@ -90958,8 +91380,8 @@ self: {
          validity-time yaml
        ];
        description = "A Haskell client for http://fixer.io/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90981,8 +91403,8 @@ self: {
          tasty tasty-quickcheck temporary
        ];
        description = "File-backed recursive data structures";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91007,8 +91429,8 @@ self: {
          old-time QuickCheck text
        ];
        description = "FIX (co)parser";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91030,8 +91452,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91048,7 +91470,7 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck
        ];
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixpoint" = callPackage
@@ -91059,7 +91481,7 @@ self: {
        sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb";
        libraryHaskellDepends = [ base ];
        description = "Data types as fixpoints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixtime" = callPackage
@@ -91070,7 +91492,7 @@ self: {
        sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5";
        libraryHaskellDepends = [ base time ];
        description = "Some fixes to the time package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "fizz-buzz" = callPackage
@@ -91081,7 +91503,7 @@ self: {
        sha256 = "1c0nar70857awmzxh6w12xvplqrgp1qh2r7rlnaqvwcfzqkghav4";
        libraryHaskellDepends = [ base ];
        description = "Functional Fizz/Buzz";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fizzbuzz" = callPackage
@@ -91092,8 +91514,8 @@ self: {
        sha256 = "0iia37wsxvaff28ln4l9hzdg458vcnak3jj4kjnsrbbfysan5wlx";
        libraryHaskellDepends = [ base ];
        description = "test";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91111,8 +91533,8 @@ self: {
          async base bytestring network-simple optparse-applicative
        ];
        description = "FizzBuzz as a service";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91125,8 +91547,8 @@ self: {
        pname = "flac";
        version = "0.2.0";
        sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c";
-       revision = "1";
-       editedCabalFile = "1phwdnya8bgw24a80vbw0m4pm7r67grnc6si8683jz620snnsm48";
+       revision = "2";
+       editedCabalFile = "1b3cbhvvhbv1d0gkfwgn9j9jx9cjn3w606vbpfhak2cyjmw26q36";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory exceptions filepath mtl text
@@ -91139,8 +91561,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Complete high-level binding to libFLAC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {FLAC = null;};
 
@@ -91152,6 +91574,8 @@ self: {
        pname = "flac-picture";
        version = "0.1.2";
        sha256 = "02h36z65xmy0mvg7j2863h35dcf24l08ma0dxjbqcn42sca9ss0m";
+       revision = "1";
+       editedCabalFile = "1ib9ypz06i81bgkj08aw6fdyxi6fbl2029vwlcqybbhz9cnya1pm";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
        testHaskellDepends = [
@@ -91159,8 +91583,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91178,7 +91602,7 @@ self: {
          base binary deepseq HTTP optparse-applicative process
        ];
        description = "Verify FLAC files ripped form CD using AccurateRip™";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "flags-applicative" = callPackage
@@ -91194,7 +91618,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec text ];
        description = "Applicative flag parsing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flamethrower" = callPackage
@@ -91205,8 +91629,8 @@ self: {
        sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x";
        libraryHaskellDepends = [ base template-haskell text ];
        description = "A template engine for HTML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91223,8 +91647,8 @@ self: {
          base either optparse-applicative pipes
        ];
        description = "FlameGraphs of profiling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91269,8 +91693,8 @@ self: {
          these turtle unliftio-path vinyl
        ];
        description = "Generate language learning flashcards from video";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91297,7 +91721,7 @@ self: {
          unordered-containers vector
        ];
        description = "Principled and efficient bit-oriented binary serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flat-maybe" = callPackage
@@ -91308,8 +91732,8 @@ self: {
        sha256 = "0kxyr7k47lsw7xg523kf98d57p6i1iz5dmyp91zg1xs2hsbjgvlq";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Strict Maybe without space and indirection overhead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91328,7 +91752,7 @@ self: {
        ];
        testHaskellDepends = [ base vector ];
        description = "Painless general-purpose sampling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "flat-tex" = callPackage
@@ -91341,7 +91765,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory parsec ];
        description = "flatten a latex multi-file latex document and remove all comments";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "flatbuffers" = callPackage
@@ -91376,8 +91800,8 @@ self: {
          scientific template-haskell text text-manipulate vector
        ];
        description = "Haskell implementation of the FlatBuffers protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91392,8 +91816,8 @@ self: {
        libraryHaskellDepends = [ base constraints transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck transformers ];
        description = "Work generically on your datatype without knowing its shape nor its contents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91409,7 +91833,7 @@ self: {
          base containers template-haskell th-extras transformers
        ];
        description = "Generate default function implementations for complex type classes";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "flexible-time" = callPackage
@@ -91420,8 +91844,8 @@ self: {
        sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
        libraryHaskellDepends = [ base bytestring unix-time ];
        description = "simple extension of Data.UnixTime.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91436,7 +91860,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base bytestring text ];
        description = "A configurable reimplementation of unlit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flexiwrap" = callPackage
@@ -91447,8 +91871,8 @@ self: {
        sha256 = "0vvl9w3i374k720sscbcsbha89fcfk1hcvdr0nk4y7gkp13xwdba";
        libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        description = "Flexible wrappers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91462,8 +91886,8 @@ self: {
          base data-type flexiwrap mtl smallcheck
        ];
        description = "SmallCheck (Serial) instances for flexiwrap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91476,7 +91900,7 @@ self: {
        libraryHaskellDepends = [ base clock ];
        testHaskellDepends = [ base clock hspec QuickCheck ];
        description = "work with durations of time using the Flick as the smallest unit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flickr" = callPackage
@@ -91494,8 +91918,8 @@ self: {
        ];
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91507,7 +91931,7 @@ self: {
        sha256 = "17w40nfmdb4crg23fnqn663i4a60dx5714rcyaiqllm4r25n5qv9";
        libraryHaskellDepends = [ base bytestring parsec utf8-string ];
        description = "A parser for IGC files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "flight-kml" = callPackage
@@ -91530,7 +91954,7 @@ self: {
          tasty-quickcheck tasty-smallcheck template-haskell time
        ];
        description = "Parsing of pilot tracklogs dumped as KML";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "flink-statefulfun" = callPackage
@@ -91551,8 +91975,8 @@ self: {
        ];
        libraryToolDepends = [ proto-lens-protoc ];
        description = "Flink stateful functions SDK";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91566,7 +91990,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process safe-exceptions ];
        description = "e.g. `flip systemctl foo.service start` does `systemctl start foo.service`";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "flippers" = callPackage
@@ -91579,7 +92003,7 @@ self: {
        editedCabalFile = "1d3k5prcb5nl7gwq30h4n7qsbl86hrj42zpvrqwsr9lir2jss279";
        libraryHaskellDepends = [ base ];
        description = "Variations on flip for multiple arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flite" = callPackage
@@ -91595,8 +92019,8 @@ self: {
          array base containers haskell98 parsec
        ];
        description = "f-lite compiler, interpreter and libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91617,7 +92041,7 @@ self: {
          base bytestring mtl parsec regex-compat text
        ];
        description = "Generate flow charts from your code base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "float-binstring" = callPackage
@@ -91633,8 +92057,8 @@ self: {
          attoparsec base hspec HUnit QuickCheck split text
        ];
        description = "C99 printf \"%a\" style formatting and parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91646,7 +92070,7 @@ self: {
        sha256 = "0f4nrj5qy6j6d9ll22zjkbgvw2rx0x2w7nllhl929zdbmhxrjk73";
        libraryHaskellDepends = [ base integer-gmp ];
        description = "FFI bindings for C _Float128";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "floating-bits" = callPackage
@@ -91659,8 +92083,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91672,7 +92096,7 @@ self: {
        sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc";
        libraryHaskellDepends = [ array base integer-gmp ];
        description = "Alternative faster String representations for Double and Float, String representations for more general numeric types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flock" = callPackage
@@ -91690,7 +92114,7 @@ self: {
        ];
        description = "Wrapper for flock(2)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "floskell" = callPackage
@@ -91725,7 +92149,7 @@ self: {
          haskell-src-exts text utf8-string
        ];
        description = "A flexible Haskell source code pretty printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flow" = callPackage
@@ -91737,7 +92161,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "flow-er" = callPackage
@@ -91749,8 +92173,8 @@ self: {
        libraryHaskellDepends = [ base flow ];
        testHaskellDepends = [ base doctest flow QuickCheck ];
        description = "More directional operators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91769,7 +92193,7 @@ self: {
          base containers dotgen mtl parsec QuickCheck
        ];
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flowdock" = callPackage
@@ -91788,8 +92212,8 @@ self: {
          pipes-parse template-haskell text unordered-containers uuid
        ];
        description = "Flowdock client library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91826,8 +92250,8 @@ self: {
          transformers unordered-containers vector
        ];
        description = "API integration with Flowdock";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91855,8 +92279,8 @@ self: {
          tasty-quickcheck text time unordered-containers
        ];
        description = "Flowdock REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91875,7 +92299,7 @@ self: {
        ];
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91888,8 +92312,8 @@ self: {
        libraryHaskellDepends = [ base containers syb ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91908,8 +92332,8 @@ self: {
          directory MonadRandom mtl random
        ];
        description = "Simulate 454 pyrosequencing";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91942,8 +92366,8 @@ self: {
        ];
        testToolDepends = [ alex happy ];
        description = "A layout spec language for memory managers implemented in Rust";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91968,8 +92392,8 @@ self: {
          base directory filepath mtl OpenGLRaw parsec text
        ];
        description = "FLTK bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU; inherit (pkgs) pkg-config;};
@@ -91987,8 +92411,8 @@ self: {
          base bytestring directory fltkhs process stm
        ];
        description = "FLTKHS demos. Please scroll to the bottom for more information.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fltkhs-fluid-demos" = callPackage
@@ -92001,8 +92425,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Demos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fltkhs-fluid-examples" = callPackage
@@ -92015,8 +92439,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92030,8 +92454,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base fltkhs ];
        description = "Fltkhs template project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fltkhs-themes" = callPackage
@@ -92049,8 +92473,8 @@ self: {
        ];
        librarySystemDepends = [ fontconfig ];
        description = "A set of themed widgets that provides drop in replacements to the ones in FLTKHS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) fontconfig;};
 
   "fluent-logger" = callPackage
@@ -92074,8 +92498,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92092,7 +92516,7 @@ self: {
        ];
        description = "Conduit interface for fluent-logger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fluffy" = callPackage
@@ -92112,7 +92536,7 @@ self: {
          resource-pool text time uuid-types yesod-core yesod-static
        ];
        description = "A simple web application as a online practice website for XDU SE 2017 fall SPM";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fluffy-parser" = callPackage
@@ -92127,8 +92551,8 @@ self: {
          base binary bytestring pandoc parsec postgresql-simple
        ];
        description = "The parser for fluffy to parsec the question bank in .docx type";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92151,7 +92575,7 @@ self: {
          aeson base containers hspec scientific text vector
        ];
        description = "Code-generated, Auto-versioned, & Smart Web APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fluid-idl-http-client" = callPackage
@@ -92167,7 +92591,7 @@ self: {
          text-conversions
        ];
        description = "Http Client addon for Fluid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fluid-idl-scotty" = callPackage
@@ -92180,7 +92604,7 @@ self: {
          aeson base fluid-idl mtl scotty text wai
        ];
        description = "Scotty server add-on for Fluid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fluidsynth" = callPackage
@@ -92194,8 +92618,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL containers directory ];
        librarySystemDepends = [ fluidsynth ];
        description = "Haskell bindings to FluidSynth";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
@@ -92211,7 +92635,7 @@ self: {
        testHaskellDepends = [ async base hspec QuickCheck stm ];
        benchmarkHaskellDepends = [ async base deepseq old-time stm ];
        description = "Concurrent bouded blocking queues optimized for flushing. Both IO and STM implementations.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flux-monoid" = callPackage
@@ -92222,8 +92646,8 @@ self: {
        sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m";
        libraryHaskellDepends = [ base ];
        description = "A monoid for tracking changes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92241,8 +92665,8 @@ self: {
          base directory filepath mtl process Unixutils
        ];
        description = "A Friendly Markup language without syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92254,7 +92678,7 @@ self: {
        sha256 = "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d";
        libraryHaskellDepends = [ base ];
        description = "FoldMap lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fmt" = callPackage
@@ -92281,7 +92705,7 @@ self: {
          text vector
        ];
        description = "A new formatting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fmt-for-rio" = callPackage
@@ -92292,8 +92716,8 @@ self: {
        sha256 = "0hxf1cgch4l5vwnsg4449ing3qi40kpfcwjg4l807sw0b18ccwar";
        libraryHaskellDepends = [ base enum-text-rio ];
        description = "Adaptor for getting fmt to work with rio";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92306,8 +92730,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base fmt ];
        testHaskellDepends = [ ansi-terminal base fmt ];
        description = "ANSI terminal colors formatters for fmt library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92329,7 +92753,7 @@ self: {
          unordered-containers wai wai-extra
        ];
        description = "A functional web framework";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "fn-extra" = callPackage
@@ -92348,8 +92772,8 @@ self: {
          wai-extra wai-util xmlhtml
        ];
        description = "Extras for Fn, a functional web framework";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92367,7 +92791,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A general abstraction for manipulating elements of container data structures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "focuslist" = callPackage
@@ -92391,7 +92815,7 @@ self: {
          QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
        ];
        description = "Lists with a focused element";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fold-debounce" = callPackage
@@ -92407,7 +92831,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec stm time ];
        description = "Fold multiple events that happen in a given period of time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -92426,7 +92850,18 @@ self: {
          base conduit hspec resourcet stm transformers
        ];
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "foldable-ix" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "foldable-ix";
+       version = "0.1.0.0";
+       sha256 = "1lvf1n8mnv3imlry4nqdv8c2c930yic0raqs2awnbmyyy1c6fc79";
+       libraryHaskellDepends = [ base ];
+       description = "Functions to find out the indices of the elements in the Foldable structures";
+       license = lib.licenses.mit;
      }) {};
 
   "foldable1" = callPackage
@@ -92437,7 +92872,7 @@ self: {
        sha256 = "02p9wg0rcp7qvjp588y6r2szz7ja5x1idl04vn3hr7mbrbjq9ml5";
        libraryHaskellDepends = [ base transformers util ];
        description = "Foldable types with at least 1 element";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foldl" = callPackage
@@ -92450,6 +92885,8 @@ self: {
        pname = "foldl";
        version = "1.4.10";
        sha256 = "1fl1vahga6dv21nkgjd265nlhmgqzr8sa0fb5dfqzk34fb01vvvq";
+       revision = "1";
+       editedCabalFile = "0rd3w7m8a8pxb8jpmi9nky4hf1jl35cm8vp1qq8mfzgpx5bbqd2w";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors semigroupoids text transformers
@@ -92458,7 +92895,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foldl-exceptions" = callPackage
@@ -92472,7 +92909,7 @@ self: {
        libraryHaskellDepends = [ base foldl safe-exceptions ];
        testHaskellDepends = [ base doctest ];
        description = "Exception handling with FoldM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -92493,8 +92930,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers criterion foldl ];
        description = "incremental folds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92519,8 +92956,8 @@ self: {
          base criterion foldl mwc-random statistics vector
        ];
        description = "Statistical functions from the statistics package implemented as Folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92547,8 +92984,8 @@ self: {
          base criterion foldl lens-family-core
        ];
        description = "Transducers for foldl folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92570,8 +93007,8 @@ self: {
          text transformers
        ];
        description = "Attoparsec and foldl-transduce integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92597,7 +93034,7 @@ self: {
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
        description = "Beautiful Folding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "folds-common" = callPackage
@@ -92610,8 +93047,8 @@ self: {
        libraryHaskellDepends = [ base containers folds ];
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92630,7 +93067,7 @@ self: {
          array base containers gloss optparse-applicative xml
        ];
        description = "Toolset for Folger Shakespeare Library's XML annotated plays";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "follow" = callPackage
@@ -92658,8 +93095,8 @@ self: {
          text time transformers unordered-containers yaml
        ];
        description = "Haskell library to follow content published on any subject";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92684,7 +93121,7 @@ self: {
          path text unix utf8-string
        ];
        description = "Be notified when a file gets appended, solely with what was added. Warning - only works on linux and for files that are strictly appended, like log files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "follower" = callPackage
@@ -92702,8 +93139,8 @@ self: {
          old-locale strict time
        ];
        description = "Follow Tweets anonymously";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92716,10 +93153,10 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ foma ];
        description = "Simple Haskell bindings for Foma";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {foma = null;};
+     }) {inherit (pkgs) foma;};
 
   "font-awesome-type" = callPackage
     ({ mkDerivation, base }:
@@ -92729,7 +93166,7 @@ self: {
        sha256 = "1njwikgrsm52diq84j6lgjcndssk3ihmgp7fndwjq9m2v2h346gh";
        libraryHaskellDepends = [ base ];
        description = "A Font Awesome data type enumerating all icon classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "font-opengl-basic4x6" = callPackage
@@ -92743,8 +93180,8 @@ self: {
        libraryHaskellDepends = [ base OpenGL ];
        executableHaskellDepends = [ base GLFW-b OpenGL ];
        description = "Basic4x6 font for OpenGL";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92761,7 +93198,7 @@ self: {
        ];
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92777,7 +93214,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "for-free" = callPackage
@@ -92793,8 +93230,8 @@ self: {
          transformers
        ];
        description = "Functor, Monad, MonadPlus, etc for free";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92815,8 +93252,8 @@ self: {
          transformers vector
        ];
        description = "A library accelerates imperative style programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92833,8 +93270,8 @@ self: {
          base containers data-default-class lens linear
        ];
        description = "Simple force-directed layout";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92849,7 +93286,7 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92861,8 +93298,8 @@ self: {
        sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby";
        libraryHaskellDepends = [ aeson base text ];
        description = "A Haskell library for working with forecast.io data.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92874,7 +93311,7 @@ self: {
        sha256 = "1pj30p7z5nq8j95z9c4kjv6spandfch3r0dvx3n8wsbh3270dvxj";
        libraryHaskellDepends = [ base ];
        description = "Types and instances for implementing a Storable with different peek and poke";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foreign-store" = callPackage
@@ -92885,7 +93322,7 @@ self: {
        sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86";
        libraryHaskellDepends = [ base ];
        description = "Store a stable pointer in a foreign context to be retrieved later";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foreign-var" = callPackage
@@ -92898,8 +93335,8 @@ self: {
        editedCabalFile = "077s05370sx7pn053z1y6ygjg77dsvpcd5r8ivx9q9rk8m1hdjgr";
        libraryHaskellDepends = [ base stm transformers ];
        description = "Encapsulating mutatable state in external libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92915,8 +93352,8 @@ self: {
          aeson base comonad deepseq free hashable profunctors semigroupoids
        ];
        description = "Tree and Forest types";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92938,8 +93375,8 @@ self: {
          aeson base bytestring containers HUnit mtl tasty tasty-hunit
        ];
        description = "Recursively delete CloudFormation stacks and their dependants";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92954,8 +93391,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Library for generating fake placeholder data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92967,7 +93404,7 @@ self: {
        sha256 = "0qnl3bvqiwh6d7lm3w06is5ivh025c7024695m7fzajvzbpk67jp";
        libraryHaskellDepends = [ base transformers ];
        description = "An implementation of forkIO for monad stacks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "forma" = callPackage
@@ -92985,7 +93422,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base containers hspec mtl text ];
        description = "Parse and validate forms in JSON format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "formal" = callPackage
@@ -93007,8 +93444,8 @@ self: {
          parsec process text transformers urlencoded wl-pprint-text
        ];
        description = "A statically typed, functional programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93021,8 +93458,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 parsec ];
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        description = "Rendering from and scanning to format strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93035,7 +93472,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Various number formatting functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "format-status" = callPackage
@@ -93052,8 +93489,8 @@ self: {
          base data-concurrent-queue old-locale stm text time
        ];
        description = "A utility for writing the date to dzen2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93071,8 +93508,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Number text formatting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93093,8 +93530,8 @@ self: {
          lens old-locale QuickCheck text time
        ];
        description = "Business-quality formatting of numbers, dates, and other things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93113,7 +93550,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec semigroups text ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "formatting_7_1_1" = callPackage
@@ -93133,8 +93570,8 @@ self: {
          scientific text time transformers
        ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "forml" = callPackage
@@ -93158,8 +93595,8 @@ self: {
          process text urlencoded utf8-string zlib
        ];
        description = "A statically typed, functional programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93176,8 +93613,8 @@ self: {
          transformers xhtml
        ];
        description = "Formlets implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93194,8 +93631,8 @@ self: {
        ];
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93217,8 +93654,8 @@ self: {
          ansi-wl-pprint base containers lens text trifecta
        ];
        description = "Formura is a simple language to describe stencil computation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93246,8 +93683,8 @@ self: {
          type-level
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93264,7 +93701,7 @@ self: {
          base directory doctest hspec old-time process QuickCheck random
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "forth-hll" = callPackage
@@ -93275,8 +93712,8 @@ self: {
        sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3";
        libraryHaskellDepends = [ array-forth base free mtl ];
        description = "A simple eDSL for generating arrayForth code";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93305,8 +93742,8 @@ self: {
          filepath GenericPretty hspec mtl pretty text uniplate
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93321,8 +93758,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base text ];
        testHaskellDepends = [ base doctest hspec ];
        description = "Interactive terminal prompt";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93334,7 +93771,7 @@ self: {
        sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f";
        libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ];
        description = "Concurrent channels with a forwarding primitive";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "foscam-directory" = callPackage
@@ -93353,8 +93790,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Foscam File format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93374,8 +93811,8 @@ self: {
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
        description = "Foscam File format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93402,8 +93839,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Foscam File format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93419,7 +93856,7 @@ self: {
        testHaskellDepends = [ base basement ];
        benchmarkHaskellDepends = [ base basement gauge ];
        description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foundation-edge" = callPackage
@@ -93430,7 +93867,7 @@ self: {
        sha256 = "0dqpalqn9p10vmz3sw60aga76rpi4d92hrvq2v91pv44p1iva2mb";
        libraryHaskellDepends = [ bytestring foundation text ];
        description = "foundation's edge with the conventional set of packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fountain" = callPackage
@@ -93441,7 +93878,7 @@ self: {
        sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p";
        libraryHaskellDepends = [ base containers random ];
        description = "A fountain codec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fourmolu" = callPackage
@@ -93469,7 +93906,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fourmolu_0_3_0_0" = callPackage
@@ -93497,8 +93934,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fp-ieee" = callPackage
@@ -93507,16 +93944,17 @@ self: {
      }:
      mkDerivation {
        pname = "fp-ieee";
-       version = "0.1.0";
-       sha256 = "11av4rm7hwgm8xzflmcm7nmq2ynwfbb3dcyfx6hd75wwm2l1iz98";
+       version = "0.1.0.1";
+       sha256 = "11hj4ldpxcvpnyqhs02s0ryfjiql9pmn1h1caly3cfd1r9aairl9";
        libraryHaskellDepends = [ base integer-gmp integer-logarithms ];
        testHaskellDepends = [
          base decimal-arithmetic doctest hspec hspec-core integer-logarithms
          QuickCheck random
        ];
        benchmarkHaskellDepends = [ base gauge ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       description = "IEEE 754-2019 compliant operations";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93553,8 +93991,8 @@ self: {
          optparse-applicative process safe text unordered-containers
        ];
        description = "Simple interface to the FP Complete IDE API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93573,7 +94011,7 @@ self: {
          base bytestring cryptonite integer-logarithms vector
        ];
        description = "Format-preserving encryption";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fpipe" = callPackage
@@ -93584,7 +94022,7 @@ self: {
        sha256 = "1b6r19yy9wh5w8xb0ajjxsd2qyzjnkgyav1975qv92wwxslyxwr8";
        libraryHaskellDepends = [ base ];
        description = "F#-style composition and application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fplll" = callPackage
@@ -93600,8 +94038,8 @@ self: {
        libraryPkgconfigDepends = [ fplll ];
        testHaskellDepends = [ base ];
        description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
-       license = stdenv.lib.licenses.lgpl21Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fplll;};
 
@@ -93613,7 +94051,7 @@ self: {
        sha256 = "15qpfi3b9vnpm17q3y64nsrhlj5vi9rgrgysjfk98aw1gkj9mvv4";
        libraryHaskellDepends = [ base ];
        description = "A library for NLA operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fpnla-examples" = callPackage
@@ -93637,8 +94075,8 @@ self: {
          test-framework-quickcheck2 time vector
        ];
        description = "Example implementations for FPNLA library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93664,8 +94102,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "IEEE754r floating point conformance tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93684,7 +94122,7 @@ self: {
        ];
        description = "Installed package query tool for Gentoo Linux";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fractal" = callPackage
@@ -93697,7 +94135,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Draw Newton, Julia and Mandelbrot fractals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fractals" = callPackage
@@ -93709,8 +94147,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base integer-gmp QuickCheck ];
        description = "A collection of useful fractal curve encoders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93722,8 +94160,8 @@ self: {
        sha256 = "0ajkrp7babip4y0symj65yanyazsazp7lsbbsa3il2b6kp9fwgxd";
        libraryHaskellDepends = [ base semigroups ];
        description = "Fractions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93739,7 +94177,7 @@ self: {
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93763,8 +94201,8 @@ self: {
        ];
        executableHaskellDepends = [ pretty ];
        description = "A simple web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -93776,7 +94214,7 @@ self: {
        sha256 = "0wy1c9xgd6ykymqciga1sla83wfdwy17p88bygfp6pflbc0rw57g";
        libraryHaskellDepends = [ base frame pandoc ];
        description = "A markdown to Frame GUI writer for Pandoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "franchise" = callPackage
@@ -93787,8 +94225,8 @@ self: {
        sha256 = "144fywp5fcix5i06wvwvzwsr19bgxpajx7bi7jw43hnm3rlcj4vr";
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93815,7 +94253,7 @@ self: {
          base bytestring network optparse-applicative stm vector
        ];
        description = "Append-only database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fraxl" = callPackage
@@ -93834,8 +94272,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93855,8 +94293,8 @@ self: {
          text uuid
        ];
        description = "RabbitMQ Messaging API supporting request-response";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93877,7 +94315,7 @@ self: {
          transformers transformers-base
        ];
        description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free_5_1_6" = callPackage
@@ -93895,8 +94333,8 @@ self: {
          transformers transformers-base
        ];
        description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "free-algebras" = callPackage
@@ -93916,8 +94354,8 @@ self: {
          mtl transformers
        ];
        description = "Free algebras";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93929,7 +94367,7 @@ self: {
        sha256 = "1s5fdl7sgqhwk3zqrbv9qjzp7r12wyh4pwz38yywzhc32gl0vm4r";
        libraryHaskellDepends = [ base ];
        description = "free categories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-category" = callPackage
@@ -93946,8 +94384,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "efficient data types for free categories and arrows";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93959,8 +94397,8 @@ self: {
        sha256 = "1caiwxhm2wx0cnr2g4zvk2qv170jps14lf9j1q40qvx5qy3fxwlz";
        libraryHaskellDepends = [ base type-aligned ];
        description = "Free monads suitable for concurrent computation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93975,7 +94413,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "An extensible effects library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-functors" = callPackage
@@ -93992,7 +94430,7 @@ self: {
          profunctors template-haskell transformers
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-game" = callPackage
@@ -94013,8 +94451,8 @@ self: {
          StateVar template-haskell transformers vector void
        ];
        description = "Create games for free";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94031,8 +94469,8 @@ self: {
          time transformers
        ];
        description = "An HTTP Client based on Free Monads";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94048,8 +94486,8 @@ self: {
          base comonad-transformers free kan-extensions mtl transformers
        ];
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94065,8 +94503,8 @@ self: {
          base containers haskell-src haskell-src-exts mtl pretty syb
        ];
        description = "Automatic generation of free theorems";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94085,8 +94523,8 @@ self: {
        ];
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94104,8 +94542,8 @@ self: {
          old-locale old-time parsec pretty syb utf8-string xhtml
        ];
        description = "Taming Selective Strictness";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94124,8 +94562,8 @@ self: {
          utf8-string xhtml
        ];
        description = "Taming Selective Strictness";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94145,8 +94583,8 @@ self: {
          process time xhtml
        ];
        description = "CGI-based web interface for the free-theorems package";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94162,8 +94600,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94179,8 +94617,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94198,7 +94636,7 @@ self: {
          base lens linear MemoTrie pragmatic-show vector vector-space
        ];
        description = "Instantiate the classes from the vector-space package with types from linear";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-vl" = callPackage
@@ -94215,7 +94653,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
        description = "van Laarhoven encoded Free Monad with Extensible Effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freekick2" = callPackage
@@ -94237,7 +94675,7 @@ self: {
        ];
        description = "A soccer game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94257,8 +94695,8 @@ self: {
          transformers
        ];
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94273,8 +94711,8 @@ self: {
        librarySystemDepends = [ freenect freenect_sync ];
        libraryPkgconfigDepends = [ libfreenect ];
        description = "Interface to the Kinect device";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freenect; freenect_sync = null; 
          libfreenect = null;};
 
@@ -94295,7 +94733,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of the Freer Monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freer-converse" = callPackage
@@ -94311,8 +94749,8 @@ self: {
          base freer-effects tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Handle effects conversely using monadic conversation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94333,8 +94771,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94346,7 +94784,7 @@ self: {
        sha256 = "14d5683z37xyahrw6dbcv516lmc8vasl1bc6zvdy3wr4y4g1qyzd";
        libraryHaskellDepends = [ base ];
        description = "Freer indexed monad for type-level resource-aware effectual operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freer-simple" = callPackage
@@ -94373,7 +94811,7 @@ self: {
          base criterion extensible-effects free mtl
        ];
        description = "Implementation of a friendly effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freer-simple-catching" = callPackage
@@ -94385,8 +94823,8 @@ self: {
        libraryHaskellDepends = [ base freer-simple ];
        testHaskellDepends = [ base freer-simple hspec ];
        description = "Checked runtime exceptions with freer-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94407,8 +94845,8 @@ self: {
          http-types
        ];
        description = "Make HTTP requests with freer-simple!";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94421,8 +94859,8 @@ self: {
        libraryHaskellDepends = [ base containers freer-simple time ];
        testHaskellDepends = [ base containers freer-simple hspec time ];
        description = "Automatic profling of freer-simple programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94435,8 +94873,8 @@ self: {
        libraryHaskellDepends = [ base containers freer-simple random ];
        testHaskellDepends = [ base containers freer-simple hspec random ];
        description = "Random number generators using freer-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94449,8 +94887,8 @@ self: {
        libraryHaskellDepends = [ base freer-simple time ];
        testHaskellDepends = [ base freer-simple hspec time ];
        description = "freer-simple interface to IO based time functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94468,8 +94906,8 @@ self: {
          array base cpphs directory mtl parallel pretty random syb
        ];
        description = "A Haskell syntax extension for generalised sections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94491,8 +94929,8 @@ self: {
          aeson base bytestring containers data-default hspec hspec-core
        ];
        description = "Access the Freesound Project database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94507,8 +94945,8 @@ self: {
          base boundingboxes bytestring freetype2 linear
        ];
        description = "Single line text rendering for OpenGL ES";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94523,7 +94961,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base template-haskell ];
        description = "Haskell bindings for FreeType 2 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "french-cards" = callPackage
@@ -94535,7 +94973,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "French Playing Cards";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freq" = callPackage
@@ -94552,8 +94990,8 @@ self: {
        testHaskellDepends = [ base bytestring containers hedgehog ];
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94570,7 +95008,7 @@ self: {
        ];
        description = "Fresco binding for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fresh" = callPackage
@@ -94581,8 +95019,8 @@ self: {
        sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw";
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        description = "Introduce fresh variables into Haskell source code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94605,7 +95043,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "A functional image processing library for Haskell";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "friday-devil" = callPackage
@@ -94621,8 +95059,8 @@ self: {
        ];
        librarySystemDepends = [ libdevil ];
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -94639,7 +95077,7 @@ self: {
          base bytestring file-embed friday hspec JuicyPixels
        ];
        description = "Converts between the Friday and JuicyPixels image types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -94654,25 +95092,25 @@ self: {
          base base-compat carray fft friday vector
        ];
        description = "Scale Friday images with DCT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "friendly" = callPackage
-    ({ mkDerivation, base, bifunctors, lens, optparse-applicative }:
+    ({ mkDerivation, base, bifunctors, optparse-applicative }:
      mkDerivation {
        pname = "friendly";
-       version = "0.1.0.2";
-       sha256 = "18j9nw76rwsikf5wyv33mw04mn4xmdnk757c26zfbcx8rkcwjqzn";
+       version = "0.1.0.3";
+       sha256 = "1djmj4nmn4g36iab0z7npgc34vvfspvafr5a4bblnv41glx1wpc1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bifunctors lens optparse-applicative
+         base bifunctors optparse-applicative
        ];
        description = "Attempt to pretty-print any input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94687,7 +95125,7 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        testHaskellDepends = [ base hspec old-locale time ];
        description = "Print time information in friendly ways";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "frisby" = callPackage
@@ -94700,7 +95138,7 @@ self: {
          array base containers fail mtl semigroups
        ];
        description = "Linear time composable parser for PEG grammars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "from-sum" = callPackage
@@ -94712,7 +95150,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Combinators for working with Maybe and Either";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fromhtml" = callPackage
@@ -94726,7 +95164,7 @@ self: {
        libraryHaskellDepends = [ base bytestring process-extras text ];
        executableHaskellDepends = [ base bytestring process-extras text ];
        description = "Simple adapter for transformation of HTML to other formats";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "front" = callPackage
@@ -94745,8 +95183,8 @@ self: {
          fay-dom fay-websockets mtl stm text websockets
        ];
        description = "A reactive frontend web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94763,7 +95201,7 @@ self: {
          attoparsec base bytestring hspec QuickCheck text yaml
        ];
        description = "Parses frontmatter as used in Jekyll markdown files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "frotate" = callPackage
@@ -94777,7 +95215,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative time ];
        testHaskellDepends = [ base doctest ];
        description = "Advanced rotation of backups and other things";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "frown" = callPackage
@@ -94791,7 +95229,7 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "LALR(k) parser generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94803,8 +95241,8 @@ self: {
        sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94819,8 +95257,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Principled practical FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94836,8 +95274,8 @@ self: {
          base containers frpnow gloss mtl transformers
        ];
        description = "Program awesome stuff with Gloss and frpnow!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94854,8 +95292,8 @@ self: {
          base containers frpnow glib gtk mtl transformers
        ];
        description = "Program GUIs with GTK and frpnow!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94869,8 +95307,8 @@ self: {
          base containers frpnow glib gtk3 mtl text
        ];
        description = "Program GUIs with GTK3 and frpnow!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94885,8 +95323,8 @@ self: {
        libraryHaskellDepends = [ base frpnow vty ];
        executableHaskellDepends = [ base containers frpnow vty ];
        description = "Program terminal applications with vty and frpnow!";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94901,7 +95339,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Lexical extension for Quasi-Quotations using French-Quotes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fs-events" = callPackage
@@ -94912,8 +95350,8 @@ self: {
        sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4";
        libraryHaskellDepends = [ base ];
        description = "A haskell binding to the FSEvents API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94925,8 +95363,8 @@ self: {
        sha256 = "1lhvq4pqgsc52hzgh39ijw4yqw6r4pgq7shv8y5xfgyjibzkmf8m";
        libraryHaskellDepends = [ base hint ];
        description = "csv parser for fsh";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94938,7 +95376,7 @@ self: {
        sha256 = "1scmvhbsn988x6j4a94ibg1c7adrxf8lzn06n9n1iv62bjd450m3";
        libraryHaskellDepends = [ base ];
        description = "some F# operators, high priority pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fsmActions" = callPackage
@@ -94953,8 +95391,8 @@ self: {
          base containers fgl filepath graphviz MissingH mtl parsec pretty
        ];
        description = "Finite state machines and FSM actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94978,7 +95416,7 @@ self: {
          unix-compat
        ];
        description = "Cross platform library for file change notification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fsnotify-conduit" = callPackage
@@ -94997,7 +95435,7 @@ self: {
          transformers
        ];
        description = "Get filesystem notifications as a stream of events";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fst" = callPackage
@@ -95016,8 +95454,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Finite state transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95029,8 +95467,8 @@ self: {
        sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8";
        libraryHaskellDepends = [ base directory filepath ];
        description = "File system utilities for Haskell that are missing from built in libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95050,8 +95488,8 @@ self: {
          system-filepath text time-units turtle
        ];
        description = "Wait and observe events on the filesystem for a path, with a timeout";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95072,8 +95510,8 @@ self: {
          base directory fsnotify haskeline optparse-applicative process
        ];
        description = "File System watching tool with cli and slave functionalities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95092,7 +95530,7 @@ self: {
          regex-pcre-builtin system-filepath unix
        ];
        description = "Watch a file/directory and run a command when it's modified";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ft-generator" = callPackage
@@ -95105,8 +95543,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec ];
        description = "implementation accompanying a WFLP'19 paper";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95124,8 +95562,8 @@ self: {
          base base-unicode-symbols bytestring safe transformers usb
        ];
        description = "A thin layer over USB to communicate with FTDI chips";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95143,7 +95581,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hspec ];
        description = "Transfer files with FTP and FTPS";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "ftp-client-conduit" = callPackage
@@ -95159,7 +95597,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Transfer file with FTP and FTPS with Conduit";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "ftp-conduit" = callPackage
@@ -95175,8 +95613,8 @@ self: {
          utf8-string
        ];
        description = "FTP client package with conduit interface based off http-conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95195,7 +95633,7 @@ self: {
        ];
        description = "FTP Client and Server Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95207,7 +95645,7 @@ self: {
        sha256 = "1gj7j6mpfgv7ra3v9pm8gbvzbdmcvjri4zzmllx84d138l983k6g";
        libraryHaskellDepends = [ base ShowF type-unary ];
        description = "Depth-typed functor-based trees, both top-down and bottom-up";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ftshell" = callPackage
@@ -95225,8 +95663,8 @@ self: {
          base containers free-theorems mtl pretty Shellac Shellac-readline
        ];
        description = "Shell interface to the FreeTheorems library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95238,7 +95676,7 @@ self: {
        sha256 = "0g0qy0lcixbjm5srmfl1dnci4m09zwqcs5dpknpnsdc4b4l3925r";
        libraryHaskellDepends = [ base ];
        description = "A recapitulated prelude with minimal dependencies and profligate exports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "full-sessions" = callPackage
@@ -95249,8 +95687,8 @@ self: {
        sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90";
        libraryHaskellDepends = [ base ghc network ];
        description = "a monad for protocol-typed network programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95271,7 +95709,7 @@ self: {
          array base containers QuickCheck tasty tasty-quickcheck text vector
        ];
        description = "In-memory full text search engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fullstop" = callPackage
@@ -95290,8 +95728,8 @@ self: {
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Simple sentence segmenter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95320,8 +95758,8 @@ self: {
          unordered-containers utf8-string vcs-web-hook-parse
        ];
        description = "IRC bot for fun, learning, creativity and collaboration";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95340,8 +95778,8 @@ self: {
          network-uri
        ];
        description = "Report events to FunBot over a JSON/HTTP API";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95353,7 +95791,7 @@ self: {
        sha256 = "075h2iwa4vjhl2ckv7qv4n5s1zfvsnsam06xsznhqpjb9m2m1208";
        libraryHaskellDepends = [ aeson base text ];
        description = "Interact with FunBot's external events";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "funbot-git-hook" = callPackage
@@ -95372,8 +95810,8 @@ self: {
          hit network-uri template text utf8-string
        ];
        description = "Git hook which sends events to FunBot";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95386,8 +95824,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath pretty process ];
        description = "Functional MetaPost is a Haskell frontend to the MetaPost language";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "funcons-intgen" = callPackage
@@ -95406,8 +95844,8 @@ self: {
          iml-tools mtl pretty regex-applicative split text uu-cco
        ];
        description = "Generate Funcons interpreters from CBS description files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {iml-tools = null;};
 
@@ -95425,8 +95863,8 @@ self: {
          base containers funcons-tools gll text
        ];
        description = "call-by-value lambda-calculus with meta-programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95442,8 +95880,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base funcons-tools funcons-values ];
        description = "A modular interpreter for executing SIMPLE funcons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95469,8 +95907,8 @@ self: {
          random-strings regex-applicative split text TypeCompose vector
        ];
        description = "A modular interpreter for executing funcons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95486,8 +95924,8 @@ self: {
          base bv containers multiset text vector
        ];
        description = "Library providing values and operations on values in a fixed universe";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95500,7 +95938,7 @@ self: {
        libraryHaskellDepends = [ base tagged ];
        testHaskellDepends = [ base tagged ];
        description = "Create poly variadic functions for monoidal results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "function-combine" = callPackage
@@ -95511,8 +95949,8 @@ self: {
        sha256 = "1m8bmqxb9kar3y8zv22qs2a6kzd636m5li1r2q4y6pps0nglv9i9";
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95524,8 +95962,8 @@ self: {
        sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw";
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Instances of the Algebra.* classes for functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95537,8 +95975,8 @@ self: {
        sha256 = "1la9xqm5gs6a6cb18wyx9wr0nx6p5ryhczvb72d0zm6xrjrf0r5s";
        libraryHaskellDepends = [ base HList ];
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95550,7 +95988,7 @@ self: {
        sha256 = "1l72f0zz2hfhxydsmi0kqcq7mwib0cvk050mdhgyqgqdglphdpi9";
        libraryHaskellDepends = [ base ];
        description = "KMP implemented on haskell's built-in cons-cell-based lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor" = callPackage
@@ -95563,8 +96001,8 @@ self: {
        editedCabalFile = "1cjr0x65q1hmls7jszmngbibbif1l9jipjgkndpr33d84ry10hnj";
        libraryHaskellDepends = [ base category ];
        description = "Functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95576,7 +96014,7 @@ self: {
        sha256 = "0jshf7and80p0gq26zz83xj4p3ff8lppa5252qg0646xsr06lfkr";
        doHaddock = false;
        description = "This package has been subsumed by semigroupoids";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor-classes-compat" = callPackage
@@ -95593,7 +96031,7 @@ self: {
          base containers hashable unordered-containers vector
        ];
        description = "Data.Functor.Classes instances for core packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor-combinators" = callPackage
@@ -95620,8 +96058,8 @@ self: {
          semigroupoids tasty tasty-hedgehog transformers trivial-constraint
        ];
        description = "Tools for functor combinator-based program design";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95638,7 +96076,7 @@ self: {
          TypeCompose
        ];
        description = "Functor combinators with tries & zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor-friends" = callPackage
@@ -95649,8 +96087,8 @@ self: {
        sha256 = "1apbdfhmhw1f30w62wwq6nr98pqhqbadp9c05vc424jm82v0169d";
        libraryHaskellDepends = [ base recursion-schemes ];
        description = "Friendly helpers for your recursion schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95664,8 +96102,8 @@ self: {
        editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95677,7 +96115,7 @@ self: {
        sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
        libraryHaskellDepends = [ base ];
        description = "Monad-style combinators for functors";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "functor-products" = callPackage
@@ -95688,8 +96126,8 @@ self: {
        sha256 = "12rybs7d7m38sfnh9vqs375mzc0k8y0g0dgmwn2c23k9dn5r55jv";
        libraryHaskellDepends = [ base microlens singletons text vinyl ];
        description = "General functor products for various Foldable instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95701,8 +96139,8 @@ self: {
        sha256 = "1sf4d3af4kf341g7slpylm2113cy0597fngr5ldlds8znylspmms";
        libraryHaskellDepends = [ base ghc-prim lens ];
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95714,8 +96152,8 @@ self: {
        sha256 = "1aa4f6yp4vrrrs3rswhjxw2gij3mwn8yf299kgv42wd03xazyxrs";
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95727,7 +96165,7 @@ self: {
        sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6";
        libraryHaskellDepends = [ base ];
        description = "(.:) and friends, syntax for Functor and Applicative.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "funflow" = callPackage
@@ -95766,8 +96204,8 @@ self: {
          text unix
        ];
        description = "Workflows with arrows";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95789,8 +96227,8 @@ self: {
          tasty-hunit temporary unix
        ];
        description = "Utility functions for using funflow with nix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95807,7 +96245,7 @@ self: {
          TypeCompose
        ];
        description = "GLL parser with simple combinator interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "funion" = callPackage
@@ -95824,8 +96262,8 @@ self: {
          base bytestring directory filepath haskell98 HFuse unix
        ];
        description = "A unioning file-system using HFuse";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95841,8 +96279,8 @@ self: {
        testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        description = "funnyPrint function to colorize GHCi output";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95854,8 +96292,8 @@ self: {
        sha256 = "0zblrfg8mfbc1hzxb36hk2lb3c167xmpcvg8h595m9kjpdmj4ayw";
        libraryHaskellDepends = [ base mtl ];
        description = "A generalization of pattern matching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95877,8 +96315,8 @@ self: {
          QuickCheck random time
        ];
        description = "A modern DPLL-style SAT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95890,8 +96328,8 @@ self: {
        sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4";
        libraryHaskellDepends = [ base ];
        description = "Type-level function utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95912,7 +96350,7 @@ self: {
        testToolDepends = [ markdown-unlit ];
        benchmarkHaskellDepends = [ base gauge transformers ];
        description = "A fast, flexible, fused effect system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-exceptions" = callPackage
@@ -95929,7 +96367,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Handle exceptions thrown in IO with fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-lens" = callPackage
@@ -95941,7 +96379,7 @@ self: {
        libraryHaskellDepends = [ base fused-effects microlens ];
        testHaskellDepends = [ base fused-effects hspec microlens ];
        description = "Monadic lens combinators for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-mwc-random" = callPackage
@@ -95959,7 +96397,7 @@ self: {
        testHaskellDepends = [ base fused-effects mwc-random vector ];
        benchmarkHaskellDepends = [ base fused-effects-random gauge ];
        description = "High-quality random number generation as an effect";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-optics" = callPackage
@@ -95970,7 +96408,7 @@ self: {
        sha256 = "16q5b7b46k4hi8c46kq57dxidh2djzksc7s8jb65k341bbvlsy1w";
        libraryHaskellDepends = [ base fused-effects optics-core ];
        description = "Bridge between the optics and fused-effects ecosystems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-random" = callPackage
@@ -95981,7 +96419,7 @@ self: {
        sha256 = "0krcyx4hhvkxh0rbfwxb52xgb4rl45dflyx3aw8xryp6wn9my770";
        libraryHaskellDepends = [ base fused-effects random transformers ];
        description = "Random number generation for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-readline" = callPackage
@@ -96000,7 +96438,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A readline-like effect and carrier for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-resumable" = callPackage
@@ -96013,8 +96451,8 @@ self: {
          base deepseq fused-effects transformers
        ];
        description = "Resumable exceptions for the fused-effects ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96031,8 +96469,8 @@ self: {
          unliftio-pool
        ];
        description = "A fused-effects adapter for squeal-postgresql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96049,8 +96487,8 @@ self: {
          base fused-effects tasty tasty-hunit template-haskell
        ];
        description = "Template Haskell helpers for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96065,8 +96503,8 @@ self: {
        libraryHaskellDepends = [ base pipes-safe transformers void ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Effectful streaming library based on shortcut fusion techniques";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96083,7 +96521,7 @@ self: {
          transformers
        ];
        description = "GHC plugin to make stream fusion more predictable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fusion-plugin-types" = callPackage
@@ -96094,7 +96532,7 @@ self: {
        sha256 = "14lzymjna6faiwj7bdm1jrz42jfj3w1wi2hv66mldjhadf45613d";
        libraryHaskellDepends = [ base ];
        description = "Types for the fusion-plugin package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "futhark" = callPackage
@@ -96132,7 +96570,7 @@ self: {
          sexp-grammar tasty tasty-hunit tasty-quickcheck text
        ];
        description = "An optimising compiler for a functional, array-oriented language";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "futhask" = callPackage
@@ -96146,7 +96584,7 @@ self: {
        libraryHaskellDepends = [ base directory raw-strings-qq split ];
        executableHaskellDepends = [ base directory raw-strings-qq split ];
        description = "Generate Haskell wrappers for Futhark libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "futun" = callPackage
@@ -96159,8 +96597,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network unix ];
        description = "Simple IP-over-UDP tunnel using TUNTAP";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96172,8 +96610,8 @@ self: {
        sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri";
        libraryHaskellDepends = [ base ];
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96185,7 +96623,7 @@ self: {
        sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv";
        libraryHaskellDepends = [ base transformers ];
        description = "realtime resource handling with manual concurrency";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "futures" = callPackage
@@ -96196,7 +96634,7 @@ self: {
        sha256 = "0dx484i5q58yw3h6j9qp42x546vkky3sc29cqbr9969sfilmbqz8";
        libraryHaskellDepends = [ base ];
        description = "Simple and fast implementation of Future";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzcheck" = callPackage
@@ -96214,7 +96652,7 @@ self: {
          base hspec hspec-expectations HUnit QuickCheck
        ];
        description = "A simple checker for stress testing monadic code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fuzzy" = callPackage
@@ -96226,7 +96664,7 @@ self: {
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [ base HUnit ];
        description = "Filters a list based on a fuzzy string search";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzy-dates" = callPackage
@@ -96238,7 +96676,7 @@ self: {
        libraryHaskellDepends = [ base hourglass hspec lens parsec ];
        testHaskellDepends = [ base hourglass hspec lens parsec ];
        description = "Libary for parsing dates in strings in varied formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fuzzy-parse" = callPackage
@@ -96257,7 +96695,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Tools for processing unstructured text data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzy-time" = callPackage
@@ -96271,7 +96709,7 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq megaparsec text time validity validity-time
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzy-time-gen" = callPackage
@@ -96295,8 +96733,8 @@ self: {
        benchmarkHaskellDepends = [
          base criterion fuzzy-time genvalidity-criterion
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96317,8 +96755,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time
        ];
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96338,7 +96776,7 @@ self: {
          unordered-containers vector
        ];
        description = "Fuzzy set for approximate string matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fuzzytime" = callPackage
@@ -96370,7 +96808,7 @@ self: {
        ];
        testHaskellDepends = [ async base hspec ];
        description = "Fast Mutable Vars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fwgl" = callPackage
@@ -96385,8 +96823,8 @@ self: {
          base hashable transformers unordered-containers vect vector Yampa
        ];
        description = "Game engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96403,8 +96841,8 @@ self: {
          unordered-containers vect vector
        ];
        description = "FWGL GLFW backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96420,8 +96858,8 @@ self: {
          base fwgl ghcjs-base hashable unordered-containers vect
        ];
        description = "FWGL GHCJS backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96433,7 +96871,7 @@ self: {
        sha256 = "1awscv2y8ywcyyn08hdmlh3qdjs33akr7grfdfls59rmhidg4fhd";
        libraryHaskellDepends = [ base ];
        description = "Horizontally composable effects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "g-npm" = callPackage
@@ -96446,8 +96884,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96480,8 +96918,8 @@ self: {
          tasty-hunit text time unordered-containers
        ];
        description = "Haskell symbolic execution engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96493,8 +96931,8 @@ self: {
        sha256 = "1g42xkc4jc1a94s1krr1yrn191f8d6rmcpwk9ndwzk3nwby9v1vf";
        libraryHaskellDepends = [ base g2 ];
        description = "G2Q allows constraint programming, via writing Haskell predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96507,8 +96945,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A theorem prover for propositional logic that uses G4ip";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96526,7 +96964,7 @@ self: {
        executableToolDepends = [ happy ];
        testHaskellDepends = [ base ];
        description = "Theorem prover for intuitionistic propositional logic using G4ip";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gact" = callPackage
@@ -96544,7 +96982,7 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96571,8 +97009,8 @@ self: {
          vector
        ];
        description = "FFTs over finite fields";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96598,8 +97036,8 @@ self: {
          protolude QuickCheck semirings vector wl-pprint-text
        ];
        description = "Galois field library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96614,7 +97052,7 @@ self: {
        executableHaskellDepends = [ array base hscurses random text ];
        testHaskellDepends = [ array base hspec ];
        description = "Conway's Game of Life";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "game-probability" = callPackage
@@ -96625,8 +97063,8 @@ self: {
        sha256 = "1wl29h702g79kwy4ca35x1q37aaj3rphf1i9vdm2hmd44bzrwvkk";
        libraryHaskellDepends = [ base containers probability random ];
        description = "Simple probability library for dice rolls, card games and similar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96652,7 +97090,7 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96683,8 +97121,8 @@ self: {
          tasty-quickcheck text time
        ];
        description = "Tool for generating TOTP MFA tokens";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96705,8 +97143,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Gamma function and related functions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96718,7 +97156,7 @@ self: {
        sha256 = "0gj7ln0xq1a7zzxhyl636z854xfq714kmh2ld30ll0dskr701l1p";
        libraryHaskellDepends = [ base containers mtl stm transformers ];
        description = "Non-deterministic parallelism with bags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "garepinoh" = callPackage
@@ -96732,8 +97170,8 @@ self: {
        libraryHaskellDepends = [ base haskeline transformers ];
        executableHaskellDepends = [ base haskeline transformers ];
        description = "reverse prefix notation calculator and calculation library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96745,7 +97183,7 @@ self: {
        sha256 = "0r8wybcqn7g24q8abrw757h76r75l4jh4hjx91yh44h4c1r6k4yf";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gargoyle" = callPackage
@@ -96760,7 +97198,7 @@ self: {
          base directory filelock filepath network process unix
        ];
        description = "Automatically spin up and spin down local daemons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gargoyle-postgresql" = callPackage
@@ -96781,7 +97219,7 @@ self: {
          base bytestring gargoyle process text unix
        ];
        description = "Manage PostgreSQL servers with gargoyle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gargoyle-postgresql-connect" = callPackage
@@ -96800,8 +97238,8 @@ self: {
          gargoyle-postgresql-nix postgresql-simple resource-pool
        ];
        description = "Connect to gargoyle-managed postgresql instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96822,8 +97260,8 @@ self: {
          base gargoyle gargoyle-postgresql which
        ];
        description = "Manage PostgreSQL servers with gargoyle and nix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96836,7 +97274,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base hspec mtl transformers ];
        description = "A monad transformer for keeping track of where you've come from";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "garsia-wachs" = callPackage
@@ -96847,7 +97285,7 @@ self: {
        sha256 = "0mks5nwc19i0wsc5hhxh0ji2bh0224y3r89b3p9dfzzn64n3za6v";
        libraryHaskellDepends = [ base ];
        description = "A Functional Implementation of the Garsia-Wachs Algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gas" = callPackage
@@ -96858,8 +97296,8 @@ self: {
        sha256 = "1khapcq5yfx46pmc3y5nax8p5v5ckbis8v4f53jng6j59cd27c3f";
        libraryHaskellDepends = [ base free transformers ];
        description = "Limit how many steps a program may take";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96871,7 +97309,7 @@ self: {
        sha256 = "0dhna3mj7mdyk1n0x3barpn5g4hkjl9fnbr403xym1dm8rl7r7hg";
        libraryHaskellDepends = [ base binary containers mtl QuickCheck ];
        description = "A framework of algebraic classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gather" = callPackage
@@ -96882,8 +97320,8 @@ self: {
        sha256 = "0ajh8ygks61knc17vgsm5dsnqhkcrz2s0gaw6xyppq415wijgv0m";
        libraryHaskellDepends = [ base ];
        description = "An applicative for parsing unordered things, heterogenous sorting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96903,7 +97341,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base ];
        description = "small framework for performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gbu" = callPackage
@@ -96918,8 +97356,8 @@ self: {
          base containers fgl Graphalyze haskell98 mtl regex-posix
        ];
        description = "planar graph embedding into a plane";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96931,7 +97369,7 @@ self: {
        sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph";
        libraryHaskellDepends = [ base ];
        description = "Poor Richard's Memory Manager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gc-monitoring-wai" = callPackage
@@ -96947,8 +97385,8 @@ self: {
          unordered-containers wai
        ];
        description = "a wai application to show GHC.GCStats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96978,8 +97416,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "GCode processor";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "gconf" = callPackage
@@ -96995,8 +97433,8 @@ self: {
        libraryPkgconfigDepends = [ GConf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.gnome2) GConf;};
 
@@ -97013,7 +97451,7 @@ self: {
          expat fontconfig freetype gd libjpeg libpng zlib
        ];
        description = "A Haskell binding to a subset of the GD graphics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; 
          inherit (pkgs) freetype; inherit (pkgs) gd; 
          inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
@@ -97050,8 +97488,8 @@ self: {
          tasty-th text time unordered-containers vector websockets wuss
        ];
        description = "API Wrapping for Coinbase's GDAX exchange";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97066,7 +97504,7 @@ self: {
        libraryHaskellDepends = [ base bytestring megaparsec text time ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        description = "GDELT V2 (Global Database of Events, Language, and Tone)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gdiff" = callPackage
@@ -97077,7 +97515,7 @@ self: {
        sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
        libraryHaskellDepends = [ base ];
        description = "Generic diff and patch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gdiff-ig" = callPackage
@@ -97092,8 +97530,8 @@ self: {
          array base ghc-prim instant-generics template-haskell
        ];
        description = "Generic diff for the instant-generics library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97112,8 +97550,8 @@ self: {
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
        description = "Generate gdiff GADTs and Instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97132,7 +97570,7 @@ self: {
          transformers
        ];
        description = "recursive atomic build system";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gdp" = callPackage
@@ -97146,7 +97584,7 @@ self: {
        libraryHaskellDepends = [ base lawful ];
        executableHaskellDepends = [ base ];
        description = "Reason about invariants and preconditions with ghosts of departed proofs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gearbox" = callPackage
@@ -97159,7 +97597,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
        description = "zooming rotating fractal gears graphics demo";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gedcom" = callPackage
@@ -97176,8 +97614,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec megaparsec text-all ];
        description = "Parser for the GEDCOM genealogy file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97198,8 +97636,8 @@ self: {
          text-icu time
        ];
        description = "Geek blog engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97224,7 +97662,7 @@ self: {
        ];
        description = "Geek blog engine server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97245,8 +97683,8 @@ self: {
        librarySystemDepends = [ gegl ];
        libraryPkgconfigDepends = [ gegl ];
        description = "Haskell bindings to GEGL library";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gegl;};
 
@@ -97265,8 +97703,8 @@ self: {
        ];
        executableHaskellDepends = [ base linear mtl vector ];
        description = "A graphics description language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97284,8 +97722,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97297,8 +97735,8 @@ self: {
        sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r";
        libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97320,8 +97758,8 @@ self: {
        ];
        executableHaskellDepends = [ base gelatin lens linear mtl vector ];
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97339,8 +97777,8 @@ self: {
        libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ];
        executableHaskellDepends = [ base either filepath sdl2 ];
        description = "An SDL2 backend for the gelatin renderer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97353,8 +97791,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring filepath gelatin ];
        description = "Gelatin's OpenGL shaders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97370,7 +97808,7 @@ self: {
          base gemini-server network-uri transformers
        ];
        description = "A simple Happstack-style Gemini router";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gemini-server" = callPackage
@@ -97388,7 +97826,7 @@ self: {
          utf8-string
        ];
        description = "A lightweight server for the Gemini protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gemini-textboard" = callPackage
@@ -97409,7 +97847,7 @@ self: {
          network-uri nonce sqlite-simple text time transformers
        ];
        description = "A barebones textboard for the Gemini protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gemstone" = callPackage
@@ -97427,7 +97865,7 @@ self: {
        ];
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97443,8 +97881,8 @@ self: {
          base bytestring Cabal containers filepath hackage-db pretty
        ];
        description = "Code to generate instances for the package \"ghc-instances\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97462,8 +97900,8 @@ self: {
          base bytestring optparse-applicative random vector
        ];
        description = "Create wordlist-based passwords easily";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97480,8 +97918,8 @@ self: {
          transformers
        ];
        description = "A testing framework inspired by QuickCheck and SmallCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97497,8 +97935,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        executableHaskellDepends = [ attoparsec base text ];
        description = "Identify a persons gender by their first name";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97514,8 +97952,8 @@ self: {
        librarySystemDepends = [ genders ];
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {genders = null;};
 
@@ -97531,7 +97969,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Library for generating interface documentation from types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "general-games" = callPackage
@@ -97547,7 +97985,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit MonadRandom ];
        description = "Library supporting simulation of a number of games";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "general-prelude" = callPackage
@@ -97561,8 +97999,8 @@ self: {
          base lens pointless-fun strict system-filepath
        ];
        description = "Prelude replacement using generalized type classes where possible";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97574,8 +98012,8 @@ self: {
        sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd";
        libraryHaskellDepends = [ base List transformers ];
        description = "Python-generators notation for creation of monadic lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97587,8 +98025,8 @@ self: {
        sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q";
        libraryHaskellDepends = [ base mtl random ];
        description = "Actually useful monadic random value generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97608,8 +98046,8 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
        ];
        description = "stringly-named getters for generic data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97626,7 +98064,7 @@ self: {
          unordered-containers vector
        ];
        description = "Derivation of Aeson instances using GHC generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-arbitrary" = callPackage
@@ -97637,7 +98075,7 @@ self: {
        sha256 = "1imw36k5kxfl7ik0mzjxa8xzqg6hs3k253kpi19a9l53wxa0mwv9";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generic implementation for QuickCheck's Arbitrary";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-binary" = callPackage
@@ -97648,8 +98086,8 @@ self: {
        sha256 = "1h6xs56c351137mjc3hdba7yfcw8jy9dvzj0vdrgwm0dprn0xh29";
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        description = "Generic Data.Binary derivation using GHC generics.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97665,8 +98103,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Automatically convert Generic instances to and from church representations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97679,7 +98117,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-abstraction ];
        testHaskellDepends = [ base HUnit ];
        description = "Constraints via Generic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-data" = callPackage
@@ -97705,7 +98143,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Deriving instances with GHC.Generics and related utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-data-surgery" = callPackage
@@ -97721,7 +98159,7 @@ self: {
          base generic-data show-combinators tasty tasty-hunit
        ];
        description = "Surgery for generic data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -97734,7 +98172,7 @@ self: {
        editedCabalFile = "16x2sj8wq6wbda93910r8vyddi1j4yzzr0172bih0anc93mrmvaq";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic deep evaluation of data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-deriving" = callPackage
@@ -97753,7 +98191,7 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Generic programming library for generalised deriving";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-deriving_1_14" = callPackage
@@ -97770,8 +98208,8 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Generic programming library for generalised deriving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "generic-enum" = callPackage
@@ -97783,8 +98221,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ array base bytestring hspec ];
        description = "An Enum class that fixes some deficiences with Prelude's Enum";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97796,7 +98234,9 @@ self: {
        sha256 = "1wwhbn3hpanr5ya1dc8spaf1r38sc1hglpz3d6mqizlna0p9a68l";
        libraryHaskellDepends = [ base ];
        description = "Generically derived enumerations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-env" = callPackage
@@ -97807,7 +98247,7 @@ self: {
        sha256 = "084rfdmcw071dslnw86n2w58xiqhkaldf7qjcmlizykqc15si5xh";
        libraryHaskellDepends = [ base containers text ];
        description = "Generic Environment Generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-functor" = callPackage
@@ -97819,7 +98259,7 @@ self: {
        libraryHaskellDepends = [ ap-normalize base ];
        testHaskellDepends = [ base transformers ];
        description = "Deriving generalized functors with GHC.Generics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-lens" = callPackage
@@ -97837,7 +98277,7 @@ self: {
          base doctest HUnit inspection-testing lens profunctors
        ];
        description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-lens-core" = callPackage
@@ -97848,7 +98288,7 @@ self: {
        sha256 = "0h7fjh3zk8lkkmdj3w3wg72gbmnr8wz9wfm58ryvx0036l284qji";
        libraryHaskellDepends = [ base indexed-profunctors text ];
        description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-lens-labels" = callPackage
@@ -97859,8 +98299,8 @@ self: {
        sha256 = "0lhzxknz8117zc28d7l9wfvln5lp7alxfx8f6q4b986i93dzkl09";
        libraryHaskellDepends = [ base generic-lens ];
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97875,7 +98315,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Monomorphic field lens like with generic-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-lucid-scaffold" = callPackage
@@ -97886,8 +98326,8 @@ self: {
        sha256 = "13lry3hqqrqgk5z9dc6q6hr70iqky4ssra2l71y51gnrg1kprkrz";
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97899,7 +98339,7 @@ self: {
        sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv";
        libraryHaskellDepends = [ base generics-sop ];
        description = "First class pattern matching";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-maybe" = callPackage
@@ -97920,8 +98360,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A generic version of Data.Maybe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97933,7 +98373,7 @@ self: {
        sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g";
        libraryHaskellDepends = [ base ];
        description = "Derive monoid instances for product types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-optics" = callPackage
@@ -97951,7 +98391,7 @@ self: {
          base doctest HUnit inspection-testing optics-core
        ];
        description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-optics-lite" = callPackage
@@ -97965,7 +98405,7 @@ self: {
        libraryHaskellDepends = [ base generic-lens-lite optics-core ];
        testHaskellDepends = [ base optics-core ];
        description = "Monomorphic field opics like with generic-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-override" = callPackage
@@ -97976,7 +98416,7 @@ self: {
        sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5";
        libraryHaskellDepends = [ base ];
        description = "Provides functionality for overriding instances for generic derivation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-override-aeson" = callPackage
@@ -97988,8 +98428,8 @@ self: {
        libraryHaskellDepends = [ aeson base generic-override ];
        testHaskellDepends = [ aeson base generic-override hspec text ];
        description = "Provides orphan instances necessary for integrating generic-override and aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98008,8 +98448,8 @@ self: {
          base bytestring containers tasty tasty-hunit text vector
        ];
        description = "Pretty printing for Generic value";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98024,7 +98464,7 @@ self: {
          base deepseq inspection-testing QuickCheck
        ];
        description = "Generic random generators for QuickCheck";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-records" = callPackage
@@ -98035,7 +98475,7 @@ self: {
        sha256 = "0xga8vm89xjgzmnz5032kqyq1q8nhbf01n55xjgda4kfjzkx1yr0";
        libraryHaskellDepends = [ base ];
        description = "Magic record operations using generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-server" = callPackage
@@ -98046,8 +98486,8 @@ self: {
        sha256 = "0bl3gfqdw6sdwcailzkzmpz433cpxf6np9w9qnkwwa05xhcpd2k6";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98060,8 +98500,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        description = "Generic implementation of Storable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98074,7 +98514,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98088,8 +98528,8 @@ self: {
        editedCabalFile = "1dxf7c66vncw8zn0848g0bk2i2msbrb4njzvkzwvlaiphq0gqg10";
        libraryHaskellDepends = [ base containers transformers ];
        description = "A map, where the keys may be complex structured data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98104,8 +98544,8 @@ self: {
          base HaXml mtl syb-with-class template-haskell
        ];
        description = "Marshalling Haskell values to/from XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98120,8 +98560,8 @@ self: {
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [ base hxt tasty tasty-hunit tasty-th ];
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98140,7 +98580,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A library for generic programming that aims to be easy to understand";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generics-mrsop" = callPackage
@@ -98154,8 +98594,8 @@ self: {
          base containers mtl sop-core template-haskell
        ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98167,8 +98607,8 @@ self: {
        sha256 = "01fkfk18h8dpl6w3ipx85ay9qj8s56xl7022ids21a0slyc4ml4s";
        libraryHaskellDepends = [ base generics-mrsop ];
        description = "Reimplementation of the gdiff algorithm for generics-mrsop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98190,7 +98630,7 @@ self: {
          base criterion deepseq template-haskell
        ];
        description = "Generic Programming using True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generics-sop-lens" = callPackage
@@ -98201,7 +98641,7 @@ self: {
        sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks";
        libraryHaskellDepends = [ base generics-sop lens ];
        description = "Lenses for types in generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "genericserialize" = callPackage
@@ -98213,8 +98653,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98242,8 +98682,8 @@ self: {
          persistent-sqlite persistent-template text
        ];
        description = "Opinionated bootstrapping for Haskell web services";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98267,8 +98707,8 @@ self: {
          persistent-template text
        ];
        description = "Opinionated bootstrapping for Haskell web services";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98282,8 +98722,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98308,7 +98748,7 @@ self: {
        executableHaskellDepends = [ base GenI ];
        description = "GenI graphical user interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98332,8 +98772,8 @@ self: {
          base bytestring cmdargs directory filepath GenI json text
        ];
        description = "Companion tools for use with the GenI surface realiser";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98354,7 +98794,7 @@ self: {
        ];
        description = "Conversion utility for the GenI generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98367,7 +98807,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base containers mtl template-haskell ];
        description = "Generate generalized fmap, foldMap and traverse";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geniplate" = callPackage
@@ -98378,8 +98818,8 @@ self: {
        sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98391,7 +98831,7 @@ self: {
        sha256 = "08w4rslxzv6z85qzam1yazjb6vrzcr55vsjjyjgsi86pb1a8hr3b";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geniserver" = callPackage
@@ -98413,7 +98853,7 @@ self: {
        ];
        description = "Simple HTTP server for GenI results";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98425,8 +98865,8 @@ self: {
        sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr";
        libraryHaskellDepends = [ base MonadRandom syb syz ];
        description = "Genetic programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98439,8 +98879,8 @@ self: {
        libraryHaskellDepends = [ base parsec transformers ];
        testHaskellDepends = [ base HUnit parsec transformers ];
        description = "Gentle markup language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98455,7 +98895,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random validity ];
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-aeson" = callPackage
@@ -98477,7 +98917,7 @@ self: {
          aeson base genvalidity genvalidity-hspec hspec
        ];
        description = "GenValidity support for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-bytestring" = callPackage
@@ -98502,7 +98942,7 @@ self: {
          QuickCheck
        ];
        description = "GenValidity support for ByteString";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-containers" = callPackage
@@ -98526,7 +98966,7 @@ self: {
          QuickCheck
        ];
        description = "GenValidity support for containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-criterion" = callPackage
@@ -98543,7 +98983,7 @@ self: {
          base criterion genvalidity QuickCheck
        ];
        description = "Criterion benchmarks for generators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec" = callPackage
@@ -98562,7 +99002,7 @@ self: {
          base genvalidity hspec hspec-core QuickCheck
        ];
        description = "Standard spec's for GenValidity instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -98584,7 +99024,7 @@ self: {
          validity
        ];
        description = "Standard spec's for aeson-related instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-binary" = callPackage
@@ -98603,7 +99043,7 @@ self: {
          base binary genvalidity genvalidity-property hspec validity
        ];
        description = "Standard spec's for binary-related Instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-cereal" = callPackage
@@ -98623,7 +99063,7 @@ self: {
          validity
        ];
        description = "Standard spec's for cereal-related instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-hashable" = callPackage
@@ -98644,7 +99084,7 @@ self: {
          hspec hspec-core QuickCheck validity
        ];
        description = "Standard spec's for Hashable instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-optics" = callPackage
@@ -98663,7 +99103,7 @@ self: {
          microlens validity
        ];
        description = "Standard spec's for lens";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-persistent" = callPackage
@@ -98683,7 +99123,7 @@ self: {
          genvalidity-text hspec persistent QuickCheck text validity
        ];
        description = "Standard spec's for persistent-related instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-mergeful" = callPackage
@@ -98708,7 +99148,7 @@ self: {
        benchmarkHaskellDepends = [
          base criterion genvalidity-criterion mergeful
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-mergeless" = callPackage
@@ -98734,7 +99174,7 @@ self: {
        benchmarkHaskellDepends = [
          base criterion genvalidity-criterion mergeless
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-path" = callPackage
@@ -98754,7 +99194,7 @@ self: {
          base criterion genvalidity genvalidity-criterion path QuickCheck
        ];
        description = "GenValidity support for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-property" = callPackage
@@ -98770,7 +99210,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Standard properties for functions on `Validity` types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-scientific" = callPackage
@@ -98788,7 +99228,7 @@ self: {
          base genvalidity genvalidity-hspec hspec QuickCheck scientific
        ];
        description = "GenValidity support for Scientific";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-text" = callPackage
@@ -98811,7 +99251,7 @@ self: {
          base criterion genvalidity genvalidity-criterion QuickCheck text
        ];
        description = "GenValidity support for Text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-time" = callPackage
@@ -98831,7 +99271,7 @@ self: {
          base criterion genvalidity-criterion time
        ];
        description = "GenValidity support for time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-typed-uuid" = callPackage
@@ -98855,7 +99295,7 @@ self: {
          QuickCheck typed-uuid
        ];
        description = "Generators for Phantom-Typed version of UUID";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-unordered-containers" = callPackage
@@ -98876,7 +99316,7 @@ self: {
          validity
        ];
        description = "GenValidity support for unordered-containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-uuid" = callPackage
@@ -98898,7 +99338,7 @@ self: {
          base criterion genvalidity genvalidity-criterion QuickCheck uuid
        ];
        description = "GenValidity support for UUID";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-vector" = callPackage
@@ -98916,7 +99356,7 @@ self: {
          base genvalidity genvalidity-hspec hspec vector
        ];
        description = "GenValidity support for vector";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "geo-resolver" = callPackage
@@ -98938,8 +99378,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Performs geo location lookups and parses the results";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98956,7 +99396,7 @@ self: {
          array base binary bytestring bzlib template-haskell th-lift
        ];
        description = "High precision conversion between GPS and UK Grid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geocalc" = callPackage
@@ -98967,7 +99407,7 @@ self: {
        sha256 = "1bvbvrkxh8dvm796ilpp294qlacid6aap2ljdi9pmz1lkf20fxjg";
        libraryHaskellDepends = [ base ];
        description = "Libary for calculating distances between two coordinates in WSG84";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geocode-google" = callPackage
@@ -98982,7 +99422,7 @@ self: {
          base containers hjson HTTP network network-uri
        ];
        description = "Geocoding using the Google Web API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geodetic" = callPackage
@@ -98998,8 +99438,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Geodetic calculations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99011,8 +99451,8 @@ self: {
        sha256 = "1v7dl3nl9gp8pj469sk41k8nz34s1dngpinif06v8bbpms31i0bd";
        libraryHaskellDepends = [ base dimensional lens semigroups ];
        description = "Types for geodetic operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99032,7 +99472,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Terrestrial coordinate systems and geodetic calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geohash" = callPackage
@@ -99043,7 +99483,7 @@ self: {
        sha256 = "1pdx4pnq893kkjmgg0bgh9bfvfqdvzfq5fi02zfyhw3h8h4k05v4";
        libraryHaskellDepends = [ array base ];
        description = "Geohash latitudes and longitudes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geoip2" = callPackage
@@ -99059,7 +99499,7 @@ self: {
          reinterpret-cast text
        ];
        description = "Pure haskell interface to MaxMind GeoIP database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geojson" = callPackage
@@ -99080,7 +99520,7 @@ self: {
          tasty-quickcheck text validation
        ];
        description = "A thin GeoJSON Layer above the aeson library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geojson-types" = callPackage
@@ -99091,8 +99531,8 @@ self: {
        sha256 = "10kcrvimb7mdy59bk7x7nwkzhp85ws4511xakcl6bgiwhls39x4j";
        libraryHaskellDepends = [ aeson base bson bytestring lens text ];
        description = "GeoJSON data types including JSON/BSON conversion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99111,8 +99551,8 @@ self: {
          siphon test-framework test-framework-hunit text
        ];
        description = "Geolite CSV Parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99125,8 +99565,8 @@ self: {
        libraryHaskellDepends = [ base ieee754 linear QuickCheck ];
        testHaskellDepends = [ base ieee754 linear QuickCheck ];
        description = "package for geometry in euklidean 2d space";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99147,7 +99587,9 @@ self: {
        ];
        testSystemDepends = [ geos ];
        description = "Bindings for GEOS";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) geos;};
 
   "getemx" = callPackage
@@ -99165,8 +99607,8 @@ self: {
          time
        ];
        description = "Fetch from emusic using .emx files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99178,8 +99620,8 @@ self: {
        sha256 = "0jsr8cmbnllcswdvf1rp11sc6cpjhwr22x7kx9sk3dw8bv772jjc";
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99199,7 +99641,7 @@ self: {
          QuickCheck safe silently tagged
        ];
        description = "Create command line interfaces with ease";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "getopt-simple" = callPackage
@@ -99210,7 +99652,7 @@ self: {
        sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp";
        libraryHaskellDepends = [ base containers ];
        description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gf" = callPackage
@@ -99242,10 +99684,10 @@ self: {
          sed -i "s|\"-s\"|\"\"|" ./Setup.hs
          sed -i "s|numJobs (bf bi)++||" ./Setup.hs
        '';
-       preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';
+       preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH";
        description = "Grammatical Framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ggtsTC" = callPackage
@@ -99259,8 +99701,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers parsec ];
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99278,8 +99720,8 @@ self: {
          base directory github memory text vector
        ];
        description = "Github Standard Labeler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99299,7 +99741,7 @@ self: {
        executableHaskellDepends = [ aeson base bytestring ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Script helpers for interacting with GitHub";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc_8_10_2" = callPackage
@@ -99318,8 +99760,8 @@ self: {
          terminfo time transformers unix
        ];
        description = "The GHC API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-api-compat" = callPackage
@@ -99331,7 +99773,7 @@ self: {
        libraryHaskellDepends = [ ghc ];
        doHaddock = false;
        description = "GHC-API compatibility helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-boot_8_8_3" = callPackage
@@ -99348,8 +99790,8 @@ self: {
          base binary bytestring directory filepath ghc-boot-th
        ];
        description = "Shared functionality between GHC and its boot libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-boot-th_8_10_2" = callPackage
@@ -99360,8 +99802,8 @@ self: {
        sha256 = "1jic3l319b02f8b4r87c48645xhn5784vhgz2mp7d0zi2srrsfcz";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the `template-haskell` library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-byteorder" = callPackage
@@ -99374,7 +99816,7 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "\"GHC.ByteOrder\" API Compatibility Layer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-call-stack-extras" = callPackage
@@ -99385,7 +99827,7 @@ self: {
        sha256 = "01gvyl2r7jqxca33gdavv6l2a6yz4xh2ndmb4v0y2mdgc9sskymc";
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for HasCallStack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-check" = callPackage
@@ -99402,7 +99844,7 @@ self: {
          safe-exceptions template-haskell transformers
        ];
        description = "detect mismatches between compile-time and run-time versions of the ghc api";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-clippy-plugin" = callPackage
@@ -99419,8 +99861,8 @@ self: {
          base dhall ghc text text-icu text-regex-replace
        ];
        description = "Override GHC error messages to the user's liking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99434,8 +99876,8 @@ self: {
        editedCabalFile = "09l51r0nk7vj6a9crz7q5sv4962mnq18xb6zkxfl6cnm28v85nsk";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "In memory storage of deeply evaluated data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-core" = callPackage
@@ -99452,7 +99894,7 @@ self: {
          base colorize-haskell directory filepath pcre-light process
        ];
        description = "Display GHC's core and assembly output in a pager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-core-html" = callPackage
@@ -99470,7 +99912,7 @@ self: {
          base blaze-html bytestring containers mtl parsec process
        ];
        description = "Core to HTML display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-core-smallstep" = callPackage
@@ -99482,21 +99924,23 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "ghc-datasize" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-heap, ghc-prim }:
+    ({ mkDerivation, base, deepseq, ghc-lib-parser-ex, ghc-prim }:
      mkDerivation {
        pname = "ghc-datasize";
-       version = "0.2.2";
-       sha256 = "19iapv0m2g7d5i88pg9h19r89hafwj5f3h5682sp37irl4mzwkww";
-       libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
+       version = "0.2.3";
+       sha256 = "1sbzharb72ngbq10mqvia4yb71mkhk5s5n1xd8nm11xpvqy4q28k";
+       libraryHaskellDepends = [
+         base deepseq ghc-lib-parser-ex ghc-prim
+       ];
        description = "Determine the size of data structures in GHC's memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99512,8 +99956,8 @@ self: {
          base bytestring directory filepath ghc serialise text
        ];
        description = "An AST and compiler plugin for dumping GHC's Core representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99538,8 +99982,8 @@ self: {
          process unordered-containers vector
        ];
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99563,8 +100007,8 @@ self: {
          regex-tdfa-text
        ];
        description = "Handy tools for working with @ghc-dump@ dumps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99576,8 +100020,8 @@ self: {
        sha256 = "0aw4wnbzfw031xqmq0lpi4zz2md1f43nj921ni91mhdl5xgqcajm";
        libraryHaskellDepends = [ base ghc ];
        description = "Explicitly prevent sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99597,7 +100041,7 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Library and tool for parsing .eventlog files from GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-events-analyze" = callPackage
@@ -99620,8 +100064,8 @@ self: {
          th-lift th-lift-instances transformers unordered-containers
        ];
        description = "Analyze and visualize event logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99645,8 +100089,8 @@ self: {
          array base binary bytestring containers transformers
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99670,7 +100114,7 @@ self: {
          ghc-boot ghc-paths HUnit mtl silently syb
        ];
        description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -99683,7 +100127,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
        description = "Graph performance of Haskell programs with different GC flags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-generic-instances" = callPackage
@@ -99694,8 +100138,8 @@ self: {
        sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h";
        libraryHaskellDepends = [ base ghc ];
        description = "Derived instances of GHC.Generic of the GHC AST";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99715,7 +100159,7 @@ self: {
        ];
        testHaskellDepends = [ base deepseq ];
        description = "Extract the heap representation of Haskell values and thunks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-hotswap" = callPackage
@@ -99727,7 +100171,7 @@ self: {
        libraryHaskellDepends = [ base concurrent-extra deepseq ghci ];
        description = "Library for hot-swapping shared objects in GHC";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-imported-from" = callPackage
@@ -99763,8 +100207,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Find the Haddock documentation for a symbol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99786,8 +100230,8 @@ self: {
          process template-haskell time unix
        ];
        description = "Easily import all instances contained in GHC distributed libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99800,8 +100244,8 @@ self: {
        libraryHaskellDepends = [ base ghc hashable ];
        testHaskellDepends = [ base inspection-testing ];
        description = "A magic typeclass that just does it";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99821,7 +100265,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-lib-parser" = callPackage
@@ -99840,7 +100284,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-lib-parser-ex" = callPackage
@@ -99860,7 +100304,7 @@ self: {
          tasty-hunit uniplate
        ];
        description = "Algorithms on GHC parse trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-make" = callPackage
@@ -99875,7 +100319,7 @@ self: {
          base process shake unordered-containers
        ];
        description = "Accelerated version of ghc --make";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-man-completion" = callPackage
@@ -99888,8 +100332,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec process ];
        description = "Generate a bash completion from the GHC manpage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99936,8 +100380,8 @@ self: {
          base criterion directory filepath temporary
        ];
        description = "Happy Haskell Hacking";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99952,7 +100396,7 @@ self: {
          base exceptions extensible-exceptions ghc mtl
        ];
        description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-options" = callPackage
@@ -99974,8 +100418,8 @@ self: {
          transformers unix
        ];
        description = "Utilities for extracting GHC options needed to compile a given Haskell target";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bin-package-db = null;};
 
@@ -100001,8 +100445,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A parallel wrapper for 'ghc --make'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100015,7 +100459,7 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        description = "Haskell source parser from GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghc-paths" = callPackage
@@ -100029,7 +100473,7 @@ self: {
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-pkg-autofix" = callPackage
@@ -100046,8 +100490,8 @@ self: {
          base Cabal cmdargs filepath parsec process split
        ];
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100062,8 +100506,8 @@ self: {
          base Cabal directory filepath ghc ghc-paths
        ];
        description = "Provide library support for ghc-pkg information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100079,8 +100523,8 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Type checker plugins without the type checking";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100092,8 +100536,8 @@ self: {
        sha256 = "06nc87f4mcqcddllysb75qj942y5mmdwss7h9z3m0m93lbxxy6a2";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-prof" = callPackage
@@ -100114,7 +100558,7 @@ self: {
          tasty-hunit temporary text
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -100126,7 +100570,7 @@ self: {
        libraryHaskellDepends = [ aeson base text vector ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Parser for GHC's JSON profiling output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-prof-aeson-flamegraph" = callPackage
@@ -100144,7 +100588,7 @@ self: {
          optparse-applicative text vector
        ];
        description = "Turn GHC `-pj` profiling output into FlameGraph format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-prof-flamegraph" = callPackage
@@ -100160,7 +100604,7 @@ self: {
          base filepath optparse-applicative process
        ];
        description = "Generates flamegraphs from GHC .prof files.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghc-proofs" = callPackage
@@ -100172,8 +100616,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        testHaskellDepends = [ base transformers ];
        description = "GHC plugin to prove program equations by simplification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100185,7 +100629,7 @@ self: {
        sha256 = "1hg5iddlh87hir5vqjby2bihah4xcyarsfcgff3gd8l2h7mqi2dn";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-session" = callPackage
@@ -100204,8 +100648,8 @@ self: {
        ];
        executableHaskellDepends = [ base transformers ];
        description = "Simplified GHC API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100221,8 +100665,8 @@ self: {
          base binary bytestring directory filepath ghc ghc-paths
        ];
        description = "Simplified interface to the GHC API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100239,7 +100683,7 @@ self: {
          base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Constructs Haskell syntax trees for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-srcspan-plugin" = callPackage
@@ -100250,8 +100694,8 @@ self: {
        sha256 = "10zh7i4nx4ds3f1d7m2m1caqnxmi3dh6a900fl8mcp6a09isvglh";
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100263,8 +100707,8 @@ self: {
        sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0";
        libraryHaskellDepends = [ base ghc ];
        description = "Data and Typeable instances for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100276,8 +100720,8 @@ self: {
        sha256 = "0mfnlp0z64999cc3jgzi3x5s428gs5jsqmmbr2n5v7shh0csnff4";
        libraryHaskellDepends = [ base bytestring ghc syb ];
        description = "Scrap Your Boilerplate utilities for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100293,7 +100737,7 @@ self: {
        testHaskellDepends = [ base hspec text ];
        testToolDepends = [ hspec-discover ];
        description = "Syntax highlighter for Haskell using lexer of GHC itself";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-tags-core" = callPackage
@@ -100322,8 +100766,8 @@ self: {
          pipes-attoparsec pipes-bytestring text
        ];
        description = "a library to work with tags created from Haskell parsed tree";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100345,8 +100789,8 @@ self: {
          pipes-bytestring pipes-safe text
        ];
        description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100358,31 +100802,19 @@ self: {
        sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
-       version = "0.4";
-       sha256 = "0z85ma3r7k4g669br3sdsmnxnk8srh1xi0wggi1gzqrrwpylyv8w";
-       libraryHaskellDepends = [ base ghc ];
-       description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-tcplugins-extra_0_4_1" = callPackage
-    ({ mkDerivation, base, ghc }:
-     mkDerivation {
-       pname = "ghc-tcplugins-extra";
        version = "0.4.1";
        sha256 = "0v9y444gydfyk56y7adpabd633yv1d8jmddvgg272n8jpdpagw67";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-time-alloc-prof" = callPackage
@@ -100401,8 +100833,8 @@ self: {
          temporary text
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100414,7 +100846,7 @@ self: {
        sha256 = "074pvam1mb5sranh04i6xcs55vgk3h45vg0mdxnbxc3jmmv76lgi";
        libraryHaskellDepends = [ base ];
        description = "Provides bindings to functions starting and stopping the RTS timers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-trace-events" = callPackage
@@ -100426,7 +100858,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-typelits-extra" = callPackage
@@ -100437,29 +100869,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-extra";
-       version = "0.4.1";
-       sha256 = "0wfv0cympdrz999qml8j1cqrqppb22xm4gcn4k8i2hd31j748zb6";
-       libraryHaskellDepends = [
-         base containers ghc ghc-prim ghc-tcplugins-extra
-         ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
-         transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
-         tasty-hunit
-       ];
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_4_2" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-prim
-     , ghc-tcplugins-extra, ghc-typelits-knownnat
-     , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
-     , transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
        version = "0.4.2";
        sha256 = "0xpy52rib25iz5h89nqlj27isjk57pjbhlvlfam5q0g3x92572h4";
        libraryHaskellDepends = [
@@ -100472,8 +100881,7 @@ self: {
          tasty-hunit
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
@@ -100483,26 +100891,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.7.3";
-       sha256 = "1vz2qjgdv5hv7zrq0hm9f4ly0q3bl1cz2spcqrdpdzhivfff651g";
-       libraryHaskellDepends = [
-         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_7_4" = callPackage
-    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
        version = "0.7.4";
        sha256 = "1i3kwq8i3p4i2jmmq8irycs0z3g69qy4i5smh14kbcz3pl35x71l";
        libraryHaskellDepends = [
@@ -100513,30 +100901,11 @@ self: {
          base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
        ];
        description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
-     , integer-gmp, syb, tasty, tasty-hunit, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
-       version = "0.7.2";
-       sha256 = "1hk2f2vqkpia7kv7pqwf942y1w9m7mvmikzabkrjp8f8gijcsk52";
-       libraryHaskellDepends = [
-         base containers ghc ghc-tcplugins-extra integer-gmp syb
-         transformers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_7_3" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
      , integer-gmp, tasty, tasty-hunit, template-haskell, transformers
      }:
      mkDerivation {
@@ -100548,26 +100917,32 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl
-     , pretty, reflection, syb, transformers
+    ({ mkDerivation, base, containers, equational-reasoning, ghc
+     , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
+     , tasty-discover, tasty-expected-failure, tasty-hunit, text
+     , transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-presburger";
-       version = "0.3.0.1";
-       sha256 = "0h403zi5lqbpygpqw5469fafz1cgh5mcx96sp0iw4scnmh7z3cj9";
+       version = "0.5.0.0";
+       sha256 = "12v42xav9mvhkkzbfbrjcm2b3hk6vr3j6ra8qn9ji1jfzvin88wl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
          transformers
        ];
+       testHaskellDepends = [
+         base equational-reasoning tasty tasty-discover
+         tasty-expected-failure tasty-hunit text
+       ];
+       testToolDepends = [ tasty-discover ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-usage" = callPackage
@@ -100581,8 +100956,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc ];
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100601,8 +100976,8 @@ self: {
          svgcairo text transformers xdot
        ];
        description = "Live visualization of data structures in GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100614,7 +100989,7 @@ self: {
        sha256 = "1xsfznfypgmv67qdxm8zvl8n84hj47akjn9fsdi66b8flbx8c0gm";
        libraryHaskellDepends = [ base directory ghc time ];
        description = "Dump the ghc flags during compilation";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghci_8_10_2" = callPackage
@@ -100631,8 +101006,8 @@ self: {
          ghc-boot-th ghc-heap template-haskell transformers unix
        ];
        description = "The library supporting GHC's interactive interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghci-dap" = callPackage
@@ -100657,8 +101032,8 @@ self: {
          time transformers unix
        ];
        description = "ghci-dap is a GHCi having DAP interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100670,8 +101045,8 @@ self: {
        sha256 = "1jlym5k2d43avkgw7ff3pdaad5j2q5yq803cy74bgy0z69x77v1w";
        libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        description = "Display simple diagrams from ghci";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100690,8 +101065,8 @@ self: {
          mtl process unix
        ];
        description = "An implementation of ghci using the Haskeline line-input library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100704,7 +101079,7 @@ self: {
        libraryHaskellDepends = [ base binary ];
        testHaskellDepends = [ base binary doctest QuickCheck ];
        description = "GHCi as a Hex Calculator interactive";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghci-history-parser" = callPackage
@@ -100716,8 +101091,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base doctest hspec parsec ];
        description = "parse output of ghci \":history\" command";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100729,8 +101104,8 @@ self: {
        sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z";
        libraryHaskellDepends = [ base ghc MissingH ];
        description = "A library for interactively evaluating Haskell code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100752,8 +101127,8 @@ self: {
          haskeline process syb time transformers unix
        ];
        description = "Next generation GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100765,8 +101140,8 @@ self: {
        sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5";
        libraryHaskellDepends = [ base hscolour ipprint ];
        description = "colored pretty-printing within ghci";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100783,7 +101158,7 @@ self: {
          wai-app-static warp websockets
        ];
        description = "A websocket server that survives GHCi reloads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghcid" = callPackage
@@ -100809,19 +101184,19 @@ self: {
          fsnotify process tasty tasty-hunit terminal-size time unix
        ];
        description = "GHCi based bare bones IDE";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
-  "ghcide" = callPackage
+  "ghcide_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, array, async, base, base16-bytestring
      , binary, bytestring, case-insensitive, containers, cryptohash-sha1
      , data-default, deepseq, directory, extra, filepath, fingertree
      , fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths
      , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable
      , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat
-     , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
-     , opentelemetry, optparse-applicative, parallel, prettyprinter
-     , prettyprinter-ansi-terminal, process, QuickCheck
+     , hls-plugin-api, hslogger, implicit-hie-cradle, lens, lsp-test
+     , mtl, network-uri, opentelemetry, optparse-applicative, parallel
+     , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck
      , quickcheck-instances, record-dot-preprocessor, record-hasfield
      , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake
      , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure
@@ -100830,8 +101205,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcide";
-       version = "0.6.0.2";
-       sha256 = "0dd1vzz9vlvg790nkmgm5zbn0sc7msgmvfma7zkarf4zgqx1hmlg";
+       version = "0.7.0.0";
+       sha256 = "165dbwbcpl2r7jqsjk859c42yas8h877mx37d0jnx8vm47fdy484";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100839,24 +101214,25 @@ self: {
          case-insensitive containers cryptohash-sha1 data-default deepseq
          directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th
          ghc-check ghc-paths Glob haddock-library hashable haskell-lsp
-         haskell-lsp-types heapsize hie-bios hie-compat hslogger
-         implicit-hie-cradle mtl network-uri opentelemetry parallel
-         prettyprinter prettyprinter-ansi-terminal regex-tdfa
+         haskell-lsp-types heapsize hie-bios hie-compat hls-plugin-api
+         hslogger implicit-hie-cradle lens mtl network-uri opentelemetry
+         parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa
          rope-utf16-splay safe safe-exceptions shake sorted-list stm syb
          text time transformers unix unordered-containers utf8-string
        ];
        executableHaskellDepends = [
          aeson base bytestring containers data-default directory extra
          filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize
-         hie-bios lens lsp-test optparse-applicative process safe-exceptions
-         shake text unordered-containers
+         hie-bios hls-plugin-api lens lsp-test optparse-applicative process
+         safe-exceptions shake text unordered-containers
        ];
        testHaskellDepends = [
-         aeson base binary bytestring containers directory extra filepath
-         ghc ghc-typelits-knownnat haddock-library haskell-lsp
-         haskell-lsp-types lens lsp-test network-uri optparse-applicative
-         process QuickCheck quickcheck-instances record-dot-preprocessor
-         record-hasfield rope-utf16-splay safe safe-exceptions shake tasty
+         aeson base binary bytestring containers data-default directory
+         extra filepath ghc ghc-typelits-knownnat haddock-library
+         haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test
+         network-uri optparse-applicative process QuickCheck
+         quickcheck-instances record-dot-preprocessor record-hasfield
+         rope-utf16-splay safe safe-exceptions shake tasty
          tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
          text
        ];
@@ -100864,9 +101240,71 @@ self: {
          aeson base directory filepath shake shake-bench text yaml
        ];
        description = "The core of an IDE";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ maralorn ];
+       broken = true;
+     }) {shake-bench = null;};
+
+  "ghcide" = callPackage
+    ({ mkDerivation, aeson, array, async, base, base16-bytestring
+     , binary, bytestring, case-insensitive, containers, cryptohash-sha1
+     , data-default, deepseq, directory, dlist, extra, filepath
+     , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check
+     , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob
+     , haddock-library, hashable, haskell-lsp, haskell-lsp-types
+     , heapsize, hie-bios, hie-compat, hls-plugin-api, hslogger
+     , implicit-hie-cradle, lens, lsp-test, mtl, network-uri
+     , opentelemetry, optparse-applicative, parallel, prettyprinter
+     , prettyprinter-ansi-terminal, process, QuickCheck
+     , quickcheck-instances, record-dot-preprocessor, record-hasfield
+     , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions
+     , shake, shake-bench, sorted-list, stm, syb, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
+     , tasty-rerun, text, time, transformers, unix, unordered-containers
+     , utf8-string, vector, yaml
+     }:
+     mkDerivation {
+       pname = "ghcide";
+       version = "0.7.2.0";
+       sha256 = "1d35vfwg906djfr2klrql7crgcyabfad12akalx25jc6c7pacv1d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array async base base16-bytestring binary bytestring
+         case-insensitive containers cryptohash-sha1 data-default deepseq
+         directory dlist extra filepath fingertree fuzzy ghc ghc-boot
+         ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library
+         hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat
+         hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri
+         opentelemetry parallel prettyprinter prettyprinter-ansi-terminal
+         regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake
+         sorted-list stm syb text time transformers unix
+         unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default directory extra
+         filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize
+         hie-bios hls-plugin-api lens lsp-test optparse-applicative process
+         safe-exceptions shake text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers data-default directory
+         extra filepath ghc ghc-typelits-knownnat haddock-library
+         haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test
+         network-uri optparse-applicative process QuickCheck
+         quickcheck-instances record-dot-preprocessor record-hasfield
+         rope-utf16-splay safe safe-exceptions shake tasty
+         tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
+         text
+       ];
+       benchmarkHaskellDepends = [
+         aeson base directory filepath shake shake-bench text yaml
+       ];
+       description = "The core of an IDE";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ maralorn ];
        broken = true;
      }) {shake-bench = null;};
 
@@ -100878,7 +101316,7 @@ self: {
        sha256 = "0yf2lpd7n891i61w1g0zbmi2zv93a2jzifxdsrqj39wxhl6afpc6";
        libraryHaskellDepends = [ aeson base http-types text ];
        description = "Crossbrowser AJAX Bindings for GHCJS";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-base_0_2_0_0" = callPackage
@@ -100904,8 +101342,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "base library for GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-prim = null;};
 
@@ -100923,7 +101361,7 @@ self: {
          scientific text transformers unordered-containers vector
        ];
        description = "Allow GHCJS projects to compile under GHC and develop using intero";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghcjs-codemirror" = callPackage
@@ -100935,7 +101373,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Installs CodeMirror JavaScript files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-dom" = callPackage
@@ -100950,7 +101388,7 @@ self: {
          base containers ghcjs-dom-jsaddle text transformers
        ];
        description = "DOM library that supports both GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-dom-hello" = callPackage
@@ -100971,8 +101409,8 @@ self: {
          base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl
        ];
        description = "GHCJS DOM Hello World, an example package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghcjs-dom-jsaddle" = callPackage
@@ -100984,7 +101422,7 @@ self: {
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-dom-jsffi" = callPackage
@@ -100994,8 +101432,8 @@ self: {
        version = "0.9.4.0";
        sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w";
        description = "DOM library using JSFFI and GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101010,8 +101448,8 @@ self: {
          base glib gtk3 text transformers webkitgtk3
        ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghcjs-fetch" = callPackage
@@ -101028,8 +101466,8 @@ self: {
          aeson base bytestring case-insensitive ghcjs-base-stub http-types
        ];
        description = "GHCJS bindings for the JavaScript Fetch API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101046,8 +101484,8 @@ self: {
          transient transient-universe
        ];
        description = "Client-side web EDSL for transient nodes running in the web browser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101059,7 +101497,7 @@ self: {
        sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn";
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-promise" = callPackage
@@ -101070,8 +101508,8 @@ self: {
        sha256 = "06zq3bqcrci7zgkgphkhv5awzw75ivg6hn9avx9c4yp2c1ra3593";
        libraryHaskellDepends = [ base ghcjs-base protolude ];
        description = "Bidirectional bidings to javascript's promise";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101090,8 +101528,8 @@ self: {
          template-haskell
        ];
        description = "Virtual-dom bindings for GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-ffiqq = null; ghcjs-prim = null;};
 
@@ -101109,7 +101547,7 @@ self: {
          base base64-bytestring binary bytestring ghcjs-base text
        ];
        description = "Deprecated: use ghcjs-base's native websockets";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-xhr" = callPackage
@@ -101120,8 +101558,8 @@ self: {
        sha256 = "07nra5d0hc70v23wqaivwj96lakiz34vv96m9khi5y9f5lsads0l";
        libraryHaskellDepends = [ base ghcjs-base text ];
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101148,8 +101586,8 @@ self: {
          wai-websockets warp websockets yesod yesod-static
        ];
        description = "Interactive Haskell interpreter in a browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101168,8 +101606,8 @@ self: {
          regex-tdfa-text scientific text
        ];
        description = "GHC .prof files viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101183,7 +101621,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base zenc ];
        description = "Decode Z-encoded strings from GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghost-buster" = callPackage
@@ -101195,7 +101633,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Existential type utilites";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ght" = callPackage
@@ -101219,7 +101657,7 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101239,7 +101677,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ atk ];
        description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
@@ -101262,7 +101700,7 @@ self: {
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
   "gi-cairo-again" = callPackage
@@ -101277,8 +101715,8 @@ self: {
          base cairo-core haskell-gi-base template-haskell
        ];
        description = "Bridge between packages gi-* and cairo-core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101294,7 +101732,7 @@ self: {
          base gi-cairo gi-cairo-render haskell-gi-base mtl
        ];
        description = "GI friendly Binding to the Cairo library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "gi-cairo-render" = callPackage
@@ -101311,7 +101749,7 @@ self: {
        libraryPkgconfigDepends = [ cairo ];
        libraryToolDepends = [ c2hs ];
        description = "GI friendly Binding to the Cairo library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
@@ -101330,7 +101768,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libdbusmenu ];
        description = "Dbusmenu bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
@@ -101354,7 +101792,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        description = "DbusmenuGtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
@@ -101378,7 +101816,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdk_4_0_2" = callPackage
@@ -101402,8 +101840,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {gtk4 = null;};
 
   "gi-gdkpixbuf" = callPackage
@@ -101424,7 +101862,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gdk-pixbuf ];
        description = "GdkPixbuf bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkx11" = callPackage
@@ -101446,7 +101884,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "GdkX11 bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdkx11_4_0_2" = callPackage
@@ -101468,8 +101906,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4-x11 ];
        description = "GdkX11 bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {gtk4-x11 = null;};
 
   "gi-ggit" = callPackage
@@ -101490,7 +101928,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libgit2-glib ];
        description = "libgit2-glib bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
@@ -101509,7 +101947,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "Gio bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
@@ -101528,7 +101966,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gobject-introspection ];
        description = "GIRepository (gobject-introspection) bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
@@ -101547,7 +101985,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
@@ -101566,7 +102004,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "gi-graphene" = callPackage
@@ -101585,8 +102023,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ graphene-gobject ];
        description = "Graphene bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {graphene-gobject = null;};
 
@@ -101611,8 +102049,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gsk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtk4 = null;};
 
@@ -101632,7 +102070,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer ];
        description = "GStreamer bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -101653,8 +102091,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerAudio bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
@@ -101676,7 +102114,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerBase bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstpbutils" = callPackage
@@ -101700,8 +102138,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        description = "GStreamer Plugins Base Utils bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gstreamer-pbutils = null;};
 
@@ -101723,8 +102161,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer-tag ];
        description = "GStreamer Tag bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gstreamer-tag = null;};
 
@@ -101746,7 +102184,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerVideo bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
@@ -101770,7 +102208,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gtk_4_0_3" = callPackage
@@ -101794,8 +102232,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {gtk4 = null;};
 
   "gi-gtk-declarative" = callPackage
@@ -101819,8 +102257,8 @@ self: {
          unordered-containers vector
        ];
        description = "Declarative GTK+ programming in Haskell";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101839,8 +102277,8 @@ self: {
          pipes-concurrency text
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101858,7 +102296,7 @@ self: {
          gi-gtk haskell-gi-base mtl text transformers
        ];
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -101879,8 +102317,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "GtkosxApplication bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
@@ -101905,8 +102343,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtksheet ];
        description = "GtkSheet bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtksheet = null;};
 
@@ -101931,7 +102369,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtksourceview3 ];
        description = "GtkSource bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtksourceview3;};
 
   "gi-handy" = callPackage
@@ -101955,8 +102393,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libhandy;};
 
@@ -101976,7 +102414,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ];
        description = "HarfBuzz bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;};
 
   "gi-ibus" = callPackage
@@ -101997,7 +102435,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ ibus ];
        description = "IBus bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) ibus;};
 
   "gi-javascriptcore" = callPackage
@@ -102016,8 +102454,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
   "gi-notify" = callPackage
@@ -102038,7 +102476,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libnotify ];
        description = "Libnotify bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libnotify;};
 
   "gi-ostree" = callPackage
@@ -102059,8 +102497,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ ostree ];
        description = "OSTree bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.lgpl21;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -102085,7 +102523,7 @@ self: {
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        description = "Pango bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-pangocairo" = callPackage
@@ -102111,7 +102549,7 @@ self: {
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        description = "PangoCairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-poppler" = callPackage
@@ -102132,8 +102570,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ poppler_gi ];
        description = "Poppler bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) poppler_gi;};
 
@@ -102155,7 +102593,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libsecret ];
        description = "Libsecret bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
@@ -102176,7 +102614,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libsoup ];
        description = "Libsoup bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libsoup;};
 
   "gi-vte" = callPackage
@@ -102200,7 +102638,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ vte_291 ];
        description = "Vte bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {vte_291 = pkgs.vte;};
 
   "gi-webkit" = callPackage
@@ -102222,8 +102660,8 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
        description = "WebKit bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "gi-webkit2" = callPackage
@@ -102247,8 +102685,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "WebKit2 bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
   "gi-webkit2webextension" = callPackage
@@ -102272,8 +102710,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "WebKit2-WebExtension bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
   "gi-wnck" = callPackage
@@ -102296,8 +102734,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ libwnck ];
        description = "Wnck bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libwnck;};
 
@@ -102317,7 +102755,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "xlib bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "giak" = callPackage
@@ -102336,8 +102774,8 @@ self: {
          filepath mtl process semigroups stm stm-chans text unix wybor
        ];
        description = "Fuzzy finder for cabal executables";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102349,7 +102787,7 @@ self: {
        sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l";
        libraryHaskellDepends = [ base split ];
        description = "Haskell parser for GIML";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ginger" = callPackage
@@ -102381,7 +102819,7 @@ self: {
          utf8-string
        ];
        description = "An implementation of the Jinja2 template language in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gingersnap" = callPackage
@@ -102402,7 +102840,7 @@ self: {
          transformers
        ];
        description = "Consistent and safe JSON APIs with snap-core and (by default) postgresql-simple";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ginsu" = callPackage
@@ -102425,8 +102863,8 @@ self: {
        ];
        executableSystemDepends = [ openssl ];
        description = "Ginsu Gale Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -102445,7 +102883,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ system-glib ];
        description = "Binding to GIO";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {system-glib = pkgs.glib;};
 
   "gipeda" = callPackage
@@ -102467,8 +102905,8 @@ self: {
          unordered-containers vector yaml
        ];
        description = "Git Performance Dashboard";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102494,8 +102932,8 @@ self: {
          network-uri text
        ];
        description = "Giphy HTTP API wrapper and CLI search tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102513,8 +102951,8 @@ self: {
          aeson base bytestring conduit http-conduit text
        ];
        description = "A reliable command-line client for gist.github.com";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102539,8 +102977,8 @@ self: {
        ];
        doCheck = false;
        description = "Git operations in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102559,8 +102997,8 @@ self: {
          system-filepath text transformers unix
        ];
        description = "Determine which Git repositories need actions to be taken";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102632,8 +103070,8 @@ self: {
        checkPhase = ''PATH+=":$PWD" git-annex test'';
        enableSharedExecutables = false;
        description = "manage files with git, without checking their contents into git";
-       license = stdenv.lib.licenses.agpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.agpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -102656,7 +103094,7 @@ self: {
          base brick hspec microlens optparse-applicative process vector vty
        ];
        description = "git checkout command-line tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "git-checklist" = callPackage
@@ -102675,7 +103113,7 @@ self: {
        ];
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102697,8 +103135,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A simple parser for Git configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102718,8 +103156,8 @@ self: {
        ];
        executableHaskellDepends = [ base relude ];
        description = "Haskell Git Helper Tool";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102740,8 +103178,8 @@ self: {
          test-framework-quickcheck2 time utf8-string
        ];
        description = "Bindings to the date parsing from Git";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102757,7 +103195,7 @@ self: {
          base directory filepath process template-haskell
        ];
        description = "Use TH to embed Git repo information";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "git-fmt" = callPackage
@@ -102779,8 +103217,8 @@ self: {
          pipes-concurrency process temporary text time
        ];
        description = "Custom git command for formatting code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102803,7 +103241,7 @@ self: {
          process text
        ];
        description = "A Git subcommand to show total addition, deletion per file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "git-gpush" = callPackage
@@ -102823,8 +103261,8 @@ self: {
          transformers
        ];
        description = "More intelligent push-to-GitHub utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102838,8 +103276,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base base-compat process ];
        description = "Move a git branch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102856,7 +103294,7 @@ self: {
          http-types network-uri text
        ];
        description = "git-lfs protocol";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "git-mediate" = callPackage
@@ -102874,7 +103312,7 @@ self: {
          optparse-applicative process unix-compat
        ];
        description = "Tool to help resolving git conflicts";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "git-monitor" = callPackage
@@ -102897,8 +103335,8 @@ self: {
          template-haskell text time transformers unix unordered-containers
        ];
        description = "Passively snapshots working tree changes efficiently";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102915,8 +103353,8 @@ self: {
          enumerator filepath zlib-enum
        ];
        description = "Git object and its parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102948,8 +103386,8 @@ self: {
          optparse-applicative text
        ];
        description = "Git remote helper to store git objects on IPFS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102962,13 +103400,13 @@ self: {
      }:
      mkDerivation {
        pname = "git-repair";
-       version = "1.20200504";
-       sha256 = "1k5sildrc46mhwxzwxfjxv267322gavcvvs3gc56mz1vfs8ip4b8";
+       version = "1.20210111";
+       sha256 = "08kdip1pg300yr50xwyklf9xpmcq8pgkym60yz97qj83yhlcszb7";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
-         base bytestring Cabal data-default directory exceptions filepath
-         filepath-bytestring hslogger IfElse mtl process split unix
+         async base bytestring Cabal data-default directory exceptions
+         filepath filepath-bytestring hslogger IfElse mtl process split unix
          unix-compat
        ];
        executableHaskellDepends = [
@@ -102978,8 +103416,8 @@ self: {
          split text time transformers unix unix-compat utf8-string
        ];
        description = "repairs a damaged git repository";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102999,8 +103437,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal ];
        description = "A sanity checker for your git history";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103030,8 +103468,8 @@ self: {
        ];
        testToolDepends = [ git ];
        description = "A framework for pre-commit checks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103051,7 +103489,7 @@ self: {
          base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "More efficient replacement to the great git-radar";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitcache" = callPackage
@@ -103068,7 +103506,7 @@ self: {
          base cryptonite directory filepath process utf8-string
        ];
        description = "Simple git utility to use and manage clone cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitdo" = callPackage
@@ -103087,8 +103525,8 @@ self: {
          optparse-applicative sqlite-simple system-filepath text turtle wreq
        ];
        description = "Create Github issues out of TODO comments in code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103108,7 +103546,7 @@ self: {
          temporary unliftio
        ];
        description = "Compile git revision info into Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github" = callPackage
@@ -103138,7 +103576,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Access to the GitHub API, v3";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github-backup" = callPackage
@@ -103165,8 +103603,8 @@ self: {
        ];
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) git;};
 
@@ -103192,8 +103630,8 @@ self: {
          vector vector-instances
        ];
        description = "Access to the GitHub API, v3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103210,7 +103648,7 @@ self: {
          wai-logger warp
        ];
        description = "GitHub webhooks library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github-release" = callPackage
@@ -103230,7 +103668,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "github-rest" = callPackage
@@ -103253,7 +103691,7 @@ self: {
          tasty-quickcheck text time transformers unliftio unliftio-core
        ];
        description = "Query the GitHub REST API programmatically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github-tools" = callPackage
@@ -103272,8 +103710,8 @@ self: {
          http-client-tls monad-parallel tabular tagsoup text time vector
        ];
        description = "Various Github helper utilities";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103293,7 +103731,7 @@ self: {
        ];
        description = "Type definitions for objects used by the GitHub v3 API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "github-utils" = callPackage
@@ -103304,8 +103742,8 @@ self: {
        sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5";
        libraryHaskellDepends = [ base basic-prelude github text ];
        description = "Useful functions that use the GitHub API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103324,8 +103762,8 @@ self: {
          uuid vector
        ];
        description = "GitHub WebHook Handler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103344,8 +103782,8 @@ self: {
          github-webhook-handler snap-core uuid
        ];
        description = "GitHub WebHook Handler implementation for Snap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103364,7 +103802,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
        description = "Aeson instances for GitHub Webhook payloads";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "githud" = callPackage
@@ -103389,8 +103827,8 @@ self: {
          tasty-smallcheck
        ];
        description = "Heads up, and you see your GIT context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103409,8 +103847,8 @@ self: {
          text
        ];
        description = "Apply GitHub .gitignore templates to already existing repositories.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103463,8 +103901,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec rio ];
        description = "Gitlab Web API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103475,8 +103913,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlab-haskell";
-       version = "0.2.4";
-       sha256 = "1p2sgxnr5xgh0wz3q5vf6xqy827nrplfbcpfwa6kgqxiqgsfsdv2";
+       version = "0.2.5";
+       sha256 = "13dlbl2hlvmplxjypg14llpbxf0a9x2f4lk0kkn46f63mn0fy83x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring connection http-conduit http-types temporary
@@ -103484,7 +103922,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "A Haskell library for the GitLab web API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitlib" = callPackage
@@ -103506,8 +103944,8 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "API library for working with Git repositories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103535,8 +103973,8 @@ self: {
          tagged text transformers
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103554,8 +103992,8 @@ self: {
          hspec-expectations HUnit
        ];
        description = "Run tests between repositories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103582,8 +104020,8 @@ self: {
          transformers
        ];
        description = "Libgit2 backend for gitlib";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103613,8 +104051,8 @@ self: {
          monad-logger resourcet temporary text transformers
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103628,8 +104066,8 @@ self: {
          base exceptions gitlib mtl transformers
        ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103648,8 +104086,8 @@ self: {
          unliftio-core
        ];
        description = "Test library for confirming gitlib backend compliance";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103668,8 +104106,8 @@ self: {
          unordered-containers
        ];
        description = "Generic utility functions for working with Git repositories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103685,7 +104123,7 @@ self: {
          base base-compat directory filepath process template-haskell
        ];
        description = "Compile git revision info into Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitson" = callPackage
@@ -103710,8 +104148,8 @@ self: {
          aeson base criterion directory random transformers
        ];
        description = "A document store library for Git + JSON";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103727,8 +104165,8 @@ self: {
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
        description = "Gitter.im API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103756,8 +104194,8 @@ self: {
          text
        ];
        description = "CLI Giphy search tool with previews in iTerm 2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103770,7 +104208,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gjk2d" = callPackage
@@ -103781,7 +104219,7 @@ self: {
        sha256 = "1wpaiaki61a7wl56qv6ycz9hgc9f8wvqdcqxpxaqvndxmri4njsv";
        libraryHaskellDepends = [ base linear ];
        testHaskellDepends = [ base linear ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gl" = callPackage
@@ -103798,7 +104236,7 @@ self: {
        ];
        librarySystemDepends = [ libGL ];
        description = "Complete OpenGL raw bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
   "gl-capture" = callPackage
@@ -103809,7 +104247,7 @@ self: {
        sha256 = "0pcan0fpb1mfwda69f8z8pdrdav79rdm31yvmrk98dca7al7k583";
        libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glabrous" = callPackage
@@ -103829,7 +104267,7 @@ self: {
          base directory either hspec text unordered-containers
        ];
        description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glade" = callPackage
@@ -103845,8 +104283,8 @@ self: {
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ libglade ];
        description = "Binding to the glade library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.gnome2) libglade;};
 
@@ -103858,8 +104296,8 @@ self: {
        sha256 = "06kzakvssmldjgx0s8qm0a3cd9glmwrdnh690sv708jcvg8x45y3";
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103884,7 +104322,7 @@ self: {
          transformers
        ];
        description = "A simply typed lambda calculus interpreter, written with GADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glapp" = callPackage
@@ -103900,8 +104338,8 @@ self: {
          base containers GLFW-b lens mtl OpenGL
        ];
        description = "An OpenGL micro framework";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103915,7 +104353,7 @@ self: {
        editedCabalFile = "15zppqxc064yqc0wrmlnhaji2lg95fg598ikz03c3j4w1g5v1wdb";
        libraryHaskellDepends = [ base vector ];
        description = "Graphical Lasso algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glaze" = callPackage
@@ -103926,7 +104364,7 @@ self: {
        sha256 = "18925rqf3ah1k7xcb15zk0gcbc4slvvhr5lsz32fh96gid089cdv";
        libraryHaskellDepends = [ base lens ];
        description = "Framework for rendering things with metadata/headers and values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glazier" = callPackage
@@ -103947,8 +104385,8 @@ self: {
          tagged transformers unliftio unliftio-core
        ];
        description = "Extensible effects using ContT, State and variants";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103964,8 +104402,8 @@ self: {
          base glazier mmorph pipes stm stm-extras transformers
        ];
        description = "A threaded rendering framework using glaizer and pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103985,8 +104423,8 @@ self: {
          newtype-generics stm tagged transformers unliftio unliftio-core
        ];
        description = "ReactJS binding using Glazier.Command.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104011,8 +104449,8 @@ self: {
          unordered-containers
        ];
        description = "Examples of using glazier-react";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104032,8 +104470,8 @@ self: {
          lens-misc monadlist mtl tagged transformers
        ];
        description = "Generic widget library using glazier-react";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104058,8 +104496,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Tiny cli to fetch PR info from gitlab";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104077,25 +104515,23 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "Binding to the GLIB library for Gtk2Hs";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "glicko" = callPackage
     ({ mkDerivation, base, containers, data-default, deepseq, hspec
-     , lens, parallel, QuickCheck, statistics
+     , parallel, statistics
      }:
      mkDerivation {
        pname = "glicko";
-       version = "0.1.1.1";
-       sha256 = "1hsa50qanq44kxnayd4g5winbqk4lqccsd05hksnxqi2ql9aj3pi";
+       version = "0.3.0.2";
+       sha256 = "1vx9sk2w1914c7y7cr89yvps44xpd4n2pwnk3v337d8bqhanl1jp";
        libraryHaskellDepends = [
-         base containers data-default deepseq lens parallel statistics
+         base containers data-default deepseq parallel statistics
        ];
-       testHaskellDepends = [ base data-default hspec lens QuickCheck ];
+       testHaskellDepends = [ base data-default hspec ];
        description = "Glicko-2 implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.gpl3;
      }) {};
 
   "glider-nlp" = callPackage
@@ -104107,8 +104543,8 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base Cabal containers hspec text ];
        description = "Natural Language Processing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104123,7 +104559,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ppm split ];
        description = "A simple ray tracer in an early stage of development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glirc" = callPackage
@@ -104153,8 +104589,8 @@ self: {
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "gll" = callPackage
@@ -104170,7 +104606,7 @@ self: {
          TypeCompose
        ];
        description = "GLL parser with simple combinator interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glob-posix" = callPackage
@@ -104188,8 +104624,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        description = "Haskell bindings for POSIX glob library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104207,8 +104643,8 @@ self: {
          syntax-trees-fork-bairyn tagged template-haskell
        ];
        description = "Library enabling unique top-level declarations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104229,8 +104665,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "Global mutable configuration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104242,7 +104678,7 @@ self: {
        sha256 = "0b2sz9ag6wcr0amgrx08l7924brfansnh9rv64wg9s3nk4ni2sxp";
        libraryHaskellDepends = [ base ];
        description = "A global lock implemented without unsafePerformIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "global-variables" = callPackage
@@ -104253,8 +104689,8 @@ self: {
        sha256 = "0fvhh6q6z114qyi5rhwzxhrlqfhx6af97187b49lyvx2k9zkzvzp";
        libraryHaskellDepends = [ base containers stm ];
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104279,7 +104715,7 @@ self: {
        doHaddock = false;
        description = "ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104295,7 +104731,7 @@ self: {
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
        description = "Painless 2D vector graphics, animations and simulations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -104310,7 +104746,7 @@ self: {
          accelerate base gloss gloss-rendering linear-accelerate
        ];
        description = "Extras to interface Gloss and Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -104321,7 +104757,7 @@ self: {
        sha256 = "0wx546hm1afgq0al5bk1g2qfgg9r520whm6igz18lkc9fsksjfgd";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-banana" = callPackage
@@ -104334,8 +104770,8 @@ self: {
        editedCabalFile = "0nia67zywmxyvcnlk0a906dijh9h7m6w48330n9gs2mjkhkyqb13";
        libraryHaskellDepends = [ base gloss reactive-banana ];
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104347,8 +104783,8 @@ self: {
        sha256 = "17gwy13z4lymm9dpj26q4ihcl198gqn9kpcjdw8lcgfcg4gxszsm";
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104368,8 +104804,8 @@ self: {
          gloss-raster random repa repa-algorithms repa-io vector
        ];
        description = "Examples using the gloss library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104389,8 +104825,8 @@ self: {
        executableHaskellDepends = [ base gloss ];
        testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
        description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104402,8 +104838,8 @@ self: {
        sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980";
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104425,7 +104861,7 @@ self: {
          base bmp bytestring gloss JuicyPixels vector
        ];
        description = "Load any image supported by Juicy.Pixels in your gloss application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gloss-raster" = callPackage
@@ -104440,7 +104876,7 @@ self: {
          base containers ghc-prim gloss gloss-rendering repa
        ];
        description = "Parallel rendering of raster images";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -104455,8 +104891,8 @@ self: {
          accelerate base colour-accelerate gloss gloss-accelerate
        ];
        description = "Parallel rendering of raster images using Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gloss-rendering" = callPackage
@@ -104471,7 +104907,7 @@ self: {
          base bmp bytestring containers GLUT OpenGL
        ];
        description = "Gloss picture data types and rendering functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-sodium" = callPackage
@@ -104482,8 +104918,8 @@ self: {
        sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za";
        libraryHaskellDepends = [ base gloss sodium ];
        description = "A Sodium interface to the Gloss drawing package";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104502,8 +104938,8 @@ self: {
        testSystemDepends = [ glpk ];
        testToolDepends = [ tasty-discover ];
        description = "Low-level Haskell bindings to GLPK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -104522,8 +104958,8 @@ self: {
          array base containers deepseq gasp mtl
        ];
        description = "Comprehensive GLPK linear programming bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -104542,8 +104978,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring directory filepath shower ];
        description = "glTF scene loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104573,8 +105009,8 @@ self: {
          transformers-base unordered-containers
        ];
        description = "Make better services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104599,7 +105035,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glue-core" = callPackage
@@ -104623,7 +105059,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glue-ekg" = callPackage
@@ -104647,7 +105083,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glue-example" = callPackage
@@ -104667,7 +105103,7 @@ self: {
          transformers-base unordered-containers
        ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gluturtle" = callPackage
@@ -104680,7 +105116,7 @@ self: {
          base convertible GLUT stm yjsvg yjtools
        ];
        description = "turtle like LOGO with glut";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gmap" = callPackage
@@ -104695,8 +105131,8 @@ self: {
          array AvlTree base COrdering QuickCheck random
        ];
        description = "Composable maps and generic tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104715,8 +105151,8 @@ self: {
          priority-queue qd reflection Vec
        ];
        description = "Mandelbrot Set explorer using GTK";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104729,7 +105165,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
   "gnome-desktop" = callPackage
@@ -104745,7 +105181,7 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104762,7 +105198,7 @@ self: {
        libraryPkgconfigDepends = [ libgnome-keyring ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libgnome-keyring";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs.gnome3) gnome-keyring; 
          inherit (pkgs) libgnome-keyring;};
 
@@ -104781,7 +105217,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gnome-vfs = null; gnome-vfs_module = null;};
 
@@ -104809,8 +105245,8 @@ self: {
          conduit conduit-extra lens sbp tasty tasty-golden tasty-hunit time
        ];
        description = "GNSS Converters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104833,8 +105269,8 @@ self: {
        testPkgconfigDepends = [ libidn ];
        testToolDepends = [ c2hs ];
        description = "Bindings for GNU IDN";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libidn;};
 
@@ -104856,7 +105292,7 @@ self: {
          utility-ht
        ];
        description = "2D and 3D plots using gnuplot";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gnutls" = callPackage
@@ -104870,7 +105306,7 @@ self: {
        librarySystemDepends = [ gnutls ];
        libraryPkgconfigDepends = [ gnutls ];
        description = "Bindings for GNU libgnutls";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) gnutls;};
 
   "goa" = callPackage
@@ -104884,8 +105320,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104905,8 +105341,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Core imports for Geometric Optimization Libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104921,8 +105357,8 @@ self: {
        libraryHaskellDepends = [ base goal-core hmatrix vector ];
        executableHaskellDepends = [ base goal-core ];
        description = "Scientific computing on geometric objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104942,8 +105378,8 @@ self: {
        ];
        executableHaskellDepends = [ base goal-core goal-geometry vector ];
        description = "Manifolds of probability distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104967,8 +105403,8 @@ self: {
          vector
        ];
        description = "Mealy based simulation tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104986,7 +105422,7 @@ self: {
        testHaskellDepends = [ base bytestring cereal QuickCheck safe ];
        description = "Time Series Compression";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "goatee" = callPackage
@@ -105003,8 +105439,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit mtl parsec ];
        description = "A monadic take on a 2,500-year-old board game - library";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105025,8 +105461,8 @@ self: {
        executableHaskellDepends = [ base gtk ];
        testHaskellDepends = [ base HUnit ];
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105048,8 +105484,8 @@ self: {
        executableHaskellDepends = [ base criterion random weigh ];
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Go-style channels";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105072,8 +105508,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        doHaddock = false;
        description = "Haskell bindings for the Godot game engine API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105085,8 +105521,8 @@ self: {
        sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "The Gofer 2.30 standard prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105109,7 +105545,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Extensible interface to Web APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "goggles-gcs" = callPackage
@@ -105125,7 +105561,7 @@ self: {
          text unix-time
        ];
        description = "`goggles` interface to Google Cloud Storage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gogol" = callPackage
@@ -105149,7 +105585,7 @@ self: {
        ];
        description = "Comprehensive Google Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-abusiveexperiencereport" = callPackage
@@ -105161,7 +105597,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Abusive Experience Report SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-acceleratedmobilepageurl" = callPackage
@@ -105173,7 +105609,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Accelerated Mobile Pages (AMP) URL SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-accessapproval" = callPackage
@@ -105185,7 +105621,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Access Approval SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-accesscontextmanager" = callPackage
@@ -105197,7 +105633,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Access Context Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexchange-buyer" = callPackage
@@ -105209,7 +105645,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Exchange Buyer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexchange-seller" = callPackage
@@ -105221,7 +105657,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Exchange Seller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexchangebuyer2" = callPackage
@@ -105233,7 +105669,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Exchange Buyer API II SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexperiencereport" = callPackage
@@ -105245,7 +105681,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Experience Report SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-datatransfer" = callPackage
@@ -105257,7 +105693,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Admin Data Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-directory" = callPackage
@@ -105269,7 +105705,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Admin Directory SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-emailmigration" = callPackage
@@ -105281,7 +105717,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Email Migration API v2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-reports" = callPackage
@@ -105293,7 +105729,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Admin Reports SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adsense" = callPackage
@@ -105305,7 +105741,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google AdSense Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adsense-host" = callPackage
@@ -105317,7 +105753,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google AdSense Host SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-affiliates" = callPackage
@@ -105329,7 +105765,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Affiliate Network SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-alertcenter" = callPackage
@@ -105341,7 +105777,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google G Suite Alert Center SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-analytics" = callPackage
@@ -105353,7 +105789,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-analyticsreporting" = callPackage
@@ -105365,7 +105801,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Analytics Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-android-enterprise" = callPackage
@@ -105377,7 +105813,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play EMM SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-android-publisher" = callPackage
@@ -105389,7 +105825,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-androiddeviceprovisioning" = callPackage
@@ -105401,7 +105837,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Android Device Provisioning Partner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-androidmanagement" = callPackage
@@ -105413,7 +105849,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Android Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-appengine" = callPackage
@@ -105425,7 +105861,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google App Engine Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-activity" = callPackage
@@ -105437,7 +105873,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Drive Activity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-calendar" = callPackage
@@ -105449,7 +105885,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Calendar SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-licensing" = callPackage
@@ -105461,7 +105897,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Enterprise License Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-reseller" = callPackage
@@ -105473,7 +105909,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Enterprise Apps Reseller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-tasks" = callPackage
@@ -105485,7 +105921,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Tasks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-appstate" = callPackage
@@ -105497,7 +105933,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google App State SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-autoscaler" = callPackage
@@ -105509,7 +105945,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine Autoscaler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-bigquery" = callPackage
@@ -105521,7 +105957,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google BigQuery SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-bigquerydatatransfer" = callPackage
@@ -105533,7 +105969,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google BigQuery Data Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-bigtableadmin" = callPackage
@@ -105545,7 +105981,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Bigtable Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-billing" = callPackage
@@ -105557,7 +105993,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Billing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-binaryauthorization" = callPackage
@@ -105569,7 +106005,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Binary Authorization SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-blogger" = callPackage
@@ -105581,7 +106017,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Blogger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-books" = callPackage
@@ -105593,7 +106029,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Books SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-chat" = callPackage
@@ -105605,7 +106041,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Hangouts Chat SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-civicinfo" = callPackage
@@ -105617,7 +106053,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Civic Information SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-classroom" = callPackage
@@ -105629,7 +106065,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Classroom SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudasset" = callPackage
@@ -105641,7 +106077,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Asset SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-clouderrorreporting" = callPackage
@@ -105653,7 +106089,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Error Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudfunctions" = callPackage
@@ -105665,7 +106101,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Functions SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudidentity" = callPackage
@@ -105677,7 +106113,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Identity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudiot" = callPackage
@@ -105689,7 +106125,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud IoT SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudkms" = callPackage
@@ -105701,7 +106137,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Key Management Service (KMS) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudmonitoring" = callPackage
@@ -105713,7 +106149,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudprivatecatalog" = callPackage
@@ -105725,7 +106161,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Private Catalog SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudprivatecatalogproducer" = callPackage
@@ -105737,7 +106173,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Private Catalog Producer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudprofiler" = callPackage
@@ -105749,7 +106185,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Profiler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudscheduler" = callPackage
@@ -105761,7 +106197,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Scheduler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudsearch" = callPackage
@@ -105773,7 +106209,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudshell" = callPackage
@@ -105785,7 +106221,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Shell SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudtasks" = callPackage
@@ -105797,7 +106233,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Tasks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudtrace" = callPackage
@@ -105809,7 +106245,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Trace SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-commentanalyzer" = callPackage
@@ -105821,7 +106257,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Perspective Comment Analyzer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-composer" = callPackage
@@ -105833,7 +106269,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Composer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-compute" = callPackage
@@ -105845,7 +106281,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-consumersurveys" = callPackage
@@ -105857,7 +106293,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Consumer Surveys SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-container" = callPackage
@@ -105869,7 +106305,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Kubernetes Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-containeranalysis" = callPackage
@@ -105881,7 +106317,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Container Analysis SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-containerbuilder" = callPackage
@@ -105893,7 +106329,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Build SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-core" = callPackage
@@ -105916,7 +106352,7 @@ self: {
        testHaskellDepends = [ base tasty ];
        description = "Core data types and functionality for Gogol libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-customsearch" = callPackage
@@ -105928,7 +106364,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google CustomSearch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dataflow" = callPackage
@@ -105940,7 +106376,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Dataflow SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-datafusion" = callPackage
@@ -105952,7 +106388,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Data Fusion SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dataproc" = callPackage
@@ -105964,7 +106400,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Dataproc SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-datastore" = callPackage
@@ -105976,7 +106412,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Datastore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-debugger" = callPackage
@@ -105988,7 +106424,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Debugger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-deploymentmanager" = callPackage
@@ -106000,7 +106436,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Deployment Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dfareporting" = callPackage
@@ -106012,7 +106448,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google DCM/DFA Reporting And Trafficking SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dialogflow" = callPackage
@@ -106024,7 +106460,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Dialogflow SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-digitalassetlinks" = callPackage
@@ -106036,7 +106472,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Digital Asset Links SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-discovery" = callPackage
@@ -106048,7 +106484,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google API Discovery Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dlp" = callPackage
@@ -106060,7 +106496,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Data Loss Prevention (DLP) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dns" = callPackage
@@ -106072,7 +106508,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud DNS SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-docs" = callPackage
@@ -106084,7 +106520,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Docs SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-bids" = callPackage
@@ -106096,7 +106532,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google DoubleClick Bid Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-search" = callPackage
@@ -106108,7 +106544,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google DoubleClick Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-drive" = callPackage
@@ -106120,7 +106556,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Drive SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-driveactivity" = callPackage
@@ -106132,7 +106568,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Drive Activity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-factchecktools" = callPackage
@@ -106144,7 +106580,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fact Check Tools SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-file" = callPackage
@@ -106156,7 +106592,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Filestore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebase-dynamiclinks" = callPackage
@@ -106168,7 +106604,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Dynamic Links SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebase-rules" = callPackage
@@ -106180,7 +106616,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Rules SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebasehosting" = callPackage
@@ -106192,7 +106628,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Hosting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebaseremoteconfig" = callPackage
@@ -106204,7 +106640,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Remote Config SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firestore" = callPackage
@@ -106216,7 +106652,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Firestore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-fitness" = callPackage
@@ -106228,7 +106664,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fitness SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-fonts" = callPackage
@@ -106240,7 +106676,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fonts Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-freebasesearch" = callPackage
@@ -106252,7 +106688,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Freebase Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-fusiontables" = callPackage
@@ -106264,7 +106700,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fusion Tables SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-games" = callPackage
@@ -106276,7 +106712,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Game Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-games-configuration" = callPackage
@@ -106288,7 +106724,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Game Services Publishing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-games-management" = callPackage
@@ -106300,7 +106736,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Game Services Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-genomics" = callPackage
@@ -106312,7 +106748,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Genomics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-gmail" = callPackage
@@ -106324,7 +106760,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Gmail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-groups-migration" = callPackage
@@ -106336,7 +106772,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Groups Migration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-groups-settings" = callPackage
@@ -106348,7 +106784,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Groups Settings SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-healthcare" = callPackage
@@ -106360,7 +106796,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Healthcare SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-iam" = callPackage
@@ -106372,7 +106808,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Identity and Access Management (IAM) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-iamcredentials" = callPackage
@@ -106384,7 +106820,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google IAM Service Account Credentials SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-iap" = callPackage
@@ -106396,7 +106832,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Identity-Aware Proxy SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-identity-toolkit" = callPackage
@@ -106408,7 +106844,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Identity Toolkit SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-indexing" = callPackage
@@ -106420,7 +106856,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Indexing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-jobs" = callPackage
@@ -106432,7 +106868,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Talent Solution SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-kgsearch" = callPackage
@@ -106444,7 +106880,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Knowledge Graph Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-language" = callPackage
@@ -106456,7 +106892,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Natural Language SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-latencytest" = callPackage
@@ -106468,7 +106904,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Network Performance Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-libraryagent" = callPackage
@@ -106480,7 +106916,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Library Agent SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-logging" = callPackage
@@ -106492,7 +106928,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Logging SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-manufacturers" = callPackage
@@ -106504,7 +106940,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Manufacturer Center SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-maps-coordinate" = callPackage
@@ -106516,7 +106952,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Maps Coordinate SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-maps-engine" = callPackage
@@ -106528,7 +106964,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Maps Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-mirror" = callPackage
@@ -106540,7 +106976,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Mirror SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-ml" = callPackage
@@ -106552,7 +106988,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Machine Learning Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-monitoring" = callPackage
@@ -106564,7 +107000,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-oauth2" = callPackage
@@ -106576,7 +107012,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google OAuth2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-oslogin" = callPackage
@@ -106588,7 +107024,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud OS Login SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-pagespeed" = callPackage
@@ -106600,7 +107036,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google PageSpeed Insights SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-partners" = callPackage
@@ -106612,7 +107048,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Partners SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-people" = callPackage
@@ -106624,7 +107060,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google People SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-photoslibrary" = callPackage
@@ -106636,7 +107072,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Photos Library SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-play-moviespartner" = callPackage
@@ -106648,7 +107084,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Movies Partner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-playcustomapp" = callPackage
@@ -106660,7 +107096,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Custom App Publishing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-plus" = callPackage
@@ -106672,7 +107108,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google + SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-plus-domains" = callPackage
@@ -106684,7 +107120,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google + Domains SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-poly" = callPackage
@@ -106696,7 +107132,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Poly SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-prediction" = callPackage
@@ -106708,7 +107144,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Prediction SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-proximitybeacon" = callPackage
@@ -106720,7 +107156,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Proximity Beacon SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-pubsub" = callPackage
@@ -106732,7 +107168,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Pub/Sub SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-qpxexpress" = callPackage
@@ -106744,7 +107180,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google QPX Express SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-redis" = callPackage
@@ -106756,7 +107192,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Memorystore for Redis SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-remotebuildexecution" = callPackage
@@ -106768,7 +107204,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Remote Build Execution SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-replicapool" = callPackage
@@ -106780,7 +107216,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Replica Pool SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-replicapool-updater" = callPackage
@@ -106792,7 +107228,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine Instance Group Updater SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-resourcemanager" = callPackage
@@ -106804,7 +107240,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Resource Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-resourceviews" = callPackage
@@ -106816,7 +107252,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine Instance Groups SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-run" = callPackage
@@ -106828,7 +107264,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Run SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-runtimeconfig" = callPackage
@@ -106840,7 +107276,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Runtime Configuration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-safebrowsing" = callPackage
@@ -106852,7 +107288,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Safe Browsing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-script" = callPackage
@@ -106864,7 +107300,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Apps Script SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-searchconsole" = callPackage
@@ -106876,7 +107312,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Search Console URL Testing Tools SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-securitycenter" = callPackage
@@ -106888,7 +107324,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Security Command Center SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicebroker" = callPackage
@@ -106900,7 +107336,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Broker SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-serviceconsumermanagement" = callPackage
@@ -106912,7 +107348,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Consumer Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicecontrol" = callPackage
@@ -106924,7 +107360,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Control SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicemanagement" = callPackage
@@ -106936,7 +107372,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicenetworking" = callPackage
@@ -106948,7 +107384,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Networking SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-serviceusage" = callPackage
@@ -106960,7 +107396,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Usage SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-serviceuser" = callPackage
@@ -106972,7 +107408,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service User SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-sheets" = callPackage
@@ -106984,7 +107420,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Sheets SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-shopping-content" = callPackage
@@ -106996,7 +107432,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Content API for Shopping SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-siteverification" = callPackage
@@ -107008,7 +107444,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Site Verification SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-slides" = callPackage
@@ -107020,7 +107456,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Slides SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-sourcerepo" = callPackage
@@ -107032,7 +107468,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Source Repositories SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-spanner" = callPackage
@@ -107044,7 +107480,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Spanner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-spectrum" = callPackage
@@ -107056,7 +107492,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Spectrum Database SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-speech" = callPackage
@@ -107068,7 +107504,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Speech-to-Text SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-sqladmin" = callPackage
@@ -107080,7 +107516,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud SQL Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-storage" = callPackage
@@ -107092,7 +107528,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Storage JSON SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-storage-transfer" = callPackage
@@ -107104,7 +107540,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Storage Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-streetviewpublish" = callPackage
@@ -107116,7 +107552,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Street View Publish SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-surveys" = callPackage
@@ -107128,7 +107564,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Surveys SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-tagmanager" = callPackage
@@ -107140,7 +107576,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Tag Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-taskqueue" = callPackage
@@ -107152,7 +107588,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google TaskQueue SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-testing" = callPackage
@@ -107164,7 +107600,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Testing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-texttospeech" = callPackage
@@ -107176,7 +107612,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Text-to-Speech SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-toolresults" = callPackage
@@ -107188,7 +107624,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Tool Results SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-tpu" = callPackage
@@ -107200,7 +107636,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud TPU SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-tracing" = callPackage
@@ -107212,7 +107648,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Tracing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-translate" = callPackage
@@ -107224,7 +107660,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Translation SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-urlshortener" = callPackage
@@ -107236,7 +107672,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google URL Shortener SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-useraccounts" = callPackage
@@ -107248,7 +107684,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud User Accounts SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-vault" = callPackage
@@ -107260,7 +107696,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google G Suite Vault SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-videointelligence" = callPackage
@@ -107272,7 +107708,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Video Intelligence SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-vision" = callPackage
@@ -107284,7 +107720,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Vision SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-webmaster-tools" = callPackage
@@ -107296,7 +107732,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Search Console SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-websecurityscanner" = callPackage
@@ -107308,7 +107744,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Web Security Scanner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-youtube" = callPackage
@@ -107320,7 +107756,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google YouTube Data SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-youtube-analytics" = callPackage
@@ -107332,7 +107768,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google YouTube Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-youtube-reporting" = callPackage
@@ -107344,7 +107780,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google YouTube Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "goldplate" = callPackage
@@ -107364,8 +107800,8 @@ self: {
          unordered-containers
        ];
        description = "A lightweight golden test runner";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107377,8 +107813,8 @@ self: {
        sha256 = "0njlbvlqzm9282rwk21klr3jq6m46i2qz46xbsdhw9jg2dawq97j";
        libraryHaskellDepends = [ base renderable transformers varying ];
        description = "Graphical user interfaces that are renderable, change over time and eventually produce a value";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107398,8 +107834,8 @@ self: {
          random scientific stm text time unordered-containers
        ];
        description = "Client for the Google Cloud APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107411,7 +107847,7 @@ self: {
        sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g";
        libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ];
        description = "Simple interface to the google.com/dictionary API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "google-drive" = callPackage
@@ -107434,8 +107870,8 @@ self: {
          hspec-expectations-lifted load-env text time
        ];
        description = "Google Drive API access";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107454,8 +107890,8 @@ self: {
          syb text time
        ];
        description = "Google HTML5 Slide generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107470,7 +107906,7 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra http-conduit text
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "google-mail-filters" = callPackage
@@ -107486,8 +107922,8 @@ self: {
        ];
        testHaskellDepends = [ base google-search text time xml-conduit ];
        description = "Write GMail filters and output to importable XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107504,8 +107940,8 @@ self: {
          text
        ];
        description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107526,8 +107962,8 @@ self: {
          base bytestring hoauth2 hspec http-conduit load-env text
        ];
        description = "Google OAuth2 token negotiation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107547,8 +107983,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Opininated use of Google Authentication for ease";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107566,7 +108002,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Get Google OAuth2 token for CLI tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "google-oauth2-jwt" = callPackage
@@ -107581,8 +108017,8 @@ self: {
          base base64-bytestring bytestring HsOpenSSL RSA text unix-time
        ];
        description = "Get a signed JWT for Google Service Accounts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107594,8 +108030,8 @@ self: {
        sha256 = "1jn22iykcl6694lsshj7xxnqx33d6spqlr2q93v6ak3yaygxd7hr";
        libraryHaskellDepends = [ base free nats text time ];
        description = "EDSL for Google and GMail search expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107619,8 +108055,8 @@ self: {
          wai-extra warp
        ];
        description = "Google APIs for server to server applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107640,8 +108076,8 @@ self: {
          servant servant-client servant-JuicyPixels text utf8-string
        ];
        description = "Bindings to the Google Maps Static API (formerly Static Maps API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107658,8 +108094,8 @@ self: {
          servant-client text transformers
        ];
        description = "Google Translate API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107677,8 +108113,8 @@ self: {
          http-enumerator http-types mtl text time timerep transformers url
        ];
        description = "Haskell implementation of the Google+ API v1";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107697,8 +108133,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Google Polyline Encoder/Decoder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107719,7 +108155,7 @@ self: {
          mime-types network optparse-applicative text wai warp
        ];
        description = "proxy gopher over http";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gopherbot" = callPackage
@@ -107737,7 +108173,7 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107766,8 +108202,8 @@ self: {
          unordered-containers vector wreq
        ];
        description = "GoPro Plus Client API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107786,8 +108222,8 @@ self: {
          unordered-containers
        ];
        description = "Core of FRP game engine called Gore&Ash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107805,8 +108241,8 @@ self: {
          resourcet transformers transformers-base unordered-containers
        ];
        description = "Gore&Ash engine extension that implements actor style of programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107829,8 +108265,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Core module for Gore&Ash engine that embeds async IO actions into game loop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107856,8 +108292,8 @@ self: {
          text-show time transformers unordered-containers vector
        ];
        description = "Demonstration game for Gore&Ash game engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107874,8 +108310,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Core module for Gore&Ash engine for GLFW input events";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107895,8 +108331,8 @@ self: {
          lambdacube-compiler lambdacube-gl mtl text unordered-containers
        ];
        description = "Core module for Gore&Ash engine that do something";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107915,8 +108351,8 @@ self: {
          unordered-containers
        ];
        description = "Core module for gore-and-ash with logging utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107938,8 +108374,8 @@ self: {
          typesafe-endian unordered-containers
        ];
        description = "Core module for Gore&Ash engine with low level network API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107958,8 +108394,8 @@ self: {
          unordered-containers
        ];
        description = "Gore&Ash core module for integration with SDL library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107979,8 +108415,8 @@ self: {
          hashable mtl text unordered-containers
        ];
        description = "Gore&Ash module for high level network synchronization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108000,7 +108436,7 @@ self: {
          scientific text unix unordered-containers vector
        ];
        description = "A Haskell Vault KVv2 secret engine client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gotta-go-fast" = callPackage
@@ -108018,7 +108454,7 @@ self: {
          word-wrap
        ];
        description = "A command line utility for practicing typing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gpah" = callPackage
@@ -108038,8 +108474,8 @@ self: {
          uniplate uu-parsinglib zlib
        ];
        description = "Generic Programming Use in Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108051,7 +108487,7 @@ self: {
        sha256 = "1fm0k6n6fb5a3wvmb2l6k4zq3sdfxv16cb2y2zmjgxgj5n3gy9s8";
        libraryHaskellDepends = [ base ];
        description = "Generalized Pitch Class Sets for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gpio" = callPackage
@@ -108073,7 +108509,7 @@ self: {
          base directory exceptions monad-control optparse-generic safe
        ];
        description = "Haskell GPIO interface, designed specifically for the RaspberryPi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gpolyline" = callPackage
@@ -108084,7 +108520,7 @@ self: {
        sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8";
        libraryHaskellDepends = [ base split ];
        description = "Pure module for encoding/decoding Google Polyline";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gps" = callPackage
@@ -108104,8 +108540,8 @@ self: {
          test-framework-quickcheck2 time vector
        ];
        description = "For manipulating GPS coordinates and trails";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108126,8 +108562,8 @@ self: {
          tar time xsd
        ];
        description = "GPS to HTML Summary Report";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108144,8 +108580,8 @@ self: {
          void xml-conduit xml-types
        ];
        description = "Read GPX files using conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108159,8 +108595,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Applicative non-linear consumption";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108173,8 +108609,8 @@ self: {
        libraryHaskellDepends = [ base containers grab text ];
        testHaskellDepends = [ base containers hedgehog text ];
        description = "Applicative parsers for form parameter lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108191,8 +108627,8 @@ self: {
          base directory filepath hspec network process stm unix
        ];
        description = "Library to write graceful shutdown / upgrade service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108211,8 +108647,8 @@ self: {
          aeson aeson-pretty base bytestring Diff tasty tasty-hunit
        ];
        description = "API for creating grafana dashboards represented as json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108231,8 +108667,8 @@ self: {
          aeson base containers hspec mtl test-fixture text
        ];
        description = "Monadic correlated log events";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108256,8 +108692,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A Haskell client for Grakn";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108276,7 +108712,7 @@ self: {
        ];
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108312,8 +108748,8 @@ self: {
          rank2classes text
        ];
        description = "parsers that combine into grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108330,8 +108766,8 @@ self: {
          grapefruit-ui
        ];
        description = "Examples using the Grapefruit library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108349,8 +108785,8 @@ self: {
          arrows base containers fingertree semigroups TypeCompose
        ];
        description = "Functional Reactive Programming core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108362,8 +108798,8 @@ self: {
        sha256 = "0j1jy4rq11gk7j08cz7skdqlbnjrciiv0vi491lvmbbwmvf15cd6";
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        description = "A record system for Functional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108382,8 +108818,8 @@ self: {
          grapefruit-records
        ];
        description = "Declarative user interface programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108403,8 +108839,8 @@ self: {
          grapefruit-records grapefruit-ui gtk3 transformers
        ];
        description = "GTK+-based backend for declarative user interface programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108419,7 +108855,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graph-core" = callPackage
@@ -108439,8 +108875,8 @@ self: {
          unordered-containers vector
        ];
        description = "Fast, memory efficient and persistent graph implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108465,7 +108901,7 @@ self: {
          mwc-random QuickCheck
        ];
        description = "Functions for generating structured or random FGL graphs";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "graph-matchings" = callPackage
@@ -108476,8 +108912,8 @@ self: {
        sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv";
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108491,8 +108927,8 @@ self: {
          base base-unicode-symbols containers mtl
        ];
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108512,8 +108948,8 @@ self: {
          graph-rewriting-layout OpenGL parsec
        ];
        description = "Interactive graph rewriting system implementing various well-known combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108530,8 +108966,8 @@ self: {
          graph-rewriting-layout OpenGL
        ];
        description = "OpenGL interface for interactive port graph rewriting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108553,8 +108989,8 @@ self: {
          OpenGL parsec
        ];
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108570,8 +109006,8 @@ self: {
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
        description = "Force-directed node placement intended for incremental graph drawing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108591,8 +109027,8 @@ self: {
          graph-rewriting-layout OpenGL parsec
        ];
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108608,8 +109044,8 @@ self: {
          base base-unicode-symbols containers graph-rewriting
        ];
        description = "Evaluation strategies for port-graph rewriting systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108631,8 +109067,8 @@ self: {
          uu-parsinglib
        ];
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108653,8 +109089,8 @@ self: {
          graph-rewriting-layout IndentParser OpenGL parsec
        ];
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108666,8 +109102,8 @@ self: {
        sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74";
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Serialization of data structures with references";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108683,8 +109119,8 @@ self: {
          base containers fgl mtl parsec syb template-haskell
        ];
        description = "A simple wrapper & quasi quoter for fgl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108700,8 +109136,8 @@ self: {
          base containers data-lens data-lens-template mtl
        ];
        description = "Graph walk abstraction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108718,7 +109154,7 @@ self: {
          array base containers deepseq hspec QuickCheck
        ];
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphbuilder" = callPackage
@@ -108735,8 +109171,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A declarative, monadic graph construction language for small graphs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108753,8 +109189,8 @@ self: {
          mtl transformers
        ];
        description = "A minimal Graph Theory library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108772,8 +109208,8 @@ self: {
          base bitmap bitmap-opengl FTGL OpenGL stb-image
        ];
        description = "A functional interface to 2D drawing in OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108789,8 +109225,8 @@ self: {
          base bitmap-opengl containers hxt OpenGL stb-image transformers
        ];
        description = "Load 3D geometry in the COLLADA format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108802,8 +109238,8 @@ self: {
        sha256 = "0bcqj0n8qqaqfrn21qgkf8si5qgxl3qlsc8djy0rqhnfi2grb8nh";
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108822,8 +109258,8 @@ self: {
        ];
        executableHaskellDepends = [ base CV wx wxcore ];
        description = "Tools for creating graphical UIs, based on wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108844,7 +109280,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Graphs and networks library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphmod" = callPackage
@@ -108862,7 +109298,7 @@ self: {
          pretty
        ];
        description = "Present the module dependencies of a program as a \"dot\" graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphmod-plugin" = callPackage
@@ -108880,8 +109316,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A reimplementation of graphmod as a source plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108907,7 +109343,7 @@ self: {
        ];
        description = "Haskell GraphQL implementation";
        license = "MPL-2.0 AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108937,8 +109373,8 @@ self: {
          attoparsec base criterion exceptions protolude transformers
        ];
        description = "GraphQL API";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108969,8 +109405,8 @@ self: {
          tasty tasty-hunit template-haskell text transformers unliftio-core
        ];
        description = "A client for Haskell programs to query a GraphQL API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108986,8 +109422,8 @@ self: {
          aeson aeson-helper base graphql text unordered-containers vector
        ];
        description = "GraphQL Utils";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108999,8 +109435,8 @@ self: {
        sha256 = "0sm0j1d2h6b2d3ksbbdyvzyvwl306mb64yikwkdwp2izfy387lwg";
        libraryHaskellDepends = [ base containers json text ];
        description = "GraphQL interface middleware for SQL databases";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109018,7 +109454,7 @@ self: {
          array base containers transformers transformers-compat void
        ];
        description = "A simple monadic graph library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphted" = callPackage
@@ -109029,8 +109465,8 @@ self: {
        sha256 = "0y2nqsygqcxb0w7x1irikqqx10m209nihqmxqy1s18snrlvh06c9";
        libraryHaskellDepends = [ base indexed ];
        description = "Graph indexed monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109048,8 +109484,8 @@ self: {
          base containers dotgen haskell-src-exts haskell98 uniplate
        ];
        description = "A simple tool to illustrate dependencies between Haskell types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109077,8 +109513,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A declarative library for describing dependencies between data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109106,8 +109542,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A declarative library for describing dependencies between data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109134,7 +109570,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "Bindings to Graphviz for graph visualisation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) graphviz;};
 
   "graql" = callPackage
@@ -109151,8 +109587,8 @@ self: {
        testHaskellDepends = [ base hspec markdown-unlit text ];
        testToolDepends = [ markdown-unlit ];
        description = "Execute Graql queries on a Grakn graph";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109177,8 +109613,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "GRASP implementation for the AMMM project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109195,7 +109631,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "Generate Gravatar image URLs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gray-code" = callPackage
@@ -109207,8 +109643,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Gray code encoder/decoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109225,7 +109661,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Gray encoding schemes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graylog" = callPackage
@@ -109247,7 +109683,7 @@ self: {
        ];
        description = "Support for graylog output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "greencard" = callPackage
@@ -109261,8 +109697,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ array base containers pretty ];
        description = "GreenCard, a foreign function pre-processor for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109275,8 +109711,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers greencard pretty ];
        description = "A foreign function interface pre-processor library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109297,7 +109733,7 @@ self: {
        ];
        executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ];
        description = "Simple clipboard manager to be integrated with rofi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; 
          inherit (pkgs) xlibsWrapper;};
 
@@ -109313,8 +109749,8 @@ self: {
          base binary bytestring clock hostname network stm system-uuid time
        ];
        description = "A scalable distributed logger with a high-precision global time axis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109338,8 +109774,8 @@ self: {
        ];
        testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
        description = "Graph database client for TinkerPop3 Gremlin Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109363,8 +109799,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109382,7 +109818,7 @@ self: {
        ];
        description = "Generalised replicate functions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "greskell" = callPackage
@@ -109403,7 +109839,7 @@ self: {
          hspec text unordered-containers
        ];
        description = "Haskell binding for Gremlin graph query language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "greskell-core" = callPackage
@@ -109424,7 +109860,7 @@ self: {
          text unordered-containers vector
        ];
        description = "Haskell binding for Gremlin graph query language - core data types and tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "greskell-websocket" = callPackage
@@ -109446,7 +109882,7 @@ self: {
          vector
        ];
        description = "Haskell client for Gremlin Server using WebSocket serializer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "grid" = callPackage
@@ -109462,7 +109898,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Tools for working with regular grids (graphs, lattices)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "grid-proto" = callPackage
@@ -109484,8 +109920,8 @@ self: {
          sdl2-mixer sdl2-ttf StateVar text vector
        ];
        description = "Grid-based prototyping framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109498,8 +109934,8 @@ self: {
        libraryHaskellDepends = [ base earclipper gjk gridbox ];
        testHaskellDepends = [ base earclipper gjk gridbox hspec ];
        description = "Collision detection for GridBox";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109512,7 +109948,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A grid box model";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gridfs" = callPackage
@@ -109530,7 +109966,7 @@ self: {
        ];
        description = "GridFS (MongoDB file storage) implementation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gridland" = callPackage
@@ -109548,8 +109984,8 @@ self: {
          SDL-image SDL-mixer tuple vector
        ];
        description = "Grid-based multimedia engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109572,7 +110008,7 @@ self: {
          adjunctions base comonad deepseq distributive gauge singletons
          vector
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "grm" = callPackage
@@ -109593,8 +110029,8 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109609,7 +110045,7 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        executableHaskellDepends = [ base ];
        description = "Pretty printing for well-behaved Show instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groot" = callPackage
@@ -109658,8 +110094,8 @@ self: {
          vector yaml
        ];
        description = "Command line utility to manage AWS ECS resources";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109674,8 +110110,8 @@ self: {
        libraryHaskellDepends = [ base mtl ncurses ];
        executableHaskellDepends = [ base lens mtl ncurses ];
        description = "A spoof on gloss for terminal animation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109695,7 +110131,7 @@ self: {
          transformers transformers-base transformers-compat
        ];
        description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-converters" = callPackage
@@ -109713,8 +110149,8 @@ self: {
          groundhog-th tasty tasty-hunit tasty-quickcheck
        ];
        description = "Extended Converter Library for groundhog embedded types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109738,7 +110174,7 @@ self: {
          groundhog-th mtl
        ];
        description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-mysql" = callPackage
@@ -109755,7 +110191,7 @@ self: {
          mysql mysql-simple resource-pool resourcet text time transformers
        ];
        description = "MySQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-postgresql" = callPackage
@@ -109773,7 +110209,7 @@ self: {
          time transformers vector
        ];
        description = "PostgreSQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-sqlite" = callPackage
@@ -109790,7 +110226,7 @@ self: {
          resource-pool resourcet text transformers unordered-containers
        ];
        description = "Sqlite3 backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-th" = callPackage
@@ -109806,25 +110242,25 @@ self: {
          text time unordered-containers yaml
        ];
        description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "group-by-date" = callPackage
-    ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
-     , pathtype, time, transformers, unix-compat, utility-ht
+    ({ mkDerivation, base, explicit-exception, filemanip, pathtype
+     , shell-utility, time, transformers, unix-compat, utility-ht
      }:
      mkDerivation {
        pname = "group-by-date";
-       version = "0.1.0.3";
-       sha256 = "0lz2ygmzxanrcnhzpqcxi1fqh75c349fcrkd13jgih10zkgk86jh";
+       version = "0.1.0.4";
+       sha256 = "1k5bnk1kz25zgky5rqb214gq5adkz6qi6p16gk0hvy54iyjdj9sa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base explicit-exception filemanip hsshellscript pathtype time
+         base explicit-exception filemanip pathtype shell-utility time
          transformers unix-compat utility-ht
        ];
        description = "Shell command for grouping files by dates into folders";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "group-theory" = callPackage
@@ -109839,7 +110275,7 @@ self: {
        libraryHaskellDepends = [ base containers groups ];
        testHaskellDepends = [ base doctest ];
        description = "The theory of groups";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "group-with" = callPackage
@@ -109855,8 +110291,8 @@ self: {
          base Cabal containers hspec hspec-expectations QuickCheck
        ];
        description = "Classify objects by key-generating function, like SQL GROUP BY";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109874,7 +110310,7 @@ self: {
          base code-page criterion optparse-applicative random utility-ht
        ];
        description = "Replacement definition of Data.List.GroupBy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "grouped-list" = callPackage
@@ -109889,8 +110325,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Grouped lists. Equal consecutive elements are grouped.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109902,7 +110338,7 @@ self: {
        sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z";
        libraryHaskellDepends = [ base ];
        description = "A Groupoid class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groupoids" = callPackage
@@ -109914,7 +110350,7 @@ self: {
        libraryHaskellDepends = [ base semigroupoids ];
        doHaddock = false;
        description = "This package has been absorbed into semigroupoids 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groups" = callPackage
@@ -109925,7 +110361,7 @@ self: {
        sha256 = "0ghabk9r3pqccwfshy80p460awv0niyfi3nirg5bqnxm923c4njn";
        libraryHaskellDepends = [ base ];
        description = "Groups";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groups-generic" = callPackage
@@ -109936,8 +110372,8 @@ self: {
        sha256 = "1rnil9qashpvrjxmziymf447pnqpqpnga0lxlk7413y4dprn2rad";
        libraryHaskellDepends = [ base generic-data groups ];
        description = "Generically derive Group instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109957,7 +110393,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Mutable vector with efficient appends";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "growler" = callPackage
@@ -109978,8 +110414,8 @@ self: {
          unordered-containers vector wai wai-extra warp
        ];
        description = "A revised version of the scotty library that attempts to be simpler and more performant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109991,8 +110427,8 @@ self: {
        sha256 = "1ymvgsrqhnym2wv5j8mbhh8i3r7y0jcz19k927qmffqk7sacfxg1";
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110009,8 +110445,8 @@ self: {
          network proto-lens proto-lens-runtime
        ];
        description = "gRPC client for etcd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110039,8 +110475,8 @@ self: {
          async base bytestring criterion proto3-suite random
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110066,8 +110502,8 @@ self: {
          transformers turtle unix
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gpr = null; inherit (pkgs) grpc;};
 
@@ -110089,8 +110525,8 @@ self: {
          old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec
        ];
        description = "fractal explorer GUI using the ruff library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110109,8 +110545,8 @@ self: {
          random ruff Vec
        ];
        description = "Mandelbrot Set examples using ruff and gruff";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110128,7 +110564,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gsasl ];
        description = "Bindings for GNU libgsasl";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) gsasl;};
 
   "gsc-weighting" = callPackage
@@ -110139,7 +110575,7 @@ self: {
        sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5";
        libraryHaskellDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gscholar-rss" = callPackage
@@ -110156,8 +110592,8 @@ self: {
          base feed http-conduit scalpel-core text uri xml-types
        ];
        description = "scrapes google scholar, provides RSS feed";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110170,8 +110606,8 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base vector ];
        description = "Bindings the the GSL random number generation facilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110183,8 +110619,8 @@ self: {
        sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i";
        libraryHaskellDepends = [ base gsl-random random-fu ];
        description = "Instances for using gsl-random with random-fu";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110202,8 +110638,8 @@ self: {
          base containers mtl parsec permute sindre text X11
        ];
        description = "A visual generic menu";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gssapi" = callPackage
@@ -110217,7 +110653,7 @@ self: {
        libraryHaskellDepends = [ base bytestring resourcet transformers ];
        librarySystemDepends = [ gssapi_krb5 krb5 ];
        description = "libgssapi and libkrb5 bindings for haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {gssapi_krb5 = null; inherit (pkgs) krb5;};
 
   "gssapi-wai" = callPackage
@@ -110233,7 +110669,7 @@ self: {
          http-types vault wai wai-extra
        ];
        description = "WAI Middleware for SPNEGO authentiaction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gstorable" = callPackage
@@ -110249,8 +110685,8 @@ self: {
          base generic-storable ghc-prim hspec QuickCheck
        ];
        description = "Generic implementation of Storable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110270,8 +110706,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gst-plugins-base = null; gstreamer = null;};
 
@@ -110305,8 +110741,8 @@ self: {
          base csv directory filepath rowrecord split
        ];
        description = "The General Transit Feed Specification format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110322,8 +110758,8 @@ self: {
          base protocol-buffers protocol-buffers-descriptor
        ];
        description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110342,7 +110778,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Binding to the Gtk+ graphical user interface library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk2;};
 
   "gtk-helpers" = callPackage
@@ -110357,7 +110793,7 @@ self: {
          array base gio glib gtk mtl process template-haskell
        ];
        description = "A collection of auxiliary operations and widgets related to Gtk+";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gtk-jsinput" = callPackage
@@ -110368,7 +110804,7 @@ self: {
        sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0";
        libraryHaskellDepends = [ base gtk json transformers ];
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gtk-largeTreeStore" = callPackage
@@ -110384,7 +110820,7 @@ self: {
        ];
        testHaskellDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "gtk-mac-integration" = callPackage
@@ -110400,8 +110836,8 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
        description = "Bindings for the Gtk/OS X integration library";
-       license = stdenv.lib.licenses.lgpl21;
-       platforms = [ "x86_64-darwin" ];
+       license = lib.licenses.lgpl21;
+       platforms = [ "armv7l-linux" "x86_64-darwin" ];
      }) {inherit (pkgs) gtk-mac-integration-gtk2;};
 
   "gtk-serialized-event" = callPackage
@@ -110418,8 +110854,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk2 ];
        description = "GTK+ Serialized event";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2;};
 
@@ -110431,7 +110867,7 @@ self: {
        sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws";
        libraryHaskellDepends = [ base gtk ];
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gtk-sni-tray" = callPackage
@@ -110461,7 +110897,7 @@ self: {
          optparse-applicative status-notifier-item text unix
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -110472,7 +110908,7 @@ self: {
        sha256 = "19p3w1zvnaazfd01yy4cl00sl53xc7kqgqhsw7l3psadmwk6x4w1";
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
        description = "Libary for creating strut windows with gi-gtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gtk-toggle-button-list" = callPackage
@@ -110483,7 +110919,7 @@ self: {
        sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706";
        libraryHaskellDepends = [ base gtk ];
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gtk-toy" = callPackage
@@ -110494,8 +110930,8 @@ self: {
        sha256 = "0zf3k0c5h5wcgkqr8np5kvgz4c9nha86k5whsn4f1wk0ikj98dfq";
        libraryHaskellDepends = [ base containers gtk ];
        description = "Convenient Gtk canvas with mouse and keyboard input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110508,7 +110944,7 @@ self: {
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "A wrapper around the eggtraymanager library for Linux system trays";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "gtk2hs-buildtools" = callPackage
@@ -110529,7 +110965,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
        description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "gtk2hs-cast-glade" = callPackage
@@ -110545,7 +110981,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glib" = callPackage
@@ -110557,7 +110993,7 @@ self: {
        libraryHaskellDepends = [ base glib ];
        description = "A type class for cast functions of Gtk2hs: glib package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gnomevfs" = callPackage
@@ -110573,7 +111009,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gnomevfs package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtk" = callPackage
@@ -110589,7 +111025,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtk package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtkglext" = callPackage
@@ -110605,7 +111041,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtkglext package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtksourceview2" = callPackage
@@ -110622,7 +111058,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtksourceview2 package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-th" = callPackage
@@ -110634,7 +111070,7 @@ self: {
        libraryHaskellDepends = [ base hint template-haskell ];
        description = "A type class for cast functions of Gtk2hs: TH package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-hello" = callPackage
@@ -110647,8 +111083,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base glib gtk3 transformers ];
        description = "Gtk2Hs Hello World, an example package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110661,7 +111097,7 @@ self: {
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110682,7 +111118,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Binding to the Gtk+ 3 graphical user interface library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gtk3-helpers" = callPackage
@@ -110697,7 +111133,7 @@ self: {
          array base gio glib gtk3 mtl process template-haskell
        ];
        description = "A collection of auxiliary operations and widgets related to Gtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gtk3-mac-integration" = callPackage
@@ -110713,8 +111149,8 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "Bindings for the Gtk/OS X integration library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
@@ -110733,8 +111169,8 @@ self: {
        libraryPkgconfigDepends = [ gtkglext ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GTK+ OpenGL Extension";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; 
          inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; 
@@ -110756,8 +111192,8 @@ self: {
        libraryPkgconfigDepends = [ gtkimageview ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkImageView library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtkimageview;};
 
@@ -110777,7 +111213,7 @@ self: {
        ];
        description = "Gnome rsync progress display";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110797,8 +111233,8 @@ self: {
        libraryPkgconfigDepends = [ gtksourceview ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtksourceview;};
 
@@ -110818,8 +111254,8 @@ self: {
        libraryPkgconfigDepends = [ gtksourceview3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
@@ -110831,7 +111267,7 @@ self: {
        sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c";
        libraryHaskellDepends = [ base ];
        description = "Memory allocation with added stress tests and integrity checks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "guarded-rewriting" = callPackage
@@ -110842,8 +111278,8 @@ self: {
        sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9";
        libraryHaskellDepends = [ base instant-generics ];
        description = "Datatype-generic rewriting with preconditions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110855,8 +111291,8 @@ self: {
        sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj";
        libraryHaskellDepends = [ base HList ];
        description = "Generate simple combinators given their type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110869,7 +111305,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text uuid uuid-types ];
        testHaskellDepends = [ base HUnit ];
        description = "A simple wrapper around uuid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gulcii" = callPackage
@@ -110883,8 +111319,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        description = "graphical untyped lambda calculus interactive interpreter";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110896,7 +111332,7 @@ self: {
        sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2";
        libraryHaskellDepends = [ base ];
        description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gw" = callPackage
@@ -110909,8 +111345,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base unix ];
        description = "ghcWithPackages cmdline util";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110924,8 +111360,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110947,8 +111383,8 @@ self: {
          base exceptions http-client servant-client
        ];
        description = "REST client to the gym-http-api project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110972,8 +111408,8 @@ self: {
          stm template-haskell transformers utf8-string vinyl
        ];
        description = "Haskell library for retrieving data from various booru image sites";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110997,8 +111433,8 @@ self: {
          tasty-hunit tasty-quickcheck temporary time transformers unix
        ];
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111022,8 +111458,8 @@ self: {
          base containers hspec QuickCheck split text
        ];
        description = "Reversi game in haskell/blank-canvas";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111050,8 +111486,8 @@ self: {
          vector-algorithms vty
        ];
        description = "An Implementation of Game 2048";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111063,8 +111499,8 @@ self: {
        sha256 = "16aljqvzf8n1js0drqii99z3v8xba0468w27c9vmf5w483awkqjb";
        libraryHaskellDepends = [ base bytestring mtl resourcet ];
        description = "Bindings to Linux I2C with support for repeated-start transactions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111080,8 +111516,8 @@ self: {
          base bytestring containers mtl serialport time
        ];
        description = "Control your Arduino board from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111109,7 +111545,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bdd = null; mem = null;};
 
@@ -111126,7 +111562,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
@@ -111143,8 +111579,8 @@ self: {
        executableHaskellDepends = [ base hashable ];
        testHaskellDepends = [ base hashable ];
        description = "Conceptual modelling support for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111161,7 +111597,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to CSound API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
@@ -111173,8 +111609,8 @@ self: {
        sha256 = "1ays1qy2zsl3h49ryr2y9dymfv1ak1m1d0jvarmqwg3nb49armhm";
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111187,8 +111623,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111205,8 +111641,8 @@ self: {
          text time zlib
        ];
        description = "Haskell GELF library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111230,8 +111666,8 @@ self: {
          filepath hooplext mtl parsec pretty template-haskell transformers
        ];
        description = "A library for analyzing and transforming LLVM (3.5) assembly codes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hooplext = null;};
 
@@ -111249,8 +111685,8 @@ self: {
          old-locale old-time pureMD5 random time
        ];
        description = "Library to interact with the @Mollom anti-spam service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111265,8 +111701,8 @@ self: {
        libraryHaskellDepends = [ base hOff-parser OpenGL ];
        executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ];
        description = "The tool to transform the OFF to other image format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111278,7 +111714,7 @@ self: {
        sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci";
        libraryHaskellDepends = [ base parsec ];
        description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hOpenPGP" = callPackage
@@ -111325,7 +111761,7 @@ self: {
          zlib
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hPDB" = callPackage
@@ -111344,8 +111780,8 @@ self: {
          text unordered-containers vector zlib
        ];
        description = "Protein Databank file format library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111372,8 +111808,8 @@ self: {
          iterable linear mtl process template-haskell text time vector
        ];
        description = "Examples for hPDB library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111389,8 +111825,8 @@ self: {
          aeson base bytestring http-conduit network text
        ];
        description = "Pushover.net API functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111402,8 +111838,8 @@ self: {
        sha256 = "1kc03mgsxijszdvxw4qwq4fnd0ln61v08rk9y1k6kx9vyqc7bilc";
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111415,7 +111851,7 @@ self: {
        sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "haskell implementation of RESP (REdis Serialization Protocol)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hS3" = callPackage
@@ -111434,7 +111870,7 @@ self: {
          network-uri old-locale old-time random regex-compat utf8-string
        ];
        description = "Interface to Amazon's Simple Storage Service (S3)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hScraper" = callPackage
@@ -111450,8 +111886,8 @@ self: {
          process regex-compat text transformers
        ];
        description = "A Haskell library to scrape and crawl web-pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111468,8 +111904,8 @@ self: {
          utf8-string
        ];
        description = "Interface to Amazon's SimpleDB service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111483,8 +111919,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base ];
        description = "Parser, print and manipulate structures in PDB file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111496,8 +111932,8 @@ self: {
        sha256 = "08zmzzwbvqsyz7v5grjwg81434bdr3zkkd12ifhk76xg2p0xfhmk";
        libraryHaskellDepends = [ base containers hmatrix random ];
        description = "Multidimensional arrays and simple tensor computations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111514,7 +111950,7 @@ self: {
        executableSystemDepends = [ blas liblapack ];
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
@@ -111532,7 +111968,7 @@ self: {
          base directory gtk3 process split text
        ];
        description = "A Gtk mixer GUI application for FreeBSD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haar" = callPackage
@@ -111548,8 +111984,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Haar wavelet transforms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111574,8 +112010,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Haskell message bot framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111587,28 +112023,32 @@ self: {
        sha256 = "07h9a8l32j6j5ssrl7f1j02jlmn5f7c48h88fn7lbzhj24kqasl3";
        libraryHaskellDepends = [ base ];
        description = "customizable pretty printer library for tables";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hablo" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, lucid, mtl, optparse-applicative, parsec, template
-     , text, time, unix
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, filepath, lucid, mtl, optparse-applicative, parsec
+     , SJW, template, text, time, unix
      }:
      mkDerivation {
        pname = "hablo";
-       version = "1.0.1.0";
-       sha256 = "1jbbh8d2xdcdgm4kq4yn6i6h9g996m2zqklg8s5b5h5jlzk7hfvs";
-       isLibrary = false;
+       version = "1.1.0.1";
+       sha256 = "0jn547idw8ypa5b6wbavpwr4haidgh89gg61bscpxn0psx6r5ahc";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers directory filepath lucid mtl
-         optparse-applicative parsec template text time unix
+         optparse-applicative parsec SJW template text time unix
+       ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [
+         base Cabal containers directory filepath lucid mtl text
        ];
        description = "A minimalist static blog generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111631,8 +112071,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111644,7 +112084,7 @@ self: {
        sha256 = "0m0wfg74kmpz6ydldz5h9z5xd54957v1rprl9wal9sjr0pzl28a7";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Template Haskell framework for automatic FFI code generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack" = callPackage
@@ -111656,7 +112096,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring data-default ];
        description = "a Haskell Webserver Interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack-contrib" = callPackage
@@ -111675,8 +112115,8 @@ self: {
          time utf8-string
        ];
        description = "Hack contrib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111694,7 +112134,7 @@ self: {
        ];
        description = "Hack helper that renders Press templates";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111712,8 +112152,8 @@ self: {
          utf8-string
        ];
        description = "hack-frontend-happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111725,7 +112165,7 @@ self: {
        sha256 = "0m0af44jv03djn5i2lgrnnvvcdqx44qppfx76m1bwr7gv1vzm432";
        libraryHaskellDepends = [ base bytestring cgi containers hack ];
        description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack-handler-cgi" = callPackage
@@ -111736,8 +112176,8 @@ self: {
        sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x";
        libraryHaskellDepends = [ base bytestring hack ];
        description = "Hack handler using CGI protocol. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111757,7 +112197,7 @@ self: {
        ];
        description = "hack handler implementation using epoll";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111777,7 +112217,7 @@ self: {
        librarySystemDepends = [ event ];
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {event = null;};
 
@@ -111790,8 +112230,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ];
        librarySystemDepends = [ fcgi ];
        description = "Hack handler direct to fastcgi (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fcgi;};
 
@@ -111809,8 +112249,8 @@ self: {
          mtl network
        ];
        description = "Hack Happstack server handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111827,8 +112267,8 @@ self: {
          base bytestring containers data-default hack hyena network
        ];
        description = "Hyena hack handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111844,7 +112284,7 @@ self: {
        ];
        description = "Hack Kibro handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111860,8 +112300,8 @@ self: {
          base bytestring failure hack network web-encodings
        ];
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111875,8 +112315,8 @@ self: {
          base bytestring hack split web-encodings
        ];
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111892,8 +112332,8 @@ self: {
          base clientsession hack old-locale predicates time web-encodings
        ];
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111905,7 +112345,7 @@ self: {
        sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70";
        libraryHaskellDepends = [ base hack split zlib ];
        description = "Automatic gzip compression of responses. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack-middleware-jsonp" = callPackage
@@ -111920,8 +112360,8 @@ self: {
          base bytestring bytestring-class hack web-encodings
        ];
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111933,7 +112373,7 @@ self: {
        sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28";
        libraryHaskellDepends = [ base bytestring data-default ];
        description = "a Haskell Webserver Interface (V2)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack2-contrib" = callPackage
@@ -111949,7 +112389,7 @@ self: {
          hack2 network-uri text time
        ];
        description = "Hack2 contrib";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack2-contrib-extra" = callPackage
@@ -111967,7 +112407,7 @@ self: {
          filepath hack2 hack2-contrib network old-locale old-time time
        ];
        description = "Hack2 contrib extra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack2-handler-happstack-server" = callPackage
@@ -111984,8 +112424,8 @@ self: {
          happstack-server mtl network
        ];
        description = "Hack2 Happstack server handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112006,8 +112446,8 @@ self: {
          stm text unix zeromq-haskell
        ];
        description = "Hack2 Mongrel2 HTTP handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112026,8 +112466,8 @@ self: {
          snap-server
        ];
        description = "Hack2 Snap server handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112044,8 +112484,8 @@ self: {
          air base data-default hack2 hack2-interface-wai warp
        ];
        description = "Hack2 warp handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112062,7 +112502,27 @@ self: {
          http-types network safe wai
        ];
        description = "Hack2 interface to WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "hackage-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, http-client
+     , http-client-tls, http-media, servant, servant-client
+     , servant-client-core, text, time
+     }:
+     mkDerivation {
+       pname = "hackage-api";
+       version = "0.1.0";
+       sha256 = "1hqla8h5jq5b149gz6kql0mdnv4hw0535wwsh7cj4sx9j6yyri9y";
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal http-client http-client-tls http-media
+         servant servant-client servant-client-core text time
+       ];
+       testHaskellDepends = [ base http-client-tls servant-client ];
+       description = "An API binding to Hackage API";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-db" = callPackage
@@ -112082,8 +112542,8 @@ self: {
          filepath tar time utf8-string
        ];
        description = "Access cabal-install's Hackage database via Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hackage-diff" = callPackage
@@ -112102,8 +112562,8 @@ self: {
          haskell-src-exts HTTP mtl process text
        ];
        description = "Compare the public API of different versions of a Hackage library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112133,8 +112593,8 @@ self: {
          base monad-logger optparse-applicative
        ];
        description = "Simple mirroring utility for Hackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112153,7 +112613,7 @@ self: {
          old-locale old-time parsedate
        ];
        description = "Generate cumulative graphs of hackage uploads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-processing" = callPackage
@@ -112166,8 +112626,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal containers hackage-db ];
        description = "Process 00-index.tar.gz from Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112191,8 +112651,8 @@ self: {
          unordered-containers wai warp zlib zlib-conduit
        ];
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112215,8 +112675,8 @@ self: {
          zlib
        ];
        description = "Manage secure file-based package repositories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112246,7 +112706,7 @@ self: {
          unordered-containers vector zlib
        ];
        description = "Hackage security library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-security-HTTP" = callPackage
@@ -112261,7 +112721,7 @@ self: {
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
        description = "Hackage security bindings against the HTTP library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-server" = callPackage
@@ -112299,8 +112759,8 @@ self: {
          vector xml zlib
        ];
        description = "The Hackage web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112319,7 +112779,7 @@ self: {
          old-time parsedate tagsoup
        ];
        description = "Generate sparkline graphs of hackage statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-whatsnew" = callPackage
@@ -112337,8 +112797,8 @@ self: {
          temporary
        ];
        description = "Check for differences between working directory and hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112352,8 +112812,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base download feed tagsoup ];
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112367,8 +112827,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base feed feed2twitter ];
        description = "Send new Hackage releases to Twitter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112386,8 +112846,8 @@ self: {
          base Cabal containers directory filepath mtl process regex-tdfa
        ];
        description = "Hackage testing tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112412,8 +112872,8 @@ self: {
          quickcheck-instances
        ];
        description = "API for Hacker News";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112430,7 +112890,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
        description = "\"Hack\" like a programmer in movies and games!";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hackmanager" = callPackage
@@ -112450,8 +112910,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate useful files for Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112503,8 +112963,8 @@ self: {
          transformers-base
        ];
        description = "Lightweight Erlang-style actors for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112516,8 +112976,8 @@ self: {
        sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0";
        libraryHaskellDepends = [ base stm ];
        description = "Practical actors for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112534,8 +112994,8 @@ self: {
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112552,8 +113012,8 @@ self: {
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112578,8 +113038,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112604,8 +113064,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112617,8 +113077,8 @@ self: {
        sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r";
        libraryHaskellDepends = [ base ];
        description = "A documentation-only package exemplifying haddock markup features";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112637,8 +113097,8 @@ self: {
          array base Cabal containers directory filepath ghc ghc-paths pretty
        ];
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112659,8 +113119,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haddock-library" = callPackage
@@ -112682,7 +113142,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "haddock-test" = callPackage
@@ -112697,8 +113157,8 @@ self: {
          base bytestring Cabal directory filepath process syb xhtml xml
        ];
        description = "Test utilities for Haddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112720,8 +113180,8 @@ self: {
          sqlite-simple tagsoup text transformers
        ];
        description = "Generate docset of Dash by Haddock haskell documentation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112750,7 +113210,7 @@ self: {
          ShellCheck split text
        ];
        description = "Dockerfile Linter JavaScript API";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -112767,8 +113227,8 @@ self: {
        librarySystemDepends = [ snappy ];
        testHaskellDepends = [ base bytestring filepath text vector ];
        description = "Read/write file formats commonly used by Hadoop";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) snappy;};
 
@@ -112789,8 +113249,8 @@ self: {
        ];
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        description = "Use the Hadoop RPC interface from Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112806,7 +113266,7 @@ self: {
        testHaskellDepends = [ base bytestring conduit extra hspec ];
        testToolDepends = [ hspec-discover ];
        description = "A simple Hadoop streaming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hadoop-tools" = callPackage
@@ -112832,8 +113292,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Fast command line tools for working with Hadoop";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112852,7 +113312,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip process ];
        description = "Confirm delegation of NS and MX records";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "hafar" = callPackage
@@ -112864,8 +113324,8 @@ self: {
        libraryHaskellDepends = [ base intervals mtl ];
        testHaskellDepends = [ base intervals mtl QuickCheck ];
        description = "Affine arithmetic library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112892,8 +113352,8 @@ self: {
          base directory filemanip filepath optparse-applicative
        ];
        description = "A static site generator with blogging/comments support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112915,7 +113375,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A graph library offering mutable, immutable, and inductive graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haha" = callPackage
@@ -112929,7 +113389,7 @@ self: {
        libraryHaskellDepends = [ base containers time ];
        executableHaskellDepends = [ base containers time ];
        description = "A simple library for creating animated ascii art on ANSI terminals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hahp" = callPackage
@@ -112946,8 +113406,8 @@ self: {
        ];
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112970,8 +113430,8 @@ self: {
          tasty-hunit tasty-th text
        ];
        description = "A typed template engine, subset of jinja2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112992,7 +113452,7 @@ self: {
          netrc network-uri optparse-applicative parsec process text wreq
        ];
        description = "A service for pull-based continuous deployment based on hydra";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hailgun" = callPackage
@@ -113010,7 +113470,7 @@ self: {
          transformers
        ];
        description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hailgun-send" = callPackage
@@ -113025,8 +113485,8 @@ self: {
          base bytestring configurator hailgun text
        ];
        description = "A program to send emails throught the Mailgun api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113042,7 +113502,7 @@ self: {
          base email-validate hailgun mtl text transformers
        ];
        description = "Easy-to-use wrapper for the hailgun package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hails" = callPackage
@@ -113083,8 +113543,8 @@ self: {
          wai-test
        ];
        description = "Multi-app web platform framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {quickcheck-lio-instances = null;};
 
@@ -113103,7 +113563,7 @@ self: {
          iterio-server mongoDB mtl
        ];
        description = "Dynamic launcher of Hails applications";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "hairy" = callPackage
@@ -113131,8 +113591,8 @@ self: {
          base criterion http-types mtl persistent scotty time wai wai-extra
        ];
        description = "A JSON REST API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113162,8 +113622,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        description = "A probabilistic programming embedded DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113191,8 +113651,8 @@ self: {
        sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Akismet spam protection library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113207,8 +113667,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        executableHaskellDepends = [ base ];
        description = "Minimal akka-inspired actor library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113225,8 +113685,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "A mako-like quasi-quoter template library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113266,8 +113726,8 @@ self: {
        ];
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) utillinux;};
 
@@ -113282,8 +113742,8 @@ self: {
          base directory filepath hakyll pandoc process
        ];
        description = "A package allowing to write Hakyll blog posts in Rmd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113300,8 +113760,8 @@ self: {
          transformers xhtml
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113318,8 +113778,8 @@ self: {
          pandoc pandoc-types process text
        ];
        description = "Hakyll extension for rendering Coq code using Alectryon";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113331,8 +113791,8 @@ self: {
        sha256 = "11dl3rqls2yxkmycx63xr1cix4adk6b29sbwr4v5n48bqamr7p1j";
        libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        description = "Blaze templates for Hakyll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113348,8 +113808,8 @@ self: {
        libraryHaskellDepends = [ base hakyll pandoc ];
        executableHaskellDepends = [ base directory filepath hakyll ];
        description = "Extra modules for the hakyll website compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113366,8 +113826,8 @@ self: {
        ];
        testHaskellDepends = [ base blaze-html bytestring cassava hspec ];
        description = "Generate Html tables from Csv files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113386,8 +113846,8 @@ self: {
        ];
        executableHaskellDepends = [ base hakyll ];
        description = "Compile Elm code for inclusion in Hakyll static site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113399,8 +113859,8 @@ self: {
        sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam";
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        description = "automatic hyphenation for Hakyll";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113426,7 +113886,7 @@ self: {
        ];
        description = "A Hakyll library for internationalization";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-contrib-links" = callPackage
@@ -113445,8 +113905,8 @@ self: {
          base binary QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A hakyll library that helps maintain a separate links database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113460,8 +113920,8 @@ self: {
        pname = "hakyll-convert";
        version = "0.3.0.3";
        sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf";
-       revision = "1";
-       editedCabalFile = "1qp2lr6pq6xiw5g7srr2bkg4nj7zrywgrdhly2alk91ix0vxqrmp";
+       revision = "2";
+       editedCabalFile = "0jzc6c8z173mcvrndxny5dx24mx5p10p7pkp68lkl1jl135np6bp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113477,7 +113937,7 @@ self: {
          temporary text time xml-types
        ];
        description = "Convert from other blog engines to Hakyll";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hakyll-dhall" = callPackage
@@ -113497,8 +113957,8 @@ self: {
        ];
        executableHaskellDepends = [ base dhall hakyll ];
        description = "Dhall compiler for Hakyll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113513,8 +113973,8 @@ self: {
          base containers data-default filepath hakyll
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113529,7 +113989,7 @@ self: {
          base blaze-html blaze-markup Elm hakyll mtl
        ];
        description = "Hakyll wrapper for the Elm compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hakyll-favicon" = callPackage
@@ -113543,8 +114003,8 @@ self: {
        libraryHaskellDepends = [ base filepath hakyll ];
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113559,8 +114019,8 @@ self: {
          base filestore hakyll time time-locale-compat
        ];
        description = "FileStore utilities for Hakyll";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113582,8 +114042,8 @@ self: {
          JuicyPixels JuicyPixels-extra tasty tasty-hunit
        ];
        description = "Hakyll utilities to work with images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113595,8 +114055,8 @@ self: {
        sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d";
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        description = "Integrate ogmarkup document with Hakyll";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113608,8 +114068,8 @@ self: {
        sha256 = "03s51ql10g6vjsrzwxa2jwff4wckp7vf3sg9r6hdsbh30l4720il";
        libraryHaskellDepends = [ base bytestring hakyll typed-process ];
        description = "Hakyll compiler for arbitrary external processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113625,8 +114085,8 @@ self: {
          aeson-pretty base data-default-class filepath hakyll hsass
        ];
        description = "Hakyll SASS compiler over hsass";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113638,8 +114098,8 @@ self: {
        sha256 = "1c86lzfri5s3xzh5qyw1rpbv1wag26vbxl7pbcmjl25ad380riax";
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113657,8 +114117,8 @@ self: {
          base blaze-html containers hakyll shakespeare text
        ];
        description = "Hakyll Hamlet compiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113680,8 +114140,8 @@ self: {
          regex-posix split tasty tasty-hunit tasty-quickcheck
        ];
        description = "A shortcode extension module for Hakyll";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113691,15 +114151,15 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-shortcut-links";
-       version = "0.1.0.0";
-       sha256 = "0zhz0yixcv9xabr47rpcncxg3bwjx7la0g0hx37qfws5aqlvsz4v";
+       version = "0.1.0.1";
+       sha256 = "0dk30mw5jk14my7b3j5s0z89z2bwc6a6yxc7sl1c1k71zl56zm39";
        libraryHaskellDepends = [
          base hakyll mtl pandoc-types parsec shortcut-links text
        ];
        testHaskellDepends = [ base hspec mtl pandoc text ];
        description = "Use shortcut-links in markdown file for Hakyll";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113716,29 +114176,31 @@ self: {
        ];
        testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
        description = "Typescript and javascript hakyll compilers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "hal" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
-     , containers, envy, exceptions, http-client, http-conduit
-     , http-types, mtl, text, time
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, conduit, conduit-extra, containers, envy
+     , exceptions, http-client, http-conduit, http-types, mtl, text
+     , time, unordered-containers
      }:
      mkDerivation {
        pname = "hal";
-       version = "0.4.5";
-       sha256 = "01qs6bw9fg86vs122nyamfq29g9l3hr8m1bmrmsn0iinrhzisasp";
+       version = "0.4.6";
+       sha256 = "07xzkb9yavrh17d64gm3pc08jr8cb53lm5fdw6apcn7826ys76vh";
        revision = "1";
-       editedCabalFile = "1i2fqq0bwmsibfyk7v5nd2myb0sxlkv3xy93ypsfdx6nrsnbb4vq";
+       editedCabalFile = "01mx3i40i3xhn9i1bbdppp20df2l305zgzl9r4y02dfzcsy3xff5";
        libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra containers envy
-         exceptions http-client http-conduit http-types mtl text time
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         conduit-extra containers envy exceptions http-client http-conduit
+         http-types mtl text time unordered-containers
        ];
        description = "A runtime environment for Haskell applications running on AWS Lambda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113767,22 +114229,26 @@ self: {
          test-framework-hunit
        ];
        description = "A tool to generate missing import statements for Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "half" = callPackage
-    ({ mkDerivation, base, deepseq, hspec, QuickCheck, template-haskell
+    ({ mkDerivation, base, binary, bytestring, deepseq, QuickCheck
+     , template-haskell, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "half";
-       version = "0.3";
-       sha256 = "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6";
-       libraryHaskellDepends = [ base deepseq template-haskell ];
-       testHaskellDepends = [ base hspec QuickCheck ];
+       version = "0.3.1";
+       sha256 = "1l8m2spqg0ac50qys2jk5b32v6wxklbbk5ypjp3ga6z14hkw7bz2";
+       libraryHaskellDepends = [ base binary deepseq template-haskell ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
        description = "Half-precision floating-point";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "halfs" = callPackage
@@ -113805,8 +114271,8 @@ self: {
          fingertree HFuse mtl QuickCheck random time unix
        ];
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113821,7 +114287,7 @@ self: {
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        description = "Haskell Static Web Page Generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113851,8 +114317,8 @@ self: {
          time
        ];
        description = "A live recompiler";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113869,8 +114335,8 @@ self: {
          base doctest hspec matrix matrix-as-xyz parsec QuickCheck
        ];
        description = "Symmetry operations generater of Hall Symbols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113891,8 +114357,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Library implementing Halma rules";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113911,8 +114377,8 @@ self: {
          gtk halma mtl mvc pipes timeit
        ];
        description = "GTK application for playing Halma";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113937,8 +114403,8 @@ self: {
          vector
        ];
        description = "Telegram bot for playing Halma";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113952,7 +114418,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hint process ];
        description = "looks for functions given a set of example input/outputs";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "halves" = callPackage
@@ -113964,8 +114430,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base hedgehog lens ];
        description = "Split or combine data structures to and from halves, quarters, eighths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113985,8 +114451,8 @@ self: {
          mime-types network-uri simple-tar text XenDevice
        ];
        description = "A simple, static HaLVM web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {HALVMCore = null; XenDevice = null;};
 
@@ -114013,7 +114479,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114025,7 +114491,7 @@ self: {
        sha256 = "19792k9pwpkqwqznxm00nbq22swnayz7fv60ly0wsw5zmf1g6wv8";
        libraryHaskellDepends = [ base HCodecs newtype ];
        description = "Binding to the OS level Midi services (fork of system-midi)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hamilton" = callPackage
@@ -114050,7 +114516,7 @@ self: {
          vector-sized vty
        ];
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hamlet" = callPackage
@@ -114062,7 +114528,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Haml-like template files that are compile-time checked (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hampp" = callPackage
@@ -114080,8 +114546,8 @@ self: {
          preprocessor-tools
        ];
        description = "Haskell macro preprocessor";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114105,8 +114571,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114120,8 +114586,8 @@ self: {
        editedCabalFile = "1dik6zsi0x310m2x9qy64c0b4bd2gag1l6v1nsh09xqj7vlfpp5v";
        libraryHaskellDepends = [ array base deepseq hashable ];
        description = "A purely functional and persistent hash map";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114143,7 +114609,7 @@ self: {
          optparse-applicative resourcet stm-conduit unix
        ];
        description = "Intel AMT serial-over-lan (SOL) client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hamusic" = callPackage
@@ -114162,8 +114628,8 @@ self: {
        ];
        executableHaskellDepends = [ filepath ];
        description = "Library to handle abstract music";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114176,21 +114642,21 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base text ];
        description = "Convert Halfwidth Katakana to Fullwidth Katakana";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hanabi-dealer" = callPackage
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "hanabi-dealer";
-       version = "0.10.2.0";
-       sha256 = "0axqpa1p7lzxym8nyppc3nhbfzis8y71ywi444v3w6syyvh06ygf";
+       version = "0.11.0.1";
+       sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
        description = "Hanabi card game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114202,7 +114668,7 @@ self: {
        sha256 = "1ldfq3y9h9wvhqd3qs99hdi0d02016s7vkmf74p6wppkrzgfs3xn";
        libraryHaskellDepends = [ base ];
        description = "This package is deprecated. It formerly contained Haskell utilities for data structures and data manipulation.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "handa-gdata" = callPackage
@@ -114231,8 +114697,8 @@ self: {
          split time unix-compat utf8-string xml
        ];
        description = "Library and command-line utility for accessing Google services and APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114252,7 +114718,7 @@ self: {
          aeson base bytestring containers scientific
        ];
        description = "Geographic and Geometric Data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "handa-opengl" = callPackage
@@ -114268,7 +114734,7 @@ self: {
          split vector-space
        ];
        description = "Utility functions for OpenGL and GLUT";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "handle-like" = callPackage
@@ -114279,8 +114745,8 @@ self: {
        sha256 = "1h3wl4pqnz53ijrw8656j1rgfj61adzvgxm0qvg74wl3hi83xkgd";
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114301,8 +114767,8 @@ self: {
          base bytestring tasty tasty-hunit tasty-th
        ];
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114326,7 +114792,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "API Client for the handwriting.io API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hangman" = callPackage
@@ -114340,7 +114806,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl random utility-ht ];
        description = "Hangman implementation in Haskell written in two hours";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hannahci" = callPackage
@@ -114361,8 +114827,8 @@ self: {
          wai-middleware-static yaml
        ];
        description = "Simple Continuous Integration/Deployment System";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114386,8 +114852,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Network Stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114399,8 +114865,8 @@ self: {
        sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s";
        libraryHaskellDepends = [ base bytestring hans pcap ];
        description = "Driver for real ethernet devices for HaNS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114412,8 +114878,8 @@ self: {
        sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b";
        libraryHaskellDepends = [ base bytestring hans pfq ];
        description = "Driver for real ethernet devices for HaNS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pfq = null;};
 
@@ -114445,8 +114911,8 @@ self: {
          split text transformers unix utf8-string
        ];
        description = "Korean spell checker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114465,8 +114931,8 @@ self: {
          base checkers hspec QuickCheck quickcheck-text text
        ];
        description = "Graphviz code generation with Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114497,7 +114963,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "happindicator" = callPackage
@@ -114515,8 +114981,8 @@ self: {
        libraryPkgconfigDepends = [ libappindicator-gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libappindicator-gtk2;};
 
@@ -114531,8 +114997,8 @@ self: {
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        description = "Binding to the appindicator library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libappindicator-gtk3;};
 
@@ -114551,7 +115017,7 @@ self: {
        ];
        description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114574,7 +115040,7 @@ self: {
        ];
        description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114588,8 +115054,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114603,8 +115069,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring HAppS-Server hsp mtl plugins
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114621,8 +115087,8 @@ self: {
          hsp mtl network plugins RJson
        ];
        description = "Utilities for using HSP templates in HAppS applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114647,8 +115113,8 @@ self: {
          syb
        ];
        description = "A Happstack Tutorial that is its own web 2.0-type demo.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114663,8 +115129,8 @@ self: {
        libraryHaskellDepends = [ base happstack-server ];
        doHaddock = false;
        description = "The haskell application server stack + code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114683,8 +115149,8 @@ self: {
          random
        ];
        description = "A Happstack Authentication Suite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114714,8 +115180,8 @@ self: {
          web-routes-happstack web-routes-hsp web-routes-th
        ];
        description = "Happstack Authentication Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114732,7 +115198,7 @@ self: {
          mtl safecopy transformers-base
        ];
        description = "client-side session data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-contrib" = callPackage
@@ -114752,8 +115218,8 @@ self: {
          old-time syb unix
        ];
        description = "Web related tools and services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114775,8 +115241,8 @@ self: {
          syb-with-class-instances-text template-haskell text time
        ];
        description = "Happstack data manipulation libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114794,8 +115260,8 @@ self: {
          happstack-server mtl random template-haskell time xhtml
        ];
        description = "Cross-request user interactions for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114821,8 +115287,8 @@ self: {
          web-routes-mtl
        ];
        description = "A package for building Facebook applications using Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114839,7 +115305,7 @@ self: {
          utf8-string
        ];
        description = "Happstack extension for use with FastCGI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-fay" = callPackage
@@ -114854,8 +115320,8 @@ self: {
          aeson base fay happstack-fay-ajax happstack-server mtl
        ];
        description = "Support for using Fay with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114868,8 +115334,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Support for using Fay with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114890,8 +115356,8 @@ self: {
          web-routes web-routes-happstack web-routes-hsp web-routes-th
        ];
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114903,8 +115369,8 @@ self: {
        sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
        description = "Support for Hamlet HTML templates in Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114921,8 +115387,8 @@ self: {
          heist mtl text
        ];
        description = "Support for using Heist templates in Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114946,8 +115412,8 @@ self: {
          text utf8-string
        ];
        description = "Convenience functions for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114964,7 +115430,7 @@ self: {
          utf8-string
        ];
        description = "Support for using HSP templates in Happstack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-hstringtemplate" = callPackage
@@ -114979,8 +115445,8 @@ self: {
          base bytestring happstack-server hslogger HStringTemplate mtl
        ];
        description = "Support for using HStringTemplate in Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114999,8 +115465,8 @@ self: {
          syb-with-class template-haskell
        ];
        description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115018,8 +115484,8 @@ self: {
          jmacro text utf8-string wl-pprint-text
        ];
        description = "Support for using JMacro with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115033,8 +115499,8 @@ self: {
          base bytestring happstack-server mtl text
        ];
        description = "Happstack minus the useless stuff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115050,8 +115516,8 @@ self: {
          base happstack-server monad-peel mtl transformers
        ];
        description = "monad-peel instances for Happstack types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115067,8 +115533,8 @@ self: {
          base happstack-server mtl plugins-auto template-haskell th-lift
        ];
        description = "The haskell application server stack + reload";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115097,7 +115563,7 @@ self: {
          base bytestring containers HUnit parsec zlib
        ];
        description = "Web related tools and services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -115115,7 +115581,7 @@ self: {
        ];
        librarySystemDepends = [ openssl ];
        description = "extend happstack-server with https:// support (TLS/SSL)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
@@ -115132,8 +115598,8 @@ self: {
          happstack-server hslogger network sendfile time tls unix
        ];
        description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115154,8 +115620,8 @@ self: {
          stm syb template-haskell unix
        ];
        description = "Event-based distributed state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115171,7 +115637,7 @@ self: {
          base containers happstack-server list-tries transformers
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-util" = callPackage
@@ -115194,8 +115660,8 @@ self: {
          template-haskell time unix unix-compat
        ];
        description = "Web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115217,8 +115683,8 @@ self: {
          web-routes-happstack web-routes-th
        ];
        description = "Utilities for using YUI3 with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115238,8 +115704,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
        description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "happy" = callPackage
@@ -115254,7 +115720,7 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
        description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "happy-dot" = callPackage
@@ -115272,7 +115738,7 @@ self: {
          array base clock language-dot transformers xml
        ];
        description = "Parser for dot made with happy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "happy-hour" = callPackage
@@ -115283,8 +115749,8 @@ self: {
        sha256 = "1pj61x1ynspk3avfsy9735blzggz78r4b35gin1bza619gp9yzsb";
        libraryHaskellDepends = [ base Chart Chart-diagrams ];
        description = "Generate simple okay-looking bar plots without much effort";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115301,7 +115767,7 @@ self: {
        ];
        libraryToolDepends = [ happy ];
        description = "Quasi-quoter for Happy parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happybara" = callPackage
@@ -115317,8 +115783,8 @@ self: {
          time transformers transformers-base
        ];
        description = "Acceptance test framework for web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115338,8 +115804,8 @@ self: {
          process text time transformers transformers-base vector word8
        ];
        description = "WebKit Happybara driver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115351,8 +115817,8 @@ self: {
        sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi";
        libraryHaskellDepends = [ base directory filepath process ];
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115371,8 +115837,8 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Capstone bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) capstone;};
 
@@ -115388,8 +115854,8 @@ self: {
          base containers parsec split tagsoup text transformers
        ];
        description = "jQuery for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115411,8 +115877,8 @@ self: {
          QuickCheck random template-haskell vector
        ];
        description = "A Haskell implementation of the Quil instruction set for quantum computing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115427,7 +115893,7 @@ self: {
          aeson base bytestring directory filepath text
        ];
        description = "HAR spec in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "harchive" = callPackage
@@ -115446,7 +115912,7 @@ self: {
        executableSystemDepends = [ openssl sqlite ];
        description = "Networked content addressed backup and restore software";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
@@ -115464,8 +115930,8 @@ self: {
          mtl operational-alacarte pretty syntactic
        ];
        description = "Deep embedding of hardware descriptions with code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115486,8 +115952,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Haskell program configuration using higher kinded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115507,7 +115973,7 @@ self: {
        ];
        description = "A Gentoo package query tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115533,8 +115999,8 @@ self: {
          base containers derive hlint hslogger hspec HUnit QuickCheck
        ];
        description = "A web service specification compiler that generates implementation and tests";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115551,8 +116017,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) groonga;};
 
@@ -115571,8 +116037,8 @@ self: {
          scotty text time transformers wai-extra
        ];
        description = "Yet another Groonga http server";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115584,7 +116050,7 @@ self: {
        sha256 = "0n30bvpfijaji8p2lk3vc0dfcgd2sclwakvbi31jma4z1i03k89q";
        libraryHaskellDepends = [ base ];
        description = "HaRP allows pattern-matching with regular expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "harpy" = callPackage
@@ -115600,8 +116066,8 @@ self: {
          template-haskell
        ];
        description = "Runtime code generation for x86 machine code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115622,8 +116088,8 @@ self: {
          aeson base bytestring file-embed hspec time
        ];
        description = "Bindings for Harvest API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115637,8 +116103,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Entity based records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115650,8 +116116,8 @@ self: {
        sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4";
        libraryHaskellDepends = [ base has template-haskell ];
        description = "Template Haskell function for Has records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115662,8 +116128,10 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.4.3";
-       sha256 = "1sfnr6qrv95ryf6c4hpj3vj8v6y64qjjd2fnz4x9i37win9wcb1z";
+       version = "0.1.4.4";
+       sha256 = "0kk1lamyms1mf8d290c3asnvgk51i8sqj810whms2a5346w9n4ll";
+       revision = "1";
+       editedCabalFile = "1bnbhq6k2af08riyaplfgm2lzghhi3nc0ijiw0yk1y5pq618zhxy";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default mtl network text
@@ -115672,8 +116140,8 @@ self: {
          base bytestring containers hspec QuickCheck text
        ];
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115699,8 +116167,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Extras for hasbolt library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115742,7 +116210,7 @@ self: {
          base bytestring conduit cryptohash hex path
        ];
        description = "Decompress SAPCAR archives";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "hascard" = callPackage
@@ -115777,8 +116245,8 @@ self: {
          tasty-quickcheck text vector vty word-wrap
        ];
        description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115800,8 +116268,8 @@ self: {
          network safe-exceptions stm template-haskell uuid
        ];
        description = "Cassandra driver for haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115821,7 +116289,7 @@ self: {
        ];
        description = "Hascat Web Server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hascat-lib" = callPackage
@@ -115839,7 +116307,7 @@ self: {
        ];
        description = "Hascat Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hascat-setup" = callPackage
@@ -115861,7 +116329,7 @@ self: {
        doHaddock = false;
        description = "Hascat Installation helper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hascat-system" = callPackage
@@ -115878,7 +116346,7 @@ self: {
        ];
        description = "Hascat System Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hash" = callPackage
@@ -115896,8 +116364,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Hashing tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115913,7 +116381,7 @@ self: {
          base base16-bytestring blake2 bytestring directory filepath
        ];
        description = "Hash as cache";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "hash-tree" = callPackage
@@ -115932,7 +116400,7 @@ self: {
          memory QuickCheck
        ];
        description = "Merkle Hash Tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashable" = callPackage
@@ -115959,7 +116427,7 @@ self: {
          base bytestring criterion ghc-prim integer-gmp siphash text
        ];
        description = "A class for types that can be converted to a hash value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashable-accelerate" = callPackage
@@ -115970,8 +116438,8 @@ self: {
        sha256 = "04cfwd1vyz4xm87ah3x1avs2yzqi6ygcd3sl70v50g492dfl6738";
        libraryHaskellDepends = [ accelerate base template-haskell ];
        description = "A class for types which can be converted into a hash value";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hashable-extras" = callPackage
@@ -115990,8 +116458,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Higher-rank Hashable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116010,8 +116478,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        description = "Automatically generates Hashable instances with GHC.Generics.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116025,8 +116493,8 @@ self: {
        editedCabalFile = "00ngp3hqp3i0xbx00vdgv92pq0n1q5dffjfjni5bnb3rzlafsvvl";
        libraryHaskellDepends = [ base hashable sorted-list time ];
        description = "Provides instances missing from Hashable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116040,7 +116508,7 @@ self: {
        editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashabler" = callPackage
@@ -116058,8 +116526,8 @@ self: {
          template-haskell text
        ];
        description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116078,8 +116546,8 @@ self: {
          extensible-exceptions filepath mmap mtl zlib
        ];
        description = "Hashed file storage support code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116093,8 +116561,8 @@ self: {
        editedCabalFile = "16lgwd9wsjbqjbibg1qmgbb24r6x2rcsihc205cddjs3qxk8mkdc";
        libraryHaskellDepends = [ base containers simple-money ];
        description = "A library for working with HashFlare.io contracts and hashrates";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116107,7 +116575,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers split ];
        testHaskellDepends = [ base bytestring containers split ];
        description = "Hashids generates short, unique, non-sequential ids from numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hashing" = callPackage
@@ -116130,7 +116598,7 @@ self: {
          array base bytestring cryptonite mtl QuickCheck template-haskell
        ];
        description = "A pure haskell library implements several hash algorithms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hashmap" = callPackage
@@ -116141,7 +116609,7 @@ self: {
        sha256 = "0ma7svf9nanlfbj9nkk6bzk4m98i7xd71xrdc3a5dmmws5yba1nw";
        libraryHaskellDepends = [ base containers deepseq hashable ];
        description = "Persistent containers Map and Set based on hashing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashmap-throw" = callPackage
@@ -116152,7 +116620,7 @@ self: {
        sha256 = "0dibdmpb6nyhn37xfdw8wgam4a2w8b3hl04ivg08d1ybq4a4m1k5";
        libraryHaskellDepends = [ base exceptions hashable hashmap ];
        description = "Throw behaviour for hashmap lookup";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hashrename" = callPackage
@@ -116168,7 +116636,7 @@ self: {
          base bytestring cryptohash directory filepath
        ];
        description = "Rename every file in a directory with his SHA1 hash";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hashring" = callPackage
@@ -116184,8 +116652,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Efficient consistent hashing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116204,7 +116672,7 @@ self: {
          unordered-containers
        ];
        description = "Benchmark of hash table implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashtables" = callPackage
@@ -116225,7 +116693,7 @@ self: {
          vector
        ];
        description = "Mutable hash tables in the ST monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashtables-plus" = callPackage
@@ -116246,8 +116714,8 @@ self: {
          transformers
        ];
        description = "Extensions for a \"hashtables\" library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116259,8 +116727,8 @@ self: {
        sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Process-Based Discrete Event Simulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116278,8 +116746,8 @@ self: {
          base constraints ghc-prim reflection tagged transformers void
        ];
        description = "Categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116298,8 +116766,8 @@ self: {
          regex-compat xhtml
        ];
        description = "Generate homepages for cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116318,7 +116786,7 @@ self: {
        ];
        description = "Utility to generate bindings for BlackBerry Cascades";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskakafka" = callPackage
@@ -116342,7 +116810,7 @@ self: {
          base bytestring containers either-unwrap hspec regex-posix
        ];
        description = "Kafka bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
@@ -116362,7 +116830,7 @@ self: {
        ];
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskarrow" = callPackage
@@ -116379,8 +116847,8 @@ self: {
          base cmdargs containers cpphs directory her-lexer split
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116401,8 +116869,8 @@ self: {
          http-types monads-tf stm text wai warp
        ];
        description = "Easily-extensible chatbot for Slack messaging service";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116427,8 +116895,8 @@ self: {
          transformers unix-compat
        ];
        description = "Computes and audits file hashes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116447,7 +116915,7 @@ self: {
          process-extras text
        ];
        description = "Generate tags file for Haskell project and its nearest deps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskeem" = callPackage
@@ -116466,19 +116934,19 @@ self: {
        ];
        description = "A small scheme interpreter";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
-  "haskeline_0_8_1_0" = callPackage
+  "haskeline_0_8_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , exceptions, filepath, HUnit, process, stm, terminfo, text
      , transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
-       version = "0.8.1.0";
-       sha256 = "0r6skxr45k0qq5vlh9dyl5g5ham994b8z0k3z3v56bi3npvyi6xw";
+       version = "0.8.1.1";
+       sha256 = "1cg51rbhpa7ism0rg39dw7njz4r3q5h5pnysnbc37dh6gcdiyg2p";
        configureFlags = [ "-fterminfo" ];
        isLibrary = true;
        isExecutable = true;
@@ -116491,8 +116959,8 @@ self: {
          base bytestring containers HUnit process text unix
        ];
        description = "A command-line interface for user input, written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskeline-class" = callPackage
@@ -116503,8 +116971,8 @@ self: {
        sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
        libraryHaskellDepends = [ base haskeline mtl ];
        description = "Class interface for working with Haskeline";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116515,7 +116983,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "0bbjbrhxdms8wbv1dh129l2pkqw5rfva26121ayfx5vr8h7aa7zf";
        libraryHaskellDepends = [ ansi-terminal base haskeline mtl safe ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskelisp" = callPackage
@@ -116528,8 +116996,8 @@ self: {
        editedCabalFile = "0h900mw5kzd9fvywpbhfd9acnfwp3qk7nfi9yr9ibamjb8s87cm1";
        libraryHaskellDepends = [ base containers mtl protolude text ];
        description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116555,8 +117023,8 @@ self: {
          base binary bytestring foundation lens text
        ];
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116579,8 +117047,8 @@ self: {
          xml2json
        ];
        description = "haskell client of aliyun service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116613,8 +117081,8 @@ self: {
          transformers
        ];
        description = "Transform text from the command-line using Haskell expressions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116627,7 +117095,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring QuickCheck random ];
        description = "A bcrypt implementation for haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-bitmex-client" = callPackage
@@ -116653,8 +117121,8 @@ self: {
          http-client-tls katip mtl text time websockets
        ];
        description = "Complete BitMEX Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116682,8 +117150,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated bitmex API Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116703,8 +117171,8 @@ self: {
          base bytestring mtl QuickCheck tasty tasty-quickcheck tasty-th
        ];
        description = "BrainFuck interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116735,8 +117203,8 @@ self: {
        ];
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116757,8 +117225,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory process ];
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116770,8 +117238,8 @@ self: {
        sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
        libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116791,8 +117259,8 @@ self: {
          base bimap boolean-list bytestring containers
        ];
        description = "compress files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116808,8 +117276,8 @@ self: {
          base containers lens pretty-show protolude split text
        ];
        description = "Core Types for NLP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116821,8 +117289,8 @@ self: {
        sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn";
        libraryHaskellDepends = [ base deepseq ];
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116837,7 +117305,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base unix ];
        description = "Haskell implementation of the DAP interface data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-debug-adapter" = callPackage
@@ -116872,8 +117340,8 @@ self: {
          process resourcet safe-exceptions text
        ];
        description = "Haskell Debug Adapter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116890,8 +117358,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Client library for the Disque datastore";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116914,8 +117382,8 @@ self: {
        executableHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base ];
        description = "A program to find and display the docs and type of a name";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116928,8 +117396,8 @@ self: {
        libraryHaskellDepends = [ base eigen vector ];
        testHaskellDepends = [ base eigen vector ];
        description = "Some utility functions for haskell-eigen library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116942,7 +117410,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base syb template-haskell ];
        description = "Simple parser parser from Haskell to TemplateHaskell expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-fake-user-agent" = callPackage
@@ -116955,7 +117423,7 @@ self: {
        editedCabalFile = "03pqk1bc2j5xfchwmccbyq2sa57fy7w3ky6apa0wjr4zwni17pb5";
        libraryHaskellDepends = [ base bytestring lens tagsoup wreq ];
        description = "Simple library for retrieving current user agent strings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "haskell-formatter" = callPackage
@@ -116982,8 +117450,8 @@ self: {
          QuickCheck tasty tasty-hunit
        ];
        description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117010,8 +117478,8 @@ self: {
          system-filepath text transformers transformers-base unix
        ];
        description = "A Haskell ftp server with configurable backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117028,8 +117496,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Typesafe generation of haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117051,7 +117519,7 @@ self: {
          base filepath haskell-src-exts old-locale time uniplate
        ];
        description = "GetText runtime library implementation in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-gi" = callPackage
@@ -117073,7 +117541,7 @@ self: {
        libraryPkgconfigDepends = [ glib gobject-introspection ];
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
@@ -117085,7 +117553,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "haskell-gi-overloading" = callPackage
@@ -117096,7 +117564,7 @@ self: {
        sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry";
        doHaddock = false;
        description = "Overloading support for haskell-gi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-go-checkers" = callPackage
@@ -117109,8 +117577,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers gloss ];
        description = "Go and Checkers game in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117129,7 +117597,7 @@ self: {
          tagsoup text wreq
        ];
        description = "Simple library for accessing Google Trends";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "haskell-holes-th" = callPackage
@@ -117141,8 +117609,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base template-haskell transformers ];
        description = "Infer haskell code by given type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117165,8 +117633,8 @@ self: {
          tasty-hunit
        ];
        description = "Bindings to the igraph C library (v0.8.0).";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117185,7 +117653,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "create haskell import graph for graphviz";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-in-space" = callPackage
@@ -117198,8 +117666,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HGL random ];
        description = "'Asteroids' arcade games";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117219,8 +117687,8 @@ self: {
          servant-client split text unordered-containers vector wai
        ];
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117232,7 +117700,7 @@ self: {
        sha256 = "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii";
        libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-lsp" = callPackage
@@ -117261,10 +117729,10 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_23_0_0" = callPackage
+  "haskell-lsp_0_24_0_0" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hashable
      , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
@@ -117273,8 +117741,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.23.0.0";
-       sha256 = "07vyfqqvgaxg06yrawiwfffv511jlamhh4p7i0hwx60xdgpg11xh";
+       version = "0.24.0.0";
+       sha256 = "0gw289wy91h0qv4filw3glw3rrjvmr5j591wrdiwc1bl3w56bpig";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117290,8 +117758,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskell-lsp-client" = callPackage
@@ -117311,8 +117779,8 @@ self: {
          base directory haskell-lsp lens process text unix
        ];
        description = "A haskell package to build your own Language Server client";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117330,25 +117798,25 @@ self: {
          lens network-uri scientific text unordered-containers
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
-  "haskell-lsp-types_0_23_0_0" = callPackage
+  "haskell-lsp-types_0_24_0_0" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, data-default
      , deepseq, filepath, hashable, lens, network-uri, scientific, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.23.0.0";
-       sha256 = "0dz0980681khfn229aky3bsclj86xkril2y0ln3wr7g9v77ypbq7";
+       version = "0.24.0.0";
+       sha256 = "1p7k2g2xs95ylsnnz2np0w8c7p5dzmlss41g0kzblaz5n3352kbn";
        libraryHaskellDepends = [
          aeson base binary bytestring data-default deepseq filepath hashable
          lens network-uri scientific text unordered-containers
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskell-menu" = callPackage
@@ -117359,7 +117827,7 @@ self: {
        sha256 = "18s8g82v3h4b7maz6di43vfym6d3w16j4rbh5sjh4ps26yjnnfy4";
        libraryHaskellDepends = [ base containers ];
        description = "A simple menu system for Haskell programs";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "haskell-ml" = callPackage
@@ -117378,8 +117846,8 @@ self: {
        executableHaskellDepends = [ base hmatrix random-shuffle ];
        testHaskellDepends = [ base MonadRandom ];
        description = "Machine learning in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117392,7 +117860,7 @@ self: {
        libraryHaskellDepends = [ array base bytestring cereal ];
        testHaskellDepends = [ array base bytestring cereal hspec ];
        description = "A cereal-based parser for the Modbus protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-mpfr" = callPackage
@@ -117404,7 +117872,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117424,7 +117892,7 @@ self: {
        librarySystemDepends = [ open-pal open-rte openmpi ];
        libraryToolDepends = [ c2hs ];
        description = "Distributed parallel programming in Haskell using MPI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
@@ -117447,7 +117915,7 @@ self: {
          tasty tasty-golden traverse-with-class
        ];
        description = "Name resolution library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -117478,8 +117946,8 @@ self: {
          unordered-containers vector
        ];
        description = "A Haskell neo4j client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117494,8 +117962,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "OpenFlow protocol in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117517,8 +117985,8 @@ self: {
          system-fileio system-filepath text turtle
        ];
        description = "Manage nix overrides for haskell packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117537,8 +118005,8 @@ self: {
          transformers transformers-compat
        ];
        description = "Haskell suite library for package management and integration with Cabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117558,8 +118026,8 @@ self: {
          old-locale poppler template-haskell time zlib
        ];
        description = "Tool for presenting PDF-based presentations";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117588,8 +118056,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "A test system for the Haskell Platform environment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117611,8 +118079,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A terminal music player based on afplay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117630,7 +118098,7 @@ self: {
        ];
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117646,8 +118114,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec inline-c text ];
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libpostal = null;};
 
@@ -117671,7 +118139,7 @@ self: {
          unordered-containers vector
        ];
        description = "A haskell library for PostGIS geometry types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-proxy-list" = callPackage
@@ -117689,7 +118157,7 @@ self: {
          text wreq
        ];
        description = "Simple library for retrieving proxy servers info from https://proxy-list.org";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "haskell-qrencode" = callPackage
@@ -117701,7 +118169,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ qrencode ];
        description = "Haskell bindings for libqrencode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) qrencode;};
 
   "haskell-read-editor" = callPackage
@@ -117713,8 +118181,8 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        testHaskellDepends = [ base directory hspec process ];
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117731,8 +118199,8 @@ self: {
          transformers
        ];
        description = "Reflect Haskell types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117744,8 +118212,8 @@ self: {
        sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6";
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117760,7 +118228,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Let the Haskell logo talk to your users!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-snake" = callPackage
@@ -117780,7 +118248,7 @@ self: {
          base containers lens linear mtl random sdl2 sdl2-ttf text vector
        ];
        description = "Snake game implemetation in Haskell using SDL2";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "haskell-spacegoo" = callPackage
@@ -117796,8 +118264,8 @@ self: {
          text vector vector-space
        ];
        description = "Client API for Rocket Scissor Spacegoo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117812,8 +118280,8 @@ self: {
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117834,7 +118302,7 @@ self: {
        ];
        doCheck = false;
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-src-exts-observe" = callPackage
@@ -117847,8 +118315,8 @@ self: {
        editedCabalFile = "1n4f4yylk09g95040g6pbcygzp95yadihv0sxr4sj87j0d4xa6fc";
        libraryHaskellDepends = [ base haskell-src-exts Hoed ];
        description = "Observable orphan instances for haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117862,8 +118330,8 @@ self: {
          base haskell-src-exts lens template-haskell
        ];
        description = "Prisms with newtype wrappers for haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117880,8 +118348,8 @@ self: {
        ];
        testHaskellDepends = [ base haskell-src-exts hspec ];
        description = "A quasiquoter for haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117895,8 +118363,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty print haskell code with comments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117908,7 +118376,7 @@ self: {
        sha256 = "1jfdjaikmjx9sfairp4jjn0vzhw5vhwrg43y082ddpc1bgx2jw7m";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -117924,7 +118392,7 @@ self: {
          transformers uniplate
        ];
        description = "Helper functions for working with haskell-src-exts trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-src-match" = callPackage
@@ -117944,8 +118412,8 @@ self: {
          base filepath hspec interpolatedstring-perl6 template-haskell text
        ];
        description = "Testing code generators piece by piece";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117967,7 +118435,7 @@ self: {
          template-haskell
        ];
        description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -117983,8 +118451,8 @@ self: {
          template-haskell
        ];
        description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118003,8 +118471,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec typed-process ];
        testToolDepends = [ hspec-discover ];
        description = "haskell-stack-trace-plugin";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118017,7 +118485,7 @@ self: {
        libraryHaskellDepends = [ base lens semigroups text time ];
        testHaskellDepends = [ base doctest ];
        description = "Some useful wrappers and functions for building time ranges";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-to-elm" = callPackage
@@ -118039,7 +118507,7 @@ self: {
          unordered-containers
        ];
        description = "Generate Elm types and JSON encoders and decoders from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-token-utils" = callPackage
@@ -118062,8 +118530,8 @@ self: {
          mtl pretty QuickCheck rosezipper semigroups syb uniplate
        ];
        description = "Utilities to tie up tokens to an AST";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118080,8 +118548,8 @@ self: {
          uniplate
        ];
        description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118099,8 +118567,8 @@ self: {
          safe split template-haskell uniplate
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118117,8 +118585,8 @@ self: {
          references
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118134,8 +118602,8 @@ self: {
          base containers ghc haskell-tools-ast mtl references uniplate
        ];
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118153,8 +118621,8 @@ self: {
          references safe split template-haskell transformers uniplate
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118186,8 +118654,8 @@ self: {
          template-haskell time transformers uniplate
        ];
        description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118223,8 +118691,8 @@ self: {
          time
        ];
        description = "Command-line frontend for Haskell-tools Refact";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118258,8 +118726,8 @@ self: {
          tasty-hunit
        ];
        description = "Background process for Haskell-tools that editors can connect to";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118284,8 +118752,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Debugging Tools for Haskell-tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118316,8 +118784,8 @@ self: {
          tasty-hunit websockets
        ];
        description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118348,8 +118816,8 @@ self: {
          template-haskell time transformers uniplate
        ];
        description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118366,8 +118834,8 @@ self: {
          uniplate
        ];
        description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118397,8 +118865,8 @@ self: {
          transformers uniplate
        ];
        description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118420,8 +118888,8 @@ self: {
          tasty tasty-hunit
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118455,8 +118923,8 @@ self: {
          test-framework-quickcheck2 time x509
        ];
        description = "A Haskell Tor Node";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118470,8 +118938,8 @@ self: {
          base containers haskell-src-exts pretty
        ];
        description = "A type checker for Haskell/haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118483,8 +118951,8 @@ self: {
        sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38";
        libraryHaskellDepends = [ base process ];
        description = "Simple TypeScript API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118496,8 +118964,8 @@ self: {
        sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97";
        libraryHaskellDepends = [ base binary bytestring network ];
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118540,7 +119008,7 @@ self: {
        executableHaskellDepends = [ base hspec text ];
        executableToolDepends = [ hspec-discover ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell2010" = callPackage
@@ -118551,8 +119019,8 @@ self: {
        sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m";
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Compatibility with Haskell 2010";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118564,8 +119032,8 @@ self: {
        sha256 = "02amj6wza3aaw3i84yjh6zwn7v5g3v1d748ajc7gv6cpd4904pzq";
        libraryHaskellDepends = [ array base ];
        description = "Haskell 2020[draft] Standard Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118581,8 +119049,8 @@ self: {
          array base directory old-locale old-time process time
        ];
        description = "Compatibility with Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118598,8 +119066,8 @@ self: {
          array base directory old-locale old-time process time
        ];
        description = "Compatibility with Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118615,8 +119083,8 @@ self: {
          base containers directory mtl old-locale old-time pretty time
        ];
        description = "A library of combinators for generating and executing SQL statements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118628,8 +119096,8 @@ self: {
        sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl";
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
        description = "Bracketed HDBC session for HaskellDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118645,8 +119113,8 @@ self: {
          base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118663,8 +119131,8 @@ self: {
          MonadCatchIO-transformers transformers
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118681,8 +119149,8 @@ self: {
          MonadCatchIO-transformers transformers
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118699,8 +119167,8 @@ self: {
          monad-control transformers-base
        ];
        description = "Bracketed HaskellDB HDBC session using lifted-base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118715,8 +119183,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ];
        executableHaskellDepends = [ haskelldb ];
        description = "HaskellDB support for the dynamically loaded drivers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118734,8 +119202,8 @@ self: {
          base containers directory haskelldb mtl old-time
        ];
        description = "An experimental HaskellDB back-end in pure Haskell (no SQL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118751,8 +119219,8 @@ self: {
          base containers convertible haskelldb HDBC mtl old-time
        ];
        description = "HaskellDB support for HDBC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118770,8 +119238,8 @@ self: {
          base haskelldb haskelldb-hdbc HDBC HDBC-mysql mtl
        ];
        description = "HaskellDB support for the HDBC MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118789,8 +119257,8 @@ self: {
          base haskelldb haskelldb-hdbc HDBC HDBC-odbc mtl
        ];
        description = "HaskellDB support for the HDBC ODBC driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118809,8 +119277,8 @@ self: {
        ];
        executableSystemDepends = [ postgresql ];
        description = "HaskellDB support for the HDBC PostgreSQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -118828,8 +119296,8 @@ self: {
          base haskelldb haskelldb-hdbc HDBC HDBC-sqlite3 mtl
        ];
        description = "HaskellDB support for the HDBC SQLite driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118841,8 +119309,8 @@ self: {
        sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0";
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        description = "HaskellDB support for HSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118860,8 +119328,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-mysql mtl
        ];
        description = "HaskellDB support for the HSQL MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118879,8 +119347,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-odbc mtl
        ];
        description = "HaskellDB support for the HSQL ODBC driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118898,8 +119366,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-oracle mtl
        ];
        description = "HaskellDB support for the HSQL Oracle driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hsql-oracle = null;};
 
@@ -118917,8 +119385,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-postgresql mtl
        ];
        description = "HaskellDB support for the HSQL PostgreSQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118936,8 +119404,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-sqlite mtl
        ];
        description = "HaskellDB support for the HSQL SQLite driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hsql-sqlite = null;};
 
@@ -118955,8 +119423,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-sqlite3 mtl
        ];
        description = "HaskellDB support for the HSQL SQLite3 driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118968,8 +119436,8 @@ self: {
        sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb";
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        description = "Template Haskell utilities for HaskellDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118980,8 +119448,8 @@ self: {
        version = "1.0.0";
        sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
        description = "HaskellDB support for WXHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118997,8 +119465,8 @@ self: {
          base containers haskell-src-exts mtl template-haskell
        ];
        description = "For parsing Haskell-ish languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119022,8 +119490,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A scrabble library capturing the core game logic of scrabble";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119041,8 +119509,8 @@ self: {
          base cryptohash directory either filepath mtl process text
        ];
        description = "Command line tool for running Haskell scripts with a hashbang";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119075,7 +119543,7 @@ self: {
          vector
        ];
        description = "Elm to Haskell translation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskelzinc" = callPackage
@@ -119091,8 +119559,8 @@ self: {
          base containers directory filepath parsec pretty process
        ];
        description = "CP in Haskell through MiniZinc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119107,8 +119575,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Compiler from I- to S-Expressions for the Scheme Programming Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119136,8 +119604,8 @@ self: {
          vector
        ];
        description = "A transactional, ACID compliant, embeddable key-value store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119161,7 +119629,7 @@ self: {
          transformers vector
        ];
        description = "B+-tree implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskey-mtl" = callPackage
@@ -119181,8 +119649,8 @@ self: {
          transformers
        ];
        description = "A monad transformer supporting Haskey transactions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119194,8 +119662,8 @@ self: {
        sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz";
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        description = "Haskell game library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119212,8 +119680,8 @@ self: {
          text time unordered-containers
        ];
        description = "Haskell bindings to refheap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119233,8 +119701,8 @@ self: {
          th-lift unordered-containers
        ];
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119255,7 +119723,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Haskell Evaluation inside of LaTeX code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskmon" = callPackage
@@ -119271,8 +119739,8 @@ self: {
          vector
        ];
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119286,6 +119754,8 @@ self: {
        pname = "haskoin";
        version = "0.1.0.2";
        sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
+       revision = "1";
+       editedCabalFile = "0m1yd6l1amjrwdddrp5ddnazfzgjb6rndmw32pbpn5zim0r9i4rq";
        libraryHaskellDepends = [
          aeson base binary byteable bytestring containers cryptohash deepseq
          either json-rpc mtl pbkdf split text
@@ -119296,8 +119766,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Implementation of the Bitcoin protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119315,8 +119785,8 @@ self: {
          mtl network-bitcoin text transformers transformers-base
        ];
        description = "An adapter for haskoin to network-bitcoin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119348,8 +119818,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119372,8 +119842,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementation of Bitcoin cryptographic primitives";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119405,8 +119875,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "P2P library for Bitcoin and Bitcoin Cash";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119419,6 +119889,8 @@ self: {
        pname = "haskoin-protocol";
        version = "0.0.1.1";
        sha256 = "0r15csyylg5vd95z0spl5wkv6r8w7lpi983alsvlnkhv4dqnrg2v";
+       revision = "1";
+       editedCabalFile = "1smwy6g0fdwn04a9w5r7x0vhkylfmgrghlrnz93xxknv015a9f1z";
        libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-util QuickCheck
        ];
@@ -119427,8 +119899,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Implementation of the Bitcoin network protocol messages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119441,6 +119913,8 @@ self: {
        pname = "haskoin-script";
        version = "0.0.1";
        sha256 = "18lw5hxwvj4ichw1k4a35hjih7h0hd24khvl4m0yf2cq12m2gl11";
+       revision = "1";
+       editedCabalFile = "1438w0wijmifgcdzs5xg146f1vcm23iab9r07f19w3n21gcbvf94";
        libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-protocol haskoin-util
          mtl QuickCheck
@@ -119451,8 +119925,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementation of Bitcoin script parsing and evaluation";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119498,8 +119972,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119525,8 +119999,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Data for Haskoin Store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119539,6 +120013,8 @@ self: {
        pname = "haskoin-util";
        version = "0.0.1.1";
        sha256 = "0hh3vavqsp8pafw4nrv9py1kqcc1yx52zr80xsqzqjlsxq04fgfw";
+       revision = "1";
+       editedCabalFile = "1vfs64gbrbzi513sqalvpp4s0aff40d6gall301ipwpqfjz4jzzj";
        libraryHaskellDepends = [
          base binary bytestring either mtl QuickCheck
        ];
@@ -119547,8 +120023,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Utility functions for the Network.Haskoin project";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119591,8 +120067,8 @@ self: {
          unordered-containers
        ];
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119611,7 +120087,7 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119628,7 +120104,7 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119647,7 +120123,7 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119673,7 +120149,7 @@ self: {
        ];
        description = "The Haskore Computer Music System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119692,7 +120168,7 @@ self: {
        ];
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119715,7 +120191,7 @@ self: {
        ];
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119736,7 +120212,7 @@ self: {
        ];
        description = "Music rendering coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119748,7 +120224,7 @@ self: {
        sha256 = "1aq8lwyj4whz4llkwgx7n44rnrhk6ykyi8cpb0cjsabk3h29mm0b";
        libraryHaskellDepends = [ base ];
        description = "The February 2000 version of Haskore";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskseg" = callPackage
@@ -119773,7 +120249,7 @@ self: {
          random-shuffle text vector zlib
        ];
        description = "Simple unsupervised segmentation model";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktags" = callPackage
@@ -119801,7 +120277,7 @@ self: {
          utf8-string
        ];
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch" = callPackage
@@ -119830,8 +120306,8 @@ self: {
        ];
        doHaddock = false;
        description = "Torch for tensors and neural networks in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119861,8 +120337,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Code generation tools for Hasktorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119879,7 +120355,7 @@ self: {
          base hasktorch-types-th hspec QuickCheck text
        ];
        description = "Testing library for Hasktorch's FFI bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-ffi-th" = callPackage
@@ -119897,8 +120373,8 @@ self: {
          base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text
        ];
        description = "Bindings to Torch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ATen = null;};
 
@@ -119921,8 +120397,8 @@ self: {
          hasktorch-types-thc hspec QuickCheck text
        ];
        description = "Bindings to Cutorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ATen = null;};
 
@@ -119951,8 +120427,8 @@ self: {
        ];
        doHaddock = false;
        description = "Core Hasktorch abstractions wrapping FFI bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119978,8 +120454,8 @@ self: {
        ];
        doHaddock = false;
        description = "Backpack signatures for Tensor operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119995,8 +120471,8 @@ self: {
          base hasktorch-signatures-types hasktorch-types-th
        ];
        description = "Functions to partially satisfy tensor signatures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120013,8 +120489,8 @@ self: {
        ];
        doHaddock = false;
        description = "Signatures for support tensors in hasktorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120029,7 +120505,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        doHaddock = false;
        description = "Core types for Hasktorch backpack signatures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-types-th" = callPackage
@@ -120043,7 +120519,7 @@ self: {
        libraryHaskellDepends = [ base inline-c ];
        libraryToolDepends = [ c2hs ];
        description = "C-types for Torch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-types-thc" = callPackage
@@ -120055,7 +120531,7 @@ self: {
        libraryHaskellDepends = [ base hasktorch-types-th inline-c ];
        libraryToolDepends = [ c2hs ];
        description = "C-types for Cutorch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-zoo" = callPackage
@@ -120075,8 +120551,8 @@ self: {
          vector
        ];
        description = "Neural architectures in hasktorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120101,8 +120577,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Haskus binary format manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120122,8 +120598,8 @@ self: {
          optparse-applicative optparse-simple process temporary text yaml
        ];
        description = "Haskus system build tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120146,8 +120622,8 @@ self: {
          base containers doctest tasty tasty-quickcheck
        ];
        description = "Haskus utility modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120164,8 +120640,8 @@ self: {
          haskus-utils-data template-haskell text
        ];
        description = "Compatibility modules with other external packages (ByteString, etc.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120183,8 +120659,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Haskus data utility modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120199,8 +120675,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Haskus types utility modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120223,8 +120699,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Variant and EADT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120241,8 +120717,8 @@ self: {
          haskus-utils-compat lucid text
        ];
        description = "Haskus web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120274,8 +120750,8 @@ self: {
          persistent-template split tagsoup text time utf8-string
        ];
        description = "HTTP server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120290,8 +120766,8 @@ self: {
        libraryHaskellDepends = [ base mtl old-time wtk ];
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120310,8 +120786,8 @@ self: {
          wtk-gtk
        ];
        description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120342,7 +120818,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion directory text ];
        description = "CSS Minifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasparql-client" = callPackage
@@ -120353,8 +120829,8 @@ self: {
        sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm";
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        description = "This package enables to write SPARQL queries to remote endpoints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120367,7 +120843,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ aspell ];
        description = "Haskell bindings to aspell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
@@ -120395,7 +120871,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "An efficient PostgreSQL driver with a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-backend" = callPackage
@@ -120411,8 +120887,8 @@ self: {
          vector
        ];
        description = "API for backends of \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120435,8 +120911,8 @@ self: {
          vector
        ];
        description = "Encodable and Decodable classes for hasql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120459,8 +120935,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "A declarative abstraction over PostgreSQL Cursor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120478,8 +120954,8 @@ self: {
          contravariant-extras hasql hasql-transaction transformers
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120500,8 +120976,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Toolkit for constructing Hasql statements dynamically";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120520,8 +120996,8 @@ self: {
          vector
        ];
        description = "Generic encoder and decoder deriving for Hasql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120538,7 +121014,7 @@ self: {
          time uuid vector
        ];
        description = "Implicit definitions for Hasql, such as default codecs for standard types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-migration" = callPackage
@@ -120558,7 +121034,7 @@ self: {
          base bytestring hasql hasql-transaction hspec transformers
        ];
        description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasql-notifications" = callPackage
@@ -120580,7 +121056,7 @@ self: {
        executableHaskellDepends = [ base hasql ];
        testHaskellDepends = [ base bytestring hasql hspec QuickCheck ];
        description = "LISTEN/NOTIFY support for Hasql";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasql-optparse-applicative" = callPackage
@@ -120595,7 +121071,7 @@ self: {
          base-prelude hasql hasql-pool optparse-applicative
        ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-pipes" = callPackage
@@ -120610,7 +121086,7 @@ self: {
          base bytestring-tree-builder hasql pipes pipes-safe protolude
        ];
        description = "A pipe to stream a postgres database cursor in the hasql ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasql-pool" = callPackage
@@ -120622,7 +121098,7 @@ self: {
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        testHaskellDepends = [ base-prelude hasql hspec ];
        description = "A pool of connections for Hasql";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -120657,8 +121133,8 @@ self: {
          QuickCheck quickcheck-instances scientific text time vector
        ];
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120673,8 +121149,8 @@ self: {
          base-prelude hasql-postgres optparse-applicative
        ];
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120709,8 +121185,8 @@ self: {
          resource-pool split stm text time tmp-postgres transformers
        ];
        description = "A PostgreSQL backed queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120727,8 +121203,8 @@ self: {
          unordered-containers vector
        ];
        description = "A somewhat opinionated \"simpler\" API to hasql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120747,8 +121223,8 @@ self: {
          text uuid vector
        ];
        description = "Template Haskell utilities for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120767,7 +121243,25 @@ self: {
        ];
        testHaskellDepends = [ async hasql rebase ];
        description = "Composable abstraction over retryable transactions for Hasql";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+     }) {};
+
+  "hasql-url" = callPackage
+    ({ mkDerivation, base, bytestring, hasql, network-uri, split, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "hasql-url";
+       version = "0.1.0.0";
+       sha256 = "12zsw4jag27g0bgxm9sp45bs2i7p5h42zs5avj01zlddpyhla0wx";
+       libraryHaskellDepends = [
+         base bytestring hasql network-uri split
+       ];
+       testHaskellDepends = [ base hasql tasty tasty-quickcheck ];
+       description = "Parse PostgreSQL connection URI into Hasql.Connection Settings";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasqly-mysql" = callPackage
@@ -120782,7 +121276,7 @@ self: {
          base binary bytestring dlist mtl mysql-haskell scientific text time
        ];
        description = "composable SQL generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hastache" = callPackage
@@ -120810,8 +121304,8 @@ self: {
          base bytestring directory HUnit mtl syb text
        ];
        description = "Haskell implementation of Mustache templates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120828,8 +121322,8 @@ self: {
          unordered-containers vector
        ];
        description = "render hastache templates using aeson values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120843,8 +121337,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base curl filepath mtl ];
        description = "A universal pastebin tool, written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120864,8 +121358,8 @@ self: {
          wai wai-websockets warp websockets
        ];
        description = "Framework for type-safe, distributed web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120893,8 +121387,8 @@ self: {
          unix utf8-string
        ];
        description = "Haskell To ECMAScript compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bin-package-db = null;};
 
@@ -120909,8 +121403,8 @@ self: {
          base data-default haste-compiler transformers
        ];
        description = "Google API bindings for the Haste compiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haste-lib" = callPackage
@@ -120928,8 +121422,8 @@ self: {
          utf8-string
        ];
        description = "Base libraries for haste-compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120944,8 +121438,8 @@ self: {
          base containers directory filepath haste-lib
        ];
        description = "A port of blaze-markup and blaze-html to Haste";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120957,8 +121451,8 @@ self: {
        sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
        libraryHaskellDepends = [ base haste-compiler transformers ];
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haste-prim" = callPackage
@@ -120969,8 +121463,8 @@ self: {
        sha256 = "1gmvvqy0xy396r3jnfmdhh70j7k73qs38cw9znwgl8jjywpzrmw5";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Low level primitives for the Haste compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120996,7 +121490,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A program to download subtitle files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasty-hamiltonian" = callPackage
@@ -121013,7 +121507,7 @@ self: {
        ];
        testHaskellDepends = [ ad base mwc-probability ];
        description = "Speedy traversal through parameter space";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hat" = callPackage
@@ -121037,7 +121531,7 @@ self: {
        ];
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hatex-guide" = callPackage
@@ -121053,8 +121547,8 @@ self: {
          transformers
        ];
        description = "HaTeX User's Guide";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121078,7 +121572,7 @@ self: {
        ];
        description = "XMPP client with 9P and (optionally) GTK interfaces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hath" = callPackage
@@ -121098,7 +121592,7 @@ self: {
          base cmdargs process split tasty tasty-hunit tasty-quickcheck
        ];
        description = "Hath manipulates network blocks in CIDR notation";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "hats" = callPackage
@@ -121128,8 +121622,8 @@ self: {
          async attoparsec base bytestring criterion random stm
        ];
        description = "Haskell client for the NATS messaging system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121152,8 +121646,8 @@ self: {
          base test-framework test-framework-quickcheck2
        ];
        description = "A truth table generator for classical propositional logic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121176,7 +121670,7 @@ self: {
          base http-client http-client-tls monad-logger text
        ];
        description = "Library for checking for weak/compromised passwords";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haven" = callPackage
@@ -121195,8 +121689,8 @@ self: {
          http-types mtl process SHA temporary transformers xml
        ];
        description = "Recursively retrieve maven dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121221,8 +121715,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Implementation of the rules of Love Letter";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121244,8 +121738,8 @@ self: {
          regex-tdfa SHA time utf8-string
        ];
        description = "A twitter client for GTK+. Beta version.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121271,8 +121765,8 @@ self: {
          text transformers
        ];
        description = "Haskell cash-flow and tax simulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121299,7 +121793,7 @@ self: {
          unordered-containers
        ];
        description = "A Haskell library for efficient, concurrent, and concise data access";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haxl-amazonka" = callPackage
@@ -121315,8 +121809,8 @@ self: {
          transformers
        ];
        description = "Haxl data source for accessing AWS services through amazonka";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121339,8 +121833,8 @@ self: {
          unordered-containers vector
        ];
        description = "An example Haxl data source for accessing the Facebook Graph API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121365,8 +121859,8 @@ self: {
          utf8-string zlib
        ];
        description = "Readable HaxBall replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121387,7 +121881,7 @@ self: {
          utf8-string
        ];
        description = "XML-RPC client and server library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haxr-th" = callPackage
@@ -121398,8 +121892,8 @@ self: {
        sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
        libraryHaskellDepends = [ base haxr template-haskell ];
        description = "Automatic deriving of XML-RPC structs for Haskell records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121416,8 +121910,8 @@ self: {
          url
        ];
        description = "A simple HTTP proxy server library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121438,8 +121932,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base process xml ];
        description = "Haskell bindings for the C Wayland library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs) wayland;};
 
@@ -121458,8 +121952,8 @@ self: {
          pandoc url
        ];
        description = "Hayoo CLI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121478,8 +121972,8 @@ self: {
          base cairo filepath glade gtk haskell98 process svgcairo time unix
        ];
        description = "N-back memory game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121509,8 +122003,8 @@ self: {
          vector
        ];
        description = "Bayesian Networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121527,8 +122021,8 @@ self: {
          base directory ghc ghc-mod ghc-paths libhbb
        ];
        description = "Haskell Busy Bee, a backend for text editors";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121540,8 +122034,8 @@ self: {
        sha256 = "1glld44m6h8yfh5h63w9q5isy238j0j312ycx43va1xa80x5r4dq";
        libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121557,8 +122051,8 @@ self: {
          attoparsec base blaze-builder bytestring containers network
        ];
        description = "Client for the beanstalkd workqueue service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121577,8 +122071,8 @@ self: {
        ];
        executableSystemDepends = [ SDL_mixer ];
        description = "A simple step sequencer GUI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) SDL_mixer;};
 
@@ -121615,8 +122109,8 @@ self: {
          optparse-applicative parsec primitive text transformers vector
        ];
        description = "An optimizing Brainfuck compiler and evaluator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121634,8 +122128,8 @@ self: {
        librarySystemDepends = [ blas liblapack ];
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Human friendly BLAS and Lapack bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
@@ -121655,8 +122149,8 @@ self: {
          hashable path-pieces safecopy text unordered-containers uuid vector
        ];
        description = "A mutable vector that provides indexation on the datatype fields it stores";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121691,7 +122185,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Minimal extensible web-browser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hbro-contrib" = callPackage
@@ -121724,7 +122218,7 @@ self: {
        ];
        description = "Third-party extensions to hbro";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hburg" = callPackage
@@ -121744,8 +122238,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Haskell Bottom Up Rewrite Generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121758,7 +122252,7 @@ self: {
        libraryHaskellDepends = [ base containers gasp mtl ];
        description = "Haskell CAD library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121772,8 +122266,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring language-c ];
        description = "A toy C compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121786,8 +122280,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base colour random ];
        description = "haskell cg (minus)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121803,8 +122297,8 @@ self: {
          base cairo colour filepath hcg-minus process
        ];
        description = "haskell cg (minus) (cairo rendering)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121817,8 +122311,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mps ];
        description = "A collection of code cheatsheet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121851,8 +122345,8 @@ self: {
          text-format-heavy unix unix-bytestring unordered-containers yaml
        ];
        description = "Implementation of checkers (\"draughts\") board game - server application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121869,8 +122363,8 @@ self: {
          array attoparsec base containers hlint hspec QuickCheck text
        ];
        description = "Chess library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121891,8 +122385,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A testing library for command line applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121915,8 +122409,8 @@ self: {
          async base bytestring HUnit network QuickCheck random
        ];
        description = "CoAP implementation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121940,7 +122434,7 @@ self: {
          base base64-bytestring bytestring criterion ghc-prim reflection
        ];
        description = "An implementation of the Consistent Overhead Byte Stuffing algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hcom" = callPackage
@@ -121951,8 +122445,8 @@ self: {
        sha256 = "1ps6q3sn0dlkhxkwgpq9jj0rklrnsgsrrlk63g9jr8lfris2wlzq";
        doHaddock = false;
        description = "Haskell COM support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121970,7 +122464,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base data-default HUnit ieee754 mtl ];
        description = "Easily convert between latitude/longitude, UTM and OSGB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hcount" = callPackage
@@ -121990,7 +122484,9 @@ self: {
          stan text
        ];
        description = "Haskell name counts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcron" = callPackage
@@ -122006,8 +122502,8 @@ self: {
          random stm time
        ];
        description = "A simple job scheduler, which just runs some IO action at a given time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122028,8 +122524,8 @@ self: {
          base directory HaskellForMaths QuickCheck text
        ];
        description = "Virtual Rubik's cube of arbitrary size";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122042,8 +122538,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ bluetooth cwiid ];
        description = "Library to interface with the wiimote";
-       license = stdenv.lib.licenses.gpl2;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.gpl2;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
@@ -122058,7 +122554,7 @@ self: {
          base bytestring extensible-exceptions filepath hsyslog mtl unix
        ];
        description = "Library to handle the details of writing daemons for UNIX";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hdaemonize-buildfix" = callPackage
@@ -122073,8 +122569,8 @@ self: {
          base extensible-exceptions filepath hsyslog mtl unix
        ];
        description = "Library to handle the details of writing daemons for UNIX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122091,8 +122587,8 @@ self: {
          vector
        ];
        description = "Deserialize from HDBC rows to FromJSON instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122104,8 +122600,8 @@ self: {
        sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122144,8 +122640,8 @@ self: {
          time uuid
        ];
        description = "Haskell Database Independent interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122166,8 +122662,8 @@ self: {
          resourcet test-framework test-framework-quickcheck2 transformers
        ];
        description = "Conduit glue for HDBI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122195,8 +122691,8 @@ self: {
          test-framework-quickcheck2 text time uuid
        ];
        description = "PostgreSQL driver for hdbi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122216,8 +122712,8 @@ self: {
          test-framework text
        ];
        description = "SQlite driver for HDBI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122237,8 +122733,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text time uuid
        ];
        description = "test suite for testing HDBI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122258,8 +122754,8 @@ self: {
          network process syb time transformers unix
        ];
        description = "Persistent GHC powered background server for FAST haskell development tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122278,7 +122774,7 @@ self: {
        ];
        description = "HDF: Uniform Rate Audio Signal Processing in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122299,7 +122795,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "High-level bindings to the HDF5 \"lite\" interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) hdf5;};
 
   "hdiff" = callPackage
@@ -122331,8 +122827,8 @@ self: {
          prettyprinter-ansi-terminal QuickCheck text
        ];
        description = "Pattern-Expression-based differencing of arbitrary types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122347,8 +122843,8 @@ self: {
          base cgi Crypto network parsec random time
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122367,8 +122863,8 @@ self: {
        executableHaskellDepends = [ array base haskell98 pretty ];
        executableToolDepends = [ happy ];
        description = "An IDL compiler for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122380,8 +122876,8 @@ self: {
        sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks";
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122394,8 +122890,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the Discount markdown library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {markdown = null;};
 
@@ -122409,8 +122905,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122438,8 +122934,8 @@ self: {
          unordered-containers vector
        ];
        description = "A Digital Ocean client in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122464,8 +122960,8 @@ self: {
        ];
        testHaskellDepends = [ base containers mtl ];
        description = "Haskell docs tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122492,8 +122988,8 @@ self: {
          network-transport-tcp random template-haskell time
        ];
        description = "Haskell distributed parallel Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122509,8 +123005,8 @@ self: {
          array base bytestring cereal containers deepseq template-haskell
        ];
        description = "Explicit closures in Haskell distributed parallel Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122530,8 +123026,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122547,7 +123043,7 @@ self: {
          base case-insensitive megaparsec parser-combinators selective
        ];
        description = "More informative parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "headergen" = callPackage
@@ -122566,8 +123062,8 @@ self: {
          time
        ];
        description = "Creates a header for a haskell source file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122595,7 +123091,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "License Header Manager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heap" = callPackage
@@ -122607,7 +123103,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heap-console" = callPackage
@@ -122625,8 +123121,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "interactively inspect Haskell values at runtime";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122638,7 +123134,7 @@ self: {
        sha256 = "0vg39qm8g69n10ys9v9knnaq5dqdjndj6ffy0xb78bwrr3rm5mci";
        libraryHaskellDepends = [ base ];
        description = "Asymptotically optimal Brodal/Okasaki heaps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heapsize" = callPackage
@@ -122656,7 +123152,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Determine the size of runtime data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heapsort" = callPackage
@@ -122669,8 +123165,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base ];
        description = "Heapsort of MArrays as a demo of imperative programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122686,8 +123182,8 @@ self: {
          base co-log co-log-core ekg ekg-core ekg-statsd heart-core text
        ];
        description = "An opinionated app prelude and framework in the UnliftIO style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122707,8 +123203,8 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "An opinionated library prelude in the UnliftIO style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122720,8 +123216,8 @@ self: {
        sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d";
        libraryHaskellDepends = [ async base io-streams time ];
        description = "Heartbeats for io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122751,8 +123247,8 @@ self: {
          vector
        ];
        description = "Find and annotate ITDs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122776,8 +123272,8 @@ self: {
          pipes pipes-text safe text turtle vector
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122796,7 +123292,7 @@ self: {
          text
        ];
        description = "Compression and decompression using heatshrink";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heavy-log-shortcuts" = callPackage
@@ -122811,8 +123307,8 @@ self: {
          base fast-logger heavy-logger monad-control text text-format-heavy
        ];
        description = "Simle api for heavy logger";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122834,8 +123330,8 @@ self: {
          thread-local-storage transformers-base
        ];
        description = "Full-weight logging based on fast-logger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122851,8 +123347,8 @@ self: {
          amazonka-core base binary heavy-logger template-haskell text
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122873,8 +123369,8 @@ self: {
          text text-format-heavy
        ];
        description = "Orphan instances for data types in heavy-logger package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122887,8 +123383,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Hebrew dates and prayer times";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122901,8 +123397,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122915,7 +123411,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Oh heck, it's a heckin' case conversion library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "heckle" = callPackage
@@ -122934,8 +123430,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory process split ];
        description = "Jekyll in Haskell (feat. LaTeX)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122960,7 +123456,7 @@ self: {
          base containers mmorph mtl pretty-show text transformers
        ];
        description = "Release with confidence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -122975,8 +123471,8 @@ self: {
          base containers hedgehog semigroupoids semigroups
        ];
        testHaskellDepends = [ base either hedgehog ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122988,8 +123484,8 @@ self: {
        sha256 = "0zfk967xzpwfh3y3ys8d0c3zcz251dnp41xha11613ji3yfk0wff";
        libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123010,7 +123506,7 @@ self: {
          aeson base binary comonad containers hedgehog vector
        ];
        description = "Hedgehog will eat your typeclass bugs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-corpus" = callPackage
@@ -123021,7 +123517,7 @@ self: {
        sha256 = "194pj8mjia5v4mc0hcyxgipf15j0dr44w02r1bcf89b4b8vnk5hq";
        libraryHaskellDepends = [ base ];
        description = "hedgehog-corpus";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-fakedata" = callPackage
@@ -123033,7 +123529,9 @@ self: {
        libraryHaskellDepends = [ base fakedata hedgehog random ];
        testHaskellDepends = [ base containers fakedata hedgehog ];
        description = "Use 'fakedata' with 'hedgehog'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-fn" = callPackage
@@ -123048,7 +123546,7 @@ self: {
          base contravariant hedgehog transformers
        ];
        description = "Function generation for `hedgehog`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-gen" = callPackage
@@ -123061,7 +123559,7 @@ self: {
          base bytestring hedgehog text typerep-map
        ];
        description = "Customizable Gen for ADT using Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-gen-json" = callPackage
@@ -123085,8 +123583,8 @@ self: {
          timerep tz unordered-containers vector
        ];
        description = "JSON generators for Hedgehog";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123098,8 +123596,8 @@ self: {
        sha256 = "1166jwk3f4bfw54qaxk3q3gxrfmffwwfkmd8xyvwj7i3whwzxq0f";
        libraryHaskellDepends = [ base hedgehog ];
        description = "GHC Generics automatically derived hedgehog generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123117,8 +123615,8 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Golden testing capabilities for hedgehog using Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123132,7 +123630,7 @@ self: {
        editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh";
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        description = "Use QuickCheck generators in Hedgehog and vice versa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-servant" = callPackage
@@ -123155,8 +123653,8 @@ self: {
          string-conversions text
        ];
        description = "Hedgehog property testing for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123182,7 +123680,33 @@ self: {
        ];
        benchmarkHaskellDepends = [ base mtl time ];
        description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "hedis_0_14_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit
+     , mtl, network, network-uri, resource-pool, scanner, stm
+     , test-framework, test-framework-hunit, text, time, tls
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.14.1";
+       sha256 = "0n7hwg8mp4v512g7s8cblmai0j00l1149bbdacm6s7d0plnk0qqd";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing containers deepseq errors
+         exceptions HTTP mtl network network-uri resource-pool scanner stm
+         text time tls unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring doctest HUnit mtl stm test-framework
+         test-framework-hunit text time
+       ];
+       benchmarkHaskellDepends = [ base mtl time ];
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -123197,8 +123721,8 @@ self: {
          aeson base bytestring hedis scientific text time
        ];
        description = "Easy trivial configuration for Redis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123209,7 +123733,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "165a7pw1i1i9gxljmx03zavza5qjyir09bwk067cfr5an9razvq6";
        libraryHaskellDepends = [ base envy hedis scientific time ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedis-monadic" = callPackage
@@ -123225,7 +123749,7 @@ self: {
          transformers-compat
        ];
        description = "A la MonadReader for Redis connection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedis-namespace" = callPackage
@@ -123240,8 +123764,8 @@ self: {
        executableHaskellDepends = [ base bytestring hedis mtl ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123263,8 +123787,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Caching mandatory data with Redis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123276,8 +123800,8 @@ self: {
        sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av";
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
        description = "A simplified API for hedis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123295,8 +123819,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Tags for hedis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123318,7 +123842,7 @@ self: {
          base containers hedgehog megaparsec text time uuid-types vector
        ];
        description = "EDN parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedn-functor" = callPackage
@@ -123335,8 +123859,8 @@ self: {
          base containers hedn recursion-schemes text vector
        ];
        description = "Base functor for EDN AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123352,8 +123876,8 @@ self: {
        executableHaskellDepends = [ base haskeline ];
        testHaskellDepends = [ base doctest ];
        description = "A small library and executable for generating dice rolls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123379,8 +123903,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion weigh ];
        description = "Tidy data in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123399,8 +123923,8 @@ self: {
          transformers
        ];
        description = "An extensible build helper for haskell, in the vein of leiningen";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123443,7 +123967,7 @@ self: {
          vector xmlhtml
        ];
        description = "An Haskell template system supporting both HTML5 and XML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heist-aeson" = callPackage
@@ -123459,8 +123983,8 @@ self: {
          vector xmlhtml
        ];
        description = "Use JSON directly from Heist templates";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123474,8 +123998,8 @@ self: {
          base heist template-haskell text xmlhtml
        ];
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123498,7 +124022,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "helics" = callPackage
@@ -123521,8 +124045,8 @@ self: {
          newrelic-collector-client newrelic-common newrelic-transaction
        ];
        description = "New Relic® agent SDK wrapper for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
@@ -123541,8 +124065,8 @@ self: {
          base bytestring data-default-class helics vault wai
        ];
        description = "New Relic® agent SDK wrapper for wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123556,8 +124080,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec process ];
        description = "An incomplete Elisp compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123582,7 +124106,7 @@ self: {
        ];
        description = "The Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123598,7 +124122,7 @@ self: {
          base bytestring deepseq lifted-base mtl random text transformers
        ];
        description = "A backwards-compatible, modern replacement for the Prelude";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "helix" = callPackage
@@ -123622,8 +124146,8 @@ self: {
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
        description = "Web development micro framework for haskell with typesafe URLs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123648,8 +124172,8 @@ self: {
        ];
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123669,8 +124193,8 @@ self: {
          mtl network regex-pcre safe stm tar utf8-string zlib
        ];
        description = "Distributed hackage mirror";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123695,8 +124219,8 @@ self: {
          base containers Lucu mtl network regex-posix
        ];
        description = "Simple, distributed, anonymous data sharing network";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123710,7 +124234,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Hello World, an example package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "helm" = callPackage
@@ -123732,7 +124256,7 @@ self: {
        executableHaskellDepends = [ base linear random ];
        testHaskellDepends = [ base hspec ];
        description = "A functionally reactive game engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "help-esb" = callPackage
@@ -123748,8 +124272,8 @@ self: {
          uuid
        ];
        description = "A Haskell client for the Help.com team's ESB.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123767,8 +124291,8 @@ self: {
          array base binary bytestring hemkay-core portaudio
        ];
        description = "A module music mixer and player";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123780,7 +124304,7 @@ self: {
        sha256 = "0br41879jynw3dzb2hlb07m55zmzgyim6gi8i48bzimbi70c9z89";
        libraryHaskellDepends = [ array base binary bytestring ];
        description = "A device independent module music mixer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hemokit" = callPackage
@@ -123809,8 +124333,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
        benchmarkHaskellDepends = [ base conduit criterion mtl ];
        description = "Haskell port of the Emokit EEG project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123831,8 +124355,8 @@ self: {
          transformers uuid
        ];
        description = "Haskell bindings to Xen hypervisor interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xenctrl = null;};
 
@@ -123847,8 +124371,8 @@ self: {
          base bitset bytestring network typesafe-endian
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123860,8 +124384,8 @@ self: {
        sha256 = "0b7syzfzbcznjb98hi4k8bp46ss08s9qg2763bnnm1b10i7km23z";
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123873,8 +124397,8 @@ self: {
        sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my";
        libraryHaskellDepends = [ base mtl split ];
        description = "A lexer for Haskell source code";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123886,8 +124410,8 @@ self: {
        sha256 = "1gkcd9ikaxjirxh8haq8b9a372n1dlaq63n9xzq9gsyazkxz7lgn";
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123905,8 +124429,8 @@ self: {
          base containers ghc-prim indents mtl parsec regex-posix
        ];
        description = "HAML to ERB translator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123965,8 +124489,8 @@ self: {
        ];
        doHaddock = false;
        description = "Runs Continuous Integration tasks on your machines";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "hercules-ci-api-agent" = callPackage
@@ -123996,8 +124520,8 @@ self: {
          time uuid
        ];
        description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {};
 
   "hercules-ci-api-core" = callPackage
@@ -124019,8 +124543,8 @@ self: {
          string-conv swagger2 text time uuid
        ];
        description = "Types and convenience modules use across Hercules CI API packages";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {};
 
   "here" = callPackage
@@ -124035,7 +124559,7 @@ self: {
          base haskell-src-meta mtl parsec template-haskell
        ];
        description = "Here docs & interpolated strings via quasiquotation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heredoc" = callPackage
@@ -124046,7 +124570,7 @@ self: {
        sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
        libraryHaskellDepends = [ base template-haskell ];
        description = "multi-line string / here document using QuasiQuotes";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "heredocs" = callPackage
@@ -124062,8 +124586,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring doctest text ];
        description = "Heredocument on Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124076,7 +124600,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base doctest ];
        description = "haskell time manipulation in a 'kerf like' style";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hermit" = callPackage
@@ -124105,8 +124629,8 @@ self: {
          temporary
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124122,8 +124646,8 @@ self: {
          base containers ghc ghc-prim hermit syb template-haskell
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124144,8 +124668,8 @@ self: {
          mtl optparse-applicative semigroups split vty
        ];
        description = "A command-line manager for delicious kitchen recipes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124160,7 +124684,7 @@ self: {
        libraryHaskellDepends = [ base random text ];
        executableHaskellDepends = [ base random text ];
        description = "Think back of the five tenets of hero club";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heroku" = callPackage
@@ -124172,7 +124696,7 @@ self: {
        libraryHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [ base hspec network-uri text ];
        description = "helpers for deploying to Heroku";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heroku-persistent" = callPackage
@@ -124188,7 +124712,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec persistent-postgresql ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "herringbone" = callPackage
@@ -124207,8 +124731,8 @@ self: {
          transformers unix-compat
        ];
        description = "A library for compiling and serving static web assets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124225,8 +124749,8 @@ self: {
          system-filepath template-haskell text
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124243,8 +124767,8 @@ self: {
          system-filepath text time wai wai-app-static
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124271,8 +124795,8 @@ self: {
          process text time uniplate unix
        ];
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124291,7 +124815,7 @@ self: {
        ];
        description = "Haskell's embedded SQL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124312,8 +124836,8 @@ self: {
          base criterion deepseq hvect template-haskell vinyl
        ];
        description = "Fast heterogeneous data structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124325,7 +124849,7 @@ self: {
        sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7";
        libraryHaskellDepends = [ base ];
        description = "Pure heterogeneous maps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heterocephalus" = callPackage
@@ -124343,7 +124867,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A type-safe template engine for working with front end development tools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "heterogeneous-list-literals" = callPackage
@@ -124355,8 +124879,8 @@ self: {
        libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124374,8 +124898,8 @@ self: {
          base constraint-manip hspec indextype polydata
        ];
        description = "A heterogeneous list type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124393,7 +124917,7 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Text Tetris";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -124408,8 +124932,8 @@ self: {
          base containers deepseq parallel random text
        ];
        description = "A genetic programming based on tree structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124457,7 +124981,7 @@ self: {
        ];
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3Only;
      }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -124473,8 +124997,8 @@ self: {
          base bytestring cairo filepath haskell98
        ];
        description = "Genetic Mona Lisa problem in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124493,8 +125017,8 @@ self: {
          base bytestring cairo dph-seq filepath haskell98
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124506,7 +125030,7 @@ self: {
        sha256 = "1mc66758254d93m7vab7q6lhn7qphzxd6wyc3v6yq1diy0gji4va";
        libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hex-text" = callPackage
@@ -124519,8 +125043,8 @@ self: {
        libraryHaskellDepends = [ base base16-bytestring bytestring text ];
        testHaskellDepends = [ base doctest ];
        description = "ByteString-Text hexidecimal conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124532,8 +125056,8 @@ self: {
        sha256 = "1bx49z3ycc24bsn0x0617x0gmgapan6qnwnwq6v0w06gjrahr4r4";
        libraryHaskellDepends = [ base containers ];
        description = "Haskell scripting interface for HexChat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124546,7 +125070,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for forming hexdumps";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hexif" = callPackage
@@ -124557,8 +125081,8 @@ self: {
        sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql";
        libraryHaskellDepends = [ base binary bytestring filepath ];
        description = "Reading Exif data form a JPEG file with Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124577,8 +125101,8 @@ self: {
          random
        ];
        description = "A small game based on domino-like hexagonal tiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124591,7 +125115,7 @@ self: {
        libraryHaskellDepends = [ base bytestring extra ];
        testHaskellDepends = [ base bytestring ];
        description = "XML subset DOM parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexml-lens" = callPackage
@@ -124611,8 +125135,8 @@ self: {
          base bytestring doctest hexml hspec lens QuickCheck wreq
        ];
        description = "Lenses for the hexml package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124630,7 +125154,7 @@ self: {
        ];
        librarySystemDepends = [ expat ];
        description = "XML parser/formatter based on expat";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) expat;};
 
   "hexpat-iteratee" = callPackage
@@ -124647,8 +125171,8 @@ self: {
          List parallel transformers
        ];
        description = "Chunked XML parsing using iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124664,7 +125188,7 @@ self: {
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
        description = "Lenses for Hexpat";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hexpat-pickle" = callPackage
@@ -124680,7 +125204,7 @@ self: {
          utf8-string
        ];
        description = "XML picklers based on hexpat, source-code-similar to those of the HXT package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexpat-pickle-generic" = callPackage
@@ -124697,8 +125221,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124714,7 +125238,7 @@ self: {
          base bytestring hexpat List mtl parser-combinators text
          transformers
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexpat-tagsoup" = callPackage
@@ -124725,7 +125249,7 @@ self: {
        sha256 = "0481446ba5m0h8lxmp216gzll0wr77mhk6hvm087749fwjj597aj";
        libraryHaskellDepends = [ base hexpat tagsoup ];
        description = "Parse (possibly malformed) HTML to hexpat tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexpr" = callPackage
@@ -124739,8 +125263,8 @@ self: {
          base data-ref either mtl parsec transformers
        ];
        description = "A framework for symbolic, homoiconic languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124758,8 +125282,8 @@ self: {
          mime-types mtl text transformers vault wai warp
        ];
        description = "An express-like http framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124775,8 +125299,8 @@ self: {
          base bytestring containers parsec template-haskell
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124794,7 +125318,7 @@ self: {
        ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        description = "Fast and safe representation of a hex string";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hext" = callPackage
@@ -124810,8 +125334,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "a text classification library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124823,7 +125347,7 @@ self: {
        sha256 = "0iq6kj7mijxppjghpqx19s79sj6k1jqf21gfi8jqbj6bq7j2cdvj";
        libraryHaskellDepends = [ base ];
        description = "Generic and niche utility functions and more for Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "hextream" = callPackage
@@ -124846,7 +125370,9 @@ self: {
          tasty tasty-golden tasty-hunit text
        ];
        description = "Streaming-friendly XML parsers";
-       license = stdenv.lib.licenses.cc0;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "heyefi" = callPackage
@@ -124877,8 +125403,8 @@ self: {
          utf8-string wai wai-extra warp
        ];
        description = "A server for Eye-Fi SD cards";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124900,8 +125426,8 @@ self: {
          universe-base
        ];
        description = "Heyting and Boolean algebras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124917,8 +125443,8 @@ self: {
        librarySystemDepends = [ doublefann ];
        libraryPkgconfigDepends = [ fann ];
        description = "Haskell binding to the FANN library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {doublefann = null; fann = null;};
 
@@ -124937,8 +125463,8 @@ self: {
          MonadCatchIO-transformers network transformers
        ];
        description = "Flash debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124954,8 +125480,8 @@ self: {
        libraryHaskellDepends = [ base eprocess mtl ];
        executableHaskellDepends = [ wx wxcore ];
        description = "Four in a Row in Haskell!!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124967,7 +125493,7 @@ self: {
        sha256 = "0lmjgwgfp1s2ag2fbi6n8yryafb5qz87yb0p122lxzm3487sf98h";
        libraryHaskellDepends = [ base containers template-haskell text ];
        description = "Command line flag parser, very similar to Google's gflags";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hfmt" = callPackage
@@ -124996,8 +125522,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125017,8 +125543,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125035,7 +125561,7 @@ self: {
        ];
        testHaskellDepends = [ base base-unicode-symbols hspec text ];
        description = "Simple Haskell formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hfov" = callPackage
@@ -125046,8 +125572,8 @@ self: {
        sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l";
        libraryHaskellDepends = [ base ];
        description = "Field-of-view calculation for low-resolution 2D raster grids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125066,8 +125592,8 @@ self: {
          gd GLUT OpenGL OpenGLRaw
        ];
        description = "OpenGL fractal renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125083,7 +125609,7 @@ self: {
        librarySystemDepends = [ Cocoa ];
        libraryToolDepends = [ CoreServices ];
        description = "File/folder watching for OS X";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; 
          inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;};
@@ -125098,8 +125624,8 @@ self: {
          base containers haskell-src mtl pretty syb
        ];
        description = "A library for fusing a subset of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125119,7 +125645,7 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125142,8 +125668,8 @@ self: {
        sha256 = "08a8lmh1rg3d1rmpfhcc2fzyc0kybqhzahx4hrvfrqjw7czcnmrw";
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125162,8 +125688,8 @@ self: {
          test-framework test-framework-hunit
        ];
        description = "GDB Machine Interface: program-driven control of GDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125181,8 +125707,8 @@ self: {
          transformers transformers-base unordered-containers
        ];
        description = "A Gearman client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125199,7 +125725,7 @@ self: {
        ];
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125211,8 +125737,8 @@ self: {
        sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd";
        libraryHaskellDepends = [ base containers ];
        description = "A geometric library with bindings to GPC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125239,7 +125765,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest doctest-discover QuickCheck ];
        description = "Geometric Algorithms, Data structures, and Data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hgeometry-combinatorial" = callPackage
@@ -125270,7 +125796,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Data structures, and Data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hgeometry-ipe" = callPackage
@@ -125302,8 +125828,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Reading and Writing ipe7 files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125324,8 +125850,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Writing geometric primitives from HGeometry as SVG Files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125340,8 +125866,8 @@ self: {
        librarySystemDepends = [ geos ];
        testHaskellDepends = [ base MissingH ];
        description = "Simple Haskell bindings to GEOS C API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) geos;};
 
@@ -125364,8 +125890,8 @@ self: {
          base Cabal containers deepseq filepath haskell-src-exts uniplate
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125389,8 +125915,8 @@ self: {
        testHaskellDepends = [ base hspec spherical ];
        doHaddock = false;
        description = "Library and for GIS with Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125411,8 +125937,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs directory ];
        description = "Haskell bindings to the GitHub API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125429,7 +125955,7 @@ self: {
        ];
        description = "Various animations generated using HGL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {HTam = null;};
 
@@ -125437,15 +125963,13 @@ self: {
     ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }:
      mkDerivation {
        pname = "hgmp";
-       version = "0.1.1";
-       sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
-       revision = "4";
-       editedCabalFile = "00rg7f223716dlqk0w92ixnyj7a9imj6yqcs5qx833jv7lk8lbyj";
+       version = "0.1.2";
+       sha256 = "1sqnywh4h1nklcpci60n427m1kahkza1vy1j60jmq3lnlrbgzfzk";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125465,7 +125989,7 @@ self: {
        ];
        description = "An haskell port of the java version of gom";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125477,8 +126001,8 @@ self: {
        sha256 = "0j6ybi8f5csa9rpbpy8dc9p6l6vf2qh2zk589a9nqj2phllz7mwf";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Gopher server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125501,8 +126025,8 @@ self: {
          ansi-terminal base optparse-applicative
        ];
        description = "Search Haskell source code from the command line";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125518,7 +126042,7 @@ self: {
          aeson base bytestring directory filepath process template-haskell
        ];
        description = "Compile Mercurial (hg) version info into Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hgrib" = callPackage
@@ -125536,8 +126060,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base directory hspec ];
        description = "Unofficial bindings for GRIB API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {grib_api = null;};
 
@@ -125550,8 +126074,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ harp ];
        description = "Binding to libharp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {harp = null;};
 
@@ -125578,8 +126102,8 @@ self: {
          ghc-boot hlint hspec process syb
        ];
        description = "Happy Haskell Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125593,8 +126117,8 @@ self: {
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Bindings to https://www.open-mpi.org/projects/hwloc";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125625,7 +126149,7 @@ self: {
          temporary text time
        ];
        description = "Generate scaffold for cabal project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hi-file-parser" = callPackage
@@ -125639,7 +126163,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rio vector ];
        testHaskellDepends = [ base binary bytestring hspec rio vector ];
        description = "Parser for GHC's hi files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hi3status" = callPackage
@@ -125659,8 +126183,8 @@ self: {
        ];
        executableHaskellDepends = [ base dbus process ];
        description = "Status line for i3bar";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125681,7 +126205,7 @@ self: {
        ];
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125696,7 +126220,7 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125710,7 +126234,7 @@ self: {
        libraryPkgconfigDepends = [ hidapi ];
        libraryToolDepends = [ c2hs ];
        description = "Interface to hidapi library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) hidapi;};
 
   "hid-examples" = callPackage
@@ -125744,8 +126268,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        doHaddock = false;
        description = "Examples to accompany the book \"Haskell in Depth\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125762,7 +126286,7 @@ self: {
        ];
        librarySystemDepends = [ systemd ];
        description = "Haskell bindings to HIDAPI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) systemd;};
 
   "hidden-char" = callPackage
@@ -125776,8 +126300,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Provides cross-platform getHiddenChar function";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125808,7 +126332,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Set up a GHC API session";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hie-compat" = callPackage
@@ -125824,7 +126348,7 @@ self: {
          transformers
        ];
        description = "HIE files for GHC 8.6 and other HIE file backports";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hie-core" = callPackage
@@ -125860,34 +126384,36 @@ self: {
          parser-combinators tasty tasty-hunit text
        ];
        description = "The core of an IDE";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "hiedb" = callPackage
-    ({ mkDerivation, algebraic-graphs, array, base, bytestring
-     , containers, directory, filepath, ghc, ghc-paths, hie-compat
-     , hspec, lucid, mtl, optparse-applicative, process, sqlite-simple
-     , terminal-size, text, time
+    ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base
+     , bytestring, containers, directory, extra, filepath, ghc
+     , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative
+     , process, sqlite-simple, temporary, text
      }:
      mkDerivation {
        pname = "hiedb";
-       version = "0.1.0.0";
-       sha256 = "0bzhg7dambm97qk3r9p2k0kd4qbllghfxiannjiqnwmar7c4zaxw";
+       version = "0.3.0.0";
+       sha256 = "1g2dzprxja8isw4irgbh8aabzr9iswb9szpn5nwnvbkzkabfqabd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         algebraic-graphs array base bytestring containers directory
-         filepath ghc hie-compat lucid mtl optparse-applicative
-         sqlite-simple terminal-size text time
+         algebraic-graphs ansi-terminal array base bytestring containers
+         directory extra filepath ghc hie-compat lucid mtl
+         optparse-applicative sqlite-simple text
        ];
        executableHaskellDepends = [ base ghc-paths ];
        testHaskellDepends = [
-         base directory filepath ghc ghc-paths hspec process
+         base directory filepath ghc ghc-paths hspec process temporary
        ];
        description = "Generates a references DB from .hie files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hieraclus" = callPackage
@@ -125898,8 +126424,8 @@ self: {
        sha256 = "11fjfmdjzvid0352d346p5xf44bl7dn8bd8pms5pi34xysdyr7pg";
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125913,7 +126439,7 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hierarchical-clustering-diagrams" = callPackage
@@ -125932,8 +126458,8 @@ self: {
          HUnit
        ];
        description = "Draw diagrams of dendrograms made by hierarchical-clustering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125945,8 +126471,8 @@ self: {
        sha256 = "1yzhw7kgz5iljm8ndh5kyr18367cl6l120m1gkn5x9hpsh9mlamm";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125977,8 +126503,8 @@ self: {
          filepath hmatrix lens optparse-generic safe text text-show vector
        ];
        description = "Hierarchical spectral clustering of a graph";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126001,8 +126527,8 @@ self: {
          transformers-compat
        ];
        description = "Predicated traversal of generated trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126018,8 +126544,8 @@ self: {
          base directory filepath mtl old-time stm timers-updatable
        ];
        description = "Notification library for a filesystem hierarchy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126040,7 +126566,7 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        testHaskellDepends = [ base ];
        description = "WiFi connection script generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "higgledy" = callPackage
@@ -126059,8 +126585,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Partial types as a type constructor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126076,7 +126602,7 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Memory usage statistics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126100,7 +126626,7 @@ self: {
          transformers transformers-base unliftio
        ];
        description = "A rich monadic API for working with leveldb databases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "higherorder" = callPackage
@@ -126113,8 +126639,8 @@ self: {
        editedCabalFile = "0nflwfx4gng0kk2lxfsrrk10sgjln7jq4zl3ydv8i0n4m472b1y5";
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126132,8 +126658,8 @@ self: {
          aeson base bytestring criterion deepseq text
        ];
        description = "Spec based JSON parsing/serialisation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126152,8 +126678,8 @@ self: {
          aeson base bytestring highjson hspec lens QuickCheck swagger2 text
        ];
        description = "Derive swagger instances from highjson specs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126174,8 +126700,8 @@ self: {
          QuickCheck swagger2 text
        ];
        description = "Template Haskell helpers for highjson specs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126207,7 +126733,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Command line tool for highlighting parts of files matching a regex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "highlight-versions" = callPackage
@@ -126223,8 +126749,8 @@ self: {
          ansi-terminal base Cabal containers hackage-db
        ];
        description = "Highlight package versions which differ from the latest version on Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126242,7 +126768,7 @@ self: {
          base blaze-html bytestring filepath mtl pcre-light text
        ];
        description = "source code highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "highlighter2" = callPackage
@@ -126259,7 +126785,7 @@ self: {
          base blaze-html bytestring containers filepath mtl pcre-light text
        ];
        description = "source code highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "highlighting-kate" = callPackage
@@ -126300,7 +126826,7 @@ self: {
          transformers
        ];
        description = "Generate STL models from SRTM elevation data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "himerge" = callPackage
@@ -126319,7 +126845,7 @@ self: {
        ];
        description = "Haskell Graphical User Interface for Emerge";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mozembed = null;};
 
@@ -126340,8 +126866,8 @@ self: {
          base bytestring directory gtk HTTP http-conduit network temporary
        ];
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126363,8 +126889,8 @@ self: {
          unordered-containers vector
        ];
        description = "multithreaded snmp poller for riemann";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126399,8 +126925,8 @@ self: {
          haskell-src-exts mtl utf8-string
        ];
        description = "Extensible Haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126417,8 +126943,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec ];
        description = "Template for Hindley-Milner based languages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126434,7 +126960,7 @@ self: {
          base containers deepseq hinduce-missingh parallel vector
        ];
        description = "Apriori algorithm for association rule mining";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hinduce-classifier" = callPackage
@@ -126445,8 +126971,8 @@ self: {
        sha256 = "1cdx916xkpsy2ilsmmdkyqax2gb0cx6sgkydvjbiw7qibd76ylza";
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126464,8 +126990,8 @@ self: {
          base convertible hinduce-classifier hinduce-missingh layout
        ];
        description = "Decision Tree Classifiers for hInduce";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126485,8 +127011,8 @@ self: {
          layout vector
        ];
        description = "Example data for hInduce";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126498,7 +127024,7 @@ self: {
        sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z";
        libraryHaskellDepends = [ base ];
        description = "Utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinfo" = callPackage
@@ -126517,7 +127043,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base optparse-applicative text yaml ];
        description = "Command Line App With Info on your Haskell App";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinit" = callPackage
@@ -126547,7 +127073,9 @@ self: {
          base fused-effects path-io quickcheck-text
        ];
        description = "Generic project initialization tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinotify_0_3_9" = callPackage
@@ -126561,8 +127089,8 @@ self: {
        libraryHaskellDepends = [ async base containers directory unix ];
        testHaskellDepends = [ base directory ];
        description = "Haskell binding to inotify";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hinotify" = callPackage
@@ -126576,7 +127104,7 @@ self: {
        libraryHaskellDepends = [ async base bytestring containers unix ];
        testHaskellDepends = [ base bytestring directory unix ];
        description = "Haskell binding to inotify";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinotify-bytestring" = callPackage
@@ -126594,7 +127122,7 @@ self: {
          base bytestring directory posix-paths unix utf8-string
        ];
        description = "Haskell binding to inotify, using ByteString filepaths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinquire" = callPackage
@@ -126614,8 +127142,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Generate armet style query strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126632,7 +127160,7 @@ self: {
        ];
        description = "Installer wrapper for Haskell applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126653,7 +127181,7 @@ self: {
          base containers directory exceptions filepath HUnit stm unix
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hint-server" = callPackage
@@ -126668,8 +127196,8 @@ self: {
          base eprocess exceptions hint monad-loops mtl
        ];
        description = "A server process that runs hint";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126691,8 +127219,8 @@ self: {
          base directory exceptions extensible-exceptions filepath HUnit unix
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126719,8 +127247,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell / Erlang interoperability library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126736,7 +127264,7 @@ self: {
        executableHaskellDepends = [ base haskell98 random ];
        description = "Space Invaders";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126748,8 +127276,8 @@ self: {
        sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq";
        libraryHaskellDepends = [ base haskell98 Stream ];
        description = "Streams and Unique Fixed Points";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126774,8 +127302,8 @@ self: {
          base criterion deepseq repa repa-algorithms vector
        ];
        description = "Haskell Image Processing (HIP) Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126800,8 +127328,8 @@ self: {
          wreq
        ];
        description = "A library for building HipChat Bots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126820,8 +127348,8 @@ self: {
          string-conversions text time
        ];
        description = "Hipchat API bindings in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126837,8 +127365,8 @@ self: {
          base containers hgeometry hxt parsec split text text-format
        ];
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126854,7 +127382,7 @@ self: {
          base bytestring directory functors mtl
        ];
        description = "an IPS patcher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hircules" = callPackage
@@ -126873,7 +127401,7 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126894,8 +127422,8 @@ self: {
          vector-space
        ];
        description = "Calculates IRT 2PL and 3PL models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126911,8 +127439,8 @@ self: {
          base bytestring conduit http-conduit http-types text time
        ];
        description = "Unofficial API bindings to KISSmetrics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126936,8 +127464,8 @@ self: {
          hist-pl-fusion hist-pl-lexicon hist-pl-lmf pipes polimorf
        ];
        description = "Umbrella package for the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126952,8 +127480,8 @@ self: {
          base binary containers dawg text text-binary
        ];
        description = "A generic, DAWG-based dictionary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126970,8 +127498,8 @@ self: {
          text text-binary
        ];
        description = "Merging historical dictionary with PoliMorf";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126988,8 +127516,8 @@ self: {
          hist-pl-types pipes text transformers
        ];
        description = "A binary representation of the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127001,8 +127529,8 @@ self: {
        sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm";
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        description = "LMF parsing for the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127014,7 +127542,7 @@ self: {
        sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb";
        libraryHaskellDepends = [ base parsec ];
        description = "A simple EDSL for transliteration rules";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hist-pl-types" = callPackage
@@ -127025,8 +127553,8 @@ self: {
        sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v";
        libraryHaskellDepends = [ base binary text text-binary ];
        description = "Types in the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127041,7 +127569,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        description = "Library for histograms creation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "histogram-fill-binary" = callPackage
@@ -127052,7 +127580,7 @@ self: {
        sha256 = "0dkvdc5sbnarpdam9gg6q1rvc5xx51pga0whzf6mq81yjn2ydvqy";
        libraryHaskellDepends = [ base binary histogram-fill vector ];
        description = "Binary instances for histogram-fill package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "histogram-fill-cereal" = callPackage
@@ -127063,7 +127591,7 @@ self: {
        sha256 = "1kaj56b7cp2c4s0fdkirw48igy54zhdrcrjsjpyv4cnywq8nvqrq";
        libraryHaskellDepends = [ base cereal histogram-fill vector ];
        description = "Binary instances for histogram-fill package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "historian" = callPackage
@@ -127080,8 +127608,8 @@ self: {
          base containers directory filepath process regex-compat regex-posix
        ];
        description = "Extract the interesting bits from shell history";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127100,8 +127628,8 @@ self: {
          base bytestring containers git hashable hashtables hourglass
        ];
        description = "Git like program in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127117,8 +127645,8 @@ self: {
          base containers fgl hashable hit transformers unordered-containers
        ];
        description = "Use graph algorithms to access and manipulate Git repos";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127140,8 +127668,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base github hspec text ];
        description = "Haskell Git Helper Tool";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127158,8 +127686,8 @@ self: {
          text unordered-containers vector
        ];
        description = "Jcase library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127171,7 +127699,7 @@ self: {
        sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj";
        libraryHaskellDepends = [ base containers hjson parsec ];
        description = "XPath-like syntax for querying JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hjs" = callPackage
@@ -127189,8 +127717,8 @@ self: {
          array base bytestring containers directory mtl parsec regex-compat
        ];
        description = "JavaScript Parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127214,7 +127742,7 @@ self: {
          base directory extra filepath process unix
        ];
        description = "Haskell implementation of a javascript minifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hjson" = callPackage
@@ -127225,7 +127753,7 @@ self: {
        sha256 = "1r59g5ypqjsldflsddg7pzpa6j8jps5nwm4h9cwiw7qk734rjik8";
        libraryHaskellDepends = [ base containers parsec ];
        description = "JSON parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hjson-query" = callPackage
@@ -127236,8 +127764,8 @@ self: {
        sha256 = "0sj86rm5pz0q9079f5kjnpz51dxvvq72waaf8h64jzrrhkpz8mlx";
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127259,8 +127787,8 @@ self: {
          vector
        ];
        description = "JSON Pointer library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127291,8 +127819,8 @@ self: {
          wai-app-static warp
        ];
        description = "JSON Schema library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127313,7 +127841,7 @@ self: {
          tasty-quickcheck text transformers unordered-containers
        ];
        description = "Majority Judgment";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hjugement-cli" = callPackage
@@ -127342,8 +127870,8 @@ self: {
          time transformers unix unordered-containers
        ];
        description = "Majority Judgment and Helios-C command line tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127371,7 +127899,7 @@ self: {
          transformers
        ];
        description = "A cryptographic protocol for the Majority Judgment";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hkd" = callPackage
@@ -127397,7 +127925,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ aeson base ];
        description = "Apply default value for optional field of HKD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hkd-delta" = callPackage
@@ -127408,8 +127936,8 @@ self: {
        sha256 = "0qb20y6nca61h4mpgyhi6xfcwxf4q92pscr5zqd8yklfcz4qqyz9";
        libraryHaskellDepends = [ base ];
        description = "Definition of \"Delta structures\" for higher kinded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127421,8 +127949,8 @@ self: {
        sha256 = "0s3siyp85k84c9j1srg8y78ia6yj9s6vls9y1hnkgsmg1mx755qg";
        libraryHaskellDepends = [ base profunctors ];
        description = "Generic lens/prism/traversal-kinded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127435,7 +127963,7 @@ self: {
        libraryHaskellDepends = [ base byteable bytestring cryptohash ];
        testHaskellDepends = [ base byteable bytestring cryptohash hspec ];
        description = "Implementation of HKDF (RFC 5869)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hkgr" = callPackage
@@ -127454,7 +127982,7 @@ self: {
          simple-cmd-args xdg-basedir
        ];
        description = "Simple Hackage release workflow for package maintainers";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hkt" = callPackage
@@ -127469,8 +127997,8 @@ self: {
          base hspec inspection-testing protolude text
        ];
        description = "A library for higher kinded types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127490,7 +128018,7 @@ self: {
          template-haskell transformers uniplate utf8-string
        ];
        description = "A library to build valid LaTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hlbfgsb" = callPackage
@@ -127508,8 +128036,8 @@ self: {
          base HUnit test-framework test-framework-hunit vector
        ];
        description = "Haskell binding to L-BFGS-B version 3.0";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gfortran;};
 
@@ -127531,8 +128059,8 @@ self: {
          array base bytestring bytestring-csv containers haskell98 parallel
        ];
        description = "Fast algorithm for mining closed frequent itemsets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127555,7 +128083,7 @@ self: {
          websockets
        ];
        description = "Web Socket interface to Leap Motion controller";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hledger" = callPackage
@@ -127569,8 +128097,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.20.2";
-       sha256 = "1mk7d6ajwh5i9c8klgzk9j06yc8l24gi2nf6blyan14d9s7l85br";
+       version = "1.20.3";
+       sha256 = "1wy45ppcakml2wk021yr8kqv0q0x85vms8kx0npjawzbs498qqx9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127598,8 +128126,8 @@ self: {
          utility-ht wizards
        ];
        description = "Command-line interface for the hledger accounting system";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hledger-api" = callPackage
@@ -127623,8 +128151,8 @@ self: {
          wai-extra warp
        ];
        description = "Web API server for the hledger accounting tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127644,7 +128172,7 @@ self: {
        ];
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127658,7 +128186,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
        description = "Compares the transactions in two ledger files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-flow" = callPackage
@@ -127681,7 +128209,7 @@ self: {
          base containers foldl HUnit path path-io stm text turtle
        ];
        description = "An hledger workflow focusing on automated statement import and classification";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-iadd" = callPackage
@@ -127716,7 +128244,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A terminal UI as drop-in replacement for hledger add";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hledger-interest" = callPackage
@@ -127734,8 +128262,8 @@ self: {
          base Cabal Decimal hledger-lib mtl text time
        ];
        description = "computes interest for a given account";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hledger-irr" = callPackage
@@ -127753,8 +128281,8 @@ self: {
          text time
        ];
        description = "computes the internal rate of return of an investment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127770,8 +128298,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.20.2";
-       sha256 = "10iz6jjkighsj00shw8hj22p14zp4dd9r7l4hmpbwql1hfz53g1b";
+       version = "1.20.3";
+       sha256 = "0pm6ckim1krkg4x7azspsnc1alwynqnjdhxrda764xyrz9s0r8cp";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal array base base-compat-batteries
          blaze-markup bytestring call-stack cassava cassava-megaparsec
@@ -127791,7 +128319,7 @@ self: {
          uglymemo unordered-containers utf8-string
        ];
        description = "A reusable library providing the core functionality of hledger";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-makeitso" = callPackage
@@ -127812,7 +128340,7 @@ self: {
          base containers foldl HUnit stm text turtle
        ];
        description = "An hledger workflow focusing on automated statement import and classification";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-stockquotes" = callPackage
@@ -127835,7 +128363,7 @@ self: {
          base hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        description = "Generate HLedger Price Directives From Daily Stock Quotes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hledger-ui" = callPackage
@@ -127847,8 +128375,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.20.2";
-       sha256 = "1ns1zjmpbxn3rg5ldplh57h0yfmas6bqa9z6nmk52bw9qf0b05zw";
+       version = "1.20.3";
+       sha256 = "02g6xdxif67fjj6rjskw69cxhx2irwv7sk0b1slr20nch122pzl1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127858,8 +128386,8 @@ self: {
          split text text-zipper time transformers unix vector vty
        ];
        description = "Curses-style terminal interface for the hledger accounting system";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hledger-vty" = callPackage
@@ -127877,7 +128405,7 @@ self: {
        ];
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127894,8 +128422,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.20.2";
-       sha256 = "0898nsd4y4fzk8ri4wxykcyvrb9165mkak392ir1b5nz19nys1xf";
+       version = "1.20.3";
+       sha256 = "1dz3lwp86dlmdrnj5hda12219x03xw8csxk0bjysn43rjzxag4q4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127913,8 +128441,8 @@ self: {
          base hledger hledger-lib hspec text yesod yesod-test
        ];
        description = "Web-based user interface for the hledger accounting system";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hlibBladeRF" = callPackage
@@ -127928,8 +128456,8 @@ self: {
        libraryPkgconfigDepends = [ libbladeRF ];
        testHaskellDepends = [ base hlint ];
        description = "Haskell binding to libBladeRF SDR library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libbladeRF;};
 
@@ -127945,7 +128473,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Bindings to https://github.com/anrieff/libcpuid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hlibev" = callPackage
@@ -127957,8 +128485,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        librarySystemDepends = [ ev ];
        description = "FFI interface to libev";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ev = null;};
 
@@ -127971,8 +128499,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fam;};
 
@@ -127987,7 +128515,7 @@ self: {
        testHaskellDepends = [ base process ];
        testToolDepends = [ git ];
        description = "Low-level bindings to libgit2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) git; inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
@@ -128002,7 +128530,7 @@ self: {
        librarySystemDepends = [ libsass ];
        testHaskellDepends = [ base hspec ];
        description = "Low-level bindings to Libsass";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
@@ -128014,8 +128542,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "3.2.6";
-       sha256 = "1i1qqqi6qdfa3py48cns6c41xn6qr8rsfg7rn4i22qr86zp8ikp5";
+       version = "3.2.7";
+       sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -128027,8 +128555,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Source code suggestions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "hlint-test" = callPackage
@@ -128042,7 +128570,7 @@ self: {
        libraryHaskellDepends = [ base hlint ];
        executableHaskellDepends = [ base hlint ];
        description = "Run hlint in test suite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hlist" = callPackage
@@ -128055,7 +128583,7 @@ self: {
        editedCabalFile = "0qcvl0krnhyvvn857p1b6mc65mglbplywcmx8n8vb8ikw5vhkh68";
        libraryHaskellDepends = [ base ];
        description = "Heterogeneous list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hlivy" = callPackage
@@ -128072,8 +128600,8 @@ self: {
          resourcet text transformers unordered-containers
        ];
        description = "Client library for the Apache Livy REST API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128085,8 +128613,8 @@ self: {
        sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f";
        libraryHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent, extendable and easy-to-use logging library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128105,8 +128633,8 @@ self: {
          base bytestring curl regex-base regex-posix
        ];
        description = "Library and utility interfacing to longurl.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128124,8 +128652,8 @@ self: {
          hlrdb-core memory random store time unordered-containers zstd
        ];
        description = "High-level Redis Database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128144,8 +128672,8 @@ self: {
          unordered-containers
        ];
        description = "High-level Redis Database Core API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128159,26 +128687,186 @@ self: {
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "hls-class-plugin" = callPackage
+    ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
+     , ghcide, haskell-lsp, hls-plugin-api, lens, shake, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-class-plugin";
+       version = "0.1.0.1";
+       sha256 = "198r8kly4fgm9xsngkzhljbq1j764asc0xba757zasmgndvri2r7";
+       libraryHaskellDepends = [
+         aeson base containers ghc ghc-exactprint ghcide haskell-lsp
+         hls-plugin-api lens shake text transformers unordered-containers
+       ];
+       description = "Class/instance management plugin for Haskell Language Server";
+       license = lib.licenses.asl20;
+     }) {};
+
+  "hls-eval-plugin" = callPackage
+    ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
+     , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable
+     , haskell-lsp, haskell-lsp-types, hls-plugin-api
+     , parser-combinators, pretty-simple, QuickCheck, safe-exceptions
+     , shake, temporary, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-eval-plugin";
+       version = "0.1.0.5";
+       sha256 = "1vfsvhn7b5w537hsri6bz36c547pxv13jyjvj1a5934jzyzvv9qn";
+       libraryHaskellDepends = [
+         aeson base containers deepseq Diff directory extra filepath ghc
+         ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
+         hls-plugin-api parser-combinators pretty-simple QuickCheck
+         safe-exceptions shake temporary text time transformers
+         unordered-containers
+       ];
+       description = "Eval plugin for Haskell Language Server";
+       license = lib.licenses.asl20;
+     }) {};
+
+  "hls-exactprint-utils" = callPackage
+    ({ mkDerivation, base, dlist, ghc, ghc-exactprint, ghcide
+     , haskell-lsp-types, hls-plugin-api, retrie, syb, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hls-exactprint-utils";
+       version = "0.5.0.1";
+       sha256 = "16d2hi50197mz4nc0zfdizs9i431a89j99klyv6yxmdmxjpf9cx2";
+       libraryHaskellDepends = [
+         base dlist ghc ghc-exactprint ghcide haskell-lsp-types
+         hls-plugin-api retrie syb text transformers
+       ];
+       description = "Common utilities to interaction between ghc-exactprint and HLS plugins";
+       license = lib.licenses.asl20;
+     }) {};
+
+  "hls-explicit-imports-plugin" = callPackage
+    ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide
+     , haskell-lsp-types, hls-plugin-api, shake, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-explicit-imports-plugin";
+       version = "0.1.0.0";
+       sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2";
+       libraryHaskellDepends = [
+         aeson base containers deepseq ghc ghcide haskell-lsp-types
+         hls-plugin-api shake text unordered-containers
+       ];
+       description = "Explicit imports plugin for Haskell Language Server";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "hls-haddock-comments-plugin" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
+     , haskell-lsp-types, hls-plugin-api, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-haddock-comments-plugin";
+       version = "0.1.0.0";
+       sha256 = "12zs6yq39jpg3x6w9y5a5jri5rfh8qpxawdhmhiqm067zjnj9xi4";
+       revision = "1";
+       editedCabalFile = "0kddmrlmcsa1d22mqzw1wsh82x4nn0ff4xbwci7585i9z61mzhg2";
+       libraryHaskellDepends = [
+         base containers ghc ghc-exactprint ghcide haskell-lsp-types
+         hls-plugin-api text unordered-containers
+       ];
+       description = "Haddock comments plugin for Haskell Language Server";
+       license = lib.licenses.asl20;
+     }) {};
+
+  "hls-hlint-plugin" = callPackage
+    ({ mkDerivation, aeson, apply-refact, base, binary, bytestring
+     , containers, data-default, deepseq, Diff, directory, extra
+     , filepath, ghc, ghcide, hashable, haskell-lsp, hlint
+     , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-hlint-plugin";
+       version = "0.1.0.0";
+       sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq";
+       revision = "1";
+       editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s";
+       libraryHaskellDepends = [
+         aeson apply-refact base binary bytestring containers data-default
+         deepseq Diff directory extra filepath ghc ghcide hashable
+         haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake
+         temporary text transformers unordered-containers
+       ];
+       description = "Hlint integration plugin with Haskell Language Server";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "hls-plugin-api" = callPackage
-    ({ mkDerivation, aeson, base, containers, data-default, Diff, ghc
-     , ghc-boot-th, ghcide, hashable, haskell-lsp, hslogger, lens
-     , process, regex-tdfa, shake, text, unordered-containers
+    ({ mkDerivation, aeson, base, containers, data-default, Diff
+     , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
+     , text, unix, unordered-containers
      }:
      mkDerivation {
        pname = "hls-plugin-api";
-       version = "0.5.0.1";
-       sha256 = "0sv892m18ic9m8d5b8wm7385v80rc02fjy0wxvq9mzhgazz20cp2";
+       version = "0.6.0.0";
+       sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi";
+       revision = "2";
+       editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji";
        libraryHaskellDepends = [
-         aeson base containers data-default Diff ghc ghc-boot-th ghcide
-         hashable haskell-lsp hslogger lens process regex-tdfa shake text
+         aeson base containers data-default Diff hashable haskell-lsp
+         hslogger lens process regex-tdfa shake text unix
          unordered-containers
        ];
        description = "Haskell Language Server API for plugin communication";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
+     }) {};
+
+  "hls-retrie-plugin" = callPackage
+    ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
+     , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
+     , hls-plugin-api, retrie, safe-exceptions, shake, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-retrie-plugin";
+       version = "0.1.0.0";
+       sha256 = "1h928dvycyj4lxhn73zv58hgvc4yccr5dv7bbc6nsq62762f75j4";
+       libraryHaskellDepends = [
+         aeson base containers deepseq directory extra ghc ghcide hashable
+         haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
+         shake text transformers unordered-containers
+       ];
+       description = "Retrie integration plugin for Haskell Language Server";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "hls-splice-plugin" = callPackage
+    ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc
+     , ghc-exactprint, ghcide, haskell-lsp, hls-exactprint-utils
+     , hls-plugin-api, lens, retrie, shake, syb, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-splice-plugin";
+       version = "0.1.0.0";
+       sha256 = "10zqgczp1mx81ac8fh59dp1hipfh09w4hnxylqjhj6c6wzgwa4cj";
+       libraryHaskellDepends = [
+         aeson base containers dlist foldl ghc ghc-exactprint ghcide
+         haskell-lsp hls-exactprint-utils hls-plugin-api lens retrie shake
+         syb text transformers unordered-containers
+       ];
+       description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
+       license = lib.licenses.asl20;
      }) {};
 
   "hlwm" = callPackage
@@ -128193,8 +128881,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        description = "Bindings to the herbstluftwm window manager";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128210,7 +128898,7 @@ self: {
        ];
        description = "Haskell LilyPond";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128229,8 +128917,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A tool and library for Markov chains based text generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128244,8 +128932,8 @@ self: {
          base containers mtl network parsec xhtml
        ];
        description = "Simple wikitext-like markup format implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128265,7 +128953,7 @@ self: {
        ];
        librarySystemDepends = [ openblasCompat ];
        description = "Numeric Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
 
   "hmatrix-backprop" = callPackage
@@ -128287,7 +128975,7 @@ self: {
          microlens microlens-platform vector-sized vinyl
        ];
        description = "hmatrix operations lifted for backprop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-banded" = callPackage
@@ -128301,8 +128989,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix transformers ];
        librarySystemDepends = [ liblapack ];
        description = "HMatrix interface to LAPACK functions for banded matrices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {liblapack = null;};
 
@@ -128314,7 +129002,7 @@ self: {
        sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb";
        libraryHaskellDepends = [ base bytestring cassava hmatrix vector ];
        description = "CSV encoding and decoding for hmatrix";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-glpk" = callPackage
@@ -128326,7 +129014,7 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix ];
        librarySystemDepends = [ glpk ];
        description = "Linear Programming based on GLPK";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
@@ -128341,7 +129029,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gsl ];
        description = "Numerical computation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
@@ -128357,7 +129045,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gsl ];
        description = "GSL Statistics interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-mmap" = callPackage
@@ -128368,8 +129056,8 @@ self: {
        sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d";
        libraryHaskellDepends = [ base hmatrix mmap ];
        description = "Memory map Vector from disk into memory efficiently";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128390,7 +129078,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion hmatrix ];
        description = "Low-level machine learning auxiliary functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "hmatrix-nipals" = callPackage
@@ -128403,8 +129091,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
        description = "NIPALS method for Principal Components Analysis on large data-sets";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128417,7 +129105,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ];
        testHaskellDepends = [ base doctest ];
        description = "Interface HMatrix with the NLOPT minimizer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -128429,7 +129117,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix vector ];
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) QuadProgpp;};
 
   "hmatrix-repa" = callPackage
@@ -128440,7 +129128,7 @@ self: {
        sha256 = "1gki1qp8gi8953iqq9i6nsxrjjgjqsq7q105icjp585f01la9hsi";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "Adaptors for interoperability between hmatrix and repa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-sparse" = callPackage
@@ -128453,8 +129141,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
        description = "Sparse linear solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
@@ -128466,7 +129154,7 @@ self: {
        sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz";
        libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
        description = "Interface to GSL special functions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hmatrix-static" = callPackage
@@ -128482,7 +129170,7 @@ self: {
        ];
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128510,8 +129198,8 @@ self: {
          base bytestring cassava clock hmatrix optparse-applicative
        ];
        description = "hmatrix interface to sundials";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sundials_arkode = null; sundials_cvode = null;};
 
@@ -128527,8 +129215,8 @@ self: {
        testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        description = "SVDLIBC bindings for HMatrix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128544,8 +129232,8 @@ self: {
          base haskell-src-exts haskell-src-meta hmatrix template-haskell
        ];
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128563,8 +129251,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck random ];
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128581,7 +129269,7 @@ self: {
          base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized
        ];
        description = "Conversions between hmatrix and vector-sized types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmeap" = callPackage
@@ -128597,7 +129285,7 @@ self: {
        ];
        description = "Haskell Meapsoft Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128618,7 +129306,7 @@ self: {
        ];
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128634,7 +129322,7 @@ self: {
          base binary containers monad-stm stm transformers
        ];
        description = "In-memory relational database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmenu" = callPackage
@@ -128647,8 +129335,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base MissingH process ];
        description = "CLI fuzzy finder and launcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128668,8 +129356,8 @@ self: {
        executableHaskellDepends = [ base probable vector ];
        testHaskellDepends = [ base HUnit vector ];
        description = "HMEP Multi Expression Programming – a genetic programming variant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128681,7 +129369,7 @@ self: {
        sha256 = "0q2b2hk6s0fnyw67yfrbmiv7m2cwdcz1q86zzcna4ci5gyv0j07d";
        libraryHaskellDepends = [ base stm ];
        description = "Binding to the OS level MIDI services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmk" = callPackage
@@ -128701,7 +129389,7 @@ self: {
        ];
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128717,8 +129405,8 @@ self: {
          array base data-memocombinators list-extras logfloat
        ];
        description = "A hidden markov model library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128737,8 +129425,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using HMatrix primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128759,8 +129447,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using LAPACK primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128782,7 +129470,7 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -128816,7 +129504,7 @@ self: {
        libraryHaskellDepends = [ base integer-gmp ];
        librarySystemDepends = [ mpfr ];
        description = "Haskell binding to the MPFR library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
@@ -128837,7 +129525,7 @@ self: {
        ];
        description = "Haskell Music Theory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128856,7 +129544,7 @@ self: {
        ];
        description = "Haskell Music Theory Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128876,7 +129564,7 @@ self: {
        ];
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128906,8 +129594,8 @@ self: {
        ];
        testSystemDepends = [ netcdf ];
        description = "Haskell NetCDF library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) netcdf;};
 
@@ -128916,9 +129604,9 @@ self: {
      , bytestring, comonad, containers, criterion, data-fix, deepseq
      , deriving-compat, Diff, directory, exceptions, filepath, free
      , gitrev, Glob, hashable, hashing, haskeline, hedgehog
-     , hnix-store-core, http-client, http-client-tls, http-types
-     , lens-family, lens-family-core, lens-family-th, logict, megaparsec
-     , monad-control, monadlist, mtl, neat-interpolation
+     , hnix-store-core, hnix-store-remote, http-client, http-client-tls
+     , http-types, lens-family, lens-family-core, lens-family-th, logict
+     , megaparsec, monad-control, monadlist, mtl, neat-interpolation
      , optparse-applicative, parser-combinators, pretty-show
      , prettyprinter, process, ref-tf, regex-tdfa, repline, scientific
      , semialign, semialign-indexed, serialise, some, split, syb, tasty
@@ -128928,21 +129616,22 @@ self: {
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.11.1";
-       sha256 = "0rdl1ky8l2zm5arkdq77qrg0xnqfavba0bnr9bd0zhjj3k2gb4v7";
+       version = "0.12.0.1";
+       sha256 = "013jlmzzr5fcvl0w9rrvhsg8jikg0hbc8z57yzxgz109x7hrnjzc";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring comonad
          containers data-fix deepseq deriving-compat directory exceptions
-         filepath free gitrev hashable hashing hnix-store-core http-client
-         http-client-tls http-types lens-family lens-family-core
-         lens-family-th logict megaparsec monad-control monadlist mtl
-         neat-interpolation optparse-applicative parser-combinators
-         pretty-show prettyprinter process ref-tf regex-tdfa scientific
-         semialign semialign-indexed serialise some split syb
-         template-haskell text these time transformers transformers-base
-         unix unordered-containers vector xml
+         filepath free gitrev hashable hashing hnix-store-core
+         hnix-store-remote http-client http-client-tls http-types
+         lens-family lens-family-core lens-family-th logict megaparsec
+         monad-control monadlist mtl neat-interpolation optparse-applicative
+         parser-combinators pretty-show prettyprinter process ref-tf
+         regex-tdfa scientific semialign semialign-indexed serialise some
+         split syb template-haskell text these time transformers
+         transformers-base unix unordered-containers vector xml
        ];
        executableHaskellDepends = [
          aeson base base16-bytestring bytestring comonad containers data-fix
@@ -128963,7 +129652,7 @@ self: {
          template-haskell text time transformers unordered-containers
        ];
        description = "Haskell implementation of the Nix language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hnix-store-core" = callPackage
@@ -128991,60 +129680,54 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
-  "hnix-store-core_0_4_0_0" = callPackage
+  "hnix-store-core_0_4_1_0" = callPackage
     ({ mkDerivation, algebraic-graphs, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, bytestring, cereal
      , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
-     , cryptohash-sha512, directory, filepath, hashable, io-streams
-     , lifted-base, monad-control, mtl, nix-derivation, process
-     , process-extras, saltine, tasty, tasty-discover, tasty-golden
-     , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time
-     , unix, unordered-containers, vector
+     , cryptohash-sha512, directory, filepath, hashable, lifted-base
+     , monad-control, mtl, nix-derivation, process, saltine, tasty
+     , tasty-golden, tasty-hspec, tasty-hunit, tasty-quickcheck
+     , temporary, text, time, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hnix-store-core";
-       version = "0.4.0.0";
-       sha256 = "05fwh5y82qy4qzi32xgk8dmndd8r074rvfl2nxyg3f3ydqpcmmr2";
+       version = "0.4.1.0";
+       sha256 = "05yblps7x9r4hwszinx2s4rcfr8q1d1y6r29mn6jzydjwvdyhgj0";
        libraryHaskellDepends = [
          algebraic-graphs attoparsec base base16-bytestring
-         base64-bytestring binary bytestring cereal containers
-         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
-         directory filepath hashable lifted-base monad-control mtl
-         nix-derivation saltine text time unix unordered-containers vector
+         base64-bytestring bytestring cereal containers cryptohash-md5
+         cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory
+         filepath hashable lifted-base monad-control mtl nix-derivation
+         saltine text time unix unordered-containers vector
        ];
        testHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring binary
-         bytestring containers directory filepath io-streams process
-         process-extras tasty tasty-discover tasty-golden tasty-hspec
-         tasty-hunit tasty-quickcheck temporary text unix
+         bytestring containers directory filepath process tasty tasty-golden
+         tasty-hspec tasty-hunit tasty-quickcheck temporary text unix
        ];
-       testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hnix-store-remote" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , filepath, hnix-store-core, mtl, network, nix-derivation, text
-     , time, unix, unordered-containers, vector
+     , hnix-store-core, mtl, network, nix-derivation, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "hnix-store-remote";
-       version = "0.4.0.0";
-       sha256 = "0l9gb5b415im1bjrbx6k0ah92763hgm1ns6kxfl5mxwij52kzc32";
+       version = "0.4.1.0";
+       sha256 = "1w6x756hh7429ci2kdsl9psxbsq8k829x802dblv652d33wl0fkc";
        libraryHaskellDepends = [
-         attoparsec base binary bytestring containers filepath
-         hnix-store-core mtl network nix-derivation text time unix
-         unordered-containers vector
+         attoparsec base binary bytestring containers hnix-store-core mtl
+         network nix-derivation text time unordered-containers
        ];
        description = "Remote hnix store";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.asl20;
      }) {};
 
   "hnn" = callPackage
@@ -129062,7 +129745,7 @@ self: {
          vector-binary-instances zlib
        ];
        description = "A reasonably fast and simple neural network library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hnock" = callPackage
@@ -129077,7 +129760,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "A Nock interpreter";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hnop" = callPackage
@@ -129090,7 +129773,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hnormalise" = callPackage
@@ -129131,8 +129814,8 @@ self: {
          aeson attoparsec base criterion random text
        ];
        description = "Log message normalisation tool producing structured JSON messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129148,8 +129831,8 @@ self: {
        ];
        testHaskellDepends = [ base compdata patch-combinators ];
        description = "Generic rewrite rules with safe treatment of variables and binders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129167,8 +129850,8 @@ self: {
          old-locale random RSA SHA time utf8-string
        ];
        description = "A Haskell implementation of OAuth 1.0a protocol.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129189,7 +129872,7 @@ self: {
          uri-bytestring-aeson
        ];
        description = "Haskell OAuth2 authentication client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hob" = callPackage
@@ -129216,8 +129899,8 @@ self: {
          base containers gtk3 gtksourceview3 hspec mtl text
        ];
        description = "A source code editor aiming for the convenience of use";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129235,8 +129918,8 @@ self: {
          base filemanip filepath fsnotify system-filepath text
        ];
        description = "A small file watcher for OSX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129254,8 +129937,8 @@ self: {
          tagged template-haskell th-expand-syns transformers vector
        ];
        description = "A library for canonically representing terms with binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129275,8 +129958,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        testSystemDepends = [ ocilib ];
        description = "FFI binding to OCILIB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ocilib = null;};
 
@@ -129319,7 +130002,9 @@ self: {
          tasty-smallcheck text unordered-containers word8
        ];
        description = "Interact with the docker registry and generate nix build instructions";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hocon" = callPackage
@@ -129331,7 +130016,7 @@ self: {
        libraryHaskellDepends = [ base hspec MissingH parsec split ];
        testHaskellDepends = [ base hspec MissingH parsec split ];
        description = "Small library for typesafe's configuration specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hodatime" = callPackage
@@ -129354,8 +130039,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "A fully featured date/time library based on Nodatime";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129374,8 +130059,8 @@ self: {
          text time
        ];
        description = "hoe: Haskell One-liner Evaluator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129388,7 +130073,7 @@ self: {
        libraryHaskellDepends = [ base mtl star-to-star template-haskell ];
        description = "defining @mtl@-ready monads as * -> * fixed-points";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hog" = callPackage
@@ -129405,8 +130090,8 @@ self: {
          base cmdargs filepath irc network old-locale time unix
        ];
        description = "Simple IRC logger bot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129424,8 +130109,8 @@ self: {
          array base bytestring containers HUnit mtl old-locale random time
        ];
        description = "Library and tools to manipulate the Ogg container format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129451,8 +130136,8 @@ self: {
          optparse-applicative servant-client text time transformers
        ];
        description = "Bindings to the Toggl.com REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129468,8 +130153,8 @@ self: {
        libraryToolDepends = [ cgen cgen-hs grgen ];
        doHaddock = false;
        description = "Haskell binding to a subset of OGRE";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
@@ -129485,8 +130170,8 @@ self: {
        executableHaskellDepends = [ base hogre ];
        executableSystemDepends = [ OgreMain ];
        description = "Examples for using Hogre";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OgreMain = null;};
 
@@ -129502,8 +130187,8 @@ self: {
        librarySystemDepends = [ OIS ];
        executableHaskellDepends = [ base X11 ];
        description = "OIS bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OIS = null;};
 
@@ -129517,7 +130202,7 @@ self: {
        editedCabalFile = "1xp8l236gflh5njl3s8f0d2ahqypks70pfjnawskc0fcnl818qpa";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hol" = callPackage
@@ -129547,8 +130232,8 @@ self: {
          transformers
        ];
        description = "Higher order logic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129560,8 +130245,8 @@ self: {
        sha256 = "1j2ql6izsd85skd6l9j1qfg7pj5rf513096s9bkvqip9bb4ibr4r";
        libraryHaskellDepends = [ base random safe ];
        description = "An engine for Texas hold'em Poker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129573,8 +130258,8 @@ self: {
        sha256 = "05ba87wk9b5i5b4gsfvsj16rv91dqsmzyys6b5fkssrxh2ika36c";
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129586,7 +130271,7 @@ self: {
        sha256 = "13f6f647ykssqgdqw4fp7gnr2ardxbcn41ksgs15v5dx1n1xvan1";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "holmes" = callPackage
@@ -129597,8 +130282,8 @@ self: {
      }:
      mkDerivation {
        pname = "holmes";
-       version = "0.3.0.1";
-       sha256 = "0b7ifnmg2n3jfb1zgdzy3fylifqq0mxp00r2iwp9wrnf29rdzxp3";
+       version = "0.3.2.0";
+       sha256 = "1hrgdnlyqz8wjnqihp8gn3rhl1zfyd6p9yv4cjwsv876bgy17ql8";
        libraryHaskellDepends = [
          base containers hashable hedgehog logict mtl primitive transformers
          unordered-containers
@@ -129610,9 +130295,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit tasty-discover ];
        description = "Tools and combinators for solving constraint problems";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.mit;
      }) {};
 
   "holy-project" = callPackage
@@ -129646,8 +130329,8 @@ self: {
        ];
        doCheck = false;
        description = "Start your Haskell project with cabal, git and tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129659,8 +130342,8 @@ self: {
        sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c";
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Homeomorphic Embedding Test";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129674,8 +130357,8 @@ self: {
          array base directory haskell98 random time
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129690,7 +130373,7 @@ self: {
        ];
        description = "DirectSound extension (Windows) for the Hommage sound library";
        license = "GPL";
-       platforms = stdenv.lib.platforms.none;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "homoiconic" = callPackage
@@ -129702,8 +130385,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129718,7 +130401,7 @@ self: {
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base OneTuple Only single-tuple ];
        description = "Homotuple, all whose elements are the same type";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "homplexity" = callPackage
@@ -129745,8 +130428,8 @@ self: {
          base filepath haskell-src-exts hspec template-haskell
        ];
        description = "Haskell code quality tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129760,7 +130443,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hourglass split ];
        executableHaskellDepends = [ base hourglass split ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "honi" = callPackage
@@ -129776,8 +130459,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
@@ -129789,7 +130472,7 @@ self: {
        sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf";
        libraryHaskellDepends = [ base ];
        description = "Cross-platform interface to the PC speaker";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hoobuddy" = callPackage
@@ -129807,8 +130490,8 @@ self: {
          mtl process yaml
        ];
        description = "Simple tool for fetching and merging hoogle data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129821,8 +130504,8 @@ self: {
        libraryHaskellDepends = [ array base FPretty ghc-prim ];
        testHaskellDepends = [ base ghc-prim ];
        description = "Debugging by observing in place";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129834,8 +130517,8 @@ self: {
        sha256 = "15rj6qfyhihzc5svl3dwkn387x7bbkl5am7h0kj5jjj8hv2q1pnc";
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129847,8 +130530,8 @@ self: {
        sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02";
        libraryHaskellDepends = [ array base ];
        description = "Debugging by observing in place";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129866,8 +130549,8 @@ self: {
          array astar base containers hfov monad-loops mtl ncurses random
        ];
        description = "A small, toy roguelike";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129888,8 +130571,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs hoodle-core ];
        description = "Executable for hoodle";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129906,8 +130589,8 @@ self: {
          strict text
        ];
        description = "text builder for hoodle file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129940,8 +130623,8 @@ self: {
        ];
        librarySystemDepends = [ libX11 libXi ];
        description = "Core library for hoodle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
@@ -129967,8 +130650,8 @@ self: {
          unordered-containers xournal-parser
        ];
        description = "extra hoodle tools";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129986,8 +130669,8 @@ self: {
          lens mtl strict text transformers xournal-types
        ];
        description = "Hoodle file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130014,8 +130697,8 @@ self: {
          base cmdargs directory directory-tree filepath gtk3
        ];
        description = "publish hoodle files as a static web site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130036,8 +130719,8 @@ self: {
          uuid
        ];
        description = "Hoodle file renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130054,8 +130737,8 @@ self: {
          vector
        ];
        description = "Data types for programs for hoodle file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130088,7 +130771,7 @@ self: {
        executableHaskellDepends = [ base ];
        testTarget = "--test-option=--no-net";
        description = "Haskell API Search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hoogle-index" = callPackage
@@ -130107,8 +130790,8 @@ self: {
          optparse-applicative process temporary transformers
        ];
        description = "Easily generate Hoogle indices for installed packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130120,8 +130803,8 @@ self: {
        sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b";
        libraryHaskellDepends = [ base directory process text ];
        description = "run executables in a directory as hooks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130138,7 +130821,7 @@ self: {
          network stm
        ];
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hoop" = callPackage
@@ -130159,8 +130842,8 @@ self: {
          parsec pretty template-haskell text
        ];
        description = "Object-Oriented Programming in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130180,8 +130863,8 @@ self: {
          test-framework-hunit
        ];
        description = "A library to support dataflow analysis and optimization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130205,8 +130888,8 @@ self: {
          snap-core snap-server text time transformers unix xml
        ];
        description = "Haskell Media Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130223,8 +130906,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell binding to libopencc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) opencc;};
 
@@ -130244,8 +130927,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell bindings for OpenCL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OpenCL = null;};
 
@@ -130262,8 +130945,8 @@ self: {
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.23.3";
-       sha256 = "1h6hg05i7vm0cnhn3sifmmv01hjxy0w030j4m3fig3ic57658q2p";
+       version = "0.23.6";
+       sha256 = "0hjh6avcd24czd5dv0kr78hkv8k48i3lgcxiahnfjaqwirmg5wix";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130277,39 +130960,7 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "hOpenPGP-based command-line tools";
-       license = stdenv.lib.licenses.agpl3Plus;
-     }) {};
-
-  "hopenpgp-tools_0_23_4" = callPackage
-    ({ mkDerivation, aeson, alex, array, base, base16-bytestring
-     , binary, binary-conduit, bytestring, conduit, conduit-extra
-     , containers, cryptonite, directory, errors, fgl, graphviz, happy
-     , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed
-     , lens, memory, monad-loops, mtl, openpgp-asciiarmor
-     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-     , prettyprinter-convert-ansi-wl-pprint, resourcet, text, time
-     , time-locale-compat, transformers, unordered-containers, vector
-     , yaml
-     }:
-     mkDerivation {
-       pname = "hopenpgp-tools";
-       version = "0.23.4";
-       sha256 = "1l9aznav4a0cwbd0mw6vlqi85vb3wc7w4fik4m8znmg5xa7dzvsl";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson array base base16-bytestring binary binary-conduit bytestring
-         conduit conduit-extra containers cryptonite directory errors fgl
-         graphviz hOpenPGP http-client http-client-tls http-types
-         ixset-typed lens memory monad-loops mtl openpgp-asciiarmor
-         optparse-applicative prettyprinter prettyprinter-ansi-terminal
-         prettyprinter-convert-ansi-wl-pprint resourcet text time
-         time-locale-compat transformers unordered-containers vector yaml
-       ];
-       executableToolDepends = [ alex happy ];
-       description = "hOpenPGP-based command-line tools";
-       license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Plus;
      }) {};
 
   "hopenssl" = callPackage
@@ -130324,8 +130975,8 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "FFI Bindings to OpenSSL's EVP Digest Interface";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) openssl;};
 
   "hopfield" = callPackage
@@ -130356,8 +131007,8 @@ self: {
          QuickCheck random vector
        ];
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
@@ -130380,7 +131031,7 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Hopfield Networks for unsupervised learning in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hopfli" = callPackage
@@ -130394,7 +131045,7 @@ self: {
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        description = "Bidings to Google's Zopfli compression library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hoppy-docs" = callPackage
@@ -130408,8 +131059,8 @@ self: {
          base haskell-src hoppy-generator hoppy-runtime
        ];
        description = "C++ FFI generator - Documentation";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130426,8 +131077,8 @@ self: {
          process temporary text
        ];
        description = "C++ FFI generator - Code generator";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130441,8 +131092,8 @@ self: {
          base Cabal containers directory filepath
        ];
        description = "C++ FFI generator - Runtime support";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130457,8 +131108,8 @@ self: {
          base filepath haskell-src hoppy-generator
        ];
        description = "C++ FFI generator - Standard library bindings";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130491,8 +131142,8 @@ self: {
          filepath process QuickCheck text transformers vector
        ];
        description = "Handy Operations on Power Series";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130512,8 +131163,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "A language based on homotopy type theory with an interval type";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130531,7 +131182,7 @@ self: {
          timezone-series
        ];
        description = "date time";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "horizon" = callPackage
@@ -130542,8 +131193,8 @@ self: {
        sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
        libraryHaskellDepends = [ AC-Angle base time ];
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130562,8 +131213,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Rename function definitions returned by SMT solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130581,7 +131232,7 @@ self: {
          time transformers
        ];
        description = "Haskell Open Sound Control";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hosc-json" = callPackage
@@ -130600,7 +131251,7 @@ self: {
        ];
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130622,7 +131273,7 @@ self: {
        ];
        description = "Haskell Open Sound Control Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {www-minus = null;};
 
@@ -130641,7 +131292,7 @@ self: {
          hashable iproute microlens-th text
        ];
        description = "Network Host Addresses";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hostname" = callPackage
@@ -130652,7 +131303,7 @@ self: {
        sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
        libraryHaskellDepends = [ base ];
        description = "A very simple package providing a cross-platform means of determining the hostname";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hostname-validate" = callPackage
@@ -130663,7 +131314,7 @@ self: {
        sha256 = "0my8g4kqf9mz7ii79ff53rwkx3yv9kkn4jbm60q4b7g1rzhb3bvz";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Validate hostnames e.g. localhost or foo.co.uk.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hosts-server" = callPackage
@@ -130680,8 +131331,8 @@ self: {
          attoparsec base bytestring data-default dns iproute network
        ];
        description = "An dns server which is extremely easy to config";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130700,8 +131351,8 @@ self: {
          haskell-src-exts optparse-applicative split
        ];
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130713,8 +131364,8 @@ self: {
        sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv";
        libraryHaskellDepends = [ base plugins ];
        description = "Simple code hotswapping";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130734,7 +131385,7 @@ self: {
          base bytestring deepseq gauge mtl old-locale time
        ];
        description = "simple performant time related library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hourglass-fuzzy-parsing" = callPackage
@@ -130745,8 +131396,8 @@ self: {
        sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37";
        libraryHaskellDepends = [ base hourglass parsec ];
        description = "A small library for parsing more human friendly date/time formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130763,7 +131414,7 @@ self: {
          aeson base hourglass hspec hspec-expectations text
        ];
        description = "Orphan Aeson instances to hourglass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "houseman" = callPackage
@@ -130792,8 +131443,8 @@ self: {
          streaming-commons temporary text time trifecta unix
        ];
        description = "A Haskell implementation of Foreman";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130806,7 +131457,7 @@ self: {
        libraryHaskellDepends = [ base indexed ];
        testHaskellDepends = [ base do-notation indexed ];
        description = "Non-interactive proof assistant monad for first-order logic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hp2any-core" = callPackage
@@ -130822,8 +131473,8 @@ self: {
          old-locale process time
        ];
        description = "Heap profiling helper library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130845,8 +131496,8 @@ self: {
        ];
        executableSystemDepends = [ freeglut libGL libGLU ];
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
@@ -130868,8 +131519,8 @@ self: {
          glib gtk gtkglext hp2any-core hp2any-graph OpenGL time
        ];
        description = "A utility to visualise and compare heap profiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130884,7 +131535,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers filepath ];
        description = "A tool for converting GHC heap-profiles to HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hp2pretty" = callPackage
@@ -130902,7 +131553,7 @@ self: {
          optparse-applicative semigroups text
        ];
        description = "generate pretty graphs from heap profiles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpack" = callPackage
@@ -130940,7 +131591,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A modern format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hpack-convert" = callPackage
@@ -130971,8 +131622,8 @@ self: {
          split temporary text unordered-containers vector yaml
        ];
        description = "Convert Cabal manifests into hpack's package.yamls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131003,7 +131654,9 @@ self: {
          tasty-golden text transformers utf8-string yaml
        ];
        description = "hpack's dhalling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpaco" = callPackage
@@ -131020,8 +131673,8 @@ self: {
          aeson base cmdargs filepath hpaco-lib strict utf8-string yaml
        ];
        description = "Modular template compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131039,8 +131692,8 @@ self: {
          mtl parsec safe split strict transformers
        ];
        description = "Modular template compiler library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131062,8 +131715,8 @@ self: {
          process time wx wxcore
        ];
        description = "A scrapbook for Haskell developers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131076,8 +131729,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) papi;};
 
@@ -131106,7 +131759,7 @@ self: {
        ];
        description = "Haskell paste web site";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131126,8 +131779,8 @@ self: {
          lifted-base network optparse-applicative process safe utf8-string
        ];
        description = "A command-line client for hpaste.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131144,7 +131797,7 @@ self: {
          utf8-string word8
        ];
        description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-directory" = callPackage
@@ -131167,7 +131820,7 @@ self: {
          process time unix unix-bytestring utf8-string
        ];
        description = "Alternative to 'directory' package with ByteString based filepaths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-filepath" = callPackage
@@ -131178,7 +131831,7 @@ self: {
        sha256 = "01sclksryvl8z56asxda2q4wx0snc89482xlav6mrgzxsi432a07";
        libraryHaskellDepends = [ base bytestring unix word8 ];
        description = "ByteString based filepath manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-io" = callPackage
@@ -131195,7 +131848,7 @@ self: {
          safe-exceptions streamly time unix
        ];
        description = "High-level IO operations on files/directories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-posix" = callPackage
@@ -131206,7 +131859,7 @@ self: {
        sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf";
        libraryHaskellDepends = [ base bytestring hpath-filepath unix ];
        description = "Some low-level POSIX glue code, that is not in 'unix'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc_0_6_0_3" = callPackage
@@ -131221,8 +131874,8 @@ self: {
          base containers directory filepath time
        ];
        description = "Code Coverage Library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hpc-codecov" = callPackage
@@ -131231,8 +131884,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpc-codecov";
-       version = "0.2.0.0";
-       sha256 = "0ha97zldwbsx86ji4sjaw9jf7kzgrk41zabzdd1b6sdlf20p883k";
+       version = "0.2.0.1";
+       sha256 = "0gbgrq5xv393mg7xgqddw18hqwhrz11nrqblcrcjpm4cdbkxwf5q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131243,7 +131896,7 @@ self: {
          base directory filepath tar tasty tasty-hunit
        ];
        description = "Generate codecov report from hpc data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-coveralls" = callPackage
@@ -131268,8 +131921,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Coveralls.io support for Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131296,7 +131949,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Convert HPC output into LCOV format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-strobe" = callPackage
@@ -131307,7 +131960,7 @@ self: {
        sha256 = "1fgw4pf72684mi7s5pqvfj75s8y004rxf3ww377kyrlw1mb7405c";
        libraryHaskellDepends = [ base filepath hpc ];
        description = "Hpc-generated strobes for a running Haskell program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-threshold" = callPackage
@@ -131324,7 +131977,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq hspec ];
        description = "Ensure the code coverage is above configured thresholds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-tracer" = callPackage
@@ -131342,8 +131995,8 @@ self: {
          unix
        ];
        description = "Tracer with AJAX interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131367,7 +132020,7 @@ self: {
          base bytestring memory optparse-applicative semigroups utf8-string
        ];
        description = "A tool for looking through PDF file using Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hpg" = callPackage
@@ -131380,8 +132033,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random ];
        description = "a simple password generator";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131411,8 +132064,8 @@ self: {
          protolude QuickCheck
        ];
        description = "Monads for GPIO in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131429,8 +132082,8 @@ self: {
          transformers
        ];
        description = "monadic, reactive Formlets running in the Web browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hplaylist" = callPackage
@@ -131445,7 +132098,7 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131466,7 +132119,7 @@ self: {
        ];
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131487,7 +132140,7 @@ self: {
        executableHaskellDepends = [ base directory filepath time ];
        testHaskellDepends = [ base bytestring transformers ];
        description = "A Haskell pre-processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpqtypes" = callPackage
@@ -131516,8 +132169,8 @@ self: {
          unordered-containers uuid-types vector
        ];
        description = "Haskell bindings to libpqtypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -131531,6 +132184,8 @@ self: {
        pname = "hpqtypes-extras";
        version = "1.10.3.0";
        sha256 = "1ifr6z89ki541b9x3kpyf10vbn3anhfcq8ppqwyp5zvmkx0q3wqs";
+       revision = "1";
+       editedCabalFile = "0pa13k78w0xm59pvlsd9rmg9ddi3jkc918j5i0hb4vlxcaivq34y";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash exceptions
          fields-json hpqtypes lifted-base log-base monad-control mtl safe
@@ -131541,8 +132196,8 @@ self: {
          tasty-hunit text transformers uuid-types
        ];
        description = "Extra utilities for hpqtypes library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131572,8 +132227,8 @@ self: {
        ];
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131602,8 +132257,8 @@ self: {
        ];
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131626,7 +132281,7 @@ self: {
          wai-extra warp warp-tls
        ];
        description = "a lightweight HTTP proxy server, and more";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hps" = callPackage
@@ -131639,7 +132294,7 @@ self: {
        libraryHaskellDepends = [ base filepath hcg-minus process ];
        description = "Haskell Postscript";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131656,7 +132311,7 @@ self: {
        executableHaskellDepends = [ base cairo gtk hps random ];
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131668,8 +132323,8 @@ self: {
        sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc";
        libraryHaskellDepends = [ base vector ];
        description = "A nice implementation of the k-Means algorithm";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131683,7 +132338,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libpuz";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hpygments" = callPackage
@@ -131698,8 +132353,8 @@ self: {
          aeson base bytestring process process-extras
        ];
        description = "Highlight source code using Pygments";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131716,7 +132371,7 @@ self: {
        ];
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131732,8 +132387,8 @@ self: {
          base lens optparse-applicative parsec text
        ];
        description = "pyrg utility done right";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131763,8 +132418,8 @@ self: {
          base criterion deepseq megaparsec text validation
        ];
        description = "Python language tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131795,7 +132450,7 @@ self: {
        ];
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131808,7 +132463,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131826,7 +132481,7 @@ self: {
          test-framework-hunit text xmlhtml
        ];
        description = "A query language for transforming HTML5";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hranker" = callPackage
@@ -131839,8 +132494,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131860,8 +132515,8 @@ self: {
        ];
        testHaskellDepends = [ base hset transformers-base ];
        description = "Generalization of MonadReader and ReaderT using hset";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131877,8 +132532,8 @@ self: {
          base comonad hreader hset lens lens-action profunctors
        ];
        description = "Optics for hreader package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131907,8 +132562,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A Type dependent Highlevel HTTP client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131933,8 +132588,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Conduit streaming support for Hreq";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131955,8 +132610,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Core functionality for Hreq Http client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131969,7 +132624,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base process tasty tasty-hunit ];
        description = "File size in human readable format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hricket" = callPackage
@@ -131982,8 +132637,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132009,8 +132664,8 @@ self: {
          base containers hspec hspec-core HUnit kazura-queue QuickCheck
        ];
        description = "A Riemann Client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132033,7 +132688,7 @@ self: {
          aeson attoparsec base QuickCheck text vector
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -132045,7 +132700,7 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ GeoIP ];
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {GeoIP = null;};
 
   "hs-bibutils" = callPackage
@@ -132077,8 +132732,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion cryptohash ];
        benchmarkSystemDepends = [ libb2 ];
        description = "A cryptohash-inspired library for blake2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libb2;};
 
@@ -132097,8 +132752,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Compression and decompression in the brotli format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {brotlidec = null; brotlienc = null;};
 
@@ -132110,7 +132765,7 @@ self: {
        sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8";
        libraryHaskellDepends = [ base bytestring gd random ];
        description = "Generate images suitable for use as CAPTCHAs in online web-form security";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-carbon" = callPackage
@@ -132122,7 +132777,7 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel random ];
        testHaskellDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hs-carbon-examples" = callPackage
@@ -132139,8 +132794,8 @@ self: {
          base deepseq gloss hs-carbon monad-loops mtl tf-random
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132156,8 +132811,8 @@ self: {
          array base bytestring bytestring-mmap directory filepath mtl
        ];
        description = "A library for reading CDB (Constant Database) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132178,8 +132833,8 @@ self: {
          base containers directory filepath megaparsec
        ];
        description = "Conllu validating parser and utils";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132209,8 +132864,8 @@ self: {
          regex-tdfa template-haskell text time
        ];
        description = "Dependency Injection library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132223,8 +132878,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ole32 = null; oleaut32 = null;};
 
@@ -132247,7 +132902,7 @@ self: {
          raw-strings-qq template-haskell text time
        ];
        description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hs-excelx" = callPackage
@@ -132262,8 +132917,8 @@ self: {
          base bytestring containers mtl text time xml-conduit zip-archive
        ];
        description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132275,8 +132930,8 @@ self: {
        sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51";
        libraryHaskellDepends = [ base bytestring haskell98 ];
        description = "Bindings to FFMPEG library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132290,8 +132945,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fltk fltk_images ];
        description = "Binding to GUI library FLTK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
@@ -132303,7 +132958,7 @@ self: {
        sha256 = "1cigaggilr05pgizj11g5c40ln38zb5q8p0igliamkhx7fz3axis";
        libraryHaskellDepends = [ base dual tagged transformers ];
        description = "Functors from products of Haskell and its dual to Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-gchart" = callPackage
@@ -132315,7 +132970,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        description = "Haskell wrapper for the Google Chart API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -132333,8 +132988,8 @@ self: {
          haskell-src-exts hse-cpp mtl tagged
        ];
        description = "Utility to generate haskell-names interface files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132350,8 +133005,8 @@ self: {
          base containers directory filepath parsec process
        ];
        description = "Haskell wrapper around the GIZA++ toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132364,8 +133019,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src ];
        testHaskellDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132377,7 +133032,7 @@ self: {
        sha256 = "04dm8c5ilaw4agljfp7k31ln2j5m1shyg4zb3x36rjkbs807z8sf";
        libraryHaskellDepends = [ base hs-functors ];
        description = "Indexed applicative functors and monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-java" = callPackage
@@ -132396,8 +133051,8 @@ self: {
          filepath Glob LibZip MissingH mtl parsec utf8-string
        ];
        description = "Java .class files assembler/disassembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132411,8 +133066,8 @@ self: {
          aeson base bytestring HTTP network text
        ];
        description = "JSON-RPC client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132439,8 +133094,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Logo interpreter written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132465,8 +133120,8 @@ self: {
          base bytestring lens managed QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {mesos = null; inherit (pkgs) protobuf;};
 
   "hs-multiaddr" = callPackage
@@ -132484,8 +133139,8 @@ self: {
          base bytestring either-unwrap hs-multihash hspec iproute sandi
        ];
        description = "Multiaddr library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hs-multihash = null;};
 
@@ -132499,8 +133154,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HandsomeSoup hxt random ];
        description = "Name generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132515,7 +133170,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base containers emojis text ];
        description = "The OpenMoji emoji dataset";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-pattrans" = callPackage
@@ -132540,8 +133195,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "DSL for musical patterns and transformation, based on contravariant functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132561,8 +133216,8 @@ self: {
          array base directory glib gtk MonadPrompt mtl random
        ];
        description = "Programmer's Mine Sweeper in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132574,7 +133229,7 @@ self: {
        sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f";
        libraryHaskellDepends = [ base bytestring ];
        description = "PHP session and values serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-pkg-config" = callPackage
@@ -132587,8 +133242,8 @@ self: {
        editedCabalFile = "1kj5lrv2a9mgzqbwkznpsgjgs5s9wnwrcsab2mykxpkm8f71nk81";
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Create pkg-config configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132609,8 +133264,8 @@ self: {
          zip-archive
        ];
        description = "A library for Passbook pass creation & signing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132625,7 +133280,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Bindings to C pipe functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-profunctors" = callPackage
@@ -132636,7 +133291,7 @@ self: {
        sha256 = "09iylf1xjxsikjyaib9902na33bkfs8nv3wasyvikg4g82xqay5y";
        libraryHaskellDepends = [ base hs-functors ];
        description = "Profunctors from Haskell to Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-re" = callPackage
@@ -132647,8 +133302,8 @@ self: {
        sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Easy to use Regex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132665,8 +133320,8 @@ self: {
          unordered-containers
        ];
        description = "A Haskell client for RQlite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132687,8 +133342,8 @@ self: {
        executableSystemDepends = [ notifier ];
        testHaskellDepends = [ base protolude ];
        description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {notifier = null;};
 
@@ -132709,8 +133364,8 @@ self: {
          base containers hspec tasty tasty-hunit xml-conduit
        ];
        description = "Simple and easy web scraping and automation in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132726,7 +133381,7 @@ self: {
        libraryHaskellDepends = [ base directory network ];
        testHaskellDepends = [ base HUnit network temporary unix ];
        description = "Write a server supporting Server::Starter's protocol in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-snowtify" = callPackage
@@ -132742,8 +133397,8 @@ self: {
          base either safe safe-exceptions text turtle
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132762,8 +133417,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Convert an eventlog into the speedscope json format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132781,8 +133436,8 @@ self: {
          base HTTP json mime network old-locale old-time random utf8-string
        ];
        description = "Haskell binding to the Twitter API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132798,7 +133453,7 @@ self: {
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        description = "Commandline Twitter feed archiver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132810,8 +133465,8 @@ self: {
        sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15";
        libraryHaskellDepends = [ base old-locale time ];
        description = "Implements the RFC 2426 vCard 3.0 spec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132831,8 +133486,8 @@ self: {
          base bytestring containers filepath tasty tasty-hunit temporary
        ];
        description = "Client library for Facebook's Watchman tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132853,7 +133508,7 @@ self: {
          base bytestring criterion ghc-prim zlib
        ];
        description = "Haskell bindings to the Zstandard compression algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs2048" = callPackage
@@ -132877,7 +133532,7 @@ self: {
          base criterion hastache random statistics
        ];
        description = "A 2048 clone in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hs2ats" = callPackage
@@ -132901,7 +133556,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Create ATS types from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs2bf" = callPackage
@@ -132919,8 +133574,8 @@ self: {
          array base containers directory filepath haskell-src mtl
        ];
        description = "Haskell to Brainfuck compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132939,7 +133594,7 @@ self: {
        ];
        description = "Generate graphviz-code from Haskell-code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hs2ps" = callPackage
@@ -132951,8 +133606,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Translate Haskell types to PureScript";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132977,8 +133632,8 @@ self: {
        sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132991,7 +133646,7 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base HUnit lens ];
        description = "PID control loop";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hsSqlite3" = callPackage
@@ -133008,7 +133663,7 @@ self: {
        ];
        description = "Sqlite3 bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133021,8 +133676,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring dlist mtl ];
        librarySystemDepends = [ xenctrl ];
        description = "FFI bindings to the Xen Control library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xenctrl = null;};
 
@@ -133055,7 +133710,7 @@ self: {
          uuid xml-conduit
        ];
        description = "Akamai API(Edgegrid and Netstorage)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsaml2" = callPackage
@@ -133082,8 +133737,8 @@ self: {
          network-uri semigroups string-conversions time x509
        ];
        description = "OASIS Security Assertion Markup Language (SAML) V2.0";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libxml2;};
 
@@ -133108,30 +133763,26 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Integrating Sass into Haskell applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsautogui" = callPackage
-    ({ mkDerivation, base, containers, cpython, mtl, python3
+    ({ mkDerivation, base, containers, cpython, hspec, mtl
      , template-haskell, text
      }:
      mkDerivation {
        pname = "hsautogui";
-       version = "0.1.0";
-       sha256 = "0ds1r620825z7dq8rahbi7jymkn5n7y47i7m92qw4dl2cdl0s4g0";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0";
+       sha256 = "1bw0z2jkijqd2rrwwm4zrrz9l44b59fy1rzkr37wagfc59gp9g68";
        libraryHaskellDepends = [
          base containers cpython mtl template-haskell text
        ];
-       librarySystemDepends = [ python3 ];
-       executableHaskellDepends = [ base ];
-       executableSystemDepends = [ python3 ];
+       testHaskellDepends = [ base cpython hspec ];
        description = "Haskell bindings for PyAutoGUI, a library for automating user interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) python3;};
+     }) {};
 
   "hsay" = callPackage
     ({ mkDerivation, base, Hclip, HTTP, process, unix }:
@@ -133144,8 +133795,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133163,7 +133814,7 @@ self: {
          base bytestring containers directory filepath preprocessor-tools
        ];
        description = "Preprocesses a file, adding blobs from files as string literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsbackup" = callPackage
@@ -133181,8 +133832,8 @@ self: {
          old-locale strict time
        ];
        description = "simple utility for rolling filesystem backups";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133196,8 +133847,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ attoparsec base text vector ];
        description = "A command line calculator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133220,8 +133871,8 @@ self: {
          test-framework-hunit text time
        ];
        description = "Launch and gather data from Haskell and non-Haskell benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133240,8 +133891,8 @@ self: {
          time
        ];
        description = "Backend for uploading benchmark data to CodeSpeed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133265,8 +133916,8 @@ self: {
          split statistics text
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133286,7 +133937,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsc3" = callPackage
@@ -133305,8 +133956,8 @@ self: {
          transformers vector
        ];
        description = "Haskell SuperCollider";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133323,7 +133974,7 @@ self: {
        ];
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133337,7 +133988,7 @@ self: {
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        description = "haskell supercollider cairo drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133356,7 +134007,7 @@ self: {
        ];
        description = "haskell supercollider data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133370,7 +134021,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 safe ];
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133384,7 +134035,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        description = "haskell supercollider graph drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133405,7 +134056,7 @@ self: {
        ];
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133431,7 +134082,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133453,7 +134104,7 @@ self: {
        ];
        description = "Haskell SuperCollider Language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133474,7 +134125,7 @@ self: {
        ];
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133493,7 +134144,7 @@ self: {
        ];
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133514,7 +134165,7 @@ self: {
        ];
        description = "Create and control scsynth processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133528,7 +134179,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133547,7 +134198,7 @@ self: {
        ];
        description = "hsc3 re-writing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133575,7 +134226,7 @@ self: {
        ];
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133589,7 +134240,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133607,7 +134258,7 @@ self: {
        ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133621,7 +134272,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133644,7 +134295,7 @@ self: {
        ];
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133671,8 +134322,8 @@ self: {
          regex-compat temporary text transformers unix
        ];
        description = "Very simple file/directory structure scaffolding writer monad EDSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133688,7 +134339,7 @@ self: {
        librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
@@ -133705,8 +134356,8 @@ self: {
          Thrift
        ];
        description = "cassandra database interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133721,8 +134372,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        description = "Command line client and library for SoundCloud.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133737,7 +134388,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base random random-shuffle ];
        description = "minimal ncurses-like library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hschema" = callPackage
@@ -133754,7 +134405,7 @@ self: {
          natural-transformation profunctors text unordered-containers vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hschema-aeson" = callPackage
@@ -133783,7 +134434,7 @@ self: {
          scientific text time unordered-containers vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hschema-prettyprinter" = callPackage
@@ -133801,7 +134452,7 @@ self: {
          vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hschema-quickcheck" = callPackage
@@ -133818,7 +134469,7 @@ self: {
          quickcheck-instances text unordered-containers vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hsclock" = callPackage
@@ -133832,7 +134483,7 @@ self: {
        executableHaskellDepends = [ base cairo glib gtk old-time ];
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133870,8 +134521,8 @@ self: {
          base directory mtl process test-simple Unixutils
        ];
        description = "cscope like browser for Haskell code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133887,7 +134538,7 @@ self: {
          base directory filepath process time
        ];
        description = "Haskell shell script template";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hscuid" = callPackage
@@ -133906,8 +134557,8 @@ self: {
        executableHaskellDepends = [ base criterion ];
        testHaskellDepends = [ base containers text ];
        description = "Collision-resistant IDs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133938,7 +134589,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hscurses random safe unix ];
        description = "hscurses swimming fish example";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hsdev" = callPackage
@@ -133981,8 +134632,8 @@ self: {
          hformat hspec lens lens-aeson mtl text
        ];
        description = "Haskell development library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133996,7 +134647,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SDIF";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134011,8 +134662,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        description = "hsdip - a Diplomacy parser/renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134029,8 +134680,8 @@ self: {
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
        description = "Asynchronous DNS Resolver";
-       license = stdenv.lib.licenses.lgpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.lgpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) adns;};
 
   "hsdns-cache" = callPackage
@@ -134045,8 +134696,8 @@ self: {
          base hsdns network SafeSemaphore text time unordered-containers
        ];
        description = "Caching asynchronous DNS resolver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134058,7 +134709,7 @@ self: {
        sha256 = "0k2bmsk6d3ym7z71bwxicc0b8wsw0camjgxgbybx4pdz0261dc7f";
        libraryHaskellDepends = [ base cpphs haskell-src-exts ];
        description = "Preprocess+parse haskell code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsebaysdk" = callPackage
@@ -134075,7 +134726,7 @@ self: {
          time transformers unordered-containers
        ];
        description = "Haskell eBay SDK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsemail" = callPackage
@@ -134087,8 +134738,8 @@ self: {
        libraryHaskellDepends = [ base parsec time time-compat ];
        testHaskellDepends = [ base hspec parsec time ];
        description = "Parsec parsers for the Internet Message format (e-mail)";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hsemail-ns" = callPackage
@@ -134100,7 +134751,7 @@ self: {
        libraryHaskellDepends = [ base mtl old-time parsec ];
        testHaskellDepends = [ base doctest hspec old-time parsec ];
        description = "Internet Message Parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsendxmpp" = callPackage
@@ -134118,7 +134769,7 @@ self: {
        ];
        description = "sendxmpp clone, sending XMPP messages via CLI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsenv" = callPackage
@@ -134138,8 +134789,8 @@ self: {
          io-streams mtl process safe split unix
        ];
        description = "Virtual Haskell Environment builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134153,7 +134804,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs wai-app-static warp ];
        description = "Simple http server in haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hset" = callPackage
@@ -134165,8 +134816,8 @@ self: {
        libraryHaskellDepends = [ base deepseq tagged type-fun ];
        testHaskellDepends = [ base HUnit tagged ];
        description = "Primitive list with elements of unique types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134185,7 +134836,7 @@ self: {
          base binary bytestring containers hspec HUnit iconv text time
        ];
        description = "EXIF handling library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsfacter" = callPackage
@@ -134196,8 +134847,8 @@ self: {
        sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q";
        libraryHaskellDepends = [ base containers language-puppet text ];
        description = "A small and ugly library that emulates the output of the puppet facter program";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134213,8 +134864,8 @@ self: {
          base hdaemonize hslogger network process
        ];
        description = "Incremental builder for flash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134228,8 +134879,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ghc ];
        description = "Z-decoder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134253,8 +134904,8 @@ self: {
          uri-encode
        ];
        description = "Salesforce API Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134268,7 +134919,7 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
@@ -134282,7 +134933,7 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
@@ -134295,8 +134946,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134344,7 +134995,7 @@ self: {
        librarySystemDepends = [ blas liblapack ];
        libraryPkgconfigDepends = [ gsl ];
        description = "Signal processing and EEG data analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;};
 
   "hsilop" = callPackage
@@ -134360,7 +135011,7 @@ self: {
          base directory filepath haskeline xdg-basedir
        ];
        description = "RPN calculator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsimport" = callPackage
@@ -134387,7 +135038,7 @@ self: {
        ];
        doHaddock = false;
        description = "Extend the import list of a Haskell source file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsini" = callPackage
@@ -134406,7 +135057,7 @@ self: {
          tasty-quickcheck tasty-th
        ];
        description = "ini configuration files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsinspect" = callPackage
@@ -134428,8 +135079,8 @@ self: {
          transformers
        ];
        description = "Inspect Haskell source files";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134460,8 +135111,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "LSP interface over the hsinspect binary";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134482,7 +135133,7 @@ self: {
          optparse-applicative process safe-exceptions transformers
        ];
        description = "Install Haskell software";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hskeleton" = callPackage
@@ -134493,8 +135144,8 @@ self: {
        sha256 = "0f06xir28rzpwphk14gkpww8l7gbws4habhm26915idpnd4bva2w";
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134510,8 +135161,8 @@ self: {
          base Cabal directory filepath process unix
        ];
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134525,8 +135176,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {svm = null;};
 
@@ -134543,8 +135194,8 @@ self: {
          base Cabal hint MemoTrie process regex-compat
        ];
        description = "Resolves links to Haskell identifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134564,7 +135215,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Versatile logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hslogger-reader" = callPackage
@@ -134582,8 +135233,8 @@ self: {
          attoparsec base hslogger optparse-applicative text text-icu time
        ];
        description = "Parsing hslogger-produced logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134595,8 +135246,8 @@ self: {
        sha256 = "1fg7nz63c3nbpibm5q4mm7rvch7ihf3rlbh6jnhdj6qdspvm38p8";
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134635,8 +135286,8 @@ self: {
          base conduit hspec QuickCheck split stm transformers
        ];
        description = "A library to work with, or as, a logstash server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134659,7 +135310,7 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Bindings to Lua, an embeddable scripting language";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) lua5_3;};
 
   "hslua_1_3_0" = callPackage
@@ -134681,8 +135332,8 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Bindings to Lua, an embeddable scripting language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) lua5_3;};
 
   "hslua-aeson" = callPackage
@@ -134703,7 +135354,7 @@ self: {
          quickcheck-instances scientific text unordered-containers vector
        ];
        description = "Allow aeson data types to be used with lua";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hslua-module-doclayout" = callPackage
@@ -134719,7 +135370,7 @@ self: {
          base doclayout hslua tasty tasty-hunit tasty-lua
        ];
        description = "Lua module wrapping Text.DocLayout.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hslua-module-system" = callPackage
@@ -134737,7 +135388,7 @@ self: {
          base hslua tasty tasty-hunit tasty-lua text
        ];
        description = "Lua module wrapper around Haskell's System module";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hslua-module-text" = callPackage
@@ -134753,7 +135404,7 @@ self: {
          base hslua tasty tasty-hunit tasty-lua text
        ];
        description = "Lua module for text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsluv-haskell" = callPackage
@@ -134765,8 +135416,8 @@ self: {
        libraryHaskellDepends = [ base colour ];
        testHaskellDepends = [ aeson base bytestring colour containers ];
        description = "HSLuv conversion utility";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134790,8 +135441,8 @@ self: {
          freetype2 GraphicsMagick lcms libxml2
        ];
        description = "FFI bindings for the GraphicsMagick library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; 
@@ -134811,7 +135462,7 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit mtl ];
        description = "A collection of miscellaneous modules";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsmodetweaks" = callPackage
@@ -134828,8 +135479,8 @@ self: {
          base containers directory hpack protolude text
        ];
        description = "Tool for generating .dir-locals.el for intero";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134841,8 +135492,8 @@ self: {
        sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg";
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Simple SMTP Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134856,7 +135507,7 @@ self: {
        librarySystemDepends = [ libsndfile ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libsndfile";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libsndfile;};
 
   "hsndfile-storablevector" = callPackage
@@ -134867,7 +135518,7 @@ self: {
        sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z";
        libraryHaskellDepends = [ base hsndfile storablevector ];
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
-       license = stdenv.lib.licenses.lgpl2;
+       license = lib.licenses.lgpl2;
      }) {};
 
   "hsndfile-vector" = callPackage
@@ -134878,7 +135529,7 @@ self: {
        sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig";
        libraryHaskellDepends = [ base hsndfile vector ];
        description = "Haskell bindings for libsndfile (Data.Vector interface)";
-       license = stdenv.lib.licenses.lgpl2;
+       license = lib.licenses.lgpl2;
      }) {};
 
   "hsnock" = callPackage
@@ -134899,8 +135550,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Nock 5K interpreter";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134912,7 +135563,7 @@ self: {
        sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl";
        libraryHaskellDepends = [ base vector ];
        description = "A coherent 3d noise library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsns" = callPackage
@@ -134925,8 +135576,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134945,8 +135596,8 @@ self: {
          stm stm-chans text
        ];
        description = "Haskell NSQ client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134963,8 +135614,8 @@ self: {
        libraryHaskellDepends = [ array base mtl network old-time random ];
        executableHaskellDepends = [ unix ];
        description = "Libraries to use SNTP protocol and small client/server implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134989,8 +135640,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell library that supports command-line flag processing";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135029,8 +135680,8 @@ self: {
          time wai
        ];
        description = "Iron, Hawk, Oz: Web auth protocols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135042,7 +135693,7 @@ self: {
        sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf";
        libraryHaskellDepends = [ base mtl text ];
        description = "Haskell Server Pages is a library for writing dynamic server-side web pages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsp-cgi" = callPackage
@@ -135053,8 +135704,8 @@ self: {
        sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n";
        libraryHaskellDepends = [ base containers harp hsp network ];
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135066,7 +135717,7 @@ self: {
        sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6";
        libraryHaskellDepends = [ base bytestring dataenc gd ];
        description = "Sparklines for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsparql" = callPackage
@@ -135087,8 +135738,8 @@ self: {
          test-framework-hunit text wai warp
        ];
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135105,7 +135756,7 @@ self: {
        ];
        description = "Haskell Spear Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135115,13 +135766,13 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.7.4";
-       sha256 = "0zql8cl025ai3yx2dhp1sgvmw8n4ngqbrlmb42hcgv26q8qnvhmi";
+       version = "2.7.8";
+       sha256 = "0v6bf6ir6h97mys797amr8idl1a6w1gpvj7ps3k0gkxwrnsyvynh";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
        description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -135139,7 +135790,7 @@ self: {
          attoparsec base bytestring hspec hspec-expectations text
        ];
        description = "Utility functions for testing your attoparsec parsers with hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-bracket" = callPackage
@@ -135150,7 +135801,7 @@ self: {
        sha256 = "1d6262frfaghmq77nqsvcalm6w4jl7bn995bkphx461skhm8n300";
        libraryHaskellDepends = [ base hspec ];
        description = "The bracket definitions for Hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-checkers" = callPackage
@@ -135162,7 +135813,7 @@ self: {
        libraryHaskellDepends = [ base checkers hspec ];
        testHaskellDepends = [ base checkers hspec ];
        description = "Allows to use checkers properties from hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-contrib" = callPackage
@@ -135176,7 +135827,7 @@ self: {
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        description = "Contributed functionality for Hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-core" = callPackage
@@ -135187,8 +135838,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.7.4";
-       sha256 = "1k0rs9399m6bzmndc9ybs26mxrzkl9pifrijvknysbaqfcifmq35";
+       version = "2.7.8";
+       sha256 = "10c7avvjcrpy3nrf5xng4177nmxvz0gmc83h7qlnljcp3rkimbvd";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -135203,7 +135854,7 @@ self: {
        testToolDepends = [ hspec-meta ];
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
        description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-dirstream" = callPackage
@@ -135221,7 +135872,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Helper functions to simplify adding integration tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-discover" = callPackage
@@ -135229,8 +135880,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.7.4";
-       sha256 = "02laain23bcnzsl65347qr5knvrmrlhd0kzc0d88kx59lpzm27a0";
+       version = "2.7.8";
+       sha256 = "0z2ysmy4qzv4jyb5yqmavhmbhqk2ch0cmaj18i9jvbg0y7fpsn67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -135240,7 +135891,7 @@ self: {
        ];
        testToolDepends = [ hspec-meta ];
        description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-expectations" = callPackage
@@ -135252,7 +135903,7 @@ self: {
        libraryHaskellDepends = [ base call-stack HUnit ];
        testHaskellDepends = [ base call-stack HUnit nanospec ];
        description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-expectations-json" = callPackage
@@ -135269,8 +135920,8 @@ self: {
        ];
        testHaskellDepends = [ aeson-qq base hspec ];
        description = "Hspec expectations for JSON Values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135287,7 +135938,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec lens silently ];
        description = "Hspec expectations for the lens stuff";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "hspec-expectations-lifted" = callPackage
@@ -135298,7 +135949,7 @@ self: {
        sha256 = "0a1qwz0n80lph8m9cq6cb06m8bsmqgg8ifx0acpylvrrkd8g3k92";
        libraryHaskellDepends = [ base hspec-expectations transformers ];
        description = "A version of hspec-expectations generalized to MonadIO";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-expectations-match" = callPackage
@@ -135314,8 +135965,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "An hspec expectation that asserts a value matches a pattern";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135331,8 +135982,8 @@ self: {
          base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo
        ];
        description = "hspec-expectations with pretty printing on failure";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135349,7 +136000,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec HUnit text ];
        description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-experimental" = callPackage
@@ -135361,8 +136012,8 @@ self: {
        libraryHaskellDepends = [ base hspec HUnit QuickCheck ];
        testHaskellDepends = [ base hspec-meta ];
        description = "An experimental DSL for testing on top of Hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135380,7 +136031,7 @@ self: {
        executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [ base directory hspec hspec-core silently ];
        description = "Golden tests for hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-golden-aeson" = callPackage
@@ -135401,7 +136052,7 @@ self: {
          quickcheck-arbitrary-adt silently transformers
        ];
        description = "Use tests to monitor changes in Aeson serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-hashable" = callPackage
@@ -135417,8 +136068,8 @@ self: {
          base hashable hspec hspec-core QuickCheck silently
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135437,7 +136088,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog hspec ];
        description = "Integrate Hedgehog and Hspec!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -135448,8 +136099,8 @@ self: {
        sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2";
        libraryHaskellDepends = [ base blaze-markup hspec ];
        description = "Jenkins-friendly XML formatter for Hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135463,7 +136114,7 @@ self: {
        testHaskellDepends = [ base hspec markdown-unlit QuickCheck ];
        testToolDepends = [ markdown-unlit ];
        description = "Document and test laws for standard type classes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-leancheck" = callPackage
@@ -135475,7 +136126,7 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ];
        testHaskellDepends = [ base hspec leancheck ];
        description = "LeanCheck support for the Hspec test framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-megaparsec" = callPackage
@@ -135491,7 +136142,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
        description = "Utility functions for testing Megaparsec parsers with Hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-meta" = callPackage
@@ -135519,7 +136170,7 @@ self: {
          setenv stm time transformers
        ];
        description = "A version of Hspec which is used to test Hspec itself";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-monad-control" = callPackage
@@ -135534,8 +136185,8 @@ self: {
          base hspec-core monad-control transformers transformers-base
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135552,7 +136203,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A testing framework for Haskell using Hspec";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hspec-need-env" = callPackage
@@ -135566,7 +136217,7 @@ self: {
        libraryHaskellDepends = [ base hspec-core hspec-expectations ];
        testHaskellDepends = [ base hspec hspec-core setenv transformers ];
        description = "Read environment variables for hspec tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-parsec" = callPackage
@@ -135580,7 +136231,7 @@ self: {
        libraryHaskellDepends = [ base hspec-expectations parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Hspec expectations for testing Parsec parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-pg-transact" = callPackage
@@ -135596,8 +136247,8 @@ self: {
          text tmp-postgres
        ];
        description = "Helpers for creating database tests with hspec and pg-transact";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135616,7 +136267,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-contrib transformers ];
        description = "Test Framework for checking server's status";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-setup" = callPackage
@@ -135645,8 +136296,8 @@ self: {
          projectroot QuickCheck split strict
        ];
        description = "Add an hspec test-suite in one command";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135658,8 +136309,8 @@ self: {
        sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3";
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135676,7 +136327,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl stm ];
        description = "Find slow test cases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-smallcheck" = callPackage
@@ -135695,7 +136346,7 @@ self: {
          smallcheck
        ];
        description = "SmallCheck support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-snap" = callPackage
@@ -135718,8 +136369,8 @@ self: {
          transformers
        ];
        description = "A library for testing with Hspec and the Snap Web Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135731,7 +136382,7 @@ self: {
        sha256 = "1svdw7z92cxfflyahq1gn6kfb33p7pl4byqp5a4baj7b5gd18rqg";
        libraryHaskellDepends = [ base directory hspec safe strict ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-structured-formatter" = callPackage
@@ -135741,8 +136392,8 @@ self: {
        version = "0.1.0.3";
        sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj";
        libraryHaskellDepends = [ base hspec ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135757,7 +136408,7 @@ self: {
        libraryHaskellDepends = [ base hspec-core ];
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Table-driven (by-example) HSpec tests";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -135772,7 +136423,7 @@ self: {
          base hspec hspec-contrib hspec-core HUnit QuickCheck
        ];
        description = "Run test-framework tests with Hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-test-framework-th" = callPackage
@@ -135788,7 +136439,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec-test-framework HUnit ];
        description = "Run test-framework tests with Hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-test-sandbox" = callPackage
@@ -135800,8 +136451,8 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-core test-sandbox ];
        testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135825,7 +136476,7 @@ self: {
          wai-extra
        ];
        description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-wai_0_11_1" = callPackage
@@ -135848,8 +136499,8 @@ self: {
          wai-extra
        ];
        description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-wai-json" = callPackage
@@ -135866,7 +136517,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-wai ];
        description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-wai-json_0_11_0" = callPackage
@@ -135883,8 +136534,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-wai ];
        description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-webdriver" = callPackage
@@ -135901,8 +136552,8 @@ self: {
          stm text transformers unordered-containers webdriver
        ];
        description = "Write end2end web application tests using webdriver and hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135916,8 +136567,8 @@ self: {
        editedCabalFile = "1q0pw1ggki7h839jicf2k0lllbm219qjcr3407hvcih9vfkbw03j";
        libraryHaskellDepends = [ base hspec hspec-discover ];
        description = "Alpha version of Hspec 2.0";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135929,8 +136580,8 @@ self: {
        sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il";
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        description = "Spec for testing properties for variant types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135949,8 +136600,8 @@ self: {
          RSA unix utf8-string
        ];
        description = "Wrapper for PKCS #11 interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135962,7 +136613,7 @@ self: {
        sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a";
        libraryHaskellDepends = [ base old-time ];
        description = "Session handler for HSP";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hspread" = callPackage
@@ -135977,8 +136628,8 @@ self: {
          base binary bytestring containers extensible-exceptions network
        ];
        description = "A client library for the spread toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135993,8 +136644,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring vty ];
        doHaddock = false;
        description = "A terminal presentation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136020,8 +136671,8 @@ self: {
          test-framework-hunit
        ];
        description = "The Haskell Stream Processor command line utility";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136033,8 +136684,8 @@ self: {
        sha256 = "0i53n42ynq22fzlz4kpmri4q4abmi4dz8bz0izn307is1pmk4bby";
        libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136049,8 +136700,8 @@ self: {
        libraryHaskellDepends = [ base Cabal hsql ];
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mysqlclient = null;};
 
@@ -136063,8 +136714,8 @@ self: {
        libraryHaskellDepends = [ base hsql old-time ];
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) unixODBC;};
 
@@ -136077,8 +136728,8 @@ self: {
        libraryHaskellDepends = [ base hsql old-time ];
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -136091,8 +136742,8 @@ self: {
        libraryHaskellDepends = [ base hsql ];
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -136114,8 +136765,8 @@ self: {
          base containers directory QuickCheck tagged text
        ];
        description = "Haskell binding for Qt Quick";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -136127,8 +136778,8 @@ self: {
        libraryHaskellDepends = [ base hsqml template-haskell text ];
        libraryPkgconfigDepends = [ qt5 ];
        description = "HsQML (Qt5) data model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -136143,8 +136794,8 @@ self: {
          base exceptions hsqml-datamodel type-list vinyl
        ];
        description = "HsQML DataModel instances for Vinyl Rec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-manic" = callPackage
@@ -136160,8 +136811,8 @@ self: {
          base containers hsqml MonadRandom text
        ];
        description = "HsQML-based clone of Pipe Mania";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -136179,8 +136830,8 @@ self: {
          base containers deepseq directory hsqml OddWord text
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -136198,8 +136849,8 @@ self: {
          base containers hsqml sqlite-simple text transformers
        ];
        description = "Sticky notes example program implemented in HsQML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -136213,8 +136864,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        description = "HsQML sample programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -136232,8 +136883,8 @@ self: {
          base containers deepseq directory hsqml OddWord tagged
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsreadability" = callPackage
@@ -136256,8 +136907,8 @@ self: {
          text
        ];
        description = "Access to the Readability API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136272,8 +136923,8 @@ self: {
          attoparsec base bytestring network utf8-string
        ];
        description = "RELP (Reliable Event Logging Protocol) server implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136288,7 +136939,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {seccomp = null;};
 
@@ -136312,7 +136963,7 @@ self: {
          memory stm tasty tasty-hunit tasty-quickcheck
        ];
        description = "SSH protocol implementation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsshellscript" = callPackage
@@ -136327,6 +136978,19 @@ self: {
        license = "LGPL";
      }) {};
 
+  "hsshellscript_3_5_0" = callPackage
+    ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
+     mkDerivation {
+       pname = "hsshellscript";
+       version = "3.5.0";
+       sha256 = "1gdj6b3b0b71jcmxd5wc42gs9v5s37jqd1jwryif84qbiq8rskgr";
+       libraryHaskellDepends = [ base directory parsec random unix ];
+       libraryToolDepends = [ c2hs ];
+       description = "Haskell for Unix shell scripting tasks";
+       license = "LGPL";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hssourceinfo" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, regexpr }:
      mkDerivation {
@@ -136339,7 +137003,7 @@ self: {
          base containers directory filepath regexpr
        ];
        description = "get haskell source code info";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hssqlppp" = callPackage
@@ -136360,8 +137024,8 @@ self: {
          tasty tasty-hunit template-haskell text transformers uniplate
        ];
        description = "SQL parser and type checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136380,8 +137044,8 @@ self: {
          base hssqlppp syb tasty tasty-hunit template-haskell text
        ];
        description = "hssqlppp extras which need template-haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136404,8 +137068,8 @@ self: {
        ];
        executableToolDepends = [ cpphs ];
        description = "Haskell version of tar CLI utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136421,7 +137085,7 @@ self: {
          array base hmatrix hmatrix-gsl-stats random vector
        ];
        description = "Statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hstats" = callPackage
@@ -136432,8 +137096,8 @@ self: {
        sha256 = "1a0rzbnbxd7r9b0ibs74nzijbdhj019wssdk1fls2r9i0w1v6i9h";
        libraryHaskellDepends = [ base ];
        description = "Statistical Computing in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136445,8 +137109,8 @@ self: {
        sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
        libraryHaskellDepends = [ base bytestring mtl network text ];
        description = "Quick and dirty statsd interface";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136464,8 +137128,8 @@ self: {
          base directory filepath ghc ghc-paths HUnit mtl QuickCheck random
        ];
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136479,8 +137143,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136509,8 +137173,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Distributed instant messaging over Tor";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hstox" = callPackage
@@ -136537,8 +137201,8 @@ self: {
        executableHaskellDepends = [ base process ];
        testHaskellDepends = [ async base ];
        description = "A Tox protocol implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136563,8 +137227,8 @@ self: {
          base bytestring conduit resourcet transformers
        ];
        description = "Tradeking API bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136582,8 +137246,8 @@ self: {
          base cmdargs directory filepath haskell-src-exts syb text vector
        ];
        description = "Checks Haskell source code for style compliance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136604,8 +137268,8 @@ self: {
          mtl parallel QuickCheck random unordered-containers vector xml
        ];
        description = "A two player abstract strategy game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136627,8 +137291,8 @@ self: {
          system-filepath text text-format time transformers unix
        ];
        description = "One-time, faithful conversion of Subversion repositories to Git";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136657,8 +137321,8 @@ self: {
          http-client http-client-tls hxt QuickCheck text
        ];
        description = "Sudoku game with a GTK3 interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136678,7 +137342,7 @@ self: {
          shakespeare text transformers
        ];
        description = "Synthesizable Verilog DSL supporting for multiple clock and reset";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hswip" = callPackage
@@ -136691,7 +137355,7 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
@@ -136708,8 +137372,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136723,8 +137387,8 @@ self: {
          base hsp jmacro mtl text wl-pprint-text
        ];
        description = "hsp+jmacro support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136736,8 +137400,8 @@ self: {
        sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2";
        libraryHaskellDepends = [ base hsx mtl ];
        description = "XHTML utilities to use together with HSX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136760,7 +137424,7 @@ self: {
          template-haskell utf8-string
        ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsyscall" = callPackage
@@ -136771,8 +137435,8 @@ self: {
        sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld";
        libraryHaskellDepends = [ base ];
        description = "FFI to syscalls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136788,8 +137452,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "FFI interface to syslog(3) from POSIX.1-2001";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hsyslog-tcp" = callPackage
@@ -136804,8 +137468,8 @@ self: {
          base bytestring hsyslog hsyslog-udp network text time
        ];
        description = "syslog over TCP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136822,7 +137486,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec time ];
        description = "Log to syslog over a network via UDP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hszephyr" = callPackage
@@ -136834,8 +137498,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl time ];
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {com_err = null; zephyr = null;};
 
@@ -136847,13 +137511,15 @@ self: {
        pname = "htaglib";
        version = "1.2.0";
        sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa";
+       revision = "1";
+       editedCabalFile = "09vsz2z5sb5ai3qpksqdckb43vndqs66x4abx3lln2xr40dlkljv";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring text transformers ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings to TagLib, audio meta-data library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) taglib;};
 
   "htags" = callPackage
@@ -136868,8 +137534,8 @@ self: {
          base directory filepath haskell-src mtl
        ];
        description = "A Haskell98 parsing tags program similar to ctags";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136887,8 +137553,8 @@ self: {
          base bytestring bzlib directory filepath old-locale tar time zlib
        ];
        description = "Command-line tar archive utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136900,7 +137566,7 @@ self: {
        sha256 = "18kgglc22k4v66hh9yf2qa7zx60ka2xl9bvzpinvc5v4zv0prl7l";
        libraryHaskellDepends = [ base ];
        description = "Tautology Proving Logic in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htdp-image" = callPackage
@@ -136916,8 +137582,8 @@ self: {
          base gloss HUnit test-framework test-framework-hunit
        ];
        description = "Beginner friendly graphics library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136933,8 +137599,8 @@ self: {
        libraryToolDepends = [ gcc ];
        executableHaskellDepends = [ base ];
        description = "A library for testing correctness of pseudo random number generators in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gcc;};
 
@@ -136951,8 +137617,8 @@ self: {
          zlib
        ];
        description = "Import from the Tiled map editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136966,7 +137632,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
        description = "Timing utility for the command line";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htirage" = callPackage
@@ -136982,7 +137648,7 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck text transformers
        ];
        description = "Equiprobable draw from publicly verifiable random data";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "htlset" = callPackage
@@ -136993,8 +137659,8 @@ self: {
        sha256 = "0i7qipq0dbyd9zqjl1n6sxzma066293gpbxwqwd84wiw3vw2gz3w";
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Set";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137006,7 +137672,7 @@ self: {
        sha256 = "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c";
        libraryHaskellDepends = [ base ];
        description = "HTML combinator library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-charset" = callPackage
@@ -137030,8 +137696,8 @@ self: {
          base bytestring doctest doctest-discover hlint QuickCheck
        ];
        description = "Determine character encoding of HTML documents/fragments";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137052,7 +137718,7 @@ self: {
          base bytestring containers deepseq hspec HUnit text xml-conduit
        ];
        description = "Parse HTML documents using xml-conduit datatypes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "html-email-validate" = callPackage
@@ -137069,7 +137735,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Validating an email address against HTML standard";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-entities" = callPackage
@@ -137084,7 +137750,7 @@ self: {
          attoparsec base base-prelude text unordered-containers
        ];
        description = "A codec library for HTML-escaped text and HTML-entities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "html-entity" = callPackage
@@ -137104,7 +137770,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "HTML entity decoding and encoding for Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-entity-map" = callPackage
@@ -137120,7 +137786,7 @@ self: {
          base criterion text unordered-containers
        ];
        description = "Map from HTML5 entity names to the corresponding Unicode text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-kure" = callPackage
@@ -137131,8 +137797,8 @@ self: {
        sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l";
        libraryHaskellDepends = [ base hxt kure ];
        description = "HTML rewrite engine, using KURE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137171,7 +137837,7 @@ self: {
          attoparsec base criterion deepseq tagsoup text
        ];
        description = "A high-performance HTML tokenizer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-rules" = callPackage
@@ -137182,8 +137848,8 @@ self: {
        sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw";
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        description = "Perform traversals of HTML structures using sets of rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137206,8 +137872,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "An \"attoparsec\"-based HTML tokenizer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137219,7 +137885,7 @@ self: {
        sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14";
        libraryHaskellDepends = [ base tagsoup ];
        description = "A HTML truncator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-validator-cli" = callPackage
@@ -137246,7 +137912,7 @@ self: {
          hspec http-conduit text utf8-string
        ];
        description = "A command-line interface for https://validator.w3.org/";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html2hamlet" = callPackage
@@ -137265,7 +137931,7 @@ self: {
          optparse-declarative regex-tdfa text wl-pprint-text xml-conduit
        ];
        description = "HTML to Hamlet converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html5-entity" = callPackage
@@ -137279,7 +137945,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "A library for looking up and validating HTML5 entities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htn" = callPackage
@@ -137291,7 +137957,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "resolver using htn algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htodo" = callPackage
@@ -137304,7 +137970,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HDBC HDBC-sqlite3 ];
        description = "A todo application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htoml" = callPackage
@@ -137329,7 +137995,7 @@ self: {
          unordered-containers vector
        ];
        description = "Parser for TOML files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htoml-megaparsec" = callPackage
@@ -137355,7 +138021,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        doHaddock = false;
        description = "Parser for TOML files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htrace" = callPackage
@@ -137366,7 +138032,7 @@ self: {
        sha256 = "0ar1w9p6ppag2vp8kw6byirhfdfs4r639pjh5icnyiiliz6jkvlx";
        libraryHaskellDepends = [ base ];
        description = "Hierarchical tracing for debugging of lazy evaluation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hts" = callPackage
@@ -137379,7 +138045,7 @@ self: {
        libraryHaskellDepends = [ base hmt xml ];
        description = "Haskell Music Typesetting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137403,8 +138069,8 @@ self: {
          htsn-common hxt MissingH network process tasty tasty-hunit unix
        ];
        description = "Parse XML files from The Sports Network feed";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137418,7 +138084,7 @@ self: {
          ansi-terminal base hslogger transformers
        ];
        description = "Display/logging facilities used by both htsn and htsn-import";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "htsn-import" = callPackage
@@ -137447,8 +138113,8 @@ self: {
          split tasty tasty-hunit time transformers tuple
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137460,8 +138126,8 @@ self: {
        sha256 = "15wbafj54yfipp3pfqk0yd5qlzm76457mngv1fs899sp31y2m2cv";
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137474,7 +138140,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Functions for working with HTTP Accept headers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-api-data" = callPackage
@@ -137501,33 +138167,33 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
-  "http-api-data_0_4_2" = callPackage
+  "http-api-data_0_4_3" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat
      , bytestring, containers, cookie, hashable, hspec, hspec-discover
-     , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged
-     , text, time-compat, transformers, unordered-containers, uuid-types
+     , http-types, HUnit, QuickCheck, quickcheck-instances, tagged, text
+     , time-compat, transformers, unordered-containers, uuid-types
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.4.2";
-       sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl";
+       version = "0.4.3";
+       sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz";
        libraryHaskellDepends = [
          attoparsec attoparsec-iso8601 base base-compat bytestring
          containers cookie hashable http-types tagged text time-compat
          transformers unordered-containers uuid-types
        ];
        testHaskellDepends = [
-         base base-compat bytestring cookie hspec HUnit nats QuickCheck
+         base base-compat bytestring cookie hspec HUnit QuickCheck
          quickcheck-instances text time-compat unordered-containers
          uuid-types
        ];
        testToolDepends = [ hspec-discover ];
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -137538,8 +138204,8 @@ self: {
        sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        description = "Attoparsec parsers for http-types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137567,25 +138233,25 @@ self: {
        ];
        doCheck = false;
        description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
-  "http-client_0_7_3" = callPackage
-    ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , case-insensitive, containers, cookie, deepseq, directory
-     , exceptions, filepath, ghc-prim, hspec, http-types, memory
-     , mime-types, monad-control, network, network-uri, random, stm
-     , streaming-commons, text, time, transformers, zlib
+  "http-client_0_7_4" = callPackage
+    ({ mkDerivation, array, async, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , deepseq, directory, exceptions, filepath, ghc-prim, hspec
+     , http-types, mime-types, monad-control, network, network-uri
+     , random, stm, streaming-commons, text, time, transformers, zlib
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.7.3";
-       sha256 = "0jpy5rlv4iwq79h5p37g0nnh5ff2qi4swxx8xmr98v0znvz6wc8i";
+       version = "0.7.4";
+       sha256 = "1a4vhhn8y5qcqd4i2q7pl9jqfrsh65nkv32qcsc80cjy2bcqivjs";
        libraryHaskellDepends = [
-         array base blaze-builder bytestring case-insensitive containers
-         cookie deepseq exceptions filepath ghc-prim http-types memory
-         mime-types network network-uri random stm streaming-commons text
-         time transformers
+         array base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie deepseq exceptions filepath
+         ghc-prim http-types mime-types network network-uri random stm
+         streaming-commons text time transformers
        ];
        testHaskellDepends = [
          async base blaze-builder bytestring case-insensitive containers
@@ -137594,8 +138260,8 @@ self: {
        ];
        doCheck = false;
        description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -137613,8 +138279,8 @@ self: {
          transformers utf8-string
        ];
        description = "HTTP authorization (both basic and digest) done right";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137627,7 +138293,7 @@ self: {
        libraryHaskellDepends = [ base http-client ];
        doHaddock = false;
        description = "Frontend support for using http-client with conduit (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-extra" = callPackage
@@ -137646,7 +138312,7 @@ self: {
          http-types random text transformers
        ];
        description = "wrapper for http-client exposing cookies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-client-lens" = callPackage
@@ -137661,8 +138327,8 @@ self: {
          base bytestring http-client http-types lens network
        ];
        description = "Optics for http-client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137675,7 +138341,7 @@ self: {
        libraryHaskellDepends = [ base http-client ];
        doHaddock = false;
        description = "Generate multipart uploads for http-client. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-openssl" = callPackage
@@ -137694,7 +138360,7 @@ self: {
        ];
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-openssl_0_3_3" = callPackage
@@ -137713,8 +138379,8 @@ self: {
        ];
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-client-overrides" = callPackage
@@ -137736,7 +138402,7 @@ self: {
          base bytestring http-client tasty tasty-hunit text
        ];
        description = "HTTP client overrides";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-client-request-modifiers" = callPackage
@@ -137752,8 +138418,8 @@ self: {
          network network-uri
        ];
        description = "Convenient monadic HTTP request modifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137763,14 +138429,14 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-restricted";
-       version = "0.0.3";
-       sha256 = "1xn84430haz2r9ikkxbi6awgpi0ybc7d7gp1plqhxq43ws626sam";
+       version = "0.0.4";
+       sha256 = "0jljvfjbdjxj61m6nznysbh9y7nszrzmdv0i8ndxgshnmc19q9h1";
        libraryHaskellDepends = [
          base connection data-default http-client http-client-tls network
          network-bsd utf8-string
        ];
        description = "restricting the servers that http-client will use";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-session" = callPackage
@@ -137785,8 +138451,8 @@ self: {
          base-prelude bytestring either http-client mtl-prelude
        ];
        description = "A simple abstraction over the \"http-client\" connection manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137803,8 +138469,8 @@ self: {
          io-streams mtl transformers
        ];
        description = "http-client for io-streams supporting openssl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137831,27 +138497,26 @@ self: {
        benchmarkHaskellDepends = [ base gauge http-client ];
        doCheck = false;
        description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-websockets" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, hspec, http-client
+    ({ mkDerivation, base, bytestring, hspec, http-client
      , http-client-tls, network-uri, utf8-string, websockets
      }:
      mkDerivation {
        pname = "http-client-websockets";
-       version = "0.1.1.0";
-       sha256 = "1kmvwhfsp1l672km2a06pww0a3wmwbxcwwg1k78xcnc767wj0g1m";
+       version = "0.1.1.1";
+       sha256 = "0b5kvyrfhhj7c5ys8ccxwv6prhb6sj0ycinzbk1yrwnd3wrmzk78";
        libraryHaskellDepends = [
          base bytestring http-client network-uri utf8-string websockets
        ];
        testHaskellDepends = [
-         base bytestring doctest hspec http-client-tls network-uri
-         websockets
+         base bytestring hspec http-client-tls network-uri websockets
        ];
        description = "Glue code for http-client and websockets";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137869,7 +138534,7 @@ self: {
          directory mtl network text transformers unordered-containers
        ];
        description = "Common types for HTTP clients and servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-conduit" = callPackage
@@ -137897,7 +138562,7 @@ self: {
        ];
        doCheck = false;
        description = "HTTP client package with conduit interface and HTTPS support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -137923,8 +138588,8 @@ self: {
          resourcet text time transformers wai warp
        ];
        description = "Browser interface to the http-conduit package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137942,8 +138607,8 @@ self: {
          http-client-openssl http-types network network-uri text time zlib
        ];
        description = "HTTP downloader tailored for web-crawler needs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137960,7 +138625,7 @@ self: {
          base bytestring doctest hspec old-locale time
        ];
        description = "HTTP Date parser/formatter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-directory" = callPackage
@@ -137978,8 +138643,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "http directory listing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137997,8 +138662,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec ];
        description = "High level HTTP client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138025,7 +138690,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Verified downloads with retries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-encodings" = callPackage
@@ -138042,7 +138707,7 @@ self: {
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
        description = "A library for encoding and decoding bodies of HTTP messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-enumerator" = callPackage
@@ -138066,8 +138731,8 @@ self: {
          utf8-string zlib-enum
        ];
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138079,8 +138744,8 @@ self: {
        sha256 = "1x073nw7fagbj16x42n7xgyr5liv69l0g4ig1f4adzdc9p997l27";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138103,7 +138768,7 @@ self: {
        ];
        description = "HTTP and WebSocket client based on io-streams";
        license = "BSD-3-Clause AND GPL-2.0-or-later";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138126,8 +138791,8 @@ self: {
          tasty-quickcheck text wai wai-extra
        ];
        description = "Generic kinds and types for working with HTTP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138146,7 +138811,7 @@ self: {
          base bytestring hspec http-types QuickCheck quickcheck-instances
        ];
        description = "A low-level HTTP library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-link-header" = callPackage
@@ -138170,7 +138835,7 @@ self: {
          base criterion directory network-uri text transformers
        ];
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "http-link-header_1_2_0" = callPackage
@@ -138194,8 +138859,8 @@ self: {
          network-uri text transformers
        ];
        description = "A parser and writer for the HTTP Link header per RFC 5988";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-listen" = callPackage
@@ -138212,8 +138877,8 @@ self: {
          base bytestring exceptions HTTP network transformers
        ];
        description = "Listen to HTTP requests and handle them in arbitrary ways";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138226,8 +138891,8 @@ self: {
        pname = "http-media";
        version = "0.8.0.0";
        sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir";
-       revision = "3";
-       editedCabalFile = "1ndz5x6njl35h73il5c6qpaqd4ynvg21n6k7sb8aq09gfbg544d8";
+       revision = "4";
+       editedCabalFile = "0qg6x92i3w2q7zarr08kmicychkwskfi04xaxkqkg0cw6jnpnhhh";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -138236,7 +138901,7 @@ self: {
          test-framework test-framework-quickcheck2 utf8-string
        ];
        description = "Processing HTTP Content-Type and Accept headers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-mock" = callPackage
@@ -138252,7 +138917,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "HTTP mocking and expectations library for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "http-monad" = callPackage
@@ -138271,8 +138936,8 @@ self: {
          network-uri parsec semigroups transformers utility-ht
        ];
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138289,8 +138954,8 @@ self: {
          transformers
        ];
        description = "A type unsafe http library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138310,8 +138975,8 @@ self: {
          http-types pipes pipes-bytestring pipes-safe transformers wai
        ];
        description = "Serve a WAI application with http-pony";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138323,7 +138988,7 @@ self: {
        sha256 = "14fbqw5bqsbyvr99g4bpk54n38mz2ilkyb6979rgdr2fpvzkv6rr";
        libraryHaskellDepends = [ base case-insensitive lens profunctors ];
        description = "Tag http headers as case insensitive";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-pony-transformer-http" = callPackage
@@ -138338,7 +139003,7 @@ self: {
          attoparsec base bytestring pipes pipes-attoparsec transformers
        ];
        description = "Transform raw TCP stream to a basic HTTP type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-pony-transformer-startline" = callPackage
@@ -138351,7 +139016,7 @@ self: {
          attoparsec base bytestring http-types lens
        ];
        description = "transform HTTP startlines to tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-proxy" = callPackage
@@ -138378,8 +139043,8 @@ self: {
          vault wai wai-conduit warp warp-tls
        ];
        description = "A library for writing HTTP and HTTPS proxies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138395,7 +139060,7 @@ self: {
          aeson base bytestring http-conduit network-uri text
        ];
        description = "Simple http queries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-querystring" = callPackage
@@ -138411,8 +139076,8 @@ self: {
          base bytestring containers doctest hspec http-types QuickCheck
        ];
        description = "The HTTP query builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138432,8 +139097,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Declarative DSL for parsing an HTTP response";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138458,7 +139123,7 @@ self: {
          transformers unliftio wai warp
        ];
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-rfc7807" = callPackage
@@ -138478,8 +139143,8 @@ self: {
          servant servant-server tasty tasty-hunit text
        ];
        description = "RFC7807 style response messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138495,8 +139160,8 @@ self: {
          base HTTP mime network network-uri text unix url utf8-string
        ];
        description = "A library for writing Haskell web servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138510,8 +139175,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138543,7 +139208,7 @@ self: {
          unordered-containers
        ];
        description = "An HTTP client using io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-test" = callPackage
@@ -138562,7 +139227,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Test framework for HTTP APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-trace" = callPackage
@@ -138581,7 +139246,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Tracking http redirects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-types" = callPackage
@@ -138599,7 +139264,7 @@ self: {
          base bytestring doctest hspec QuickCheck quickcheck-instances text
        ];
        description = "Generic HTTP types for Haskell (for both client and server code)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-wget" = callPackage
@@ -138610,8 +139275,8 @@ self: {
        sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx";
        libraryHaskellDepends = [ base failure process transformers ];
        description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138643,7 +139308,7 @@ self: {
          mwc-random network-byte-order psqueues stm
        ];
        description = "HTTP/2 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-client" = callPackage
@@ -138661,7 +139326,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-client-exe" = callPackage
@@ -138680,7 +139345,7 @@ self: {
          lifted-async lifted-base optparse-applicative time tls
        ];
        description = "A command-line http2 client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-client-grpc" = callPackage
@@ -138699,8 +139364,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138717,8 +139382,8 @@ self: {
          zlib
        ];
        description = "Encoders based on `proto-lens` for gRPC over HTTP2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138737,7 +139402,7 @@ self: {
          proto3-wire zlib
        ];
        description = "Encoders based on `proto3-wire` for gRPC over HTTP2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-grpc-types" = callPackage
@@ -138751,7 +139416,7 @@ self: {
          base binary bytestring case-insensitive zlib
        ];
        description = "Types for gRPC over HTTP2 common for client and servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "httpd-shed" = callPackage
@@ -138764,7 +139429,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base network network-bsd network-uri ];
        description = "A simple web-server with an interact style API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "https-everywhere-rules" = callPackage
@@ -138787,8 +139452,8 @@ self: {
          taggy-lens text text-icu
        ];
        description = "High-level access to HTTPS Everywhere rulesets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138803,8 +139468,8 @@ self: {
          base directory filepath functor-infix text
        ];
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138823,7 +139488,7 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138837,8 +139502,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        description = "harmonic analyser and tuner for musical instruments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138866,8 +139531,8 @@ self: {
        ];
        testSystemDepends = [ tvm_runtime ];
        description = "Bindings for TVM machine learning framework";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {tvm_runtime = null;};
 
@@ -138881,8 +139546,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base OpenGL random SDL ];
        description = "A two player abstract strategy game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138901,7 +139566,7 @@ self: {
          process regex-compat unix utf8-string
        ];
        description = "For multiplexing GHC installations and providing development sandboxes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hubigraph" = callPackage
@@ -138913,7 +139578,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers haxr mtl ];
        description = "A haskell wrap for Ubigraph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hubris" = callPackage
@@ -138938,7 +139603,7 @@ self: {
        executableSystemDepends = [ ruby ];
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) ruby;};
 
   "huck" = callPackage
@@ -138958,8 +139623,8 @@ self: {
          unordered-containers
        ];
        description = "huck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138971,7 +139636,7 @@ self: {
        sha256 = "0ajyqwnpdhby9h6skl3l0dys53ycnyq7y7r72ma7x0b5rdi3djd2";
        libraryHaskellDepends = [ base ];
        description = "Haskell IOT on Intel Edison and other Linux computers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "huff" = callPackage
@@ -138991,8 +139656,8 @@ self: {
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base ];
        description = "A fast-foward-based planner";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139004,8 +139669,8 @@ self: {
        sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3";
        libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139022,8 +139687,8 @@ self: {
          yhccore
        ];
        description = "Hugs Front-end to Yhc Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139050,8 +139715,8 @@ self: {
          mtl network split strict text time unix utf8-string
        ];
        description = "IRC server written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139064,6 +139729,8 @@ self: {
        pname = "hum";
        version = "0.1.0.0";
        sha256 = "06zyjg2i0kk4wnzrcax7rff710rpafqwz4rv75wq09vr65wvvj1y";
+       revision = "1";
+       editedCabalFile = "1y0lhdjjv780jlrr0kdnqbk1w8117g765cnvqd98k112z31p2l8i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139082,7 +139749,9 @@ self: {
          vty witherable-class
        ];
        description = "A TUI MPD client, inspired by ncmpcpp";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "human-parse" = callPackage
@@ -139093,8 +139762,8 @@ self: {
        sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d";
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for parsing text entered by humans";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139108,7 +139777,7 @@ self: {
        testHaskellDepends = [ base doctest Glob time ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provide duration helper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "human-text" = callPackage
@@ -139119,8 +139788,8 @@ self: {
        sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa";
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for converting values to human-friendly text";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139132,8 +139801,8 @@ self: {
        sha256 = "0pzfhp65afkdc33pjbxzcf68c02w6nq8sxqspfwbn78dghg9cbrn";
        libraryHaskellDepends = [ base bytestring deepseq ghc text ];
        description = "Redefinition-free prelude alternative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139159,7 +139828,7 @@ self: {
        ];
        description = "Haskell UPnP Media Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139182,7 +139851,7 @@ self: {
          QuickCheck split
        ];
        description = "CSS-like syntax for file system manipulation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hunit-dejafu" = callPackage
@@ -139193,7 +139862,7 @@ self: {
        sha256 = "11d52blw31mcsg7c3w1f7khy3vk2p03h4c5z6ja6wb9k5bg4d004";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hunit-gui" = callPackage
@@ -139208,8 +139877,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        description = "A GUI testrunner for HUnit";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139221,7 +139890,7 @@ self: {
        sha256 = "089l8n1yjcf6sypr76r8p0djwpcqaa5xdk1d0m2k9piig9fnzr40";
        libraryHaskellDepends = [ base HUnit parsec ];
        description = "An HUnit Testable instance for Parsec parser unit tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hunit-rematch" = callPackage
@@ -139233,8 +139902,8 @@ self: {
        libraryHaskellDepends = [ base HUnit rematch ];
        testHaskellDepends = [ base hspec HUnit rematch ];
        description = "HUnit support for rematch";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139254,7 +139923,7 @@ self: {
        ];
        description = "Unpacker tool with DWIM";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139271,8 +139940,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq stm ];
        benchmarkPkgconfigDepends = [ hunspell ];
        description = "Hunspell thread-safe FFI bindings for spell checking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) hunspell;};
 
@@ -139304,8 +139973,8 @@ self: {
          time
        ];
        description = "A search and indexing engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139329,8 +139998,8 @@ self: {
          wai-extra wai-middleware-static warp
        ];
        description = "A search and indexing engine server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139354,8 +140023,8 @@ self: {
          time transformers unordered-containers
        ];
        description = "A Command line Interface for the Hunt server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hunt-client = null;};
 
@@ -139384,8 +140053,8 @@ self: {
          http-types QuickCheck simple temporary transformers wai wai-extra
        ];
        description = "Upload packages or documentation to a hackage server";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139401,8 +140070,8 @@ self: {
          array base bytestring containers kangaroo
        ];
        description = "Extract function names from Windows DLLs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139415,8 +140084,8 @@ self: {
      }:
      mkDerivation {
        pname = "hurl";
-       version = "1.5.0.0";
-       sha256 = "1fzy2zzwn5x420xz91fj64h6g0vzlam4058pymb2pdmg4x801j42";
+       version = "2.1.0.0";
+       sha256 = "0n467hgj8ybgqa69snsj6c199f0ipavxwjn2pb47q1vns6prlwd0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139427,7 +140096,9 @@ self: {
        ];
        executableHaskellDepends = [ base directory network-uri ];
        description = "Haskell URL resolver";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hurriyet" = callPackage
@@ -139445,8 +140116,8 @@ self: {
          aeson base bytestring containers here hspec text
        ];
        description = "Haskell bindings for Hurriyet API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139471,8 +140142,8 @@ self: {
          parsec process transformers
        ];
        description = "R5RS Scheme interpreter, compiler, and library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139488,8 +140159,8 @@ self: {
          array base containers husk-scheme json mtl transformers
        ];
        description = "Extra libraries for the husk Scheme platform";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139508,7 +140179,7 @@ self: {
        ];
        description = "A simple command line calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139529,8 +140200,8 @@ self: {
          websockets wuss
        ];
        description = "A program for the button on Reddit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139544,8 +140215,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec parsec-numbers ];
        description = "Quick implemention of Hutton's Razor";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139557,8 +140228,8 @@ self: {
        sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp";
        libraryHaskellDepends = [ base easyplot ];
        description = "Fuzzy logic library with support for T1, IT2, GT2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139571,7 +140242,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Simple strict heterogeneous lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hvega" = callPackage
@@ -139590,7 +140261,7 @@ self: {
          tasty-golden text unordered-containers
        ];
        description = "Create Vega-Lite visualizations (version 4) in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hvega-theme" = callPackage
@@ -139601,7 +140272,7 @@ self: {
        sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv";
        libraryHaskellDepends = [ base hvega text ];
        description = "Theme for hvega";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hw-aeson" = callPackage
@@ -139620,7 +140291,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Convenience functions for Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-all" = callPackage
@@ -139647,8 +140318,8 @@ self: {
          hw-string-parse hw-succinct hw-uri hw-xml
        ];
        description = "Demo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139685,7 +140356,7 @@ self: {
        ];
        doHaddock = false;
        description = "Balanced parentheses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-bits" = callPackage
@@ -139708,7 +140379,7 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-ci-assist" = callPackage
@@ -139729,8 +140400,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        doHaddock = false;
        description = "CI Assistant for Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139756,7 +140427,7 @@ self: {
          base bytestring conduit criterion mmap vector
        ];
        description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hw-conduit-merges" = callPackage
@@ -139773,7 +140444,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Additional merges and joins for Conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-diagnostics" = callPackage
@@ -139786,7 +140457,7 @@ self: {
        testHaskellDepends = [ base doctest doctest-discover ];
        testToolDepends = [ doctest-discover ];
        description = "Diagnostics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-dsv" = callPackage
@@ -139827,8 +140498,8 @@ self: {
          mmap vector
        ];
        description = "Unbelievably fast streaming DSV file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139862,7 +140533,7 @@ self: {
          base bits-extra bytestring criterion hw-bits hw-prim vector
        ];
        description = "File Dump";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-eliasfano" = callPackage
@@ -139901,7 +140572,7 @@ self: {
          hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector
        ];
        description = "Elias-Fano";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-excess" = callPackage
@@ -139926,7 +140597,7 @@ self: {
          base bytestring criterion hw-prim vector
        ];
        description = "Excess";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-fingertree" = callPackage
@@ -139944,7 +140615,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Generic finger-tree structure, with example instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-fingertree-strict" = callPackage
@@ -139964,7 +140635,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Generic strict finger-tree structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-hedgehog" = callPackage
@@ -139978,7 +140649,7 @@ self: {
        testHaskellDepends = [ base doctest doctest-discover ];
        testToolDepends = [ doctest-discover ];
        description = "Extra hedgehog functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-hspec-hedgehog" = callPackage
@@ -139997,7 +140668,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Interoperability between hspec and hedgehog";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-int" = callPackage
@@ -140015,7 +140686,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Additional facilities for Integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-ip" = callPackage
@@ -140046,7 +140717,7 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        doHaddock = false;
        description = "Library for manipulating IP addresses and CIDR blocks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-json" = callPackage
@@ -140090,8 +140761,8 @@ self: {
        ];
        doHaddock = false;
        description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140121,8 +140792,8 @@ self: {
          base bytestring criterion hw-json lens
        ];
        description = "Lens for hw-json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140149,8 +140820,8 @@ self: {
        ];
        testToolDepends = [ doctest-discover ];
        description = "SIMD-based JSON semi-indexer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140188,8 +140859,8 @@ self: {
          base bytestring criterion directory mmap
        ];
        description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140229,8 +140900,8 @@ self: {
          base bytestring criterion directory mmap
        ];
        description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140257,7 +140928,9 @@ self: {
          transformers unordered-containers
        ];
        description = "Avro support for Kafka infrastructure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-kafka-client" = callPackage
@@ -140267,8 +140940,32 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "4.0.0";
-       sha256 = "0cwiaxri121lh713sisy9mka0h6z2ip82hzqbyzqj1dnljkqry9c";
+       version = "4.0.1";
+       sha256 = "05ahw4cdp5kk5j4rbjf1bdvivg3nhiaaf68p902mp8jcbh7fz9sf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers text transformers unix
+       ];
+       librarySystemDepends = [ rdkafka ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bifunctors bytestring containers either hspec monad-loops text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Kafka bindings for Haskell";
+       license = lib.licenses.mit;
+     }) {inherit (pkgs) rdkafka;};
+
+  "hw-kafka-client_4_0_2" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
+     , either, hspec, hspec-discover, monad-loops, rdkafka, text
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "hw-kafka-client";
+       version = "4.0.2";
+       sha256 = "166gi8mj2ljv4xcjrhi2pgjmnj112998fzbzjfpf5ckj54d20ch9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140281,7 +140978,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Kafka bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) rdkafka;};
 
   "hw-kafka-conduit" = callPackage
@@ -140306,7 +141004,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Conduit bindings for hw-kafka-client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hw-mquery" = callPackage
@@ -140328,7 +141026,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Monadic query DSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-packed-vector" = callPackage
@@ -140361,7 +141059,7 @@ self: {
          base criterion directory hedgehog hspec hw-prim vector
        ];
        description = "Packed Vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-parser" = callPackage
@@ -140381,7 +141079,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Simple parser support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-prim" = callPackage
@@ -140408,7 +141106,7 @@ self: {
          base bytestring criterion mmap transformers vector
        ];
        description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -140428,8 +141126,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140469,7 +141167,7 @@ self: {
        ];
        doHaddock = false;
        description = "Rank-select";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-rankselect-base" = callPackage
@@ -140495,7 +141193,7 @@ self: {
          base bits-extra criterion hw-bits hw-prim vector
        ];
        description = "Rank-select base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-simd" = callPackage
@@ -140527,8 +141225,8 @@ self: {
          transformers vector
        ];
        description = "SIMD library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140557,7 +141255,7 @@ self: {
          transformers vector
        ];
        description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-string-parse" = callPackage
@@ -140569,7 +141267,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
        description = "String parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-succinct" = callPackage
@@ -140587,7 +141285,7 @@ self: {
          mono-traversable text vector word8
        ];
        description = "Succint datastructures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hw-uri" = callPackage
@@ -140622,8 +141320,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Supports IO on URIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140638,7 +141336,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hw-prim vector ];
        testHaskellDepends = [ base hspec QuickCheck vector ];
        description = "Vector type with convenient typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-xml" = callPackage
@@ -140681,7 +141379,7 @@ self: {
          resourcet vector
        ];
        description = "XML parser based on succinct data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -140699,8 +141397,8 @@ self: {
          unix
        ];
        description = "Initial version of firewall Authentication for IITK network";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140723,8 +141421,8 @@ self: {
          transformers
        ];
        description = "Haskell Web Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140745,8 +141443,8 @@ self: {
        executableToolDepends = [ alex happy ];
        testHaskellDepends = [ array base Cabal containers mtl ];
        description = "An implementation of Neil D. Jones' While language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140765,7 +141463,7 @@ self: {
          base directory extra filepath hint simple-cmd-args
        ];
        description = "Commandline text processing with Haskell functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hworker" = callPackage
@@ -140786,8 +141484,8 @@ self: {
          text time uuid
        ];
        description = "A reliable at-least-once job queue built on top of redis";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140804,8 +141502,8 @@ self: {
          time unordered-containers
        ];
        description = "Library for sending email with Amazon's SES and hworker";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140838,8 +141536,8 @@ self: {
          containers hedgehog hspec magic-wormhole protolude saltine text
        ];
        description = "magic-wormhole client";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140858,8 +141556,8 @@ self: {
          regex-compat text unix
        ];
        description = "Simple Haskell Web Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140879,8 +141577,8 @@ self: {
          base bytestring Cabal criterion cryptohash parallel
        ];
        description = "Hashing with SL2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140892,8 +141590,8 @@ self: {
        sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9";
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140907,8 +141605,8 @@ self: {
          base bytestring hwsl2 reducers semigroups
        ];
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140920,8 +141618,8 @@ self: {
        sha256 = "04wkgql6gs9glmp9kj5awis5b15vmwgkyqzi814k9514k3c7c1rb";
        libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140940,8 +141638,8 @@ self: {
          xml-types
        ];
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140968,8 +141666,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs ];
        description = "A pen notetaking program written in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140988,7 +141686,7 @@ self: {
          parsec
        ];
        description = "A collection of tools for processing XML with Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-binary" = callPackage
@@ -141004,7 +141702,7 @@ self: {
        ];
        description = "Serialisation and deserialisation of HXT XmlTrees";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-cache" = callPackage
@@ -141021,7 +141719,7 @@ self: {
        ];
        description = "Cache for HXT XML Documents and other binary data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-charproperties" = callPackage
@@ -141032,7 +141730,7 @@ self: {
        sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm";
        libraryHaskellDepends = [ base ];
        description = "Character properties and classes for XML and Unicode";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-css" = callPackage
@@ -141045,7 +141743,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
        description = "CSS selectors for HXT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hxt-curl" = callPackage
@@ -141057,7 +141755,7 @@ self: {
        libraryHaskellDepends = [ base bytestring curl hxt parsec ];
        description = "LibCurl interface for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-expat" = callPackage
@@ -141069,7 +141767,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hexpat hxt ];
        description = "Expat parser for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-extras" = callPackage
@@ -141080,7 +141778,7 @@ self: {
        sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1";
        libraryHaskellDepends = [ base hxt ];
        description = "Extra functions for HXT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hxt-filter" = callPackage
@@ -141097,7 +141795,7 @@ self: {
        ];
        description = "A collection of tools for processing XML with Haskell (Filter variant)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-http" = callPackage
@@ -141112,7 +141810,7 @@ self: {
          base bytestring HTTP hxt network network-uri parsec
        ];
        description = "Interface to native Haskell HTTP package HTTP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-pickle-utils" = callPackage
@@ -141125,8 +141823,8 @@ self: {
        editedCabalFile = "0d5fg718y7xzw76ip33q0w1liqk70q9074qkd198mjnijxjcrkf3";
        libraryHaskellDepends = [ base hxt mtl ];
        description = "Utility functions for using HXT picklers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141148,7 +141846,7 @@ self: {
          base bytestring criterion deepseq parsec text
        ];
        description = "A regular expression library for W3C XML Schema regular expressions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-relaxng" = callPackage
@@ -141164,7 +141862,7 @@ self: {
          network-uri parsec
        ];
        description = "The HXT RelaxNG validator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-tagsoup" = callPackage
@@ -141180,7 +141878,7 @@ self: {
        ];
        description = "TagSoup parser for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-unicode" = callPackage
@@ -141191,7 +141889,7 @@ self: {
        sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v";
        libraryHaskellDepends = [ base hxt-charproperties ];
        description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-xpath" = callPackage
@@ -141206,7 +141904,7 @@ self: {
        ];
        description = "The XPath modules for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-xslt" = callPackage
@@ -141222,7 +141920,7 @@ self: {
        ];
        description = "The XSLT modules for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxthelper" = callPackage
@@ -141234,7 +141932,7 @@ self: {
        libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        description = "Helper functions for HXT";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141246,8 +141944,8 @@ self: {
        sha256 = "0faiyflyhmn2y0bs920qgm9xkj9i69lzxhsg4rxffal989gi32z8";
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141261,8 +141959,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers HUnit random ];
        description = "A Yahtzee game implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141284,8 +141982,8 @@ self: {
          unordered-containers
        ];
        description = "Literate-style Documentation Generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141302,8 +142000,8 @@ self: {
          base containers haskell98 mtl parsec
        ];
        description = "A implementation of a type-checker for Lambda-H";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141319,7 +142017,7 @@ self: {
          base deepseq primitive semigroups vector
        ];
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hydra-hs" = callPackage
@@ -141332,8 +142030,8 @@ self: {
        librarySystemDepends = [ sixense_x64 ];
        testHaskellDepends = [ base ];
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sixense_x64 = null;};
 
@@ -141365,8 +142063,8 @@ self: {
          text time transformers unix
        ];
        description = "NCurses interface to view multiple ByteString streams in parallel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141383,8 +142081,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        description = "An alternate Prelude";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141405,8 +142103,8 @@ self: {
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
        ];
        description = "Hydrogen Data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141422,8 +142120,8 @@ self: {
          base containers hydrogen-multimap hydrogen-prelude
        ];
        description = "Hydrogen Command Line Arguments Parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141435,8 +142133,8 @@ self: {
        sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88";
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        description = "Hydrogen Data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141448,8 +142146,8 @@ self: {
        sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93";
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Hydrogen Multimap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141463,8 +142161,8 @@ self: {
          base containers hydrogen-prelude parsec
        ];
        description = "Hydrogen Parsing Utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141484,8 +142182,8 @@ self: {
          regex-base regex-tdfa strict text time transformers uuid
        ];
        description = "Hydrogen Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141497,8 +142195,8 @@ self: {
        sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh";
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        description = "Hydrogen Prelude /w Parsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141515,8 +142213,8 @@ self: {
          uuid
        ];
        description = "Hydrogen Syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141531,8 +142229,8 @@ self: {
          base containers hydrogen-prelude parsec time
        ];
        description = "Hydrogen Tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141544,7 +142242,7 @@ self: {
        sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38";
        libraryHaskellDepends = [ base ];
        description = "Hydrogen Version Type";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hyena" = callPackage
@@ -141561,8 +142259,8 @@ self: {
          mtl network network-bytestring unix
        ];
        description = "Simple web application server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141584,8 +142282,8 @@ self: {
          process text wai warp websockets
        ];
        description = "WebGL live-coding environment for writing shaders with Hylogen";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141597,7 +142295,7 @@ self: {
        sha256 = "0ha9bn7mqyqwpxzzcd4p0hm59dbrf3rcnpyihjkgnb7j4wk1f1rx";
        libraryHaskellDepends = [ base data-reify vector-space ];
        description = "GLSL embedded in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hylolib" = callPackage
@@ -141613,7 +142311,7 @@ self: {
        ];
        description = "Tools for hybrid logics related programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141629,7 +142327,7 @@ self: {
        executableHaskellDepends = [ base hylolib mtl ];
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141646,7 +142344,7 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141658,7 +142356,7 @@ self: {
        sha256 = "14vl52v4qshdyp45qrg8ii8xzpi6n05qdgz3ri59wis8hdw1v06z";
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hyper-extra" = callPackage
@@ -141673,8 +142371,8 @@ self: {
          base diagrams-lib diagrams-svg hyper QuickCheck svg-builder text
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141694,8 +142392,8 @@ self: {
          hint hyper scotty text transformers
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141714,8 +142412,8 @@ self: {
          pipes pretty
        ];
        description = "a fast, trustworthy HTTP(s) server built";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141731,8 +142429,8 @@ self: {
          adjunctions base distributive profunctors transformers
        ];
        description = "Hyperfunctions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141760,8 +142458,8 @@ self: {
          base hspec lens QuickCheck text unordered-containers
        ];
        description = "Reliable performance measurement with robust data export";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141787,7 +142485,7 @@ self: {
          simple-reflect
        ];
        description = "An approximate streaming (constant space) unique object counter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hyperloglogplus" = callPackage
@@ -141803,8 +142501,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ];
        description = "Approximate cardinality estimation using constant space";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141820,8 +142518,8 @@ self: {
          aeson attoparsec base bytestring http-enumerator http-types
        ];
        description = "A thin wrapper for the Hyperpublic API";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141833,7 +142531,7 @@ self: {
        sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4";
        libraryHaskellDepends = [ base containers ];
        description = "Text hyphenation algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hyphenation" = callPackage
@@ -141844,8 +142542,8 @@ self: {
        pname = "hyphenation";
        version = "0.8";
        sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii";
-       revision = "1";
-       editedCabalFile = "0h8k3hj2lrmj4fg8q34v6q4pskmpci9v8z3hby8gamjmlgivsqjf";
+       revision = "2";
+       editedCabalFile = "0y10glmsgnc67f2y8d6irgwyz9fahg9dv2sidqx1r6rfbs02416i";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -141855,7 +142553,7 @@ self: {
          base containers doctest unordered-containers
        ];
        description = "Configurable Knuth-Liang hyphenation";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "hypher" = callPackage
@@ -141884,8 +142582,8 @@ self: {
          transformers-base unordered-containers vector
        ];
        description = "A Haskell neo4j client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141897,6 +142595,8 @@ self: {
        pname = "hyraxAbif";
        version = "0.2.3.27";
        sha256 = "1ww4lgf280sjj9bhj8s6pxadqwk91jkx6lngb2cqcf81gr38drhm";
+       revision = "1";
+       editedCabalFile = "0l8dl3mw4vw8xhq59hin72rc5qh2swbzv41z61bqj2i1088xw0dg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141928,7 +142628,7 @@ self: {
        librarySystemDepends = [ z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings for the Z3 Theorem Prover";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
   "hzaif" = callPackage
@@ -141945,7 +142645,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "This package is Zaif Exchange Api wrapper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hzenhan" = callPackage
@@ -141957,7 +142657,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base containers QuickCheck text ];
        description = "Zenhan library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hzenity" = callPackage
@@ -141972,7 +142672,7 @@ self: {
          base containers data-default process process-extras text time
        ];
        description = "Haskell interface to Zenity dialogs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hzk" = callPackage
@@ -141990,7 +142690,7 @@ self: {
        ];
        testSystemDepends = [ zookeeper_mt ];
        description = "Haskell client library for Apache Zookeeper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zookeeper_mt;};
 
   "hzulip" = callPackage
@@ -142014,8 +142714,8 @@ self: {
          scotty stm stm-conduit text transformers
        ];
        description = "A haskell wrapper for the Zulip API";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142036,8 +142736,8 @@ self: {
          base containers hspec tasty tasty-hspec text
        ];
        description = "Internationalization for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142057,7 +142757,7 @@ self: {
          transformers turtle
        ];
        description = "Base i3blocks written in haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "i3ipc" = callPackage
@@ -142074,8 +142774,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "A type-safe wrapper around i3's IPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142094,8 +142794,8 @@ self: {
          time
        ];
        description = "iCalendar data types, parser, and printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142108,7 +142808,7 @@ self: {
        libraryHaskellDepends = [ base interleavableIO mtl ];
        description = "Version of Control.Exception using InterleavableIO.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "iap-verifier" = callPackage
@@ -142124,8 +142824,8 @@ self: {
          monads-tf text transformers
        ];
        description = "A simple wrapper of In-App-Purchase receipt validate APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142142,8 +142842,8 @@ self: {
          attoparsec base bytestring network unix
        ];
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142162,8 +142862,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Validate and generate IBANs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142175,7 +142875,7 @@ self: {
        sha256 = "0yrdh4y0ssldg0lmrbr6yk0zg2sihirp3mnh20dvg3m887kdhrj1";
        libraryHaskellDepends = [ base dbus directory unix xdg-basedir ];
        description = "A simple uncomplete ibus api";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "ical" = callPackage
@@ -142196,8 +142896,8 @@ self: {
        executableHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "iCalendar format parser and org-mode converter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142243,8 +142943,8 @@ self: {
          wai-websockets warp websockets
        ];
        description = "A fast JSON document store with push notification support";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ rkrzr ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ rkrzr ];
      }) {};
 
   "icfpc2020-galaxy" = callPackage
@@ -142255,7 +142955,7 @@ self: {
        sha256 = "17m8vp3kikpscagb40972r9a8i6ng8wjc697zdslj5zl95rpyrvd";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "A strange message received at the Pegovka observatory";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "icon-fonts" = callPackage
@@ -142266,7 +142966,7 @@ self: {
        sha256 = "0lc5filf2xydjrsq9d5qlwz3y76pn590pjiqjjhibkk4dhnys3gs";
        libraryHaskellDepends = [ base ];
        description = "Package for handling icon fonts in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iconv" = callPackage
@@ -142277,7 +142977,7 @@ self: {
        sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin";
        libraryHaskellDepends = [ base bytestring ];
        description = "String encoding conversion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iconv-typed" = callPackage
@@ -142293,8 +142993,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Type safe iconv wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142341,8 +143041,8 @@ self: {
          test-framework test-framework-hunit text unix utf8-string
        ];
        description = "An IDE backend library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142367,8 +143067,8 @@ self: {
          unix-compat
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142380,7 +143080,7 @@ self: {
        sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0";
        libraryHaskellDepends = [ base ];
        description = "RTS for the IDE backend";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ide-backend-server" = callPackage
@@ -142403,8 +143103,8 @@ self: {
          transformers unix unordered-containers zlib
        ];
        description = "An IDE backend server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142424,8 +143124,8 @@ self: {
          QuickCheck random streaming-commons time uniplate wai wl-pprint
        ];
        description = "Feedback services for intelligent tutoring systems";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142444,7 +143144,7 @@ self: {
        ];
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142458,8 +143158,8 @@ self: {
          base containers ideas parsec QuickCheck
        ];
        description = "Common types for mathematical domain reasoners";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142475,8 +143175,8 @@ self: {
          base containers ideas ideas-math-types
        ];
        description = "Interactive domain reasoner for statistics";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142489,8 +143189,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Idempotent monoids";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142513,7 +143213,7 @@ self: {
          base bytestring criterion JuicyPixels random tf-random
        ];
        description = "Flexible generation of identicons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "identicon-style-squares" = callPackage
@@ -142533,7 +143233,7 @@ self: {
          base bytestring cryptohash identicon JuicyPixels
        ];
        description = "Squares style for the identicon package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "identifiers" = callPackage
@@ -142557,8 +143257,8 @@ self: {
          base binary bytestring cereal criterion deepseq text
        ];
        description = "Numeric identifiers for values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142584,8 +143284,8 @@ self: {
          MissingH polyparse process text utf8-string
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142597,7 +143297,7 @@ self: {
        sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
        libraryHaskellDepends = [ base punycode stringprep text ];
        description = "Implements IDNA (RFC 3490)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "idna2008" = callPackage
@@ -142608,8 +143308,8 @@ self: {
        sha256 = "1pd62pr1hyk565mxc15f5lxyms58bywcqll5ya6cnzw20lv4lzlz";
        libraryHaskellDepends = [ base punycode split ];
        description = "Converts Unicode hostnames into ASCII";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142630,7 +143330,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A project manage tool for Idris";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "idris" = callPackage
@@ -142674,8 +143374,8 @@ self: {
          time transformers
        ];
        description = "Functional Programming Language with Dependent Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp;};
 
@@ -142687,7 +143387,7 @@ self: {
        sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km";
        libraryHaskellDepends = [ base ];
        description = "Utilities for dealing with IEEE floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ieee-utils" = callPackage
@@ -142698,8 +143398,8 @@ self: {
        sha256 = "0548m1xjvzf65kkklmqjr2f5h85zdfpvxmdbx5rcg33zi8aiqfgk";
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142711,7 +143411,7 @@ self: {
        sha256 = "0x0mkvnf3q4yfh7bi7hv6364gy0l57syzy9xgzyax8z94zh465c3";
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ieee754" = callPackage
@@ -142722,7 +143422,7 @@ self: {
        sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f";
        libraryHaskellDepends = [ base ];
        description = "Utilities for dealing with IEEE floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ieee754-parser" = callPackage
@@ -142749,8 +143449,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit stocks ];
        description = "Library for the IEX Trading API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142762,7 +143462,7 @@ self: {
        sha256 = "078lg8b6n4bhlhh6ax4k4n8k8fk7hiwcnzyr4h9zbq6vczl77xi8";
        libraryHaskellDepends = [ base ];
        description = "(?) and (?>) conditional operator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ifcxt" = callPackage
@@ -142776,8 +143476,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "put if statements within type constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142805,7 +143505,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "An inductive-form set constraint solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ig" = callPackage
@@ -142826,8 +143526,8 @@ self: {
          time transformers transformers-base unordered-containers
        ];
        description = "Bindings to Instagram's API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142850,8 +143550,8 @@ self: {
          transformers wl-pprint-text
        ];
        description = "An keyboard-driven interactive graph editor";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142870,8 +143570,8 @@ self: {
        libraryPkgconfigDepends = [ ige-mac-integration ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Bindings for the Gtk/OS X integration library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ige-mac-integration = null;};
 
@@ -142891,8 +143591,8 @@ self: {
        executableHaskellDepends = [ base directory path ];
        testHaskellDepends = [ base HTF text ];
        description = "Handle ignore files of different VCSes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142910,8 +143610,8 @@ self: {
        librarySystemDepends = [ igraph ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the igraph C library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) igraph;};
 
@@ -142925,7 +143625,7 @@ self: {
          ad base poly semirings text vector-space
        ];
        description = "International Geomagnetic Reference Field";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ihaskell" = callPackage
@@ -142960,8 +143660,8 @@ self: {
          raw-strings-qq setenv shelly text transformers
        ];
        description = "A Haskell backend kernel for the IPython project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142977,8 +143677,8 @@ self: {
          aeson aeson-pretty base bytestring here ihaskell text
        ];
        description = "IHaskell display instances for Aeson";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142990,8 +143690,8 @@ self: {
        sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw";
        libraryHaskellDepends = [ base ihaskell ];
        description = "IHaskell display instances for basic types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143003,8 +143703,8 @@ self: {
        sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7";
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        description = "IHaskell display instances for blaze-html types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143021,8 +143721,8 @@ self: {
          ihaskell
        ];
        description = "IHaskell display instances for charts types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143039,8 +143739,8 @@ self: {
          directory ihaskell text
        ];
        description = "IHaskell display instances for diagram types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143052,8 +143752,8 @@ self: {
        sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0";
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        description = "IHaskell display instances for basic types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143065,8 +143765,8 @@ self: {
        sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6";
        libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143078,8 +143778,8 @@ self: {
        sha256 = "1min39vd75rn7vwpmggf8a30fhlv5zphhmckb5a4g6lqg5v1kf1y";
        libraryHaskellDepends = [ base bytestring ihaskell process ];
        description = "IHaskell display instance for GraphViz (external binary)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143091,8 +143791,8 @@ self: {
        sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8";
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        description = "IHaskell display instances for hatex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143104,8 +143804,8 @@ self: {
        sha256 = "0k7h33cqj58dv4hrsdjgnbykh036mrvbw6cbr98xlkdq5062pnzp";
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143123,8 +143823,8 @@ self: {
          ihaskell-blaze inline-r template-haskell temporary
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143139,8 +143839,8 @@ self: {
          base bytestring directory ihaskell JuicyPixels
        ];
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143157,8 +143857,8 @@ self: {
          text utf8-string
        ];
        description = "IHaskell display instances for bytestrings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143174,8 +143874,8 @@ self: {
          aeson base here ihaskell parsec random text unordered-containers
        ];
        description = "IHaskell display instances for Parsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143187,8 +143887,8 @@ self: {
        sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y";
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        description = "IHaskell display instance for Plot (from plot package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143206,8 +143906,8 @@ self: {
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143225,8 +143925,8 @@ self: {
          text unix unordered-containers vector vinyl
        ];
        description = "IPython standard widgets for IHaskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143240,7 +143940,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Interpolated Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "ihttp" = callPackage
@@ -143258,8 +143958,8 @@ self: {
        ];
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143277,7 +143977,7 @@ self: {
          base criterion lens loop transformers vector
        ];
        description = "Optimised list functions for doing index-related things";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "illuminate" = callPackage
@@ -143297,8 +143997,8 @@ self: {
        executableHaskellDepends = [ array base containers html xhtml ];
        executableToolDepends = [ alex ];
        description = "A fast syntax highlighting library built with alex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143312,7 +144012,7 @@ self: {
        editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7";
        libraryHaskellDepends = [ base bytestring ];
        description = "Determine the type of an image by reading the first bytes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "imagefilters" = callPackage
@@ -143323,7 +144023,7 @@ self: {
        sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y";
        libraryHaskellDepends = [ base gd ];
        description = "Image Filters (contrast, brightness, gaussian blur, etc)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "imagemagick" = callPackage
@@ -143348,7 +144048,7 @@ self: {
        testPkgconfigDepends = [ imagemagick ];
        description = "bindings to imagemagick library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
@@ -143367,8 +144067,8 @@ self: {
          template-haskell transformers vcs-revision
        ];
        description = "Command-line image paste utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143389,7 +144089,7 @@ self: {
          base bytestring conduit conduit-extra hspec resourcet
        ];
        description = "Determine the size of some common image formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "imap" = callPackage
@@ -143415,8 +144115,8 @@ self: {
          tasty-quickcheck text transformers word8
        ];
        description = "An efficient IMAP client library, with SSL and streaming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143434,8 +144134,8 @@ self: {
          base bytestring directory HaskellNet HsOpenSSL network text
        ];
        description = "Downloads email from imap SSL servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143458,7 +144158,7 @@ self: {
        ];
        description = "Minimalistic reference manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143474,8 +144174,8 @@ self: {
          base data-default-class http-client req text xml-conduit xml-lens
        ];
        description = "A function to post an image to imgur";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143496,8 +144196,8 @@ self: {
          base curl directory haskell98 hxt hxt-xpath url
        ];
        description = "Uploader for Imgur";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143510,8 +144210,8 @@ self: {
        libraryHaskellDepends = [ base imj-base imj-prelude mtl ];
        testHaskellDepends = [ base ];
        description = "Animation Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143536,8 +144236,8 @@ self: {
          ansi-terminal base imj-prelude mtl text time
        ];
        description = "Game engine with geometry, easing, animated text, delta rendering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143558,8 +144258,8 @@ self: {
        executableHaskellDepends = [ base imj-prelude ];
        testHaskellDepends = [ base imj-base mtl text ];
        description = "A game with flying numbers and 8-bit color animations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143575,8 +144275,8 @@ self: {
          base imj-prelude optparse-applicative
        ];
        description = "An application to determine the maximum capacity of stdout buffer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143588,8 +144288,8 @@ self: {
        sha256 = "1nv3fxps3i4znibv98qygxdl22dzri5zkw6hjaqajb4nlnh4bd0v";
        libraryHaskellDepends = [ base mtl text ];
        description = "Prelude library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143628,8 +144328,8 @@ self: {
          typed-process typerep-map uri-bytestring xml-conduit xml-types
        ];
        description = "Execute arbitrary actions for each item from RSS/Atom feeds";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143648,8 +144348,8 @@ self: {
          base lifted-base stm tasty tasty-hunit transformers
        ];
        description = "Spawn threads that never die (unless told to do so)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -143663,7 +144363,7 @@ self: {
        libraryHaskellDepends = [ base stm unliftio-core ];
        testHaskellDepends = [ base stm tasty tasty-hunit transformers ];
        description = "Spawn threads that never die (unless told to do so)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "immortal-queue" = callPackage
@@ -143675,7 +144375,7 @@ self: {
        libraryHaskellDepends = [ async base immortal ];
        testHaskellDepends = [ base stm tasty tasty-hunit ];
        description = "Build a pool of queue-processing worker threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "immortal-worker" = callPackage
@@ -143691,8 +144391,8 @@ self: {
          unliftio-core
        ];
        description = "Create worker threads that logs exceptions and restarts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143716,8 +144416,8 @@ self: {
          parsec richreports split staticanalysis text uxadt
        ];
        description = "Multi-platform parser analyzer and generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143743,8 +144443,8 @@ self: {
          tasty-th
        ];
        description = "Deep embedding of imperative programs with code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143761,8 +144461,8 @@ self: {
          operational-alacarte pretty syntactic
        ];
        description = "Deep embedding of VHDL programs with code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143775,8 +144475,8 @@ self: {
        libraryHaskellDepends = [ base containers named template-haskell ];
        doHaddock = false;
        description = "Framework for defaulting superclasses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143807,7 +144507,7 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        benchmarkHaskellDepends = [ base criterion parsec ];
        description = "A math-inspired programmatic 2D & 3D CAD system";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "implicit-hie" = callPackage
@@ -143833,7 +144533,7 @@ self: {
          hspec-attoparsec text transformers yaml
        ];
        description = "Auto generate hie-bios cradles & hie.yaml";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "implicit-hie-cradle" = callPackage
@@ -143853,7 +144553,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Auto generate hie-bios cradles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "implicit-logging" = callPackage
@@ -143866,8 +144566,8 @@ self: {
        editedCabalFile = "02x6cmbxyw26y5azhjrx8461vngsj27l0a255xvhg2pl25zwfbfs";
        libraryHaskellDepends = [ base mtl time transformers ];
        description = "A logging framework built around implicit parameters";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143879,8 +144579,8 @@ self: {
        sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Named and unnamed implicit parameters with defaults";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143913,8 +144613,8 @@ self: {
          universum unordered-containers
        ];
        description = "Tool for haskell imports refactoring";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143927,8 +144627,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath mtl ];
        testHaskellDepends = [ base directory filepath mtl ];
        description = "Generate code for importing directories automatically";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143940,8 +144640,8 @@ self: {
        sha256 = "0557f8a9aaslkhpyp7b6zidg88a3472ya31rp8amqf71393nvkqp";
        libraryHaskellDepends = [ base lens ];
        description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143962,8 +144662,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal Imprevu ];
        description = "Reactive programming language based on a DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Imprevu = null;};
 
@@ -143984,8 +144684,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "Imprevu support for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "imprint" = callPackage
@@ -143999,8 +144699,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring constraints ];
        testHaskellDepends = [ base binary constraints hspec ];
        description = "Serialization of arbitrary Haskell expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144012,8 +144712,8 @@ self: {
        sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a";
        libraryHaskellDepends = [ base mtl yices ];
        description = "An imperative, verifiable programming language for high assurance applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144036,7 +144736,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Mutable containers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "in-other-words" = callPackage
@@ -144057,7 +144757,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A higher-order effect system where the sky's the limit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inbox" = callPackage
@@ -144068,7 +144768,7 @@ self: {
        sha256 = "12012di97775da8ijv0qjwaxls36kvly0j7nvqqj15ai3kf9yarq";
        libraryHaskellDepends = [ async base error-or text time ];
        description = "Inbox for asychronous messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inc-ref" = callPackage
@@ -144079,7 +144779,7 @@ self: {
        sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl";
        libraryHaskellDepends = [ base stm ];
        description = "A STM reference useful for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inch" = callPackage
@@ -144101,8 +144801,8 @@ self: {
          presburger pretty
        ];
        description = "A type-checker for Haskell with integer constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144114,8 +144814,8 @@ self: {
        sha256 = "1dsrx48srmrqcw4y60prgnzxzr7nc7vyzjv0nnr2vaay3j6pxkii";
        libraryHaskellDepends = [ base ];
        description = "Simple parser combinators for lexical analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144134,7 +144834,7 @@ self: {
        testHaskellDepends = [ base bytestring ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Inclusion of files in executables at compile-time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "incremental" = callPackage
@@ -144150,7 +144850,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "incremental update library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "incremental-computing" = callPackage
@@ -144170,8 +144870,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        description = "Incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144195,8 +144895,8 @@ self: {
          QuickCheck
        ];
        description = "Package for doing incremental computations on maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144220,7 +144920,7 @@ self: {
          base bytestring criterion deepseq monoid-subclasses text
        ];
        description = "Generic parser library capable of providing partial results from partial input";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -144231,7 +144931,7 @@ self: {
        sha256 = "1a75jkv48awijwdch0lnvcxdihh8ns9rflzgsbbhw8p34k1jpz8s";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Simple, Incremental SAT Solving as a Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "increments" = callPackage
@@ -144250,8 +144950,8 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        description = "type classes for incremental updates to data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144266,7 +144966,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Fix your indentation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indentation" = callPackage
@@ -144282,8 +144982,8 @@ self: {
          parsec parsers trifecta
        ];
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144295,8 +144995,8 @@ self: {
        sha256 = "1l1zk5wz9x0m4ird1qk8shi1fkcm3sq2nwkjj6wz2sicp0xkx6h9";
        libraryHaskellDepends = [ base mtl ];
        description = "Indentation sensitive parsing combinators core library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144311,8 +145011,8 @@ self: {
        libraryHaskellDepends = [ base indentation-core mtl parsec ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Indentation sensitive parsing combinators for Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144329,8 +145029,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
        description = "Indentation sensitive parsing combinators for Trifecta";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144344,7 +145044,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec ];
        description = "A parser for indentation based structures";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "indents" = callPackage
@@ -144356,7 +145056,7 @@ self: {
        libraryHaskellDepends = [ base mtl parsec ];
        testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
        description = "indentation sensitive parser-combinators for parsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "index-core" = callPackage
@@ -144367,8 +145067,8 @@ self: {
        sha256 = "014fr720vvl1zs0hl6ljsa1dskwby6zqrlwrrhv0pk1nsmxbilbm";
        libraryHaskellDepends = [ base ];
        description = "Indexed Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144390,8 +145090,8 @@ self: {
          unordered-containers vector vector-th-unbox
        ];
        description = "Tools for entity indexation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144403,7 +145103,7 @@ self: {
        sha256 = "1hpmzg9ziqgng4wh4g0x4p6sdvn9f31hymwxdvfffydzqq70k17g";
        libraryHaskellDepends = [ base ];
        description = "Haskell98 indexed functors, monads, comonads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-containers" = callPackage
@@ -144416,7 +145116,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Simple, no-frills indexed lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-do-notation" = callPackage
@@ -144430,7 +145130,7 @@ self: {
          base haskell-src-meta indexed template-haskell
        ];
        description = "Do notation for indexed monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-extras" = callPackage
@@ -144443,7 +145143,7 @@ self: {
        editedCabalFile = "0103q2ns33wmcnlhda2lcrz2x1kr2cyfxpv7akj6y09k7q19ir77";
        libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
        description = "Indexed functors, monads and comonads that require extensions to Haskell98";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-free" = callPackage
@@ -144454,7 +145154,7 @@ self: {
        sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
        libraryHaskellDepends = [ base indexed ];
        description = "indexed monads for free";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-list-literals" = callPackage
@@ -144466,7 +145166,7 @@ self: {
        libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base hspec ];
        description = "Type safe indexed list literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-profunctors" = callPackage
@@ -144477,7 +145177,7 @@ self: {
        sha256 = "0rdvj62rapkkj5zv5jyx2ynfwn2iszx1w2q08j9ik17zklqv9pri";
        libraryHaskellDepends = [ base ];
        description = "Utilities for indexed profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-traversable" = callPackage
@@ -144488,7 +145188,7 @@ self: {
        sha256 = "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs";
        libraryHaskellDepends = [ array base containers transformers ];
        description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "indexed-traversable-instances" = callPackage
@@ -144512,7 +145212,7 @@ self: {
          vector
        ];
        description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "indextype" = callPackage
@@ -144524,8 +145224,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144537,7 +145237,7 @@ self: {
        sha256 = "1dw0fy3v2hfvlaw371af2c288v4p0wyg43h88clswids3nh1lpn8";
        libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indices" = callPackage
@@ -144552,8 +145252,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144579,15 +145279,15 @@ self: {
          raw-strings-qq template-haskell text time
        ];
        description = "A collection of implementations of IndieWeb algorithms";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "indigo" = callPackage
     ({ mkDerivation, base, casing, cleveland, constraints, containers
-     , directory, fmt, hedgehog, hspec-expectations, HUnit, lorentz
-     , megaparsec, microlens-th, morley, morley-prelude
+     , directory, file-embed, fmt, hedgehog, hspec-expectations, HUnit
+     , lorentz, megaparsec, microlens-th, morley, morley-prelude
      , optparse-applicative, process, reflection, shelly, singletons
      , string-interpolate, summoner, tasty, tasty-discover
      , tasty-hedgehog, tasty-hunit-compat, template-haskell, text, vinyl
@@ -144595,8 +145295,8 @@ self: {
      }:
      mkDerivation {
        pname = "indigo";
-       version = "0.4";
-       sha256 = "1qa6xbzyfl1f1c6kw71b0zi538zxql07kidkmsjz91sy9nrc93ml";
+       version = "0.5.0";
+       sha256 = "121y842b8ik37lp01k9gqh8g63wcpn32w7br7nw9valjjxmc3dkg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144605,7 +145305,7 @@ self: {
          with-utf8
        ];
        executableHaskellDepends = [
-         base directory megaparsec morley morley-prelude
+         base directory file-embed megaparsec morley morley-prelude
          optparse-applicative process shelly string-interpolate summoner
          text with-utf8
        ];
@@ -144616,8 +145316,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Convenient imperative eDSL over Lorentz";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cleveland = null;};
 
@@ -144630,8 +145330,8 @@ self: {
        libraryHaskellDepends = [ array base deepseq vector ];
        testHaskellDepends = [ array base deepseq QuickCheck text vector ];
        description = "Non-contiguous interval data types with potentially infinite ranges";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144650,7 +145350,7 @@ self: {
          base directory filepath hspec text text-metrics
        ];
        description = "Infer software license from a given license file";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "infer-upstream" = callPackage
@@ -144667,8 +145367,8 @@ self: {
          ansi-wl-pprint base github optparse-applicative parsec process text
        ];
        description = "Find the repository from where a given repo was forked";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144689,8 +145389,8 @@ self: {
          unordered-containers wai
        ];
        description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144711,8 +145411,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative parsec ];
        description = "Type inference and checker for JavaScript (experimental)";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144724,7 +145424,7 @@ self: {
        sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41";
        libraryHaskellDepends = [ base ];
        description = "Exhaustively searchable infinite sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "infinity" = callPackage
@@ -144739,8 +145439,8 @@ self: {
        executableHaskellDepends = [
          base binary Cabal filepath ghc irc plugins
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144753,7 +145453,7 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src ];
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144773,7 +145473,7 @@ self: {
          base containers hspec hspec-megaparsec megaparsec QuickCheck text
        ];
        description = "Inflections library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inflist" = callPackage
@@ -144785,8 +145485,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "An infinite list type and operations thereon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144814,7 +145514,7 @@ self: {
          template-haskell time vector
        ];
        description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "informative" = callPackage
@@ -144842,8 +145542,8 @@ self: {
          time-locale-compat yesod yesod-auth yesod-core yesod-form
        ];
        description = "A yesod subsite serving a wiki";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144860,7 +145560,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec unordered-containers ];
        description = "Quick and easy configuration files in the INI format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ini-qq" = callPackage
@@ -144874,8 +145574,8 @@ self: {
        libraryHaskellDepends = [ base ini template-haskell text ];
        testHaskellDepends = [ base HUnit ini raw-strings-qq text ];
        description = "Quasiquoter for INI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144895,8 +145595,8 @@ self: {
          testpack trifecta
        ];
        description = "Processing for .ini files with duplicate sections and options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144908,8 +145608,8 @@ self: {
        sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
        libraryHaskellDepends = [ base ];
        description = "Initialization and Deinitialization of 'Storable' values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144920,7 +145620,7 @@ self: {
        version = "1.0";
        sha256 = "1dhssqy5369vzcxkkrv8bi5bjz0z67dawwzc27mz9m40bq7324j0";
        description = "A class for injective (one-to-one) functions";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "inj-base" = callPackage
@@ -144931,7 +145631,7 @@ self: {
        sha256 = "1cvhk4ww55nd85rwhaagaz2fihcakrqxy9r37jdp3jghaybk9p9d";
        libraryHaskellDepends = [ base inj ];
        description = "'Inj' instances for 'base'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inject" = callPackage
@@ -144950,7 +145650,7 @@ self: {
          attoparsec base hspec hspec-expectations process text
        ];
        description = "A minimalistic template engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inject-function" = callPackage
@@ -144961,8 +145661,8 @@ self: {
        sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl";
        libraryHaskellDepends = [ base ];
        description = "Monadic functions with injected parameters";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144991,8 +145691,8 @@ self: {
          uniplate
        ];
        description = "Inline some Assembly in ur Haskell!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145004,8 +145704,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.9.1.3";
-       sha256 = "1b2dcyg6b15q5n7k9k391y78wblqlvkrwxr8hbnp0y6x8h8l8ma8";
+       version = "0.9.1.4";
+       sha256 = "021r3ghn3cv1nykkkgyd50gq5cmczam8j37xqfi7vmyx5iwdv0a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145018,25 +145718,26 @@ self: {
          unordered-containers vector
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
-     , template-haskell
+     , template-haskell, vector
      }:
      mkDerivation {
        pname = "inline-c-cpp";
-       version = "0.4.0.2";
-       sha256 = "0nb7n2q47jbny7rj9y1hn6lnailnmpy4y7j6jaalny123kxsdipp";
+       version = "0.4.0.3";
+       sha256 = "0bqrhyic3cw1pqg7knsmkqx5swpr4kvf9bmz0mhmqbl6brmv5il0";
        libraryHaskellDepends = [
          base containers inline-c safe-exceptions template-haskell
        ];
        testHaskellDepends = [
-         base containers hspec inline-c safe-exceptions
+         base containers hspec inline-c safe-exceptions template-haskell
+         vector
        ];
        description = "Lets you embed C++ code into Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inline-c-win32" = callPackage
@@ -145051,7 +145752,7 @@ self: {
          base containers inline-c template-haskell Win32
        ];
        description = "Win32 API Context for the inline-c library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inline-java" = callPackage
@@ -145075,8 +145776,8 @@ self: {
          base criterion deepseq jni jvm singletons
        ];
        description = "Java interop via inline Java code in Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145111,8 +145812,8 @@ self: {
          template-haskell vector
        ];
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) R;};
 
@@ -145133,7 +145834,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base text ];
        description = "Interactive literate programming";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "input-parsers" = callPackage
@@ -145149,7 +145850,7 @@ self: {
          text transformers
        ];
        description = "Extension of the parsers library with more capability and efficiency";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inquire" = callPackage
@@ -145162,8 +145863,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ aether base text ];
        description = "Console client for encyclopedias";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {aether = null;};
 
@@ -145188,7 +145889,7 @@ self: {
          unordered-containers
        ];
        description = "Associative containers retaining insertion order for traversals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inserts" = callPackage
@@ -145199,8 +145900,8 @@ self: {
        sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477";
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        description = "Stupid simple bytestring templates";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145218,7 +145919,7 @@ self: {
          async base bytestring cmdargs pipes pipes-network
        ];
        description = "A simple proxy for debugging plaintext protocols communication";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inspection-testing" = callPackage
@@ -145234,7 +145935,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "GHC plugin to do inspection testing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -145256,8 +145957,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Create benchmarks from the HAR files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145292,8 +145993,8 @@ self: {
          regex-tdfa retry scientific text unix unordered-containers
        ];
        description = "SDK for adding custom Instana tracing support to Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145305,7 +146006,7 @@ self: {
        sha256 = "0wvb3hia5n0nmfd5ih17qp6f7517s164c5mhrn29ai7vv20x6vbx";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Controls how the compiler searches for instances using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "instance-map" = callPackage
@@ -145321,8 +146022,8 @@ self: {
          aeson base binary bytestring containers hspec mtl template-haskell
        ];
        description = "Template haskell utilities for helping with deserialization etc. of existential types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145339,8 +146040,8 @@ self: {
          aeson base instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Aeson instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145357,8 +146058,8 @@ self: {
          base bytes instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Serial instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145370,8 +146071,8 @@ self: {
        sha256 = "088fwsj4hllp96ik91wpqyjfjcb5n64sb6b4fqfvplcsn3zzlvv0";
        libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145385,8 +146086,8 @@ self: {
        editedCabalFile = "1z5224dfrwlz29clxb2x2s4cn88sfgmq4264zj4vgkkgakvp848w";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "Generic programming library with a sum of products view";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145398,8 +146099,8 @@ self: {
        sha256 = "0xrs81j6dmwd5xb69rn24ibngkhrs51n9kr8bs292vhj0awm3y4b";
        libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145414,7 +146115,7 @@ self: {
        libraryHaskellDepends = [ base instant-generics mtl ];
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145434,8 +146135,8 @@ self: {
          http-types network scotty text wai wai-extra
        ];
        description = "Basic HTTP gateway to save articles to Instapaper";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145447,8 +146148,8 @@ self: {
        sha256 = "0wh95zjdv9j1n3ccg2j08av43qnb9vmiyvqvyi70p47dr481npl8";
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145460,7 +146161,7 @@ self: {
        sha256 = "1fc3vgxxzk6rw0y6d40jiyrc66fd1ig7nk4bdmfn1q595q5iwnz3";
        libraryHaskellDepends = [ array base containers music-diatonic ];
        description = "Render Instrument Chords";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "int-cast" = callPackage
@@ -145478,7 +146179,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Checked conversions between integral types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "int-multimap" = callPackage
@@ -145499,8 +146200,8 @@ self: {
          unordered-containers
        ];
        description = "A data structure that associates each Int key with a set of values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145515,8 +146216,8 @@ self: {
        libraryHaskellDepends = [ base containers primitive ];
        testHaskellDepends = [ base containers doctest primitive ];
        description = "Advent of Code 2019 intcode interpreter";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145528,8 +146229,8 @@ self: {
        sha256 = "06302vwkc99l5gdbk3r25w84gi9cj18jcf8ipi189vpnmw42awwf";
        libraryHaskellDepends = [ ghc-prim ];
        description = "Integer library based on GMP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "integer-logarithms" = callPackage
@@ -145547,7 +146248,7 @@ self: {
          tasty-smallcheck
        ];
        description = "Integer logarithms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "integer-pure" = callPackage
@@ -145557,8 +146258,8 @@ self: {
        version = "1.0";
        sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145577,7 +146278,7 @@ self: {
          base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "Integer roots and perfect powers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "integer-simple" = callPackage
@@ -145588,7 +146289,7 @@ self: {
        sha256 = "1z8hfl4wnsb3bypv3arms0sbvixkalhlcchv35vwziy5wnflnsvn";
        libraryHaskellDepends = [ ghc-prim ];
        description = "Simple Integer library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "integration" = callPackage
@@ -145599,7 +146300,7 @@ self: {
        sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc";
        libraryHaskellDepends = [ base parallel ];
        description = "Fast robust numeric integration via tanh-sinh quadrature";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "integreat" = callPackage
@@ -145625,8 +146326,8 @@ self: {
          vector
        ];
        description = "Integrate different assays";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145645,8 +146346,8 @@ self: {
        ];
        librarySystemDepends = [ intel_aes ];
        description = "Hardware accelerated AES encryption and Random Number Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {intel_aes = null;};
 
@@ -145667,8 +146368,8 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "A GHC Core plugin for intensional datatype refinement checking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145685,7 +146386,7 @@ self: {
          base bytestring hspec main-tester mtl silently
        ];
        description = "instantly create REPL from any function";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interactive-plot" = callPackage
@@ -145704,7 +146405,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Interactive quick time series plotting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interchangeable" = callPackage
@@ -145715,7 +146416,7 @@ self: {
        sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh";
        libraryHaskellDepends = [ base containers ];
        description = "A type class for interchangeable data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interleavableGen" = callPackage
@@ -145729,7 +146430,7 @@ self: {
        executableHaskellDepends = [ base directory haskell-src hint mtl ];
        description = "Generates a version of a module using InterleavableIO";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "interleavableIO" = callPackage
@@ -145741,7 +146442,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Use other Monads in functions that asks for an IO Monad";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "interleave" = callPackage
@@ -145752,7 +146453,7 @@ self: {
        sha256 = "062ixqbrrmamwv3fj6vpfcxy35p37i1wpmsxk1gl9n06n0lg9a8c";
        libraryHaskellDepends = [ base ];
        description = "Combinators for supporting interleaving of different behaviours";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interlude" = callPackage
@@ -145781,8 +146482,8 @@ self: {
          string-conv text transformers witherable
        ];
        description = "Prelude replacement based on protolude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145794,11 +146495,13 @@ self: {
        pname = "intern";
        version = "0.9.3";
        sha256 = "1pbk804kq5p25ixrihhpfgy0fwj8i6cybxlhk42krzni7ad7gx4k";
+       revision = "1";
+       editedCabalFile = "1cjlmvg55nn9fd1f0jfmgy1rjys7gna3x3qknnpcmndq6vzg1mrl";
        libraryHaskellDepends = [
          array base bytestring hashable text unordered-containers
        ];
        description = "Efficient hash-consing for arbitrary data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "internetmarke" = callPackage
@@ -145817,7 +146520,7 @@ self: {
        ];
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145844,8 +146547,8 @@ self: {
          transformers
        ];
        description = "Complete interactive development program for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145877,7 +146580,7 @@ self: {
          text transformers unordered-containers vector
        ];
        description = "Tracery-like randomized text interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interpol" = callPackage
@@ -145900,8 +146603,8 @@ self: {
          test-framework-hunit
        ];
        description = "GHC preprocessor and library to enable variable interpolation in strings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145919,7 +146622,7 @@ self: {
          quickcheck-instances template-haskell text
        ];
        description = "String interpolation done right";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interpolatedstring-perl6" = callPackage
@@ -145936,7 +146639,7 @@ self: {
          base bytestring haskell-src-meta template-haskell text
        ];
        description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "interpolatedstring-qq" = callPackage
@@ -145951,8 +146654,8 @@ self: {
          base haskell-src-meta-mwotton template-haskell
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145968,8 +146671,8 @@ self: {
          base haskell-src-meta-mwotton template-haskell
        ];
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145988,8 +146691,8 @@ self: {
          base bytestring haskell-src-meta HUnit template-haskell text
        ];
        description = "QuasiQuoter for multi-line interpolated strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146006,7 +146709,7 @@ self: {
          array base containers QuickCheck utility-ht
        ];
        description = "piecewise linear and cubic Hermite interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interpolator" = callPackage
@@ -146027,7 +146730,7 @@ self: {
          product-profunctors profunctors QuickCheck template-haskell text
        ];
        description = "Runtime interpolation of environment variables in records using profunctors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interprocess" = callPackage
@@ -146041,7 +146744,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base typed-process ];
        description = "Shared memory and control structures for IPC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interruptible" = callPackage
@@ -146059,8 +146762,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal either transformers ];
        description = "Monad transformers that can be run and resumed later, conserving their context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146072,7 +146775,7 @@ self: {
        sha256 = "1z0ca16vp3j9l2nkzg8gck2jrysqn2fw4vxr2br0j41fp7iss5wx";
        libraryHaskellDepends = [ base base-prelude transformers ];
        description = "An abstraction over interspersing monadic actions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interval" = callPackage
@@ -146086,8 +146789,8 @@ self: {
        libraryHaskellDepends = [ base deepseq fingertree ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Intervals with adherences";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146100,7 +146803,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "An implementation of Allen's interval algebra for temporal logic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interval-functor" = callPackage
@@ -146112,7 +146815,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hedgehog ];
        description = "Intervals of functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "intervals" = callPackage
@@ -146132,7 +146835,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Interval Arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "intmap-graph" = callPackage
@@ -146143,7 +146846,7 @@ self: {
        sha256 = "0g4kf7d4yh29jlb5a2f8awjbmaan2f7m1ybkcihayp83lvjld4v0";
        libraryHaskellDepends = [ base containers text vector word8 ];
        description = "A graph library that allows to explore edges after their type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "intricacy" = callPackage
@@ -146166,7 +146869,7 @@ self: {
        ];
        executablePkgconfigDepends = [ ncurses ];
        description = "A game of competitive puzzle-design";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) ncurses;};
 
   "intrinsic-superclasses" = callPackage
@@ -146181,7 +146884,7 @@ self: {
          base containers haskell-src-meta mtl template-haskell
        ];
        description = "A quasiquoter for better instance deriving and default methods";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "intro" = callPackage
@@ -146203,7 +146906,7 @@ self: {
          writer-cps-mtl
        ];
        description = "Safe and minimal prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "intro-prelude" = callPackage
@@ -146218,8 +146921,8 @@ self: {
        testHaskellDepends = [ intro ];
        doHaddock = false;
        description = "Intro reexported as Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146240,8 +146943,8 @@ self: {
          validity-containers
        ];
        description = "A prelude for safe new projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146261,8 +146964,8 @@ self: {
          introduction path path-io QuickCheck time
        ];
        description = "A prelude for the tests of safe new projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146274,8 +146977,8 @@ self: {
        sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
        description = "Pure, mergeable, succinct Int sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146295,7 +146998,7 @@ self: {
          base containers criterion random unordered-containers vector
        ];
        description = "An imperative integer set written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invariant" = callPackage
@@ -146317,7 +147020,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell98 invariant functors";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "invertible" = callPackage
@@ -146335,7 +147038,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invertible-grammar" = callPackage
@@ -146354,7 +147057,7 @@ self: {
          tagged template-haskell text transformers
        ];
        description = "Invertible parsing combinators framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invertible-hlist" = callPackage
@@ -146365,8 +147068,8 @@ self: {
        sha256 = "1824j4k8y5mn16vyk1h3mb72gr19j6rc833w24yqjxjlqw81y3y5";
        libraryHaskellDepends = [ base HList invertible ];
        description = "invertible functions and instances for HList";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146380,7 +147083,7 @@ self: {
          base hxt hxt-charproperties invertible mtl
        ];
        description = "invertible transformer instances for HXT Picklers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -146391,8 +147094,8 @@ self: {
        sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp";
        libraryHaskellDepends = [ base partial-isomorphisms ];
        description = "Invertible syntax descriptions for both parsing and pretty printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146404,7 +147107,7 @@ self: {
        sha256 = "1nms6w5b8apdz9xlwdqyj9n4m0b192simxg9zl7pv8zkyklyb3aw";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "Semigroups with involution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-capture" = callPackage
@@ -146422,8 +147125,8 @@ self: {
          base bytestring hspec hspec-core streaming-bytestring unix
        ];
        description = "Capture IO actions' stdout and stderr";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146443,8 +147146,8 @@ self: {
          base hspec lifted-base monad-control transformers
        ];
        description = "Choice for IO and lifted IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146457,7 +147160,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "Easy I/O model to learn IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-manager" = callPackage
@@ -146471,7 +147174,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        description = "Skeleton library around the IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-memoize" = callPackage
@@ -146482,7 +147185,7 @@ self: {
        sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
        libraryHaskellDepends = [ async base ];
        description = "Memoize IO actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-reactive" = callPackage
@@ -146496,8 +147199,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146510,7 +147213,7 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec transformers ];
        description = "Exception safe resource management with dynamic regions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-storage" = callPackage
@@ -146521,7 +147224,7 @@ self: {
        sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
        libraryHaskellDepends = [ base containers ];
        description = "A key-value store in the IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-streams" = callPackage
@@ -146547,7 +147250,7 @@ self: {
          time transformers vector zlib zlib-bindings
        ];
        description = "Simple, composable, and easy-to-use stream I/O";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-streams-haproxy" = callPackage
@@ -146568,7 +147271,7 @@ self: {
          test-framework-hunit transformers
        ];
        description = "HAProxy protocol 1.5 support for io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-streams-http" = callPackage
@@ -146584,7 +147287,7 @@ self: {
          transformers
        ];
        description = "http-client for io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-string-like" = callPackage
@@ -146597,7 +147300,7 @@ self: {
        editedCabalFile = "0fn9zq62js0xybfbhd673hbh5zp0l2v1p2ddknwkclh4i01i03i6";
        libraryHaskellDepends = [ base binary bytestring text ];
        description = "Classes to handle Prelude style IO functions for different datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-throttle" = callPackage
@@ -146611,7 +147314,7 @@ self: {
        libraryHaskellDepends = [ base SafeSemaphore threads ];
        testHaskellDepends = [ base ];
        description = "Limit number of IO actions started per second";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ioctl" = callPackage
@@ -146624,8 +147327,8 @@ self: {
        editedCabalFile = "15i0plam5pr3zkvmmy0g5q9v1fwvp49r4gsyx3y5j89svyffwqaq";
        libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146646,8 +147349,8 @@ self: {
          base containers ivory ivory-backend-c mtl
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146659,7 +147362,7 @@ self: {
        sha256 = "1iwi1675ggfwfh5as0zj19q4375b58hrb3g4jfn8myrhlhncixpl";
        libraryHaskellDepends = [ base ];
        description = "iorefs with a unique stable index";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "iostring" = callPackage
@@ -146670,8 +147373,8 @@ self: {
        sha256 = "0bqi5b8j0i56nqm2fw2ylk6qnc2hm41qx36p93hs0f8javpmv1nn";
        libraryHaskellDepends = [ base bytestring path text ];
        description = "A class of strings that can be involved in IO";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146683,8 +147386,8 @@ self: {
        sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
        libraryHaskellDepends = [ base ];
        description = "run IOs in a single thread";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146696,8 +147399,8 @@ self: {
        sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc";
        libraryHaskellDepends = [ base ];
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146728,8 +147431,8 @@ self: {
          text
        ];
        description = "Library for IP and MAC addresses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146744,8 +147447,8 @@ self: {
        libraryHaskellDepends = [ base cpu network template-haskell ];
        testHaskellDepends = [ base cpu network tasty tasty-hunit ];
        description = "Quasiquoter for IP addresses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146757,8 +147460,8 @@ self: {
        sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0";
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Location Haskell package for IP geolocation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146770,8 +147473,8 @@ self: {
        sha256 = "1hi1q0kiqqp96w29y9699s66rmyr7k0fp6s7z86ll9n3bmf0a4g4";
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146785,7 +147488,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs IPv6Addr text ];
        description = "Commandline tool to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ipatch" = callPackage
@@ -146803,8 +147506,8 @@ self: {
          unix
        ];
        description = "interactive patch editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146820,8 +147523,8 @@ self: {
          base binary bytestring dlist mtl network network-bytestring stm
        ];
        description = "High level inter-process communication library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146838,7 +147541,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ipfs" = callPackage
@@ -146863,8 +147566,8 @@ self: {
          text vector yaml
        ];
        description = "Access IPFS locally and remotely";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146880,8 +147583,8 @@ self: {
          aeson base bytestring http-media http-types servant text
        ];
        description = "Auto-generated IPFS HTTP API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146903,8 +147606,8 @@ self: {
          text
        ];
        description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146926,8 +147629,8 @@ self: {
        libraryPkgconfigDepends = [ ipopt nlopt ];
        libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;};
 
@@ -146939,8 +147642,8 @@ self: {
        sha256 = "08x8lfy0dll09y7cvfgmif5gvj7j2kxd8qac3fndmq4z45wiy90s";
        libraryHaskellDepends = [ base haskell-src sr-extra ];
        description = "Tiny helper for pretty-printing values in ghci console";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146962,7 +147665,7 @@ self: {
          QuickCheck safe
        ];
        description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -146980,8 +147683,8 @@ self: {
        ];
        executableHaskellDepends = [ base QuickCheck syb ];
        description = "iptables rules parser/printer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147006,8 +147709,8 @@ self: {
          time unix utf8-string
        ];
        description = "web-interface for iptables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147031,7 +147734,7 @@ self: {
          unordered-containers vector
        ];
        description = "Data structure for working with Jupyter notebooks (ipynb)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ipython-kernel" = callPackage
@@ -147053,7 +147756,7 @@ self: {
          transformers unordered-containers uuid zeromq4-haskell
        ];
        description = "A library for creating kernels for IPython frontends";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc" = callPackage
@@ -147070,7 +147773,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A small library for parsing IRC messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "irc-bytestring" = callPackage
@@ -147081,7 +147784,7 @@ self: {
        sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "serialization and parsing of IRC messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "irc-client" = callPackage
@@ -147101,7 +147804,7 @@ self: {
          x509-store x509-validation
        ];
        description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc-colors" = callPackage
@@ -147112,7 +147815,7 @@ self: {
        sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0";
        libraryHaskellDepends = [ base text ];
        description = "Colourize your IRC strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "irc-conduit" = callPackage
@@ -147130,7 +147833,7 @@ self: {
          x509-validation
        ];
        description = "Streaming IRC message library using conduits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc-core" = callPackage
@@ -147149,8 +147852,8 @@ self: {
        ];
        testHaskellDepends = [ base hashable HUnit text ];
        description = "IRC core library for glirc";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "irc-ctcp" = callPackage
@@ -147161,7 +147864,7 @@ self: {
        sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n";
        libraryHaskellDepends = [ base bytestring text ];
        description = "A CTCP encoding and decoding library for IRC clients";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc-dcc" = callPackage
@@ -147185,8 +147888,8 @@ self: {
          tasty-hspec tasty-quickcheck utf8-string
        ];
        description = "A DCC message parsing and helper library for IRC clients";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147207,8 +147910,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Library for writing fun IRC bots";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147227,8 +147930,8 @@ self: {
          time-units unordered-containers
        ];
        description = "Another library for writing IRC clients";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147245,8 +147948,8 @@ self: {
        ];
        testHaskellDepends = [ base text ];
        description = "Add color and style decorations to IRC messages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147260,8 +147963,8 @@ self: {
          base irc-fun-types regex-applicative text
        ];
        description = "Types and functions for working with the IRC protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147273,8 +147976,8 @@ self: {
        sha256 = "15q9sfpazrnplj8yp1v641amnw8zcvwb9wp8siy8fbhi6gcx5lip";
        libraryHaskellDepends = [ base hashable text ];
        description = "Common types for IRC related packages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147297,7 +148000,7 @@ self: {
          parsec random SafeSemaphore stm time unix
        ];
        description = "A library for writing IRC bots";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ircbouncer" = callPackage
@@ -147308,7 +148011,7 @@ self: {
        sha256 = "1bn0m9x89pqknz8gn8gk9is6w6px4hznp3fqqb5dxwssmmjm99zm";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ireal" = callPackage
@@ -147319,7 +148022,7 @@ self: {
        sha256 = "0wxwr74rhf2kmx8dz629k707ir10w4mlkvis50v113kh87d990lj";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Real numbers and intervals with relatively efficient exact arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iri" = callPackage
@@ -147345,8 +148048,8 @@ self: {
          tasty-quickcheck
        ];
        description = "RFC-based resource identifier library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147374,8 +148077,8 @@ self: {
          base extra multistate text transformers unordered-containers yaml
        ];
        description = "Automated Local Cabal Package Testing and Uploading";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147387,8 +148090,8 @@ self: {
        sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        description = "Iron.IO message queueing client library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147411,8 +148114,8 @@ self: {
          antisplice base chatty chatty-utils mtl transformers
        ];
        description = "A technical demo for Antisplice";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147424,8 +148127,8 @@ self: {
        sha256 = "05a1k70cj4rlaz7yx84m7riz6zhsb588vfyzkza2gr4i5wlhjr6c";
        libraryHaskellDepends = [ ad base data-default-class statistics ];
        description = "Item Response Theory functions for use in computerized adaptive testing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147438,7 +148141,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Generic pattern predicates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "isbn" = callPackage
@@ -147450,7 +148153,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "ISBN Validation and Manipulation";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "isdicom" = callPackage
@@ -147469,8 +148172,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "An executable and library to determine if a file is a DICOM file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147482,8 +148185,8 @@ self: {
        sha256 = "10f09br33xy5ldl924kfnnlc5ilwq44hd17s2qdf9jm75q4sa7d5";
        libraryHaskellDepends = [ base vacuum ];
        description = "Check whether a value has been evaluated";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147497,7 +148200,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "islink" = callPackage
@@ -147508,7 +148211,7 @@ self: {
        sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg";
        libraryHaskellDepends = [ base unordered-containers ];
        description = "Check if an HTML element is a link";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ismtp" = callPackage
@@ -147524,8 +148227,8 @@ self: {
          lifted-base monad-control netlines network vector
        ];
        description = "Advanced ESMTP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147538,7 +148241,7 @@ self: {
        libraryHaskellDepends = [ base mtl profunctors ];
        testHaskellDepends = [ base mtl ];
        description = "Deriving via arbitrary isomorphisms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "iso3166-country-codes" = callPackage
@@ -147562,7 +148265,7 @@ self: {
        sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj";
        libraryHaskellDepends = [ base ];
        description = "ISO-639-1 language codes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iso8583-bitmaps" = callPackage
@@ -147578,7 +148281,7 @@ self: {
          th-lift
        ];
        description = "Parse and merge ISO 8583-style bitmaps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iso8601-duration" = callPackage
@@ -147597,8 +148300,8 @@ self: {
          time
        ];
        description = "Types and parser for ISO8601 durations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147611,7 +148314,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit time ];
        description = "Convert to/from the ISO 8601 time format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "isobmff" = callPackage
@@ -147636,8 +148339,8 @@ self: {
          base binary bytestring criterion tagged type-spec
        ];
        description = "A parser and generator for the ISO-14496-12/14 base media file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147662,8 +148365,8 @@ self: {
          base binary bytestring criterion tagged type-spec
        ];
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147680,8 +148383,8 @@ self: {
          unordered-containers uri vector
        ];
        description = "Bindings to the isoHunt torrent search API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147700,8 +148403,8 @@ self: {
          base containers hspec megaparsec QuickCheck
        ];
        description = "Isotopic masses and relative abundances";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147714,7 +148417,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Positive integers test";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "it-has" = callPackage
@@ -147726,7 +148429,7 @@ self: {
        libraryHaskellDepends = [ base generic-lens ];
        testHaskellDepends = [ base generic-lens QuickCheck ];
        description = "Automatically derivable Has instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "itanium-abi" = callPackage
@@ -147744,7 +148447,7 @@ self: {
          base HUnit process test-framework test-framework-hunit
        ];
        description = "An implementation of name mangling/demangling for the Itanium ABI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "itcli" = callPackage
@@ -147762,8 +148465,8 @@ self: {
          time uuid yaml
        ];
        description = "Issue Tracker for the CLI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147791,8 +148494,8 @@ self: {
          vty
        ];
        description = "A brick Widget for selectable summary of many elements on a terminal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147811,8 +148514,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "iteratees for statistical processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147831,8 +148534,8 @@ self: {
        ];
        librarySystemDepends = [ zlib ];
        description = "Iteratee-based IO with pipe operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -147847,7 +148550,7 @@ self: {
          base mtl tagged template-haskell vector
        ];
        description = "API for hierarchical multilevel collections";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iteratee" = callPackage
@@ -147876,8 +148579,8 @@ self: {
          mtl transformers transformers-base unix
        ];
        description = "Iteratee-based I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147890,8 +148593,8 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee mtl ];
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
@@ -147909,8 +148612,8 @@ self: {
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
        description = "Iteratee-based I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147926,8 +148629,8 @@ self: {
          base iteratee ListLike parsec reference transformers
        ];
        description = "Package allowing parsec parser initeratee";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147941,8 +148644,8 @@ self: {
          base iteratee stm stm-chans transformers
        ];
        description = "Concurrent iteratees using STM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147959,8 +148662,8 @@ self: {
          transformers unix
        ];
        description = "Library for building servers with IterIO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147977,8 +148680,8 @@ self: {
        libraryHaskellDepends = [ base base64-bytestring bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Enable graphical display of images inline on some terminals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147992,8 +148695,8 @@ self: {
        editedCabalFile = "0pd14gfdpd12h1vlrk3dfg5vxlpd1jv2zi32nxic7p09wz59dkpk";
        libraryHaskellDepends = [ base iterm-show JuicyPixels ];
        description = "Orphan Show instances for JuciyPixels image types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148011,8 +148714,8 @@ self: {
          base diagrams-lib diagrams-rasterific iterm-show JuicyPixels
        ];
        description = "Orphan Show instances for diagrams package that render inline in some terminals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148029,7 +148732,7 @@ self: {
          alg base smallcheck tasty tasty-smallcheck
        ];
        description = "Intervals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ivar-simple" = callPackage
@@ -148040,7 +148743,7 @@ self: {
        sha256 = "0a8wm3jj5widp3awdsgl8jidxyhw97d9iijl65frwd9kjfzsc678";
        libraryHaskellDepends = [ base ];
        description = "Write once concurrency primitives";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ivor" = callPackage
@@ -148058,8 +148761,8 @@ self: {
          base binary containers directory haskell98 mtl parsec
        ];
        description = "Theorem proving library based on dependent type theory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148078,8 +148781,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148095,7 +148798,7 @@ self: {
          base directory filepath HStringTemplate text utf8-string
        ];
        description = "Manage additional data files during Ivory compilation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ivory-avr-atmega328p-registers" = callPackage
@@ -148108,8 +148811,8 @@ self: {
          base base-compat ivory ivory-hw monadLib
        ];
        description = "Ivory register bindings for the Atmega328p";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148130,8 +148833,8 @@ self: {
          process srcloc template-haskell
        ];
        description = "Ivory C backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148150,8 +148853,8 @@ self: {
        ];
        executableHaskellDepends = [ base ivory ivory-backend-c ];
        description = "Ivory bit-data support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148170,8 +148873,8 @@ self: {
          base base-compat containers ivory monadLib tasty tasty-hunit
        ];
        description = "Simple concrete evaluator for Ivory programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148194,8 +148897,8 @@ self: {
          monadLib pretty QuickCheck template-haskell
        ];
        description = "Ivory examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148208,8 +148911,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148226,8 +148929,8 @@ self: {
          monadLib pretty
        ];
        description = "Ivory compiler optimizations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148249,8 +148952,8 @@ self: {
          ivory-stdlib monadLib process QuickCheck tasty tasty-hunit
        ];
        description = "QuickCheck driver for Ivory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148267,8 +148970,8 @@ self: {
          base base-compat filepath ivory ivory-artifact monadLib
        ];
        description = "Serialization library for Ivory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148281,8 +148984,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148298,8 +149001,8 @@ self: {
          base invertible-syntax partial-isomorphisms snap snap-core
        ];
        description = "A lightweight web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148312,7 +149015,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ wirelesstools ];
        description = "Bindings for the iw C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) wirelesstools;};
 
   "ix" = callPackage
@@ -148331,7 +149034,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Indexed monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ix-shapable" = callPackage
@@ -148342,7 +149045,7 @@ self: {
        sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh";
        libraryHaskellDepends = [ array base ];
        description = "Reshape multi-dimensional arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ixdopp" = callPackage
@@ -148355,8 +149058,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base preprocessor-tools syb ];
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148370,8 +149073,8 @@ self: {
        editedCabalFile = "064bqv1i43car216ajjiq7j9vz2ha0rxhmpin83ajrchva1yd7sq";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148390,7 +149093,7 @@ self: {
          base Cabal containers HUnit QuickCheck random
        ];
        description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ixset-typed" = callPackage
@@ -148409,7 +149112,7 @@ self: {
          base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ixset-typed-binary-instance" = callPackage
@@ -148420,7 +149123,7 @@ self: {
        sha256 = "1jgqc1ys5pvfkha8pyddz5f01qsmv9a83xw0q75njk8zhqajlyvx";
        libraryHaskellDepends = [ base binary ixset-typed ];
        description = "Binary instance for ixset-typed";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ixset-typed-conversions" = callPackage
@@ -148436,7 +149139,7 @@ self: {
          zipper-extra
        ];
        description = "Conversions from ixset-typed to other containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ixset-typed-hashable-instance" = callPackage
@@ -148447,7 +149150,7 @@ self: {
        sha256 = "0bwajqlj1kpis2616lrmcymmag66fkmdrsrj0r3kf8j6090zxmyv";
        libraryHaskellDepends = [ base hashable ixset-typed ];
        description = "Hashable instance for ixset-typed";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ixshader" = callPackage
@@ -148463,8 +149166,8 @@ self: {
          template-haskell text
        ];
        description = "A shallow embedding of the OpenGL Shading Language in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148484,8 +149187,8 @@ self: {
          haskell98 hoauth mtl old-locale parsec time utf8-string xml
        ];
        description = "CLI (command line interface) to YQL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148494,15 +149197,13 @@ self: {
      }:
      mkDerivation {
        pname = "j";
-       version = "0.2.1.0";
-       sha256 = "1r2lldy35sfzqrd82v2fj113l10mhvllf4yxbkrfy0y7wv0c5v8n";
-       revision = "1";
-       editedCabalFile = "022ah42q1ba8ank33jn5r9h7fbs3579mlrk6ks8q7vbcm4rnalj0";
+       version = "0.2.1.1";
+       sha256 = "14mmqdkh73idqsxsvgvz5nfv7n0ashj35amawzy63zs80hfmqcf2";
        libraryHaskellDepends = [ base bytestring repa unix ];
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148523,8 +149224,8 @@ self: {
          strings syb transformers
        ];
        description = "j2hs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148536,7 +149237,7 @@ self: {
        sha256 = "1654hjzagmnaq3p9irjgdg0crgx01v2r3qnprb09a32xg4cf6xam";
        libraryHaskellDepends = [ base ];
        description = "Extra functions I require in base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jack" = callPackage
@@ -148569,8 +149270,8 @@ self: {
        libraryPkgconfigDepends = [ libjack2 ];
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libjack2;};
 
@@ -148582,8 +149283,8 @@ self: {
        sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd";
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148596,8 +149297,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base doctest ];
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148623,8 +149324,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Generate flamegraphs from Jaeger .json dumps.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148640,8 +149341,8 @@ self: {
          base containers directory monads-fd transformers
        ];
        description = "Jailed IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148655,8 +149356,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
        description = "Strip version restrictions from Cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "jalaali" = callPackage
@@ -148669,7 +149370,7 @@ self: {
        testHaskellDepends = [ base hspec time ];
        benchmarkHaskellDepends = [ base deepseq time ];
        description = "Jalaali calendar systems";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jalla" = callPackage
@@ -148692,7 +149393,7 @@ self: {
        ];
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
@@ -148713,7 +149414,7 @@ self: {
        ];
        executableHaskellDepends = [ base boxes directory filepath ];
        description = "Export sheet music and audio from Windows/Mac app Jammit";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "japanese-calendar" = callPackage
@@ -148725,7 +149426,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Data type of Japanese Calendar (Wareki)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "japanese-holidays" = callPackage
@@ -148738,7 +149439,7 @@ self: {
        testHaskellDepends = [ base doctest hspec time ];
        testToolDepends = [ hspec-discover ];
        description = "Japanese holidays utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jarfind" = callPackage
@@ -148759,7 +149460,7 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148781,8 +149482,8 @@ self: {
        ];
        doHaddock = false;
        description = "Jarification of Haskell sources";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148802,8 +149503,8 @@ self: {
        executableHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ aeson base bytestring text ];
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148820,7 +149521,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Create immutable algebraic data structures for Java";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "java-bridge" = callPackage
@@ -148843,8 +149544,8 @@ self: {
          named-records names split strings syb
        ];
        description = "Bindings to the JNI and a high level interface generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148856,8 +149557,8 @@ self: {
        sha256 = "0wjxm0h5xlsab7iphcabb66c7gjxy7hyb502inlj5zxq1ic5ghzv";
        libraryHaskellDepends = [ base java-bridge transformers ];
        description = "Utilities for working with the java-bridge package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148869,8 +149570,8 @@ self: {
        sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768";
        libraryHaskellDepends = [ base diet ];
        description = "Functions to simulate Java's Character class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148885,7 +149586,7 @@ self: {
        libraryHaskellDepends = [ base random-shuffle ];
        executableHaskellDepends = [ base ];
        description = "The etude of the Haskell programming";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "java-reflect" = callPackage
@@ -148896,8 +149597,8 @@ self: {
        sha256 = "1vdfq3c8chqhss6jiy139yrm45mij4kjdwxf2wrsfm4064j0n3wc";
        libraryHaskellDepends = [ base containers hx java-bridge ];
        description = "Tools for reflecting on Java classes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148919,7 +149620,7 @@ self: {
        ];
        description = "Java class files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "javascript-bridge" = callPackage
@@ -148940,8 +149641,8 @@ self: {
        executableHaskellDepends = [ base scotty text ];
        testHaskellDepends = [ aeson base scotty stm text time wai-extra ];
        description = "Remote Monad for JavaScript on the browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148962,7 +149663,7 @@ self: {
        ];
        executableHaskellDepends = [ base ghcjs-base-stub ];
        description = "Extra javascript functions when using GHCJS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "javasf" = callPackage
@@ -148982,8 +149683,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149000,8 +149701,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A utility to print the target version of Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149023,8 +149724,8 @@ self: {
          aeson-pretty base optparse-applicative text
        ];
        description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149040,8 +149741,8 @@ self: {
          aeson base bytestring http-conduit text transformers
        ];
        description = "JCDecaux self-service bicycles API client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149060,8 +149761,8 @@ self: {
        ];
        executableHaskellDepends = [ base mtl network ];
        description = "Implementation of Java Debug Interface";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149083,8 +149784,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate a cabal freeze file from a stack.yaml";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149108,8 +149809,8 @@ self: {
        ];
        testHaskellDepends = [ base containers tasty-hspec text ];
        description = "Generate nix for Jenkins plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149139,8 +149840,8 @@ self: {
          transformers
        ];
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149163,8 +149864,8 @@ self: {
          quantities regex-compat
        ];
        description = "Unit conversion and manipulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149180,7 +149881,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base parsec tasty tasty-hunit text ];
        description = "Handle Jira wiki markup";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jmacro" = callPackage
@@ -149206,8 +149907,8 @@ self: {
          unordered-containers vector wl-pprint-text
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149226,8 +149927,8 @@ self: {
          vector
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149244,8 +149945,8 @@ self: {
          jmacro-rpc mtl
        ];
        description = "Happstack backend for jmacro-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149261,8 +149962,8 @@ self: {
          aeson base bytestring containers jmacro jmacro-rpc mtl snap-core
        ];
        description = "Snap backend for jmacro-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149283,8 +149984,8 @@ self: {
        ];
        testHaskellDepends = [ base protolude tasty ];
        description = "Common utilities for running a web service";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149297,8 +149998,8 @@ self: {
        libraryHaskellDepends = [ base casing free jmacro ];
        testHaskellDepends = [ base casing free jmacro ];
        description = "Jmonkey is very restricted but handy EDSL for JavaScript";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149319,8 +150020,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base hspec singletons ];
        description = "Complete JNI raw bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) jdk;};
 
@@ -149346,8 +150047,8 @@ self: {
          QuickCheck stm
        ];
        description = "A job queue library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149368,8 +150069,8 @@ self: {
          time transformers warp
        ];
        description = "A library for creating a jobs management website running custom jobs";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149382,8 +150083,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        description = "Parallel Join Patterns with Guards and Propagation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149397,8 +150098,8 @@ self: {
          aeson base bytestring lens text url wreq
        ];
        description = "Bindings for Join push notifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149410,8 +150111,8 @@ self: {
        sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35";
        libraryHaskellDepends = [ base ];
        description = "Join list - symmetric list type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149427,7 +150128,7 @@ self: {
          adjunctions base comonad distributive transformers
        ];
        description = "Trying to compose non-composable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jonathanscard" = callPackage
@@ -149442,8 +150143,8 @@ self: {
          base bytestring containers HTTP json mtl network old-locale time
        ];
        description = "An implementation of the Jonathan's Card API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149462,7 +150163,7 @@ self: {
        testHaskellDepends = [ base hspec HUnit markdown-unlit ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Geographical Position Calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jort" = callPackage
@@ -149476,7 +150177,7 @@ self: {
        executableHaskellDepends = [ array base gtk ];
        description = "JP's own ray tracer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jose" = callPackage
@@ -149506,7 +150207,7 @@ self: {
          vector x509
        ];
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "jose-jwt" = callPackage
@@ -149530,7 +150231,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
        description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jot" = callPackage
@@ -149548,8 +150249,8 @@ self: {
          yaml
        ];
        description = "Tiny markdown notebook";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149561,8 +150262,8 @@ self: {
        sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx";
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149574,7 +150275,7 @@ self: {
        sha256 = "0k31r994cw1w79v2zqkj64jhbfyym1j96vawvqc5pvw2mjk1f5in";
        libraryHaskellDepends = [ base containers fingertree lens vector ];
        description = "Jump point search for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "js-chart" = callPackage
@@ -149587,7 +150288,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Obtain minified chart.js code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "js-dgtable" = callPackage
@@ -149600,7 +150301,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Obtain minified jquery.dgtable code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "js-flot" = callPackage
@@ -149613,7 +150314,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        description = "Obtain minified flot code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "js-good-parts" = callPackage
@@ -149624,8 +150325,8 @@ self: {
        sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75";
        libraryHaskellDepends = [ base wl-pprint ];
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149640,7 +150341,7 @@ self: {
        testHaskellDepends = [ base HTTP ];
        doCheck = false;
        description = "Obtain minified jQuery code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle" = callPackage
@@ -149661,7 +150362,7 @@ self: {
          transformers unliftio-core unordered-containers vector
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-clib" = callPackage
@@ -149676,7 +150377,7 @@ self: {
          aeson base base-compat bytestring data-default jsaddle text
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-dom" = callPackage
@@ -149692,7 +150393,7 @@ self: {
          base base-compat exceptions jsaddle lens text transformers
        ];
        description = "DOM library that uses jsaddle to support both GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-hello" = callPackage
@@ -149705,8 +150406,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base jsaddle lens text ];
        description = "JSaddle Hello World, an example package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149733,7 +150434,7 @@ self: {
          websockets
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-webkit2gtk" = callPackage
@@ -149752,8 +150453,8 @@ self: {
          jsaddle text unix webkit2gtk3-javascriptcore
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jsaddle-webkitgtk" = callPackage
@@ -149771,8 +150472,8 @@ self: {
          webkitgtk3-javascriptcore
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jsaddle-wkwebview" = callPackage
@@ -149788,8 +150489,8 @@ self: {
          text
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149806,8 +150507,8 @@ self: {
          webkitgtk3-javascriptcore
        ];
        description = "High level interface for webkit-javascriptcore";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jsmw" = callPackage
@@ -149818,8 +150519,8 @@ self: {
        sha256 = "1r36w2h5007qln56gnyyd7w6bcqiymn1jw287z0waf4fhpy02ygq";
        libraryHaskellDepends = [ base DOM mtl WebBits ];
        description = "Javascript Monadic Writer base package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149837,7 +150538,7 @@ self: {
          array base bytestring containers mtl parsec pretty syb text
        ];
        description = "Support for serialising Haskell to and from JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-alt" = callPackage
@@ -149848,8 +150549,8 @@ self: {
        sha256 = "1ivmbm5gw362vlss1w5s2z7byrzxdh8z1qdfsh0xmywkvwx56l5q";
        libraryHaskellDepends = [ aeson base ];
        description = "Union 'alternative' or Either that has untagged JSON encoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149871,7 +150572,7 @@ self: {
          lens lens-aeson text unordered-containers url
        ];
        description = "Utilities for generating JSON-API payloads";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-api-lib" = callPackage
@@ -149895,7 +150596,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Utilities for generating JSON-API payloads";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-assertions" = callPackage
@@ -149910,8 +150611,8 @@ self: {
          aeson base indexed indexed-free lens lens-aeson text
        ];
        description = "Test that your (Aeson) JSON encoding matches your expectations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149927,7 +150628,7 @@ self: {
          base scientific text unordered-containers vector
        ];
        description = "Universal JSON AST datastructure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-ast-json-encoder" = callPackage
@@ -149944,8 +150645,8 @@ self: {
          json-encoder scientific text unordered-containers vector
        ];
        description = "Encoders of JSON AST";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149960,8 +150661,8 @@ self: {
          base json-ast QuickCheck quickcheck-instances
        ];
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149996,8 +150697,8 @@ self: {
          unordered-containers vector
        ];
        description = "Automatic type declaration for JSON input data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150020,8 +150721,8 @@ self: {
          bytestringparser-temporary containers utf8-string
        ];
        description = "JSON parser that uses byte strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150040,8 +150741,8 @@ self: {
          unordered-containers utf8-string vector
        ];
        description = "Data structure agnostic JSON serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150057,7 +150758,7 @@ self: {
        testHaskellDepends = [ base-prelude bytestring text ];
        benchmarkHaskellDepends = [ aeson criterion rebase ];
        description = "Direct-to-bytes JSON Builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-directory" = callPackage
@@ -150079,8 +150780,8 @@ self: {
          aeson base bytestring filepath mtl process text
        ];
        description = "Load JSON from files in a directory structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150098,8 +150799,8 @@ self: {
          contravariant-extras scientific semigroups text
        ];
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150117,8 +150818,8 @@ self: {
          enumerator json-types text transformers
        ];
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150135,8 +150836,8 @@ self: {
          unordered-containers yaml
        ];
        description = "Utility functions to extend Aeson";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150153,7 +150854,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring filepath hspec ];
        description = "JSON Feed";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-fu" = callPackage
@@ -150174,8 +150875,8 @@ self: {
          text time unordered-containers vector
        ];
        description = "Generic JSON serialization / deserialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150200,8 +150901,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Incremental JSON parser with early termination and a declarative DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150214,8 +150915,8 @@ self: {
        libraryHaskellDepends = [ base json ];
        testHaskellDepends = [ base hspec json QuickCheck ];
        description = "Extends Text.JSON to handle literal JS objects.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150229,7 +150930,7 @@ self: {
        editedCabalFile = "0bs7fa02jjq9r7bn3vlwn4xq93yllj62h3bb5g2lsihx1svk7lkn";
        libraryHaskellDepends = [ attoparsec base base-prelude text ];
        description = "JSON Pointer parsing and interpretation utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-pointer-aeson" = callPackage
@@ -150244,7 +150945,7 @@ self: {
          aeson base-prelude json-pointer unordered-containers vector
        ];
        description = "Integration layer for \"json-pointer\" and \"aeson\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-pointer-hasql" = callPackage
@@ -150260,8 +150961,8 @@ self: {
          aeson either hasql json-pointer rebase transformers
        ];
        description = "JSON Pointer extensions for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150286,7 +150987,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "JSON Pointer (RFC 6901) parsing, access, and modification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-python" = callPackage
@@ -150302,8 +151003,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python;};
 
@@ -150321,7 +151022,7 @@ self: {
        ];
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "json-rpc" = callPackage
@@ -150352,7 +151053,7 @@ self: {
          vector
        ];
        description = "Fully-featured JSON-RPC 2.0 library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-rpc-client" = callPackage
@@ -150379,8 +151080,8 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "JSON-RPC 2.0 on the client side.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150401,7 +151102,7 @@ self: {
          aeson base QuickCheck quickcheck-simple text
        ];
        description = "Generic encoder and decode for JSON-RPC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-rpc-server" = callPackage
@@ -150425,7 +151126,7 @@ self: {
          text unordered-containers vector
        ];
        description = "JSON-RPC 2.0 on the server side.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-schema" = callPackage
@@ -150450,8 +151151,8 @@ self: {
          generic-aeson tasty tasty-hunit tasty-th text vector
        ];
        description = "Types and type classes for defining JSON schemas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150468,8 +151169,8 @@ self: {
          unordered-containers vector
        ];
        description = "Generics JSON (de)serialization using generics-sop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150485,7 +151186,7 @@ self: {
          aeson aeson-pretty base bytestring libgit time-units
        ];
        description = "Keep program state in JSON files";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "json-stream" = callPackage
@@ -150505,7 +151206,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "Incremental applicative JSON parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-syntax" = callPackage
@@ -150533,8 +151234,8 @@ self: {
          primitive scientific-notation text
        ];
        description = "High-performance JSON parser and encoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150566,7 +151267,7 @@ self: {
          microlens-platform mtl nonempty-containers raw-strings-qq
          recursion-schemes text unordered-containers vector
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-togo" = callPackage
@@ -150583,8 +151284,8 @@ self: {
          transformers unordered-containers vector
        ];
        description = "Effectful parsing of JSON documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150612,8 +151313,8 @@ self: {
          scientific-notation text
        ];
        description = "Tokenize JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150633,8 +151334,8 @@ self: {
          scientific string-conversions tar text unordered-containers vector
        ];
        description = "A collection of JSON tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150658,8 +151359,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150671,7 +151372,7 @@ self: {
        sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn";
        libraryHaskellDepends = [ base containers text ];
        description = "Basic types for representing JSON";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json2" = callPackage
@@ -150687,8 +151388,8 @@ self: {
          parsec pretty time utf8-string
        ];
        description = "Library provides support for JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150704,8 +151405,8 @@ self: {
          base containers HDBC json2 json2-types time utf8-string
        ];
        description = "Support JSON for SQL Database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150717,7 +151418,7 @@ self: {
        sha256 = "0gr5mfi68hvk8wajw6wbimmwxd0rgjwqrg3mjyfppkr1nwkyfzpr";
        libraryHaskellDepends = [ base containers ];
        description = "Defined JSON data types and function for renders JSON to string";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json2yaml" = callPackage
@@ -150730,7 +151431,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ aeson base bytestring yaml ];
        description = "Utility to convert a file from JSON to YAML format. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json5hs" = callPackage
@@ -150745,7 +151446,7 @@ self: {
          array base bytestring containers mtl pretty syb text
        ];
        description = "Serialising to and from JSON5";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jsonextfilter" = callPackage
@@ -150765,8 +151466,8 @@ self: {
          unordered-containers vector
        ];
        description = "Filter select values in JSON objects to unix programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150777,8 +151478,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonifier";
-       version = "0.1.0.5";
-       sha256 = "0qx296dnhb7gdf1zybs20pa0fgi2zz6wbb4x9kcr31p7z51hd07v";
+       version = "0.1.0.6";
+       sha256 = "0yhczdq3m79xbg04hcahl2c75kipm5szahr7bmj8xjml4zxzd3bk";
        libraryHaskellDepends = [
          base bytestring ptr-poker scientific text
        ];
@@ -150787,8 +151488,8 @@ self: {
          aeson buffer-builder gauge rerebase text-builder
        ];
        description = "Fast and simple JSON encoding toolkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150810,7 +151511,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Library to parse and execute JSONPath";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jsonresume" = callPackage
@@ -150825,8 +151526,8 @@ self: {
          aeson base bytestring old-locale text time unordered-containers
        ];
        description = "Parser and datatypes for the JSON Resume format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150847,8 +151548,8 @@ self: {
          aeson base bytestring conduit conduit-extra hspec text
        ];
        description = "JSON-RPC 2.0 server over a Conduit.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150880,8 +151581,8 @@ self: {
          scientific text uniplate unordered-containers vector
        ];
        description = "JSON to JSON Schema";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150903,8 +151604,8 @@ self: {
          aeson base bytestring containers process tagged text
        ];
        description = "JSON Schema generator from Algebraic data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150925,8 +151626,8 @@ self: {
          vector
        ];
        description = "Interpolate JSON object values into SQL strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150947,8 +151648,8 @@ self: {
          vector
        ];
        description = "JSON to TSV transformer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150969,8 +151670,8 @@ self: {
          unordered-containers vector xlsx
        ];
        description = "json to xlsx converter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150995,7 +151696,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Cherry picking in JSON objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jspath" = callPackage
@@ -151010,8 +151711,8 @@ self: {
          base bytestring bytestring-trie JSONb utf8-string
        ];
        description = "Extract substructures from JSON by following a path";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151036,8 +151737,8 @@ self: {
          wai-middleware-static warp
        ];
        description = "Manage users in MariaDB >= 10.1.1";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151064,8 +151765,8 @@ self: {
          optparse-applicative text unordered-containers yaml
        ];
        description = "Tableau-based theorem prover for justification logic";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151081,8 +151782,8 @@ self: {
        librarySystemDepends = [ Judy ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Judy = null;};
 
@@ -151099,7 +151800,7 @@ self: {
        ];
        executableHaskellDepends = [ base JuicyPixels ];
        description = "Draw and fill lines, rectangles and polygons";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "juicy-gcode" = callPackage
@@ -151117,7 +151818,7 @@ self: {
          svg-tree text
        ];
        description = "SVG to G-Code converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jukebox" = callPackage
@@ -151138,7 +151839,7 @@ self: {
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base ];
        description = "A first-order reasoning toolbox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jump" = callPackage
@@ -151150,7 +151851,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base criterion hspec ];
        description = "Nothing to see here, move along";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jumpthefive" = callPackage
@@ -151164,7 +151865,7 @@ self: {
        libraryHaskellDepends = [ base parallel ];
        executableHaskellDepends = [ base parallel ];
        description = "an elementary symmetric chiffre for pragmatically protecting one's effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "junit-xml" = callPackage
@@ -151177,7 +151878,7 @@ self: {
        libraryHaskellDepends = [ base text xml-conduit ];
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Producing JUnit-style XML test reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jupyter" = callPackage
@@ -151204,8 +151905,8 @@ self: {
          unordered-containers zeromq4-haskell
        ];
        description = "A library for creating and using Jupyter kernels";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151222,7 +151923,7 @@ self: {
          base containers ghc-prim hspec QuickCheck should-not-typecheck
        ];
        description = "Keyed container types with type-checked proofs of key presence";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "jvm" = callPackage
@@ -151245,8 +151946,8 @@ self: {
          base criterion deepseq jni singletons text
        ];
        description = "Call JVM methods from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151271,8 +151972,8 @@ self: {
          base criterion deepseq jvm split vector
        ];
        description = "Provides batched marshalling of values between Java and Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151305,8 +152006,8 @@ self: {
          text vector
        ];
        description = "A library for reading Java class-files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151323,8 +152024,8 @@ self: {
          fingertree pretty zlib
        ];
        description = "A parser for JVM bytecode files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151349,8 +152050,8 @@ self: {
          base criterion deepseq jvm streaming text vector
        ];
        description = "Expose Java iterators as streams from the streaming package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151379,7 +152080,7 @@ self: {
          unordered-containers vector x509 x509-store
        ];
        description = "JSON Web Token (JWT) decoding and encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "kademlia" = callPackage
@@ -151400,8 +152101,8 @@ self: {
          tasty-hunit tasty-quickcheck transformers transformers-compat
        ];
        description = "An implementation of the Kademlia DHT Protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151413,7 +152114,7 @@ self: {
        sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kafka-client" = callPackage
@@ -151432,8 +152133,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151448,8 +152149,8 @@ self: {
        libraryHaskellDepends = [ base containers hw-kafka-client ];
        testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
        description = "Synchronous Kafka Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151470,8 +152171,8 @@ self: {
          aeson base binary bytestring cereal linear milena mtl
        ];
        description = "UI device events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151486,8 +152187,8 @@ self: {
        libraryHaskellDepends = [ base GLUT kafka-device OpenGL ];
        executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
        description = "GLUT events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151508,8 +152209,8 @@ self: {
          aeson base binary bytestring cereal kafka-device yaml
        ];
        description = "Linux joystick events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151528,8 +152229,8 @@ self: {
          aeson base hleap kafka-device websockets
        ];
        description = "Leap Motion events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151550,8 +152251,8 @@ self: {
          aeson base binary bytestring cereal kafka-device yaml
        ];
        description = "Linux SpaceNavigator events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151566,8 +152267,8 @@ self: {
        libraryHaskellDepends = [ base kafka-device vrpn ];
        executableHaskellDepends = [ base kafka-device vrpn ];
        description = "VRPN events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151590,8 +152291,8 @@ self: {
        ];
        doHaddock = false;
        description = "Haskell Kaleidoscope tutorial";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151611,8 +152312,8 @@ self: {
          random-fu-multivariate
        ];
        description = "Kalman and particle filters and smoothers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151631,7 +152332,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kangaroo" = callPackage
@@ -151642,8 +152343,8 @@ self: {
        sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x";
        libraryHaskellDepends = [ array base ];
        description = "Binary parsing with random access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151670,7 +152371,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ aeson base containers criterion text ];
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kansas-comet" = callPackage
@@ -151689,7 +152390,7 @@ self: {
          transformers unordered-containers
        ];
        description = "A JavaScript push mechanism based on the comet idiom";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kansas-lava" = callPackage
@@ -151711,8 +152412,8 @@ self: {
          sized-types strict template-haskell
        ];
        description = "Kansas Lava is a hardware simulator and VHDL generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151732,8 +152433,8 @@ self: {
          kansas-lava network sized-types
        ];
        description = "FPGA Cores Written in Kansas Lava";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151752,8 +152453,8 @@ self: {
          kansas-lava kansas-lava-cores netlist network sized-types
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151770,8 +152471,8 @@ self: {
          base containers kansas-lava mustache shake text vector
        ];
        description = "Shake rules for building Kansas Lava projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151787,8 +152488,8 @@ self: {
          base comonad containers minioperational mtl transformers
        ];
        description = "Good stateful automata";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151816,8 +152517,8 @@ self: {
          raw-strings-qq text vector
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151836,7 +152537,7 @@ self: {
          aeson attoparsec base hspec text unordered-containers vector
        ];
        description = "A simple template engine, inspired by jinja2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip" = callPackage
@@ -151871,7 +152572,7 @@ self: {
          safe-exceptions text time transformers unix
        ];
        description = "A structured logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip-datadog" = callPackage
@@ -151893,7 +152594,7 @@ self: {
          safe-exceptions tasty tasty-hunit text unordered-containers
        ];
        description = "Datadog scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip-elasticsearch" = callPackage
@@ -151924,8 +152625,8 @@ self: {
          unordered-containers uuid
        ];
        description = "ElasticSearch scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151939,8 +152640,8 @@ self: {
          aeson base bytestring hw-kafka-client katip
        ];
        description = "Katip scribe to send logs to Kafka";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151957,7 +152658,7 @@ self: {
          unliftio
        ];
        description = "Logstash backend for katip";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "katip-logzio" = callPackage
@@ -151983,7 +152684,7 @@ self: {
          uri-bytestring vector warp
        ];
        description = "Logz.IO scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip-raven" = callPackage
@@ -151999,7 +152700,9 @@ self: {
          unordered-containers
        ];
        description = "Katip scribe for raven (https://sentry.io)";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-rollbar" = callPackage
@@ -152015,8 +152718,8 @@ self: {
          text time
        ];
        description = "Katip scribe that logs to Rollbar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152035,8 +152738,8 @@ self: {
          aeson base katip scientific text unordered-containers
        ];
        description = "A katip scribe for logging to json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152053,8 +152756,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Syslog Katip Scribe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152076,8 +152779,8 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        testHaskellDepends = [ base bytestring directory mtl ];
        description = "Client for the Kattis judge system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152111,8 +152814,8 @@ self: {
          filepath hxt ilist json mtl parsec regex-tdfa text transformers
        ];
        description = "A haskell implementation of Katydid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152134,7 +152837,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog text unordered-containers ];
        description = "Key-value store in single files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kawaii" = callPackage
@@ -152159,8 +152862,8 @@ self: {
          warp warp-tls
        ];
        description = "Utilities for serving static sites and blogs with Wai/Warp";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152183,8 +152886,8 @@ self: {
          tasty-smallcheck text
        ];
        description = "stats.NBA.com library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152207,7 +152910,7 @@ self: {
          atomic-primops base criterion primitive stm
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kbq-gu" = callPackage
@@ -152239,8 +152942,8 @@ self: {
        ];
        testHaskellDepends = [ base kcd-parser tasty tasty-hunit ];
        description = "Kayak .kcd parsing library.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {kcd-parser = null;};
 
@@ -152254,8 +152957,8 @@ self: {
          base lens linear vector vector-algorithms
        ];
        description = "A simple k-d tree implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152274,8 +152977,8 @@ self: {
          process
        ];
        description = "Build profiles for kdesrc-build";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152294,7 +152997,7 @@ self: {
          process
        ];
        description = "Build profiles for kdesrc-build";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "kdt" = callPackage
@@ -152312,7 +153015,7 @@ self: {
          MonadRandom QuickCheck
        ];
        description = "Fast and flexible k-d trees for various types of point queries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "keccak" = callPackage
@@ -152338,8 +153041,8 @@ self: {
          base bytestring cryptonite gauge memory
        ];
        description = "cryptographic functions based on the sponge construction";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152367,7 +153070,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keep-alive" = callPackage
@@ -152379,7 +153082,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "TCP keep alive implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-callbacks" = callPackage
@@ -152390,7 +153093,7 @@ self: {
        sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq";
        libraryHaskellDepends = [ base mtl ];
        description = "Mutable memory locations with callbacks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-i18n" = callPackage
@@ -152406,8 +153109,8 @@ self: {
          utf8-string
        ];
        description = "Rapid Gtk Application Development - I18N";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152419,7 +153122,7 @@ self: {
        sha256 = "1j7vhkghdh4hrap7g2xshpd2fw3acgwvi68f2c01mqmfi5dl4z2n";
        libraryHaskellDepends = [ base ];
        description = "Haskell on Gtk rails - Gtk-based controller for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-mvc-environment-gtk" = callPackage
@@ -152435,8 +153138,8 @@ self: {
          keera-hails-mvc-view-gtk
        ];
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152453,8 +153156,8 @@ self: {
          template-haskell
        ];
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152471,8 +153174,8 @@ self: {
          template-haskell
        ];
        description = "Rapid Gtk Application Development - Protected Reactive Models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152484,7 +153187,7 @@ self: {
        sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1";
        libraryHaskellDepends = [ base directory filepath MissingK ];
        description = "Haskell on Gtk rails - Easy handling of configuration files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-mvc-solutions-gtk" = callPackage
@@ -152505,8 +153208,8 @@ self: {
          network network-uri template-haskell
        ];
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152518,7 +153221,7 @@ self: {
        sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p";
        libraryHaskellDepends = [ base ];
        description = "Haskell on Gtk rails - Generic View for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-mvc-view-gtk" = callPackage
@@ -152531,7 +153234,7 @@ self: {
          base gtk gtk-helpers keera-hails-mvc-view
        ];
        description = "Haskell on Gtk rails - Gtk-based View for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-reactive-cbmvar" = callPackage
@@ -152549,8 +153252,8 @@ self: {
          base directory filepath hlint process regex-posix
        ];
        description = "Reactive Haskell on Rails - CBMVars as reactive values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152566,8 +153269,8 @@ self: {
          base directory fsnotify keera-hails-reactivevalues system-filepath
        ];
        description = "Haskell on Rails - Files as Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152584,8 +153287,8 @@ self: {
          keera-hails-reactivevalues mtl transformers
        ];
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152603,8 +153306,8 @@ self: {
          keera-hails-reactivevalues mtl transformers
        ];
        description = "Keera Hails Reactive bindings for HTML DOM via GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152620,8 +153323,8 @@ self: {
          base bytestring keera-hails-reactivevalues network network-bsd
        ];
        description = "Haskell on Rails - Sockets as Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152636,8 +153339,8 @@ self: {
          base keera-callbacks keera-hails-reactivevalues
        ];
        description = "Haskell on Rails - Polling based Readable RVs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152651,8 +153354,8 @@ self: {
          base keera-hails-reactivevalues wx wxcore
        ];
        description = "Haskell on Rails - Reactive Fields for WX widgets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152668,8 +153371,8 @@ self: {
          base keera-callbacks keera-hails-reactivevalues time Yampa
        ];
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152681,8 +153384,8 @@ self: {
        sha256 = "1c72sc68wqvsxhjr7y16k7iw784swk8wfp2j7xw0y0ggdjlamn0x";
        libraryHaskellDepends = [ base keera-hails-reactivevalues lens ];
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152702,8 +153405,8 @@ self: {
        ];
        testToolDepends = [ cabal-install ];
        description = "Haskell on Rails - Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152739,7 +153442,7 @@ self: {
        executableSystemDepends = [ SDL_mixer ];
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) SDL_mixer;};
 
   "keiretsu" = callPackage
@@ -152761,7 +153464,7 @@ self: {
        ];
        description = "Multi-process orchestration for development and integration testing";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "kempe" = callPackage
@@ -152772,8 +153475,8 @@ self: {
      }:
      mkDerivation {
        pname = "kempe";
-       version = "0.1.1.1";
-       sha256 = "0mianbsn02vzbb0fr6pgxsij0jrpnhmbah9n2fcl3fj9xzcb6ac7";
+       version = "0.1.1.2";
+       sha256 = "1nmmka06zin3i4y30510c56yk3vjxvnndfb38w4v557xr94rirkd";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -152795,8 +153498,8 @@ self: {
        ];
        doHaddock = false;
        description = "Kempe compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152819,8 +153522,8 @@ self: {
          mtl process resourcet temporary-resourcet text transformers
        ];
        description = "Manage and abstract your packer configurations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152842,7 +153545,7 @@ self: {
          QuickCheck temporary
        ];
        description = "Haskell implementation of nix-hash";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "keter" = callPackage
@@ -152875,8 +153578,8 @@ self: {
          base bytestring conduit hspec HUnit transformers unix
        ];
        description = "Web application deployment manager, focusing on Haskell web frameworks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152898,7 +153601,7 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152910,7 +153613,7 @@ self: {
        sha256 = "18wgalv0hr5ndr7mbywr7ilyc504kzf28xyymmkj1fm66wb93n4k";
        libraryHaskellDepends = [ base transformers ];
        description = "Type-safe unconstrained dynamic typing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "key-state" = callPackage
@@ -152922,7 +153625,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Manage key and button states and statuses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "key-vault" = callPackage
@@ -152936,7 +153639,7 @@ self: {
          base base-unicode-symbols containers key util
        ];
        description = "Store of values of arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keycloak-hs" = callPackage
@@ -152959,7 +153662,7 @@ self: {
          unordered-containers word8 wreq
        ];
        executableHaskellDepends = [ base hslogger ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keycode" = callPackage
@@ -152974,7 +153677,7 @@ self: {
          base containers ghc-prim template-haskell
        ];
        description = "Maps web browser keycodes to their corresponding keyboard keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keyed" = callPackage
@@ -152985,8 +153688,8 @@ self: {
        sha256 = "0q53nv4babmvj1nzc2my3d88aqm8yxl10rd396y62z7412jvnp5q";
        libraryHaskellDepends = [ base containers vector ];
        description = "Generic indexing for many data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152998,7 +153701,7 @@ self: {
        sha256 = "0hf7lmx8bgl5lh1i71x56nfbgnp8xrqfza3s5acq9i16g21ri292";
        libraryHaskellDepends = [ base bytestring containers text xeno ];
        description = "Tools for macOS .keylayout files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "keyring" = callPackage
@@ -153011,8 +153714,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
        description = "Keyring access";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153031,7 +153734,7 @@ self: {
          unordered-containers
        ];
        description = "Keyed functors and containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keysafe" = callPackage
@@ -153060,8 +153763,8 @@ self: {
          unix unix-compat utf8-string wai warp zxcvbn-c
        ];
        description = "back up a secret key securely to the cloud";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153093,8 +153796,8 @@ self: {
          unordered-containers
        ];
        description = "Managing stores of secret things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153111,8 +153814,8 @@ self: {
          mmap storable-record
        ];
        description = "Pure Haskell key/value store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153134,8 +153837,8 @@ self: {
          base containers hspec parsec parseerror-eq
        ];
        description = "Extract data from a keyword-args config file format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153155,8 +153858,8 @@ self: {
          parsec text transformers unix unordered-containers yaml
        ];
        description = "Command-line file tagging and organization tool";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153169,8 +153872,8 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ base stm ];
        description = "A lightweight, structured-concurrency library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153182,7 +153885,7 @@ self: {
        sha256 = "0yfyx4jyz0n3p2w6pca3nxc72s01240n3siy5sx883ldz706adls";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kicad-data" = callPackage
@@ -153203,8 +153906,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Parser and writer for KiCad files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153222,8 +153925,8 @@ self: {
          vector
        ];
        description = "Parses kat.ph torrent dumps";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153242,8 +153945,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "Kick Channels: bounded channels with non-blocking writes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153262,8 +153965,8 @@ self: {
          base bytestring cmdargs hostname old-time parsec twine
        ];
        description = "Process KIF iOS test logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153275,7 +153978,7 @@ self: {
        sha256 = "0wq0jfi8jdah6mwc6amrfjs5ld0bz86y53va9sm0hzvpiyb4bpcq";
        libraryHaskellDepends = [ base ];
        description = "Utilities to work with lists of types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kind-generics" = callPackage
@@ -153286,7 +153989,7 @@ self: {
        sha256 = "1ldfi5rvs3mxlbpy0nfyx8mq58xjkk76c13fmvmgqcpgb8gvmrnx";
        libraryHaskellDepends = [ base kind-apply ];
        description = "Generic programming in GHC style for arbitrary kinds and GADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kind-generics-th" = callPackage
@@ -153302,7 +154005,7 @@ self: {
        ];
        testHaskellDepends = [ base kind-generics template-haskell ];
        description = "Template Haskell support for generating `GenericK` instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kinds" = callPackage
@@ -153313,7 +154016,7 @@ self: {
        sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5";
        libraryHaskellDepends = [ base ];
        description = "Emulation of subkinds and subkind polymorphism";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kit" = callPackage
@@ -153333,8 +154036,8 @@ self: {
          unordered-containers yaml
        ];
        description = "A dependency manager for Xcode (Objective-C) projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153356,7 +154059,9 @@ self: {
          step-function text transformers
        ];
        description = "Kleene algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "kleene-list" = callPackage
@@ -153373,7 +154078,7 @@ self: {
          base base-compat deepseq doctest QuickCheck template-haskell
        ];
        description = "A list type based on the Kleene star and plus";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "kmeans" = callPackage
@@ -153384,7 +154089,7 @@ self: {
        sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix";
        libraryHaskellDepends = [ base ];
        description = "K-means clustering algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kmeans-par" = callPackage
@@ -153405,8 +154110,8 @@ self: {
          base criterion deepseq metric normaldistribution random vector
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153423,8 +154128,8 @@ self: {
        executableHaskellDepends = [ base probable vector ];
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153444,8 +154149,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Advanced keyboard remapping utility";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153458,8 +154163,8 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        testHaskellDepends = [ array base QuickCheck ];
        description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153481,8 +154186,8 @@ self: {
          base comfort-array llvm-extra llvm-tf QuickCheck tfp utility-ht
        ];
        description = "Repa-like array processing using LLVM JIT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153496,8 +154201,8 @@ self: {
          base knead llvm-extra llvm-tf utility-ht
        ];
        description = "Linear algebra and interpolation using LLVM JIT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153515,7 +154220,7 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Ties the knot on data structures that reference each other by unique keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "knit-haskell" = callPackage
@@ -153549,8 +154254,8 @@ self: {
          random-source store streamly text
        ];
        description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153562,7 +154267,7 @@ self: {
        sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Memory-backed handles";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "knots" = callPackage
@@ -153580,8 +154285,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers parallel ];
        description = "Khovanov homology computations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153595,8 +154300,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153613,8 +154318,8 @@ self: {
          unjson utf8-string yaml
        ];
        description = "JSON config file parsing based on unjson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153632,7 +154337,7 @@ self: {
          monad-control mtl time transformers transformers-base
        ];
        description = "Utilities for working with many HStringTemplate templates from files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "koofr-client" = callPackage
@@ -153650,7 +154355,7 @@ self: {
          http-types mtl
        ];
        description = "Client to Koofr API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "korea-holidays" = callPackage
@@ -153669,7 +154374,7 @@ self: {
          aeson base hspec monad-extras split template-haskell time yaml
        ];
        description = "Korea Holidays";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "korfu" = callPackage
@@ -153685,7 +154390,7 @@ self: {
        ];
        description = "The Korfu ORF Utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153701,8 +154406,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath mtl time unix ];
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153720,8 +154425,8 @@ self: {
          aeson base bytestring http-client http-client-tls mtl
        ];
        description = "Kraken.io API client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153752,8 +154457,8 @@ self: {
          PyF req safe-exceptions text unordered-containers
        ];
        description = "Krank checks your code source comments for important markers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153779,8 +154484,8 @@ self: {
          raw-strings-qq text vector
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153806,8 +154511,8 @@ self: {
          base bytestring criterion monad-logger mtl
        ];
        description = "KRPC protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153819,8 +154524,8 @@ self: {
        sha256 = "1xj9bnwiws3rnax3rlf67p8dh487w07xl99h81a9j1wjkqysldym";
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153832,7 +154537,7 @@ self: {
        sha256 = "0lvdb3z73nm5csnrvjd3dvzxm411ns8wz07wcpaxqk26szc5igv1";
        libraryHaskellDepends = [ base directory ];
        description = "System management tooling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ktx" = callPackage
@@ -153844,8 +154549,8 @@ self: {
        libraryHaskellDepends = [ base bytestring OpenGL ];
        libraryPkgconfigDepends = [ egl glew ];
        description = "A binding for libktx from Khronos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {egl = null; inherit (pkgs) glew;};
 
@@ -153855,8 +154560,8 @@ self: {
      }:
      mkDerivation {
        pname = "ktx-codec";
-       version = "0.0.1.1";
-       sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0";
+       version = "0.0.1.2";
+       sha256 = "14vv1c7n8ms2y18ks08i5hr09av9y2gn677rki4swfdhgy3zamcp";
        libraryHaskellDepends = [
          base binary bytestring containers text vector
        ];
@@ -153865,8 +154570,8 @@ self: {
          vector
        ];
        description = "Khronos texture format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153902,8 +154607,8 @@ self: {
          x509-validation yaml
        ];
        description = "Client library for Kubernetes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153931,8 +154636,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated kubernetes-client-core API Client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153949,7 +154654,7 @@ self: {
          unordered-containers
        ];
        description = "Create Kubernetes Admission Webhooks in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "kuifje" = callPackage
@@ -153960,8 +154665,8 @@ self: {
        sha256 = "0f7ldw506g4r6f7s803iwq49syfl1zmxdyyr62arbzg6h5qg81j7";
        libraryHaskellDepends = [ base boxes containers lens ];
        description = "A Quantitative Information Flow aware programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153975,8 +154680,8 @@ self: {
        editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3";
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153988,8 +154693,8 @@ self: {
        sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b";
        libraryHaskellDepends = [ base kure template-haskell ];
        description = "Generator for Boilerplate KURE Combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154022,8 +154727,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Find the alpha emoji";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154036,7 +154741,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal ];
        librarySystemDepends = [ kyotocabinet ];
        description = "Mid level bindings to Kyoto Cabinet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) kyotocabinet;};
 
   "l-bfgs-b" = callPackage
@@ -154048,8 +154753,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ lbfgsb ];
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {lbfgsb = null;};
 
@@ -154061,7 +154766,7 @@ self: {
        sha256 = "182w8l9h2zw8lxr1fahnmcasbd09z2z00ii7gkmq2y95dm3k4w0a";
        libraryHaskellDepends = [ base text time ];
        description = "Enables providing localization as typeclass instances in separate files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "labeled-graph" = callPackage
@@ -154072,8 +154777,8 @@ self: {
        sha256 = "060nvnlh1h8vxi6k2hsz79fn4xypangdj5v4q0kc6abyf9garf7r";
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154085,7 +154790,7 @@ self: {
        sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
        libraryHaskellDepends = [ base ];
        description = "Labeled tree structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "labels" = callPackage
@@ -154096,7 +154801,7 @@ self: {
        sha256 = "04rh8c9ncd9radarz4fjka9hc3i6crvibpyj3y8qpij0acmw1d76";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Anonymous records via named tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "laborantin-hs" = callPackage
@@ -154119,8 +154824,8 @@ self: {
          random split text transformers uuid
        ];
        description = "an experiment management framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154144,8 +154849,8 @@ self: {
          attoparsec base bytestring preamble tasty tasty-hunit
        ];
        description = "LabSat TCP Interface Wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154167,8 +154872,8 @@ self: {
          parsec QuickCheck random safecopy template-haskell transformers
        ];
        description = "A complicated turn-based game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154202,8 +154907,8 @@ self: {
          yesod-static
        ];
        description = "A complicated turn-based game - Web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154216,8 +154921,8 @@ self: {
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154229,7 +154934,7 @@ self: {
        sha256 = "0d65dqvbfrrvgdnagjyiq8xf7635rd46wda722g85dxzxr1l7mbn";
        libraryHaskellDepends = [ base ];
        description = "fizzy n dizzy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lagrangian" = callPackage
@@ -154249,8 +154954,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "Solve Lagrange multiplier problems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154270,8 +154975,8 @@ self: {
          template-haskell text transformers
        ];
        description = "Minimalistic type-checked compile-time template engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154283,7 +154988,7 @@ self: {
        sha256 = "07i0fw7hvkzky9rwrnh4b3i35crbv4mkj0w001dwkgsh1flzh95f";
        libraryHaskellDepends = [ base ];
        description = "Lambda Calculi Abstract Syntax Trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-bridge" = callPackage
@@ -154297,8 +155002,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154318,8 +155023,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hlint hspec HUnit ];
        description = "A lambda calculus interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154335,7 +155040,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Lambda Calculus interpreter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-canvas" = callPackage
@@ -154346,8 +155051,8 @@ self: {
        sha256 = "14wl1w1sc0j1yjfad5v00346ccxp0grfs1677hnjqwisashdac92";
        libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        description = "Educational drawing canvas for FP explorers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154374,8 +155079,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "a Paralell-DEVS implementaion based on distributed-process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154390,8 +155095,8 @@ self: {
          base containers funspection mtl read-bounded
        ];
        description = "Declarative command-line parser with type-driven pattern matching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154403,7 +155108,7 @@ self: {
        sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd";
        libraryHaskellDepends = [ base ];
        description = "A library to emulate laceholders similar to Scala";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-sampler" = callPackage
@@ -154419,7 +155124,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Boltzmann sampler utilities for lambda calculus";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-toolbox" = callPackage
@@ -154432,8 +155137,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "An application to work with the lambda calculus (for learning)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154447,8 +155152,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
        description = "Untyped Lambda calculus to JavaScript compiler";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154460,8 +155165,8 @@ self: {
        sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154476,7 +155181,7 @@ self: {
        executableHaskellDepends = [ base haskell98 html ];
        description = "RSS 2.0 feed generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154494,8 +155199,8 @@ self: {
          base bytestring haskeline lambdaBase mtl network
        ];
        description = "...";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154687,7 +155392,7 @@ self: {
        ];
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154714,7 +155419,7 @@ self: {
        ];
        description = "Lambdabot plugin for XMPP (Jabber) protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lambdabot-zulip" = callPackage
@@ -154734,8 +155439,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit text ];
        description = "Lambdabot for Zulip Chat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154754,8 +155459,8 @@ self: {
          base cmdargs containers dyre glade gtk mtl network webkit
        ];
        description = "Webkit Browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lambdacms-core" = callPackage
@@ -154779,8 +155484,8 @@ self: {
          base classy-prelude classy-prelude-yesod hspec yesod yesod-core
        ];
        description = "LambdaCms 'core' subsite for Yesod apps";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154797,8 +155502,8 @@ self: {
          time yesod yesod-form
        ];
        description = "LambdaCms \"media\" extension";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154812,8 +155517,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154827,8 +155532,8 @@ self: {
          base bullet lambdacube-engine mtl vector
        ];
        description = "Example for combining LambdaCube and Bullet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154853,8 +155558,8 @@ self: {
          aeson base bytestring filepath optparse-applicative
        ];
        description = "LambdaCube 3D is a DSL to program GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154870,8 +155575,8 @@ self: {
          base bytestring bytestring-trie containers mtl vector
        ];
        description = "LambdaCube 3D IR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154888,8 +155593,8 @@ self: {
          mtl vector
        ];
        description = "LambdaCube 3D EDSL definition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154909,8 +155614,8 @@ self: {
          vector-algorithms xml zip-archive
        ];
        description = "3D rendering engine written entirely in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154927,8 +155632,8 @@ self: {
          base elerea GLFW-b lambdacube-engine mtl
        ];
        description = "Examples for LambdaCube";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154947,8 +155652,8 @@ self: {
          vector vector-algorithms
        ];
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154960,8 +155665,8 @@ self: {
        sha256 = "1xq1l27p5k863yklhiw0ldrq5ri9h5fg7wj7k2nbbwm7860mha0z";
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154983,8 +155688,8 @@ self: {
          vector
        ];
        description = "Samples for LambdaCube 3D";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155006,7 +155711,7 @@ self: {
        ];
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155032,8 +155737,8 @@ self: {
          twitter-conduit twitter-types utf8-string
        ];
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155047,8 +155752,8 @@ self: {
          base clash-prelude Lambdaya template-haskell
        ];
        description = "Fpga bus core and serialization for RedPitaya";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155066,8 +155771,8 @@ self: {
          attoparsec attoparsec-enumerator base bytestring enumerator gtk mtl
        ];
        description = "Diff Viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155080,6 +155785,8 @@ self: {
        pname = "lame";
        version = "0.2.0";
        sha256 = "1bqq3aanfffdsl3v0am7jdfslcr6y372cq7jx36z7g09zy5mp2sp";
+       revision = "1";
+       editedCabalFile = "1czjga37b56xs6jrylsf5gip5srmlfg2982k96l5w4300sj8ricz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath text transformers
@@ -155091,8 +155798,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Fairly complete high-level binding to LAME encoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mp3lame = null;};
 
@@ -155109,8 +155816,8 @@ self: {
        ];
        testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ];
        description = "A strange and unnecessary selective test-running library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155122,8 +155829,8 @@ self: {
        sha256 = "1nmyirpf07q7lrgfdqxwaspa173a2g3077gy9k7rpviw8pg2az0w";
        libraryHaskellDepends = [ base bytestring http-streams Mapping ];
        description = "A Lisp";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155156,8 +155863,8 @@ self: {
          text
        ];
        description = "Parser, pretty-printer, and more for the Modula-2 programming language";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155176,8 +155883,8 @@ self: {
          vector
        ];
        description = "ASN.1 encoding and decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155197,7 +155904,7 @@ self: {
          base HUnit parsec syb test-framework test-framework-hunit
        ];
        description = "Parsing of ASN1 definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-ats" = callPackage
@@ -155208,8 +155915,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.10.2";
-       sha256 = "10lanbzbaywyc3a8lq2ndgmpqq2kgpm4vkjxw7gl4irzjn3206yg";
+       version = "1.7.10.3";
+       sha256 = "0snidchidgzxwizbzaxf1gn547ga6kdf8pi03p6p5g9ffb8mv372";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -155221,7 +155928,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Parser and pretty-printer for ATS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-avro" = callPackage
@@ -155239,7 +155946,7 @@ self: {
          avro base hspec hspec-megaparsec megaparsec text vector
        ];
        description = "Language definition and parser for AVRO files";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "language-bash" = callPackage
@@ -155257,7 +155964,7 @@ self: {
          tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
        ];
        description = "Parsing and pretty-printing Bash shell scripts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-boogie" = callPackage
@@ -155279,8 +155986,8 @@ self: {
          stream-monad time transformers
        ];
        description = "Interpreter and language infrastructure for Boogie";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155299,7 +156006,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base directory filepath process ];
        description = "Analysis and generation of C code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-c_0_9_0_1" = callPackage
@@ -155317,8 +156024,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base directory filepath process ];
        description = "Analysis and generation of C code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "language-c-comments" = callPackage
@@ -155331,8 +156038,8 @@ self: {
        libraryHaskellDepends = [ array base language-c ];
        libraryToolDepends = [ alex ];
        description = "Extracting comments from C code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155349,8 +156056,8 @@ self: {
          template-haskell
        ];
        description = "Inline C & Objective-C code in Haskell for language interoperability";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155375,7 +156082,7 @@ self: {
          test-framework-hunit
        ];
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-c99" = callPackage
@@ -155386,7 +156093,7 @@ self: {
        sha256 = "0k4a1chca328sa3w7aghhi446kqfrbp6h5jaj2rddd8f8qjz5pag";
        libraryHaskellDepends = [ base pretty ];
        description = "An implementation of the C99 AST that strictly follows the standard";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "language-c99-simple" = callPackage
@@ -155399,7 +156106,7 @@ self: {
          base language-c99 language-c99-util mtl
        ];
        description = "C-like AST to simplify writing C99 programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "language-c99-util" = callPackage
@@ -155410,7 +156117,7 @@ self: {
        sha256 = "0rdwb29d2aa9mqkn5b4acwviymxy18sjfmzr01j7n3j4n3q4d2lz";
        libraryHaskellDepends = [ base language-c99 ];
        description = "Utilities for language-c99";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "language-cil" = callPackage
@@ -155421,7 +156128,7 @@ self: {
        sha256 = "1150fzhkn9zfxmam27wf2nyhai0ab66aaw8fqak559v39p0nri10";
        libraryHaskellDepends = [ base bool-extras ];
        description = "Manipulating Common Intermediate Language AST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-conf" = callPackage
@@ -155444,8 +156151,8 @@ self: {
          pretty QuickCheck semigroups text transformers
        ];
        description = "Conf parsers and pretty-printers for the Haskell programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155460,8 +156167,8 @@ self: {
        libraryHaskellDepends = [ array base parsec pretty text ];
        libraryToolDepends = [ alex ];
        description = "C# source code manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155473,7 +156180,7 @@ self: {
        sha256 = "0gwsa9i9jxlnp60z3dh1rkk2zds74llxwjxzrsnhbmi71rmmiggx";
        libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-dart" = callPackage
@@ -155485,8 +156192,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155526,8 +156233,8 @@ self: {
        ];
        doHaddock = false;
        description = "A language for generative literature";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155549,7 +156256,7 @@ self: {
          megaparsec prettyprinter QuickCheck split text time
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -155577,8 +156284,8 @@ self: {
          transformers unordered-containers yaml
        ];
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155594,7 +156301,7 @@ self: {
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base parsec ];
        description = "A library for the analysis and creation of Graphviz DOT files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-ecmascript" = callPackage
@@ -155619,8 +156326,8 @@ self: {
          uniplate
        ];
        description = "JavaScript parser and pretty-printer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155636,8 +156343,8 @@ self: {
          base containers language-ecmascript parsec uniplate
        ];
        description = "JavaScript static analysis library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155656,8 +156363,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Parser and pretty printer for the Eiffel language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155675,8 +156382,8 @@ self: {
        testHaskellDepends = [ base hspec mtl pretty protolude ];
        testToolDepends = [ doctest ];
        description = "Generate elm code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155690,8 +156397,8 @@ self: {
        libraryHaskellDepends = [ array base haskell-src parsec syb ];
        libraryToolDepends = [ alex happy ];
        description = "Fortran lexer and parser, language support, and extensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155703,8 +156410,8 @@ self: {
        sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf";
        libraryHaskellDepends = [ base bifunctors parsers ];
        description = "Something similar to Dijkstra's guarded command language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155718,7 +156425,7 @@ self: {
        editedCabalFile = "0gkllr25h5msjvlcx1pch6a4ndm7yymdqh4ya95drc7gns0kz1zc";
        libraryHaskellDepends = [ base text ];
        description = "Datatypes and parsing/printing functions to represent the Gemini markup language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-glsl" = callPackage
@@ -155739,7 +156446,7 @@ self: {
          base HUnit parsec prettyclass test-framework test-framework-hunit
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-go" = callPackage
@@ -155751,7 +156458,7 @@ self: {
        libraryHaskellDepends = [ array base parsec utf8-string ];
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155764,8 +156471,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155779,7 +156486,7 @@ self: {
        editedCabalFile = "1chx4g8ngb1hpyh3r9rbl8rkjkm67klms4wmw3p1g2llg47vvqip";
        libraryHaskellDepends = [ base regex-posix template-haskell ];
        description = "Module to automatically extract functions from the local code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-hcl" = callPackage
@@ -155803,8 +156510,8 @@ self: {
          base criterion directory filepath text
        ];
        description = "HCL parsers and pretty-printers for the Haskell programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155824,7 +156531,7 @@ self: {
          base directory filepath mtl tasty tasty-hunit tasty-quickcheck
        ];
        description = "Java source manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-java-classfile" = callPackage
@@ -155841,8 +156548,8 @@ self: {
          data-flags deepseq language-java LibZip mtl parsec utf8-string
        ];
        description = "Parser for Java .class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155864,7 +156571,7 @@ self: {
          QuickCheck utf8-light utf8-string
        ];
        description = "Parser for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-js" = callPackage
@@ -155876,7 +156583,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "javascript parser for es6 and es7";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-kort" = callPackage
@@ -155899,8 +156606,8 @@ self: {
          base bytestring QuickCheck smaoin text vocabulary-kadma
        ];
        description = "Parser and serializer for the Kort information language";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155925,8 +156632,8 @@ self: {
          base criterion directory filepath text
        ];
        description = "Lua parser and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155943,8 +156650,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155970,8 +156677,8 @@ self: {
          tasty-hunit tasty-quickcheck unordered-containers
        ];
        description = "Lua parser and pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155986,8 +156693,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec pretty ];
        executableHaskellDepends = [ base pretty ];
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156026,8 +156733,8 @@ self: {
          versions
        ];
        description = "A library for dealing with the Ninja build language";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156043,8 +156750,8 @@ self: {
          base deepseq lens parsec-class pretty QuickCheck
        ];
        description = "Data types and functions to represent the Nix language";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "language-oberon" = callPackage
@@ -156075,8 +156782,8 @@ self: {
          grammatical-parsers prettyprinter tasty tasty-hunit text
        ];
        description = "Parser, pretty-printer, and more for the Oberon programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156094,8 +156801,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Analysis and generation of Objective C code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156121,8 +156828,8 @@ self: {
          string-qq tasty tasty-golden tasty-hunit
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -156139,8 +156846,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        executableHaskellDepends = [ attoparsec base bytestring ];
        description = "A simple parser for OpenSCAD";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156161,8 +156868,8 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Pig parser in haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156174,7 +156881,7 @@ self: {
        sha256 = "1wxihyf320xsqi114dbl2cwylkc261d5wgd7migb1lh23gxnhhz2";
        libraryHaskellDepends = [ base megaparsec text ];
        description = "Language definition and parser for Protocol Buffers";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "language-puppet" = callPackage
@@ -156216,8 +156923,8 @@ self: {
          transformers unordered-containers vector
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156234,7 +156941,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Parsing and pretty printing of Python code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-python-colour" = callPackage
@@ -156249,8 +156956,8 @@ self: {
          base haskell98 language-python xhtml
        ];
        description = "Generate coloured XHTML for Python code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156264,7 +156971,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base language-python ];
        description = "testing code for the language-python library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-qux" = callPackage
@@ -156280,8 +156987,8 @@ self: {
          transformers
        ];
        description = "Utilities for working with the Qux language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156311,8 +157018,8 @@ self: {
          statistics weigh
        ];
        description = "Parsing and pretty printing of Rust code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156327,7 +157034,7 @@ self: {
          ansi-wl-pprint base bytestring containers text
        ];
        description = "AST and pretty printer for Sally";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "language-sh" = callPackage
@@ -156341,8 +157048,8 @@ self: {
          base directory filepath mtl parsec pcre-light
        ];
        description = "A package for parsing shell scripts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156361,7 +157068,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "AST and parser for the ZeroC Slice language (Specification language for ICE)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-spelling" = callPackage
@@ -156381,8 +157088,8 @@ self: {
          base bytestring criterion random-shuffle time
        ];
        description = "Various tools to detect/correct mistakes in words";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156398,8 +157105,8 @@ self: {
          array base bytestring containers mtl template-haskell utf8-string
        ];
        description = "Full parser and generator for SQL as implemented by SQLite3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156414,8 +157121,8 @@ self: {
        libraryHaskellDepends = [ array base hashable text ];
        testHaskellDepends = [ base deepseq tasty tasty-hunit text ];
        description = "A parser and printer for the SyGuS 2.0 language.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156438,8 +157145,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Parser and pretty printer for the Thrift IDL format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156462,8 +157169,8 @@ self: {
          text
        ];
        description = "A Parser for the Type Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156475,8 +157182,8 @@ self: {
        sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd";
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "A library for working with TypeScript Definition files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156488,8 +157195,8 @@ self: {
        sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka";
        libraryHaskellDepends = [ base pretty ];
        description = "VHDL AST and pretty printer in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156502,8 +157209,8 @@ self: {
        libraryHaskellDepends = [ base parsec wl-pprint ];
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156517,7 +157224,7 @@ self: {
        testHaskellDepends = [ base deepseq ];
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Matrix programming library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lapack" = callPackage
@@ -156548,8 +157255,8 @@ self: {
          unique-logic-tf utility-ht
        ];
        description = "Numerical Linear Algebra using LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156566,8 +157273,8 @@ self: {
          transformers
        ];
        description = "Auto-generated interface to Fortran LAPACK via CArrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156584,8 +157291,8 @@ self: {
          storable-complex transformers
        ];
        description = "Auto-generated interface to Fortran LAPACK via comfort-array";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156598,8 +157305,8 @@ self: {
        libraryHaskellDepends = [ base netlib-ffi ];
        libraryPkgconfigDepends = [ liblapack ];
        description = "Auto-generated interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {liblapack = null;};
 
@@ -156624,7 +157331,7 @@ self: {
          unordered-containers utility-ht vector
        ];
        description = "Generator for Haskell interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "large-hashable" = callPackage
@@ -156652,8 +157359,8 @@ self: {
          deepseq safecopy text transformers
        ];
        description = "Efficiently hash (large) Haskell values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156671,7 +157378,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lat" = callPackage
@@ -156690,8 +157397,8 @@ self: {
          HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time
        ];
        description = "Tool to track security alerts on LWN";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156722,8 +157429,8 @@ self: {
          transformers
        ];
        description = "Find the latest version of a package on npm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156735,7 +157442,7 @@ self: {
        sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw";
        libraryHaskellDepends = [ base containers utility-ht ];
        description = "Parse, format and process LaTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "latex-formulae-hakyll" = callPackage
@@ -156753,8 +157460,8 @@ self: {
          pandoc-types
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156773,8 +157480,8 @@ self: {
          transformers
        ];
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156796,8 +157503,8 @@ self: {
          base latex-formulae-image pandoc-types
        ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156820,7 +157527,7 @@ self: {
        executableHaskellDepends = [ base HaTeX process template-haskell ];
        testHaskellDepends = [ base ];
        description = "Function table specifications in latex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "latex-live-snippets" = callPackage
@@ -156835,7 +157542,7 @@ self: {
          base directory filepath lens MissingH
        ];
        description = "Automatically inline Haskell snippets into LaTeX documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "latex-svg-hakyll" = callPackage
@@ -156850,8 +157557,8 @@ self: {
          base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156869,8 +157576,8 @@ self: {
          directory filepath parsec process temporary transformers
        ];
        description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156890,8 +157597,8 @@ self: {
        ];
        executableHaskellDepends = [ base latex-svg-image pandoc-types ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156918,7 +157625,9 @@ self: {
          universe-reverse-instances unordered-containers
        ];
        description = "Fine-grained library for constructing and manipulating lattices";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "launchdarkly-server-sdk" = callPackage
@@ -156950,8 +157659,8 @@ self: {
          unordered-containers uuid vector
        ];
        description = "Server-side SDK for integrating with LaunchDarkly";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156969,8 +157678,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "High and low-level interface to the Novation Launchpad midi controller";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156982,7 +157691,7 @@ self: {
        sha256 = "014drjks30wij31fm371q5d8m6x3fpf3z52dim6zmxxv0r0pjmh0";
        libraryHaskellDepends = [ base ];
        description = "Assert the lawfulness of your typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lawless-concurrent-machines" = callPackage
@@ -157003,8 +157712,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157016,7 +157725,7 @@ self: {
        sha256 = "0hmsqpm3jakp5q274q47c9gvb2i4asc25nrfypblkvnpvnh6q172";
        libraryHaskellDepends = [ base ];
        description = "Common mathematical laws";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lax" = callPackage
@@ -157027,7 +157736,7 @@ self: {
        sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy";
        libraryHaskellDepends = [ base ];
        description = "Lax arrows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "layered-state" = callPackage
@@ -157049,8 +157758,8 @@ self: {
          criterion deepseq either kan-extensions mtl-c timeit
        ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157062,8 +157771,8 @@ self: {
        sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf";
        libraryHaskellDepends = [ base transformers ];
        description = "Modular type class machinery for monad transformer stacks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157083,8 +157792,8 @@ self: {
          OpenGLRaw pretty-show
        ];
        description = "A prototypical 2d platform game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157096,8 +157805,8 @@ self: {
        sha256 = "126r47n5aaz3ksl7fwfc5lg5wniy46lscr1c3z7d2sdk10rhbql9";
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157109,8 +157818,8 @@ self: {
        sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi";
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157122,8 +157831,8 @@ self: {
        sha256 = "1ddynm3jl7c4jakxk2lxy954a9245j2664an0kyh9inn51j17p9r";
        libraryHaskellDepends = [ alex-tools base text ];
        description = "A collection of different layout implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157139,8 +157848,8 @@ self: {
          base container layered-state prologue terminal-text text
        ];
        description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157152,7 +157861,7 @@ self: {
        sha256 = "02a9iw0ns12hszi5rim4x6pa15y3zycmbcmcwmsr6m31rzgz8ryp";
        libraryHaskellDepends = [ base comonad ];
        description = "Explicit laziness for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lazy-csv" = callPackage
@@ -157166,7 +157875,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Efficient lazy parsers for CSV (comma-separated values)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazy-hash" = callPackage
@@ -157184,8 +157893,8 @@ self: {
          template-haskell vector-space
        ];
        description = "Identifiers for not-yet-computed values";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157206,8 +157915,8 @@ self: {
          temporary
        ];
        description = "Storing computed values for re-use when the same program runs again";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157219,7 +157928,7 @@ self: {
        sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9";
        libraryHaskellDepends = [ base ];
        description = "Lazy IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazy-io-streams" = callPackage
@@ -157232,8 +157941,8 @@ self: {
        editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm";
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157250,8 +157959,8 @@ self: {
        testHaskellDepends = [ base doctest lens ];
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157263,8 +157972,8 @@ self: {
        sha256 = "1vicd1yzcz3kw3r0widfx04j4qbzz4912j5v8c2bhd0z9hvc22vp";
        libraryHaskellDepends = [ base size-based ];
        description = "Finds values satisfying a lazy predicate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157276,8 +157985,8 @@ self: {
        sha256 = "0bc2n7x8fydmzc84yb5zbdaca1r4qwpk7zlvbgcycycr87fk7p7n";
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157297,8 +158006,8 @@ self: {
          aeson base hspec microstache text transformers
        ];
        description = "An EDSL for programming the Game Boy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157312,7 +158021,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base transformers unsafe ];
        description = "Run IO actions lazily while respecting their order";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazyset" = callPackage
@@ -157329,8 +158038,8 @@ self: {
          base containers data-ordlist time timeit
        ];
        description = "Set and Map from lazy/infinite lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157342,7 +158051,7 @@ self: {
        sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
        libraryHaskellDepends = [ base ];
        description = "A library for demand-driven testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazysplines" = callPackage
@@ -157353,7 +158062,7 @@ self: {
        sha256 = "13ll6w4g0pv2bq5dsyiz4v9ywsdax6pjzb1d64fsqvq1zqr490ix";
        libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lbfgs" = callPackage
@@ -157365,7 +158074,7 @@ self: {
        libraryHaskellDepends = [ array base vector ];
        description = "L-BFGS optimization";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lca" = callPackage
@@ -157378,7 +158087,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "O(log n) persistent online lowest common ancestor search without preprocessing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lcs" = callPackage
@@ -157390,7 +158099,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Find longest common sublist of two lists";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ld-intervals" = callPackage
@@ -157401,8 +158110,8 @@ self: {
        sha256 = "1mi94kdc61d4vhzvcr4gvzy3zl2wrd4i353gpmmaxp652rm9xm99";
        libraryHaskellDepends = [ base ];
        description = "Data structures for representing arbitrary intervals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157418,8 +158127,8 @@ self: {
          base containers ghc-prim mtl random-fu random-source rvar vector
        ];
        description = "Online Latent Dirichlet Allocation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157438,7 +158147,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec process semigroups ];
        description = "Pure Haskell LDAP Client Library";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ldapply" = callPackage
@@ -157456,8 +158165,8 @@ self: {
          unordered-containers
        ];
        description = "LDIF idempotent apply tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157480,8 +158189,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "The LDAP Data Interchange Format (LDIF) tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157500,8 +158209,8 @@ self: {
          base blaze-html directory filepath pandoc split
        ];
        description = "A simple portfolio generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157520,8 +158229,8 @@ self: {
          seqaid template-haskell
        ];
        description = "Robust space leak, and its strictification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157537,8 +158246,8 @@ self: {
          base base-unicode-symbols text-utf8 transformers util
        ];
        description = "Bonds to Lean theorem prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157557,7 +158266,7 @@ self: {
          template-haskell
        ];
        description = "A maximally lazy, simple implementation of the Peano numbers with minimal dependencies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leancheck" = callPackage
@@ -157569,7 +158278,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "leancheck-enum-instances" = callPackage
@@ -157580,7 +158289,7 @@ self: {
        sha256 = "0l14npnkwdr3vcdjv2b20a0g3cka0nd93cm6hrq16dcphm1ckaj1";
        libraryHaskellDepends = [ base enum-types leancheck ];
        description = "listable instances for small enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "leancheck-instances" = callPackage
@@ -157598,7 +158307,7 @@ self: {
          base bytestring containers leancheck nats text
        ];
        description = "Common LeanCheck instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "leankit-api" = callPackage
@@ -157611,7 +158320,7 @@ self: {
          aeson base bytestring colour curl split
        ];
        description = "LeanKit API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leanpub-concepts" = callPackage
@@ -157622,7 +158331,7 @@ self: {
        sha256 = "1vf62iryqmj8ll16cm5xpwaqzlhw8rb7p6pshm87assm9lnw3k8c";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Types for the Leanpub API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leanpub-wreq" = callPackage
@@ -157639,8 +158348,8 @@ self: {
          time transformers unordered-containers wreq
        ];
        description = "Use the Leanpub API via Wreq";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157654,8 +158363,8 @@ self: {
        editedCabalFile = "1n3r1c58626nzqmjb068kz3ckb3xsn9v62i70yvzk2g6j29fpz2g";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base tasty tasty-hunit time ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157668,7 +158377,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base QuickCheck time ];
        description = "Leap seconds announced at library release time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "learn" = callPackage
@@ -157679,8 +158388,8 @@ self: {
        sha256 = "1i2rn4pmgbqxj0xsjqp5rh50lv6zgnblbjgwmqh5cxb3dsillvpj";
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157701,7 +158410,7 @@ self: {
          base gloss gnuplot not-gloss spatial-math
        ];
        description = "Haskell code for learning physics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -157718,8 +158427,8 @@ self: {
          base gloss gnuplot learn-physics not-gloss spatial-math
        ];
        description = "examples for learn-physics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157735,7 +158444,7 @@ self: {
          base containers deepseq hmatrix random-fu random-source vector
        ];
        description = "Yet another library for hidden Markov models";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leb128" = callPackage
@@ -157754,7 +158463,9 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "LEB128 encoding logic for and in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "leb128-cereal" = callPackage
@@ -157770,7 +158481,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
        description = "LEB128 and SLEB128 encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leetify" = callPackage
@@ -157784,8 +158495,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers ];
        description = "Leetify text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157799,7 +158510,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hscharm random random-shuffle ];
        description = "left4dead-inspired roguelike";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "legion" = callPackage
@@ -157820,8 +158531,8 @@ self: {
          stm text time transformers unix uuid wai wai-extra warp
        ];
        description = "Distributed, stateful, homogeneous microservice framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157847,8 +158558,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A discovery service based on Legion";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157868,8 +158579,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Client library for communicating with legion-discovery";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157891,8 +158602,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Extra non-essential utilities for building legion applications";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157931,7 +158642,7 @@ self: {
        executableHaskellDepends = [ base gi-gtk-hs leksah-server stm ];
        description = "Haskell IDE written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gtk3;};
 
   "leksah-server" = callPackage
@@ -157969,7 +158680,7 @@ self: {
        ];
        description = "Metadata collection for leksah";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157986,8 +158697,8 @@ self: {
          io-streams mtl scientific text vector
        ];
        description = "Bindings for the LendingClub marketplace API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158006,8 +158717,8 @@ self: {
        pname = "lens";
        version = "4.19.2";
        sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j";
-       revision = "2";
-       editedCabalFile = "1bp6s0ifwdmzv946krxgxqakw02iriqmzvvcypwrgcynrn9wkn9y";
+       revision = "3";
+       editedCabalFile = "1anqghjbi0wyvqpg7qcbph5rfq78sjpdavrajh4z6f20kzy4mn45";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -158029,7 +158740,7 @@ self: {
          generic-deriving transformers unordered-containers vector
        ];
        description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -158040,7 +158751,7 @@ self: {
        sha256 = "1sk3iy5qv24mifx0gwd5z714lf3y3s4zpbff09mqk42whk2sdd0y";
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-action" = callPackage
@@ -158059,7 +158770,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Monadic Getters and Folds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-aeson" = callPackage
@@ -158082,7 +158793,7 @@ self: {
          base doctest generic-deriving semigroups simple-reflect
        ];
        description = "Law-abiding lenses for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lens-core" = callPackage
@@ -158104,7 +158815,7 @@ self: {
        sha256 = "0kkwb32ndhxhlz01pn4xh825x95l8g45cs4h5wxkjh24rywl3rrp";
        libraryHaskellDepends = [ base bytestring cassava lens ];
        testHaskellDepends = [ base bytestring cassava lens ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-datetime" = callPackage
@@ -158115,7 +158826,7 @@ self: {
        sha256 = "1m6cns38xggw8kcc9h0mf4q024cvc8njm7n33f8gi7hwyxxqs7xv";
        libraryHaskellDepends = [ base lens time ];
        description = "Lenses for Data.Time.* types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-errors" = callPackage
@@ -158127,7 +158838,7 @@ self: {
        libraryHaskellDepends = [ base either lens ];
        testHaskellDepends = [ base containers either hspec lens ];
        description = "Error handling in lens chains";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-family" = callPackage
@@ -158142,7 +158853,7 @@ self: {
          base containers lens-family-core mtl transformers
        ];
        description = "Lens Families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-family_2_1_0" = callPackage
@@ -158157,8 +158868,8 @@ self: {
          base containers lens-family-core mtl transformers
        ];
        description = "Lens Families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lens-family-core" = callPackage
@@ -158169,7 +158880,7 @@ self: {
        sha256 = "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 2022 Lens Families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-family-core_2_1_0" = callPackage
@@ -158180,8 +158891,8 @@ self: {
        sha256 = "1jjzm2f4ixjwysyk8gybzpb98rlf2mmzn0nfg8qvhkf5gl87jv3v";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 2022 Lens Families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lens-family-th" = callPackage
@@ -158193,7 +158904,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell transformers ];
        description = "Generate lens-family style lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-filesystem" = callPackage
@@ -158211,8 +158922,8 @@ self: {
          base directory filepath hspec lens lens-action
        ];
        description = "Lens interface for your filesystem; still a bit experimental";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158224,8 +158935,8 @@ self: {
        sha256 = "0zz2w01knsj1zn9vj8g3dbhvh0sgnibr5wm9dn91qv0bmps745z7";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158237,7 +158948,7 @@ self: {
        sha256 = "1jyqxi83imkyd318m17p2z84zqaxyb08mk5gy7q7saay2blmz4jr";
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Miscellaneous lens utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-named" = callPackage
@@ -158248,7 +158959,7 @@ self: {
        sha256 = "1w6y1caah0yr7gilwsv7ji7pp3mz1m9wlx5zpq0n0z1q2wbdsmfp";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Helper for use with lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-prelude" = callPackage
@@ -158265,8 +158976,8 @@ self: {
          mtl text time transformers unordered-containers vector
        ];
        description = "Alternate prelude that exports lens combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158286,7 +158997,7 @@ self: {
          base doctest filepath lens process tasty tasty-hunit
        ];
        description = "Optics for system processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-properties" = callPackage
@@ -158299,7 +159010,7 @@ self: {
        editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7";
        libraryHaskellDepends = [ base lens QuickCheck transformers ];
        description = "QuickCheck properties for lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-regex" = callPackage
@@ -158319,7 +159030,7 @@ self: {
          base directory doctest filepath regex-posix
        ];
        description = "Lens powered regular expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-regex-pcre" = callPackage
@@ -158343,7 +159054,7 @@ self: {
          template-haskell text
        ];
        description = "A lensy interface to regular expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-simple" = callPackage
@@ -158358,8 +159069,8 @@ self: {
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
        description = "simplified import of elementary lens-family combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158373,7 +159084,7 @@ self: {
          base fclabels generics-sop transformers
        ];
        description = "Computing lenses generically using generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-text-encoding" = callPackage
@@ -158384,8 +159095,8 @@ self: {
        sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv";
        libraryHaskellDepends = [ base bytestring lens text ];
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158400,8 +159111,8 @@ self: {
        libraryHaskellDepends = [ base ghc lens ];
        executableHaskellDepends = [ base ghc ghc-exactprint lens ];
        description = "Rewrites Template Haskell splices using the API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158413,8 +159124,8 @@ self: {
        sha256 = "1hrp9d6qja7yc3zj68w3hylgflyfsvh79m8daw9030yjdxm525za";
        libraryHaskellDepends = [ base lens time ];
        description = "lens for Data.Time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158431,8 +159142,8 @@ self: {
          base containers dwergaz hlint lens-family text toml-parser
        ];
        description = "Lenses for toml-parser";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158445,8 +159156,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158458,8 +159169,8 @@ self: {
        sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp";
        libraryHaskellDepends = [ base singletons ];
        description = "Type-level lenses using singletons";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158476,8 +159187,8 @@ self: {
          template-haskell
        ];
        description = "Collection of missing lens utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158492,7 +159203,7 @@ self: {
        libraryHaskellDepends = [ base lens xml ];
        testHaskellDepends = [ base lens xml ];
        description = "Lenses for the xml package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lenses" = callPackage
@@ -158503,7 +159214,7 @@ self: {
        sha256 = "1wwl0f1f1scflnbjgqcinkpvpvhn21942bfbg8vlimdap6i5d49h";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Simple Functional Lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lensref" = callPackage
@@ -158515,8 +159226,8 @@ self: {
        libraryHaskellDepends = [ base monad-control mtl transformers ];
        testHaskellDepends = [ base ];
        description = "References which can be joined and on which lenses can be applied";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158528,8 +159239,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.4.1.0";
-       sha256 = "07zlmds8450sa54axx91ppxil6jfafx78ba3lxrr6jpdvzc73w55";
+       version = "1.5.0.0";
+       sha256 = "1fkgaf4vgn2b8pkvcc9x3dmigqrq4qp31xvjmp3h0g9s1bm9ay5z";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -158543,8 +159254,8 @@ self: {
          semigroups terminal-progress-bar text
        ];
        description = "frugal issue tracker";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158562,7 +159273,7 @@ self: {
          base base-unicode-symbols hs-functors transformers
        ];
        description = "Van Laarhoven lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lenz-mtl" = callPackage
@@ -158580,7 +159291,7 @@ self: {
        ];
        description = "mtl operations with Van Laarhoven lenses";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lenz-template" = callPackage
@@ -158598,7 +159309,7 @@ self: {
        ];
        description = "Van Laarhoven lens templates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "less-arbitrary" = callPackage
@@ -158610,13 +159321,13 @@ self: {
      }:
      mkDerivation {
        pname = "less-arbitrary";
-       version = "0.1.4.0";
-       sha256 = "1rd21mnvr3wwzbl09070jmzbg7zl05kviaggpycyxybj4sq8lxm3";
+       version = "0.1.7.0";
+       sha256 = "0j1qnd3qz6kiivhmbs5a4hnw1wm13q794s7b5rrin62x8dz7kcp0";
        libraryHaskellDepends = [
          base containers email-validate generic-arbitrary genvalidity
          genvalidity-hspec genvalidity-property hashable hspec mtl
-         QuickCheck random scientific text time transformers
-         unordered-containers validity vector
+         QuickCheck quickcheck-classes random scientific text time
+         transformers unordered-containers validity vector
        ];
        testHaskellDepends = [
          base containers email-validate generic-arbitrary genvalidity
@@ -158626,7 +159337,7 @@ self: {
          vector
        ];
        description = "Linear time testing with variant of Arbitrary class that always terminates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "level-monad" = callPackage
@@ -158637,8 +159348,8 @@ self: {
        sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a";
        libraryHaskellDepends = [ base fmlist ];
        description = "Non-Determinism Monad for Level-Wise Search";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158663,7 +159374,7 @@ self: {
          tasty tasty-quickcheck temporary transformers
        ];
        description = "Haskell bindings to LevelDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -158686,7 +159397,7 @@ self: {
          QuickCheck transformers
        ];
        description = "Haskell bindings to LevelDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) leveldb;};
 
   "levmar" = callPackage
@@ -158697,8 +159408,8 @@ self: {
        sha256 = "0v2mfqw4irzpfq100i1rm5djfqzvxilq9i7pcslsb92jkcv2zgbc";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        description = "An implementation of the Levenberg-Marquardt algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158712,8 +159423,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158733,8 +159444,8 @@ self: {
        testHaskellDepends = [ base util ];
        benchmarkHaskellDepends = [ base gauge util ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158751,7 +159462,7 @@ self: {
          base deepseq regex-applicative srcloc tasty tasty-hunit
        ];
        description = "Simple lexer based on applicative regular expressions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lfst" = callPackage
@@ -158763,8 +159474,8 @@ self: {
        libraryHaskellDepends = [ base containers doctest lattices ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "L-Fuzzy Set Theory implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158792,8 +159503,8 @@ self: {
          vector
        ];
        description = "Lens GUI Toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158805,8 +159516,8 @@ self: {
        sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1";
        libraryHaskellDepends = [ haskell2010 ];
        description = "Data structures for the Les Houches Accord";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158827,7 +159538,7 @@ self: {
        ];
        description = "Simple spreadsheet program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158841,8 +159552,8 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        description = "LHC Haskell Compiler";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158854,8 +159565,8 @@ self: {
        sha256 = "08725r5i71ni9ip4qbc5fr111j256rsii936yvxbd7kbbw4ap2a9";
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158874,8 +159585,8 @@ self: {
          base cmdargs filepath haskell-src-exts syb uu-parsinglib
        ];
        description = "Literate highlighter preprocessor for lhs2tex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158890,7 +159601,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath Glob ];
        description = "Compile lhs in bird style to md, html, hs";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "lhs2tex" = callPackage
@@ -158925,8 +159636,8 @@ self: {
          base directory filepath process regex-posix
        ];
        description = "Tool for using pdflatex with .lhs files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158942,7 +159653,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A binding to the libBF library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "libGenI" = callPackage
@@ -158959,7 +159670,7 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158990,8 +159701,8 @@ self: {
          base bytestring criterion tar tar-conduit temporary
        ];
        description = "Haskell interface to libarchive";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libarchive;};
 
@@ -159008,7 +159719,7 @@ self: {
        ];
        librarySystemDepends = [ archive ];
        description = "Read many archive formats with libarchive and conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {archive = null;};
 
   "libconfig" = callPackage
@@ -159028,8 +159739,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base doctest doctest-prop lens ];
        description = "Haskell bindings to libconfig";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libconfig;};
 
@@ -159050,8 +159761,8 @@ self: {
          base directory filepath mtl test-framework
        ];
        description = "A library providing a parser, type checker and evaluator for CSPM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159064,8 +159775,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
@@ -159079,7 +159790,7 @@ self: {
        librarySystemDepends = [ ffi ];
        libraryPkgconfigDepends = [ libffi ];
        description = "A binding to libffi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {ffi = null; inherit (pkgs) libffi;};
 
   "libffi-dynamic" = callPackage
@@ -159091,7 +159802,7 @@ self: {
        libraryHaskellDepends = [ base contravariant hashable intern ];
        librarySystemDepends = [ ffi ];
        description = "LibFFI interface with dynamic bidirectional type-driven binding generation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {ffi = null;};
 
   "libfuse3" = callPackage
@@ -159115,8 +159826,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion unix ];
        description = "A Haskell binding for libfuse-3.x";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fuse3;};
 
@@ -159128,7 +159839,7 @@ self: {
        sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x";
        libraryHaskellDepends = [ base mtl process ];
        description = "Simple Git Wrapper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libgraph" = callPackage
@@ -159145,7 +159856,7 @@ self: {
          array base containers monads-tf process union-find
        ];
        description = "Store and manipulate data in a graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libhbb" = callPackage
@@ -159168,8 +159879,8 @@ self: {
          base bytestring ghc ghc-paths hspec mtl syb
        ];
        description = "Backend for text editors to provide better Haskell editing support";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159188,8 +159899,8 @@ self: {
          http-types resource-pool stm text
        ];
        description = "libinfluxdb";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159218,8 +159929,8 @@ self: {
          xml-conduit
        ];
        description = "Jenkins API interface";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159250,8 +159961,8 @@ self: {
          transformers unordered-containers uuid
        ];
        description = "A Haskell implementation of JSON Web Token (JWT)";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159278,8 +159989,8 @@ self: {
          xml-html-conduit-lens
        ];
        description = "Lastfm API interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159315,8 +160026,8 @@ self: {
          test-framework-th text time transformers
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159330,8 +160041,8 @@ self: {
          base bindings-DSL enumerator mtl vector
        ];
        description = "liblinear iteratee";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159345,8 +160056,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "FFI interface to libltdl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159359,8 +160070,8 @@ self: {
        libraryHaskellDepends = [ base bytestring data-default vector ];
        librarySystemDepends = [ modbus ];
        description = "Haskell bindings to the C modbus library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {modbus = null;};
 
@@ -159393,31 +160104,31 @@ self: {
          test-framework-th text time transformers
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "libmpd" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, filepath, hspec, mtl, network, old-locale
-     , QuickCheck, safe-exceptions, text, time, unix, utf8-string
+     , data-default-class, filepath, hspec, mtl, network, QuickCheck
+     , safe-exceptions, text, time, unix, utf8-string
      }:
      mkDerivation {
        pname = "libmpd";
-       version = "0.9.2.0";
-       sha256 = "0vjzwdxlldn07v9mkkx5vbh4pmz7s71qjh4c126f968a807zmqrn";
+       version = "0.9.3.0";
+       sha256 = "08bi0m7kxh2ppkabq5vsx1cwz3i1y4y7w4j0g1hi9q9raml6y0y9";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
-         mtl network old-locale safe-exceptions text time utf8-string
+         mtl network safe-exceptions text time utf8-string
        ];
        testHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
-         hspec mtl network old-locale QuickCheck safe-exceptions text time
-         unix utf8-string
+         hspec mtl network QuickCheck safe-exceptions text time unix
+         utf8-string
        ];
        description = "An MPD client library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "libnix" = callPackage
@@ -159435,8 +160146,8 @@ self: {
          base directory errors protolude tasty tasty-hunit text
        ];
        description = "Bindings to the nix package manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159449,7 +160160,7 @@ self: {
        libraryHaskellDepends = [ base bytestring glib gtk ];
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libnotify;};
 
   "libnvvm" = callPackage
@@ -159467,8 +160178,8 @@ self: {
          base bytestring Cabal HUnit test-framework test-framework-hunit
        ];
        description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {nvvm = null;};
 
   "liboath-hs" = callPackage
@@ -159489,8 +160200,8 @@ self: {
        executableHaskellDepends = [ base bytestring time ];
        testHaskellDepends = [ base ];
        description = "Bindings to liboath";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {liboath = null; oath = null;};
 
@@ -159506,8 +160217,8 @@ self: {
          base CC-delcont containers mtl template-haskell unix
        ];
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159521,8 +160232,8 @@ self: {
        librarySystemDepends = [ pafe ];
        testHaskellDepends = [ base bytestring iconv transformers ];
        description = "Wrapper for libpafe";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pafe = null;};
 
@@ -159535,8 +160246,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ postgresql ];
        description = "libpq binding for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -159588,8 +160299,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Raft consensus algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159601,8 +160312,8 @@ self: {
        sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn";
        libraryHaskellDepends = [ base bytestring curl ];
        description = "Wrapper to Random.org API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159623,8 +160334,8 @@ self: {
          vector
        ];
        description = "Bindings to the Librato API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159643,7 +160354,7 @@ self: {
          text uri-bytestring url
        ];
        description = "Use Libravatar, the decentralized avatar delivery service";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "librdkafka" = callPackage
@@ -159654,7 +160365,7 @@ self: {
        sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libretls" = callPackage
@@ -159671,8 +160382,8 @@ self: {
        libraryPkgconfigDepends = [ libtls ];
        testHaskellDepends = [ base containers hspec HUnit libressl ];
        description = "libtls bindings";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libressl = null; libtls = null;};
 
@@ -159685,7 +160396,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Use Roman Numerals as a Numeric Datatype (sort of)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libsodium" = callPackage
@@ -159703,7 +160414,7 @@ self: {
        ];
        testPkgconfigDepends = [ libsodium ];
        description = "Low-level bindings to the libsodium C library";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {inherit (pkgs) libsodium;};
 
   "libssh2" = callPackage
@@ -159721,8 +160432,8 @@ self: {
        libraryPkgconfigDepends = [ libssh2 ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libssh2;};
 
@@ -159740,8 +160451,8 @@ self: {
          base bytestring conduit libssh2 stm transformers
        ];
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159760,7 +160471,7 @@ self: {
          http-conduit profunctors text
        ];
        description = "StackExchange API interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "libsystemd-daemon" = callPackage
@@ -159779,8 +160490,8 @@ self: {
          base HUnit network test-framework test-framework-hunit
        ];
        description = "Haskell bindings for libsystemd-daemon";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
@@ -159800,7 +160511,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ systemd ];
        description = "Haskell bindings to libsystemd-journal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -159814,8 +160525,8 @@ self: {
        librarySystemDepends = [ taglib ];
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib C library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) taglib;};
 
@@ -159830,7 +160541,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        libraryPkgconfigDepends = [ libtelnet ];
        description = "Bindings to libtelnet";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {inherit (pkgs) libtelnet;};
 
   "libversion" = callPackage
@@ -159842,7 +160553,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        libraryPkgconfigDepends = [ libversion ];
        description = "Haskell binding to libversion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libversion;};
 
   "libvirt-hs" = callPackage
@@ -159855,7 +160566,7 @@ self: {
        libraryPkgconfigDepends = [ libvirt ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libvirt;};
 
   "libvorbis" = callPackage
@@ -159866,7 +160577,7 @@ self: {
        sha256 = "19mx07gvwsqhbish8cbbiplgpw75birn19sl0hhn2300kpryyxfb";
        libraryHaskellDepends = [ base bytestring cpu ];
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libxls" = callPackage
@@ -159877,8 +160588,8 @@ self: {
        sha256 = "03klm9s27v06s65ypy6bsshnif20mprhynvqrmcw90brzmgiihf6";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to libxls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159894,7 +160605,7 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libxml2;};
 
   "libxml-enumerator" = callPackage
@@ -159909,8 +160620,8 @@ self: {
          base bytestring enumerator libxml-sax text transformers xml-types
        ];
        description = "Enumerator-based API for libXML's SAX interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159924,7 +160635,7 @@ self: {
        librarySystemDepends = [ libxml2 ];
        libraryPkgconfigDepends = [ libxml2 ];
        description = "Bindings for the libXML2 SAX interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libxml2;};
 
   "libxslt" = callPackage
@@ -159936,8 +160647,8 @@ self: {
        libraryHaskellDepends = [ base bytestring libxml ];
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xslt = null;};
 
@@ -159949,7 +160660,7 @@ self: {
        sha256 = "1dcpbsjg6n305l07isxmavgp01lbv1qggy16acjyxjlz35pxchlg";
        libraryHaskellDepends = [ base bytestring conduit resourcet ];
        description = "Low-level, streaming YAML interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libzfs" = callPackage
@@ -159967,7 +160678,7 @@ self: {
        executableHaskellDepends = [ base mtl transformers ];
        executableSystemDepends = [ nvpair zfs ];
        description = "Bindings to libzfs, for dealing with the Z File System and Zpools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
@@ -159987,7 +160698,7 @@ self: {
          base Cabal cmdargs containers directory
        ];
        description = "A license compatibility helper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lie" = callPackage
@@ -160001,8 +160712,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Lie Algebras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160017,7 +160728,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "Conway's Life cellular automaton";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "life-sync" = callPackage
@@ -160043,7 +160754,7 @@ self: {
          text tomland
        ];
        description = "Synchronize personal configs across multiple machines";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "lift-generics" = callPackage
@@ -160065,7 +160776,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lift-read-show" = callPackage
@@ -160076,7 +160787,7 @@ self: {
        sha256 = "0sp725nflvqzxvhycjj1v9j46y4cx1vvbr9k6pfwz585n35gs1a0";
        libraryHaskellDepends = [ base ];
        description = "Helper methods to define `Read1`, `Read2`, `Show1`, `Show2` instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-async" = callPackage
@@ -160097,7 +160808,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ async base criterion deepseq ];
        description = "Run lifted IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-base" = callPackage
@@ -160118,7 +160829,7 @@ self: {
          base criterion monad-control monad-peel transformers
        ];
        description = "lifted IO operations from the base library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-base-tf" = callPackage
@@ -160141,8 +160852,8 @@ self: {
          base criterion lifted-base monad-control monad-peel transformers
        ];
        description = "lifted IO operations from the base library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160160,8 +160871,8 @@ self: {
          lifted-async lifted-base mtl safe stm text transformers
        ];
        description = "A sensible set of defaults for writing lifted custom Preludes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160178,7 +160889,7 @@ self: {
          transformers-base transformers-compat
        ];
        description = "STM operations lifted through monad transformer stacks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-threads" = callPackage
@@ -160193,7 +160904,7 @@ self: {
          base monad-control threads transformers-base
        ];
        description = "lifted IO operations from the threads library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifter" = callPackage
@@ -160211,8 +160922,8 @@ self: {
          array base bitmap bytestring directory filepath gloss mtl stb-image
        ];
        description = "A boulderdash-like game and solution validator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160224,8 +160935,8 @@ self: {
        sha256 = "03h30lbhppi9hmpsc8fhsrsad6w9sjs9n53lz76czz3iqaknkcrb";
        libraryHaskellDepends = [ base text ];
        description = "Expand ligatures in unicode text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160237,7 +160948,7 @@ self: {
        sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp";
        libraryHaskellDepends = [ base ];
        description = "Lightweight Implementation of Generics and Dynamics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "light" = callPackage
@@ -160251,7 +160962,7 @@ self: {
        libraryHaskellDepends = [ base containers gjk2d lens linear mtl ];
        testHaskellDepends = [ base containers lens linear QuickCheck ];
        description = "a simple physics engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lightning-haskell" = callPackage
@@ -160272,8 +160983,8 @@ self: {
          aeson api-builder base bytestring hspec text transformers
        ];
        description = "Haskell client for lightning-viz REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160305,8 +161016,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "LightStep OpenTracing client library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160323,8 +161034,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160341,8 +161052,8 @@ self: {
          template-haskell
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160359,8 +161070,8 @@ self: {
          prettify process semigroups vector-space
        ];
        description = "Bindings to Lilypond";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160377,7 +161088,7 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
        description = "representation of Integer Linear Programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "limp-cbc" = callPackage
@@ -160394,8 +161105,8 @@ self: {
          base limp QuickCheck tasty tasty-quickcheck
        ];
        description = "bindings for integer linear programming solver Coin/CBC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160407,7 +161118,7 @@ self: {
        sha256 = "0yfw2m1l7240xir3qa8i11c5q7appaji4kgcjyhdc0rz6p3j55iy";
        libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linda" = callPackage
@@ -160418,8 +161129,8 @@ self: {
        sha256 = "0d58i69hvry9vzr4i7f1yhhm99808vqw238hfjc3sr51plc1is45";
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160449,8 +161160,8 @@ self: {
          base containers hashable mtl random-fu rosezipper text uuid warp
        ];
        description = "Zen gardening, based on l-systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160462,7 +161173,7 @@ self: {
        sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1";
        libraryHaskellDepends = [ base ];
        description = "L-systems in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "line" = callPackage
@@ -160485,7 +161196,7 @@ self: {
          text time transformers
        ];
        description = "Haskell SDK for the LINE API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "line-bot-sdk" = callPackage
@@ -160499,8 +161210,8 @@ self: {
      }:
      mkDerivation {
        pname = "line-bot-sdk";
-       version = "0.5.2";
-       sha256 = "1vrfq9v8lv5nwdmy7n99p7dnm10b35ng5n24ncjq54i0ci2ldi75";
+       version = "0.6.0";
+       sha256 = "13flx2vkm2112agygb4f1924mq79a8i1739mm8lp8v2v32cjngp5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160515,12 +161226,12 @@ self: {
        testHaskellDepends = [
          aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256
          deepseq free hspec hspec-expectations hspec-wai http-client
-         http-types servant servant-client servant-client-core
-         servant-server text time transformers wai warp
+         http-client-tls http-types servant servant-client
+         servant-client-core servant-server text time transformers wai warp
        ];
        description = "Haskell SDK for LINE Messaging API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160534,7 +161245,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Convert newlines in text";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "line-drawing" = callPackage
@@ -160546,7 +161257,9 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "raster line drawing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "line-size" = callPackage
@@ -160559,7 +161272,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Display the number of bytes of each line";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "line2pdf" = callPackage
@@ -160573,7 +161286,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        executableHaskellDepends = [ base bytestring containers ];
        description = "Simple command-line utility to convert text into PDF";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear" = callPackage
@@ -160601,7 +161314,7 @@ self: {
          simple-reflect test-framework test-framework-hunit vector
        ];
        description = "Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-accelerate" = callPackage
@@ -160618,7 +161331,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Lifting linear vector spaces into Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -160638,8 +161351,8 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A linear algebra library with bindings to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160661,8 +161374,8 @@ self: {
          utility-ht
        ];
        description = "Compute resistance of linear electrical circuits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160688,8 +161401,8 @@ self: {
          tasty-smallcheck
        ];
        description = "A simple library for linear codes (coding theory, error correction)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160702,7 +161415,7 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A simple grammar for building linear equations and inclusive inequalities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-maps" = callPackage
@@ -160716,8 +161429,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160733,8 +161446,8 @@ self: {
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
        description = "Isomorphisms between linear and OpenGL types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160747,7 +161460,7 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        testHaskellDepends = [ base hspec network tasty-hspec ];
        description = "Typed sockets";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "linear-tests" = callPackage
@@ -160762,7 +161475,7 @@ self: {
          base hspec hspec-core lens linear QuickCheck
        ];
        description = "Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-vect" = callPackage
@@ -160773,8 +161486,8 @@ self: {
        sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy";
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160786,7 +161499,7 @@ self: {
        sha256 = "0lrrgix4m2sbfw9ydcqnx45lka0grl8ndiiy3cs1xg4xpcy2fkjw";
        libraryHaskellDepends = [ base sbv ];
        description = "Use SMT solvers to solve linear systems over integers and rationals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linearmap-category" = callPackage
@@ -160805,8 +161518,8 @@ self: {
          semigroups tagged transformers vector vector-space
        ];
        description = "Native, complete, matrix-free linear algebra";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160820,8 +161533,8 @@ self: {
          base containers ghc-prim mtl transformers
        ];
        description = "Linear scan register allocator, formally verified in Coq";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160842,8 +161555,8 @@ self: {
          lens-family-core linearscan QuickCheck transformers
        ];
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160855,7 +161568,7 @@ self: {
        sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7";
        libraryHaskellDepends = [ base hyphenation ];
        description = "breaks strings to fit width";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linenoise" = callPackage
@@ -160875,7 +161588,7 @@ self: {
          base bytestring exceptions mtl text unliftio-core
        ];
        description = "A lightweight readline-replacement library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lines-of-action" = callPackage
@@ -160886,8 +161599,8 @@ self: {
        sha256 = "1sikhdahhxqi9i285zphbpnz60vyxjdhvz2qd70hmy7x3ckymb42";
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160910,7 +161623,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "File extension based programming language detection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linguistic-ordinals" = callPackage
@@ -160921,7 +161634,7 @@ self: {
        sha256 = "11f01j9qak8rhaj84gkx27qhfc334cj9pchi7qcb6brpqbwgdsik";
        libraryHaskellDepends = [ base text ];
        description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "link-relations" = callPackage
@@ -160936,7 +161649,7 @@ self: {
          base bytestring hashable unordered-containers uri-bytestring
        ];
        description = "Use web link relation types (RFC 5988) in Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "linkchk" = callPackage
@@ -160954,7 +161667,7 @@ self: {
        ];
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160971,8 +161684,8 @@ self: {
          base containers extcore filepath process
        ];
        description = "Combines multiple GHC Core modules into a single module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160985,8 +161698,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "A pure linked list which is mutable through iterators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161009,8 +161722,8 @@ self: {
          base containers criterion deepseq hashable unordered-containers
        ];
        description = "Persistent LinkedHashMap data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161033,8 +161746,8 @@ self: {
          uri-bytestring wai wreq
        ];
        description = "A Haskell library for the Slack API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161061,8 +161774,8 @@ self: {
          uri-encode wai warp
        ];
        description = "Lightweight library for building HTTP API";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161080,8 +161793,8 @@ self: {
          quickcheck-instances text
        ];
        description = "Aeson JSON support for Linnet";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161102,8 +161815,8 @@ self: {
          quickcheck-classes quickcheck-instances wai warp
        ];
        description = "Conduit-backed support for streaming in Linnet";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161125,8 +161838,8 @@ self: {
          text
        ];
        description = "Bindings to the Linode API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161143,8 +161856,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Haskell wrapper for the Linode v4 API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161161,8 +161874,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ blkid ];
        description = "Linux libblkid";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {blkid = null;};
 
@@ -161174,8 +161887,8 @@ self: {
        sha256 = "0dd1ii1n6y9frilnkxikzahp9xrh3i334i7syvd8fyxp51dpzgy1";
        libraryHaskellDepends = [ base filepath ];
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161189,7 +161902,7 @@ self: {
        editedCabalFile = "1gnjyc8q7xq60pm362hwibwh97jw8pv66xvqv88cm9nbh0ccf6q2";
        libraryHaskellDepends = [ base bytestring time unix ];
        description = "Bindings to Linux evdev input device interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-file-extents" = callPackage
@@ -161202,7 +161915,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        description = "Retrieve file fragmentation information under Linux";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-framebuffer" = callPackage
@@ -161214,7 +161927,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL unix ];
        description = "Linux fbdev (framebuffer device, /dev/fbX) utility functions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "linux-inotify" = callPackage
@@ -161225,7 +161938,7 @@ self: {
        sha256 = "1dl71xkfjlwjsmv0mqf2fpkfjl3hyzk5q1drsykg7rdblpjfbzlc";
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-kmod" = callPackage
@@ -161237,8 +161950,8 @@ self: {
        libraryHaskellDepends = [ base directory ];
        libraryPkgconfigDepends = [ libkmod ];
        description = "Linux kernel modules support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libkmod = null;};
 
@@ -161250,7 +161963,7 @@ self: {
        sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi";
        libraryHaskellDepends = [ base bytestring ];
        description = "Mount and unmount filesystems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-namespaces" = callPackage
@@ -161261,7 +161974,7 @@ self: {
        sha256 = "1rvkzfmd07sz46k059ly80cjgwx67igfw8zsw8c6ljsp3hsdn4hl";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Work with linux namespaces: create new or enter existing ones";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-perf" = callPackage
@@ -161283,8 +161996,8 @@ self: {
          unix
        ];
        description = "Read files generated by perf on Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161302,8 +162015,8 @@ self: {
          base bytestring mmap posix-waitpid process template-haskell unix
        ];
        description = "Wrapping of Linux' ptrace(2)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161315,7 +162028,7 @@ self: {
        sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6";
        libraryHaskellDepends = [ base bytestring ];
        description = "Read, set and list extended attributes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linx-gateway" = callPackage
@@ -161335,8 +162048,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementation of the Enea LINX gateway protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161348,7 +162061,7 @@ self: {
        sha256 = "04hcbvxskjji04sxx4jydac62sh6h7jlggn7kfwm8axmwjczjjqs";
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lio-eci11" = callPackage
@@ -161365,7 +162078,7 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161382,7 +162095,7 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -161406,8 +162119,8 @@ self: {
          simple-templates text
        ];
        description = "LIO support for the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161419,8 +162132,8 @@ self: {
        sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generators for random sequences of English-like nonsense text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161445,8 +162158,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
        description = "Liquid template language library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161460,8 +162173,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ];
        description = "Drop-in base replacement for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161477,8 +162190,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ];
        description = "LiquidHaskell specs for the bytestring package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161494,8 +162207,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ containers liquid-base liquidhaskell ];
        description = "LiquidHaskell specs for the containers package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161529,7 +162242,7 @@ self: {
        testSystemDepends = [ git nettools z3 ];
        doCheck = false;
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) git; inherit (pkgs) nettools; 
          inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
@@ -161543,8 +162256,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ ghc-prim liquidhaskell ];
        description = "Drop-in ghc-prim replacement for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161559,8 +162272,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ liquid-base liquidhaskell parallel ];
        description = "LiquidHaskell specs for the parallel package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161580,8 +162293,8 @@ self: {
          liquid-prelude liquid-vector liquidhaskell process
        ];
        description = "A battery-included platform for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161598,8 +162311,8 @@ self: {
          bytestring containers liquid-base liquidhaskell
        ];
        description = "General utility modules for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161613,8 +162326,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ liquid-base liquidhaskell vector ];
        description = "LiquidHaskell specs for the vector package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161655,7 +162368,7 @@ self: {
        ];
        testSystemDepends = [ z3 ];
        description = "Liquid Types for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
   "liquidhaskell-cabal" = callPackage
@@ -161668,8 +162381,8 @@ self: {
        editedCabalFile = "0c76lchw32dzfn8q4qckxqjzcnw909x7niiwlzadas8mv9p93ybl";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "Liquid Haskell integration for Cabal and Stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161686,7 +162399,7 @@ self: {
        executableHaskellDepends = [ base liquidhaskell-cabal ];
        description = "Demo of Liquid Haskell integration for Cabal and Stack";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lispparser" = callPackage
@@ -161697,7 +162410,7 @@ self: {
        sha256 = "1hj5fwmzxp2gw2gx86wa1fy36jmmh3sf8kd4acc8x0rghpmlw0w8";
        libraryHaskellDepends = [ base parsec ];
        description = "Simple parser for LISP S-expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-duplicate" = callPackage
@@ -161709,7 +162422,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Group and delete duplicates from a list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-extras" = callPackage
@@ -161720,7 +162433,7 @@ self: {
        sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
        libraryHaskellDepends = [ base ];
        description = "Common not-so-common functions for lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-filter" = callPackage
@@ -161732,7 +162445,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Special takes and drops on lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-fusion-probe" = callPackage
@@ -161744,8 +162457,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161757,7 +162470,7 @@ self: {
        sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l";
        libraryHaskellDepends = [ base ];
        description = "Functions for grouping a list into sublists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-mux" = callPackage
@@ -161768,8 +162481,8 @@ self: {
        sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys";
        libraryHaskellDepends = [ base ];
        description = "List Multiplexing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161782,7 +162495,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Predicates on lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-prompt" = callPackage
@@ -161802,8 +162515,8 @@ self: {
          ansi-terminal base data-default hspec stm terminal-size vty
        ];
        description = "A simple list prompt UI for the terminal";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161830,8 +162543,8 @@ self: {
          MissingH tasty tasty-hunit tasty-quickcheck
        ];
        description = "List all remote forwards for mail accounts stored in a SQL database";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161843,7 +162556,7 @@ self: {
        sha256 = "0mb2kwj3gvykwh0iywwzqdnma27nxs1hl1rvnp3qxi893p4ikyiw";
        libraryHaskellDepends = [ base ];
        description = "Easily and clearly create lists with only one element in them";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "list-t" = callPackage
@@ -161859,7 +162572,7 @@ self: {
        ];
        testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
        description = "ListT done right";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -161877,8 +162590,8 @@ self: {
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
        description = "An \"attoparsec\" adapter for \"list-t\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161902,8 +162615,8 @@ self: {
          list-t-attoparsec list-t-text text xml-types
        ];
        description = "Streaming HTML parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161919,8 +162632,8 @@ self: {
          base-prelude bytestring http-client list-t mtl-prelude
        ];
        description = "A streaming HTTP client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161937,7 +162650,7 @@ self: {
          resource-pool stm
        ];
        description = "A \"libcurl\"-based streaming HTTP client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "list-t-text" = callPackage
@@ -161956,8 +162669,8 @@ self: {
          quickcheck-instances text transformers
        ];
        description = "A streaming text codec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161965,12 +162678,12 @@ self: {
     ({ mkDerivation, base, doctest, mtl }:
      mkDerivation {
        pname = "list-transformer";
-       version = "1.0.6";
-       sha256 = "0gc36nhx3a8rks943fyrnqzp47cp8gg58yijpfqxig086gblmwpl";
+       version = "1.0.7";
+       sha256 = "1i8zmds67fyglbw1ygcyffly5ykq62p2hcm23vxrxvj3ryq9iih8";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
        description = "List monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-tries" = callPackage
@@ -161988,7 +162701,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Tries and Patricia tries: finite sets and maps for list keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-tuple" = callPackage
@@ -162007,7 +162720,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "List-like operations for tuples";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "list-witnesses" = callPackage
@@ -162023,8 +162736,8 @@ self: {
          vinyl
        ];
        description = "Witnesses for working with type-level lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162036,8 +162749,8 @@ self: {
        sha256 = "0sklydccvdbxnj0c79lj7pcvw5v0bkycs9zp566gdcfy08qcjq79";
        libraryHaskellDepends = [ base ];
        description = "Provides zips with default values";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162060,8 +162773,8 @@ self: {
          tasty-hedgehog tasty-hunit tasty-quickcheck transformers
        ];
        description = "A list zipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162079,8 +162792,8 @@ self: {
          servant servant-client text time transformers
        ];
        description = "A client library to the ListenBrainz project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162092,8 +162805,8 @@ self: {
        sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm";
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
        description = "Extra instances of the ListLike class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162105,7 +162818,7 @@ self: {
        sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
        libraryHaskellDepends = [ base list-extras split ];
        description = "Functions for dealing with lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lists-flines" = callPackage
@@ -162116,7 +162829,7 @@ self: {
        sha256 = "0srpivpf43xn0zj64phq90hkrchjih92sxx984c5zx9nrrcvyxwf";
        libraryHaskellDepends = [ base ];
        description = "Additional data and structures to some 'String'-related lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "listsafe" = callPackage
@@ -162127,7 +162840,7 @@ self: {
        sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs";
        libraryHaskellDepends = [ base exceptions ];
        description = "Safe wrappers for partial list functions, supporting MonadThrow";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "liszt" = callPackage
@@ -162162,8 +162875,8 @@ self: {
          vector vector-th-unbox winery
        ];
        description = "Append only key-list database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162184,7 +162897,7 @@ self: {
        ];
        description = "A simple tool for literate programming";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162196,8 +162909,8 @@ self: {
        sha256 = "06n4svp0qss78l8827qmppmd63877wq01d6w9xagd10vn3c4hs2j";
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162217,8 +162930,8 @@ self: {
          unliftio-core
        ];
        description = "Basic logging based on co-log";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162235,7 +162948,7 @@ self: {
          resourcet unliftio-core
        ];
        description = "When you need just the RIO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "live-sequencer" = callPackage
@@ -162263,7 +162976,7 @@ self: {
        ];
        description = "Live coding of MIDI music";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162286,8 +162999,8 @@ self: {
        ];
        executableHaskellDepends = [ base mvc pipes ];
        description = "Liveplotting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {andromeda = null;};
 
@@ -162299,8 +163012,8 @@ self: {
        sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ picosat ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) picosat;};
 
@@ -162312,7 +163025,7 @@ self: {
        sha256 = "057bp1f1mpzlgg408b02x1bdzsixrrkcl1536nyvhp43rvxmgj61";
        libraryHaskellDepends = [ base ];
        description = "Purely functional sets and heaps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "llsd" = callPackage
@@ -162332,8 +163045,8 @@ self: {
          time utf8-string uuid
        ];
        description = "An implementation of the LLSD data system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162350,8 +163063,8 @@ self: {
          type-level
        ];
        description = "Bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162379,8 +163092,8 @@ self: {
          llvm-data-interop transformers uniplate unordered-containers
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162392,8 +163105,8 @@ self: {
        sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n";
        libraryHaskellDepends = [ base mtl ];
        description = "FFI bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162414,8 +163127,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162427,8 +163140,8 @@ self: {
        sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w";
        libraryHaskellDepends = [ base llvm-base ];
        description = "Utilities for bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162449,8 +163162,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162468,8 +163181,8 @@ self: {
          storable-enum storable-record tfp transformers utility-ht
        ];
        description = "Support for writing an EDSL with LLVM-JIT as target";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162488,8 +163201,8 @@ self: {
          tfp transformers unsafe utility-ht
        ];
        description = "Processor specific intrinsics for the llvm interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162515,8 +163228,8 @@ self: {
        ];
        doHaddock = false;
        description = "Utility functions for the llvm interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162531,8 +163244,8 @@ self: {
        libraryHaskellDepends = [ base enumset ];
        librarySystemDepends = [ LLVM ];
        description = "FFI bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {LLVM = null;};
 
@@ -162550,8 +163263,8 @@ self: {
          base bytestring containers regex-posix utility-ht
        ];
        description = "Tools for maintaining the llvm-ffi package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162578,8 +163291,8 @@ self: {
          transformers transformers-compat
        ];
        description = "General purpose LLVM bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {llvm-config = null;};
 
@@ -162600,8 +163313,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162625,8 +163338,8 @@ self: {
          base containers HUnit llvm-general-pure tasty tasty-hunit
        ];
        description = "QuasiQuoting llvm code for llvm-general";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162653,7 +163366,7 @@ self: {
          transformers
        ];
        description = "General purpose LLVM bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {llvm-config = null;};
 
   "llvm-hs-pretty" = callPackage
@@ -162673,7 +163386,7 @@ self: {
          tasty-hspec tasty-hunit text transformers
        ];
        description = "A pretty printer for LLVM IR";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "llvm-hs-pure" = callPackage
@@ -162693,7 +163406,7 @@ self: {
          base containers mtl tasty tasty-hunit tasty-quickcheck transformers
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "llvm-ht" = callPackage
@@ -162708,8 +163421,8 @@ self: {
          base bytestring directory mtl process type-level
        ];
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162728,8 +163441,8 @@ self: {
          base Cabal explicit-exception process transformers utility-ht
        ];
        description = "Generate Pkg-Config configuration file for LLVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162746,8 +163459,8 @@ self: {
          template-haskell th-abstraction
        ];
        description = "A pretty printing library inspired by the llvm binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162774,8 +163487,8 @@ self: {
          base bytestring directory filepath llvm-pretty process
        ];
        description = "LLVM bitcode parsing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162797,8 +163510,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tfp utility-ht ];
        doHaddock = false;
        description = "Bindings to the LLVM compiler toolkit using type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162826,8 +163539,8 @@ self: {
          process-conduit unordered-containers
        ];
        description = "Useful tools built on llvm-analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162840,7 +163553,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ lmdb ];
        description = "Lightning MDB bindings";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {inherit (pkgs) lmdb;};
 
   "lmdb-high-level" = callPackage
@@ -162862,7 +163575,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Higher level API for working with LMDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lmdb-simple" = callPackage
@@ -162877,7 +163590,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Simple API for LMDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lmonad" = callPackage
@@ -162897,8 +163610,8 @@ self: {
          transformers-base
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162919,8 +163632,8 @@ self: {
          yesod-persistent
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162932,8 +163645,8 @@ self: {
        sha256 = "1vszir1b79fdn545k3k86mgqhivyg8s5vv5v24y4cp4cc47aiwmi";
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
        description = "Client-side load balancing utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162950,7 +163663,7 @@ self: {
          base directory doctest hspec parsec temporary
        ];
        description = "Load environment variables from a file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "load-font" = callPackage
@@ -162966,8 +163679,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
        description = "A cross platform library for loading bundled fonts into your application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162979,7 +163692,7 @@ self: {
        sha256 = "13q2yxqyzkh099jwz32plmdc71p4w2gkajx5bbi3fkvl2gylqlk6";
        libraryHaskellDepends = [ base ];
        description = "Load average parsing from /proc/loadavg and bindings to getloadavg (3)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "loc" = callPackage
@@ -162991,7 +163704,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog ];
        description = "Types representing line and column positions and ranges in text files";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "loc-test" = callPackage
@@ -163002,7 +163715,7 @@ self: {
        sha256 = "0jg6p0lfd5xgrwbmlskj5f1x8l5b0b3dqh460ds2nii8isccgvcq";
        libraryHaskellDepends = [ base containers hedgehog loc ];
        description = "Test-related utilities related to the /loc/ package";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "local-address" = callPackage
@@ -163013,8 +163726,8 @@ self: {
        sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9";
        libraryHaskellDepends = [ base network ];
        description = "Functions to get local interface address";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163032,7 +163745,7 @@ self: {
        ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163044,7 +163757,7 @@ self: {
        sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd";
        libraryHaskellDepends = [ base containers text transformers ];
        description = "Library for localization (l10n)";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "localize" = callPackage
@@ -163062,8 +163775,8 @@ self: {
          transformers
        ];
        description = "GNU Gettext-based messages localization library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163075,8 +163788,8 @@ self: {
        sha256 = "15mkhpp2r9l94qkqdxfc0llw9nbxcj8n3a70qs5lmv416a1i4qk2";
        libraryHaskellDepends = [ base text ];
        description = "Source location helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163089,8 +163802,8 @@ self: {
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Location-aware variants of partial functions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ gridaphobe ];
      }) {};
 
   "located-monad-logger" = callPackage
@@ -163101,8 +163814,8 @@ self: {
        sha256 = "1xkckg3qgqrqmkli9d6cbzqf5aanqpbxchy650yflpjygwapn4xn";
        libraryHaskellDepends = [ base monad-logger text ];
        description = "Location-aware logging without Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163121,7 +163834,7 @@ self: {
          base bytestring containers cryptonite hspec HUnit QuickCheck
        ];
        description = "Human exchangable identifiers and locators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "loch" = callPackage
@@ -163135,8 +163848,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163148,7 +163861,7 @@ self: {
        sha256 = "1hvdkcyrlnv65q8x8h0441x30wr9bbfbg3961xd3fy9an5r961fc";
        libraryHaskellDepends = [ base pretty template-haskell ];
        description = "Support for precise error locations in source files (Template Haskell version)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lock-file" = callPackage
@@ -163168,7 +163881,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Provide exclusive access to a resource using lock file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "locked-poll" = callPackage
@@ -163189,8 +163902,8 @@ self: {
          regex-genex tasty tasty-golden tasty-hunit tasty-quickcheck time
        ];
        description = "Very simple poll lock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163211,7 +163924,7 @@ self: {
          ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "Michael and Scott lock-free queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lockpool" = callPackage
@@ -163222,7 +163935,7 @@ self: {
        sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi";
        libraryHaskellDepends = [ base clock stm ];
        description = "set a maximum on the number of concurrent actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log" = callPackage
@@ -163248,8 +163961,8 @@ self: {
          transformers-base
        ];
        description = "Structured logging solution with multiple backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163269,7 +163982,7 @@ self: {
          transformers-base unliftio-core unordered-containers
        ];
        description = "Structured logging solution (base package)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-domain" = callPackage
@@ -163292,7 +164005,7 @@ self: {
          base doctest generic-deriving semigroups simple-reflect
        ];
        description = "Log-domain arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-effect" = callPackage
@@ -163314,7 +164027,7 @@ self: {
          transformers-base
        ];
        description = "An extensible log effect using extensible-effects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "log-effect-syslog" = callPackage
@@ -163330,7 +164043,7 @@ self: {
          transformers-base
        ];
        description = "Syslog functions for log-effect";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-elasticsearch" = callPackage
@@ -163350,7 +164063,7 @@ self: {
          vector
        ];
        description = "Structured logging solution (Elasticsearch back end)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-postgres" = callPackage
@@ -163371,8 +164084,8 @@ self: {
          text-show time unordered-containers vector
        ];
        description = "Structured logging solution (PostgreSQL back end)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163395,8 +164108,8 @@ self: {
          unjson vector wai warp
        ];
        description = "Utils for working with logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163432,8 +164145,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Flexible, configurable, monadic and pretty logging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163448,7 +164161,7 @@ self: {
        executableHaskellDepends = [ base containers json parsec ];
        description = "Turn log file records into JSON";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163479,8 +164192,8 @@ self: {
          time vformat vformat-aeson vformat-time yaml
        ];
        description = "A python logging style log library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163500,8 +164213,8 @@ self: {
          base bytestring fast-logger hspec uuid-types
        ];
        description = "Request logger middleware for Logentries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163513,7 +164226,7 @@ self: {
        sha256 = "10kza99pzs0ajn6xqd66sm059xp43i2sl0mnd8257q1av1qvsx7p";
        libraryHaskellDepends = [ array base ];
        description = "Log-domain floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "logger" = callPackage
@@ -163530,8 +164243,8 @@ self: {
          time-locale-compat transformers transformers-compat unagi-chan
        ];
        description = "Fast & extensible logging framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163550,7 +164263,7 @@ self: {
        ];
        executableHaskellDepends = [ base protolude stm ];
        description = "Run FastLogger in a thread and direct all queued messages to it";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "logging" = callPackage
@@ -163568,7 +164281,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simplified logging in IO for application writers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logging-effect" = callPackage
@@ -163591,7 +164304,7 @@ self: {
          prettyprinter text time
        ];
        description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -163610,8 +164323,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Supplemental packages for `logging-effect`";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163630,8 +164343,8 @@ self: {
        ];
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "TH splices to augment log messages with file info";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163650,8 +164363,8 @@ self: {
        ];
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "Handy logging handler combinators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163664,7 +164377,7 @@ self: {
        libraryHaskellDepends = [ base call-stack transformers ];
        testHaskellDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple back-ends";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logging-facade-journald" = callPackage
@@ -163683,7 +164396,7 @@ self: {
          unordered-containers
        ];
        description = "Journald back-end for logging-facade";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -163694,8 +164407,8 @@ self: {
        sha256 = "1acfkmr3cgprij9sfa0hfqyni6s8py22s3n0xa8qhy3syz1j72zb";
        libraryHaskellDepends = [ base hsyslog logging-facade ];
        description = "A logging back-end to syslog(3) for the logging-facade library";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "logic-TPTP" = callPackage
@@ -163742,8 +164455,8 @@ self: {
          PropLogic safe set-extra syb
        ];
        description = "Framework for propositional and first order logic, theorem proving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163755,21 +164468,38 @@ self: {
        sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc";
        libraryHaskellDepends = [ base logict transformers ];
        description = "Backtracking mutable references in the ST and IO monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
-  "logict" = callPackage
+  "logict_0_7_0_3" = callPackage
     ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "logict";
        version = "0.7.0.3";
        sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r";
+       revision = "1";
+       editedCabalFile = "13hxmzaxd5iv9hjad5kw9infq0lxsgypqqb2z1i1939604a90qp4";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base mtl tasty tasty-hunit ];
        description = "A backtracking logic-programming monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "logict" = callPackage
+    ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "logict";
+       version = "0.7.1.0";
+       sha256 = "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ async base mtl tasty tasty-hunit ];
+       description = "A backtracking logic-programming monad";
+       license = lib.licenses.bsd3;
      }) {};
 
   "logict-state" = callPackage
@@ -163780,8 +164510,8 @@ self: {
        sha256 = "17rx8rj6m4jny52zh4daw6ac9pyp0yns470nm0bf2z9y69mfr63g";
        libraryHaskellDepends = [ base logict mtl transformers ];
        description = "Library for logic programming based on haskell package logict";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163794,7 +164524,7 @@ self: {
        libraryHaskellDepends = [ base deepseq text ];
        testHaskellDepends = [ base text ];
        description = "Log Level Datatype";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logplex-parse" = callPackage
@@ -163806,8 +164536,8 @@ self: {
        libraryHaskellDepends = [ base iso8601-time parsec text time ];
        testHaskellDepends = [ base hspec time ];
        description = "Parse Heroku application/logplex documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163820,7 +164550,7 @@ self: {
        libraryHaskellDepends = [ base hsyslog logging-facade time ];
        testHaskellDepends = [ base hspec hsyslog logging-facade time ];
        description = "A logging framework for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logstash" = callPackage
@@ -163838,7 +164568,7 @@ self: {
          stm-chans time tls unbounded-delays unliftio
        ];
        description = "Logstash client library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lojban" = callPackage
@@ -163860,8 +164590,8 @@ self: {
        ];
        executableHaskellDepends = [ haskell98 ];
        description = "Useful utilities for the Lojban language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163876,8 +164606,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "lojban parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163892,8 +164622,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163907,8 +164637,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base lojbanParser yjtools ];
        description = "Prolog with lojban";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163937,8 +164667,8 @@ self: {
        ];
        testHaskellDepends = [ base test-framework ];
        description = "A library for lattice cryptography";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163959,8 +164689,8 @@ self: {
          test-framework time
        ];
        description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163977,8 +164707,8 @@ self: {
          MonadRandom split statistics
        ];
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164000,8 +164730,8 @@ self: {
          text-format transformers
        ];
        description = "Calculus for LOL (λω language)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164021,8 +164751,8 @@ self: {
        testHaskellDepends = [ base lol lol-apps test-framework ];
        benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ];
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164042,8 +164772,8 @@ self: {
        testHaskellDepends = [ base lol-tests ];
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164063,8 +164793,8 @@ self: {
        ];
        testHaskellDepends = [ base lol test-framework ];
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164089,8 +164819,8 @@ self: {
          monad-classes tasty tasty-hunit text text-format transformers
        ];
        description = "Type inferencer for LOL (λω language)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164108,8 +164838,8 @@ self: {
          template utf8-string
        ];
        description = "A minimum web dev DSL in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164121,7 +164851,7 @@ self: {
        sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g";
        libraryHaskellDepends = [ base integer-gmp ];
        description = "FFI bindings for C long double";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "longboi" = callPackage
@@ -164132,8 +164862,8 @@ self: {
        sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977";
        libraryHaskellDepends = [ base ];
        description = "Dependently-typed linked list implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164165,8 +164895,8 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell
        ];
        description = "Fast Brute-force search using parallelism";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164181,8 +164911,8 @@ self: {
        libraryHaskellDepends = [ base primitive template-haskell ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Statically generate lookup tables using Template Haskell";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164199,7 +164929,7 @@ self: {
          base criterion foldl mtl random vector
        ];
        description = "Fast loops (for when GHC can't optimize forM_)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "loop-effin" = callPackage
@@ -164210,8 +164940,8 @@ self: {
        sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52";
        libraryHaskellDepends = [ base effin ];
        description = "control-monad-loop port for effin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164223,8 +164953,8 @@ self: {
        sha256 = "1yvw91gn1iyw72rbq455zzrbb3pq8ph9cv1c6800qzjyxx0694bd";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer supporting various styles of while loop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164242,8 +164972,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "inline self-recursive definitions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164261,8 +164991,8 @@ self: {
        testHaskellDepends = [
          aeson base hspec optparse-applicative text time unliftio
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164280,8 +165010,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164300,8 +165030,8 @@ self: {
          process random
        ];
        description = "Find all biological feedback loops within an ecosystem graph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164342,8 +165072,8 @@ self: {
          unordered-containers utf8-string wai-logger xml-conduit yaml
        ];
        description = "A command line interface to online radios";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164358,8 +165088,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Library for generating filler text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164382,8 +165112,8 @@ self: {
          with-utf8
        ];
        description = "EDSL for the Michelson Language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164397,8 +165127,8 @@ self: {
        librarySystemDepends = [ loris ];
        libraryToolDepends = [ c2hs ];
        description = "interface to Loris API";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {loris = null;};
 
@@ -164417,8 +165147,8 @@ self: {
          process split
        ];
        description = "Minecraft 1.7 server proxy that answers to queries when the server is offline";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164437,7 +165167,7 @@ self: {
        ];
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164451,7 +165181,7 @@ self: {
          base bytestring JuicyPixels text vector
        ];
        description = "Turning images into text using Braille font";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "loup" = callPackage
@@ -164471,8 +165201,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164484,8 +165214,8 @@ self: {
        sha256 = "1xwxsg4bz83xg4sjm69vz7zaxi7wjnn2xlqs8gha78ylpq105szw";
        libraryHaskellDepends = [ base gl linear vector ];
        description = "Basic gl wrapper and reference";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164498,7 +165228,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Low dimensional linear algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lp-diagrams" = callPackage
@@ -164516,7 +165246,7 @@ self: {
          vector
        ];
        description = "An EDSL for diagrams based based on linear constraints";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "lp-diagrams-svg" = callPackage
@@ -164536,7 +165266,7 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164548,7 +165278,7 @@ self: {
        sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw";
        libraryHaskellDepends = [ base containers contravariant ];
        description = "a simple, pure LRU cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lrucaching" = callPackage
@@ -164568,7 +165298,7 @@ self: {
          base containers deepseq hashable hspec QuickCheck transformers
        ];
        description = "LRU cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lrucaching-haxl" = callPackage
@@ -164579,7 +165309,7 @@ self: {
        sha256 = "0pn2f671ak1grzjigyvan5wagh9vyqhsz86jfy1z281rd2pw4gk2";
        libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ];
        description = "Combine lrucaching and haxl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ls-usb" = callPackage
@@ -164597,8 +165327,8 @@ self: {
          usb-id-database vector
        ];
        description = "List USB devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164616,8 +165346,8 @@ self: {
          base bytestring Cabal containers directory filepath pretty process
        ];
        description = "List exported modules from a set of .cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164648,7 +165378,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lsp-test" = callPackage
@@ -164675,7 +165405,7 @@ self: {
          text unordered-containers
        ];
        description = "Functional test framework for LSP servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lsp-test_0_11_0_7" = callPackage
@@ -164702,8 +165432,8 @@ self: {
          text unordered-containers
        ];
        description = "Functional test framework for LSP servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lsp-types" = callPackage
@@ -164724,7 +165454,7 @@ self: {
          temporary text unordered-containers
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lss" = callPackage
@@ -164744,8 +165474,8 @@ self: {
          language-css-attoparsec text
        ];
        description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {language-css-attoparsec = null;};
 
@@ -164761,8 +165491,8 @@ self: {
          base haskell98 uu-parsinglib wx wxcore
        ];
        description = "Paint an L-System Grammar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164794,24 +165524,28 @@ self: {
          text transformers unordered-containers
        ];
        description = "Parameterized file evaluator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lti13" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-client
-     , http-types, jose-jwt, oidc-client, safe-exceptions, text
+    ({ mkDerivation, aeson, base, bytestring, containers, file-embed
+     , hspec, http-client, http-types, jose-jwt, oidc-client, QuickCheck
+     , safe-exceptions, text, th-utilities
      }:
      mkDerivation {
        pname = "lti13";
-       version = "0.1.2.2";
-       sha256 = "18l5sj2rv3lfis6hcaymn8vv7w6dbsnzl9wsfml5vfmlpb4jw8fw";
+       version = "0.2.0.0";
+       sha256 = "004zic7k2a4cii4ny3vbnwn7vwrzbfvi971xz8wgsnvnjmjnpfsq";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-types jose-jwt
          oidc-client safe-exceptions text
        ];
+       testHaskellDepends = [
+         aeson base bytestring file-embed hspec QuickCheck text th-utilities
+       ];
        description = "Core functionality for LTI 1.3.";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164831,7 +165565,7 @@ self: {
          wai wai-extra xml-conduit xml-hamlet yesod-core
        ];
        description = "Partial implementation of a service provider for LTI 1.1.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ltk" = callPackage
@@ -164852,7 +165586,7 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Leksah tool kit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk3;};
 
@@ -164864,7 +165598,7 @@ self: {
        sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g";
        libraryHaskellDepends = [ base vcd ];
        description = "Using linear temporal logic (LTL) to verify embedded software and hardware";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lua-bc" = callPackage
@@ -164882,8 +165616,8 @@ self: {
          vector
        ];
        description = "Lua bytecode parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164900,7 +165634,7 @@ self: {
          vector
        ];
        description = "Library for loading Lua bytecode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "luachunk" = callPackage
@@ -164916,8 +165650,8 @@ self: {
          text
        ];
        description = "Library functions for reading and writing Lua chunks";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164939,8 +165673,8 @@ self: {
          text-binary
        ];
        description = "Helpers for Haskell integration with Lua";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164952,7 +165686,7 @@ self: {
        sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h";
        libraryHaskellDepends = [ base unamb ];
        description = "information operators: least upper bound (lub) and greatest lower bound (glb)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucid" = callPackage
@@ -164977,7 +165711,7 @@ self: {
          base blaze-builder bytestring criterion deepseq text transformers
        ];
        description = "Clear to write, read and edit DSL for HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucid-cdn" = callPackage
@@ -164988,7 +165722,7 @@ self: {
        sha256 = "119d92xc047r98pw0phxplm57nc2jdjz6smkas9hr95mck0d16db";
        libraryHaskellDepends = [ base lucid ];
        description = "Curated list of CDN imports for lucid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lucid-colonnade" = callPackage
@@ -164999,8 +165733,8 @@ self: {
        sha256 = "0gbpfh1ky5pq0f0rz619hxfgll4yj0ky056dvrvq0s741l3gnhv8";
        libraryHaskellDepends = [ base colonnade lucid text ];
        description = "Helper functions for using lucid with colonnade";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165017,7 +165751,7 @@ self: {
        ];
        testHaskellDepends = [ base directory lucid ];
        description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lucid-foundation" = callPackage
@@ -165033,7 +165767,7 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Basic Zurb Foundation API in Lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucid-svg" = callPackage
@@ -165046,7 +165780,7 @@ self: {
          base blaze-builder lucid text transformers
        ];
        description = "DSL for SVG using lucid for HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucienne" = callPackage
@@ -165068,7 +165802,7 @@ self: {
        ];
        description = "Server side feed aggregator/reader";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165080,8 +165814,8 @@ self: {
        sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz";
        libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165097,8 +165831,8 @@ self: {
          base containers haskell98 haskgame MaybeT mtl SDL
        ];
        description = "Purely FunctionaL User Interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165113,8 +165847,8 @@ self: {
          aeson base http-client lens text vector wreq
        ];
        description = "An unofficial client for the LUIS NLP service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165128,8 +165862,8 @@ self: {
        libraryHaskellDepends = [ air base bytestring libffi ];
        librarySystemDepends = [ objc ];
        description = "Simple ObjectiveC runtime binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {objc = null;};
 
@@ -165139,8 +165873,8 @@ self: {
      }:
      mkDerivation {
        pname = "lukko";
-       version = "0.1.1.2";
-       sha256 = "1lh7cv0fqbrn8sf54xz74wq991bl8p67jcyq4ing3khcvh9x2yca";
+       version = "0.1.1.3";
+       sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          async base bytestring filepath singleton-bool tasty
@@ -165168,7 +165902,7 @@ self: {
          base contravariant exceptions mtl prettyprinter text
        ];
        description = "Trek through your code forest and make logs";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "luminance" = callPackage
@@ -165184,8 +165918,8 @@ self: {
          semigroups transformers vector void
        ];
        description = "Type-safe, type-level and stateless graphics framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165204,8 +165938,8 @@ self: {
          resourcet transformers
        ];
        description = "Luminance samples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165219,8 +165953,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts text vector ];
        description = "Create ctags compatible tags files for Haskell programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165233,8 +165967,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec transformers ];
        testHaskellDepends = [ base mtl parsec ];
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165262,8 +165996,8 @@ self: {
          text time transformers vector
        ];
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165286,8 +166020,8 @@ self: {
          array base containers directory filepath parsec wl-pprint
        ];
        description = "The Lazy Virtual Machine (LVM)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165311,8 +166045,8 @@ self: {
        sha256 = "0nxwmbcfbwpd4dx1zmcdxrb9n7q12v17khi4h4qi7hiwy2zxk8wv";
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        description = "High level Haskell bindings to LXC (Linux containers)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165342,8 +166076,8 @@ self: {
          base exceptions hspec hspec-core random text turtle uuid
        ];
        description = "LXD client written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165364,7 +166098,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text yaml
        ];
        description = "Read the configuration file of the standard LXD client";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "lye" = callPackage
@@ -165381,8 +166115,8 @@ self: {
          base containers free HCodecs lens parsers transformers trifecta
        ];
        description = "A Lilypond-compiling music box";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165400,7 +166134,7 @@ self: {
          base bytestring criterion deepseq quicklz snappy
        ];
        description = "LZ4 compression for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lz4-bytes" = callPackage
@@ -165416,8 +166150,8 @@ self: {
          base byteslice primitive tasty tasty-quickcheck
        ];
        description = "Bindings to LZ4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165441,8 +166175,8 @@ self: {
          base bytestring bytestring-arbitrary conduit QuickCheck resourcet
        ];
        description = "LZ4 compression for conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165471,8 +166205,8 @@ self: {
          unliftio-core
        ];
        description = "Conduit implementing the official LZ4 frame streaming format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165491,7 +166225,7 @@ self: {
          base bytestring criterion filepath temporary
        ];
        description = "lz4 bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lzip" = callPackage
@@ -165502,8 +166236,8 @@ self: {
        sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7";
        libraryHaskellDepends = [ base bytestring ];
        description = "Lzip compression / Lzlib bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165513,8 +166247,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "1.0.7.0";
-       sha256 = "0dwwnpfzy5sg4cylpcz3d1aq26grdq0jvidw97x2fkcq2j4d9bak";
+       version = "1.0.7.1";
+       sha256 = "18y6diahfvqvv3qp6ch1jbi9jwz6li4xm1y1c5pi2895h4c51ljf";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
@@ -165524,7 +166258,7 @@ self: {
          base bytestring criterion filepath temporary
        ];
        description = "lzlib bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lzma" = callPackage
@@ -165543,7 +166277,7 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "LZMA/XZ compression and decompression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
@@ -165554,8 +166288,8 @@ self: {
        sha256 = "1mczl0vb4zsh9y9wng30wb645crzxrhh3c19qiqhwarsxyw9rv8a";
        doHaddock = false;
        description = "liblzma C library and headers for use by LZMA bindings";
-       license = stdenv.lib.licenses.publicDomain;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       platforms = lib.platforms.none;
      }) {};
 
   "lzma-conduit" = callPackage
@@ -165575,7 +166309,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Conduit interface for lzma/xz compression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lzma-enumerator" = callPackage
@@ -165596,8 +166330,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Enumerator interface for lzma/xz compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) lzma;};
 
@@ -165618,8 +166352,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "IO-Streams interface for lzma/xz compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165635,8 +166369,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "minilzo bundled for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165653,8 +166387,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring Cabal ];
        description = "Library for talking to the mDNSResponder daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165671,8 +166405,8 @@ self: {
          base containers template-haskell text vector
        ];
        description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165684,8 +166418,8 @@ self: {
        sha256 = "0zhjpszj8qm1kqx2q7g9a41crbmqvqis7qlx65a1l36ywk78gnyd";
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165706,8 +166440,8 @@ self: {
          saltine transformers
        ];
        description = "A toolkit for working with macaroons";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165734,7 +166468,7 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring hspec ];
        description = "Macbeth - A beautiful and minimalistic FICS client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165748,7 +166482,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base binary parsec process ];
        description = "Obtain the host MAC address on *NIX and Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "machination" = callPackage
@@ -165760,7 +166494,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Plot charts as unicode strings";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "machinecell" = callPackage
@@ -165778,8 +166512,8 @@ self: {
          base doctest hspec mtl profunctors QuickCheck semigroups
        ];
        description = "Arrow based stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165804,7 +166538,7 @@ self: {
          base conduit criterion mtl pipes streaming
        ];
        description = "Networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "machines-amazonka" = callPackage
@@ -165825,8 +166559,8 @@ self: {
          monad-control mtl resourcet stm stm-containers time transformers
        ];
        description = "Machine transducers for Amazonka calls";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165847,8 +166581,8 @@ self: {
          attoparsec base bytestring machines tasty tasty-hunit text
        ];
        description = "Parse machines streams with attoparsec parsers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165860,8 +166594,8 @@ self: {
        sha256 = "0lh6q99xfmxl53gkxlrbjh1pfbkff8faxr9fycks98cfcmnlbzv0";
        libraryHaskellDepends = [ base binary bytestring machines ];
        description = "Binary utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165873,8 +166607,8 @@ self: {
        sha256 = "1rlc5pr70z899zjs2q5p7qy5pm9gjpnm9pww934cxmlwrp1sck9b";
        libraryHaskellDepends = [ base bytestring machines ];
        description = "ByteString support for machines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165890,8 +166624,8 @@ self: {
          base directory filepath machines machines-io transformers
        ];
        description = "Directory (system) utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165903,8 +166637,8 @@ self: {
        sha256 = "1n8skhf48q7dissrq7hpgsccjgh1hspjqh331m58z8id9xry133g";
        libraryHaskellDepends = [ base bytestring machines text ];
        description = "Transcode encodings with machines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165920,8 +166654,8 @@ self: {
          base bytestring chunked-data machines transformers
        ];
        description = "IO utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165936,8 +166670,8 @@ self: {
          base chunked-data machines machines-io process
        ];
        description = "Process (system) utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165952,8 +166686,8 @@ self: {
          base basic-prelude machines streaming-commons
        ];
        description = "Decompression support for machines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165966,8 +166700,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for Mach-O object format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165991,7 +166725,7 @@ self: {
          unordered-containers
        ];
        description = "An API client library for Mackerel";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "maclight" = callPackage
@@ -166015,8 +166749,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166032,8 +166766,8 @@ self: {
          base containers managed mtl profunctors tagged transformers
        ];
        description = "Haskell bindings to C-based Mac OS SDK frameworks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166053,8 +166787,8 @@ self: {
          filepath graph-visit mtl process transformers unix
        ];
        description = "Make a macosx app standalone deployable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166079,8 +166813,8 @@ self: {
          process unix uuid
        ];
        description = "Alternative rm command for macOS that remove files/dirs to the system trash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166103,7 +166837,7 @@ self: {
          random-shuffle raw-strings-qq transformers
        ];
        description = "Monadic DSL for building constraint solvers using basic propagators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "madlang" = callPackage
@@ -166133,8 +166867,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-megaparsec text ];
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
        description = "Randomized templating language DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166150,8 +166884,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl random ];
        executableSystemDepends = [ ncurses ];
        description = "Rogue-like";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -166164,7 +166898,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ file ];
        description = "Interface to C file/magic library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) file;};
 
   "magic-tyfams" = callPackage
@@ -166175,8 +166909,8 @@ self: {
        sha256 = "1vgbbmv2807cyi6hh2137nw6dldn84qall828d64lg2ja6zj6xii";
        libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ];
        description = "Write plugins for magic type families with ease";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166207,8 +166941,8 @@ self: {
          spake2 stm tasty tasty-hedgehog tasty-hspec
        ];
        description = "Interact with Magic Wormhole";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166239,8 +166973,8 @@ self: {
          wai-middleware-metrics
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166258,8 +166992,8 @@ self: {
          base comfort-array lapack transformers utility-ht
        ];
        description = "Compute solutions for Magico puzzle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166273,8 +167007,8 @@ self: {
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
        testHaskellDepends = [ base ghc-prim ];
        description = "magma is an algebraic structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166286,7 +167020,7 @@ self: {
        sha256 = "006axj7hwdiq3gyxx9rpqz9ji1g7xpal7j8wrlgfa2as1s73076b";
        libraryHaskellDepends = [ base ];
        description = "Magma-like objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mahoro" = callPackage
@@ -166307,7 +167041,7 @@ self: {
        ];
        description = "ImageBoards to XMPP gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166329,8 +167063,8 @@ self: {
          text
        ];
        description = "A simple static web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166353,27 +167087,25 @@ self: {
          optparse-applicative resource-pool time
        ];
        description = "Preconfigured email connection pool on top of smtp";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "mail-reports" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, mtl, resourcet, streaming
-     , streaming-bytestring, streaming-utils, text, time, xml
-     , zip-archive
+    ({ mkDerivation, aeson, base, bytestring, mtl, text, time, xml
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "mail-reports";
-       version = "0.2.0.0";
-       sha256 = "1g3jazpcyhsmiz9i9vx0n784n2n9nqzrbbnjhjlzji2si9gnkg9z";
+       version = "0.3.0.0";
+       sha256 = "10n3q21d3ihqj1v2zsi4674jbvwbfjh0bkan6nml30k3ahw86xxa";
        libraryHaskellDepends = [
-         aeson base bytestring mtl resourcet streaming streaming-bytestring
-         streaming-utils text time xml zip-archive
+         aeson base bytestring mtl text time xml zip-archive zlib
        ];
        description = "A parser library for DMARC and SMTP TLS reports";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166398,7 +167130,7 @@ self: {
          tasty-hunit
        ];
        description = "Count mailboxes in a SQL database";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "mailchimp" = callPackage
@@ -166416,8 +167148,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Bindings for the MailChimp API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166436,8 +167168,8 @@ self: {
          text transformers wai-extra
        ];
        description = "MailChimp subscription request handler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166457,8 +167189,8 @@ self: {
          these time transformers unordered-containers wreq
        ];
        description = "API binding for Mailgun";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166475,7 +167207,7 @@ self: {
          base bytestring hspec hspec-core QuickCheck text
        ];
        description = "Capture stdout/stderr/exit code, and replace stdin of your main function";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mainland-pretty" = callPackage
@@ -166488,7 +167220,7 @@ self: {
          base containers srcloc text transformers
        ];
        description = "Pretty printing designed for printing source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "majordomo" = callPackage
@@ -166508,8 +167240,8 @@ self: {
          base bytestring cmdargs threads unix
        ];
        description = "Majordomo protocol for ZeroMQ";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166521,8 +167253,8 @@ self: {
        sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka";
        libraryHaskellDepends = [ haskell2010 ];
        description = "Boyer-Moore Majority Vote Algorithm";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166541,7 +167273,7 @@ self: {
        ];
        description = "Change duplicated files into hard-links";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166553,8 +167285,8 @@ self: {
        sha256 = "1bls9gfdlwvaq90g2dllc4vb2rrp6zplx12g35byx6xvwj26lxra";
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Make a MonoFoldable type into an ordinary Foldable type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166575,8 +167307,8 @@ self: {
          github haskeline lens lens-datetime mtl process text time
        ];
        description = "Make a cabalized package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166588,8 +167320,8 @@ self: {
        sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n";
        libraryHaskellDepends = [ base directory filepath HSH process ];
        description = "Helper for writing redo scripts in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166607,8 +167339,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Simple Makefile parser and generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166636,8 +167368,8 @@ self: {
          unordered-containers
        ];
        description = "Database migration and testing as a library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166653,7 +167385,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Static Website Generator in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "managed" = callPackage
@@ -166664,7 +167396,7 @@ self: {
        sha256 = "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "manatee" = callPackage
@@ -166684,8 +167416,8 @@ self: {
          template-haskell text unix utf8-string
        ];
        description = "The Haskell/Gtk+ Integrated Live Environment";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166711,8 +167443,8 @@ self: {
        ];
        doHaddock = false;
        description = "Virtual package to install all Manatee packages";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "manatee-anything" = callPackage
@@ -166732,8 +167464,8 @@ self: {
          split stm text unix utf8-string
        ];
        description = "Multithread interactive input/search framework for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166753,8 +167485,8 @@ self: {
          mtl stm text utf8-string webkit
        ];
        description = "Browser extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "manatee-core" = callPackage
@@ -166777,8 +167509,8 @@ self: {
          template-haskell text time unix utf8-string
        ];
        description = "The core of Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166801,8 +167533,8 @@ self: {
          old-time regex-tdfa stm template-haskell text utf8-string
        ];
        description = "Download Manager extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166823,8 +167555,8 @@ self: {
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
        description = "Editor extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166845,8 +167577,8 @@ self: {
          manatee-core mtl old-locale old-time stm text utf8-string
        ];
        description = "File manager extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166867,8 +167599,8 @@ self: {
          gtkimageview manatee-core regex-tdfa stm text utf8-string
        ];
        description = "Image viewer extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166893,8 +167625,8 @@ self: {
          regex-posix split stm template-haskell text unix utf8-string
        ];
        description = "IRC client extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166916,8 +167648,8 @@ self: {
          text time unix utf8-string
        ];
        description = "Mplayer client extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166938,8 +167670,8 @@ self: {
          manatee-core mtl poppler stm text utf8-string
        ];
        description = "PDF viewer extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166959,8 +167691,8 @@ self: {
          proc stm text
        ];
        description = "Process manager extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166981,8 +167713,8 @@ self: {
          filepath gtk manatee-core stm text utf8-string webkit
        ];
        description = "Feed reader extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "manatee-template" = callPackage
@@ -167001,8 +167733,8 @@ self: {
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
        description = "Template code to create Manatee application";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167022,8 +167754,8 @@ self: {
          stm text unix vte
        ];
        description = "Terminal Emulator extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167043,8 +167775,8 @@ self: {
          filepath gtk manatee-core regex-tdfa stm text
        ];
        description = "Welcome module to help user play Manatee quickly";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167058,7 +167790,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Simple mancala game";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "mandrill" = callPackage
@@ -167082,8 +167814,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Library for interfacing with the Mandrill JSON API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167102,8 +167834,8 @@ self: {
          array base bytestring containers directory filepath GLUT hslua time
        ];
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167142,8 +167874,8 @@ self: {
          unordered-containers utf8-string vector wai warp x509-system
        ];
        description = "Bindings to the MangoPay API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167160,8 +167892,8 @@ self: {
          semigroups vector-space
        ];
        description = "Sampling random points on general manifolds";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167191,8 +167923,8 @@ self: {
          tasty-hunit tasty-quickcheck vector-space
        ];
        description = "Coordinate-free hypersurfaces";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167204,7 +167936,7 @@ self: {
        sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        description = "The basic classes for the manifolds hierarchy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "map-classes" = callPackage
@@ -167220,7 +167952,7 @@ self: {
          utility-ht
        ];
        description = "A set of classes and instances for working with key/value mappings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "map-exts" = callPackage
@@ -167234,8 +167966,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base bytestring cassava containers ];
        description = "Extensions to Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167263,7 +167995,7 @@ self: {
          unordered-containers
        ];
        description = "foldl wrappers for map-reduce";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "map-syntax" = callPackage
@@ -167281,7 +168013,7 @@ self: {
          base containers deepseq hspec HUnit mtl QuickCheck transformers
        ];
        description = "Syntax sugar for defining maps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mapalgebra" = callPackage
@@ -167301,8 +168033,8 @@ self: {
          tasty-hunit tasty-quickcheck vector
        ];
        description = "Efficient, polymorphic Map Algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167325,8 +168057,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167342,7 +168074,7 @@ self: {
          aeson base bytestring exceptions goggles mtl req text
        ];
        description = "Bindings to the MapQuest API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "maquinitas-tidal" = callPackage
@@ -167353,7 +168085,7 @@ self: {
        sha256 = "0apr5qkir3b6mnczi50lf3p349p1q3bl1sn4yg9dls2n3m147mf7";
        libraryHaskellDepends = [ base tidal ];
        description = "library for MIDI control of hardware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "marihana" = callPackage
@@ -167369,7 +168101,7 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        testHaskellDepends = [ base directory filepath process ];
        description = "Minimal tool to make your blog in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "marionetta" = callPackage
@@ -167386,8 +168118,8 @@ self: {
          base containers gloss mtl splines vector vector-space
        ];
        description = "A study of marionetta movements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167411,7 +168143,7 @@ self: {
          containers directory filepath hspec text transformers
        ];
        description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "markdown-kate" = callPackage
@@ -167433,8 +168165,8 @@ self: {
          system-filepath text transformers
        ];
        description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167446,8 +168178,8 @@ self: {
        sha256 = "0cq0s9yixkg98vhsgiv1xjia2cn0b4q6gjl1wv0q7yrm26anaqcq";
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167469,7 +168201,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Literate Haskell support for Markdown";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "markdown2svg" = callPackage
@@ -167487,8 +168219,8 @@ self: {
          papillon png-file yjsvg
        ];
        description = "markdown to svg converter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167501,8 +168233,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base ];
        description = "Pretty-printing library, with scoping, based on pretty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167514,7 +168246,7 @@ self: {
        sha256 = "1ka44rvrl9ppshbjmk95997cna670bqwjsharcr9qsalp6pchmdf";
        libraryHaskellDepends = [ base ];
        description = "Simple interpreter for Markov's normal algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "markov-chain" = callPackage
@@ -167542,7 +168274,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Computations for Markov chain usage models";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "markov-processes" = callPackage
@@ -167558,8 +168290,8 @@ self: {
        ];
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167572,8 +168304,8 @@ self: {
        libraryHaskellDepends = [ base comonad MonadRandom ];
        testHaskellDepends = [ base HTF MonadRandom ];
        description = "Realizations of Markov chains";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167592,8 +168324,8 @@ self: {
          text transformers-base urlpath
        ];
        description = "Abstraction for HTML-embedded content";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167614,8 +168346,8 @@ self: {
          pandoc temporary text transformers webkit
        ];
        description = "A simple markup document preview (markdown, textile, reStructuredText)";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "marmalade-upload" = callPackage
@@ -167642,8 +168374,8 @@ self: {
          aeson base exceptions tasty tasty-hunit text transformers
        ];
        description = "Upload packages to Marmalade";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167678,8 +168410,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167695,8 +168427,8 @@ self: {
          array base bytestring colour gloss MonadRandom mtl random
        ];
        description = "Generates mountainous terrain using a random walk algorithm";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167712,7 +168444,7 @@ self: {
          base bytestring kan-extensions lens mtl
        ];
        description = "A ContT-based wrapper for Haskell-to-C marshalling functions";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "marvin" = callPackage
@@ -167746,8 +168478,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A framework for modular, portable chat bots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167764,8 +168496,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "Compile time string interpolation a la Scala and CoffeeScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167789,7 +168521,7 @@ self: {
          base configurator dlist parsek pretty
        ];
        description = "Markup language preprocessor for Haskell";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -167811,8 +168543,8 @@ self: {
          twitter-types
        ];
        description = "@minamiyama1994_bot on haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167828,7 +168560,7 @@ self: {
          array base bytestring ghc-prim integer-gmp network text
        ];
        description = "Fast and extensible bytestring builder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "massiv" = callPackage
@@ -167850,7 +168582,7 @@ self: {
          template-haskell
        ];
        description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "massiv-io" = callPackage
@@ -167872,7 +168604,29 @@ self: {
          QuickCheck random template-haskell
        ];
        description = "Import/export of Image files into massiv Arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "massiv-persist" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, doctest, hspec
+     , hspec-discover, massiv, massiv-test, persist, primitive
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "massiv-persist";
+       version = "0.1.0.0";
+       sha256 = "0w3hm8mzk2vsd0myk7sl1cckl2yhr7b1y9qb9nzph5gw99hsc761";
+       libraryHaskellDepends = [
+         base bytestring deepseq massiv persist primitive
+       ];
+       testHaskellDepends = [
+         base doctest hspec massiv massiv-test persist QuickCheck
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Compatibility of 'massiv' with 'persist'";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "massiv-scheduler" = callPackage
@@ -167892,7 +168646,26 @@ self: {
          base deepseq doctest hspec QuickCheck template-haskell unliftio
        ];
        description = "Work stealing scheduler for Massiv (Массив) and other parallel applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "massiv-serialise" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, hspec, hspec-discover
+     , massiv, massiv-test, QuickCheck, serialise, vector
+     }:
+     mkDerivation {
+       pname = "massiv-serialise";
+       version = "0.1.0.0";
+       sha256 = "0780lggn343k64ph3c27zhkkx0gmk9zfvv5pxz6zl1817xfqzc83";
+       libraryHaskellDepends = [ base deepseq massiv serialise vector ];
+       testHaskellDepends = [
+         base doctest hspec massiv massiv-test QuickCheck serialise
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Compatibility of 'massiv' with 'serialise'";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "massiv-test" = callPackage
@@ -167914,7 +168687,7 @@ self: {
          hspec massiv mwc-random primitive QuickCheck scheduler vector
        ];
        description = "Library that contains generators, properties and tests for Massiv Array Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "master-plan" = callPackage
@@ -167938,8 +168711,8 @@ self: {
          random-shuffle text
        ];
        description = "The project management tool for hackers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167953,7 +168726,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random ];
        description = "console mastermind decypher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matchable" = callPackage
@@ -167971,7 +168744,7 @@ self: {
        ];
        testHaskellDepends = [ base containers doctest hspec ];
        description = "A type class for Matchable Functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matchable-th" = callPackage
@@ -167987,7 +168760,7 @@ self: {
        ];
        testHaskellDepends = [ base containers matchable ];
        description = "Generates Matchable instances using TemplateHaskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matcher" = callPackage
@@ -168002,7 +168775,7 @@ self: {
          base base-prelude profunctors success text transformers
        ];
        description = "A composable abstraction for checking or converting a context value";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "matchers" = callPackage
@@ -168014,8 +168787,8 @@ self: {
        libraryHaskellDepends = [ base bytestring prednote text ];
        librarySystemDepends = [ pcre ];
        description = "Text matchers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) pcre;};
 
@@ -168028,7 +168801,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog ];
        description = "A variety of mathematical utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "math-functions" = callPackage
@@ -168051,7 +168824,7 @@ self: {
          base data-default-class gauge random vector
        ];
        description = "Collection of tools for numeric computations";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "math-grads" = callPackage
@@ -168068,8 +168841,8 @@ self: {
        ];
        testHaskellDepends = [ array base containers hspec random ];
        description = "Library containing graph data structures and graph algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168081,8 +168854,8 @@ self: {
        sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq";
        libraryHaskellDepends = [ base ];
        description = "Class for interpolation of values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168094,8 +168867,8 @@ self: {
        sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx";
        libraryHaskellDepends = [ base ];
        description = "Typeclass for metric spaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168114,7 +168887,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A library for formulating and solving math programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "math-programming-glpk" = callPackage
@@ -168136,8 +168909,8 @@ self: {
        testSystemDepends = [ glpk ];
        testToolDepends = [ tasty-discover ];
        description = "A GLPK backend to the math-programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -168153,8 +168926,8 @@ self: {
          base math-programming tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Utility functions for testing implementations of the math-programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168181,8 +168954,8 @@ self: {
          test-framework-hunit time unix url
        ];
        description = "A program for creating and managing a static weblog with LaTeX math and diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168194,7 +168967,7 @@ self: {
        sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Parse and evaluate math expressions with variables and functions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "mathflow" = callPackage
@@ -168213,8 +168986,8 @@ self: {
          template-haskell text
        ];
        description = "Dependently typed tensorflow modeler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168234,7 +169007,7 @@ self: {
          graphviz HTTP process safe tagsoup text
        ];
        description = "Discover your (academic) ancestors!";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "mathista" = callPackage
@@ -168257,7 +169030,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec parsec ];
        description = "A small programming language for numerical computing";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "mathlink" = callPackage
@@ -168273,8 +169046,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Write Mathematica packages in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168297,8 +169070,8 @@ self: {
        ];
        executableSystemDepends = [ eng mat mx ];
        description = "Matlab bindings and interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {eng = null; mat = null; inherit (pkgs) mx;};
 
   "matplotlib" = callPackage
@@ -168320,7 +169093,7 @@ self: {
          tasty tasty-expected-failure tasty-golden tasty-hunit temporary
        ];
        description = "Bindings to Matplotlib; a Python plotting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrices" = callPackage
@@ -168337,7 +169110,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "native matrix based on vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix" = callPackage
@@ -168356,7 +169129,7 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A native implementation of matrix operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix-as-xyz" = callPackage
@@ -168373,8 +169146,8 @@ self: {
          base doctest hspec matrix parsec QuickCheck
        ];
        description = "Read and Display Jones-Faithful notation for spacegroup and planegroup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168393,7 +169166,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Optics for the \"matrix\" package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix-market" = callPackage
@@ -168404,8 +169177,8 @@ self: {
        sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28";
        libraryHaskellDepends = [ base bytestring ];
        description = "Read and write NIST Matrix Market files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168425,7 +169198,7 @@ self: {
          base directory exceptions hspec QuickCheck
        ];
        description = "Parsing and serialization functions for the NIST Matrix Market format";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "matrix-market-pure" = callPackage
@@ -168436,7 +169209,7 @@ self: {
        sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1";
        libraryHaskellDepends = [ array base containers ];
        description = "Pure and composable reader and writer of the Matrix Market format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix-sized" = callPackage
@@ -168457,8 +169230,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Haskell matrix library with interface to C++ linear algebra libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168478,7 +169251,19 @@ self: {
          vector
        ];
        description = "Type-safe matrix operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "matroid" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "matroid";
+       version = "0.0.0";
+       sha256 = "0k7x9m8zn45s9r9frpqagrjkwbmfd9hfx2v1kwx7h5gfdkmkpb5z";
+       libraryHaskellDepends = [ base containers hspec QuickCheck ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       description = "matroid (combinatorial pre-geometries) library";
+       license = lib.licenses.bsd3;
      }) {};
 
   "matsuri" = callPackage
@@ -168498,7 +169283,7 @@ self: {
        ];
        description = "ncurses XMPP client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168538,8 +169323,8 @@ self: {
          Unique uuid
        ];
        description = "Terminal client for the Mattermost chat system";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "mattermost-api" = callPackage
@@ -168567,8 +169352,8 @@ self: {
          text unordered-containers
        ];
        description = "Client API for Mattermost chat system";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "mattermost-api-qc" = callPackage
@@ -168583,8 +169368,8 @@ self: {
          base containers mattermost-api QuickCheck text time
        ];
        description = "QuickCheck instances for the Mattermost client API library";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "maude" = callPackage
@@ -168599,8 +169384,8 @@ self: {
          base directory filepath process process-extras temporary text xml
        ];
        description = "An interface to the Maude rewriting system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168622,8 +169407,8 @@ self: {
          vector
        ];
        description = "Compute Maximum Entropy Distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168648,7 +169433,7 @@ self: {
        ];
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168671,7 +169456,7 @@ self: {
        ];
        description = "GUI for maxent-learner-hw";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168683,7 +169468,7 @@ self: {
        sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh";
        libraryHaskellDepends = [ base containers vector ];
        description = "Enumerate all maximal cliques of a graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "maxsharing" = callPackage
@@ -168704,8 +169489,8 @@ self: {
          process uuagc uuagc-cabal
        ];
        description = "Maximal sharing of terms in the lambda calculus with letrec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168718,7 +169503,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Simple higher order function for Maybe";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "maybench" = callPackage
@@ -168736,8 +169521,8 @@ self: {
          base benchpress Cabal directory filepath mtl process time
        ];
        description = "Automated benchmarking tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168751,7 +169536,7 @@ self: {
        editedCabalFile = "11jikczq21fnhsvr6n33qbb5q6ixbhab4s0js8n39zwgmglighz5";
        libraryHaskellDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mbox-tools" = callPackage
@@ -168769,8 +169554,8 @@ self: {
          process pureMD5
        ];
        description = "A collection of tools to process mbox files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168789,7 +169574,7 @@ self: {
          utility-ht
        ];
        description = "List contents of an mbox file containing e-mails";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mbtiles" = callPackage
@@ -168807,7 +169592,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Haskell MBTiles client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mbug" = callPackage
@@ -168832,8 +169617,8 @@ self: {
          tagsoup text time xdg-basedir
        ];
        description = "download bugs mailboxes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168860,8 +169645,8 @@ self: {
          base binary bytestring criterion deepseq groups
        ];
        description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
 
@@ -168881,8 +169666,8 @@ self: {
          MissingH polyparse process text unix
        ];
        description = "Machine Configuration Manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168895,8 +169680,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168924,7 +169709,9 @@ self: {
          base criterion log-domain microlens mwc-random
        ];
        description = "Sample from a posterior using Markov chain Monte Carlo";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -168939,8 +169726,8 @@ self: {
          base containers hakaru hmatrix mwc-random primitive statistics
        ];
        description = "Combinators for MCMC sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168952,8 +169739,8 @@ self: {
        sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq";
        libraryHaskellDepends = [ base MonadRandom ];
        description = "MCMC applied to probabilistic program synthesis";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168967,7 +169754,7 @@ self: {
          base containers mwc-probability transformers
        ];
        description = "Common types for sampling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mcpi" = callPackage
@@ -168981,8 +169768,8 @@ self: {
        libraryHaskellDepends = [ base network split transformers ];
        executableHaskellDepends = [ base transformers ];
        description = "Connect to MineCraft running on a Raspberry PI";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169001,8 +169788,8 @@ self: {
          transformers wreq
        ];
        description = "Haskell interface to Fedora's mdapi";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169022,8 +169809,8 @@ self: {
          ansi-terminal base directory pandoc terminfo
        ];
        description = "Markdown viewer in your terminal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169037,7 +169824,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Command-line tool to run a command on each of the items";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mdp" = callPackage
@@ -169053,31 +169840,32 @@ self: {
        executableHaskellDepends = [ base vector ];
        testHaskellDepends = [ base HTF HUnit QuickCheck vector ];
        description = "Tools for solving Markov Decision Processes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "mealstrom" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , hashable, list-t, postgresql-simple, resource-pool, stm
+     , deferred-folds, hashable, postgresql-simple, resource-pool, stm
      , stm-containers, tasty, tasty-hunit, text, time, uuid
      }:
      mkDerivation {
        pname = "mealstrom";
-       version = "0.0.1.0";
-       sha256 = "1nsbh00c5d5n1w3vkf63s9y9snbqvk5f590a8gyp00ikz85m3c23";
+       version = "0.0.1.1";
+       sha256 = "1bif2siwyijnwmz4mgsi88rv81w8ksyri7d4lxrrkhi581jy8f4s";
        libraryHaskellDepends = [
-         aeson async base bytestring containers hashable list-t
+         aeson async base bytestring containers deferred-folds hashable
          postgresql-simple resource-pool stm stm-containers text time uuid
        ];
        testHaskellDepends = [
-         aeson async base bytestring hashable list-t postgresql-simple
-         resource-pool stm stm-containers tasty tasty-hunit text time uuid
+         aeson async base bytestring deferred-folds hashable
+         postgresql-simple resource-pool stm stm-containers tasty
+         tasty-hunit text time uuid
        ];
        description = "Manipulate FSMs and store them in PostgreSQL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169098,8 +169886,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169111,7 +169899,7 @@ self: {
        sha256 = "12px5awgvblmpyfr92f83gkbhnr8qy8ip3h3gqnp46yhy6yr2js3";
        libraryHaskellDepends = [ base semigroups ];
        description = "calculate varieties of mean/average using semigroup";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mecab" = callPackage
@@ -169123,8 +169911,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ mecab ];
        description = "A Haskell binding to MeCab";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mecab;};
 
@@ -169136,8 +169924,8 @@ self: {
        sha256 = "0r9n04r6rv9dn38l469h40mk7fbmjwq0m72jvq69qahjw11y5lns";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169151,7 +169939,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "A constructive solid geometry (CSG) modeling language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mechs" = callPackage
@@ -169162,8 +169950,8 @@ self: {
        sha256 = "04z4qsjmls6h1ndczirldprn42pngm9v8g7kbmwilp7gk1zl0wyx";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169181,7 +169969,7 @@ self: {
          base bytestring storable-endian transformers utility-ht
        ];
        description = "Parse song module files from Amiga MED and OctaMED";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "medea" = callPackage
@@ -169208,7 +169996,7 @@ self: {
          QuickCheck quickcheck-instances text unordered-containers vector
        ];
        description = "A schema language for JSON";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mediabus" = callPackage
@@ -169238,8 +170026,8 @@ self: {
          template-haskell text time transformers type-spec vector
        ];
        description = "Multimedia streaming on top of Conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169267,8 +170055,8 @@ self: {
          time vector
        ];
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {fdk-aac = null;};
 
@@ -169306,8 +170094,8 @@ self: {
          tagged template-haskell text time transformers type-spec vector
        ];
        description = "Receive and Send RTP Packets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169320,7 +170108,7 @@ self: {
        libraryHaskellDepends = [ base heap ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Constant-time queries for the median of a stream of numeric data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mediawiki" = callPackage
@@ -169338,8 +170126,8 @@ self: {
          base HTTP mime network pretty utf8-string xml
        ];
        description = "Interfacing with the MediaWiki API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169383,8 +170171,8 @@ self: {
          servant-client servant-server text time
        ];
        description = "Haskell SDK for communicating with the Medium API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169405,7 +170193,7 @@ self: {
          QuickCheck semigroupoids semigroups
        ];
        description = "A silly container";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "mega-sdist" = callPackage
@@ -169423,8 +170211,8 @@ self: {
          yaml
        ];
        description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169436,8 +170224,8 @@ self: {
        sha256 = "158j4wc9j8vpi3k095nfsimjavfmrxgzil3d4a3yqphpk96fz9ci";
        libraryHaskellDepends = [ base megaparsec mtl text ];
        description = "lisp parser using mega-parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169460,7 +170248,7 @@ self: {
          base containers criterion deepseq text weigh
        ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "megaparsec-tests" = callPackage
@@ -169486,7 +170274,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Test utilities and the test suite of Megaparsec";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "meldable-heap" = callPackage
@@ -169500,7 +170288,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mellon-core" = callPackage
@@ -169519,8 +170307,8 @@ self: {
          quickcheck-instances time transformers
        ];
        description = "Control physical access devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169532,8 +170320,8 @@ self: {
        sha256 = "0hg878il0d31lfqwkb3rsd7gxbhs5cb1sxgc3rwdv70fdg63iirp";
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
        description = "GPIO support for mellon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169575,8 +170363,8 @@ self: {
          wai wai-extra warp
        ];
        description = "A REST web service for Mellon controllers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169598,8 +170386,8 @@ self: {
          base containers HUnit mtl test-framework test-framework-hunit
        ];
        description = "A functional scripting language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169616,7 +170404,7 @@ self: {
          th-lift
        ];
        description = "Indices for type level lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "membrain" = callPackage
@@ -169632,7 +170420,7 @@ self: {
          base doctest Glob hedgehog hspec type-spec
        ];
        description = "Type-safe memory units";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "memcache" = callPackage
@@ -169642,8 +170430,8 @@ self: {
      }:
      mkDerivation {
        pname = "memcache";
-       version = "0.2.0.1";
-       sha256 = "0p6qyw15nx1l0b7h029hjkhgz7zvc19c4bfm2pkx53hm96gxjxqg";
+       version = "0.3.0.1";
+       sha256 = "0sbfzmdq0rqzrvrjk7yzkn0mfadbz3dxj1d9n8f3s9mz3s8bv328";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-default-class hashable
          network resource-pool time vector
@@ -169653,8 +170441,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A memcached client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169674,8 +170462,8 @@ self: {
          memcache-haskell mtl network resourcet split
        ];
        description = "Conduit library for memcache procotol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169698,8 +170486,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
        description = "Memcache procotol library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169712,7 +170500,7 @@ self: {
        libraryHaskellDepends = [ base bytestring network utf8-light ];
        description = "haskell bindings for memcached";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "memcached-binary" = callPackage
@@ -169734,8 +170522,8 @@ self: {
          base bytestring data-default-class hspec HUnit network process
        ];
        description = "memcached client using binary protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169752,7 +170540,7 @@ self: {
          base bytestring cereal hspec QuickCheck vector
        ];
        description = "Efficient in memory indexed database";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "memexml" = callPackage
@@ -169763,7 +170551,7 @@ self: {
        sha256 = "1x3gi54d1yzxi2046vb62dxa6jvbhggsazh4dasxcbjc1pkq6pp8";
        libraryHaskellDepends = [ base hxt ];
        description = "Library for reading Meme XML output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "meminfo" = callPackage
@@ -169776,7 +170564,7 @@ self: {
        editedCabalFile = "0i6znbcw4yyf8jzkixx5dxbklzfnh79hmywvwwamdmjgi39akpi5";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Library for reading `/proc/meminfo`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memis" = callPackage
@@ -169801,8 +170589,8 @@ self: {
          wai-middleware-static warp
        ];
        description = "Memis Efficient Manual Image Sorting";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169814,8 +170602,8 @@ self: {
        sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19";
        libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169827,7 +170615,7 @@ self: {
        sha256 = "0x6vpf5kcr4icli0hjdqzphbpsakh0yn2ih2jyh65hnk1nh4j8n7";
        libraryHaskellDepends = [ base direct-sqlite text ];
        description = "memoize functions using SQLite3 database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memoization-utils" = callPackage
@@ -169843,8 +170631,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec time time-units ];
        description = "Utilities for memoizing functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169857,7 +170645,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "A memoization library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memorable-bits" = callPackage
@@ -169885,7 +170673,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Generate human memorable strings from binary data";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "memory" = callPackage
@@ -169903,7 +170691,7 @@ self: {
        ];
        testHaskellDepends = [ base basement bytestring foundation ];
        description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memorypool" = callPackage
@@ -169918,8 +170706,8 @@ self: {
          base containers transformers unsafe vector
        ];
        description = "basic memory pool outside of haskell heap/GC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169961,8 +170749,8 @@ self: {
          tasty-th vector
        ];
        description = "Haskell binding for Menoh DNN inference library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {menoh = null;};
 
@@ -169981,8 +170769,8 @@ self: {
          aeson base hspec QuickCheck regex-tdfa scientific text
        ];
        description = "Data Validation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170009,7 +170797,7 @@ self: {
          base bytestring directory HUnit optparse-applicative text
        ];
        description = "Haskell binding to Mercury API for ThingMagic RFID readers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "merge-bash-history" = callPackage
@@ -170028,7 +170816,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base ];
        description = "command line utility to merge bash_history";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mergeful" = callPackage
@@ -170043,7 +170831,7 @@ self: {
          aeson base containers deepseq mtl text time validity
          validity-containers validity-time
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mergeful-persistent" = callPackage
@@ -170067,8 +170855,8 @@ self: {
          validity validity-persistent
        ];
        description = "Support for using mergeful from persistent-based databases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {genvalidity-persistent = null; validity-persistent = null;};
 
@@ -170083,7 +170871,7 @@ self: {
        libraryHaskellDepends = [
          aeson base containers deepseq mtl validity validity-containers
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mergeless-persistent" = callPackage
@@ -170107,8 +170895,8 @@ self: {
          text validity
        ];
        description = "Support for using mergeless from persistent-based databases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {genvalidity-persistent = null;};
 
@@ -170134,7 +170922,7 @@ self: {
          memory merkle-tree mwc-random QuickCheck random random-bytestring
        ];
        description = "Merkle Tree Logs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "merkle-patricia-db" = callPackage
@@ -170160,8 +170948,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "A modified Merkle Patricia DB";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170181,8 +170969,8 @@ self: {
          random tasty tasty-quickcheck
        ];
        description = "An implementation of a Merkle tree and merkle tree proofs of inclusion";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170194,7 +170982,7 @@ self: {
        sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
        libraryHaskellDepends = [ base old-time ];
        description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mersenne-random-pure64" = callPackage
@@ -170207,7 +170995,7 @@ self: {
        editedCabalFile = "0pxq0xz42x60993rl4pr4pia80jv1xcqh6njvjzfvn75018j4gw5";
        libraryHaskellDepends = [ base random time ];
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "messagepack" = callPackage
@@ -170229,7 +171017,7 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Serialize instance for Message Pack Object";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "messagepack-rpc" = callPackage
@@ -170246,8 +171034,8 @@ self: {
          base bytestring cereal containers messagepack network-simple
        ];
        description = "Message Pack RPC over TCP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170261,8 +171049,8 @@ self: {
          base bytestring HTTP http-conduit network
        ];
        description = "Messente SMS Gateway";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170274,8 +171062,8 @@ self: {
        sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c";
        libraryHaskellDepends = [ base loch-th template-haskell ];
        description = "Utility library providing miscellaneous meta-programming utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170292,8 +171080,8 @@ self: {
          mwc-random transformers vector
        ];
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170311,8 +171099,8 @@ self: {
          array base meta-par QuickCheck transformers vector
        ];
        description = "Support for integrated Accelerate computations within Meta-par";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170324,8 +171112,8 @@ self: {
        sha256 = "0860ggpksvaagrb1gqvnpp8gx6xd6h05dqg2ciis6i2my9gxmcmz";
        libraryHaskellDepends = [ base text time ];
        description = "metadata library for semantic web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170338,7 +171126,7 @@ self: {
        libraryHaskellDepends = [ arrows base random Stream ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170351,7 +171139,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "metamorphisms: ana . cata or understanding folds and unfolds";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "metaplug" = callPackage
@@ -170362,8 +171150,8 @@ self: {
        sha256 = "086n9kqyi2jqki31jgylm0r63ahgvw3pf7mi5hln2m86a5x4ij4n";
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170389,8 +171177,8 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Australian METAR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170415,11 +171203,24 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "HTTP for METAR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "method" = callPackage
+    ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }:
+     mkDerivation {
+       pname = "method";
+       version = "0.2.0.0";
+       sha256 = "0vgh0ri5r1jsfax5qafvkqqnkywk4qayaw54dwhh5i3p1n5cqkqa";
+       libraryHaskellDepends = [ base rio transformers ];
+       testHaskellDepends = [ base hspec rio transformers ];
+       testToolDepends = [ hspec-discover ];
+       description = "rebindable methods for improving testability";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "metric" = callPackage
     ({ mkDerivation, base, data-default, edit-distance, hmatrix
      , QuickCheck, test-framework, test-framework-quickcheck2, vector
@@ -170435,8 +171236,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "Metric spaces";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170459,7 +171260,7 @@ self: {
          async base HUnit lens mwc-random primitive QuickCheck
        ];
        description = "High-performance application metric tracking";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "metricsd-client" = callPackage
@@ -170470,8 +171271,8 @@ self: {
        sha256 = "1q807wvmj1q605257jj60h0j2wal6ypjiad9wkjmv836p3mis5q9";
        libraryHaskellDepends = [ base network ];
        description = "Client for the metrics aggregator Metricsd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170488,7 +171289,7 @@ self: {
          unliftio unordered-containers
        ];
        description = "A simple tcp and udp socket server framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-socket" = callPackage
@@ -170504,7 +171305,7 @@ self: {
          transformers unliftio
        ];
        description = "Socket transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-crypto" = callPackage
@@ -170522,7 +171323,7 @@ self: {
          base bytestring cryptonite metro QuickCheck quickcheck-instances
        ];
        description = "Crypto transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-tls" = callPackage
@@ -170538,7 +171339,7 @@ self: {
          x509-validation
        ];
        description = "TLS transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-websockets" = callPackage
@@ -170549,7 +171350,7 @@ self: {
        sha256 = "1jyy3sssz8ixwqdlf8zph05pfrm6qnf56sjsq8bx6yah9psy92dg";
        libraryHaskellDepends = [ base bytestring metro websockets ];
        description = "Websockets transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-xor" = callPackage
@@ -170560,7 +171361,7 @@ self: {
        sha256 = "1hx839sxd2lrx6vsxswi4i88x1d1489jcdmh2vbnc2dvnssnqcpv";
        libraryHaskellDepends = [ base bytestring metro unliftio ];
        description = "XOR transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metronome" = callPackage
@@ -170573,8 +171374,8 @@ self: {
          base data-lens data-lens-template hosc stm
        ];
        description = "Time Synchronized execution";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170595,8 +171396,8 @@ self: {
          base deepseq hspec HUnit QuickCheck should-not-typecheck
        ];
        description = "Typesafe music composition";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170608,8 +171409,8 @@ self: {
        sha256 = "0ayz8sdxakrwb0arnbq9rv876f5jbkmycj3jr00p82vhfdyvwll2";
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Pure Profunctor Functional Lenses";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170626,7 +171427,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mgeneric" = callPackage
@@ -170639,8 +171440,8 @@ self: {
          base containers lens mtl template-haskell
        ];
        description = "Generics with multiple parameters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170656,8 +171457,8 @@ self: {
          base haskell-src-meta parsec split template-haskell
        ];
        description = "Multiple Instance for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170673,8 +171474,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170703,7 +171504,7 @@ self: {
          wai-websockets warp websockets yaml
        ];
        description = "A Micro service gateway";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "micro-recursion-schemes" = callPackage
@@ -170720,8 +171521,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base HUnit template-haskell ];
        description = "Simple recursion schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170745,19 +171546,19 @@ self: {
          tasty tasty-quickcheck text unordered-containers vector
        ];
        description = "A tiny JSON library with light dependency footprint";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "microbase" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microbase";
-       version = "4.14.0.0.6";
-       sha256 = "1wnng6ik7p4id5p7crbk9gwy0c4rg2rggkphc4wqfmc2zgpl1ywq";
+       version = "4.15.0.0.1";
+       sha256 = "0dslfkfvjr5zfdw5vmxi1xrblvy3g0l13d38m4c30rgl3nhxyjlm";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "A minimal base to work around GHC bugs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "microbench" = callPackage
@@ -170768,7 +171569,7 @@ self: {
        sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg";
        libraryHaskellDepends = [ base time ];
        description = "Microbenchmark Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microc" = callPackage
@@ -170783,7 +171584,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "microc compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microformats2-parser" = callPackage
@@ -170819,8 +171620,8 @@ self: {
          raw-strings-qq template-haskell text time xml-lens
        ];
        description = "A Microformats 2 parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170836,8 +171637,8 @@ self: {
          aeson base data-default-class pandoc-types setters text time
        ];
        description = "Microformats 2 types (with Aeson instances)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170849,8 +171650,8 @@ self: {
        sha256 = "1dfkiiiksb4wnf6kgxmla37w1xmmxpzim4ribjckvn58pd2hn2a0";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Array-backed extensible records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170862,7 +171663,7 @@ self: {
        sha256 = "1z6zdprpr193a56r5s67q75554rrqyp2kk6srxn1gif7fd54sj2f";
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens_0_4_12_0" = callPackage
@@ -170873,8 +171674,8 @@ self: {
        sha256 = "10q7gl9yavcln58sxdxzih7ff0ixxq5hpd87icvxw97yqf1p6hmm";
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "microlens-aeson" = callPackage
@@ -170895,7 +171696,7 @@ self: {
          text unordered-containers vector
        ];
        description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "microlens-contra" = callPackage
@@ -170906,7 +171707,7 @@ self: {
        sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m";
        libraryHaskellDepends = [ base microlens ];
        description = "True folds and getters for microlens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-each" = callPackage
@@ -170917,8 +171718,8 @@ self: {
        sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
        libraryHaskellDepends = [ base microlens ];
        description = "'each' for microlens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170934,7 +171735,7 @@ self: {
          array base bytestring containers microlens transformers
        ];
        description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-ghc_0_4_13" = callPackage
@@ -170949,8 +171750,8 @@ self: {
          array base bytestring containers microlens transformers
        ];
        description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "microlens-mtl" = callPackage
@@ -170965,7 +171766,7 @@ self: {
          base microlens mtl transformers transformers-compat
        ];
        description = "microlens support for Reader/Writer/State from mtl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-platform" = callPackage
@@ -170981,7 +171782,7 @@ self: {
          text unordered-containers vector
        ];
        description = "microlens + all batteries included (best for apps)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-platform_0_4_2" = callPackage
@@ -170997,8 +171798,8 @@ self: {
          text unordered-containers vector
        ];
        description = "microlens + all batteries included (best for apps)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "microlens-process" = callPackage
@@ -171015,24 +171816,24 @@ self: {
        libraryHaskellDepends = [ base filepath microlens process ];
        testHaskellDepends = [ base doctest microlens process ];
        description = "Micro-optics for the process library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-th" = callPackage
-    ({ mkDerivation, base, containers, microlens, template-haskell
-     , th-abstraction, transformers
+    ({ mkDerivation, base, containers, microlens, tagged
+     , template-haskell, th-abstraction, transformers
      }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.4.3.8";
-       sha256 = "0dy3vrqcw7ahlcwcqfw8jhisy4yj58f91pk4djqqvj8lnx74cm9f";
+       version = "0.4.3.9";
+       sha256 = "08gfqf24r95dcnw4jlnhh8ijmfwiyr9zaiiz4lbzp72hrkarlbiw";
        libraryHaskellDepends = [
          base containers microlens template-haskell th-abstraction
          transformers
        ];
-       testHaskellDepends = [ base microlens ];
+       testHaskellDepends = [ base microlens tagged ];
        description = "Automatic generation of record lenses for microlens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "micrologger" = callPackage
@@ -171049,8 +171850,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec text ];
        description = "A super simple logging module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171068,8 +171869,8 @@ self: {
          http-media mtl safe servant servant-client text time xml
        ];
        description = "Bindings to the Microsoft Translator API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171081,7 +171882,7 @@ self: {
        sha256 = "0615gdbsk7i3w71adjp69zabw4mli965wffm2h846hp6pjj31xcb";
        libraryHaskellDepends = [ base QuickCheck time ];
        description = "Tiny QuickCheck test library with minimal dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microstache" = callPackage
@@ -171101,7 +171902,7 @@ self: {
          aeson base bytestring containers hspec parsec text
        ];
        description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microtimer" = callPackage
@@ -171112,7 +171913,7 @@ self: {
        sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap";
        libraryHaskellDepends = [ base time ];
        description = "A tiny library for benchmarking IO actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mida" = callPackage
@@ -171143,8 +171944,8 @@ self: {
          tf-random transformers
        ];
        description = "Language for algorithmic generation of MIDI files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171156,7 +171957,7 @@ self: {
        sha256 = "1dkja5arps41wanhv1jnkf99xrc8f5aiimp27myd595lqqdr87s2";
        libraryHaskellDepends = [ base containers safe stm ];
        description = "Hot-swappable FRP";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "midi" = callPackage
@@ -171191,8 +171992,8 @@ self: {
          alsa-seq base data-accessor midi utility-ht
        ];
        description = "Convert between datatypes of the midi and the alsa packages";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -171211,8 +172012,8 @@ self: {
          optparse-applicative utility-ht
        ];
        description = "Convert MIDI file to music box punch tape";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171234,7 +172035,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A simple and fast library for working with MIDI messages";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "midi-util" = callPackage
@@ -171248,7 +172049,7 @@ self: {
          base containers event-list midi non-negative
        ];
        description = "Utility functions for processing MIDI files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "midi-utils" = callPackage
@@ -171264,8 +172065,8 @@ self: {
          base bytestring directory event-list midi parsec process
        ];
        description = "Utilities for working with MIDI data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171285,8 +172086,8 @@ self: {
          random transformers utility-ht wx wxcore
        ];
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171304,8 +172105,8 @@ self: {
          alsa-core alsa-seq base containers gtk mtl stm
        ];
        description = "A control midi surface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171326,8 +172127,8 @@ self: {
          hslogger network parsec time unix webserver
        ];
        description = "Simple Web Server in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171360,7 +172161,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec http-client ];
        description = "High performance web server on WAI/warp";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mighty-metropolis" = callPackage
@@ -171380,7 +172181,7 @@ self: {
          base containers foldl hspec mcmc-types mwc-probability mwc-random
        ];
        description = "The Metropolis algorithm";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "migrant-core" = callPackage
@@ -171396,8 +172197,8 @@ self: {
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171416,8 +172217,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171438,8 +172239,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171457,8 +172258,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171473,7 +172274,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "MikMod bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171499,8 +172300,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Lambda calculus interpreter";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171517,8 +172318,8 @@ self: {
          http-types mtl wai wai-extra
        ];
        description = "A minimum web dev DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171542,8 +172343,8 @@ self: {
          tasty-hspec tasty-quickcheck
        ];
        description = "A Kafka client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171557,7 +172358,7 @@ self: {
        editedCabalFile = "07r4kyjm2bk8knyhbfivgxlxnxp7qqlcnzp61f2hi7d1s7clg290";
        libraryHaskellDepends = [ base text ];
        description = "Working with MIME types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mime-directory" = callPackage
@@ -171573,7 +172374,7 @@ self: {
        ];
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171591,7 +172392,7 @@ self: {
        ];
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "Compose MIME email messages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mime-mail-ses" = callPackage
@@ -171620,7 +172421,7 @@ self: {
          base bytestring case-insensitive tasty tasty-hunit time
        ];
        description = "Send mime-mail messages via Amazon SES";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mime-string" = callPackage
@@ -171637,7 +172438,7 @@ self: {
        ];
        description = "MIME implementation for String's";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mime-types" = callPackage
@@ -171648,7 +172449,7 @@ self: {
        sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha";
        libraryHaskellDepends = [ base bytestring containers text ];
        description = "Basic mime-type handling types and functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "min-max-pqueue" = callPackage
@@ -171665,7 +172466,7 @@ self: {
          base containers criterion integer-logarithms random
        ];
        description = "Double-ended priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minecraft" = callPackage
@@ -171676,7 +172477,7 @@ self: {
        sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minecraft-data" = callPackage
@@ -171694,8 +172495,8 @@ self: {
          time vector zlib
        ];
        description = "a DSL for generating minecraft commands and levels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171711,7 +172512,7 @@ self: {
        executableHaskellDepends = [ base directory mtl random ];
        description = "Minesweeper simulation using neural networks";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "minesweeper" = callPackage
@@ -171730,8 +172531,8 @@ self: {
          filepath glade gtk random time
        ];
        description = "Minesweeper game which is always solvable without guessing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171753,8 +172554,8 @@ self: {
        executableHaskellDepends = [ base sort ];
        testHaskellDepends = [ base hspec primes ];
        description = "Template Haskell Implementation of Egison Pattern Matching";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171766,7 +172567,7 @@ self: {
        sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172";
        libraryHaskellDepends = [ base vector ];
        description = "Bindings to Miniball, a smallest enclosing ball library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "miniforth" = callPackage
@@ -171787,8 +172588,8 @@ self: {
          base containers lens mtl parsec readline
        ];
        description = "Miniature FORTH-like interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171804,8 +172605,8 @@ self: {
          array base bytestring containers mtl semigroups text transformers
        ];
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171837,8 +172638,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A SDL2-based graphics library, batteries-included";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171859,8 +172660,8 @@ self: {
        ];
        executableHaskellDepends = [ base lens minilight mtl ];
        description = "A binding library of minilight for Lua langauge";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171873,7 +172674,7 @@ self: {
        libraryHaskellDepends = [ base containers directory filepath ];
        description = "Minimal ini like configuration library with a few extras";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "minimorph" = callPackage
@@ -171889,7 +172690,7 @@ self: {
          base HUnit test-framework test-framework-hunit text
        ];
        description = "English spelling functions with an emphasis on simplicity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minimung" = callPackage
@@ -171902,8 +172703,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171941,7 +172742,7 @@ self: {
          unordered-containers xml-conduit
        ];
        description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "minions" = callPackage
@@ -171956,8 +172757,8 @@ self: {
          ansi-terminal base MissingH process time
        ];
        description = "A fast parallel ssh tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171974,8 +172775,8 @@ self: {
          transformers
        ];
        description = "fast and simple operational monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171993,7 +172794,7 @@ self: {
        ];
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172013,8 +172814,8 @@ self: {
          old-locale old-time process safe split template-haskell
        ];
        description = "Minimalistic file rotation utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172026,7 +172827,7 @@ self: {
        sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd";
        libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minisat-solver" = callPackage
@@ -172038,7 +172839,7 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        benchmarkHaskellDepends = [ base containers easyrender ];
        description = "High-level Haskell bindings for the MiniSat SAT solver";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ministg" = callPackage
@@ -172056,8 +172857,8 @@ self: {
          transformers xhtml
        ];
        description = "an interpreter for an operational semantics for the STG machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172072,7 +172873,7 @@ self: {
          base containers filepath OpenGL stb-truetype
        ];
        description = "Layout and render text with TrueType fonts using OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "miniutter" = callPackage
@@ -172089,7 +172890,7 @@ self: {
          base containers HUnit test-framework test-framework-hunit text
        ];
        description = "Simple English clause creation from arbitrary words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minizinc-process" = callPackage
@@ -172109,8 +172910,8 @@ self: {
          aeson base hashable hedgehog hspec hspec-hedgehog
        ];
        description = "A set of helpers to call minizinc models";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172125,7 +172926,7 @@ self: {
          base mono-traversable semigroups transformers
        ];
        description = "Express the minimum length of a container in its type";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "minst-idx" = callPackage
@@ -172138,8 +172939,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
        description = "Read and write IDX data that is used in e.g. the MINST database.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172151,7 +172952,7 @@ self: {
        sha256 = "1njhz7wjmsk5pbr7gfkl95k50npkmm0iyxp3j93bbsg4rmxzg2kw";
        libraryHaskellDepends = [ base ];
        description = "A reliable way to detect the presence of a MinTTY console on Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mios" = callPackage
@@ -172174,8 +172975,8 @@ self: {
          base bytestring ghc-prim hspec primitive vector
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172194,8 +172995,8 @@ self: {
          transformers twitter-conduit
        ];
        description = "Tweet mirror";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172217,7 +173018,7 @@ self: {
        ];
        executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
        description = "fortune-mod clone";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "mismi-core" = callPackage
@@ -172240,8 +173041,8 @@ self: {
          mmorph resourcet transformers
        ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mismi-core-test = null;};
 
@@ -172254,7 +173055,7 @@ self: {
        libraryHaskellDepends = [ base mismi-p text ];
        testHaskellDepends = [ base hedgehog mismi-p text ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mismi-p" = callPackage
@@ -172267,7 +173068,7 @@ self: {
        editedCabalFile = "1nhb8lz21qn4rmgwn0b8vr771fcpykg13zvp7qsrsz5jvd3ylifg";
        libraryHaskellDepends = [ base text ];
        description = "A commmon prelude for the mismi project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mismi-s3" = callPackage
@@ -172308,8 +173109,8 @@ self: {
          text transformers unix uuid
        ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mismi-core-test = null; mismi-s3-core-test = null;};
 
@@ -172322,7 +173123,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base mismi-p text ];
        testHaskellDepends = [ base hedgehog mismi-p text ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "miso" = callPackage
@@ -172341,8 +173142,8 @@ self: {
          network-uri servant servant-lucid text transformers vector
        ];
        description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172354,8 +173155,8 @@ self: {
        sha256 = "02xcj7ic4fh3h08h89naa2rl0rkksqx426wx8k8v0zl0d7rd12jc";
        libraryHaskellDepends = [ aeson base ghcjs-base miso ];
        description = "Miso state transition logger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172368,8 +173169,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172387,7 +173188,7 @@ self: {
          attoparsec base bytestring containers pretty-simple text
        ];
        description = "Convert HTML to miso View syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "miss" = callPackage
@@ -172417,8 +173218,8 @@ self: {
          unix
        ];
        description = "A Haskell git implimentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172437,8 +173238,8 @@ self: {
          mtl posix-paths
        ];
        description = "Useability extras built on top of miss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172450,7 +173251,7 @@ self: {
        sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
        libraryHaskellDepends = [ base ];
        description = "Convenience functions for FFI work";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "missing-py2" = callPackage
@@ -172464,34 +173265,35 @@ self: {
          anydbm base Cabal directory HUnit MissingH
        ];
        description = "Haskell interface to Python";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "miv" = callPackage
-    ({ mkDerivation, aeson, async, base, concurrent-output, directory
-     , filepath, filepattern, ghc-prim, hashable, hspec, monad-parallel
-     , process, SafeSemaphore, text, time, unix-compat
-     , unordered-containers, xdg-basedir, yaml
+    ({ mkDerivation, async, base, bytestring, concurrent-output
+     , containers, directory, filepath, filepattern, ghc-prim, hspec
+     , HsYAML, monad-parallel, process, SafeSemaphore, text, time
+     , unix-compat, unordered-containers, xdg-basedir
      }:
      mkDerivation {
        pname = "miv";
-       version = "0.4.6";
-       sha256 = "1xf4frjvccjvkzgx9ha9q2i6ig5bx3z37igjb3s7a9zvqnvig06g";
+       version = "0.4.8";
+       sha256 = "1b3lplsnjf992rvidj48swccl8f8aqdik1sf481g7vwv2mz7d7m6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson async base concurrent-output directory filepath filepattern
-         ghc-prim hashable monad-parallel process SafeSemaphore text time
-         unix-compat unordered-containers xdg-basedir yaml
+         async base bytestring concurrent-output containers directory
+         filepath filepattern ghc-prim HsYAML monad-parallel process
+         SafeSemaphore text time unix-compat unordered-containers
+         xdg-basedir
        ];
        testHaskellDepends = [
-         aeson base directory ghc-prim hashable hspec monad-parallel process
-         text time unordered-containers yaml
+         base bytestring containers directory ghc-prim hspec HsYAML
+         monad-parallel process text time unordered-containers
        ];
        description = "Vim plugin manager written in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mix-arrows" = callPackage
@@ -172502,8 +173304,8 @@ self: {
        sha256 = "0m70l09bmr8b95d87rpz4vdircdar2rsvnamr2g07542wx024931";
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172520,8 +173322,8 @@ self: {
          array base containers simple-tabular
        ];
        description = "Find optimal mixed strategies for two-player games";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172539,7 +173341,25 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
        description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "mixed-types-num_0_4_1" = callPackage
+    ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck
+     , smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.4.1";
+       sha256 = "159zx9b5p3g1ywhnbihjbxkpxylgrkhhrswmazymqbh49f4s758y";
+       libraryHaskellDepends = [
+         base hspec hspec-smallcheck mtl QuickCheck smallcheck
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mixpanel-client" = callPackage
@@ -172562,8 +173382,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172579,7 +173399,7 @@ self: {
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172599,7 +173419,7 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172614,8 +173434,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec pretty ];
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172627,8 +173447,8 @@ self: {
        sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k";
        libraryHaskellDepends = [ base haskell98 ];
        description = "Monadic List alternative to lazy I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172652,7 +173472,7 @@ self: {
          vector
        ];
        description = "Machine Learning Toolbox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mm2" = callPackage
@@ -172663,8 +173483,8 @@ self: {
        sha256 = "0zn629lm41z6b59snnjkqdk41ryimjhd5yapiwykl5fg0f7wmap3";
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172678,7 +173498,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Memory mapped files for POSIX and Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmark" = callPackage
@@ -172707,7 +173527,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text weigh ];
        description = "Strict markdown processor for writers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmark-cli" = callPackage
@@ -172720,8 +173540,8 @@ self: {
        pname = "mmark-cli";
        version = "0.0.5.0";
        sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby";
-       revision = "5";
-       editedCabalFile = "1ncyh564gk6fhirx97jnr6v2nw3k69kngxd3gbn9wbi6hm6zz238";
+       revision = "6";
+       editedCabalFile = "1qki0f2iwr9phma4wby3alnsxigzl5qc1ims8cvhszkill9yfi4z";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -172730,7 +173550,7 @@ self: {
          unordered-containers
        ];
        description = "Command line interface to the MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmark-ext" = callPackage
@@ -172752,7 +173572,7 @@ self: {
        testHaskellDepends = [ base hspec lucid mmark skylighting text ];
        testToolDepends = [ hspec-discover ];
        description = "Commonly useful extensions for the MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmorph" = callPackage
@@ -172765,7 +173585,7 @@ self: {
          base mtl transformers transformers-compat
        ];
        description = "Monad morphisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmsyn2" = callPackage
@@ -172776,7 +173596,7 @@ self: {
        sha256 = "06n8vxqafc698ahml782klb41g9bfsvqdrl4k0blnn3m3vavnzxy";
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for multiple (Ord a) => a -> b transformations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn2-array" = callPackage
@@ -172787,7 +173607,7 @@ self: {
        sha256 = "0dcvs5s11s840fvl17h5qrz5x6fmzvvjkfxmbk8r0p13n4k2a0ny";
        libraryHaskellDepends = [ base ];
        description = "A library with less dependencies that can be used for multiple Ord a => a -> b transformations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn3" = callPackage
@@ -172798,7 +173618,7 @@ self: {
        sha256 = "0fpn0lzr93aaha9741spc7vmlg5c4x5wb3p4qvxzp57w85zqdwm3";
        libraryHaskellDepends = [ base directory ];
        description = "A small library to deal with executable endings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn4" = callPackage
@@ -172812,7 +173632,7 @@ self: {
        libraryHaskellDepends = [ base directory mmsyn3 process ];
        executableHaskellDepends = [ base directory mmsyn3 process ];
        description = "The \"glue\" between electronic tables and GraphViz";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn5" = callPackage
@@ -172823,7 +173643,7 @@ self: {
        sha256 = "0xbdmlq71pjnsls67mydrfzajnnyyzp0dvzgrg2lms3pssvzs6f1";
        libraryHaskellDepends = [ base ];
        description = "Various additional operations on lists (some with intermediate Monads)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn6ukr" = callPackage
@@ -172846,7 +173666,7 @@ self: {
          ukrainian-phonetics-basic vector
        ];
        description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn6ukr-array" = callPackage
@@ -172869,7 +173689,7 @@ self: {
          ukrainian-phonetics-basic-array
        ];
        description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn7h" = callPackage
@@ -172891,8 +173711,8 @@ self: {
          process vector
        ];
        description = "Produces a sound recording specified by the Ukrainian text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172913,7 +173733,7 @@ self: {
          base directory mmsyn2 mmsyn3 mmsyn7ukr process vector
        ];
        description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn7s" = callPackage
@@ -172927,7 +173747,7 @@ self: {
        libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
        executableHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
        description = "Shows a sorted list of the Ukrainian sounds representations that can be used by mmsyn7 series of programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn7ukr" = callPackage
@@ -172948,7 +173768,18 @@ self: {
          base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector
        ];
        description = "A simple basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+     }) {};
+
+  "mmsyn7ukr-common" = callPackage
+    ({ mkDerivation, base, directory, mmsyn3, process }:
+     mkDerivation {
+       pname = "mmsyn7ukr-common";
+       version = "0.1.1.0";
+       sha256 = "000xkm0yvj6sxmnkzax98gc3rv0cfkfglfznf84p32axmxa4vg0q";
+       libraryHaskellDepends = [ base directory mmsyn3 process ];
+       description = "Some common for mmsyn7ukr and mmsyn7ukr-array functionality using SoX";
+       license = lib.licenses.mit;
      }) {};
 
   "mmtf" = callPackage
@@ -172968,8 +173799,8 @@ self: {
          http-conduit QuickCheck text
        ];
        description = "Macromolecular Transmission Format implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172981,8 +173812,8 @@ self: {
        sha256 = "0bb19l52s56y2dwyskvjwdal7387ii2dg9cc1l6f341y3695nj7l";
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172996,8 +173827,8 @@ self: {
        editedCabalFile = "1iby6x0pkqz4447nr5aqpzch2msqb76bdypcprpi5y8djr51x248";
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173011,7 +173842,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
        description = "Read and write IDX data that is used in e.g. the MNIST database.";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "moan" = callPackage
@@ -173027,8 +173858,8 @@ self: {
          tagset-positional text zlib
        ];
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173047,7 +173878,7 @@ self: {
          relude text wai warp yaml
        ];
        description = "A HTTP server for testing HTTP clients";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "mock-time" = callPackage
@@ -173069,7 +173900,7 @@ self: {
          unliftio-core
        ];
        description = "Mock time in tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mockazo" = callPackage
@@ -173087,7 +173918,7 @@ self: {
          base constraints hspec multistate relude template-haskell
        ];
        description = "Mock records of functions easily";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mockery" = callPackage
@@ -173107,7 +173938,7 @@ self: {
          temporary
        ];
        description = "Support functions for automated testing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mod" = callPackage
@@ -173128,7 +173959,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base time ];
        description = "Fast type-safe modular arithmetic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "modbus-tcp" = callPackage
@@ -173141,7 +173972,7 @@ self: {
          base bytestring cereal mtl transformers
        ];
        description = "Communicate with Modbus devices over TCP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "model" = callPackage
@@ -173160,7 +173991,7 @@ self: {
          base containers doctest filemanip ghc-prim pretty tasty tasty-hunit
        ];
        description = "Derive a model of a data type using Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modelicaparser" = callPackage
@@ -173176,8 +174007,8 @@ self: {
          ansi-terminal base containers filepath parsec QuickCheck
        ];
        description = "A parser for the modelica language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173204,7 +174035,7 @@ self: {
          base bytestring criterion deepseq megaparsec text weigh
        ];
        description = "Modern library for working with URIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modify-fasta" = callPackage
@@ -173227,8 +174058,8 @@ self: {
          semigroups split text transformers
        ];
        description = "Modify fasta (and CLIP) files in several optional ways";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173249,8 +174080,8 @@ self: {
          base directory filepath haskell98 mtl utf8-string
        ];
        description = "Haskell source splitter driven by special comments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173262,7 +174093,7 @@ self: {
        sha256 = "1igg7am4z1kfvpyp5a53rsqan5i209rp1s0z9xamqydx60ilc2s3";
        libraryHaskellDepends = [ base ghc-typelits-knownnat ];
        description = "Type-safe modular arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modular-arithmetic" = callPackage
@@ -173274,7 +174105,7 @@ self: {
        libraryHaskellDepends = [ base typelits-witnesses ];
        testHaskellDepends = [ base doctest typelits-witnesses ];
        description = "A type for integers modulo some constant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modular-prelude" = callPackage
@@ -173291,8 +174122,8 @@ self: {
          system-filepath text transformers unordered-containers vector
        ];
        description = "A new Prelude featuring first class modules";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173304,8 +174135,8 @@ self: {
        sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx";
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        description = "Reifying ClassyPrelude a la ModularPrelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173321,8 +174152,8 @@ self: {
          base hmatrix sparse-linear-algebra spectral-clustering vector
        ];
        description = "Find the modularity of a network";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173353,8 +174184,8 @@ self: {
          base containers filepath haskell-src-exts HUnit process
        ];
        description = "Clean up module imports, split and merge modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173371,8 +174202,8 @@ self: {
          transformers
        ];
        description = "Template Haskell for introspecting a module's declarations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173392,8 +174223,8 @@ self: {
          nats pandoc-types parsec prettify process semigroups text
        ];
        description = "Modular C code generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173409,8 +174240,8 @@ self: {
          air base bytestring data-default dlist mtl text
        ];
        description = "html with style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173433,8 +174264,8 @@ self: {
          unordered-containers
        ];
        description = "A functional firewall killer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173457,8 +174288,8 @@ self: {
          old-locale old-time parsec process transformers unix utility-ht
        ];
        description = "Modular Haskell Web Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173489,8 +174320,8 @@ self: {
          smallcheck stm text time unordered-containers vector
        ];
        description = "A glorified string replacement tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173516,8 +174347,8 @@ self: {
          tasty-hunit time
        ];
        description = "Mollie API client for Haskell http://www.mollie.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173534,7 +174365,7 @@ self: {
          transformers-compat
        ];
        description = "A better error monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-atom" = callPackage
@@ -173545,8 +174376,8 @@ self: {
        sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically convert object to unique integers and back";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173558,8 +174389,8 @@ self: {
        sha256 = "1k4rcrdjjs52p9mnsbwp0gmb2inivhcqw044l56dbc080yxrk32j";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173571,7 +174402,7 @@ self: {
        sha256 = "0zjyy9apc5zr51nh31p3f6bzbnfbc40hkf9p52370ynj4513lz4r";
        libraryHaskellDepends = [ base exceptions ];
        description = "An applicative monad that batches commands for later more efficient execution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-bayes" = callPackage
@@ -173603,8 +174434,8 @@ self: {
          process vector
        ];
        description = "A library for probabilistic programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173617,7 +174448,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "This package has been removed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-branch" = callPackage
@@ -173628,8 +174459,8 @@ self: {
        sha256 = "0g82ccql6pmj319ji3zpmxab78qwdlrjsl7cdfhjvv4m1i4kmzdf";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monadic abstraction for computations that can be branched and run independently";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173645,7 +174476,7 @@ self: {
          base contravariant invariant MonadRandom mtl primitive transformers
        ];
        description = "Monad, monad transformer, and typeclass representing choices";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "monad-chronicle" = callPackage
@@ -173661,7 +174492,7 @@ self: {
          transformers-compat
        ];
        description = "These as a transformer, ChronicleT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-classes" = callPackage
@@ -173682,7 +174513,7 @@ self: {
          transformers
        ];
        description = "more flexible mtl";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-classes-logging" = callPackage
@@ -173700,7 +174531,7 @@ self: {
          base logging-effect monad-classes tasty tasty-hunit transformers
        ];
        description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-codec" = callPackage
@@ -173713,7 +174544,7 @@ self: {
          base binary containers data-lens-light mtl
        ];
        description = "Monadic conversion between complex data structures and unique integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-connect" = callPackage
@@ -173728,7 +174559,7 @@ self: {
          base bytestring connection exceptions transformers
        ];
        description = "Transformer for TCP connection with TLS and SOCKS support";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-control" = callPackage
@@ -173743,7 +174574,7 @@ self: {
          base stm transformers transformers-base transformers-compat
        ];
        description = "Lift control operations, like exception catching, through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-control-aligned" = callPackage
@@ -173758,7 +174589,7 @@ self: {
          base stm transformers transformers-base transformers-compat
        ];
        description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-control-identity" = callPackage
@@ -173773,7 +174604,7 @@ self: {
          base monad-control transformers transformers-base
        ];
        description = "Stronger classes than monad-control";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-coroutine" = callPackage
@@ -173804,7 +174635,7 @@ self: {
        ];
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "A monad transformer for weighted graph searches";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-exception" = callPackage
@@ -173820,8 +174651,8 @@ self: {
          transformers-base
        ];
        description = "Exstensible monadic exceptions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173837,7 +174668,7 @@ self: {
          base mmorph monad-control stm transformers transformers-base
        ];
        description = "Extra utility functions for working with monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-finally" = callPackage
@@ -173853,7 +174684,7 @@ self: {
          transformers-base transformers-compat
        ];
        description = "Guard monadic computations with cleanup actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-fork" = callPackage
@@ -173864,8 +174695,8 @@ self: {
        sha256 = "15xwavq4yc3xfif4isjh9m0q9h1bh7pmv2i3rh99sndmd34cdpwc";
        libraryHaskellDepends = [ base monad-control ];
        description = "Type class for monads which support a fork operation";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173877,7 +174708,7 @@ self: {
        sha256 = "0rc4r6sg29sjgh9xsk7q80h0lixhyxs60bszj5dnn8yf7w18b15y";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple monad for generating fresh integers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-hash" = callPackage
@@ -173893,7 +174724,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring cryptonite transformers ];
        description = "Monad transformer for incremental hashing";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-http" = callPackage
@@ -173914,8 +174745,8 @@ self: {
          transformers transformers-compat
        ];
        description = "A class of monads which can do http requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173927,8 +174758,8 @@ self: {
        sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7";
        libraryHaskellDepends = [ base ];
        description = "Monads with an unsaveInterleaveIO-like operation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173943,7 +174774,7 @@ self: {
          base coercion-extras mmorph mtl transformers
        ];
        description = "A reader monad that gives the environment access to the entire transformer stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-io-adapter" = callPackage
@@ -173960,7 +174791,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec transformers-base ];
        description = "Adapters between MonadIO and MonadBase IO";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "monad-journal" = callPackage
@@ -173975,7 +174806,7 @@ self: {
          base monad-control mtl transformers transformers-base
        ];
        description = "Pure logger typeclass and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-levels" = callPackage
@@ -173990,8 +174821,8 @@ self: {
          base constraints transformers transformers-compat
        ];
        description = "Specific levels of monad transformers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174010,8 +174841,8 @@ self: {
          base containers deepseq hspec logict mtl QuickCheck
        ];
        description = "Monad transformers for combining local and global state";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174031,8 +174862,8 @@ self: {
          monad-control template-haskell text text-show transformers
        ];
        description = "A simple and fast logging monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174054,7 +174885,7 @@ self: {
          transformers-compat unliftio-core
        ];
        description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-logger-extras" = callPackage
@@ -174072,7 +174903,7 @@ self: {
        ];
        executableHaskellDepends = [ base monad-logger ];
        description = "Utilities for composing loggers, coloring output, plus a few orphan instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -174086,7 +174917,7 @@ self: {
          aeson base monad-logger template-haskell text
        ];
        description = "JSON-friendly Logging APIs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-logger-logstash" = callPackage
@@ -174102,7 +174933,7 @@ self: {
          transformers unliftio
        ];
        description = "Logstash backend for monad-logger";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-logger-prefix" = callPackage
@@ -174120,7 +174951,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion monad-logger ];
        description = "Add prefixes to your monad-logger output";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "monad-logger-syslog" = callPackage
@@ -174137,7 +174968,7 @@ self: {
          base bytestring fast-logger hsyslog monad-logger text transformers
        ];
        description = "syslog output for monad-logger";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-loops" = callPackage
@@ -174149,7 +174980,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Monadic loops";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-loops-stm" = callPackage
@@ -174160,7 +174991,7 @@ self: {
        sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as";
        libraryHaskellDepends = [ base stm ];
        description = "Monadic loops for STM";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-lrs" = callPackage
@@ -174179,8 +175010,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "a monad to calculate linear recursive sequence";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174196,7 +175027,7 @@ self: {
          base base-compat MonadRandom mtl random transformers
        ];
        description = "Markov process monad";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-memo" = callPackage
@@ -174219,7 +175050,7 @@ self: {
          array base containers criterion primitive transformers vector
        ];
        description = "Memoization monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -174232,8 +175063,8 @@ self: {
        editedCabalFile = "1kyfaridmi15wcib9gxns6v252pdhgsbyi303sqrvwhwpx9n3rl4";
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
        description = "An efficient random generator monad, based on the Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174251,7 +175082,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A convenient wrapper around EKG metrics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-metrics-extensible" = callPackage
@@ -174271,8 +175102,8 @@ self: {
          stm text
        ];
        description = "An extensible and type-safe wrapper around EKG metrics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174291,8 +175122,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad transformer for mocking mtl-style typeclasses";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174304,8 +175135,8 @@ self: {
        sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Open recursion for when you need it";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174317,7 +175148,7 @@ self: {
        sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8";
        libraryHaskellDepends = [ base containers mtl text vector ];
        description = "Monad for observation extraction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-par" = callPackage
@@ -174343,7 +175174,7 @@ self: {
          time
        ];
        description = "A library for parallel programming based on a monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-par-extras" = callPackage
@@ -174358,7 +175189,7 @@ self: {
          abstract-par base cereal deepseq mtl random transformers
        ];
        description = "Combinators and extra features for Par monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-parallel" = callPackage
@@ -174372,7 +175203,7 @@ self: {
          base parallel transformers transformers-compat
        ];
        description = "Parallel execution of monadic computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-parallel-progressbar" = callPackage
@@ -174387,8 +175218,8 @@ self: {
          base monad-parallel monadIO terminal-progress-bar
        ];
        description = "Parallel execution of monadic computations with a progress bar";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174400,8 +175231,8 @@ self: {
        sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Parameterized monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174421,7 +175252,7 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Lift control operations like exception catching through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-persist" = callPackage
@@ -174442,8 +175273,8 @@ self: {
          persistent-template text transformers
        ];
        description = "An mtl-style typeclass and transformer for persistent";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174455,7 +175286,7 @@ self: {
        sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x";
        libraryHaskellDepends = [ base primitive transformers ];
        description = "Type class for monad transformers stack with pirimitive base monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-products" = callPackage
@@ -174466,7 +175297,7 @@ self: {
        sha256 = "1skcjjkn14fh92l4rx3akxjg1c85jqhnlwvkkzqwz9g15bdy3gq2";
        libraryHaskellDepends = [ base semigroupoids ];
        description = "Monad products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-ran" = callPackage
@@ -174477,8 +175308,8 @@ self: {
        sha256 = "04y9s2b4hz2f8khr0q62xy0f6l2v896s7x03i3s18i14bwscqlax";
        libraryHaskellDepends = [ base ghc-prim mtl ];
        description = "Fast monads and monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174495,8 +175326,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Record and replay the results of monadic actions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174508,7 +175339,7 @@ self: {
        sha256 = "0hc9dbqhd609lzn79c25zwhm55262i9yip16ag9rysxv6rxbshml";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        description = "Resumption and reactive resumption monads for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-skeleton" = callPackage
@@ -174519,7 +175350,7 @@ self: {
        sha256 = "17jm69pwysx2kbx06n80iy396nbj5dys9iwdivargfzx7xql0s59";
        libraryHaskellDepends = [ base ];
        description = "Monads of program skeleta";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-st" = callPackage
@@ -174530,7 +175361,7 @@ self: {
        sha256 = "025zi9xzliwgyasq5hrfxwzg4ksj3kj0ys2kp62fi1n4ddbih64f";
        libraryHaskellDepends = [ base transformers ];
        description = "Provides a MonadST class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-state" = callPackage
@@ -174545,8 +175376,8 @@ self: {
          AbortT-transformers base fclabels monads-tf transformers
        ];
        description = "Utility library for monads, particularly those involving state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174559,8 +175390,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base stm ];
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174577,8 +175408,8 @@ self: {
        libraryHaskellDepends = [ base exceptions ghc-prim primitive ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "ST monad with efficient explicit errors";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174593,8 +175424,8 @@ self: {
          base bytestring containers deepseq monads-tf
        ];
        description = "ST-like monad capturing variables to regions and supporting IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174606,8 +175437,8 @@ self: {
        sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56";
        libraryHaskellDepends = [ base monad-stlike-io stm ];
        description = "ST-like monad capturing variables to regions and supporting STM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174619,7 +175450,7 @@ self: {
        sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
        libraryHaskellDepends = [ base stm transformers ];
        description = "MonadSTM class analogous to MonadIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-supply" = callPackage
@@ -174631,7 +175462,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Stateful supply monad";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "monad-task" = callPackage
@@ -174642,8 +175473,8 @@ self: {
        sha256 = "02qp31w0zgms07b13km3aiina4iqbzxkiajab3b0czmc17xv4kx4";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A monad transformer that turns event processing into co-routine programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174656,7 +175487,7 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        testHaskellDepends = [ base mtl time ];
        description = "Type class for monads which carry the notion of the current time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-timing" = callPackage
@@ -174673,8 +175504,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hlint hspec transformers ];
        description = "Monad transformer for recording timing events";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174686,8 +175517,8 @@ self: {
        sha256 = "0jv3pcmbm3bph42hhr4i0l3dchapixf5j5gd7ybs9j3bbk3yydk9";
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174701,8 +175532,8 @@ self: {
        editedCabalFile = "1qkccw4xd4i112d6mkw8dgsnwfrnqcg1shk9s5cwyn55pwlmnn3x";
        libraryHaskellDepends = [ base mtl unordered-containers ];
        description = "Generic first-order unification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174718,7 +175549,7 @@ self: {
          base constraints monad-control transformers transformers-base
        ];
        description = "Typeclasses for representing monad transformer unlifting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-unlift-ref" = callPackage
@@ -174735,7 +175566,7 @@ self: {
          mutable-containers resourcet stm transformers transformers-base
        ];
        description = "Typeclasses for representing monad transformer unlifting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-validate" = callPackage
@@ -174755,7 +175586,7 @@ self: {
          text transformers transformers-base unordered-containers vector
        ];
        description = "A monad transformer for data validation";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "monad-var" = callPackage
@@ -174766,8 +175597,8 @@ self: {
        sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88";
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174779,8 +175610,8 @@ self: {
        sha256 = "1hmigg0cbrsdvf6s0z2wn3s81q12qg3c30jjlsrw4jdfwv1qn13f";
        libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174792,7 +175623,7 @@ self: {
        sha256 = "1a3gb70fkh28ck13zdkphdip2kzdcivzdrsg9fdn3nci9scbdp2w";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadLib" = callPackage
@@ -174805,7 +175636,7 @@ self: {
        editedCabalFile = "072k4hnqkrfq80yh4qz2zw72fn43zm8l5rbjnckjaqdx4l315p11";
        libraryHaskellDepends = [ base ];
        description = "A collection of monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadLib-compose" = callPackage
@@ -174816,8 +175647,8 @@ self: {
        sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1";
        libraryHaskellDepends = [ base monadLib ];
        description = "Arrow-like monad composition for monadLib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174829,8 +175660,8 @@ self: {
        sha256 = "1k1jqi0q2n34xd07qp3fd4jw48iq4909m1pq2dm90sg46n6003sr";
        libraryHaskellDepends = [ base transformers ];
        description = "The Acme and AcmeT monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174858,7 +175689,7 @@ self: {
          transformers-compat
        ];
        description = "A monad for using CryptoRandomGen";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadfibre" = callPackage
@@ -174884,7 +175715,7 @@ self: {
          array base stm transformers transformers-compat
        ];
        description = "Boxed and unboxed arrays for monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadic-recursion-schemes" = callPackage
@@ -174900,8 +175731,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Recursion Schemes for Monadic version";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174919,8 +175750,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174939,8 +175770,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
@@ -174953,7 +175784,7 @@ self: {
        sha256 = "18hbi4vxj9lfcla11b17sb88ysskxavq00zmrjx62cpyzkp85yxh";
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "Reversibly allow monad transformer stacks to run in IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadlist" = callPackage
@@ -174964,7 +175795,7 @@ self: {
        sha256 = "1zpxqp5zhcpk4358xqrapvkcfyazpdsdlrw3g14518y2kwnfifq6";
        libraryHaskellDepends = [ base ];
        description = "Monadic versions of list functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadloc" = callPackage
@@ -174975,7 +175806,7 @@ self: {
        sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "A class for monads which can keep a monadic call trace";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monadloc-pp" = callPackage
@@ -174992,8 +175823,8 @@ self: {
          base filepath haskell-src-exts monadloc pretty syb
        ];
        description = "A preprocessor for generating monadic call traces";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175013,8 +175844,8 @@ self: {
          monad-control template-haskell text text-show transformers
        ];
        description = "A simple and fast logging monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175028,7 +175859,7 @@ self: {
          base monad-control mtl transformers-base
        ];
        description = "A monoid for monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadplus" = callPackage
@@ -175041,8 +175872,8 @@ self: {
        editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp";
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175054,8 +175885,8 @@ self: {
        sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monad classes, using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175067,7 +175898,7 @@ self: {
        sha256 = "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadtransform" = callPackage
@@ -175078,7 +175909,7 @@ self: {
        sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv";
        libraryHaskellDepends = [ base transformers ];
        description = "A type-class for transforming monads (homomorphism) in a transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monarch" = callPackage
@@ -175096,8 +175927,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Monadic interface for TokyoTyrant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175121,8 +175952,8 @@ self: {
          timerep transformers wai warp
        ];
        description = "Haskell bindings for the Mondo API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175134,8 +175965,8 @@ self: {
        sha256 = "069jmlnrgia36ncl5mqaqq0iaqwrhx6ig5jjnlxr40vfdi4m4dw6";
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175148,8 +175979,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Money";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175182,8 +176013,8 @@ self: {
          nonce parsec random random-shuffle stm text tls transformers-base
        ];
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175204,8 +176035,8 @@ self: {
          text transformers
        ];
        description = "message queue using MongoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175223,8 +176054,8 @@ self: {
          case-insensitive containers http-types text zeromq-haskell
        ];
        description = "Mongrel2 Handler Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175238,8 +176069,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175264,8 +176095,8 @@ self: {
          base containers directory mtl optparse-applicative process unix
        ];
        description = "A system state collecting library and application";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175277,8 +176108,8 @@ self: {
        sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm";
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "Folds for monomorphic containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175302,7 +176133,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mwc-random vector ];
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -175319,7 +176150,7 @@ self: {
          semigroupoids semigroups transformers vector-instances
        ];
        description = "Extra typeclass instances for mono-traversable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mono-traversable-keys" = callPackage
@@ -175337,7 +176168,7 @@ self: {
          vector-instances
        ];
        description = "Type-classes for interacting with monomorphic containers with a key";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mono-traversable-wrapper" = callPackage
@@ -175348,7 +176179,7 @@ self: {
        sha256 = "1jv40qwj08vfsy06cdrwdi05j06b1q3q7p30gh60ccq9l8y1qi2d";
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Wrapper providing Foldable instance for MonoFoldables";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monoid" = callPackage
@@ -175359,8 +176190,8 @@ self: {
        sha256 = "13k5s9y37igvrsfbw5q76zy10fm585dijx10qk32c4agih9fxyfv";
        libraryHaskellDepends = [ base containers lens mtl ];
        description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175372,8 +176203,8 @@ self: {
        sha256 = "1sq2ll3ac3fxb0gdcy6gzjlv5j17pnrj8zs2bhi2s96dx2gp6zrv";
        libraryHaskellDepends = [ base mtl ];
        description = "A library for (left, right) zero monoids and backtracking with cut";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175389,8 +176220,8 @@ self: {
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "Various extra monoid-related definitions and utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175403,8 +176234,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "a practical monoid implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175416,7 +176247,7 @@ self: {
        sha256 = "14xs1nvf0ngx4jvinkhzq3ainhs159zx0396z88y21vvc8kw42i5";
        libraryHaskellDepends = [ base ];
        description = "Support for modifying record fields of monoidal type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoid-statistics" = callPackage
@@ -175436,7 +176267,7 @@ self: {
          base math-functions QuickCheck tasty tasty-quickcheck
        ];
        description = "Monoids for calculation of statistics of sample";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoid-subclasses" = callPackage
@@ -175455,7 +176286,7 @@ self: {
          tasty tasty-quickcheck text vector
        ];
        description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -175466,7 +176297,7 @@ self: {
        sha256 = "1243r77m5ywphwyhw7kn9vb2ha5m5zj375bd61fprdfiwi3z3as3";
        libraryHaskellDepends = [ base semigroups ];
        description = "Monoid counterparts to some ubiquitous monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoidal-containers" = callPackage
@@ -175484,7 +176315,7 @@ self: {
          semigroups these unordered-containers
        ];
        description = "Containers with monoidal accumulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoidplus" = callPackage
@@ -175497,8 +176328,8 @@ self: {
          base contravariant semigroups transformers
        ];
        description = "Extra classes/functions about monoids";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175514,8 +176345,8 @@ self: {
          array base bytestring containers fingertree parallel text
        ];
        description = "Deprecated: Use 'reducers'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175527,7 +176358,7 @@ self: {
        sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln";
        libraryHaskellDepends = [ base ];
        description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monopati" = callPackage
@@ -175543,8 +176374,8 @@ self: {
          base directory free hedgehog peano split transformers
        ];
        description = "Well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175565,8 +176396,8 @@ self: {
          zeromq-haskell
        ];
        description = "Riak Resolution Proxy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {riak-bump = null; stats-web = null;};
 
@@ -175588,8 +176419,8 @@ self: {
          unordered-containers zeromq-haskell
        ];
        description = "Riak Resolution Proxy Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {riak-bump = null; stats-web = null;};
 
@@ -175610,8 +176441,8 @@ self: {
          test-framework-quickcheck2 transformers vector
        ];
        description = "A monad and transformer for Monte Carlo calculations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175632,8 +176463,8 @@ self: {
          time-compat
        ];
        description = "Month, YearMonth, Quarter, YearQuarter types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175650,8 +176481,8 @@ self: {
          base containers smallcheck tasty tasty-quickcheck tasty-smallcheck
        ];
        description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175675,8 +176506,8 @@ self: {
          timerep transformers wai warp
        ];
        description = "Haskell bindings for the Monzo API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175698,8 +176529,8 @@ self: {
          MonadRandom mtl parallel random random-shuffle time vector
        ];
        description = "Genetic algorithm library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175716,7 +176547,7 @@ self: {
          text time transformers yaml
        ];
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "more-containers" = callPackage
@@ -175728,7 +176559,7 @@ self: {
        libraryHaskellDepends = [ base binary containers ];
        testHaskellDepends = [ base binary containers hspec ];
        description = "A few more collections";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "more-extensible-effects" = callPackage
@@ -175739,7 +176570,7 @@ self: {
        sha256 = "1sl4m02ji5my13kajcr2csqm24jph01qsihxj5dj66cxgw99idq1";
        libraryHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "morfette" = callPackage
@@ -175759,8 +176590,8 @@ self: {
          pretty QuickCheck text utf8-string vector
        ];
        description = "A tool for supervised learning of morphology";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175778,8 +176609,8 @@ self: {
        ];
        librarySystemDepends = [ morfeusz ];
        description = "Bindings to the morphological analyser Morfeusz";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {morfeusz = null;};
 
@@ -175797,8 +176628,8 @@ self: {
      }:
      mkDerivation {
        pname = "morley";
-       version = "1.11.0";
-       sha256 = "06l83vida9kyyh9xc4rhjp7q36iq2knn4p2mrl9j7nvsinrqprcn";
+       version = "1.11.1";
+       sha256 = "04gvyfhn84p5dns28h1cfn68fpz7zwsavwvay27b3yfbzd8i1z31";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -175816,8 +176647,8 @@ self: {
          morley-prelude named optparse-applicative text vinyl with-utf8
        ];
        description = "Developer tools for the Michelson Language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175829,7 +176660,7 @@ self: {
        sha256 = "1nrwrz54xg0v9v8f1caccpdav1d0nnjqy8r8wmj5cgf9y30jfzjf";
        libraryHaskellDepends = [ base-noprelude universum ];
        description = "A custom prelude used in Morley";
-       license = stdenv.lib.licenses.agpl3Plus;
+       license = lib.licenses.agpl3Plus;
      }) {};
 
   "morloc" = callPackage
@@ -175867,8 +176698,8 @@ self: {
          tasty-quickcheck template-haskell text unordered-containers yaml
        ];
        description = "A multi-lingual, typed, workflow language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175888,7 +176719,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A simple database migrator for PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "morpheus-graphql" = callPackage
@@ -175912,7 +176743,7 @@ self: {
          template-haskell text transformers unordered-containers vector
        ];
        description = "Morpheus GraphQL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morpheus-graphql-cli" = callPackage
@@ -175932,8 +176763,8 @@ self: {
          base bytestring filepath morpheus-graphql optparse-applicative
        ];
        description = "Morpheus GraphQL CLI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175957,7 +176788,7 @@ self: {
          unordered-containers
        ];
        description = "Morpheus GraphQL Client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morpheus-graphql-core" = callPackage
@@ -175982,7 +176813,7 @@ self: {
          th-lift-instances transformers unordered-containers vector
        ];
        description = "Morpheus GraphQL Core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morpheus-graphql-subscriptions" = callPackage
@@ -176005,7 +176836,7 @@ self: {
          unordered-containers uuid websockets
        ];
        description = "Morpheus GraphQL Subscriptions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morphisms" = callPackage
@@ -176015,7 +176846,7 @@ self: {
        version = "0.1.1";
        sha256 = "0waj252x6xpxaph50l248r0xf44xzfsz6jpmza5mwi9qf1br6dws";
        description = "It's all about functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morphisms-functors" = callPackage
@@ -176026,8 +176857,8 @@ self: {
        sha256 = "1mv2sjn68n55482496icg84nbf3mn85fizf4q42781qn689np60q";
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176039,8 +176870,8 @@ self: {
        sha256 = "16p5wj9yq6qsbzaqsx0p33fkginkf5mbqg4y7pak2wx1v7aqll2m";
        libraryHaskellDepends = [ morphisms morphisms-functors ];
        description = "Inventory is state and store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176052,8 +176883,8 @@ self: {
        sha256 = "1d5jbjp8ih1fsna8w2mkw217ybsxdhyh7acq0r7b9iwngh52jj6b";
        libraryHaskellDepends = [ morphisms ];
        description = "Algebraic structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176087,8 +176918,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176107,8 +176938,8 @@ self: {
          stm-chans transformers
        ];
        description = "Generación interactiva de mosaicos";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176120,7 +176951,7 @@ self: {
        sha256 = "0c80pf189gkxr3zrf8r5rsw5gli1kk4q4pd3giww9wxwpc2nyjln";
        libraryHaskellDepends = [ base ];
        description = "Mosquitto client library bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "moss" = callPackage
@@ -176136,7 +176967,7 @@ self: {
          unix-compat
        ];
        description = "Haskell client for Moss";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "moto" = callPackage
@@ -176161,7 +176992,7 @@ self: {
          safe-exceptions tasty tasty-hunit tasty-quickcheck text time
        ];
        description = "General purpose migrations library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "moto-postgresql" = callPackage
@@ -176177,8 +177008,8 @@ self: {
          text
        ];
        description = "PostgreSQL-based migrations registry for moto";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176200,7 +177031,7 @@ self: {
        ];
        testHaskellDepends = [ base indexed indexed-extras row-types ];
        description = "Type-safe effectful state machines in Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "motor-diagrams" = callPackage
@@ -176219,8 +177050,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176238,8 +177069,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176252,7 +177083,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176287,8 +177118,8 @@ self: {
          system-filepath text time
        ];
        description = "Plays videos using GStreamer and GTK+";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176301,7 +177132,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "This is a library for calculating moving averages on lists of numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mp" = callPackage
@@ -176325,8 +177156,8 @@ self: {
          simple-ui template-haskell text unix utf8-string vty
        ];
        description = "Music player for linux";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176343,7 +177174,7 @@ self: {
        ];
        description = "MP3 decoder for teaching";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mpdmate" = callPackage
@@ -176358,8 +177189,8 @@ self: {
          base directory network powermate unix
        ];
        description = "MPD/PowerMate executable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176372,7 +177203,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpg123 ];
        description = "Mpg132 bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) mpg123;};
 
   "mpi-hs" = callPackage
@@ -176391,7 +177222,7 @@ self: {
        testHaskellDepends = [ base monad-loops ];
        testSystemDepends = [ mpich ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {inherit (pkgs) mpich;};
 
   "mpi-hs-binary" = callPackage
@@ -176408,7 +177239,7 @@ self: {
        executableHaskellDepends = [ base mpi-hs ];
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mpi-hs-cereal" = callPackage
@@ -176425,7 +177256,7 @@ self: {
        executableHaskellDepends = [ base mpi-hs ];
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mpi-hs-store" = callPackage
@@ -176442,7 +177273,7 @@ self: {
        executableHaskellDepends = [ base mpi-hs ];
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mplayer-spot" = callPackage
@@ -176462,7 +177293,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Save your spot when watching movies with @mplayer@";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mpppc" = callPackage
@@ -176476,7 +177307,7 @@ self: {
        ];
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176495,8 +177326,8 @@ self: {
          base devtools source-constraints text unliftio-core
        ];
        description = "A minimalish prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176513,8 +177344,8 @@ self: {
          orders text transformers
        ];
        description = "a monadic, extensible pretty printing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176526,8 +177357,8 @@ self: {
        sha256 = "11c62m19ngap44fv4gnv0ln8iff1b08dg2vclj16jx1fj8pqps9y";
        libraryHaskellDepends = [ base containers dbus mtl ];
        description = "Interface for MPRIS";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176545,8 +177376,8 @@ self: {
          base containers haskell98 mtl parsec pretty transformers unbound
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176566,8 +177397,8 @@ self: {
          utf8-string
        ];
        description = "simply oo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176592,8 +177423,8 @@ self: {
        ];
        executableToolDepends = [ c2hs ];
        description = "A work in progress Multipath TCP path manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176612,8 +177443,8 @@ self: {
          base directory filepath gtk mtl process template-haskell unix
        ];
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176642,8 +177473,8 @@ self: {
          base binary bytestring criterion text
        ];
        description = "An MQTT protocol implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176660,8 +177491,8 @@ self: {
          stm text transformers
        ];
        description = "A MQTT client library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176674,7 +177505,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A simple way to read environment variables in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mrifk" = callPackage
@@ -176688,7 +177519,7 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        description = "Decompiles Glulx files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176700,8 +177531,8 @@ self: {
        sha256 = "1qmfki808284yz8l5l30s10q6idhlmp864wi6xbk14chh331xaiw";
        libraryHaskellDepends = [ base ];
        description = "Modular Refiable Matching, first-class matches";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176722,8 +177553,8 @@ self: {
          base doctest profunctors tasty tasty-quickcheck vector
        ];
        description = "metric spaces";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176747,7 +177578,7 @@ self: {
          x509-system
        ];
        description = "TDS Protocol implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "msgpack" = callPackage
@@ -176769,8 +177600,8 @@ self: {
          async base bytestring QuickCheck tasty tasty-quickcheck
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176789,8 +177620,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        description = "Aeson adapter for MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176817,8 +177648,8 @@ self: {
          base bytestring criterion deepseq QuickCheck
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176840,8 +177671,8 @@ self: {
        executableHaskellDepends = [ base cmdargs directory peggy ];
        testHaskellDepends = [ base hspec ];
        description = "An IDL Compiler for MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176862,8 +177693,8 @@ self: {
        ];
        testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        description = "A MessagePack-RPC Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176885,8 +177716,8 @@ self: {
        ];
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176908,7 +177739,7 @@ self: {
          QuickCheck text unordered-containers vector
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "msh" = callPackage
@@ -176924,8 +177755,8 @@ self: {
          template-haskell text
        ];
        description = "Object-Oriented Programming in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176939,8 +177770,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176961,7 +177792,7 @@ self: {
          text time tls uuid-types
        ];
        description = "SQL Server client library implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mstate" = callPackage
@@ -176972,7 +177803,7 @@ self: {
        sha256 = "13jv04skkb0ysxx9gswynp7fg7yz3nwy5zhzp209fbwr9izxcm05";
        libraryHaskellDepends = [ base fail monad-peel mtl stm ];
        description = "MState: A consistent State monad for concurrent applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "msu" = callPackage
@@ -176989,7 +177820,7 @@ self: {
          base directory filepath mtl parsec process xdg-basedir
        ];
        description = "Monitor Setup Utility";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mtgoxapi" = callPackage
@@ -177015,8 +177846,8 @@ self: {
          text time transformers unordered-containers vector watchdog
        ];
        description = "Library to communicate with Mt.Gox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177028,8 +177859,8 @@ self: {
        sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mtl-c" = callPackage
@@ -177040,8 +177871,8 @@ self: {
        sha256 = "12zays8x0b65dc11s95f5j6gwz2kksh9md5m9cpal1yj5qydmmrd";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Very strict CPS'd transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177054,7 +177885,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        doHaddock = false;
        description = "Backported Control.Monad.Except module from mtl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mtl-evil-instances" = callPackage
@@ -177069,8 +177900,8 @@ self: {
          base monad-control mtl transformers transformers-base
        ];
        description = "Instances for the mtl classes for all monad transformers";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177082,8 +177913,8 @@ self: {
        sha256 = "1v7wm6gsp3c9kad6slxwj68s3050zqkv6k4n5h827vgx7na694pz";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Higher order versions of MTL classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177095,7 +177926,7 @@ self: {
        sha256 = "0cqjl0mcnj6qgx46qxjygndzlgch4mc0q0sm3wbd4fynjfhdv9n4";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mtl-tf" = callPackage
@@ -177106,8 +177937,8 @@ self: {
        sha256 = "0z9vinxhbbg4lpf8mxi0h3jbz4kv6x3ih05q44kjh4z8mpm9szzy";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177127,7 +177958,7 @@ self: {
          base contravariant hspec hspec-core lens mtl profunctors
        ];
        description = "MTL classes without the functional dependency";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mtl-uplift" = callPackage
@@ -177139,7 +177970,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base mtl ];
        description = "Lift substacks of monad transformer stacks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mtlparse" = callPackage
@@ -177161,8 +177992,8 @@ self: {
        sha256 = "0s0cniqn1fb7rq14w3wjh7mkzkxpndj1h1wrgssxds6cs3vkk4dn";
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177176,7 +178007,7 @@ self: {
        librarySystemDepends = [ mtp ];
        description = "Bindings to libmtp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mtp = null;};
 
@@ -177188,7 +178019,7 @@ self: {
        sha256 = "1l4kjrmr5v8pkhf48w0ym6dlrsvaf21p3x5sykq1rxwp821cqglv";
        libraryHaskellDepends = [ base bifunctors ];
        description = "Tree with Meta and Content parameters";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "mtsl" = callPackage
@@ -177199,7 +178030,7 @@ self: {
        sha256 = "02zfqimal6f5a1wldfy4abk7mvmvac71j9m01bxzw5ydmm057wgh";
        libraryHaskellDepends = [ base mtl ];
        description = "Reified monad transformer stacks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mu-avro" = callPackage
@@ -177210,8 +178041,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-avro";
-       version = "0.4.0.2";
-       sha256 = "1g8cww3lz5dlgri34m0fjpc8sbs64f4fcxx8h1mamgzn5f3f2z7h";
+       version = "0.4.0.3";
+       sha256 = "01sygrx80jfi6xygrgj2chqjr0fllld807p26rggfdzwp9p6pc9b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -177220,10 +178051,12 @@ self: {
          mu-schema sop-core tagged template-haskell text time transformers
          unordered-containers uuid vector
        ];
-       executableHaskellDepends = [ avro base bytestring mu-schema ];
+       executableHaskellDepends = [
+         avro base bytestring containers mu-schema
+       ];
        description = "Avro serialization support for Mu microservices";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177237,8 +178070,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-graphql";
-       version = "0.4.1.0";
-       sha256 = "0qi6sc0vwzdayjhfr0rqvrfp1ydcy9fwhyzkmc488gfafi0xc1gj";
+       version = "0.5.0.0";
+       sha256 = "0idlxja65gv2whaln7snrqa87yfm7dc3pqwnq6qhmxwvm1npbjqk";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -177250,11 +178083,11 @@ self: {
          websockets
        ];
        executableHaskellDepends = [
-         base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp
+         aeson base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp
        ];
        description = "GraphQL support for Mu";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177269,6 +178102,8 @@ self: {
        pname = "mu-grpc-client";
        version = "0.4.0.1";
        sha256 = "030b8ajbplb1w5llzm8vn8jpwa7v4kw0y8zli8xagc50k19wp75v";
+       revision = "2";
+       editedCabalFile = "1zs17a684mww8ppgams79xbr019mlr27bxnnhvyhq3k5y1lwz7dh";
        libraryHaskellDepends = [
          async avro base bytestring conduit http2 http2-client
          http2-client-grpc http2-grpc-types mu-grpc-common mu-optics
@@ -177276,8 +178111,8 @@ self: {
          stm-conduit template-haskell text th-abstraction tracing
        ];
        description = "gRPC clients from Mu definitions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177290,13 +178125,15 @@ self: {
        pname = "mu-grpc-common";
        version = "0.4.0.0";
        sha256 = "0rn0gkvxfd8j6ayzixapm3nagjszf50xjr8d59v7vfqh61kwrx83";
+       revision = "1";
+       editedCabalFile = "06749nqdaki8w84inpbw52kdkdiban3znlvdjl7brh37rmwmi2sn";
        libraryHaskellDepends = [
          avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types
          mu-avro mu-protobuf mu-rpc mu-schema
        ];
        description = "gRPC for Mu, common modules for client and server";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177308,8 +178145,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-grpc-server";
-       version = "0.4.0.0";
-       sha256 = "0wnqalcsj7j2ny999nw818ncy292f3kmmbwc2ci14d43zgrjdi3v";
+       version = "0.5.0.0";
+       sha256 = "1k5fq8daxhl7rm27craj0rn7k3j1k4qrphh6ckpn3sa2y4zrrrl5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177323,8 +178160,8 @@ self: {
          stm-conduit wai warp warp-grpc warp-tls
        ];
        description = "gRPC servers for Mu definitions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177341,8 +178178,8 @@ self: {
          mu-avro mu-schema resourcet
        ];
        description = "Utilities for interoperation between Mu and Kafka";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177358,8 +178195,8 @@ self: {
          base containers generic-lens lens mu-rpc mu-schema sop-core text
        ];
        description = "Lenses for @mu-schema@ terms";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177374,8 +178211,8 @@ self: {
          base containers mu-schema optics-core sop-core
        ];
        description = "Optics for @mu-schema@ terms";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177392,8 +178229,8 @@ self: {
          transformers
        ];
        description = "Utilities for interoperation between Mu and Persistent";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177403,42 +178240,42 @@ self: {
      }:
      mkDerivation {
        pname = "mu-prometheus";
-       version = "0.4.0.0";
-       sha256 = "060fx3svjiwzyfifmwrzcvm23xp332yb91fb4hh7whcmi2q415c8";
+       version = "0.5.0.0";
+       sha256 = "02a31v12z2cp5ykgmin50lz3c8zvhrras41n53hvc0s043483ibz";
        libraryHaskellDepends = [
          base lifted-base monad-control mu-rpc prometheus-client text wai
          wai-middleware-prometheus
        ];
        description = "Metrics support for Mu using Prometheus";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "mu-protobuf" = callPackage
-    ({ mkDerivation, base, bytestring, compendium-client, http-client
-     , http2-grpc-proto3-wire, language-protobuf, mu-rpc, mu-schema
-     , proto3-wire, servant-client-core, sop-core, template-haskell
-     , text
+    ({ mkDerivation, base, bytestring, compendium-client, containers
+     , http-client, http2-grpc-proto3-wire, language-protobuf, mu-rpc
+     , mu-schema, proto3-wire, servant-client-core, sop-core
+     , template-haskell, text
      }:
      mkDerivation {
        pname = "mu-protobuf";
-       version = "0.4.0.3";
-       sha256 = "0wc562fw89l3qmyf28axj41cyj88ppkg0jsif9rsrdgj4ypq2zrj";
+       version = "0.4.1.0";
+       sha256 = "1sx9943y1z213fx5gasw78xz7zgxk33lfnx16918ls5jxma40igh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring compendium-client http-client
+         base bytestring compendium-client containers http-client
          http2-grpc-proto3-wire language-protobuf mu-rpc mu-schema
          proto3-wire servant-client-core sop-core template-haskell text
        ];
        executableHaskellDepends = [
-         base bytestring mu-schema proto3-wire text
+         base bytestring containers mu-schema proto3-wire text
        ];
        description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177448,15 +178285,15 @@ self: {
      }:
      mkDerivation {
        pname = "mu-rpc";
-       version = "0.4.0.1";
-       sha256 = "0s1q12nl6q3smnmmk2f1qhs0bk3sarmjcabvnj06vw6ciivnx16z";
+       version = "0.5.0.0";
+       sha256 = "15a950ig348h0fxfvzq4pj8s8rryn18cd26vmrcmx7s6w32zlzyr";
        libraryHaskellDepends = [
          aeson base conduit http-types mtl mu-schema sop-core
          template-haskell text wai
        ];
        description = "Protocol-independent declaration of services and servers";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177475,8 +178312,8 @@ self: {
          vector
        ];
        description = "Format-independent schemas for serialization";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177487,8 +178324,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-servant-server";
-       version = "0.4.0.0";
-       sha256 = "0iwcrqbldfvjg9g7pq1r9gw8avhrl4m9fxjcr7gbci2fwalx7901";
+       version = "0.5.0.0";
+       sha256 = "0szd3byklap7a2dwqxq12vj99vgpa7vaqv5l3cvm1016in30l1yd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177500,8 +178337,8 @@ self: {
          aeson base conduit mu-rpc mu-schema servant-server text warp
        ];
        description = "Servant servers for Mu definitions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177515,8 +178352,8 @@ self: {
          base containers mu-rpc text tracing-control
        ];
        description = "Tracing support for Mu";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177552,8 +178389,8 @@ self: {
          base directory free hspec mtl QuickCheck time unix
        ];
        description = "Multi-version deployer for web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177575,7 +178412,7 @@ self: {
        ];
        description = "Continuous deployment server for use with GitHub";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "muesli" = callPackage
@@ -177591,8 +178428,8 @@ self: {
          psqueues time
        ];
        description = "A simple document-oriented database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177614,7 +178451,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Safely evaluate pure Haskell expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mulang" = callPackage
@@ -177646,8 +178483,8 @@ self: {
        ];
        testToolDepends = [ alex happy ];
        description = "An intermediate language designed to perform advanced code analysis";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177659,8 +178496,8 @@ self: {
        sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6";
        libraryHaskellDepends = [ base ];
        description = "MULTEXT-East morphosyntactic descriptors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177682,8 +178519,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "A tool supporting multi cabal project builds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177697,7 +178534,7 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        testToolDepends = [ hspec-discover ];
        description = "A few multimap variants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multi-instance" = callPackage
@@ -177709,8 +178546,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Typeclasses augmented with a phantom type parameter";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177723,8 +178560,8 @@ self: {
        libraryHaskellDepends = [ base composition containers ];
        testHaskellDepends = [ base containers HTF ];
        description = "Trie of sets, as a model for compound names having multiple values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177745,8 +178582,8 @@ self: {
          base tasty tasty-hunit tasty-quickcheck text
        ];
        description = "A network address format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177765,8 +178602,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
        description = "Command lines for options that take multiple arguments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177779,8 +178616,8 @@ self: {
      }:
      mkDerivation {
        pname = "multibase";
-       version = "0.1.1";
-       sha256 = "08r3imyvgi6ahgfqpjcxfr3xg4zj2cvw4g2lzqs04ncipzrw5rnf";
+       version = "0.1.2";
+       sha256 = "036caj0dzhzp065dhy05flz2j5qml5pirs1y95np4hf2xv9jk32h";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base16-bytestring base32-z-bytestring base58-bytestring
@@ -177789,8 +178626,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177809,7 +178646,7 @@ self: {
          transformers
        ];
        description = "create many files from one";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multifocal" = callPackage
@@ -177834,8 +178671,8 @@ self: {
          process syb
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177859,8 +178696,8 @@ self: {
          cryptohash hex io-streams optparse-applicative
        ];
        description = "Multihash library and CLI executable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177880,7 +178717,7 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite doctest hedgehog ];
        description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multihash-serialise" = callPackage
@@ -177897,8 +178734,8 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite hedgehog serialise ];
        description = "CBOR encoding of multihashes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177910,7 +178747,7 @@ self: {
        sha256 = "1bripl4vqj275n4wnka7vrdcjyyppbc773pfsbmvfjvl2qqi5jrb";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "hashmap from keys to hashsets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multilinear" = callPackage
@@ -177931,8 +178768,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177956,8 +178793,8 @@ self: {
          base criterion deepseq directory either multilinear transformers
        ];
        description = "Conduit-based input/output capability for multilinear package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177969,7 +178806,7 @@ self: {
        sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
        libraryHaskellDepends = [ base containers ];
        description = "A multimap";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "multipart" = callPackage
@@ -177980,7 +178817,7 @@ self: {
        sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn";
        libraryHaskellDepends = [ base bytestring parsec stringsearch ];
        description = "Parsers for the HTTP multipart format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipart-names" = callPackage
@@ -177996,7 +178833,7 @@ self: {
          base HUnit lens test-framework test-framework-hunit
        ];
        description = "Handling of multipart names in various casing styles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipass" = callPackage
@@ -178012,8 +178849,8 @@ self: {
          newtype unordered-containers
        ];
        description = "Folding data with multiple named passes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178025,8 +178862,8 @@ self: {
        sha256 = "0m4wmh5iib5g1qxzj23q330gznib7q80r405df10k9685aqafgn3";
        libraryHaskellDepends = [ base parsec utf8-string ];
        description = "Parser and builder for unix-path-like objects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178041,7 +178878,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
        description = "Lightweight generic library for mutually recursive data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "multiplate-simplified" = callPackage
@@ -178053,8 +178890,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178071,8 +178908,8 @@ self: {
          base containers fez-conf mtl process
        ];
        description = "Wrapper program for duplicity, adding config files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178093,7 +178930,7 @@ self: {
          text unordered-containers
        ];
        description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipool-persistent" = callPackage
@@ -178113,7 +178950,7 @@ self: {
          unordered-containers
        ];
        description = "Read and write from appropriate persistent sql instances in replicated environments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipool-persistent-postgresql" = callPackage
@@ -178137,8 +178974,8 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "Read and write appropriately from both master and replicated postgresql instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178159,7 +178996,7 @@ self: {
          base bytestring mtl multipool postgresql-simple resource-pool
          unliftio-core unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multiprocess" = callPackage
@@ -178170,7 +179007,7 @@ self: {
        sha256 = "06f1yq4x9jc7cv8nxsqbm47xbv6b2cp1q8xkbhlqr9dbz8cvf5my";
        libraryHaskellDepends = [ base ];
        description = "Multiprocess architecture library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multirec" = callPackage
@@ -178182,8 +179019,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Generic programming for families of recursive datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178199,8 +179036,8 @@ self: {
          base containers mtl multirec syb template-haskell th-expand-syns
        ];
        description = "Alternative multirec instances deriver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178212,8 +179049,8 @@ self: {
        sha256 = "1cj1rfjqxwc06vr5w12fqbcpjb0fjsphf8vp40sp2naizpvvnmzs";
        libraryHaskellDepends = [ base binary multirec ];
        description = "Generic Data.Binary instances using MultiRec.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178230,7 +179067,7 @@ self: {
          base checkers doctest QuickCheck tasty tasty-quickcheck
        ];
        description = "The Data.MultiSet container type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multiset-comb" = callPackage
@@ -178243,7 +179080,7 @@ self: {
        editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Combinatorial algorithms over multisets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multisetrewrite" = callPackage
@@ -178255,8 +179092,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm ];
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178275,7 +179112,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec transformers ];
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multivariant" = callPackage
@@ -178305,8 +179142,8 @@ self: {
          transformers
        ];
        description = "Multivariant assignments generation language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178325,8 +179162,8 @@ self: {
          base smallcheck tasty tasty-smallcheck Vector
        ];
        description = "Vectors of packed tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Vector = null;};
 
@@ -178347,8 +179184,8 @@ self: {
          HStringTemplate markdown MissingH process text
        ];
        description = "Static blog generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178366,7 +179203,7 @@ self: {
        ];
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178392,8 +179229,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Simple CUI Twitter Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178405,7 +179242,7 @@ self: {
        sha256 = "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9";
        libraryHaskellDepends = [ base bytestring ];
        description = "MurmurHash2 implementation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "murmur3" = callPackage
@@ -178425,7 +179262,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "murmurhash3" = callPackage
@@ -178436,8 +179273,8 @@ self: {
        sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2";
        libraryHaskellDepends = [ haskell2010 ];
        description = "32-bit non-cryptographic hashing";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178464,8 +179301,8 @@ self: {
        ];
        testHaskellDepends = [ base classy-prelude ];
        description = "Minimalist MPD client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178477,7 +179314,7 @@ self: {
        sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg";
        libraryHaskellDepends = [ average base semigroups ];
        description = "Abstract representation of musical articulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-diatonic" = callPackage
@@ -178489,7 +179326,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-dynamics" = callPackage
@@ -178503,7 +179340,7 @@ self: {
          average base music-dynamics-literal semigroups
        ];
        description = "Abstract representation of musical dynamics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-dynamics-literal" = callPackage
@@ -178514,7 +179351,7 @@ self: {
        sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5";
        libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded dynamics literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-graphics" = callPackage
@@ -178530,8 +179367,8 @@ self: {
          music-score process
        ];
        description = "Diagrams-based visualization of musical data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178554,8 +179391,8 @@ self: {
          vector-space vector-space-points
        ];
        description = "Musical instruments, parts and playing techniques";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178573,8 +179410,8 @@ self: {
          positive semigroups type-unary vector-space vector-space-points
        ];
        description = "Musical pitch representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178588,7 +179425,7 @@ self: {
        editedCabalFile = "0v86clbcjkgg7psx8jbxq4za66v8ln1vkr7ywrm0vz6vbgkg356f";
        libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded pitch literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-preludes" = callPackage
@@ -178615,8 +179452,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178640,8 +179477,8 @@ self: {
          transformers-compat vector-space vector-space-points
        ];
        description = "Musical score and part representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178661,8 +179498,8 @@ self: {
          music-preludes music-score semigroups unordered-containers
        ];
        description = "Interaction with Sibelius";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178682,8 +179519,8 @@ self: {
        ];
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178701,8 +179538,8 @@ self: {
          base Cabal containers directory fgl process shelly split text unix
        ];
        description = "Utility for developing the Music Suite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178727,8 +179564,8 @@ self: {
        executableHaskellDepends = [ base ];
        executablePkgconfigDepends = [ gtk3 ];
        description = "Supply your tunes info without leaving your music player";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk3;};
 
@@ -178762,8 +179599,8 @@ self: {
          test-framework-smallcheck text time transformers xmlhtml
        ];
        description = "Send an email to all MusicBrainz editors";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178782,8 +179619,8 @@ self: {
          transformers
        ];
        description = "Sound synthesis library, to be used with GHCJS and Web Audio API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-prim = null;};
 
@@ -178799,8 +179636,8 @@ self: {
          base containers directory HaXml old-time pretty
        ];
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178818,7 +179655,7 @@ self: {
          reverse-apply semigroups type-unary xml
        ];
        description = "A representation of the MusicXML format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mustache" = callPackage
@@ -178847,7 +179684,7 @@ self: {
          lens process tar temporary text unordered-containers wreq yaml zlib
        ];
        description = "A mustache template parser library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mustache-haskell" = callPackage
@@ -178871,8 +179708,8 @@ self: {
          vector
        ];
        description = "Straight implementation of mustache templates";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178892,7 +179729,7 @@ self: {
        ];
        description = "Utility to generate Haskell code from Mustache templates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mutable" = callPackage
@@ -178913,7 +179750,7 @@ self: {
          transformers vector vinyl
        ];
        description = "Automatic piecewise-mutable references for your types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mutable-containers" = callPackage
@@ -178932,7 +179769,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers gauge vector ];
        description = "Abstactions and concrete implementations of mutable containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mutable-iter" = callPackage
@@ -178947,8 +179784,8 @@ self: {
          base iteratee MonadCatchIO-transformers transformers vector
        ];
        description = "iteratees based upon mutable buffers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178967,7 +179804,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base extra primitive ];
        description = "Interoperate mutable references with regular lens";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mute-unmute" = callPackage
@@ -178985,8 +179822,8 @@ self: {
          process
        ];
        description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178998,8 +179835,8 @@ self: {
        sha256 = "09diqzb4vp7bcg6v16fgjb70mi68i8srnyxf6qga58va6avbc4wg";
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179016,8 +179853,8 @@ self: {
          pipes-concurrency transformers
        ];
        description = "Model-view-controller";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179029,8 +179866,8 @@ self: {
        sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
        libraryHaskellDepends = [ async base foldl mvc ];
        description = "Concurrent and combinable updates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179049,8 +179886,8 @@ self: {
          maccatcher mtl network parsec time uuid
        ];
        description = "Client library for metaverse systems like Second Life";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179066,7 +179903,7 @@ self: {
          base containers mwc-random primitive transformers
        ];
        description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mwc-probability-transition" = callPackage
@@ -179085,7 +179922,7 @@ self: {
          base hspec logging-effect mwc-probability QuickCheck
        ];
        description = "A Markov stochastic transition operator with logging";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mwc-random" = callPackage
@@ -179099,7 +179936,7 @@ self: {
        ];
        doCheck = false;
        description = "Fast, high quality pseudo random number generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mwc-random_0_15_0_1" = callPackage
@@ -179123,8 +179960,8 @@ self: {
        ];
        doCheck = false;
        description = "Fast, high quality pseudo random number generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mwc-random-accelerate" = callPackage
@@ -179135,7 +179972,7 @@ self: {
        sha256 = "1a8b36l60p29461y0gacgjzarlyrncl54r7x4zh2rgvs2w7mjdc5";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -179150,7 +179987,7 @@ self: {
          base monad-primitive mwc-random primitive transformers vector
        ];
        description = "Monadic interface for mwc-random";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mx-state-codes" = callPackage
@@ -179162,7 +179999,7 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
        description = "ISO 3166-2:MX State Codes and Names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mxnet" = callPackage
@@ -179182,8 +180019,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "MXNet interface in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -179201,8 +180038,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mxnet streaming ];
        description = "mxnet dataiters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179216,8 +180053,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mxnet ];
        description = "Examples for MXNet in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179243,8 +180080,8 @@ self: {
          streaming-utils unordered-containers vector
        ];
        description = "Train a neural network with MXNet in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179258,8 +180095,8 @@ self: {
        librarySystemDepends = [ mxnet ];
        libraryToolDepends = [ c2hs ];
        description = "NNVM interface in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -179284,8 +180121,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179310,8 +180147,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179336,8 +180173,8 @@ self: {
          ansi-terminal base Cabal Euterpea QuickCheck
        ];
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179361,8 +180198,8 @@ self: {
          http-client-tls network-uri text yaml
        ];
        description = "Export from MyAnimeList";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179376,7 +180213,7 @@ self: {
          base cgi curl directory mtl process split
        ];
        description = "Binding to mybitcoin.com's Shopping Cart Interface.";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "myo" = callPackage
@@ -179399,8 +180236,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Haskell binding to the Myo armband";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179417,8 +180254,8 @@ self: {
          regex-posix snap snap-core time
        ];
        description = "Sessions and continuations for Snap web apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179438,8 +180275,8 @@ self: {
          snap-core snap-server text time
        ];
        description = "Example projects using mysnapsession";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179455,7 +180292,7 @@ self: {
        librarySystemDepends = [ mysql ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "A low-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -179472,8 +180309,8 @@ self: {
          base bytestring extensible-effects mysql mysql-simple
        ];
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179497,7 +180334,7 @@ self: {
          base bytestring io-streams tasty tasty-hunit text time vector
        ];
        description = "pure haskell MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mysql-haskell-nem" = callPackage
@@ -179512,7 +180349,7 @@ self: {
          base bytestring io-streams mysql-haskell scientific text time
        ];
        description = "Adds a interface like mysql-simple to mysql-haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mysql-haskell-openssl" = callPackage
@@ -179528,8 +180365,8 @@ self: {
          wire-streams
        ];
        description = "TLS support for mysql-haskell package using openssl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179548,7 +180385,7 @@ self: {
        ];
        testHaskellDepends = [ base blaze-builder hspec text ];
        description = "A mid-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mysql-simple-quasi" = callPackage
@@ -179563,8 +180400,8 @@ self: {
          base haskell-src-meta mysql-simple template-haskell
        ];
        description = "Quasi-quoter for use with mysql-simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179580,8 +180417,8 @@ self: {
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
        description = "Typed extension to mysql simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179600,8 +180437,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Bindings for Mystem morphological analyzer executabe";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179626,8 +180463,8 @@ self: {
          unordered-containers wai wai-extra wai-middleware-static warp
        ];
        description = "Web application to view and kill MySQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179650,8 +180487,8 @@ self: {
        ];
        testHaskellDepends = [ bytestring text ];
        description = "A Haskell client for the Myxine GUI server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179663,8 +180500,8 @@ self: {
        sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l";
        libraryHaskellDepends = [ base transformers ];
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179682,7 +180519,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "An n-ary version of Functor";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "n-m" = callPackage
@@ -179697,7 +180534,7 @@ self: {
        executableHaskellDepends = [ base HSH mtl process ];
        description = "Utility to call iwconfig";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "n-tuple" = callPackage
@@ -179708,8 +180545,8 @@ self: {
        sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva";
        libraryHaskellDepends = [ base singletons vector ];
        description = "Homogeneous tuples of arbitrary length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179723,7 +180560,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers text ];
        testHaskellDepends = [ base hspec ];
        description = "Abstract Protocol Loop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "n2o-nitro" = callPackage
@@ -179738,7 +180575,7 @@ self: {
          base base64-bytestring binary bytestring containers n2o text
        ];
        description = "Nitro Elements, Events and Actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "n2o-protocols" = callPackage
@@ -179754,8 +180591,8 @@ self: {
          time
        ];
        description = "N2O Protocols Starter Pack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179774,8 +180611,8 @@ self: {
          websockets
        ];
        description = "N2O adapter for WebSockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179790,7 +180627,7 @@ self: {
        libraryHaskellDepends = [ base bifunctors exceptions mtl text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Package for writing monitoring plugins";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nagios-config" = callPackage
@@ -179804,7 +180641,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "EDSL to specify Nagios configuration files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nagios-perfdata" = callPackage
@@ -179822,7 +180659,7 @@ self: {
          base bytestring hspec HUnit MissingH transformers
        ];
        description = "Parse Nagios performance data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nagios-plugin-ekg" = callPackage
@@ -179845,8 +180682,8 @@ self: {
          base bytestring hspec HUnit nagios-check text transformers
        ];
        description = "Monitor ekg metrics via Nagios";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179885,8 +180722,8 @@ self: {
          unliftio-core unordered-containers uuid vector wai warp
        ];
        description = "Client library for the Nakadi Event Broker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179901,7 +180738,7 @@ self: {
        libraryHaskellDepends = [ aeson attoparsec base lens text wreq ];
        executableHaskellDepends = [ base text ];
        description = "Tool to keep namecoin names updated and well";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "named" = callPackage
@@ -179915,7 +180752,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Named parameters (keyword arguments) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "named-formlet" = callPackage
@@ -179930,7 +180767,7 @@ self: {
          base blaze-html bytestring containers mtl text transformers
        ];
        description = "A simple formlet library with named formlets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "named-lock" = callPackage
@@ -179941,8 +180778,8 @@ self: {
        sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i";
        libraryHaskellDepends = [ base containers ];
        description = "A named lock that is created on demand";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179954,7 +180791,7 @@ self: {
        sha256 = "0ykcmmnns63zjfd00kd9941c33l19n9c5b5xkin4n7r9v0qvirwr";
        libraryHaskellDepends = [ base binary names template-haskell ];
        description = "Flexible records with named fields";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "named-servant" = callPackage
@@ -179964,8 +180801,8 @@ self: {
        version = "0.2.0";
        sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53";
        libraryHaskellDepends = [ base named servant ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179981,8 +180818,8 @@ self: {
          base named named-servant servant servant-client-core
        ];
        description = "client support for named-servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179998,8 +180835,8 @@ self: {
          base named named-servant servant servant-server text
        ];
        description = "server support for named-servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180012,8 +180849,8 @@ self: {
        libraryHaskellDepends = [ base singletons text ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dependently-typed sums and products, tagged by field name";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180032,8 +180869,8 @@ self: {
          base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "fortran90 namelist parser/pretty printer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180045,7 +180882,7 @@ self: {
        sha256 = "0sjjp90zfrkjavj8fqyscnvc9d72mkvv8f7ajd47jba92mhwzr5g";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type level names";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "names-th" = callPackage
@@ -180056,7 +180893,7 @@ self: {
        sha256 = "12ally0n6ixsxj0zwbvw439dbx29phvh0rd6l5sd0c5a514a32aa";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Manipulate name strings for TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "namespace" = callPackage
@@ -180068,8 +180905,8 @@ self: {
        libraryHaskellDepends = [ base containers monoid-extras ];
        testHaskellDepends = [ base ];
        description = "A Generic Haskell library for managing namespaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180087,7 +180924,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A threadsafe binding to glibc's crypt_r function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nano-erl" = callPackage
@@ -180098,7 +180935,7 @@ self: {
        sha256 = "04pfk3a9m6fgspyk2vriixldsx2y9p2jcwzfjfvpgjiq5dl602ip";
        libraryHaskellDepends = [ base stm ];
        description = "Small library for Erlang-style actor semantics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nano-hmac" = callPackage
@@ -180110,8 +180947,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        description = "Bindings to OpenSSL HMAC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -180126,8 +180963,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        description = "Efficient, ByteString bindings to OpenSSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -180146,7 +180983,7 @@ self: {
        ];
        description = "A toy dependently-typed language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nanocurses" = callPackage
@@ -180158,8 +180995,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ ncurses ];
        description = "Simple Curses binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -180172,8 +181009,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nanomsg ];
        description = "nanomsg - scalability protocols library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) nanomsg;};
 
@@ -180198,8 +181035,8 @@ self: {
          base bytestring criterion zeromq4-haskell
        ];
        description = "Bindings to the nanomsg library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) nanomsg;};
 
@@ -180211,8 +181048,8 @@ self: {
        sha256 = "00ghdzkzshk24g7v42hq7zq0dxsq8vjpkslj41dxdnx0zizwbn3m";
        libraryHaskellDepends = [ base bytestring ListLike ];
        description = "An implementation of attoparsec-like parser around list-like";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180225,7 +181062,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec silently ];
        description = "A lightweight implementation of a subset of Hspec's API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nanovg" = callPackage
@@ -180246,8 +181083,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        description = "Haskell bindings for nanovg";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
@@ -180266,8 +181103,8 @@ self: {
          base GLFW-b monad-loops nanovg OpenGL safe-exceptions text
        ];
        description = "Simple interface to rendering with NanoVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180287,8 +181124,8 @@ self: {
          kanji microlens microlens-aeson optparse-applicative text
        ];
        description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180306,8 +181143,8 @@ self: {
          adjunctions base comonad distributive free streams transformers
        ];
        description = "Efficient representable functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180327,7 +181164,7 @@ self: {
        doHaddock = false;
        description = "A library for working with anything map related";
        license = "(Apache-2.0 OR BSD-3-Clause)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180339,8 +181176,8 @@ self: {
        sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc";
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180352,7 +181189,7 @@ self: {
        sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
        libraryHaskellDepends = [ base ];
        description = "Lazy binary natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nat-sized-numbers" = callPackage
@@ -180364,8 +181201,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base doctest hedgehog QuickCheck ];
        description = "Variable-sized numbers from type-level nats";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180382,8 +181219,8 @@ self: {
          http-types multiset tls transformers xml
        ];
        description = "NationStates API client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180404,7 +181241,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        testHaskellDepends = [ base ];
        description = "Native library manager for Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nats" = callPackage
@@ -180417,7 +181254,7 @@ self: {
        editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc";
        doHaddock = false;
        description = "Natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nats-client" = callPackage
@@ -180443,8 +181280,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Another Haskell client for NATS (https://nats.io)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180465,8 +181302,8 @@ self: {
          random text
        ];
        description = "Haskell API for NATS messaging system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180485,7 +181322,7 @@ self: {
          tasty-hunit tasty-quickcheck transformers
        ];
        description = "Natural number";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-arithmetic" = callPackage
@@ -180496,7 +181333,7 @@ self: {
        sha256 = "0zw1dax3a67cpilq57ykbrjybz9kc45qflpr6mwfz79hpx9pcld0";
        libraryHaskellDepends = [ base ];
        description = "Arithmetic of natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-induction" = callPackage
@@ -180509,7 +181346,7 @@ self: {
        editedCabalFile = "012kjygd54rxinmaplqnbw0hkfm4wp829j0afjxr6h40x22gwzn5";
        libraryHaskellDepends = [ base peano ];
        description = "Induction over natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-number" = callPackage
@@ -180525,8 +181362,8 @@ self: {
          type-level-natural-number-induction
        ];
        description = "Natural numbers tagged with a type-level representation of the number";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180538,7 +181375,7 @@ self: {
        sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn";
        libraryHaskellDepends = [ base ];
        description = "Natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-sort" = callPackage
@@ -180549,7 +181386,7 @@ self: {
        sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv";
        libraryHaskellDepends = [ base bytestring parsec text ];
        description = "User-friendly text collation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-transformation" = callPackage
@@ -180567,7 +181404,7 @@ self: {
          base containers quickcheck-instances tasty tasty-quickcheck
        ];
        description = "A natural transformation package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "naturalcomp" = callPackage
@@ -180578,7 +181415,7 @@ self: {
        sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x";
        libraryHaskellDepends = [ base text utf8-string ];
        description = "Natural-order string comparison";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "naturals" = callPackage
@@ -180589,7 +181426,7 @@ self: {
        sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
        libraryHaskellDepends = [ base ];
        description = "Constructors and related functions for natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "naver-translate" = callPackage
@@ -180604,8 +181441,8 @@ self: {
          aeson base iso639 lens lens-aeson network-uri random text wreq
        ];
        description = "Interface to Naver Translate";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180625,8 +181462,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180645,7 +181482,7 @@ self: {
          stm unix
        ];
        description = "CPU load and memory usage indicators for i3bar";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ncurses" = callPackage
@@ -180662,7 +181499,7 @@ self: {
        librarySystemDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
        description = "Modernised bindings to GNU ncurses";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) ncurses;};
 
   "ndjson-conduit" = callPackage
@@ -180675,7 +181512,7 @@ self: {
          aeson attoparsec base bytestring conduit
        ];
        description = "Conduit-based parsing and serialization for newline delimited JSON";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "neat" = callPackage
@@ -180689,8 +181526,8 @@ self: {
        libraryHaskellDepends = [ base filepath parsec ];
        executableHaskellDepends = [ base filepath parsec ];
        description = "A Fast Retargetable Template Engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180709,7 +181546,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A quasiquoter for neat and simple multiline text interpolation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "needle" = callPackage
@@ -180725,8 +181562,8 @@ self: {
          template-haskell text vector
        ];
        description = "ASCII-fied arrow notation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180743,8 +181580,8 @@ self: {
          random transformers
        ];
        description = "A NEAT library for Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180764,8 +181601,8 @@ self: {
          random
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180784,7 +181621,7 @@ self: {
          old-time process time
        ];
        description = "General tools for Neil";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "neither" = callPackage
@@ -180795,8 +181632,8 @@ self: {
        sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf";
        libraryHaskellDepends = [ base failure transformers ];
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180817,8 +181654,8 @@ self: {
          process random tagged tasty tasty-hunit tasty-smallcheck temporary
        ];
        description = "Neko VM code generation and disassembly library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180840,7 +181677,7 @@ self: {
          random text transformers
        ];
        description = "a TCP tunnel with packet length obfuscation";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nemesis" = callPackage
@@ -180855,7 +181692,7 @@ self: {
          base containers directory dlist Glob lens mtl process time
        ];
        description = "a task management tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nemesis-titan" = callPackage
@@ -180872,8 +181709,8 @@ self: {
          nemesis random uuid
        ];
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180889,8 +181726,8 @@ self: {
      }:
      mkDerivation {
        pname = "neptune-backend";
-       version = "0.2.1";
-       sha256 = "0i6dw3g1sdhnf33g88rp251irzfmvvl77fz3ihvwzmy44qavdhrp";
+       version = "0.3.0";
+       sha256 = "0lsimmpy5wpgsq5pn6zp386wnzqi04mql3vj03d8iadckyjizgvl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -180907,7 +181744,9 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Neptune Client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "nerf" = callPackage
@@ -180933,8 +181772,8 @@ self: {
          polysoup sgd tagsoup temporary text text-binary tokenize vector
        ];
        description = "Nerf, a named entity recognition tool based on linear-chain CRFs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180953,8 +181792,8 @@ self: {
          base bytestring doctest Glob lens tasty tasty-hunit text
        ];
        description = "Lens-based HTTP toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180970,8 +181809,8 @@ self: {
          base bytestring http-types lens nero text wai wai-extra
        ];
        description = "WAI adapter for Nero server applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180983,8 +181822,8 @@ self: {
        sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s";
        libraryHaskellDepends = [ base nero nero-wai warp ];
        description = "Run Nero server applications with Warp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181000,8 +181839,8 @@ self: {
          base bytestring containers text transformers unix
        ];
        testHaskellDepends = [ base bytestring containers hedgehog text ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181031,8 +181870,8 @@ self: {
          wai-middleware-verbs wai-transformers
        ];
        description = "Declarative, compositional Wai responses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181049,8 +181888,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "List-like data structures with O(log(n)) random access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181063,7 +181902,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "Nested set model implementation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nestedmap" = callPackage
@@ -181079,8 +181918,8 @@ self: {
          base base-unicode-symbols containers data-ordlist hspec QuickCheck
        ];
        description = "A library for nested maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181096,8 +181935,8 @@ self: {
          base bytestring containers ghc-binary hslogger monad-loops network
        ];
        description = "Concurrent over the network execution library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -181131,7 +181970,9 @@ self: {
          tasty-quickcheck text websockets
        ];
        description = "An MQTT Protocol Implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-mqtt-lens" = callPackage
@@ -181147,7 +181988,9 @@ self: {
          base HUnit lens net-mqtt tasty tasty-hunit tasty-quickcheck
        ];
        description = "Optics for net-mqtt";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-mqtt-rpc" = callPackage
@@ -181168,7 +182011,9 @@ self: {
          optparse-applicative random stm text uuid
        ];
        description = "Make RPC calls via an MQTT broker";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider" = callPackage
@@ -181192,7 +182037,9 @@ self: {
          hspec text time vector
        ];
        description = "A graph database middleware to maintain a time-varying graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-cli" = callPackage
@@ -181212,7 +182059,9 @@ self: {
          base doctest doctest-discover hspec net-spider optparse-applicative
        ];
        description = "CLI option parsers for NetSpider objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-pangraph" = callPackage
@@ -181230,8 +182079,8 @@ self: {
          base doctest doctest-discover hspec net-spider pangraph text
        ];
        description = "Conversion between net-spider and pangraph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181253,8 +182102,8 @@ self: {
          text
        ];
        description = "NetSpider data model and utility for RPL networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181281,8 +182130,8 @@ self: {
          net-spider net-spider-cli net-spider-rpl optparse-applicative text
        ];
        description = "CLI executable of NetSpider.RPL.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181296,8 +182145,8 @@ self: {
        editedCabalFile = "00wqr9nnjn8hm0r8xa5qrgqva5r0pcf32hlksrqhkzy12yl2kv08";
        libraryHaskellDepends = [ base bytestring hosc network ];
        description = "Netclock protocol";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181312,7 +182161,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ libsodium ];
        description = "Bindings to the low-level netcode.io library.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libsodium;};
 
   "netcore" = callPackage
@@ -181343,8 +182192,8 @@ self: {
          random syb
        ];
        description = "The NetCore compiler and runtime system for OpenFlow networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181373,8 +182222,8 @@ self: {
          random stm transformers vty
        ];
        description = "NetEase Cloud Music FM client in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181388,7 +182237,7 @@ self: {
          array base carray netlib-ffi transformers
        ];
        description = "Helper modules for CArray wrappers to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlib-comfort-array" = callPackage
@@ -181401,7 +182250,7 @@ self: {
          base comfort-array netlib-ffi transformers
        ];
        description = "Helper modules for comfort-array wrappers to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlib-ffi" = callPackage
@@ -181416,7 +182265,7 @@ self: {
          base guarded-allocation storable-complex transformers
        ];
        description = "Helper modules for FFI to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlines" = callPackage
@@ -181434,8 +182283,8 @@ self: {
        ];
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181454,7 +182303,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Netlink communication for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlist" = callPackage
@@ -181465,7 +182314,7 @@ self: {
        sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
        libraryHaskellDepends = [ base binary containers syb ];
        description = "Netlist AST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlist-to-vhdl" = callPackage
@@ -181476,7 +182325,7 @@ self: {
        sha256 = "1f62l4i1l1z47gbrv49xx5y78ykcf6iq6bish3sx5fw46mhcr1j4";
        libraryHaskellDepends = [ base netlist pretty ];
        description = "Convert a Netlist AST to VHDL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netpbm" = callPackage
@@ -181495,7 +182344,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Loading PBM, PGM, PPM image files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "netrc" = callPackage
@@ -181513,7 +182362,7 @@ self: {
          base bytestring tasty tasty-golden tasty-quickcheck
        ];
        description = "Parser for .netrc files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "netrium" = callPackage
@@ -181532,8 +182381,8 @@ self: {
          base containers directory filepath HaXml pretty process
        ];
        description = "Contract normaliser and simulator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181550,8 +182399,8 @@ self: {
          transformers
        ];
        description = "Simplify static Networking tasks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181565,8 +182414,8 @@ self: {
          base bytestring enumerator transformers
        ];
        description = "Enumerator-based netstring parsing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181592,7 +182441,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "safe nettle binding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -181608,8 +182457,8 @@ self: {
          network-data random time
        ];
        description = "FRP for controlling networks of OpenFlow switches";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181625,8 +182474,8 @@ self: {
          base containers directory filepath mtl nettle-openflow unix
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181643,8 +182492,8 @@ self: {
          mtl network parsec syb
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181661,7 +182510,7 @@ self: {
          transformers
        ];
        description = "Functional reactive programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netwire-input" = callPackage
@@ -181672,7 +182521,7 @@ self: {
        sha256 = "1f9xxlcpy2brqn5hv0mdc428fav402jsqa1b8h4s8b09qa3v1ii9";
        libraryHaskellDepends = [ base deepseq netwire ];
        description = "Input handling abstractions for netwire";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "netwire-input-glfw" = callPackage
@@ -181689,7 +182538,7 @@ self: {
          base containers deepseq GLFW-b mtl netwire-input stm
        ];
        description = "GLFW instance of netwire-input";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "netwire-input-javascript" = callPackage
@@ -181704,8 +182553,8 @@ self: {
          base containers ghcjs-base netwire netwire-input transformers
        ];
        description = "JavaScript instance of netwire-input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181728,8 +182577,8 @@ self: {
          transformers vinyl vinyl-gl
        ];
        description = "Netwire/GLFW/VinylGL input handling demo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181746,8 +182595,8 @@ self: {
          base bytestring doctest HUnit test-framework test-framework-hunit
        ];
        description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network" = callPackage
@@ -181762,7 +182611,7 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec HUnit ];
        testToolDepends = [ hspec-discover ];
        description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network_3_1_2_1" = callPackage
@@ -181781,8 +182630,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-address" = callPackage
@@ -181800,8 +182649,8 @@ self: {
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "IP data structures and textual representation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181824,8 +182673,8 @@ self: {
          hspec-expectations mtl network network-simple transformers uuid
        ];
        description = "Haskell API for I2P anonymous networking";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181855,8 +182704,8 @@ self: {
          text transformers
        ];
        description = "Haskell API for Tor anonymous networking";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181874,8 +182723,8 @@ self: {
          http-client-tls http-types text time tls
        ];
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181897,8 +182746,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Arbitrary Instances for Network Types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181922,8 +182771,8 @@ self: {
        ];
        doCheck = false;
        description = "Utility functions for running a parser against a socket";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181946,8 +182795,8 @@ self: {
          unordered-containers vector
        ];
        description = "An interface to bitcoind";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181961,7 +182810,7 @@ self: {
        editedCabalFile = "1hc3jdbmpq2wxh82xfx452v2m2l97jbdaqqbmj5nz4lljxa2696r";
        libraryHaskellDepends = [ base deepseq network ];
        description = "POSIX network database (<netdb.h>) API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-builder" = callPackage
@@ -181982,8 +182831,8 @@ self: {
          base cabal-test-bin hspec hspec-server process
        ];
        description = "Linux NetworkNameSpace Builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181996,7 +182845,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring doctest ];
        description = "Network byte order utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-bytestring" = callPackage
@@ -182009,8 +182858,8 @@ self: {
        editedCabalFile = "0znp4qkad1sd650kjqhbbrr2ap7bb772g3db92k7r2rrydr19cdl";
        libraryHaskellDepends = [ base bytestring network unix ];
        description = "Fast, memory-efficient, low-level networking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182024,8 +182873,8 @@ self: {
          base bytestring network text time vector
        ];
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182038,7 +182887,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Stream socket data using conduits. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-conduit-tls" = callPackage
@@ -182058,7 +182907,7 @@ self: {
          base bytestring conduit conduit-extra connection HUnit mtl
        ];
        description = "Create TLS-aware network code with conduits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "network-connection" = callPackage
@@ -182073,8 +182922,8 @@ self: {
          base bytestring containers network network-bytestring stm
        ];
        description = "A wrapper around a generic stream-like connection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182086,7 +182935,7 @@ self: {
        sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz";
        libraryHaskellDepends = [ base bytestring cereal pretty ];
        description = "Library for network data structures and their serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-dbus" = callPackage
@@ -182103,7 +182952,7 @@ self: {
        ];
        description = "D-Bus";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-dns" = callPackage
@@ -182125,8 +182974,8 @@ self: {
          base data-serializer data-textual network-ip posix-socket
        ];
        description = "Domain Name System data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182142,8 +182991,8 @@ self: {
          base bytestring enumerator network transformers
        ];
        description = "Enumerators for network sockets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182155,7 +183004,7 @@ self: {
        sha256 = "0myzfvmv6xny7nmq2p5dhyrz8yl7n48p4brkarkacs07k1zyldj9";
        libraryHaskellDepends = [ base bytestring ];
        description = "Networking support with a cleaner API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-hans" = callPackage
@@ -182166,8 +183015,8 @@ self: {
        sha256 = "1gv1y0iz90r30rmp8g40ksf39fvgznjihy68sspahpf8r24srlwq";
        libraryHaskellDepends = [ base bytestring hans parsec ];
        description = "HaNS to Network shims for easier HaNS integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182179,8 +183028,8 @@ self: {
        sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7";
        libraryHaskellDepends = [ array base containers mtl ];
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182194,7 +183043,7 @@ self: {
        editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d";
        libraryHaskellDepends = [ base ];
        description = "Access the local computer's basic network configuration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-interfacerequest" = callPackage
@@ -182205,8 +183054,8 @@ self: {
        sha256 = "0qa5rbbcw9axg7mj4kjj027hfsclnw85cj8nmi6jvrzq2yhhk56c";
        libraryHaskellDepends = [ base bytestring ioctl network ];
        description = "Haskell bindings for the ifreq structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182228,7 +183077,7 @@ self: {
          text-printer
        ];
        description = "Internet Protocol data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-manager-tui" = callPackage
@@ -182252,7 +183101,7 @@ self: {
        ];
        doHaddock = false;
        description = "network-manager tui";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-messagepack-rpc" = callPackage
@@ -182268,7 +183117,7 @@ self: {
          unordered-containers
        ];
        description = "MessagePack RPC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-messagepack-rpc-websocket" = callPackage
@@ -182288,8 +183137,8 @@ self: {
          network-messagepack-rpc QuickCheck skews text wss-client
        ];
        description = "WebSocket backend for MessagePack RPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182306,7 +183155,7 @@ self: {
        ];
        description = "Send metrics to Ganglia, Graphite, and statsd";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-minihttp" = callPackage
@@ -182325,8 +183174,8 @@ self: {
          old-locale stm tagsoup time unix
        ];
        description = "A ByteString based library for writing HTTP(S) servers and clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182339,7 +183188,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring network unix ];
        description = "Recvmsg and sendmsg bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-msgpack-rpc" = callPackage
@@ -182361,8 +183210,8 @@ self: {
        ];
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182374,7 +183223,7 @@ self: {
        sha256 = "0whvi0pbwjy6dbwfdf9rv1j3yr3lcmfp3q7a8pwq63g537l4l2l3";
        libraryHaskellDepends = [ base network network-bsd ];
        description = "Simple multicast library";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "network-netpacket" = callPackage
@@ -182390,8 +183239,8 @@ self: {
          network-interfacerequest
        ];
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182408,7 +183257,7 @@ self: {
        ];
        description = "Library for writing PGI applications";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-protocol-xmpp" = callPackage
@@ -182424,8 +183273,8 @@ self: {
          text transformers xml-types
        ];
        description = "Client library for the XMPP protocol";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182443,8 +183292,8 @@ self: {
          containers control-timeout network network-bytestring stm
        ];
        description = "A cross-platform RPC library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182456,7 +183305,7 @@ self: {
        sha256 = "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple network runner library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-server" = callPackage
@@ -182471,7 +183320,7 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182487,8 +183336,8 @@ self: {
          base base64-bytestring bytestring network
        ];
        description = "Provide a service at the data type level";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182505,7 +183354,7 @@ self: {
          transformers
        ];
        description = "Simple network sockets usage patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-simple-sockaddr" = callPackage
@@ -182520,8 +183369,8 @@ self: {
          base bytestring directory exceptions network transformers
        ];
        description = "network-simple for resolved addresses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182540,7 +183389,7 @@ self: {
          x509-validation
        ];
        description = "Simple interface to TLS secured network sockets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-simple-ws" = callPackage
@@ -182556,7 +183405,7 @@ self: {
          websockets
        ];
        description = "Simple interface to WebSockets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-simple-wss" = callPackage
@@ -182572,8 +183421,8 @@ self: {
          safe-exceptions websockets
        ];
        description = "Simple interface to TLS secured WebSockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182585,8 +183434,8 @@ self: {
        sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r";
        libraryHaskellDepends = [ base network ];
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182603,8 +183452,8 @@ self: {
          transformers
        ];
        description = "ByteString and Text streams for networking";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182626,8 +183475,8 @@ self: {
          random-fu statistics stm text transformers vector
        ];
        description = "A few network topic model implementations for bayes-stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182643,7 +183492,7 @@ self: {
          base binary bytestring deepseq hashable transformers
        ];
        description = "Network abstraction layer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-amqp" = callPackage
@@ -182668,8 +183517,8 @@ self: {
          tasty-hunit
        ];
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182681,7 +183530,7 @@ self: {
        sha256 = "0i2rwl1hwbp87kvnhfc6h0v2zy1hbfgrz0wx1vicd9m76nzbynx3";
        libraryHaskellDepends = [ base bytestring network-transport ];
        description = "Compose network transports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-inmemory" = callPackage
@@ -182701,8 +183550,8 @@ self: {
          base network-transport network-transport-tests
        ];
        description = "In-memory instantiation of Network.Transport";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182722,7 +183571,7 @@ self: {
          base bytestring network network-transport network-transport-tests
        ];
        description = "TCP instantiation of Network.Transport";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-tests" = callPackage
@@ -182738,7 +183587,7 @@ self: {
          random
        ];
        description = "Unit tests for Network.Transport implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-zeromq" = callPackage
@@ -182766,7 +183615,7 @@ self: {
          base binary bytestring criterion distributed-process
        ];
        description = "ZeroMQ backend for network-transport";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-types-icmp" = callPackage
@@ -182778,7 +183627,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Types for representing ICMP and ICMPv6 messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri" = callPackage
@@ -182796,7 +183645,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "URI manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri-flag" = callPackage
@@ -182810,7 +183659,7 @@ self: {
        libraryHaskellDepends = [ network network-uri ];
        doHaddock = false;
        description = "Pseudo-package encapsulating flag(network-uri) Cabal boilerplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri-json" = callPackage
@@ -182827,8 +183676,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "FromJSON and ToJSON Instances for Network.URI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182840,7 +183689,7 @@ self: {
        sha256 = "1z4qqdr2b64pf5xx73bqgjrlqnvi0x6ziqqbzc7x1ka736cdak2w";
        libraryHaskellDepends = [ base network-uri ];
        description = "Lenses for network-uri";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri-static" = callPackage
@@ -182852,7 +183701,7 @@ self: {
        libraryHaskellDepends = [ base network-uri template-haskell ];
        testHaskellDepends = [ base doctest ];
        description = "A small utility to declare type-safe static URIs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "network-voicetext" = callPackage
@@ -182868,8 +183717,8 @@ self: {
          resourcet transformers utf8-string
        ];
        description = "VoiceText Web API wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182881,8 +183730,8 @@ self: {
        sha256 = "1fnqc1vbahy6zy632s9kam8bv7108bhmynyh2iwkqb7ybkkj37i9";
        libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182896,8 +183745,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskell98 network webserver ];
        description = "WebSocket library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182915,8 +183764,8 @@ self: {
          base binary bytestring containers network time transformers
        ];
        description = "Networked-game support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182949,8 +183798,8 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec MonadRandom ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Neural Networks in native Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182962,7 +183811,7 @@ self: {
        sha256 = "1pmgy3qmijkw3g542pg9wxzqncql3h2mh7slibgz8x0w9sfydmbd";
        libraryHaskellDepends = [ base constraints ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "neural-network-blashs" = callPackage
@@ -182981,8 +183830,8 @@ self: {
          base blas-hs hmatrix hspec neural-network-base QuickCheck vector
        ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183000,8 +183849,8 @@ self: {
        ];
        librarySystemDepends = [ blas ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas;};
 
@@ -183059,8 +183908,8 @@ self: {
        ];
        doHaddock = false;
        description = "Future-proof system for plain-text notes";
-       license = stdenv.lib.licenses.agpl3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.agpl3Only;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "newhope" = callPackage
@@ -183091,8 +183940,8 @@ self: {
          trifecta vector
        ];
        description = "Library implementing the NewHope cryptographic key-exchange protocol";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183106,8 +183955,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory old-time ];
        description = "List ports newer than N days on a FreeBSD system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183136,8 +183985,8 @@ self: {
          unordered-containers warp
        ];
        description = "A basic newsletter implimentation, using various backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183153,8 +184002,8 @@ self: {
          base exceptions lens machines mailgun mime-mail mtl newsletter text
        ];
        description = "A mailgun backend for the newsletter package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183172,7 +184021,7 @@ self: {
        libraryHaskellDepends = [ base containers fixedprec random ];
        executableHaskellDepends = [ base random time ];
        description = "Exact and approximate synthesis of quantum circuits";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "newt" = callPackage
@@ -183192,8 +184041,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs containers mtl ];
        description = "A trivially simple app to create things from simple templates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183207,7 +184056,7 @@ self: {
        editedCabalFile = "0261ljw57c7l7mw3z553s6ak8lmgyqwmfhk1m2jv6snra2i5shs4";
        libraryHaskellDepends = [ base ];
        description = "A typeclass and set of functions for working with newtypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "newtype-deriving" = callPackage
@@ -183223,8 +184072,8 @@ self: {
          transformers-base
        ];
        description = "Instance derivers for newtype wrappers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183243,7 +184092,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base gauge semigroups ];
        description = "A typeclass and set of functions for working with newtypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "newtype-th" = callPackage
@@ -183259,8 +184108,8 @@ self: {
          base haskell-src-meta newtype syb template-haskell
        ];
        description = "A template haskell deriver to create Control.Newtype instances.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183277,8 +184126,8 @@ self: {
          random
        ];
        description = "Newtype Wrapper Zoo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183290,7 +184139,7 @@ self: {
        sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs";
        libraryHaskellDepends = [ base Kleislify newtype ];
        description = "Extra functions for the Control.Newtype typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "next-ref" = callPackage
@@ -183302,8 +184151,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec ];
        description = "A concurrency primitive for a slow consumer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183315,8 +184164,8 @@ self: {
        sha256 = "0wld4nc6hcv642km60vvjyclsfwnpfavq59mqm8fm3a73al4csyw";
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183328,7 +184177,7 @@ self: {
        sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a";
        libraryHaskellDepends = [ base deepseq ];
        description = "NF data type to statically enforce normal form";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nfc" = callPackage
@@ -183343,8 +184192,8 @@ self: {
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
        description = "libnfc bindings";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {nfc = null;};
 
@@ -183366,7 +184215,7 @@ self: {
          zlib
        ];
        description = "Ngram models for compressing and classifying text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ngrams-loader" = callPackage
@@ -183384,8 +184233,8 @@ self: {
        ];
        executableHaskellDepends = [ base parseargs ];
        description = "Ngrams loader based on http://www.ngrams.info format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183402,7 +184251,7 @@ self: {
          unix
        ];
        description = "Helper module for Nginx haskell module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ngx-export-tools" = callPackage
@@ -183417,7 +184266,7 @@ self: {
          aeson base binary bytestring ngx-export safe template-haskell
        ];
        description = "Extra tools for Nginx haskell module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ngx-export-tools-extra" = callPackage
@@ -183439,8 +184288,8 @@ self: {
          unordered-containers
        ];
        description = "More extra tools for Nginx haskell module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183457,8 +184306,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "High performance CSS EDSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183479,8 +184328,8 @@ self: {
          test-framework-hunit
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183504,8 +184353,8 @@ self: {
          shakespeare text transformers type-of-html weigh
        ];
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183519,7 +184368,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base nicify-lib ];
        description = "Pretty print the standard output of default `Show` instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nicify-lib" = callPackage
@@ -183530,7 +184379,7 @@ self: {
        sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx";
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Pretty print the standard output of default `Show` instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nicovideo-translator" = callPackage
@@ -183552,8 +184401,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183575,7 +184424,7 @@ self: {
        ];
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183587,7 +184436,7 @@ self: {
        sha256 = "1k177w8lccpqq4mwj089v7fbqvbrqskqxqj0gaingm0kmskggaaj";
        libraryHaskellDepends = [ base integer-logarithms ];
        description = "Finite nimber arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nirum" = callPackage
@@ -183625,8 +184474,8 @@ self: {
          unordered-containers
        ];
        description = "IDL compiler and RPC/distributed object framework for microservices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183640,7 +184489,7 @@ self: {
        editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q";
        libraryHaskellDepends = [ base bytestring http-conduit xml ];
        description = "Haskell interface to the nist random beacon";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nitro" = callPackage
@@ -183651,8 +184500,8 @@ self: {
        sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb";
        libraryHaskellDepends = [ base bytestring ];
        description = "Haskell bindings for Nitro";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183665,8 +184514,8 @@ self: {
      }:
      mkDerivation {
        pname = "niv";
-       version = "0.2.18";
-       sha256 = "1jgljmj7msix2vn9nxip9q4754hx4739w4r7sa05l6q4ba5ilwqd";
+       version = "0.2.19";
+       sha256 = "15smcgr81ryxb3a57b88azz2xsvcq92n0cmjam8v1x8r6j0w0p39";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -183689,7 +184538,7 @@ self: {
          unordered-containers
        ];
        description = "Easy dependency management for Nix projects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nix-delegate" = callPackage
@@ -183708,8 +184557,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Convenient utility for distributed Nix builds";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183728,8 +184577,8 @@ self: {
          optparse-generic text turtle
        ];
        description = "Deploy Nix-built software to a NixOS machine";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183741,6 +184590,8 @@ self: {
        pname = "nix-derivation";
        version = "1.1.1";
        sha256 = "1jcgq7c0x6q33ddq3ns4w69z23r31cvb2qxj04v2pyd5v8rwls9d";
+       revision = "1";
+       editedCabalFile = "1ink37s91kbrq8p0sqyi1i90xp2jimyg1cnzy9ydjh3iv21f7pi5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183752,8 +184603,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ attoparsec base criterion text ];
        description = "Parse and render *.drv files";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "nix-diff" = callPackage
@@ -183771,8 +184622,8 @@ self: {
          optparse-applicative text unix vector
        ];
        description = "Explain why two Nix derivations differ";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ terlar ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ terlar ];
      }) {};
 
   "nix-eval" = callPackage
@@ -183788,7 +184639,7 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183818,8 +184669,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        doHaddock = false;
        description = "Convert a tree of files into fixed-output derivations";
-       license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183839,8 +184690,8 @@ self: {
          attoparsec base filepath hspec QuickCheck text
        ];
        description = "Parse and render .narinfo files";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "nix-paths" = callPackage
@@ -183852,8 +184703,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        libraryToolDepends = [ nix ];
        description = "Knowledge of Nix's installation directories";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) nix;};
 
   "nix-thunk" = callPackage
@@ -183880,8 +184731,8 @@ self: {
          base cli-extras optparse-applicative text
        ];
        description = "Lightweight dependency management with Nix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183912,30 +184763,31 @@ self: {
          transformers unordered-containers vector yaml zlib
        ];
        description = "cabal/stack to nix translation tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "nix-tree" = callPackage
-    ({ mkDerivation, aeson, async, base, brick, containers, deepseq
-     , directory, filepath, hashable, hrfsize, lens, parallel, protolude
-     , text, transformers, typed-process, unordered-containers, vty
+    ({ mkDerivation, aeson, async, base, brick, bytestring, containers
+     , deepseq, directory, filepath, hashable, hrfsize, lens, parallel
+     , protolude, text, transformers, typed-process
+     , unordered-containers, vty
      }:
      mkDerivation {
        pname = "nix-tree";
-       version = "0.1.3.0";
-       sha256 = "03ih8gz26rpkipd46zbrkpr9lp23q0nnq8ks6j80d32096n7q59i";
+       version = "0.1.3.1";
+       sha256 = "1rihvfvfsrkgvq87bli9gzpbv1ny93n21cf31bid1b3g3cwadffp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson async base brick containers deepseq directory filepath
-         hashable hrfsize lens parallel protolude text transformers
+         aeson async base brick bytestring containers deepseq directory
+         filepath hashable hrfsize lens parallel protolude text transformers
          typed-process unordered-containers vty
        ];
        description = "Interactively browse a Nix store paths dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ utdemir ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ utdemir ];
      }) {};
 
   "nixdu" = callPackage
@@ -183955,7 +184807,7 @@ self: {
          typed-process unordered-containers vty
        ];
        description = "Interactively browse a Nix store paths dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nixfmt" = callPackage
@@ -183977,7 +184829,7 @@ self: {
          base cmdargs directory filepath safe-exceptions text unix
        ];
        description = "An opinionated formatter for Nix";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "nixfromnpm" = callPackage
@@ -184003,8 +184855,8 @@ self: {
          transformers unix unordered-containers
        ];
        description = "Generate nix expressions from npm packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184016,7 +184868,7 @@ self: {
        sha256 = "1q38cs0747fyf94y35cq734yzmsdcyfmmk5w6qv563jns55qj36c";
        doHaddock = false;
        description = "this package is obsolete; see cabal2nix instead";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nixpkgs-update" = callPackage
@@ -184040,8 +184892,8 @@ self: {
          text time unix vector
        ];
        description = "Tool for semi-automatic updating of nixpkgs repository";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184060,8 +184912,8 @@ self: {
          zlib
        ];
        description = "Manipulating the National Corpus of Polish (NKJP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184075,7 +184927,7 @@ self: {
        librarySystemDepends = [ nlopt ];
        testHaskellDepends = [ base vector ];
        description = "Low-level bindings to the NLOPT optimization library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) nlopt;};
 
   "nlp-scores" = callPackage
@@ -184086,8 +184938,8 @@ self: {
        sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m";
        libraryHaskellDepends = [ base containers strict ];
        description = "Scoring functions commonly used for evaluation in NLP and IR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184103,8 +184955,8 @@ self: {
          base containers nlp-scores split text
        ];
        description = "NLP scoring command-line programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184121,8 +184973,8 @@ self: {
        libraryPkgconfigDepends = [ glib libnm-glib ];
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
@@ -184136,7 +184988,7 @@ self: {
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Bindings to the Nyctergatis Markup Engine";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nmis-parser" = callPackage
@@ -184148,8 +185000,8 @@ self: {
        libraryHaskellDepends = [ base containers megaparsec ];
        testHaskellDepends = [ base Nmis ];
        description = "NMIS file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Nmis = null;};
 
@@ -184164,7 +185016,7 @@ self: {
        libraryHaskellDepends = [ base random split ];
        testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ];
        description = "A tiny neural network";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nntp" = callPackage
@@ -184180,7 +185032,7 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184192,7 +185044,7 @@ self: {
        sha256 = "19yswbnwwfp7n33irdk12vggczhxp198cjd68jdbaz1wcd00ryld";
        libraryHaskellDepends = [ base ];
        description = "Workaround for GHC bug #2189";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "no-role-annots" = callPackage
@@ -184204,8 +185056,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Role annotations without -XRoleAnnotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184217,7 +185069,7 @@ self: {
        sha256 = "1jczx8d4ah74wiishdcv335hlr0330wwq0vfb5rv4gmrvbpkgllf";
        libraryHaskellDepends = [ base ];
        description = "A type class for choosing sentinel-like values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "noether" = callPackage
@@ -184239,8 +185091,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Math in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184254,8 +185106,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184269,8 +185121,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184294,8 +185146,8 @@ self: {
          base HTF HUnit parsec QuickCheck string-qq
        ];
        description = "A friendly language for graphic design";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184312,8 +185164,8 @@ self: {
          regex-compat text yaml
        ];
        description = "A static site generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184338,8 +185190,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Name-binding & alpha-equivalence";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184351,7 +185203,7 @@ self: {
        sha256 = "1wd2vd0qn8ln3a5r29gikdcr4c2c2rf43p6kq3wmqm8ww30djgca";
        libraryHaskellDepends = [ base containers ];
        description = "Binders and alpha-equivalence made easy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nomyx-api" = callPackage
@@ -184372,8 +185224,8 @@ self: {
          swagger2 text transformers wai wai-cors wai-extra warp yaml
        ];
        description = "REST API for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-core" = callPackage
@@ -184401,8 +185253,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-language" = callPackage
@@ -184421,8 +185273,8 @@ self: {
          time-recurrence
        ];
        description = "Language to express rules for Nomic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-library" = callPackage
@@ -184439,8 +185291,8 @@ self: {
          shortcut time time-recurrence
        ];
        description = "Library of rules for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-server" = callPackage
@@ -184461,8 +185313,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-web" = callPackage
@@ -184486,8 +185338,8 @@ self: {
          split stm text time web-routes web-routes-happstack web-routes-th
        ];
        description = "Web gui for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {nomyx-auth = null;};
 
@@ -184503,7 +185355,7 @@ self: {
        ];
        testHaskellDepends = [ base containers QuickCheck utility-ht ];
        description = "List-like structures with static restrictions on the number of elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "non-empty-containers" = callPackage
@@ -184513,7 +185365,7 @@ self: {
        version = "0.1.4.0";
        sha256 = "1frjpvx3nzymkwyxz0zc4p11pvxdihx3d3hi31w3d9qanwncbc96";
        libraryHaskellDepends = [ base containers semigroupoids ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "non-empty-sequence" = callPackage
@@ -184524,7 +185376,7 @@ self: {
        sha256 = "0a6xk2ijj3lzhqzdrk6q89538d1a62aw8x0ccvkq2kyl1dlahwc0";
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Non-empty sequence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "non-empty-text" = callPackage
@@ -184537,7 +185389,7 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec QuickCheck text ];
        description = "Non empty Data.Text type";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "non-empty-zipper" = callPackage
@@ -184549,8 +185401,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184581,7 +185433,7 @@ self: {
          unliftio unliftio-core
        ];
        description = "Generate cryptographic nonces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nondeterminism" = callPackage
@@ -184604,7 +185456,7 @@ self: {
        sha256 = "1ymndk1aqaw0n0vgj9gbajm5ma21ld77g0a06z92frqi8wvp67ii";
        libraryHaskellDepends = [ base comonad semigroups ];
        description = "NonEmpty for Alternative types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonempty-containers" = callPackage
@@ -184625,7 +185477,7 @@ self: {
          semigroupoids tasty tasty-hedgehog text these vector
        ];
        description = "Non-empty variants of containers data types, with full API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonempty-lift" = callPackage
@@ -184639,8 +185491,8 @@ self: {
        libraryHaskellDepends = [ base comonad semigroupoids ];
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "nonempty structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184656,7 +185508,7 @@ self: {
        libraryHaskellDepends = [ base deepseq primitive vector ];
        testHaskellDepends = [ base doctest ];
        description = "Non-empty vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonemptymap" = callPackage
@@ -184667,7 +185519,7 @@ self: {
        sha256 = "1pzs51kmsyarv62qqbskhw2xlkjp74bwcgs9a8ri1jk96m64rg94";
        libraryHaskellDepends = [ base containers semigroupoids ];
        description = "A NonEmptyMap Implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonfree" = callPackage
@@ -184678,7 +185530,7 @@ self: {
        sha256 = "0qm1iwm3y69z146w64wx5wwa4cdpa0ka7gz055dalf06xky35qji";
        libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nonlinear-optimization" = callPackage
@@ -184708,7 +185560,7 @@ self: {
          ad base nonlinear-optimization primitive reflection vector
        ];
        description = "Wrapper of nonlinear-optimization package for using with AD package";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nonlinear-optimization-backprop" = callPackage
@@ -184726,7 +185578,7 @@ self: {
          reflection vector
        ];
        description = "Wrapper of nonlinear-optimization package for using with backprop package";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "noodle" = callPackage
@@ -184741,7 +185593,7 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "the noodle programming language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "normaldistribution" = callPackage
@@ -184752,7 +185604,7 @@ self: {
        sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd";
        libraryHaskellDepends = [ base random ];
        description = "Minimum fuss normally distributed random values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "normalization-insensitive" = callPackage
@@ -184775,8 +185627,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Normalization insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184798,7 +185650,7 @@ self: {
          base bytestring cassava containers optparse-generic text vector
        ];
        description = "Normalize data using a variety of methods";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "normalize-imports" = callPackage
@@ -184812,7 +185664,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Sort and align Haskell import statements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "not-gloss" = callPackage
@@ -184828,7 +185680,7 @@ self: {
          vector vector-binary-instances
        ];
        description = "Painless 3D graphics, no affiliation with gloss";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "not-gloss-examples" = callPackage
@@ -184845,8 +185697,8 @@ self: {
          base containers GLUT linear not-gloss spatial-math X11
        ];
        description = "examples for not-gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184859,7 +185711,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Useful utility functions that only depend on base";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "notcpp" = callPackage
@@ -184871,8 +185723,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184891,9 +185743,7 @@ self: {
          base containers ghc-prim hedgehog random stm tasty tasty-hedgehog
        ];
        description = "Examine values for unexpected thunks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.mit;
      }) {};
 
   "notifications-tray-icon" = callPackage
@@ -184918,8 +185768,8 @@ self: {
          base bytestring github haskeline hslogger optparse-applicative text
          transformers tuple
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184939,7 +185789,7 @@ self: {
        librarySystemDepends = [ notmuch talloc ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding to Notmuch, the mail indexer";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;};
 
   "notmuch-haskell" = callPackage
@@ -184958,7 +185808,7 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) notmuch;};
 
@@ -184997,7 +185847,7 @@ self: {
        ];
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185015,7 +185865,7 @@ self: {
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
        description = "A data type for representing numeric values, except zero";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "now-haskell" = callPackage
@@ -185051,8 +185901,8 @@ self: {
          unordered-containers vector
        ];
        description = "Zeit Now haskell-side integration and introspection tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185067,7 +185917,7 @@ self: {
        libraryHaskellDepends = [ base bytestring template-haskell ];
        testHaskellDepends = [ base bytestring template-haskell ];
        description = "Here document without variable expansion like PHP Nowdoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "np-extras" = callPackage
@@ -185080,8 +185930,8 @@ self: {
        editedCabalFile = "1imcizgbckwcmxwjicads55g0v6abprz3g69b6blkkgmcq5r9x6b";
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185097,8 +185947,8 @@ self: {
          base binary containers numeric-prelude reflection tagged
        ];
        description = "Linear algebra for the numeric-prelude framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185117,8 +185967,8 @@ self: {
          old-locale process split time unix
        ];
        description = "A collection of random tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185139,7 +185989,7 @@ self: {
          stm-conduit text unliftio
        ];
        description = "Concurrency library in the style of Erlang/OTP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nri-env-parser" = callPackage
@@ -185153,7 +186003,7 @@ self: {
          base modern-uri network-uri nri-prelude text
        ];
        description = "Read environment variables as settings to build 12-factor apps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nri-prelude" = callPackage
@@ -185177,7 +186027,7 @@ self: {
          pretty-show safe-exceptions terminal-size text time vector
        ];
        description = "A Prelude inspired by the Elm programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nsis" = callPackage
@@ -185192,7 +186042,7 @@ self: {
          base directory process transformers uniplate
        ];
        description = "DSL for producing Windows Installer using NSIS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nth-prime" = callPackage
@@ -185210,7 +186060,7 @@ self: {
          base opentheory-prime opentheory-primitive
        ];
        description = "Computing the nth prime";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ntha" = callPackage
@@ -185231,7 +186081,7 @@ self: {
        executableHaskellDepends = [ base containers haskeline lens mtl ];
        testHaskellDepends = [ base containers hspec pretty ];
        description = "A tiny statically typed functional programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nthable" = callPackage
@@ -185241,7 +186091,7 @@ self: {
        version = "0.1";
        sha256 = "1qi1wq7wbnp3sv3c2v4185mnq80646vcsnqq16mqlshiy164wsly";
        libraryHaskellDepends = [ base type-level ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ntp-control" = callPackage
@@ -185259,8 +186109,8 @@ self: {
          base bytestring bytestring-lexing cereal network old-locale time
        ];
        description = "Client library for NTP control messaging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185285,8 +186135,8 @@ self: {
          base basic-prelude bytestring conduit optparse-generic
        ];
        description = "NTRIP client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185298,7 +186148,7 @@ self: {
        sha256 = "0raz6azyj7a3fygpmylhz38b75zy57xdrginbhj2d6vwzxhkmscd";
        libraryHaskellDepends = [ base ];
        description = "N-ary sum/product types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nuha" = callPackage
@@ -185310,8 +186160,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base vector ];
        description = "Multidimensional arrays, Linear algebra, Numerical analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185329,8 +186179,8 @@ self: {
          wai-extra warp
        ];
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185342,8 +186192,8 @@ self: {
        sha256 = "19vwgyscil4rmgfnla8msmhgamn6j3wfy7wqghb539byca0gim0c";
        libraryHaskellDepends = [ base ];
        description = "A package for working with nullary type classes";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185356,8 +186206,8 @@ self: {
        libraryHaskellDepends = [ base bytestring pipes ];
        testHaskellDepends = [ base hspec pipes ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185369,7 +186219,7 @@ self: {
        sha256 = "0ikhjcjwziv55gnf79fhajhgp5m3441snxg8amc241h5iw4rls8x";
        libraryHaskellDepends = [ base inj ];
        description = "Non-negative numbers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "number" = callPackage
@@ -185380,7 +186230,7 @@ self: {
        sha256 = "0la9dx2072f0gjrfq8p33qal7ma4202x5f8h2n4bhwkjln67n5bj";
        libraryHaskellDepends = [ base ];
        description = "A library for real numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "number-length" = callPackage
@@ -185399,7 +186249,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Number of digits in a number in decimal and hexadecimal representation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "number-show" = callPackage
@@ -185412,7 +186262,7 @@ self: {
        editedCabalFile = "1lsxi6704g6svw0834haggp6j97kb6r51583lr2a3kn1ni2zh60c";
        libraryHaskellDepends = [ base microlens microlens-th ];
        description = "Flexible and accurate (for a given precision) numerical->string conversion";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "numbered-semigroups" = callPackage
@@ -185425,8 +186275,8 @@ self: {
        editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c";
        libraryHaskellDepends = [ base call-stack semigroups ];
        description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185438,7 +186288,7 @@ self: {
        sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv";
        libraryHaskellDepends = [ base containers vector ];
        description = "Combinators for creating bijections from some type to the natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numbers" = callPackage
@@ -185454,7 +186304,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Various number types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numerals" = callPackage
@@ -185475,8 +186325,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Convert numbers to number words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185498,8 +186348,8 @@ self: {
          fingertree HUnit test-framework test-framework-hunit
        ];
        description = "Convert numbers to number words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185511,7 +186361,7 @@ self: {
        sha256 = "0n5wcg2snpivbp6giqrcd1y97215y6n3hbgbnb6w2gi7qsmyyq10";
        libraryHaskellDepends = [ base ];
        description = "Numeric Domains";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-extras" = callPackage
@@ -185522,7 +186372,7 @@ self: {
        sha256 = "1mk11c0gz1yjy5b8dvq6czfny57pln0bs7x28fz38qyr44872067";
        libraryHaskellDepends = [ base ];
        description = "Useful tools from the C standard library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-limits" = callPackage
@@ -185533,7 +186383,7 @@ self: {
        sha256 = "0lsi0my45lpd30vjbwdbzhisz8r3lryvg1c80qcmwipnxklnr5cb";
        libraryHaskellDepends = [ base ];
        description = "Various floating point limit related constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-ode" = callPackage
@@ -185561,8 +186411,8 @@ self: {
          mtl plots vector vector-space
        ];
        description = "Ode solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185582,7 +186432,7 @@ self: {
          semigroups storable-record utility-ht
        ];
        description = "An experimental alternative hierarchy of numeric type classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-qq" = callPackage
@@ -185599,8 +186449,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        doCheck = false;
        description = "Quasi-quoters for numbers of different bases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185627,8 +186477,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "A framework for numeric ranges";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185641,7 +186491,7 @@ self: {
        libraryHaskellDepends = [ base ieee754 primitive vector ];
        testHaskellDepends = [ base HUnit ];
        description = "Collection of numerical tools for integration, differentiation etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numerical" = callPackage
@@ -185662,8 +186512,8 @@ self: {
          transformers vector
        ];
        description = "core package for Numerical Haskell project";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185675,7 +186525,7 @@ self: {
        sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v";
        libraryHaskellDepends = [ base ];
        description = "Peano numbers with attendant bells and whistles";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "numhask" = callPackage
@@ -185690,7 +186540,7 @@ self: {
          base bifunctors mmorph protolude text transformers
        ];
        description = "numeric classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numhask_0_7_1_0" = callPackage
@@ -185706,8 +186556,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "A numeric class hierarchy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "numhask-array" = callPackage
@@ -185723,8 +186573,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Multi-dimensional array interface for numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185741,8 +186591,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "numerical free algebras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185759,8 +186609,8 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog numhask numhask-prelude ];
        description = "Laws and tests for numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185777,8 +186627,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185791,8 +186641,8 @@ self: {
        libraryHaskellDepends = [ base numhask protolude ];
        testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185813,8 +186663,8 @@ self: {
          base doctest numhask-prelude numhask-test tasty
        ];
        description = "Numbers that are range representations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185833,8 +186683,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Numerical spaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185851,8 +186701,8 @@ self: {
        ];
        testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
        description = "Laws and tests for numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185864,7 +186714,7 @@ self: {
        sha256 = "0bbl7f3qd26sa92k73qni3r1jwxxrfq5k19hcvh5rgdh5ig9d6v8";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numtype" = callPackage
@@ -185875,7 +186725,7 @@ self: {
        sha256 = "1pdawf6zyany5jz5jmszwbm7ms7c125if52v9cw0chy0xz5ahdym";
        libraryHaskellDepends = [ base ];
        description = "Type-level (low cardinality) integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numtype-dk" = callPackage
@@ -185888,7 +186738,7 @@ self: {
        editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4";
        libraryHaskellDepends = [ base ];
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numtype-tf" = callPackage
@@ -185899,7 +186749,7 @@ self: {
        sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
        libraryHaskellDepends = [ base ];
        description = "Type-level (low cardinality) integers, implemented using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nurbs" = callPackage
@@ -185919,7 +186769,7 @@ self: {
          base base-unicode-symbols hspec lens linear
        ];
        description = "NURBS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nuxeo" = callPackage
@@ -185938,7 +186788,7 @@ self: {
          http-types text time url
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nvim-hs" = callPackage
@@ -185977,7 +186827,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -186000,7 +186850,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nvim-hs-ghcid" = callPackage
@@ -186020,7 +186870,7 @@ self: {
        ];
        executableHaskellDepends = [ base nvim-hs ];
        description = "Neovim plugin that runs ghcid to update the quickfix list";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nvvm" = callPackage
@@ -186039,8 +186889,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to NVVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nyan" = callPackage
@@ -186053,7 +186903,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring mtl ncurses text ];
        description = "Bored? Nyan cat!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nylas" = callPackage
@@ -186070,8 +186920,8 @@ self: {
          pipes-bytestring pipes-http pipes-parse text time wreq
        ];
        description = "Client for the Nylas API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186090,8 +186940,8 @@ self: {
          base cairo containers glade glib gtk mtl parsec random
        ];
        description = "An interactive GUI for manipulating L-systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186118,7 +186968,7 @@ self: {
          text vector
        ];
        description = "A bullet-hell game made with SDL2";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "o-clock" = callPackage
@@ -186127,8 +186977,8 @@ self: {
      }:
      mkDerivation {
        pname = "o-clock";
-       version = "1.2.0";
-       sha256 = "0l8bwv0sagfpyfray4g1nnwb8zl4b2nljwxxwhh71vfhz620vrkx";
+       version = "1.2.0.1";
+       sha256 = "039p0jjpmlkbz21szfj4abnjyi0k34m6b8fqpsmyj94nbq1qldy4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim ];
@@ -186139,7 +186989,7 @@ self: {
        ];
        testToolDepends = [ doctest markdown-unlit ];
        description = "Type-safe time library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "oanda-rest-api" = callPackage
@@ -186163,8 +187013,8 @@ self: {
          text thyme transformers vector
        ];
        description = "Client to the OANDA REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186187,8 +187037,8 @@ self: {
          uri-bytestring xml-conduit xml-conduit-writer
        ];
        description = "Extensible Resource Descriptor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186208,7 +187058,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        description = "Fully Automatic Luxury OAuth 1.0a headers";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "oauth2-jwt-bearer" = callPackage
@@ -186233,8 +187083,8 @@ self: {
          streaming-commons text warp x509 x509-store
        ];
        description = "OAuth2 jwt-bearer client flow as per rfc7523";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186260,8 +187110,8 @@ self: {
          network-uri text time transformers
        ];
        description = "Simple OAuth for http-client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186286,8 +187136,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Communicate to OBD interfaces over ELM327";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186305,7 +187155,7 @@ self: {
        testHaskellDepends = [ array base containers text ];
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186326,7 +187176,7 @@ self: {
        doHaddock = false;
        description = "Oberon0 Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186346,8 +187196,8 @@ self: {
          OpenGL OpenGLCheck QuickCheck
        ];
        description = "Reads and writes obj models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186368,8 +187218,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Rather unique identifier for things that need to be stored";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186388,8 +187238,8 @@ self: {
          unordered-containers void witherable
        ];
        description = "Composable objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186413,8 +187263,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "An implementation of the Oblivious Transfer protocol in Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186426,7 +187276,7 @@ self: {
        sha256 = "0hi9y867yg48nv0756ylblxmsdw9vkfg72n0bb0ali227695d6qb";
        libraryHaskellDepends = [ base transformers ];
        description = "Continuation patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "observable-sharing" = callPackage
@@ -186437,7 +187287,7 @@ self: {
        sha256 = "1lqig0r4f7gqjdymsc4jpwspc3jr01xkmk5cgiqr5ngxvk6zw3j0";
        libraryHaskellDepends = [ base containers ];
        description = "Simple observable sharing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ocaml-export" = callPackage
@@ -186464,8 +187314,8 @@ self: {
          wai-extra warp
        ];
        description = "Convert Haskell types in OCaml types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186478,7 +187328,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Object capability based IO";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ochan" = callPackage
@@ -186496,8 +187346,8 @@ self: {
          async base bytestring mtl oref text transformers
        ];
        description = "Owned channels in the Ownership Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186514,7 +187364,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A module to manage payroll books for Japanese companies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "octane" = callPackage
@@ -186538,8 +187388,8 @@ self: {
          rattletrap text
        ];
        description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186570,8 +187420,8 @@ self: {
          base base-compat dotenv hspec hspec-expectations text transformers
        ];
        description = "A tested, minimal wrapper around GitHub's API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186592,8 +187442,8 @@ self: {
          array base bytestring containers hexpr mtl parsec symbol text
        ];
        description = "Lisp with more dynamism, more power, more simplicity";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186610,8 +187460,8 @@ self: {
        ];
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        description = "Oculus Rift ffi providing head tracking data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXinerama; ovr = null; 
@@ -186642,8 +187492,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) unixODBC;};
 
@@ -186695,8 +187545,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A full-featured PostgreSQL-backed job queue (with an admin UI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186712,8 +187562,8 @@ self: {
          aeson base bytestring containers text unordered-containers
        ];
        description = "Provides Go package metadata";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186734,8 +187584,8 @@ self: {
        ];
        testToolDepends = [ c2hs ];
        description = "Oracle Database Bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "oeis" = callPackage
@@ -186751,7 +187601,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "oeis2" = callPackage
@@ -186770,8 +187620,8 @@ self: {
          text vector
        ];
        description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186783,8 +187633,8 @@ self: {
        sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj";
        libraryHaskellDepends = [ base parsec3 vector ];
        description = "A parser for simplified-syntax OFF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186799,7 +187649,7 @@ self: {
        libraryHaskellDepends = [ base parsec pretty time ];
        executableHaskellDepends = [ base parsec pretty time ];
        description = "Parser for OFX data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ogmarkup" = callPackage
@@ -186815,8 +187665,8 @@ self: {
          base hspec hspec-megaparsec megaparsec shakespeare text
        ];
        description = "A lightweight markup language for story writers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186840,8 +187690,8 @@ self: {
          test-framework-quickcheck2 text-format-simple
        ];
        description = "Interface to the Ohloh API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186858,8 +187708,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186885,8 +187735,8 @@ self: {
          time
        ];
        description = "OpenID Connect 1.0 library for RP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186899,8 +187749,8 @@ self: {
        libraryHaskellDepends = [ base hogre ];
        librarySystemDepends = [ OIS ];
        description = "wrapper for OIS input manager for use with hogre";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OIS = null;};
 
@@ -186914,7 +187764,7 @@ self: {
        editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs";
        libraryHaskellDepends = [ base ];
        description = "locale library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "old-time" = callPackage
@@ -186927,7 +187777,7 @@ self: {
        editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9";
        libraryHaskellDepends = [ base old-locale ];
        description = "Time library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "old-version" = callPackage
@@ -186939,7 +187789,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic versioning library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "olwrapper" = callPackage
@@ -186964,8 +187814,8 @@ self: {
          snap-loader-static snap-server snaplet-fay text
        ];
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186977,8 +187827,8 @@ self: {
        sha256 = "1wiasb3f22g47n54jhxv1c74a0ghxsknrakjdgj3fqlw878g3aan";
        libraryHaskellDepends = [ base ];
        description = "Actor pattern utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186996,8 +187846,8 @@ self: {
          safe-exceptions template-haskell text unix wai
        ];
        description = "Haskell utilities for building embedded Elm programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187012,8 +187862,8 @@ self: {
          base monad-logger safe-exceptions transformers
        ];
        description = "Monad transformer providing MonadFail";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187029,8 +187879,8 @@ self: {
          base http-types monad-logger safe-exceptions uuid wai
        ];
        description = "om-http-logging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187048,8 +187898,8 @@ self: {
          base optparse-applicative shakespeare-text shelly text
        ];
        description = "A simple tool to generate OMakefile for latex files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187069,8 +187919,8 @@ self: {
          transformers transformers-base unordered-containers vector-space
        ];
        description = "Render engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187089,8 +187939,8 @@ self: {
          array base containers directory filepath pretty time
        ];
        description = "A purely functional programming language and a proof system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187109,7 +187959,7 @@ self: {
        ];
        description = "Data encoding and decoding command line utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "omnifmt" = callPackage
@@ -187136,8 +187986,8 @@ self: {
          temporary text time
        ];
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187156,8 +188006,8 @@ self: {
          wai wai-extra warp
        ];
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187178,8 +188028,8 @@ self: {
          base bytestring GenericPretty network process random
        ];
        description = "Program that sends traffic through SSH tunnels on-demand";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187191,8 +188041,8 @@ self: {
        sha256 = "09knyhswd0jgiwx1p1qra1hppnkny7yqjrzmqspxdxjhl0zs91fz";
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "HTML-parsing primitives for Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187213,7 +188063,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "memoization for IO actions and functions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "one-line-aeson-text" = callPackage
@@ -187226,7 +188076,7 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        testHaskellDepends = [ base doctest ];
        description = "Pretty-printing short Aeson values as text";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "one-liner" = callPackage
@@ -187245,7 +188095,7 @@ self: {
        ];
        testHaskellDepends = [ base contravariant HUnit ];
        description = "Constraint-based generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "one-liner-instances" = callPackage
@@ -187256,7 +188106,7 @@ self: {
        sha256 = "1gy900nd5n6cffqw63hlkqg4ly86wjlfqgdcm1zy2nyx7dxg914k";
        libraryHaskellDepends = [ base one-liner random ];
        description = "Generics-based implementations for common typeclasses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "one-time-password" = callPackage
@@ -187274,7 +188124,7 @@ self: {
          base bytestring cryptonite tasty tasty-hunit time
        ];
        description = "HMAC-Based and Time-Based One-Time Passwords";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "oneOfN" = callPackage
@@ -187285,7 +188135,7 @@ self: {
        sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk";
        libraryHaskellDepends = [ base ];
        description = "Anonymous coproduct type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "oneormore" = callPackage
@@ -187296,8 +188146,8 @@ self: {
        sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p";
        libraryHaskellDepends = [ base ];
        description = "A never-empty list type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187318,8 +188168,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187338,8 +188188,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask-prelude ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187364,8 +188214,8 @@ self: {
        sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1";
        libraryHaskellDepends = [ base ];
        description = "partition lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187377,8 +188227,8 @@ self: {
        sha256 = "1d0yn5bj04ircxbi12rx80kds54zssmq4j9kqyk05nmv506x76k0";
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187390,7 +188240,7 @@ self: {
        sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
        libraryHaskellDepends = [ base ];
        description = "Support for OO-like prototypes";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "op" = callPackage
@@ -187402,8 +188252,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers doctest ];
        description = "Common operators encouraging large-scale easy reading";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187434,7 +188284,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -187452,8 +188302,8 @@ self: {
          product-profunctors transformers
        ];
        description = "Opaleye wrapped up in classy MTL attire";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187478,8 +188328,8 @@ self: {
          QuickCheck semigroups sqlite-simple time
        ];
        description = "An SQL-generating DSL targeting SQLite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187501,8 +188351,8 @@ self: {
          base opaleye postgresql-simple product-profunctors
        ];
        description = "A monad transformer for Opaleye";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187518,8 +188368,8 @@ self: {
          base constraints recursion-schemes row-types template-haskell
        ];
        description = "Open algebraic data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187539,8 +188389,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Open algebraic data type examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187555,7 +188405,7 @@ self: {
        libraryHaskellDepends = [ base process ];
        executableHaskellDepends = [ base ];
        description = "Open a web browser from Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "open-haddock" = callPackage
@@ -187568,8 +188418,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base basic-prelude text turtle ];
        description = "Open haddock HTML documentation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187593,7 +188443,7 @@ self: {
        ];
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187606,8 +188456,8 @@ self: {
        libraryHaskellDepends = [ base either mtl transformers ];
        testHaskellDepends = [ base ];
        description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187618,7 +188468,7 @@ self: {
        version = "0.1";
        sha256 = "0dz6ci2i43mghp0v40q11pz2q3511m25sxds44dixish14cs5gym";
        libraryHaskellDepends = [ attoparsec base conduit mtl text ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "open-typerep" = callPackage
@@ -187635,8 +188485,8 @@ self: {
        testHaskellDepends = [ base syntactic ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Open type representations and dynamic types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187651,8 +188501,8 @@ self: {
        libraryHaskellDepends = [ base type-fun ];
        executableHaskellDepends = [ base type-fun ];
        description = "Extensible, type-safe unions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187670,7 +188520,45 @@ self: {
        ];
        testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
        description = "open witnesses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "openai-hs" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, casing, containers, cpphs
+     , hspec, http-client, http-client-tls, http-types, openai-servant
+     , servant, servant-client, servant-client-core, text, vector
+     }:
+     mkDerivation {
+       pname = "openai-hs";
+       version = "0.1.1.0";
+       sha256 = "0cfcw1jlsvzzyvxi2wmqn3klh0fr8rpi8ai6sg315ml7ignyfxz5";
+       libraryHaskellDepends = [
+         aeson base casing cpphs http-client http-types openai-servant
+         servant servant-client text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring casing containers cpphs hspec http-client
+         http-client-tls http-types openai-servant servant servant-client
+         servant-client-core text vector
+       ];
+       description = "Unofficial OpenAI client";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "openai-servant" = callPackage
+    ({ mkDerivation, aeson, base, casing, servant, text, time, vector
+     }:
+     mkDerivation {
+       pname = "openai-servant";
+       version = "0.1.0.0";
+       sha256 = "0fn8ram1rnf9qgs7iwl579gdz8z1qfjy6hhgk0n2z1dh28lhgq6d";
+       libraryHaskellDepends = [
+         aeson base casing servant text time vector
+       ];
+       description = "Unofficial OpenAI servant types";
+       license = lib.licenses.bsd3;
      }) {};
 
   "openapi-petstore" = callPackage
@@ -187697,8 +188585,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated openapi-petstore API Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187718,8 +188606,8 @@ self: {
          yaml
        ];
        description = "Types for OpenAPI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187755,8 +188643,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "OpenAPI 3.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187793,8 +188681,8 @@ self: {
          yaml
        ];
        description = "OpenAPI3 Haskell Client Code Generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187806,8 +188694,8 @@ self: {
        sha256 = "1cvcqv6fx9jszrlv46xn7b3rfxk4bymzc42ndzzvnpwj592yd55i";
        libraryHaskellDepends = [ aeson base data-default text time ];
        description = "A Haskell implementation of the Swiss Meteo Net data API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187821,7 +188709,7 @@ self: {
        librarySystemDepends = [ atomspace-cwrapper ];
        description = "Haskell Bindings for the AtomSpace";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {atomspace-cwrapper = null;};
 
   "opencv" = callPackage
@@ -187852,7 +188740,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion repa ];
        hardeningDisable = [ "bindnow" ];
        description = "Haskell binding to OpenCV-3.x";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) opencv3;};
 
   "opencv-extra" = callPackage
@@ -187876,7 +188764,7 @@ self: {
          template-haskell text transformers vector
        ];
        description = "Haskell binding to OpenCV-3.x extra modules";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opencv-raw" = callPackage
@@ -187888,8 +188776,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL Cabal vector ];
        libraryPkgconfigDepends = [ opencv ];
        description = "Raw Haskell bindings to OpenCV >= 2.0";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) opencv;};
 
@@ -187901,8 +188789,8 @@ self: {
        sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531";
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        description = "A library for working with Open Data Tables";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187919,7 +188807,7 @@ self: {
        ];
        description = "Fetch exchange rates from OpenExchangeRates.org";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "openexr-write" = callPackage
@@ -187936,7 +188824,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring directory hspec vector ];
        description = "Library for writing images in OpenEXR HDR file format";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "openflow" = callPackage
@@ -187953,7 +188841,7 @@ self: {
        ];
        description = "OpenFlow";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opengl-dlp-stereo" = callPackage
@@ -187969,7 +188857,7 @@ self: {
          base data-default GLUT OpenGL vector
        ];
        description = "Library and example for using DLP stereo in OpenGL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opengl-spacenavigator" = callPackage
@@ -187985,7 +188873,7 @@ self: {
          base binary data-default GLUT OpenGL
        ];
        description = "Library and example for using a SpaceNavigator-compatible 3-D mouse with OpenGL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opengles" = callPackage
@@ -188009,8 +188897,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {EGL = null; GLESv2 = null;};
 
@@ -188029,7 +188917,7 @@ self: {
          network network-uri time xml
        ];
        description = "An implementation of the OpenID-2.0 spec.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "openid-connect" = callPackage
@@ -188054,8 +188942,8 @@ self: {
          tasty-hunit text time unordered-containers
        ];
        description = "An OpenID Connect library that does all the heavy lifting for you";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188080,7 +188968,7 @@ self: {
        ];
        description = "Implementation of the OpenPGP message format";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "openpgp-Crypto" = callPackage
@@ -188102,7 +188990,7 @@ self: {
        ];
        description = "Implementation of cryptography for use with OpenPGP using the Crypto library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "openpgp-asciiarmor" = callPackage
@@ -188122,7 +189010,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "OpenPGP (RFC4880) ASCII Armor codec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "openpgp-crypto-api" = callPackage
@@ -188148,7 +189036,7 @@ self: {
        ];
        description = "Implement cryptography for OpenPGP using crypto-api compatible libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opensoundcontrol-ht" = callPackage
@@ -188164,7 +189052,7 @@ self: {
        ];
        description = "Haskell OpenSoundControl utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188184,7 +189072,7 @@ self: {
          text transformers
        ];
        description = "Haskell API Wrapper for the Open Source License API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "openssh-github-keys" = callPackage
@@ -188206,8 +189094,8 @@ self: {
          base hspec keyword-args octohat optparse-applicative parsec text
        ];
        description = "Fetch OpenSSH keys from a GitHub team";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188224,8 +189112,8 @@ self: {
        ];
        testHaskellDepends = [ base cereal hedgehog time ];
        description = "Haskell implementation of openssh protocol primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188237,7 +189125,7 @@ self: {
        sha256 = "1p59wlkirz4dwyhsnzzzbvy2cwfizn2zky5sxrsmnrzfkbpx1ig5";
        libraryHaskellDepends = [ base directory HsOpenSSL time unix ];
        description = "Create OpenSSL keypairs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "openssl-streams" = callPackage
@@ -188256,7 +189144,7 @@ self: {
          test-framework-hunit
        ];
        description = "OpenSSL network support for io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opentelemetry" = callPackage
@@ -188270,7 +189158,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring exceptions ghc-trace-events hashable
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentelemetry-extra" = callPackage
@@ -188306,7 +189194,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [ base gauge opentelemetry ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentelemetry-http-client" = callPackage
@@ -188319,8 +189207,8 @@ self: {
        libraryHaskellDepends = [
          base http-client http-types opentelemetry text
        ];
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188347,7 +189235,7 @@ self: {
          ghc-events http-client http-types opentelemetry opentelemetry-extra
          splitmix text typed-process unordered-containers
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentelemetry-wai" = callPackage
@@ -188361,7 +189249,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-types opentelemetry text wai
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentheory" = callPackage
@@ -188373,7 +189261,7 @@ self: {
        libraryHaskellDepends = [ base opentheory-primitive QuickCheck ];
        testHaskellDepends = [ base opentheory-primitive QuickCheck ];
        description = "The standard theory library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-bits" = callPackage
@@ -188389,7 +189277,7 @@ self: {
          QuickCheck
        ];
        description = "Natural number to bit-list conversions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-byte" = callPackage
@@ -188405,7 +189293,7 @@ self: {
          opentheory-probability QuickCheck
        ];
        description = "Bytes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-char" = callPackage
@@ -188427,8 +189315,8 @@ self: {
          random
        ];
        description = "Unicode characters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188446,7 +189334,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "The divides relation on natural numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-fibonacci" = callPackage
@@ -188464,7 +189352,7 @@ self: {
          base opentheory opentheory-primitive opentheory-stream QuickCheck
        ];
        description = "Fibonacci numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-parser" = callPackage
@@ -188481,7 +189369,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "Stream parsers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-prime" = callPackage
@@ -188501,7 +189389,7 @@ self: {
          opentheory-stream QuickCheck
        ];
        description = "Prime natural numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-primitive" = callPackage
@@ -188513,7 +189401,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random ];
        testHaskellDepends = [ base QuickCheck random ];
        description = "Haskell primitives used by OpenTheory packages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-probability" = callPackage
@@ -188527,7 +189415,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "Probability";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-stream" = callPackage
@@ -188541,7 +189429,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "Infinite stream types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-unicode" = callPackage
@@ -188562,7 +189450,7 @@ self: {
          opentheory-primitive opentheory-probability QuickCheck
        ];
        description = "Unicode characters";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentok" = callPackage
@@ -188594,8 +189482,8 @@ self: {
          unordered-containers utf8-string uuid
        ];
        description = "An OpenTok SDK for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188613,8 +189501,8 @@ self: {
          pretty-hex time unordered-containers vector
        ];
        description = "Opentype loading and writing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188637,8 +189525,8 @@ self: {
          base directory optparse-applicative time xdg-basedir
        ];
        description = "Access data at OpenWeatherMap";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188655,8 +189543,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188671,7 +189559,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        executableHaskellDepends = [ base mtl random ];
        description = "Implementation of difficult monads made easy with operational semantics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "operational-alacarte" = callPackage
@@ -188683,7 +189571,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
        description = "A version of Operational suitable for extensible EDSLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "operational-class" = callPackage
@@ -188694,7 +189582,7 @@ self: {
        sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b";
        libraryHaskellDepends = [ base operational transformers ];
        description = "MonadProgram typeclass for the operational package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "operational-extra" = callPackage
@@ -188709,8 +189597,8 @@ self: {
          base bytestring operational text time transformers
        ];
        description = "Interpretation functions and simple instruction sets for operational";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188729,8 +189617,8 @@ self: {
          text-builder unordered-containers
        ];
        description = "Compiler for OpLang, an esoteric programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188742,7 +189630,7 @@ self: {
        sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
        libraryHaskellDepends = [ base directory xml ];
        description = "Representing and handling OPML subscription information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opml-conduit" = callPackage
@@ -188770,7 +189658,7 @@ self: {
          uri-bytestring xml-conduit
        ];
        description = "Streaming parser/renderer for the OPML 2.0 format.";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "opn" = callPackage
@@ -188788,8 +189676,8 @@ self: {
          process text unordered-containers
        ];
        description = "Open files or URLs using associated programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188818,7 +189706,7 @@ self: {
          unordered-containers vector
        ];
        description = "Optics as an abstract interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-core" = callPackage
@@ -188833,7 +189721,7 @@ self: {
          array base containers indexed-profunctors transformers
        ];
        description = "Optics as an abstract interface: core definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-extra" = callPackage
@@ -188850,7 +189738,7 @@ self: {
          optics-core text transformers unordered-containers vector
        ];
        description = "Extra utilities and instances for optics-core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-th" = callPackage
@@ -188869,7 +189757,7 @@ self: {
        ];
        testHaskellDepends = [ base optics-core tagged ];
        description = "Optics construction using TemplateHaskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-vl" = callPackage
@@ -188884,7 +189772,7 @@ self: {
          base indexed-profunctors optics-core profunctors
        ];
        description = "Utilities for compatibility with van Laarhoven optics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optima" = callPackage
@@ -188901,8 +189789,8 @@ self: {
        ];
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188918,8 +189806,8 @@ self: {
          base bytestring hasql hasql-pool optima text time
        ];
        description = "Command-line arguments parsing for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188944,8 +189832,8 @@ self: {
          base bytestring criterion deepseq vector
        ];
        description = "Optimal Block boundary determination for rsync-like behaviours";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188961,8 +189849,8 @@ self: {
          ad base distributive linear semigroupoids vector
        ];
        description = "Numerical optimization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188981,8 +189869,8 @@ self: {
          uniplate wl-pprint
        ];
        description = "A supercompiler for f-lite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188994,7 +189882,7 @@ self: {
        sha256 = "1m02b0wcsmfdlmh5cnwfylnpc1cizmfcmjxdiwab5bjbbi0xvkaj";
        libraryHaskellDepends = [ base ];
        description = "A strict version of Maybe";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "optional" = callPackage
@@ -189008,8 +189896,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "Using type-classes for optional function arguments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189023,7 +189911,7 @@ self: {
        editedCabalFile = "0fda6mhm44qpbc9hfkf6jxnm3a7qszabywsmxa2iw0dz734a9xl3";
        libraryHaskellDepends = [ base ];
        description = "Optional function arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "options" = callPackage
@@ -189039,7 +189927,7 @@ self: {
          base chell chell-quickcheck containers monads-tf transformers
        ];
        description = "A powerful and easy-to-use command-line option parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "options-time" = callPackage
@@ -189051,8 +189939,8 @@ self: {
        libraryHaskellDepends = [ base options time ];
        testHaskellDepends = [ base chell options time ];
        description = "Command-line option types for dates and times";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189071,7 +189959,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-applicative_0_16_1_0" = callPackage
@@ -189087,8 +189975,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "optparse-applicative-simple" = callPackage
@@ -189104,8 +189992,8 @@ self: {
        ];
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189117,7 +190005,7 @@ self: {
        sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr";
        libraryHaskellDepends = [ base mtl ];
        description = "Declarative command line option parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "optparse-enum" = callPackage
@@ -189131,8 +190019,8 @@ self: {
          base enum-text fmt optparse-applicative text
        ];
        description = "An enum-text based toolkit for optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189149,7 +190037,7 @@ self: {
          system-filepath text time transformers void
        ];
        description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-generic_1_4_4" = callPackage
@@ -189165,8 +190053,8 @@ self: {
          transformers void
        ];
        description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -189179,8 +190067,8 @@ self: {
        editedCabalFile = "13zhsnpdw3kckjrc3sz2i5cqgxwd6sisvik02q0j43d940jmmdk0";
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Helper functions for optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189199,7 +190087,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Simple interface to optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-text" = callPackage
@@ -189211,7 +190099,7 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base hspec optparse-applicative text ];
        description = "Data.Text helpers for optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-version" = callPackage
@@ -189221,7 +190109,7 @@ self: {
        version = "0.3.0.0";
        sha256 = "08mv8ah4g5xs91245gpgh6r0mgdz6rk7ykk1ywr8gfwn3dx1zm7x";
        libraryHaskellDepends = [ base optparse-applicative ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orbits" = callPackage
@@ -189242,7 +190130,7 @@ self: {
          tagged tasty tasty-quickcheck tasty-th units units-defs
        ];
        description = "Types and functions for Kepler orbits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orc" = callPackage
@@ -189259,8 +190147,8 @@ self: {
          base deepseq monadIO mtl process random stm
        ];
        description = "Orchestration-style co-ordination EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189284,8 +190172,8 @@ self: {
          wreq
        ];
        description = "An API client for http://orchestrate.io/.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189306,8 +190194,8 @@ self: {
          salvia-extras stm time unix xml
        ];
        description = "Haskell Wiki Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189327,8 +190215,8 @@ self: {
          salvia-extras stm
        ];
        description = "Haskell Wiki Demo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189340,7 +190228,7 @@ self: {
        sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263";
        libraryHaskellDepends = [ base void ];
        description = "Creating Ord instances instantly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "order-maintenance" = callPackage
@@ -189356,8 +190244,8 @@ self: {
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
        ];
        description = "Algorithms for the order maintenance problem with a safe interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189375,7 +190263,7 @@ self: {
          base containers criterion deepseq random
        ];
        description = "Order statistic trees based on weight-balanced trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "order-statistics" = callPackage
@@ -189390,8 +190278,8 @@ self: {
          base containers math-functions statistics vector vector-space
        ];
        description = "L-Estimators for robust statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189404,7 +190292,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A definition of Posets";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ordered-containers" = callPackage
@@ -189415,7 +190303,7 @@ self: {
        sha256 = "1j92dm36s0cfhc7s4k3dk36ibkvr6w1nhaq6q1m5vkbh1qrwfnn7";
        libraryHaskellDepends = [ base containers ];
        description = "Set- and Map-like types that remember the order elements were inserted";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orderly-workers" = callPackage
@@ -189426,7 +190314,7 @@ self: {
        sha256 = "0w032z05yxl7zqdganxvd8rklzli5k8bya2648hk8scl51q98390";
        libraryHaskellDepends = [ base stm ];
        description = "Fork concurrent worker threads and produce ordered results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orders" = callPackage
@@ -189439,7 +190327,7 @@ self: {
        editedCabalFile = "1ilyg95l97xp4ym402g499ysfbwqsw413kpk4gvi5hd861xx2laj";
        libraryHaskellDepends = [ base containers ];
        description = "basic orders";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ordinal" = callPackage
@@ -189458,7 +190346,9 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        testToolDepends = [ hspec-discover ];
        description = "Convert numbers to words in different languages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "ordrea" = callPackage
@@ -189472,8 +190362,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189488,8 +190378,8 @@ self: {
        ];
        testHaskellDepends = [ base containers either mtl transformers ];
        description = "Owned references in the Ownership Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189507,8 +190397,8 @@ self: {
        ];
        testHaskellDepends = [ base megaparsec tasty tasty-hunit text ];
        description = "Parser for Emacs org-mode files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189523,8 +190413,8 @@ self: {
          base containers hashable lucid org-mode text
        ];
        description = "Lucid integration for org-mode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189538,7 +190428,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec regex-compat ];
        description = "Basic org to anki exporter";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "organize-imports" = callPackage
@@ -189551,8 +190441,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ attoparsec base text ];
        description = "Organize scala imports";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189572,8 +190462,8 @@ self: {
          QuickCheck random regex-posix syb text
        ];
        description = "Org Mode library for haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189596,7 +190486,7 @@ self: {
          thyme unordered-containers
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orgstat" = callPackage
@@ -189605,12 +190495,12 @@ self: {
      , diagrams-svg, directory, exceptions, filepath, fmt, formatting
      , hashable, hspec, HUnit, lens, mtl, optparse-simple, orgmode-parse
      , process, QuickCheck, quickcheck-text, text, time, transformers
-     , turtle, universum, yaml
+     , turtle, universum, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.1.8";
-       sha256 = "072xdy9kg853l7lskm1knkk63pnyqh44s7zakplb37x46rcsj4jc";
+       version = "0.1.9";
+       sha256 = "09psfz4a2amgcyq00ygjp6zakzf5yx2y2kjykz62wncwpqkgnf53";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189621,16 +190511,17 @@ self: {
          yaml
        ];
        executableHaskellDepends = [
-         base bytestring directory exceptions filepath formatting
-         optparse-simple universum
+         attoparsec base bytestring directory exceptions filepath formatting
+         optparse-simple orgmode-parse text time turtle universum
+         unordered-containers
        ];
        testHaskellDepends = [
          base colour hspec HUnit lens QuickCheck quickcheck-text text time
          transformers universum
        ];
        description = "Statistics visualizer for org-mode";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189649,8 +190540,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "An un-SYB framework for transforming heterogenous data through folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189670,7 +190561,7 @@ self: {
          http-types iso8601-time lens mtl string-conversions text time
          unordered-containers word8 wreq
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orizentic" = callPackage
@@ -189691,8 +190582,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec jwt mtl time ];
        description = "Token-based authentication and authorization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189706,6 +190597,8 @@ self: {
        pname = "ormolu";
        version = "0.1.4.1";
        sha256 = "1aamgzimjn9h7kwby9ajfgbj5dx08nmxyalwvpg9rs4xd8pbpd9s";
+       revision = "1";
+       editedCabalFile = "1fi8fxyhw9jdwhsbmrikjqd461wrz7h4kdszrahlvdjfdsn4wh7d";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -189721,7 +190614,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orthotope" = callPackage
@@ -189741,7 +190634,7 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Multidimensional arrays inspired by APL";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "os-release" = callPackage
@@ -189761,7 +190654,7 @@ self: {
          pretty-simple tasty tasty-golden tasty-hspec text
        ];
        description = "/etc/os-release helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "osc" = callPackage
@@ -189776,8 +190669,8 @@ self: {
          attoparsec base binary bytestring data-binary-ieee754 network
        ];
        description = "A library to handle messages in the OSC protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189789,8 +190682,8 @@ self: {
        sha256 = "1452a2y085xbj5q83g6y8f9vrxmlq804i8kyx6rfwyzfvzq5s3ic";
        libraryHaskellDepends = [ base colour gloss random ];
        description = "Implements an osculatory packing (kissing circles) algorithm and display";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189810,7 +190703,7 @@ self: {
        ];
        executableHaskellDepends = [ base process ];
        description = "Show keys pressed with an on-screen display (Linux only)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "oset" = callPackage
@@ -189826,8 +190719,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        testToolDepends = [ hspec-discover ];
        description = "An insertion-order-preserving set";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189847,8 +190740,8 @@ self: {
          base conduit exceptions hspec resourcet text xml-conduit xml-types
        ];
        description = "Parse and operate on OSM data in efficient way";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189870,8 +190763,8 @@ self: {
          text time transformers transformers-base
        ];
        description = "Download Open Street Map tiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189890,8 +190783,8 @@ self: {
          process temporary
        ];
        description = "Better conversion of Oxford Scholarship Online material to PDF";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189904,8 +190797,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189926,8 +190819,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Real-time collaborative editing with Operational Transformation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189953,8 +190846,8 @@ self: {
          aeson base binary bytestring h-gpgme text yaml
        ];
        description = "OTP Authenticator (a la google) command line client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189972,8 +190865,8 @@ self: {
          base containers parsec split uniplate
        ];
        description = "Pretty-printer for Ott parse trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189998,7 +190891,7 @@ self: {
          vector-algorithms
        ];
        description = "External sorting package based on Conduit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "overhang" = callPackage
@@ -190009,7 +190902,7 @@ self: {
        sha256 = "07iafybg45130jhwin6jj2fnkgcwra367f5df91xn34kaj9zas0x";
        libraryHaskellDepends = [ base ];
        description = "Hang loose with your lambdas!";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "overload" = callPackage
@@ -190024,7 +190917,7 @@ self: {
          base simple-effects template-haskell th-expand-syns
        ];
        description = "Finite overloading";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "overloaded" = callPackage
@@ -190050,8 +190943,8 @@ self: {
        ];
        doHaddock = false;
        description = "Overloaded pragmas as a plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190073,8 +190966,8 @@ self: {
          test-framework-hunit
        ];
        description = "Overloaded Records based on current GHC proposal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190088,8 +190981,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190105,8 +190998,8 @@ self: {
          array base bytestring lens transformers vector
        ];
        description = "Bidirectional fast ByteString packer/unpacker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190121,8 +191014,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Fetches a 'GenericPackageDescription' from Hackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190141,8 +191034,8 @@ self: {
          base Cabal filemanip filepath groom packdeps process
        ];
        description = "Utilities for working with cabal packages and your package database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190158,8 +191051,8 @@ self: {
          base Cabal Diff filepath haskell-src-exts
        ];
        description = "Haskell Package Versioning Tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190173,7 +191066,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
        description = "Universal build and CI testing for Haskell packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "packdeps" = callPackage
@@ -190197,7 +191090,7 @@ self: {
          base Cabal containers optparse-applicative process semigroups text
        ];
        description = "Check your cabal packages for lagging dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "packed" = callPackage
@@ -190213,8 +191106,8 @@ self: {
          base containers ghc-prim hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        benchmarkHaskellDepends = [ base gauge ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190242,8 +191135,8 @@ self: {
          vector-binary-instances
        ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190262,8 +191155,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Efficient “spreadsheet table” like maps with multiple marginals";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190277,8 +191170,8 @@ self: {
        editedCabalFile = "1kqbbvvpb0zn19dp4lx598iwgpbswz1qvclrcy5v27vjivzk9hyb";
        libraryHaskellDepends = [ array base ];
        description = "(Deprecated) Packed Strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190295,7 +191188,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
        description = "Fast byte serializer and unserializer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "packer-messagepack" = callPackage
@@ -190313,8 +191206,8 @@ self: {
          base bytestring containers hedgehog packer safe-exceptions text
        ];
        description = "MessagePack Serialization an Deserialization for Packer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190334,8 +191227,8 @@ self: {
          QuickCheck
        ];
        description = "Serialization library for GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190356,8 +191249,8 @@ self: {
          process split
        ];
        description = "Tool for detecting redundant Cabal package dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190371,8 +191264,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base deepseq directory-tree ];
        description = "Read whole Pacman database which pushes it into the memory cache";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190388,8 +191281,8 @@ self: {
          base containers hmidi minioperational transformers
        ];
        description = "Controlling padKONTROL native mode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190408,7 +191301,7 @@ self: {
          servant-client servant-client-core time
        ];
        description = "API to the Paddle payment processor";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pads-haskell" = callPackage
@@ -190435,8 +191328,8 @@ self: {
          transformers
        ];
        description = "PADS data description language for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190455,8 +191348,8 @@ self: {
        ];
        executableHaskellDepends = [ base text wreq ];
        description = "Pagarme API wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190478,7 +191371,7 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring conduit-extra text ];
        description = "Open up a pager, like 'less' or 'more'";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "pagerduty" = callPackage
@@ -190502,7 +191395,7 @@ self: {
        ];
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pagination" = callPackage
@@ -190516,7 +191409,7 @@ self: {
        libraryHaskellDepends = [ base deepseq exceptions ];
        testHaskellDepends = [ base exceptions hspec QuickCheck ];
        description = "Framework-agnostic pagination boilerplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pagure-cli" = callPackage
@@ -190534,7 +191427,7 @@ self: {
          optparse-applicative simple-cmd-args text
        ];
        description = "Pagure client";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "pagure-hook-receiver" = callPackage
@@ -190549,8 +191442,8 @@ self: {
          base containers scotty shelly text transformers unix
        ];
        description = "Receive hooks from pagure and do things with them";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190566,7 +191459,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Colorization of text for command-line output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pairing" = callPackage
@@ -190592,8 +191485,8 @@ self: {
          MonadRandom protolude tasty-quickcheck
        ];
        description = "Bilinear pairings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190609,8 +191502,8 @@ self: {
          array base colour containers MonadRandom
        ];
        description = "Utilities for choosing and creating color schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190624,7 +191517,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base bytestring containers ];
        description = "Finding palindromes in strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pam" = callPackage
@@ -190639,9 +191532,9 @@ self: {
        librarySystemDepends = [ pam ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pam = null;};
 
@@ -190659,8 +191552,8 @@ self: {
        testHaskellDepends = [ base byteslice primitive ];
        benchmarkHaskellDepends = [ base byteslice gauge primitive ];
        description = "Parse syslog traffic from PAN-OS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190682,7 +191575,7 @@ self: {
        ];
        description = "A simple static blog engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190739,8 +191632,8 @@ self: {
          mv "man/"*.1 $out/share/man/man1/
        '';
        description = "Conversion between markup formats";
-       license = stdenv.lib.licenses.gpl2Plus;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl2Plus;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "pandoc-citeproc" = callPackage
@@ -190775,7 +191668,7 @@ self: {
        ];
        doCheck = false;
        description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -190792,7 +191685,7 @@ self: {
          base directory filepath pandoc-types process text-conversions
        ];
        description = "Insert a preamble before pandoc-citeproc's bibliography";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "pandoc-crossref" = callPackage
@@ -190828,7 +191721,7 @@ self: {
          utility-ht
        ];
        description = "Pandoc filter for cross-references";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -190843,8 +191736,8 @@ self: {
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
        executableHaskellDepends = [ base csv pandoc pandoc-types ];
        description = "Convert CSV to Pandoc Table Markdown";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190856,7 +191749,7 @@ self: {
        sha256 = "032fx8fy134hysg10y5c57c7jkvq8lkc0q2r8ylc54qbfmvqd820";
        libraryHaskellDepends = [ base dhall either pandoc text ];
        description = "Decodes pandoc to dhall";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-emphasize-code" = callPackage
@@ -190881,7 +191774,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A Pandoc filter for emphasizing code in fenced blocks";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "pandoc-filter-graphviz" = callPackage
@@ -190900,37 +191793,40 @@ self: {
          directory filepath pandoc pandoc-types process text
        ];
        description = "A Pandoc filter to use graphviz";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "pandoc-filter-indent" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup
+    ({ mkDerivation, base, blaze-html, blaze-markup, containers
      , ghc-syntax-highlighter, HaTeX, optics-core, optics-th
-     , pandoc-types, text
+     , optparse-applicative, pandoc-types, QuickCheck, quickcheck-text
+     , skylighting, text
      }:
      mkDerivation {
        pname = "pandoc-filter-indent";
-       version = "0.2.1.0";
-       sha256 = "1jc5a977490jfqnhvqzg5zqs22r10x094mfqd26ynqq9fx7pa580";
+       version = "0.3.1.0";
+       sha256 = "1ys7v9ygy07c4jxraqmbb1fqswhh0fydcgd5zcfjln2sjb637947";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup ghc-syntax-highlighter HaTeX
-         optics-core optics-th pandoc-types text
+         optics-core optics-th pandoc-types skylighting text
        ];
        executableHaskellDepends = [
-         base blaze-html blaze-markup ghc-syntax-highlighter HaTeX
-         optics-core optics-th pandoc-types text
+         base blaze-html blaze-markup containers ghc-syntax-highlighter
+         HaTeX optics-core optics-th optparse-applicative pandoc-types
+         skylighting text
        ];
        testHaskellDepends = [
          base blaze-html blaze-markup ghc-syntax-highlighter HaTeX
-         optics-core optics-th pandoc-types text
+         optics-core optics-th pandoc-types QuickCheck quickcheck-text
+         skylighting text
        ];
        description = "Pandoc filter formatting Haskell code fragments using GHC lexer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190947,7 +191843,7 @@ self: {
          skylighting-extensions skylighting-modding text
        ];
        description = "Syntax highlighting customization for Pandoc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pandoc-include" = callPackage
@@ -190967,8 +191863,8 @@ self: {
        ];
        doHaddock = false;
        description = "Include other Markdown files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190993,7 +191889,7 @@ self: {
          tasty-hunit text
        ];
        description = "A Pandoc filter for including code from source files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "pandoc-japanese-filters" = callPackage
@@ -191012,8 +191908,8 @@ self: {
          pandoc-types shelly system-fileio system-filepath text
        ];
        description = "Japanese-specific markup filters for pandoc";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191025,8 +191921,8 @@ self: {
        sha256 = "0prc0wv808l1l7m6rg78r6alwqgajj0h2yn3w7sgxmsvxdr8aj1w";
        libraryHaskellDepends = [ base containers lens pandoc-types text ];
        description = "Lenses for Pandoc documents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191040,7 +191936,7 @@ self: {
          base containers pandoc-types relude text
        ];
        description = "Extract \"contextual links\" from Pandoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-markdown-ghci-filter" = callPackage
@@ -191065,8 +191961,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191089,7 +191985,7 @@ self: {
        ];
        description = "Pandoc filter to include CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191113,8 +192009,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191128,8 +192024,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-plot";
-       version = "1.0.1.0";
-       sha256 = "0p7sfsi70vbwkxwknl5k31qsvnkwvhdjr8c2q7y0pjz3xz9zdrjq";
+       version = "1.0.2.1";
+       sha256 = "0yi1dh6d1zxzrpmh32v0c7v921qjyxmmapzv56vh0ih8mi3ggbji";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191149,7 +192045,7 @@ self: {
          base criterion pandoc-types template-haskell text
        ];
        description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "pandoc-pyplot" = callPackage
@@ -191179,8 +192075,8 @@ self: {
          mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text
        ];
        description = "A Pandoc filter to include figures generated from Python code blocks";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191195,8 +192091,8 @@ self: {
        libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ];
        executableHaskellDepends = [ base pandoc-types ];
        description = "Convert Pandoc Markdown-style footnotes into sidenotes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191214,7 +192110,7 @@ self: {
          base bytestring containers extra pandoc pandoc-types text
        ];
        description = "Pandoc filter to customize links, images and paragraphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-throw" = callPackage
@@ -191225,7 +192121,7 @@ self: {
        sha256 = "1i737mv2sgm65c53ggrxnscga92fya5khb5nhgbg1nnqgy2sjkm8";
        libraryHaskellDepends = [ base exceptions pandoc ];
        description = "MonadThrow behaviour for Pandoc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pandoc-types" = callPackage
@@ -191248,7 +192144,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -191261,8 +192157,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191280,8 +192176,8 @@ self: {
          text transformers
        ];
        description = "Utility functions to work with Pandoc in Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191300,17 +192196,17 @@ self: {
          temporary text
        ];
        description = "Pandoc filter for native Vim code highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandora" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.3.3";
-       sha256 = "16jaq5q0b2q230iwhfhs2p1fmmqb38zssr7zbgjmry2045ya2dhh";
+       version = "0.3.5";
+       sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja";
        description = "A box of patterns and paradigms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pang-a-lambda" = callPackage
@@ -191329,8 +192225,8 @@ self: {
          transformers Yampa
        ];
        description = "A super-pang clone";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191350,7 +192246,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ pango ];
        description = "Binding to the Pango text rendering engine";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) pango;};
 
   "pangraph" = callPackage
@@ -191367,8 +192263,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191390,8 +192286,8 @@ self: {
          QuickCheck syb tagged tasty tasty-quickcheck
        ];
        description = "Pandoc filter to unwrap nested blocks";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {lazysmallcheck2012 = null;};
 
@@ -191403,7 +192299,7 @@ self: {
        sha256 = "0hidfg8yzp5vzq8y422c442b45jkr8a9s38s8n78wyi5811fpp0m";
        libraryHaskellDepends = [ base gitrev template-haskell ];
        description = "A convenient way to panic";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "panpipe" = callPackage
@@ -191424,8 +192320,8 @@ self: {
          base pandoc QuickCheck tasty tasty-quickcheck
        ];
        description = "Pandoc filter to execute code blocks";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191454,8 +192350,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        description = "Pansite: a simple web site management tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191497,7 +192393,7 @@ self: {
          unliftio unordered-containers vector yaml zip-archive
        ];
        description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -191551,8 +192447,8 @@ self: {
          zip-archive
        ];
        description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191576,8 +192472,8 @@ self: {
          papa-x-export papa-x-implement
        ];
        description = "Reasonable default import";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191591,8 +192487,8 @@ self: {
          base papa-base-export papa-base-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191604,8 +192500,8 @@ self: {
        sha256 = "120b3ks9h3m9w6z365hmqrcp349kh3w8ii4kgki1zxjhh9z05mnm";
        libraryHaskellDepends = [ base semigroups ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191617,8 +192513,8 @@ self: {
        sha256 = "07wpz625sdsjajaf3imqns92hs4h5gwjlmmfsr5mk9rbb3zph7ck";
        libraryHaskellDepends = [ base papa-base-export semigroups ];
        description = "Useful base functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191634,7 +192530,7 @@ self: {
          base papa-bifunctors-export papa-bifunctors-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-bifunctors-export" = callPackage
@@ -191647,7 +192543,7 @@ self: {
        editedCabalFile = "1d5jvb35as6kb9nmv99gv38v7rzl7c9mdg3ypwzmdqg0646m9k7m";
        libraryHaskellDepends = [ base bifunctors ];
        description = "export useful functions from `bifunctors`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-bifunctors-implement" = callPackage
@@ -191658,7 +192554,7 @@ self: {
        sha256 = "0s1hcpchiz9xrip25z677lkglmflnqibrvy98xmn2ppzp489pm24";
        libraryHaskellDepends = [ base bifunctors ];
        description = "useful `bifunctors` functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-export" = callPackage
@@ -191678,8 +192574,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Reasonable default import";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191701,8 +192597,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Reasonable default import";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191719,8 +192615,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Third party libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191734,7 +192630,7 @@ self: {
          base papa-lens-export papa-lens-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-lens-export" = callPackage
@@ -191745,7 +192641,7 @@ self: {
        sha256 = "1sckrsfljk8r9jkjv1ccpzw6bk4fq50zwvkddhfidjrjnfvkycfb";
        libraryHaskellDepends = [ base lens ];
        description = "export useful functions from `lens`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-lens-implement" = callPackage
@@ -191756,7 +192652,7 @@ self: {
        sha256 = "1x7439f7s625mdhnphvwy4pj7llpj6qsvzgvhzjcfg9m3n2a8bn4";
        libraryHaskellDepends = [ base lens ];
        description = "useful `lens` functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-prelude" = callPackage
@@ -191772,8 +192668,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191790,8 +192686,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191808,8 +192704,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191826,8 +192722,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191844,8 +192740,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191861,8 +192757,8 @@ self: {
          base papa-semigroupoids-export papa-semigroupoids-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191874,7 +192770,7 @@ self: {
        sha256 = "0arqnnavjmpk0r9rfmpkyr3cxgc3gcr01ym8p15ix0iv0svghhx3";
        libraryHaskellDepends = [ base semigroupoids ];
        description = "export useful functions from `semigroupoids`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-semigroupoids-implement" = callPackage
@@ -191885,8 +192781,8 @@ self: {
        sha256 = "0walc4zzm8cyjmjl577zrc01lkgf321r8law5mwhlr7n9ihiqfxg";
        libraryHaskellDepends = [ base semigroupoids semigroups ];
        description = "useful `semigroupoids` functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191898,7 +192794,7 @@ self: {
        sha256 = "1dvnnpdbiaxry2mxsfxlm0c42zi8ssx0sxj6m9z5mihwcf76cpld";
        libraryHaskellDepends = [ base papa-x-export papa-x-implement ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-x-export" = callPackage
@@ -191909,7 +192805,7 @@ self: {
        sha256 = "1l0rklbpg9py2cbp22qlshcxh51wxv9ayiixqh32q70jsgfbkind";
        libraryHaskellDepends = [ base ];
        description = "export useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-x-implement" = callPackage
@@ -191920,7 +192816,7 @@ self: {
        sha256 = "1hwd93nig7vgqsdy3qyxrgvjcq8wwbj98z6r66wpp7lw8jfpqhff";
        libraryHaskellDepends = [ base ];
        description = "useful functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paphragen" = callPackage
@@ -191933,8 +192829,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring containers ];
        description = "A passphrase generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191955,8 +192851,8 @@ self: {
          base directory filepath monads-tf template-haskell transformers
        ];
        description = "packrat parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191970,8 +192866,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191994,8 +192890,8 @@ self: {
          wai-app-static wai-websockets warp websockets word8
        ];
        description = "The Haskell library and examples for the kids programming robot paprika";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192012,8 +192908,8 @@ self: {
          base hedgehog refined template-haskell validators
        ];
        description = "ParDual class for Parallel <-> Sequential";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192025,7 +192921,7 @@ self: {
        sha256 = "0rmv6wyisdg4srzjykikqqigfji6x5zn1cz2v3cyl0dms4yr4lig";
        libraryHaskellDepends = [ base directory filepath parallel-io ];
        description = "Traverse a directory in parallel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "para" = callPackage
@@ -192036,7 +192932,7 @@ self: {
        sha256 = "0l5abmqi548s10f87m124ld4hhphhl1szljyc04a13fah4dsqjbh";
        libraryHaskellDepends = [ base ];
        description = "Text paragraph formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paragon" = callPackage
@@ -192063,8 +192959,8 @@ self: {
        ];
        executableToolDepends = [ alex ];
        description = "Paragon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192078,7 +192974,7 @@ self: {
        editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6";
        libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
        description = "Parallel programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parallel-io" = callPackage
@@ -192095,7 +192991,7 @@ self: {
          base containers extensible-exceptions random
        ];
        description = "Combinators for executing IO actions in parallel on a thread pool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parallel-tasks" = callPackage
@@ -192110,8 +193006,8 @@ self: {
          base bytestring cereal deepseq here old-locale stm time
          transformers vector vector-algorithms
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192123,7 +193019,7 @@ self: {
        sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd";
        libraryHaskellDepends = [ base parallel tree-monad ];
        description = "Parallel Tree Search";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "parameterized" = callPackage
@@ -192135,8 +193031,8 @@ self: {
        libraryHaskellDepends = [ base data-diverse transformers ];
        testHaskellDepends = [ base data-diverse hspec transformers ];
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192148,7 +193044,7 @@ self: {
        sha256 = "0fsghadd533qzav40xi3yfb8xmfv4wqsqmb0bk93rczyzyff2900";
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Parameterized data library implementing lightweight dependent types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parameterized-utils" = callPackage
@@ -192170,8 +193066,8 @@ self: {
          tasty-ant-xml tasty-hedgehog tasty-hunit
        ];
        description = "Classes and data structures for working with data-kind indexed types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192190,7 +193086,7 @@ self: {
          base bytestring tasty tasty-golden tasty-hunit temporary
        ];
        description = "Generate labelled test/benchmark trees from sets of parameters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paranoia" = callPackage
@@ -192215,8 +193111,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "http proxy server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192228,8 +193124,8 @@ self: {
        sha256 = "0598hz6zqcn4lh5y3vr54z4jh4ampxnh8rq29k6p5vnmrpvn4lq4";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192241,8 +193137,8 @@ self: {
        sha256 = "0bc2gyvc1i3l3p702zs6hfkab7fmc7li5kh4mdzy3a91gzgsl3jh";
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192254,8 +193150,8 @@ self: {
        sha256 = "0m3dsjay3av4y0v4j76wxybmk4mkjdhqq81w1wsfr173d4blgxf3";
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192271,8 +193167,8 @@ self: {
          base bytestring containers mtl text transformers utf8-string word8
        ];
        description = "A simple parser-combinator library, a bit like Parsec but without the frills";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192301,8 +193197,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192314,8 +193210,8 @@ self: {
        sha256 = "0b05zrc3v1hczasgg8ir83qfsz52lq02kwgn9nd39wnfliw6a4n0";
        libraryHaskellDepends = [ base ];
        description = "A library for cause-effect relationships";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192339,7 +193235,7 @@ self: {
          base bytestring parser-combinators random tasty tasty-hunit text
        ];
        description = "Parser combinators with fast-path and slower fallback for error reporting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "parochial" = callPackage
@@ -192349,8 +193245,8 @@ self: {
      }:
      mkDerivation {
        pname = "parochial";
-       version = "0.1.0.0";
-       sha256 = "14sjpm97cl3i4ndnl8dmqd08an6y7n11yarhfw5wr7k5l3lrw64c";
+       version = "0.2.0.0";
+       sha256 = "0sb42rln3svcfs78ab2fs6kq3k975xin6gqnm83rg3kryaawnra7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192362,7 +193258,9 @@ self: {
          base Cabal optparse-generic protolude
        ];
        description = "Help Manage project specific documentation";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "parport" = callPackage
@@ -192398,8 +193296,8 @@ self: {
          mtl process QuickCheck text
        ];
        description = "Streaming Parquet reader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192411,7 +193309,7 @@ self: {
        sha256 = "0amh3h49xi65kx8l34cy5jkai1f0d9l1qxp4937f3cjf7afif0pj";
        libraryHaskellDepends = [ array base bytestring parsec ];
        description = "DIMACS CNF parser library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parse-gcstats" = callPackage
@@ -192430,7 +193328,7 @@ self: {
          text
        ];
        description = "Parse machine-readable GHC GC stats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parse-help" = callPackage
@@ -192447,8 +193345,8 @@ self: {
        ];
        testHaskellDepends = [ cmdargs ];
        description = "generate command line arguments from a --help output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192464,8 +193362,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base process ];
        description = "Parse command-line arguments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192484,8 +193382,8 @@ self: {
          base HUnit mtl test-framework test-framework-hunit
        ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "parsec-class" = callPackage
@@ -192496,7 +193394,7 @@ self: {
        sha256 = "0wqpivsrjsp9996fz6lb06rxl3860afc4l8hbx8d1vxhwv2lx702";
        libraryHaskellDepends = [ base parsec ];
        description = "Class of types that can be constructed from their text representation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "parsec-extra" = callPackage
@@ -192507,7 +193405,7 @@ self: {
        sha256 = "00n7vzkkd70ndjlxhwnnl4mlh0892idc813kj4j1a14xa85sndj9";
        libraryHaskellDepends = [ base monads-tf parsec ];
        description = "Some miscellaneous basic string parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec-free" = callPackage
@@ -192522,8 +193420,8 @@ self: {
          base bytestring containers free lens mtl parsec text transformers
        ];
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192535,7 +193433,7 @@ self: {
        sha256 = "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp";
        libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec-numeric" = callPackage
@@ -192553,7 +193451,7 @@ self: {
        ];
        description = "Parsec combinators for parsing Haskell numeric types";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "parsec-parsers" = callPackage
@@ -192567,8 +193465,8 @@ self: {
        libraryHaskellDepends = [ base parsec parsers ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Parsing instances for Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192581,7 +193479,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec QuickCheck ];
        description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec-pratt" = callPackage
@@ -192595,8 +193493,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base containers mtl parsec pretty ];
        description = "Pratt Parser combinator for Parsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192608,7 +193506,7 @@ self: {
        sha256 = "1pzspf5fimjlki5fn3lxz1kdpd9pf2ww8z9sf08zaiyfp4ms15n1";
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Parsec parsers for Tagsoup tag streams";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "parsec-trace" = callPackage
@@ -192619,7 +193517,7 @@ self: {
        sha256 = "085899pyr7sff5d5zgr9pmflv3384hwm7p2b5k2lf0pcnvzf2mgw";
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Add a hierarchical trace to Parsec parsers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "parsec-utils" = callPackage
@@ -192630,7 +193528,7 @@ self: {
        sha256 = "0pfdl9zsdzxcbjh37234djcbg6sdhqzx3fnin0b55hxn78k26ivi";
        libraryHaskellDepends = [ base parsec ];
        description = "Utility functions and combinators for Text.Parsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec1" = callPackage
@@ -192641,7 +193539,7 @@ self: {
        sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf";
        libraryHaskellDepends = [ base ];
        description = "Portable monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec2" = callPackage
@@ -192652,8 +193550,8 @@ self: {
        sha256 = "075y56pbi02ssyb965di1b6d2047jdjwq2wp2maraqjm6gdk824y";
        libraryHaskellDepends = [ base ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192665,8 +193563,8 @@ self: {
        sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf";
        libraryHaskellDepends = [ base bytestring mtl text ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192678,7 +193576,7 @@ self: {
        sha256 = "0i7fvbhvvmf5nld51kv9v0vpb42dlnpivxcl7ll0zwa3gzks2cm5";
        libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from Char sequences";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsedate" = callPackage
@@ -192689,7 +193587,7 @@ self: {
        sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip";
        libraryHaskellDepends = [ base old-locale old-time parsec ];
        description = "Data and time parsing for CalendarTime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parseerror-eq" = callPackage
@@ -192701,8 +193599,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Adds and Eq instance for Parsec's ParseError if needed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192714,7 +193612,7 @@ self: {
        sha256 = "090yhbbh2i5lwfwrfml0n54ziy8mz3mgmwnykr4ab06w1ylc2zh4";
        libraryHaskellDepends = [ base ];
        description = "Parallel Parsing Processes";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "parsely" = callPackage
@@ -192724,8 +193622,8 @@ self: {
        version = "0.1";
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
        libraryHaskellDepends = [ base mtl parsec ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192737,7 +193635,7 @@ self: {
        sha256 = "0k95nvgnl5820y094yfh7b868l0xd1diclm4kx9560p5rm02w5h3";
        libraryHaskellDepends = [ base ];
        description = "Lightweight package providing commonly useful parser combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parser-combinators-tests" = callPackage
@@ -192759,8 +193657,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Test suite of parser-combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192776,8 +193674,8 @@ self: {
          aeson base bytestring haskell-src-exts text
        ];
        description = "Prints Haskell parse trees in JSON";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192792,8 +193690,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec mtl ];
        description = "An interface to create production rules using augmented grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192815,8 +193713,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "TH parser generator for splitting bytestring into fixed-width fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192838,7 +193736,7 @@ self: {
          attoparsec base bytestring parsec QuickCheck quickcheck-instances
        ];
        description = "Parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsers-megaparsec" = callPackage
@@ -192855,8 +193753,8 @@ self: {
          base fail megaparsec mtl parsers semigroups text transformers
        ];
        description = "`parsers` instances for Megaparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192880,8 +193778,8 @@ self: {
          array base binary bytestring containers deepseq mtl
        ];
        description = "NMR-STAR file format parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192893,8 +193791,8 @@ self: {
        sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192915,7 +193813,7 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Parser combinators with slicing, error recovery, and syntax highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "partage" = callPackage
@@ -192933,8 +193831,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit tasty tasty-hunit ];
        description = "Parsing factorized";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192946,7 +193844,7 @@ self: {
        sha256 = "1pgmiddwhk40bzhwznv6lwmxglsnp41z45qhpd5cm0nh2wmzgx5p";
        libraryHaskellDepends = [ base ];
        description = "A nullary type class for partial functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "partial-handler" = callPackage
@@ -192957,7 +193855,7 @@ self: {
        sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl";
        libraryHaskellDepends = [ base ];
        description = "A composable exception handler";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "partial-isomorphisms" = callPackage
@@ -192968,7 +193866,7 @@ self: {
        sha256 = "0r51ykq6i11gzypv93bnw8pzn4zdyrabiiqfpbhpvs0rj6k1ymac";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "partial-lens" = callPackage
@@ -192983,8 +193881,8 @@ self: {
          base comonad-transformers data-lens transformers
        ];
        description = "Haskell 98 Partial Lenses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193002,7 +193900,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Provides typeclass suitable for types admitting a partial order";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "partial-records" = callPackage
@@ -193013,8 +193911,8 @@ self: {
        sha256 = "0vp5d0jdbk451a563a4hzkycyqh41w6plb39dfn0bv6li4a5qp8h";
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Template haskell utilities for constructing records with default values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193027,7 +193925,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "partial-semigroup-hedgehog" = callPackage
@@ -193038,7 +193936,7 @@ self: {
        sha256 = "0n0j8xlrz66mzkvrsa083b9057n3rgbir7pwqxqycwzgj18g68s6";
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "partial-semigroup-test" = callPackage
@@ -193050,7 +193948,7 @@ self: {
        libraryHaskellDepends = [ partial-semigroup-hedgehog ];
        doHaddock = false;
        description = "Testing utilities for the partial-semigroup package";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "partial-uri" = callPackage
@@ -193062,7 +193960,7 @@ self: {
        libraryHaskellDepends = [ base network-uri ];
        description = "Datatype for passing around unresolved URIs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "partly" = callPackage
@@ -193084,8 +193982,8 @@ self: {
          aeson base base64-bytestring binary bytestring QuickCheck vector
        ];
        description = "Inspect, create, and alter MBRs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193104,36 +194002,37 @@ self: {
          mwc-random pretty primitive process random
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "passman" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
-     , bytestring, containers, easy-file, HCL, HUnit, lens, random, SHA
-     , text, transformers
+     , bytestring, containers, easy-file, HCL, HUnit, microlens
+     , microlens-th, random, SHA, text, transformers
      }:
      mkDerivation {
        pname = "passman";
-       version = "0.2.1";
-       sha256 = "0xa7cc38x012nznp5cwma44gf11v24w7h7cja869i282v7g5693b";
+       version = "0.3.0";
+       sha256 = "1m3g4ah1wvga3kq9krvg13niisq4rqkb7i6f6lil39v6lplq5drq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring base64-bytestring bytestring
-         containers lens random SHA text
+         containers microlens microlens-th random SHA text
        ];
        executableHaskellDepends = [
-         aeson base bytestring containers easy-file HCL lens random
-         transformers
+         aeson base bytestring containers easy-file HCL microlens
+         microlens-th random transformers
        ];
        testHaskellDepends = [
-         aeson base bytestring containers HUnit lens random
+         aeson base bytestring containers HUnit microlens microlens-th
+         random
        ];
        description = "a simple password manager";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193154,8 +194053,8 @@ self: {
          passman-core resourcet text X11 yaml
        ];
        description = "Deterministic password generator command line interface";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "passman-core" = callPackage
@@ -193180,8 +194079,8 @@ self: {
        ];
        doHaddock = false;
        description = "Deterministic password generator core";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "password" = callPackage
@@ -193204,7 +194103,7 @@ self: {
          template-haskell text
        ];
        description = "Hashing and checking of passwords";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "password-instances" = callPackage
@@ -193227,7 +194126,7 @@ self: {
          template-haskell text
        ];
        description = "typeclass instances for password package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "passwords" = callPackage
@@ -193238,8 +194137,8 @@ self: {
        sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li";
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193256,8 +194155,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec microlens protolude ];
        description = "PostgreSQL Abstract Syntax Tree Assember";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193269,8 +194168,8 @@ self: {
        sha256 = "1425gzss5maqzrphrvvsw60lkapwg3wfjx10c59qkylx63k5ixjl";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193285,7 +194184,7 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        description = "A simple command line pasting utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193314,8 +194213,8 @@ self: {
          base directory QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Terminal-based presentations using Pandoc";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193336,7 +194235,7 @@ self: {
        ];
        testHaskellDepends = [ base directory filemanip filepath hlint ];
        description = "Data structures for describing changes to other data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "patch-combinators" = callPackage
@@ -193348,7 +194247,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for patching functions and data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "patch-image" = callPackage
@@ -193373,8 +194272,8 @@ self: {
          unordered-containers utility-ht vector
        ];
        description = "Compose a big image from overlapping parts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "patches-vector" = callPackage
@@ -193392,8 +194291,8 @@ self: {
          base criterion doctest hspec QuickCheck vector
        ];
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193418,7 +194317,7 @@ self: {
          genvalidity-property hspec mtl QuickCheck validity
        ];
        description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "path_0_8_0" = callPackage
@@ -193440,8 +194339,8 @@ self: {
          genvalidity-property hspec mtl QuickCheck template-haskell validity
        ];
        description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "path-binary-instance" = callPackage
@@ -193452,7 +194351,7 @@ self: {
        sha256 = "19ck3ja66vcgl90wyw6r9d2h50kdv9gjs7sxjgciam6v6867vb0y";
        libraryHaskellDepends = [ base binary path ];
        description = "Binary instance for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-dhall-instance" = callPackage
@@ -193463,7 +194362,7 @@ self: {
        sha256 = "17igz9936lfivph9rr04075sp7ik5k8byljw2vj0zx8lnznjwn6a";
        libraryHaskellDepends = [ base dhall either path text ];
        description = "ToDhall and FromDhall instances for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-extensions" = callPackage
@@ -193474,7 +194373,7 @@ self: {
        sha256 = "0pvjb26arsj892addi9x26v8naislh87x6av70k8fjnsish3pnj5";
        libraryHaskellDepends = [ base exceptions path ];
        description = "Enumeration of common filetype extensions for use with the path library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-extra" = callPackage
@@ -193491,7 +194390,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "URLs without host information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "path-io" = callPackage
@@ -193511,7 +194410,7 @@ self: {
          unix-compat
        ];
        description = "Interface to ‘directory’ package for users of ‘path’";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "path-like" = callPackage
@@ -193522,7 +194421,7 @@ self: {
        sha256 = "1hr58zcgcybd34zzas5kf0jgcm5z2wdlbhskwj9233503nnlwkq9";
        libraryHaskellDepends = [ base path ];
        description = "PathLike, FileLike and DirLike type classes for the Path library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-pieces" = callPackage
@@ -193536,8 +194435,8 @@ self: {
        libraryHaskellDepends = [ base text time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "Components of paths";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "path-text-utf8" = callPackage
@@ -193550,7 +194449,7 @@ self: {
          base bytestring path safe-exceptions text
        ];
        description = "Read and write UTF-8 text files";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "path-utils" = callPackage
@@ -193561,7 +194460,7 @@ self: {
        sha256 = "0k6wfy8vzddfhxsd5zlbjd4397syqhdg6i8v49d218m0qqfhzkpj";
        libraryHaskellDepends = [ base exceptions path split text ];
        description = "Handful of simple utility functions for the path library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pathfinding" = callPackage
@@ -193572,7 +194471,7 @@ self: {
        sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80";
        libraryHaskellDepends = [ base containers ];
        description = "pathfinding in grid and graphs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pathfindingcore" = callPackage
@@ -193590,8 +194489,8 @@ self: {
          array base-noprelude bizzlelude tasty tasty-hunit
        ];
        description = "A toy pathfinding library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193603,7 +194502,7 @@ self: {
        sha256 = "04877061vp9fv5qd0cdazmn8dd1l0zsqpxvw1awvbzjyfzl31k1y";
        libraryHaskellDepends = [ base bytestring random ];
        description = "Pathological ByteStrings for testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paths" = callPackage
@@ -193621,7 +194520,7 @@ self: {
          time
        ];
        description = "Library for representing and manipulating type-safe file paths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pathtype" = callPackage
@@ -193640,7 +194539,7 @@ self: {
        ];
        testHaskellDepends = [ base random ];
        description = "Type-safe replacement for System.FilePath etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pathwalk" = callPackage
@@ -193652,7 +194551,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath transformers ];
        testHaskellDepends = [ base ];
        description = "Path walking utilities for Haskell programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "patience" = callPackage
@@ -193663,7 +194562,7 @@ self: {
        sha256 = "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i";
        libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "patronscraper" = callPackage
@@ -193676,8 +194575,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HandsomeSoup hxt ];
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193689,7 +194588,7 @@ self: {
        sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
        libraryHaskellDepends = [ base mtl ];
        description = "Arrows for Pretty Printing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pattern-matcher" = callPackage
@@ -193701,7 +194600,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers mtl QuickCheck ];
        description = "A library for compiling pattern-matching to decision trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pattern-trie" = callPackage
@@ -193725,7 +194624,7 @@ self: {
          base bytestring containers criterion deepseq hashable text
        ];
        description = "Pattern tries";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "patterns" = callPackage
@@ -193742,7 +194641,7 @@ self: {
        ];
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193756,7 +194655,7 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        description = "Greatest convex majorants and least concave minorants";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "paymill" = callPackage
@@ -193768,7 +194667,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "This is an unofficial client for the Paymill API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paypal-adaptive-hoops" = callPackage
@@ -193792,8 +194691,8 @@ self: {
          test-framework-hunit text
        ];
        description = "Client for a limited part of PayPal's Adaptive Payments API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193810,8 +194709,8 @@ self: {
          mtl old-locale text time wai
        ];
        description = "PayPal API, currently supporting \"ButtonManager\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193828,8 +194727,8 @@ self: {
          http-types lens safe text time wreq
        ];
        description = "A client to connect to PayPal's REST API (v1)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193845,8 +194744,8 @@ self: {
          base containers HTTP network process
        ];
        description = "pastebin command line application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193866,8 +194765,8 @@ self: {
        ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Utility CLI for working with protobuf files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193879,8 +194778,8 @@ self: {
        sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9";
        libraryHaskellDepends = [ base hslua string-qq ];
        description = "pbc for HsLua";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193899,7 +194798,7 @@ self: {
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
        description = "Haskell implementation of the PBKDF functions from RFC-2898";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcap" = callPackage
@@ -193910,7 +194809,7 @@ self: {
        sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
        libraryHaskellDepends = [ base bytestring network time ];
        description = "A system-independent interface for user-level packet capture";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcap-conduit" = callPackage
@@ -193923,7 +194822,7 @@ self: {
          base bytestring conduit pcap transformers
        ];
        description = "Conduit <-> libpcap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcap-enumerator" = callPackage
@@ -193937,8 +194836,8 @@ self: {
          base bytestring enumerator pcap transformers
        ];
        description = "Convert a pcap into an enumerator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193968,8 +194867,8 @@ self: {
          genvalidity-property hspec hspec-core lens QuickCheck resourcet
          text unliftio-core validity
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193994,8 +194893,8 @@ self: {
          test-framework-hunit text vector
        ];
        description = "PCD file loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194013,8 +194912,8 @@ self: {
          transformers void
        ];
        description = "A one file compiler for PCF";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194029,8 +194928,8 @@ self: {
          base binary bytestring containers vector zlib
        ];
        description = "PCF font parsing and rendering library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194046,8 +194945,8 @@ self: {
          base bytestring pcf-font template-haskell vector
        ];
        description = "Template Haskell for embedding text rendered using PCF fonts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194065,7 +194964,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Haskell bindings to the PCG random number generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcgen" = callPackage
@@ -194080,7 +194979,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck random ];
        benchmarkHaskellDepends = [ base criterion deepseq random ];
        description = "A fast, pseudorandom number generator";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pcre-heavy" = callPackage
@@ -194099,7 +194998,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A regexp (regex) library on top of pcre-light you can actually use";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "pcre-less" = callPackage
@@ -194110,7 +195009,7 @@ self: {
        sha256 = "1widnpz4r2az96lwxrq21vm21j9j7b4sn86kqn2iih3xs2dpwqf9";
        libraryHaskellDepends = [ array base regex-pcre ];
        description = "Nicer interface to regex-pcre";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcre-light" = callPackage
@@ -194123,7 +195022,7 @@ self: {
        librarySystemDepends = [ pcre ];
        testHaskellDepends = [ base bytestring containers HUnit mtl ];
        description = "Portable regex library for Perl 5 compatible regular expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) pcre;};
 
   "pcre-light-extra" = callPackage
@@ -194134,8 +195033,8 @@ self: {
        sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx";
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "pcre-light extra functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194152,7 +195051,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ];
        description = "Perl-like substitute and split for PCRE regexps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcre2" = callPackage
@@ -194162,8 +195061,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcre2";
-       version = "1.1.3.1";
-       sha256 = "1gm9dd2b2vsx24i3am66ml5xx951994h06p20b7fi22g8xh66hh2";
+       version = "1.1.4";
+       sha256 = "0wrw2slmkxxmw3zx85f9xv8374fsvhxsyf1l149fvkaqnvf19bs2";
        libraryHaskellDepends = [
          base containers mtl template-haskell text
        ];
@@ -194175,7 +195074,7 @@ self: {
          regex-pcre-builtin template-haskell text
        ];
        description = "Regular expressions via the PCRE2 C library (included)";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pdf-slave" = callPackage
@@ -194200,8 +195099,8 @@ self: {
          shelly system-filepath text transformers yaml
        ];
        description = "Tool to generate PDF from haskintex templates and YAML input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194235,8 +195134,8 @@ self: {
          base lens optparse-applicative text wai-extra warp
        ];
        description = "Web service for pdf-slave tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pdf-slave-server-api = null;};
 
@@ -194252,8 +195151,8 @@ self: {
          aeson base base64-bytestring bytestring containers text
        ];
        description = "Template format definition for pdf-slave tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194270,8 +195169,8 @@ self: {
          pdf-toolbox-core text
        ];
        description = "A collection of tools for processing PDF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194288,8 +195187,8 @@ self: {
          transformers zlib-bindings
        ];
        description = "A collection of tools for processing PDF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194308,8 +195207,8 @@ self: {
          transformers
        ];
        description = "A collection of tools for processing PDF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194330,8 +195229,8 @@ self: {
          transformers
        ];
        description = "Simple pdf viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194364,7 +195263,7 @@ self: {
          base mtl old-locale process-extras text time time-locale-compat
        ];
        description = "Wrapper around the pdfinfo command";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pdfname" = callPackage
@@ -194381,8 +195280,8 @@ self: {
          base directory filepath optparse-applicative pdfinfo text
        ];
        description = "Name a PDF file using information from the pdfinfo command";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194398,8 +195297,8 @@ self: {
          base directory pdfinfo process temporary
        ];
        description = "split two-column PDFs, so there is one column per page";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194421,8 +195320,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        testToolDepends = [ hspec-discover ];
        description = "Extracts text from PDF using poppler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {poppler-cpp = null;};
 
@@ -194439,8 +195338,8 @@ self: {
          base directory filepath ghc ghc-paths old-time process
        ];
        description = "pdynload is polymorphic dynamic linking library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194456,8 +195355,8 @@ self: {
          base derive GLUT List template-haskell time TypeCompose
        ];
        description = "Experiemental library for composable interactive programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194472,7 +195371,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "peano-inf" = callPackage
@@ -194483,7 +195382,7 @@ self: {
        sha256 = "1w8rvlckqcy41ciq2csb2nf83l969nwvvrrlm0x1yzf5i6ibg33b";
        libraryHaskellDepends = [ base containers lazysmallcheck ];
        description = "Lazy Peano numbers including observable infinity value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pec" = callPackage
@@ -194507,8 +195406,8 @@ self: {
          old-time process shake syb uniplate wl-pprint
        ];
        description = "pec embedded compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194521,8 +195420,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194543,8 +195442,8 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "An implementation of Pedersen commitment schemes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194558,8 +195457,8 @@ self: {
        editedCabalFile = "1434n6ncyyryjqzn3xcg73nwvcr6si7cnf2k8g2qrp0xmrq0nx8b";
        libraryHaskellDepends = [ array base binary containers ];
        description = "A pedestrian implementation of directed acyclic graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194577,8 +195476,8 @@ self: {
          base containers filepath haskeline logict mtl parsec
        ];
        description = "a lazy non-deterministic concatenative programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194597,8 +195496,8 @@ self: {
          template-haskell
        ];
        description = "The Parser Generator for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194616,8 +195515,8 @@ self: {
          QuickCheck
        ];
        description = "Package to solve the Generalized Pell Equation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194636,7 +195535,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Privacy Enhanced Mail (PEM) format reader and writer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pencil" = callPackage
@@ -194659,8 +195558,8 @@ self: {
          base doctest mtl text unordered-containers
        ];
        description = "Static site generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194672,7 +195571,7 @@ self: {
        sha256 = "12c5bzn3ac8783lny56n7rd8a1ik4ayfm1pr5v7gm7z53f7iz0qy";
        libraryHaskellDepends = [ base containers parsec ];
        description = "Tools for manipulating the Penn TreeBank";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "penntreebank-megaparsec" = callPackage
@@ -194692,8 +195591,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Parser combinators for trees in the Penn Treebank format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194722,8 +195621,8 @@ self: {
          tasty tasty-quickcheck text time transformers
        ];
        description = "Extensible double-entry accounting system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194742,8 +195641,8 @@ self: {
          pretty-show semigroups text transformers
        ];
        description = "Deprecated - use penny package instead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194765,8 +195664,8 @@ self: {
          pretty-show rainbow semigroups split text time transformers
        ];
        description = "Deprecated - use penny package instead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194802,8 +195701,8 @@ self: {
          tasty-hunit tasty-quickcheck tasty-smallcheck text uuid websockets
        ];
        description = "Create beautiful diagrams just by typing mathematical notation in plain text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194815,8 +195714,8 @@ self: {
        sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54";
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
        description = "A parser for PE object files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194836,8 +195735,8 @@ self: {
          base bytestring criterion network-uri
        ];
        description = "Percent encode/decode ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194850,7 +195749,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base leancheck ];
        description = "simple printf-style string formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "perceptron" = callPackage
@@ -194861,8 +195760,8 @@ self: {
        sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78";
        libraryHaskellDepends = [ base ];
        description = "The perceptron learning algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194890,8 +195789,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq filepath ];
        benchmarkToolDepends = [ cpphs ];
        description = "Find duplicate images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194921,7 +195820,7 @@ self: {
        ];
        description = "Robust persistence for acyclic immutable data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "peregrin" = callPackage
@@ -194938,8 +195837,8 @@ self: {
          transformers
        ];
        description = "Database migration support for use in other libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194956,8 +195855,8 @@ self: {
        ];
        testHaskellDepends = [ base deepseq doctest rdtsc ];
        description = "Low-level run time measurement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194980,8 +195879,8 @@ self: {
          text vector
        ];
        description = "analysis example using perf";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195011,7 +195910,7 @@ self: {
          vector
        ];
        description = "Perfect minimal hashing implementation in native Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "perfect-vector-shuffle" = callPackage
@@ -195037,7 +195936,7 @@ self: {
          vector
        ];
        description = "Library for performing vector shuffles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "perfecthash" = callPackage
@@ -195060,8 +195959,8 @@ self: {
          unordered-containers
        ];
        description = "A perfect hashing library for mapping bytestrings to values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195079,8 +195978,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Perhaps, a monad";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195102,7 +196001,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit text time ];
        description = "Parse and format date periods, collapse and expand their text representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic" = callPackage
@@ -195117,8 +196016,8 @@ self: {
        executableHaskellDepends = [ base cereal hedis text time ];
        testHaskellDepends = [ base cereal hedis hspec text time ];
        description = "A reliable at-least-once periodic job scheduler backed by redis";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195136,7 +196035,7 @@ self: {
          periodic-common resource-pool transformers unliftio
        ];
        description = "Periodic task system haskell client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic-client-exe" = callPackage
@@ -195160,7 +196059,7 @@ self: {
          streaming-commons text unix-time unliftio warp websockets
        ];
        description = "Periodic task system haskell client executables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic-common" = callPackage
@@ -195176,7 +196075,7 @@ self: {
          text unliftio vector
        ];
        description = "Periodic task system common";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic-polynomials" = callPackage
@@ -195187,7 +196086,7 @@ self: {
        sha256 = "1y7hj8cjdy5zpp7sg7yfaafcid7ssf23g4az6fwk2hrcrk97sf2i";
        libraryHaskellDepends = [ base vector ];
        description = "A library for working with periodic polynomials (very basic functionality)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "periodic-server" = callPackage
@@ -195216,8 +196115,8 @@ self: {
          unliftio
        ];
        description = "Periodic task system haskell server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195234,8 +196133,8 @@ self: {
          base HUnit mtl test-framework test-framework-hunit
        ];
        description = "permutation Applicative and Monad with many mtl instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195250,8 +196149,8 @@ self: {
        setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        description = "A library for permutations and combinations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195275,8 +196174,8 @@ self: {
          tasty-smallcheck universe-base
        ];
        description = "Permutations of finite sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195288,8 +196187,8 @@ self: {
        sha256 = "03g1d9h26f1id0pnaigy9xy1cv5pvzqcjrwgzn75xnnbm5c3y9ch";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195307,7 +196206,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Minimal serialization library with focus on performance";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persist-state" = callPackage
@@ -195326,7 +196225,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Serialization library with state and leb128 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persist2er" = callPackage
@@ -195341,8 +196240,8 @@ self: {
          base optparse-applicative persistent text
        ];
        description = "Transforms persist's quasi-quoted syntax into ER format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195363,7 +196262,7 @@ self: {
        ];
        testHaskellDepends = [ base quickcheck-simple ];
        description = "Binding between SQL database values and haskell records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
@@ -195383,7 +196282,7 @@ self: {
          base relational-query relational-query-HDBC text-postgresql
        ];
        description = "HDBC and Relational-Record instances of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent" = callPackage
@@ -195410,8 +196309,8 @@ self: {
          text time transformers unordered-containers vector
        ];
        description = "Type-safe, multi-backend data serialization";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-audit" = callPackage
@@ -195440,8 +196339,8 @@ self: {
          persistent-sqlite persistent-template text time transformers
        ];
        description = "Parses a Persist Model file and produces Audit Models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195453,8 +196352,8 @@ self: {
        sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f";
        libraryHaskellDepends = [ base cereal persistent text ];
        description = "Helper functions for writing Persistent instances";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195474,8 +196373,8 @@ self: {
          base bytestring hspec persistent-postgresql text
        ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195496,7 +196395,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Documentation DSL for persistent entities";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "persistent-equivalence" = callPackage
@@ -195507,8 +196406,8 @@ self: {
        sha256 = "14nn01bbwskllbccgcnwnjwzyws6vppqv4l51n6pcvhwbphn18qz";
        libraryHaskellDepends = [ array base diffarray ];
        description = "Persistent equivalence relations (aka union-find)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195520,7 +196419,7 @@ self: {
        sha256 = "1a9h7dfj9v47di4pwg3fwzwa550fh8wj2ri1w2kd8xbw9xym5kqk";
        libraryHaskellDepends = [ base persistent text ];
        description = "Derive Persistent classes generically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-hssqlppp" = callPackage
@@ -195536,8 +196435,8 @@ self: {
          persistent-template template-haskell text th-lift
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195549,7 +196448,7 @@ self: {
        sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn";
        libraryHaskellDepends = [ base bytestring iproute persistent ];
        description = "Persistent instances for types in iproute";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-iproute" = callPackage
@@ -195565,7 +196464,7 @@ self: {
          path-pieces persistent text
        ];
        description = "Persistent instances for types in iproute";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-map" = callPackage
@@ -195582,7 +196481,7 @@ self: {
        ];
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195607,8 +196506,8 @@ self: {
          temporary text time yaml
        ];
        description = "Manual migrations for the persistent library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195636,8 +196535,8 @@ self: {
          unliftio-core
        ];
        description = "Backend for the persistent library using mongoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195663,7 +196562,7 @@ self: {
          unliftio
        ];
        description = "Monad transformer for the persistent API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -195689,7 +196588,7 @@ self: {
          unliftio-core
        ];
        description = "Backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
@@ -195721,8 +196620,8 @@ self: {
          unliftio-core
        ];
        description = "A pure haskell backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195743,7 +196642,9 @@ self: {
          transformers
        ];
        description = "Backend for the persistent library using ODBC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-pagination" = callPackage
@@ -195764,7 +196665,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Efficient and correct pagination for persistent or esqueleto queries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-parser" = callPackage
@@ -195776,7 +196677,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
        description = "Parse persistent model files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-postgresql" = callPackage
@@ -195806,7 +196707,7 @@ self: {
          vector
        ];
        description = "Backend for the persistent library using postgresql";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-protobuf" = callPackage
@@ -195822,8 +196723,8 @@ self: {
          protocol-buffers-descriptor template-haskell text
        ];
        description = "Template-Haskell helpers for integrating protobufs with persistent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195846,7 +196747,7 @@ self: {
          resourcet template-haskell text unliftio
        ];
        description = "Provides a quasi-quoter for raw SQL for persistent";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-ratelimit" = callPackage
@@ -195857,8 +196758,8 @@ self: {
        sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m";
        libraryHaskellDepends = [ base time yesod ];
        description = "A library for rate limiting activities with a persistent backend";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195882,7 +196783,7 @@ self: {
          time transformers utf8-string
        ];
        description = "Backend for persistent library using Redis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-refs" = callPackage
@@ -195895,7 +196796,7 @@ self: {
          base containers mtl ref-fd transformers
        ];
        description = "Haskell references backed by an IntMap for persistence and reversibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-relational-record" = callPackage
@@ -195918,8 +196819,8 @@ self: {
          test-framework test-framework-hunit test-framework-th text time
        ];
        description = "relational-record on persisten backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195940,7 +196841,7 @@ self: {
          aeson base hspec http-api-data persistent QuickCheck text
        ];
        description = "Database agnostic, spatially indexed type for geographic points";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-sqlite" = callPackage
@@ -195971,8 +196872,8 @@ self: {
          time transformers unliftio-core
        ];
        description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
   "persistent-template" = callPackage
@@ -195999,8 +196900,8 @@ self: {
          template-haskell text
        ];
        description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-template-classy" = callPackage
@@ -196020,8 +196921,8 @@ self: {
          template-haskell text
        ];
        description = "Generate classy lens field accessors for persistent models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196045,8 +196946,8 @@ self: {
          transformers-base unliftio unliftio-core unordered-containers
        ];
        description = "Tests for Persistent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196071,7 +196972,7 @@ self: {
          resource-pool resourcet template-haskell text transformers
        ];
        description = "Type safe access to multiple database schemata";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-vector" = callPackage
@@ -196088,8 +196989,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "A persistent sequence based on array mapped tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196119,8 +197020,8 @@ self: {
          utf8-string
        ];
        description = "Backend for persistent library using Zookeeper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196137,8 +197038,8 @@ self: {
          unordered-containers
        ];
        description = "Persona (BrowserID) library";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196160,8 +197061,8 @@ self: {
          pem persona scotty shakespeare text time transformers unix wai x509
        ];
        description = "Persona (BrowserID) Identity Provider";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196177,7 +197078,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196204,8 +197105,8 @@ self: {
          x509-store
        ];
        description = "Pretty Easy YOshikuni-made TLS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196223,8 +197124,8 @@ self: {
          crypto-pubkey-types monads-tf word24 x509 x509-store
        ];
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196241,8 +197142,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A Pretty Extraordinary Zipper library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196259,8 +197160,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit text ];
        description = "PostgreSQL database performance insights";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196280,8 +197181,8 @@ self: {
          async base ini postgresql-simple random scotty text transformers
        ];
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196293,7 +197194,7 @@ self: {
        sha256 = "06gqra5q20sc13slh5vz95bi1vq0ai43qfh7npcyv258zwv40qnh";
        libraryHaskellDepends = [ base bytestring HTTP ];
        description = "Client library for pg-harness-server";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "pg-harness-server" = callPackage
@@ -196312,8 +197213,8 @@ self: {
          warp
        ];
        description = "REST service for creating temporary PostgreSQL databases";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196339,8 +197240,8 @@ self: {
          resource-pool
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196364,8 +197265,8 @@ self: {
          test-framework test-framework-quickcheck2 text
        ];
        description = "Simple storage interface to PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196387,8 +197288,8 @@ self: {
          postgresql-libpq postgresql-simple tmp-postgres
        ];
        description = "A postgresql-simple transaction monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196414,8 +197315,8 @@ self: {
          tagsoup text time transformers unix vector vty
        ];
        description = "browse directory listing webpages and download files from them";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196428,8 +197329,8 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        librarySystemDepends = [ gu pgf ];
        description = "Bindings to the C version of the PGF runtime";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gu = null; inherit (pkgs) pgf;};
 
@@ -196441,7 +197342,7 @@ self: {
        sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
        libraryHaskellDepends = [ array base bytestring parsec ];
        description = "Pure Haskell implementation of PGM image format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pgp-wordlist" = callPackage
@@ -196458,7 +197359,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Translate between binary data and a human-readable collection of words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pgsql-simple" = callPackage
@@ -196477,8 +197378,8 @@ self: {
          network old-locale pcre-light text time utf8-string
        ];
        description = "A mid-level PostgreSQL client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196503,8 +197404,8 @@ self: {
          uuid vector
        ];
        description = "Streaming Postgres bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196517,7 +197418,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Phantom State Transformer. Like State Monad, but without values.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "phasechange" = callPackage
@@ -196531,8 +197432,8 @@ self: {
          array base ghc-prim monad-st primitive vector
        ];
        description = "Freezing, thawing, and copy elision";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196547,8 +197448,8 @@ self: {
          base bytestring containers QuickCheck text
        ];
        description = "Incremental multiple pass parser library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196567,7 +197468,7 @@ self: {
        ];
        testSystemDepends = [ pHash ];
        description = "Haskell bindings to pHash, the open source perceptual hash library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {pHash = null;};
 
   "phizzle" = callPackage
@@ -196583,7 +197484,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Library for checking if a given link is in a phishtank json file";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "phoityne" = callPackage
@@ -196606,8 +197507,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196630,7 +197531,7 @@ self: {
          text transformers
        ];
        description = "Haskell Debug Adapter for Visual Studio Code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "phone-metadata" = callPackage
@@ -196644,7 +197545,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Phonenumber Metadata - NOTE: this is now deprecated!";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "phone-numbers" = callPackage
@@ -196658,8 +197559,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring ];
        description = "Haskell bindings to the libphonenumber library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {phonenumber = null; inherit (pkgs) protobuf;};
 
@@ -196677,8 +197578,8 @@ self: {
          HsOpenSSL http-conduit network time transformers
        ];
        description = "Push notifications for Android and iOS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196690,7 +197591,7 @@ self: {
        sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw";
        libraryHaskellDepends = [ array base containers regex-compat ];
        description = "Phonetic codes: Soundex and Phonix";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "phonetic-languages-common" = callPackage
@@ -196701,7 +197602,7 @@ self: {
        sha256 = "16m215rydybgn7wi5g3lh694z8zja2yr7b5p1rn33vgph2h5i8v7";
        libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "A generalization of the uniqueness-periods-vector-common package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-constaints" = callPackage
@@ -196712,7 +197613,7 @@ self: {
        sha256 = "17n4m9zbl1h6g76wxrqxc3wwcd0m5qjmbiakvmvbcdv7nffc8xyh";
        libraryHaskellDepends = [ base vector ];
        description = "Constraints to filter the needed permutations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-constraints" = callPackage
@@ -196723,7 +197624,7 @@ self: {
        sha256 = "11m389rpz7ddvmkf5wrasc41kmy67fki234fjcgi1djk8iawp5pw";
        libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "Constraints to filter the needed permutations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-constraints-array" = callPackage
@@ -196734,7 +197635,7 @@ self: {
        sha256 = "0mxn7xvggiii4cmpqmxx5mkk660z9q8s3n09kaqbmwszf5l86ynd";
        libraryHaskellDepends = [ base subG ];
        description = "Constraints to filter the needed permutations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-examples" = callPackage
@@ -196767,7 +197668,7 @@ self: {
          vector
        ];
        description = "A generalization of the uniqueness-periods-vector-examples functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-filters-array" = callPackage
@@ -196778,7 +197679,7 @@ self: {
        sha256 = "0gi2hbdzb62s0hvx9j8w936bwiypv6xvh5xndmx4w1kf8r2lkagy";
        libraryHaskellDepends = [ base filters-basic mmsyn2-array ];
        description = "Allows to change the structure of the function output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-general" = callPackage
@@ -196794,7 +197695,7 @@ self: {
          subG vector
        ];
        description = "A generalization of the uniqueness-periods-vector-general functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-permutations" = callPackage
@@ -196805,7 +197706,7 @@ self: {
        sha256 = "1y6izwnlphy528y6j4qg97pzi4nkw7j8vnlp63brnil9wd5765wa";
        libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "Commonly used versions of the phonetic-languages-common package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-permutations-array" = callPackage
@@ -196816,7 +197717,7 @@ self: {
        sha256 = "1r8fwdphn3h9zpbrdbbgmqjwv6gwcl205ahr3kqwz6sfg78bflj4";
        libraryHaskellDepends = [ base subG ];
        description = "Permutations and universal set related functions for the phonetic-languages series";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-plus" = callPackage
@@ -196835,7 +197736,7 @@ self: {
          uniqueness-periods-vector-stats
        ];
        description = "Some common shared between different packages functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-properties" = callPackage
@@ -196852,7 +197753,7 @@ self: {
          phonetic-languages-vector ukrainian-phonetics-basic vector
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-rhythmicity" = callPackage
@@ -196863,7 +197764,7 @@ self: {
        sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3";
        libraryHaskellDepends = [ base ];
        description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-base" = callPackage
@@ -196877,7 +197778,7 @@ self: {
          base phonetic-languages-permutations-array subG
        ];
        description = "A simplified version of the phonetic-languages functionality common for some different realizations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-common" = callPackage
@@ -196892,7 +197793,70 @@ self: {
          base phonetic-languages-permutations subG subG-instances vector
        ];
        description = "A simplified version of the phonetic-languages-functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+     }) {};
+
+  "phonetic-languages-simplified-examples-array" = callPackage
+    ({ mkDerivation, base, heaps, mmsyn2-array, parallel
+     , phonetic-languages-constraints-array
+     , phonetic-languages-filters-array
+     , phonetic-languages-permutations-array, phonetic-languages-plus
+     , phonetic-languages-rhythmicity
+     , phonetic-languages-simplified-base
+     , phonetic-languages-simplified-examples-common
+     , phonetic-languages-simplified-properties-array
+     , phonetic-languages-ukrainian-array, print-info, subG
+     , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-simplified-examples-array";
+       version = "0.2.2.0";
+       sha256 = "1b8i9kgybidiczlpwyb2grgkxgyscdnldfpj75snwnpyyw40qlfs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base heaps mmsyn2-array parallel
+         phonetic-languages-constraints-array
+         phonetic-languages-filters-array
+         phonetic-languages-permutations-array phonetic-languages-plus
+         phonetic-languages-rhythmicity phonetic-languages-simplified-base
+         phonetic-languages-simplified-examples-common
+         phonetic-languages-simplified-properties-array
+         phonetic-languages-ukrainian-array subG
+         ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
+       ];
+       executableHaskellDepends = [
+         base heaps mmsyn2-array parallel
+         phonetic-languages-constraints-array
+         phonetic-languages-filters-array
+         phonetic-languages-permutations-array phonetic-languages-plus
+         phonetic-languages-rhythmicity phonetic-languages-simplified-base
+         phonetic-languages-simplified-examples-common
+         phonetic-languages-simplified-properties-array
+         phonetic-languages-ukrainian-array print-info subG
+         ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
+       ];
+       description = "Helps to create Ukrainian texts with the given phonetic properties";
+       license = lib.licenses.mit;
+     }) {};
+
+  "phonetic-languages-simplified-examples-common" = callPackage
+    ({ mkDerivation, base, heaps, mmsyn2-array
+     , phonetic-languages-constraints-array
+     , phonetic-languages-ukrainian-array, subG
+     , ukrainian-phonetics-basic-array
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-simplified-examples-common";
+       version = "0.1.1.0";
+       sha256 = "09h63czjpab863gi7806k1yw4q9mykszvvnb3zwbv9i97nfbvnfa";
+       libraryHaskellDepends = [
+         base heaps mmsyn2-array phonetic-languages-constraints-array
+         phonetic-languages-ukrainian-array subG
+         ukrainian-phonetics-basic-array
+       ];
+       description = "Some commonly used by phonetic-languages-simplified* series functions";
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-lists-examples" = callPackage
@@ -196926,7 +197890,7 @@ self: {
          uniqueness-periods-vector-stats vector
        ];
        description = "Simplified and somewhat optimized version of the phonetic-languages-examples";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-properties-array" = callPackage
@@ -196936,14 +197900,14 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-properties-array";
-       version = "0.1.0.0";
-       sha256 = "0p072ydixsfi5ps45qi147gd5lsahpykw27ar8n5zb6sihsvklzp";
+       version = "0.1.1.0";
+       sha256 = "0ildphgb5dd2s5hc4nr7ii9q9dzm0qa7vc2j4yjcis72jjzjx6nd";
        libraryHaskellDepends = [
          base phonetic-languages-rhythmicity
          phonetic-languages-simplified-base ukrainian-phonetics-basic-array
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-properties-lists" = callPackage
@@ -196961,7 +197925,7 @@ self: {
          vector
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-properties-lists-double" = callPackage
@@ -196979,7 +197943,7 @@ self: {
          vector
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-ukrainian" = callPackage
@@ -196990,7 +197954,7 @@ self: {
        sha256 = "1z9frcwvy9njq1flk3hd2n4z8l4ad7f248w8h1pgjl1fbz6fv9dc";
        libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ];
        description = "Prepares Ukrainian text to be used as a phonetic language text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-ukrainian-array" = callPackage
@@ -197001,7 +197965,7 @@ self: {
        sha256 = "0h88qcdkckgn5cjyjiwvdxci8p04h12xr6jj5pjp4wzqyp6a5wcf";
        libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ];
        description = "Prepares Ukrainian text to be used as a phonetic language text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-vector" = callPackage
@@ -197012,7 +197976,7 @@ self: {
        sha256 = "12mhmrfpdkxl00yfvy5jc74c7xnrj10pcydnn3xdhzj0fvp1zrll";
        libraryHaskellDepends = [ base vector ];
        description = "A generalization of the functionality of the uniqueness-periods-vector package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phooey" = callPackage
@@ -197027,8 +197991,8 @@ self: {
          array base mtl reactive TypeCompose wx wxcore
        ];
        description = "Functional user interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197050,8 +198014,8 @@ self: {
          regex-posix time unix
        ];
        description = "Rename photo image files based on EXIF shoot date";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197065,8 +198029,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl SDL transformers ];
        description = "A fractal viewer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197099,8 +198063,8 @@ self: {
          vector
        ];
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197112,7 +198076,7 @@ self: {
        sha256 = "07ysi2xq73g29pv4c3zvwq9zf1yjl2aszb1zkim49n00f5bxfnqc";
        libraryHaskellDepends = [ base ];
        description = "dimensions, quantities and constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pi-calculus" = callPackage
@@ -197132,8 +198096,8 @@ self: {
          io-streams mtl network parsec RSA transformers
        ];
        description = "Applied pi-calculus interpreter";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197157,8 +198121,8 @@ self: {
          QuickCheck transformers unbound-generics
        ];
        description = "Demo implementation of typechecker for dependently-typed language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197184,8 +198148,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Lightweight access control solution for the pijul vcs";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197207,7 +198171,7 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Control an Adafruit character LCD and keypad kit on a Raspberry Pi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pia-forward" = callPackage
@@ -197227,8 +198191,8 @@ self: {
          xdg-basedir
        ];
        description = "Set up port forwarding with the Private Internet Access VPN service";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197251,8 +198215,8 @@ self: {
          base containers errors filepath network streams text transformers
        ];
        description = "Remotely controlling Java Swing applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197267,8 +198231,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix JuicyPixels vector ];
        executableHaskellDepends = [ base cli hmatrix ];
        description = "simple image manipulation functions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197280,8 +198244,8 @@ self: {
        sha256 = "13c1n06v6mh9lyplfg0y1gdijk2mhxg4ln59v7i2z4j1y65y8cz9";
        libraryHaskellDepends = [ base containers network stm text ];
        description = "Instant StatsD in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197304,8 +198268,8 @@ self: {
          base containers mtl picosat pretty QuickCheck
        ];
        description = "Utilities for symbolic predicate logic expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197338,8 +198302,8 @@ self: {
          parsec scientific text unordered-containers vector
        ];
        description = "Fast combinator parsing for bytestrings and text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197352,7 +198316,7 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [ base containers random rdtsc transformers ];
        description = "Bindings to the PicoSAT solver";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pictikz" = callPackage
@@ -197365,8 +198329,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base matrix transformers xml ];
        description = "Converts a svg image to tikz code";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197383,7 +198347,7 @@ self: {
        libraryHaskellDepends = [ base directory process unix ];
        executableHaskellDepends = [ base ];
        description = "Do signal handling and orphan reaping for Unix PID1 init processes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pidfile" = callPackage
@@ -197394,7 +198358,7 @@ self: {
        sha256 = "0z0k923gb0b01r35x1qp4i1743mcn84cj3m12ss7jbxql768jigf";
        libraryHaskellDepends = [ base unix ];
        description = "Run an IO action protected by a pidfile";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pier" = callPackage
@@ -197414,8 +198378,8 @@ self: {
          transformers unordered-containers yaml
        ];
        description = "Yet another Haskell build system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197435,8 +198399,8 @@ self: {
          http-types process shake temporary text unix
        ];
        description = "A library for writing forwards-declared build systems in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197450,8 +198414,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197468,8 +198432,8 @@ self: {
          base containers random random-shuffle
        ];
        description = "dice game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197484,7 +198448,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl parsec text ];
        description = "Yet another text-to-html converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pinboard" = callPackage
@@ -197508,8 +198472,8 @@ self: {
          text time transformers unliftio unliftio-core unordered-containers
        ];
        description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197530,35 +198494,55 @@ self: {
          transformers
        ];
        description = "Back up the notes you've saved to Pinboard";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "pinch" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups
-     , text, unordered-containers, vector
+    ({ mkDerivation, array, async, base, bytestring, cereal, containers
+     , deepseq, ghc-prim, hashable, hspec, hspec-discover, network
+     , network-run, QuickCheck, semigroups, text, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "pinch";
-       version = "0.3.5.0";
-       sha256 = "0bw7pfywa9qr6mrs340znqgzhg9yy8brh6v833wvk87sxjs8psdv";
-       revision = "1";
-       editedCabalFile = "1pl6cymb93lpjqsll87y7avwrw2w5k237gyyhqr05yfcsrjky8rp";
+       version = "0.4.0.0";
+       sha256 = "0xn79n8r42wl48fkbbplyhj4ykfky7kzzj96qb8qn0w1f70pi3i2";
        libraryHaskellDepends = [
-         array base bytestring containers deepseq ghc-prim hashable
-         semigroups text unordered-containers vector
+         array base bytestring cereal containers deepseq ghc-prim hashable
+         network semigroups text unordered-containers vector
        ];
        libraryToolDepends = [ hspec-discover ];
        testHaskellDepends = [
-         base bytestring containers hspec QuickCheck semigroups text
-         unordered-containers vector
+         async base bytestring cereal containers hspec network network-run
+         QuickCheck semigroups text unordered-containers vector
        ];
        testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "pinch-gen" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , language-thrift, megaparsec, mtl, optparse-applicative
+     , prettyprinter, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pinch-gen";
+       version = "0.4.0.0";
+       sha256 = "03fpcy2mdq83mpx4hv6x57csdwd07pkqcfqc0wd10zys77i75s46";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory filepath language-thrift megaparsec mtl
+         optparse-applicative prettyprinter text unordered-containers
+       ];
+       description = "A code generator for the pinch Thrift library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197577,8 +198561,8 @@ self: {
          transformers
        ];
        description = "Write grammars, not parsers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197602,7 +198586,7 @@ self: {
          base containers linear mtl sdl2 sdl2-image stm text
        ];
        description = "Functional 2D Game Framework";
-       license = stdenv.lib.licenses.zlib;
+       license = lib.licenses.zlib;
      }) {};
 
   "ping" = callPackage
@@ -197620,8 +198604,8 @@ self: {
          stm transformers
        ];
        description = "icmp echo requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197643,7 +198627,7 @@ self: {
          attoparsec base hspec iproute QuickCheck quickcheck-text
        ];
        description = "Attoparsec parsers of ping utility";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ping-wrapper" = callPackage
@@ -197666,7 +198650,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Haskell Ping wrapper";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pinpon" = callPackage
@@ -197700,8 +198684,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest protolude ];
        description = "A gateway for various cloud notification services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197713,8 +198697,8 @@ self: {
        sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc";
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        description = "A bidirectional bridge between pipes and iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197731,7 +198715,7 @@ self: {
          base bytestring editor-open Hclip safe
        ];
        description = "Open your editor, pipe the output to the system clipboard";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "piped" = callPackage
@@ -197752,7 +198736,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Conduit with a smaller core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipeline" = callPackage
@@ -197763,7 +198747,7 @@ self: {
        sha256 = "1bz7pfyfgc1cps5pwy31m5z3r6kxi5c4661qa60q333y0rd2y2j1";
        libraryHaskellDepends = [ base transformers ];
        description = "Continuation patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes" = callPackage
@@ -197786,7 +198770,7 @@ self: {
          base criterion mtl optparse-applicative transformers
        ];
        description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -197802,7 +198786,7 @@ self: {
          pipes-bytestring pipes-parse transformers
        ];
        description = "Encode and decode JSON streams using Aeson and Pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-async" = callPackage
@@ -197822,8 +198806,8 @@ self: {
          stm transformers-base
        ];
        description = "A higher-level interface to using concurrency with pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197843,7 +198827,7 @@ self: {
          text transformers
        ];
        description = "Attoparsec and Pipes integration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-attoparsec-streaming" = callPackage
@@ -197863,8 +198847,8 @@ self: {
          attoparsec base bytestring pipes-core transformers
        ];
        description = "Streaming parsing in the pipes-core framework with Attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197880,8 +198864,8 @@ self: {
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197903,7 +198887,7 @@ self: {
          smallcheck tasty tasty-hunit tasty-smallcheck transformers
        ];
        description = "Encode and decode binary streams using the pipes and binary libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-break" = callPackage
@@ -197919,7 +198903,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring mtl pipes QuickCheck ];
        description = "Pipes to group by any delimiter (such as lines with carriage returns)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-brotli" = callPackage
@@ -197935,8 +198919,8 @@ self: {
          base bytestring pipes pipes-bytestring QuickCheck
        ];
        description = "Brotli (RFC7932) compressors and decompressors for the Pipes package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197953,7 +198937,7 @@ self: {
          transformers
        ];
        description = "ByteString support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-bzip" = callPackage
@@ -197976,7 +198960,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base ];
        description = "Streaming compression/decompression via pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
@@ -197992,8 +198976,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cacophony pipes ];
        testHaskellDepends = [ base hlint ];
        description = "Pipes for Noise-secured network connections";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198008,7 +198992,7 @@ self: {
        libraryHaskellDepends = [ base lens mtl pipes pipes-extras ];
        testHaskellDepends = [ base hspec pipes transformers ];
        description = "Allows instances for Category, Arrow and ArrowChoice for Pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cborg" = callPackage
@@ -198029,7 +199013,7 @@ self: {
          tasty tasty-quickcheck transformers
        ];
        description = "Encode and decode cborg streams using the pipes and cborg libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cellular" = callPackage
@@ -198040,7 +199024,7 @@ self: {
        sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc";
        libraryHaskellDepends = [ base bytestring data-cell pipes ];
        description = "Pipes-based combinators for cellular data processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cellular-csv" = callPackage
@@ -198054,7 +199038,7 @@ self: {
          base bytestring data-cell pipes pipes-cellular
        ];
        description = "Efficient pipes-based cellular CSV codec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cereal" = callPackage
@@ -198069,8 +199053,8 @@ self: {
          base bytestring cereal mtl pipes pipes-bytestring pipes-parse
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198086,8 +199070,8 @@ self: {
          base bytestring cereal-plus errors mtl pipes pipes-bytestring text
        ];
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198105,7 +199089,7 @@ self: {
          async base bytestring pipes pipes-safe process stm unix
        ];
        description = "Streaming to and from subprocesses using Pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-concurrency" = callPackage
@@ -198123,7 +199107,7 @@ self: {
        ];
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-conduit" = callPackage
@@ -198134,8 +199118,8 @@ self: {
        sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8";
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
        description = "Conduit adapters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198151,8 +199135,8 @@ self: {
          base categories lifted-base monad-control transformers void
        ];
        description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198164,8 +199148,8 @@ self: {
        sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf";
        libraryHaskellDepends = [ base courier pipes ];
        description = "Pipes utilities for interfacing with the courier message-passing framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198187,7 +199171,7 @@ self: {
          test-framework test-framework-hunit vector
        ];
        description = "Fast, streaming csv parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-errors" = callPackage
@@ -198198,8 +199182,8 @@ self: {
        sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76";
        libraryHaskellDepends = [ base errors pipes ];
        description = "Integration between pipes and errors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198227,8 +199211,8 @@ self: {
          transformers zlib zlib-conduit zlib-enum
        ];
        description = "Various basic utilities for Pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198247,7 +199231,7 @@ self: {
          base HUnit pipes test-framework test-framework-hunit transformers
        ];
        description = "Extra utilities for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -198262,7 +199246,7 @@ self: {
          attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring
        ];
        description = "Streaming parsers for Fasta and Fastq";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-files" = callPackage
@@ -198289,8 +199273,8 @@ self: {
          text transformers unix
        ];
        description = "Fast traversal of directory trees using pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198313,7 +199297,7 @@ self: {
          mtl pipes pipes-concurrency pipes-misc stm transformers
        ];
        description = "Reactively combines Producers so that a value is yielded as soon as possible";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-group" = callPackage
@@ -198331,7 +199315,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-http" = callPackage
@@ -198348,7 +199332,7 @@ self: {
          base bytestring http-client http-client-tls pipes
        ];
        description = "HTTP client with pipes interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-illumina" = callPackage
@@ -198363,8 +199347,8 @@ self: {
          base bytestring directory filepath pipes pipes-bgzf
        ];
        description = "Illumina NGS data processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198378,7 +199362,7 @@ self: {
        editedCabalFile = "06vg9vlczmmlpvqnnwn12kyb9c741y50hl8ky0vvdlkwlb90zncq";
        libraryHaskellDepends = [ base containers heaps pipes ];
        description = "Interleave and merge streams of elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-io" = callPackage
@@ -198392,8 +199376,8 @@ self: {
        libraryHaskellDepends = [ base pipes pipes-parse ];
        testHaskellDepends = [ base hspec pipes ];
        description = "Stateful IO streams based on pipes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198411,7 +199395,7 @@ self: {
          pipes-safe text transformers transformers-base
        ];
        description = "Kafka in the Pipes ecosystem";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-key-value-csv" = callPackage
@@ -198434,8 +199418,8 @@ self: {
          QuickCheck reflection text transformers vinyl vinyl-utils
        ];
        description = "Streaming processing of CSV files preceded by key-value pairs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198452,7 +199436,7 @@ self: {
          base bytestring lens mtl pipes pipes-group QuickCheck
        ];
        description = "Pipes for grouping by lines with carriage returns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-lzma" = callPackage
@@ -198471,7 +199455,7 @@ self: {
          base bytestring pipes pipes-bytestring QuickCheck
        ];
        description = "LZMA compressors and decompressors for the Pipes package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-misc" = callPackage
@@ -198491,7 +199475,7 @@ self: {
          base hspec lens mmorph pipes pipes-concurrency stm transformers
        ];
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-mongodb" = callPackage
@@ -198503,8 +199487,8 @@ self: {
        libraryHaskellDepends = [ base monad-control mongoDB pipes ];
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
        description = "Stream results from MongoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198521,7 +199505,7 @@ self: {
          transformers
        ];
        description = "Use network sockets together with the pipes library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-network-tls" = callPackage
@@ -198538,7 +199522,7 @@ self: {
          pipes-network pipes-safe tls transformers
        ];
        description = "TLS-secured network connections support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-network-ws" = callPackage
@@ -198551,7 +199535,7 @@ self: {
          base bytestring network-simple-ws pipes
        ];
        description = "WebSockets support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-ordered-zip" = callPackage
@@ -198563,7 +199547,7 @@ self: {
        libraryHaskellDepends = [ base pipes pipes-safe ];
        testHaskellDepends = [ base foldl hspec pipes pipes-safe ];
        description = "merge two ordered Producers into a new Producer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-p2p" = callPackage
@@ -198580,8 +199564,8 @@ self: {
          network-simple-sockaddr pipes pipes-concurrency pipes-network
        ];
        description = "P2P network nodes with pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198600,8 +199584,8 @@ self: {
          network-simple-sockaddr pipes pipes-network pipes-p2p
        ];
        description = "Examples using pipes-p2p";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198613,7 +199597,7 @@ self: {
        sha256 = "1a87q6l610rhxr23qfzzzif3zpfjhw3mg5gfcyjwqac25hdq73yj";
        libraryHaskellDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-postgresql-simple" = callPackage
@@ -198630,7 +199614,7 @@ self: {
          pipes-safe postgresql-simple stm text transformers
        ];
        description = "Convert various postgresql-simple calls to work with pipes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-protolude" = callPackage
@@ -198652,8 +199636,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Alternate Prelude for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198665,7 +199649,7 @@ self: {
        sha256 = "1xsb0cxksrrkv81yk9qb7b3g7niz3sc7sz0960hxn16hwjymkv5k";
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        description = "Producers for handling randomness";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-rt" = callPackage
@@ -198679,8 +199663,8 @@ self: {
        libraryHaskellDepends = [ base mwc-random pipes time ];
        executableHaskellDepends = [ base pipes time ];
        description = "A few pipes to control the timing of yields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198703,8 +199687,8 @@ self: {
          QuickCheck tasty tasty-quickcheck text
        ];
        description = "A simple interface for streaming data to and from Amazon S3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198721,7 +199705,7 @@ self: {
          transformers transformers-base
        ];
        description = "Safety for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-shell" = callPackage
@@ -198741,8 +199725,8 @@ self: {
          pipes-safe process stm stm-chans text
        ];
        description = "Create proper Pipes from System.Process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198756,8 +199740,8 @@ self: {
          base pipes pipes-safe sqlite-simple text
        ];
        description = "Functions that smash Pipes and sqlite-simple together";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198775,7 +199759,7 @@ self: {
          pipes-safe streaming-commons text transformers
        ];
        description = "properly streaming text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -198798,8 +199782,8 @@ self: {
          base doctest foldl free pipes tasty tasty-hunit text
        ];
        description = "Interfacing pipes with foldl folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198815,8 +199799,8 @@ self: {
          base monad-primitive pipes primitive transformers vector
        ];
        description = "Various proxies for streaming data into vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198832,7 +199816,7 @@ self: {
          base blaze-builder bytestring http-types pipes transformers wai
        ];
        description = "A port of wai-conduit for the pipes ecosystem";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-websockets" = callPackage
@@ -198850,7 +199834,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "WebSockets in the Pipes framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-zeromq4" = callPackage
@@ -198867,8 +199851,8 @@ self: {
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
        description = "Pipes integration for ZeroMQ messaging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198889,7 +199873,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Zlib and GZip compression and decompression for Pipes streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pisigma" = callPackage
@@ -198908,8 +199892,8 @@ self: {
          mtl parsec text utf8-string
        ];
        description = "A dependently typed core language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198932,8 +199916,8 @@ self: {
          base bytestring optparse-applicative text unordered-containers yaml
        ];
        description = "Account management tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198954,8 +199938,8 @@ self: {
          transformers
        ];
        description = "Pitch tracking library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198979,8 +199963,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A library and a CLI tool for accessing Pivotal Tracker API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199004,7 +199988,7 @@ self: {
          uri-encode vector
        ];
        description = "Pixela client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pixelated-avatar-generator" = callPackage
@@ -199025,8 +200009,8 @@ self: {
          base bytestring hspec JuicyPixels QuickCheck
        ];
        description = "A library and application for generating pixelated avatars";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199051,7 +200035,7 @@ self: {
          base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text
        ];
        description = "Haskell game engine like fantasy console";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pkcs1" = callPackage
@@ -199083,8 +200067,8 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509
        ];
        description = "PKCS#10 library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199097,8 +200081,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
        description = "PKCS #7 padding in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199112,8 +200096,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199133,8 +200117,8 @@ self: {
          http-directory simple-cmd simple-cmd-args text
        ];
        description = "Package tree diff tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199147,7 +200131,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Implementation of the PKTree spatial index data structure";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "placeholders" = callPackage
@@ -199158,7 +200142,7 @@ self: {
        sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Placeholders for use while developing Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plaid" = callPackage
@@ -199189,7 +200173,7 @@ self: {
          microlens microlens-th pretty-simple QuickCheck text time wai
        ];
        description = "Plaid.com api integration library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plailude" = callPackage
@@ -199200,8 +200184,8 @@ self: {
        sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i";
        libraryHaskellDepends = [ base bytestring mtl time unix ];
        description = "plaimi's prelude";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199222,8 +200206,8 @@ self: {
          tasty tasty-hunit transformers
        ];
        description = "Applicative/Arrow for resource estimation and progress tracking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199242,8 +200226,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec path path-io ];
        description = "Failure-tolerant file and directory editing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199260,8 +200244,8 @@ self: {
          deepseq
        ];
        description = "A representation of planar graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199285,8 +200269,8 @@ self: {
          unliftio-core
        ];
        description = "Token Introspection for PlanB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199341,8 +200325,8 @@ self: {
          uuid-types vault vector vector-builder writer-cps-mtl
        ];
        description = "Planet Mitchell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199359,8 +200343,8 @@ self: {
          tasty-rerun weigh
        ];
        description = "Planet Mitchell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199372,8 +200356,8 @@ self: {
        sha256 = "049dqzxygj81kzb5zqpw8cc3ql1hakwl3j84dzqhrc6vk6r9a50q";
        libraryHaskellDepends = [ adjunctions base protolude ];
        description = "The core of a numeric prelude, taken from numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199387,8 +200371,8 @@ self: {
          base bytestring containers mtl utf8-string
        ];
        description = "Simple templating library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199412,8 +200396,8 @@ self: {
        ];
        testHaskellDepends = [ base containers fgl hspec vector ];
        description = "General Framework for compiler development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199437,7 +200421,7 @@ self: {
          attoparsec base bytestring filepath hspec text word8
        ];
        description = "Library and executable for working with playlist files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "playlists-http" = callPackage
@@ -199455,7 +200439,7 @@ self: {
          text transformers
        ];
        description = "Library to glue together playlists and http-client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plex" = callPackage
@@ -199473,7 +200457,7 @@ self: {
          async base bytestring deepseq hspec QuickCheck unix
        ];
        description = "run a subprocess, combining stdout and stderr";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "plist" = callPackage
@@ -199485,8 +200469,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199510,8 +200494,8 @@ self: {
          text time
        ];
        description = "Remote monad for editing plists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199532,7 +200516,7 @@ self: {
        ];
        description = "Plivo API wrapper for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "plocketed" = callPackage
@@ -199545,8 +200529,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199562,7 +200546,7 @@ self: {
          array base cairo colour hmatrix mtl pango transformers
        ];
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plot-gtk" = callPackage
@@ -199573,8 +200557,8 @@ self: {
        sha256 = "1fq75kg8f1sm9bmn89w5c54arr2y1xv0lswbvnxc4rmfc98l82lw";
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        description = "GTK plots and interaction with GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199591,8 +200575,8 @@ self: {
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
        description = "A quick way to use Mathematica like Manipulation abilities";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199606,8 +200590,8 @@ self: {
          base glib gtk3 hmatrix mtl plot process
        ];
        description = "GTK3 plots and interaction with GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199624,8 +200608,8 @@ self: {
          base colour gtk hmatrix plot text vector
        ];
        description = "A plotting tool with Mathematica like Manipulation abilities";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199644,7 +200628,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A lightweight plotting library, exporting to SVG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plot-light-examples" = callPackage
@@ -199664,7 +200648,7 @@ self: {
          scientific text time
        ];
        description = "Example binaries for plot-light";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plotfont" = callPackage
@@ -199692,7 +200676,7 @@ self: {
          microlens-th text time
        ];
        description = "Haskell bindings to Plotly.js";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ploton" = callPackage
@@ -199711,7 +200695,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A useful cli tool to draw figures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plots" = callPackage
@@ -199736,8 +200720,8 @@ self: {
          semigroups split statistics time transformers vector
        ];
        description = "Diagrams based plotting library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199749,7 +200733,7 @@ self: {
        sha256 = "17vr3c9dnd1jabx66qih7z19mk0irrxzab51gl5gifcgdxlf4s3x";
        libraryHaskellDepends = [ base curl split ];
        description = "Plotserver API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "plucky" = callPackage
@@ -199761,7 +200745,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base mtl ];
        description = "A library and technique for handling errors via plucking constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plugins" = callPackage
@@ -199778,8 +200762,8 @@ self: {
          ghc-prim haskell-src process random split
        ];
        description = "Dynamic linking for Haskell and C objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199796,8 +200780,8 @@ self: {
        ];
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199816,8 +200800,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th template-haskell
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199829,8 +200813,8 @@ self: {
        sha256 = "1lih19zjz5yrrjvrgk8zv5xrvld57ykdxxhdrvhwh6bqyzzarqjj";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199843,8 +200827,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199857,8 +200841,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199878,7 +200862,7 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plzwrk" = callPackage
@@ -199897,8 +200881,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl text unordered-containers ];
        description = "A front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199914,8 +200898,8 @@ self: {
          array base binary-file bytestring monads-tf template-haskell zlib
        ];
        description = "read/write png file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199932,8 +200916,8 @@ self: {
          array base bytestring haskell98 mtl parsec zlib
        ];
        description = "Pure Haskell loader for PNG images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199946,8 +200930,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199959,7 +200943,7 @@ self: {
        sha256 = "0h6wsqv6c36cmk30gs3rjdjbxxq9zih49pmzhj2dh9nyxsqbj2yw";
        libraryHaskellDepends = [ base bytestring ];
        description = "PNM image format header parsing and pretty printing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pocket" = callPackage
@@ -199974,8 +200958,8 @@ self: {
          aeson base bytestring exceptions http-conduit http-types text
        ];
        description = "Bindings for the Pocket API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200010,8 +200994,8 @@ self: {
          hspec-test-sandbox shakespeare test-sandbox text transformers
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200030,8 +201014,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Point octree, with bounding boxes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200050,7 +201034,7 @@ self: {
          transformers-compat unordered-containers
        ];
        description = "Pointed and copointed data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pointedalternative" = callPackage
@@ -200061,8 +201045,8 @@ self: {
        sha256 = "12l380hgl17l0jxdx38kipvnip6gz4p9n27n03h9q37k5qhzjfha";
        libraryHaskellDepends = [ base mtl semigroups transformers ];
        description = "Alternative done right";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200074,7 +201058,7 @@ self: {
        sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
        libraryHaskellDepends = [ base binary ];
        description = "A zipper-like comonad which works as a list, tracking a position";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pointfree" = callPackage
@@ -200099,7 +201083,7 @@ self: {
        ];
        description = "Tool for refactoring expressions into pointfree form";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pointfree-fancy" = callPackage
@@ -200121,7 +201105,9 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck ];
        doHaddock = false;
        description = "Tool for refactoring expressions into pointfree form";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointful" = callPackage
@@ -200139,8 +201125,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200152,7 +201138,7 @@ self: {
        sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
        libraryHaskellDepends = [ base ];
        description = "Some common point-free combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pointless-haskell" = callPackage
@@ -200163,8 +201149,8 @@ self: {
        sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx";
        libraryHaskellDepends = [ base GHood process syb ];
        description = "Pointless Haskell library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200180,8 +201166,8 @@ self: {
          base containers derive pointless-haskell process QuickCheck
        ];
        description = "Pointless Lenses library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200197,8 +201183,8 @@ self: {
          base containers mtl pointless-haskell pointless-lenses process
        ];
        description = "Pointless Rewrite library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200230,8 +201216,8 @@ self: {
          unboxing-vector unordered-containers vector
        ];
        description = "Discord verification bot";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200248,8 +201234,8 @@ self: {
          proto-lens text
        ];
        description = "Haskell types for the Pokemon Go protobuf protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200262,8 +201248,8 @@ self: {
        libraryHaskellDepends = [ array base mtl random vector ];
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {poker-eval = null;};
 
@@ -200281,8 +201267,8 @@ self: {
          HTTP http-client http-conduit http-types strict text time
        ];
        description = "PokitDok Platform API Client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200294,7 +201280,7 @@ self: {
        sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh";
        libraryHaskellDepends = [ base ];
        description = "Complex numbers in polar form";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polar-configfile" = callPackage
@@ -200306,8 +201292,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200320,8 +201306,8 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200340,8 +201326,8 @@ self: {
          text-binary transformers
        ];
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200367,7 +201353,7 @@ self: {
          base Cabal directory filepath hedgehog hspec relude text
        ];
        description = "Haskell PVP version adviser";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "polimorf" = callPackage
@@ -200378,7 +201364,7 @@ self: {
        sha256 = "0pdz9fwqdwhqm1l81jnji3nm8y51dmfg5i84ggp8gmqfsiczvbj3";
        libraryHaskellDepends = [ base binary containers text ];
        description = "Handling the PoliMorf dictionary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poll" = callPackage
@@ -200389,7 +201375,7 @@ self: {
        sha256 = "0agdl2bxw7ca05kqyc8dix4kvjdh67i91hn1scmcngjd3gz8gzmr";
        libraryHaskellDepends = [ base enumset utility-ht ];
        description = "Bindings to poll.h";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poly" = callPackage
@@ -200413,7 +201399,7 @@ self: {
          base deepseq gauge mod semirings vector
        ];
        description = "Polynomials";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poly-arity" = callPackage
@@ -200424,7 +201410,7 @@ self: {
        sha256 = "0afxrwq5is4l954kmlqm76g0zpy4jw6vvx2275q8xph4zr2ac46b";
        libraryHaskellDepends = [ base constraints ];
        description = "Tools for working with functions of undetermined arity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poly-cont" = callPackage
@@ -200435,8 +201421,8 @@ self: {
        sha256 = "05pkz6v2xyva73ibb5v97c7fh5zjpvkhahfgnnxycrlnsag5ckgy";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Poly-kinded continuations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200448,8 +201434,8 @@ self: {
        sha256 = "044xsfpxwp3h7vsx86y2d099qmgiiknslmh3jjfnbr2qy9aj73r6";
        libraryHaskellDepends = [ base lens ];
        description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200461,7 +201447,7 @@ self: {
        sha256 = "1csi81i0j3hk2gsc3c0rx939i67b0mj2pi064giw20yspqqjrp27";
        libraryHaskellDepends = [ base requirements ];
        description = "Polykinded extensible records";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "polyToMonoid" = callPackage
@@ -200472,7 +201458,7 @@ self: {
        sha256 = "068acarrpd66682yjscm6l5k9kj9p8zxbf3hi76kz7gvkhkbsjj8";
        libraryHaskellDepends = [ base ];
        description = "Polyvariadic functions mapping to a given monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polydata" = callPackage
@@ -200490,8 +201476,8 @@ self: {
          base constraint-manip hspec indextype polydata-core
        ];
        description = "Wrap together data and it's constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200503,8 +201489,8 @@ self: {
        sha256 = "1wdi8a1s235knb98bmhfqvy7qbqvj804dx6rn846x8aj50drjjqv";
        libraryHaskellDepends = [ base ];
        description = "Core data definitions for the \"polydata\" package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200517,7 +201503,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Polygonal maps";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "polynom" = callPackage
@@ -200540,7 +201526,7 @@ self: {
        ];
        description = "Polynomial types and operations";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "polynomial" = callPackage
@@ -200562,8 +201548,8 @@ self: {
          test-framework-quickcheck2 vector vector-space
        ];
        description = "Polynomials";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200621,7 +201607,7 @@ self: {
          transformers type-errors type-errors-pretty unagi-chan
        ];
        description = "Higher-order, low-boilerplate free monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-RandomFu" = callPackage
@@ -200642,8 +201628,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Experimental, RandomFu effect and interpreters for polysemy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200666,7 +201652,7 @@ self: {
        ];
        description = "Polysemy effect for chronos";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200682,7 +201668,7 @@ self: {
          base containers exceptions extra polysemy polysemy-zoo
        ];
        description = "Extra Input and Output functions for polysemy..";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-fs" = callPackage
@@ -200697,7 +201683,7 @@ self: {
          base bytestring path polysemy rio temporary text unliftio-path
        ];
        description = "Low level filesystem operations for polysemy";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-fskvstore" = callPackage
@@ -200712,7 +201698,7 @@ self: {
          base bytestring path polysemy polysemy-zoo rio unliftio-path
        ];
        description = "Run a KVStore as a filesystem in polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-http" = callPackage
@@ -200745,7 +201731,7 @@ self: {
        ];
        description = "Polysemy effect for http-client";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200762,7 +201748,7 @@ self: {
          unliftio-path
        ];
        description = "Run a KVStore as a single json file in polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-methodology" = callPackage
@@ -200777,8 +201763,8 @@ self: {
          base co-log-polysemy polysemy polysemy-plugin polysemy-zoo
        ];
        description = "Domain modelling algebra for polysemy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200795,8 +201781,8 @@ self: {
          polysemy-vinyl vinyl
        ];
        description = "Functions for using polysemy-methodology with composite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200808,8 +201794,8 @@ self: {
        sha256 = "1ym2da08wy5pbdijrvn769w644dyma8hc010f8phqjnpkhq4j0z5";
        libraryHaskellDepends = [ base optics polysemy polysemy-zoo ];
        description = "Optics for Polysemy";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200825,8 +201811,8 @@ self: {
          base path polysemy polysemy-extra polysemy-plugin
        ];
        description = "Polysemy versions of Path functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200850,7 +201836,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Disambiguate obvious uses of effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-resume" = callPackage
@@ -200870,7 +201856,7 @@ self: {
        ];
        description = "Polysemy error tracking";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200895,7 +201881,7 @@ self: {
        ];
        description = "Polysemy effects for testing";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200920,7 +201906,7 @@ self: {
        ];
        description = "Polysemy effect for time";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200935,7 +201921,7 @@ self: {
        libraryHaskellDepends = [
          base formatting path path-utils polysemy text turtle
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-vinyl" = callPackage
@@ -200946,7 +201932,7 @@ self: {
        sha256 = "1545a125bfgi5314dxhak5dnx9h5kwanzgbp1f88f96hlxik1rjh";
        libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ];
        description = "Functions for mapping vinyl records in polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-webserver" = callPackage
@@ -200967,7 +201953,7 @@ self: {
          polysemy-plugin text wai wai-websockets warp websockets
        ];
        description = "Start web servers from within a Polysemy effect stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-zoo" = callPackage
@@ -200991,7 +201977,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polyseq" = callPackage
@@ -201011,8 +201997,8 @@ self: {
        ];
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201026,7 +202012,7 @@ self: {
          base containers deepseq polyparse tagsoup
        ];
        description = "Online XML parsing with polyparse and tagsoup";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polytypeable" = callPackage
@@ -201037,8 +202023,8 @@ self: {
        sha256 = "0vb2adm97ypi553lsjz7333q3dg9fmi0incrxlikqixk0f3ajaq8";
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201050,8 +202036,8 @@ self: {
        sha256 = "1hbpamgqsmsjkzjjva15f566yra77hwasp88b6y68nx9qa36a821";
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201066,7 +202052,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Creation and application of polyvariadic functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pomaps" = callPackage
@@ -201091,7 +202077,9 @@ self: {
          base criterion deepseq lattices random vector
        ];
        description = "Maps and sets of partial orders";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "pomodoro" = callPackage
@@ -201109,8 +202097,8 @@ self: {
          process time unix wx wxcore
        ];
        description = "pomodoro timer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201134,8 +202122,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec protolude ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201147,8 +202135,8 @@ self: {
        sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h";
        libraryHaskellDepends = [ base mtl ];
        description = "PEG parser combinator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201166,8 +202154,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec network QuickCheck ];
        description = "A simple embedded pingable server that runs in the background";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201187,7 +202175,7 @@ self: {
        ];
        description = "Extended Personal Media Network (XPMN) media server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pontarius-xmpp" = callPackage
@@ -201225,8 +202213,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An XMPP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201243,7 +202231,7 @@ self: {
        ];
        description = "XEPs implementation on top of pontarius-xmpp";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pontarius-xpmn" = callPackage
@@ -201259,7 +202247,7 @@ self: {
        ];
        description = "Extended Personal Media Network (XPMN) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pony" = callPackage
@@ -201272,7 +202260,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Can I have a pony?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pool" = callPackage
@@ -201285,8 +202273,8 @@ self: {
        editedCabalFile = "0lf9m19hl5asyb85xc8h34kh0iqpfdpwzil4lm5lskvn4fbi77n7";
        libraryHaskellDepends = [ base monad-control transformers ];
        description = "Thread-safe resource pools. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201304,8 +202292,8 @@ self: {
          base monad-control resource-pool resourcet transformers
        ];
        description = "Resource pool allocations via ResourceT. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201324,7 +202312,7 @@ self: {
          utility-ht
        ];
        description = "Run jobs on a limited number of threads and support data dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pop3-client" = callPackage
@@ -201336,8 +202324,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl network ];
        description = "POP3 Client Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201351,7 +202339,7 @@ self: {
        libraryHaskellDepends = [ base directory haskell98 unix ];
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201373,7 +202361,9 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck store ];
        testToolDepends = [ hspec-discover ];
        description = "Static key-value storage backed by poppy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "poppler" = callPackage
@@ -201393,8 +202383,8 @@ self: {
        libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler_gi ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler_gi;};
@@ -201407,7 +202397,7 @@ self: {
        sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y";
        libraryHaskellDepends = [ base ];
        description = "Empty Cabal package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "porcupine-core" = callPackage
@@ -201449,8 +202439,8 @@ self: {
          unliftio-core unordered-containers url vector vinyl yaml zlib
        ];
        description = "Express portable, composable and reusable data tasks and pipelines";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201479,8 +202469,8 @@ self: {
          text transformers unordered-containers
        ];
        description = "A location accessor for porcupine to connect to HTTP sources/sinks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201511,8 +202501,8 @@ self: {
          unordered-containers
        ];
        description = "A location accessor for porcupine to connect to AWS S3 sources/sinks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201531,7 +202521,7 @@ self: {
        ];
        executableHaskellDepends = [ base warp ];
        description = "A minimalist HTTP server framework written on top of wai";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "port-utils" = callPackage
@@ -201543,7 +202533,7 @@ self: {
        libraryHaskellDepends = [ base network ];
        testHaskellDepends = [ async base hspec network stm transformers ];
        description = "Utilities for creating and waiting on ports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "portable-lines" = callPackage
@@ -201554,7 +202544,7 @@ self: {
        sha256 = "1l94p3s56a3kfqc8fzqc52z12rhg3c8xsmgcw1i20dnl8aygalsh";
        libraryHaskellDepends = [ base bytestring ];
        description = "Alternative 'lines' implementation that understands CR-LF and CR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "portable-template-haskell-lens" = callPackage
@@ -201565,7 +202555,7 @@ self: {
        sha256 = "14xg0zdyml5jx8jbgrk7b3697qs2schxjrb9iviqi1hnkcaqq75q";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Lenses for the AST of Template Haskell 2.11 and Template Haskell < 2.11";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "portager" = callPackage
@@ -201584,8 +202574,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
        description = "DSL for configuring Gentoo portage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201599,7 +202589,7 @@ self: {
        librarySystemDepends = [ portaudio ];
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
@@ -201616,8 +202606,8 @@ self: {
          base bytestring containers extensible-exceptions stringsearch
        ];
        description = "FreeBSD ports index search and analysis tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201629,7 +202619,7 @@ self: {
        sha256 = "12pvav3xx4mdjnvza15yhkdcphxlsjns2s1i66h2nfgbb9lc8h0q";
        libraryHaskellDepends = [ base ];
        description = "Implementation of the Porter stemming algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ports" = callPackage
@@ -201641,7 +202631,7 @@ self: {
        libraryHaskellDepends = [ base haskell98 unix ];
        description = "The Haskell Ports Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201654,7 +202644,7 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        description = "Library to interact with port tools on FreeBSD";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "poseidon" = callPackage
@@ -201676,8 +202666,8 @@ self: {
          text time unordered-containers uuid
        ];
        description = "Simple extensible library to run SQL file against PostgreSQL database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201698,8 +202688,8 @@ self: {
          QuickCheck scientific text time unordered-containers uuid
        ];
        description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201711,7 +202701,7 @@ self: {
        sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg";
        libraryHaskellDepends = [ base nats semigroups ];
        description = "Positive integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "positron" = callPackage
@@ -201728,8 +202718,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Experiment";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201747,8 +202737,8 @@ self: {
        ];
        librarySystemDepends = [ acl ];
        description = "Support for Posix ACL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) acl;};
 
@@ -201769,8 +202759,8 @@ self: {
          base primitive primitive-unlifted tasty tasty-hunit
        ];
        description = "posix bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) systemd;};
 
@@ -201782,7 +202772,7 @@ self: {
        sha256 = "1462njrxsfb26xavpwji17p172bsy6ivicsjzfvh8sq60rqyzjv1";
        libraryHaskellDepends = [ base ];
        description = "POSIX error codes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-escape" = callPackage
@@ -201793,7 +202783,7 @@ self: {
        sha256 = "0yrx8cr6qximfy0vh7qqljlkj27q9gksrnqmqbnj2hk5bsa5l48w";
        libraryHaskellDepends = [ base ];
        description = "Quote arguments to be passed through the Unix shell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-filelock" = callPackage
@@ -201805,7 +202795,7 @@ self: {
        libraryHaskellDepends = [ base transformers unix ];
        description = "Nice wrapper around POSIX fcntl advisory locks";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "posix-paths" = callPackage
@@ -201824,7 +202814,7 @@ self: {
          base bytestring criterion directory filepath process unix
        ];
        description = "POSIX filepath/directory functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-pty" = callPackage
@@ -201837,7 +202827,7 @@ self: {
        librarySystemDepends = [ util ];
        testHaskellDepends = [ base bytestring process ];
        description = "Pseudo terminal interaction with subprocesses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {util = null;};
 
   "posix-realtime" = callPackage
@@ -201848,8 +202838,8 @@ self: {
        sha256 = "01yz9p66m8w5418mqrrbz33dib97pscw329382wh0bi75swvlb39";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201866,7 +202856,7 @@ self: {
          transformers-base unix
        ];
        description = "Bindings to the POSIX socket API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-timer" = callPackage
@@ -201877,7 +202867,7 @@ self: {
        sha256 = "01s9hd23xcgdnryi72vj635435ccryv98a911l0zipxmvq4d8ri8";
        libraryHaskellDepends = [ base transformers-base unix ];
        description = "Bindings to POSIX clock and timer functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-waitpid" = callPackage
@@ -201890,8 +202880,8 @@ self: {
        editedCabalFile = "12amy5ss3myr4c8bl5k3qpx3y78sp4pw4jdzvcg5sncpq7np3hdh";
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201909,7 +202899,7 @@ self: {
          base directory process split time timerep transformers unix X11
        ];
        description = "Sleep tracker for X11, using XScreenSaver extension and manual input";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "possible" = callPackage
@@ -201920,7 +202910,7 @@ self: {
        sha256 = "1r3xg8yni440h0yzcq5a4w27l3877y7bdvx70jf6agcyqhsl4ppj";
        libraryHaskellDepends = [ base ];
        description = "Three valued Data.Maybe";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "possibly" = callPackage
@@ -201931,7 +202921,7 @@ self: {
        sha256 = "08pannfx1831xp4zj4q3qp64vjr208df83qdwvzzlrn9ffc9ikaj";
        libraryHaskellDepends = [ base ];
        description = "type Possibly a = Either String a";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "post-mess-age" = callPackage
@@ -201942,7 +202932,7 @@ self: {
        sha256 = "0k6njm7fbj7y6bzqkfpdby4az13i2sqg7lacnn5ry2hkrfqrmxnh";
        libraryHaskellDepends = [ base ];
        description = "Send messages to a handle concurrently without getting them mixed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postcodes" = callPackage
@@ -201953,8 +202943,8 @@ self: {
        sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8";
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
        description = "A library that gets postcode information from the uk-postcodes.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201973,8 +202963,8 @@ self: {
          base bytestring filepath postgresql-simple process
        ];
        description = "Library for easily running embedded PostgreSQL server for tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201991,7 +202981,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "An Options type representing options for postgres connections";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgres-tmp" = callPackage
@@ -202002,8 +202992,8 @@ self: {
        sha256 = "1zx5inxczzlhyb5f89f92f0ngzln49qahzraqr6ksvi5r7n7gk86";
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        description = "Create a temporary database that is deleted after performing some operation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202036,8 +203026,8 @@ self: {
          time unordered-containers wai-extra websockets
        ];
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202067,7 +203057,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-common" = callPackage
@@ -202083,7 +203073,7 @@ self: {
          attoparsec base bytestring postgresql-simple
        ];
        description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-common-persistent" = callPackage
@@ -202101,7 +203091,7 @@ self: {
          base bytestring persistent postgresql-common text
        ];
        description = "Persistent compatibility for postgresql-common";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-config" = callPackage
@@ -202117,7 +203107,7 @@ self: {
          resource-pool time
        ];
        description = "Types for easy adding postgresql configuration to your program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-connector" = callPackage
@@ -202134,7 +203124,7 @@ self: {
          resourcet time transformers-base
        ];
        description = "Initial project postgresql-connector from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-copy-escape" = callPackage
@@ -202145,7 +203135,7 @@ self: {
        sha256 = "08ld3rqjjjhlikcv1cpxjqs8wlsjhvv7qq9fjb032hx6mvcqwz0i";
        libraryHaskellDepends = [ base bytestring ];
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-cube" = callPackage
@@ -202156,7 +203146,7 @@ self: {
        sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3";
        libraryHaskellDepends = [ base bytestring postgresql-simple ];
        description = "Cube support for postgresql-simple";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-error-codes" = callPackage
@@ -202167,7 +203157,7 @@ self: {
        sha256 = "1r1dv1pi1z16q0v1329g2j856j3afdlhv42qhgdabl9p4wyrvm76";
        libraryHaskellDepends = [ bytestring ];
        description = "PostgreSQL error codes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-libpq" = callPackage
@@ -202181,7 +203171,7 @@ self: {
        librarySystemDepends = [ postgresql ];
        testHaskellDepends = [ base bytestring ];
        description = "low-level binding to libpq";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-libpq-notify" = callPackage
@@ -202198,7 +203188,7 @@ self: {
          tmp-postgres
        ];
        description = "Minimal dependency PostgreSQL notifications library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-lo-stream" = callPackage
@@ -202214,8 +203204,8 @@ self: {
          postgresql-simple
        ];
        description = "Utilities for streaming PostgreSQL LargeObjects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202233,8 +203223,8 @@ self: {
        ];
        testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
        description = "Generic deserialization of PostgreSQL rows based on column names";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202279,7 +203269,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Converter for question mark style and dollar sign style of PostgreSQL SQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-pure" = callPackage
@@ -202328,7 +203318,7 @@ self: {
          text time utf8-string vector
        ];
        description = "pure Haskell PostgreSQL driver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-query" = callPackage
@@ -202343,8 +203333,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "3.7.0";
-       sha256 = "0raxd0vd6hf772g11x8p0c6h86sipwk74z5kfxb38mbi26yj0p24";
+       version = "3.8.1";
+       sha256 = "09lld8fibwn0brszpz040pr8q7b5wrpc9fzdw8pwf7gfsb02wvx1";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default exceptions file-embed haskell-src-meta hreader hset
@@ -202359,8 +203349,8 @@ self: {
          tasty-quickcheck tasty-th text time
        ];
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202382,7 +203372,7 @@ self: {
          base basic-prelude optparse-applicative shelly text time
        ];
        description = "PostgreSQL Schema Management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple" = callPackage
@@ -202390,27 +203380,27 @@ self: {
      , bytestring, bytestring-builder, case-insensitive, containers
      , cryptohash-md5, filepath, hashable, HUnit, inspection-testing
      , Only, postgresql-libpq, scientific, tasty, tasty-golden
-     , tasty-hunit, template-haskell, text, time, transformers
+     , tasty-hunit, template-haskell, text, time-compat, transformers
      , uuid-types, vector
      }:
      mkDerivation {
        pname = "postgresql-simple";
-       version = "0.6.3";
-       sha256 = "193rh38gzgpy41y6826hs4zdp01xw2fpjncwm281cm1ibrmh68pq";
+       version = "0.6.4";
+       sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-builder
          case-insensitive containers hashable Only postgresql-libpq
-         scientific template-haskell text time transformers uuid-types
-         vector
+         scientific template-haskell text time-compat transformers
+         uuid-types vector
        ];
        testHaskellDepends = [
          aeson base base16-bytestring bytestring case-insensitive containers
          cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq
-         tasty tasty-golden tasty-hunit text time vector
+         tasty tasty-golden tasty-hunit text time-compat vector
        ];
        benchmarkHaskellDepends = [ base vector ];
        description = "Mid-Level PostgreSQL client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple-bind" = callPackage
@@ -202430,8 +203420,8 @@ self: {
          base bytestring hspec postgresql-simple text
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202447,7 +203437,7 @@ self: {
          base haskell-src-meta mtl parsec postgresql-simple template-haskell
        ];
        description = "Interpolated SQL queries via quasiquotation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple-migration" = callPackage
@@ -202470,8 +203460,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202491,8 +203481,8 @@ self: {
          transformers
        ];
        description = "Implementation of named parameters for `postgresql-simple` library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202516,7 +203506,7 @@ self: {
          optparse-applicative postgres-options postgresql-simple
        ];
        description = "An optparse-applicative and envy parser for postgres options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple-queue" = callPackage
@@ -202541,8 +203531,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL backed queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202554,8 +203544,8 @@ self: {
        sha256 = "05plsdm4i4nw35pcbbk1yb91gpj6jq5hygsqijdmnsxyl9d6vbby";
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        description = "Generic functions for postgresql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202572,8 +203562,8 @@ self: {
          transformers typedquery utf8-string
        ];
        description = "Typed extension for PostgreSQL simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202594,7 +203584,7 @@ self: {
          base postgresql-simple tasty tasty-quickcheck
        ];
        description = "Parse postgres:// url into ConnectInfo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-syntax" = callPackage
@@ -202618,8 +203608,8 @@ self: {
          tasty-quickcheck
        ];
        description = "PostgreSQL AST parsing and rendering";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202633,7 +203623,7 @@ self: {
          base monad-control mtl postgresql-simple
        ];
        description = "a transactional monad on top of postgresql-simple";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-tx" = callPackage
@@ -202644,7 +203634,7 @@ self: {
        sha256 = "1q8yh16wxgfdvr3090i395ba20lzv2iyq5sswrzm9slcbnan353d";
        libraryHaskellDepends = [ base transformers ];
        description = "A safe transaction monad for use with various PostgreSQL Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-tx-monad-logger" = callPackage
@@ -202655,7 +203645,7 @@ self: {
        sha256 = "00gyhjfq13rknh4hpizmfizqv84b8l8ziik36gjyq1vsmfg5da43";
        libraryHaskellDepends = [ base monad-logger postgresql-tx ];
        description = "postgresql-tx interfacing for use with monad-logger";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-tx-query" = callPackage
@@ -202674,8 +203664,8 @@ self: {
          postgresql-tx-simple transformers transformers-base
        ];
        description = "postgresql-tx interfacing for use with postgresql-query";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202691,7 +203681,7 @@ self: {
          base bytestring postgresql-simple postgresql-tx transformers
        ];
        description = "postgresql-tx interfacing for use with postgresql-simple";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-tx-squeal" = callPackage
@@ -202707,8 +203697,8 @@ self: {
          records-sop squeal-postgresql unliftio
        ];
        description = "postgresql-tx interfacing for use with squeal-postgresql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202722,8 +203712,8 @@ self: {
          base postgresql-simple postgresql-tx-squeal
        ];
        description = "Connection interop from postgresql-simple connections to postgresql-libpq connections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202752,7 +203742,7 @@ self: {
          base bytestring criterion network time tls
        ];
        description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-typed-lifted" = callPackage
@@ -202768,8 +203758,8 @@ self: {
          postgresql-typed transformers-base
        ];
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202818,8 +203808,8 @@ self: {
          time transformers-base wai wai-extra
        ];
        description = "REST API for any Postgres database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202855,8 +203845,8 @@ self: {
          wai-extra
        ];
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202875,8 +203865,8 @@ self: {
          pipes-parse tls uuid
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202895,8 +203885,8 @@ self: {
          http-types network-api-support text
        ];
        description = "Library for postmarkapp.com HTTP Api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202913,8 +203903,8 @@ self: {
          http-streams io-streams text time
        ];
        description = "Send email via Postmark using io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202936,7 +203926,7 @@ self: {
        ];
        description = "Postmaster ESMTP Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202950,8 +203940,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Command line Dreamcast VMU filesystem toolset";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202963,8 +203953,8 @@ self: {
        sha256 = "1hc7jp7q6mdqva40v0dppihp1bnl30h7vxnkawg0kmczq5p9js35";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202987,8 +203977,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Streaming serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203011,8 +204001,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Integration of \"potoki\" and \"conduit\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203040,8 +204030,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203057,8 +204047,8 @@ self: {
          acquire base bytestring hasql potoki-core profunctors text vector
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203072,8 +204062,8 @@ self: {
          acquire base bytestring potoki-core zlib
        ];
        description = "Streaming ZLib decompression";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203090,7 +204080,7 @@ self: {
          JuicyPixels vector
        ];
        description = "Trace bitmap images to paths using potrace";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "potrace-diagrams" = callPackage
@@ -203103,8 +204093,8 @@ self: {
        editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga";
        libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        description = "Potrace bindings for the diagrams library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203119,8 +204109,8 @@ self: {
        libraryHaskellDepends = [ base directory unix ];
        executableHaskellDepends = [ base ];
        description = "bindings for Griffin PowerMate USB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203132,8 +204122,8 @@ self: {
        sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny";
        libraryHaskellDepends = [ base ];
        description = "Tools for PowerPC programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203147,7 +204137,7 @@ self: {
        libraryHaskellDepends = [ async base contravariant timespan ];
        testHaskellDepends = [ async base hspec stm ];
        description = "A flexible job queue with exchangeable backends";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "powerqueue-distributed" = callPackage
@@ -203165,7 +204155,7 @@ self: {
        ];
        testHaskellDepends = [ async base hspec powerqueue stm timespan ];
        description = "A distributed worker backend for powerqueu";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "powerqueue-levelmem" = callPackage
@@ -203191,8 +204181,8 @@ self: {
        ];
        benchmarkSystemDepends = [ leveldb snappy ];
        description = "A high performance in memory and LevelDB backend for powerqueue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
@@ -203206,8 +204196,8 @@ self: {
          aws-simple base powerqueue text timespan
        ];
        description = "A Amazon SQS backend for powerqueue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203219,7 +204209,7 @@ self: {
        sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy";
        libraryHaskellDepends = [ base mtl ];
        description = "a tiny PPM image generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pprecord" = callPackage
@@ -203230,8 +204220,8 @@ self: {
        sha256 = "1gpr6sndh3pc43f1aks7wq8h969bbj2rc01rvaq9pkdnwqlqr7r4";
        libraryHaskellDepends = [ base boxes ];
        description = "A library for pretty printing Records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203255,7 +204245,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Pretty Print containers in a tabular format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pqc" = callPackage
@@ -203266,8 +204256,8 @@ self: {
        sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
        libraryHaskellDepends = [ base QuickCheck random stm ];
        description = "Parallel batch driver for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203280,7 +204270,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Reliable, persistent, fast priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -203295,8 +204285,8 @@ self: {
          base containers ghc-prim MaybeT mtl stateful-mtl uvector
        ];
        description = "Fully encapsulated monad transformers with queuelike functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203315,8 +204305,8 @@ self: {
          base bytestring data-default directory json mps
        ];
        description = "Practice Room";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203337,8 +204327,8 @@ self: {
          unordered-containers vector
        ];
        description = "A pragmatic Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203355,7 +204345,7 @@ self: {
          base tasty tasty-hunit tasty-quickcheck vector-space
        ];
        description = "Alternative Show class that gives shorter view if possible";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "prairie" = callPackage
@@ -203373,7 +204363,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base ];
        description = "A first class record field library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preamble" = callPackage
@@ -203394,8 +204384,8 @@ self: {
          unordered-containers uuid
        ];
        description = "Yet another prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203415,7 +204405,7 @@ self: {
        ];
        description = "Diff Cabal packages";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "precursor" = callPackage
@@ -203431,8 +204421,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Prelude replacement";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203444,8 +204434,8 @@ self: {
        sha256 = "09kpqc281r4inrcnlsqspry6bvyzpa8npmjzqmmnpxscz58fq8nb";
        libraryHaskellDepends = [ base hashable hashtables HSet ];
        description = "Simple cached predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203474,8 +204464,8 @@ self: {
          tries unordered-containers
        ];
        description = "Predicative tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203487,8 +204477,8 @@ self: {
        sha256 = "03rw51jpfcl827nrv1fxlghqwg0mk89l1rkqwd743lnsydwzi15h";
        libraryHaskellDepends = [ base ];
        description = "Helper class for passing context along a predicate value";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203502,8 +204492,8 @@ self: {
        editedCabalFile = "1b02l2fdfxvlsvhcmkpsp0vzc0igsd0nrb64yb7af5a7z08cc9c0";
        libraryHaskellDepends = [ adjunctions base deepseq lens mtl ];
        description = "A library for writing predicates and transformations over predicates in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203530,8 +204520,8 @@ self: {
          tasty-quickcheck template-haskell text these time
        ];
        description = "Predicates, Refinement types and Dsl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203543,7 +204533,7 @@ self: {
        sha256 = "0ly64xml5gbazyq07s409swgysvlwjc19w4x46yp1684ifv0gghf";
        libraryHaskellDepends = [ base ];
        description = "A couple of convenience functions for forming predicates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "predictive" = callPackage
@@ -203554,7 +204544,7 @@ self: {
        sha256 = "0n1ilbr3zs8gaji37xn5iab5nwk02my3g18x8bci6pp8znisrbi0";
        libraryHaskellDepends = [ base containers ];
        description = "Predict the future, backtrack on failure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prednote" = callPackage
@@ -203575,8 +204565,8 @@ self: {
          tasty tasty-quickcheck tasty-th text transformers
        ];
        description = "Evaluate and display trees of predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203599,8 +204589,8 @@ self: {
          rainbow-tests text
        ];
        description = "Tests and QuickCheck generators to accompany prednote";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203614,7 +204604,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
        description = "Prefetch stdin even before stdout is ready";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prefix-expression" = callPackage
@@ -203625,7 +204615,7 @@ self: {
        sha256 = "0brw6rrykfsg67ckcfs3d5x4n7m8c6vbnh9hqrk1iq9whlz6vpwy";
        libraryHaskellDepends = [ base regex-pcre-builtin ];
        testHaskellDepends = [ base hspec ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prefix-units" = callPackage
@@ -203642,7 +204632,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A basic library for SI/binary prefix units";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prefork" = callPackage
@@ -203664,8 +204654,8 @@ self: {
          base cab containers directory filepath hspec process stm unix
        ];
        description = "A library for building a prefork-style server quickly";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203685,8 +204675,8 @@ self: {
          text-conversions time tuple unordered-containers vector
        ];
        description = "Prelude for applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203708,8 +204698,8 @@ self: {
          string-conversions
        ];
        description = "A larger alternative to the Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203721,7 +204711,7 @@ self: {
        sha256 = "1mv00d5k5wqb39iyghdbf4lfqznwb1whcc9a564ly4wzka70y9f1";
        libraryHaskellDepends = [ base ];
        description = "Provide Prelude and Data.List with fixed content across GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude-edsl" = callPackage
@@ -203732,7 +204722,7 @@ self: {
        sha256 = "0ms63ggqciin92qld07cx6110n534idk38hzj7c69jw68cz3bw1f";
        libraryHaskellDepends = [ base ];
        description = "An EDSL-motivated subset of the Prelude";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude-extras" = callPackage
@@ -203743,7 +204733,7 @@ self: {
        sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9";
        libraryHaskellDepends = [ base ];
        description = "Higher order versions of Prelude classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude-generalize" = callPackage
@@ -203754,8 +204744,8 @@ self: {
        sha256 = "0h452pn7zs97z5gv2p3x9pg61phphwcw5y5g1w38k3gihdvym8jl";
        libraryHaskellDepends = [ base comonad logict transformers ];
        description = "Another kind of alternate Prelude file";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203769,8 +204759,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203782,7 +204772,7 @@ self: {
        sha256 = "1avj11a5bqn8sxizzh1fxhw3dvd55xsimbbhdwymxfn45vvfswr7";
        libraryHaskellDepends = [ base ];
        description = "A slightly better (but conservative) Prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "prelude-safeenum" = callPackage
@@ -203793,7 +204783,7 @@ self: {
        sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
        libraryHaskellDepends = [ base ];
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude2010" = callPackage
@@ -203804,7 +204794,7 @@ self: {
        sha256 = "0f4ggnm3a57b4gqw07fq3ash43dxsy0bmg16b8wj33yik96qk06l";
        libraryHaskellDepends = [ prelude-compat ];
        description = "Provide Prelude with fixed content across GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preludeplus" = callPackage
@@ -203815,7 +204805,7 @@ self: {
        sha256 = "08sxfgr8xh0rbg9nv3k93970mjcqgjyv1qy0kmwksl11fsih6sr3";
        libraryHaskellDepends = [ base containers ];
        description = "Generalizes List functions and replaces partials with NonEmpty equivalents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preprocess-haskell" = callPackage
@@ -203834,8 +204824,8 @@ self: {
          system-filepath temporary text turtle unix
        ];
        description = "Preprocess Haskell Repositories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203856,8 +204846,8 @@ self: {
          base directory haskell-src-exts hspec process temporary
        ];
        description = "Remove cpp annotations to get the source ready for static analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203869,37 +204859,46 @@ self: {
        sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp";
        libraryHaskellDepends = [ base mtl parsec syb ];
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preql" = callPackage
     ({ mkDerivation, aeson, alex, array, base, binary-parser
-     , bytestring, bytestring-strict-builder, contravariant, free, happy
-     , mtl, postgresql-binary, postgresql-libpq, scientific, tasty
-     , tasty-hunit, template-haskell, text, th-lift-instances, time
-     , transformers, uuid, vector
+     , bytestring, bytestring-strict-builder, containers, contravariant
+     , criterion, deepseq, generic-random, happy, hedgehog, mtl
+     , postgresql-binary, postgresql-libpq, scientific, syb, tasty
+     , tasty-hedgehog, tasty-hunit, template-haskell, text
+     , th-lift-instances, time, transformers, uuid, vector, vector-sized
      }:
      mkDerivation {
        pname = "preql";
-       version = "0.3";
-       sha256 = "03zdkxlkvqyccvi682w0inxl70fvzi4l56kicp9qrb661jaqvy9q";
+       version = "0.5";
+       sha256 = "13lyk12x8i34q5s6dc9q7mzhax7662r7frhiiklvd0s0ksk25rqq";
        libraryHaskellDepends = [
          aeson array base binary-parser bytestring bytestring-strict-builder
-         contravariant free mtl postgresql-binary postgresql-libpq
-         scientific template-haskell text th-lift-instances time
-         transformers uuid vector
+         contravariant mtl postgresql-binary postgresql-libpq scientific syb
+         template-haskell text th-lift-instances time transformers uuid
+         vector vector-sized
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
          aeson array base binary-parser bytestring bytestring-strict-builder
-         contravariant free mtl postgresql-binary postgresql-libpq
-         scientific tasty tasty-hunit template-haskell text
-         th-lift-instances time transformers uuid vector
+         containers contravariant generic-random hedgehog mtl
+         postgresql-binary postgresql-libpq scientific syb tasty
+         tasty-hedgehog tasty-hunit template-haskell text th-lift-instances
+         time transformers uuid vector vector-sized
        ];
        testToolDepends = [ alex happy ];
+       benchmarkHaskellDepends = [
+         aeson array base binary-parser bytestring bytestring-strict-builder
+         contravariant criterion deepseq mtl postgresql-binary
+         postgresql-libpq scientific syb template-haskell text
+         th-lift-instances time transformers uuid vector vector-sized
+       ];
+       benchmarkToolDepends = [ alex happy ];
        description = "safe PostgreSQL queries using Quasiquoters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203914,8 +204913,8 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        testHaskellDepends = [ base QuickCheck ];
        description = "A decision procedure for quantifier-free linear arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203927,8 +204926,8 @@ self: {
        sha256 = "0ys2ibfh518r9rg9bl2m5cmyfxmri47g8wg7q0n5fcbsh4sb7s5s";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Make presentations for data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203941,7 +204940,7 @@ self: {
        libraryHaskellDepends = [ base containers json mtl parsec ];
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203961,8 +204960,8 @@ self: {
          scientific text transformers
        ];
        description = "An HDBC connector for Presto";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203974,7 +204973,7 @@ self: {
        sha256 = "18bwgz2cgkd6n9gwpwipv2bc6d5501mflmr0r2akwy98q2gb9qg8";
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Haskell2010 structured text formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty_1_1_3_6" = callPackage
@@ -203987,8 +204986,8 @@ self: {
        testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Pretty-printing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pretty-class" = callPackage
@@ -203999,7 +204998,7 @@ self: {
        sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am";
        libraryHaskellDepends = [ base pretty ];
        description = "Pretty printing class similar to Show";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-compact" = callPackage
@@ -204034,7 +205033,7 @@ self: {
          base data-default Diff tasty tasty-hunit tasty-test-reporter text
        ];
        description = "Pretty printing a diff of two values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-display" = callPackage
@@ -204049,7 +205048,7 @@ self: {
        executableHaskellDepends = [ ansi-wl-pprint base pretty-show ];
        testHaskellDepends = [ base ];
        description = "Typeclass for human-readable display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-error" = callPackage
@@ -204062,7 +205061,7 @@ self: {
          base basic-prelude bytestring pretty-show
        ];
        description = "Pretty error messages for runtime invariants";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pretty-ghci" = callPackage
@@ -204086,8 +205085,8 @@ self: {
          base directory filepath prettyprinter process
        ];
        description = "Functionality for beautifying GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204099,7 +205098,7 @@ self: {
        sha256 = "0c8pa0rdb2q8rf4acy4gww0hj5lrzclzdh52yi2aiaaij4lqzir7";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library for hex dumps of ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-loc" = callPackage
@@ -204110,7 +205109,7 @@ self: {
        sha256 = "196slpa651p7yq8107c4pkwdfkfmg2bn6ibyqz22c46psklyrisb";
        libraryHaskellDepends = [ base text ];
        description = "Tracking and highlighting of locations in source files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-ncols" = callPackage
@@ -204121,8 +205120,8 @@ self: {
        sha256 = "0bvd8wgjrj9g86b1z8m9mjzswibrmhasgajnkgr2dlizl5lg7faq";
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204140,7 +205139,7 @@ self: {
          validity validity-time
        ];
        description = "Pretty relative time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pretty-show" = callPackage
@@ -204160,7 +205159,7 @@ self: {
        libraryToolDepends = [ happy ];
        executableHaskellDepends = [ base ];
        description = "Tools for working with derived `Show` instances and generic inspection of values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pretty-show-ansi-wl" = callPackage
@@ -204176,7 +205175,7 @@ self: {
        ];
        libraryToolDepends = [ happy ];
        description = "Like pretty-show, but only for ansi-wl-pprint";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pretty-simple" = callPackage
@@ -204200,8 +205199,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ cdepillabout ];
      }) {};
 
   "pretty-sop" = callPackage
@@ -204216,7 +205215,7 @@ self: {
        testHaskellDepends = [ base generics-sop pretty-show ];
        testToolDepends = [ markdown-unlit ];
        description = "A generic pretty-printer using generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-terminal" = callPackage
@@ -204232,7 +205231,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
        description = "Styling and coloring terminal output with ANSI escape sequences";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-tree" = callPackage
@@ -204243,20 +205242,20 @@ self: {
        sha256 = "0cf856qjacc0lmiina44s00i17ga2qrfr7wdlxhwiqdmpsh5g3fw";
        libraryHaskellDepends = [ base boxes containers ];
        description = "Pretty-print trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-types" = callPackage
     ({ mkDerivation, base, hspec, mtl, tagged }:
      mkDerivation {
        pname = "pretty-types";
-       version = "0.3.0.1";
-       sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv";
+       version = "0.4.0.0";
+       sha256 = "0vfsriviwbrbs9kwg8jwfk5ih9ckv1bfgdxbkcqz8cfaxmbqx4f7";
        libraryHaskellDepends = [ base mtl tagged ];
        testHaskellDepends = [ base hspec tagged ];
        description = "A small pretty printing DSL for complex types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204268,7 +205267,7 @@ self: {
        sha256 = "08vqwhbda9qyqmgg469w0ijy090j5wj9xwd54ph6m0rzypbjw8hd";
        libraryHaskellDepends = [ base ];
        description = "prettier function composition by (°)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prettyclass" = callPackage
@@ -204279,7 +205278,7 @@ self: {
        sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5";
        libraryHaskellDepends = [ base pretty ];
        description = "Pretty printing class similar to Show";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prettyprinter" = callPackage
@@ -204304,7 +205303,7 @@ self: {
          QuickCheck random text transformers
        ];
        description = "A modern, easy to use, well-documented, extensible pretty-printer";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
@@ -204322,7 +205321,7 @@ self: {
          text
        ];
        description = "ANSI terminal backend for the »prettyprinter« package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-compat-annotated-wl-pprint" = callPackage
@@ -204333,7 +205332,7 @@ self: {
        sha256 = "0plkzvwbqilmh711fbbki9r37i01n00kmzr6cxjgjw0ak1m2djbn";
        libraryHaskellDepends = [ base prettyprinter text ];
        description = "Drop-in compatibility package to migrate from »annotated-wl-pprint« to »prettyprinter«";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-compat-ansi-wl-pprint" = callPackage
@@ -204350,7 +205349,7 @@ self: {
          base prettyprinter prettyprinter-ansi-terminal text
        ];
        description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-compat-wl-pprint" = callPackage
@@ -204363,7 +205362,7 @@ self: {
        editedCabalFile = "0cb1i1hmr6wl8lacy3w822h273lapqhp537snxgbmhf9xvfckbpr";
        libraryHaskellDepends = [ base prettyprinter text ];
        description = "Prettyprinter compatibility module for previous users of the wl-pprint package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-convert-ansi-wl-pprint" = callPackage
@@ -204380,7 +205379,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-graphviz" = callPackage
@@ -204391,7 +205390,7 @@ self: {
        sha256 = "1lqf296jr2jfg86apn729payq2rkk95pdidl7n62xx4bniax7fvm";
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "A prettyprinter backend for graphviz";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prettyprinter-lucid" = callPackage
@@ -204402,8 +205401,8 @@ self: {
        sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh";
        libraryHaskellDepends = [ base lucid prettyprinter text ];
        description = "A prettyprinter backend for lucid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204417,8 +205416,8 @@ self: {
        editedCabalFile = "120lhr6g3grsybq5bp0vg38cdb78dysq8nwa206ghzigaxs34vcd";
        libraryHaskellDepends = [ base prettyprinter vty ];
        description = "prettyprinter backend for vty";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204434,8 +205433,8 @@ self: {
          base containers pretty strict-data text util-plus
        ];
        description = "The method of previewing data (instead of wholly show-ing it)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204447,7 +205446,7 @@ self: {
        sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4";
        libraryHaskellDepends = [ ghc-prim ];
        description = "An ergonomic but conservative interface to ghc-prim";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "prim-array" = callPackage
@@ -204460,8 +205459,8 @@ self: {
        editedCabalFile = "120v58dhida6ms5wd4skw32y2mc70594dhipmz2zp4kjcqmllmdq";
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204474,8 +205473,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "Prim typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204487,8 +205486,8 @@ self: {
        sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8";
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204504,7 +205503,7 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck spoon ];
        benchmarkHaskellDepends = [ base criterion ghc-prim spoon ];
        description = "Catch errors thrown from pure computations using primops";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prim-uniq" = callPackage
@@ -204515,7 +205514,7 @@ self: {
        sha256 = "1l7jlv3pfasn89n2wpgff972npy423vqsidkkn5crxfyqjyzxbdv";
        libraryHaskellDepends = [ base dependent-sum primitive ];
        description = "Opaque unique identifiers in primitive state monads";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "primal" = callPackage
@@ -204529,8 +205528,8 @@ self: {
        libraryHaskellDepends = [ base deepseq transformers ];
        testHaskellDepends = [ base doctest template-haskell ];
        description = "Primeval world of Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204550,11 +205549,23 @@ self: {
          base criterion deepseq primal primitive random
        ];
        description = "Unified interface for memory managemenet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "prime" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "prime";
+       version = "0.1.1";
+       sha256 = "18bfxyzazf5d8hfakrags3l3hbn75zws4ihl9bj59c52if5l6fbm";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "prime number tools";
+       license = lib.licenses.gpl3;
+     }) {};
+
   "primes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -204563,7 +205574,7 @@ self: {
        sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl";
        libraryHaskellDepends = [ base ];
        description = "Efficient, purely functional generation of prime numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primes-type" = callPackage
@@ -204576,8 +205587,8 @@ self: {
        testHaskellDepends = [ base HTF primes ];
        benchmarkHaskellDepends = [ base criterion primes ];
        description = "Type-safe prime numbers";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204593,7 +205604,7 @@ self: {
        executableHaskellDepends = [ base foundation ];
        executableSystemDepends = [ primesieve ];
        description = "FFI bindings for the primesieve library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) primesieve;};
 
   "primitive" = callPackage
@@ -204614,7 +205625,7 @@ self: {
          transformers-compat
        ];
        description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-addr" = callPackage
@@ -204625,7 +205636,7 @@ self: {
        sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2";
        libraryHaskellDepends = [ base primitive ];
        description = "Addresses to unmanaged memory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-atomic" = callPackage
@@ -204637,8 +205648,8 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        testHaskellDepends = [ base primitive primitive-unlifted ];
        description = "Wrappers for primops around atomic operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204650,8 +205661,8 @@ self: {
        sha256 = "1h4gsririgjw8p72dz2p91yq8mxr37qca8rshmxmkmmds8yv6w1s";
        libraryHaskellDepends = [ base primitive ];
        description = "primitive functions with bounds-checking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204677,8 +205688,8 @@ self: {
          base containers gauge ghc-prim primitive primitive-unlifted random
        ];
        description = "containers backed by arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204690,8 +205701,8 @@ self: {
        sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan";
        libraryHaskellDepends = [ primitive ];
        description = "convenience class for PrimMonad m/PrimState m";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204714,8 +205725,8 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
        ];
        description = "Extras for the \"primitive\" library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204728,8 +205739,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base primitive QuickCheck ];
        description = "using the `Prim` interface for the FFI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204741,8 +205752,8 @@ self: {
        sha256 = "0sbn3h426i6i609iyybar10lywpsklgfkzp355cg8dpfp4a3ibsf";
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204760,8 +205771,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Arrays of Maybes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204773,7 +205784,7 @@ self: {
        sha256 = "0aspdlzx1xaw1fyiy8vnzadbklpg7hn2mb1g9qmw2vpkxglpspmi";
        libraryHaskellDepends = [ base primitive ];
        description = "Types for offsets into unboxed arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-simd" = callPackage
@@ -204787,8 +205798,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204810,8 +205821,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204823,8 +205834,8 @@ self: {
        sha256 = "1kdrzam5m2svxrpa7k3byg061i5xs0lc6q12hwgiq6l09savql6j";
        libraryHaskellDepends = [ base primitive ];
        description = "primitive operations on StableNames";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204837,7 +205848,7 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base primitive ];
        description = "Unaligned access to primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-unlifted" = callPackage
@@ -204849,7 +205860,7 @@ self: {
        libraryHaskellDepends = [ base bytestring primitive text-short ];
        testHaskellDepends = [ base primitive stm ];
        description = "Primitive GHC types with unlifted types inside";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-unlifted_1_0_0_0" = callPackage
@@ -204868,8 +205879,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Primitive GHC types with unlifted types inside";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "primula-board" = callPackage
@@ -204892,7 +205903,7 @@ self: {
        ];
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204912,7 +205923,7 @@ self: {
        ];
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204929,8 +205940,8 @@ self: {
          unordered-containers vector vinyl
        ];
        description = "Classes and data structures complementing the singletons library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204945,7 +205956,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        executableHaskellDepends = [ base ];
        description = "Print all ANSI console colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "print-debugger" = callPackage
@@ -204956,8 +205967,8 @@ self: {
        sha256 = "10c4dsf0kz5ydbx5gr8dzcd280l6nj8dd6h77k56ggy5icnhx6p8";
        libraryHaskellDepends = [ base split ];
        description = "Debug print formatting library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204969,7 +205980,7 @@ self: {
        sha256 = "02wl9hq7jkz4yzkb744xwgnbss0w2sdpi02d3ms2q5rvc03ixnh6";
        libraryHaskellDepends = [ base ];
        description = "Can be used to coordinate the printing output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "printcess" = callPackage
@@ -204985,8 +205996,8 @@ self: {
          base containers hspec HUnit lens mtl QuickCheck transformers
        ];
        description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205002,7 +206013,7 @@ self: {
          base bytestring containers data-default template-haskell
        ];
        description = "A Perl printf like formatter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "printf-safe" = callPackage
@@ -205013,7 +206024,7 @@ self: {
        sha256 = "17bazxp86h96r12ca7mr1k7krh3zxh7dipgx5p6n8h08dgfsmijl";
        libraryHaskellDepends = [ base ];
        description = "Type safe interface for Text.Printf";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prints" = callPackage
@@ -205028,8 +206039,8 @@ self: {
          base hscolour pretty-show pretty-simple text transformers
        ];
        description = "The Artist Formerly Known as Prints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205043,7 +206054,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base xosd ];
        description = "Simple tool to display some text on an on-screen display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "priority-queue" = callPackage
@@ -205054,8 +206065,8 @@ self: {
        sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf";
        libraryHaskellDepends = [ base containers queue reord stateref ];
        description = "Simple implementation of a priority queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205073,7 +206084,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Cooperative task prioritization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "private-hackage-uploader" = callPackage
@@ -205091,7 +206102,7 @@ self: {
        ];
        executableHaskellDepends = [ base directory shelly text ];
        description = "Upload a package to the public or private hackage, building its docs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "privileged-concurrency" = callPackage
@@ -205106,7 +206117,7 @@ self: {
          base contravariant lifted-base stm unliftio unliftio-core
        ];
        description = "Provides privilege separated versions of the concurrency primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prizm" = callPackage
@@ -205124,7 +206135,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Convert colors to different color spaces, interpolate colors, and transform colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "probability" = callPackage
@@ -205138,7 +206149,7 @@ self: {
          base containers random transformers utility-ht
        ];
        description = "Probabilistic Functional Programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "probable" = callPackage
@@ -205158,8 +206169,8 @@ self: {
          base criterion mwc-random mwc-random-monad vector
        ];
        description = "Easy and reasonably efficient probabilistic programming and random generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205178,8 +206189,8 @@ self: {
          xformat
        ];
        description = "Parse process information for Linux";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205195,7 +206206,7 @@ self: {
          attoparsec base bytestring network unix
        ];
        description = "Parse /proc/net/{tcp,tcp6,udp,udp6}";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "process_1_6_10_0" = callPackage
@@ -205209,8 +206220,8 @@ self: {
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "process-conduit" = callPackage
@@ -205230,8 +206241,8 @@ self: {
          base bytestring conduit conduit-extra hspec resourcet
        ];
        description = "Conduits for processes (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205249,7 +206260,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Process extras";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "process-iterio" = callPackage
@@ -205267,8 +206278,8 @@ self: {
          base bytestring cpphs iterIO process transformers
        ];
        description = "IterIO Process Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205280,8 +206291,8 @@ self: {
        sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Process libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205298,8 +206309,8 @@ self: {
          base bytestring deepseq ListLike process text
        ];
        description = "Process extras";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205316,8 +206327,8 @@ self: {
          text time unix utf8-string
        ];
        description = "Run a process and do reportsing on its progress";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205334,8 +206345,8 @@ self: {
          template-haskell text
        ];
        description = "Quasi-Quoters for exec process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205367,8 +206378,8 @@ self: {
          void
        ];
        description = "Streaming interface to system processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205387,8 +206398,8 @@ self: {
          transformers
        ];
        description = "Web graphic applications with processing.js.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205405,7 +206416,7 @@ self: {
          transformers utf8-string vector-space
        ];
        description = "Computer graphics for kids and artists with Processing implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "processmemory" = callPackage
@@ -205416,8 +206427,8 @@ self: {
        sha256 = "12p7974x43w06jwaf7hlv2wxlgqnq9kb10mgjl9c4l7hbpbg3y0z";
        libraryHaskellDepends = [ base binary bytestring process ];
        description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205433,7 +206444,7 @@ self: {
          array attoparsec base bytestring containers deepseq mtl
        ];
        description = "a creation kit for instruction sets and cpu simulators and development tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "procrastinating-structure" = callPackage
@@ -205445,7 +206456,7 @@ self: {
        libraryHaskellDepends = [ base procrastinating-variable ];
        description = "Pure structures that can be incrementally created in impure code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "procrastinating-variable" = callPackage
@@ -205456,8 +206467,8 @@ self: {
        sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4";
        libraryHaskellDepends = [ base ];
        description = "Haskell values that cannot be evaluated immediately";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205469,8 +206480,8 @@ self: {
        sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "get information on processes in Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205489,7 +206500,7 @@ self: {
          base bytestring hspec HUnit process QuickCheck text
        ];
        description = "An IO library for testing interactive command line programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "producer" = callPackage
@@ -205506,8 +206517,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Simple streaming datatype";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205521,7 +206532,7 @@ self: {
        editedCabalFile = "0ssd2yc8c3h2y5yra8y49sphxwpj8jd7ss6h058nabld0hrbvjm2";
        libraryHaskellDepends = [ base category ];
        description = "Product category";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "product-isomorphic" = callPackage
@@ -205533,7 +206544,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-data-compat ];
        testHaskellDepends = [ base template-haskell ];
        description = "Weaken applicative functor on products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "product-profunctors" = callPackage
@@ -205552,7 +206563,7 @@ self: {
        testHaskellDepends = [ base profunctors ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "product-profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prof-flamegraph" = callPackage
@@ -205565,8 +206576,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Generate flamegraphs from ghc RTS .prof files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205582,8 +206593,8 @@ self: {
          base containers filepath haskell98 parsec
        ];
        description = "Convert GHC profiles into GraphViz's dot format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205602,8 +206613,8 @@ self: {
          base containers filepath haskell-src-exts semigroups uniplate zenc
        ];
        description = "generate pretty source from time/allocation profiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205622,7 +206633,7 @@ self: {
          scientific text
        ];
        description = "Restructure GHC profile reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profiteur" = callPackage
@@ -205642,9 +206653,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-arrows" = callPackage
@@ -205655,7 +206664,7 @@ self: {
        sha256 = "136d594l4magjibq44fs64bqafvcdy8jm2gijs6x1whpab0vl44k";
        libraryHaskellDepends = [ base comonad lawz profunctors ];
        description = "Profunctor arrows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -205667,7 +206676,7 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        doHaddock = false;
        description = "This package has been absorbed into profunctors 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-misc" = callPackage
@@ -205678,7 +206687,7 @@ self: {
        sha256 = "0akgx4gasd0p0skqrr29xdm0yp0dppzx21skk00is0lrwmldhqkg";
        libraryHaskellDepends = [ base comonad contravariant profunctors ];
        description = "Profunctor miscellany";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-monad" = callPackage
@@ -205694,8 +206703,8 @@ self: {
          base hashable mtl transformers unordered-containers
        ];
        description = "Monadic bidirectional programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205717,8 +206726,8 @@ self: {
        ];
        executableHaskellDepends = [ base doctest mtl ];
        description = "A compact optics library compatible with the typeclasses in profunctors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {coapplicative = null;};
 
@@ -205737,7 +206746,7 @@ self: {
          tagged transformers
        ];
        description = "Profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctors_5_6_1" = callPackage
@@ -205753,8 +206762,8 @@ self: {
          tagged transformers
        ];
        description = "Profunctors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "progress" = callPackage
@@ -205765,8 +206774,8 @@ self: {
        sha256 = "0cac4v6k2nrpglnf3680y334kw4k0s6xfm86wrfyszl5sq2a7w94";
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205778,8 +206787,8 @@ self: {
        sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6";
        libraryHaskellDepends = [ ansi-terminal async base stm ];
        description = "Live diagnostics for concurrent activity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205793,8 +206802,8 @@ self: {
        editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1";
        libraryHaskellDepends = [ base deepseq mtl time ];
        description = "Functionality for reporting function progress";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205808,8 +206817,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205826,8 +206835,8 @@ self: {
          txt-sushi
        ];
        description = "Automates the recording and graphing of criterion benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205846,8 +206855,8 @@ self: {
          process text
        ];
        description = "Multilabel classification model which learns sequentially (online)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205861,7 +206870,7 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) proj;};
 
@@ -205932,8 +206941,8 @@ self: {
          vector-binary-instances websockets winery
        ];
        description = "Relational Algebra Engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205955,7 +206964,7 @@ self: {
          QuickCheck resourcet text transformers
        ];
        description = "Specify Haskell project templates and generate files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "projectile" = callPackage
@@ -205974,8 +206983,8 @@ self: {
          tasty-hunit tasty-rerun text vector
        ];
        description = "Go to README.md";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205989,7 +206998,7 @@ self: {
        editedCabalFile = "02ykpvapl8ypzrggf0b6bdcy6wcwbkwrczhbq3ccc02282lv8pc0";
        libraryHaskellDepends = [ base ];
        description = "Projection function for arbitrarily nested binary product types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "projectroot" = callPackage
@@ -206001,7 +207010,7 @@ self: {
        libraryHaskellDepends = [ base directory ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to the projectroot C logic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "prolens" = callPackage
@@ -206017,8 +207026,8 @@ self: {
          base doctest hedgehog hspec hspec-hedgehog inspection-testing
        ];
        description = "Profunctor-based lightweight implementation of optics";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206035,7 +207044,7 @@ self: {
          transformers
        ];
        description = "A Prolog interpreter written in Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "prolog-graph" = callPackage
@@ -206052,8 +207061,8 @@ self: {
          base cmdargs fgl graphviz mtl prolog prolog-graph-lib text
        ];
        description = "A command line tool to visualize query resolution in Prolog";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206065,7 +207074,7 @@ self: {
        sha256 = "1qxikgryyh47zm0qwbsa7lpqmiphbl1askjjjc0rfr9dh5f0wclr";
        libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        description = "Generating images of resolution trees for Prolog queries";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "prologue" = callPackage
@@ -206090,30 +207099,31 @@ self: {
          transformers transformers-base typelevel vector
        ];
        description = "Better, more general Prelude exporting common utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "prolude" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava, containers
-     , generic-random, lens, mongoDB, mtl, network-uri, persistent
-     , persistent-mongoDB, QuickCheck, quickcheck-instances
-     , safe-exceptions, scientific, swagger2, text, time, uuid, vector
+    ({ mkDerivation, aeson, amazonka, base, bytestring, cassava
+     , containers, generic-random, lens, mongoDB, mtl, network-uri
+     , persistent, persistent-mongoDB, QuickCheck, quickcheck-instances
+     , safe-exceptions, scientific, servant, swagger2, text, time, uuid
+     , vector
      }:
      mkDerivation {
        pname = "prolude";
-       version = "0.0.0.14";
-       sha256 = "1lsr85ibkrdcmwg66iiazr3wksk66153l2wdlk583q71w2r5h6is";
+       version = "0.0.0.17";
+       sha256 = "1c98ybwv8jdswkx80q2wlxr7jqll6kyy07lyk2rc27phxb153slk";
        libraryHaskellDepends = [
-         aeson base bytestring cassava containers generic-random lens
-         mongoDB mtl network-uri persistent persistent-mongoDB QuickCheck
-         quickcheck-instances safe-exceptions scientific swagger2 text time
-         uuid vector
+         aeson amazonka base bytestring cassava containers generic-random
+         lens mongoDB mtl network-uri persistent persistent-mongoDB
+         QuickCheck quickcheck-instances safe-exceptions scientific servant
+         swagger2 text time uuid vector
        ];
        description = "ITProTV's custom prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206131,7 +207141,7 @@ self: {
          http-client-tls http-types network-uri text transformers wai warp
        ];
        description = "Prometheus Haskell Client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prometheus-client" = callPackage
@@ -206157,7 +207167,7 @@ self: {
          base bytestring criterion random text utf8-string
        ];
        description = "Haskell client library for http://prometheus.io.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "prometheus-effect" = callPackage
@@ -206184,8 +207194,8 @@ self: {
        testHaskellDepends = [ base text weigh ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Instrument applications with metrics and publish/push to Prometheus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206202,7 +207212,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "prometheus-proc" = callPackage
@@ -206218,7 +207228,7 @@ self: {
          unix unix-memory
        ];
        description = "Export metrics from /proc for the current process";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prometheus-wai-middleware" = callPackage
@@ -206238,7 +207248,7 @@ self: {
          async base http-types prometheus wai warp
        ];
        description = "Instrument a wai application with various metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "promise" = callPackage
@@ -206249,8 +207259,8 @@ self: {
        sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg";
        libraryHaskellDepends = [ async base ];
        description = "A monadic interface for async";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206262,7 +207272,7 @@ self: {
        sha256 = "0q7jjk9dqli4vi46j94gywxp0fp80b7r0k0g4ymyf8n12lcr0z5z";
        libraryHaskellDepends = [ base primitive ];
        description = "Lazy demand-driven promises";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prompt" = callPackage
@@ -206277,7 +207287,7 @@ self: {
          base base-compat mtl transformers transformers-compat
        ];
        description = "Monad (and transformer) for deferred-effect pure prompt-response queries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pronounce" = callPackage
@@ -206293,8 +207303,8 @@ self: {
          base binary containers filepath mtl safe text
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206306,8 +207316,8 @@ self: {
        sha256 = "1wcm5wxzqm4lq340l3ga15cmjfabpf8njnvma3zagwyhmndabxfw";
        libraryHaskellDepends = [ base ];
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206323,8 +207333,8 @@ self: {
          base colour containers directory filepath repa repa-devil spawn
        ];
        description = "Functional synthesis of images and animations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206336,7 +207346,7 @@ self: {
        sha256 = "00v1j1mv5dl6vivkfqv9w9jvw1jh3085mpkax5x0cyndhqcw027x";
        libraryHaskellDepends = [ base ];
        description = "A Simple Propagator Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "propellor" = callPackage
@@ -206358,7 +207368,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "property-based host configuration management in haskell";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "properties" = callPackage
@@ -206369,8 +207379,8 @@ self: {
        sha256 = "04a35zxgps9rn6y86x3jf6gma6kjl8izmnyl45hz64cl9yb5dwwi";
        libraryHaskellDepends = [ base ];
        description = "check quickCheck properties in real time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206382,7 +207392,7 @@ self: {
        sha256 = "1amgzvg7xp7i5ppxmyhh1dhbv4zgwwvg9cdrc719flsndxp4xvar";
        libraryHaskellDepends = [ base ];
        description = "common properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "property-list" = callPackage
@@ -206401,8 +207411,8 @@ self: {
          transformers vector xml
        ];
        description = "Apple property list parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206414,8 +207424,8 @@ self: {
        sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m";
        libraryHaskellDepends = [ base glade glib gtk ];
        description = "A library for functional GUI development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206428,7 +207438,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Reusable quickcheck properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prosidy" = callPackage
@@ -206455,8 +207465,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "A simple language for writing documents";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206473,8 +207483,8 @@ self: {
          prosidy text unordered-containers
        ];
        description = "A DSL for processing Prosidy documents";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206493,7 +207503,7 @@ self: {
          base deepseq free hspec inspection-testing kan-extensions
        ];
        description = "Explore continuations with trepidation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prosper" = callPackage
@@ -206510,8 +207520,8 @@ self: {
          io-streams mtl text transformers vector
        ];
        description = "Bindings to the Prosper marketplace API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206530,8 +207540,8 @@ self: {
        libraryPkgconfigDepends = [ libpulse libpulse-simple ];
        libraryToolDepends = [ c2hs ];
        description = "Simple audio library for Windows, Linux, OSX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libpulse = null; libpulse-simple = null; 
          inherit (pkgs) libpulseaudio;};
@@ -206549,7 +207559,9 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        libraryToolDepends = [ c2hs ];
        description = "Simple audio library for SDL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) SDL2;};
 
   "proteome" = callPackage
@@ -206588,8 +207600,8 @@ self: {
          unliftio utf8-string
        ];
        description = "neovim project manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206611,7 +207623,7 @@ self: {
          base bytestring QuickCheck tasty tasty-quickcheck vector
        ];
        description = "A lens-based implementation of protocol buffers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-arbitrary" = callPackage
@@ -206626,7 +207638,9 @@ self: {
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
        description = "Arbitrary instances for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto-lens-combinators" = callPackage
@@ -206647,8 +207661,8 @@ self: {
          proto-lens-runtime test-framework test-framework-hunit
        ];
        description = "Utilities functions to proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206665,8 +207679,8 @@ self: {
          lens-labels proto-lens text
        ];
        description = "Protocol buffers for describing the definitions of messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206683,7 +207697,7 @@ self: {
          proto-lens-runtime text vector
        ];
        description = "JSON protobuf encoding for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-optparse" = callPackage
@@ -206696,7 +207710,7 @@ self: {
          base optparse-applicative proto-lens text
        ];
        description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-protobuf-types" = callPackage
@@ -206714,7 +207728,7 @@ self: {
        ];
        libraryToolDepends = [ proto-lens-protoc protobuf ];
        description = "Basic protocol buffer message types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc" = callPackage
@@ -206735,7 +207749,7 @@ self: {
          lens-family pretty proto-lens proto-lens-runtime text
        ];
        description = "Protocol buffer compiler for the proto-lens library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-runtime" = callPackage
@@ -206751,7 +207765,7 @@ self: {
          text vector
        ];
        doHaddock = false;
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-setup" = callPackage
@@ -206767,7 +207781,7 @@ self: {
          proto-lens-protoc temporary text
        ];
        description = "Cabal support for codegen with proto-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto3-suite" = callPackage
@@ -206807,8 +207821,8 @@ self: {
          text transformers turtle vector
        ];
        description = "A low level library for writing out data in the Protocol Buffers wire format";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206832,7 +207846,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "proto3-wire_1_2_0" = callPackage
@@ -206845,6 +207859,8 @@ self: {
        pname = "proto3-wire";
        version = "1.2.0";
        sha256 = "1xrnrh4njnw6af8xxg9xhcxrscg0g644jx4l9an4iqz6xmjp2nk2";
+       revision = "1";
+       editedCabalFile = "14cjzgh364b836sg7szwrkvmm19hg8w57hdbsrsgwa7k9rhqi349";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq ghc-prim hashable
          parameterized primitive QuickCheck safe text transformers
@@ -206855,8 +207871,8 @@ self: {
          tasty-quickcheck text transformers vector
        ];
        description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "protobuf" = callPackage
@@ -206877,7 +207893,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck text unordered-containers
        ];
        description = "Google Protocol Buffers via GHC.Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protobuf-native" = callPackage
@@ -206900,8 +207916,8 @@ self: {
          protocol-buffers-fork QuickCheck text utf8-string
        ];
        description = "Protocol Buffers via C++";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206927,7 +207943,7 @@ self: {
          hspec parsec QuickCheck quickcheck-instances split text
        ];
        description = "Simple Protocol Buffers library (proto2)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "protocol" = callPackage
@@ -206938,8 +207954,8 @@ self: {
        sha256 = "16pbhfggw46jdjyljqr6dr0mlzmfhvwmw3lg1s5rp90zg4jgvha0";
        libraryHaskellDepends = [ base freer-indexed singletons ];
        description = "Model distributed system as type-level multi-party protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206957,7 +207973,7 @@ self: {
          directory filepath mtl parsec syb text utf8-string vector
        ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
@@ -206973,7 +207989,7 @@ self: {
          base bytestring containers protocol-buffers
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -206989,8 +208005,8 @@ self: {
          base bytestring containers protocol-buffers-fork
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207007,8 +208023,8 @@ self: {
          utf8-string
        ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207025,7 +208041,7 @@ self: {
          template-haskell text transformers
        ];
        description = "parser and printer for radius protocol packet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protocol-radius-test" = callPackage
@@ -207042,7 +208058,7 @@ self: {
        ];
        testHaskellDepends = [ base quickcheck-simple ];
        description = "testsuit of protocol-radius haskell package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protolude" = callPackage
@@ -207061,7 +208077,7 @@ self: {
          mtl mtl-compat stm text transformers transformers-compat
        ];
        description = "A small prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "protolude-lifted" = callPackage
@@ -207075,8 +208091,26 @@ self: {
          async base lifted-async lifted-base protolude
        ];
        description = "Protolude with lifted-base and lifted-async";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "proton" = callPackage
+    ({ mkDerivation, adjunctions, base, bifunctors, comonad
+     , compactable, containers, contravariant, distributive, linear, mtl
+     , profunctors, tagged
+     }:
+     mkDerivation {
+       pname = "proton";
+       version = "0.0.1";
+       sha256 = "0l3176d1vjvknns2dx7qnwi7n45mc6v4qx9iv3z4488msjfqx6gf";
+       libraryHaskellDepends = [
+         adjunctions base bifunctors comonad compactable containers
+         contravariant distributive linear mtl profunctors tagged
+       ];
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207095,8 +208129,8 @@ self: {
          test-framework-hunit
        ];
        description = "Simple XML templating library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207108,8 +208142,8 @@ self: {
        sha256 = "1kzinhdy622gzg3mzfln15vgi890i2l3lkrgrw0n0yb08r2n53i7";
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207130,8 +208164,8 @@ self: {
          unordered-containers wai warp
        ];
        description = "The server for ProveEverywhere";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207150,8 +208184,8 @@ self: {
          time
        ];
        description = "Computations that automatically track data dependencies";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207163,7 +208197,7 @@ self: {
        sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r";
        libraryHaskellDepends = [ base ];
        description = "Make functions consume Proxy instead of undefined";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proxy" = callPackage
@@ -207174,7 +208208,7 @@ self: {
        sha256 = "1465mvkdq9cv202sj2hiwa8a2a07906dww2msan235fvkrnhj9jz";
        libraryHaskellDepends = [ base ];
        description = "proxy helpers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "proxy-kindness" = callPackage
@@ -207185,8 +208219,8 @@ self: {
        sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7";
        libraryHaskellDepends = [ base tagged ];
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207198,8 +208232,8 @@ self: {
        sha256 = "12lwn64znci7l5l7sa3g7hm0rmnjvykci7k65mz5c2zdwx3zgvdd";
        libraryHaskellDepends = [ base ];
        description = "Mapping of Proxy Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207229,8 +208263,8 @@ self: {
          base containers hspec monad-logger mtl stm
        ];
        description = "Language support for the PureScript programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207255,8 +208289,8 @@ self: {
          tasty-th temporary
        ];
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207270,8 +208304,8 @@ self: {
        editedCabalFile = "1xc7acqd7zss6zd2n43n0kd5qiv1i8m5wlnskrw5sdj7i1ddsrj5";
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207283,7 +208317,7 @@ self: {
        sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9";
        libraryHaskellDepends = [ base template-haskell time ];
        description = "cpp-style built-in macros using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "psi" = callPackage
@@ -207296,7 +208330,7 @@ self: {
          base bytestring deepseq semigroups text
        ];
        description = "Yet another custom Prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "psql-helpers" = callPackage
@@ -207307,7 +208341,7 @@ self: {
        sha256 = "1x0r68mfv56rp87j8ick875wbq3qzkii9ia60amx6xr40x1acg7i";
        libraryHaskellDepends = [ base postgresql-simple ];
        description = "A small collection of helper functions to generate postgresql queries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "psql-utils" = callPackage
@@ -207322,7 +208356,7 @@ self: {
          aeson base hashable postgresql-simple resource-pool time
        ];
        description = "PostgreSQL Simple util tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "psqueues" = callPackage
@@ -207347,7 +208381,7 @@ self: {
          hashable mtl PSQueue random unordered-containers
        ];
        description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pstemmer" = callPackage
@@ -207361,7 +208395,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
        description = "A Haskell Implementation of the Porter Stemmer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pthread" = callPackage
@@ -207374,7 +208408,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings for the pthread library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ptr" = callPackage
@@ -207394,7 +208428,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Abstractions for operations on pointers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ptr-poker" = callPackage
@@ -207403,14 +208437,14 @@ self: {
      }:
      mkDerivation {
        pname = "ptr-poker";
-       version = "0.1.1.2";
-       sha256 = "06h267z01cvk2sck7ycbi8vssg4985nh7cxx2mw92hiqj1kqp0gp";
+       version = "0.1.1.3";
+       sha256 = "1qrcsci4jccx4l1zlpqr202jl2dhpmcbbq94gfgdax80q8js3yrq";
        libraryHaskellDepends = [ base bytestring scientific text ];
        testHaskellDepends = [ hedgehog numeric-limits rerebase ];
        benchmarkHaskellDepends = [ gauge rerebase ];
        description = "Pointer poking action construction and composition toolkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207429,7 +208463,7 @@ self: {
          base bytestring hedis optparse-generic pipes pipes-bytestring text
        ];
        description = "Pipe stdin to a redis pub/sub channel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "publicsuffix" = callPackage
@@ -207444,7 +208478,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -207463,7 +208497,7 @@ self: {
          utf8-string
        ];
        description = "Is a given string a domain suffix?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "publicsuffixlistcreate" = callPackage
@@ -207480,8 +208514,8 @@ self: {
        ];
        testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        description = "Create the publicsuffixlist package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207509,8 +208543,8 @@ self: {
          unordered-containers
        ];
        description = "Publishing tools for papers, books, and presentations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207543,8 +208577,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "PubNub Haskell SDK";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207563,8 +208597,8 @@ self: {
        ];
        executableHaskellDepends = [ fastcgi ];
        description = "A library for Google/SixApart pubsub hub interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207594,8 +208628,8 @@ self: {
          test-framework-quickcheck2 text time vector
        ];
        description = "A CLI assistant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207612,8 +208646,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "pugixml binding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207637,8 +208671,8 @@ self: {
          pretty random stm utf8-string
        ];
        description = "DrIFT with pugs-specific rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207652,7 +208686,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pugs-compat" = callPackage
@@ -207671,8 +208705,8 @@ self: {
          syb time unix utf8-string
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207684,8 +208718,8 @@ self: {
        sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i";
        libraryHaskellDepends = [ array base haskell98 ];
        description = "Haskell PCRE binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207697,7 +208731,7 @@ self: {
        sha256 = "0npq49hm17h3p7acmvbg10qkqx74asbk3f6c2rlw7zaa1zhb9r6d";
        libraryHaskellDepends = [ async base containers time ];
        description = "Synchronize actions to a time pulse";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pulse-simple" = callPackage
@@ -207709,7 +208743,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libpulseaudio;};
 
   "pulseaudio" = callPackage
@@ -207723,7 +208757,7 @@ self: {
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
@@ -207741,8 +208775,8 @@ self: {
          base mtl regex-tdfa tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Multilingual unsupervised sentence tokenization with Punkt";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207759,7 +208793,7 @@ self: {
          base bytestring cereal encoding HUnit mtl QuickCheck text
        ];
        description = "Encode unicode strings to ascii forms according to RFC 3492";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "puppetresources" = callPackage
@@ -207777,8 +208811,8 @@ self: {
          mtl text
        ];
        description = "A program that displays the puppet resources associated to a node given .pp files.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207797,8 +208831,8 @@ self: {
          base bytestring containers mtl test-simple Unixutils vector
        ];
        description = "Another pure-haskell CDB (Constant Database) implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207810,7 +208844,7 @@ self: {
        sha256 = "1zzravfgxbx07c38pf0p73a9nzjk2pbq3hzfw8v9zkqj95b3l94i";
        libraryHaskellDepends = [ base ];
        description = "Fast Fourier Transform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pure-io" = callPackage
@@ -207823,8 +208857,8 @@ self: {
        editedCabalFile = "04r055y62f46lxhm4wbfmdk115fslw7lapw06r16lzb1l48m0phj";
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207836,8 +208870,8 @@ self: {
        sha256 = "125vnkjx6n7pgflk9iqg7b6daw55a1rdfi9pfgp39ikfcx9vhb3p";
        libraryHaskellDepends = [ base containers ];
        description = "A pure priority queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207856,8 +208890,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Tests for the pure-priority-queue package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207873,7 +208907,7 @@ self: {
        testHaskellDepends = [
          base hspec mono-traversable QuickCheck random-shuffle transformers
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pure-zlib" = callPackage
@@ -207898,7 +208932,9 @@ self: {
        ];
        benchmarkHaskellDepends = [ base base-compat bytestring time ];
        description = "A Haskell-only implementation of zlib / DEFLATE";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "pureMD5" = callPackage
@@ -207918,7 +208954,7 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "purebred-email" = callPackage
@@ -207945,7 +208981,7 @@ self: {
          tasty-hedgehog tasty-hunit tasty-quickcheck text time
        ];
        description = "types and parser for email messages (including MIME)";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "purescheme-wai-routing-core" = callPackage
@@ -207967,8 +209003,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Simple Routing functions for Wai Applications";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208041,8 +209077,8 @@ self: {
        testToolDepends = [ happy hspec-discover ];
        doCheck = false;
        description = "PureScript Programming Language Compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208063,7 +209099,7 @@ self: {
          base containers hspec hspec-expectations-pretty-diff text
        ];
        description = "Generate PureScript data types from Haskell data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -208080,7 +209116,7 @@ self: {
          base containers directory filepath optparse-applicative text vector
        ];
        description = "A fast alternative to Purescript's `psc-bundle` to be used during development";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "purescript-iso" = callPackage
@@ -208109,8 +209145,8 @@ self: {
          zeromq4-simple
        ];
        description = "Isomorphic trivial data type definitions over JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208133,8 +209169,8 @@ self: {
          optparse-applicative purescript text
        ];
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208151,7 +209187,7 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "A cli client for pursuit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "push-notifications" = callPackage
@@ -208170,8 +209206,8 @@ self: {
          resourcet text time transformers
        ];
        description = "Push notifications for Android and iOS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208195,8 +209231,8 @@ self: {
          tls-extra transformers unordered-containers xml-conduit
        ];
        description = "A server-side library for sending push notifications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208222,8 +209258,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208243,8 +209279,8 @@ self: {
          stm text tls tls-extra unordered-containers xml-types
        ];
        description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208263,8 +209299,8 @@ self: {
          unordered-containers xml-conduit yesod
        ];
        description = "A general library for sending/receiving push notif. through dif. services.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208281,7 +209317,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Simple push support for pushbullet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pushbullet-types" = callPackage
@@ -208297,7 +209333,7 @@ self: {
          time unordered-containers
        ];
        description = "Datatypes used by the Pushbullet APIs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pusher-haskell" = callPackage
@@ -208313,8 +209349,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A Pusher.com client written in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208336,7 +209372,7 @@ self: {
          aeson base bytestring hspec QuickCheck text unordered-containers
        ];
        description = "Haskell client library for the Pusher Channels HTTP API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pusher-ws" = callPackage
@@ -208355,8 +209391,8 @@ self: {
          unordered-containers websockets wuss
        ];
        description = "Implementation of the Pusher WebSocket protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208382,8 +209418,8 @@ self: {
          transformers unix unordered-containers yaml
        ];
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208404,7 +209440,7 @@ self: {
          base bytestring http-client tasty tasty-hunit text time
        ];
        description = "A Haskell Pushover API library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "putlenses" = callPackage
@@ -208420,8 +209456,8 @@ self: {
          template-haskell transformers
        ];
        description = "Put-based lens library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208453,8 +209489,8 @@ self: {
          tasty tasty-hspec tasty-hunit text yaml
        ];
        description = "Creating graphics for pencil puzzles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208473,8 +209509,8 @@ self: {
          puzzle-draw yaml
        ];
        description = "Creating graphics for pencil puzzles, command line tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208493,7 +209529,7 @@ self: {
          async base deepseq genvalidity hspec primitive QuickCheck
        ];
        description = "Mutable variable with primitive values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pvd" = callPackage
@@ -208512,8 +209548,8 @@ self: {
        ];
        executableSystemDepends = [ libdevil ];
        description = "A photo viewer daemon application with remote controlling abilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -208537,7 +209573,7 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ];
        description = "Public Verifiable Secret Sharing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pwstore-cli" = callPackage
@@ -208558,7 +209594,7 @@ self: {
          test-framework-hunit
        ];
        description = "Command line interface for the pwstore library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "pwstore-fast" = callPackage
@@ -208573,7 +209609,7 @@ self: {
          base base64-bytestring binary byteable bytestring cryptohash random
        ];
        description = "Secure password storage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pwstore-purehaskell" = callPackage
@@ -208588,7 +209624,7 @@ self: {
          base base64-bytestring byteable bytestring random SHA
        ];
        description = "Secure password storage, in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pxsl-tools" = callPackage
@@ -208618,8 +209654,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python;};
 
@@ -208636,8 +209672,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python;};
 
@@ -208661,8 +209697,8 @@ self: {
          test-framework-hunit
        ];
        description = "Serialization/deserialization using Python Pickle format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208681,8 +209717,8 @@ self: {
          base doctest lens lens-properties tasty tasty-quickcheck
        ];
        description = "Efficient alternating finger trees";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208696,8 +209732,8 @@ self: {
          base fclabels QuickCheck template-haskell
        ];
        description = "Compile time generation of operation invariance tests for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208714,7 +209750,7 @@ self: {
        executableHaskellDepends = [ base hmatrix ];
        testHaskellDepends = [ base hmatrix linear tasty tasty-hunit ];
        description = "A library for implementing Quantum Algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qd" = callPackage
@@ -208726,8 +209762,8 @@ self: {
        libraryHaskellDepends = [ base floatshow ];
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {qd = null;};
 
@@ -208739,8 +209775,8 @@ self: {
        sha256 = "0lj5kg0sjkck89phvi239xb2k7hxmxg9dh7yg2df2iaj4c2m2ync";
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208759,8 +209795,8 @@ self: {
        ];
        testHaskellDepends = [ base transformers ];
        description = "Simple prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208784,8 +209820,8 @@ self: {
          process simple-sql-parser split sqlite-simple syb text zlib
        ];
        description = "Command line tool qhs, SQL queries on CSV and TSV files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208798,8 +209834,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ qhull ];
        description = "Simple bindings to Qhull, a library for computing convex hulls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) qhull;};
 
@@ -208819,8 +209855,8 @@ self: {
          tasty-quickcheck text time
        ];
        description = "A simple QIF file format parser / printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208841,8 +209877,8 @@ self: {
          template-haskell
        ];
        description = "Typesafe library for linear algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208859,7 +209895,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Implementation of interpolated multiline strings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "qnap-decrypt" = callPackage
@@ -208890,7 +209926,7 @@ self: {
          temporary utf8-string
        ];
        description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qq-literals" = callPackage
@@ -208904,7 +209940,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base network-uri template-haskell ];
        description = "Compile-time checked literal values via QuasiQuoters";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "qr-imager" = callPackage
@@ -208923,8 +209959,8 @@ self: {
        libraryPkgconfigDepends = [ qrencode ];
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) qrencode;};
 
@@ -208944,8 +209980,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring ];
        description = "Library to generate QR codes from bytestrings and objects and scale image files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208958,7 +209994,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers mtl vector ];
        description = "QR Code library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qrcode-core" = callPackage
@@ -208974,7 +210010,7 @@ self: {
          text vector
        ];
        description = "QR code library in pure Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "qrcode-juicypixels" = callPackage
@@ -208990,7 +210026,7 @@ self: {
          vector
        ];
        description = "Converts a qrcode-core image to JuicyPixels";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "qsem" = callPackage
@@ -209001,8 +210037,8 @@ self: {
        sha256 = "1y9c22jr0frflgzmpzpz4d7zgcz7wbql8xwr6bx912rh6gm4gx9h";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "quantity semaphores";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209020,7 +210056,7 @@ self: {
        ];
        description = "Qt bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {qtc_core = null; qtc_gui = null; qtc_network = null; 
          qtc_opengl = null; qtc_script = null; qtc_tools = null;};
 
@@ -209036,8 +210072,8 @@ self: {
        libraryHaskellDepends = [ base process qtah-generator ];
        librarySystemDepends = [ qtbase ];
        description = "Qt bindings for Haskell - C++ library";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
@@ -209055,8 +210091,8 @@ self: {
          base binary bytestring containers filepath hoppy-runtime qtah-qt5
        ];
        description = "Example programs for Qtah Qt bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209079,8 +210115,8 @@ self: {
        ];
        doHaddock = false;
        description = "Generator for Qtah Qt bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209100,8 +210136,8 @@ self: {
        libraryToolDepends = [ qtbase ];
        testHaskellDepends = [ base hoppy-runtime HUnit ];
        description = "Qt bindings for Haskell";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
@@ -209115,7 +210151,7 @@ self: {
          aeson attoparsec base http-types mtl text
        ];
        description = "Convenience parser combinators for URI query strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quadratic-irrational" = callPackage
@@ -209135,7 +210171,7 @@ self: {
          tasty tasty-quickcheck
        ];
        description = "An implementation of quadratic irrationals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quandl-api" = callPackage
@@ -209152,7 +210188,7 @@ self: {
          text time time-locale-compat unordered-containers
        ];
        description = "Quandl.com API library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quantfin" = callPackage
@@ -209171,8 +210207,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Quant finance library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209191,8 +210227,8 @@ self: {
          unordered-containers vector
        ];
        description = "Rage against the quantification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209213,7 +210249,7 @@ self: {
          regex-compat
        ];
        description = "Unit conversion and manipulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quantum-arrow" = callPackage
@@ -209225,7 +210261,7 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209248,8 +210284,8 @@ self: {
        executableHaskellDepends = [ base haskeline mtl ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Retrieve, store and manage real quantum random data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209271,8 +210307,8 @@ self: {
          servant-server stm text time uuid wai wai-extra warp warp-tls
        ];
        description = "Coronavirus quarantine timer web app for your things";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209291,8 +210327,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Quite Useless DB";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209315,8 +210351,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Quenya verb conjugator";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209336,8 +210372,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209354,8 +210390,8 @@ self: {
          unordered-containers
        ];
        description = "Demo package containing queryparser examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209375,8 +210411,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "Parsing for Hive SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209396,8 +210432,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "Parsing for Presto SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209417,8 +210453,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "Parsing for Vertica SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209437,7 +210473,7 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from query strings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "questioner" = callPackage
@@ -209452,8 +210488,8 @@ self: {
          ansi-terminal base readline terminal-size
        ];
        description = "A package for prompting values from the command-line";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209465,7 +210501,7 @@ self: {
        sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7";
        libraryHaskellDepends = [ base stm ];
        description = "Abstraction typeclasses for queue-like things";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "queuelike" = callPackage
@@ -209476,8 +210512,8 @@ self: {
        sha256 = "0nvs9ln55wrczpn948i4z110rbfp0rv2wv8iz94lbyxhilhyjf1z";
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209489,7 +210525,7 @@ self: {
        sha256 = "1bccyvm300bkm3n98ayjc3syfcakjnf26bs2mdqdjimdfw2f0g6n";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generator random test data for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quick-schema" = callPackage
@@ -209508,8 +210544,8 @@ self: {
          vector
        ];
        description = "Slimmed down json schema language and validator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209531,7 +210567,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "quick & easy benchmarking of command-line programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209550,8 +210586,8 @@ self: {
          thyme yaml
        ];
        description = "QuickBooks API binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209568,7 +210604,7 @@ self: {
          base hspec lens QuickCheck template-haskell transformers
        ];
        description = "Generic typeclasses for generating arbitrary ADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-arbitrary-template" = callPackage
@@ -209585,8 +210621,8 @@ self: {
          tasty-quickcheck template-haskell
        ];
        description = "Generate QuickCheck Gen for Sum Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209599,7 +210635,7 @@ self: {
        libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ];
        testHaskellDepends = [ base hspec ieee754 QuickCheck ];
        description = "HUnit like assertions for QuickCheck";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "quickcheck-classes" = callPackage
@@ -209622,7 +210658,7 @@ self: {
          semigroupoids tagged tasty tasty-quickcheck transformers vector
        ];
        description = "QuickCheck common typeclasses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-classes-base" = callPackage
@@ -209638,7 +210674,7 @@ self: {
          QuickCheck tagged transformers
        ];
        description = "QuickCheck common typeclasses from `base`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-combinators" = callPackage
@@ -209648,7 +210684,7 @@ self: {
        version = "0.0.5";
        sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-enum-instances" = callPackage
@@ -209659,7 +210695,7 @@ self: {
        sha256 = "117lpk15z288ad1bzakwf1z0jcdm7w5c0584lzwpgkmgqr3jgzdc";
        libraryHaskellDepends = [ base enum-types QuickCheck ];
        description = "arbitrary instances for small enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-higherorder" = callPackage
@@ -209675,7 +210711,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck test-fun ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "QuickCheck extension for higher-order properties";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-instances" = callPackage
@@ -209687,8 +210723,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-instances";
-       version = "0.3.25.1";
-       sha256 = "06gg3y56ws1bc9yz00fmm0i5vrmqd2mqlxnbxp676yksfyr80qxd";
+       version = "0.3.25.2";
+       sha256 = "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h";
        libraryHaskellDepends = [
          array base bytestring case-insensitive containers data-fix hashable
          integer-logarithms old-time QuickCheck scientific splitmix strict
@@ -209700,7 +210736,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring QuickCheck ];
        description = "Common quickcheck instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-io" = callPackage
@@ -209711,7 +210747,7 @@ self: {
        sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        description = "Use HUnit assertions as QuickCheck properties";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-poly" = callPackage
@@ -209727,8 +210763,8 @@ self: {
          regex-tdfa
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209740,7 +210776,7 @@ self: {
        sha256 = "0hr61w1wpah1p4h87iz17aby53ysa8waqsl0als8b69in0zyv29w";
        libraryHaskellDepends = [ base ];
        description = "QuickCheck properties for standard type classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-property-comb" = callPackage
@@ -209751,8 +210787,8 @@ self: {
        sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5";
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Combinators for Quickcheck Property construction and diagnostics";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209764,8 +210800,8 @@ self: {
        sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c";
        libraryHaskellDepends = [ base either QuickCheck transformers ];
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209781,8 +210817,8 @@ self: {
          base containers QuickCheck regex-genex regex-tdfa
        ];
        description = "Generate regex-constrained strings for QuickCheck";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209798,8 +210834,8 @@ self: {
          base hxt hxt-relaxng QuickCheck quickcheck-regex
        ];
        description = "Generate RelaxNG-constrained XML documents for QuickCheck";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209812,8 +210848,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck rematch ];
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        description = "QuickCheck support for rematch";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209829,8 +210865,8 @@ self: {
          base lens QuickCheck template-haskell th-printf
        ];
        description = "Customizable reports for quickcheck properties";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209844,7 +210880,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory process QuickCheck ];
        description = "Automated test tool for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-simple" = callPackage
@@ -209855,7 +210891,7 @@ self: {
        sha256 = "0ah32y1p39p3d0696zp4mlf4bj67ggh73sb8nvf21snkwll86dai";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-special" = callPackage
@@ -209868,7 +210904,7 @@ self: {
        editedCabalFile = "1whwmij115vw0qwkzlkc4z4yhj7iwwqjhf5aaxn5np0gh2gzihb3";
        libraryHaskellDepends = [ base QuickCheck special-values ];
        description = "Edge cases and special values for QuickCheck Arbitrary instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-state-machine" = callPackage
@@ -209905,8 +210941,8 @@ self: {
          tree-diff unliftio unliftio-core vector wai warp
        ];
        description = "Test monadic programs using state machine based models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209930,8 +210966,8 @@ self: {
          strict tasty tasty-quickcheck temporary
        ];
        description = "Test monadic programs using state machine based models";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209941,14 +210977,16 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-string-random";
-       version = "0.1.3.0";
-       sha256 = "0pyh2xa68d6jhca1lr5ymmxqs19m17hjxdlrplyl0pww65mfrj8d";
+       version = "0.1.4.0";
+       sha256 = "08ikiqgzhizg4acv9kba6glwa47xzpdzrpzcz95kcw7b90q9qqp9";
        libraryHaskellDepends = [ base QuickCheck string-random text ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck text
        ];
        description = "Helper to build generators with Text.StringRandom";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-text" = callPackage
@@ -209960,7 +210998,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring QuickCheck text ];
        testHaskellDepends = [ base bytestring QuickCheck text ];
        description = "Alternative arbitrary instance for Text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-transformer" = callPackage
@@ -209971,7 +211009,7 @@ self: {
        sha256 = "0al0p44qi9j829zcnv43kqf4pxaxr6fb48vkq1an15hdk6svx11j";
        libraryHaskellDepends = [ base QuickCheck random transformers ];
        description = "A GenT monad transformer for QuickCheck library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-unicode" = callPackage
@@ -209982,7 +211020,7 @@ self: {
        sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generator and shrink functions for testing Unicode-related software";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "quickcheck-webdriver" = callPackage
@@ -209993,8 +211031,8 @@ self: {
        sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h";
        libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        description = "Utilities for using WebDriver with QuickCheck";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210006,7 +211044,7 @@ self: {
        sha256 = "0shigzw0r59cwa22f56522qfv0lsaq1z2861lgy1lhhclzswr6zg";
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Get counterexamples from QuickCheck as Haskell values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickjs-hs" = callPackage
@@ -210017,8 +211055,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickjs-hs";
-       version = "0.1.2.3";
-       sha256 = "1azd2173hwij0z2qxn4k6fi7bkiyaar0q751z15byhbdzil7pf1d";
+       version = "0.1.2.4";
+       sha256 = "18b9yp87v94bcjy68jip2n31f5hajn0509p9z7yhgv8647pdvnx7";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions inline-c mtl scientific
          string-conv text time transformers unliftio-core
@@ -210029,7 +211067,7 @@ self: {
          tasty-quickcheck text unordered-containers vector
        ];
        description = "Wrapper for the QuickJS Javascript Engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quicklz" = callPackage
@@ -210046,7 +211084,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "QuickLZ compression for ByteStrings";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "quickpull" = callPackage
@@ -210061,8 +211099,8 @@ self: {
        executableHaskellDepends = [ base directory filepath QuickCheck ];
        testHaskellDepends = [ base directory filepath QuickCheck ];
        description = "Generate Main module with QuickCheck tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210077,7 +211115,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base doctest QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion random vector ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickset" = callPackage
@@ -210088,8 +211126,8 @@ self: {
        sha256 = "0xiw57wi9z567nmp4h0vfcw3sr9dciy29jadn47bvi3q278v7zdy";
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210101,7 +211139,7 @@ self: {
        sha256 = "1aa56ng45la91kd40hvqmg5mdprmw7mdgg0zjfz0l71qg2yka14a";
        libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
        description = "Quick JSON extractions with Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickspec" = callPackage
@@ -210119,7 +211157,7 @@ self: {
          twee-lib uglymemo
        ];
        description = "Equational laws for free!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickterm" = callPackage
@@ -210137,7 +211175,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "An interface for describing and executing terminal applications";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "quicktest" = callPackage
@@ -210152,8 +211190,8 @@ self: {
          base directory haskell98 mtl process
        ];
        description = "A reflective batch tester for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210172,8 +211210,8 @@ self: {
          servant-server text warp
        ];
        description = "A quick webapp generator for any file processing tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210186,7 +211224,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Generic deriving of Read/Show with no record labels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quipper" = callPackage
@@ -210202,8 +211240,8 @@ self: {
        ];
        doHaddock = false;
        description = "Meta-package for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210227,8 +211265,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A set of algorithms implemented in Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210244,8 +211282,8 @@ self: {
        ];
        doHaddock = false;
        description = "Meta-package for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210257,8 +211295,8 @@ self: {
        sha256 = "0kj7836h61h13kw4k74wfa96pr0w12k32mmmy0ry43wmk56zy318";
        libraryHaskellDepends = [ base Cabal process quipper-language ];
        description = "Some functions to aid in the creation of Cabal packages for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210274,8 +211312,8 @@ self: {
          base containers mtl primes random template-haskell
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210296,8 +211334,8 @@ self: {
        ];
        doHaddock = false;
        description = "Miscellaneous code snippets that illustrate various Quipper features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210318,8 +211356,8 @@ self: {
        ];
        executableHaskellDepends = [ base process ];
        description = "Quipper, an embedded functional programming language for quantum computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210342,8 +211380,8 @@ self: {
          quipper-utils random
        ];
        description = "The standard libraries for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210360,8 +211398,8 @@ self: {
          quipper-core random template-haskell unix
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210383,8 +211421,8 @@ self: {
        ];
        doHaddock = false;
        description = "Miscellaneous stand-alone tools for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210401,8 +211439,8 @@ self: {
          base containers mtl newsynth process random template-haskell unix
        ];
        description = "Utility libraries for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210414,8 +211452,8 @@ self: {
        sha256 = "1gg02lnrd2c1wq8zhbj8n355v23ijzm5nj0jyply91sppjma9w7x";
        libraryHaskellDepends = [ base mmorph transformers ];
        description = "Quiver finite stream processing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210432,8 +211470,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
        description = "Binary serialisation support for Quivers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210445,8 +211483,8 @@ self: {
        sha256 = "1iwp6z76n2iramd21l2j9gvsqzq3j90qprblscp1yvk73fq4vcmz";
        libraryHaskellDepends = [ base bytestring quiver ];
        description = "Quiver combinators for bytestring streaming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210458,8 +211496,8 @@ self: {
        sha256 = "0l8c5vhhbjlijvx27mda62y6sq6lr7irva6c47fhvf26zfgx41p8";
        libraryHaskellDepends = [ base data-cell quiver ];
        description = "Quiver combinators for cellular data processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210475,8 +211513,8 @@ self: {
          base bytestring data-cell quiver quiver-bytestring
        ];
        description = "Quiver combinators for cellular CSV data processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210488,8 +211526,8 @@ self: {
        sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp";
        libraryHaskellDepends = [ base enumerator quiver ];
        description = "Bridge between Quiver and Iteratee paradigms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210502,8 +211540,8 @@ self: {
        libraryHaskellDepends = [ base dlist quiver ];
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Group and chunk values within a Quiver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210521,8 +211559,8 @@ self: {
          base bytestring http-client http-client-tls quiver
        ];
        description = "Adapter to stream over HTTP(s) with quiver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210538,8 +211576,8 @@ self: {
          base exceptions quiver resourcet transformers transformers-base
        ];
        description = "Extra instances for Quiver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210552,8 +211590,8 @@ self: {
        libraryHaskellDepends = [ base quiver ];
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Interleave values from multiple Quivers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210577,8 +211615,8 @@ self: {
          quiver-instances resourcet temporary transformers
        ];
        description = "Sort the values in a quiver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210597,8 +211635,8 @@ self: {
          base hspec postgresql-simple raw-strings-qq text
        ];
        description = "Test helpers which help generate data for projects that use postgresql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210623,8 +211661,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit mtl ];
        description = "A Quoridor implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210640,7 +211678,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base template-haskell ];
        description = "Divide without division";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qux" = callPackage
@@ -210658,29 +211696,31 @@ self: {
          llvm-general mtl optparse-applicative pretty
        ];
        description = "Command line binary for working with the Qux language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "r-glpk-phonetic-languages-ukrainian-durations" = callPackage
-    ({ mkDerivation, base, lists-flines, mmsyn2
-     , ukrainian-phonetics-basic, vector
+    ({ mkDerivation, base, foldable-ix, lists-flines, mmsyn2-array
+     , ukrainian-phonetics-basic-array
      }:
      mkDerivation {
        pname = "r-glpk-phonetic-languages-ukrainian-durations";
-       version = "0.2.2.0";
-       sha256 = "1svwml88hfnpdgbnny8nzga9gxnmgjggnkks8gz9dplcf8w1w39d";
+       version = "0.3.0.0";
+       sha256 = "0x4i2qj1zq9r2641bwrx2x18c61ziddf8p10hfgz6hr449h6w5v3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base lists-flines mmsyn2 ukrainian-phonetics-basic vector
+         base foldable-ix lists-flines mmsyn2-array
+         ukrainian-phonetics-basic-array
        ];
        executableHaskellDepends = [
-         base lists-flines mmsyn2 ukrainian-phonetics-basic vector
+         base foldable-ix lists-flines mmsyn2-array
+         ukrainian-phonetics-basic-array
        ];
        description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "r3x-haskell-sdk" = callPackage
@@ -210706,7 +211746,7 @@ self: {
          aeson base blaze-html bytestring case-insensitive containers cookie
          http-types mtl regex-pcre text transformers wai warp
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "raaz" = callPackage
@@ -210732,8 +211772,8 @@ self: {
          pretty
        ];
        description = "The raaz cryptographic library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210763,8 +211803,8 @@ self: {
        sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d";
        libraryHaskellDepends = [ array base containers data-reify ];
        description = "Reverse Automatic Differentiation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210779,8 +211819,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [ base HUnit lens ];
        description = "Isomorphisms for measurements that use radians";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210797,8 +211837,8 @@ self: {
          base Cabal containers hspec lens parsec QuickCheck
        ];
        description = "Chemistry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210814,8 +211854,8 @@ self: {
          base Cabal containers hspec parsec QuickCheck
        ];
        description = "Chemistry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210831,7 +211871,7 @@ self: {
          base binary bytestring cryptonite iproute lens memory
        ];
        description = "Remote Authentication Dial In User Service (RADIUS)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "radix" = callPackage
@@ -210844,8 +211884,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath ];
        description = "Command-line tool for emitting numbers in various bases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210870,7 +211910,7 @@ self: {
          unordered-containers
        ];
        description = "Radix tree data structive over short byte-strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "radixtree" = callPackage
@@ -210891,7 +211931,7 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base criterion deepseq QuasiText text vector
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rados-haskell" = callPackage
@@ -210914,8 +211954,8 @@ self: {
          async base bytestring criterion mtl transformers
        ];
        description = "librados haskell bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {rados = null;};
 
@@ -210934,8 +211974,8 @@ self: {
          tostring zlib
        ];
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210958,8 +211998,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit process ];
        description = "Compiler and editor for the esolang rail";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210983,8 +212023,8 @@ self: {
          transformers vector
        ];
        description = "Decrypt Ruby on Rails sessions in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211000,7 +212040,7 @@ self: {
          base bytestring lens QuickCheck terminfo text
        ];
        description = "Print text to terminal with colors and effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rainbow-tests" = callPackage
@@ -211015,8 +212055,8 @@ self: {
          barecheck base QuickCheck rainbow terminfo text
        ];
        description = "Tests and QuickCheck generators to accompany rainbow";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211036,7 +212076,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Two-dimensional box pretty printing, with colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rake" = callPackage
@@ -211077,8 +212117,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "distributed-process node";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211095,8 +212135,8 @@ self: {
          transformers vector zlib
        ];
        description = "Stream based PDF library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211121,8 +212161,8 @@ self: {
          http-types lens req servant-server text warp
        ];
        description = "The Rakuten API in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211142,7 +212182,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Random access lists";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "ral-lens" = callPackage
@@ -211155,7 +212195,7 @@ self: {
        editedCabalFile = "0j7lxlbj2klhcx12xixp3glhbvc9k1pccaiqm2kqr5l3lkrcnirv";
        libraryHaskellDepends = [ base bin fin lens ral ];
        description = "Length-indexed random access lists: lens utilities";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "ral-optics" = callPackage
@@ -211168,23 +212208,25 @@ self: {
        editedCabalFile = "0b2j3iqzbaly8niw3snsmn1z5a34kv4jw8sh3fscsja6zfx0ffgv";
        libraryHaskellDepends = [ base bin fin optics-core ral ];
        description = "Length-indexed random access lists: optics utilities";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "ralist" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, hspec }:
+    ({ mkDerivation, base, criterion, deepseq, hspec
+     , indexed-traversable, transformers
+     }:
      mkDerivation {
        pname = "ralist";
-       version = "0.2.1.1";
-       sha256 = "0fy8c36ygdn609nq6wasc685y3z7g188nkhym7bpb7rigi1si7xj";
-       revision = "1";
-       editedCabalFile = "187idyc9b2q476xxxnpgglf818vp701ww0ir5j4dn96g0qwni8xb";
-       libraryHaskellDepends = [ base ];
+       version = "0.3.0.0";
+       sha256 = "1qy6y7fcylbp6lym7y1k0bg28imhrfxrkvlfrm9mxg3lhvl71mrf";
+       libraryHaskellDepends = [
+         base deepseq indexed-traversable transformers
+       ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Random access list with a list compatible interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211197,8 +212239,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 ];
        description = "'$' in reverse";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211214,8 +212256,8 @@ self: {
          aeson base bytestring text unordered-containers yaml
        ];
        description = "RESTful API Modeling Language (RAML) library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211229,7 +212271,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "🏰 Determine how intervals relate to each other";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "ramus" = callPackage
@@ -211243,7 +212285,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Elm signal system for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rand-vars" = callPackage
@@ -211254,8 +212296,8 @@ self: {
        sha256 = "165jvx59vzmpxp7gw60ivfka77kgc1irwijikkwja7jb4dm4ay3x";
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211274,8 +212316,8 @@ self: {
          unix
        ];
        description = "Program for picking a random file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211290,8 +212332,8 @@ self: {
          base containers microspec tf-random vector
        ];
        description = "Easy-to-use randomness for livecoding";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211306,7 +212348,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "random number library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random_1_2_0" = callPackage
@@ -211319,8 +212361,8 @@ self: {
        pname = "random";
        version = "1.2.0";
        sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4";
-       revision = "3";
-       editedCabalFile = "04hrdpc4h35dqbwyc4vfp2hw7wsr6b121f3rm8l94j11kli4108y";
+       revision = "4";
+       editedCabalFile = "08mq836ganl3sq6mfn3hrj6xm0h30klp21y7gbd9md2882agndrk";
        libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ];
        testHaskellDepends = [
          base bytestring containers doctest mwc-random primitive smallcheck
@@ -211331,8 +212373,8 @@ self: {
          base gauge mtl rdtsc split splitmix time
        ];
        description = "Pseudo-random number generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "random-access-file" = callPackage
@@ -211354,7 +212396,7 @@ self: {
          vector
        ];
        description = "Random file access methods, supporting application-level page cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-access-list" = callPackage
@@ -211365,8 +212407,8 @@ self: {
        sha256 = "1ymbs3f38l6ch0nphsy9pi32yb1a4hazn3grm9fl0dvgqw28xl8r";
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211384,7 +212426,7 @@ self: {
          mwc-random pcg-random primitive random
        ];
        description = "Efficient generation of random bytestrings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "random-class" = callPackage
@@ -211397,7 +212439,7 @@ self: {
        editedCabalFile = "125p09srh4kxj5bnjsl3i2jn4q09ci3kbyb96pb9kmzz1jn4i0rz";
        libraryHaskellDepends = [ base primitive transformers util ];
        description = "Class of random value generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-derive" = callPackage
@@ -211408,8 +212450,8 @@ self: {
        sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p";
        libraryHaskellDepends = [ base random template-haskell ];
        description = "A Template Haskell helper for deriving Random instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211421,8 +212463,8 @@ self: {
        sha256 = "1m28np0zfabp1n1d08przh35bxfr1l7d39kj4a5z61jkchmsaxyf";
        libraryHaskellDepends = [ base extensible-effects random ];
        description = "A simple random generator library for extensible-effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211434,8 +212476,8 @@ self: {
        sha256 = "0p1n5dfdsp00q9mlhd7xcl93k5d0wji91p59858gmfx9xf8j0p0h";
        libraryHaskellDepends = [ base effin random ];
        description = "A simple random generator library for effin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211450,7 +212492,7 @@ self: {
          array base containers random-fu random-source
        ];
        description = "Additional functions for random values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-fu" = callPackage
@@ -211467,7 +212509,7 @@ self: {
          random-source rvar syb template-haskell transformers vector
        ];
        description = "Random number generation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "random-fu_0_2_7_7" = callPackage
@@ -211484,8 +212526,8 @@ self: {
          random-source rvar syb template-haskell transformers vector
        ];
        description = "Random number generation";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "random-fu-multivariate" = callPackage
@@ -211497,7 +212539,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix mtl random-fu ];
        testHaskellDepends = [ base ];
        description = "Multivariate distributions for random-fu";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-hypergeometric" = callPackage
@@ -211514,8 +212556,8 @@ self: {
          QuickCheck random-fu vector
        ];
        description = "Random variate generation from hypergeometric distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211527,7 +212569,7 @@ self: {
        sha256 = "1sj88ccw4pnqlwbga78pvsvzib4irg7xzz4lhqs89xkdz7l043dy";
        libraryHaskellDepends = [ base QuickCheck random safe text ];
        description = "Expose Random and Arbitrary instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "random-shuffle" = callPackage
@@ -211538,7 +212580,7 @@ self: {
        sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j";
        libraryHaskellDepends = [ base MonadRandom random ];
        description = "Random shuffle implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-source" = callPackage
@@ -211555,7 +212597,7 @@ self: {
          primitive random stateref syb template-haskell th-extras
        ];
        description = "Generic basis for random number generators";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "random-source_0_3_0_11" = callPackage
@@ -211572,8 +212614,8 @@ self: {
          primitive random stateref syb template-haskell th-extras
        ];
        description = "Generic basis for random number generators";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "random-stream" = callPackage
@@ -211584,8 +212626,8 @@ self: {
        sha256 = "0q191kz3hmjzrgs143nja5gcis07igb38f51mwqw64zx7vjqvx66";
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211602,7 +212644,7 @@ self: {
          bytestring entropy
        ];
        description = "Generate a random base 16, 58, or 64 string";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-strings" = callPackage
@@ -211617,7 +212659,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Generate random strings with specific qualities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-tree" = callPackage
@@ -211633,7 +212675,7 @@ self: {
          transformers tree-fun
        ];
        description = "Create random trees";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "random-variates" = callPackage
@@ -211653,7 +212695,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory HUnit random ];
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "randomgen" = callPackage
@@ -211671,7 +212713,7 @@ self: {
        ];
        executableSystemDepends = [ openssl ];
        description = "A fast, SMP parallel random data generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "randproc" = callPackage
@@ -211682,7 +212724,7 @@ self: {
        sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7";
        libraryHaskellDepends = [ base ];
        description = "Data structures and support functions for working with random processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "randsolid" = callPackage
@@ -211695,7 +212737,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random X11 ];
        description = "Set the background of your root window to a random colour";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "range" = callPackage
@@ -211712,7 +212754,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "An efficient and versatile range library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "range-set-list" = callPackage
@@ -211730,7 +212772,7 @@ self: {
          base containers deepseq hashable tasty tasty-quickcheck
        ];
        description = "Memory efficient sets with ranges of elements";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "range-space" = callPackage
@@ -211750,8 +212792,8 @@ self: {
          test-framework-quickcheck2 time vector-space vector-space-points
        ];
        description = "A Range type with vector-space instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211763,8 +212805,8 @@ self: {
        sha256 = "01n1m3ibi44pjg04mg16j751fjzkspmnq8bzxz55qbyi22wshnwc";
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211776,7 +212818,7 @@ self: {
        sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
        libraryHaskellDepends = [ base containers ];
        description = "Ranges and various functions on them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rank-product" = callPackage
@@ -211794,7 +212836,7 @@ self: {
          base bytestring cassava containers lens optparse-generic vector
        ];
        description = "Find the rank product of a data set";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "rank1dynamic" = callPackage
@@ -211810,7 +212852,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rank2classes" = callPackage
@@ -211831,7 +212873,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "standard type constructor class hierarchy, only with methods of rank 2 types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rapid" = callPackage
@@ -211846,8 +212888,8 @@ self: {
          async base containers foreign-store stm
        ];
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211863,8 +212905,8 @@ self: {
          base clock kan-extensions process transformers unix
        ];
        description = "External terminal support for rapid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211889,8 +212931,8 @@ self: {
          base eve hspec lens QuickCheck quickcheck-instances text yi-rope
        ];
        description = "A modular text editor";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211910,8 +212952,8 @@ self: {
          rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope
        ];
        description = "Example user config for Rasa";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211926,8 +212968,8 @@ self: {
          base containers data-default lens rasa text
        ];
        description = "Rasa Ext for useful buffer utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211942,8 +212984,8 @@ self: {
          base containers data-default lens rasa text
        ];
        description = "Rasa Ext for running commands";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211959,8 +213001,8 @@ self: {
          base data-default lens mtl rasa text text-lens yi-rope
        ];
        description = "Rasa Ext adding cursor(s)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211977,8 +213019,8 @@ self: {
          yi-rope
        ];
        description = "Rasa Ext for filesystem actions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211990,8 +213032,8 @@ self: {
        sha256 = "1wv3bkfq92h7b91x88mzqcijbpb2kh7zkgg4ljxdx59qi4lb7hry";
        libraryHaskellDepends = [ base lens mtl rasa ];
        description = "Rasa Ext for logging state/actions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212008,8 +213050,8 @@ self: {
          text vty yi-rope
        ];
        description = "Rasa extension for rendering to terminal with vty";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212021,8 +213063,8 @@ self: {
        sha256 = "0grfj3qxlmk63x5cxrbibkhrrgij077f7sr0kj6vcl0np7a5dl98";
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        description = "Rasa Ext for populating status-bar";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212034,8 +213076,8 @@ self: {
        sha256 = "198phwvsndsk149rj744znjzw8w2n0238pbv07d7rfs2c1987s04";
        libraryHaskellDepends = [ base data-default lens rasa ];
        description = "Rasa Ext managing rendering styles";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212052,8 +213094,8 @@ self: {
          yi-rope
        ];
        description = "Rasa Ext managing rendering views";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212072,8 +213114,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Rasa Ext for vim bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212102,8 +213144,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "A command-line client for Reddit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212131,7 +213173,7 @@ self: {
          optparse-applicative Rasterific svg-tree
        ];
        description = "SVG renderer based on Rasterific";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rate-limit" = callPackage
@@ -212142,7 +213184,7 @@ self: {
        sha256 = "0zb19vwzyj1vg890776r3bprmjzhs9kr2r1vqa42nxv9nvwvnljm";
        libraryHaskellDepends = [ base stm time time-units ];
        description = "A basic library for rate-limiting IO actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ratel" = callPackage
@@ -212160,7 +213202,7 @@ self: {
        ];
        testHaskellDepends = [ base filepath hspec ];
        description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ratel-wai" = callPackage
@@ -212175,7 +213217,7 @@ self: {
          base bytestring case-insensitive containers http-client ratel wai
        ];
        description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ratelimiter" = callPackage
@@ -212193,7 +213235,7 @@ self: {
          base containers extra mtl time timespan vector
        ];
        description = "In-memory rate limiter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rating-chgk-info" = callPackage
@@ -212221,8 +213263,8 @@ self: {
        testHaskellDepends = [ base-noprelude relude ];
        benchmarkHaskellDepends = [ base-noprelude gauge relude ];
        description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212234,7 +213276,7 @@ self: {
        sha256 = "17mqfqvh59vid7sb0vr029az4pn8bb83axf706ngc6i5lir49709";
        libraryHaskellDepends = [ base ];
        description = "Implementations of several rating systems: Elo, Glicko, etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ratio-int" = callPackage
@@ -212245,7 +213287,7 @@ self: {
        sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g";
        libraryHaskellDepends = [ base ];
        description = "Fast specialisation of Data.Ratio for Int.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rational-list" = callPackage
@@ -212261,8 +213303,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "finite or repeating lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212296,8 +213338,8 @@ self: {
          unix unordered-containers utf8-string
        ];
        description = "Forward build system, with caching and speculation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212309,8 +213351,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "9.3.2";
-       sha256 = "06mb7z1w56hvwl9gbkmbbib01760ix93x03bdl0ybpb6hhffq7r3";
+       version = "9.3.3";
+       sha256 = "0c2q48vbqkvhd0m3sahn7ja8bxpj9xkgw2hkg9chrhj0amyp5xzk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212321,8 +213363,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring filepath HUnit temporary ];
        description = "Parse and generate Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212343,7 +213385,7 @@ self: {
          aeson base bytestring hspec time unordered-containers
        ];
        description = "Haskell client for Sentry logging service";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "raven-haskell-scotty" = callPackage
@@ -212358,8 +213400,8 @@ self: {
          base bytestring case-insensitive mtl raven-haskell scotty text wai
        ];
        description = "Sentry http interface for Scotty web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212383,8 +213425,8 @@ self: {
          tasty-th
        ];
        description = "Resource-Aware Feldspar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212397,7 +213439,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base HUnit ];
        description = "Raw string literals for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rawfilepath" = callPackage
@@ -212409,7 +213451,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring ];
        description = "Use RawFilePath instead of FilePath";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "rawr" = callPackage
@@ -212426,8 +213468,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Anonymous extensible records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212439,7 +213481,7 @@ self: {
        sha256 = "1zk82akj2p4hl9hqwr30fixqfkjlpnb02qwhhflvcpv8gnxpg88i";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
        description = "Simple raw string quotation and dictionary interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "raz" = callPackage
@@ -212456,8 +213498,8 @@ self: {
          base containers criterion deepseq MonadRandom random transformers
        ];
        description = "Random Access Zippers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212476,8 +213518,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        description = "Common text/parsing tools for Razom language packages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212498,7 +213540,7 @@ self: {
        ];
        description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bitcoin-payment-protocol = null;};
 
@@ -212514,7 +213556,7 @@ self: {
        executableHaskellDepends = [ base bio bytestring containers ];
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212537,7 +213579,9 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mwc-random ];
        description = "Randomized Binary Search Trees";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "rc" = callPackage
@@ -212560,8 +213604,8 @@ self: {
          base dde hmatrix Learning linear random vector
        ];
        description = "Reservoir Computing, fast RNNs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212577,8 +213621,8 @@ self: {
          base binary bytestring data-binary-ieee754 network QuickCheck split
        ];
        description = "Haskell client for Rserve";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212607,7 +213651,7 @@ self: {
          primitive rdtsc time transformers
        ];
        description = "Read-Copy-Update for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rdf" = callPackage
@@ -212625,7 +213669,7 @@ self: {
          base bytestring criterion deepseq text
        ];
        description = "Representation and Incremental Processing of RDF Data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rdf4h" = callPackage
@@ -212655,7 +213699,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A library for RDF processing in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rdioh" = callPackage
@@ -212677,8 +213721,8 @@ self: {
          transformers urlencoded
        ];
        description = "A Haskell wrapper for Rdio's API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212690,7 +213734,7 @@ self: {
        sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal";
        libraryHaskellDepends = [ base ];
        description = "Binding for the rdtsc machine instruction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rdtsc-enolan" = callPackage
@@ -212701,7 +213745,7 @@ self: {
        sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q";
        libraryHaskellDepends = [ base ];
        description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "re2" = callPackage
@@ -212714,7 +213758,7 @@ self: {
        librarySystemDepends = [ re2 ];
        testHaskellDepends = [ base bytestring HUnit vector ];
        description = "Bindings to the re2 regular expression library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) re2;};
 
   "react-flux" = callPackage
@@ -212732,8 +213776,8 @@ self: {
          unordered-containers
        ];
        description = "A binding to React based on the Flux application architecture for GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212745,8 +213789,8 @@ self: {
        sha256 = "171q9h2yd78bcwsbhzhggin9wvnwc560vr73zw7abbx2q8aik4q4";
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212764,8 +213808,8 @@ self: {
          unordered-containers void
        ];
        description = "Haskell React bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212783,8 +213827,8 @@ self: {
          aeson aeson-pretty base bytestring scotty time transformers
        ];
        description = "react-tutorial web server";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212799,8 +213843,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        executableHaskellDepends = [ base mtl QuickCheck ];
        description = "pluggable pure logic serializable reactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212818,7 +213862,7 @@ self: {
        ];
        description = "Push-pull functional reactive programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reactive-bacon" = callPackage
@@ -212830,8 +213874,8 @@ self: {
        libraryHaskellDepends = [ base old-time stm ];
        testHaskellDepends = [ base containers HUnit old-time stm ];
        description = "FRP (functional reactive programming) framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212853,8 +213897,8 @@ self: {
          reactive-midyim transformers utility-ht
        ];
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212877,8 +213921,8 @@ self: {
          unordered-containers vault
        ];
        description = "Library for functional reactive programming (FRP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212895,8 +213939,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212912,8 +213956,8 @@ self: {
          base non-empty reactive-banana transformers utility-ht
        ];
        description = "Extend reactive-banana to multiple events per time point";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212930,8 +213974,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212948,8 +213992,8 @@ self: {
          SDL-ttf
        ];
        description = "Reactive Banana bindings for SDL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212962,8 +214006,8 @@ self: {
        libraryHaskellDepends = [ base reactive-banana sdl2 ];
        testHaskellDepends = [ base ];
        description = "Reactive Banana integration with SDL2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212978,8 +214022,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        description = "Examples for the reactive-banana library, using threepenny-gui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212997,8 +214041,8 @@ self: {
          base cabal-macosx reactive-banana wx wxcore
        ];
        description = "Examples for the reactive-banana library, using wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213015,8 +214059,8 @@ self: {
          vector-space
        ];
        description = "Connect Reactive and FieldTrip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213032,8 +214076,8 @@ self: {
          base GLUT old-time OpenGL reactive vector-space
        ];
        description = "Connects Reactive and GLUT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213045,7 +214089,7 @@ self: {
        sha256 = "115zjaymcx1dm7lwdqjq810j664a2kj8phrvjkhfkdsl95srqc85";
        libraryHaskellDepends = [ base ];
        description = "minimal fork of io-reactive";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reactive-io" = callPackage
@@ -213056,7 +214100,7 @@ self: {
        sha256 = "0s7a29cfzb2j5xvqykx1n5naci2np36zjs3qyq0i4yzjf3qprr63";
        libraryHaskellDepends = [ base transformers ];
        description = "IO-oriented FRP library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reactive-jack" = callPackage
@@ -213076,8 +214120,8 @@ self: {
          utility-ht
        ];
        description = "Process MIDI events via reactive-banana and JACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213097,8 +214141,8 @@ self: {
          transformers utility-ht
        ];
        description = "Process MIDI events via reactive-banana";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213115,8 +214159,8 @@ self: {
          base monad-parallel SDL stm transformers
        ];
        description = "Reactive programming via imperative threads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213135,7 +214179,7 @@ self: {
        ];
        description = "An alternate implementation of push-pull FRP";
        license = "GPL";
-       platforms = stdenv.lib.platforms.none;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "reactor" = callPackage
@@ -213151,8 +214195,8 @@ self: {
          transformers
        ];
        description = "Reactor - task parallel reactive programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213164,8 +214208,8 @@ self: {
        sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl";
        libraryHaskellDepends = [ base ];
        description = "Class for reading bounded values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213188,8 +214232,8 @@ self: {
        testHaskellDepends = [
          base bytestring containers directory hspec text
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213203,7 +214247,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory process ];
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "read-env-var" = callPackage
@@ -213215,7 +214259,7 @@ self: {
        libraryHaskellDepends = [ base exceptions transformers ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Functions for safely reading environment variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "read-io" = callPackage
@@ -213227,8 +214271,8 @@ self: {
        libraryHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [ base containers directory filepath hspec ];
        description = "Read IO library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213249,7 +214293,7 @@ self: {
          aeson base http-conduit optparse-applicative text xml-conduit
        ];
        description = "Extracts text of main article from HTML document";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "readable" = callPackage
@@ -213260,7 +214304,7 @@ self: {
        sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Reading from Text and ByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "readcsv" = callPackage
@@ -213273,7 +214317,7 @@ self: {
        editedCabalFile = "1lcgpdjlv1kaasyhk327cvkw4ar06mr7ks8xrkvxf27njdiv035s";
        libraryHaskellDepends = [ base ];
        description = "Lightweight CSV parser/emitter based on ReadP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reader-soup" = callPackage
@@ -213290,7 +214334,7 @@ self: {
          transformers transformers-base unliftio-core vinyl
        ];
        description = "Vinyl-based reader-like monad composition";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "readline" = callPackage
@@ -213303,7 +214347,7 @@ self: {
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
 
@@ -213315,8 +214359,8 @@ self: {
        sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8";
        libraryHaskellDepends = [ base readline StateVar ];
        description = "Readline with variables (setX/getY) wrapped in state vars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213338,8 +214382,8 @@ self: {
        executableHaskellDepends = [ base numhask ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Literate programming support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213353,8 +214397,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bliplib parseargs ];
        description = "Read and pretty print Python bytecode (.pyc) files.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213372,8 +214416,8 @@ self: {
          base binary bytestring data-binary-ieee754 filepath monad-loops
        ];
        description = "Code for reading ESRI Shapefiles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213390,7 +214434,7 @@ self: {
          base quickcheck-instances tasty tasty-quickcheck time
        ];
        description = "Tiny library to calculate date considering when your day realy ends";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "really-simple-xml-parser" = callPackage
@@ -213401,8 +214445,8 @@ self: {
        sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy";
        libraryHaskellDepends = [ base parsec ];
        description = "A really simple XML parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213410,29 +214454,28 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
      , base64-bytestring, bytestring, cassava, cereal, colour
      , containers, cryptohash-sha256, cubicbezier, directory, filelock
-     , filepath, fingertree, fsnotify, geojson, ghcid, hashable
-     , hgeometry, hgeometry-combinatorial, JuicyPixels, lens, linear
-     , matrix, mtl, neat-interpolation, open-browser
-     , optparse-applicative, parallel, process, QuickCheck, random
-     , random-shuffle, reanimate-svg, split, tasty
-     , tasty-expected-failure, tasty-golden, tasty-hunit
-     , tasty-quickcheck, tasty-rerun, temporary, text, time
-     , unordered-containers, vector, vector-space, websockets, xml
+     , filepath, fingertree, fsnotify, geojson, hashable, hgeometry
+     , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl
+     , neat-interpolation, network, open-browser, optparse-applicative
+     , parallel, process, QuickCheck, random, random-shuffle
+     , reanimate-svg, split, tasty, tasty-expected-failure, tasty-golden
+     , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time
+     , unix, unordered-containers, vector, vector-space, websockets, xml
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "1.1.2.1";
-       sha256 = "043jpim33pliymnks47i39hz36wp61rvwjyk9f0k89whsi74bkd6";
+       version = "1.1.3.2";
+       sha256 = "006fj47pm7lqs4haq0i0nmz6syqx3v07qgnh4vjqlyqixk22cyy5";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal array attoparsec base base64-bytestring
          bytestring cassava cereal colour containers cryptohash-sha256
          cubicbezier directory filelock filepath fingertree fsnotify geojson
-         ghcid hashable hgeometry hgeometry-combinatorial JuicyPixels lens
-         linear matrix mtl neat-interpolation open-browser
+         hashable hgeometry hgeometry-combinatorial JuicyPixels lens linear
+         matrix mtl neat-interpolation network open-browser
          optparse-applicative parallel process random random-shuffle
-         reanimate-svg split temporary text time unordered-containers vector
-         vector-space websockets xml
+         reanimate-svg split temporary text time unix unordered-containers
+         vector vector-space websockets xml
        ];
        testHaskellDepends = [
          base bytestring directory filepath linear process QuickCheck tasty
@@ -213440,8 +214483,8 @@ self: {
          tasty-rerun temporary text vector
        ];
        description = "Animation library based on SVGs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213467,8 +214510,8 @@ self: {
          tasty-quickcheck tasty-rerun temporary text typed-process vector
        ];
        description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213490,7 +214533,7 @@ self: {
          QuickCheck quickcheck-instances text time
        ];
        description = "Generate Reason types from Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reasonable-lens" = callPackage
@@ -213501,8 +214544,8 @@ self: {
        sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam";
        libraryHaskellDepends = [ base mtl split template-haskell ];
        description = "Lens implementation. It is more small but adequately.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213516,7 +214559,7 @@ self: {
        editedCabalFile = "1ky8nncf441i32hni0090lm5vrh67dqvj99c09c1i58gxjad4gln";
        libraryHaskellDepends = [ base ];
        description = "Just size Operational Monad implementation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rebase" = callPackage
@@ -213537,7 +214580,7 @@ self: {
          transformers unordered-containers uuid vector void
        ];
        description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rebase_1_10_0_1" = callPackage
@@ -213558,8 +214601,8 @@ self: {
          transformers unordered-containers uuid vector vector-instances void
        ];
        description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -213570,7 +214613,7 @@ self: {
        sha256 = "0zd1ik544hcfwmxwg0jvfsw6giwkzppf7hb573a9ck0xm6daslp7";
        libraryHaskellDepends = [ base data-default-class indexed ];
        description = "A library to facilitate rebinding of Haskell syntax";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "recaptcha" = callPackage
@@ -213581,7 +214624,7 @@ self: {
        sha256 = "03a3f34lcd387112pfa931wwna58av5yv4jvx4nl0zkryp1p4qd2";
        libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        description = "Functions for using the reCAPTCHA service in web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recommender-als" = callPackage
@@ -213596,7 +214639,7 @@ self: {
          base containers data-default-class hmatrix parallel random vector
        ];
        description = "Recommendations using alternating least squares algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "record" = callPackage
@@ -213611,8 +214654,8 @@ self: {
          base base-prelude basic-lens template-haskell transformers
        ];
        description = "Anonymous records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213629,8 +214672,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base-prelude hspec record ];
        description = "Instances of \"aeson\" classes for the \"record\" types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213648,7 +214691,7 @@ self: {
        executableHaskellDepends = [ base extra ];
        testHaskellDepends = [ base extra filepath record-hasfield ];
        description = "Preprocessor to allow record.field syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "record-encode" = callPackage
@@ -213664,8 +214707,8 @@ self: {
          base doctest generics-sop hspec QuickCheck vector
        ];
        description = "Generic encoding of records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213689,8 +214732,8 @@ self: {
          test-framework-hunit
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213703,7 +214746,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A version of GHC.Records as available in future GHCs.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "record-preprocessor" = callPackage
@@ -213722,8 +214765,8 @@ self: {
        benchmarkHaskellDepends = [ base-prelude basic-lens record ];
        doHaddock = false;
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213747,8 +214790,8 @@ self: {
          base-prelude conversion conversion-text record text
        ];
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213761,7 +214804,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Alter your records with ease";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "records" = callPackage
@@ -213774,8 +214817,8 @@ self: {
        editedCabalFile = "01ydi3gzgr72z56i1rdq10g4xrfz2f9vz6vn03mp84r74k5zdgrv";
        libraryHaskellDepends = [ base kinds type-functions ];
        description = "A flexible record system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213794,7 +214837,7 @@ self: {
          base deepseq generics-sop hspec should-not-typecheck
        ];
        description = "Record subtyping and record utilities with generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "records-th" = callPackage
@@ -213810,8 +214853,8 @@ self: {
          type-functions unordered-containers
        ];
        description = "Template Haskell declarations for the records package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213823,7 +214866,7 @@ self: {
        sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursion-schemes" = callPackage
@@ -213840,7 +214883,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit template-haskell transformers ];
        description = "Representing common recursion patterns as higher-order functions";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "recursion-schemes-ext" = callPackage
@@ -213859,7 +214902,7 @@ self: {
          base criterion deepseq recursion-schemes
        ];
        description = "Amateur addenda to recursion-schemes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursion-schemes-ix" = callPackage
@@ -213875,7 +214918,7 @@ self: {
          base containers hspec mtl QuickCheck singlethongs
        ];
        description = "Recursion schemes over indexed Functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursive-line-count" = callPackage
@@ -213892,7 +214935,7 @@ self: {
          base bytestring containers filepath gtk mtl process
        ];
        description = "Count lines in files and display them hierarchically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursors" = callPackage
@@ -213904,8 +214947,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213924,8 +214967,8 @@ self: {
        ];
        doHaddock = false;
        description = "Extensible records and variants indexed by a type-level Red-Black tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213938,7 +214981,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Red Black Trees implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "redHandlers" = callPackage
@@ -213956,7 +214999,7 @@ self: {
        ];
        description = "Monadic HTTP request handlers combinators to build a standalone web apps";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reddit" = callPackage
@@ -213979,8 +215022,8 @@ self: {
          http-client http-client-tls text time transformers yaml
        ];
        description = "Library for interfacing with Reddit's API";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213997,7 +215040,7 @@ self: {
          old-time utf8-string
        ];
        description = "A driver for Redis key-value database";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "redis-hs" = callPackage
@@ -214008,8 +215051,8 @@ self: {
        sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg";
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        description = "A simple Redis library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214038,7 +215081,7 @@ self: {
          base bytestring criterion hedis redis-resp tinylog transformers
        ];
        description = "Yet another redis client";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -214049,7 +215092,7 @@ self: {
        sha256 = "1znjmgmlha2adwrmfgbyr10hg0lw99xas610cswf4c9hrbw0gqjy";
        libraryHaskellDepends = [ aeson base bytestring hedis ];
        description = "Simple priority job queue backed by Redis";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "redis-resp" = callPackage
@@ -214066,7 +215109,7 @@ self: {
          double-conversion operational semigroups split transformers
        ];
        description = "REdis Serialization Protocol (RESP) implementation";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "redis-simple" = callPackage
@@ -214077,8 +215120,8 @@ self: {
        sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43";
        libraryHaskellDepends = [ base binary bytestring redis ];
        description = "Simple redis bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214094,7 +215137,7 @@ self: {
          aeson async base bytestring hashable haxl hedis network time
        ];
        description = "Combine redis caching and haxl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "redland" = callPackage
@@ -214106,8 +215149,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {raptor2 = null; redland = null;};
 
@@ -214125,7 +215168,7 @@ self: {
          base bytestring containers directory filepath process pureMD5
        ];
        description = "software build system, make replacement, implementation of djb's redo";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "reduce-equations" = callPackage
@@ -214150,8 +215193,8 @@ self: {
          text
        ];
        description = "Simplify a set of equations by removing redundancies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214164,14 +215207,14 @@ self: {
        pname = "reducers";
        version = "3.12.3";
        sha256 = "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki";
-       revision = "1";
-       editedCabalFile = "1v0r75wkaahxdv4y0sqgcikvgwymiz12fa8nkk59n1g4x9nng9wb";
+       revision = "2";
+       editedCabalFile = "1kd38n9h2hxl09khvkvkhnflgm6rbky1zkw3iazlpb8xk9zkk39s";
        libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
        ];
        description = "Semigroups, specialized containers and a general map/reduce framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reedsolomon" = callPackage
@@ -214198,8 +215241,8 @@ self: {
          base criterion exceptions loop mtl primitive vector
        ];
        description = "Reed-Solomon Erasure Coding in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214213,8 +215256,8 @@ self: {
          base hamid HCodecs stm time vector-space
        ];
        description = "A reimplementation of the Reactive library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214225,7 +215268,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9";
        libraryHaskellDepends = [ base crypto-api ];
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "ref" = callPackage
@@ -214236,8 +215279,8 @@ self: {
        sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214254,7 +215297,7 @@ self: {
          unordered-containers
        ];
        description = "Extra stuff for mutable references";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ref-fd" = callPackage
@@ -214265,7 +215308,7 @@ self: {
        sha256 = "1camr7cv1fglicyp2ivv7qv1yidj36zxcglfvmw7giqdj7r7j5w8";
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ref-mtl" = callPackage
@@ -214276,8 +215319,8 @@ self: {
        sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080";
        libraryHaskellDepends = [ base mtl stm transformers ];
        description = "A type class for monads with references compatible with the mtl2 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214289,7 +215332,7 @@ self: {
        sha256 = "0pq9pm8jsx9w1q81pf5pvc361ad8dbyklw94jq47drr2i0dc7n20";
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "refact" = callPackage
@@ -214300,7 +215343,7 @@ self: {
        sha256 = "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a";
        libraryHaskellDepends = [ base ];
        description = "Specify refactorings to perform with apply-refact";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "refcount" = callPackage
@@ -214321,8 +215364,8 @@ self: {
          unordered-containers
        ];
        description = "Container with element counts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214334,7 +215377,7 @@ self: {
        sha256 = "1gqbbiwhx5wq1g73m3apwyrrpapqzimincmw2b64fpkkykq66dq1";
        libraryHaskellDepends = [ base stm ];
        description = "A class for references in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "references" = callPackage
@@ -214356,8 +215399,8 @@ self: {
          uniplate
        ];
        description = "Selectors for reading and updating data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214375,8 +215418,8 @@ self: {
          base clippard cmdargs directory filepath haskheap network
        ];
        description = "A command-line tool for pasting to https://www.refheap.com";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214394,7 +215437,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Refinement types with static and runtime checking";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "refined-http-api-data" = callPackage
@@ -214405,8 +215448,8 @@ self: {
        sha256 = "0064cz00lp023kbn5vqpcsgjzsxd5a9s5fl1klsq6jlk1cmi5c0m";
        libraryHaskellDepends = [ base http-api-data refined text ];
        description = "http-api-data instances for refined types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214423,7 +215466,7 @@ self: {
          base checkers exceptions hspec logict mmorph mtl QuickCheck
        ];
        description = "Toolkit for building proof automation systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "refinery_0_3_0_0" = callPackage
@@ -214439,8 +215482,8 @@ self: {
          base checkers exceptions hspec logict mmorph mtl QuickCheck
        ];
        description = "Toolkit for building proof automation systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflection" = callPackage
@@ -214455,7 +215498,7 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflection-extras" = callPackage
@@ -214469,8 +215512,8 @@ self: {
          aeson base constraints lens reflection tagged
        ];
        description = "Utilities for the reflection package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214483,7 +215526,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base type-aligned ];
        description = "Efficient free and operational monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex" = callPackage
@@ -214521,7 +215564,7 @@ self: {
          loch-th mtl primitive process ref-tf split stm time transformers
        ];
        description = "Higher-order Functional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex-animation" = callPackage
@@ -214537,8 +215580,8 @@ self: {
          semigroups vector-space
        ];
        description = "Continuous animations support for reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214564,8 +215607,8 @@ self: {
          witherable
        ];
        description = "Reflex bindings for TCP sockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214586,8 +215629,8 @@ self: {
        ];
        executableHaskellDepends = [ base http-types reflex wai ];
        description = "Reflex interface to `wai`";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214608,8 +215651,8 @@ self: {
        ];
        executableHaskellDepends = [ base lens reflex witherable ];
        description = "A basic Reflex host for backend work";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214627,8 +215670,8 @@ self: {
          base bytestring jsaddle-webkit2gtk reflex reflex-dom-core text
        ];
        description = "Functional Reactive Web Apps with Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "reflex-dom-colonnade" = callPackage
@@ -214644,8 +215687,8 @@ self: {
          semigroups text vector
        ];
        description = "Use colonnade with reflex-dom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-contrib" = callPackage
@@ -214663,8 +215706,8 @@ self: {
          string-conv text time transformers
        ];
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-core" = callPackage
@@ -214703,8 +215746,8 @@ self: {
          websockets which
        ];
        description = "Functional Reactive Web Apps with Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {chrome-test-utils = null;};
 
@@ -214723,8 +215766,8 @@ self: {
        ];
        executableHaskellDepends = [ base reflex-dom text ];
        description = "A reflex-dom widget to draw on a canvas with a fragment shader program";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-helpers" = callPackage
@@ -214740,8 +215783,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Html tag helpers for reflex-dom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-pandoc" = callPackage
@@ -214760,7 +215803,7 @@ self: {
          reflex reflex-dom-core safe skylighting text time
        ];
        description = "Render Pandoc documents to HTML using reflex-dom";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex-dom-retractable" = callPackage
@@ -214775,8 +215818,8 @@ self: {
          base containers jsaddle mtl ref-tf reflex reflex-dom
        ];
        description = "Routing and retractable back button for reflex-dom";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214792,8 +215835,8 @@ self: {
          base containers lens reflex reflex-dom-core safe text
        ];
        description = "Reflex functions for SVG elements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214816,8 +215859,8 @@ self: {
          these
        ];
        description = "various dynamic containers for Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214829,7 +215872,7 @@ self: {
        sha256 = "0mv17j5g0h7y1ym4563xr1vc0sdvw0g4wdpx0a9aryk3i0k0i4mx";
        libraryHaskellDepends = [ base deepseq reflex ];
        description = "External reference with reactivity support";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reflex-fsnotify" = callPackage
@@ -214844,8 +215887,8 @@ self: {
          base containers directory filepath fsnotify reflex
        ];
        description = "Reflex FRP interface for watching files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214870,8 +215913,8 @@ self: {
          time
        ];
        description = "Interact with a GADT API in your reflex-dom application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214899,8 +215942,35 @@ self: {
          base directory process reflex reflex-process temporary
        ];
        description = "A GHCi widget library for use in reflex applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "reflex-gi-gtk" = callPackage
+    ({ mkDerivation, async, base, containers, dependent-sum
+     , exception-transformers, gi-gdk, gi-glib, gi-gtk, haskell-gi-base
+     , mtl, patch, primitive, ref-tf, reflex, semialign, stm, text
+     , these, witherable
+     }:
+     mkDerivation {
+       pname = "reflex-gi-gtk";
+       version = "0.2.0.0";
+       sha256 = "0dx9g5v5i0fhxn1kn6fsj8hpwnax8wq89drsv8q2fwk9pxd8i384";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base containers dependent-sum exception-transformers gi-gdk
+         gi-glib gi-gtk haskell-gi-base mtl primitive ref-tf reflex
+         semialign stm text these witherable
+       ];
+       executableHaskellDepends = [
+         base containers dependent-sum gi-gtk haskell-gi-base mtl patch
+         reflex text
+       ];
+       description = "Helper functions to use reflex with gi-gtk";
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214916,8 +215986,8 @@ self: {
          base dependent-sum gloss mtl reflex transformers
        ];
        description = "An reflex interface for gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214945,8 +216015,8 @@ self: {
          reflex-transformers transformers
        ];
        description = "A simple scene-graph using reflex and gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214963,8 +216033,8 @@ self: {
          template-haskell text
        ];
        description = "Use jsx-like syntax in Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-libtelnet" = callPackage
@@ -214980,8 +216050,8 @@ self: {
          dependent-sum-template lens libtelnet reflex
        ];
        description = "Reflex bindings for libtelnet";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214997,8 +216067,8 @@ self: {
          base jsaddle mtl reflex reflex-external-ref text
        ];
        description = "Localization library for reflex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215016,8 +216086,8 @@ self: {
          base containers reflex reflex-dom reflex-localize text
        ];
        description = "Helper widgets for reflex-localize";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215033,7 +216103,7 @@ self: {
          base jsaddle mtl reflex reflex-external-ref
        ];
        description = "Utilities to split reflex app to authorized and not authorized contexts";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reflex-orphans" = callPackage
@@ -215049,8 +216119,8 @@ self: {
          base deepseq dependent-map mtl ref-tf reflex tasty tasty-hunit
        ];
        description = "Useful missing instances for Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215076,8 +216146,8 @@ self: {
          process ref-tf reflex unix
        ];
        description = "Reflex FRP interface for running system processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215097,8 +216167,8 @@ self: {
        ];
        executableHaskellDepends = [ base mtl reflex ];
        description = "SDL2 and reflex FRP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215119,7 +216189,7 @@ self: {
          ref-tf reflex these transformers
        ];
        description = "reflex host methods for testing without external events";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -215134,8 +216204,8 @@ self: {
          base containers lens mtl reflex semigroups stateWriter transformers
        ];
        description = "Collections and switchable Monad transformers for Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215162,8 +216232,8 @@ self: {
          base containers reflex text time transformers vty
        ];
        description = "Reflex FRP host and widgets for VTY applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215175,7 +216245,7 @@ self: {
        sha256 = "0dl0jz5ibcj4vafpf0a0v52rac4nmmif69817g7qgxavc093nq82";
        libraryHaskellDepends = [ base containers mtl semigroups text ];
        description = "reform is a type-safe HTML form generation and validation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-blaze" = callPackage
@@ -215188,7 +216258,7 @@ self: {
          base blaze-html blaze-markup reform text
        ];
        description = "Add support for using blaze-html with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-hamlet" = callPackage
@@ -215201,7 +216271,7 @@ self: {
          base blaze-markup reform shakespeare text
        ];
        description = "Add support for using Hamlet with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-happstack" = callPackage
@@ -215216,7 +216286,7 @@ self: {
          base bytestring happstack-server mtl random reform text utf8-string
        ];
        description = "Happstack support for reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-hsp" = callPackage
@@ -215227,7 +216297,7 @@ self: {
        sha256 = "1vjbj41yl158h59wcx190jb4s627bhrhcbp21ykn93n4j454kfns";
        libraryHaskellDepends = [ base hsp hsx2hs reform text ];
        description = "Add support for using HSP with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-lucid" = callPackage
@@ -215238,7 +216308,7 @@ self: {
        sha256 = "1a3jfk0i87vqwxxlspzy44lf2i3bxxxy20pnbysczzf8i113y9zi";
        libraryHaskellDepends = [ base lucid path-pieces reform text ];
        description = "Add support for using lucid with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reformat" = callPackage
@@ -215249,8 +216319,8 @@ self: {
        sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am";
        libraryHaskellDepends = [ base parsec ];
        description = "The parser and render to parsec and render the string";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215274,8 +216344,8 @@ self: {
          base base-unicode-symbols category gauge hs-functors transformers
        ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215291,8 +216361,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        description = "Environment Monad with automatic resource refreshment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215305,7 +216375,7 @@ self: {
        libraryHaskellDepends = [ aeson base containers text ];
        testHaskellDepends = [ base ];
        description = "Formatted JSON generator for API server inspired by normalizr";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "refurb" = callPackage
@@ -215335,8 +216405,8 @@ self: {
          these these-lens thyme transformers-base vector-space
        ];
        description = "Tools for maintaining a database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215350,8 +216420,8 @@ self: {
        editedCabalFile = "1dzisg5cdb2jrcp6xmkzmgzd00phqhgf1iddlm2c10x49lbqsrld";
        libraryHaskellDepends = [ base ];
        description = "Register allocation API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215375,8 +216445,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        doHaddock = false;
        description = "Register allocation by graph colorization";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215388,7 +216458,7 @@ self: {
        sha256 = "18m8di3syz0r01bq9vpglk5x87sw6y38wqnl8zg3z80i67fzfd4m";
        libraryHaskellDepends = [ base ];
        description = "Types used in register allocation API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex" = callPackage
@@ -215407,7 +216477,7 @@ self: {
          time-locale-compat transformers unordered-containers utf8-string
        ];
        description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-applicative" = callPackage
@@ -215430,7 +216500,7 @@ self: {
          parsers parsers-megaparsec
        ];
        description = "Regex-based parsing with applicative interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "regex-applicative-text" = callPackage
@@ -215443,7 +216513,7 @@ self: {
        editedCabalFile = "1jgmhqhlhj9zhxwikmhiq71fj1900iqiyg6r9l5y7xjk7arwscmi";
        libraryHaskellDepends = [ base regex-applicative text ];
        description = "regex-applicative on text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-base" = callPackage
@@ -215458,7 +216528,7 @@ self: {
          array base bytestring containers mtl text
        ];
        description = "Common \"Text.Regex.*\" API for Regex matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-compat" = callPackage
@@ -215471,7 +216541,7 @@ self: {
        editedCabalFile = "1d2k9zj51rhy695vlx6cfcmik6a0yyk5kl6aza7nqsqc6zwhidif";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Replaces/Enhances \"Text.Regex\"";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-compat-tdfa" = callPackage
@@ -215482,7 +216552,7 @@ self: {
        sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
        libraryHaskellDepends = [ array base regex-base regex-tdfa ];
        description = "Unicode Support version of Text.Regex, using regex-tdfa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-deriv" = callPackage
@@ -215499,8 +216569,8 @@ self: {
          hashtables mtl parallel parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215514,8 +216584,8 @@ self: {
        editedCabalFile = "089gzj8yih2f4ijyk9c49zyq6cws68z2rnklhiww9f3nb75lg6a9";
        libraryHaskellDepends = [ base mtl parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215536,7 +216606,7 @@ self: {
          stringsearch tagged text
        ];
        description = "PCRE wrapper";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "regex-easy" = callPackage
@@ -215551,7 +216621,7 @@ self: {
          array base bytestring regex-pcre string-conversions
        ];
        description = "sugar for regex-pcre";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-examples" = callPackage
@@ -215586,7 +216656,7 @@ self: {
          utf8-string
        ];
        description = "Tutorial, tests and example programs for regex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-generator" = callPackage
@@ -215604,8 +216674,8 @@ self: {
          base bytestring hspec HUnit random regex-pcre
        ];
        description = "Generate a random string from a PCRE";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215625,7 +216695,7 @@ self: {
        executableHaskellDepends = [ base containers mtl regex-tdfa sbv ];
        description = "From a regex, generate all possible strings it can match";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "regex-parsec" = callPackage
@@ -215638,8 +216708,8 @@ self: {
        editedCabalFile = "19y0kgmqpcz4k0l3cfjbxirq844zqm71gaz7117pm399x8bz1df7";
        libraryHaskellDepends = [ base parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215658,7 +216728,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ pcre ];
        description = "PCRE Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) pcre;};
 
   "regex-pcre-builtin" = callPackage
@@ -215673,7 +216743,7 @@ self: {
          array base bytestring containers regex-base text
        ];
        description = "PCRE Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-pcre-text" = callPackage
@@ -215689,8 +216759,8 @@ self: {
          text
        ];
        description = "Text-based PCRE API for regex-base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215707,8 +216777,8 @@ self: {
          parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215724,7 +216794,7 @@ self: {
          array base bytestring containers regex-base
        ];
        description = "POSIX Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-posix-clib" = callPackage
@@ -215735,7 +216805,7 @@ self: {
        sha256 = "1y4vmiq1xksxxd84yvyark6axsz51ywb6slswbddlxbdpcpfday7";
        doHaddock = false;
        description = "\"Regex for Windows\" C library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "regex-posix-unittest" = callPackage
@@ -215753,8 +216823,8 @@ self: {
          array base bytestring containers mtl regex-base regex-posix
        ];
        description = "Unit tests for the plaform's Posix regex library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215776,7 +216846,7 @@ self: {
          text utf8-string
        ];
        description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-tdfa-pipes" = callPackage
@@ -215791,8 +216861,8 @@ self: {
          array base lens monads-tf pipes regex-base regex-tdfa
        ];
        description = "Parse with regular expressions on Producers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215804,8 +216874,8 @@ self: {
        sha256 = "1l0yk2m2k4ybjx3pidcn2xpij9cnyi76ar74llf09vwv764mh36f";
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215821,8 +216891,8 @@ self: {
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215836,8 +216906,8 @@ self: {
        editedCabalFile = "00swglzmdw30g4bn47z6j71all0djjb2hjm7bkfl7pza4wv14wpv";
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215856,8 +216926,8 @@ self: {
          array base bytestring containers mtl regex-base regex-tdfa
        ];
        description = "Unit tests for the regex-tdfa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215875,8 +216945,8 @@ self: {
          array base bytestring regex-base regex-tdfa utf8-string
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215891,8 +216961,8 @@ self: {
        libraryHaskellDepends = [ base regex-base ];
        librarySystemDepends = [ tre ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tre;};
 
@@ -215904,8 +216974,8 @@ self: {
        sha256 = "02pwls2yfp9y6g7lcfnkxjfbz3h280y9ifqh870bis16fa8dy6gv";
        libraryHaskellDepends = [ base ];
        description = "Type-level regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215924,7 +216994,7 @@ self: {
          unordered-containers
        ];
        description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-wrapper" = callPackage
@@ -215942,8 +217012,8 @@ self: {
          text
        ];
        description = "Types that can only be constructed if they match a regular expression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215955,8 +217025,8 @@ self: {
        sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4";
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "A regular expression library for W3C XML Schema regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216012,8 +217082,8 @@ self: {
          base containers derive-trie template-haskell weighted-regexp
        ];
        description = "Regular Expressions on Tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216037,8 +217107,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Regular expressions via symbolic manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216052,8 +217122,8 @@ self: {
          base bytestring pcre-light template-haskell
        ];
        description = "A quasiquoter for PCRE regexes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216068,8 +217138,8 @@ self: {
          base base-unicode-symbols regions transformers
        ];
        description = "Regional memory pointers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216085,8 +217155,8 @@ self: {
          base base-unicode-symbols monad-control transformers
        ];
        description = "Provides the region monad for safely opening and working with scarce resources";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216102,8 +217172,8 @@ self: {
          base-unicode-symbols monads-fd regions transformers
        ];
        description = "Monads-fd instances for the RegionT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216119,8 +217189,8 @@ self: {
          base-unicode-symbols monads-tf regions transformers
        ];
        description = "Monads-tf instances for the RegionT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216132,8 +217202,8 @@ self: {
        sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0";
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        description = "mtl instances for the RegionT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216145,8 +217215,8 @@ self: {
        sha256 = "0zsvpsqksms9fh0zwyngb0sm1scffi47ipphgfn7b5m3km9z6cjj";
        libraryHaskellDepends = [ base ];
        description = "A computationally universal register machine implementation at the type-level";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216174,7 +217244,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "data structure for assembling components";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "registry-hedgehog" = callPackage
@@ -216185,8 +217255,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry-hedgehog";
-       version = "0.2.1.1";
-       sha256 = "1s94xb7ma6rq81z30wjaczy2w3v1myqwhkx257p4nh69dv4wzd8d";
+       version = "0.3.0.0";
+       sha256 = "0ardmwsaxlk9g062bf2xiigbjbnqbf7iz9s8xwjzj8nh8rrs252z";
        libraryHaskellDepends = [
          base containers hedgehog mmorph multimap protolude registry tasty
          tasty-discover tasty-hedgehog tasty-th template-haskell text
@@ -216199,8 +217269,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "utilities to work with Hedgehog generators and `registry`";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216212,8 +217282,8 @@ self: {
        sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj";
        libraryHaskellDepends = [ ad base vector ];
        description = "Linear and logistic regression through automatic differentiation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216225,8 +217295,8 @@ self: {
        sha256 = "0f74xwyrnz39cl24kazvk8rd3px2l2ycx6a5jaqlab6wiwi5xclq";
        libraryHaskellDepends = [ base vector ];
        description = "Simple linear and quadratic regression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216240,8 +217310,8 @@ self: {
        editedCabalFile = "0hrr2drpmrsb3jim2lgfx7nx2pvycdvfff51j2v3ihgdy8d8zqrw";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216253,8 +217323,8 @@ self: {
        sha256 = "0x1sbps0ccwpvf6fx1jnbjxylqsvvfzkkynliip9jyh6gkhm44vx";
        libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216270,8 +217340,8 @@ self: {
          applicative-extras base fclabels formlets json mtl regular xhtml
        ];
        description = "Generic programming for the web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216283,8 +217353,8 @@ self: {
        sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
        libraryHaskellDepends = [ base hxt regular text ];
        description = "Generic generation of HXT XmlPickler instances using Regular";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216300,7 +217370,7 @@ self: {
        testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216318,8 +217388,8 @@ self: {
          base cmdargs parallel-io shelly split system-filepath text
        ];
        description = "Rebuild default.hoo from many .hoo files in the current directory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216337,8 +217407,8 @@ self: {
          attoparsec base bytestring containers directory regex-tdfa split
        ];
        description = "Process lists easily";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216350,8 +217420,8 @@ self: {
        sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Reify records to Maps and back again";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216368,7 +217438,7 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Serialize data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216384,7 +217454,7 @@ self: {
        testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
        benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ];
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "relacion" = callPackage
@@ -216395,8 +217465,8 @@ self: {
        sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976";
        libraryHaskellDepends = [ array base containers ];
        description = "A relation data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216415,7 +217485,7 @@ self: {
          tasty tasty-hspec text vector
        ];
        description = "Sensible RLP encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "relation" = callPackage
@@ -216433,7 +217503,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "A data structure representing Relations on Sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-postgresql8" = callPackage
@@ -216450,8 +217520,8 @@ self: {
          relational-query-HDBC template-haskell time transformers
        ];
        description = "PostgreSQL v8.x driver for haskell-relational-record";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216476,7 +217546,7 @@ self: {
          base containers product-isomorphic quickcheck-simple transformers
        ];
        description = "Typeful, Modular, Relational, algebraic query engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -216500,7 +217570,7 @@ self: {
          base convertible HDBC QuickCheck quickcheck-simple
        ];
        description = "HDBC instance of relational-query and typed query interface for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-query-postgresql-pure" = callPackage
@@ -216526,8 +217596,8 @@ self: {
          postgresql-pure relational-query relational-query-HDBC
        ];
        description = "The connector of relational-record and postgresql-pure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216545,7 +217615,7 @@ self: {
          product-isomorphic relational-query relational-query-HDBC
        ];
        description = "Meta package of Relational Record";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-record-examples" = callPackage
@@ -216568,7 +217638,7 @@ self: {
          base product-isomorphic relational-query template-haskell time
        ];
        description = "Examples of Haskell Relationa Record";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-schemas" = callPackage
@@ -216584,7 +217654,7 @@ self: {
          template-haskell time
        ];
        description = "RDBMSs' schema templates for relational-query";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relative-date" = callPackage
@@ -216598,8 +217668,8 @@ self: {
          base concatenative datetime mtl parsec time
        ];
        description = "Durations and generalized time parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216618,8 +217688,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Automation of Haskell package release process";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "relevant-time" = callPackage
@@ -216630,8 +217700,8 @@ self: {
        sha256 = "0978g03dlkgx45hxzk3lwl68iln8jnf0hldchac4yqp4c9rsxf22";
        libraryHaskellDepends = [ aeson base chronos text torsor ];
        description = "humanised relevant time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216645,7 +217715,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to the low-level reliable.io library.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relit" = callPackage
@@ -216656,7 +217726,7 @@ self: {
        sha256 = "03cnra0yfpijp65p1x0wv4fvc1p1l27lcb00k22ijrcy2mxqr9cg";
        libraryHaskellDepends = [ base regex-base template-haskell ];
        description = "Literal for regular expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reload" = callPackage
@@ -216691,8 +217761,8 @@ self: {
          websockets
        ];
        description = "A web based Haskell IDE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216714,7 +217784,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge unordered-containers ];
        description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "remark" = callPackage
@@ -216733,8 +217803,8 @@ self: {
          base GenericPretty tasty tasty-golden tasty-hunit
        ];
        description = "A DSL for marking student work";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216756,8 +217826,8 @@ self: {
          base GenericPretty tasty tasty-golden tasty-hunit
        ];
        description = "A DSL for marking student work";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216770,7 +217840,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "A simple api for matchers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rematch-text" = callPackage
@@ -216782,7 +217852,7 @@ self: {
        libraryHaskellDepends = [ base rematch text ];
        testHaskellDepends = [ base hspec HUnit rematch text ];
        description = "`rematch` matchers for Data.Text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "remote" = callPackage
@@ -216799,8 +217869,8 @@ self: {
          pureMD5 stm syb template-haskell time utf8-string
        ];
        description = "Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216816,8 +217886,8 @@ self: {
          array base ghc ghc-paths json network
        ];
        description = "Interface to ghci debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216842,8 +217912,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Remote Monad implementation of the JSON RPC protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216861,8 +217931,8 @@ self: {
          aeson base lens natural-transformation remote-json wreq
        ];
        description = "Web client wrapper for remote-json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216880,8 +217950,8 @@ self: {
          scotty text transformers warp
        ];
        description = "Web server wrapper for remote-json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216904,8 +217974,8 @@ self: {
          quickcheck-instances tasty tasty-quickcheck
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216938,8 +218008,8 @@ self: {
          system-filepath text time transformers-base
        ];
        description = "A library for client-server applications based on custom protocols";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216955,8 +218025,8 @@ self: {
          base bytestring fmt semigroups text transformers
        ];
        description = "Simple Utf8 wrapper for ByteString Builder with conversion classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216968,7 +218038,7 @@ self: {
        sha256 = "1idn0jg74wm3ksy5n4jk2dzsij64r1byghr6qc03g4d85n6mmsni";
        libraryHaskellDepends = [ base containers hashable transformers ];
        description = "An API for managing renderable resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reord" = callPackage
@@ -216979,7 +218049,7 @@ self: {
        sha256 = "07lxnfj0q565ydjzgcnb9dhjlrs7s1h6ybam7aic68lfd4p0hr7y";
        libraryHaskellDepends = [ base ];
        description = "Ad-hoc Ord instances";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "reorderable" = callPackage
@@ -216995,7 +218065,7 @@ self: {
        ];
        description = "Define compound types that do not depend on member order";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "repa" = callPackage
@@ -217012,7 +218082,7 @@ self: {
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
        description = "High performance, regular, shape polymorphic parallel arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-algorithms" = callPackage
@@ -217025,8 +218095,8 @@ self: {
        editedCabalFile = "0lvb1sn95qca9m1b8cy0a2j9gjzqm8g5v68ykglffjskv78d0jfm";
        libraryHaskellDepends = [ base repa vector ];
        description = "Algorithms using the Repa array library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217044,8 +218114,8 @@ self: {
          repa-convert repa-eval repa-scalar repa-stream text vector
        ];
        description = "Bulk array representations and operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217058,8 +218128,8 @@ self: {
        libraryHaskellDepends = [ base repa ];
        doHaddock = false;
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217075,8 +218145,8 @@ self: {
          base bytestring double-conversion primitive repa-scalar text vector
        ];
        description = "Packing and unpacking flat tables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217089,8 +218159,8 @@ self: {
        libraryHaskellDepends = [ base repa transformers ];
        librarySystemDepends = [ libdevil ];
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -217102,8 +218172,8 @@ self: {
        sha256 = "13dla66r1k85zibic3291xdwgv8hf44z9i6814p14xk8cqgbj9an";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Low-level parallel operators on bulk random-accessble arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217124,8 +218194,8 @@ self: {
          template-haskell vector
        ];
        description = "Examples using the Repa array library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217146,7 +218216,7 @@ self: {
          base criterion deepseq random repa repa-algorithms
        ];
        description = "Perform fft with repa via FFTW";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-flow" = callPackage
@@ -217164,8 +218234,8 @@ self: {
          vector
        ];
        description = "Data-parallel data flows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217183,7 +218253,7 @@ self: {
          base binary bmp bytestring old-time repa vector
        ];
        description = "Read and write Repa arrays in various formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-linear-algebra" = callPackage
@@ -217194,8 +218264,8 @@ self: {
        sha256 = "18lryk19dfcgq8d09lyc4bchg3gxlr1n8k4m50np2zmhk911n3jn";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "HMatrix operations for Repa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217212,8 +218282,8 @@ self: {
          mtl
        ];
        description = "Data Flow Fusion GHC Plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217231,8 +218301,8 @@ self: {
          base bytestring double-conversion primitive time vector
        ];
        description = "Scalar data types and conversions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217244,8 +218314,8 @@ self: {
        sha256 = "1kldz4d4cv0vliqw78ywbcfgh0mw4i5cd93j0jdagvhsbhlxlp5k";
        libraryHaskellDepends = [ base ghc ghc-prim vector ];
        description = "Series Expressionss API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217264,7 +218334,7 @@ self: {
          base directory filepath hsndfile hsndfile-vector repa vector
        ];
        description = "Reading and writing sound files with repa arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-stream" = callPackage
@@ -217275,8 +218345,8 @@ self: {
        sha256 = "0xdsnfmm8pw1daprz609h5qmiz9qdiv7n1zxk0yvxqmfpm3r4kl9";
        libraryHaskellDepends = [ base mtl primitive repa-scalar vector ];
        description = "Stream functions not present in the vector library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217297,7 +218367,7 @@ self: {
        executableHaskellDepends = [ base gloss repa ];
        description = "Provides high-level access to webcams";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217311,8 +218381,8 @@ self: {
          base ghc ghc-paths haskell-src-exts parsec
        ];
        description = "IRC friendly REPL library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217331,7 +218401,7 @@ self: {
          semigroupoids text transformers
        ];
        description = "Toolkit for quickly whipping up config files and command-line interfaces";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "replace-attoparsec" = callPackage
@@ -217339,14 +218409,14 @@ self: {
      }:
      mkDerivation {
        pname = "replace-attoparsec";
-       version = "1.4.2.0";
-       sha256 = "02amqp8gbsdvbbb55p6bab6hfhmcc1xijs0dc8677l9iv1q628yq";
+       version = "1.4.4.0";
+       sha256 = "06js4adbzvm2qn18vlaaxhav2dq1hqp825lmsvpg69cylp72fzif";
        libraryHaskellDepends = [ attoparsec base bytestring text ];
        testHaskellDepends = [
          attoparsec base bytestring Cabal parsers text
        ];
        description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "replace-megaparsec" = callPackage
@@ -217362,7 +218432,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring Cabal megaparsec text ];
        description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "replica" = callPackage
@@ -217383,8 +218453,8 @@ self: {
          QuickCheck quickcheck-instances template-haskell text wai
          wai-websockets websockets
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217411,8 +218481,8 @@ self: {
        executableHaskellDepends = [ base bytestring hedis-namespace mtl ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217429,7 +218499,7 @@ self: {
        ];
        testHaskellDepends = [ base containers mtl process ];
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "repo-based-blog" = callPackage
@@ -217457,8 +218527,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Blogging module using blaze html for markup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217474,8 +218544,8 @@ self: {
          base base-unicode-symbols dstring random string-combinators
        ];
        description = "Render overloaded expressions to their textual representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217487,7 +218557,7 @@ self: {
        sha256 = "1ypfb65ghjwxzsx525lcqc3f6pdr357lw6c2xgn54d4f3xi6xphj";
        libraryHaskellDepends = [ base containers syb text ];
        description = "Tree representation and pretty-printing of data structures based on SYB";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "representable-functors" = callPackage
@@ -217505,8 +218575,8 @@ self: {
          transformers
        ];
        description = "Representable functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217519,7 +218589,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "This package has been absorbed into profunctor-extras";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "representable-tries" = callPackage
@@ -217537,8 +218607,8 @@ self: {
          semigroups transformers
        ];
        description = "Tries from representations of polynomial functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217553,8 +218623,8 @@ self: {
          base mtl syb syz text transformers uniplate
        ];
        description = "Scrap Your Reprinter";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217567,8 +218637,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec ];
        description = "Define and combine \"materialized\" projections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217584,6 +218654,8 @@ self: {
        pname = "req";
        version = "3.8.0";
        sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap";
+       revision = "1";
+       editedCabalFile = "1gkd25bg87r0dr8rb04r3scjfm66v88905490fiy4x1826gj9cv0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
@@ -217600,7 +218672,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        doCheck = false;
        description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "req-conduit" = callPackage
@@ -217611,8 +218683,8 @@ self: {
        pname = "req-conduit";
        version = "1.0.0";
        sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx";
-       revision = "7";
-       editedCabalFile = "08ynq0760hd2v1pmbfmc2n71vjr33qmv1cgnklbqn2ibzbg3mmx2";
+       revision = "8";
+       editedCabalFile = "1md7zajmw87qrx6rvs35yrkbjs3s9nm0akg35jmf7a34xccrr7a7";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -217624,8 +218696,8 @@ self: {
          base bytestring conduit conduit-extra req resourcet temporary weigh
        ];
        description = "Conduit helpers for the req HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217648,8 +218720,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Provides OAuth2 authentication for use with Req";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217665,8 +218737,8 @@ self: {
        executableHaskellDepends = [ aeson base modern-uri req text ];
        testHaskellDepends = [ base hspec modern-uri req ];
        description = "Provides URI/URL helper functions for use with Req";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217683,8 +218755,8 @@ self: {
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
        ];
        description = "A local http server to catch the HTTP redirect";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217696,8 +218768,8 @@ self: {
        sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws";
        libraryHaskellDepends = [ base free mtl transformers ];
        description = "A transformer for generic requests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217729,7 +218801,7 @@ self: {
          mtl optparse-generic relude text
        ];
        description = "Scrap your qualified import clutter";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "requirements" = callPackage
@@ -217740,7 +218812,7 @@ self: {
        sha256 = "1s0s3p0dy07222ks83w3spfw9df33q5lggqv3dw4m9hd5x16a6zi";
        libraryHaskellDepends = [ base ];
        description = "Abstraction to manage user defined Type Errors";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "rere" = callPackage
@@ -217766,7 +218838,7 @@ self: {
          fin parsec vec
        ];
        description = "Regular-expressions extended with fixpoints for context-free powers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rerebase" = callPackage
@@ -217777,7 +218849,7 @@ self: {
        sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rerebase_1_10_0_1" = callPackage
@@ -217788,8 +218860,8 @@ self: {
        sha256 = "0kqcd80a4z1hynmdwb78dzif0iim6gwk9pdzkgzspf8kxir5adf3";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -217813,7 +218885,7 @@ self: {
          random regex-compat text unordered-containers vector
        ];
        description = "abstract implementation of typed and untyped web routing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rescue" = callPackage
@@ -217844,8 +218916,8 @@ self: {
          transformers-base world-peace
        ];
        description = "More understandable exceptions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217869,8 +218941,8 @@ self: {
          http-types network process QuickCheck unix warp
        ];
        description = "Reserve reloads web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217882,8 +218954,8 @@ self: {
        sha256 = "0ywskms53cnhyywryvsr6mi9qyba6l6dncpj0hx59k0rdr5nb25h";
        libraryHaskellDepends = [ base containers random ];
        description = "Unweighted reservoir sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217895,8 +218967,8 @@ self: {
        sha256 = "1arv9mcbg5xa6vzv6k85mcxdz38x26ipwhk8613qdd94a2hhf8nx";
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        description = "High performance variable binders";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217910,8 +218982,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base comfort-array lapack ];
        description = "Compute total resistance of a cube of resistors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217930,8 +219002,8 @@ self: {
          base bytestring directory filepath tasty tasty-hunit
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "resolv" = callPackage
@@ -217949,7 +219021,7 @@ self: {
          base bytestring directory filepath tasty tasty-hunit
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "resolve" = callPackage
@@ -217966,8 +219038,8 @@ self: {
          hslogger iproute network parsec stm stm-containers transformers
        ];
        description = "A name resolusion library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217986,8 +219058,8 @@ self: {
          optparse-applicative process unix
        ];
        description = "Remove trivial conflict markers in a git repository";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218006,8 +219078,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "A port of the package 'resourcet' for extensible effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218021,8 +219093,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring directory ];
        description = "Embed data files via C and FFI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218039,7 +219111,7 @@ self: {
          vector
        ];
        description = "A high-performance striped resource pooling implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "resource-pool-catchio" = callPackage
@@ -218055,8 +219127,8 @@ self: {
          transformers-base vector
        ];
        description = "Fork of resource-pool, with a MonadCatchIO constraint";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218072,7 +219144,7 @@ self: {
          base free kan-extensions monad-control resource-pool transformers
        ];
        description = "A monadic interface for resource-pool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "resource-simple" = callPackage
@@ -218088,8 +219160,8 @@ self: {
          transformers transformers-base
        ];
        description = "Allocate resources which are guaranteed to be released";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218106,7 +219178,7 @@ self: {
        ];
        testHaskellDepends = [ base exceptions hspec transformers ];
        description = "Deterministic allocation and freeing of scarce resources";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "resourcet-pool" = callPackage
@@ -218117,7 +219189,7 @@ self: {
        sha256 = "1jf6sbyhxrqbkdxiv330rk46kdvbrr0c4pybnm9cmij9wdqs15bd";
        libraryHaskellDepends = [ base resource-pool resourcet ];
        description = "A small library to convert a Pool into an Acquire";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "respond" = callPackage
@@ -218145,8 +219217,8 @@ self: {
          aeson base fast-logger http-types text wai
        ];
        description = "process and route HTTP requests and generate responses on top of WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218168,8 +219240,8 @@ self: {
          transformers-base transformers-compat uri-encode utf8-string
        ];
        description = "Utility library for use in generated API client libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218197,8 +219269,8 @@ self: {
          transformers transformers-compat unordered-containers
        ];
        description = "Rest API library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218221,8 +219293,8 @@ self: {
        ];
        executableHaskellDepends = [ base base-compat rest-gen ];
        description = "Example project for rest";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218250,8 +219322,8 @@ self: {
          test-framework-hunit
        ];
        description = "Documentation and client generation from rest definition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218269,8 +219341,8 @@ self: {
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
        description = "Rest driver for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218288,8 +219360,8 @@ self: {
          snap-core unordered-containers uri-encode utf8-string
        ];
        description = "Rest driver for Snap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218306,8 +219378,8 @@ self: {
          unordered-containers
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218327,8 +219399,8 @@ self: {
          generic-xmlpickler hxt json-schema rest-stringmap text uuid
        ];
        description = "Silk Rest Framework Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218348,8 +219420,8 @@ self: {
          mime-types mtl rest-core text unordered-containers wai
        ];
        description = "Rest driver for WAI applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218361,8 +219433,8 @@ self: {
        sha256 = "0bar7sy53pylq13wkbb4j3i7y81g6y203njkh9vlid7nh109j409";
        libraryHaskellDepends = [ aeson base bytestring unix ];
        description = "Minimal live coding library for model-view-event-update applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218382,8 +219454,8 @@ self: {
          readable snap snap-core snap-extras template-haskell text time
          time-locale-compat xmlhtml
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218402,7 +219474,7 @@ self: {
          base bytestring containers tasty tasty-hunit temporary text
        ];
        description = "Easy Git repository serialization";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "restricted-workers" = callPackage
@@ -218420,8 +219492,8 @@ self: {
          transformers-base unix
        ];
        description = "Running worker processes under system resource restrictions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218436,8 +219508,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base directory filepath utf8-string ];
        description = "Convert between camel case and separated words style";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218450,7 +219522,7 @@ self: {
        libraryHaskellDepends = [ base bifunctors keys mtl transformers ];
        testHaskellDepends = [ base ];
        description = "Encode success or at least one error";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "resumable-exceptions" = callPackage
@@ -218462,7 +219534,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer for resumable exceptions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rethinkdb" = callPackage
@@ -218485,8 +219557,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        description = "A driver for RethinkDB 2.2";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218515,8 +219587,8 @@ self: {
          base criterion text time unordered-containers vector
        ];
        description = "Client driver for RethinkDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218532,8 +219604,8 @@ self: {
          aeson base mtl rethinkdb text transformers unordered-containers
        ];
        description = "Useful tools for modeling data with rethinkdb";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218553,8 +219625,8 @@ self: {
          unordered-containers utf8-string vector
        ];
        description = "RethinkDB driver for Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218583,7 +219655,7 @@ self: {
          syb tasty tasty-hunit temporary text unordered-containers
        ];
        description = "A powerful, easy-to-use codemodding tool for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "retry" = callPackage
@@ -218603,7 +219675,7 @@ self: {
          tasty-hedgehog tasty-hunit time transformers
        ];
        description = "Retry combinators for monadic actions that may fail";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "retryer" = callPackage
@@ -218616,8 +219688,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative process ];
        description = "Retry failed commands";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218632,7 +219704,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
        description = "Reverse State monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "revdectime" = callPackage
@@ -218656,7 +219728,7 @@ self: {
        sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
        libraryHaskellDepends = [ base ];
        description = "Standard version of the reverse apply operator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reverse-arguments" = callPackage
@@ -218667,7 +219739,7 @@ self: {
        sha256 = "0f9dz654rqz0yrh1qvl6947ds5pfl2bsy7gnv4i8swlaj1n8dmzi";
        libraryHaskellDepends = [ base ];
        description = "Reverse the arguments of arbitrary functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reverse-geocoding" = callPackage
@@ -218682,8 +219754,8 @@ self: {
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
        description = "Simple reverse geocoding using OpenStreeMap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218697,8 +219769,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base process ];
        description = "Text-only reversi (aka othelo) game";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218714,8 +219786,8 @@ self: {
          base bytestring directory multiarg process
        ];
        description = "open file and rewrite it with new contents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218735,8 +219807,8 @@ self: {
        ];
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218748,8 +219820,8 @@ self: {
        sha256 = "0gnd8awqjnm905m29yldy3z7w7jvilj5svijz63lzmwbjknfh6bs";
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218767,7 +219839,7 @@ self: {
          pcre-light template-haskell
        ];
        description = "A quasi-quoter for typeful results of regex captures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rezoom" = callPackage
@@ -218786,7 +219858,7 @@ self: {
        ];
        description = "Github resume generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218820,8 +219892,8 @@ self: {
          warp wreq
        ];
        description = "Robert Fischer's Common library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218833,8 +219905,8 @@ self: {
        sha256 = "1s3r5wpap3rj7fxx1wvxjk5671jcnllvplz631vagwbyl9p755zh";
        libraryHaskellDepends = [ base envy network rfc-prelude time ];
        description = "Environment variable support from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218852,8 +219924,8 @@ self: {
          rfc-prelude scientific servant-server vector wreq
        ];
        description = "The HTTP client extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218877,8 +219949,8 @@ self: {
          tuple unliftio unliftio-core uuid-types
        ];
        description = "The Prelude from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218895,8 +219967,8 @@ self: {
          rfc-prelude transformers
        ];
        description = "The PostgreSQL extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218908,8 +219980,8 @@ self: {
        sha256 = "00r8mghkgqgf6mh4v5jspahdcpb3bj5i82rmiyasv01a7gp6gzsg";
        libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ];
        description = "The Redis extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218931,8 +220003,8 @@ self: {
          servant-server servant-swagger servant-swagger-ui swagger2 wai wreq
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218944,7 +220016,7 @@ self: {
        sha256 = "065x5fgsqdi4d5sjd1gridwshag3afdbip1g8qi4jz41xdi2xm38";
        libraryHaskellDepends = [ base network-simple rfc1413-types ];
        description = "rfc1413 server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rfc1413-types" = callPackage
@@ -218957,7 +220029,7 @@ self: {
        editedCabalFile = "1v55q9z4k4c4qb30hmavf3hvwi1i9a351i12ycwzmlj0vv382byk";
        libraryHaskellDepends = [ base bytestring ];
        description = "An rfc1413 parser and response renderer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rfc1751" = callPackage
@@ -218973,7 +220045,7 @@ self: {
          base bytestring cereal hspec QuickCheck vector
        ];
        description = "RFC-1751 library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rfc3339" = callPackage
@@ -218985,7 +220057,7 @@ self: {
        libraryHaskellDepends = [ base timerep ];
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rfc5051" = callPackage
@@ -218997,7 +220069,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base text ];
        description = "Simple unicode collation as per RFC5051";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rg" = callPackage
@@ -219016,8 +220088,8 @@ self: {
          vector
        ];
        description = "A dynamic/unbounded alternative to Bounded Enum";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219029,7 +220101,7 @@ self: {
        sha256 = "0vhqw2hylv0228g48b4q81fs0pjgmv68rzlasnz39g6yqddws97c";
        libraryHaskellDepends = [ base ];
        description = "Haskell types for working with RGB colors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rhbzquery" = callPackage
@@ -219039,8 +220111,8 @@ self: {
      }:
      mkDerivation {
        pname = "rhbzquery";
-       version = "0.4.1";
-       sha256 = "0zfn9bzgm3wb2apnnnakh0lmys0nf9a2ch797m1sfsrbx2mjqvmh";
+       version = "0.4.2";
+       sha256 = "1j9nxizi1wsgz5gamdn9izy4aq6ci41gbkvsw7bbpc8fnvv5gpd2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -219049,7 +220121,7 @@ self: {
        ];
        testHaskellDepends = [ base simple-cmd ];
        description = "Bugzilla query tool";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "rhine" = callPackage
@@ -219066,7 +220138,7 @@ self: {
          simple-affine-space time transformers vector-sized
        ];
        description = "Functional Reactive Programming with type-level clocks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rhine-gloss" = callPackage
@@ -219080,7 +220152,7 @@ self: {
        libraryHaskellDepends = [ base dunai gloss rhine transformers ];
        executableHaskellDepends = [ base ];
        description = "Gloss backend for Rhine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -219098,8 +220170,8 @@ self: {
          base call containers lens mtl objective split
        ];
        description = "Haskell rhythm game tutorial";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219133,7 +220205,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "riak-protobuf" = callPackage
@@ -219149,7 +220221,7 @@ self: {
        ];
        description = "Haskell types for the Riak protocol buffer API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "riak-protobuf-lens" = callPackage
@@ -219171,7 +220243,7 @@ self: {
        ];
        description = "Lenses for riak-protobuf";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rib" = callPackage
@@ -219201,8 +220273,8 @@ self: {
          safe-exceptions shake text time wai wai-app-static warp
        ];
        description = "Static site generator based on Shake";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219224,7 +220296,7 @@ self: {
          text time wai wai-app-static warp
        ];
        description = "Static site generator based on Shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ribbit" = callPackage
@@ -219235,8 +220307,8 @@ self: {
        sha256 = "076m5w4w08z8migb0v8vb6lybs06x1bfvxqfi9g633lz464hyi9v";
        libraryHaskellDepends = [ base Only postgresql-simple text time ];
        description = "Type-level Relational DB combinators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219271,7 +220343,7 @@ self: {
        ];
        description = "api extensions for nvim-hs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ribosome-root" = callPackage
@@ -219303,7 +220375,7 @@ self: {
        ];
        description = "api extensions for nvim-hs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ribosome-test" = callPackage
@@ -219325,7 +220397,7 @@ self: {
        ];
        description = "test helpers for ribosome";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "richreports" = callPackage
@@ -219336,7 +220408,7 @@ self: {
        sha256 = "0mik0m6nziwm6z517wkxdmjp92nh3qz1m8yk3x5897zafgs1y5kk";
        libraryHaskellDepends = [ ascetic base MissingH ];
        description = "Integrated pretty-printing and error/static analysis reporting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ridley" = callPackage
@@ -219364,8 +220436,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Quick metrics to grow your app strong";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219383,8 +220455,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219414,8 +220486,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A Riemann client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219434,8 +220506,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring filepath ];
        description = "RIFF parser for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219452,7 +220524,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A mid-level wrapper for vega-lite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ring-buffer" = callPackage
@@ -219466,8 +220538,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl primitive vector ];
        testHaskellDepends = [ base HUnit QuickCheck vector ];
        description = "A concurrent, mutable ring-buffer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219484,8 +220556,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit primitive QuickCheck ];
        description = "mutable ring buffers with atomic updates in GHC Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219502,7 +220574,7 @@ self: {
          semigroupoids
        ];
        description = "Ring-like objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rio" = callPackage
@@ -219528,7 +220600,7 @@ self: {
          unordered-containers vector
        ];
        description = "A standard library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rio-orphans" = callPackage
@@ -219548,7 +220620,7 @@ self: {
          resourcet rio transformers-base
        ];
        description = "Orphan instances for the RIO type in the rio package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rio-prettyprint" = callPackage
@@ -219564,7 +220636,7 @@ self: {
          path rio text
        ];
        description = "Pretty-printing for RIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "riot" = callPackage
@@ -219584,7 +220656,7 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -219605,7 +220677,7 @@ self: {
        ];
        description = "Ripple payment system library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ripple-federation" = callPackage
@@ -219623,7 +220695,7 @@ self: {
        ];
        description = "Utilities and types to work with the Ripple federation protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "risc-v" = callPackage
@@ -219642,8 +220714,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "RISC-V";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219659,8 +220731,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl pretty ];
        executableToolDepends = [ alex happy ];
        description = "Reduced instruction set i386 simulator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219675,8 +220747,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell representation of the RISC-V instruction set architecture";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219697,7 +220769,7 @@ self: {
          unordered-containers vector
        ];
        description = "Parses and renders RISON strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivers" = callPackage
@@ -219708,8 +220780,8 @@ self: {
        sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64";
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        description = "Rivers are like Streams, but different";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219723,8 +220795,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        description = "A project management tool for Haskell applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219736,7 +220808,7 @@ self: {
        sha256 = "0gpvlxrg6m4avxk6zhym20mx7ha2qdjr1dkjzjwsvyk4fhcjk399";
        libraryHaskellDepends = [ base postgresql-simple rivet-core text ];
        description = "Rivet migration library postgresql backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivet-autoimporter" = callPackage
@@ -219749,7 +220821,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
        description = "Database migration library; automatic importer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivet-core" = callPackage
@@ -219761,7 +220833,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "Database migration library; core functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivet-migration" = callPackage
@@ -219772,8 +220844,8 @@ self: {
        sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd";
        libraryHaskellDepends = [ base postgresql-simple text ];
        description = "Postgresql migration support for project management tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219785,8 +220857,8 @@ self: {
        sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        description = "Basic deployment support for project management tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219812,8 +220884,8 @@ self: {
          base containers mtl unordered-containers
        ];
        description = "Collection of Reinforcement Learning algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219836,8 +220908,8 @@ self: {
          network-simple random transformers
        ];
        description = "A Haskell codec for RL-Glue";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219849,7 +220921,7 @@ self: {
        sha256 = "17v8sbgfk1mnm6qfqsnrjcm2nh7i2bibgyr6bh0bic8cfcx0haia";
        libraryHaskellDepends = [ base ];
        description = "Lists with cheap snocs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rlwe-challenges" = callPackage
@@ -219873,8 +220945,8 @@ self: {
        ];
        executableHaskellDepends = [ ansi-terminal base options time ];
        description = "Ring-LWE/LWR challenges using Lol";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219891,8 +220963,8 @@ self: {
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "Restricted monad library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219921,8 +220993,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219940,7 +221012,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "RNG within an IORef for convenient concurrent use";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rob" = callPackage
@@ -219961,8 +221033,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        testHaskellDepends = [ base directory ];
        description = "Simple projects generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219982,8 +221054,8 @@ self: {
          monad-control mtl process resourcet text time unix
        ];
        description = "A build daemon for Haskell development";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220005,7 +221077,7 @@ self: {
          servant-client servant-flatten servant-server string-conversions
        ];
        description = "Automatic session-aware servant testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "robot" = callPackage
@@ -220019,7 +221091,7 @@ self: {
        ];
        description = "Simulate keyboard and mouse events";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "robots-txt" = callPackage
@@ -220038,8 +221110,8 @@ self: {
          transformers
        ];
        description = "Parser for robots.txt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220054,8 +221126,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "ROC online clustering algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220073,8 +221145,8 @@ self: {
          base containers gloss optparse-applicative roc-cluster
        ];
        description = "Gloss interactive demo for roc-cluster package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220094,7 +221166,7 @@ self: {
          vector-sized
        ];
        description = "Implementation of the ROC National ID standard";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rock" = callPackage
@@ -220119,8 +221191,8 @@ self: {
          hashable hedgehog mtl unordered-containers
        ];
        description = "A build system for incremental, parallel, and demand-driven computations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220143,8 +221215,8 @@ self: {
          QuickCheck resourcet temporary transformers
        ];
        description = "Haskell bindings to RocksDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) rocksdb;};
 
@@ -220165,7 +221237,7 @@ self: {
          string-conversions unliftio
        ];
        description = "Haskell bindings for RocksDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) rocksdb;};
 
   "rocksdb-query" = callPackage
@@ -220184,7 +221256,9 @@ self: {
          base cereal data-default hspec rocksdb-haskell-jprupp unliftio
        ];
        description = "RocksDB database querying library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "roguestar" = callPackage
@@ -220202,7 +221276,7 @@ self: {
        ];
        description = "Sci-fi roguelike game. Client application.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roguestar-engine" = callPackage
@@ -220223,7 +221297,7 @@ self: {
        ];
        description = "Sci-fi roguelike game. Backend.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roguestar-gl" = callPackage
@@ -220241,7 +221315,7 @@ self: {
        ];
        description = "Sci-fi roguelike game. Client library.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roguestar-glut" = callPackage
@@ -220255,7 +221329,7 @@ self: {
        executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
        description = "Sci-fi roguelike game. GLUT front-end.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roku-api" = callPackage
@@ -220270,8 +221344,8 @@ self: {
          base bytestring http-client network text xml xml-extractors
        ];
        description = "Bindings to Roku's External Control API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220283,7 +221357,7 @@ self: {
        sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2";
        libraryHaskellDepends = [ base containers ];
        description = "Composable class-based roles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rollbar" = callPackage
@@ -220299,8 +221373,8 @@ self: {
          network resourcet text vector
        ];
        description = "error tracking through rollbar.com";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220318,8 +221392,8 @@ self: {
        executableHaskellDepends = [ base rollbar-client ];
        testHaskellDepends = [ base ];
        description = "Simple CLI tool to perform commons tasks such as tracking deploys";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220343,8 +221417,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Core library to communicate with Rollbar API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220367,8 +221441,8 @@ self: {
          QuickCheck text unordered-containers
        ];
        description = "Core Rollbar data types and APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220393,8 +221467,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Provides error reporting capabilities to WAI based applications through Rollbar API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220416,8 +221490,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Provides error reporting capabilities to Yesod applications through Rollbar API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220438,8 +221512,8 @@ self: {
          base optparse-applicative random regex-applicative
        ];
        description = "Playing with applicatives and dice!";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220451,7 +221525,7 @@ self: {
        sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43";
        libraryHaskellDepends = [ base stm ];
        description = "Bounded channel for STM that discards old entries when full";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roman-numerals" = callPackage
@@ -220464,7 +221538,7 @@ self: {
          base base-unicode-symbols bytestring text
        ];
        description = "Parsing and pretty printing of Roman numerals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "romkan" = callPackage
@@ -220481,7 +221555,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Japanese Romaji <-> Japanese Kana conversion library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ron" = callPackage
@@ -220500,7 +221574,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ];
        description = "RON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ron-rdt" = callPackage
@@ -220516,8 +221590,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Replicated Data Types (RON-RDT)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220535,8 +221609,8 @@ self: {
          ron-rdt template-haskell text transformers
        ];
        description = "RON-Schema";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220554,8 +221628,8 @@ self: {
          mtl network-info ron ron-rdt stm text tf-random transformers
        ];
        description = "RON Storage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220567,7 +221641,7 @@ self: {
        sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9";
        libraryHaskellDepends = [ base tagged ];
        description = "Root-finding algorithms (1-dimensional)";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "rope" = callPackage
@@ -220580,8 +221654,8 @@ self: {
          base bytestring fingertree mtl utf8-string
        ];
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220598,7 +221672,7 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Ropes optimised for updating using UTF-16 code units and row/column pairs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rosa" = callPackage
@@ -220618,7 +221692,21 @@ self: {
          wreq
        ];
        description = "Query the namecoin blockchain";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
+     }) {};
+
+  "rose" = callPackage
+    ({ mkDerivation, base, comonad, free, indexed-traversable
+     , QuickCheck, quickcheck-classes
+     }:
+     mkDerivation {
+       pname = "rose";
+       version = "0.1";
+       sha256 = "1nmprllcihxif0m7p484afrmcabxhc2v5z5g3j3j658z6mbn1b2g";
+       libraryHaskellDepends = [ base comonad free indexed-traversable ];
+       testHaskellDepends = [ base QuickCheck quickcheck-classes ];
+       description = "rose trees";
+       license = lib.licenses.bsd3;
      }) {};
 
   "rose-trees" = callPackage
@@ -220646,8 +221734,8 @@ self: {
          unordered-containers witherable
        ];
        description = "Various trie implementations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220663,8 +221751,8 @@ self: {
          base containers deepseq minilens mtl transformers
        ];
        description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220680,7 +221768,9 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Common rose tree/forest functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "rosezipper" = callPackage
@@ -220691,7 +221781,7 @@ self: {
        sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
        libraryHaskellDepends = [ base containers ];
        description = "Generic zipper implementation for Data.Tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roshask" = callPackage
@@ -220723,8 +221813,8 @@ self: {
          filepath mtl pureMD5 tasty tasty-hunit testpack transformers
        ];
        description = "Haskell support for the ROS robotics framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220742,8 +221832,8 @@ self: {
          lens-family-core pureMD5 template-haskell text
        ];
        description = "ROS message parser, render, TH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220761,8 +221851,8 @@ self: {
          base filepath monad-logger rosmsg rospkg stack temporary text
        ];
        description = "ROS message management tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220783,7 +221873,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "ROS package system information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rosso" = callPackage
@@ -220794,8 +221884,8 @@ self: {
        sha256 = "0cz5kqpvq9qjkdy2x3y6aqia3armawjjsnv2pxifl0l6f9hhrvis";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220808,7 +221898,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base bytestring hspec QuickCheck text ];
        description = "Fast ROT13 cipher for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rotating-log" = callPackage
@@ -220827,8 +221917,8 @@ self: {
          base bytestring directory filepath time time-locale-compat
        ];
        description = "Size-limited, concurrent, automatically-rotating log writer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220845,7 +221935,7 @@ self: {
          base QuickCheck semigroups tasty tasty-quickcheck
        ];
        description = "A simple round-robin data type";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rounded" = callPackage
@@ -220863,8 +221953,8 @@ self: {
        libraryPkgconfigDepends = [ mpfr ];
        testHaskellDepends = [ base long-double ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
@@ -220889,8 +221979,8 @@ self: {
          array base deepseq fp-ieee gauge primitive vector
        ];
        description = "Directed rounding for built-in floating types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220902,8 +221992,8 @@ self: {
        sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y";
        libraryHaskellDepends = [ array base numeric-extras ];
        description = "Explicit floating point rounding mode wrappers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220919,7 +222009,7 @@ self: {
          base containers pretty safe template-haskell text xml-types
        ];
        description = "Bidirectional (de-)serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -220939,8 +222029,8 @@ self: {
          aeson base bytestring lens-aeson roundtrip text vector
        ];
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220952,7 +222042,7 @@ self: {
        sha256 = "1lad64y877rf36dgldkc7qcg5xagjc00z4cf2r1ahamv379df8d7";
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -220973,8 +222063,8 @@ self: {
          text xml-enumerator xml-types
        ];
        description = "Bidirectional (de-)serialization for XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220991,7 +222081,7 @@ self: {
        ];
        description = "Utility to generate routes for use with yesod-routes";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "route-planning" = callPackage
@@ -221009,8 +222099,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A library and utilities for creating a route";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221027,7 +222117,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        doHaddock = false;
        description = "Row types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "row-types" = callPackage
@@ -221045,7 +222135,7 @@ self: {
        testHaskellDepends = [ base generic-lens ];
        benchmarkHaskellDepends = [ base deepseq gauge ];
        description = "Open Records and Variants";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rowdy" = callPackage
@@ -221057,7 +222147,7 @@ self: {
        libraryHaskellDepends = [ base containers dlist mtl ];
        testHaskellDepends = [ base containers dlist hspec mtl ];
        description = "An EDSL for web application routes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rowdy-yesod" = callPackage
@@ -221069,7 +222159,7 @@ self: {
        libraryHaskellDepends = [ base rowdy yesod-core ];
        testHaskellDepends = [ base hspec rowdy yesod-core ];
        description = "An EDSL for web application routes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rowrecord" = callPackage
@@ -221080,8 +222170,8 @@ self: {
        sha256 = "0gcrdy75f0rqfayn37frwcixb086x4s7dygphxhxbpvyl8sjnl0l";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221098,8 +222188,8 @@ self: {
          template-haskell th-lift
        ];
        description = "type safe rpcs provided as basic IO actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221118,8 +222208,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "a remote procedure call framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221139,8 +222229,8 @@ self: {
          hslogger iproute parsec unix
        ];
        description = "Receiver Policy Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221154,8 +222244,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221180,8 +222270,8 @@ self: {
        ];
        testHaskellDepends = [ base extra hspec simple-cmd unix ];
        description = "Order RPM packages by dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221198,8 +222288,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "Recurrence rule parser and formatter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221219,8 +222309,8 @@ self: {
          rsagl-math stm Vec Vec-OpenGLRaw
        ];
        description = "The RogueStar Animation and Graphics Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221236,8 +222326,8 @@ self: {
          array arrows base containers mtl old-time random rsagl-math stm
        ];
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221254,8 +222344,8 @@ self: {
          random Vec Vec-OpenGLRaw
        ];
        description = "The RogueStar Animation and Graphics Library: Mathematics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221269,7 +222359,7 @@ self: {
        testHaskellDepends = [ base QuickCheck safe ];
        description = "Range set";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rspp" = callPackage
@@ -221280,8 +222370,8 @@ self: {
        sha256 = "132s7pbm49fgpiq7znr72h52wcmwblljblr0s0krr56593gp2rry";
        libraryHaskellDepends = [ base ];
        description = "A Rational Street Performer Protocol solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221295,8 +222385,8 @@ self: {
        editedCabalFile = "0ql1ffjw0g1sdyz9icin4cq86i5b9ljzhvpivfbbyaipg2nc9z0s";
        libraryHaskellDepends = [ base HaXml network network-uri time ];
        description = "A library for generating RSS 2.0 feeds.";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221327,8 +222417,8 @@ self: {
          tasty-quickcheck text time uri-bytestring xml-conduit xml-types
        ];
        description = "Streaming parser/renderer for the RSS standard";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221352,8 +222442,8 @@ self: {
          text time transformers utf8-string
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221365,8 +222455,8 @@ self: {
        sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "stream-fusion framework from vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221395,8 +222485,8 @@ self: {
          tasty-hunit tasty-quickcheck text word24
        ];
        description = "Haskell bindings for RTCM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221409,7 +222499,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "dynamic linker tools for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rtlsdr" = callPackage
@@ -221422,8 +222512,8 @@ self: {
        librarySystemDepends = [ rtl-sdr ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to librtlsdr";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtnetlink" = callPackage
@@ -221445,8 +222535,8 @@ self: {
          base bytestring exceptions hspec linux-namespaces socket unix
        ];
        description = "Manipulate network devices, addresses, and routes on Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221463,8 +222553,8 @@ self: {
          mtl network split utf8-string
        ];
        description = "A library for communicating with RTorrent over its XML-RPC interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221485,7 +222575,7 @@ self: {
          QuickCheck temporary utf8-string
        ];
        description = "Parsing and manipulation of rtorrent state file contents";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "rts-loader" = callPackage
@@ -221504,8 +222594,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal process ];
        description = "Dynamically load Haskell libraries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221523,8 +222613,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
        description = "Binding to the C++ audio stretching library Rubber Band";
-       license = stdenv.lib.licenses.gpl3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.gpl3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -221542,8 +222632,8 @@ self: {
          base bytestring cereal containers fail hspec mtl string-conv vector
        ];
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221560,8 +222650,8 @@ self: {
          process template-haskell trifecta
        ];
        description = "rubyish quasiquoters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221573,8 +222663,8 @@ self: {
        sha256 = "1id3rpfzqwhnmv2w4p35a70zfanwrpazix27ak1hzaz1jd2yfmz5";
        libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
        description = "relatively useful fractal functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221596,8 +222686,8 @@ self: {
          smallcheck template-haskell
        ];
        description = "Pliable records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221616,8 +222706,8 @@ self: {
          base Cabal containers mtl shuffle uhc-util uuagc uuagc-cabal uulib
        ];
        description = "Ruler tool for UHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221636,7 +222726,7 @@ self: {
          uulib
        ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221648,7 +222738,7 @@ self: {
        sha256 = "1ra8rv7cbsj1x8vfd3sbynd7a73v9arfimzcfhg9j6blqcii2i2d";
        libraryHaskellDepends = [ base data-default filepath process ];
        description = "Running newly generated Haskell source module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "run-st" = callPackage
@@ -221659,8 +222749,8 @@ self: {
        sha256 = "11if8xwv22ry0mxrglg3pcx3cx8ljnq56f3m9vjkr9jcj2881dvf";
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        description = "runST without boxing penalty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221672,8 +222762,8 @@ self: {
        sha256 = "07drd0xvkg06p2fsbncafnr7wzkrs4m6sfs1szbbscggw3pxh4fp";
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221691,7 +222781,7 @@ self: {
          base cmdargs directory filepath old-time process
        ];
        description = "runghc replacement for fast repeated runs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "runhs" = callPackage
@@ -221710,8 +222800,8 @@ self: {
        ];
        testHaskellDepends = [ base directory hspec process ];
        description = "Stack wrapper for single-file Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221729,8 +222819,8 @@ self: {
          async base bytestring optparse-applicative process stm
        ];
        description = "Run multiple commands, interleaving output and errors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221742,7 +222832,7 @@ self: {
        sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms";
        testHaskellDepends = [ base data-memocombinators time ];
        description = "A simple memoization helper library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "runtime-arbitrary" = callPackage
@@ -221753,8 +222843,8 @@ self: {
        sha256 = "1lb9c174vmbcjpm4y1j2jwngbzx5s0s1iiq8iam5g87h475k2bh1";
        libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
        description = "Runtime generation of Arbitrary values";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221772,7 +222862,9 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "RISC-V";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "rvar" = callPackage
@@ -221787,7 +222879,7 @@ self: {
          base MonadPrompt mtl random-source transformers
        ];
        description = "Random Variables";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "rwlock" = callPackage
@@ -221798,7 +222890,7 @@ self: {
        sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba";
        libraryHaskellDepends = [ base monad-loops-stm stm syb ];
        description = "Multiple-read / single-write locks";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "rws" = callPackage
@@ -221818,11 +222910,29 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Packet Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "rz-pipe" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HTTP, process
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "rz-pipe";
+       version = "0.1.0";
+       sha256 = "0x8mdry5l8b4dnpi43g2vqj9haggi7asnjhdz864bw17gr53g8vx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP process utf8-string
+       ];
+       executableHaskellDepends = [ aeson base ];
+       description = "Pipe interface for Rizin";
+       license = lib.licenses.mit;
+     }) {};
+
   "s-cargot" = callPackage
     ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck, text
      }:
@@ -221835,7 +222945,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec text ];
        testHaskellDepends = [ base HUnit parsec QuickCheck text ];
        description = "A flexible, extensible s-expression library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "s-cargot-letbind" = callPackage
@@ -221847,7 +222957,7 @@ self: {
        libraryHaskellDepends = [ base s-cargot text ];
        testHaskellDepends = [ base HUnit parsec s-cargot text ];
        description = "Enables let-binding and let-expansion for s-cargot defined S-expressions";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "s-expression" = callPackage
@@ -221861,8 +222971,8 @@ self: {
        libraryHaskellDepends = [ base derive-monoid lens semigroups ];
        executableHaskellDepends = [ base ];
        description = "simple general-purpose s-expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221884,7 +222994,7 @@ self: {
          case-insensitive cryptohash http-types time utf8-string
        ];
        description = "Pre-signed Amazon S3 URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe" = callPackage
@@ -221896,7 +223006,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-access" = callPackage
@@ -221907,7 +223017,7 @@ self: {
        sha256 = "13fw3b4sgrqymkq27n0727y5m8d3h6h44lfb9faip98bakr5d8v5";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple environment to control access to data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-buffer-monad" = callPackage
@@ -221922,8 +223032,8 @@ self: {
          base hspec mtl safe-exceptions stm unliftio
        ];
        description = "A monadic buffer resilient to exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221935,8 +223045,8 @@ self: {
        sha256 = "059mn68pj57dvjzmv3vypv0askx02f4hlalbzsr34cn2h7ndw6df";
        libraryHaskellDepends = [ base ];
        description = "A friendly shorthand for an old friend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221956,7 +223066,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Safe and very efficient arithmetic operations on fixed decimal point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-exceptions" = callPackage
@@ -221970,7 +223080,7 @@ self: {
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        description = "Safe, consistent, and easy exception handling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safe-exceptions-checked" = callPackage
@@ -221988,7 +223098,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Safe, checked exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-failure" = callPackage
@@ -221999,7 +223109,7 @@ self: {
        sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7";
        libraryHaskellDepends = [ base failure ];
        description = "Library for safe functions (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-failure-cme" = callPackage
@@ -222012,7 +223122,7 @@ self: {
          base control-monad-exception safe-failure
        ];
        description = "control-monad-exception Instances for safe-failure";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "safe-foldable" = callPackage
@@ -222023,7 +223133,7 @@ self: {
        sha256 = "1l87j0liv0hgdv3f3d4s4962df5q5xcyhmnfz2fj773r1v62wzya";
        libraryHaskellDepends = [ base ];
        description = "Safe wrappers for null-partial Foldable operations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safe-freeze" = callPackage
@@ -222034,8 +223144,8 @@ self: {
        sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33";
        libraryHaskellDepends = [ base indexed mtl vector ];
        description = "Support for safely freezing multiple arrays in the ST monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222047,8 +223157,8 @@ self: {
        sha256 = "0an3hy28fpdw3v5gjx13fbszzp4r2p65l8mgks0pdflscf2cwwv5";
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222073,7 +223183,7 @@ self: {
          temporary text time unordered-containers uuid uuid-types vector
        ];
        description = "Automatic JSON format versioning";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safe-lazy-io" = callPackage
@@ -222087,8 +223197,8 @@ self: {
          base extensible-exceptions parallel strict-io
        ];
        description = "A library providing safe lazy IO features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222106,8 +223216,8 @@ self: {
          base hspec hspec-core QuickCheck should-not-typecheck
        ];
        description = "Tired of accidentally calling length on tuples? Relief at last!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222129,7 +223239,7 @@ self: {
          tasty-hunit tasty-quickcheck text vector-space
        ];
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-aeson" = callPackage
@@ -222146,7 +223256,7 @@ self: {
          text
        ];
        description = "Instances from the aeson library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-cereal" = callPackage
@@ -222163,7 +223273,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Instances from the cereal library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-serialise" = callPackage
@@ -222180,7 +223290,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Instances from the serialise library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-store" = callPackage
@@ -222197,7 +223307,7 @@ self: {
          text
        ];
        description = "Instances from the store library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-xmlbf" = callPackage
@@ -222214,7 +223324,7 @@ self: {
          xmlbf
        ];
        description = "Instances from the xmlbf library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-plugins" = callPackage
@@ -222229,8 +223339,8 @@ self: {
          base directory filepath haskell-src-exts plugins Unixutils
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222250,8 +223360,8 @@ self: {
          th-lift
        ];
        description = "Well-typed, flexible and variadic printf for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222267,7 +223377,7 @@ self: {
          base constraints containers deepseq hmatrix mtl singletons
        ];
        description = "Dependently typed tensor algebra";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safecopy" = callPackage
@@ -222278,8 +223388,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.10.3";
-       sha256 = "142ghv6pa3y0s7x141x9f9r5sn0315vvkfw6f7lgnndlncs5y354";
+       version = "0.10.3.1";
+       sha256 = "0y2jpykad7inzndw4azb2wdp4zp3smjax95sdcxycw5x88rxdra1";
        libraryHaskellDepends = [
          array base bytestring cereal containers generic-data old-time
          template-haskell text time transformers vector
@@ -222290,7 +223400,7 @@ self: {
          template-haskell time vector
        ];
        description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -222307,8 +223417,8 @@ self: {
          microlens safecopy template-haskell th-abstraction uniplate
        ];
        description = "Making SafeCopy migrations easier";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222332,8 +223442,8 @@ self: {
          template-haskell time vector
        ];
        description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222351,8 +223461,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "overflow-checked Int type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222375,7 +223485,7 @@ self: {
          test-framework-th unix
        ];
        description = "Write output to disk atomically";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safepath" = callPackage
@@ -222387,8 +223497,8 @@ self: {
        libraryHaskellDepends = [ base text validity ];
        testHaskellDepends = [ base doctest ];
        description = "Safe Paths in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222405,8 +223515,8 @@ self: {
          regional-pointers regions transformers
        ];
        description = "Type-safe file handling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222423,8 +223533,8 @@ self: {
          safer-file-handles transformers
        ];
        description = "Extends safer-file-handles with ByteString operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222440,8 +223550,8 @@ self: {
          explicit-iomodes-text regions safer-file-handles text transformers
        ];
        description = "Extends safer-file-handles with Text operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222453,8 +223563,8 @@ self: {
        sha256 = "00ykmy44paghgc3m731p1hh00zv11416pl2xil4cav7vrr43nb6h";
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "A simple type-safe routing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222470,8 +223580,8 @@ self: {
          base containers ghc ghc-syb-utils HUnit syb
        ];
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222494,8 +223604,8 @@ self: {
          unordered-containers vector
        ];
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222517,8 +223627,8 @@ self: {
        ];
        executableToolDepends = [ cpphs ];
        description = "Compression command-line tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222539,7 +223649,7 @@ self: {
          aeson base bytestring hspec time unordered-containers
        ];
        description = "Haskell representation of messages exchanged on the sakura.io platform.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "salak" = callPackage
@@ -222568,7 +223678,7 @@ self: {
          base criterion data-default mtl text time
        ];
        description = "Configuration (re)Loader and Parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "salak-toml" = callPackage
@@ -222590,8 +223700,8 @@ self: {
          base criterion salak text time tomland unordered-containers
        ];
        description = "Configuration Loader for toml";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222613,7 +223723,7 @@ self: {
          base conduit criterion libyaml salak text
        ];
        description = "Configuration Loader for yaml";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "saltine" = callPackage
@@ -222623,8 +223733,8 @@ self: {
      }:
      mkDerivation {
        pname = "saltine";
-       version = "0.1.1.0";
-       sha256 = "1apcyc39mraqg9394scwqrdc3aaxvry22pl648gyp73z9dfrk5wf";
+       version = "0.1.1.1";
+       sha256 = "1bgr6vrmw18qr8akabxz6w3hwhlqi6zsnr23n70hkvwvcap1lnx7";
        libraryHaskellDepends = [ base bytestring hashable profunctors ];
        libraryPkgconfigDepends = [ libsodium ];
        testHaskellDepends = [
@@ -222632,7 +223742,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
@@ -222651,8 +223761,8 @@ self: {
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
        description = "Quickcheck implementations for some NaCl data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libsodium;};
 
@@ -222665,7 +223775,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Semantic version numbers and constraints";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "salvia" = callPackage
@@ -222685,8 +223795,8 @@ self: {
          utf8-string
        ];
        description = "Modular web application framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222709,8 +223819,8 @@ self: {
        ];
        doHaddock = false;
        description = "Demo Salvia servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222731,8 +223841,8 @@ self: {
          transformers utf8-string
        ];
        description = "Collection of non-fundamental handlers for the Salvia web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222749,8 +223859,8 @@ self: {
          utf8-string
        ];
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222768,8 +223878,8 @@ self: {
          random safe salvia salvia-protocol stm time utf8-string
        ];
        description = "Session support for the Salvia webserver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222786,8 +223896,8 @@ self: {
          utf8-string
        ];
        description = "Websocket implementation for the Salvia Webserver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222801,7 +223911,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck storable-record ];
        description = "Handling of samples in an (audio) signal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sample-frame-np" = callPackage
@@ -222812,7 +223922,7 @@ self: {
        sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi";
        libraryHaskellDepends = [ base numeric-prelude sample-frame ];
        description = "Orphan instances for types from sample-frame and numericprelude";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sampling" = callPackage
@@ -222829,7 +223939,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Sample values from collections";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "samtools" = callPackage
@@ -222844,8 +223954,8 @@ self: {
        librarySystemDepends = [ zlib ];
        libraryToolDepends = [ c2hs ];
        description = "Binding to the C samtools library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -222866,8 +223976,8 @@ self: {
          base bytestring conduit filepath resourcet samtools transformers
        ];
        description = "Conduit interface to SAM/BAM format files through samtools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222883,8 +223993,8 @@ self: {
          base bytestring enumerator samtools transformers
        ];
        description = "Enumerator interface to SamTools library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222901,8 +224011,8 @@ self: {
          base bytestring iteratee samtools transformers
        ];
        description = "Iteratee interface to SamTools library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222922,7 +224032,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Data encoding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sandlib" = callPackage
@@ -222933,8 +224043,8 @@ self: {
        sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx";
        libraryHaskellDepends = [ base ];
        description = "SAND data serialization and manipulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222953,8 +224063,8 @@ self: {
          process text unix-compat
        ];
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222966,8 +224076,8 @@ self: {
        sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438";
        libraryHaskellDepends = [ base deepseq portaudio ];
        description = "audio library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222995,8 +224105,8 @@ self: {
          network process text unordered-containers vector
        ];
        description = "A universal quickfix toolkit and his protocol";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223013,8 +224123,8 @@ self: {
          simple-pipe
        ];
        description = "SASL implementation using simple-pipe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223029,7 +224139,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CNF SATisfier";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223048,7 +224158,7 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223068,7 +224178,7 @@ self: {
        testHaskellDepends = [ array base ];
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223085,7 +224195,7 @@ self: {
        ];
        description = "driver for external satchmo backends";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223104,7 +224214,7 @@ self: {
        ];
        description = "examples that show how to use satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223121,7 +224231,7 @@ self: {
        ];
        description = "funsat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223134,7 +224244,7 @@ self: {
        libraryHaskellDepends = [ base containers process satchmo ];
        description = "minisat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223150,8 +224260,8 @@ self: {
          array base containers satchmo toysolver
        ];
        description = "toysat driver as backend for satchmo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223170,8 +224280,8 @@ self: {
          unix
        ];
        description = "re-export of the random generators from Hedgehog";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223190,8 +224300,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Monadic streaming XML parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223211,7 +224321,7 @@ self: {
          base bytestring gauge text transformers unliftio
        ];
        description = "Send textual messages to a Handle in a thread-friendly way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "say-my-name" = callPackage
@@ -223222,7 +224332,7 @@ self: {
        sha256 = "1fc9jgyapdc0rlni6l60b8ya272vg8km8p97pb52f4gj5z48zk3j";
        libraryHaskellDepends = [ base ];
        description = "Require explicit type application for some type variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sbp" = callPackage
@@ -223249,7 +224359,7 @@ self: {
        ];
        testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
        description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "sbp2udp" = callPackage
@@ -223269,7 +224379,7 @@ self: {
          streaming-commons
        ];
        description = "SBP to UDP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sbv" = callPackage
@@ -223300,7 +224410,7 @@ self: {
          gauge mtl process random silently syb time
        ];
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -223319,8 +224429,8 @@ self: {
          base directory filepath process tasty tasty-golden
        ];
        description = "Formally prove properties of Haskell programs using SBV/SMT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223340,8 +224450,8 @@ self: {
          proto-lens sc2-proto sc2-support text websockets
        ];
        description = "Low-level Starcraft II API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223361,8 +224471,8 @@ self: {
        ];
        libraryToolDepends = [ proto-lens-protoc protoc ];
        description = "A protocol buffer model for the Starcraft II bot API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {protoc = null;};
 
@@ -223379,8 +224489,8 @@ self: {
          text
        ];
        description = "Support and utility library for sc2hs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223409,7 +224519,7 @@ self: {
        ];
        description = "An interface to the Starcraft II bot API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sc3-rdu" = callPackage
@@ -223422,7 +224532,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223440,8 +224550,8 @@ self: {
          bytestring enumerator mtl network network-enumerator
        ];
        description = "Library for writing fast/scalable TCP-based services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223455,8 +224565,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath gd ];
        description = "Scale an image to a new geometry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223473,8 +224583,8 @@ self: {
          base containers hspec QuickCheck text time
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223501,8 +224611,8 @@ self: {
          aeson base hspec lens regex-compat stm text transformers wreq
        ];
        description = "Test webhooks locally";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223519,7 +224629,7 @@ self: {
          http-client-tls scalpel-core tagsoup text
        ];
        description = "A high level web scraping library for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "scalpel-core" = callPackage
@@ -223538,7 +224648,7 @@ self: {
        testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        benchmarkHaskellDepends = [ base criterion tagsoup text ];
        description = "A high level web scraping library for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "scalpel-search" = callPackage
@@ -223554,8 +224664,8 @@ self: {
          base hspec scalpel scalpel-core tagsoup text uri
        ];
        description = "scalpel scrapers for search engines";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223571,7 +224681,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
        description = "lexical style suggestions for source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scan-metadata" = callPackage
@@ -223588,8 +224698,8 @@ self: {
          generic-lens hw-aeson hw-ip lens mtl text thyme unliftio-core
        ];
        description = "Metadata types for Albedo Scanners";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223602,8 +224712,8 @@ self: {
        libraryHaskellDepends = [ accelerate array base dph-base HUnit ];
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223616,7 +224726,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Easy and type-safe format strings for parsing and printing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "scanner" = callPackage
@@ -223633,7 +224743,7 @@ self: {
          attoparsec base bytestring cereal criterion text
        ];
        description = "Fast non-backtracking incremental combinator parsing for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scanner-attoparsec" = callPackage
@@ -223645,7 +224755,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base scanner ];
        testHaskellDepends = [ attoparsec base bytestring hspec scanner ];
        description = "Inject attoparsec parser with backtracking into non-backtracking scanner";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scat" = callPackage
@@ -223668,7 +224778,7 @@ self: {
          vector
        ];
        description = "Generates unique passwords for various websites from a single password";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scc" = callPackage
@@ -223701,7 +224811,7 @@ self: {
        ];
        description = "Streaming component combinators";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223718,8 +224828,8 @@ self: {
          OpenGL process
        ];
        description = "Scene Graph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223735,8 +224845,8 @@ self: {
          base bytestring cgi extensible-exceptions network
        ];
        description = "A Haskell library for writing SCGI programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223754,8 +224864,8 @@ self: {
          base directory filepath old-locale time xturtle
        ];
        description = "Marge schedules and show EVR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223777,7 +224887,7 @@ self: {
          transformers
        ];
        description = "Pure deterministic scheduled computations";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "schedule-planner" = callPackage
@@ -223796,8 +224906,8 @@ self: {
          options text text-icu transformers wai warp
        ];
        description = "Find the ideal lesson layout";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223818,7 +224928,7 @@ self: {
          template-haskell unliftio vector
        ];
        description = "Work stealing scheduler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "schedyield" = callPackage
@@ -223829,8 +224939,8 @@ self: {
        sha256 = "0lzhxlfxa660vx4y49gbg2q76v8dda00h3rznj5fhdjj29pkypgp";
        libraryHaskellDepends = [ base ];
        description = "Exposes standard POSIX function sched_yield";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223845,8 +224955,8 @@ self: {
          base groom hspec msgpack-binary QuickCheck
        ];
        description = "Encoding-independent schemas for Haskell data types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223871,8 +224981,8 @@ self: {
          unordered-containers
        ];
        description = "schema guided serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223885,8 +224995,8 @@ self: {
      }:
      mkDerivation {
        pname = "schematic";
-       version = "0.5.0.0";
-       sha256 = "0mq38m08gj90gyk38lj4vyyfz0d6qrpxlpqjizqvyj4k3hqqy4ka";
+       version = "0.5.1.0";
+       sha256 = "1blbm7pmfwn2v1s60as98gw09c6c3l370xpx4b1w4vsq9ap9k7l8";
        libraryHaskellDepends = [
          aeson base bytestring containers hjsonschema mtl profunctors
          regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged
@@ -223901,8 +225011,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "JSON-biased spec and validation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223948,7 +225058,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223982,8 +225092,8 @@ self: {
          scholdoc-types temporary text yaml
        ];
        description = "Scholdoc fork of pandoc-citeproc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224007,7 +225117,7 @@ self: {
        ];
        description = "Scholdoc fork of texmath";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224024,7 +225134,7 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224036,7 +225146,7 @@ self: {
        sha256 = "1wwbalfkfg66azr9zizscvdc2csi9q73d6wq5bwbiq33z522nwxy";
        libraryHaskellDepends = [ base ];
        description = "Transformation of n-ary functions to unary functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sci-ratio" = callPackage
@@ -224048,8 +225158,8 @@ self: {
        libraryHaskellDepends = [ base hashable ];
        testHaskellDepends = [ base ];
        description = "Rational numbers in scientific notation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224083,8 +225193,8 @@ self: {
          network process regex safe split terminal-size text tls x509-store
        ];
        description = "Haskell query for SciDB via shim";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224096,7 +225206,7 @@ self: {
        sha256 = "0h60pdq3r32wl9h49i08iq496yf0qwvd0qmlmnk9jy5x3zcdwjmd";
        libraryHaskellDepends = [ base ];
        description = "Mathematical/physical/chemical constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "science-constants-dimensional" = callPackage
@@ -224110,7 +225220,7 @@ self: {
          base dimensional numtype-dk science-constants
        ];
        description = "Mathematical/physical/chemical constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scientific" = callPackage
@@ -224133,7 +225243,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scientific-notation" = callPackage
@@ -224158,8 +225268,8 @@ self: {
          primitive run-st scientific
        ];
        description = "Scientific notation intended for tokenization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224185,8 +225295,8 @@ self: {
          utf8-string
        ];
        description = "Haskell IDE library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224221,8 +225331,8 @@ self: {
          utf8-string vector zlib
        ];
        description = "Command-line interface for browsing and searching packages documentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224237,7 +225347,7 @@ self: {
        executableHaskellDepends = [ base bytestring containers process ];
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224255,8 +225365,8 @@ self: {
          mwc-random time unix zoom-cache
        ];
        description = "An interactive renderer for plotting time-series data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224280,8 +225390,8 @@ self: {
          zoom-cache
        ];
        description = "An interactive renderer for plotting time-series data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224299,8 +225409,8 @@ self: {
          persistent resource-pool scotty stm text transformers wai warp
        ];
        description = "scotty with batteries included";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224334,7 +225444,7 @@ self: {
          weigh
        ];
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-binding-play" = callPackage
@@ -224352,8 +225462,8 @@ self: {
          base bytestring hspec http-client HUnit scotty text transformers
        ];
        description = "The Play Framework style data binding in Scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224368,8 +225478,8 @@ self: {
          base blaze-builder blaze-html mtl scotty wai
        ];
        description = "blaze-html integration for Scotty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224388,7 +225498,7 @@ self: {
          transformers
        ];
        description = "Cookie management helper functions for Scotty framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-fay" = callPackage
@@ -224410,8 +225520,8 @@ self: {
          transformers wai wai-test
        ];
        description = "Fay integration for Scotty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224425,8 +225535,8 @@ self: {
          base ditto ditto-lucid lucid scotty text
        ];
        description = "Html form validation using `ditto`";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224443,8 +225553,8 @@ self: {
        executableHaskellDepends = [ aeson base scotty text ];
        testHaskellDepends = [ base ];
        description = "Response format helper for the Scotty web framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224461,8 +225571,8 @@ self: {
          warp
        ];
        description = "Easy Mustache templating support for Scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224474,7 +225584,7 @@ self: {
        sha256 = "06wcvjpaar8zd2y6p9j4pxs4l7rkw84s1kmcvacafkw43h1d2bx2";
        libraryHaskellDepends = [ base haxl scotty text ];
        description = "Combine scotty and haxl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-params-parser" = callPackage
@@ -224490,8 +225600,8 @@ self: {
          unordered-containers
        ];
        description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224504,7 +225614,7 @@ self: {
        libraryHaskellDepends = [ base bytestring scotty text wai ];
        testHaskellDepends = [ base doctest ];
        description = "Redirect to a normalized path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "scotty-resource" = callPackage
@@ -224519,8 +225629,8 @@ self: {
          base containers http-types scotty text transformers wai
        ];
        description = "A Better way of modeling web resources";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224546,8 +225656,8 @@ self: {
          string-conversions text wai
        ];
        description = "Webmachine-style REST library for scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224566,8 +225676,8 @@ self: {
          wai
        ];
        description = "Adding session functionality to scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224581,8 +225691,8 @@ self: {
          base scotty transformers wai warp warp-tls
        ];
        description = "TLS for Scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224598,7 +225708,7 @@ self: {
          aeson aeson-result base http-types scotty text
        ];
        description = "Scotty utils library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-view" = callPackage
@@ -224614,8 +225724,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224637,8 +225747,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring io-streams ];
        description = "An SCP protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224658,8 +225768,8 @@ self: {
          parallel split
        ];
        description = "Scrabble play generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224683,8 +225793,8 @@ self: {
          base extensible rio scrapbook-core tasty tasty-hunit yaml
        ];
        description = "collect posts of site that is wrote in config yaml using feed or scraping";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224706,7 +225816,9 @@ self: {
          tasty-hunit xml-conduit xml-types yaml
        ];
        description = "Core Package for scrapbook";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrape-changes" = callPackage
@@ -224732,8 +225844,8 @@ self: {
          test-framework-quickcheck2 text validation
        ];
        description = "Scrape websites for changes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224760,8 +225872,8 @@ self: {
          tasty-quickcheck-laws transformers
        ];
        description = "Stack of error, reader, writer, state, and prompt monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224784,8 +225896,8 @@ self: {
          url
        ];
        description = "Scrobbling server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224806,7 +225918,7 @@ self: {
          vector
        ];
        description = "scroll(6), a roguelike game";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "scrypt" = callPackage
@@ -224826,7 +225938,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Stronger password hashing via sequential memory-hard functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scrz" = callPackage
@@ -224850,7 +225962,7 @@ self: {
        ];
        description = "Process management and supervision daemon";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "scuttlebutt-types" = callPackage
@@ -224867,7 +225979,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec text ];
        description = "generic types for Secure Scuttlebutt";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scythe" = callPackage
@@ -224882,8 +225994,8 @@ self: {
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224906,7 +226018,7 @@ self: {
        executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224925,8 +226037,8 @@ self: {
          vector
        ];
        description = "Distributed SDE solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224944,7 +226056,7 @@ self: {
          test-framework-hunit transformers
        ];
        description = "A parser for SDF version 2.1 using Parsec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sdl-try-drivers" = callPackage
@@ -224957,7 +226069,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base pretty-simple sdl2 text ];
        description = "small testing tool for sdl2 and accelerated drivers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sdl2" = callPackage
@@ -224978,7 +226090,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        testHaskellDepends = [ base deepseq linear vector weigh ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -224989,7 +226101,7 @@ self: {
        sha256 = "1diz8irrrc7mvy5fnm679xpl3dyy9ynr7a6d900yi3dn0zamq939";
        libraryHaskellDepends = [ base cairo linear sdl2 ];
        description = "Render with Cairo on SDL textures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sdl2-cairo-image" = callPackage
@@ -225004,8 +226116,8 @@ self: {
          base cairo convertible JuicyPixels linear sdl2 sdl2-cairo vector
        ];
        description = "An image loading and rendering library for sdl2 / sdl2-cairo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225029,8 +226141,8 @@ self: {
          base Cabal hspec hspec-core lrucache QuickCheck stm
        ];
        description = "image compositing with sdl2 - declarative style";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225044,8 +226156,8 @@ self: {
        editedCabalFile = "09bgygx1il6j4s243frlm4xl0z5drpdqn8fdgsid8m5b2m8c48ya";
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225069,7 +226181,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 SDL2_gfx ];
        executableHaskellDepends = [ base linear sdl2 vector ];
        description = "Bindings to SDL2_gfx";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};
 
   "sdl2-image" = callPackage
@@ -225090,7 +226202,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 SDL2_image ];
        executableHaskellDepends = [ base sdl2 text ];
        description = "Bindings to SDL2_image";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-mixer" = callPackage
@@ -225112,8 +226224,8 @@ self: {
        librarySystemDepends = [ SDL2_mixer ];
        libraryPkgconfigDepends = [ SDL2_mixer ];
        description = "Bindings to SDL2_mixer";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2_mixer;};
 
   "sdl2-sprite" = callPackage
@@ -225133,7 +226245,7 @@ self: {
          base optparse-simple sdl2 sdl2-image split text
        ];
        description = "Sprite previewer/animator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sdl2-ttf" = callPackage
@@ -225151,8 +226263,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
        description = "Bindings to SDL2_ttf";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
@@ -225163,7 +226275,7 @@ self: {
        sha256 = "1hckjr6fprw2y7wb4zz035rnhqj6xs7djnlkhdyzmir9g5xa3cr6";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Self-delimiting numeric values encoding library";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "sdr" = callPackage
@@ -225194,9 +226306,9 @@ self: {
          base criterion primitive storable-complex vector
        ];
        description = "A software defined radio library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225221,7 +226333,7 @@ self: {
        ];
        description = "Small web framework using Warp and WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "seakale" = callPackage
@@ -225232,8 +226344,8 @@ self: {
        sha256 = "0pb0d0y7cxry6np5412j7d2xm5wlp97gc15za3iqc7n38bdffjvy";
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225249,8 +226361,8 @@ self: {
          base bytestring free mtl postgresql-libpq seakale time
        ];
        description = "PostgreSQL backend for Seakale";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225266,8 +226378,8 @@ self: {
          base bytestring free mtl recursion-schemes seakale
        ];
        description = "Helpers to test code using Seakale";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225279,7 +226391,7 @@ self: {
        sha256 = "0x2m280qbfaswr2gk26d26dwg2s3v1nk4n93zh2fh1ikpkw13dfq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell support for global configuration data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "search" = callPackage
@@ -225297,7 +226409,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Infinite search in finite time with Hilbert's epsilon";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "search-algorithms" = callPackage
@@ -225309,7 +226421,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Common graph search algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sec" = callPackage
@@ -225320,8 +226432,8 @@ self: {
        sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Semantic Editor Combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225337,7 +226449,7 @@ self: {
        executableHaskellDepends = [ base haskeline ];
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of the SECD abstract machine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "secdh" = callPackage
@@ -225352,8 +226464,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        description = "SECDH Machine Simulator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225365,8 +226477,8 @@ self: {
        sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw";
        libraryHaskellDepends = [ base ];
        description = "A simple library for static information-flow security in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225394,8 +226506,8 @@ self: {
        ];
        testToolDepends = [ cpphs ];
        description = "Second Transfer HTTP/2 web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225419,8 +226531,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) secp256k1;};
 
@@ -225446,7 +226558,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-legacy" = callPackage
@@ -225471,8 +226583,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "fork of secp256k1";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225490,8 +226602,8 @@ self: {
          base containers diagrams-cairo diagrams-lib haskell-qrencode random
        ];
        description = "Secret Santa game assigner using QR-Codes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225512,7 +226624,7 @@ self: {
          test-framework test-framework-quickcheck2 vector
        ];
        description = "Information-theoretic secure secret sharing";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "secrm" = callPackage
@@ -225525,8 +226637,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225542,8 +226654,8 @@ self: {
          base bytestring directory HsOpenSSL network process transformers
        ];
        description = "Secure point-to-point connectivity library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225555,8 +226667,8 @@ self: {
        sha256 = "0af16j1j77849idfs7cb0hvi1wkf60qlnkfdvqnp40qrwzpbqn9c";
        libraryHaskellDepends = [ base bytestring containers network ];
        description = "Setups secure (unsorted) UDP packet transfer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225570,7 +226682,7 @@ self: {
          base byteable bytestring ghc-prim memory
        ];
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sednaDBXML" = callPackage
@@ -225586,8 +226698,8 @@ self: {
        ];
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sedna = null;};
 
@@ -225607,8 +226719,8 @@ self: {
          symmetry-operations-symbols
        ];
        description = "Read and Display Seitz Symbol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225627,7 +226739,7 @@ self: {
          uuid-types
        ];
        description = "Multi-backend, high-level EDSL for interacting with SQL databases";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selda-json" = callPackage
@@ -225640,7 +226752,7 @@ self: {
        editedCabalFile = "1gajzv8zhj8i3bxzjh81vjn8j2igh3nrawfpddvxg1ayb5l2d2y0";
        libraryHaskellDepends = [ aeson base bytestring selda text ];
        description = "JSON support for the Selda database library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selda-postgresql" = callPackage
@@ -225658,7 +226770,7 @@ self: {
          selda-json text time uuid-types
        ];
        description = "PostgreSQL backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selda-sqlite" = callPackage
@@ -225676,7 +226788,7 @@ self: {
          uuid-types
        ];
        description = "SQLite backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "select" = callPackage
@@ -225687,7 +226799,7 @@ self: {
        sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0";
        libraryHaskellDepends = [ base ];
        description = "Wrap the select(2) POSIX function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "selections" = callPackage
@@ -225698,7 +226810,7 @@ self: {
        sha256 = "0vl7rqrz0p5m7iwymaw3b8l2kbaikwhmkhq82hq79581vj99fdpw";
        libraryHaskellDepends = [ base ];
        description = "Combinators for operating with selections over an underlying functor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "selective" = callPackage
@@ -225715,7 +226827,7 @@ self: {
          tasty-quickcheck transformers
        ];
        description = "Selective applicative functors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selectors" = callPackage
@@ -225731,8 +226843,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "CSS Selectors for DOM traversal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225744,8 +226856,8 @@ self: {
        sha256 = "0vr3d891pj947lv2grgbc83nm828gz9bbz6dp8mnf9bsji3ih7l7";
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225765,8 +226877,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text webdriver ];
        description = "Run the selenium standalone server for usage with webdriver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225786,8 +226898,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225799,7 +226911,7 @@ self: {
        sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n";
        libraryHaskellDepends = [ base directory executable-path unix ];
        description = "Restarts the current executable (on binary change)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selinux" = callPackage
@@ -225811,8 +226923,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ selinux ];
        description = "SELinux bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {selinux = null;};
 
@@ -225824,7 +226936,7 @@ self: {
        sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98";
        libraryHaskellDepends = [ base ];
        description = "Framework and service for analyzing and diffing untrusted code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "semantic-source" = callPackage
@@ -225844,8 +226956,8 @@ self: {
          base hedgehog tasty tasty-hedgehog tasty-hunit text
        ];
        description = "Types and functionality for working with source code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225857,7 +226969,7 @@ self: {
        sha256 = "1349pzjs91xayx4dib520037mmgh4lvyc0wjx8h8yf492dvfbdkr";
        libraryHaskellDepends = [ base ];
        description = "Various concurrency abstractions built on top of semaphores";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semdoc" = callPackage
@@ -225877,8 +226989,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Evaluate code snippets in Literate Haskell";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225894,8 +227006,8 @@ self: {
          base lens profunctors semigroupoids transformers tuple-morph
        ];
        description = "Weakened partial isomorphisms, reversible computations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225912,7 +227024,7 @@ self: {
          unordered-containers vector
        ];
        description = "Align and Zip type-classes from the common Semialign ancestor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semialign-extras" = callPackage
@@ -225930,8 +227042,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Extra functions for working with Semialigns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225950,7 +227062,7 @@ self: {
          vector
        ];
        description = "SemialignWithIndex, i.e. izipWith and ialignWith";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semialign-optics" = callPackage
@@ -225968,7 +227080,7 @@ self: {
          unordered-containers vector
        ];
        description = "SemialignWithIndex, i.e. izipWith and ialignWith";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semibounded-lattices" = callPackage
@@ -225980,8 +227092,8 @@ self: {
        libraryHaskellDepends = [ base containers lattices ];
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225993,7 +227105,7 @@ self: {
        sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh";
        libraryHaskellDepends = [ base profunctors semigroupoids ];
        description = "Semigroupoids that depend on PolyKinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semigroupoids" = callPackage
@@ -226012,7 +227124,7 @@ self: {
          transformers-compat unordered-containers
        ];
        description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -226032,8 +227144,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "RebindableSyntax using the semigroupoids package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226045,7 +227157,7 @@ self: {
        sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr";
        libraryHaskellDepends = [ base ];
        description = "Anything that associates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semigroups-actions" = callPackage
@@ -226056,8 +227168,8 @@ self: {
        sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb";
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Semigroups actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226076,7 +227188,7 @@ self: {
          base doctest QuickCheck quickcheck-instances
        ];
        description = "Semilattices";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semiring" = callPackage
@@ -226089,8 +227201,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
        description = "Semirings, ring-like structures used for dynamic programming applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226116,8 +227228,8 @@ self: {
          base containers criterion random vector
        ];
        description = "Basic semiring class and instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226129,23 +227241,22 @@ self: {
        sha256 = "0a7xd58jl3dm03z2wv4iyp3dfjnpydn3lmlz25azqna57x9ip3f0";
        libraryHaskellDepends = [ base ];
        description = "A module for dealing with semirings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semirings" = callPackage
     ({ mkDerivation, base, base-compat-batteries, containers, hashable
-     , integer-gmp, unordered-containers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.5.4";
-       sha256 = "16lsxg0nzi7d4kr5xibgy9q46fxrga10yzh0jy4jzpyy5axwwysw";
+       version = "0.6";
+       sha256 = "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr";
        libraryHaskellDepends = [
-         base base-compat-batteries containers hashable integer-gmp
-         unordered-containers
+         base base-compat-batteries containers hashable unordered-containers
        ];
        description = "two monoids as one, in holy haskimony";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semver" = callPackage
@@ -226162,7 +227273,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "semver-range" = callPackage
@@ -226181,7 +227292,7 @@ self: {
          unordered-containers
        ];
        description = "An implementation of semver and semantic version ranges";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sendfile" = callPackage
@@ -226192,7 +227303,7 @@ self: {
        sha256 = "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0";
        libraryHaskellDepends = [ base bytestring network ];
        description = "A portable sendfile library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sendgrid-haskell" = callPackage
@@ -226208,53 +227319,56 @@ self: {
          monad-control text transformers
        ];
        description = "Sengrid API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "sendgrid-v3" = callPackage
-    ({ mkDerivation, aeson, base, lens, semigroups, tasty, tasty-hunit
-     , text, wreq
+    ({ mkDerivation, aeson, base, bytestring, http-client, lens
+     , semigroups, tasty, tasty-hunit, text, wreq
      }:
      mkDerivation {
        pname = "sendgrid-v3";
-       version = "0.1.2.0";
-       sha256 = "06j07c86560f4w4vpx6gbnmrbyhs9i69jksliifsd9a9flg93vx3";
-       libraryHaskellDepends = [ aeson base lens semigroups text wreq ];
-       testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
+       version = "0.3.0.0";
+       sha256 = "0b1m2r0zq3f3ggy9nds42rf0w25p08mkcs9crvckmvqjhmwik1cm";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client lens semigroups text wreq
+       ];
+       testHaskellDepends = [
+         base lens semigroups tasty tasty-hunit text wreq
+       ];
        description = "Sendgrid v3 API library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "sensei" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
-     , directory, filepath, fsnotify, hspec, hspec-meta, hspec-wai
+    ({ mkDerivation, ansi-terminal, base, bytestring, directory
+     , filepath, fsnotify, hspec, hspec-discover, hspec-meta, hspec-wai
      , http-client, http-types, interpolate, mockery, network, process
      , silently, stm, text, time, unix, wai, warp
      }:
      mkDerivation {
        pname = "sensei";
-       version = "0.4.0";
-       sha256 = "18p3hrc0av30ri678rgzdarp5m3qpia0y1nc6rb8zzvs0cspmfvd";
+       version = "0.5.0";
+       sha256 = "011lck879q12npszqf2cjsxyjrcyfhrs77dh8kbififm53dfglf4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base base-compat bytestring directory filepath
-         fsnotify http-client http-types network process stm text time unix
-         wai warp
+         ansi-terminal base bytestring directory filepath fsnotify
+         http-client http-types network process stm text time unix wai warp
        ];
        testHaskellDepends = [
-         ansi-terminal base base-compat bytestring directory filepath
-         fsnotify hspec hspec-meta hspec-wai http-client http-types
-         interpolate mockery network process silently stm text time unix wai
-         warp
+         ansi-terminal base bytestring directory filepath fsnotify hspec
+         hspec-meta hspec-wai http-client http-types interpolate mockery
+         network process silently stm text time unix wai warp
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Automatically run Hspec tests on file modifications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226272,8 +227386,8 @@ self: {
          aeson base bytestring containers process stm zeromq3-haskell
        ];
        description = "Distributed sensor network for the raspberry pi";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226295,8 +227409,8 @@ self: {
          process temporary text time unix unix-compat vector wreq
        ];
        description = "A tool to send command execution results to Sensu";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226310,8 +227424,8 @@ self: {
          base mecab random-shuffle text transformers
        ];
        description = "Easily generating message of japanese natural language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226328,7 +227442,7 @@ self: {
          unordered-containers vector
        ];
        description = "Parser for the SentiWordNet tab-separated file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sentry" = callPackage
@@ -226348,8 +227462,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory filepath unix ];
        description = "Process monitoring tool written and configured in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226361,7 +227475,7 @@ self: {
        sha256 = "0pl7dcs9w4dzzajlfnkrjl5kgsx8zdzzl5hvikh9v9djsmw2290h";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seonbi" = callPackage
@@ -226397,8 +227511,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "SmartyPants for Korean language";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226421,7 +227535,7 @@ self: {
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
        description = "A data type with elements separated by values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqaid" = callPackage
@@ -226445,8 +227559,8 @@ self: {
          base Cabal cpphs directory process regex-base regex-pcre temporary
        ];
        description = "Dynamic strictness control, including space leak repair";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226458,7 +227572,7 @@ self: {
        sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqid" = callPackage
@@ -226469,7 +227583,7 @@ self: {
        sha256 = "07xxpdrr3lqqnzcxbync46c0kz3d2i7k4day630a6x6zmzpyay0i";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqid-streams" = callPackage
@@ -226480,7 +227594,7 @@ self: {
        sha256 = "0dd0vxs216ri0hdkz49hzzrryil7hhqb55cc9z6ca8f337imanm8";
        libraryHaskellDepends = [ base io-streams seqid ];
        description = "Sequence ID IO-Streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqloc" = callPackage
@@ -226500,8 +227614,8 @@ self: {
          unordered-containers vector
        ];
        description = "Handle sequence locations for bioinformatics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226535,8 +227649,8 @@ self: {
          transformers transformers-base unordered-containers vector
        ];
        description = "Read and write BED and GTF format genome annotations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226549,7 +227663,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers transformers ];
        description = "A type class for sequences and various sequence data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sequence-formats" = callPackage
@@ -226572,7 +227686,31 @@ self: {
          tasty-hunit transformers vector
        ];
        description = "A package with basic parsing utilities for several Bioinformatic data formats";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
+     }) {};
+
+  "sequence-formats_1_5_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
+     , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
+     , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "sequence-formats";
+       version = "1.5.2";
+       sha256 = "0n09mw9z8bjqr8dc32l7swp25vgci7m2hb1w6masgv2cw8irh7as";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers errors exceptions foldl
+         lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec pipes pipes-safe tasty
+         tasty-hunit transformers vector
+       ];
+       description = "A package with basic parsing utilities for several Bioinformatic data formats";
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sequenceTools" = callPackage
@@ -226600,7 +227738,7 @@ self: {
          base bytestring hspec pipes sequence-formats vector
        ];
        description = "A package with tools for processing DNA sequencing data";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sequent-core" = callPackage
@@ -226615,8 +227753,8 @@ self: {
          base bytestring containers ghc transformers
        ];
        description = "Alternative Core language for GHC plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226628,7 +227766,7 @@ self: {
        sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6";
        libraryHaskellDepends = [ base bytestring ];
        description = "Sequential numbers that allow arbitrarily inserting numbers - for containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sequor" = callPackage
@@ -226651,8 +227789,8 @@ self: {
          text vector
        ];
        description = "A sequence labeler based on Collins's sequence perceptron";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226669,7 +227807,7 @@ self: {
          resourcet text
        ];
        description = "Interact with Serf via Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serial" = callPackage
@@ -226699,7 +227837,7 @@ self: {
          system-fileio transformers
        ];
        description = "Test your 'Aeson' 'Serialize' and 'Binary' instances for stability over time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serialise" = callPackage
@@ -226731,7 +227869,7 @@ self: {
          pretty semigroups store tar text time vector zlib
        ];
        description = "A binary serialisation library for Haskell values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "serialise-uuid" = callPackage
@@ -226750,7 +227888,7 @@ self: {
          uuid-types
        ];
        description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "serialize-instances" = callPackage
@@ -226767,8 +227905,8 @@ self: {
          base cereal hashable semigroups unordered-containers
        ];
        description = "Instances for Serialize of cereal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226776,12 +227914,12 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, unix }:
      mkDerivation {
        pname = "serialport";
-       version = "0.5.0";
-       sha256 = "1w547rrfsa1cbjcdpqrlzwnnyrzd4lmbj52mnh98zz9aiv7rbqxv";
+       version = "0.5.1";
+       sha256 = "1ys3rjw1a3cghd2slnn43hvc3pdgwfy3rs19j1kjfshasr7d375m";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Cross platform serial port library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "serokell-util" = callPackage
@@ -226811,8 +227949,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "General-purpose functions by Serokell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226831,8 +227969,8 @@ self: {
        ];
        executableHaskellDepends = [ base singletons text ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226846,8 +227984,8 @@ self: {
          base containers http-kinder singletons text
        ];
        description = "Dependently typed API framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226872,8 +228010,8 @@ self: {
          tasty-quickcheck text wai wai-extra
        ];
        description = "Dependently typed API servers with Serv";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226900,7 +228038,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -226920,8 +228058,8 @@ self: {
          base JuicyPixels servant servant-server wai warp
        ];
        description = "Servant support for JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226947,8 +228085,8 @@ self: {
          silently string-conversions temporary text
        ];
        description = "generic tests for aeson serialization in servant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226964,7 +228102,7 @@ self: {
          aeson base jose lens servant text unordered-containers
        ];
        description = "Authentication combinators for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -226990,7 +228128,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-client/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-cookie" = callPackage
@@ -227020,8 +228158,8 @@ self: {
          base bytestring criterion cryptonite servant-server
        ];
        description = "Authentication via encrypted cookies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227046,7 +228184,9 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-docs/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-hmac" = callPackage
@@ -227081,8 +228221,8 @@ self: {
          time transformers wai wai-extra with-location
        ];
        description = "Authentication via HMAC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227111,7 +228251,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -227131,7 +228271,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-swagger/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -227150,8 +228290,8 @@ self: {
          time transformers uuid wai
        ];
        description = "Servant based API and server for token based authorisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227173,8 +228313,8 @@ self: {
          transformers transformers-base uuid
        ];
        description = "Acid-state backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227191,8 +228331,8 @@ self: {
          servant-swagger swagger2 text
        ];
        description = "Servant based API for token based authorisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227214,8 +228354,8 @@ self: {
          transformers unliftio-core uuid vector
        ];
        description = "Leveldb backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227235,8 +228375,8 @@ self: {
          servant-server text time transformers unliftio-core uuid
        ];
        description = "Persistent backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227259,8 +228399,8 @@ self: {
          vector
        ];
        description = "RocksDB backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227276,8 +228416,8 @@ self: {
          base mtl servant-server text time wai wordpress-auth
        ];
        description = "Authenticate Routes Using Wordpress Cookies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227295,8 +228435,8 @@ self: {
          servant-server text warp
        ];
        description = "Avro content type for Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227311,7 +228451,7 @@ self: {
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-cassava" = callPackage
@@ -227332,8 +228472,8 @@ self: {
          servant-server wai warp
        ];
        description = "Servant CSV content-type for cassava";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227358,7 +228498,9 @@ self: {
          tasty-hunit wai
        ];
        description = "Checked exceptions for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-checked-exceptions-core" = callPackage
@@ -227379,7 +228521,9 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Checked exceptions for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-cli" = callPackage
@@ -227406,8 +228550,8 @@ self: {
          random servant servant-client servant-server text vinyl warp
        ];
        description = "Command line interface for Servant API clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227438,7 +228582,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-client-core" = callPackage
@@ -227461,7 +228605,7 @@ self: {
        testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-client-js" = callPackage
@@ -227480,8 +228624,8 @@ self: {
          servant servant-client-core text transformers transformers-base
        ];
        description = "A servant client for frontend JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227503,8 +228647,8 @@ self: {
          servant-server-namedargs warp
        ];
        description = "Automatically derive API client functions with named and optional parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227525,7 +228669,7 @@ self: {
          resourcet servant servant-client servant-server wai warp
        ];
        description = "Servant Stream support for conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-csharp" = callPackage
@@ -227544,8 +228688,8 @@ self: {
          unordered-containers uuid uuid-types
        ];
        description = "Generate servant client library for C#";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227557,8 +228701,8 @@ self: {
        sha256 = "12nsdpcmv0xijvp89x3ksnf1mpdwbhwrn86c2y1cayvspvv1iilr";
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227584,8 +228728,8 @@ self: {
          quickcheck-instances servant-db text time transformers-base
        ];
        description = "Derive a postgres client to database API specified by servant-db";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227607,8 +228751,8 @@ self: {
          wai warp
        ];
        description = "Servant Dhall content-type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227637,7 +228781,9 @@ self: {
          tasty-golden tasty-hunit transformers
        ];
        description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-docs-simple" = callPackage
@@ -227659,8 +228805,8 @@ self: {
          unordered-containers
        ];
        description = "Generate endpoints overview for Servant API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227684,8 +228830,8 @@ self: {
          base ede http-media servant-server text unordered-containers warp
        ];
        description = "Combinators for rendering EDE templates in servant web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227712,8 +228858,8 @@ self: {
          aeson base ekg ekg-core process servant-server text wai warp
        ];
        description = "Helpers for using ekg with servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227736,8 +228882,8 @@ self: {
          aeson base Diff elm-bridge hspec HUnit servant servant-client text
        ];
        description = "Automatically derive Elm functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227761,7 +228907,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Servant Errors wai-middlware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-examples" = callPackage
@@ -227783,8 +228929,8 @@ self: {
          warp
        ];
        description = "Example programs for servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227799,7 +228945,7 @@ self: {
          aeson base exceptions http-types servant text
        ];
        description = "Extensible exceptions for servant APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-exceptions-server" = callPackage
@@ -227815,7 +228961,7 @@ self: {
          servant-exceptions servant-server text wai
        ];
        description = "Extensible exceptions for servant API servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-fiat-content" = callPackage
@@ -227828,8 +228974,8 @@ self: {
          base bytestring http-media servant text
        ];
        description = "Fiat content types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227841,7 +228987,7 @@ self: {
        sha256 = "0j8dv8010yr63sl3ks0an64ry53ajc2xd47vpd6i1svhb9b6l79i";
        libraryHaskellDepends = [ base servant ];
        description = "Utilities for flattening servant API types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-foreign" = callPackage
@@ -227858,7 +229004,7 @@ self: {
        testHaskellDepends = [ base hspec servant ];
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-generate" = callPackage
@@ -227871,8 +229017,8 @@ self: {
        editedCabalFile = "11hmn45fsl78kq6lladgz29yjycmr7lxmkswc8f41zbcb4m8rzyk";
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227889,8 +229035,8 @@ self: {
          base network-uri servant servant-server text warp
        ];
        description = "Specify Servant APIs with records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227914,8 +229060,8 @@ self: {
        executableHaskellDepends = [ base text transformers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227938,7 +229084,7 @@ self: {
          aeson base bytestring servant-server text transformers wai warp
        ];
        description = "Servant combinators to facilitate writing GitHub webhooks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -227965,8 +229111,8 @@ self: {
          servant servant-server text wai warp
        ];
        description = "automatical derivation of querying functions for servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227993,8 +229139,8 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228028,7 +229174,9 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-http2-client" = callPackage
@@ -228052,8 +229200,8 @@ self: {
          http2-client mtl servant servant-client-core text tls transformers
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228070,8 +229218,8 @@ self: {
          base data-default http-media iCalendar servant
        ];
        description = "Servant support for iCalendar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228090,8 +229238,8 @@ self: {
          base hspec hspec-expectations language-ecmascript lens servant
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228115,8 +229263,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Automatically derive javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228128,7 +229276,7 @@ self: {
        sha256 = "0qy2al8waycarh5973c43bdd9g4a9032waknjsbykhflwglvwmv5";
        libraryHaskellDepends = [ aeson base servant ];
        description = "JSON-RPC messages and endpoints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-jsonrpc-client" = callPackage
@@ -228143,7 +229291,7 @@ self: {
          aeson base servant servant-client-core servant-jsonrpc
        ];
        description = "Generate JSON-RPC servant clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-jsonrpc-server" = callPackage
@@ -228158,7 +229306,7 @@ self: {
          aeson base containers mtl servant servant-jsonrpc servant-server
        ];
        description = "JSON-RPC servant servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -228183,8 +229331,8 @@ self: {
          servant servant-foreign shelly text time wl-pprint-text
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228199,7 +229347,7 @@ self: {
        libraryHaskellDepends = [ base http-media lucid servant text ];
        testHaskellDepends = [ base lucid servant-server wai warp ];
        description = "Servant support for lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-machines" = callPackage
@@ -228217,7 +229365,7 @@ self: {
          servant-client servant-server wai warp
        ];
        description = "Servant Stream support for machines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-match" = callPackage
@@ -228233,7 +229381,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec network-uri servant text ];
        description = "Standalone implementation of servant’s dispatching mechanism";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-matrix-param" = callPackage
@@ -228253,8 +229401,8 @@ self: {
          servant-server text transformers wai wai-extra warp
        ];
        description = "Matrix parameter combinator for servant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228283,8 +229431,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Derive a mock server for free from your servant API types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228317,7 +229465,9 @@ self: {
          tasty-wai text
        ];
        description = "multipart/form-data (e.g file upload) support for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-named" = callPackage
@@ -228335,7 +229485,7 @@ self: {
          base hspec hspec-wai http-types servant servant-server
        ];
        description = "Add named endpoints to servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-namedargs" = callPackage
@@ -228347,8 +229497,8 @@ self: {
        libraryHaskellDepends = [ base named servant text ];
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228370,8 +229520,8 @@ self: {
          warp
        ];
        description = "Servant Nix content-type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228400,8 +229550,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228417,7 +229567,7 @@ self: {
          base bytestring http-types servant-foreign servant-server text wai
        ];
        description = "Provide responses to OPTIONS requests for Servant applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-pagination" = callPackage
@@ -228435,8 +229585,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck servant-server text ];
        description = "Type-safe pagination for Servant APIs";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228454,8 +229604,8 @@ self: {
          servant-docs string-conversions text unordered-containers
        ];
        description = "Use Pandoc to render servant API documentation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228477,7 +229627,7 @@ self: {
          wai warp
        ];
        description = "Servant Stream support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-polysemy" = callPackage
@@ -228502,8 +229652,8 @@ self: {
          servant-swagger servant-swagger-ui swagger2 text wai warp
        ];
        description = "Utilities for using servant in a polysemy stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228517,8 +229667,8 @@ self: {
        editedCabalFile = "15wcxjn22zmwj7dqrbg5kmca4niri6p4cs0gm8b3dnr1iv2l0jgq";
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228535,8 +229685,8 @@ self: {
          servant-response
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228559,8 +229709,8 @@ self: {
          test-framework test-framework-hunit warp
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228584,8 +229734,8 @@ self: {
          servant servant-foreign servant-subscriber text
        ];
        description = "Generate PureScript accessor functions for you servant API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228605,8 +229755,8 @@ self: {
          text time unordered-containers
        ];
        description = "Bindings to the Pushbullet API using servant-client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228628,8 +229778,8 @@ self: {
          servant-foreign text
        ];
        description = "Automatically derive python functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228658,8 +229808,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228671,7 +229821,7 @@ self: {
        sha256 = "05gv21y7vzw7gdbsk0nax47rnn4isjmx7hbbwilsv0cj7l8qm1bk";
        libraryHaskellDepends = [ base servant ];
        description = "Embed a raw 'Application' in a Servant API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-rawm-client" = callPackage
@@ -228682,8 +229832,8 @@ self: {
        sha256 = "0ldjhmmfdh0jpfaz4sg1b9n5l23wza3w0m8bvvf80gvl7p6fk0fj";
        libraryHaskellDepends = [ base servant-client-core servant-rawm ];
        description = "The client implementation of servant-rawm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228699,7 +229849,9 @@ self: {
          base http-media http-types lens servant-docs servant-rawm
        ];
        description = "Documentation generator for 'RawM' endpoints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm-server" = callPackage
@@ -228715,7 +229867,7 @@ self: {
          wai-app-static
        ];
        description = "The server implementation of servant-rawm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-reason" = callPackage
@@ -228735,8 +229887,8 @@ self: {
          process reason-export servant servant-foreign text wl-pprint-text
        ];
        description = "Derive Reason types to interact with a Haskell backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228759,8 +229911,8 @@ self: {
          transformers
        ];
        description = "servant API generator for reflex apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228774,7 +229926,7 @@ self: {
        editedCabalFile = "1lhxc5kjz4459v65h57imv3k9l9nrkgid1qqlbwb4987q7y83qay";
        libraryHaskellDepends = [ aeson base http-types text ];
        description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-router" = callPackage
@@ -228793,8 +229945,8 @@ self: {
          base blaze-html servant servant-blaze servant-server warp
        ];
        description = "Servant router for non-server applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228809,7 +229961,7 @@ self: {
        libraryHaskellDepends = [ base casing servant-foreign text ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-scotty" = callPackage
@@ -228827,8 +229979,8 @@ self: {
          transformers
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228851,29 +230003,29 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "Generate Robots.txt and Sitemap.xml specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "servant-serf" = callPackage
     ({ mkDerivation, attoparsec, base, hpack, mtl, optparse-applicative
-     , parser-combinators, regex-base, regex-tdfa, text, tomland
+     , parser-combinators, regex-base, regex-tdfa, text
      }:
      mkDerivation {
        pname = "servant-serf";
-       version = "0.0.3";
-       sha256 = "10ky0hmz1484jz0grwmac9208vlv4k8jwzn2imbrn405p76iifdm";
+       version = "0.1.0";
+       sha256 = "08x4d595czal5j5dgd08bps4swsrh547nnmk4i006jjvbl0315nf";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          attoparsec base hpack mtl optparse-applicative parser-combinators
-         regex-base regex-tdfa text tomland
+         regex-base regex-tdfa text
        ];
        doHaddock = false;
        description = "Generates a servant API module";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228909,7 +230061,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-server-namedargs" = callPackage
@@ -228926,8 +230078,8 @@ self: {
          servant-namedargs servant-server string-conversions text wai
        ];
        description = "Automatically derive API server functions with named and optional parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228950,8 +230102,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228989,8 +230141,8 @@ self: {
          temporary text time transformers
        ];
        description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229013,7 +230165,7 @@ self: {
          aeson base http-media servant-server warp
        ];
        description = "Content-Types for rendering Mustache in servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-static-th" = callPackage
@@ -229024,8 +230176,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-static-th";
-       version = "0.2.4.0";
-       sha256 = "1xmikym19kq912apmh6zcdjzbz23mhn580pvsy5ll35ylqziaflk";
+       version = "1.0.0.0";
+       sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -229039,7 +230191,7 @@ self: {
          tasty-hunit wai
        ];
        description = "Embed a directory of static files in your Servant server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-streaming" = callPackage
@@ -229053,8 +230205,8 @@ self: {
        libraryHaskellDepends = [ base http-types servant ];
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229080,8 +230232,8 @@ self: {
          servant-streaming servant-streaming-server streaming warp
        ];
        description = "Client instances for the 'servant-streaming' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229099,8 +230251,8 @@ self: {
          base lens servant servant-docs servant-streaming
        ];
        description = "Client instances for the 'servant-docs' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229127,8 +230279,8 @@ self: {
          warp
        ];
        description = "Server instances for the 'servant-streaming' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229155,7 +230307,7 @@ self: {
        ];
        executableHaskellDepends = [ base purescript-bridge ];
        description = "When REST is not enough ...";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger" = callPackage
@@ -229183,7 +230335,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-tags" = callPackage
@@ -229199,8 +230351,8 @@ self: {
          servant-server servant-swagger swagger2 text
        ];
        description = "Swagger Tags for Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229217,7 +230369,7 @@ self: {
          servant-swagger-ui-core swagger2 text
        ];
        description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
@@ -229235,7 +230387,7 @@ self: {
          wai-app-static
        ];
        description = "Servant swagger ui core components";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-ui-jensoleg" = callPackage
@@ -229253,7 +230405,7 @@ self: {
          servant-swagger-ui-core swagger2 text
        ];
        description = "Servant swagger ui: Jens-Ole Graulund theme";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-ui-redoc" = callPackage
@@ -229271,7 +230423,7 @@ self: {
          servant-swagger-ui-core swagger2 text
        ];
        description = "Servant swagger ui: ReDoc theme";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-to-elm" = callPackage
@@ -229293,8 +230445,8 @@ self: {
          servant-multipart text
        ];
        description = "Automatically generate Elm clients for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229325,7 +230477,7 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck text time
          transformers
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-waargonaut" = callPackage
@@ -229349,8 +230501,8 @@ self: {
          wl-pprint-annotated
        ];
        description = "Servant Integration for Waargonaut JSON Package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229369,7 +230521,7 @@ self: {
          base bytestring servant servant-server transformers warp
        ];
        description = "Servant support for delivering WebAssembly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-websockets" = callPackage
@@ -229391,7 +230543,7 @@ self: {
          aeson base conduit servant-server text wai warp websockets
        ];
        description = "Small library providing WebSocket endpoints for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-xml" = callPackage
@@ -229406,7 +230558,7 @@ self: {
          base bytestring http-media servant xmlbf xmlbf-xeno
        ];
        description = "Servant support for the XML Content-Type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-yaml" = callPackage
@@ -229427,8 +230579,8 @@ self: {
          wai warp yaml
        ];
        description = "Servant support for yaml";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229440,8 +230592,8 @@ self: {
        sha256 = "1pga7l2akxqhkfq6gqaiiz6svvhzb83dbc5bw487kkrs3vriyyc3";
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229465,8 +230617,8 @@ self: {
          warp
        ];
        description = "Client library for servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229490,8 +230642,8 @@ self: {
          string-conversions warp wreq
        ];
        description = "Server library for servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229513,8 +230665,8 @@ self: {
          servant-swagger servant-zeppelin swagger2
        ];
        description = "Swagger instances for servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229530,8 +230682,8 @@ self: {
          aeson base bytestring http-types mtl text void wai warp
        ];
        description = "Auto-generate a server for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229559,7 +230711,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession" = callPackage
@@ -229583,7 +230735,7 @@ self: {
          unordered-containers
        ];
        description = "Secure, modular server-side sessions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession-backend-acid-state" = callPackage
@@ -229603,8 +230755,8 @@ self: {
          unordered-containers
        ];
        description = "Storage backend for serversession using acid-state";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229631,8 +230783,8 @@ self: {
          time transformers unordered-containers
        ];
        description = "Storage backend for serversession using persistent and an RDBMS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229654,8 +230806,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Storage backend for serversession using Redis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229673,7 +230825,7 @@ self: {
          time transformers unordered-containers
        ];
        description = "Snap bindings for serversession";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession-frontend-wai" = callPackage
@@ -229690,7 +230842,7 @@ self: {
          time transformers unordered-containers vault wai wai-session
        ];
        description = "wai-session bindings for serversession";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession-frontend-yesod" = callPackage
@@ -229708,8 +230860,8 @@ self: {
          yesod-core
        ];
        description = "Yesod bindings for serversession";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229727,8 +230879,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Tools for building services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229744,7 +230896,7 @@ self: {
          aeson base bytestring generic-deriving text text-show
        ];
        description = "JSON to Sql";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servius" = callPackage
@@ -229762,7 +230914,7 @@ self: {
          shakespeare text wai wai-app-static
        ];
        description = "Warp web server with template rendering";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ses-html" = callPackage
@@ -229778,7 +230930,7 @@ self: {
          HsOpenSSL http-streams tagsoup time
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -229794,8 +230946,8 @@ self: {
          transformers
        ];
        description = "Snaplet for the ses-html package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229811,7 +230963,7 @@ self: {
        ];
        description = "Session Types for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229833,8 +230985,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory exceptions hspec ];
        description = "Session types library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229857,8 +231009,8 @@ self: {
          base distributed-process hspec network-transport-tcp sessiontypes
        ];
        description = "Session types distributed";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229887,7 +231039,7 @@ self: {
          transformers utility-ht
        ];
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "set-extra" = callPackage
@@ -229898,7 +231050,7 @@ self: {
        sha256 = "10kbvd09hp12rlfkc15xqiglrbxzi7gchb0aazqyg77ah66wjn10";
        libraryHaskellDepends = [ base containers mtl syb ];
        description = "Functions that could be added to Data.Set.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "set-monad" = callPackage
@@ -229909,7 +231061,7 @@ self: {
        sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "set-of" = callPackage
@@ -229920,8 +231072,8 @@ self: {
        sha256 = "0npsxff611frdb2a5xbyd4ipn3qb8ji6a1yygxid7pk7qsx0spj1";
        libraryHaskellDepends = [ base containers ];
        description = "Sets of fixed size, with typelits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229939,8 +231091,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Set of elements sorted by a different data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229960,7 +231112,9 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Treating files as sets to perform rapid set manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "setenv" = callPackage
@@ -229973,7 +231127,7 @@ self: {
        editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5";
        libraryHaskellDepends = [ base unix ];
        description = "A cross-platform library for setting environment variables";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "setgame" = callPackage
@@ -229989,8 +231143,8 @@ self: {
        libraryHaskellDepends = [ base random vty ];
        executableHaskellDepends = [ base ];
        description = "A console interface to the game of Set";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230004,7 +231158,7 @@ self: {
        editedCabalFile = "0l0hlxhjspm05hxd06972ilw4c3ni72mnzcyljg3a01i8pxi53cl";
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to setlocale";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "setoid" = callPackage
@@ -230022,8 +231176,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A Haskell implementation of setoid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230045,7 +231199,7 @@ self: {
          base containers doctest hlint hspec protolude
        ];
        description = "Perform set operations on files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "setops" = callPackage
@@ -230056,7 +231210,7 @@ self: {
        sha256 = "1mja48p8g9prfk53218qbv83ks6rs63s0n6jad0jgrj1221afpvg";
        libraryHaskellDepends = [ base containers ];
        description = "Uniform names (and Unicode operators) for set operations on data structures";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "sets" = callPackage
@@ -230088,7 +231242,7 @@ self: {
          witherable
        ];
        description = "Ducktyped set interface for Haskell containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "setters" = callPackage
@@ -230101,8 +231255,8 @@ self: {
        editedCabalFile = "0rck3kizbzr5vffisnnhl3fsl4vw3n0s3mb7lcgggd4b40hp7zy4";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230114,7 +231268,7 @@ self: {
        sha256 = "1hnbr2r99i2cgjl329zh7i1g059vq2id3d2drmx0gzmw6x9nvqs8";
        libraryHaskellDepends = [ base text unordered-containers ];
        description = "Runtime-editable program settings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "sexp" = callPackage
@@ -230138,8 +231292,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "S-Expression parsing/printing made fun and easy";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230169,7 +231323,7 @@ self: {
          base bytestring criterion deepseq text
        ];
        description = "Invertible grammar combinators for S-expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sexp-show" = callPackage
@@ -230184,7 +231338,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base pretty-show ];
        description = "Produce a s-expression representation of Show values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sexpr" = callPackage
@@ -230199,7 +231353,7 @@ self: {
          base base64-string binary bytestring pretty
        ];
        description = "S-expression printer and parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sexpr-parser" = callPackage
@@ -230216,8 +231370,8 @@ self: {
        executableHaskellDepends = [ base bytestring megaparsec process ];
        testHaskellDepends = [ base data-default hspec megaparsec ];
        description = "Simple s-expression parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230239,7 +231393,7 @@ self: {
        ];
        description = "A flexible library for parsing and printing S-expression";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sext" = callPackage
@@ -230257,8 +231411,8 @@ self: {
          base bytestring tasty tasty-hunit template-haskell
        ];
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230272,7 +231426,7 @@ self: {
        librarySystemDepends = [ libsndfile openal ];
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
@@ -230283,8 +231437,8 @@ self: {
        sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6";
        libraryHaskellDepends = [ base bytestring entropy primitive ];
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230305,8 +231459,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -230331,8 +231485,8 @@ self: {
          random-shuffle tasty tasty-hunit temporary vector
        ];
        description = "Stochastic gradient descent library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230349,8 +231503,8 @@ self: {
          time transformers
        ];
        description = "SGF (Smart Game Format) parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230365,7 +231519,7 @@ self: {
        executableHaskellDepends = [ base bio regex-compat ];
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230392,8 +231546,8 @@ self: {
          transformers unix
        ];
        description = "Record your shell session and print in the markdown format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230408,8 +231562,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring io-streams SHA ];
        executableHaskellDepends = [ base io-streams SHA ];
        description = "SHA hashes for io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230426,8 +231580,8 @@ self: {
          base byteslice natural-arithmetic primitive small-bytearray-builder
        ];
        description = "SHA-1 Hash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230441,8 +231595,8 @@ self: {
        editedCabalFile = "164nw1gg6yl3fb4pqbgxxphafw2120a8kryhqx0i09l8c1n49557";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A control structure used to combine heterogenous types with delayed effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230465,8 +231619,8 @@ self: {
          system-filepath text
        ];
        description = "An automated way to run doctests in files that are changing";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230496,7 +231650,7 @@ self: {
          base binary bytestring containers cryptohash HUnit process
        ];
        description = "A fast SOCKS5 proxy that help you get through firewalls";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shady-gen" = callPackage
@@ -230514,7 +231668,7 @@ self: {
        ];
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "shady-graphics" = callPackage
@@ -230532,7 +231686,7 @@ self: {
        ];
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "shake" = callPackage
@@ -230543,8 +231697,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.19.2";
-       sha256 = "0s34c40zvr0ny5n0p2g85rzkx3789r20627gykkpsn5cvnc7pj5s";
+       version = "0.19.4";
+       sha256 = "1vkkgncar07na4kn3i02b2zdyjdjxl10hrcz2l23c498yrrqibjv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -230565,7 +231719,7 @@ self: {
          utf8-string
        ];
        description = "Build system library, like Make, but more accurate dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-ats" = callPackage
@@ -230582,7 +231736,7 @@ self: {
          microlens shake shake-c shake-cabal shake-ext text
        ];
        description = "Utilities for building ATS projects with shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-bindist" = callPackage
@@ -230597,8 +231751,8 @@ self: {
          archive-sig base bytestring bz2 lzlib shake zlib zstd
        ];
        description = "Rules for binary distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230610,7 +231764,7 @@ self: {
        sha256 = "1bhi4rfvhin16c4xhx50dxjhr2gfpngasv7fps9fhm6is372ln9v";
        libraryHaskellDepends = [ base cdeps composition-prelude shake ];
        description = "Library for building C code with shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-cabal" = callPackage
@@ -230626,7 +231780,7 @@ self: {
          hashable shake
        ];
        description = "Shake library for use with cabal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-cabal-build" = callPackage
@@ -230641,8 +231795,8 @@ self: {
          base Cabal directory filepath process
        ];
        description = "Utility for building Shake build systems using Cabal sandboxes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230654,7 +231808,7 @@ self: {
        sha256 = "1n52fjay6xgx65ihin6zxx05q42mfkdqi9888hn8dnn70kf5j7cg";
        libraryHaskellDepends = [ base directory shake ];
        description = "Shake rules for CCJS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-dhall" = callPackage
@@ -230670,8 +231824,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dhall dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230683,7 +231837,7 @@ self: {
        sha256 = "057ph5ai8pswzymln8l6i2hdn1vgi3hwyji1z6s4bh71xnc0sn5r";
        libraryHaskellDepends = [ base shake ];
        description = "Elm builds in shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-ext" = callPackage
@@ -230694,7 +231848,7 @@ self: {
        sha256 = "12pfi6rc4y8rjndym0crzyjfmcqnnrh61hww1vrnl614hs00iw6h";
        libraryHaskellDepends = [ base directory shake ];
        description = "Helper functions for linting with shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-extras" = callPackage
@@ -230709,8 +231863,8 @@ self: {
          base bytestring cmdargs directory filepath shake
        ];
        description = "Extra utilities for shake build systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230726,7 +231880,7 @@ self: {
          base containers directory filepath futhark shake text
        ];
        description = "Dependency tracking for Futhark";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-google-closure-compiler" = callPackage
@@ -230737,7 +231891,7 @@ self: {
        sha256 = "1z9znpcsnc6qizx0rnkww3pbxpk77pmrn6dvn8jqm2pppwbpjw0g";
        libraryHaskellDepends = [ base directory shake ];
        description = "Shake rules for the Google closure compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-language-c" = callPackage
@@ -230755,7 +231909,7 @@ self: {
        testHaskellDepends = [ base directory doctest hspec shake ];
        doCheck = false;
        description = "Utilities for cross-compiling with Shake";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "shake-literate" = callPackage
@@ -230766,7 +231920,7 @@ self: {
        sha256 = "0wx3mh62b8kq20qw15zg35nl4l066i11mzgj0vxlvys5a6902ijn";
        libraryHaskellDepends = [ base cpphs shake ];
        description = "Rules for building literate programs in shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-minify" = callPackage
@@ -230779,8 +231933,8 @@ self: {
          base bytestring css-text hjsmin shake text
        ];
        description = "Shake Minify Rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230794,7 +231948,7 @@ self: {
          base directory filepath hasmin shake text
        ];
        description = "Shake rules for CSS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-pack" = callPackage
@@ -230805,8 +231959,8 @@ self: {
        sha256 = "13v9p6idndg3xy8fb63g037csgmj5kaxj0903kx5py050cj6rbaz";
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        description = "Shake File Pack Rule";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230818,8 +231972,8 @@ self: {
        sha256 = "0sjw0hcs6i9c8vfirrk90y5xd3cf0f9c0wa2p5pqimc5wfid9plk";
        libraryHaskellDepends = [ base path path-io shake ];
        description = "path alternatives to shake functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230837,8 +231991,8 @@ self: {
        ];
        executableHaskellDepends = [ base shake ];
        description = "Shake build system on-disk caching";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230850,7 +232004,7 @@ self: {
        sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5";
        libraryHaskellDepends = [ base extra path rio shake ];
        description = "Re-export of Shake using well-typed paths and ReaderT";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shake-plus-extended" = callPackage
@@ -230869,7 +232023,7 @@ self: {
          path-binary-instance rio shake shake-plus within
        ];
        description = "Experimental extensions to shake-plus";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakebook" = callPackage
@@ -230914,8 +232068,8 @@ self: {
          zipper-extra
        ];
        description = "Shake-based technical documentation generator; HTML & PDF";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230944,8 +232098,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "simple and interactive command-line build tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230960,7 +232114,7 @@ self: {
          base basic-prelude directory lifted-base shake
        ];
        description = "Shake helpers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare" = callPackage
@@ -230984,8 +232138,8 @@ self: {
          text time transformers
        ];
        description = "A toolkit for making compile-time interpolated templates";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "shakespeare-babel" = callPackage
@@ -231001,8 +232155,8 @@ self: {
          template-haskell
        ];
        description = "compile es2015";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231015,7 +232169,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Stick your haskell variables into css at compile time. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare-i18n" = callPackage
@@ -231027,7 +232181,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "A type-based approach to internationalization. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare-js" = callPackage
@@ -231039,7 +232193,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare-sass" = callPackage
@@ -231054,8 +232208,8 @@ self: {
          base hsass shakespeare template-haskell yesod yesod-core
        ];
        description = "SASS support for Shakespeare and Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231068,7 +232222,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shana" = callPackage
@@ -231080,7 +232234,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory regex-posix ];
        description = "treat haskell functions as unix pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shannon-fano" = callPackage
@@ -231097,7 +232251,7 @@ self: {
          base bytestring optparse-generic QuickCheck
        ];
        description = "Shannon-fano compression algorithm in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shapefile" = callPackage
@@ -231112,8 +232266,8 @@ self: {
          base binary bytestring data-binary-ieee754 dbf filepath rwlock
        ];
        description = "Parser and related tools for ESRI shapefile format";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231132,8 +232286,8 @@ self: {
          base containers proxy-kindness QuickCheck tagged template-haskell
        ];
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231161,7 +232315,7 @@ self: {
          QuickCheck shapes-math transformers vector vector-th-unbox
        ];
        description = "physics engine and other tools for 2D shapes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shapes-demo" = callPackage
@@ -231180,7 +232334,7 @@ self: {
          sdl2 shapes StateVar text transformers vector
        ];
        description = "demos for the 'shapes' package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shapes-math" = callPackage
@@ -231203,7 +232357,7 @@ self: {
          base ghc-prim hspec linear QuickCheck template-haskell
        ];
        description = "faster vector/matrix math using unboxed numbers and Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sharc-timbre" = callPackage
@@ -231214,7 +232368,7 @@ self: {
        sha256 = "1cwzks95jlpa4cd99mz5cz509h7j8k08w53xpvwny1bdb3p1cpsa";
        libraryHaskellDepends = [ base ];
        description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shared-buffer" = callPackage
@@ -231231,8 +232385,8 @@ self: {
          test-framework-quickcheck2 unix
        ];
        description = "A circular buffer built on shared memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231246,8 +232400,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base Cabal hspec lens text ];
        description = "a tiny library for using shared lens fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231260,7 +232414,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ base bytestring unix ];
        description = "POSIX shared memory";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sharedio" = callPackage
@@ -231271,7 +232425,7 @@ self: {
        sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv";
        libraryHaskellDepends = [ base ];
        description = "Bundles shared calls to IO functions to perform them only once";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "she" = callPackage
@@ -231287,8 +232441,8 @@ self: {
        libraryHaskellDepends = [ base filepath mtl ];
        executableHaskellDepends = [ base filepath mtl ];
        description = "A Haskell preprocessor adding miscellaneous features";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231319,8 +232473,8 @@ self: {
          transformers wreq
        ];
        description = "Test webhooks locally";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231344,7 +232498,7 @@ self: {
          template-haskell
        ];
        description = "Write shell scripts with Conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shell-escape" = callPackage
@@ -231357,7 +232511,7 @@ self: {
          base binary bytestring containers vector
        ];
        description = "Shell escaping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shell-monad" = callPackage
@@ -231368,7 +232522,7 @@ self: {
        sha256 = "1mms4k2y7gxzilax0hqhgqppckx0mm5nj7fjzqhmn211rsc2s1qn";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shell-pipe" = callPackage
@@ -231384,7 +232538,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pipe streams through external shell commands";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231396,7 +232550,7 @@ self: {
        sha256 = "1n15v0avvkxvczmyjc6g4z9axr5c61n8jlpa1cm4xr3qk7spm1mi";
        libraryHaskellDepends = [ base ];
        description = "Utility functions for writing command-line programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shellish" = callPackage
@@ -231412,8 +232566,8 @@ self: {
          unix-compat
        ];
        description = "shell-/perl- like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231430,8 +232584,8 @@ self: {
          unix
        ];
        description = "Simple interface for shell scripting in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231448,8 +232602,8 @@ self: {
          tagsoup text utf8-string xml
        ];
        description = "Extra functionality for shellmate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231467,7 +232621,7 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Out of the shell solution for scripting in Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "shellout" = callPackage
@@ -231481,7 +232635,7 @@ self: {
        libraryHaskellDepends = [ async base stm text typed-process ];
        executableHaskellDepends = [ async base stm text typed-process ];
        description = "A threaded manager for Haskell that can run and stream external process output/err/exits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shelltestrunner" = callPackage
@@ -231513,7 +232667,7 @@ self: {
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec ];
        description = "Parse strings into words, like a shell would";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shelly" = callPackage
@@ -231542,7 +232696,7 @@ self: {
          transformers-base unix unix-compat
        ];
        description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shelly-extra" = callPackage
@@ -231558,7 +232712,7 @@ self: {
          async base hspec HUnit mtl SafeSemaphore shelly text
        ];
        description = "shelly features that require extra dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shentong" = callPackage
@@ -231576,7 +232730,7 @@ self: {
          unordered-containers vector
        ];
        description = "A Haskell implementation of the Shen programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shh" = callPackage
@@ -231606,8 +232760,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Simple shell scripting from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "shh-extras" = callPackage
@@ -231621,7 +232775,7 @@ self: {
        libraryHaskellDepends = [ base hostname shh time ];
        testHaskellDepends = [ base tasty ];
        description = "Utility functions for using shh";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shift" = callPackage
@@ -231639,7 +232793,7 @@ self: {
          filepath optparse-applicative
        ];
        description = "A tool to quickly switch between directories";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shikensu" = callPackage
@@ -231659,7 +232813,7 @@ self: {
          tasty-hunit text unordered-containers
        ];
        description = "Run a sequence of functions on in-memory representations of files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shimmer" = callPackage
@@ -231679,8 +232833,8 @@ self: {
          base bytestring containers filepath haskeline text
        ];
        description = "The Reflective Lambda Machine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231696,8 +232850,8 @@ self: {
          base ghcjs-dom ghcjs-prim keycode mtl time transformers
        ];
        description = "Declarative graphics for the browser using GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-prim = null;};
 
@@ -231710,8 +232864,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        description = "Examples for the shine package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231726,8 +232880,8 @@ self: {
        libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ];
        testHaskellDepends = [ base ghcjs-dom keycode shine varying ];
        description = "FRP interface for shine using the varying package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "shivers-cfg" = callPackage
@@ -231742,8 +232896,8 @@ self: {
          base containers directory HPDF language-dot mtl pretty process
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231755,8 +232909,8 @@ self: {
        sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v";
        libraryHaskellDepends = [ base curl ];
        description = "A very basic SOAP package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231777,8 +232931,8 @@ self: {
          vector
        ];
        description = "A haskell API binding for shopify.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231790,7 +232944,7 @@ self: {
        sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z";
        libraryHaskellDepends = [ base ];
        description = "Short-circuit values and expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shortcut" = callPackage
@@ -231802,7 +232956,7 @@ self: {
        revision = "1";
        editedCabalFile = "14yp03pynaw3wwj6fnnr6ns7f74h2x7m75wvg3dkxc0dv6snl9l7";
        libraryHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shortcut-links" = callPackage
@@ -231814,8 +232968,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base doctest ];
        description = "Link shortcuts for use in text markup";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231827,8 +232981,8 @@ self: {
        sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3";
        libraryHaskellDepends = [ base text ];
        description = "Shorten a variety of string-like types adding ellipsis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231843,7 +232997,7 @@ self: {
          base deepseq hspec hspec-expectations HUnit
        ];
        description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "show" = callPackage
@@ -231868,7 +233022,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Combinators to write Show instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "show-please" = callPackage
@@ -231883,7 +233037,7 @@ self: {
          base mtl parsec template-haskell th-orphans time
        ];
        description = "A wrapper type V with improved Show instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "show-prettyprint" = callPackage
@@ -231903,8 +233057,8 @@ self: {
          base containers doctest prettyprinter trifecta
        ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231916,7 +233070,7 @@ self: {
        sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv";
        libraryHaskellDepends = [ base ];
        description = "convert types into string values in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "showdown" = callPackage
@@ -231930,8 +233084,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231955,7 +233109,7 @@ self: {
          utf8-string vector
        ];
        description = "Clean up the formatting of 'show' output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shpider" = callPackage
@@ -231971,8 +233125,8 @@ self: {
          tagsoup-parsec time url web-encodings
        ];
        description = "Web automation library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231986,7 +233140,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl ];
        description = "A Haskell pattern splitter with emacs attachments";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "shqq" = callPackage
@@ -232001,7 +233155,7 @@ self: {
          base parsec posix-escape process template-haskell unix
        ];
        description = "Embed shell commands with interpolated Haskell variables, and capture output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shuffle" = callPackage
@@ -232022,8 +233176,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Shuffle tool for UHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232035,7 +233189,7 @@ self: {
        sha256 = "1imidmpjs1ps6j9hzizhknfgw6zwb8qb8zphfknjv9zgjmwn15x4";
        libraryHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shunyalib" = callPackage
@@ -232046,7 +233200,7 @@ self: {
        sha256 = "1yh6xcfhjwb02y731s0lh1y6q63cdfmbnvxv3djylkf1hwdkqhpa";
        libraryHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shwifty" = callPackage
@@ -232064,8 +233218,8 @@ self: {
          uuid-types vector
        ];
        description = "Generate swift types from haskell types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232079,8 +233233,8 @@ self: {
          base bytestring hsI2C time transformers
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232106,8 +233260,8 @@ self: {
          hmatrix JuicyPixels random random-shuffle split vector
        ];
        description = "Machine Learning algorithms";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232119,7 +233273,7 @@ self: {
        sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m";
        libraryHaskellDepends = [ base ];
        description = "Sieve is an implementation of the Sieve abstract data type";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "sifflet" = callPackage
@@ -232142,8 +233296,8 @@ self: {
          base Cabal cairo containers fgl HUnit parsec process
        ];
        description = "Simple, visual, functional language for learning about recursion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232162,8 +233316,8 @@ self: {
        ];
        librarySystemDepends = [ gdk_x11 gtk_x11 ];
        description = "Library of modules shared by sifflet and its tests and its exporters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
@@ -232183,7 +233337,7 @@ self: {
          tasty-smallcheck
        ];
        description = "Rounding rationals to significant digits and decimal places";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "sigma-ij" = callPackage
@@ -232204,8 +233358,8 @@ self: {
          base combinat optparse-applicative time
        ];
        description = "Thom polynomials of second order Thom-Boardman singularities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232228,7 +233382,9 @@ self: {
          tasty-quickcheck tasty-th universe-base
        ];
        description = "Arithmetic over signs and sets of signs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "signable" = callPackage
@@ -232256,8 +233412,8 @@ self: {
          secp256k1-haskell text universum unordered-containers
        ];
        description = "Deterministic serialisation and signatures with proto-lens support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232277,7 +233433,7 @@ self: {
          lens-family proto-lens proto-lens-protoc proto-lens-runtime text
        ];
        description = "Deterministic serialisation and signatures with proto-lens support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "signal" = callPackage
@@ -232291,7 +233447,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        executableHaskellDepends = [ base ];
        description = "Multiplatform signal support for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "signals" = callPackage
@@ -232307,8 +233463,8 @@ self: {
          observable-sharing operational-alacarte
        ];
        description = "Synchronous signal processing for DSLs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232326,7 +233482,7 @@ self: {
          hexstring scientific text unordered-containers vector
        ];
        description = "Hmac sha256 signature json and http payload";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "signed-multiset" = callPackage
@@ -232337,8 +233493,8 @@ self: {
        sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747";
        libraryHaskellDepends = [ base containers ];
        description = "Multisets with negative membership";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232351,7 +233507,7 @@ self: {
        libraryHaskellDepends = [ base deepseq directory ];
        testHaskellDepends = [ base deepseq directory nanospec temporary ];
        description = "Prevent or capture writing to stdout and other handles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "silkscreen" = callPackage
@@ -232362,8 +233518,8 @@ self: {
        sha256 = "0gmp71cipwc0ymydckhvw9g8q3j4pm8cq2la2rbvm0rr9z7c2l40";
        libraryHaskellDepends = [ base prettyprinter ];
        description = "Prettyprinting transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232381,8 +233537,8 @@ self: {
        ];
        testHaskellDepends = [ base quantification savage text ];
        description = "A generator for different kinds of data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232394,8 +233550,8 @@ self: {
        sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m";
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        description = "simple interface to GHC's SIMD instructions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232414,7 +233570,7 @@ self: {
        ];
        description = "stochastic simulation engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232449,7 +233605,7 @@ self: {
          unordered-containers vector wai wai-extra
        ];
        description = "A minimalist web framework for the WAI server interface";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-actors" = callPackage
@@ -232463,8 +233619,8 @@ self: {
          base chan-split contravariant mtl transformers
        ];
        description = "A library for more structured concurrent programming, based on the Actor Model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232481,7 +233637,7 @@ self: {
          base directory filepath hlint process regex-posix
        ];
        description = "A simple library for affine and vector spaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-atom" = callPackage
@@ -232492,8 +233648,8 @@ self: {
        sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Atom (or symbol) datatype for fast comparision and sorting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232506,8 +233662,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bluetooth = null;};
 
@@ -232530,8 +233686,8 @@ self: {
          test-framework-quickcheck2 tuple uniplate
        ];
        description = "A simple C value type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232545,7 +233701,7 @@ self: {
          base bytestring Cabal directory filepath
        ];
        description = "Cabal file wrapper library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-cmd" = callPackage
@@ -232558,7 +233714,7 @@ self: {
          base directory extra filepath process unix
        ];
        description = "Simple String-based process commands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-cmd-args" = callPackage
@@ -232569,7 +233725,7 @@ self: {
        sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd";
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Simple command args parsing and execution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-conduit" = callPackage
@@ -232600,8 +233756,8 @@ self: {
          transformers-base vector void
        ];
        description = "A simple streaming I/O library based on monadic folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232619,8 +233775,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Simple config file parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232636,8 +233792,8 @@ self: {
          base blaze-html hashable language-css unordered-containers
        ];
        description = "simple binding of css and html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232653,8 +233809,8 @@ self: {
          base conduit-combinators http-client http-conduit mtl transformers
        ];
        description = "A simple wrapper of http-conduit for file download";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232676,7 +233832,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion mtl transformers ];
        description = "A simple effect system that integrates with MTL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-enumeration" = callPackage
@@ -232688,7 +233844,7 @@ self: {
        libraryHaskellDepends = [ base integer-gmp ];
        testHaskellDepends = [ base doctest ];
        description = "Finite or countably infinite sequences of values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-eval" = callPackage
@@ -232702,8 +233858,8 @@ self: {
        libraryHaskellDepends = [ base parsec text transformers ];
        executableHaskellDepends = [ base text ];
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232715,8 +233871,8 @@ self: {
        sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka";
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
        description = "Simplified interface for firewire cameras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232734,7 +233890,7 @@ self: {
        ];
        description = "Forms that configure themselves based on type";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "simple-genetic-algorithm" = callPackage
@@ -232748,8 +233904,8 @@ self: {
        libraryHaskellDepends = [ base parallel random ];
        executableHaskellDepends = [ base deepseq parallel random ];
        description = "Simple parallel genetic algorithm implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232770,7 +233926,7 @@ self: {
          base deepseq MonadRandom parallel random transformers
        ];
        description = "Simple parallel genetic algorithm implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-get-opt" = callPackage
@@ -232781,7 +233937,7 @@ self: {
        sha256 = "0xr5gi22ifq6nw0q0w1rf66djsns4gfv2l9yjvxhbxr4j8bqmwik";
        libraryHaskellDepends = [ base ];
        description = "A simple library for processing command-line options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-index" = callPackage
@@ -232796,8 +233952,8 @@ self: {
          base containers hashable safecopy unordered-containers
        ];
        description = "Allows simple indexation on any data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232818,7 +233974,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec microlens-platform text ];
        description = "Simple log for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-log-syslog" = callPackage
@@ -232829,8 +233985,8 @@ self: {
        sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34";
        libraryHaskellDepends = [ base hsyslog simple-log text ];
        description = "Syslog backend for simple-log";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232842,7 +233998,7 @@ self: {
        sha256 = "16ap76da3pvigl9gwpzb6miy13z5ypgh318cnqfyij0l5hrg4qg4";
        libraryHaskellDepends = [ base fast-logger monad-logger mtl text ];
        description = "A very simple but efficient logging framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "simple-logging" = callPackage
@@ -232864,8 +234020,8 @@ self: {
          simple-effects string-conv text time vector
        ];
        description = "Logging effect to plug into the simple-effects framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232879,7 +234035,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A simple LTL checker";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-money" = callPackage
@@ -232890,8 +234046,8 @@ self: {
        sha256 = "0bhiqnk7nh2y4qk7zkbfygna7kcg0gwqy8a5m70dqxs3f34h3fwf";
        libraryHaskellDepends = [ base containers ];
        description = "Simple library to handle and interexchange money";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232911,8 +234067,8 @@ self: {
          base containers deepseq parallel random split
        ];
        description = "Simple parallel neural networks implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232934,8 +234090,8 @@ self: {
          mtl parsec system-filepath text text-render unordered-containers
        ];
        description = "Simple parsing/pretty printing for Nix expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232947,7 +234103,7 @@ self: {
        sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r";
        libraryHaskellDepends = [ base ];
        description = "The Observer pattern";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-pascal" = callPackage
@@ -232964,8 +234120,8 @@ self: {
          base containers filepath mtl parsec simple-stacked-vm
        ];
        description = "Simplified Pascal language to SSVM compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232984,8 +234140,8 @@ self: {
          transformers-base
        ];
        description = "simple pipeline library like conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233003,7 +234159,7 @@ self: {
          resource-pool simple transformers
        ];
        description = "Connector package for integrating postgresql-orm with the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-reflect" = callPackage
@@ -233014,7 +234170,7 @@ self: {
        sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
        libraryHaskellDepends = [ base ];
        description = "Simple reflection of expressions containing variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-rope" = callPackage
@@ -233025,8 +234181,8 @@ self: {
        sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl";
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        description = "Memory-efficient strings with concatenation and splitting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233044,7 +234200,7 @@ self: {
          process resourcet unix
        ];
        description = "Cross platform library for the sendfile system call";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-server" = callPackage
@@ -233061,7 +234217,7 @@ self: {
        ];
        description = "Simple Server interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233079,7 +234235,7 @@ self: {
          cookie cryptohash http-types simple transformers wai wai-extra
        ];
        description = "Cookie-based session management for the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-sessions" = callPackage
@@ -233090,7 +234246,7 @@ self: {
        sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5";
        libraryHaskellDepends = [ base indexed synchronous-channels ];
        description = "A simple implementation of session types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-smt" = callPackage
@@ -233101,7 +234257,7 @@ self: {
        sha256 = "0bwb3r2gqm81nmf0hc0mgj8vp2a48kmzx0h7h42lprp4d4irwmy2";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-sql-parser" = callPackage
@@ -233115,7 +234271,7 @@ self: {
        libraryHaskellDepends = [ base mtl parsec pretty ];
        testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ];
        description = "A parser for SQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-src-utils" = callPackage
@@ -233130,7 +234286,7 @@ self: {
        executableHaskellDepends = [ base extra text ];
        testHaskellDepends = [ base extra tasty tasty-hunit text ];
        description = "source code editing utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-stacked-vm" = callPackage
@@ -233147,8 +234303,8 @@ self: {
          array base binary-state containers filepath mtl parsec
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233160,8 +234316,8 @@ self: {
        sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs";
        libraryHaskellDepends = [ base ];
        description = "Simple tabular-text formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233177,8 +234333,8 @@ self: {
          base bytestring cereal containers filepath time
        ];
        description = "Simple, pure, file-system-free reading of tar files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233197,7 +234353,7 @@ self: {
          aeson attoparsec base hspec HUnit scientific vector
        ];
        description = "A basic template language for the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-text-format" = callPackage
@@ -233213,7 +234369,7 @@ self: {
          base hspec microlens-platform text unordered-containers
        ];
        description = "Simple text based format strings with named identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-ui" = callPackage
@@ -233230,8 +234386,8 @@ self: {
          transformers vector vty
        ];
        description = "UI library for terminal";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233243,8 +234399,8 @@ self: {
        sha256 = "1dzsr15lq32dqsbhb639vzlx2d6m2kx0qax75ik2z765r5h9f9sa";
        libraryHaskellDepends = [ base first-class-families ];
        description = "Simple arithmetic with SI units using type-checked dimensional analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233262,8 +234418,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Three-dimensional vectors of doubles with basic operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233276,8 +234432,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base hspec lens ];
        description = "Zippers made slightly easier";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233291,7 +234447,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233308,8 +234464,8 @@ self: {
          base containers either generic-deriving hspec lens text
        ];
        description = "Short description of your package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233326,8 +234482,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
        description = "Simple IRC Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233339,8 +234495,8 @@ self: {
        sha256 = "1cmzln3lya1scz10c6p33aqwy7djivc1dm9qkpkbwp2c8adq02bw";
        libraryHaskellDepends = [ base bytestring simpleirc ];
        description = "Lenses for simpleirc types";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233355,7 +234511,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simplemesh" = callPackage
@@ -233366,7 +234522,7 @@ self: {
        sha256 = "1cq8h96kr1qnxqma7if3pmxcw05nrirpnw703r4cba75xwgwlqcl";
        libraryHaskellDepends = [ base linear ];
        description = "Generators for primitive meshes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simplenote" = callPackage
@@ -233382,8 +234538,8 @@ self: {
          utf8-string
        ];
        description = "Haskell interface for the simplenote API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233402,8 +234558,8 @@ self: {
          base ghc-paths haskell-src-exts process uniplate
        ];
        description = "A simplified Haskell prelude for teaching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233417,8 +234573,8 @@ self: {
        editedCabalFile = "09dd2d70jhkw3svsf4680f9250w4c7s9396w6dac2l2ypxxiq0p6";
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Very simple SMTP Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233431,7 +234587,7 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ libssh2 ];
        description = "Simple wrapper around libssh2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libssh2;};
 
   "simplest-sqlite" = callPackage
@@ -233447,8 +234603,8 @@ self: {
        ];
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -233466,7 +234622,7 @@ self: {
          base directory filepath mtl process random regex-compat split time
        ];
        description = "A simple markup language that translates to LaTeX";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "simplex-basic" = callPackage
@@ -233487,7 +234643,7 @@ self: {
          transformers
        ];
        description = "Very basic simplex implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simplistic-generics" = callPackage
@@ -233502,7 +234658,7 @@ self: {
          base containers deepseq kind-apply mtl template-haskell
        ];
        description = "Generic programming without too many type classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simseq" = callPackage
@@ -233517,7 +234673,7 @@ self: {
        executableHaskellDepends = [ base bio bytestring random ];
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233529,7 +234685,7 @@ self: {
        sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8";
        libraryHaskellDepends = [ base containers ];
        description = "Load data organized in a tree";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "since" = callPackage
@@ -233540,7 +234696,7 @@ self: {
        sha256 = "1zy1vwna8a0421l3jvdm8mg36xwgj4xl3p2xkf678ahbzk0179vs";
        libraryHaskellDepends = [ base time ];
        description = "Get the number of seconds since the last invocation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sindre" = callPackage
@@ -233567,7 +234723,7 @@ self: {
        ];
        executablePkgconfigDepends = [ libXft ];
        description = "A programming language for simple GUIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXft;};
 
   "single-tuple" = callPackage
@@ -233580,7 +234736,7 @@ self: {
        testHaskellDepends = [ base hspec OneTuple Only ];
        testToolDepends = [ hspec-discover ];
        description = "a class for single tuple implementations";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "singlethongs" = callPackage
@@ -233592,7 +234748,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Like singletons, but much smaller";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singleton-bool" = callPackage
@@ -233605,7 +234761,7 @@ self: {
        editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an";
        libraryHaskellDepends = [ base dec ];
        description = "Type level booleans";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singleton-dict" = callPackage
@@ -233616,8 +234772,8 @@ self: {
        sha256 = "125mb6j4gf3qcgmvjf6zibnzl7sw8jcmrh60nig16ahk55cjczic";
        libraryHaskellDepends = [ base singletons ];
        description = "Typelevel balanced search trees via a singletonized Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233629,7 +234785,7 @@ self: {
        sha256 = "0qmkqfj8rch9qcczs05lm5l3sx29slmqw156g4hhr3d735xg4nk1";
        libraryHaskellDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singleton-typelits" = callPackage
@@ -233640,8 +234796,8 @@ self: {
        sha256 = "08xn7qv9kwhj9i69bpzigd76581rpq2jz410gmvr29g5ag1d0k08";
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233667,24 +234823,24 @@ self: {
          turtle
        ];
        description = "A framework for generating singleton types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singletons-presburger" = callPackage
-    ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection
-     , singletons
+    ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl
+     , reflection, singletons
      }:
      mkDerivation {
        pname = "singletons-presburger";
-       version = "0.3.0.1";
-       sha256 = "1j7azll9cjg5gcvpw8aq1hia1njg4bm8llwms1v941gwi7gk481m";
+       version = "0.5.0.0";
+       sha256 = "0pc95rg9vbcgzw6bzsj41vbz3h85p4lhf1ry8ik6l8c2nz3ga6bb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base ghc ghc-typelits-presburger reflection singletons
+         base ghc ghc-typelits-presburger mtl reflection singletons
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singnal" = callPackage
@@ -233695,8 +234851,8 @@ self: {
        sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj";
        libraryHaskellDepends = [ base ];
        description = "Singnal";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233718,7 +234874,7 @@ self: {
        ];
        description = "Multivariate polynomial factorization via bindings to Singular-factory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {singular-factory = null;};
 
@@ -233730,8 +234886,8 @@ self: {
        sha256 = "04ny9450h2mlw1j0gn6a1vvgwsk3gbhhzshqv2sbcg5pwkzkdrzp";
        libraryHaskellDepends = [ base ];
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233752,7 +234908,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "siphash: a fast short input PRF";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "siphon" = callPackage
@@ -233778,8 +234934,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Encode and decode CSV files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233804,8 +234960,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Siren Tools for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233822,8 +234978,8 @@ self: {
          remote SHA transformers
        ];
        description = "Sirkel, a Chord DHT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233835,7 +234991,7 @@ self: {
        sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
        libraryHaskellDepends = [ base lens taggy taggy-lens text ];
        description = "Sitemap parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sitemap-gen" = callPackage
@@ -233851,7 +235007,7 @@ self: {
          base bytestring HUnit raw-strings-qq tasty tasty-hunit time
        ];
        description = "Generate XML Sitemaps & Sitemap Indexes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sitepipe" = callPackage
@@ -233871,8 +235027,8 @@ self: {
          unordered-containers yaml
        ];
        description = "A simple to understand static site generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233892,7 +235048,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Sixel library to show images in a terminal emulator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sixfiguregroup" = callPackage
@@ -233908,8 +235064,8 @@ self: {
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
        description = "A six figure group of time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233922,7 +235078,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers lens mtl ];
        testHaskellDepends = [ base bytestring containers lens mtl ];
        description = "An eDSL for writing 65(C)02 bytecode";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "size-based" = callPackage
@@ -233939,8 +235095,8 @@ self: {
          base dictionary-sharing template-haskell testing-type-modifiers
        ];
        description = "Sized functors, for size-based enumerations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233948,24 +235104,26 @@ self: {
     ({ mkDerivation, base, constraints, containers, deepseq
      , equational-reasoning, ghc-typelits-knownnat
      , ghc-typelits-presburger, hashable, hspec, inspection-testing
-     , lens, mono-traversable, singletons, subcategories
-     , template-haskell, th-lift, these, type-natural, vector
+     , lens, mono-traversable, subcategories, template-haskell, th-lift
+     , these, type-natural, vector
      }:
      mkDerivation {
        pname = "sized";
-       version = "0.8.0.0";
-       sha256 = "1jwarhc0xi4h5860whi6s9n36qijlh6j6rnxx71dnlsrinfdsn2m";
+       version = "1.0.0.0";
+       sha256 = "0f6ql0yk0qi2wkzifhhhfn5z3wzh10d57ak9wrb4dv8s6mx34yk7";
+       revision = "3";
+       editedCabalFile = "13v3dkfdnzg2y7pfkn2dnvczd9y40izlm30vcssn2a5b1v7vy3bz";
        libraryHaskellDepends = [
          base constraints containers deepseq equational-reasoning
          ghc-typelits-knownnat ghc-typelits-presburger hashable lens
-         mono-traversable singletons subcategories these type-natural vector
+         mono-traversable subcategories these type-natural vector
        ];
        testHaskellDepends = [
          base containers hspec inspection-testing mono-traversable
-         singletons subcategories template-haskell th-lift vector
+         subcategories template-haskell th-lift type-natural vector
        ];
        description = "Sized sequence data-types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sized-grid" = callPackage
@@ -233989,8 +235147,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Multidimensional grids with sized specified at compile time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234009,8 +235167,8 @@ self: {
          array base base-compat containers singletons
        ];
        description = "Sized types in Haskell using the GHC Nat kind";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234027,8 +235185,8 @@ self: {
          singletons template-haskell type-natural
        ];
        description = "Size-parameterized vector types and functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234048,8 +235206,8 @@ self: {
          system-fileio system-filepath text unix
        ];
        description = "Recursively show space (size and i-nodes) used in subdirectories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234071,8 +235229,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234091,7 +235249,7 @@ self: {
          base bytestring cereal crypto-api filepath hspec tagged
        ];
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "skeletal-set" = callPackage
@@ -234109,8 +235267,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Skeletal set - a set with equivalence relation different from equality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234129,8 +235287,8 @@ self: {
          process time
        ];
        description = "a tool to access the OSX keychain";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234149,8 +235307,8 @@ self: {
          transformers transformers-compat
        ];
        description = "Manage project skeletons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234166,8 +235324,8 @@ self: {
          base blaze-html bytestring containers http-types text wai
        ];
        description = "An overly complex Haskell web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234186,8 +235344,8 @@ self: {
          wreq xml-conduit
        ];
        description = "A MyAnimeList.net client.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234204,8 +235362,8 @@ self: {
          async base bytestring deque envy hspec network websockets
        ];
        description = "A very quick-and-dirty WebSocket server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234219,7 +235377,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of pure skip lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skip-var" = callPackage
@@ -234232,7 +235390,7 @@ self: {
        editedCabalFile = "0vl2y19l7xhlq08f91ggycj4imfdxvkj2fsaz8ifc0waxk3q7ja8";
        libraryHaskellDepends = [ base ];
        description = "Skip variables";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skulk" = callPackage
@@ -234244,8 +235402,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Eclectic collection of utility functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234268,8 +235426,8 @@ self: {
          base conduit-extra optparse-generic preamble shakers
        ];
        description = "Skylark client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234292,7 +235450,7 @@ self: {
          pretty-show text
        ];
        description = "syntax highlighting library";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "skylighting-core" = callPackage
@@ -234323,7 +235481,7 @@ self: {
          base containers criterion directory filepath text
        ];
        description = "syntax highlighting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "skylighting-extensions" = callPackage
@@ -234338,7 +235496,7 @@ self: {
          base containers skylighting skylighting-modding text
        ];
        description = "Customized Skylighting syntax highlighters";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skylighting-lucid" = callPackage
@@ -234351,8 +235509,8 @@ self: {
          base containers lucid skylighting-core text
        ];
        description = "Lucid support for Skylighting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234364,7 +235522,7 @@ self: {
        sha256 = "11wmasn3hhva7jxmrjigbgvhrsnwvrx1ksbhjhdp46ii2jnyk0i3";
        libraryHaskellDepends = [ base containers skylighting-core text ];
        description = "Utilities for modifying Skylighting syntaxes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skype4hs" = callPackage
@@ -234381,8 +235539,8 @@ self: {
          time transformers-base word8 X11
        ];
        description = "Skype Desktop API binding for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234402,8 +235560,8 @@ self: {
          haskell98 IfElse old-locale regex-pcre time utf8-string
        ];
        description = "Export Skype chat logs to text files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -234420,8 +235578,8 @@ self: {
          transformers
        ];
        description = "Haskell API for interacting with Slack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234445,7 +235603,7 @@ self: {
        executableHaskellDepends = [ base lens mtl text ];
        testHaskellDepends = [ base ];
        description = "Bindings to the Slack RTM API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slack-notify-haskell" = callPackage
@@ -234464,8 +235622,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Slack notifier for Haskell project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234491,7 +235649,7 @@ self: {
          aeson base bytestring interpolate lens lens-aeson mtl network-uri
          text transformers wreq
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slack-verify" = callPackage
@@ -234509,7 +235667,7 @@ self: {
          base base16-bytestring bytestring cryptonite hspec
        ];
        description = "Slack API Request Verification HMAC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slack-web" = callPackage
@@ -234532,8 +235690,8 @@ self: {
          time
        ];
        description = "Bindings for the Slack web API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234561,7 +235719,7 @@ self: {
          string-conversions unordered-containers
        ];
        description = "A note taking CLI tool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slave-thread" = callPackage
@@ -234581,8 +235739,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "A fundamental solution to ghost threads and silent exceptions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234597,7 +235755,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        executableHaskellDepends = [ base time ];
        description = "zZzzZz";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "slice-cpp-gen" = callPackage
@@ -234615,7 +235773,7 @@ self: {
          language-slice MissingH
        ];
        description = "Generate C++ skeletons from slice files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sliceofpy" = callPackage
@@ -234639,8 +235797,8 @@ self: {
          template-haskell text
        ];
        description = "Python-ish slicing traversals for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234650,14 +235808,14 @@ self: {
      }:
      mkDerivation {
        pname = "slick";
-       version = "1.0.1.1";
-       sha256 = "1n1a7jpn37dzfmk9z51d6yhg2iaraqw55qnlap0d6zk1lnc3drib";
+       version = "1.1.0.0";
+       sha256 = "1a6zsp308ikqzdxy26phb04bk4hr8lmw1i73mwydg65yd42c8zjx";
        libraryHaskellDepends = [
          aeson base bytestring directory extra mustache pandoc shake text
          unordered-containers
        ];
        description = "A quick & easy static site builder built with shake and pandoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "slidemews" = callPackage
@@ -234676,7 +235834,7 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234692,8 +235850,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Functional reactive user interface programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234714,8 +235872,8 @@ self: {
          tasty-hedgehog tasty-hunit text
        ];
        description = "SLIP-0032: Extended serialization format for BIP-32 wallets";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234728,7 +235886,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Sized list";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "sloane" = callPackage
@@ -234749,8 +235907,8 @@ self: {
          optparse-applicative resourcet stringsearch text transformers
        ];
        description = "A command line interface to Sloane's OEIS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234769,7 +235927,7 @@ self: {
          base Chart Chart-cairo colour data-default-class lens
        ];
        description = "Visualize mathematical function's slope fields";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "slot-lambda" = callPackage
@@ -234785,8 +235943,8 @@ self: {
          template-haskell vector
        ];
        description = "Write lambdas without naming the parameters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234798,8 +235956,8 @@ self: {
        sha256 = "0x3iw1mqbl3q723kkxr6b0i1hxcfb4sink4kmg6xnpzd3hwaspq9";
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234812,7 +235970,7 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Pure Haskell slotmap implementation over ST or IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "slug" = callPackage
@@ -234833,11 +235991,26 @@ self: {
          base exceptions hspec http-api-data path-pieces QuickCheck text
        ];
        description = "Type-safe slugs for Yesod ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "slugify" = callPackage
+    ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, text
+     , unicode-transforms
+     }:
+     mkDerivation {
+       pname = "slugify";
+       version = "0.1.0.0";
+       sha256 = "1bsb9jhd85zpa27wfv365axg9qx973wqi1nlnjds262i0ywdc45s";
+       libraryHaskellDepends = [ base text unicode-transforms ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
+       testToolDepends = [ hspec-discover ];
+       description = "Convert text into slugs";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "slynx" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring, containers
      , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix
@@ -234857,7 +236030,9 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Handle molecular sequences";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "small-bytearray-builder" = callPackage
@@ -234869,8 +236044,8 @@ self: {
        libraryHaskellDepends = [ base bytebuild byteslice ];
        doHaddock = false;
        description = "Serialize to bytes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234882,8 +236057,8 @@ self: {
        sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z";
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
        description = "low-level unboxed arrays, with minimal features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234906,18 +236081,18 @@ self: {
          attoparsec base containers data-default parsec text
        ];
        description = "Flatten camel case text in LaTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smallcheck" = callPackage
     ({ mkDerivation, base, logict, mtl, pretty }:
      mkDerivation {
        pname = "smallcheck";
-       version = "1.2.0";
-       sha256 = "1y6rh1g7pi99jqq32xdv79yli9hmbfwjqg8ix1z2i2qkqqkr5iyn";
+       version = "1.2.1";
+       sha256 = "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4";
        libraryHaskellDepends = [ base logict mtl pretty ];
        description = "A property-based testing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smallcheck-kind-generics" = callPackage
@@ -234934,8 +236109,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234947,8 +236122,8 @@ self: {
        sha256 = "1jyn1bsn78jsnf5lzscvqzbf68ljf82vclq0k9aba58r2dayxn47";
        libraryHaskellDepends = [ base smallcheck smallcheck-series ];
        description = "SmallCheck properties for common laws";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234964,8 +236139,8 @@ self: {
          base lens smallcheck smallcheck-series transformers
        ];
        description = "SmallCheck properties for lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234985,7 +236160,7 @@ self: {
          base doctest Glob smallcheck tasty tasty-hunit tasty-smallcheck
        ];
        description = "Extra SmallCheck series and utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smallpt-hs" = callPackage
@@ -234998,8 +236173,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base vector ];
        description = "A Haskell port of the smallpt path tracer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235015,8 +236190,8 @@ self: {
          base bytestring deepseq hashable smallarray text utf8-string
        ];
        description = "A Unicode text type, optimized for low memory overhead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235032,7 +236207,7 @@ self: {
        libraryHaskellDepends = [ base bytestring random text uuid ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Utilities for the Smaoin semantic information model";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "smap" = callPackage
@@ -235063,8 +236238,8 @@ self: {
          strict text transformers unordered-containers
        ];
        description = "A command line tool for working with sets and maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235078,8 +236253,8 @@ self: {
          base bytestring containers template-haskell
        ];
        description = "group strings or bytestrings by words in common";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235100,8 +236275,8 @@ self: {
          base containers generic-deriving ghc-prim mtl QuickCheck random
        ];
        description = "A smarter QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235113,8 +236288,8 @@ self: {
        sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package exposing a helper function for generating smart constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235140,7 +236315,7 @@ self: {
          text
        ];
        description = "Haskell Behavior Tree Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smartword" = callPackage
@@ -235156,8 +236331,8 @@ self: {
          base haskell98 pretty unix utf8-string
        ];
        description = "Web based flash card for Word Smart I and II vocabularies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235174,7 +236349,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Combinators for Maybe types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-aeson" = callPackage
@@ -235187,7 +236362,7 @@ self: {
        editedCabalFile = "1y0k6gz9qlr98f543607zkx6a97fnzh3zrbi2b59rlljp0rjvdw8";
        libraryHaskellDepends = [ aeson base smash unordered-containers ];
        description = "Aeson support for the smash library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-lens" = callPackage
@@ -235199,7 +236374,7 @@ self: {
        libraryHaskellDepends = [ base lens smash ];
        testHaskellDepends = [ base ];
        description = "Optics for the `smash` library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-microlens" = callPackage
@@ -235213,7 +236388,7 @@ self: {
        libraryHaskellDepends = [ base microlens smash ];
        testHaskellDepends = [ base ];
        description = "Optics for the `smash` library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-optics" = callPackage
@@ -235224,7 +236399,7 @@ self: {
        sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh";
        libraryHaskellDepends = [ base optics-core smash ];
        description = "Optics for the `smash` library using `optics-core`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smcdel" = callPackage
@@ -235250,8 +236425,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235263,8 +236438,8 @@ self: {
        sha256 = "1d3kjyskwzc7p5bi6pv9yxfa6l6dqkkqc24dmmxl5wx7vmbfma25";
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235283,8 +236458,8 @@ self: {
          base doctest exceptions free Glob hspec mtl process QuickCheck text
          transformers yaml
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235296,8 +236471,8 @@ self: {
        sha256 = "0k1yy1bhgavsmm40zz1i6ihyfksb6fr06wxlbqyj1y0igmrrrlrw";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235309,8 +236484,8 @@ self: {
        sha256 = "0ylhzs0lc7fxp54s74slffkr8rnasy4pak4snyi5jnvma0wiz55g";
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235334,8 +236509,8 @@ self: {
          smith-client text transformers transformers-bifunctors unix
        ];
        description = "Command line tool for <https://smith.st/ Smith>.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235359,8 +236534,8 @@ self: {
          transformers
        ];
        description = "API client for <https://smith.st/ Smith>.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235373,7 +236548,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base linear text vector ];
        description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smsaero" = callPackage
@@ -235389,8 +236564,8 @@ self: {
          servant-client servant-docs text time
        ];
        description = "SMSAero API and HTTP client based on servant library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235406,7 +236581,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Interface to Satisfiability Modulo Theories solvers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smt-lib" = callPackage
@@ -235417,8 +236592,8 @@ self: {
        sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky";
        libraryHaskellDepends = [ array base directory polyparse ];
        description = "Parsing and printing SMT-LIB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235431,8 +236606,8 @@ self: {
        libraryHaskellDepends = [ base parsec text ];
        testHaskellDepends = [ base HUnit parsec text ];
        description = "A Haskell parser for SMT-LIB version 2.6";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235444,7 +236619,7 @@ self: {
        sha256 = "0bws90179vl2ycvnsmi0zni1vg71bdlhkgg0qdvqmls2rjyh5q3j";
        libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smtlib2" = callPackage
@@ -235460,8 +236635,8 @@ self: {
          template-haskell
        ];
        description = "A type-safe interface to communicate with an SMT solver";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235478,8 +236653,8 @@ self: {
          mtl smtlib2 smtlib2-pipe text
        ];
        description = "Dump the communication with an SMT solver for debugging purposes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235501,8 +236676,8 @@ self: {
          base Cabal cabal-test-quickcheck smtlib2 smtlib2-quickcheck
        ];
        description = "A type-safe interface to communicate with an SMT solver";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235518,8 +236693,8 @@ self: {
          base containers dependent-map dependent-sum mtl QuickCheck smtlib2
        ];
        description = "Helper functions to create SMTLib expressions in QuickCheck";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235531,8 +236706,8 @@ self: {
        sha256 = "12828gfip43pwjwnhd0smvkz1ar71gbp4lkv3njli6yp5dbcwfi5";
        libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ];
        description = "Get timing informations for SMT queries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235551,7 +236726,7 @@ self: {
          text
        ];
        description = "Simple email sending via SMTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smtp-mail-ng" = callPackage
@@ -235571,8 +236746,8 @@ self: {
          x509-system
        ];
        description = "An SMTP client EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235587,7 +236762,7 @@ self: {
        executableHaskellDepends = [ base haskell98 network process ];
        description = "Listen for SMTP traffic and send it to an MTA script";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "smtps-gmail" = callPackage
@@ -235605,8 +236780,8 @@ self: {
          tls transformers
        ];
        description = "Gmail SMTP Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235629,8 +236804,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory filepath ];
        description = "GHC Source Plugin that helps to manage imports";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235641,8 +236816,8 @@ self: {
      }:
      mkDerivation {
        pname = "smuggler2";
-       version = "0.3.6.1";
-       sha256 = "1wr7qskz75dr0zzhg5gzpjci70rhlcwzlx3cavii7199kvm8axhd";
+       version = "0.3.6.2";
+       sha256 = "1lkz9dpwz0pgc134wcpnb00r6ql4l19bbl5zqszm4wsrw92npd56";
        libraryHaskellDepends = [
          base containers directory filepath ghc ghc-boot ghc-exactprint
          split syb
@@ -235652,8 +236827,8 @@ self: {
          typed-process
        ];
        description = "GHC Source Plugin that helps to minimise imports and generate explicit exports";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235667,8 +236842,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random split terminal-size ];
        description = "A basic console snake game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235680,8 +236855,8 @@ self: {
        sha256 = "1iy3m20ldc98agdi7n71ik8k2f62ybfg719z79lcf8pzynbfsrbd";
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235717,7 +236892,7 @@ self: {
          unordered-containers xmlhtml
        ];
        description = "Top-level package for the Snap Web Framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-accept" = callPackage
@@ -235732,8 +236907,8 @@ self: {
          base bytestring case-insensitive http-media snap-core
        ];
        description = "Accept header branching for the Snap web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235745,7 +236920,7 @@ self: {
        sha256 = "1v3izzvxadjplir47ipi087sj6fcmfj5ivlhbkpp9ld7vj8sv2hi";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-auth-cli" = callPackage
@@ -235765,8 +236940,8 @@ self: {
          utf8-string
        ];
        description = "Command-line tool to manage Snap AuthManager database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235778,7 +236953,7 @@ self: {
        sha256 = "0hc8k0cviq7ayjymsfr435bnfw35pa4f80i7x4ypn2539fykavmk";
        libraryHaskellDepends = [ base blaze-html snap-core ];
        description = "blaze-html integration for Snap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-blaze-clay" = callPackage
@@ -235789,8 +236964,8 @@ self: {
        sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy";
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
        description = "blaze-html-clay integration for Snap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235804,8 +236979,8 @@ self: {
          base configurator text unordered-containers
        ];
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235840,7 +237015,7 @@ self: {
          vector zlib
        ];
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-cors" = callPackage
@@ -235852,7 +237027,7 @@ self: {
        libraryHaskellDepends = [ snap-core ];
        doHaddock = false;
        description = "Add CORS headers to Snap applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-elm" = callPackage
@@ -235868,7 +237043,7 @@ self: {
          transformers
        ];
        description = "Serve Elm files through the Snap web framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-error-collector" = callPackage
@@ -235884,8 +237059,8 @@ self: {
          transformers
        ];
        description = "Collect errors in batches and dispatch them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235917,8 +237092,8 @@ self: {
          tasty-quickcheck
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235934,7 +237109,7 @@ self: {
          attoparsec base bytestring containers snap-core
        ];
        description = "Language handling for Snap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-loader-dynamic" = callPackage
@@ -235950,7 +237125,7 @@ self: {
          time unix
        ];
        description = "Snap dynamic loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-loader-static" = callPackage
@@ -235961,7 +237136,7 @@ self: {
        sha256 = "0598xvy2jk6xc4xhhjqy2v8f5s7k8x13v4wadw8r37h81jpbic00";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Snap static loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-predicates" = callPackage
@@ -235987,7 +237162,7 @@ self: {
        ];
        description = "Declarative routing for Snap";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "snap-routes" = callPackage
@@ -236004,8 +237179,8 @@ self: {
          mime-types path-pieces random snap template-haskell text
        ];
        description = "Typesafe URLs for Snap applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236048,7 +237223,7 @@ self: {
          vector
        ];
        description = "A web server for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-stream" = callPackage
@@ -236063,8 +237238,8 @@ self: {
          attoparsec base bytestring io-streams snap-core
        ];
        description = "Streaming Snap handlers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236086,7 +237261,7 @@ self: {
          hashable old-time template-haskell text
        ];
        description = "Scaffolding CLI for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-testing" = callPackage
@@ -236109,8 +237284,8 @@ self: {
          transformers
        ];
        description = "A library for BDD-style testing with the Snap Web Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236128,8 +237303,8 @@ self: {
          snap-core text xmlhtml
        ];
        description = "Snap Framework utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236145,8 +237320,8 @@ self: {
          base bytestring heist mtl snap snap-core text web-routes xmlhtml
        ];
        description = "Type safe URLs for Snap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236160,8 +237335,8 @@ self: {
          acid-state base mtl snap text transformers
        ];
        description = "acid-state snaplet for Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236186,8 +237361,8 @@ self: {
          transformers unordered-containers xmlhtml
        ];
        description = "Generic action log snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236205,8 +237380,8 @@ self: {
          resource-pool snap transformers
        ];
        description = "Snap framework snaplet for the AMQP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236227,8 +237402,8 @@ self: {
          vector
        ];
        description = "Provides an Acid-State backend for the Auth Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236246,8 +237421,8 @@ self: {
          snap snap-core
        ];
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236264,8 +237439,8 @@ self: {
          utf8-string
        ];
        description = "A Snaplet for CSS minification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236289,8 +237464,8 @@ self: {
          transformers unordered-containers uri-bytestring xmlhtml
        ];
        description = "Alternate authentication snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236307,8 +237482,8 @@ self: {
          unordered-containers
        ];
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236328,8 +237503,8 @@ self: {
          snap-core transformers
        ];
        description = "Fay integration for Snap with request- and pre-compilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236346,7 +237521,7 @@ self: {
          string-conversions transformers
        ];
        description = "Serve javascript files compiled with GHCJS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -236363,8 +237538,8 @@ self: {
          hasql-backend lens mtl snap text time
        ];
        description = "A Hasql snaplet";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236380,8 +237555,8 @@ self: {
          base haxl MonadCatchIO-transformers snap transformers
        ];
        description = "Snaplet for Facebook's Haxl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236402,8 +237577,8 @@ self: {
          unordered-containers
        ];
        description = "HDBC snaplet for Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236420,8 +237595,8 @@ self: {
          base configurator hslogger mtl snap transformers
        ];
        description = "Snap framework snaplet for the Logger API library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236445,7 +237620,7 @@ self: {
          snap-loader-static text transformers xmlhtml
        ];
        description = "snaplet-i18n";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snaplet-influxdb" = callPackage
@@ -236463,8 +237638,8 @@ self: {
          monad-control mtl network snap text transformers
        ];
        description = "Snap framework snaplet for the InfluxDB library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236481,7 +237656,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec-snap hspec2 lens snap text ];
        description = "Lexical Style Sheets - Snap Web Framework adaptor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snaplet-mandrill" = callPackage
@@ -236497,8 +237672,8 @@ self: {
          base configurator mandrill mtl network snap transformers
        ];
        description = "Snap framework snaplet for the Mandrill API library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236518,8 +237693,8 @@ self: {
          snap-core template-haskell text time
        ];
        description = "Snap Framework MongoDB support as Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236534,8 +237709,8 @@ self: {
          base lens mongoDB mtl snap text transformers
        ];
        description = "Minimalistic MongoDB Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236556,8 +237731,8 @@ self: {
          resource-pool-catchio snap text transformers unordered-containers
        ];
        description = "mysql-simple snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236583,8 +237758,8 @@ self: {
          test-framework-hunit text
        ];
        description = "snaplet-oauth";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236607,7 +237782,9 @@ self: {
          time transformers unordered-containers
        ];
        description = "persistent snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-postgresql-simple" = callPackage
@@ -236631,8 +237808,8 @@ self: {
          transformers transformers-base unordered-containers
        ];
        description = "postgresql-simple snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236649,8 +237826,8 @@ self: {
          base configurator mtl postmark snap text transformers
        ];
        description = "Postmark snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236667,8 +237844,8 @@ self: {
          string-conv text transformers
        ];
        description = "Automatic (re)compilation of purescript projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236686,8 +237863,8 @@ self: {
          lens MonadCatchIO-transformers mtl snap text transformers
        ];
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236707,8 +237884,8 @@ self: {
          network snap snap-core text time transformers unordered-containers
        ];
        description = "Redis support for Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236728,8 +237905,8 @@ self: {
          text utf8-string websockets websockets-snap
        ];
        description = "CRUD for JSON data with Redis storage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236747,8 +237924,8 @@ self: {
          lens mtl snap snap-accept snap-core text utf8-string xmlhtml
        ];
        description = "REST resources for the Snap web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236766,8 +237943,8 @@ self: {
          riak-protobuf snap snap-core time transformers
        ];
        description = "A Snaplet for the Riak database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236785,8 +237962,8 @@ self: {
          snap-core transformers
        ];
        description = "Sass integration for Snap with request- and pre-compilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236803,8 +237980,8 @@ self: {
          time unordered-containers
        ];
        description = "Modularised session state for Snaplets, in a Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236821,8 +237998,8 @@ self: {
          sednaDBXML snap
        ];
        description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236839,8 +238016,8 @@ self: {
          snap text transformers
        ];
        description = "Snaplet for the ses-html package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236871,8 +238048,8 @@ self: {
          text time transformers unordered-containers
        ];
        description = "sqlite-simple snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236892,8 +238069,8 @@ self: {
          snaplet-sqlite-simple sqlite-simple text time unordered-containers
        ];
        description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236912,8 +238089,8 @@ self: {
          text text-format transformers xmlhtml
        ];
        description = "Stripe snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236930,8 +238107,8 @@ self: {
          network snap snap-core
        ];
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236949,8 +238126,8 @@ self: {
          PSQueue random regex-posix snap snap-core time
        ];
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236977,8 +238154,8 @@ self: {
          unordered-containers xmlhtml
        ];
        description = "A snaplet that communicates with wordpress over its api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236997,7 +238174,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bindings to the Google Snappy library for fast compression/decompression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) snappy;};
 
   "snappy-conduit" = callPackage
@@ -237008,8 +238185,8 @@ self: {
        sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi";
        libraryHaskellDepends = [ base bytestring conduit snappy ];
        description = "Conduit bindings for Snappy (see snappy package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237021,7 +238198,7 @@ self: {
        sha256 = "0nxmaj84y48zsagdx3nzc8c845yziwgvx27zafc59zajsfqgqkh6";
        libraryHaskellDepends = [ array base binary bytestring snappy ];
        description = "Snappy Framing Format in Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -237032,8 +238209,8 @@ self: {
        sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk";
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
        description = "An enumeratee that uses Google's snappy compression library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237048,7 +238225,7 @@ self: {
          base binary bytestring snappy snappy-framing
        ];
        description = "Lazy bytestring compression and decompression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sndfile-enumerators" = callPackage
@@ -237066,8 +238243,8 @@ self: {
          word24
        ];
        description = "Audio file reading/writing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237083,8 +238260,8 @@ self: {
          base classy-prelude containers lens linear mtl ncurses transformers
        ];
        description = "Tiny, declarative wrapper around ncurses";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237096,8 +238273,8 @@ self: {
        sha256 = "0yyway7rhx1x2p6mxfrs6xw22ylc780hsppbq2xkd4rpd1cdw54n";
        libraryHaskellDepends = [ base haste-compiler ];
        description = "A compositional web UI library, which draws to a Canvas element";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "snipcheck" = callPackage
@@ -237108,8 +238285,8 @@ self: {
        sha256 = "1x9jjfznvzz9pa4n54q6xja0axifnlgbp9aw93hvcr4w8f94gfp0";
        libraryHaskellDepends = [ base containers pandoc process text ];
        description = "Markdown tester";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237123,7 +238300,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
        description = "Extracts labeled snippets of code to files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snm" = callPackage
@@ -237144,8 +238321,8 @@ self: {
          base containers directory filepath HsSyck parsec safe spoonutil
        ];
        description = "The Simple Nice-Looking Manual Generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237164,8 +238341,8 @@ self: {
          network stm vector
        ];
        description = "SNMP protocol library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237188,8 +238365,8 @@ self: {
          optparse-applicative parsec random
        ];
        description = "Strategic board game of medium complexity";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237202,8 +238379,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring mps ];
        description = "encode any binary instance to white space";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237226,7 +238403,7 @@ self: {
          base criterion language-haskell-extract text
        ];
        description = "Bindings to the Snowball library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snowflake" = callPackage
@@ -237239,7 +238416,7 @@ self: {
        editedCabalFile = "1y5v3nsin8iyxvh0abfhs7ma75p5zjvha0lp41801pdiikacfzha";
        libraryHaskellDepends = [ base time ];
        description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "snowflake-core" = callPackage
@@ -237251,8 +238428,8 @@ self: {
        libraryHaskellDepends = [ base time-exts ];
        testHaskellDepends = [ base QuickCheck ];
        description = "twitter's snowflake";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237271,8 +238448,8 @@ self: {
          snowflake-core
        ];
        description = "snowflake http server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237290,7 +238467,7 @@ self: {
          base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random
        ];
        description = "randomized fractal snowflakes demo";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "snowtify" = callPackage
@@ -237306,8 +238483,8 @@ self: {
          base either safe safe-exceptions text turtle
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237331,7 +238508,7 @@ self: {
          xml-conduit-writer
        ];
        description = "SOAP client tools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "soap-openssl" = callPackage
@@ -237349,7 +238526,7 @@ self: {
          http-client-openssl soap text
        ];
        description = "TLS-enabled SOAP transport (using openssl bindings)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "soap-tls" = callPackage
@@ -237368,7 +238545,7 @@ self: {
          http-client-tls soap text tls x509 x509-store x509-validation
        ];
        description = "TLS-enabled SOAP transport (using tls package)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sock2stream" = callPackage
@@ -237386,7 +238563,7 @@ self: {
        ];
        description = "Tunnel a socket over a single datastream (stdin/stdout)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sockaddr" = callPackage
@@ -237397,7 +238574,7 @@ self: {
        sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2";
        libraryHaskellDepends = [ base byteorder bytestring network ];
        description = "Printing SockAddr";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "socket" = callPackage
@@ -237413,7 +238590,7 @@ self: {
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "An extensible socket library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "socket-activation" = callPackage
@@ -237426,8 +238603,8 @@ self: {
        editedCabalFile = "0bvm8ik8fp0v5gjw6q4h767zgs1i4ydckdypvqa85sarc985hkmp";
        libraryHaskellDepends = [ base network transformers unix ];
        description = "systemd socket activation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237439,7 +238616,7 @@ self: {
        sha256 = "1wvrdgz0ybacbzg91vi8jiswr02lj7hz61cksmcfii2qsmzpfgb7";
        libraryHaskellDepends = [ base socket ];
        description = "Definitions for using ICMP with the `socket` library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "socket-io" = callPackage
@@ -237454,8 +238631,8 @@ self: {
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237469,8 +238646,8 @@ self: {
        librarySystemDepends = [ lksctp-tools ];
        testHaskellDepends = [ base bytestring socket ];
        description = "STCP socket extensions library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) lksctp-tools;};
 
@@ -237487,8 +238664,8 @@ self: {
          async base bytestring socket tasty tasty-hunit unix
        ];
        description = "Unix domain sockets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237515,8 +238692,8 @@ self: {
          template-haskell text wai wai-websockets warp websockets
        ];
        description = "simpe tool to serve piped data over http and websocket";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237545,8 +238722,8 @@ self: {
          transformers-base unordered-containers vector wai warp
        ];
        description = "Socket.IO server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237577,8 +238754,8 @@ self: {
        ];
        doHaddock = false;
        description = "High-level network sockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237604,8 +238781,8 @@ self: {
          aeson base bytestring either network text websockets
        ];
        description = "A small websocket backend provider";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237619,7 +238796,7 @@ self: {
          base basement bytestring cereal network
        ];
        description = "Socks proxy (ver 5)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sodium" = callPackage
@@ -237630,8 +238807,8 @@ self: {
        sha256 = "00qs1calial08a185ma5hm17lmmzig0yjf3710d5ikq1bmrgcqga";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237644,8 +238821,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237658,8 +238835,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {softfloat = null;};
 
@@ -237673,7 +238850,7 @@ self: {
        editedCabalFile = "0r4786crxih8z4dwi0grpga2kp8ivvnmwa0lhddmn16bfqwa16s9";
        libraryHaskellDepends = [ base time ];
        description = "Simple library for solar calculations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "solga" = callPackage
@@ -237696,8 +238873,8 @@ self: {
          wai wai-extra
        ];
        description = "Simple typesafe web routing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237715,8 +238892,8 @@ self: {
          solga swagger2 text unordered-containers
        ];
        description = "Swagger generation for Solga";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237741,8 +238918,8 @@ self: {
          transformers uri-encode
        ];
        description = "A minimal Solr client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237758,21 +238935,19 @@ self: {
        executableHaskellDepends = [ base containers filepath ];
        testHaskellDepends = [ base containers QuickCheck ];
        description = "Solving simple games";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "some" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "some";
-       version = "1.0.1";
-       sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii";
-       revision = "1";
-       editedCabalFile = "0gpr24rf427l82d8gb3x97yj03vc2v8ky3b6m1gb4j3g4yvvmr96";
+       version = "1.0.2";
+       sha256 = "12mv5gzcvl4n5rz685r2nmmiykvnkvrvx7k4cvwscdjjgnqa9y6c";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base ];
        description = "Existential type: Some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sonic-visualiser" = callPackage
@@ -237793,7 +238968,7 @@ self: {
        ];
        description = "Sonic Visualiser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237807,7 +238982,7 @@ self: {
        editedCabalFile = "1d4sagrlhmvai3f4hvb9rn8aqsjbvi00z0mzv1gds9nblshk83xd";
        libraryHaskellDepends = [ base deepseq ];
        description = "True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sophia" = callPackage
@@ -237826,7 +239001,7 @@ self: {
          base binary bindings-sophia bytestring criterion directory
        ];
        description = "Bindings to Sophia library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sort" = callPackage
@@ -237837,7 +239012,7 @@ self: {
        sha256 = "03bpyn0mimfyilfjs26b9c8sclbzsbardjhy6d822jybg548kqyf";
        libraryHaskellDepends = [ base ];
        description = "A Haskell sorting toolkit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sort-by-pinyin" = callPackage
@@ -237853,7 +239028,7 @@ self: {
          air base bytestring containers here template-haskell text
        ];
        description = "sort by pinyin";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sorted" = callPackage
@@ -237864,8 +239039,8 @@ self: {
        sha256 = "0rzcxhzc4s4sbdnysmjh1i8pd39jyx7a4hbhkarsp2qbx29s4h03";
        libraryHaskellDepends = [ base ];
        description = "Efficient, type-safe sorted sequences";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237878,7 +239053,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Type-enforced sorted lists and related functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sortee" = callPackage
@@ -237890,7 +239065,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Generate string for sort key";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sorting" = callPackage
@@ -237901,8 +239076,8 @@ self: {
        sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
        libraryHaskellDepends = [ base ];
        description = "Utils for sorting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237916,40 +239091,33 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
        description = "Sort lines per file size";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "souffle-haskell" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, directory, extra
-     , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl
+    ({ mkDerivation, array, base, containers, deepseq, directory
+     , filepath, hedgehog, hspec, hspec-hedgehog, mtl
      , neat-interpolation, process, template-haskell, temporary, text
      , type-errors-pretty, vector
      }:
      mkDerivation {
        pname = "souffle-haskell";
-       version = "2.0.1";
-       sha256 = "1imnmgx2wpxx2g51ajcsvnrpwvw97wmind9wzfirfx4l7zr3cp7d";
-       isLibrary = true;
-       isExecutable = true;
+       version = "2.1.0";
+       sha256 = "1szkv27my46xgwqanhb6wkgncll08yznpl0p2m1wq5cifxir2m7h";
        libraryHaskellDepends = [
          array base containers deepseq directory filepath mtl process
          template-haskell temporary text type-errors-pretty vector
        ];
-       executableHaskellDepends = [
-         array base containers deepseq directory extra filepath megaparsec
-         mtl process template-haskell temporary text type-errors-pretty
-         vector
-       ];
        testHaskellDepends = [
          array base containers deepseq directory filepath hedgehog hspec
          hspec-hedgehog mtl neat-interpolation process template-haskell
          temporary text type-errors-pretty vector
        ];
        description = "Souffle Datalog bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237972,8 +239140,8 @@ self: {
          utility-ht
        ];
        description = "Approximate a song from other pieces of sound";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237987,8 +239155,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio delay line";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238002,8 +239170,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base split WAVE ];
        description = "sound generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238027,8 +239195,8 @@ self: {
          template-haskell time unix
        ];
        description = "The server backend for the source code iPhone app";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238048,7 +239216,7 @@ self: {
          text
        ];
        description = "Source constraints GHC plugin";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sourcemap" = callPackage
@@ -238070,7 +239238,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Implementation of source maps as proposed by Google and Mozilla";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sousit" = callPackage
@@ -238089,8 +239257,8 @@ self: {
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238128,7 +239296,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ sox ];
        description = "Write, read, convert audio signals using libsox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) sox;};
 
   "soyuz" = callPackage
@@ -238146,8 +239314,8 @@ self: {
          trifecta uniplate vector
        ];
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238167,7 +239335,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Experimental library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "spacecookie" = callPackage
@@ -238190,7 +239358,7 @@ self: {
          socket systemd transformers unix
        ];
        description = "Gopher Library and Server Daemon";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "spacefill" = callPackage
@@ -238202,7 +239370,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Generators for space-filling curves";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "spacepart" = callPackage
@@ -238213,8 +239381,8 @@ self: {
        sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp";
        libraryHaskellDepends = [ base vector-space ];
        description = "Space partition data structures. Currently only a QuadTree.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238233,7 +239401,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Optimization over arbitrary search spaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spake2" = callPackage
@@ -238259,8 +239427,8 @@ self: {
          QuickCheck tasty tasty-hspec
        ];
        description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238278,8 +239446,8 @@ self: {
          base containers gloss lens linear MonadRandom mtl netwire
        ];
        description = "A breakout clone written in netwire and gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238305,8 +239473,8 @@ self: {
          zip-archive
        ];
        description = "Distributed Apache Spark applications in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238324,7 +239492,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "An SPARQL 1.1 Protocol client library.";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sparrow" = callPackage
@@ -238352,8 +239520,8 @@ self: {
          wai-transformers websockets websockets-simple wuss
        ];
        description = "Unified streaming data-dependency framework for web apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238365,8 +239533,8 @@ self: {
        sha256 = "1q1vpwrr96k41p9zj5x7mjd3817iq9a762q3jfqkwd0cb41iyka6";
        libraryHaskellDepends = [ base containers ];
        description = "A sparse set-based parsing library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238394,8 +239562,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        description = "A playground of sparse linear algebra primitives using Morton ordering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238413,8 +239581,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Effective linear algebra on sparse matrices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238437,7 +239605,7 @@ self: {
          mwc-random primitive QuickCheck scientific
        ];
        description = "Numerical computing in native Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sparse-tensor" = callPackage
@@ -238459,7 +239627,7 @@ self: {
          base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "typesafe tensor algebra library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sparsebit" = callPackage
@@ -238470,8 +239638,8 @@ self: {
        sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07";
        libraryHaskellDepends = [ base haskell98 ];
        description = "Sparse bitmaps for pattern match coverage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238483,8 +239651,8 @@ self: {
        sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95";
        libraryHaskellDepends = [ base containers ];
        description = "A Logic Programming Library for Test-Data Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238500,8 +239668,8 @@ self: {
          base containers data-default monadplus nats pointed semigroups
        ];
        description = "Lightweight parsing library based on partial functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238514,8 +239682,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base dlist mps mtl ];
        description = "brainless form validation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238535,7 +239703,7 @@ self: {
          base doctest QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spatial-rotations" = callPackage
@@ -238557,7 +239725,7 @@ self: {
          tasty-quickcheck vector-space
        ];
        description = "Rotate about any suitable axis";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "spawn" = callPackage
@@ -238568,7 +239736,7 @@ self: {
        sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
        libraryHaskellDepends = [ base ];
        description = "Tiny library for concurrent computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spdx" = callPackage
@@ -238587,7 +239755,7 @@ self: {
          base base-compat Cabal QuickCheck tasty-quickcheck
        ];
        description = "SPDX license expression language, Extras";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spdx-license" = callPackage
@@ -238603,7 +239771,7 @@ self: {
        ];
        testHaskellDepends = [ base directory hspec megaparsec text ];
        description = "SPDX license templates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spe" = callPackage
@@ -238615,7 +239783,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Combinatorial species lite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "special-functors" = callPackage
@@ -238626,8 +239794,8 @@ self: {
        sha256 = "0c68af104qxn9lhzshcy9s466q10n3ic7q4navqi53mmmmznivrd";
        libraryHaskellDepends = [ base mtl ];
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238645,8 +239813,8 @@ self: {
          mwc-random path-pieces primitive safecopy text uuid
        ];
        description = "Simple data types that help me here and there";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238660,7 +239828,7 @@ self: {
          base bytestring ieee754 scientific text
        ];
        description = "Typeclass providing special values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "specialize-th" = callPackage
@@ -238686,8 +239854,8 @@ self: {
          type-sub-th uniplate universe-th
        ];
        description = "Create specialized types from polymorphic ones using TH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238706,8 +239874,8 @@ self: {
          template-haskell
        ];
        description = "Computational combinatorial species";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238725,8 +239893,8 @@ self: {
          sparse-linear-algebra statistics vector
        ];
        description = "Library for spectral clustering";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238742,7 +239910,7 @@ self: {
        testHaskellDepends = [ base express leancheck ];
        benchmarkHaskellDepends = [ base express leancheck ];
        description = "discovery of properties about Haskell functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "speculation" = callPackage
@@ -238753,8 +239921,8 @@ self: {
        sha256 = "0gsdxgi1bw33z7v23m2fq8ynqxz06swjv4ikl8mqmlp0hwd69gvk";
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        description = "A framework for safe, programmable, speculative parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238767,8 +239935,8 @@ self: {
        libraryHaskellDepends = [ speculation ];
        doHaddock = false;
        description = "Merged into 'speculation'. Use that instead.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238799,8 +239967,8 @@ self: {
          text-format-heavy
        ];
        description = "Speechmatics api client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238818,7 +239986,7 @@ self: {
        ];
        testHaskellDepends = [ base containers ];
        description = "Speedy slice sampling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -238839,8 +240007,8 @@ self: {
          base edit-distance parseargs phonetic-code sqlite
        ];
        description = "Spelling suggestion tool with library and command-line interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238852,7 +240020,7 @@ self: {
        sha256 = "1h014k4yi0aachbbni011a1jkzi31lrxhpi8h5q5f2vkgb18k1g4";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "Geometry on a sphere";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sphero" = callPackage
@@ -238867,8 +240035,8 @@ self: {
          base bytestring cereal containers mtl simple-bluetooth
        ];
        description = "Orbotix Sphero client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238885,8 +240053,8 @@ self: {
          xml
        ];
        description = "Haskell bindings to the Sphinx full-text searching daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238900,8 +240068,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238920,8 +240088,8 @@ self: {
        libraryHaskellDepends = [ base MissingH parsec split ];
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Transform queries for sphinx input";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238938,8 +240106,8 @@ self: {
          JuicyPixels-repa OpenGL
        ];
        description = "An FRP-based game engine written in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238960,8 +240128,8 @@ self: {
        ];
        executablePkgconfigDepends = [ libsoup ];
        description = "Experimental web browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libsoup;};
 
   "spine" = callPackage
@@ -238972,7 +240140,7 @@ self: {
        sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv";
        libraryHaskellDepends = [ base ];
        description = "Simple implementation of the generic spine view";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spir-v" = callPackage
@@ -238983,8 +240151,8 @@ self: {
        sha256 = "1jnnc9pgy22iayln4ljgirr4ixspjn7iljyxz2pp7fxgvmvb3msr";
        libraryHaskellDepends = [ base ];
        description = "Some utilities for reading and writing SPIR-V files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239011,8 +240179,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Spiros Boosalis's Custom Prelude";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239024,8 +240192,8 @@ self: {
        sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl";
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239043,8 +240211,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Provides an annotated splay tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239056,7 +240224,7 @@ self: {
        sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1";
        libraryHaskellDepends = [ base network ];
        description = "Cross-platform Socket to Socket Data Splicing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spline3" = callPackage
@@ -239079,8 +240247,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck vector
        ];
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239102,8 +240270,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239115,7 +240283,7 @@ self: {
        sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6";
        libraryHaskellDepends = [ base containers ghc hlint stm ];
        description = "HLint as a GHC source plugin";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "split" = callPackage
@@ -239127,7 +240295,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "split-channel" = callPackage
@@ -239138,7 +240306,7 @@ self: {
        sha256 = "0w2sgj1f5ydfvhm80d3pbka9988jwl80n14bp5nisawpd2glxvak";
        libraryHaskellDepends = [ base ];
        description = "Control.Concurrent.Chan split into sending and receiving halves.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "split-morphism" = callPackage
@@ -239150,8 +240318,8 @@ self: {
        libraryHaskellDepends = [ base invariant lens ];
        testHaskellDepends = [ base invariant lens QuickCheck ];
        description = "Split Epimorphisms and Monomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239170,7 +240338,7 @@ self: {
          transformers utility-ht
        ];
        description = "Split a big audio file into pieces at positions of silence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "split-tchan" = callPackage
@@ -239181,7 +240349,7 @@ self: {
        sha256 = "0qwcbvnm2vlr4bmn8r1q3ycamvgs0nfap4dkyzgp54f9rrl73x2p";
        libraryHaskellDepends = [ base stm ];
        description = "STM's TChan split into sending and receiving halves";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "splitmix" = callPackage
@@ -239204,7 +240372,7 @@ self: {
          base clock containers criterion random tf-random
        ];
        description = "Fast Splittable PRNG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "splitter" = callPackage
@@ -239219,8 +240387,8 @@ self: {
          base directory filepath parsec range
        ];
        description = "Use numerical ranges to split out certain lines from a file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239240,7 +240408,7 @@ self: {
          strptime template-haskell time vcs-revision
        ];
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spool" = callPackage
@@ -239251,7 +240419,7 @@ self: {
        sha256 = "1svkz3cxkyi6f3akakjfk1cvij85xy69v52d88gh97xgiawp5346";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Convert between ByteString and Vector.Storable without copying";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spoon" = callPackage
@@ -239264,7 +240432,7 @@ self: {
        editedCabalFile = "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74";
        libraryHaskellDepends = [ base deepseq ];
        description = "Catch errors thrown from pure computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spoonutil" = callPackage
@@ -239281,8 +240449,8 @@ self: {
          base directory extensible-exceptions filepath parsec
        ];
        description = "Spoon's utilities. Simple testing and nice looking error reporting.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239294,7 +240462,7 @@ self: {
        sha256 = "1mkcb9qi9d3izf3nhn0bmiiwfhvak6ky71wq7qnrq3imsarrni6s";
        libraryHaskellDepends = [ base deepseq ];
        description = "Catch errors from pure computations in a Maybe/Either";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spoty" = callPackage
@@ -239310,8 +240478,8 @@ self: {
          unordered-containers wreq
        ];
        description = "Spotify web API wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239328,7 +240496,7 @@ self: {
          base explicit-exception transformers utility-ht
        ];
        description = "Read and write spreadsheets from and to CSV files in a lazy way";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sprinkles" = callPackage
@@ -239371,8 +240539,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck temporary wai-extra
        ];
        description = "JSON API to HTML website wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239384,8 +240552,8 @@ self: {
        sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
        libraryHaskellDepends = [ base lens mtl vector ];
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239410,8 +240578,8 @@ self: {
          SHA split text time tls unix utf8-string x509 yaml
        ];
        description = "HTTP proxy for authenticating users via OAuth2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239437,8 +240605,8 @@ self: {
          warp
        ];
        description = "Web interface to sproxy database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239464,8 +240632,8 @@ self: {
          wai wai-conduit warp warp-tls word8 yaml
        ];
        description = "Secure HTTP proxy for authenticating users via OAuth2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239485,8 +240653,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion hmatrix random ];
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239512,8 +240680,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time unix
        ];
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239530,8 +240698,8 @@ self: {
          transformers-base
        ];
        description = "common middle-level sql client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239547,8 +240715,8 @@ self: {
          base data-default-class mysql mysql-simple sql-simple text
        ];
        description = "mysql backend for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239565,8 +240733,8 @@ self: {
          time
        ];
        description = "conection pool for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239582,8 +240750,8 @@ self: {
          base data-default-class postgresql-simple sql-simple text
        ];
        description = "postgresql backend for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239595,8 +240763,8 @@ self: {
        sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1";
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        description = "sqlite backend for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239609,7 +240777,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "SQL keywords data constructors into OverloadedString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sqlcipher" = callPackage
@@ -239627,8 +240795,8 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base filepath hspec temporary ];
        description = "Haskell binding to sqlcipher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -239641,7 +240809,7 @@ self: {
        libraryHaskellDepends = [ base logging text transformers ];
        librarySystemDepends = [ unixODBC ];
        description = "Bindings for SQL/CLI (ODBC) C API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) unixODBC;};
 
   "sqlcli-odbc" = callPackage
@@ -239652,7 +240820,7 @@ self: {
        sha256 = "1rfhdaa0wmvc78nbjhi93p9sv66xa6rjr79yyhlkqi1d335b8vb5";
        libraryHaskellDepends = [ base logging sqlcli ];
        description = "ODBC specific definitions to be used by SQL CLI clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sqlite" = callPackage
@@ -239669,8 +240837,8 @@ self: {
        librarySystemDepends = [ sqlite ];
        testHaskellDepends = [ base ];
        description = "Haskell binding to sqlite3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -239692,7 +240860,7 @@ self: {
          base base16-bytestring bytestring direct-sqlite HUnit text time
        ];
        description = "Mid-Level SQLite client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -239704,7 +240872,9 @@ self: {
        libraryHaskellDepends = [ base parsec sqlite-simple text ];
        testHaskellDepends = [ base mtl sqlite-simple text ];
        description = "Wrapper around errors from sqlite-simple";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "sqlite-simple-typed" = callPackage
@@ -239720,8 +240890,8 @@ self: {
          typedquery utf8-string
        ];
        description = "Typed extension to sqlite simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239733,8 +240903,8 @@ self: {
        sha256 = "1r9y3p355rl57pnm84flx734zzjxnnc53fkcfdkykxi5wi5j05v0";
        libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239756,8 +240926,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239773,7 +240943,7 @@ self: {
          adjunctions base bifunctors comonad distributive profunctors
        ];
        description = "The double category of Hask functors and profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "squeal-postgresql" = callPackage
@@ -239813,8 +240983,8 @@ self: {
          with-utf8
        ];
        description = "Squeal PostgreSQL Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239832,7 +241002,7 @@ self: {
          text
        ];
        description = "Use databases with the version 3 series of the SQLite C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "squeeze" = callPackage
@@ -239856,7 +241026,7 @@ self: {
        ];
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239884,8 +241054,8 @@ self: {
          userid uuid uuid-orphans uuid-types zlib
        ];
        description = "Module limbo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239905,7 +241075,7 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239917,7 +241087,7 @@ self: {
        sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6";
        libraryHaskellDepends = [ base ];
        description = "Data types for managing source code locations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "srec" = callPackage
@@ -239928,7 +241098,7 @@ self: {
        sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k";
        libraryHaskellDepends = [ base bytestring ];
        description = "Parsing and processing s-records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sscan" = callPackage
@@ -239946,8 +241116,8 @@ self: {
          temporary text time vty
        ];
        description = "text UI for scanning with SANE";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239965,8 +241135,8 @@ self: {
          MonadCatchIO-mtl mtl transformers utf8-string
        ];
        description = "Simple SCGI Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239979,7 +241149,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Formats Strings with subscript or superscript characters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ssh" = callPackage
@@ -240010,8 +241180,8 @@ self: {
        ];
        doCheck = false;
        description = "A pure-Haskell SSH server library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240032,7 +241202,7 @@ self: {
          test-framework-quickcheck2 text unix
        ];
        description = "Read and interpret the SSH known-hosts file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ssh-tunnel" = callPackage
@@ -240049,8 +241219,8 @@ self: {
          base foldl http-client managed text transformers turtle uuid
        ];
        description = "Proxy http-client via ssh tunnel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240071,8 +241241,8 @@ self: {
          base containers hspec keyword-args nagios-check parsec
        ];
        description = "Check sshd configuration for adherence to best practices";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240092,7 +241262,7 @@ self: {
          regex-compat stm unix
        ];
        description = "Wrapper daemon to manage an ssh tunnel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sssp" = callPackage
@@ -240120,8 +241290,8 @@ self: {
          wai-extra warp
        ];
        description = "HTTP proxy for S3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240140,8 +241310,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240156,7 +241326,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        description = "Comma-separated-value (CSV) read, show and write routines";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "st2" = callPackage
@@ -240167,8 +241337,8 @@ self: {
        sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz";
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240185,8 +241355,8 @@ self: {
          base criterion fingertree heaps mwc-random pqueue vector
        ];
        description = "Purely functional stable heaps (fair priority queues)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240198,8 +241368,8 @@ self: {
        sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w";
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Heterogeneous maps keyed by StableNames";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240212,8 +241382,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240227,8 +241397,8 @@ self: {
        editedCabalFile = "1wlz6cpbvf8mi4c78dwwbdxsk2wax3y7q27hy78h83gl0cbnfiij";
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240253,8 +241423,8 @@ self: {
          QuickCheck tasty tasty-quickcheck text
        ];
        description = "Trees whose branches are resistant to change";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240269,8 +241439,8 @@ self: {
        pname = "stache";
        version = "2.2.0";
        sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g";
-       revision = "2";
-       editedCabalFile = "1p435wl5c50wjz5s07p102dlyg3pby7n918gp4za0crgb8fi99xh";
+       revision = "3";
+       editedCabalFile = "1wjdn7qsrfnz2cqwx2pggi8ak3pj01zsmax14gvb8xsq4w9crdvx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -240291,7 +241461,7 @@ self: {
          aeson base criterion deepseq megaparsec text
        ];
        description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack" = callPackage
@@ -240385,7 +241555,7 @@ self: {
          $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
        '';
        description = "The Haskell Tool Stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-all" = callPackage
@@ -240403,7 +241573,7 @@ self: {
          simple-cmd-args text
        ];
        description = "CLI tool for building across Stackage major versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-bump" = callPackage
@@ -240426,8 +241596,8 @@ self: {
          lens-aeson optparse-applicative process QuickCheck strict text yaml
        ];
        description = "Dead simple version bumping for hpack packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240437,15 +241607,15 @@ self: {
      }:
      mkDerivation {
        pname = "stack-clean-old";
-       version = "0.2.2";
-       sha256 = "0d755pndi990l1g0nkzhylz8ki4zz8vs40axnrl7wqcc430vwa24";
+       version = "0.3";
+       sha256 = "1nszwagwsc6n02smqg70c79a21q9bwamlk4nqqbgzp009jfv0b7c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base directory extra filemanip filepath simple-cmd simple-cmd-args
        ];
        description = "Clean away old stack build artefacts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-fix" = callPackage
@@ -240458,8 +241628,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base options text turtle ];
        description = "Console program used to fix Stack build errors automatically";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240486,8 +241656,8 @@ self: {
          time
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240503,8 +241673,8 @@ self: {
          base monad-logger path stack time transformers
        ];
        description = "Wrapper to use stack as a library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240546,8 +241716,8 @@ self: {
          transformers yaml
        ];
        description = "A program for extending Stack to add distributed capabilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240566,8 +241736,8 @@ self: {
        ];
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240587,8 +241757,8 @@ self: {
          directory filepath MissingH stm terminal-size time vty
        ];
        description = "An equivalent to cabal run for stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240616,8 +241786,8 @@ self: {
          lens lens-aeson MissingH process stm-containers text time wreq
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240639,7 +241809,7 @@ self: {
          process text
        ];
        description = "Create etags for Haskell projects based on Stack snapshots";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stack-templatizer" = callPackage
@@ -240652,7 +241822,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring directory filepath ];
        description = "Generate a stack template from a folder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-type" = callPackage
@@ -240663,8 +241833,8 @@ self: {
        sha256 = "13kc36p62kmni6lksr3j5mlndc1rmmgir9p0k7qcv5ph6rbrc47k";
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240681,8 +241851,8 @@ self: {
        libraryHaskellDepends = [ base filepath process ];
        executableHaskellDepends = [ base filepath process ];
        description = "Call ghc within stack by calling ghc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240699,7 +241869,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Parse a stack.yaml file";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stack2cabal" = callPackage
@@ -240725,7 +241895,9 @@ self: {
          http-client-tls optparse-applicative process safe temporary text
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack2nix" = callPackage
@@ -240751,8 +241923,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240771,8 +241943,8 @@ self: {
          stackage-upload
        ];
        description = "Dummy package forcing installation of other Stackage packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240797,8 +241969,8 @@ self: {
          aeson base optparse-applicative stackage-cli text
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240819,8 +241991,8 @@ self: {
          optparse-applicative parsec process stackage-cli system-fileio text
        ];
        description = "A CLI executable for cabal-based stackage commands";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240842,8 +242014,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240888,8 +242060,8 @@ self: {
          http-client http-client-tls QuickCheck text yaml
        ];
        description = "Tools for curating Stackage bundles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240911,7 +242083,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Secure download of packages for cabal-install";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stackage-metadata" = callPackage
@@ -240938,8 +242110,8 @@ self: {
          stackage-install stackage-update tar text transformers yaml
        ];
        description = "DEPRECATED Grab current metadata for all packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240963,8 +242135,8 @@ self: {
          unordered-containers vector yaml
        ];
        description = "Tool for querying Stackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240985,8 +242157,8 @@ self: {
          directory filepath optparse-applicative process stackage-cli text
        ];
        description = "Work with shared stackage sandboxes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241010,8 +242182,8 @@ self: {
          unordered-containers yaml
        ];
        description = "An executable for downloading a Haskell setup";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241037,8 +242209,8 @@ self: {
          optparse-applicative text
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241058,8 +242230,8 @@ self: {
          text time unordered-containers vector
        ];
        description = "Shared data types between various Stackage packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241074,7 +242246,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        executableHaskellDepends = [ base ];
        description = "Update your package index incrementally (requires git)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stackage-upload" = callPackage
@@ -241096,8 +242268,8 @@ self: {
          base optparse-applicative stackage-cli
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241128,8 +242300,8 @@ self: {
          yaml
        ];
        description = "Convert Stack files into Nix build instructions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241153,7 +242325,7 @@ self: {
          recursion-schemes rosezipper safe text transformers utf8-string
        ];
        description = "Program to fold GHC prof files into flamegraph input";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
      }) {};
 
   "stacked-dag" = callPackage
@@ -241172,7 +242344,7 @@ self: {
        ];
        testHaskellDepends = [ base containers doctest graphviz text ];
        description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "staf" = callPackage
@@ -241184,7 +242356,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Numerical statistics for Foldable containers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "stagen" = callPackage
@@ -241207,7 +242379,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Static site generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stan" = callPackage
@@ -241238,7 +242410,7 @@ self: {
        ];
        doHaddock = false;
        description = "Haskell STatic ANalyser";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "standalone-derive-topdown" = callPackage
@@ -241249,8 +242421,8 @@ self: {
        sha256 = "179pm3wixdqg7786l8ys2nwpx7anpnvsl63bj25cgs8082g587v0";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "This package will derive class instance along the data type declaration tree. (Deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241268,8 +242440,8 @@ self: {
          base Cabal containers directory filepath optparse-applicative
        ];
        description = "Generate standalone haddock documentation for a set of packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241281,7 +242453,7 @@ self: {
        sha256 = "03lk46s8v3pgxgk4ddyf382rspqvkf61v9bffhym0pd4didnz9d5";
        libraryHaskellDepends = [ base ];
        description = "*-semirings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "star-to-star" = callPackage
@@ -241293,7 +242465,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "the * -> * types, operators, and covariant instances";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "star-to-star-contra" = callPackage
@@ -241305,7 +242477,7 @@ self: {
        libraryHaskellDepends = [ base star-to-star ];
        description = "contravariant instances for * -> * types and operators";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "starling" = callPackage
@@ -241318,8 +242490,8 @@ self: {
          base binary bytestring failure transformers
        ];
        description = "A memcached client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241340,7 +242512,7 @@ self: {
        ];
        description = "Space simulation game";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "starter" = callPackage
@@ -241351,7 +242523,7 @@ self: {
        sha256 = "14rxrs1gjsm26m7rk4rj9b2389zca0j24kjl7sfznqpxgk99qmpx";
        libraryHaskellDepends = [ base fsnotify ];
        description = "Develop applications without restarts";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "stash" = callPackage
@@ -241366,8 +242538,8 @@ self: {
          aeson attoparsec base bytestring directory hashable text vector
        ];
        description = "To be written";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241380,7 +242552,7 @@ self: {
        libraryHaskellDepends = [ arrows base mtl ];
        description = "Data.State";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241397,8 +242569,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec transformers ];
        description = "Monad transformers for holding bags of state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241412,7 +242584,7 @@ self: {
        libraryHaskellDepends = [ aeson base shakespeare text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
        description = "ISO 3166-2:US state codes and i18n names";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "state-plus" = callPackage
@@ -241424,8 +242596,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241438,7 +242610,7 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Better records for State monad states";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241457,7 +242629,7 @@ self: {
          vector
        ];
        description = "A faster variant of the RWS monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "statechart" = callPackage
@@ -241470,7 +242642,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base polyparse ];
        description = "Compiles Rhapsody statecharts to C";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stateful-mtl" = callPackage
@@ -241481,8 +242653,8 @@ self: {
        sha256 = "19645rqfqbcvngq8hj7bryl35lgx7p5k55vgsxa1a2hm2kq8vm5h";
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241494,7 +242666,7 @@ self: {
        sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Abstraction for things that work like IORef";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "statestack" = callPackage
@@ -241507,8 +242679,8 @@ self: {
          base mtl transformers transformers-compat
        ];
        description = "Simple State-like monad transformer with saveable and restorable state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241520,8 +242692,8 @@ self: {
        sha256 = "05clniwqk4i3zz22jzbjj2x9cgkxb2ks7mccjyp3gyy4zbm2xlmz";
        libraryHaskellDepends = [ applicative base transformers ];
        description = "The ST monad and STRefs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {applicative = null;};
 
@@ -241539,7 +242711,7 @@ self: {
        librarySystemDepends = [ libstatgrab ];
        description = "Collect system level metrics and statistics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libstatgrab;};
 
   "static" = callPackage
@@ -241559,7 +242731,7 @@ self: {
          base doctest mtl tasty tasty-hunit transformers
        ];
        description = "Type-safe and interoperable static values and closures";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "static-canvas" = callPackage
@@ -241572,8 +242744,8 @@ self: {
        editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7";
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241590,8 +242762,8 @@ self: {
          template-haskell
        ];
        description = "Serialisable static pointers to functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241603,7 +242775,7 @@ self: {
        sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l";
        libraryHaskellDepends = [ array base containers hashable primes ];
        description = "Immutable hash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "static-resources" = callPackage
@@ -241624,7 +242796,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
        ];
        description = "JavaScript and Css files concat for http optimization. Now with LESS support.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "static-tensor" = callPackage
@@ -241647,8 +242819,8 @@ self: {
          base criterion deepseq linear mwc-random vector
        ];
        description = "Tensors of statically known size";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241670,8 +242842,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241683,7 +242855,7 @@ self: {
        sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf";
        libraryHaskellDepends = [ base MissingH ];
        description = "Reusable static analysis interfaces and modules";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "statistics" = callPackage
@@ -241709,7 +242881,7 @@ self: {
          tasty-hunit tasty-quickcheck vector vector-algorithms
        ];
        description = "A library of statistical types, data, and functions";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "statistics-dirichlet" = callPackage
@@ -241724,8 +242896,8 @@ self: {
          base deepseq hmatrix-special nonlinear-optimization vector
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241737,8 +242909,8 @@ self: {
        sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf";
        libraryHaskellDepends = [ base vector ];
        description = "An implementation of high performance, minimal statistics functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241754,8 +242926,8 @@ self: {
          base math-functions mwc-random primitive statistics
        ];
        description = "Random variate generation from hypergeometric distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241771,7 +242943,32 @@ self: {
          base MonadRandom random random-shuffle safe statistics vector
        ];
        description = "Linear regression between two samples, based on the 'statistics' package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+     }) {};
+
+  "statistics-skinny" = callPackage
+    ({ mkDerivation, async, base, base-orphans, data-default-class
+     , deepseq, dense-linear-algebra, erf, ieee754, math-functions
+     , monad-par, mwc-random, primitive, QuickCheck, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector
+     , vector-algorithms, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "statistics-skinny";
+       version = "0.15.2.0";
+       sha256 = "1rx65xyi7xlf5a0p1xvyi7rmba4x4xrb462lhybwr4c0xv1c2mbl";
+       libraryHaskellDepends = [
+         async base base-orphans data-default-class deepseq
+         dense-linear-algebra math-functions monad-par mwc-random primitive
+         vector vector-algorithms vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base dense-linear-algebra erf ieee754 math-functions mwc-random
+         primitive QuickCheck tasty tasty-expected-failure tasty-hunit
+         tasty-quickcheck vector vector-algorithms
+       ];
+       description = "A library of statistical types, data, and functions";
+       license = lib.licenses.bsd2;
      }) {};
 
   "stats" = callPackage
@@ -241784,8 +242981,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base statistics text vector ];
        description = "command line statistics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241801,8 +242998,8 @@ self: {
          base bytestring monad-control mtl network random
        ];
        description = "StatsD API";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241820,8 +243017,8 @@ self: {
          network network-uri old-time random time-units
        ];
        description = "Statsd UDP client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241837,7 +243034,7 @@ self: {
          base bytestring monad-control network text transformers-base
        ];
        description = "DataDog-flavored StatsD client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "statsdi" = callPackage
@@ -241860,8 +243057,8 @@ self: {
          base bytestring hspec network stm tasty tasty-hspec time
        ];
        description = "A lovely [Dog]StatsD implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241885,7 +243082,7 @@ self: {
          base dbus dbus-hslogger hslogger optparse-applicative
        ];
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "statvfs" = callPackage
@@ -241896,8 +243093,8 @@ self: {
        sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
        libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241927,7 +243124,7 @@ self: {
          text unordered-containers
        ];
        description = "What version is the package X in stackage lts-Y.ZZ?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stb-image" = callPackage
@@ -241938,7 +243135,7 @@ self: {
        sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
        libraryHaskellDepends = [ base bitmap bytestring ];
        description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "stb-image-redux_0_2_1_2" = callPackage
@@ -241950,8 +243147,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241964,8 +243161,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241977,7 +243174,7 @@ self: {
        sha256 = "1fk9qkra5f18wql76vakdq9796z0dbg1d4apv2zjj47rla43ii38";
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "stc-lang" = callPackage
@@ -242010,8 +243207,8 @@ self: {
          test-framework-hunit time transformers
        ];
        description = "A library for implicit, monadic dataflow parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242023,7 +243220,7 @@ self: {
        sha256 = "0ldn5yxpj99yhhp5x7zlxjmd9qgqyjg68avr19k7argwcf3nr9y9";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stdata" = callPackage
@@ -242034,8 +243231,8 @@ self: {
        sha256 = "0ijir2knl4vc1cpzzmf32wcjfdc958li1wd7w5vdmgk4bx45kybf";
        libraryHaskellDepends = [ base parsec syb template-haskell ];
        description = "Structure Data Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242058,8 +243255,8 @@ self: {
          aeson base base64-bytestring binary bytestring split text
        ];
        description = "Parse Structured Test Data Format (STDF)";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242085,8 +243282,8 @@ self: {
          quickcheck-instances scientific word8
        ];
        description = "A simple and high performance IO toolkit for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libuv;};
 
@@ -242100,8 +243297,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory parsec transformers ];
        description = "List and launch steam games from the cli";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242132,7 +243329,7 @@ self: {
          regex-tdfa semigroups stm streaming text yaml
        ];
        description = "A file watcher and development tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stego-uuid" = callPackage
@@ -242145,8 +243342,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cryptonite memory uuid ];
        testHaskellDepends = [ base random uuid ];
        description = "Generator and verifier for steganographic numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242158,8 +243355,8 @@ self: {
        sha256 = "1pg6bk9p1agip8nqzvdpw1hjjf0nwq9fmr58750wda6il7nljx3m";
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to the Snowball stemming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242173,8 +243370,8 @@ self: {
        editedCabalFile = "0pvghdxgd56yjm33lrzk6343lklnfdw77g30vhbfddwwdx1ifx2v";
        libraryHaskellDepends = [ base text ];
        description = "Extract the stem of a German inflected word form";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242193,7 +243390,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Staircase functions or piecewise constant functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stepwise" = callPackage
@@ -242204,7 +243401,7 @@ self: {
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
        libraryHaskellDepends = [ base containers mtl ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242222,8 +243419,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Positive rational numbers represented as paths in the Stern-Brocot tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242252,8 +243449,8 @@ self: {
          tasty-rerun tasty-smallcheck template-haskell text
        ];
        description = "Educational implementation of the STG (Spineless Tagless G-machine)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242265,7 +243462,7 @@ self: {
        sha256 = "0iw1ia3sf4rwzbkcckbxzr288i6lbgv7vaaynyrkg2c17gjs492a";
        libraryHaskellDepends = [ base ];
        description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stitch" = callPackage
@@ -242282,7 +243479,7 @@ self: {
        testHaskellDepends = [ base Cabal hspec text ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "lightweight CSS DSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm_2_5_0_0" = callPackage
@@ -242295,8 +243492,8 @@ self: {
        editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "stm-actor" = callPackage
@@ -242312,7 +243509,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl stm stm-queue ];
        description = "A simplistic actor model based on STM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stm-channelize" = callPackage
@@ -242323,7 +243520,7 @@ self: {
        sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm";
        libraryHaskellDepends = [ base stm ];
        description = "Transactional I/O for duplex streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-chans" = callPackage
@@ -242337,7 +243534,7 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base stm ];
        description = "Additional types of channels for STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-chunked-queues" = callPackage
@@ -242349,8 +243546,8 @@ self: {
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        description = "Chunked Communication Queues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242376,7 +243573,7 @@ self: {
          test-framework-quickcheck2 transformers unliftio
        ];
        description = "Introduces conduits to channels, and promotes using conduits concurrently";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-containers" = callPackage
@@ -242396,8 +243593,8 @@ self: {
          quickcheck-text rerebase
        ];
        description = "Containers for STM";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242410,7 +243607,7 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base stm ];
        description = "Updatable one-shot timer polled with STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-extras" = callPackage
@@ -242421,7 +243618,7 @@ self: {
        sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8";
        libraryHaskellDepends = [ base stm ];
        description = "Extra STM functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-firehose" = callPackage
@@ -242439,8 +243636,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit stm ];
        description = "Conduits and STM operations for fire hoses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242467,8 +243664,8 @@ self: {
          rebase
        ];
        description = "STM-specialised Hash Array Mapped Trie";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242481,7 +243678,7 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec stm ];
        description = "A library for constructing incremental computations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stm-io-hooks" = callPackage
@@ -242492,7 +243689,7 @@ self: {
        sha256 = "021s1ck8b09z6khaky2g8ymxf37hznqrl9n4sakb8j57mhliayvc";
        libraryHaskellDepends = [ array base mtl stm ];
        description = "Launch your IO-actions from within the STM monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-lifted" = callPackage
@@ -242503,7 +243700,7 @@ self: {
        sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658";
        libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-linkedlist" = callPackage
@@ -242514,7 +243711,7 @@ self: {
        sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr";
        libraryHaskellDepends = [ base stm ];
        description = "Mutable, doubly linked lists for STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-orelse-io" = callPackage
@@ -242525,7 +243722,7 @@ self: {
        sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4";
        libraryHaskellDepends = [ base stm ];
        description = "Choose between the return value of an STM operation and an IO action";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-promise" = callPackage
@@ -242537,8 +243734,8 @@ self: {
        libraryHaskellDepends = [ base mtl process stm unix ];
        testHaskellDepends = [ base QuickCheck stm ];
        description = "Simple STM Promises for IO computations and external processes";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242555,7 +243752,7 @@ self: {
          async base criterion deepseq hspec stm time
        ];
        description = "An implementation of a real-time concurrent queue";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stm-queue-extras" = callPackage
@@ -242566,7 +243763,7 @@ self: {
        sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100";
        libraryHaskellDepends = [ base stm stm-chans ];
        description = "Extra queue utilities for STM";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "stm-sbchan" = callPackage
@@ -242577,7 +243774,7 @@ self: {
        sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s";
        libraryHaskellDepends = [ base stm stm-tlist ];
        description = "Bounded channel for STM where item sizes can vary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-split" = callPackage
@@ -242588,7 +243785,7 @@ self: {
        sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8";
        libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-stats" = callPackage
@@ -242601,8 +243798,8 @@ self: {
          base containers stm template-haskell time
        ];
        description = "retry statistics for STM transactions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242617,7 +243814,7 @@ self: {
        libraryHaskellDepends = [ base concurrent-supply ];
        testHaskellDepends = [ async base QuickCheck random Unique ];
        description = "STM wrapper around Control.Concurrent.Supply.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-tlist" = callPackage
@@ -242628,7 +243825,7 @@ self: {
        sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6";
        libraryHaskellDepends = [ base stm ];
        description = "Mutable, singly-linked list in STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stmcontrol" = callPackage
@@ -242640,8 +243837,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        description = "Control communication among retrying transactions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242657,8 +243854,8 @@ self: {
          base Chart Chart-cairo containers mtl random
        ];
        description = "Monadic composition of probabilistic functions and sampling";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242676,8 +243873,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Library for the IEX Trading API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242752,7 +243949,7 @@ self: {
        libraryHaskellDepends = [ base clock transformers ];
        testHaskellDepends = [ base clock hspec ];
        description = "A simple stopwatch utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable" = callPackage
@@ -242763,8 +243960,8 @@ self: {
        sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg";
        libraryHaskellDepends = [ base mtl ];
        description = "Storable type class for variable-sized data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242776,7 +243973,7 @@ self: {
        sha256 = "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s";
        libraryHaskellDepends = [ base base-orphans ];
        description = "Storable instance for Complex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-endian" = callPackage
@@ -242789,7 +243986,7 @@ self: {
        editedCabalFile = "12f8sscsvsarlwz3p6kk9vbvqsbyhs8lhafgn9h7c0z6pz1amrya";
        libraryHaskellDepends = [ base byteorder ];
        description = "Storable instances with endianness";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-enum" = callPackage
@@ -242800,7 +243997,7 @@ self: {
        sha256 = "01nllxm3fx9f1cxay80bwvmpawrwipk7d2c6xb1q5fr3iwnqqaa2";
        libraryHaskellDepends = [ base prelude-compat ];
        description = "Wrapper that makes any Enum type Storable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-record" = callPackage
@@ -242815,7 +244012,7 @@ self: {
          base semigroups transformers utility-ht
        ];
        description = "Elegant definition of Storable instances for records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-static-array" = callPackage
@@ -242826,8 +244023,8 @@ self: {
        sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm";
        libraryHaskellDepends = [ array base tagged vector ];
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242841,7 +244038,7 @@ self: {
          base base-orphans storable-record utility-ht
        ];
        description = "Storable instance for pairs and triples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storablevector" = callPackage
@@ -242864,7 +244061,7 @@ self: {
          base deepseq sample-frame unsafe utility-ht
        ];
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storablevector-carray" = callPackage
@@ -242875,7 +244072,7 @@ self: {
        sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i";
        libraryHaskellDepends = [ base carray storablevector utility-ht ];
        description = "Conversion between storablevector and carray";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storablevector-streamfusion" = callPackage
@@ -242890,8 +244087,8 @@ self: {
          base storablevector stream-fusion utility-ht
        ];
        description = "Conversion between storablevector and stream-fusion lists with fusion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242940,7 +244137,7 @@ self: {
          unordered-containers vector vector-binary-instances void weigh
        ];
        description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "store-core" = callPackage
@@ -242955,7 +244152,7 @@ self: {
          base bytestring ghc-prim primitive text transformers
        ];
        description = "Fast and lightweight binary serialization";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "store-streaming" = callPackage
@@ -242977,7 +244174,7 @@ self: {
          transformers void
        ];
        description = "Streaming interfaces for `store`";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stp" = callPackage
@@ -242991,8 +244188,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base regex-compat ];
        description = "Simple Theorem Prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243009,8 +244206,8 @@ self: {
          utf8-string
        ];
        description = "A type class to abstract between many different string types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243035,7 +244232,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stratum-tool" = callPackage
@@ -243055,8 +244252,8 @@ self: {
          unordered-containers vector
        ];
        description = "Client for Stratum protocol";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243072,8 +244269,8 @@ self: {
          base stratux-http stratux-types stratux-websockets
        ];
        description = "A library for stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243096,8 +244293,8 @@ self: {
          transformers
        ];
        description = "A demonstration of the stratux library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243113,8 +244310,8 @@ self: {
          aeson base HTTP network-uri stratux-types transformers utf8-string
        ];
        description = "A library for using HTTP with stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243130,8 +244327,8 @@ self: {
          aeson base bytestring lens scientific text time
        ];
        description = "A library for reading JSON output from stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243148,8 +244345,8 @@ self: {
          websockets
        ];
        description = "A library for using websockets with stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243169,8 +244366,8 @@ self: {
          base bytestring criterion ghc-prim temporary vector
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243184,8 +244381,8 @@ self: {
        editedCabalFile = "1jyb8mc99ag72y4bqxw997klrikhnxqrbacmx2ag5kmwsd1v1p12";
        libraryHaskellDepends = [ base ];
        description = "Faster Haskell lists using stream fusion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243199,8 +244396,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base logict ];
        description = "Simple, Fair and Terminating Backtracking Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243212,8 +244409,8 @@ self: {
        sha256 = "0dg5hmv61jnpqby4v5g4wpsb7ynsm56fmb3xj2pixswnzqz31ian";
        libraryHaskellDepends = [ base bytestring hidapi mtl split ];
        description = "Control library for the Elgato Stream Deck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243232,8 +244429,8 @@ self: {
          random transformers utility-ht
        ];
        description = "Programmatically edit MIDI event streams via ALSA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243249,7 +244446,7 @@ self: {
          base containers ghc-prim mmorph mtl transformers transformers-base
        ];
        description = "an elementary streaming prelude and general stream type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-attoparsec" = callPackage
@@ -243268,7 +244465,7 @@ self: {
          tasty-hunit
        ];
        description = "Attoparsec integration for the streaming ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-base64" = callPackage
@@ -243289,8 +244486,8 @@ self: {
          streaming-with tasty tasty-golden
        ];
        description = "Streaming conversion from/to base64";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243316,8 +244513,8 @@ self: {
          streaming streamly template-haskell transformers vector
        ];
        description = "Benchmarks to compare streaming packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243336,7 +244533,7 @@ self: {
          base binary bytestring hspec streaming streaming-bytestring
        ];
        description = "Streaming interface to binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-bracketed" = callPackage
@@ -243353,7 +244550,7 @@ self: {
          streaming-commons tasty tasty-hunit
        ];
        description = "A resource management decorator for \"streaming\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "streaming-brotli" = callPackage
@@ -243373,8 +244570,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Streaming interface for Brotli (RFC7932) compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243396,7 +244593,7 @@ self: {
          tasty-smallcheck transformers
        ];
        description = "Fast, effectful byte streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-cassava" = callPackage
@@ -243417,8 +244614,8 @@ self: {
          vector
        ];
        description = "Cassava support for the streaming ecosystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243441,7 +244638,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
        description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "streaming-concurrency" = callPackage
@@ -243465,8 +244662,8 @@ self: {
          testbench
        ];
        description = "Concurrency support for the streaming ecosystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243483,8 +244680,8 @@ self: {
        ];
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243501,8 +244698,8 @@ self: {
          streaming-attoparsec streaming-bytestring wai-extra
        ];
        description = "Client-side consumption of a ServerEvent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243523,7 +244720,7 @@ self: {
          streaming tasty tasty-hunit tasty-quickcheck
        ];
        description = "Translate pull-based stream folds into push-based iteratees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-fft" = callPackage
@@ -243538,8 +244735,8 @@ self: {
          base contiguous-fft ghc-prim prim-instances primitive streaming
        ];
        description = "online streaming fft";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243556,7 +244753,7 @@ self: {
          base containers tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "streaming-lzma" = callPackage
@@ -243576,8 +244773,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Streaming interface for LZMA/XZ compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243600,8 +244797,8 @@ self: {
          vector zlib
        ];
        description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243623,8 +244820,8 @@ self: {
          streaming-attoparsec streaming-bytestring tasty tasty-hunit
        ];
        description = "Stream packets via libpcap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243645,8 +244842,8 @@ self: {
          vector
        ];
        description = "Perfectly streaming PNG image decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243664,7 +244861,7 @@ self: {
          resourcet safe-exceptions streaming transformers
        ];
        description = "Stream postgresql-query results using the streaming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-process" = callPackage
@@ -243688,8 +244885,8 @@ self: {
          streaming-bytestring
        ];
        description = "Streaming support for running system process";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243711,8 +244908,8 @@ self: {
          streaming-with transformers
        ];
        description = "Sorting streams";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243734,8 +244931,8 @@ self: {
          streaming-bytestring streaming-commons transformers
        ];
        description = "http, attoparsec, pipes and other utilities for the streaming libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243751,8 +244948,8 @@ self: {
          base bytestring bytestring-builder http-types streaming wai
        ];
        description = "Streaming Wai utilities";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ jb55 ];
      }) {};
 
   "streaming-with" = callPackage
@@ -243769,8 +244966,8 @@ self: {
          base exceptions managed streaming-bytestring temporary transformers
        ];
        description = "with/bracket-style idioms for use with streaming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243798,7 +244995,7 @@ self: {
          transformers
        ];
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-archive" = callPackage
@@ -243819,8 +245016,8 @@ self: {
        ];
        testSystemDepends = [ archive ];
        description = "Stream data from archives using the streamly library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {archive = null;};
 
@@ -243837,7 +245034,7 @@ self: {
          base binary bytestring hspec QuickCheck streamly
        ];
        description = "Integration of streamly and binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-bytestring" = callPackage
@@ -243859,7 +245056,7 @@ self: {
          base bytestring deepseq gauge random streamly
        ];
        description = "Library for streamly and bytestring interoperation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-cassava" = callPackage
@@ -243885,7 +245082,7 @@ self: {
          vector weigh
        ];
        description = "CSV streaming support via cassava for the streamly ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-fsnotify" = callPackage
@@ -243900,7 +245097,7 @@ self: {
          base filepath fsnotify semirings streamly text time
        ];
        description = "Folder watching as a Streamly stream";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-lmdb" = callPackage
@@ -243919,7 +245116,9 @@ self: {
        ];
        testSystemDepends = [ lmdb ];
        description = "Stream data to or from LMDB databases using the streamly library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) lmdb;};
 
   "streamly-posix" = callPackage
@@ -243940,7 +245139,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Posix related streaming APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamproc" = callPackage
@@ -243953,8 +245152,8 @@ self: {
        editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs";
        libraryHaskellDepends = [ base ];
        description = "Stream Processer Arrow";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243970,7 +245169,7 @@ self: {
          adjunctions base comonad distributive semigroupoids semigroups
        ];
        description = "Various Haskell 2010 stream comonads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strelka" = callPackage
@@ -243991,8 +245190,8 @@ self: {
          transformers unordered-containers url-decoders uuid
        ];
        description = "A simple, flexible and composable web-router";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244009,7 +245208,7 @@ self: {
          unordered-containers
        ];
        description = "Core components of \"strelka\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strelka-wai" = callPackage
@@ -244025,7 +245224,7 @@ self: {
          strelka-core text unordered-containers wai warp
        ];
        description = "WAI compatibility layer for \"strelka\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strict" = callPackage
@@ -244041,7 +245240,7 @@ self: {
          transformers
        ];
        description = "Strict data types and String IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-base" = callPackage
@@ -244054,7 +245253,7 @@ self: {
        editedCabalFile = "17zgiwiahgjvdamfcffx2dj88qlks4sgrmsqancz5vayp4yf9x1g";
        libraryHaskellDepends = [ base ];
        description = "Strict versions of base data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-base-types" = callPackage
@@ -244069,8 +245268,8 @@ self: {
          aeson base quickcheck-instances strict strict-lens
        ];
        description = "Strict variants of the types provided in base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244082,7 +245281,7 @@ self: {
        sha256 = "1h2nk5fn6gclzkwn5mbkb7gcqisms8y5m3kr64hd9lska3n39n82";
        libraryHaskellDepends = [ base deepseq ];
        description = "Strict concurrency abstractions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-data" = callPackage
@@ -244106,8 +245305,8 @@ self: {
          base containers deepseq doctest hashable HTF vector
        ];
        description = "A collection of commonly used strict data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244119,8 +245318,8 @@ self: {
        sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb";
        libraryHaskellDepends = [ base ghc syb ];
        description = "Compiler plugin for making Haskell strict";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244134,7 +245333,7 @@ self: {
        editedCabalFile = "0lvazdvzfaawrbj3pklc9p3q1ajfclzirpsiw84hhgn16pqy7fnz";
        libraryHaskellDepends = [ base ];
        description = "Strict Identity Monad, handy for writing fast code!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-io" = callPackage
@@ -244145,7 +245344,7 @@ self: {
        sha256 = "1jcm1p1slbdxmbnmvqihvgf2czfaj4yks4hyqiv9ng95w9cfpagr";
        libraryHaskellDepends = [ base deepseq extensible-exceptions ];
        description = "A library wrapping standard IO modules to provide strict IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-lens" = callPackage
@@ -244156,7 +245355,7 @@ self: {
        sha256 = "0hwrbrjhgkh83474mci3ipg8nqims7b18w7i6xajz3xxq3cik5vn";
        libraryHaskellDepends = [ base lens strict ];
        description = "Lenses for types in strict package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-list" = callPackage
@@ -244173,7 +245372,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Strict linked list";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strict-optics" = callPackage
@@ -244184,7 +245383,7 @@ self: {
        sha256 = "1x4p2fksljd9xfy4mxdz5pxcskxz2qg2ma28d6y4j2v4728r0x8a";
        libraryHaskellDepends = [ base optics-core strict ];
        description = "Optics for types in strict package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-tuple" = callPackage
@@ -244196,7 +245395,7 @@ self: {
        libraryHaskellDepends = [ base bifunctors deepseq hashable ];
        testHaskellDepends = [ base ];
        description = "Strict tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-tuple-lens" = callPackage
@@ -244209,8 +245408,8 @@ self: {
        editedCabalFile = "0875r7kva6ym17fdklh18vm4s04sd9pj0w55km8jv2kmbkmfja8k";
        libraryHaskellDepends = [ base lens strict-tuple ];
        description = "Optics for the `strict-tuple` library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244227,7 +245426,7 @@ self: {
          unordered-containers vector
        ];
        description = "A type level predicate ranging over strict types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-writer" = callPackage
@@ -244239,7 +245438,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
        description = "A stricter writer, which uses StateT in order to avoid space leaks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strictify" = callPackage
@@ -244254,7 +245453,7 @@ self: {
          base directory filepath process unix
        ];
        description = "Find a local optimum of strictness annotations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strictly" = callPackage
@@ -244265,8 +245464,8 @@ self: {
        sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c";
        libraryHaskellDepends = [ base deepseq ];
        description = "Combinators for strictifying functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244278,7 +245477,7 @@ self: {
        sha256 = "1l94p8c9j8a2dbpwj5q7d1m61gdhmi6vllz34g8d9qjfwpnx7z6z";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-class" = callPackage
@@ -244289,7 +245488,7 @@ self: {
        sha256 = "1s0bj0wvwriw4516za6ar7w7zsz5mmnf1dba0ch239n27rb00nwf";
        libraryHaskellDepends = [ base bytestring tagged text ];
        description = "String class library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-combinators" = callPackage
@@ -244300,7 +245499,7 @@ self: {
        sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
        libraryHaskellDepends = [ base ];
        description = "Polymorphic functions to build and combine stringlike values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-conv" = callPackage
@@ -244311,7 +245510,7 @@ self: {
        sha256 = "0fb04bm384rpiq7kd7v783z1sriqialvjyn0f6dg2si9dwza0ngj";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Standardized conversion between string types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-conversions" = callPackage
@@ -244328,7 +245527,7 @@ self: {
          utf8-string
        ];
        description = "Simplifies dealing with different types for strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-convert" = callPackage
@@ -244344,7 +245543,7 @@ self: {
          base bytestring tasty tasty-hunit text utf8-string
        ];
        description = "Universal string conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-fromto" = callPackage
@@ -244355,7 +245554,7 @@ self: {
        sha256 = "0vnf500vahgccbbg7zvxqjxllvyq3jxzf2difqwh46fp62jfqwmx";
        libraryHaskellDepends = [ base bytestring memory text ];
        description = "Conversions between common string types, as well as Base16/Base32/Base64";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-interpolate" = callPackage
@@ -244385,7 +245584,7 @@ self: {
          neat-interpolation QuickCheck text
        ];
        description = "Haskell string/text/bytestring interpolation that just works";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-isos" = callPackage
@@ -244400,8 +245599,8 @@ self: {
          base bytestring mono-traversable safe text type-iso
        ];
        description = "Tools for working with isomorphisms of strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244413,7 +245612,7 @@ self: {
        sha256 = "1b87532fhv2wn6pnzsaw20lzj5j399smlfn7lai0h0ph2axb2dbi";
        libraryHaskellDepends = [ base bytestring text ];
        description = "A package that aims to provide a uniform interface to string-like types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-qq" = callPackage
@@ -244425,7 +245624,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base HUnit text ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "string-quote" = callPackage
@@ -244437,8 +245636,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244449,8 +245648,8 @@ self: {
      }:
      mkDerivation {
        pname = "string-random";
-       version = "0.1.3.0";
-       sha256 = "18yni8zm51x65i5h1c4sr9msd5fqa3fnh3zm0dck2wk364xz7dsy";
+       version = "0.1.4.0";
+       sha256 = "09xv1jbhsz8hfxc6y54fj4pkhyxfbfh53i6kxy408zm3raa2nmii";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -244462,7 +245661,9 @@ self: {
          tasty-quickcheck text
        ];
        description = "A library for generating random string from a regular experession";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "string-similarity" = callPackage
@@ -244477,7 +245678,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "longest common substring";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-transform" = callPackage
@@ -244493,7 +245694,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
        ];
        description = "simple and easy haskell string transform wrapper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "string-typelits" = callPackage
@@ -244508,8 +245709,8 @@ self: {
          base template-haskell type-combinators type-combinators-quote
        ];
        description = "Type-level Chars and Strings, with decidable equality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244521,7 +245722,7 @@ self: {
        sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
        libraryHaskellDepends = [ base bytestring system-filepath text ];
        description = "A Stringable type class, in the spirit of Foldable and Traversable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stringbuilder" = callPackage
@@ -244533,7 +245734,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A writer monad for multi-line string literals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stringlike" = callPackage
@@ -244550,8 +245751,8 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Transformations to several string-like types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244569,7 +245770,7 @@ self: {
          text-icu
        ];
        description = "Implements the \"StringPrep\" algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strings" = callPackage
@@ -244580,7 +245781,7 @@ self: {
        sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Functions for working with strings, including Text, ByteString, etc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stringsearch" = callPackage
@@ -244593,7 +245794,7 @@ self: {
        editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378";
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Fast searching, splitting and replacing of ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stringtable-atom" = callPackage
@@ -244604,8 +245805,8 @@ self: {
        sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs";
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244621,7 +245822,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strip-ansi-escape" = callPackage
@@ -244635,7 +245836,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Strip ANSI escape code from string";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "stripe" = callPackage
@@ -244651,8 +245852,8 @@ self: {
          unordered-containers utf8-string
        ];
        description = "A Haskell implementation of the Stripe API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244664,7 +245865,7 @@ self: {
        sha256 = "0n4q3hsgqrqypmkkim8mcksdlljgldr908wqxlcz6k1wsv9klyc6";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Types for the Stripe API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-core" = callPackage
@@ -244680,7 +245881,7 @@ self: {
          unordered-containers
        ];
        description = "Stripe API for Haskell - Pure Core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-haskell" = callPackage
@@ -244691,7 +245892,7 @@ self: {
        sha256 = "02ydf9i632r2clhvf1f9v0yx7vmpmh37mch1jshazrw3my6sq1vl";
        libraryHaskellDepends = [ base stripe-core stripe-http-client ];
        description = "Stripe API for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-hs" = callPackage
@@ -244716,7 +245917,9 @@ self: {
          timespan vector
        ];
        description = "Unofficial Stripe client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-http-client" = callPackage
@@ -244735,7 +245938,7 @@ self: {
          base free hspec http-client stripe-core stripe-tests
        ];
        description = "Stripe API for Haskell - http-client backend";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-http-streams" = callPackage
@@ -244755,8 +245958,8 @@ self: {
        ];
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244773,8 +245976,8 @@ self: {
          stripe-signature text unordered-containers
        ];
        description = "Listen for Stripe webhook events with Scotty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244791,7 +245994,7 @@ self: {
          unordered-containers vector
        ];
        description = "Unofficial Stripe servant types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stripe-signature" = callPackage
@@ -244808,7 +246011,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring text ];
        description = "Verification of Stripe webhook signatures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-tests" = callPackage
@@ -244825,7 +246028,7 @@ self: {
          text time transformers unordered-containers
        ];
        description = "Tests for Stripe API bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-wreq" = callPackage
@@ -244841,8 +246044,8 @@ self: {
          unordered-containers wreq
        ];
        description = "Use the Stripe API via Wreq";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244860,7 +246063,7 @@ self: {
          mtl scientific text time transformers unordered-containers vector
        ];
        description = "Stripe-Library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strips" = callPackage
@@ -244874,7 +246077,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec mtl ];
        description = "resolver using strips algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strive" = callPackage
@@ -244893,7 +246096,7 @@ self: {
        testHaskellDepends = [ base bytestring markdown-unlit time ];
        testToolDepends = [ markdown-unlit ];
        description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strongswan-sql" = callPackage
@@ -244924,8 +246127,8 @@ self: {
          network structured-cli text transformers
        ];
        description = "Interface library for strongSwan SQL backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244937,7 +246140,7 @@ self: {
        sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
        libraryHaskellDepends = [ base bytestring text time ];
        description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structs" = callPackage
@@ -244959,7 +246162,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Strict GC'd imperative object-oriented programming with cheap pointers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structural-induction" = callPackage
@@ -244979,8 +246182,8 @@ self: {
          testing-feat
        ];
        description = "Instantiate structural induction schemas for algebraic data types";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244993,8 +246196,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        testHaskellDepends = [ base HUnit mtl ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245016,7 +246219,7 @@ self: {
          unordered-containers uuid-types vector
        ];
        description = "Structure (hash) of your data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structured-cli" = callPackage
@@ -245036,7 +246239,7 @@ self: {
        ];
        executableHaskellDepends = [ base data-default mtl split ];
        description = "Application library for building interactive console CLIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structured-cli_2_7_0_1" = callPackage
@@ -245054,8 +246257,8 @@ self: {
        ];
        executableHaskellDepends = [ base data-default mtl split ];
        description = "Application library for building interactive console CLIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "structured-haskell-mode" = callPackage
@@ -245075,8 +246278,8 @@ self: {
          base descriptive ghc-prim haskell-src-exts text
        ];
        description = "Structured editing Emacs mode for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "structured-mongoDB" = callPackage
@@ -245095,7 +246298,7 @@ self: {
        ];
        description = "Structured MongoDB interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245126,8 +246329,8 @@ self: {
          unordered-containers vector
        ];
        description = "\"Advanced\" Data Structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245144,8 +246347,8 @@ self: {
          base tasty tasty-hunit tasty-quickcheck transformers
        ];
        description = "A monad transformer version of the ST monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245169,8 +246372,8 @@ self: {
          unbounded-delays
        ];
        description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245191,8 +246394,8 @@ self: {
          lambdacube-bullet lambdacube-engine mtl random vector
        ];
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245220,8 +246423,8 @@ self: {
          attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit
        ];
        description = "(Stutter Text|String)-Utterer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245248,8 +246451,8 @@ self: {
        testHaskellDepends = [ base base-compat bytestring hspec ];
        doHaddock = false;
        description = "Format Cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245280,7 +246483,7 @@ self: {
          test-framework test-framework-hunit text
        ];
        description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stylist" = callPackage
@@ -245301,8 +246504,8 @@ self: {
          regex-tdfa scientific text unordered-containers
        ];
        description = "Apply CSS styles to a document tree";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245315,7 +246518,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Ways to output stylized text on ANSI consoles";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245355,8 +246558,8 @@ self: {
          svg-builder text transformers warp websockets
        ];
        description = "An applicative functor that seamlessly talks to HTML inputs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245374,8 +246577,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Get the total, put a single element";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245387,7 +246590,7 @@ self: {
        sha256 = "17fzdwlmh8ykwqn9h9a60wpnvqbgbz0wk6cgcrglbj0i41jy28jv";
        libraryHaskellDepends = [ base ];
        description = "Some extension to the Foldable and Monoid classes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "subG-instances" = callPackage
@@ -245398,7 +246601,7 @@ self: {
        sha256 = "0nyhd0l0cd1q62ch9jbjyv33f9sdidpgkjbkb0hj4dagqyxpv0jy";
        libraryHaskellDepends = [ base subG vector ];
        description = "Additional instances for the InsertLeft class from subG package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "subcategories" = callPackage
@@ -245427,7 +246630,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Subcategories induced by class constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "subhask" = callPackage
@@ -245453,8 +246656,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion MonadRandom ];
        description = "Type safe interface for programming in subcategories of Hask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245476,8 +246679,8 @@ self: {
          base containers lens mtl parsec pretty template-haskell
        ];
        description = "Toolchain of subleq computer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245499,8 +246702,8 @@ self: {
          base cmark hlint hspec template-haskell text
        ];
        description = "Extract a part from CommonMark/Markdown docs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245512,7 +246715,7 @@ self: {
        sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv";
        libraryHaskellDepends = [ base split ];
        description = "subnetting calculator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "subsample" = callPackage
@@ -245530,8 +246733,8 @@ self: {
          base bytestring cassava containers optparse-generic text vector
        ];
        description = "Subsample data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245550,8 +246753,8 @@ self: {
          attoparsec base hspec NoTrace parsers QuickCheck text
        ];
        description = "Match / replace substrings with a parser combinators";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245563,7 +246766,7 @@ self: {
        sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q";
        libraryHaskellDepends = [ attoparsec base containers text ];
        description = "A parser for .srt and .sub files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "subtitles" = callPackage
@@ -245576,7 +246779,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base split ];
        description = "Modify SRT subtitle files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "subwordgraph" = callPackage
@@ -245588,8 +246791,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Subword graph implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245602,7 +246805,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "Helps when going \"seed values\" -> alternatives and optional -> answers";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "success" = callPackage
@@ -245617,7 +246820,7 @@ self: {
          base monad-control mtl transformers transformers-base
        ];
        description = "A version of Either specialised for encoding of success or failure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "successors" = callPackage
@@ -245628,8 +246831,8 @@ self: {
        sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg";
        libraryHaskellDepends = [ base ];
        description = "An applicative functor to manage successors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245650,8 +246853,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Simple and moderately efficient suffix array implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245666,8 +246869,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        executableHaskellDepends = [ base HUnit ];
        description = "n log n implementation of suffix array";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245679,7 +246882,7 @@ self: {
        sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6";
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Efficient, lazy suffix tree implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sugarhaskell" = callPackage
@@ -245693,7 +246896,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245705,8 +246908,8 @@ self: {
        sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci";
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245719,7 +246922,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Library for reducing the boilerplate involved with sum types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "summer" = callPackage
@@ -245731,7 +246934,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base ];
        description = "An implementation of extensible products and sums";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "summoner" = callPackage
@@ -245758,8 +246961,8 @@ self: {
          validation-selective
        ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245779,8 +246982,8 @@ self: {
        ];
        executableHaskellDepends = [ base relude ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245798,8 +247001,8 @@ self: {
          base bytestring data-default lens serialport transformers vector
        ];
        description = "A Haskell interface to SUMP-compatible logic analyzers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245811,7 +247014,7 @@ self: {
        sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Bindings to the sundown markdown library";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "sunlight" = callPackage
@@ -245827,8 +247030,8 @@ self: {
          tuple
        ];
        description = "Test Cabalized package against multiple dependency versions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245846,8 +247049,8 @@ self: {
          semigroups tagged template-haskell transformers vector-space
        ];
        description = "Monadic Javascript Compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245869,8 +247072,8 @@ self: {
          sunroof-server
        ];
        description = "Tests for Sunroof";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245892,8 +247095,8 @@ self: {
          wai-middleware-static warp
        ];
        description = "Monadic Javascript Compiler - Server Utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245923,8 +247126,8 @@ self: {
          process QuickCheck text transformers unix validity validity-path
        ];
        description = "Configure your dotfile deployment with a DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245939,8 +247142,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245958,7 +247161,7 @@ self: {
          async base buffer-builder bytestring criterion
        ];
        description = "Efficiently build a bytestring from smaller chunks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "supercollider-ht" = callPackage
@@ -245976,7 +247179,7 @@ self: {
        ];
        description = "Haskell SuperCollider utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246000,7 +247203,7 @@ self: {
        ];
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246017,8 +247220,8 @@ self: {
          template-haskell type-eq
        ];
        description = "Access an instance's constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246033,7 +247236,7 @@ self: {
          base Cabal containers directory filepath
        ];
        description = "Additional documentation markup and Unicode support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "superevent" = callPackage
@@ -246058,8 +247261,8 @@ self: {
          transformers uuid vector
        ];
        description = "A simple opinionated event store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246076,8 +247279,8 @@ self: {
        ];
        testHaskellDepends = [ base containers ghc QuickCheck ];
        description = "Plugin and base library to support supermonads in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246098,8 +247301,8 @@ self: {
        ];
        testHaskellDepends = [ aeson async base bytestring streamly text ];
        description = "Apache Pulsar client for Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246118,8 +247321,8 @@ self: {
          process time uniplate
        ];
        description = "A Supercompiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246139,7 +247342,7 @@ self: {
          aeson base bookkeeper criterion deepseq labels text
        ];
        description = "Supercharged anonymous records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "supervisor" = callPackage
@@ -246152,8 +247355,8 @@ self: {
          base containers exceptions monadloc mtl
        ];
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246172,7 +247375,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "supplemented" = callPackage
@@ -246190,8 +247393,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Early termination for monads";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246203,8 +247406,8 @@ self: {
        sha256 = "1nhq7lfzsbh9ra1m1n7649q35ch6l1lgm110p1qbxgvv6w6xmz41";
        libraryHaskellDepends = [ base lens mtl template-haskell ];
        description = "An output coverage checker";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246216,7 +247419,7 @@ self: {
        sha256 = "0wphk3dabba6rgd9lkxbsmq5vivvyy6b4jfxfndqb53yhdj5nkrg";
        libraryHaskellDepends = [ base lifted-base transformers-base ];
        description = "Simple package that allows for long thread suspensions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sv" = callPackage
@@ -246244,8 +247447,8 @@ self: {
          vector
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246267,7 +247470,7 @@ self: {
          base bytestring cassava HUnit sv-core text validation vector
        ];
        description = "Integration to use sv with cassava's parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sv-core" = callPackage
@@ -246294,7 +247497,7 @@ self: {
          tasty tasty-quickcheck text validation vector
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sv-svfactor" = callPackage
@@ -246311,8 +247514,8 @@ self: {
          base bytestring lens profunctors sv-core svfactor validation
        ];
        description = "sv-core + svfactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246338,8 +247541,8 @@ self: {
          tasty-hedgehog tasty-hunit text trifecta utf8-string vector
        ];
        description = "Syntax-preserving CSV manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246357,8 +247560,8 @@ self: {
          base blaze-builder bytestring hashable text unordered-containers
        ];
        description = "DSL for building SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246374,8 +247577,8 @@ self: {
          base blaze-builder bytestring hashable text unordered-containers
        ];
        description = "DSL for building SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246393,7 +247596,7 @@ self: {
          scientific text transformers vector xml
        ];
        description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "svg2q" = callPackage
@@ -246410,8 +247613,8 @@ self: {
          base haskell98 language-c pretty svgutils syb xml
        ];
        description = "Code generation tool for Quartz code from a SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246428,11 +247631,36 @@ self: {
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
        description = "Binding to the libsvg-cairo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) librsvg;};
 
+  "svgone" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, extra
+     , filepath, generic-lens, lens, linear, mtl, pretty-simple, process
+     , reanimate-svg, safe, text
+     }:
+     mkDerivation {
+       pname = "svgone";
+       version = "0.2.0.0";
+       sha256 = "1r176z555amzfj1jxpgc6n495rp60v829d5raab8nddj5rhr5p35";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory extra filepath generic-lens
+         lens linear mtl pretty-simple process reanimate-svg safe text
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory extra filepath generic-lens
+         lens linear mtl pretty-simple process reanimate-svg safe text
+       ];
+       description = "Optimise SVGs";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "svgutils" = callPackage
     ({ mkDerivation, base, filepath, xml }:
      mkDerivation {
@@ -246444,8 +247672,8 @@ self: {
        libraryHaskellDepends = [ base xml ];
        executableHaskellDepends = [ base filepath xml ];
        description = "Helper functions for dealing with SVG files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246457,7 +247685,7 @@ self: {
        sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz";
        libraryHaskellDepends = [ array base ];
        description = "A support vector machine written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "svm-light-utils" = callPackage
@@ -246470,8 +247698,8 @@ self: {
        editedCabalFile = "0mrnfxg1h3mrbx192n8hl7m9i64n8cfrai2yksvhkgp6b8qxqnma";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Parsers and formatters for the SVMlight input file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246488,8 +247716,8 @@ self: {
          monad-par mwc-random vector
        ];
        description = "Medium level, simplified, bindings to libsvm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246508,8 +247736,8 @@ self: {
          attoparsec base bytestring directory doctest filepath zlib
        ];
        description = "Library for reading Subversion dump files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246527,7 +247755,7 @@ self: {
        testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "Implementation of swagger data model";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "swagger-petstore" = callPackage
@@ -246554,8 +247782,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated openapi-petstore API Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246585,8 +247813,8 @@ self: {
          optparse-applicative random swagger2 text
        ];
        description = "Testing of Swagger APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246621,7 +247849,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "swapper" = callPackage
@@ -246638,8 +247866,8 @@ self: {
        ];
        librarySystemDepends = [ tokyocabinet ];
        description = "Transparently swapping data from in-memory structures to disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
@@ -246659,8 +247887,8 @@ self: {
          random-shuffle readline system-fileio system-filepath text
        ];
        description = "Clojure without alphanumerics";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246683,8 +247911,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Shallow embedding implementation of non-linear pattern matching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246696,8 +247924,8 @@ self: {
        sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl";
        libraryHaskellDepends = [ base mtl pretty ];
        description = "A library for creating Shockwave Flash (SWF) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246713,8 +247941,8 @@ self: {
          array base containers ghc-prim mwc-random primitive vector
        ];
        description = "Online sampler for Latent Dirichlet Allocation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246740,7 +247968,7 @@ self: {
          test-framework test-framework-hunit text time
        ];
        description = "A semantic web toolkit";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "swiss-ephemeris" = callPackage
@@ -246754,8 +247982,8 @@ self: {
        testHaskellDepends = [ base directory hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the Swiss Ephemeris C library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246779,8 +248007,8 @@ self: {
          wai-middleware-static warp warp-tls x509
        ];
        description = "A simple web server for serving directories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246794,7 +248022,7 @@ self: {
          base containers polyparse text xml-types
        ];
        description = "A SXML-parser";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "syb" = callPackage
@@ -246803,10 +248031,25 @@ self: {
        pname = "syb";
        version = "0.7.1";
        sha256 = "0077vxzyi9ppbphi2ialac3p376k49qly1kskdgf57wdwix9qjp0";
+       revision = "1";
+       editedCabalFile = "0rgxzwnbwawi8visnpq74s51n0qi9rzgnxsm2bdmi4vwfn3lb6w0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers HUnit mtl ];
        description = "Scrap Your Boilerplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "syb_0_7_2_1" = callPackage
+    ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "syb";
+       version = "0.7.2.1";
+       sha256 = "15ld5929n3lzfb5sy9nnm77x2l6i2sgsxw47jdrqcrz6fxpwc1qq";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
+       description = "Scrap Your Boilerplate";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "syb-extras" = callPackage
@@ -246819,8 +248062,8 @@ self: {
        editedCabalFile = "1a0kb7an663vhhi4wd4hfc5235bampxcyl8g5ssajm6ggs7n7gm3";
        libraryHaskellDepends = [ base eq prelude-extras ];
        description = "Higher order versions of the Scrap Your Boilerplate classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246837,7 +248080,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Scrap Your Boilerplate With Class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "syb-with-class-instances-text" = callPackage
@@ -246848,8 +248091,8 @@ self: {
        sha256 = "0vnpqk89nxs0anx62mzasl9wrcscw18vwc284y067ryb086aj2hf";
        libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246876,7 +248119,7 @@ self: {
        testToolDepends = [ sydtest-discover ];
        description = "An advanced modern testing framework for Haskell with good defaults and advanced testing features";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {sydtest-discover = null;};
 
   "syfco" = callPackage
@@ -246896,8 +248139,8 @@ self: {
          array base containers convertible directory mtl parsec transformers
        ];
        description = "Synthesis Format Conversion Tool / Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246924,7 +248167,7 @@ self: {
        ];
        description = "Lambda calculus visualization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246937,8 +248180,8 @@ self: {
        libraryHaskellDepends = [ base containers hashable vector ];
        testHaskellDepends = [ base hashable QuickCheck ];
        description = "Permutations, patterns, and statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246950,8 +248193,8 @@ self: {
        sha256 = "1ppq86fv5knfdcfn3pfiyg7v9k1aq47xp0b6yn8bwkfhcxxmbbhp";
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        description = "Plot permutations; an addition to the sym package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246968,8 +248211,8 @@ self: {
          text transformers
        ];
        description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246991,8 +248234,8 @@ self: {
          tasty tasty-golden text time transformers treeseq
        ];
        description = "Library for reading and writing Atom";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247004,7 +248247,7 @@ self: {
        sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d";
        libraryHaskellDepends = [ base ];
        description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "symantic-cli" = callPackage
@@ -247020,8 +248263,8 @@ self: {
          transformers
        ];
        description = "Symantics for parsing and documenting a CLI";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247038,7 +248281,7 @@ self: {
          base containers tasty tasty-hunit text transformers
        ];
        description = "Document symantics";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "symantic-grammar" = callPackage
@@ -247054,7 +248297,7 @@ self: {
          base megaparsec tasty tasty-hunit text transformers
        ];
        description = "Library for symantic grammars";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "symantic-http" = callPackage
@@ -247070,8 +248313,8 @@ self: {
          text transformers
        ];
        description = "Symantic combinators for deriving clients or a server from an HTTP API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247090,8 +248333,8 @@ self: {
          symantic-http text time transformers word8
        ];
        description = "symantic-http applied to the derivation of HTTP clients";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247118,8 +248361,8 @@ self: {
          time transformers wai wai-extra warp
        ];
        description = "Demo for symantic-http and its companion libraries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247141,8 +248384,8 @@ self: {
          symantic-http text time transformers word8
        ];
        description = "Streaming support through pipes for symantic-http";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247161,8 +248404,8 @@ self: {
          text time transformers wai warp word8
        ];
        description = "symantic-http applied to the derivation of HTTP servers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247190,8 +248433,8 @@ self: {
          transformers wai wai-extra warp
        ];
        description = "Test symantic-http and its companion libraries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247214,8 +248457,8 @@ self: {
          tasty-hunit text transformers
        ];
        description = "Symantics for common types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247227,8 +248470,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic-parser";
-       version = "0.0.0.20210101";
-       sha256 = "04lc4wyg4gi0781nd2wzi5s96r0x7kd3yknhhdfx9m0w83qqwwj2";
+       version = "0.0.0.20210102";
+       sha256 = "00gmcbn1amdr9nx54wia898gc7437563g9gpvlkhsg9r7197acid";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim hashable template-haskell
          text transformers unordered-containers
@@ -247239,7 +248482,9 @@ self: {
          transformers unix unordered-containers
        ];
        description = "Parser combinators statically optimized and staged via typed meta-programming";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-xml" = callPackage
@@ -247262,8 +248507,8 @@ self: {
          symantic-base tasty tasty-golden text transformers treeseq
        ];
        description = "Library for reading, validating and writing XML";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247295,8 +248540,8 @@ self: {
          websockets-simple-extra
        ];
        description = "Data serialization, communication, and operation verification implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247310,7 +248555,7 @@ self: {
        editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "A 'Symbol' type for fast symbol comparison";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "symbolic-link" = callPackage
@@ -247322,8 +248567,8 @@ self: {
        libraryHaskellDepends = [ base directory unix ];
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Symlink functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247335,7 +248580,7 @@ self: {
        sha256 = "19hlvyq5s4lvqi8n4qwxy4fgi33y72n8h4lw5bbb35sbq9jlw69c";
        libraryHaskellDepends = [ base ];
        description = "Symbol manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "symengine" = callPackage
@@ -247350,8 +248595,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
@@ -247370,8 +248615,8 @@ self: {
        testHaskellDepends = [ base ];
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
@@ -247385,7 +248630,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "Monoids for sameness and uniqueness";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "symmetry-operations-symbols" = callPackage
@@ -247401,8 +248646,8 @@ self: {
          base doctest hspec matrix matrix-as-xyz parsec QuickCheck
        ];
        description = "Derivation of symbols and coordinate triplets Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247418,7 +248663,7 @@ self: {
          ansi-terminal base monad-loops random
        ];
        description = "Minimal implementation(s) of the classic electronic memory game";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sync" = callPackage
@@ -247429,8 +248674,8 @@ self: {
        sha256 = "10c2divizmjij5w7x2ky6dzhq6y6wr6qq1pwl7wlhgv663y9yalk";
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247468,8 +248713,8 @@ self: {
          aeson base bytestring directory filepath process temporary time
        ];
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247481,7 +248726,7 @@ self: {
        sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb";
        libraryHaskellDepends = [ base ];
        description = "Synchronous communication channels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "syncthing-hs" = callPackage
@@ -247508,8 +248753,8 @@ self: {
          vector wreq
        ];
        description = "Haskell bindings for the Syncthing REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247534,7 +248779,7 @@ self: {
        ];
        description = "Similar code analysis";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Synt = null;};
 
@@ -247558,8 +248803,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Generic representation and manipulation of abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247571,7 +248816,7 @@ self: {
        sha256 = "1sqnmarmdm4mha28h8gbp3jddlig84v7zqn53a29047w3877g3gw";
        libraryHaskellDepends = [ base ];
        description = "Distfix expression parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "syntax" = callPackage
@@ -247588,8 +248833,8 @@ self: {
          base lens mono-traversable scientific semi-iso text vector
        ];
        description = "Reversible parsing and pretty-printing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247605,8 +248850,8 @@ self: {
          attoparsec base bytestring scientific semi-iso syntax text vector
        ];
        description = "Syntax instances for Attoparsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247625,8 +248870,8 @@ self: {
          syntax-printer text
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247645,8 +248890,8 @@ self: {
          syntax-attoparsec syntax-printer text
        ];
        description = "Example JSON parser/pretty-printer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247661,8 +248906,8 @@ self: {
          base pretty scientific semi-iso syntax text
        ];
        description = "Syntax instance for pretty, the pretty printing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247679,8 +248924,8 @@ self: {
          text vector
        ];
        description = "Text and ByteString printers for 'syntax'";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247696,8 +248941,8 @@ self: {
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247713,8 +248958,8 @@ self: {
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247733,8 +248978,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247757,7 +249002,7 @@ self: {
        ];
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247867,7 +249112,7 @@ self: {
        ];
        description = "Audio signal processing with dynamic physical dimensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {UniqueLogicNP = null;};
 
@@ -247896,8 +249141,8 @@ self: {
        ];
        doHaddock = false;
        description = "Efficient signal processing using runtime compilation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247937,7 +249182,7 @@ self: {
        libraryHaskellDepends = [ base process text ];
        testHaskellDepends = [ base doctest ];
        description = "Auth with smbclient command";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sys-process" = callPackage
@@ -247957,8 +249202,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "A replacement for System.Exit and System.Process.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247971,7 +249216,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec hspec-expectations ];
        description = "Haskell Interface for getting overall system statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-argv0" = callPackage
@@ -247982,7 +249227,7 @@ self: {
        sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
        libraryHaskellDepends = [ base bytestring system-filepath text ];
        description = "Get argv[0] as a FilePath";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-canonicalpath" = callPackage
@@ -247998,8 +249243,8 @@ self: {
        ];
        testHaskellDepends = [ base basic-prelude chell system-filepath ];
        description = "Abstract data type for canonical paths with some utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248018,8 +249263,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A replacement for System.Exit and System.Process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248031,7 +249276,7 @@ self: {
        sha256 = "1hig7m7arrj6hmgix8abkidy6wf1a4a4y72k81csq90kv5jhynxk";
        libraryHaskellDepends = [ base ];
        description = "Error reporting functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-extra" = callPackage
@@ -248045,8 +249290,8 @@ self: {
        libraryHaskellDepends = [ base bytestring directory process ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A bunch of system utilities used by other projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248066,7 +249311,7 @@ self: {
          transformers unix
        ];
        description = "Consistent filesystem interaction across GHC versions (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-filepath" = callPackage
@@ -248085,7 +249330,7 @@ self: {
          base bytestring chell chell-quickcheck QuickCheck text
        ];
        description = "High-level, byte-based file and directory path manipulations (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-gpio" = callPackage
@@ -248096,7 +249341,7 @@ self: {
        sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4";
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "GPIO wrapper libary for Raspberry Pi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-info" = callPackage
@@ -248107,7 +249352,7 @@ self: {
        sha256 = "10a43hb20gb8vgggibsnd3xg3al1wm4phjpp1mf2hnkf4nwxilm4";
        libraryHaskellDepends = [ base ];
        description = "Get the name of the operating system";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-inotify" = callPackage
@@ -248118,8 +249363,8 @@ self: {
        sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg";
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to Linux's inotify interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248142,8 +249387,8 @@ self: {
          transformers unix
        ];
        description = "Lifted versions of System functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248160,8 +249405,8 @@ self: {
        ];
        testHaskellDepends = [ base directory hedgehog pretty-show ];
        description = "A library for accessing the /proc filesystem in Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248178,8 +249423,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Get system locales";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248191,7 +249436,7 @@ self: {
        sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A toy module to temporarily redirect a program's stdout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-random-effect" = callPackage
@@ -248217,8 +249462,8 @@ self: {
          base criterion deepseq extensible-effects vector
        ];
        description = "Random number generation for extensible effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248238,7 +249483,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Runs system tests of applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-time-monotonic" = callPackage
@@ -248249,7 +249494,7 @@ self: {
        sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
        libraryHaskellDepends = [ base time ];
        description = "Simple library for using the system's monotonic clock";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-util" = callPackage
@@ -248270,8 +249515,8 @@ self: {
          semigroups system-lifted template-haskell transformers
        ];
        description = "Various system utils lifted to EitherT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {easy-data = null;};
 
@@ -248291,7 +249536,7 @@ self: {
        ];
        librarySystemDepends = [ libossp_uuid ];
        description = "Bindings to system UUID functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libossp_uuid;};
 
   "systemd" = callPackage
@@ -248305,7 +249550,7 @@ self: {
        ];
        testHaskellDepends = [ base network unix ];
        description = "Systemd facilities (Socket activation, Notify)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "systemstats" = callPackage
@@ -248323,8 +249568,8 @@ self: {
          transformers
        ];
        description = "An application that regularly logs system stats for later analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248336,7 +249581,7 @@ self: {
        sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
        libraryHaskellDepends = [ base syb ];
        description = "Scrap Your Zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "t-regex" = callPackage
@@ -248353,8 +249598,8 @@ self: {
          QuickCheck recursion-schemes template-haskell transformers
        ];
        description = "Matchers and grammars using tree regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248366,8 +249611,8 @@ self: {
        sha256 = "1pnikcyczwy7x4gf35pxkmr9p8b6smqb637r1h8rc9p2hjag2kak";
        libraryHaskellDepends = [ base t3-game t3-server ];
        description = "tic-tac-toe Rexports for client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248384,7 +249629,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec ];
        description = "tic-tac-toe core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "t3-server" = callPackage
@@ -248403,8 +249648,8 @@ self: {
          text time transformers unordered-containers vector wai
        ];
        description = "tic-tac-toe server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248420,8 +249665,8 @@ self: {
          base containers ghc-prim mtl Takusen template-haskell time
        ];
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248436,7 +249681,7 @@ self: {
        libraryHaskellDepends = [ base safe text ];
        description = "Table layout";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "table" = callPackage
@@ -248451,8 +249696,8 @@ self: {
          base csv optparse-applicative process split
        ];
        description = "Simple tool to generate tables from DSV input";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248477,7 +249722,9 @@ self: {
          QuickCheck
        ];
        description = "Format tabular data as grid or table";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "table-tennis" = callPackage
@@ -248488,8 +249735,8 @@ self: {
        sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k";
        libraryHaskellDepends = [ base ];
        description = "A table tennis game tracking engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248507,8 +249754,8 @@ self: {
          base cgi containers html mtl parsec QuickCheck
        ];
        description = "An interactive theorem prover based on semantic tableaux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248532,8 +249779,8 @@ self: {
          unordered-containers
        ];
        description = "In-memory storage with multiple keys using lenses and traversals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248554,8 +249801,8 @@ self: {
          time transformers utf8-string xml
        ];
        description = "Azure Table Storage REST API Wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248574,7 +249821,7 @@ self: {
        ];
        description = "Pretty-printing of CSV files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tabloid" = callPackage
@@ -248592,8 +249839,8 @@ self: {
          regex-posix
        ];
        description = "View the output of shell commands in a table";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248608,8 +249855,8 @@ self: {
        libraryHaskellDepends = [ base filepath monadlist mtl tagged ];
        executableHaskellDepends = [ base filepath monadlist mtl tagged ];
        description = "Indents source files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248621,7 +249868,7 @@ self: {
        sha256 = "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb";
        libraryHaskellDepends = [ base csv html mtl ];
        description = "Two-dimensional data tables with rendering functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taffybar" = callPackage
@@ -248665,7 +249912,7 @@ self: {
        ];
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -248676,8 +249923,8 @@ self: {
        sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248693,8 +249940,8 @@ self: {
          attoparsec base blaze-builder bytestring enumerator
        ];
        description = "streamlined html tag parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248733,7 +249980,7 @@ self: {
          base deepseq template-haskell transformers
        ];
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagged-binary" = callPackage
@@ -248746,7 +249993,7 @@ self: {
          base base-compat binary bytestring pureMD5
        ];
        description = "Provides tools for serializing data tagged with type information";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tagged-exception-core" = callPackage
@@ -248759,8 +250006,8 @@ self: {
          base exceptions mmorph mtl transformers
        ];
        description = "Reflect exceptions using phantom types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248772,7 +250019,7 @@ self: {
        sha256 = "1n5jafvcck6mq14fb1wrgclkrkxz4vd1x09y028awz66makn5v1c";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Trivial monad transformer that allows identical monad stacks have different types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagged-list" = callPackage
@@ -248791,8 +250038,8 @@ self: {
          type-level-natural-number-operations
        ];
        description = "Lists tagged with a type-level natural number representing their length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248806,8 +250053,8 @@ self: {
          base tagged template-haskell type-spine
        ];
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248821,8 +250068,8 @@ self: {
          base time transformers unordered-containers
        ];
        description = "Simple wrappers for timing IO actions (single-threaded)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248839,7 +250086,7 @@ self: {
          semigroupoids tagged
        ];
        description = "Monad transformer carrying an extra phantom type tag";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagging" = callPackage
@@ -248850,7 +250097,7 @@ self: {
        sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93";
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "Library for tagging data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taggy" = callPackage
@@ -248878,7 +250125,7 @@ self: {
          attoparsec base criterion tagsoup text vector
        ];
        description = "Efficient and simple HTML/XML parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taggy-lens" = callPackage
@@ -248896,7 +250143,7 @@ self: {
          base doctest hspec lens taggy text unordered-containers
        ];
        description = "Lenses for the taggy html/xml parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taglib" = callPackage
@@ -248925,8 +250172,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ taglib ];
        description = "An FFI layer over TagLib's C bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) taglib;};
 
@@ -248942,7 +250189,7 @@ self: {
          base binary containers parsec text text-binary
        ];
        description = "Positional tags and tagsets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagshare" = callPackage
@@ -248953,7 +250200,7 @@ self: {
        sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
        libraryHaskellDepends = [ base containers mtl ];
        description = "TagShare - explicit sharing with tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagsoup" = callPackage
@@ -248969,7 +250216,7 @@ self: {
          base bytestring deepseq directory process QuickCheck time
        ];
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagsoup-ht" = callPackage
@@ -248993,7 +250240,7 @@ self: {
        ];
        description = "alternative parser for the tagsoup package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249010,8 +250257,8 @@ self: {
          base hspec megaparsec raw-strings-qq tagsoup
        ];
        description = "A Tag token parser and Tag specific parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249029,8 +250276,8 @@ self: {
          tagsoup tagsoup-selection transformers
        ];
        description = "Tagsoup Navigate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249042,8 +250289,8 @@ self: {
        sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk";
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249055,8 +250302,8 @@ self: {
        sha256 = "0wqw4g5bg8zrkdxfsr8gn0g4a6dvz83b3hyvhdwqf2q1v3i5jw9d";
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249077,8 +250324,8 @@ self: {
          base bytestring tagsoup unicode-show utf8-string
        ];
        description = "Black magic tagsoup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249099,7 +250346,7 @@ self: {
          base bytestring conduit hspec HUnit QuickCheck resourcet text
        ];
        description = "streamlined html tag parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tai" = callPackage
@@ -249116,8 +250363,8 @@ self: {
          base clock lens mtl parsers time trifecta wreq
        ];
        description = "Support library to enable TAI usage on systems with time kept in UTC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249136,8 +250383,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Tai64 Labels for Haskell";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249161,7 +250408,7 @@ self: {
          streaming-eversion tasty tasty-hunit text
        ];
        description = "Tail files in Unix, using hinotify";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tak" = callPackage
@@ -249181,7 +250428,7 @@ self: {
          random-shuffle safe
        ];
        description = "A library encoding the rules of Tak, and a playtak.com client.";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "tak-ai" = callPackage
@@ -249198,7 +250445,7 @@ self: {
          base HUnit matrix parsec random-shuffle tak
        ];
        description = "AI(s) for playing Tak on playtak.com";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "takahashi" = callPackage
@@ -249210,8 +250457,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249226,8 +250473,8 @@ self: {
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
        description = "Database library with left-fold interface for Oracle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {clntsh = null;};
 
@@ -249243,8 +250490,8 @@ self: {
          base containers mtl pretty transformers unbound
        ];
        description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249275,7 +250522,7 @@ self: {
        ];
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249295,7 +250542,7 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249318,7 +250565,7 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249337,7 +250584,7 @@ self: {
        ];
        description = "Utility library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249349,7 +250596,7 @@ self: {
        sha256 = "0im6m05lj6nfap6qqff9qmb8vvv4i3g17pcqdg6rqb2xx86dfnjj";
        libraryHaskellDepends = [ base containers mtl safe text ];
        description = "Blaze-style HTML templates as a Monad Transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tangle" = callPackage
@@ -249360,7 +250607,7 @@ self: {
        sha256 = "1ylv73v6ydf39zfks9762dsz27sxr7sbmmk7k628yqc9czj3nj60";
        libraryHaskellDepends = [ base transformers ];
        description = "HKD record builder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tao" = callPackage
@@ -249371,7 +250618,7 @@ self: {
        sha256 = "0iqsah4l87bd25cpk575hsq5qbx506gz1ajf6fyv6pmi0sb1w2hb";
        libraryHaskellDepends = [ base ];
        description = "Type-level assertion operators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tao-example" = callPackage
@@ -249382,7 +250629,7 @@ self: {
        sha256 = "1ch09fgj46fy5h33rcqlbkm02v8cq246bpxswxfdj8p9g1dkkpk5";
        libraryHaskellDepends = [ base tao ];
        description = "Example usage of the tao package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tapioca" = callPackage
@@ -249399,8 +250646,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec vector ];
        description = "A tasty enhancement to cassava for easy csv exporting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249427,7 +250674,7 @@ self: {
          filepath time
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tar-bytestring" = callPackage
@@ -249456,7 +250703,7 @@ self: {
          hpath-filepath hpath-posix safe-exceptions these time unix word8
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tar-conduit" = callPackage
@@ -249481,7 +250728,7 @@ self: {
          deepseq directory filepath hspec
        ];
        description = "Extract and create tar files using conduit for streaming";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tardis" = callPackage
@@ -249494,7 +250741,7 @@ self: {
        editedCabalFile = "1wp6vp90g19hv8r2l83ava7qxf0933gb7ni2zgyfa66vlvxvhibv";
        libraryHaskellDepends = [ base mmorph mtl ];
        description = "Bidirectional state monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "target" = callPackage
@@ -249532,8 +250779,8 @@ self: {
          xml-conduit
        ];
        description = "Generate test-suites from refinement types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) z3;};
 
@@ -249556,7 +250803,7 @@ self: {
          text text-zipper vector vty
        ];
        description = "Terminal Art";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "task" = callPackage
@@ -249575,8 +250822,8 @@ self: {
          directory filepath old-locale random text time unix
        ];
        description = "A command line tool for keeping track of tasks you worked on";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249613,8 +250860,8 @@ self: {
          temporary text transformers vector
        ];
        description = "Distributed processing of changing tasks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249644,8 +250891,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A command-line kanban board/task manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249664,7 +250911,7 @@ self: {
          async base containers fgl hspec stm transformers
        ];
        description = "Manage pools of possibly interdependent tasks using STM and async";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "taskwarrior" = callPackage
@@ -249688,8 +250935,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Types and aeson instances for taskwarrior tasks";
-       license = stdenv.lib.licenses.agpl3Plus;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.agpl3Plus;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "tasty" = callPackage
@@ -249706,25 +250953,25 @@ self: {
          stm tagged unbounded-delays unix wcwidth
        ];
        description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
-  "tasty_1_4_0_1" = callPackage
+  "tasty_1_4_0_3" = callPackage
     ({ mkDerivation, ansi-terminal, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      , wcwidth
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.4.0.1";
-       sha256 = "1ffq2gpasdqm2drhd2aglcq33yrpb1h3grfyqyc34amz65bfczqq";
+       version = "1.4.0.3";
+       sha256 = "044kxp33qnsaxh8s1ja73149acf9xys36x4fs6lz6nyd8id3w497";
        libraryHaskellDepends = [
          ansi-terminal base clock containers mtl optparse-applicative stm
          tagged unbounded-delays unix wcwidth
        ];
        description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -249741,7 +250988,25 @@ self: {
          stm tagged tasty transformers xml
        ];
        description = "Render tasty output to XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "tasty-ant-xml_1_1_8" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+     , xml
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.1.8";
+       sha256 = "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving ghc-prim mtl
+         stm tagged tasty transformers xml
+       ];
+       description = "Render tasty output to XML for Jenkins";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tasty-auto" = callPackage
@@ -249761,8 +251026,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Auto discovery for Tasty with support for ingredients and test tree generation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249788,8 +251053,8 @@ self: {
          tasty-hunit temporary text transformers
        ];
        description = "BDD tests language and tasty provider";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249801,7 +251066,7 @@ self: {
        sha256 = "0jzaqra7gsrvy33j1g6bnrwg7x5pyg5p50l5mgvpz71kd946725l";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-discover" = callPackage
@@ -249827,23 +251092,10 @@ self: {
          tasty-smallcheck
        ];
        description = "Test discovery for the tasty framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-expected-failure" = callPackage
-    ({ mkDerivation, base, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-expected-failure";
-       version = "0.11.1.2";
-       sha256 = "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n";
-       revision = "1";
-       editedCabalFile = "1r367zar3gdad99nh53z7pr1qcw640pkcdv8zgl1b162ds3sv6zz";
-       libraryHaskellDepends = [ base tagged tasty ];
-       description = "Mark tasty tests as failure expected";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-expected-failure_0_12_2" = callPackage
     ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden
      , tasty-hedgehog, tasty-hunit, unbounded-delays
      }:
@@ -249856,8 +251108,7 @@ self: {
          base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit
        ];
        description = "Mark tasty tests as failure expected";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-fail-fast" = callPackage
@@ -249873,8 +251124,8 @@ self: {
          base directory tasty tasty-golden tasty-hunit tasty-tap
        ];
        description = "Adds the ability to fail a tasty test suite on first test failure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249891,7 +251142,7 @@ self: {
          base tasty tasty-expected-failure tasty-hunit
        ];
        description = "Simple focus mechanism for tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-golden" = callPackage
@@ -249913,7 +251164,7 @@ self: {
          base directory filepath process tasty tasty-hunit temporary
        ];
        description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-golden_2_3_4" = callPackage
@@ -249936,8 +251187,8 @@ self: {
          base directory filepath process tasty tasty-hunit temporary
        ];
        description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tasty-groundhog-converters" = callPackage
@@ -249955,8 +251206,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Tasty Tests for groundhog converters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249975,7 +251226,7 @@ self: {
          base hedgehog tasty tasty-expected-failure
        ];
        description = "Integration for tasty and hedgehog";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-hedgehog-coverage" = callPackage
@@ -249997,8 +251248,8 @@ self: {
          base hedgehog tasty tasty-expected-failure
        ];
        description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250015,7 +251266,7 @@ self: {
          tasty-smallcheck
        ];
        description = "Hspec support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-html" = callPackage
@@ -250025,15 +251276,15 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-html";
-       version = "0.4.1.2";
-       sha256 = "1bffbp8qwyad85s9bl3ck3gxay3hphka527j09hn2sz1bfqzcihb";
+       version = "0.4.1.4";
+       sha256 = "1zf14am7rl0rdh3mschkbsg8h02cv7y8yglxpc9cs2wj14ymhyvv";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          semigroups stm tagged tasty text transformers
        ];
        description = "Render tasty output to HTML";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-hunit" = callPackage
@@ -250044,7 +251295,7 @@ self: {
        sha256 = "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp";
        libraryHaskellDepends = [ base call-stack tasty ];
        description = "HUnit support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-hunit-adapter" = callPackage
@@ -250055,7 +251306,7 @@ self: {
        sha256 = "06rywmn6gc1qyhf65iwm6i0ysg99ygr2ghk1alkklz4ycagidyvg";
        libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        description = "Use existing HUnit tests with tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-hunit-compat" = callPackage
@@ -250066,7 +251317,7 @@ self: {
        sha256 = "0kfxga9j1iy7f00gj3dsh45ywyi7qzdlrmp16gr4ir3b08rwhj2m";
        libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        description = "Integration of `HUnit` with `tasty`";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "tasty-integrate" = callPackage
@@ -250096,8 +251347,8 @@ self: {
          transformers
        ];
        description = "automated integration of QuickCheck properties into tasty suites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250117,8 +251368,8 @@ self: {
          tasty-hunit unix
        ];
        description = "Render tasty output to both console and XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250134,7 +251385,7 @@ self: {
          base bytestring containers stm tagged tasty text
        ];
        description = "JSON reporter for the tasty testing framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-kat" = callPackage
@@ -250150,7 +251401,7 @@ self: {
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
        description = "Known Answer Tests (KAT) framework for tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-laws" = callPackage
@@ -250167,8 +251418,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
        description = "Test common laws";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250181,7 +251432,7 @@ self: {
        libraryHaskellDepends = [ base leancheck tasty ];
        testHaskellDepends = [ base leancheck tasty ];
        description = "LeanCheck support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-lens" = callPackage
@@ -250197,8 +251448,8 @@ self: {
        ];
        testHaskellDepends = [ base lens tasty ];
        description = "Tasty TestTrees for Lens validation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250208,8 +251459,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-lua";
-       version = "0.2.3.1";
-       sha256 = "1dw9wbwhyklc2lkpvhj12kdq7kyq6lv9w2586szx3yr5qbpwaggm";
+       version = "0.2.3.2";
+       sha256 = "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53";
        libraryHaskellDepends = [
          base bytestring file-embed hslua tasty text
        ];
@@ -250217,7 +251468,7 @@ self: {
          base directory filepath hslua tasty tasty-hunit
        ];
        description = "Write tests in Lua, integrate into tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-mgolden" = callPackage
@@ -250242,8 +251493,8 @@ self: {
          tasty-hunit text typed-process
        ];
        description = "Golden testing provider for tasty with muti-line diff output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250258,7 +251509,7 @@ self: {
          base deepseq directory filepath process tasty
        ];
        description = "Use tasty framework to test whether a program executes correctly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-quickcheck" = callPackage
@@ -250274,7 +251525,7 @@ self: {
        ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        description = "QuickCheck support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-quickcheck-laws" = callPackage
@@ -250289,7 +251540,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck tasty ];
        description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-rerun" = callPackage
@@ -250307,7 +251558,7 @@ self: {
          transformers
        ];
        description = "Rerun only tests which failed in a previous test run";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-silver" = callPackage
@@ -250330,7 +251581,9 @@ self: {
          transformers
        ];
        description = "A fancy test runner, including support for golden tests";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-smallcheck" = callPackage
@@ -250341,11 +251594,13 @@ self: {
        pname = "tasty-smallcheck";
        version = "0.8.2";
        sha256 = "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym";
+       revision = "1";
+       editedCabalFile = "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh";
        libraryHaskellDepends = [
          base optparse-applicative smallcheck tagged tasty
        ];
        description = "SmallCheck support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-stats" = callPackage
@@ -250360,11 +251615,33 @@ self: {
          base containers directory process stm tagged tasty time
        ];
        description = "Collect statistics of your Tasty testsuite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "tasty-sugar" = callPackage
+    ({ mkDerivation, base, directory, filemanip, filepath, hedgehog
+     , logict, optparse-applicative, pretty-show, prettyprinter
+     , raw-strings-qq, tagged, tasty, tasty-hedgehog, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "tasty-sugar";
+       version = "1.0.1.1";
+       sha256 = "1mkph7g4ybvy4h4rblr60bnalj5jf1acfgdqcw0ggwmbhfbzbg68";
+       libraryHaskellDepends = [
+         base directory filemanip filepath logict optparse-applicative
+         prettyprinter tagged tasty
+       ];
+       testHaskellDepends = [
+         base filepath hedgehog logict pretty-show prettyprinter
+         raw-strings-qq tasty tasty-hedgehog tasty-hunit
+       ];
+       doHaddock = false;
+       description = "Tests defined by Search Using Golden Answer References";
+       license = lib.licenses.isc;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -250378,7 +251655,7 @@ self: {
          base directory tasty tasty-golden tasty-hunit
        ];
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-test-reporter" = callPackage
@@ -250396,7 +251673,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Producing JUnit-style XML test reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-test-vector" = callPackage
@@ -250409,7 +251686,7 @@ self: {
        editedCabalFile = "131ldlbp4ji1m8wayl8h28ykcda29bsvifa3mw8513mnqnndgahc";
        libraryHaskellDepends = [ base tasty ];
        description = "Test vector support for tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-th" = callPackage
@@ -250425,7 +251702,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty-hunit ];
        description = "Automatic tasty test case discovery using TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-tmux" = callPackage
@@ -250441,7 +251718,7 @@ self: {
          typed-process
        ];
        description = "Terminal user acceptance testing (UAT) via tmux";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "tasty-travis" = callPackage
@@ -250455,7 +251732,7 @@ self: {
        libraryHaskellDepends = [ base tasty ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fancy Travis CI output for tasty tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-wai" = callPackage
@@ -250466,12 +251743,14 @@ self: {
        pname = "tasty-wai";
        version = "0.1.1.1";
        sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y";
+       revision = "1";
+       editedCabalFile = "033s0aap50r7y3sbxc1jf60lpv66nljwyypc8smyccgiv5l8khzr";
        libraryHaskellDepends = [
          base bytestring http-types HUnit tasty wai wai-extra
        ];
        testHaskellDepends = [ base http-types tasty wai ];
        description = "Test 'wai' endpoints via Test.Tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tateti-tateti" = callPackage
@@ -250486,8 +251765,8 @@ self: {
          array base lens-simple mtl ncurses random
        ];
        description = "Meta tic-tac-toe ncurses game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250499,7 +251778,7 @@ self: {
        sha256 = "10vw3y3vimqpb22amhk7n0d0jni46j60iva1gqa28ky8lhqq8ssz";
        libraryHaskellDepends = [ base ];
        description = "Tau, the ratio between any circle's circumference and radius";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tax" = callPackage
@@ -250512,7 +251791,7 @@ self: {
          base dollaridoos profunctors semigroups
        ];
        description = "Types and combinators for taxes";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "tbox" = callPackage
@@ -250530,7 +251809,7 @@ self: {
        ];
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250546,8 +251825,8 @@ self: {
          aws base bytestring conduit http-conduit network TCache text
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250565,8 +251844,8 @@ self: {
          base bytestring tokyocabinet-haskell utf8-string
        ];
        description = "TokyoCabinet CLI interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250582,7 +251861,7 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HUnit ];
        description = "Very simple config file reading";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tcod-haskell" = callPackage
@@ -250600,8 +251879,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ libtcod ];
        description = "Bindings to libtcod roguelike engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libtcod;};
 
@@ -250613,7 +251892,7 @@ self: {
        sha256 = "05cnlbrdddbrdwlm8s7b76ydwrn49vaifdgaklfhv8rzz9dfpvbr";
        libraryHaskellDepends = [ base containers ];
        description = "Simple text configuration file parser library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tcp" = callPackage
@@ -250624,8 +251903,8 @@ self: {
        sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv";
        libraryHaskellDepends = [ base containers old-time ];
        description = "A purely functional TCP implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250648,7 +251927,7 @@ self: {
          test-framework-hunit
        ];
        description = "One stop solution for tcp client and server with tls support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tcp-streams-openssl" = callPackage
@@ -250669,8 +251948,8 @@ self: {
          test-framework-hunit
        ];
        description = "Tcp streams using openssl for tls support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250698,36 +251977,12 @@ self: {
          transformers
        ];
        description = "Test framework wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "tdigest" = callPackage
-    ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest
-     , deepseq, doctest, reducers, semigroupoids, semigroups, tasty
-     , tasty-quickcheck, transformers, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "tdigest";
-       version = "0.2.1";
-       sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl";
-       revision = "5";
-       editedCabalFile = "1crjfhxhs8ihbl2xn1dqr5w19g7w74mcf2w889my6zb935l7lyjs";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-compat binary deepseq reducers semigroupoids transformers
-         vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base base-compat binary deepseq doctest semigroups tasty
-         tasty-quickcheck vector vector-algorithms
-       ];
-       description = "On-line accumulation of rank-based statistics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tdigest_0_2_1_1" = callPackage
     ({ mkDerivation, base, base-compat, binary, deepseq, reducers
      , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers
      , vector, vector-algorithms
@@ -250745,8 +252000,7 @@ self: {
          vector vector-algorithms
        ];
        description = "On-line accumulation of rank-based statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tdigest-Chart" = callPackage
@@ -250767,8 +252021,8 @@ self: {
          tdigest vector
        ];
        description = "Chart generation from tdigest";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250796,8 +252050,8 @@ self: {
        ];
        testSystemDepends = [ tdlib ];
        description = "complete binding to the Telegram Database Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tdlib;};
 
@@ -250826,8 +252080,8 @@ self: {
          template-haskell text
        ];
        description = "Codegen for TDLib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250848,8 +252102,8 @@ self: {
          polysemy-plugin tdlib-gen text
        ];
        description = "Types and Functions generated from tdlib api spec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250865,7 +252119,7 @@ self: {
          base bytestring template-haskell transformers xhtml
        ];
        description = "TDoc is a typed document builder with support for (X)HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tds" = callPackage
@@ -250886,8 +252140,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250900,7 +252154,7 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250922,7 +252176,7 @@ self: {
          base gauge rio typed-process unliftio
        ];
        description = "Build safe and composable teardown sub-routines for resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "techlab" = callPackage
@@ -250943,8 +252197,8 @@ self: {
          polysemy-plugin polysemy-vinyl polysemy-zoo
        ];
        description = "Bleeding edge prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250976,7 +252230,7 @@ self: {
        ];
        doHaddock = false;
        description = "Procedures and Sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "teeth" = callPackage
@@ -250987,8 +252241,8 @@ self: {
        sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c";
        libraryHaskellDepends = [ base ];
        description = "Dental data types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251004,7 +252258,7 @@ self: {
          base exceptions fallible prettyprinter prettyprinter-ansi-terminal
        ];
        description = "Prettier error";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "telegram" = callPackage
@@ -251019,8 +252273,8 @@ self: {
          aeson base bytestring data-default http-conduit url utf8-string
        ];
        description = "Telegram API client";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251048,8 +252302,8 @@ self: {
          servant-client servant-client-core text transformers utf8-string
        ];
        description = "Telegram Bot API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251070,8 +252324,8 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "Telegram Bot microframework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251103,8 +252357,8 @@ self: {
          unordered-containers
        ];
        description = "Easy to use library for building Telegram bots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251129,8 +252383,8 @@ self: {
          servant-client-core servant-multipart telegram-types text time
        ];
        description = "Servant bindings to the Telegram bot API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251152,11 +252406,31 @@ self: {
          mime-types open-union servant servant-multipart text time
        ];
        description = "Types used in Telegram bot API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "telegraph" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, deriving-aeson
+     , generic-data-surgery, http-client, http-client-tls, http-conduit
+     , in-other-words, mtl, text
+     }:
+     mkDerivation {
+       pname = "telegraph";
+       version = "1.0.0";
+       sha256 = "1s3k3psva95lka5zqzylh20k3s7bqmsg22l43r1jzrkldlaqkh3n";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit deriving-aeson generic-data-surgery
+         http-client http-conduit in-other-words mtl text
+       ];
+       testHaskellDepends = [
+         base http-client http-client-tls in-other-words
+       ];
+       description = "Binding to the telegraph API";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "teleport" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring
      , configurator, optparse-applicative, system-filepath, text, turtle
@@ -251174,8 +252448,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A tool to quickly switch between directories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251198,8 +252472,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Telnet client and other things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251219,8 +252493,8 @@ self: {
          regex-pcre split tagsoup text time transformers
        ];
        description = "IRC tellbot";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251242,7 +252516,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A dead-simple shell interpolation templating utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tempi" = callPackage
@@ -251253,8 +252527,8 @@ self: {
        sha256 = "08hjgs32cx3vcm6sga4xc7ijcj3lbjlg133vkri06xfi0v3hjgnp";
        libraryHaskellDepends = [ base time ];
        description = "For representing musical tempi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251266,7 +252540,7 @@ self: {
        sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
        libraryHaskellDepends = [ base mtl text ];
        description = "Simple string substitution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "template-default" = callPackage
@@ -251277,8 +252551,8 @@ self: {
        sha256 = "1fxfyfnwlw9yslbz012rygw2j5iywplybmgbaawkfq4jda7yail4";
        libraryHaskellDepends = [ base data-default template-haskell ];
        description = "declaring Default instances just got even easier";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251290,8 +252564,8 @@ self: {
        sha256 = "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g";
        libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ];
        description = "Support library for Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "template-haskell-compat-v0208" = callPackage
@@ -251302,7 +252576,7 @@ self: {
        sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A backwards compatibility layer for Template Haskell newer than 2.8";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "template-haskell-optics" = callPackage
@@ -251315,7 +252589,7 @@ self: {
          base containers optics-core template-haskell
        ];
        description = "Optics for template-haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "template-haskell-util" = callPackage
@@ -251328,8 +252602,8 @@ self: {
          base GenericPretty ghc-prim template-haskell
        ];
        description = "Some utilities for template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251350,8 +252624,8 @@ self: {
          base parsec QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Haskell's Simple Markup Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251371,7 +252645,7 @@ self: {
          unordered-containers uri-encode
        ];
        description = "Template Toolkit implementation for Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "template-yj" = callPackage
@@ -251382,8 +252656,8 @@ self: {
        sha256 = "1vj856dcmnipzxkzs3y33sgkyldqirq8rz9mi6grllv6mqq6lgj2";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Process template file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251397,8 +252671,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
        description = "Make template from website";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251416,8 +252690,8 @@ self: {
          regex-compat regex-posix template-haskell time utf8-string
        ];
        description = "A PostgreSQL access library with compile-time SQL type inference";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251434,7 +252708,7 @@ self: {
          base hspec hspec-attoparsec HUnit QuickCheck text
        ];
        description = "Simple string templater";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tempo" = callPackage
@@ -251455,7 +252729,7 @@ self: {
        executableHaskellDepends = [ base MissingH mtl time ];
        testHaskellDepends = [ base ];
        description = "Command-line tool to log time-tracking information into JIRA Tempo plugin";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tempodb" = callPackage
@@ -251472,8 +252746,8 @@ self: {
          http-streams io-streams mtl old-locale text time
        ];
        description = "A small Haskell wrapper around the TempoDB api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251491,8 +252765,8 @@ self: {
          temporal-music-notation temporal-music-notation-western
        ];
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251504,7 +252778,7 @@ self: {
        sha256 = "04qbbx32rs6mz5w3j7wj2hx744x858rv60hmpla3zpx2491r0qi9";
        libraryHaskellDepends = [ base Boolean ];
        description = "data types for temporal media";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporal-music-notation" = callPackage
@@ -251517,7 +252791,7 @@ self: {
          base data-default temporal-media vector
        ];
        description = "music notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporal-music-notation-demo" = callPackage
@@ -251532,7 +252806,7 @@ self: {
          base binary data-default HCodecs temporal-music-notation
        ];
        description = "generates midi from score notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporal-music-notation-western" = callPackage
@@ -251543,7 +252817,7 @@ self: {
        sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc";
        libraryHaskellDepends = [ base temporal-music-notation ];
        description = "western music notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporary" = callPackage
@@ -251561,7 +252835,7 @@ self: {
          base base-compat directory filepath tasty tasty-hunit unix
        ];
        description = "Portable temporary file and directory support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporary-rc" = callPackage
@@ -251576,7 +252850,7 @@ self: {
          base directory exceptions filepath transformers unix
        ];
        description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporary-resourcet" = callPackage
@@ -251594,7 +252868,7 @@ self: {
          base directory resourcet tasty tasty-hunit transformers
        ];
        description = "Portable temporary files and directories with automatic deletion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tempus" = callPackage
@@ -251614,8 +252888,8 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "Interpreter for the FRP language Tempus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251631,7 +252905,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Programmers' time tracker";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "tensor" = callPackage
@@ -251643,8 +252917,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim random vector ];
        testHaskellDepends = [ base QuickCheck random ];
        description = "A completely type-safe library for linear algebra";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251668,8 +252942,8 @@ self: {
          hint singletons text vector vector-sized
        ];
        description = "Create valid deep neural network architectures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251698,8 +252972,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "TensorFlow bindings";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libtensorflow = null;};
 
@@ -251720,8 +252994,8 @@ self: {
          base bytestring lens-family proto-lens tensorflow text
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251750,8 +253024,8 @@ self: {
          test-framework-hunit text
        ];
        description = "TensorBoard related functionality";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251785,8 +253059,8 @@ self: {
          test-framework test-framework-hunit text transformers vector
        ];
        description = "TensorFlow demo application for learning MNIST model";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {tensorflow-mnist-input-data = null;};
 
@@ -251804,8 +253078,8 @@ self: {
          optparse-applicative proto-lens semigroups tensorflow-proto text
        ];
        description = "Code generation for TensorFlow operations";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251835,8 +253109,8 @@ self: {
          base criterion deepseq tensorflow transformers vector
        ];
        description = "Friendly layer around TensorFlow bindings";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251854,7 +253128,7 @@ self: {
        ];
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -251870,7 +253144,7 @@ self: {
          base bytestring cereal test-framework test-framework-quickcheck2
        ];
        description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tensorflow-records-conduit" = callPackage
@@ -251886,7 +253160,7 @@ self: {
          resourcet tensorflow-records
        ];
        description = "Conduit wrappers for TensorFlow.Records.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tensorflow-test" = callPackage
@@ -251897,7 +253171,7 @@ self: {
        sha256 = "1z2anh5ikjpsb1sjfn290bcf5rcxsmzb0gwdk9czdnlmx3fig0ip";
        libraryHaskellDepends = [ base HUnit vector ];
        description = "Some common functions for test suites";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tensors" = callPackage
@@ -251916,7 +253190,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq vector ];
        description = "Tensor in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "term-rewriting" = callPackage
@@ -251933,7 +253207,9 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit QuickCheck ];
        description = "Term Rewriting Library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "termbox" = callPackage
@@ -251946,7 +253222,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "termbox bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "termbox-banana" = callPackage
@@ -251959,8 +253235,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base reactive-banana termbox ];
        description = "reactive-banana + termbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251976,8 +253252,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base ];
        description = "Bindings to the Termbox library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251992,7 +253268,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base cli ];
        description = "Composable terminal colors";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "terminal" = callPackage
@@ -252012,7 +253288,7 @@ self: {
          tasty-hunit tasty-quickcheck text transformers
        ];
        description = "Portable terminal interaction library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-progress-bar" = callPackage
@@ -252029,7 +253305,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "A progress bar in the terminal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-punch" = callPackage
@@ -252047,7 +253323,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck time ];
        description = "Simple terminal-based time tracker";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-size" = callPackage
@@ -252058,7 +253334,7 @@ self: {
        sha256 = "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm";
        libraryHaskellDepends = [ base ];
        description = "Get terminal window height and width";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-text" = callPackage
@@ -252073,8 +253349,8 @@ self: {
          ansi-terminal base container layered-state prologue text
        ];
        description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252086,8 +253362,8 @@ self: {
        sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh";
        libraryHaskellDepends = [ base containers contravariant ];
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252100,8 +253376,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ncurses ];
        description = "Haskell bindings to the terminfo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "terminfo-hs" = callPackage
@@ -252117,7 +253393,7 @@ self: {
        ];
        testHaskellDepends = [ base directory errors filepath QuickCheck ];
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "termonad" = callPackage
@@ -252132,8 +253408,8 @@ self: {
      }:
      mkDerivation {
        pname = "termonad";
-       version = "4.0.1.2";
-       sha256 = "0gf1p3bjc42jmw5jb7ysm0vnyk5zah8y6fv23k8b6r2zdr8p9v6w";
+       version = "4.1.1.0";
+       sha256 = "1v8w6wf5y3708pjya97zzq1w8vb3g8vqc46pbfy7rizg5jfbr2ba";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -252152,7 +253428,7 @@ self: {
          QuickCheck tasty tasty-hedgehog tasty-hspec
        ];
        description = "Terminal emulator configurable in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; 
          vte_291 = pkgs.vte;};
 
@@ -252171,8 +253447,8 @@ self: {
          time-units transformers unix vty
        ];
        description = "Plot time series in your terminal using commands stdout";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252190,8 +253466,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "a ternary library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252205,7 +253481,7 @@ self: {
        librarySystemDepends = [ terralib4c translib ];
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {terralib4c = null; translib = null;};
 
@@ -252226,8 +253502,8 @@ self: {
          base containers mtl process syb transformers
        ];
        description = "A semantic parser for lojban";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252253,8 +253529,8 @@ self: {
          wreq
        ];
        description = "Tesla API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252276,8 +253552,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Test monadic side-effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252302,7 +253578,7 @@ self: {
          time xml
        ];
        description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-doctest" = callPackage
@@ -252318,8 +253594,8 @@ self: {
        ];
        testHaskellDepends = [ base test-framework ];
        description = "Test.Framework wrapper for DocTest";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252335,7 +253611,7 @@ self: {
          base bytestring filepath mtl process temporary test-framework
        ];
        description = "Golden tests support for test-framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "test-framework-hunit" = callPackage
@@ -252351,7 +253627,7 @@ self: {
          base extensible-exceptions HUnit test-framework
        ];
        description = "HUnit support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-leancheck" = callPackage
@@ -252363,7 +253639,7 @@ self: {
        libraryHaskellDepends = [ base leancheck test-framework ];
        testHaskellDepends = [ base leancheck test-framework ];
        description = "LeanCheck support for test-framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-program" = callPackage
@@ -252374,7 +253650,7 @@ self: {
        sha256 = "10p6xxxbfx3yr71wdbvk7qhm3xkxq3a1dv4hgcirzynsdfk36s3z";
        libraryHaskellDepends = [ base directory process test-framework ];
        description = "Test framework support for running simple test programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-quickcheck" = callPackage
@@ -252389,8 +253665,8 @@ self: {
          base deepseq extensible-exceptions QuickCheck random test-framework
        ];
        description = "QuickCheck support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252408,7 +253684,7 @@ self: {
          base extensible-exceptions QuickCheck random test-framework
        ];
        description = "QuickCheck-2 support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-sandbox" = callPackage
@@ -252428,8 +253704,8 @@ self: {
          base HUnit test-framework test-sandbox test-sandbox-hunit
        ];
        description = "test-sandbox support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252449,8 +253725,8 @@ self: {
          test-framework-smallcheck
        ];
        description = "Functions for conveniently marking some of the tests in a suite as being skipped";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252464,7 +253740,7 @@ self: {
          base smallcheck test-framework transformers
        ];
        description = "Support for SmallCheck tests in test-framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-testing-feat" = callPackage
@@ -252476,8 +253752,8 @@ self: {
        libraryHaskellDepends = [ base test-framework testing-feat ];
        testHaskellDepends = [ base test-framework testing-feat ];
        description = "A test framework provider for testing-feat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252494,7 +253770,7 @@ self: {
          template-haskell test-framework
        ];
        description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-th-prime" = callPackage
@@ -252509,8 +253785,8 @@ self: {
          base cpphs haskell-src-exts template-haskell test-framework
        ];
        description = "Template Haskell for test framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252523,7 +253799,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Testable functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "test-invariant" = callPackage
@@ -252538,7 +253814,7 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion QuickCheck ];
        description = "Provide common invariants to be checked with QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-karya" = callPackage
@@ -252562,8 +253838,8 @@ self: {
          text
        ];
        description = "Testing framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252583,7 +253859,7 @@ self: {
        ];
        executableHaskellDepends = [ base simple-get-opt ];
        description = "A library to make a quick test-runner script";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "test-monad-laws" = callPackage
@@ -252603,7 +253879,7 @@ self: {
          base mtl QuickCheck quickcheck-higherorder tasty tasty-quickcheck
        ];
        description = "Laws for mtl classes as QuickCheck properties";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "test-pkg" = callPackage
@@ -252614,8 +253890,8 @@ self: {
        sha256 = "0fncybd3sxrbnrd4l1hri18rhfg9h0fm3k4305iwh4l65fbwg2n8";
        libraryHaskellDepends = [ base ];
        description = "Just tests Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252643,8 +253919,8 @@ self: {
          template-haskell text transformers transformers-compat unix
        ];
        description = "Sandbox for system tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252676,8 +253952,8 @@ self: {
          shakespeare test-sandbox text unix
        ];
        description = "Lightweight development enviroments using test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252689,8 +253965,8 @@ self: {
        sha256 = "0v8nfgjn46q4z5ic5vlqm240dfkk0ci90n86bb3b7nk3hvka1zpk";
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        description = "HUnit convenience functions for use with test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252706,8 +253982,8 @@ self: {
          base mtl QuickCheck random test-sandbox transformers
        ];
        description = "QuickCheck convenience functions for use with test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252721,8 +253997,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover silently ];
        testToolDepends = [ hspec-discover ];
        description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252741,8 +254017,8 @@ self: {
          base executable-path mtl process QuickCheck
        ];
        description = "Simple Perl inspired testing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252761,7 +254037,7 @@ self: {
        ];
        description = "Write your tests in comments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252776,7 +254052,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Small test package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "testbench" = callPackage
@@ -252797,8 +254073,8 @@ self: {
          streaming-cassava streaming-with temporary transformers weigh
        ];
        description = "Create tests and benchmarks together";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252821,8 +254097,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover tasty-discover ];
        description = "Docker containers for your integration tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252838,8 +254114,8 @@ self: {
          base QuickCheck size-based testing-type-modifiers
        ];
        description = "Functional Enumeration of Algebraic Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252851,7 +254127,7 @@ self: {
        sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5";
        libraryHaskellDepends = [ base ];
        description = "Data type modifiers for property based testing";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "testloop" = callPackage
@@ -252869,8 +254145,8 @@ self: {
          time unix
        ];
        description = "Quick feedback loop for test suites";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252888,7 +254164,7 @@ self: {
        ];
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252903,8 +254179,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base filepath gtk ];
        description = "Display a monitor test pattern";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252920,7 +254196,7 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252935,7 +254211,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base GLUT random ];
        description = "A 2-D clone of Tetris";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tex-join-bib" = callPackage
@@ -252955,7 +254231,7 @@ self: {
          base optparse-generic system-filepath text
        ];
        description = "Compile separate tex files with the same bibliography";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tex2txt" = callPackage
@@ -252969,8 +254245,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq parsec ];
        executableHaskellDepends = [ base containers deepseq parsec ];
        description = "LaTeX to plain-text conversion";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252991,8 +254267,8 @@ self: {
          temporary unix
        ];
        description = "View your latex output while editing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253015,7 +254291,7 @@ self: {
          utf8-string xml
        ];
        description = "Conversion between formats used to represent mathematics";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "texrunner" = callPackage
@@ -253037,34 +254313,27 @@ self: {
          base bytestring HUnit lens test-framework test-framework-hunit
        ];
        description = "Functions for running Tex from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
-  "text_1_2_4_0" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
-     , quickcheck-unicode, random, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+  "text_1_2_4_1" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim
+     , integer-gmp, template-haskell
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.4.0";
-       sha256 = "0k739i0sjrbl029y5j8n5v1hqa68z00xazvrahjhyl69mp4s5qna";
+       version = "1.2.4.1";
+       sha256 = "0bnb4g5lpranra58zpwqh14hvwdh6zc4nz3hwppzrpdahi10s7hv";
        libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
          template-haskell
        ];
-       testHaskellDepends = [
-         array base binary bytestring deepseq directory ghc-prim HUnit
-         integer-gmp QuickCheck quickcheck-unicode random template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
        doCheck = false;
        description = "An efficient packed Unicode text type";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-all" = callPackage
@@ -253078,8 +254347,8 @@ self: {
          base bytestring text text-format utf8-string
        ];
        description = "Everything Data.Text related in one package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253096,8 +254365,8 @@ self: {
          unordered-containers
        ];
        description = "EDSL to create HTML documents with plots based on the C3.js library.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253105,11 +254374,11 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "text-ansi";
-       version = "0.1.0.2";
-       sha256 = "139whkn4yr72bxd4jq3zp0cccylynb8p2lgk5dkhrhddhcj5605g";
+       version = "0.1.1";
+       sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6";
        libraryHaskellDepends = [ base text ];
        description = "Text styling for ANSI terminals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-binary" = callPackage
@@ -253120,7 +254389,7 @@ self: {
        sha256 = "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn";
        libraryHaskellDepends = [ base binary text ];
        description = "Binary instances for text types";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "text-builder" = callPackage
@@ -253141,7 +254410,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "An efficient strict text builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "text-containers" = callPackage
@@ -253163,8 +254432,8 @@ self: {
          tasty-quickcheck text text-short vector
        ];
        description = "Memory-efficient string-indexed container types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253182,7 +254451,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec text ];
        testToolDepends = [ hspec-discover ];
        description = "Safe conversions between textual types";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "text-cp437" = callPackage
@@ -253198,7 +254467,7 @@ self: {
          base bytestring QuickCheck quickcheck-text text
        ];
        description = "Conversion of Text to and from CP437";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-format" = callPackage
@@ -253216,7 +254485,7 @@ self: {
          time transformers
        ];
        description = "Text formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-format-heavy" = callPackage
@@ -253234,8 +254503,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec time ];
        description = "Full-weight string formatting library, analog of Python's string.format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253247,7 +254516,7 @@ self: {
        sha256 = "0iqs3v03kirjczlp7jpqdqzrfvqsbm260g110abkbpbxws3szqhk";
        libraryHaskellDepends = [ base MissingH ];
        description = "Simple text formatting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-generic-pretty" = callPackage
@@ -253271,8 +254540,8 @@ self: {
          tasty-hunit tasty-quickcheck time unordered-containers
        ];
        description = "A generic, derivable, haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253293,7 +254562,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Bindings to the ICU library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) icu;};
 
   "text-icu-normalized" = callPackage
@@ -253316,8 +254585,8 @@ self: {
          test-framework-quickcheck2 test-framework-th text text-icu
        ];
        description = "Dealing with Strict Text in NFC normalization";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253336,7 +254605,7 @@ self: {
          text-icu
        ];
        description = "ICU transliteration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -253352,7 +254621,7 @@ self: {
        ];
        description = "Json Quasiquatation for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-latin1" = callPackage
@@ -253368,7 +254637,7 @@ self: {
          text
        ];
        description = "Latin-1 (including ASCII) utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-ldap" = callPackage
@@ -253389,7 +254658,7 @@ self: {
          base bytestring QuickCheck quickcheck-simple random
        ];
        description = "Parser and Printer for LDAP text data stream";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-lens" = callPackage
@@ -253401,8 +254670,8 @@ self: {
        libraryHaskellDepends = [ base extra lens text ];
        testHaskellDepends = [ base hspec lens ];
        description = "Lenses for operating over text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253418,8 +254687,8 @@ self: {
          base containers parsers text text-loc transformers
        ];
        description = "Monadic parsing combinator library with attention to locations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253431,7 +254700,7 @@ self: {
        sha256 = "069v99jnlayl2srl09355i56wpry0f6mq4bfp8lj0sxcsm1bzpgw";
        libraryHaskellDepends = [ base hashable ];
        description = "Line-column locations within a text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-locale-encoding" = callPackage
@@ -253442,7 +254711,7 @@ self: {
        sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg";
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        description = "Encode and decode Text to/from ByteString using TextEncoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-manipulate" = callPackage
@@ -253456,7 +254725,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Case conversion, word boundary manipulation, and textual subjugation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-manipulate_0_3_0_0" = callPackage
@@ -253469,8 +254738,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Case conversion, word boundary manipulation, and textual subjugation";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-markup" = callPackage
@@ -253487,8 +254756,8 @@ self: {
          base QuickCheck quickcheck-text tasty tasty-quickcheck text
        ];
        description = "A data structure for mapping metadata to text subsequences";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253506,7 +254775,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
        description = "Calculate various string metrics efficiently";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-normal" = callPackage
@@ -253522,8 +254791,8 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Unicode-normalized text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253542,8 +254811,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Library for converting between line/column and byte offset";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253560,8 +254829,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest HTF text ];
        description = "Utils for text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253576,8 +254845,8 @@ self: {
        libraryHaskellDepends = [ base regex-applicative ];
        testHaskellDepends = [ base QuickCheck regex-applicative ];
        description = "Handling positions in text and position-tagging it";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253594,7 +254863,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "Parser and Printer of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-printer" = callPackage
@@ -253612,7 +254881,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Abstract interface for text builders/printers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-regex-replace" = callPackage
@@ -253628,7 +254897,7 @@ self: {
          base hspec QuickCheck smallcheck text text-icu
        ];
        description = "Easy replacement when using text-icu regexes";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "text-region" = callPackage
@@ -253646,7 +254915,7 @@ self: {
        ];
        testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
        description = "Marking text regions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-register-machine" = callPackage
@@ -253657,8 +254926,8 @@ self: {
        sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph";
        libraryHaskellDepends = [ base containers mtl vector ];
        description = "A Haskell implementation of the 1# Text Register Machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253670,7 +254939,7 @@ self: {
        sha256 = "1p78xsr25qxmfgsl73lzfn7j32ni897667k48448fkihdsg0a15g";
        libraryHaskellDepends = [ base classy-prelude mtl parsec text ];
        description = "A type class for rendering objects as text, pretty-printing, etc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "text-replace" = callPackage
@@ -253687,8 +254956,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative parsec ];
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253711,7 +254980,7 @@ self: {
          text
        ];
        description = "Memory-efficient representation of Unicode text strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-show" = callPackage
@@ -253726,6 +254995,8 @@ self: {
        pname = "text-show";
        version = "3.9";
        sha256 = "1cj6w77lgh9cydg1jz3wfhll0bvzrmhgk37dgm7s33qbkpq9mf90";
+       revision = "1";
+       editedCabalFile = "1jwsp8g7c7wywxvhb7ns7xw0h7mbr33c3kyhba8ybw0rn43ynjki";
        libraryHaskellDepends = [
          array base base-compat-batteries bifunctors bytestring
          bytestring-builder containers generic-deriving ghc-boot-th ghc-prim
@@ -253741,7 +255012,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
        description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-show-instances" = callPackage
@@ -253774,7 +255045,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Additional instances for text-show";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-stream-decode" = callPackage
@@ -253790,7 +255061,7 @@ self: {
        testHaskellDepends = [ base bytestring deepseq hspec text ];
        benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Streaming decoding functions for UTF encodings. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "text-time" = callPackage
@@ -253806,7 +255077,7 @@ self: {
          attoparsec base Cabal formatting hspec QuickCheck text time
        ];
        description = "Library for Time parsing from Text into UTCTime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-trie" = callPackage
@@ -253823,8 +255094,8 @@ self: {
          silently smallcheck text
        ];
        description = "An efficient finite map from Text to values, based on bytestring-trie";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253842,7 +255113,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "UTF-7 encoding/decoding for Data.Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-utf8" = callPackage
@@ -253866,8 +255137,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "An efficient packed UTF-8 backed Unicode text type";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253880,8 +255151,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base HTF text ];
        description = "Various text utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253899,7 +255170,7 @@ self: {
        ];
        description = "Serialize Data to XML (strings)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-xml-qq" = callPackage
@@ -253910,8 +255181,8 @@ self: {
        sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5";
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        description = "Quasiquoter for xml. XML DSL in Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253919,13 +255190,13 @@ self: {
     ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }:
      mkDerivation {
        pname = "text-zipper";
-       version = "0.10.1";
-       sha256 = "0jxicjp0ak1fyl1n3yspxq6hv9l90zzy75glsv8bc2svsn9ypyls";
+       version = "0.11";
+       sha256 = "07l1pyx93gv95cn1wh1di129axhm9sqsn4znykliacv60ld854ys";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "A text editor zipper library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-zipper-monad" = callPackage
@@ -253937,8 +255208,8 @@ self: {
        libraryHaskellDepends = [ base mtl text-zipper ];
        testHaskellDepends = [ base hspec text-zipper ];
        description = "Monadic interface to the text-zipper package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253955,8 +255226,8 @@ self: {
          base HUnit lens QuickCheck semigroups text
        ];
        description = "Non-empty values of `Data.Text`.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253968,7 +255239,7 @@ self: {
        sha256 = "04mhchvnk20r7ra2m568lvbzqzcwnh7vsyzj01r50cwylacgwwvd";
        libraryHaskellDepends = [ array base ];
        description = "Plot functions in text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "textlocal" = callPackage
@@ -253984,7 +255255,7 @@ self: {
          unix-time
        ];
        description = "Haskell wrapper for textlocal SMS gateway";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "textmatetags" = callPackage
@@ -253997,8 +255268,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 process ];
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254019,8 +255290,8 @@ self: {
          tasty tasty-hunit text transformers
        ];
        description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254032,7 +255303,7 @@ self: {
        sha256 = "15r3lrd6qrhhsll6qlbvgd5g545mj2s6banahwlibcimqqdw8s9h";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "textual" = callPackage
@@ -254043,8 +255314,8 @@ self: {
        sha256 = "0facdj7h789pz7ll43wdkfn6zs6d4q1ns61wq64d2gixwi2fq06y";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Textual type class for data that represent text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254056,7 +255327,7 @@ self: {
        sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
        libraryHaskellDepends = [ base primitive random time ];
        description = "High-quality splittable pseudorandom number generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tfp" = callPackage
@@ -254068,7 +255339,7 @@ self: {
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Type-level integers, booleans, lists using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tfp-th" = callPackage
@@ -254079,8 +255350,8 @@ self: {
        sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm";
        libraryHaskellDepends = [ base template-haskell tfp ];
        description = "Template-Haskell code for tfp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254105,8 +255376,8 @@ self: {
          base hslogger mtl network QuickCheck transformers
        ];
        description = "A library for building tftp servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254118,8 +255389,8 @@ self: {
        sha256 = "0lpc5z575y7cq03ww2knr5qdkfb36qnim5y1gkh552r9k3pfdjhf";
        libraryHaskellDepends = [ base bytestring ];
        description = "Reading and writing of tga image files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254134,7 +255405,7 @@ self: {
        ];
        testHaskellDepends = [ base containers template-haskell ];
        description = "Nicer interface for reified information about data types";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "th-alpha" = callPackage
@@ -254153,8 +255424,8 @@ self: {
          base derive tasty tasty-hunit tasty-quickcheck template-haskell
        ];
        description = "Alpha equivalence for TH Exp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254166,7 +255437,7 @@ self: {
        sha256 = "0p5zpiqk8141a4n362m3kpd92sx0192gpv172ixdnfgabk07gn1z";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for bang-type template";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-build" = callPackage
@@ -254177,8 +255448,8 @@ self: {
        sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6";
        libraryHaskellDepends = [ base template-haskell ];
        description = "More convenient construction of TH ASTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254191,7 +255462,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Compile-time CAS(Computer Algebra System)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "th-compat" = callPackage
@@ -254208,7 +255479,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Backward- (and forward-)compatible Quote and Code types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-constraint-compat" = callPackage
@@ -254219,7 +255490,7 @@ self: {
        sha256 = "1wx35f24gryal0h0gadq351gws82qvficcq23pyd1ajrxhgnv3zc";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Compatibility for type constraint template";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-context" = callPackage
@@ -254242,8 +255513,8 @@ self: {
          template-haskell text th-desugar th-orphans th-reify-many
        ];
        description = "Test instance context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254255,7 +255526,7 @@ self: {
        sha256 = "03d5ddbxzfn60ysxxn17q7gzdlls8hvlsvhzai4mn0qfjpwi6ljx";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for data definition template of TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-desugar" = callPackage
@@ -254277,7 +255548,7 @@ self: {
          th-orphans
        ];
        description = "Functions to desugar Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-dict-discovery" = callPackage
@@ -254288,8 +255559,8 @@ self: {
        sha256 = "1dmkj8is73mwngy1dw3ba34744whqj0jc243bjnkyrrwkbwn55ih";
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Automatically discover available dictionaries at compile time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254303,7 +255574,7 @@ self: {
        testHaskellDepends = [ base markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
        description = "Template Haskell splice that expands to an environment variable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-expand-syns" = callPackage
@@ -254315,7 +255586,7 @@ self: {
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-extras" = callPackage
@@ -254326,7 +255597,7 @@ self: {
        sha256 = "1vgvqgfm2lvx6v5r2mglwyl63647c9n6b9a5ikqc93pjm98g9vwg";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "A grab bag of functions for use with Template Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "th-fold" = callPackage
@@ -254337,8 +255608,8 @@ self: {
        sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z";
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH fold generator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254355,8 +255626,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
        description = "Template Haskell based support for format strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254368,7 +255639,7 @@ self: {
        sha256 = "09xxfgyy56284cd2fry8pshlpawva4yq1k6bhza5samn694yinkq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Simple inline IO action into compiled code using TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-instance-reification" = callPackage
@@ -254388,8 +255659,8 @@ self: {
          tasty-quickcheck template-haskell
        ];
        description = "Fixed versions of instances reification functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254413,8 +255684,8 @@ self: {
          test-framework-quickcheck2 th-kinds th-lift
        ];
        description = "A place to collect orphan instances for Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254430,8 +255701,8 @@ self: {
          base containers mtl template-haskell th-orphans
        ];
        description = "Automated kind inference in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254447,8 +255718,8 @@ self: {
          base containers mtl template-haskell th-orphans
        ];
        description = "Automated kind inference in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254469,8 +255740,8 @@ self: {
          tasty-quickcheck template-haskell
        ];
        description = "Template Haskell construction utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254486,7 +255757,7 @@ self: {
        ];
        testHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Derive Template Haskell's Lift class for datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-lift-instances" = callPackage
@@ -254505,7 +255776,7 @@ self: {
          base bytestring containers QuickCheck template-haskell text vector
        ];
        description = "Lift instances for template-haskell for common data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-nowq" = callPackage
@@ -254518,7 +255789,7 @@ self: {
        testHaskellDepends = [ base markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
        description = "Template Haskell splice that expands to current time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-orphans" = callPackage
@@ -254539,7 +255810,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Orphan instances for TH datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-pprint" = callPackage
@@ -254550,8 +255821,8 @@ self: {
        sha256 = "1c6h6jw82a8bdb8kqxcam63vbrz04dl8m2ypcmfw5qm88b61zl1f";
        libraryHaskellDepends = [ base lens pretty template-haskell ];
        description = "Simplify and render Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254572,7 +255843,7 @@ self: {
          base hspec HUnit QuickCheck template-haskell text
        ];
        description = "Quasiquoters for printf";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "th-reify-compat" = callPackage
@@ -254583,7 +255854,7 @@ self: {
        sha256 = "171m4fibjq4ml33xvbb0qdm625adknsdgz8flb4xhag075z2w6xg";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for the result type of TH reify";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-reify-many" = callPackage
@@ -254599,7 +255870,7 @@ self: {
        ];
        testHaskellDepends = [ base template-haskell ];
        description = "Recurseively reify template haskell datatype info";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-sccs" = callPackage
@@ -254610,8 +255881,8 @@ self: {
        sha256 = "0vrjqwdjv2922kqmh57ypbslbv1m829wag78addqsr4vjd9b3zl6";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254623,7 +255894,7 @@ self: {
        sha256 = "0jmajcnw832df503jbg2fmrmnskc43i07214vpc4fw359cgd7yn3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility shim for Bang and Strict in Template Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "th-tc" = callPackage
@@ -254638,8 +255909,8 @@ self: {
          base containers lens mtl template-haskell th-orphans transformers
        ];
        description = "Typechecking in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254661,7 +255932,7 @@ self: {
          th-orphans transformers
        ];
        description = "Utility functions for testing Template Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-to-exp" = callPackage
@@ -254673,8 +255944,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Provides a way to persist data from compile-time to runtime";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254686,8 +255957,8 @@ self: {
        sha256 = "1hmhpcxg0hhqhb8qmqqi9x8jb4h8a6045k0q8162mm0vl47s4rz2";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Tracing Q monad computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254715,8 +255986,8 @@ self: {
          aeson base HUnit network-uri syb template-haskell th-lift
        ];
        description = "Graph of the subtype relation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254737,7 +256008,7 @@ self: {
          template-haskell text th-orphans vector
        ];
        description = "Collection of useful functions for use with Template Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "thank-you-stars" = callPackage
@@ -254759,8 +256030,8 @@ self: {
          base Cabal containers directory filepath hspec
        ];
        description = "Give your dependencies stars on GitHub!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254776,8 +256047,8 @@ self: {
          base contravariant semigroups slave-thread unagi-chan
        ];
        description = "Minimalistic actor library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254804,7 +256075,7 @@ self: {
          tasty-hunit text time
        ];
        description = "Haskell API bindings for http://themoviedb.org";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "themplate" = callPackage
@@ -254825,7 +256096,7 @@ self: {
          optparse-applicative text transformers transformers-compat
        ];
        description = "Project templating tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thentos-cookie-session" = callPackage
@@ -254851,7 +256122,7 @@ self: {
        ];
        description = "All-in-one session handling for servant-based frontends";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254863,8 +256134,8 @@ self: {
        sha256 = "05z0jppjbw70rlyh2qis27xp8vdx9fgn7i22ckxb0m2y75gffq61";
        libraryHaskellDepends = [ base HTTP json utf8-string ];
        description = "A common library for TheoremQuest, a theorem proving game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254878,8 +256149,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HTTP network theoremquest ];
        description = "A simple client for the TheoremQuest theorem proving game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254891,7 +256162,7 @@ self: {
        sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p";
        libraryHaskellDepends = [ assoc base binary deepseq hashable ];
        description = "An either-or-both data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "these-lens" = callPackage
@@ -254902,7 +256173,7 @@ self: {
        sha256 = "1nwknm17x7vkx9936z7xa6hqw69pgig185if1dninrvyxvv59kps";
        libraryHaskellDepends = [ base lens these ];
        description = "Lenses for These";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "these-optics" = callPackage
@@ -254913,7 +256184,7 @@ self: {
        sha256 = "1xwf2m03cbb2z40mdab70d042nmvcxpgdq94rmajbqqpb072yivq";
        libraryHaskellDepends = [ base optics-core these ];
        description = "Optics for These";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "these-skinny" = callPackage
@@ -254926,7 +256197,7 @@ self: {
        editedCabalFile = "0q1izcz4kxrnl7sh0sxamxxq02mkxww88vr6v04pwj8alyhkd4z2";
        libraryHaskellDepends = [ base deepseq ];
        description = "A fork of the 'these' package without the dependency bloat";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thespian" = callPackage
@@ -254937,7 +256208,7 @@ self: {
        sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Lightweight Erlang-style actors for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "theta-functions" = callPackage
@@ -254948,7 +256219,7 @@ self: {
        sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f";
        libraryHaskellDepends = [ base ];
        description = "Theta-functions implemented as trigonometric series";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "thih" = callPackage
@@ -254962,8 +256233,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty ];
        description = "Typing Haskell In Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254982,8 +256253,37 @@ self: {
          base edit-distance parseargs phonetic-code sqlite
        ];
        description = "Command-line spelling word suggestion tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "thock" = callPackage
+    ({ mkDerivation, aeson, base, brick, containers, file-embed, lens
+     , mtl, network, random, text, text-zipper, time, vector, vty
+     , websockets
+     }:
+     mkDerivation {
+       pname = "thock";
+       version = "0.2.1.0";
+       sha256 = "0s5xxmbxpr6g2j7797j8ix51405q7455s74x5dijfpi13phx7v94";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base brick containers file-embed lens mtl network random text
+         text-zipper time vector vty websockets
+       ];
+       executableHaskellDepends = [
+         aeson base brick containers file-embed lens mtl network random text
+         text-zipper time vector vty websockets
+       ];
+       testHaskellDepends = [
+         aeson base brick containers file-embed lens mtl network random text
+         text-zipper time vector vty websockets
+       ];
+       description = "A modern TUI typing game featuring online racing against friends";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255002,8 +256302,8 @@ self: {
          template-haskell
        ];
        description = "Datatype Manipulation with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255017,7 +256317,7 @@ self: {
        testHaskellDepends = [ base containers hspec stm ];
        testToolDepends = [ hspec-discover ];
        description = "Simple Haskell thread management in hierarchical manner";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "thread-local-storage" = callPackage
@@ -255030,7 +256330,7 @@ self: {
        testHaskellDepends = [ atomic-primops base ];
        benchmarkHaskellDepends = [ atomic-primops base criterion ];
        description = "Several options for thread-local-storage (TLS) in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thread-supervisor" = callPackage
@@ -255049,7 +256349,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A simplified implementation of Erlang/OTP like supervisor over thread";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "threadPool" = callPackage
@@ -255082,7 +256382,7 @@ self: {
          monad-control-aligned mtl stm tmapmvar
        ];
        description = "Manage concurrently operating threads without having to spark them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threadmanager" = callPackage
@@ -255093,8 +256393,8 @@ self: {
        sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255112,7 +256412,7 @@ self: {
          base concurrent-extra HUnit stm test-framework test-framework-hunit
        ];
        description = "Fork threads and wait for their result";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threads-extras" = callPackage
@@ -255124,7 +256424,7 @@ self: {
        libraryHaskellDepends = [ base stm threads ];
        testHaskellDepends = [ base ];
        description = "Extends the threads package with a bounded thread group";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threads-pool" = callPackage
@@ -255135,7 +256435,7 @@ self: {
        sha256 = "1x1yafxaaf8r02cqipqnm9shj74kja1bqdp0d1cq5kdhcnh22xkz";
        libraryHaskellDepends = [ base containers mtl stm ];
        description = "A library to operate with pool of haskell's IO threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threads-supervisor" = callPackage
@@ -255158,7 +256458,7 @@ self: {
          tasty-quickcheck time transformers
        ];
        description = "Simple, IO-based library for Erlang-style thread supervision";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "threadscope" = callPackage
@@ -255168,8 +256468,8 @@ self: {
      }:
      mkDerivation {
        pname = "threadscope";
-       version = "0.2.13";
-       sha256 = "1y5d6mgrx3mv6vdivv4ih1hvgp3bjrz26mr922gim08ryfh1hm43";
+       version = "0.2.14";
+       sha256 = "0xcj8v6kyk8ss2sg6f32gx84vgx36hfaqb5p3sy3d4vkxan4xwcy";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -255179,9 +256479,7 @@ self: {
          text time unix
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threefish" = callPackage
@@ -255197,7 +256495,7 @@ self: {
          tagged
        ];
        description = "The Threefish block cipher and the Skein hash function for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threepenny-editors" = callPackage
@@ -255215,8 +256513,8 @@ self: {
          semigroups text threepenny-gui
        ];
        description = "Composable algebraic editors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255243,7 +256541,7 @@ self: {
          vector websockets websockets-snap
        ];
        description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -255257,8 +256555,8 @@ self: {
        libraryHaskellDepends = [ base threepenny-gui ];
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Write simple nested context menus for threepenny-gui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255273,8 +256571,8 @@ self: {
        libraryHaskellDepends = [ base clay text threepenny-gui ];
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Flexbox layouts for Threepenny-gui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255297,8 +256595,8 @@ self: {
          base bytestring hspec QuickCheck unordered-containers
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255310,7 +256608,7 @@ self: {
        sha256 = "16alzsalzlvwg3cjfy8yysv8z72v7v1in1hbi5prz6gm1ws4rcly";
        libraryHaskellDepends = [ base ];
        description = "Type-threaded list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttle" = callPackage
@@ -255321,7 +256619,7 @@ self: {
        sha256 = "1yxmq7244a8bcw1jg00dqcpwzf8h1333c51k9d0v39flpkzp5qlc";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttle-io-stream" = callPackage
@@ -255338,7 +256636,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Throttler between arbitrary IO producer and consumer functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttled" = callPackage
@@ -255349,7 +256647,7 @@ self: {
        sha256 = "0grzdhgpba5wjylr3ci4xp1cx6d26jhh0r018n4l3fzi1zivwagg";
        libraryHaskellDepends = [ async base stm ];
        description = "Concurrent processing of a Foldable, throttled by CPU count";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttled-io-loop" = callPackage
@@ -255361,8 +256659,8 @@ self: {
        libraryHaskellDepends = [ base natural-numbers time ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Loop over an action but throttle it to a certain rate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255376,7 +256674,7 @@ self: {
        editedCabalFile = "1fdy2wyczl2jncy9gg0asasb8bybcnif8aqnw9fq73sr1778kjpf";
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        description = "Convert textual types through Text without needing O(n^2) instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throwable-exceptions" = callPackage
@@ -255394,7 +256692,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "thumbnail" = callPackage
@@ -255405,7 +256703,7 @@ self: {
        sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd";
        libraryHaskellDepends = [ base bytestring gd ];
        description = "generate thumbnail image";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thumbnail-plus" = callPackage
@@ -255428,8 +256726,8 @@ self: {
          transformers
        ];
        description = "Generate thumbnails easily and safely";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255446,8 +256744,8 @@ self: {
          nonce resourcet text
        ];
        description = "Image thumbnail creation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255478,7 +256776,7 @@ self: {
          vector vector-space
        ];
        description = "A faster time library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tianbar" = callPackage
@@ -255515,8 +256813,8 @@ self: {
          vector xdg-basedir
        ];
        description = "A desktop bar based on WebKit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
 
   "tibetan-utils" = callPackage
@@ -255534,7 +256832,7 @@ self: {
          base hspec hspec-megaparsec megaparsec text
        ];
        description = "Parse and display tibetan numerals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -255548,8 +256846,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk haskell98 ];
        description = "Useful if reading \"Why FP matters\" by John Hughes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255566,7 +256864,7 @@ self: {
        libraryHaskellDepends = [ async base safe-exceptions ];
        testHaskellDepends = [ async base deepseq doctest Glob hspec ];
        description = "A concurrent utility inspired by Ticker in golang";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tickle" = callPackage
@@ -255586,8 +256884,8 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "A port of @Data.Binary@";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255599,8 +256897,8 @@ self: {
        sha256 = "0xpfcabhlpnp883jb23sjcilan1cwwykvvlqvc6qzhda63fcyqp1";
        libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
        description = "3D Tic-Tac-Toe game";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255621,7 +256919,7 @@ self: {
        testHaskellDepends = [ base containers deepseq microspec parsec ];
        benchmarkHaskellDepends = [ base criterion weigh ];
        description = "Pattern language for improvised music";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tidal-midi" = callPackage
@@ -255638,8 +256936,8 @@ self: {
          base containers PortMidi tidal time transformers
        ];
        description = "MIDI support for tidal";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255653,8 +256951,8 @@ self: {
          base bytestring containers serialport tidal
        ];
        description = "Serial support for tidal";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255675,8 +256973,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Visual rendering for Tidal patterns and osc messages";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255689,7 +256987,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255701,8 +256999,8 @@ self: {
        sha256 = "13jazsgjs95hykshjsvjx05hdhj5jcl85sqhci4hmjhyivplxc58";
        libraryHaskellDepends = [ base deepseq time ];
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255719,8 +257017,8 @@ self: {
          array base containers uuagc uuagc-cabal uulib
        ];
        description = "Tiger Compiler of Universiteit Utrecht";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255732,7 +257030,7 @@ self: {
        sha256 = "069gwshl52cngbm563snyvjdgm39cgrlpq446mh45adjmbfd26c4";
        libraryHaskellDepends = [ base ];
        description = "Tightly binding infix function application";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tightrope" = callPackage
@@ -255748,8 +257046,8 @@ self: {
          wai-extra wreq
        ];
        description = "Nice API for a Slackbot";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255768,8 +257066,8 @@ self: {
          simple-pipe time
        ];
        description = "Tiny and Incrementally-Growing HTTP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255782,7 +257080,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Slippy map tile functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tilings" = callPackage
@@ -255793,7 +257091,7 @@ self: {
        sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys";
        libraryHaskellDepends = [ base ];
        description = "substitution tilings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timberc" = callPackage
@@ -255812,8 +257110,8 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "The Timber Compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255832,8 +257130,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A time library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "time-cache" = callPackage
@@ -255848,7 +257146,7 @@ self: {
          auto-update base text time time-units transformers
        ];
        description = "Cache current time and formatted time text";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "time-compat" = callPackage
@@ -255865,7 +257163,7 @@ self: {
          tasty-quickcheck time
        ];
        description = "Compatibility package for time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-extras" = callPackage
@@ -255876,8 +257174,8 @@ self: {
        sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l";
        libraryHaskellDepends = [ base time ];
        description = "Data instances for the time package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255899,8 +257197,8 @@ self: {
          old-locale QuickCheck random text time tz
        ];
        description = "Yet another time library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255924,8 +257222,8 @@ self: {
          QuickCheck tagged time
        ];
        description = "Parse and format HTTP/1.1 Date and Time strings";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255937,7 +257235,7 @@ self: {
        sha256 = "097yab0j9dpplq65a9x6liisdrakag6azmylis4yxv2zlg1f2wrl";
        libraryHaskellDepends = [ base time-units ];
        description = "Use a time unit class, but hold a concrete time type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "time-io-access" = callPackage
@@ -255948,8 +257246,8 @@ self: {
        sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb";
        libraryHaskellDepends = [ base base-io-access time ];
        description = "IO Access for time";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255961,7 +257259,7 @@ self: {
        sha256 = "07nh97x1mx5hc48xqv3gk3cgls6xpb829h3bzsjx8rwqnzybijyq";
        libraryHaskellDepends = [ base data-lens-light time ];
        description = "Lens-based interface to Data.Time data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-locale-compat" = callPackage
@@ -255972,7 +257270,7 @@ self: {
        sha256 = "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7";
        libraryHaskellDepends = [ base old-locale time ];
        description = "Compatibile module for time-format locale";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-locale-vietnamese" = callPackage
@@ -255983,7 +257281,7 @@ self: {
        sha256 = "0xhbfdzrlhj3096w2dgk2ijpzs4kzym11sz3r0h8r19a3jrjs1ln";
        libraryHaskellDepends = [ base time ];
        description = "Vietnamese locale for date and time format";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "time-machine" = callPackage
@@ -255995,8 +257293,8 @@ self: {
        libraryHaskellDepends = [ base mtl time tz ];
        testHaskellDepends = [ base hspec HUnit mtl time tz ];
        description = "A library to mock the current time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256008,7 +257306,7 @@ self: {
        sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh";
        libraryHaskellDepends = [ auto-update base ];
        description = "Scalable timer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "time-out" = callPackage
@@ -256025,7 +257323,7 @@ self: {
        ];
        testHaskellDepends = [ base time-units transformers ];
        description = "Timers, timeouts, alarms, monadic wrappers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "time-parsers" = callPackage
@@ -256044,7 +257342,7 @@ self: {
          template-haskell text time
        ];
        description = "Parsers for types in `time`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-patterns" = callPackage
@@ -256055,7 +257353,7 @@ self: {
        sha256 = "0qyg2y41c0bn296zyxfhjjjm0bxn4vmns242vl90j0b0siz69qr0";
        libraryHaskellDepends = [ base intervals time ];
        description = "Patterns for recurring events";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-qq" = callPackage
@@ -256071,8 +257369,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Quasi-quoter for UTCTime times";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256089,8 +257387,8 @@ self: {
          base doctest doctest-discover template-haskell time
        ];
        description = "Quasi-quoters for dates and times";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256108,8 +257406,8 @@ self: {
          test-framework-hunit time
        ];
        description = "Generate recurring dates";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256124,8 +257422,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256139,8 +257437,8 @@ self: {
        testHaskellDepends = [ base Cabal hspec QuickCheck ];
        doHaddock = false;
        description = "Library for Time Series processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256152,7 +257450,7 @@ self: {
        sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1";
        libraryHaskellDepends = [ base ];
        description = "A basic library for defining units of time as types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-w3c" = callPackage
@@ -256165,8 +257463,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base convertible parsec time ];
        description = "Parse, format and convert W3C Date and Time";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256204,8 +257502,8 @@ self: {
          time-units transformers
        ];
        description = "Distributed systems execution emulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256218,8 +257516,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256233,7 +257531,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
        description = "time each line of terminal output";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "timeit" = callPackage
@@ -256246,7 +257544,7 @@ self: {
        editedCabalFile = "0d4vjg48xyqjmydnjqjxica0zr30vgb91b3vv75cig686ikpjmq7";
        libraryHaskellDepends = [ base ];
        description = "Time monadic computations with an IO base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timelens" = callPackage
@@ -256257,7 +257555,7 @@ self: {
        sha256 = "0r57fib5nzvrk8gsn26364l1a14zj9sg3kv2db4pjzy3dq0zmrpl";
        libraryHaskellDepends = [ base lens time ];
        description = "Lenses for the time package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeless" = callPackage
@@ -256270,7 +257568,7 @@ self: {
          ansi-terminal base linear time transformers
        ];
        description = "An Arrow based Functional Reactive Programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeless-tutorials" = callPackage
@@ -256284,7 +257582,7 @@ self: {
        libraryHaskellDepends = [ base timeless ];
        executableHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timelike" = callPackage
@@ -256295,7 +257593,7 @@ self: {
        sha256 = "0gxpagh4pp0wfraryxvij52gm7b42alsgg8l34xsf6p06cxh8h5d";
        libraryHaskellDepends = [ base transformers ];
        description = "Type classes for types representing time";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "timelike-clock" = callPackage
@@ -256306,7 +257604,7 @@ self: {
        sha256 = "1bnwp4bzn58pmdcwnrarafvh8m28ahwsgl6lysrnyv7k2krb7qny";
        libraryHaskellDepends = [ base clock timelike transformers ];
        description = "Timelike interface for the clock library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "timelike-time" = callPackage
@@ -256317,7 +257615,7 @@ self: {
        sha256 = "07a853ggcbzggcm5sg943mgb7b2qy1dzmh2ghmix9iiyc5pm6jxy";
        libraryHaskellDepends = [ base time timelike transformers ];
        description = "Timelike interface for the time library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "timemap" = callPackage
@@ -256342,8 +257640,8 @@ self: {
          base containers criterion focus hashable list-t stm stm-containers
          time unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256360,8 +257658,8 @@ self: {
          base exceptions mtl QuickCheck tasty tasty-quickcheck time
        ];
        description = "Generalized sleep and timeout functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256377,7 +257675,7 @@ self: {
          base ghc-prim lifted-base monad-control mtl transformers-base
        ];
        description = "Updatable timeouts as a Monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeout-with-results" = callPackage
@@ -256389,7 +257687,7 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256405,8 +257703,8 @@ self: {
          attoparsec base bytestring containers convertible mtl time
        ];
        description = "Attoparsec parsers for various Date/Time formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256427,7 +257725,7 @@ self: {
          time transformers vcs-revision
        ];
        description = "A tool for visualizing time series from log files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeprint" = callPackage
@@ -256438,8 +257736,8 @@ self: {
        sha256 = "1anb14bih8728jsygx86fq077fs0gmy4gnkaa489zy5gh468a4bg";
        libraryHaskellDepends = [ base datetime ];
        description = "Prints timestamps after each line evaluated";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256452,7 +257750,7 @@ self: {
        libraryHaskellDepends = [ atomic-primops base psqueues vector ];
        testHaskellDepends = [ base ];
        description = "A timer wheel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timerep" = callPackage
@@ -256470,7 +257768,7 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck text time
        ];
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timers" = callPackage
@@ -256485,7 +257783,7 @@ self: {
          base lifted-base monad-control suspend transformers-base
        ];
        description = "Simple package that implements timers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timers-tick" = callPackage
@@ -256497,7 +257795,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "tick based timers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timers-updatable" = callPackage
@@ -256508,7 +257806,7 @@ self: {
        sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw";
        libraryHaskellDepends = [ base stm ];
        description = "timers which are updatable in the remaining time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeseries" = callPackage
@@ -256527,8 +257825,8 @@ self: {
          text-time time vector
        ];
        description = "Library for Time Series processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256540,7 +257838,7 @@ self: {
        sha256 = "1gzrdwysyk3lj5pr53w63c8mk0i22rip4v2jp4h38f85lanzwb2b";
        libraryHaskellDepends = [ base time ];
        description = "Useful timespan datatype and functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "timestamp" = callPackage
@@ -256555,7 +257853,7 @@ self: {
          base cereal foldl generic-random hashable QuickCheck time
        ];
        description = "Space-efficient Unix timestamp and utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "timestamp-subprocess-lines" = callPackage
@@ -256572,7 +257870,7 @@ self: {
          base bytestring process split time transformers
        ];
        description = "Run a command and timestamp its stdout/stderr lines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timestamper" = callPackage
@@ -256585,7 +257883,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base old-locale time ];
        description = "Read standard input and prepend each line with a timestamp";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "timeutils" = callPackage
@@ -256600,8 +257898,8 @@ self: {
        executableHaskellDepends = [ base brick microlens time vty ];
        testHaskellDepends = [ base hspec microlens time ];
        description = "Time utilities";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256621,8 +257919,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the zone-detect C library; plus tz-aware utils";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256638,7 +257936,7 @@ self: {
          base binary bytestring extensible-exceptions time timezone-series
        ];
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timezone-olson-th" = callPackage
@@ -256653,8 +257951,8 @@ self: {
          base template-haskell time timezone-olson timezone-series
        ];
        description = "Load TimeZoneSeries from an Olson file at compile time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256666,7 +257964,7 @@ self: {
        sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5";
        libraryHaskellDepends = [ base deepseq time ];
        description = "Enhanced timezone handling for Data.Time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timezone-unix" = callPackage
@@ -256686,8 +257984,8 @@ self: {
          base directory leapseconds tasty tasty-golden tasty-hunit time
          timezone-series
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256699,7 +257997,7 @@ self: {
        sha256 = "078p6gzzb7f9g68lm3q5806azhrs6li35ras9jnb9gs2r6i0w83j";
        libraryHaskellDepends = [ base time ];
        description = "Convenient functions for getting times";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tini" = callPackage
@@ -256711,8 +258009,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Tiny INI file and configuration library with a minimal dependency footprint";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256738,8 +258036,8 @@ self: {
        executableToolDepends = [ require ];
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256751,8 +258049,8 @@ self: {
        sha256 = "04bcz2ifkrw0f6razvzpycvzdbarv1ain800l4rapqyqzykgzxjw";
        libraryHaskellDepends = [ async base time ];
        description = "tiny no-brainer job scheduler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256768,8 +258066,8 @@ self: {
          attoparsec base bytestring hex serialport unix
        ];
        description = "TinyMesh - communicating with auto-meshing sensor network";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256794,8 +258092,8 @@ self: {
          vector
        ];
        description = "A fast DOM parser for a subset of XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256808,7 +258106,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        libraryToolDepends = [ c2hs ];
        description = "Wrapper around the 'tiny file dialogs' C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tinylog" = callPackage
@@ -256825,7 +258123,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simplistic logging using fast-logger";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "tinytemplate" = callPackage
@@ -256837,8 +258135,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base QuickCheck text ];
        description = "A tiny text templating library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256863,8 +258161,8 @@ self: {
          base optparse-applicative pretty pretty-show tip-lib
        ];
        description = "Convert from Haskell to Tip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256888,8 +258186,8 @@ self: {
          base filepath optparse-applicative pretty
        ];
        description = "tons of inductive problems - support library and tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256906,7 +258204,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec vector ];
        description = "Navigating and editing JSON data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "titan" = callPackage
@@ -256934,8 +258232,8 @@ self: {
          keera-hails-reactivevalues mtl network network-bsd template-haskell
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256953,8 +258251,8 @@ self: {
          base IfElse network network-bsd stm transformers Yampa
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256966,8 +258264,8 @@ self: {
        sha256 = "0h7d4152nd8mx4slyjss4kf7n1xn99vc5hnk072apqfv301vpbx3";
        libraryHaskellDepends = [ base Yampa ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256983,8 +258281,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Convert English Words to Title Case";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "tkhs" = callPackage
@@ -257002,8 +258300,8 @@ self: {
        ];
        testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        description = "Simple Presentation Utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257030,8 +258328,8 @@ self: {
          web-routes yesod yesod-core yesod-form yesod-static
        ];
        description = "A web-based visualizer for GHC Profiling Reports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257044,7 +258342,7 @@ self: {
        libraryHaskellDepends = [ base containers network-uri text ];
        testHaskellDepends = [ base HUnit network-uri text ];
        description = "This project separates subdomains, domains, and top-level-domains from URLs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tldr" = callPackage
@@ -257065,7 +258363,109 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Haskell tldr client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "tlex" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
+     , hspec, hspec-discover, QuickCheck, tlex-core
+     }:
+     mkDerivation {
+       pname = "tlex";
+       version = "0.2.0.0";
+       sha256 = "0ad2zxlwrkpz2lgqp9lyj4aaq0nicj8vxfys0hn63cv23arwr0cc";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base containers tlex-core ];
+       testHaskellDepends = [
+         base containers doctest hspec QuickCheck tlex-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A lexer generator";
+       license = "(Apache-2.0 OR MPL-2.0)";
+     }) {};
+
+  "tlex-core" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-doctest, containers
+     , doctest, hashable, hspec, hspec-discover, QuickCheck
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "tlex-core";
+       version = "0.2.1.0";
+       sha256 = "1qjzxsz7rl1fmfp1yzc2cdxjwz9nwjrxz6d18023cz41v1jympzq";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array base containers hashable transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         array base containers doctest hashable hspec QuickCheck
+         transformers unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A lexer generator";
+       license = "(Apache-2.0 OR MPL-2.0)";
+     }) {};
+
+  "tlex-debug" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
+     , hspec, hspec-discover, QuickCheck, tlex, tlex-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "tlex-debug";
+       version = "0.2.0.0";
+       sha256 = "0qj1wcdg9spf7vfwmpkqp5z74qzh9xkb4m6gv0v015krr8qvwc01";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base containers tlex tlex-core unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers doctest hspec QuickCheck tlex tlex-core
+         unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Debug utilities for Tlex";
+       license = "(Apache-2.0 OR MPL-2.0)";
+     }) {};
+
+  "tlex-encoding" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, charset, containers
+     , doctest, hspec, hspec-discover, QuickCheck, tlex, tlex-core
+     }:
+     mkDerivation {
+       pname = "tlex-encoding";
+       version = "0.2.0.0";
+       sha256 = "0krisx0fh85dccgcw6y1b3b1q2brwqz75hqg6r7w39rn0w7b5xm7";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base charset containers tlex tlex-core ];
+       testHaskellDepends = [
+         base charset containers doctest hspec QuickCheck tlex tlex-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Encoding plugin for Tlex";
+       license = "(Apache-2.0 OR MPL-2.0)";
+     }) {};
+
+  "tlex-th" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-doctest, containers
+     , doctest, ghc-prim, hspec, hspec-discover, QuickCheck
+     , template-haskell, tlex, tlex-core
+     }:
+     mkDerivation {
+       pname = "tlex-th";
+       version = "0.2.0.1";
+       sha256 = "19hlj81rxnki90imiz4zjklfl4ffbpkkd9iycq4wbj92i9vw4n8v";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array base containers ghc-prim template-haskell tlex tlex-core
+       ];
+       testHaskellDepends = [
+         array base containers doctest ghc-prim hspec QuickCheck
+         template-haskell tlex tlex-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "TemplateHaskell plugin for Tlex";
+       license = "(Apache-2.0 OR MPL-2.0)";
      }) {};
 
   "tls" = callPackage
@@ -257092,7 +258492,7 @@ self: {
          gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
        ];
        description = "TLS/SSL protocol native implementation (Server and Client)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tls-debug" = callPackage
@@ -257111,7 +258511,7 @@ self: {
          tls-session-manager x509 x509-store x509-system x509-validation
        ];
        description = "Set of programs for TLS testing and debugging";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tls-extra" = callPackage
@@ -257130,8 +258530,8 @@ self: {
          crypto-random cryptohash mtl network pem time tls vector
        ];
        description = "TLS extra default values and helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257147,7 +258547,7 @@ self: {
          auto-update base basement bytestring clock memory psqueues tls
        ];
        description = "In-memory TLS session manager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tlynx" = callPackage
@@ -257169,7 +258569,9 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Handle phylogenetic trees";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "tmapchan" = callPackage
@@ -257184,7 +258586,7 @@ self: {
          base containers hashable stm unordered-containers
        ];
        description = "An insert-ordered multimap (indexed FIFO) which consumes values as you lookup";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tmapmvar" = callPackage
@@ -257204,7 +258606,7 @@ self: {
          tasty tasty-quickcheck unordered-containers
        ];
        description = "A single-entity stateful Map in STM, similar to tmapchan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tmp-postgres" = callPackage
@@ -257239,8 +258641,8 @@ self: {
          base criterion deepseq postgres-options postgresql-simple temporary
        ];
        description = "Start and stop a temporary postgres";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257256,7 +258658,7 @@ self: {
          base bytestring directory template text
        ];
        description = "simple executable for templating";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tn" = callPackage
@@ -257278,8 +258680,8 @@ self: {
          base bytestring file-embed optparse-applicative optparse-helper
        ];
        description = "A simple daily journal program";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257292,7 +258694,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring utf8-string ];
        description = "Library for encoding/decoding TNET strings for PGI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "to" = callPackage
@@ -257311,7 +258713,7 @@ self: {
          base containers gauge text unordered-containers
        ];
        description = "Simple, safe, boring type conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "to-haskell" = callPackage
@@ -257325,8 +258727,8 @@ self: {
          base containers haskell-src-exts transformers
        ];
        description = "A type class and some utilities for generating Haskell code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257340,8 +258742,8 @@ self: {
        editedCabalFile = "1p5q59gswv86pk7hxpg1n81q4szhwx8rwfx5hsibdz9i9mgz2bbs";
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257353,8 +258755,8 @@ self: {
        sha256 = "1h5aq3shagzgh1j8sbslvi2rrkqv1djm595d522ci8hpj6h8vxl9";
        libraryHaskellDepends = [ bytestring pretty text to-string-class ];
        description = "Instances for the ToString class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257373,8 +258775,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Twitter bot generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257386,8 +258788,8 @@ self: {
        sha256 = "1gh2jdrxph0x9cc03kk8xxjyicivwcqfs9qv2nfr7mn570cmjrmw";
        libraryHaskellDepends = [ base ];
        description = "A todo bottom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257413,8 +258815,8 @@ self: {
          utf8-string
        ];
        description = "Easy-to-use TODOs manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257433,8 +258835,8 @@ self: {
          array base bytestring containers filepath hexpat hexpat-pickle
        ];
        description = "Reading and writing Haskell data from and to XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257453,7 +258855,7 @@ self: {
        ];
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257468,7 +258870,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        description = "Rate limiter using lazy bucket algorithm";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "token-limiter" = callPackage
@@ -257489,8 +258891,8 @@ self: {
          async base clock QuickCheck tasty tasty-hunit text
        ];
        description = "Fast rate limiting using the token bucket algorithm (BSD)";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257516,8 +258918,8 @@ self: {
          base bytestring conduit hashable hspec process streaming-commons
          text unordered-containers
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257529,8 +258931,8 @@ self: {
        sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch";
        libraryHaskellDepends = [ base containers text ];
        description = "A regex lexer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257547,7 +258949,7 @@ self: {
          base bytestring criterion deepseq filepath split text
        ];
        description = "Simple tokenizer for English text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tokenizer-monad" = callPackage
@@ -257558,7 +258960,7 @@ self: {
        sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn";
        libraryHaskellDepends = [ base bytestring text ];
        description = "An efficient and easy-to-use tokenizer monad";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tokenizer-streaming" = callPackage
@@ -257574,8 +258976,8 @@ self: {
          streaming-commons text tokenizer-monad
        ];
        description = "A variant of tokenizer-monad that supports streaming";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257600,8 +259002,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "TokTok C code style checker";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257617,7 +259019,7 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        executableHaskellDepends = [ base bytestring gf iconv ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257629,13 +259031,15 @@ self: {
        pname = "tokyocabinet-haskell";
        version = "0.0.6";
        sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk";
+       revision = "1";
+       editedCabalFile = "1mk2nwi51zm0b2081db26xipwa0yd53ikhxa5vd8fp8x2w52wliw";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ tokyocabinet ];
        testHaskellDepends = [ base bytestring directory HUnit mtl ];
        testSystemDepends = [ tokyocabinet ];
        description = "Haskell binding of Tokyo Cabinet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
@@ -257649,9 +259053,9 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ tokyocabinet tokyotyrant ];
        description = "FFI bindings to libtokyotyrant";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
@@ -257663,8 +259067,8 @@ self: {
        sha256 = "0xffc0xjkg1jqdq7s5x0y4gi13s9yhpcwb5zvrcbmv194bp65xx1";
        libraryHaskellDepends = [ base OpenAL stm vector ];
        description = "Easy to use library for audio programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257681,8 +259085,8 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring containers old-locale time
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257697,7 +259101,7 @@ self: {
        libraryHaskellDepends = [ array base text time ];
        libraryToolDepends = [ alex happy ];
        description = "Parser for the TOML configuration language";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "tomland" = callPackage
@@ -257728,7 +259132,7 @@ self: {
          unordered-containers
        ];
        description = "Bidirectional TOML serialization";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "tomlcheck" = callPackage
@@ -257745,7 +259149,7 @@ self: {
          base htoml-megaparsec megaparsec optparse-applicative text
        ];
        description = "Command-line tool to check syntax of TOML files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tonalude" = callPackage
@@ -257757,7 +259161,7 @@ self: {
        libraryHaskellDepends = [ base bytestring rio unliftio ];
        testHaskellDepends = [ base bytestring doctest Glob rio unliftio ];
        description = "A standard library for Tonatona framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonaparser" = callPackage
@@ -257771,7 +259175,7 @@ self: {
        libraryHaskellDepends = [ base envy rio say ];
        testHaskellDepends = [ base doctest envy Glob rio say tonatona ];
        description = "Scalable way to pass runtime configurations for tonatona";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonatona" = callPackage
@@ -257783,7 +259187,7 @@ self: {
        libraryHaskellDepends = [ base rio tonaparser ];
        testHaskellDepends = [ base doctest Glob rio tonaparser ];
        description = "meta application framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonatona-google-server-api" = callPackage
@@ -257805,8 +259209,8 @@ self: {
          tonatona
        ];
        description = "tonatona plugin for google-server-api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257819,7 +259223,7 @@ self: {
        libraryHaskellDepends = [ base rio tonaparser tonatona ];
        testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ];
        description = "tonatona plugin for logging";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonatona-persistent-postgresql" = callPackage
@@ -257839,7 +259243,9 @@ self: {
          resource-pool rio tonaparser tonatona
        ];
        description = "tonatona plugin for accessing PostgreSQL database";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "tonatona-persistent-sqlite" = callPackage
@@ -257859,7 +259265,9 @@ self: {
          resource-pool rio tonaparser tonatona
        ];
        description = "tonatona plugin for accessing Sqlite database";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "tonatona-servant" = callPackage
@@ -257882,8 +259290,8 @@ self: {
          wai-extra warp
        ];
        description = "tonatona plugin for servant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257928,8 +259336,8 @@ self: {
          vector
        ];
        description = "Cluster single cells and analyze cell clade relationships";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257965,8 +259373,8 @@ self: {
          text time wai warp yaml
        ];
        description = "Manage the TODO entries in your code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258008,8 +259416,8 @@ self: {
          base directory doctest filemanip tasty tasty-hunit zm
        ];
        description = "Top (typed oriented protocol) API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258029,7 +259437,7 @@ self: {
        ];
        description = "OpenGL Arcade Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258045,7 +259453,7 @@ self: {
          base base-compat base-orphans containers vector
        ];
        description = "Directed acyclic graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "torch" = callPackage
@@ -258056,8 +259464,8 @@ self: {
        sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc";
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        description = "Simple unit test library (or framework)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258073,7 +259481,7 @@ self: {
          base bencode binary bytestring containers filepath syb
        ];
        description = "BitTorrent file parser and generater";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "torsor" = callPackage
@@ -258084,7 +259492,7 @@ self: {
        sha256 = "173dn2n24xdlyymw5hqd6qd1r6h65bqrhpkcl49kccxr10xgb8vm";
        libraryHaskellDepends = [ base ];
        description = "Torsor Typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tostring" = callPackage
@@ -258095,7 +259503,7 @@ self: {
        sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg";
        libraryHaskellDepends = [ base case-insensitive text utf8-string ];
        description = "The ToString class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "total" = callPackage
@@ -258106,7 +259514,7 @@ self: {
        sha256 = "0zr3b83pwjbarxsl9kva6va3cp9b4npfp77yp0nh9q1za00344vk";
        libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "total-alternative" = callPackage
@@ -258117,7 +259525,7 @@ self: {
        sha256 = "1krm6jymnrr6iiys16rwar60avnaxpbn583szarnd4lqjhk0g5cq";
        libraryHaskellDepends = [ base ];
        description = "Alternative interface for total versions of partial function on the Prelude";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "total-map" = callPackage
@@ -258128,8 +259536,8 @@ self: {
        sha256 = "015bj6g4hjp38fc8bm5z57w6akdgvyab6j2sc666x0qdxgrdwp88";
        libraryHaskellDepends = [ base containers semiring-num ];
        description = "Finitely represented total maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258146,7 +259554,7 @@ self: {
          linear reflection semigroups vector
        ];
        description = "Dense and sparse total maps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "touched" = callPackage
@@ -258160,8 +259568,8 @@ self: {
        libraryHaskellDepends = [ base directory process time ];
        executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258179,7 +259587,7 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "A numeric tower";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "toxcore" = callPackage
@@ -258208,8 +259616,8 @@ self: {
          saltine text
        ];
        description = "A Tox protocol implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258235,8 +259643,8 @@ self: {
          data-default-class hspec QuickCheck saltine
        ];
        description = "Haskell bindings to the C reference implementation of Tox";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {toxcore = null;};
 
@@ -258256,8 +259664,8 @@ self: {
          silently time
        ];
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258314,8 +259722,8 @@ self: {
          array base criterion data-default-class vector
        ];
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258352,8 +259760,8 @@ self: {
          pipes-safe process stm transformers trifecta
        ];
        description = "simple, parallel job scheduling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258379,8 +259787,8 @@ self: {
          wai warp websockets wuss
        ];
        description = "Applications for interacting with the Pushbullet API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258412,8 +259820,8 @@ self: {
      }:
      mkDerivation {
        pname = "tptp";
-       version = "0.1.2.0";
-       sha256 = "0ccffd1pskfybyysaa1ilbsbgw0vga4x0q0awmj2wy05gbbzfb1y";
+       version = "0.1.3.0";
+       sha256 = "1blz39ksyf6svcrr55v5mn537qa42aymmfj76154wla328ll6nr4";
        libraryHaskellDepends = [
          attoparsec base prettyprinter scientific text
        ];
@@ -258422,8 +259830,8 @@ self: {
          prettyprinter QuickCheck scientific text
        ];
        description = "Parser and pretty printer for the TPTP language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258440,8 +259848,8 @@ self: {
          transformers-base
        ];
        description = "A monad transformer for tracing provenience of errors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258453,8 +259861,8 @@ self: {
        sha256 = "1fiz1v9d4ck8na68cywha53vgbgdk6iqad1zv6pj3lq0pwvkx6aw";
        libraryHaskellDepends = [ base containers mtl ];
        description = "functions for logging the arguments and results of function calls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258466,8 +259874,8 @@ self: {
        sha256 = "0c5nsq9x59rmdkyvcrr1v94kjya48nhl9pnsad6xdmh77msf33xy";
        libraryHaskellDepends = [ base ];
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258479,8 +259887,8 @@ self: {
        sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9";
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258493,7 +259901,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base mtl transformers ];
        description = "Tracing utilities for Functor/Applicative/Monad types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tracetree" = callPackage
@@ -258510,8 +259918,8 @@ self: {
          base bifunctors containers json mtl transformers
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258532,7 +259940,7 @@ self: {
          base containers hspec mtl stm text unliftio
        ];
        description = "Distributed tracing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tracing-control" = callPackage
@@ -258555,7 +259963,7 @@ self: {
          text
        ];
        description = "Distributed tracing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tracked-files" = callPackage
@@ -258570,8 +259978,8 @@ self: {
        executableHaskellDepends = [ base directory process text ];
        testHaskellDepends = [ base directory hspec process ];
        description = "Package to list all tracked and untracked existing files via Git";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258584,7 +259992,7 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258603,8 +260011,8 @@ self: {
          text time vty
        ];
        description = "A command-line tool for live monitoring";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258626,8 +260034,8 @@ self: {
          base hedgehog mmorph postgresql-simple resource-pool text
        ];
        description = "Tools for postgresql-simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258639,8 +260047,8 @@ self: {
        sha256 = "03s31yfhnv9h1h51810vx8dsfs8r09bqigr9hs3kgb3107vyny77";
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258673,7 +260081,7 @@ self: {
          megaparsec mtl pretty-show tasty tasty-hedgehog tasty-hunit text
          time transformers unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
   "traildb" = callPackage
@@ -258696,8 +260104,8 @@ self: {
          base bytestring cereal criterion deepseq directory random
        ];
        description = "TrailDB bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Judy = null; traildb = null;};
 
@@ -258720,8 +260128,8 @@ self: {
          http-types regexpr text unordered-containers uri
        ];
        description = "Tools and a library for working with Trajectory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258733,7 +260141,7 @@ self: {
        sha256 = "0hkwl1dygghym6w5qci53ylkhk298bzddfvahisr2gw5wibknrfs";
        libraryHaskellDepends = [ base ];
        description = "Monadic effect framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trans-fx-data" = callPackage
@@ -258744,7 +260152,7 @@ self: {
        sha256 = "0y4hnn1ixgsqd9x829cxyn0n2psxpjczxxaa99jv9wrfwfvssgid";
        libraryHaskellDepends = [ base trans-fx-core ];
        description = "Monadic effect framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trans-fx-io" = callPackage
@@ -258756,7 +260164,7 @@ self: {
        libraryHaskellDepends = [ base time trans-fx-core trans-fx-data ];
        testHaskellDepends = [ base time trans-fx-core ];
        description = "Monadic effect framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transaction" = callPackage
@@ -258772,7 +260180,7 @@ self: {
          base doctest Glob hspec mono-traversable QuickCheck
        ];
        description = "Monadic representation of transactions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "transactional-events" = callPackage
@@ -258785,8 +260193,8 @@ self: {
        editedCabalFile = "10sdjrzyld7wpzw687vrs91vk98pf3zk1cv9hj11jqnbnlbfbqcs";
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258805,8 +260213,8 @@ self: {
          mtl process semigroups
        ];
        description = "Text transformer and interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258835,8 +260243,8 @@ self: {
          base bytestring cpu hspec QuickCheck sqlcli store time transformers
        ];
        description = "ODBC database transfer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258857,8 +260265,8 @@ self: {
          base containers criterion mtl multirec parsec QuickCheck
        ];
        description = "Generic representation of tree transformations";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258870,8 +260278,8 @@ self: {
        sha256 = "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "transformers-abort" = callPackage
@@ -258887,7 +260295,7 @@ self: {
          transformers-base
        ];
        description = "Error and short-circuit monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-base" = callPackage
@@ -258902,7 +260310,7 @@ self: {
          base base-orphans stm transformers transformers-compat
        ];
        description = "Lift computations from the bottom of a transformer stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-bifunctors" = callPackage
@@ -258915,7 +260323,7 @@ self: {
        editedCabalFile = "1vjyk2ldwfi2pkvk79p37ii5xgg1399kxqhkq3l4wvag4j5p4afs";
        libraryHaskellDepends = [ base mmorph transformers ];
        description = "Bifunctors over monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-compat" = callPackage
@@ -258926,7 +260334,7 @@ self: {
        sha256 = "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "A small compatibility shim for the transformers library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-compose" = callPackage
@@ -258937,8 +260345,8 @@ self: {
        sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d";
        libraryHaskellDepends = [ base transformers ];
        description = "Arrow-like / category-like composition for transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258950,7 +260358,7 @@ self: {
        sha256 = "0h0qbhk7b4wm3h06m26ga3i6rqw60fjs469iq6p3j6pdvq58bb5x";
        libraryHaskellDepends = [ base transformers ];
        description = "Control flow data type and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-convert" = callPackage
@@ -258968,8 +260376,8 @@ self: {
          HUnit QuickCheck text transformers unix
        ];
        description = "Sensible conversions between some of the monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258988,8 +260396,8 @@ self: {
          base criterion effect-interpreters mtl pipes transformers
        ];
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {effect-interpreters = null;};
 
@@ -259001,7 +260409,7 @@ self: {
        sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7";
        libraryHaskellDepends = [ base exceptions text transformers ];
        description = "An Either monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-except" = callPackage
@@ -259012,7 +260420,7 @@ self: {
        sha256 = "1i89k4bml223f7m3pin73vrz51xb2j7q7rr39x9v587hmm40mvkm";
        libraryHaskellDepends = [ base exceptions text transformers ];
        description = "An Except monad transformer with";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-fix" = callPackage
@@ -259025,7 +260433,7 @@ self: {
        editedCabalFile = "126gyjr8jp42md6nblx7c0kan97jgsakvsf2vzv2pj828ax1icrs";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad transformer for evaluating to a fixpoint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-free" = callPackage
@@ -259038,7 +260446,7 @@ self: {
        editedCabalFile = "1zkizjg2pincjf9kj254153bsrivywk141wz9wlnl0i56wl9cy7i";
        libraryHaskellDepends = [ base transformers ];
        description = "Free monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-lift" = callPackage
@@ -259051,8 +260459,8 @@ self: {
          base transformers writer-cps-transformers
        ];
        description = "Ad-hoc type classes for lifting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259064,8 +260472,8 @@ self: {
        sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s";
        libraryHaskellDepends = [ base transformers ];
        description = "A unified interface for the run operation of monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259077,7 +260485,7 @@ self: {
        sha256 = "09f9n3cxi3sjmd8yscvcyahvdsqa5db5bckj9ryaflswsdm0ximq";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Supply applicative, monad, applicative transformer and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transient" = callPackage
@@ -259097,7 +260505,7 @@ self: {
          transformers
        ];
        description = "composing programs with multithreading, events and distributed computing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "transient-universe" = callPackage
@@ -259132,8 +260540,8 @@ self: {
          transformers transient vector websockets
        ];
        description = "fully composable remote execution for the creation of distributed systems";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259150,8 +260558,8 @@ self: {
          transient-universe x509-store x509-system
        ];
        description = "transient with secure communications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259165,8 +260573,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259179,8 +260587,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base curl json network utf8-string ];
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259198,8 +260606,8 @@ self: {
        executableHaskellDepends = [ base text turtle ];
        testHaskellDepends = [ base HUnit ];
        description = "Translation cli tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259218,8 +260626,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Type Safe Web Routing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259236,8 +260644,8 @@ self: {
          http-media http-types text trasa
        ];
        description = "Type safe http requests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259255,8 +260663,8 @@ self: {
          mtl path-pieces quantification text trasa trasa-server
        ];
        description = "Extra functions for trasa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259275,8 +260683,8 @@ self: {
          unordered-containers
        ];
        description = "generate forms using lucid, ditto and trasa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259293,8 +260701,8 @@ self: {
          reflex reflex-dom text trasa
        ];
        description = "Reactive Type Safe Routing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "trasa-server" = callPackage
@@ -259310,8 +260718,8 @@ self: {
          mtl text trasa wai
        ];
        description = "Type safe web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259328,8 +260736,8 @@ self: {
        ];
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259345,8 +260753,8 @@ self: {
        testHaskellDepends = [ base template-haskell util ];
        benchmarkHaskellDepends = [ base gauge template-haskell util ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259361,7 +260769,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Generic applicative traversals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "travis" = callPackage
@@ -259378,8 +260786,8 @@ self: {
          aeson base bytestring http-conduit transformers
        ];
        description = "A simple client implementation using Travis CI API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259409,8 +260817,8 @@ self: {
          yaml
        ];
        description = ".travis.yml preprocessor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259425,7 +260833,7 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative process ];
        executableHaskellDepends = [ base ];
        description = "A better travis_wait";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trawl" = callPackage
@@ -259443,8 +260851,8 @@ self: {
          split
        ];
        description = "A tool for finding haddocks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259459,8 +260867,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk process ];
        description = "Tray Icon application to PowerOff / Reboot computer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259475,8 +260883,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mersenne-random-pure64 ];
        testHaskellDepends = [ base doctest Glob hspec hspec-core ];
        description = "Efficient implementation of the implicit treap data structure";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259504,7 +260912,7 @@ self: {
          tagged tasty tasty-golden tasty-quickcheck trifecta
        ];
        description = "Diffing of (expression) trees";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "tree-fun" = callPackage
@@ -259515,7 +260923,7 @@ self: {
        sha256 = "07vgsps4kjld75ndnjjaigsk5vvg11vjp740pznhsw79k3qjbs9a";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Library for functions pertaining to tree exploration and manipulation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tree-monad" = callPackage
@@ -259526,7 +260934,7 @@ self: {
        sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf";
        libraryHaskellDepends = [ base ];
        description = "Non-Determinism Monad for Tree Search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-render-text" = callPackage
@@ -259537,8 +260945,8 @@ self: {
        sha256 = "04mmmj443aa8lkdj33dsk7zf985mnzfikzg10715vn5khrll0pgq";
        libraryHaskellDepends = [ base boxes containers mtl ];
        description = "Configurable text rendering of trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259556,7 +260964,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Unstable bindings for the tree-sitter parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-go" = callPackage
@@ -259568,7 +260976,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Go";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-haskell" = callPackage
@@ -259581,7 +260989,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-java" = callPackage
@@ -259593,7 +261001,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Java";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-json" = callPackage
@@ -259605,7 +261013,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-php" = callPackage
@@ -259617,7 +261025,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for PHP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-python" = callPackage
@@ -259629,7 +261037,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Python";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-ql" = callPackage
@@ -259641,7 +261049,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for QL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-ruby" = callPackage
@@ -259653,7 +261061,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Ruby";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-rust" = callPackage
@@ -259665,7 +261073,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Rust";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-tsx" = callPackage
@@ -259677,7 +261085,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TSX";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-typescript" = callPackage
@@ -259689,7 +261097,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TypeScript";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-traversals" = callPackage
@@ -259701,8 +261109,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest mtl ];
        description = "Functions and newtype wrappers for traversing Trees";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259716,7 +261124,7 @@ self: {
        editedCabalFile = "0f4sls511c4axp92r07yk0b4h9wvlbk5345643q4gvy1adxwdyw5";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Render trees as foldable HTML and Unicode art";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "treefold" = callPackage
@@ -259731,7 +261139,7 @@ self: {
        testHaskellDepends = [ base doctest hedgehog ];
        benchmarkHaskellDepends = [ base containers criterion random ];
        description = "Provides folds which try to combine elements in a balanced way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "treemap" = callPackage
@@ -259751,8 +261159,8 @@ self: {
          tasty-hunit text transformers
        ];
        description = "A tree of Data.Map.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259768,8 +261176,8 @@ self: {
          base Cabal containers filepath ghc html parsec regex-posix
        ];
        description = "Generates HTML for Data.Tree as TreeMap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259789,8 +261197,8 @@ self: {
        ];
        doHaddock = false;
        description = "Treemap related commands for producing foldable TreeMap HTML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259802,8 +261210,8 @@ self: {
        sha256 = "0an35kz6hq5m7wc16d08v1i05zr8fp4v2yrf6zay2lfas1ilh3i2";
        libraryHaskellDepends = [ base haste-compiler sneathlane-haste ];
        description = "Structure Editing Combinators";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "treeseq" = callPackage
@@ -259814,7 +261222,7 @@ self: {
        sha256 = "105gj9s8gp4xc4i7ank8m6pjc80kywl7vn53qdxfrndaljv4kark";
        libraryHaskellDepends = [ base containers ];
        description = "Library for a multi-way tree (rose tree), using Seq (finger tree) for forests";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "treeviz" = callPackage
@@ -259827,7 +261235,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
        description = "Visualization of computation decomposition trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trek" = callPackage
@@ -259838,7 +261246,7 @@ self: {
        sha256 = "02rvyq11591d83rxhmb3c9bi7ahsh7lpwf2a7am2fd3625l5rq55";
        libraryHaskellDepends = [ base logict mtl ];
        testHaskellDepends = [ base logict mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trek-app" = callPackage
@@ -259871,8 +261279,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259896,8 +261304,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259909,7 +261317,7 @@ self: {
        sha256 = "038qn30g82c2wzalhbgb6cglclld8kfmi6m1q76mr9yl9s2h6mf1";
        libraryHaskellDepends = [ base lens logict mtl trek ];
        testHaskellDepends = [ base lens logict mtl trek ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tremulous-query" = callPackage
@@ -259924,8 +261332,8 @@ self: {
          attoparsec base bytestring containers deepseq mtl network
        ];
        description = "Library for polling Tremulous servers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259936,8 +261344,8 @@ self: {
        version = "0.2.2";
        sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3";
        description = "Deprecated";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259954,7 +261362,7 @@ self: {
          base dlist doctest hedgehog hspec hspec-hedgehog splitmix
        ];
        description = "Trial Data Structure";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "trial-optparse-applicative" = callPackage
@@ -259965,7 +261373,7 @@ self: {
        sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn";
        libraryHaskellDepends = [ base optparse-applicative trial ];
        description = "Trial helper functions for optparse-applicative";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "trial-tomland" = callPackage
@@ -259976,7 +261384,7 @@ self: {
        sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23";
        libraryHaskellDepends = [ base text tomland trial ];
        description = "Trial helper functions for tomland";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "triangulation" = callPackage
@@ -259991,8 +261399,8 @@ self: {
          array base collada-types haskell98 tuple vector vector-algorithms
        ];
        description = "triangulation of polygons";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260012,7 +261420,7 @@ self: {
          base containers criterion deepseq mwc-random vector
        ];
        description = "Simple Map-based Trie";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tries" = callPackage
@@ -260041,8 +261449,8 @@ self: {
          unordered-containers
        ];
        description = "Various trie implementations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260058,8 +261466,8 @@ self: {
        pname = "trifecta";
        version = "2.1";
        sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs";
-       revision = "2";
-       editedCabalFile = "17b0wxwgf52xdm597x0ybq1g2yrvfihl32jpd989xsm6n7s7y21a";
+       revision = "3";
+       editedCabalFile = "0ag08di787zqzz70nwhsfigsvqbmbg7bkq011znq145yg750jcwl";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal array base blaze-builder blaze-html blaze-markup
@@ -260070,7 +261478,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest parsers QuickCheck ];
        description = "A modern parser combinator library with convenient diagnostics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trigger" = callPackage
@@ -260091,8 +261499,8 @@ self: {
        executableHaskellDepends = [ base protolude ];
        testHaskellDepends = [ base hspec protolude ];
        description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260108,8 +261516,8 @@ self: {
        executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [ base hspec ];
        description = "A command-line tool for trimming whitespace";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260124,7 +261532,7 @@ self: {
        executableHaskellDepends = [ base bio bytestring simpleargs ];
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260140,8 +261548,8 @@ self: {
          base bytestring cereal filepath leveldb-haskell
        ];
        description = "A very simple triple store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260161,7 +261569,7 @@ self: {
          tasty-quickcheck
        ];
        description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trivia" = callPackage
@@ -260172,8 +261580,8 @@ self: {
        sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
        libraryHaskellDepends = [ base comonad distributive ];
        description = "The trivial monad and comonad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260185,8 +261593,8 @@ self: {
        sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5";
        libraryHaskellDepends = [ base ];
        description = "Constraints that any type, resp. no type fulfills";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260198,8 +261606,8 @@ self: {
        sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2";
        libraryHaskellDepends = [ base semiring-simple ];
        description = "A library for tropical mathematics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260224,8 +261632,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A Tropical Geometry package for Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260240,8 +261648,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base containers template-haskell time ];
        description = "Template Haskell hack to violate module abstractions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260255,8 +261663,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio file compressor-limiter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260279,8 +261687,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
        description = "Haskell template code generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260292,7 +261700,7 @@ self: {
        sha256 = "0p8z1n7y6zfx7ff349fb8d8ld08hj70yz2s9sb3wf8riv0rywzp4";
        libraryHaskellDepends = [ base ];
        description = "Typeclass for truthfulness of values";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tsession" = callPackage
@@ -260305,8 +261713,8 @@ self: {
        editedCabalFile = "0msyf0rkd6aj8y632ippnrz554r6r5l7j45dnlnqlf1kls29kn5g";
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260320,8 +261728,8 @@ self: {
          base happstack-server transformers tsession
        ];
        description = "A Transaction Framework for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260334,7 +261742,7 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ async base stm ];
        description = "Hides duplicating channels when broadcasting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tskiplist" = callPackage
@@ -260366,7 +261774,7 @@ self: {
        ];
        description = "-";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tslogger" = callPackage
@@ -260380,7 +261788,7 @@ self: {
          async base bytestring containers random text
        ];
        description = "Thread-safe logging, with additional interleaving fuzz-testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tsne" = callPackage
@@ -260412,8 +261820,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss stm vector ];
        description = "Real time TSP tour visualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260431,8 +261839,8 @@ self: {
          base Decimal parsec pretty process split time
        ];
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260444,7 +261852,7 @@ self: {
        sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx";
        libraryHaskellDepends = [ base ];
        description = "BK-tree implementation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tsuntsun" = callPackage
@@ -260464,8 +261872,8 @@ self: {
          typed-process
        ];
        description = "Interacts with tesseract to ease reading of RAW Japanese manga";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260480,7 +261888,7 @@ self: {
        libraryHaskellDepends = [ base HUnit split ];
        executableHaskellDepends = [ base ];
        description = "Convert tsv to csv";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tsvsql" = callPackage
@@ -260498,8 +261906,8 @@ self: {
          string-qq text unordered-containers
        ];
        description = "Template tsv into SQL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260528,8 +261936,8 @@ self: {
          text time transformers
        ];
        description = "An API binding Web.Spock to Database.Beam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260552,8 +261960,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "This is task management tool for yourself, that inspired by scrum";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260570,7 +261978,7 @@ self: {
          base bytestring tasty tasty-hunit template-haskell text
        ];
        description = "Textual Type Classes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ttl-hashtables" = callPackage
@@ -260592,7 +262000,7 @@ self: {
          hspec mtl transformers
        ];
        description = "Extends hashtables so that entries added can be expired after a TTL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ttn" = callPackage
@@ -260610,8 +262018,8 @@ self: {
          aeson base hspec hspec-expectations raw-strings-qq
        ];
        description = "Things Tracker Network JSON Types";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "ttn-client" = callPackage
@@ -260631,7 +262039,9 @@ self: {
        ];
        executableHaskellDepends = [ base text time ttn ];
        description = "TheThingsNetwork client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "ttrie" = callPackage
@@ -260658,7 +262068,7 @@ self: {
          unordered-containers vector
        ];
        description = "Contention-free STM hash map";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tttool" = callPackage
@@ -260683,8 +262093,8 @@ self: {
          random split spool template-haskell text time vector yaml zlib
        ];
        description = "Working with files for the Tiptoi® pen";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260701,8 +262111,8 @@ self: {
          transformers
        ];
        description = "Write stream processing computations with side effects in a series of tubes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260714,8 +262124,8 @@ self: {
        sha256 = "0q6g2wcjddb9r1l9fxpn2qcssw5gyfwsam15rc3q6xjqbwz7fm41";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Interface to TUN/TAP drivers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260729,8 +262139,8 @@ self: {
        editedCabalFile = "15jav5fj1ggjczn2mh4yv5rmsfydwc17vzlah3j1z5mkyq1691i8";
        libraryHaskellDepends = [ base ioctl ];
        description = "A simple tun/tap library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260745,8 +262155,8 @@ self: {
        libraryHaskellDepends = [ base cpphs ];
        executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        description = "Homogeneous tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260758,7 +262168,7 @@ self: {
        sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
        libraryHaskellDepends = [ base OneTuple ];
        description = "Various functions on tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tuple-gen" = callPackage
@@ -260769,8 +262179,8 @@ self: {
        sha256 = "0bgwsxq8wrh76hhbwadv0rag4c7dx3644zrh2aflnsych0rncvd7";
        libraryHaskellDepends = [ base combinat ];
        description = "Enum instances for tuples where the digits increase with the same speed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260782,7 +262192,7 @@ self: {
        sha256 = "034yzdwksydl9dxprv786lznwdfafa1nnzcsywjd40zv6las3gdm";
        libraryHaskellDepends = [ base ];
        description = "Generic operations on tuples";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tuple-hlist" = callPackage
@@ -260794,7 +262204,7 @@ self: {
        libraryHaskellDepends = [ base HList OneTuple ];
        description = "Functions to convert between tuples and HLists";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tuple-lenses" = callPackage
@@ -260805,8 +262215,8 @@ self: {
        sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Stock FieldN combos and generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260820,8 +262230,8 @@ self: {
        editedCabalFile = "1npahk37am7x6n4lfdk6y1i1690drg39j63gzb2jx5ivzxhlcp43";
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260833,8 +262243,8 @@ self: {
        sha256 = "09993bfndv2iljq6sspihysv22d2f8g0lar03p7ghiyp81m6j0ax";
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260847,7 +262257,7 @@ self: {
        libraryHaskellDepends = [ base generics-sop ];
        testHaskellDepends = [ base generics-sop ];
        description = "functions on n-ary tuples using generics-sop";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tuple-th" = callPackage
@@ -260858,7 +262268,7 @@ self: {
        sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Generate (non-recursive) utility functions for tuples of statically known size";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tupleinstances" = callPackage
@@ -260869,8 +262279,8 @@ self: {
        sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Functor, Applicative and Monad for n-ary tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260887,7 +262297,7 @@ self: {
          base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck
        ];
        description = "Small monomorphic tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tuples-homogenous-h98" = callPackage
@@ -260898,7 +262308,7 @@ self: {
        sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2";
        libraryHaskellDepends = [ base ];
        description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turing" = callPackage
@@ -260921,8 +262331,8 @@ self: {
        sha256 = "1anh6x4vdkys5b89ni18gsh3fl68v667qg5aw1867s4hwlvsii35";
        libraryHaskellDepends = [ base ];
        description = "A simple simulator for Turing machines";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260936,8 +262346,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260954,8 +262364,8 @@ self: {
          base containers hspec hspecVariant QuickCheck QuickCheckVariant
        ];
        description = "An implementation of Turing Machine and Automaton";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260971,7 +262381,7 @@ self: {
        executableHaskellDepends = [ base containers vector ];
        testHaskellDepends = [ base HUnit ];
        description = "Haskell port of Deniz Yuret's Turkish deasciifier";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "turn-loop" = callPackage
@@ -260982,7 +262392,7 @@ self: {
        sha256 = "180yplkjf0c4n17a5ad2pakjwnh7830rldzmaqjj7gwcl3pg0lc6";
        libraryHaskellDepends = [ base containers stm ];
        description = "Manage multiple turned-based sessions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turni" = callPackage
@@ -260995,7 +262405,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers MonadRandom random ];
        description = "shifts scheduling tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turtle" = callPackage
@@ -261018,7 +262428,7 @@ self: {
        testHaskellDepends = [ base doctest system-filepath temporary ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turtle_1_5_21" = callPackage
@@ -261041,8 +262451,8 @@ self: {
        testHaskellDepends = [ base doctest system-filepath temporary ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -261058,8 +262468,8 @@ self: {
        executableHaskellDepends = [ base turtle ];
        testHaskellDepends = [ base HUnit parsec ];
        description = "Collection of command line options and parsers for these options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261073,7 +262483,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
        description = "Trailing Whitespace";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tweak" = callPackage
@@ -261084,8 +262494,8 @@ self: {
        sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw";
        libraryHaskellDepends = [ base containers lens stm transformers ];
        description = "A library for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261102,8 +262512,8 @@ self: {
          base containers jukebox pretty split twee-lib
        ];
        description = "An equational theorem prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261119,7 +262529,7 @@ self: {
          base containers dlist ghc-prim pretty primitive transformers vector
        ];
        description = "An equational theorem prover";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tweet-hs" = callPackage
@@ -261146,8 +262556,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        description = "Command-line tool for twitter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261159,7 +262569,7 @@ self: {
        sha256 = "1kmf907i6g6lfhw8g403b6701srrd298n4r53dvcqzy72c5qaixl";
        libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twentefp-eventloop-graphics" = callPackage
@@ -261176,8 +262586,8 @@ self: {
          base network text twentefp-number twentefp-websockets
        ];
        description = "Used as Lab Assignments Environment at the University of Twente";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261189,8 +262599,8 @@ self: {
        sha256 = "03aj2awy7prznv8m7048idvn0vs3rfrbcamr4zakjdpxyjknz054";
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261202,8 +262612,8 @@ self: {
        sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir";
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261215,7 +262625,7 @@ self: {
        sha256 = "1kh0a6h4syx98ygwidw6cc24ci91v1blshpfcczx96z850x1h6xf";
        libraryHaskellDepends = [ base parsec ];
        description = "Lab Assignments Environment at Univeriteit Twente";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twentefp-rosetree" = callPackage
@@ -261229,8 +262639,8 @@ self: {
          base twentefp-eventloop-graphics twentefp-number
        ];
        description = "RoseTree type and show functions for lab assignment of University of Twente";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261242,8 +262652,8 @@ self: {
        sha256 = "0mmj96xbqjzm4cylk39pib9jfwh6m350q1cwf6ij8pl0swab3b0g";
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261262,8 +262672,8 @@ self: {
          network random SHA text
        ];
        description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261293,8 +262703,8 @@ self: {
          base Cabal cabal-test-quickcheck HUnit-Plus QuickCheck split vector
        ];
        description = "Rubik's cube solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261320,8 +262730,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "They Work For You API Client Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261352,8 +262762,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "CLI twitter client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261375,7 +262785,7 @@ self: {
        ];
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261388,7 +262798,7 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261415,8 +262825,8 @@ self: {
        ];
        doCheck = false;
        description = "Twilio REST API library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261435,8 +262845,8 @@ self: {
          QuickCheck text time
        ];
        description = "Twilio API interaction";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261454,7 +262864,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "TwiML library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twine" = callPackage
@@ -261469,8 +262879,8 @@ self: {
          base bytestring containers convertible filepath mtl parsec
        ];
        description = "very simple template language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261492,8 +262902,8 @@ self: {
          proto-lens-jsonpb proto-lens-runtime servant text wai
        ];
        description = "Haskell twirp foundations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261510,7 +262920,7 @@ self: {
        ];
        description = "Simulator of twisty puzzles à la Rubik's Cube";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "twitch" = callPackage
@@ -261530,7 +262940,7 @@ self: {
          optparse-applicative time transformers
        ];
        description = "A high level file watcher DSL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "twitter" = callPackage
@@ -261547,8 +262957,8 @@ self: {
          base curl directory filepath json mtl old-locale readline time xml
        ];
        description = "A Haskell-based CLI Twitter client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261562,8 +262972,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.5.0";
-       sha256 = "1rh68ll9dv0axql5npvk547ykqbarak3frpwdflblfm3hrfnwfgf";
+       version = "0.5.1";
+       sha256 = "0xhkxgpcz6fzkc1w69542zk5y58irw33ljmg8bfl3xi722yazvgs";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
@@ -261579,8 +262989,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261599,8 +263009,8 @@ self: {
          transformers
        ];
        description = "Twitter API package with enumerator interface and Streaming API support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261622,8 +263032,8 @@ self: {
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "Client for fetching Twitter timeline via Oauth";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261645,7 +263055,7 @@ self: {
          unordered-containers
        ];
        description = "Twitter JSON parser and types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -261660,7 +263070,7 @@ self: {
          base lens template-haskell text time twitter-types
        ];
        description = "Twitter JSON types (lens powered)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tx" = callPackage
@@ -261675,8 +263085,8 @@ self: {
          base bytestring cereal safecopy stm transformers
        ];
        description = "Persistent transactions on top of STM";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261695,8 +263105,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261714,7 +263124,7 @@ self: {
          base binary bytestring containers directory parsec regex-posix
        ];
        description = "The SQL link in your *NIX chain";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "txt2rtf" = callPackage
@@ -261738,8 +263148,8 @@ self: {
        sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb";
        libraryHaskellDepends = [ base ];
        description = "Deprecated in favor of eros";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261753,7 +263163,7 @@ self: {
        editedCabalFile = "0sxqrkqchr3zcks68wljp722f5sndxz1fw5a2qi599i984v91y0l";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Typed type representations and equality proofs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tyfam-witnesses" = callPackage
@@ -261764,8 +263174,8 @@ self: {
        sha256 = "0gsx2syy58gq7n2yi4whslbnwg4dh34x8jy56h11k8z6n01inppc";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Provide proof witnesses for closed type family evaluation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261784,8 +263194,8 @@ self: {
          base bytestring directory filepath ghc process
        ];
        description = "Analyzes Haskell source files for easy reference";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261798,7 +263208,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Various type-aligned sequence data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-assertions" = callPackage
@@ -261810,8 +263220,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec test-fixture ];
        description = "Runtime type assertions for testing";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261823,7 +263233,7 @@ self: {
        sha256 = "11kbnfbvclkdwirnnpdi4f20pibdar4l47anvnkaxxl330zi7yfh";
        libraryHaskellDepends = [ base ];
        description = "Type-level booleans via type-families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-cache" = callPackage
@@ -261838,8 +263248,8 @@ self: {
          base containers lens lens-utils template-haskell
        ];
        description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261856,8 +263266,8 @@ self: {
          type-spine
        ];
        description = "Type-level serialization of type constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261871,8 +263281,8 @@ self: {
        editedCabalFile = "1m975zq2mxlzk5h4nzrkaxjx5w79p3ws3yli3m6cn3245pjygv5w";
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261888,8 +263298,8 @@ self: {
          base haskell-src-meta template-haskell type-combinators
        ];
        description = "Quasiquoters for the 'type-combinators' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261901,8 +263311,8 @@ self: {
        sha256 = "00cwlfcka2d1wcp7159r3sk3gz852dmc71jvjfr8bn1rrr781n0q";
        libraryHaskellDepends = [ base singletons type-combinators ];
        description = "Interop between /type-combinators/ and /singletons/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261914,8 +263324,8 @@ self: {
        sha256 = "0rmqy3wcypyq09gnfz0xvkr2ly9gnpsjnil2n981ajfxsk2shi58";
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261930,8 +263340,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
        description = "Type equality evidence you can carry around";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261941,11 +263351,11 @@ self: {
        pname = "type-equality";
        version = "1";
        sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27";
-       revision = "1";
-       editedCabalFile = "13lsff17dxz852f5bhjz8d1by704rzvwr67qqfc5dz5s7xc28qyk";
+       revision = "2";
+       editedCabalFile = "1a3irpv5kyg3rywhmcp5fwg5irrdbdr0hrlw7asdk113nakrba7j";
        libraryHaskellDepends = [ base ];
        description = "Data.Type.Equality compat package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-equality-check" = callPackage
@@ -261956,7 +263366,7 @@ self: {
        sha256 = "1r0g2xpkyj3765z07s559xy9vx4ipwnlk13sxrbcjds7wghfb8ci";
        libraryHaskellDepends = [ base type-level ];
        description = "Type equality check";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-errors" = callPackage
@@ -261977,7 +263387,7 @@ self: {
          th-abstraction
        ];
        description = "Tools for writing better type errors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-errors-pretty" = callPackage
@@ -261991,7 +263401,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Combinators for writing pretty type errors easily";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "type-fun" = callPackage
@@ -262003,8 +263413,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Collection of widely reimplemented type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262016,7 +263426,7 @@ self: {
        sha256 = "1ib1d5z9wxc63hq2gyxplpzs49k5rfafgz1r59bqsqh63yk4lly8";
        libraryHaskellDepends = [ base kinds ];
        description = "Emulation of type-level functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-hint" = callPackage
@@ -262027,7 +263437,7 @@ self: {
        sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i";
        libraryHaskellDepends = [ base ];
        description = "Guide type inference with proxy values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-indexed-queues" = callPackage
@@ -262049,8 +263459,8 @@ self: {
          base containers criterion pqueue random
        ];
        description = "Queues with verified and unverified versions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262062,8 +263472,8 @@ self: {
        sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type Level 2s- and 16s- Complement Integers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262076,8 +263486,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262094,7 +263504,7 @@ self: {
          vector-builder
        ];
        description = "Typeclasses for injective relations and isomorphisms between types";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "type-level" = callPackage
@@ -262105,7 +263515,7 @@ self: {
        sha256 = "03w9dkb2d8351y2ic2wxh1sr2dnwh9ph9qa5mak0iciqraxvqxlr";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Type-level programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-bst" = callPackage
@@ -262116,8 +263526,8 @@ self: {
        sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk";
        libraryHaskellDepends = [ base ];
        description = "type-level binary search trees in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262130,7 +263540,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Provides integers lifted to the type level";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-kv-list" = callPackage
@@ -262142,7 +263552,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A module for hash map like object with type level keys";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "type-level-natural-number" = callPackage
@@ -262153,7 +263563,7 @@ self: {
        sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
        libraryHaskellDepends = [ base ];
        description = "Simple type level natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-natural-number-induction" = callPackage
@@ -262166,8 +263576,8 @@ self: {
          base transformers type-level-natural-number
        ];
        description = "High-level combinators for performing inductive operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262179,8 +263589,8 @@ self: {
        sha256 = "0vql5q5zhbhmwv0wqqb0xi4ayqdsz149rymhs730c583pq0h9r3w";
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Basic operations on type-level natural numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262193,7 +263603,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Type level numbers implemented using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-sets" = callPackage
@@ -262206,7 +263616,7 @@ self: {
        editedCabalFile = "0cc0ws2plharq0gvindgmkp1fs82zd43zijkh7wf0ilfnr2l17z2";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-tf" = callPackage
@@ -262217,7 +263627,7 @@ self: {
        sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Type-level programming library (type families)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-list" = callPackage
@@ -262228,8 +263638,8 @@ self: {
        sha256 = "03395ivxda6mihjzn89rzvf0nkk0g16n207wvz4f61ky8r5mzfpz";
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262246,25 +263656,34 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Type-indexed maps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "type-natural" = callPackage
-    ({ mkDerivation, base, constraints, equational-reasoning
-     , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons
-     , singletons-presburger, template-haskell
+    ({ mkDerivation, base, constraints, equational-reasoning, ghc
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise
+     , ghc-typelits-presburger, integer-logarithms, QuickCheck
+     , quickcheck-instances, tasty, tasty-discover
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
+     , template-haskell
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.9.0.0";
-       sha256 = "1jg8qqha60mxj7mrbi69jbcniayksyggi2s7fxy88ap4ay1hky3a";
+       version = "1.0.0.0";
+       sha256 = "04j37xqgd2690y0vlx6f24y7fa07vljkrlaq8x8azmka8lsmbdl0";
        libraryHaskellDepends = [
-         base constraints equational-reasoning ghc-typelits-natnormalise
-         ghc-typelits-presburger singletons singletons-presburger
-         template-haskell
+         base constraints equational-reasoning ghc ghc-typelits-knownnat
+         ghc-typelits-natnormalise ghc-typelits-presburger
+         integer-logarithms template-haskell
+       ];
+       testHaskellDepends = [
+         base equational-reasoning integer-logarithms QuickCheck
+         quickcheck-instances tasty tasty-discover tasty-expected-failure
+         tasty-hunit tasty-quickcheck template-haskell
        ];
+       testToolDepends = [ tasty-discover ];
        description = "Type-level natural and proofs of their properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-of-html" = callPackage
@@ -262285,7 +263704,7 @@ self: {
          text weigh
        ];
        description = "High performance type driven html generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-of-html-static" = callPackage
@@ -262297,8 +263716,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-of-html ];
        testHaskellDepends = [ base type-of-html ];
        description = "Optimize static parts of type-of-html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262310,7 +263729,7 @@ self: {
        sha256 = "1cm3vfarjpwm885i5w5mjyg1ibg9bm5q34hbacpl3c9q9l1vwl4j";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Various type-level operators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-ord" = callPackage
@@ -262323,8 +263742,8 @@ self: {
          base template-haskell type-digits type-spine
        ];
        description = "Type-level comparison operator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262340,8 +263759,8 @@ self: {
          base template-haskell type-cereal type-ord type-spine
        ];
        description = "Generic type-level comparison of types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262353,8 +263772,8 @@ self: {
        sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262367,8 +263786,8 @@ self: {
        libraryHaskellDepends = [ base cmptype ];
        testHaskellDepends = [ base cmptype ];
        description = "Type-level sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262384,8 +263803,8 @@ self: {
          base containers syb template-haskell transformers type-equality
        ];
        description = "Sets and functions-as-relations in the type system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262398,7 +263817,7 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        testHaskellDepends = [ base ];
        description = "Type Level Specification by Example";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-spine" = callPackage
@@ -262409,8 +263828,8 @@ self: {
        sha256 = "0vy9ixmz1xm3dd0376s0h66q7qi64jqc5kqsqjpcg7akxidl03hi";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262437,8 +263856,8 @@ self: {
          unordered-containers vector
        ];
        description = "Type structure analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262463,8 +263882,8 @@ self: {
          th-instances tuple uniplate
        ];
        description = "Substitute types for other types with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262482,8 +263901,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Tree representations of datatypes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262503,7 +263922,7 @@ self: {
          vector-space
        ];
        description = "Type-level and typed unary natural numbers, inequality proofs, vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typeable-th" = callPackage
@@ -262515,11 +263934,24 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base ];
        description = "Automatic deriving of TypeableN instances with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "typecheck-plugin-nat-simple" = callPackage
+    ({ mkDerivation, base, containers, ghc }:
+     mkDerivation {
+       pname = "typecheck-plugin-nat-simple";
+       version = "0.1.0.1";
+       sha256 = "1d35zj6gi3h9ybgvdi16x1lrjg0fgn8lhi36ia04f56qmsc3bk4j";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base containers ghc ];
+       testHaskellDepends = [ base containers ghc ];
+       description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "typed-admin" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, data-default-class
      , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session
@@ -262544,7 +263976,7 @@ self: {
          unordered-containers utf8-string wai wai-extra warp yaml
        ];
        description = "Admin console framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typed-digits" = callPackage
@@ -262561,7 +263993,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Digits, indexed by their base at the type level";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typed-duration" = callPackage
@@ -262576,7 +264008,7 @@ self: {
          base lifted-base monad-control transformers-base
        ];
        description = "Thread delay and timeout functions with typed arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typed-encoding" = callPackage
@@ -262586,8 +264018,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-encoding";
-       version = "0.5.2.1";
-       sha256 = "1n71rxj42ssv7g4yqsycg5wg1afja2y1jxfb5khv323v581gf4wn";
+       version = "0.5.2.2";
+       sha256 = "17h6ig2phgdr5gq7pdswn50yjdqz7ci1nh4grwpz8m0qykkqj4v4";
        libraryHaskellDepends = [
          base base64-bytestring bytestring symbols text
        ];
@@ -262596,8 +264028,8 @@ self: {
          QuickCheck quickcheck-instances symbols text
        ];
        description = "Type safe string transformations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262617,8 +264049,8 @@ self: {
          quickcheck-instances typed-encoding
        ];
        description = "Bridge between encoding and typed-encoding packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262638,7 +264070,7 @@ self: {
          transformers unliftio-core
        ];
        description = "Run external processes, with strong typing of streams";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -262657,8 +264089,8 @@ self: {
        ];
        executableHaskellDepends = [ base diagrams-lib text ];
        description = "Typed and composable spreadsheets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262680,8 +264112,8 @@ self: {
          make-monofoldable-foldable mono-traversable vector
        ];
        description = "A stream based replacement for lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262698,7 +264130,7 @@ self: {
          text uuid validity validity-uuid
        ];
        description = "Phantom-Typed version of UUID";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typed-uuid_0_1_0_0" = callPackage
@@ -262715,8 +264147,8 @@ self: {
          text uuid validity validity-uuid yamlparse-applicative
        ];
        description = "Phantom-Typed version of UUID";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "typed-wire" = callPackage
@@ -262740,8 +264172,8 @@ self: {
          aeson base bytestring directory filepath HTF process temporary text
        ];
        description = "Language-independent type-safe communication";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262757,7 +264189,7 @@ self: {
          aeson base base64-bytestring bytestring text time
        ];
        description = "Haskell utility library required for code generated by typed-wire compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typedflow" = callPackage
@@ -262771,8 +264203,8 @@ self: {
          base ghc-typelits-knownnat mtl pretty-compact
        ];
        description = "Typed frontend to TensorFlow and higher-order deep learning";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262789,8 +264221,8 @@ self: {
          transformers
        ];
        description = "Parser for SQL augmented with types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262802,8 +264234,8 @@ self: {
        sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv";
        libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        description = "Create a unique hash value for a type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262820,8 +264252,8 @@ self: {
          primitive transformers
        ];
        description = "Useful type level operations (type families and related operators)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262840,8 +264272,8 @@ self: {
        ];
        testHaskellDepends = [ base ghc-prim vinyl ];
        description = "Solve type equalities using custom type-level rewrite rules";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262859,8 +264291,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262872,7 +264304,7 @@ self: {
        sha256 = "1a2ahf8imbk8zff2i7cfag2irax8qdd4r6vb00hil34i67p980ij";
        libraryHaskellDepends = [ base symbols text ];
        description = "Type-safe printf from parsing GHC TypeLits Symbol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typelits-witnesses" = callPackage
@@ -262883,7 +264315,7 @@ self: {
        sha256 = "1khy5nacmsl7h4vg7driv4yb9m3zvkhbf8divyhd249i6bdmql70";
        libraryHaskellDepends = [ base dependent-sum ];
        description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typenums" = callPackage
@@ -262895,8 +264327,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type level numbers using existing Nat functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262910,7 +264342,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Small script for inferring types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typeparams" = callPackage
@@ -262926,8 +264358,8 @@ self: {
          template-haskell vector
        ];
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262952,7 +264384,7 @@ self: {
        ];
        doHaddock = false;
        description = "Efficient implementation of a dependent map with types as keys";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "types-compat" = callPackage
@@ -262965,8 +264397,8 @@ self: {
        editedCabalFile = "0h8hlx3zb7s8dfh275ich99j4aa4gdj2f8yvzwpmzgylcvn1gfwg";
        libraryHaskellDepends = [ base ];
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262978,7 +264410,7 @@ self: {
        sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj";
        libraryHaskellDepends = [ base ];
        description = "Enforce endianness with types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typesafe-precure" = callPackage
@@ -262997,8 +264429,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263018,8 +264450,8 @@ self: {
          language-typescript parsec split syb utf8-string
        ];
        description = "A documentation generator for TypeScript Definition files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263057,8 +264489,8 @@ self: {
          template-haskell vector
        ];
        description = "Just let me draw nice text already";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263074,7 +264506,7 @@ self: {
          base containers parallel polynomials-bernstein vector
        ];
        description = "Drawings for printed text documents";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "typson-beam" = callPackage
@@ -263096,8 +264528,8 @@ self: {
          tasty-hedgehog tasty-hunit test-fixture typson-core
        ];
        description = "Typson Beam Integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263113,7 +264545,7 @@ self: {
          aeson base containers profunctors text unordered-containers vector
        ];
        description = "Type-safe PostgreSQL JSON Querying";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typson-esqueleto" = callPackage
@@ -263137,8 +264569,8 @@ self: {
          text typson-core
        ];
        description = "Typson Esqueleto Integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263161,8 +264593,8 @@ self: {
          test-fixture text typson-core
        ];
        description = "Typson Selda Integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263183,8 +264615,8 @@ self: {
          test-framework test-framework-hunit text vector
        ];
        description = "Type derived JSON parsing using Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263212,7 +264644,7 @@ self: {
        ];
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        description = "Efficient time zone handling";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tzdata" = callPackage
@@ -263233,7 +264665,7 @@ self: {
          test-framework-th unix
        ];
        description = "Time zone database (as files and as a module)";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "u2f" = callPackage
@@ -263251,8 +264683,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring either-unwrap hspec text ];
        description = "Haskell Universal Two Factor helper toolbox library thing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263273,7 +264705,7 @@ self: {
        ];
        description = "A simplistic dependently-typed language with parametricity";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ua-parser" = callPackage
@@ -263298,7 +264730,7 @@ self: {
          filepath pcre-light text yaml
        ];
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uacpid" = callPackage
@@ -263318,7 +264750,7 @@ self: {
          regex-compat time time-locale-compat unix
        ];
        description = "Userspace Advanced Configuration and Power Interface event daemon";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uber" = callPackage
@@ -263330,8 +264762,8 @@ self: {
        libraryHaskellDepends = [ aeson base text webapi ];
        testHaskellDepends = [ base hspec text ];
        description = "Uber client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263343,8 +264775,8 @@ self: {
        sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9";
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Generate overloaded lenses from plain data declaration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263375,7 +264807,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "The Ucam-Webauth protocol, used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263398,7 +264830,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Types for the Ucam-Webauth protocol, as used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263417,8 +264849,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "Unicode Character Database — Predicates on characters specified by Unicode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263431,8 +264863,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) icu;};
 
@@ -263454,7 +264886,7 @@ self: {
          utf8-string
        ];
        description = "Small DBus implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "udbus-model" = callPackage
@@ -263467,7 +264899,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring udbus xml ];
        description = "Model API for udbus introspection and definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "udcode" = callPackage
@@ -263478,7 +264910,7 @@ self: {
        sha256 = "1namnm91divk1x8ki7wfbd79f4nrym58r4ki9yamj2giv4nxda36";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Does a set of code words form a uniquely decodable code?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "udev" = callPackage
@@ -263492,8 +264924,8 @@ self: {
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
        libraryPkgconfigDepends = [ systemd ];
        description = "libudev bindings";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "udp-conduit" = callPackage
@@ -263508,8 +264940,8 @@ self: {
          base chunked-data conduit-combinators mono-traversable network
        ];
        description = "Simple fire-and-forget conduit UDP wrappers";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263523,8 +264955,8 @@ self: {
          base bytestring network resourcet streaming
        ];
        description = "Streaming to and from UDP socket";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263536,7 +264968,7 @@ self: {
        sha256 = "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy";
        libraryHaskellDepends = [ base containers ];
        description = "A simple (but internally ugly) memoization function";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "uhc-light" = callPackage
@@ -263563,8 +264995,8 @@ self: {
          transformers uhc-util utf8-string uulib vector
        ];
        description = "Part of UHC packaged as cabal/hackage installable library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263584,8 +265016,8 @@ self: {
          process time time-compat transformers uulib vector
        ];
        description = "UHC utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263599,8 +265031,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring split ];
        description = "hex dumper for UTF-8 text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263625,7 +265057,7 @@ self: {
          optparse-applicative
        ];
        description = "Minimal HTTP client library optimized for benchmarking";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "ui-command" = callPackage
@@ -263638,8 +265070,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263655,7 +265087,7 @@ self: {
          aeson base bytestring cereal dataenc text uuid
        ];
        description = "Simple unique identifier datatype, serializable and encodable as base32";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ukrainian-phonetics-basic" = callPackage
@@ -263666,7 +265098,7 @@ self: {
        sha256 = "1sgch686yq6yqm6yz63v4hcprslfzn82an1ndxbgy0m7d7ipdavx";
        libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ukrainian-phonetics-basic-array" = callPackage
@@ -263677,7 +265109,7 @@ self: {
        sha256 = "1v5nzcnyrkhz5r2igxdp07ac506p0nnmjiskxxil5rzhab9zf8kn";
        libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ulid" = callPackage
@@ -263701,7 +265133,7 @@ self: {
          base deepseq format-numbers text time
        ];
        description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "una" = callPackage
@@ -263718,7 +265150,7 @@ self: {
          base bytestring cmdargs directory filepath io-storage process
        ];
        description = "Universal un-archiver utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unagi-bloomfilter" = callPackage
@@ -263735,8 +265167,8 @@ self: {
          atomic-primops base bytestring hashabler primitive
        ];
        description = "A fast, cache-efficient, concurrent bloom filter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263754,7 +265186,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ async base criterion ];
        description = "Fast concurrent queues with a Chan-like API, and more";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unagi-streams" = callPackage
@@ -263765,7 +265197,7 @@ self: {
        sha256 = "11vr8zxyksqb2np6f77d9ai6xrb7fpfjbgv191h3pppcanysm4w3";
        libraryHaskellDepends = [ base io-streams unagi-chan ];
        description = "Unagi Chan IO-Streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unamb" = callPackage
@@ -263780,7 +265212,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Unambiguous choice";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unamb-custom" = callPackage
@@ -263791,8 +265223,8 @@ self: {
        sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functional concurrency with unamb using a custom scheduler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263816,7 +265248,7 @@ self: {
        ];
        doHaddock = false;
        description = "Opinionated Haskell Interoperability";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbound" = callPackage
@@ -263835,8 +265267,8 @@ self: {
          template-haskell transformers
        ];
        description = "Generic support for programming with names and binders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263859,7 +265291,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Support for programming with names and binders using GHC Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbound-kind-generics" = callPackage
@@ -263874,7 +265306,7 @@ self: {
          base kind-generics kind-generics-th unbound-generics
        ];
        description = "Support for programming with names and binders using kind-generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbounded-delays" = callPackage
@@ -263885,7 +265317,7 @@ self: {
        sha256 = "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar";
        libraryHaskellDepends = [ base ];
        description = "Unbounded thread delays and timeouts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbounded-delays-units" = callPackage
@@ -263896,8 +265328,8 @@ self: {
        sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614";
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        description = "Thread delays and timeouts using proper time units";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263909,7 +265341,7 @@ self: {
        sha256 = "1xk9x1viprvswjp62xrg2mvm34b0qamflb1phpyfh9bspy8f1qqd";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "All the standard sum types but strict and unboxed as possible";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unboxed-containers" = callPackage
@@ -263922,8 +265354,8 @@ self: {
        editedCabalFile = "16j16v36jabr9lpmjm52zbfz82m0ckd4p0f3z8123aawvzcvayji";
        libraryHaskellDepends = [ base containers ];
        description = "Self-optimizing unboxed sets using view patterns and data families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263936,7 +265368,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive ];
        testHaskellDepends = [ async base HUnit ];
        description = "Fast unboxed references for ST and IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unboxed-references" = callPackage
@@ -263950,8 +265382,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        executableHaskellDepends = [ base vector ];
        description = "A library for reference cells backed by unboxed-vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263974,7 +265406,7 @@ self: {
          base deepseq mono-traversable primitive vector
        ];
        description = "A newtype-friendly variant of unboxed vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbreak" = callPackage
@@ -263994,8 +265426,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring cmdargs ];
        description = "Secure and resilient remote file storage utility";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264010,7 +265442,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Customize uncaught exception handling";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "uncertain" = callPackage
@@ -264026,7 +265458,7 @@ self: {
          transformers
        ];
        description = "Manipulating numbers with inherent experimental/measurement uncertainty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unconstrained" = callPackage
@@ -264038,7 +265470,7 @@ self: {
        revision = "1";
        editedCabalFile = "13fj2jlh44774www49fwp7h7z6gr23scfbvg745rpywys49c0559";
        description = "Null constraint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unescaping-print" = callPackage
@@ -264051,8 +265483,8 @@ self: {
        editedCabalFile = "113p28z74lvsc7c6v93ilvbyp2fn5h1qsymksn3mi2ndxwq3vz3f";
        libraryHaskellDepends = [ base ];
        description = "Tiny package providing unescaping versions of show and print";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264069,7 +265501,7 @@ self: {
        ];
        description = "IO without any non-error, synchronous exceptions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unexceptionalio-trans" = callPackage
@@ -264083,7 +265515,7 @@ self: {
        libraryHaskellDepends = [ base transformers unexceptionalio ];
        description = "A wrapper around UnexceptionalIO using monad transformers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unfix-binders" = callPackage
@@ -264094,8 +265526,8 @@ self: {
        sha256 = "0aw4ihkzwz220pgg84p47zp37i5dqn7cxqcqa2lfzi23y9sp5iss";
        libraryHaskellDepends = [ base ];
        description = "Unfixing and recursion schemes for data types with binders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264113,7 +265545,7 @@ self: {
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
        description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -264129,7 +265561,7 @@ self: {
          unit-constraint unordered-containers
        ];
        description = "An alternative to the Unfoldable typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ungadtagger" = callPackage
@@ -264140,7 +265572,7 @@ self: {
        sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b";
        libraryHaskellDepends = [ base ];
        description = "Abstract GADTs from typelevel tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uni-events" = callPackage
@@ -264152,7 +265584,7 @@ self: {
        libraryHaskellDepends = [ base containers uni-util ];
        description = "Event handling for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264169,7 +265601,7 @@ self: {
        ];
        description = "Graphs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264187,7 +265619,7 @@ self: {
        ];
        description = "Graphical User Interface for Haskell Programs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264204,7 +265636,7 @@ self: {
        ];
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264220,7 +265652,7 @@ self: {
        ];
        description = "Reactors for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264238,7 +265670,7 @@ self: {
        ];
        description = "Graphs binding";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264256,7 +265688,7 @@ self: {
        ];
        description = "Utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264271,7 +265703,7 @@ self: {
        libraryHaskellDepends = [ base containers semigroups ];
        testHaskellDepends = [ base containers utility-ht ];
        description = "Construct and transform unicode characters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-names" = callPackage
@@ -264284,7 +265716,7 @@ self: {
          array base containers unicode-properties
        ];
        description = "Unicode 3.2.0 character names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-normalization" = callPackage
@@ -264296,8 +265728,8 @@ self: {
        libraryHaskellDepends = [ base bytestring compact-string ];
        librarySystemDepends = [ icu ];
        description = "Unicode normalization using the ICU library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) icu;};
 
@@ -264309,8 +265741,8 @@ self: {
        sha256 = "05zakihlk06wckzgm43f3g26fjdn4gb3d1ypw4vcwqmipq2dbfsw";
        libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264322,7 +265754,7 @@ self: {
        sha256 = "06zrr2z9irbsxwf7fbnhp2sg36ykb2amfys2y78nzn0mw63xb3q1";
        libraryHaskellDepends = [ array base containers ];
        description = "Unicode 3.2.0 character properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-show" = callPackage
@@ -264334,8 +265766,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "print and show in unicode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264347,8 +265779,8 @@ self: {
        sha256 = "0y1awqrf1x2in158linszma69zyz3zp14h3rmdx3vmbmif9fvbyv";
        libraryHaskellDepends = [ base containers ];
        description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264371,7 +265803,7 @@ self: {
          base deepseq filepath gauge path path-io text
        ];
        description = "Unicode normalization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-tricks" = callPackage
@@ -264386,7 +265818,9 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Functions to work with unicode blocks more convenient";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicoder" = callPackage
@@ -264408,7 +265842,7 @@ self: {
        ];
        testHaskellDepends = [ base text ];
        description = "Make writing in unicode easy";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unidecode" = callPackage
@@ -264420,7 +265854,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Haskell binding of Unidecode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unification-fd" = callPackage
@@ -264431,7 +265865,7 @@ self: {
        sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
        libraryHaskellDepends = [ base containers logict mtl ];
        description = "Simple generic unification algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniform-io" = callPackage
@@ -264450,8 +265884,8 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
        description = "Uniform IO over files, network, anything";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -264468,7 +265902,7 @@ self: {
          adjunctions base deepseq distributive prelude-extras
        ];
        description = "Uniform pairs with class instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "union" = callPackage
@@ -264479,15 +265913,15 @@ self: {
        pname = "union";
        version = "0.1.2";
        sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3";
-       revision = "4";
-       editedCabalFile = "09b6wqnmv4g2pnjzl5k90yp78jcif8pk40c0spdrbr2vr5766clj";
+       revision = "5";
+       editedCabalFile = "1qxwx43ba4ixq6g78y6gs4zqq4v2ka0qi79gpvny9qw577gwbbd3";
        libraryHaskellDepends = [
          base deepseq hashable profunctors tagged vinyl
        ];
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264501,7 +265935,7 @@ self: {
        editedCabalFile = "13cwjh03n82sgshbk4fdlvhc0pb3v979sdcdrpvnpjdqmvcprs92";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Efficient union and equivalence testing of sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "union-find-array" = callPackage
@@ -264512,7 +265946,7 @@ self: {
        sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
        libraryHaskellDepends = [ array base mtl ];
        description = "union find data structure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "union-map" = callPackage
@@ -264523,8 +265957,8 @@ self: {
        sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l";
        libraryHaskellDepends = [ base containers extensible ];
        description = "Heterogeneous map by open unions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264536,7 +265970,7 @@ self: {
        sha256 = "07jl3an9y4gbpmsq2gcbp3xwyvrnvkjcxcpq1702cc320c8zq542";
        libraryHaskellDepends = [ base ];
        description = "Helpers which allow safe partial pattern matching in lambdas";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniplate" = callPackage
@@ -264547,11 +265981,13 @@ self: {
        pname = "uniplate";
        version = "1.6.13";
        sha256 = "1lis5qcb5j7yzd1cqjaqpb6bmkyjfb7l4nhk3ykmcma4513cjxz7";
+       revision = "1";
+       editedCabalFile = "1rvvzmi43gbrww0f17dzchm3g61zvm97arrfa5raljqb1mbibdy8";
        libraryHaskellDepends = [
          base containers ghc-prim hashable syb unordered-containers
        ];
        description = "Help writing simple, concise and fast generic operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniprot-kb" = callPackage
@@ -264569,7 +266005,9 @@ self: {
          attoparsec base hspec neat-interpolation QuickCheck text
        ];
        description = "UniProt-KB format parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "uniq-deep" = callPackage
@@ -264584,20 +266022,18 @@ self: {
          base bytestring unordered-containers
        ];
        description = "uniq-deep";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unique" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable }:
+    ({ mkDerivation, base, hashable }:
      mkDerivation {
        pname = "unique";
-       version = "0";
-       sha256 = "140a9avcxs1fkj1v2awplq6prd1g13yg0kckccw6i1qpgcdigyz3";
-       revision = "2";
-       editedCabalFile = "0ydjjd6j7gr4mibky6j5rqwhy9frvfii0sr4g8shaxnph3y0kb6b";
-       libraryHaskellDepends = [ base ghc-prim hashable ];
+       version = "0.0.1";
+       sha256 = "1dgln2dr64ma1isqskj1qnjslg9smmr7jssg8hmk68wp36i3rwkd";
+       libraryHaskellDepends = [ base hashable ];
        description = "Fully concurrent unique identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unique-logic" = callPackage
@@ -264615,7 +266051,7 @@ self: {
          base non-empty QuickCheck semigroups transformers utility-ht
        ];
        description = "Solve simple simultaneous equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unique-logic-tf" = callPackage
@@ -264633,7 +266069,7 @@ self: {
          base non-empty QuickCheck semigroups transformers utility-ht
        ];
        description = "Solve simple simultaneous equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniqueid" = callPackage
@@ -264644,8 +266080,8 @@ self: {
        sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6";
        libraryHaskellDepends = [ base ];
        description = "Splittable Unique Identifier Supply";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264662,8 +266098,8 @@ self: {
          base checkers containers doctest QuickCheck
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264675,7 +266111,7 @@ self: {
        sha256 = "1r5wnc9gdinxigqf9sb58k8rvbkbqmn71d2gxpg1xz3fgxs35cqq";
        libraryHaskellDepends = [ base mmsyn6ukr vector ];
        description = "Can be used to produce the 'uniquenessPeriods' function and related functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-general" = callPackage
@@ -264686,7 +266122,7 @@ self: {
        sha256 = "117svylwp76rgygc1fa871qz0ghv5hsfj7lr63zy1r3zcakak45q";
        libraryHaskellDepends = [ base vector ];
        description = "Can be used to produce the similar to 'String.Ukrainian.UniquenessPeriods' functions.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector" = callPackage
@@ -264697,7 +266133,7 @@ self: {
        sha256 = "0nl6rpxsmjw4zsw5x550wlifhrhy4pzkvjxhklb0183n9pl8nkkd";
        libraryHaskellDepends = [ base vector ];
        description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-common" = callPackage
@@ -264708,7 +266144,7 @@ self: {
        sha256 = "1h7xv3g7rpa2bj7mlydvfn9g14j911jrarpl7665h3rfb6fdq4zq";
        libraryHaskellDepends = [ base vector ];
        description = "Generalization of the dobutokO-poetry-general package functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-examples" = callPackage
@@ -264739,7 +266175,7 @@ self: {
          uniqueness-periods-vector-stats vector
        ];
        description = "Usage examples for the uniqueness-periods-vector series of packages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-filters" = callPackage
@@ -264750,7 +266186,7 @@ self: {
        sha256 = "0hm4g7bqsi598z3wfjj9xy5rv3hfxwyk0vbkyqwvq99xr2pwr415";
        libraryHaskellDepends = [ base mmsyn2 vector ];
        description = "A library allows to change the structure of the 'RealFrac' function output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-general" = callPackage
@@ -264765,7 +266201,7 @@ self: {
          base print-info uniqueness-periods-vector-common vector
        ];
        description = "Some kind of the optimization approach to data inner structure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-properties" = callPackage
@@ -264784,7 +266220,7 @@ self: {
          uniqueness-periods-vector-common vector
        ];
        description = "Metrices for the maximum element for the uniqueness-periods-vector packages family";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-stats" = callPackage
@@ -264795,7 +266231,7 @@ self: {
        sha256 = "1vw12a6q1h2in2llyy49n54s20sh8i4ry9vr2rwy8q0xfvfq9v25";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "A very basic descriptive statistics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unit" = callPackage
@@ -264807,7 +266243,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Aliases for `()`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unit-constraint" = callPackage
@@ -264818,7 +266254,7 @@ self: {
        sha256 = "0nayhjyprph6bg2hhrvd91nmrzz1bixlfib4cxsxpj8n014fhva4";
        libraryHaskellDepends = [ base constraints ];
        description = "Extremely simple typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "units" = callPackage
@@ -264840,7 +266276,7 @@ self: {
          units-parser vector-space
        ];
        description = "A domain-specific type system for dimensional analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "units-attoparsec" = callPackage
@@ -264855,8 +266291,8 @@ self: {
          attoparsec base template-haskell text units units-defs
        ];
        description = "Attoparsec parsers for the units package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264868,7 +266304,7 @@ self: {
        sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki";
        libraryHaskellDepends = [ base template-haskell units ];
        description = "Definitions for use with the units package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "units-parser" = callPackage
@@ -264885,7 +266321,7 @@ self: {
          template-haskell
        ];
        description = "A parser for units of measure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unittyped" = callPackage
@@ -264897,8 +266333,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "An extendable library for type-safe computations including units";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264921,7 +266357,7 @@ self: {
          ansi-terminal ansi-wl-pprint base mtl optparse-applicative
          semigroups split text
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unitym" = callPackage
@@ -264932,7 +266368,7 @@ self: {
        sha256 = "16rvv72ya9dp5x0lr6n4kbslgqds87x3fbf9v5rsylx0dgig48js";
        libraryHaskellDepends = [ base text transformers ];
        description = "A monad type class shared between web services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unitym-servant" = callPackage
@@ -264947,7 +266383,7 @@ self: {
          base mtl servant-server text transformers unitym
        ];
        description = "Implementaation of unitym for Servant servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unitym-yesod" = callPackage
@@ -264958,8 +266394,8 @@ self: {
        sha256 = "1qg0iqww3yq5kzy6x9fc3p64vcsa53ricagnknzwhhjirh9yy3yw";
        libraryHaskellDepends = [ base unitym yesod ];
        description = "Implementation of the unity monad for the Yesod framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264979,7 +266415,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Universal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universal-binary" = callPackage
@@ -264991,8 +266427,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265002,14 +266438,16 @@ self: {
      }:
      mkDerivation {
        pname = "universe";
-       version = "1.2";
-       sha256 = "0l8g583pgbklxgv7fjb1bdhf1a09wmj8fc59siknqwlankln84qs";
+       version = "1.2.1";
+       sha256 = "1v9lgxkfly2570i8x66sjz8nk58a71y3jwlqdc3wi2jmh773y6hi";
        libraryHaskellDepends = [
          universe-base universe-instances-extended
          universe-reverse-instances universe-some
        ];
        description = "A class for finite and recursively enumerable types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe-base" = callPackage
@@ -265017,29 +266455,23 @@ self: {
      }:
      mkDerivation {
        pname = "universe-base";
-       version = "1.1.1";
-       sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x";
-       revision = "2";
-       editedCabalFile = "0601hqv5h2274i11j1ai2yqb7zk2fkqkiqlpwnq5awbgdkwb10i8";
+       version = "1.1.2";
+       sha256 = "1jja1yqfqdnpc0982haccpqz9zb3p50ydyv89hcg9pjr3cr1is4r";
        libraryHaskellDepends = [ base containers tagged transformers ];
        testHaskellDepends = [ base containers QuickCheck ];
        description = "A class for finite and recursively enumerable types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universe-dependent-sum" = callPackage
-    ({ mkDerivation, base, dependent-sum, some, universe-base
-     , universe-some
-     }:
+    ({ mkDerivation, base, universe-some }:
      mkDerivation {
        pname = "universe-dependent-sum";
-       version = "1.2.0.1";
-       sha256 = "0002wc68z803jys90s7sdh5nzdx1dk2jl49d19sjylk1cf18n5fi";
-       libraryHaskellDepends = [
-         base dependent-sum some universe-base universe-some
-       ];
+       version = "1.3";
+       sha256 = "0fwqx4fzs9s09fwrf715simqb0vxnx3z7q35zbv9mkj1m6nbrsk5";
+       libraryHaskellDepends = [ base universe-some ];
        description = "Universe instances for types from dependent-sum";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universe-instances-base" = callPackage
@@ -265048,28 +266480,30 @@ self: {
        pname = "universe-instances-base";
        version = "1.1";
        sha256 = "17g4xf7zcxd9a2am0p401b0l87ynxwpm3c2lqc4vmw4sz071kccb";
-       revision = "1";
-       editedCabalFile = "0hjrjjl6v5q9f7cmxhrdxfdk1l86im0b8anxkpgrry7s8q998979";
+       revision = "2";
+       editedCabalFile = "03g5vpmmymfjx4p1l2v275vn2dknb7m91wmh01aw8f26224f7sjw";
        libraryHaskellDepends = [ base universe-base ];
        description = "Universe instances for types from the base package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe-instances-extended" = callPackage
     ({ mkDerivation, adjunctions, base, comonad, containers
-     , contravariant, universe-base
+     , universe-base
      }:
      mkDerivation {
        pname = "universe-instances-extended";
-       version = "1.1.1";
-       sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh";
-       revision = "1";
-       editedCabalFile = "0g3qpvgw304yml1n9ly78qrsrrw53f6zpkciyk1xc0nmlm0dkwih";
+       version = "1.1.2";
+       sha256 = "1yg3cacr56kk0r8vnqxa9cm1awb727qkysnhc7rn4h9pfb10a7sn";
        libraryHaskellDepends = [
-         adjunctions base comonad containers contravariant universe-base
+         adjunctions base comonad containers universe-base
        ];
        description = "Universe instances for types from selected extra packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe-instances-trans" = callPackage
@@ -265078,24 +266512,26 @@ self: {
        pname = "universe-instances-trans";
        version = "1.1";
        sha256 = "0dp37rb61g5mqj4kfkgi6zxcjhrm9npz197sksqwg1skgjdgbbn6";
-       revision = "1";
-       editedCabalFile = "0pyqcg8mfw6gg7gxxd46xq3hnhcpd39g7jb9q1awcdipzq7xjrh2";
+       revision = "2";
+       editedCabalFile = "0fyhcfkriq4zcvqrr33x5ywxxmpyjjy0bz78pq2x38vpgqagiz4p";
        libraryHaskellDepends = [ base universe-base ];
        description = "Universe instances for types from the transformers and mtl packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe-reverse-instances" = callPackage
     ({ mkDerivation, base, containers, universe-base }:
      mkDerivation {
        pname = "universe-reverse-instances";
-       version = "1.1";
-       sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd";
-       revision = "3";
-       editedCabalFile = "1zkpcipbzhxricr94pkhn4cqmjcnsxx301kxarx798qr9il37qzw";
+       version = "1.1.1";
+       sha256 = "0wzvrnccj9hq1x55vy7a8xzppgf0zmbnlm3yz02qx3dglq97w4n4";
        libraryHaskellDepends = [ base containers universe-base ];
        description = "Instances of standard classes that are made possible by enumerations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe-some" = callPackage
@@ -265104,17 +266540,15 @@ self: {
      }:
      mkDerivation {
        pname = "universe-some";
-       version = "1.2";
-       sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh";
-       revision = "2";
-       editedCabalFile = "1m02p2lrk46a26s8ghvls3airdassdf6yy2i2arn4vm1ndzqywy2";
+       version = "1.2.1";
+       sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp";
        libraryHaskellDepends = [
          base some template-haskell th-abstraction transformers
          universe-base
        ];
        testHaskellDepends = [ base some template-haskell universe-base ];
        description = "Universe instances for Some from some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universe-th" = callPackage
@@ -265136,8 +266570,8 @@ self: {
          test-framework-quickcheck2 th-instances tuple uniplate
        ];
        description = "Construct a Dec's ancestor list";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265164,10 +266598,10 @@ self: {
          base containers gauge unordered-containers
        ];
        description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
-  "universum_1_7_1" = callPackage
+  "universum_1_7_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -265175,8 +266609,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "1.7.1";
-       sha256 = "0jsdzhy0h5d6znnrdgzr29b6qkriidck5s6yp52pci30rfv1d29z";
+       version = "1.7.2";
+       sha256 = "1ka7q5vr9xkf8z5mzpkp648mpf8az7b14lnhbvfakg3v5xy3f7gb";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable microlens
          microlens-mtl mtl safe-exceptions stm text transformers
@@ -265189,8 +266623,8 @@ self: {
          base containers gauge text unordered-containers
        ];
        description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -265203,8 +266637,8 @@ self: {
        editedCabalFile = "1hfpipkxmkr0fgjz1i4mm0ah1s7bgb28yb8sjn32rafj4lzszn2m";
        libraryHaskellDepends = [ base bytestring time ];
        description = "POSIX functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix-bytestring" = callPackage
@@ -265215,7 +266649,7 @@ self: {
        sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
        libraryHaskellDepends = [ base bytestring ];
        description = "Unix/Posix-specific functions for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-compat" = callPackage
@@ -265228,7 +266662,19 @@ self: {
        editedCabalFile = "1yx38asvjaxxlfs8lpbq0dwd84ynhgi7hw91rn32i1hsmz7yn22m";
        libraryHaskellDepends = [ base unix ];
        description = "Portable POSIX-compatibility layer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "unix-compat_0_5_3" = callPackage
+    ({ mkDerivation, base, unix }:
+     mkDerivation {
+       pname = "unix-compat";
+       version = "0.5.3";
+       sha256 = "1j75i3dj489rz60ij3nfza774mb7mw33amhdkm10dd0dxabvb4q8";
+       libraryHaskellDepends = [ base unix ];
+       description = "Portable POSIX-compatibility layer";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix-fcntl" = callPackage
@@ -265241,8 +266687,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
        description = "Comprehensive bindings to fcntl(2)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265254,8 +266700,8 @@ self: {
        sha256 = "07ysmd9ks5lm2lg1dik75m509ryn5azw28j9hcisknf5bmrfy9li";
        libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265267,7 +266713,7 @@ self: {
        sha256 = "1qy28y1apm2dxp47v0ngxj4ww3iyq4lj0n0i4z9phyr1122fglig";
        libraryHaskellDepends = [ base ];
        description = "Support for writev, pwrite and pread";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-memory" = callPackage
@@ -265284,7 +266730,7 @@ self: {
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
        ];
        description = "Unix memory syscalls";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-process-conduit" = callPackage
@@ -265305,8 +266751,8 @@ self: {
          base bytestring conduit hspec transformers unix
        ];
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265318,7 +266764,7 @@ self: {
        sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj";
        libraryHaskellDepends = [ base unix ];
        description = "POSIX pseudo-terminal support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-time" = callPackage
@@ -265335,7 +266781,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Unix time parser/formatter and utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unjson" = callPackage
@@ -265360,7 +266806,7 @@ self: {
          unordered-containers vector
        ];
        description = "Bidirectional JSON parsing and generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unlambda" = callPackage
@@ -265385,8 +266831,8 @@ self: {
        sha256 = "06ygxv8c1435rn9yrg27l1zsihzh4argqn677g0qrigw6wcvn0gg";
        libraryHaskellDepends = [ base ghc-prim semigroups ];
        description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265412,7 +266858,7 @@ self: {
          time transformers unix unliftio-core
        ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unliftio-core" = callPackage
@@ -265425,7 +266871,39 @@ self: {
        editedCabalFile = "16k5fxlm9xpbd0ca861nmhb1j2ahyid02m1vbg1vzb5ckbm48glv";
        libraryHaskellDepends = [ base transformers ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+     }) {};
+
+  "unliftio-messagebox" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, criterion
+     , data-default, hashable, HUnit, mtl, QuickCheck, tasty, tasty-html
+     , tasty-hunit, tasty-quickcheck, text, unagi-chan, unliftio
+     }:
+     mkDerivation {
+       pname = "unliftio-messagebox";
+       version = "1.0.2";
+       sha256 = "0pl75f3wbcy31b4firqw0y2mdl3axjdwx0w1vckidprv8sncsrm7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers data-default hashable mtl QuickCheck
+         text unagi-chan unliftio
+       ];
+       executableHaskellDepends = [
+         atomic-primops base containers data-default hashable mtl QuickCheck
+         text unagi-chan unliftio
+       ];
+       testHaskellDepends = [
+         atomic-primops base containers data-default hashable HUnit mtl
+         QuickCheck tasty tasty-html tasty-hunit tasty-quickcheck text
+         unagi-chan unliftio
+       ];
+       benchmarkHaskellDepends = [
+         atomic-primops base containers criterion data-default hashable mtl
+         QuickCheck text unagi-chan unliftio
+       ];
+       description = "Fast and robust message queues for concurrent processes";
+       license = lib.licenses.bsd2;
      }) {};
 
   "unliftio-path" = callPackage
@@ -265436,7 +266914,7 @@ self: {
        sha256 = "1ila58yyk2vfshaz6d5kp4vdcgjrlnwnqnrjm949qlcv36srvzg9";
        libraryHaskellDepends = [ base exceptions path time unliftio ];
        description = "UnliftIO using well-typed Paths";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unliftio-pool" = callPackage
@@ -265451,7 +266929,7 @@ self: {
          base resource-pool time transformers unliftio-core
        ];
        description = "Data.Pool generalized to MonadUnliftIO.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unliftio-streams" = callPackage
@@ -265465,8 +266943,8 @@ self: {
          base bytestring io-streams text unliftio-core
        ];
        description = "Generalization of io-streams to MonadUnliftIO";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265481,7 +266959,7 @@ self: {
        libraryHaskellDepends = [ base directory text ];
        executableHaskellDepends = [ base directory text ];
        description = "Tool to convert literate code between styles or to code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unm-hip" = callPackage
@@ -265497,7 +266975,7 @@ self: {
        ];
        description = "A Library for the manipulation of images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265511,7 +266989,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base storable-endian utility-ht ];
        description = "Extract useful information from Amiga MED files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "unordered-containers" = callPackage
@@ -265533,7 +267011,7 @@ self: {
          random
        ];
        description = "Efficient hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unordered-containers-rematch" = callPackage
@@ -265551,8 +267029,8 @@ self: {
          base hashable hspec HUnit rematch unordered-containers
        ];
        description = "Rematch support for unordered containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265568,8 +267046,8 @@ self: {
          base deepseq dlist hashable unordered-containers
        ];
        description = "Graph library using unordered-containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265586,8 +267064,8 @@ self: {
          base containers deepseq primitive QuickCheck tasty tasty-quickcheck
        ];
        description = "A specialization of `HashMap Int v`";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265603,8 +267081,8 @@ self: {
          base bytestring primitive template-haskell transformers vector
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265622,7 +267100,7 @@ self: {
        executableHaskellDepends = [ base ];
        doHaddock = false;
        description = "Unpacked containers via backpack";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "unpacked-either" = callPackage
@@ -265634,8 +267112,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265648,8 +267126,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265664,8 +267142,8 @@ self: {
        libraryHaskellDepends = [ base primitive wide-word ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265677,7 +267155,7 @@ self: {
        sha256 = "10mc9kjjqf82ddi586g5r6h065znhj9s0ih9w800yw4xl65ygayv";
        libraryHaskellDepends = [ base bytestring text-short ];
        description = "optional text that unpacks well";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unpacked-these" = callPackage
@@ -265693,8 +267171,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked these data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265711,8 +267189,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked validation data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265733,8 +267211,8 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "An attoparsec roundtrip";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265746,8 +267224,8 @@ self: {
        sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p";
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for loop unrolling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265760,7 +267238,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Unified interface to unsafe functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unsafe-promises" = callPackage
@@ -265771,7 +267249,7 @@ self: {
        sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70";
        libraryHaskellDepends = [ base threads ];
        description = "Create pure futures using lazy IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unsafely" = callPackage
@@ -265784,8 +267262,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Flexible access control for unsafe operations and instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265798,7 +267276,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Like unsafeperformIO, but for the ST monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unscramble" = callPackage
@@ -265816,8 +267294,8 @@ self: {
          array base optparse-applicative stream-fusion unordered-containers
        ];
        description = "Solve Boggle-like word games";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265836,8 +267314,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "An extension removing the sequentiality from monads";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265851,7 +267329,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Utility construction of the graph depending unusable packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unused" = callPackage
@@ -265879,8 +267357,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec text ];
        description = "A command line tool to identify unused code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265892,7 +267370,7 @@ self: {
        sha256 = "08q1zvc61gh2l8212xb2p4nvjx7p0qaw1q69085xzgg3hn5rwig2";
        libraryHaskellDepends = [ base ];
        description = "Unwrapping sums/products lifted to functors";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "uom-plugin" = callPackage
@@ -265910,8 +267388,8 @@ self: {
        ];
        testHaskellDepends = [ base hlint tasty tasty-hunit ];
        description = "Units of measure as a GHC typechecker plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265929,8 +267407,8 @@ self: {
          base directory filepath lambda-options mtl split
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265945,7 +267423,7 @@ self: {
        executableHaskellDepends = [ base ports-tools process ];
        description = "Software management tool";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "update-monad" = callPackage
@@ -265955,7 +267433,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0l6gbfw0rmhkk2iq3wd2zzyld2nvjmbrlg7rqqv962cahs5mydns";
        libraryHaskellDepends = [ base mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "update-nix-fetchgit" = callPackage
@@ -265985,8 +267463,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A program to update fetchgit values in Nix expressions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "update-repos" = callPackage
@@ -266008,7 +267486,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Update all your git repositories with just one command";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "uploadcare" = callPackage
@@ -266024,8 +267502,8 @@ self: {
          http-types old-locale time
        ];
        description = "Haskell client for Uploadcare";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266037,7 +267515,7 @@ self: {
        sha256 = "17hi7ibasy0lhvzhv52k0dynvhxlsmywliymyygwk1jv740z1bdz";
        libraryHaskellDepends = [ base ];
        description = "Upload test";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "upskirt" = callPackage
@@ -266048,8 +267526,8 @@ self: {
        sha256 = "0528345xiq2xmi9fwzv0rvbjqfhcvyhkik8c453yr2nr03k0zs4c";
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266066,8 +267544,8 @@ self: {
          req req-conduit text uuid
        ];
        description = "Talk to Urbit from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266084,8 +267562,8 @@ self: {
          req req-conduit text uuid
        ];
        description = "Talk to Urbit from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266101,7 +267579,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-core QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Hoon-style atom manipulation and printing functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ureader" = callPackage
@@ -266124,8 +267602,8 @@ self: {
          tagsoup terminal-size text time xml
        ];
        description = "Minimalistic CLI RSS reader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266146,8 +267624,8 @@ self: {
          mime-types mtl optparse-applicative process syb text
        ];
        description = "Ur/Web static content generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266159,8 +267637,8 @@ self: {
        sha256 = "0gfv54ys1h4ac3dhaypnpnm4w781857n2k8680jflnjbkqlandrr";
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266189,7 +267667,7 @@ self: {
          network-uri
        ];
        description = "Haskell URI parsing as ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uri-bytestring-aeson" = callPackage
@@ -266202,7 +267680,7 @@ self: {
          aeson base bytestring text uri-bytestring
        ];
        description = "Aeson instances for URI Bytestring";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uri-conduit" = callPackage
@@ -266219,8 +267697,8 @@ self: {
          network system-fileio system-filepath text transformers
        ];
        description = "Read and write URIs (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266237,7 +267715,7 @@ self: {
          base bytestring network-uri text utf8-string
        ];
        description = "Unicode aware uri-encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uri-encoder" = callPackage
@@ -266256,8 +267734,8 @@ self: {
          base bytestring criterion network-uri
        ];
        description = "A uri encoder to make your strings less readable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266274,8 +267752,8 @@ self: {
          transformers
        ];
        description = "Read and write URIs (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266294,8 +267772,8 @@ self: {
          uri-enumerator
        ];
        description = "uri-enumerator backend for the file scheme (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266312,8 +267790,8 @@ self: {
        ];
        testHaskellDepends = [ base data-default hspec lens ];
        description = "A simple library for parsing and generating URIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266328,8 +267806,8 @@ self: {
        libraryHaskellDepends = [ base containers utf8-string ];
        executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266353,8 +267831,8 @@ self: {
          ansi-wl-pprint base HUnit mtl template-haskell
        ];
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266366,7 +267844,7 @@ self: {
        sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
        libraryHaskellDepends = [ base utf8-string ];
        description = "A library for working with URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "url-bytes" = callPackage
@@ -266389,8 +267867,8 @@ self: {
          weigh
        ];
        description = "Memory efficient url type and parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266413,8 +267891,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion http-types rerebase ];
        description = "Decoders for URL-encoding (aka Percent-encoding)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266428,8 +267906,8 @@ self: {
        editedCabalFile = "1fbgzz9yhqc5lx15n551r190g2a6f1plf3clpar76fj3wqn6x4nr";
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266447,8 +267925,8 @@ self: {
          base bytestring containers mtl network old-time
        ];
        description = "Parallel link checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266462,8 +267940,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base network ];
        description = "Decode percent-encoded strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266475,8 +267953,8 @@ self: {
        sha256 = "1kg25w5pnmsnjwycnf0q6d65cqfw5d0xn9rwyn4ybhh3a8q2yaa8";
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266492,8 +267970,8 @@ self: {
        libraryHaskellDepends = [ base mtl network network-uri split ];
        testHaskellDepends = [ base network network-uri QuickCheck ];
        description = "Generate or process x-www-urlencoded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266513,8 +267991,8 @@ self: {
          split strict text transformers transformers-base vector
        ];
        description = "Painfully simple URL deployment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266527,8 +268005,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec ];
        description = "Universal Resource Names";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266545,8 +268023,8 @@ self: {
          template-haskell transformers
        ];
        description = "A package for updatable discrete distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266564,8 +268042,8 @@ self: {
          base filepath mtl optparse-applicative parsec process syb
        ];
        description = "XML parser-printer supporting Ur/Web syntax extensions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266577,7 +268055,7 @@ self: {
        sha256 = "16zlg48pa254bwn7kimd9mn78q0mlczhj683nhxbdd5l7yqrgkm6";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base doctest doctest-discover hspec time ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "usb" = callPackage
@@ -266592,8 +268070,8 @@ self: {
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
        description = "Communicate with USB devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266610,8 +268088,8 @@ self: {
          transformers usb
        ];
        description = "Iteratee enumerators for the usb package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266625,8 +268103,8 @@ self: {
        editedCabalFile = "1p780v435frqi04gc8db1jj1ra9c98jpdwmy4p274azp0gi51q9z";
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
        description = "Parser and request Library for USB HIDs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266646,8 +268124,8 @@ self: {
          containers-unicode-symbols parsimony
        ];
        description = "A database of USB identifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266664,8 +268142,8 @@ self: {
          usb vector
        ];
        description = "Iteratee enumerators for the usb package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266682,8 +268160,8 @@ self: {
          regions text transformers usb
        ];
        description = "Type-safe communication with USB devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266698,7 +268176,7 @@ self: {
        libraryHaskellDepends = [ base random-fu text ];
        executableHaskellDepends = [ base random-fu text ];
        description = "A collection of user agents";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "userid" = callPackage
@@ -266707,14 +268185,14 @@ self: {
      }:
      mkDerivation {
        pname = "userid";
-       version = "0.1.3.5";
-       sha256 = "0lk3a07sh7i5hh3b5d2734iw3qwz0q4dnf4b6j9br69vi35k64cw";
+       version = "0.1.3.6";
+       sha256 = "02alsm7h42hjymmr2xn2cf9ks6sph6arccirpndbndyvbgrds7nn";
        libraryHaskellDepends = [
          aeson base boomerang cereal safecopy web-routes web-routes-th
        ];
        description = "The UserId type and useful instances for web development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266730,7 +268208,7 @@ self: {
          aeson base bcrypt path-pieces text time
        ];
        description = "A library simplifying user management for web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "users-mysql-haskell" = callPackage
@@ -266749,8 +268227,8 @@ self: {
          time transformers users uuid
        ];
        description = "A mysql-haskell backend for the users library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266771,8 +268249,8 @@ self: {
          base hspec monad-logger persistent-sqlite temporary text users-test
        ];
        description = "A persistent backend for the users package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266789,7 +268267,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec postgresql-simple users-test ];
        description = "A PostgreSQL backend for the users package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "users-test" = callPackage
@@ -266800,7 +268278,7 @@ self: {
        sha256 = "0gmcbimbp8sj282c915m9bka4fj238xsf8szqmnv20n01kx4k1gn";
        libraryHaskellDepends = [ base hspec text users ];
        description = "Library to test backends for the users library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "utc" = callPackage
@@ -266820,7 +268298,7 @@ self: {
          test-framework test-framework-quickcheck2 text
        ];
        description = "A pragmatic time and date library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "utf" = callPackage
@@ -266833,8 +268311,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "UTF-8";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266853,7 +268331,7 @@ self: {
          base bytestring charsetdetect-ae hspec text text-short utf8-string
        ];
        description = "A string conversion library that assumes utf8";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-env" = callPackage
@@ -266864,7 +268342,7 @@ self: {
        sha256 = "0ls2ls2n12igm1day730sp1gfcwxvkkqd2xdp2lmyp2ldp0d72zp";
        libraryHaskellDepends = [ base mtl utf8-string ];
        description = "UTF-8 aware substitutes for functions in System.Environment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-light" = callPackage
@@ -266875,7 +268353,7 @@ self: {
        sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "Unicode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-prelude" = callPackage
@@ -266889,22 +268367,21 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "utf8-string" = callPackage
-    ({ mkDerivation, base, bytestring }:
+    ({ mkDerivation, base, bytestring, HUnit }:
      mkDerivation {
        pname = "utf8-string";
-       version = "1.0.1.1";
-       sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
-       revision = "3";
-       editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38";
+       version = "1.0.2";
+       sha256 = "16mh36ffva9rh6k37bi1046pgpj14h0cnmj1iir700v0lynxwj7f";
        libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base HUnit ];
        description = "Support for reading and writing UTF8 Strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-validator" = callPackage
@@ -266921,8 +268398,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constant-space UTF8 validator for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266936,7 +268413,7 @@ self: {
        editedCabalFile = "16hbcmcq2674j37gl808n5i02kv0vn3nwq5l2a6v5lj0dn34nicb";
        libraryHaskellDepends = [ base transformers ];
        description = "Utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "util-exception" = callPackage
@@ -266949,8 +268426,8 @@ self: {
        editedCabalFile = "1h5s7qkdgfifw35dg7wzsr42q1dcficrjvw9b1qhff00m7avdam0";
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266964,8 +268441,8 @@ self: {
        testHaskellDepends = [ base logict ];
        benchmarkHaskellDepends = [ base gauge logict ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266982,8 +268459,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HTF QuickCheck ];
        description = "A collection of commonly used utils";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266997,8 +268474,8 @@ self: {
        editedCabalFile = "0wlgp8cq7gg585x041djxprm6a3kih1dkx2fbpg6bwi850ihglir";
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267015,8 +268492,8 @@ self: {
        libraryHaskellDepends = [ base control primitive util ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for stateful primitive types and types based on them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267035,8 +268512,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for universal types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267049,7 +268526,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uu-cco" = callPackage
@@ -267060,8 +268537,8 @@ self: {
        sha256 = "008ckslrc60959k6l6mvk8dixr6vmfmiir6qj8wakgixcyd6ar6d";
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Utilities for compiler construction: core functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267075,8 +268552,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        description = "Utilities for compiler construction: example programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267088,8 +268565,8 @@ self: {
        sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px";
        libraryHaskellDepends = [ base uu-cco uulib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267101,8 +268578,8 @@ self: {
        sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71";
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267116,7 +268593,7 @@ self: {
        editedCabalFile = "1wzc2aacqh1ndyk2dawzqbig7m0khdb05q9pzplhhfhfrbgn4pjr";
        libraryHaskellDepends = [ base ];
        description = "An interleaving combinator for use with applicative style implementations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uu-options" = callPackage
@@ -267134,7 +268611,7 @@ self: {
          uu-parsinglib
        ];
        description = "Parse command line options using uu-interleave and uu-parsinglib";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uu-parsinglib" = callPackage
@@ -267145,7 +268622,7 @@ self: {
        sha256 = "0v5vcxfix04hmwc7ajni4xrv0g099pr2j79bqx1n24s1cvimlpyj";
        libraryHaskellDepends = [ base ListLike time uu-interleaved ];
        description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uu-tc" = callPackage
@@ -267158,7 +268635,7 @@ self: {
        editedCabalFile = "1jz4w3fnhaz631yrlxrxj1vfl0i0vby038v70hmwhsg10wz7w764";
        libraryHaskellDepends = [ base ];
        description = "Haskell 98 parser combinators for INFOB3TC at Utrecht University";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuagc" = callPackage
@@ -267178,7 +268655,7 @@ self: {
        ];
        executableHaskellDepends = [ base uuagc-cabal ];
        description = "Attribute Grammar System of Universiteit Utrecht";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuagc-bootstrap" = callPackage
@@ -267200,8 +268677,8 @@ self: {
          mtl uulib
        ];
        description = "Attribute Grammar System of Universiteit Utrecht";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267217,7 +268694,7 @@ self: {
          base Cabal containers directory filepath mtl process uulib
        ];
        description = "Cabal plugin for UUAGC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuagc-diagrams" = callPackage
@@ -267228,8 +268705,8 @@ self: {
        sha256 = "0x4dhbzl5xvs3mrg7256hg673nbr4k6kjszyavjs61klcq58asm7";
        libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267246,7 +268723,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "A debugger for the UUAG system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "uuid" = callPackage
@@ -267273,7 +268750,7 @@ self: {
          base criterion mersenne-random-pure64 random
        ];
        description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuid-aeson" = callPackage
@@ -267286,8 +268763,8 @@ self: {
        editedCabalFile = "056ql7mx42rswj5zphazl1h5mmvd84v8xnlwyln2jx7l7rb5rrjz";
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267308,8 +268785,8 @@ self: {
          wide-word
        ];
        description = "UUID parsing using byteverse packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267328,8 +268805,8 @@ self: {
          exceptions uuid
        ];
        description = "Reversable and secure encoding of object ids as uuids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267341,7 +268818,7 @@ self: {
        sha256 = "1gfm7bxmr2b5hn4x3dr231ra0b1nwp36x2808w3l43yglz8zwp74";
        libraryHaskellDepends = [ base bytestring uuid ];
        description = "Universally Unique Identifiers with little-endian-ish encoding tools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uuid-orphans" = callPackage
@@ -267356,7 +268833,7 @@ self: {
          base safecopy text th-lift uuid-types web-routes
        ];
        description = "Orphan instances for the UUID datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuid-quasi" = callPackage
@@ -267367,7 +268844,7 @@ self: {
        sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj";
        libraryHaskellDepends = [ base template-haskell uuid ];
        description = "Supplemental package for 'uuid' allowing quasiquotation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuid-types" = callPackage
@@ -267391,7 +268868,7 @@ self: {
          base bytestring containers criterion deepseq random
        ];
        description = "Type definitions for Universally Unique Identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uulib" = callPackage
@@ -267402,7 +268879,7 @@ self: {
        sha256 = "10j40q1b1fkx0fv56cn0kkilbqhyh6xxya536xlbx365lnc1rk0i";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell Utrecht Tools Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uusi" = callPackage
@@ -267423,7 +268900,7 @@ self: {
          base Cabal HUnit microlens microlens-th text
        ];
        description = "Tweak dependencies in .cabal files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uvector" = callPackage
@@ -267436,8 +268913,8 @@ self: {
        editedCabalFile = "023may02r17xg5wqh0lplcjdfiwaprbqn9p6jgmqs935qf9zz2g2";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Fast unboxed arrays with a flexible interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267449,8 +268926,8 @@ self: {
        sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81";
        libraryHaskellDepends = [ base uvector ];
        description = "Efficient algorithms for uvector unboxed arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267462,8 +268939,8 @@ self: {
        sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43";
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267475,7 +268952,7 @@ self: {
        sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la";
        libraryHaskellDepends = [ base process ];
        description = "Utility function for reading a source of loaded uzbl pages";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "v4l2" = callPackage
@@ -267491,8 +268968,8 @@ self: {
          bindings-posix containers ioctl
        ];
        description = "interface to Video For Linux Two (V4L2)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267506,8 +268983,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT v4l2 ];
        description = "video for linux two examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267529,8 +269006,8 @@ self: {
        ];
        testHaskellDepends = [ base process ];
        description = "the cabal companion";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267548,8 +269025,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal containers ];
        description = "Core algorithms and datatypes used by vabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267561,8 +269038,8 @@ self: {
        sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "Graph representation of the GHC heap";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267579,8 +269056,8 @@ self: {
          svgcairo vacuum
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267592,8 +269069,8 @@ self: {
        sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
        libraryHaskellDepends = [ base filepath graphviz vacuum ];
        description = "A library for transforming vacuum graphs into GraphViz output";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267613,8 +269090,8 @@ self: {
          process stb-image
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267626,8 +269103,8 @@ self: {
        sha256 = "0zpag42dr2763ddrwdy7744lqkd6207ljfw3bqm6db3a1128861z";
        libraryHaskellDepends = [ base containers hubigraph vacuum ];
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267651,7 +269128,7 @@ self: {
          attoparsec base directory filepath process QuickCheck text
        ];
        description = "Runs commands on remote machines using ssh";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "valid" = callPackage
@@ -267662,7 +269139,7 @@ self: {
        sha256 = "1c029mb3szixs9rr5i7ri2nm0ya5gv5r6bv8hzsyw90ys5nbgcz5";
        libraryHaskellDepends = [ base util ];
        description = "Type isomorphic to `Either` with `Applicative` instance which combines errors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "valid-names" = callPackage
@@ -267673,8 +269150,8 @@ self: {
        sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78";
        libraryHaskellDepends = [ base containers MonadRandom ];
        description = "Valid operator/module characters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267686,7 +269163,7 @@ self: {
        sha256 = "19d02sblyxg73prlrmlcs4vclzxzg2pzlrp67f2kx94nsw0v3l4p";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validate-input" = callPackage
@@ -267705,8 +269182,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Input validation combinator library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267726,7 +269203,7 @@ self: {
          template-haskell
        ];
        description = "Compile-time checking for partial smart-constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validated-types" = callPackage
@@ -267738,8 +269215,8 @@ self: {
        libraryHaskellDepends = [ base refined text ];
        testHaskellDepends = [ base ];
        description = "Type-level constraints on strings and other input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267758,7 +269235,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
        description = "A data-type like Either but with an accumulating Applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validation-selective" = callPackage
@@ -267776,7 +269253,7 @@ self: {
          base doctest hedgehog hspec hspec-hedgehog selective text
        ];
        description = "Lighweight pure data validation based on Applicative and Selective functors";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "validations" = callPackage
@@ -267797,8 +269274,8 @@ self: {
          transformers
        ];
        description = "A nice way to define field validations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267817,7 +269294,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Straightforward validation monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validators" = callPackage
@@ -267829,7 +269306,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base containers doctest Glob hspec text ];
        description = "Composable validations for your Haskell data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity" = callPackage
@@ -267841,7 +269318,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Validity typeclass";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-aeson" = callPackage
@@ -267858,7 +269335,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec validity ];
        description = "Validity instances for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-bytestring" = callPackage
@@ -267869,7 +269346,7 @@ self: {
        sha256 = "0ck7pn8c8srwdwpcx6x4ihixff07kigq8q9sjkc3zzyf54n93f3x";
        libraryHaskellDepends = [ base bytestring validity ];
        description = "Validity instances for bytestring";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-containers" = callPackage
@@ -267880,7 +269357,7 @@ self: {
        sha256 = "1qw5p60dr54d2wh49y6x33hbks4d74m8pr5zygblzk0y70warqld";
        libraryHaskellDepends = [ base containers validity ];
        description = "Validity instances for containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-path" = callPackage
@@ -267896,7 +269373,7 @@ self: {
          base filepath genvalidity-hspec hspec path validity
        ];
        description = "Validity instances for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-primitive" = callPackage
@@ -267907,7 +269384,7 @@ self: {
        sha256 = "0r9wy91qr2c8lf6llv9qyirb1vjkq4nb41zqph5ip9gjjj7fzk9y";
        libraryHaskellDepends = [ base primitive validity ];
        description = "Validity instances for primitive";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-scientific" = callPackage
@@ -267918,7 +269395,7 @@ self: {
        sha256 = "0vqqwlhamykz1vb5gc6krkcq3ixdmkld17c5vsxd0drnjcsllfkp";
        libraryHaskellDepends = [ base scientific validity ];
        description = "Validity instances for scientific";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-text" = callPackage
@@ -267929,7 +269406,7 @@ self: {
        sha256 = "1sdcivm7mbvi71zkm36g95wrb0y8fzhrnryp01m2wpmhffk1z5cf";
        libraryHaskellDepends = [ base bytestring text validity ];
        description = "Validity instances for text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-time" = callPackage
@@ -267940,7 +269417,7 @@ self: {
        sha256 = "02lwa2w84m4mm2lpg5dhg5p0ndba5r152bjm4iy76y2qsfkva0ap";
        libraryHaskellDepends = [ base time validity ];
        description = "Validity instances for time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-unordered-containers" = callPackage
@@ -267953,7 +269430,7 @@ self: {
          base hashable unordered-containers validity
        ];
        description = "Validity instances for unordered-containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-uuid" = callPackage
@@ -267964,7 +269441,7 @@ self: {
        sha256 = "1m4z9q8m07ssrg6a4lj7501kjnbp9hazg3gyfwrbdbrw7p7jjd9l";
        libraryHaskellDepends = [ base uuid validity ];
        description = "Validity instances for uuid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-vector" = callPackage
@@ -267975,7 +269452,7 @@ self: {
        sha256 = "0jbfd3h9k0b4ifaaqqar54r86hm1jiixyxrgs2ln7ni00b0ncv1y";
        libraryHaskellDepends = [ base hashable validity vector ];
        description = "Validity instances for vector";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "valor" = callPackage
@@ -267987,7 +269464,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hspec text transformers ];
        description = "Simple general structured validation library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "value-supply" = callPackage
@@ -267998,8 +269475,8 @@ self: {
        sha256 = "0fd6rk46sgdbdmfdr9wy0f3qzwaymgd9hl9v735g2a4bqiqanmb5";
        libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268022,8 +269499,8 @@ self: {
          optparse-applicative process uniplate
        ];
        description = "Analyze and visualize expression trees";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268041,8 +269518,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ array base criterion deepseq ];
        description = "Mutable variables and tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268054,7 +269531,7 @@ self: {
        sha256 = "12l536ca32dhvylp3kizq664lsfysmc5r0hqzs50aqrbx8db40ji";
        libraryHaskellDepends = [ base stm ];
        description = "The VarMonad typeclass, generalizing types of references";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "varan" = callPackage
@@ -268073,7 +269550,7 @@ self: {
        ];
        description = "Process mpileup output to identify significant differences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268090,8 +269567,8 @@ self: {
          type-level-natural-number
        ];
        description = "variable-precision floating point";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268104,8 +269581,8 @@ self: {
        libraryHaskellDepends = [ base mtl stm ];
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        description = "Monads with variables, without deep magic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268120,8 +269597,8 @@ self: {
          base cereal containers deepseq semigroupoids
        ];
        description = "nominal value with possible variations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268146,7 +269623,7 @@ self: {
          base contravariant criterion time transformers
        ];
        description = "FRP through value streams and monadic splines";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vault" = callPackage
@@ -268161,7 +269638,7 @@ self: {
          base containers hashable semigroups unordered-containers
        ];
        description = "a persistent store for values of arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vault-tool" = callPackage
@@ -268177,7 +269654,7 @@ self: {
          unordered-containers
        ];
        description = "Client library for HashiCorp's Vault tool (via HTTP API)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vault-tool-server" = callPackage
@@ -268196,8 +269673,8 @@ self: {
          aeson base tasty-hunit temporary vault-tool
        ];
        description = "Utility library for spawning a HashiCorp Vault process";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268214,8 +269691,8 @@ self: {
          unordered-containers vault-tool
        ];
        description = "A monad transformer for vault-tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268239,8 +269716,8 @@ self: {
          unordered-containers
        ];
        description = "Common types and instances for Vaultaire";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268257,8 +269734,8 @@ self: {
          lmdb random stm transformers
        ];
        description = "semi-transparent persistence for Haskell using LMDB, STM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268274,8 +269751,8 @@ self: {
          array base bytestring bytestring-builder vcache
        ];
        description = "patricia tries modeled above VCache";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268290,7 +269767,7 @@ self: {
        ];
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268305,8 +269782,8 @@ self: {
        libraryHaskellDepends = [ base extra shelly system-filepath ];
        executableHaskellDepends = [ base shelly text ];
        description = "Recursively check that a directory is under version control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268318,7 +269795,7 @@ self: {
        sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm";
        libraryHaskellDepends = [ base polyparse ];
        description = "Reading and writing VCD files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vcf" = callPackage
@@ -268334,8 +269811,8 @@ self: {
          attoparsec base bytestring hspec hspec-expectations
        ];
        description = "A package to parse VCF files inspired in similar python libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268347,7 +269824,7 @@ self: {
        sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
        libraryHaskellDepends = [ base process ];
        description = "Facilities for accessing the version control revision of the current directory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vcs-web-hook-parse" = callPackage
@@ -268358,7 +269835,7 @@ self: {
        sha256 = "02lm4czrjwbnfmhybqn80j8xravi37z1a319s23hgxdbxpw970nv";
        libraryHaskellDepends = [ aeson base bytestring text ];
        description = "Parse development platform web hook messages";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "vcsgui" = callPackage
@@ -268382,7 +269859,7 @@ self: {
        ];
        description = "GUI library for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268407,7 +269884,7 @@ self: {
        ];
        description = "Wrapper for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268431,7 +269908,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion fin vector ];
        description = "Vec: length-indexed (sized) list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vec-lens" = callPackage
@@ -268444,7 +269921,7 @@ self: {
        editedCabalFile = "0grj1abb7gjbzw06672464r75wjnmra9d12yvlmdm1qyj9zya0ph";
        libraryHaskellDepends = [ base fin lens vec ];
        description = "Vec: length-indexed (sized) list: lens support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vec-optics" = callPackage
@@ -268457,7 +269934,7 @@ self: {
        editedCabalFile = "10abn334qhbik8s8lx1r54vcbj3d2s091j2w98mq3cllksa8dmv0";
        libraryHaskellDepends = [ base fin optics-core vec ];
        description = "Vec: length-indexed (sized) list: optics support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vect" = callPackage
@@ -268468,7 +269945,7 @@ self: {
        sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, tailored to computer graphics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vect-floating" = callPackage
@@ -268479,8 +269956,8 @@ self: {
        sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g";
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268494,8 +269971,8 @@ self: {
        editedCabalFile = "05k20xd7rcf3hypbbw53bv8yl65sgpdawdfmskypk3mbl1w5fymg";
        libraryHaskellDepends = [ accelerate base vect-floating ];
        description = "Accelerate instances for vect-floating types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268507,8 +269984,8 @@ self: {
        sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig";
        libraryHaskellDepends = [ base OpenGL vect ];
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268527,7 +270004,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck template-haskell transformers
        ];
        description = "Efficient Arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-algorithms" = callPackage
@@ -268544,7 +270021,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base mwc-random vector ];
        description = "Efficient algorithms for vector arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-binary" = callPackage
@@ -268555,7 +270032,7 @@ self: {
        sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz";
        libraryHaskellDepends = [ base binary vector ];
        description = "Binary instances for vector types (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-binary-instances" = callPackage
@@ -268574,7 +270051,7 @@ self: {
          base binary bytestring deepseq gauge vector
        ];
        description = "Instances of Data.Binary for vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-buffer" = callPackage
@@ -268585,7 +270062,7 @@ self: {
        sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv";
        libraryHaskellDepends = [ base deepseq vector ];
        description = "A buffer compatible with Data.Vector.*";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-builder" = callPackage
@@ -268603,7 +270080,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Vector builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-bytes-instances" = callPackage
@@ -268615,7 +270092,7 @@ self: {
        libraryHaskellDepends = [ base bytes vector ];
        testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ];
        description = "Serial (from the bytes package) for Vector (from the vector package)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-bytestring" = callPackage
@@ -268633,27 +270110,27 @@ self: {
        ];
        testHaskellDepends = [ base directory QuickCheck random ];
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "vector-circular" = callPackage
-    ({ mkDerivation, base, deepseq, hedgehog, hedgehog-classes
+    ({ mkDerivation, base, deepseq, doctest, hedgehog, hedgehog-classes
      , nonempty-vector, primitive, semigroupoids, template-haskell
      , vector
      }:
      mkDerivation {
        pname = "vector-circular";
-       version = "0.1.1";
-       sha256 = "08ydvvhzgkci615dnh3r5avzvx0xzibh9l2lys93sbxa139j446c";
+       version = "0.1.2";
+       sha256 = "1605yf9q8v6w8kxgsw5g9gmj39w23gzal3qf0mlssr4ay2psvg7y";
        libraryHaskellDepends = [
          base deepseq nonempty-vector primitive semigroupoids
          template-haskell vector
        ];
-       testHaskellDepends = [ base hedgehog hedgehog-classes ];
+       testHaskellDepends = [ base doctest hedgehog hedgehog-classes ];
        description = "circular vectors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-clock" = callPackage
@@ -268672,8 +270149,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Vector clocks for versioning message flows";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268692,8 +270169,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "Conduit utilities for vectors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268705,7 +270182,7 @@ self: {
        sha256 = "0z98f0fjn90x3azdbsnjpx61r9lna9hb67bjnmmhvil9a7hpd65x";
        libraryHaskellDepends = [ base vector ];
        description = "Some special functions to work with Vector (with zip)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-endian" = callPackage
@@ -268719,8 +270196,8 @@ self: {
        ];
        doHaddock = false;
        description = "Storable vectors with cpu-independent representation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268737,7 +270214,7 @@ self: {
          vector
        ];
        description = "Utilities for the \"vector\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-fft" = callPackage
@@ -268748,7 +270225,7 @@ self: {
        sha256 = "1aygafvsx3wybbp6hqg5ddkawl8m5m6s6dg5hbrlyibz2whrp1fs";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Native FFT and IFFT for vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-fftw" = callPackage
@@ -268766,7 +270243,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "A binding to the fftw library for one-dimensional vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
@@ -268780,8 +270257,8 @@ self: {
          base ghc-prim primitive vector vector-th-unbox
        ];
        description = "vectors that perform the fmap operation in constant time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268793,8 +270270,8 @@ self: {
        sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl";
        libraryHaskellDepends = [ base vector ];
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268810,7 +270287,7 @@ self: {
          base comonad hashable keys pointed semigroupoids semigroups vector
        ];
        description = "Orphan Instances for 'Data.Vector'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-instances-collections" = callPackage
@@ -268823,8 +270300,8 @@ self: {
          base collections-api template-haskell vector
        ];
        description = "Instances of the Data.Collections classes for Data.Vector.*";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268839,7 +270316,7 @@ self: {
        libraryHaskellDepends = [ base mmap primitive vector ];
        testHaskellDepends = [ base QuickCheck temporary vector ];
        description = "Memory map immutable and mutable vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-random" = callPackage
@@ -268852,8 +270329,8 @@ self: {
        editedCabalFile = "0ys49lp4hqdm9hmfirfycksi31k03w7i6fralmqz6p9l4rc1lcyy";
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        description = "Generate vectors filled with high quality pseudorandom numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268865,8 +270342,8 @@ self: {
        sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6";
        libraryHaskellDepends = [ base vector ];
        description = "(deprecated) Read instances for 'Data.Vector'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268879,7 +270356,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base tasty tasty-quickcheck vector ];
        description = "Vectors with O(1) reverse";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-shuffling" = callPackage
@@ -268890,7 +270367,7 @@ self: {
        sha256 = "04kpp7529jd4avhprfxdy6nfikx3d3ans0knhz3lspms4iky068i";
        libraryHaskellDepends = [ base random vector ];
        description = "Algorithms for vector shuffling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-sized" = callPackage
@@ -268907,7 +270384,7 @@ self: {
          finite-typelits hashable indexed-list-literals primitive vector
        ];
        description = "Size tagged vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-space" = callPackage
@@ -268918,7 +270395,7 @@ self: {
        sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-space-map" = callPackage
@@ -268930,8 +270407,8 @@ self: {
        libraryHaskellDepends = [ base containers vector-space ];
        testHaskellDepends = [ base doctest ];
        description = "vector-space operations for finite maps using Data.Map";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268949,8 +270426,8 @@ self: {
          test-framework-quickcheck2 test-framework-th vector-space
        ];
        description = "Instances of vector-space classes for OpenGL types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268964,8 +270441,8 @@ self: {
        editedCabalFile = "1284ds38z70696vsh695hx74nyslmgaqfv4lz0wadvmzcrw0hwb4";
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268982,7 +270459,7 @@ self: {
          base QuickCheck split tasty tasty-quickcheck vector
        ];
        description = "Combinator library for splitting vectors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-static" = callPackage
@@ -268993,8 +270470,8 @@ self: {
        sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Statically checked sizes on Data.Vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269006,7 +270483,7 @@ self: {
        sha256 = "04vaizcc78q94vpaly28iwhlwk6nwrsa6jmcq2afdl6yqp63njc6";
        libraryHaskellDepends = [ base deepseq parallel vector ];
        description = "A parallel evaluation strategy for boxed vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-text" = callPackage
@@ -269021,8 +270498,8 @@ self: {
          base binary prologue text vector vector-binary-instances
        ];
        description = "Text implementation based on unboxed char vector";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269037,7 +270514,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vectortiles" = callPackage
@@ -269064,7 +270541,7 @@ self: {
          unordered-containers vector
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vega-view" = callPackage
@@ -269083,8 +270560,8 @@ self: {
          http-types scotty text unordered-containers
        ];
        description = "Easily view Vega or Vega-Lite visualizations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269111,8 +270588,8 @@ self: {
          QuickCheck utf8-light
        ];
        description = "ASCII platform-adventure game";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269124,8 +270601,8 @@ self: {
        sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly";
        libraryHaskellDepends = [ base regex-pcre ];
        description = "Regular expressions made easy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269141,7 +270618,7 @@ self: {
          base binary deepseq dhall generic-lens serialise
        ];
        description = "Simple enum that encodes application verbosity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "verdict" = callPackage
@@ -269158,8 +270635,8 @@ self: {
        executableHaskellDepends = [ base markdown-unlit text ];
        testHaskellDepends = [ base hspec ];
        description = "Validation framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269180,8 +270657,8 @@ self: {
          aeson base containers hspec unordered-containers vector verdict
        ];
        description = "JSON instances and JSON Schema for verdict";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269197,8 +270674,8 @@ self: {
          base containers lens mtl sbv transformers union vinyl
        ];
        description = "An intermediate language for Hoare logic style verification";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269221,8 +270698,8 @@ self: {
          base hspec jwt QuickCheck text text-conversions time
        ];
        description = "A new Haskeleton package";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269235,8 +270712,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ alex happy ];
        description = "Verilog preprocessor, parser, and AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269273,8 +270750,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Random verilog generation and simulator testing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269287,8 +270764,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring semigroupoids ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269309,8 +270786,8 @@ self: {
          versioning wai wai-extra
        ];
        description = "Servant combinators for the versioning library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269331,7 +270808,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Types and parsers for software version numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vflow-types" = callPackage
@@ -269351,8 +270828,8 @@ self: {
          quickcheck-classes text
        ];
        description = "types for ingesting vflow data with aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269373,7 +270850,7 @@ self: {
          base containers exceptions hspec QuickCheck template-haskell
        ];
        description = "A Python str.format() like formatter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vformat-aeson" = callPackage
@@ -269395,7 +270872,7 @@ self: {
          vformat
        ];
        description = "Extend vformat to Aeson datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vformat-time" = callPackage
@@ -269409,7 +270886,7 @@ self: {
        libraryHaskellDepends = [ base time vformat ];
        testHaskellDepends = [ base time vformat ];
        description = "Extend vformat to time datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vfr-waypoints" = callPackage
@@ -269430,8 +270907,8 @@ self: {
          base fuzzy lens optparse-applicative
        ];
        description = "VFR waypoints, as published in the AIP (ERSA)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269461,8 +270938,8 @@ self: {
          base containers doctest lens QuickCheck tasty tasty-quickcheck text
        ];
        description = "A pager for grep";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269488,8 +270965,8 @@ self: {
          random test-framework test-framework-quickcheck2 text time
        ];
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269501,8 +270978,8 @@ self: {
        sha256 = "1bi8n8m9an1hcj4c6i2ifqyadg32nq4viffi1kiihaw3j7dh552b";
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269518,8 +270995,8 @@ self: {
        testHaskellDepends = [
          base containers doctest QuickCheck quickcheck-classes
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269538,8 +271015,8 @@ self: {
          vector vector-algorithms vty
        ];
        description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269551,8 +271028,8 @@ self: {
        sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h";
        libraryHaskellDepends = [ base mtl ];
        description = "Views allow you to run a State monad on part of a state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269593,8 +271070,8 @@ self: {
          yesod-core yesod-platform
        ];
        description = "An extensible dead-man's switch system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269621,8 +271098,8 @@ self: {
          parsec process relude temporary text themoviedb time yaml
        ];
        description = "Frontend for video metadata tagging tools";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269652,8 +271129,8 @@ self: {
          transformers wcwidth
        ];
        description = "An MPD client with vim-like key bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -269674,8 +271151,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Interpreter for microcomputer-era BASIC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269698,7 +271175,7 @@ self: {
          base criterion linear microlens mwc-random primitive tagged vector
        ];
        description = "Extensible Records";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vinyl-generics" = callPackage
@@ -269715,7 +271192,7 @@ self: {
          text vinyl
        ];
        description = "Convert plain records to vinyl (and vice versa), generically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -269736,7 +271213,7 @@ self: {
          vinyl
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vinyl-json" = callPackage
@@ -269752,8 +271229,8 @@ self: {
        ];
        testHaskellDepends = [ base hlint ];
        description = "Provide json instances automagically to vinyl types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269765,7 +271242,7 @@ self: {
        sha256 = "1vxw57c17lajq6qb2kcblymbg42y7ddh85kiik5kwmbxgfmqyrrv";
        libraryHaskellDepends = [ base vinyl ];
        description = "Loeb's theorem for extensible records";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vinyl-named-sugar" = callPackage
@@ -269776,8 +271253,8 @@ self: {
        sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h";
        libraryHaskellDepends = [ base vinyl ];
        description = "Syntax sugar for vinyl records using overloaded labels";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269792,8 +271269,8 @@ self: {
          base operational operational-extra vinyl-plus
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269813,8 +271290,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest vinyl ];
        description = "Vinyl records utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269826,8 +271303,8 @@ self: {
        sha256 = "0lcpg2mxmr41lqpn5ksc35c0w16s45z6qq9wjbm0cv8r047k9bq5";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        description = "Utilities for vinyl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269846,8 +271323,8 @@ self: {
          text vector vinyl
        ];
        description = "Vectors for vinyl vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269867,8 +271344,8 @@ self: {
          safe split
        ];
        description = "Virtual Haskell Environment builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269880,8 +271357,8 @@ self: {
        sha256 = "0a1abwjg2c41xxmmn7dalvk2lfh1h76waj327dxzjsg0lkkjvhx4";
        libraryHaskellDepends = [ base containers ];
        description = "Simple computation of visibility polygons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269903,8 +271380,8 @@ self: {
          xmms2-client xmms2-client-glib
        ];
        description = "An XMMS2 client";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269932,8 +271409,8 @@ self: {
          strict-concurrency svgcairo value-supply
        ];
        description = "Visualize the graph-rewrite steps of a Haskell program";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269952,8 +271429,8 @@ self: {
          process regexpr split uniplate
        ];
        description = "Create a visual profile of a program's source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269973,8 +271450,8 @@ self: {
          mtl optparse-applicative parsec template-haskell text
        ];
        description = "Visualize CBN reduction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269986,8 +271463,8 @@ self: {
        sha256 = "0f7rwww8gcfg6q0xq6z8c3010gx0vxr0v6yf143qxqjx02f93d1p";
        libraryHaskellDepends = [ base mtl profunctors ];
        description = "Profunctor optics via the profunctor representation theorem";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270009,7 +271486,7 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270023,7 +271500,7 @@ self: {
        testHaskellDepends = [ base bytestring cereal microspec time ];
        description = "Open Sound Control encode/decode";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270044,7 +271521,7 @@ self: {
        ];
        description = "Implementation of SuperCollider server specifications";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270062,8 +271539,8 @@ self: {
          resourcet text time xml-conduit xml-hamlet
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270078,7 +271555,7 @@ self: {
        libraryHaskellDepends = [ base bytestring process unix ];
        executableHaskellDepends = [ base bytestring process unix ];
        description = "Pseudo terminal interaction with subprocesses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vocabulary-kadma" = callPackage
@@ -270091,7 +271568,7 @@ self: {
        editedCabalFile = "0p70z83k5cg9yl91afks3ipvzv61nf5i7v0yqz59x1vdmml7fis0";
        libraryHaskellDepends = [ base smaoin ];
        description = "Smaoin vocabulary definitions of the base framework";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "voicebase" = callPackage
@@ -270115,8 +271592,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270128,7 +271605,7 @@ self: {
        sha256 = "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk";
        libraryHaskellDepends = [ base ];
        description = "A Haskell 98 logically uninhabited data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vorbiscomment" = callPackage
@@ -270142,7 +271619,7 @@ self: {
          base binary-strict bytestring mtl utf8-string
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -270153,8 +271630,8 @@ self: {
        sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g";
        libraryHaskellDepends = [ base bytestring ];
        description = "Vowpal Wabbit utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270166,8 +271643,8 @@ self: {
        sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff";
        libraryHaskellDepends = [ base bytestring process utf8-string ];
        description = "Haskell bindings for libvoyeur";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270184,8 +271661,8 @@ self: {
        libraryHaskellDepends = [ base primitive util vector ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270202,7 +271679,7 @@ self: {
        executableHaskellDepends = [ base ];
        executableSystemDepends = [ quat vrpn ];
        description = "Bindings to VRPN";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {quat = null; inherit (pkgs) vrpn;};
 
   "vt-utils" = callPackage
@@ -270226,7 +271703,7 @@ self: {
          time transformers unordered-containers vector wai warp
        ];
        description = "Vector and Text utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vte" = callPackage
@@ -270243,8 +271720,8 @@ self: {
        libraryPkgconfigDepends = [ vte ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) vte;};
 
@@ -270262,8 +271739,8 @@ self: {
        libraryPkgconfigDepends = [ vte ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) vte;};
 
@@ -270299,7 +271776,7 @@ self: {
          utf8-string vector
        ];
        description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vty-examples" = callPackage
@@ -270319,8 +271796,8 @@ self: {
          utf8-string vector vty
        ];
        description = "Examples programs using the vty library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270334,8 +271811,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base vty ];
        description = "A lib for displaying a menu and getting a selection using VTY";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270357,8 +271834,8 @@ self: {
        ];
        executableHaskellDepends = [ base QuickCheck random text vty ];
        description = "An interactive terminal user interface library for Vty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270370,8 +271847,8 @@ self: {
        sha256 = "1c60bvhk1riilj7sl7x7nw4d9yg56f2k0ps1aivmjm0q4brhgnx7";
        libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        description = "Extra vty-ui functionality not included in the core library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270379,12 +271856,12 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.8.2";
-       sha256 = "1wq3hd99zqzasfj4w86yypcd0yrdp8q3xrzx3g2v6vyi99qwzdrr";
+       version = "3.9";
+       sha256 = "00k23g4qszrhwbbc746y1z50mcnxw9b99rqfdqx6ncnzblc6b63z";
        libraryHaskellDepends = [ base bytestring transformers vector ];
-       librarySystemDepends = [ vulkan ];
+       libraryPkgconfigDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {vulkan = null;};
 
@@ -270396,8 +271873,8 @@ self: {
        sha256 = "1afnj053p3azm9wwdsr49w2s82k64lb0f12ak2g2v8vgidrjl7qk";
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270409,8 +271886,8 @@ self: {
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.4";
-       sha256 = "0r7byk8i59qnvkaqvkr5kdw9spwni6g6pyspgwzabhvky6n2mang";
+       version = "0.4.1";
+       sha256 = "1kd8v3l6c1szip8d7aw03s9vs5bnwbm66c98wbvmbmwc46rrkksh";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring containers dependent-map dependent-sum extra
@@ -270419,7 +271896,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Utils for the vulkan package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "waargonaut" = callPackage
@@ -270436,8 +271913,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.8.0.1";
-       sha256 = "1rfmj9c87ql6mfqspx58qpqx6k1pvvfvgngzbjfpdx62xknxflkf";
+       version = "0.8.0.2";
+       sha256 = "0w36jcgm1vq1212vd3mzwcfk6qwprz49afyshfjqcll6yq8vwp16";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
@@ -270457,8 +271934,8 @@ self: {
          zippers
        ];
        description = "JSON wrangling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270482,8 +271959,8 @@ self: {
          process select text udev unordered-containers vector X11 yaml
        ];
        description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270506,8 +271983,8 @@ self: {
          JuicyPixels
        ];
        description = "DOOM WAD file utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270528,26 +272005,26 @@ self: {
          remote-monad scotty semigroups stm text wai-middleware-static
        ];
        description = "A haskell binding of the Web Audio API ala blank-canvas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
   "wai" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hspec-discover
-     , http-types, network, text, transformers, vault
+     , http-types, network, text, vault
      }:
      mkDerivation {
        pname = "wai";
-       version = "3.2.2.1";
-       sha256 = "058871axlq6r0gcqxbjw37w57df9xbv81dmz99b1zq59wf329xzy";
+       version = "3.2.3";
+       sha256 = "1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m";
        libraryHaskellDepends = [
-         base bytestring http-types network text transformers vault
+         base bytestring http-types network text vault
        ];
        testHaskellDepends = [ base bytestring hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Web Application Interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -270567,7 +272044,7 @@ self: {
          base file-embed wai wai-app-static warp
        ];
        description = "Rewrite based on Accept-Language header";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-app-file-cgi" = callPackage
@@ -270594,7 +272071,7 @@ self: {
          hspec HTTP http-types unix wai warp
        ];
        description = "File/CGI/Rev Proxy App of WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-app-static" = callPackage
@@ -270629,7 +272106,7 @@ self: {
          unix-compat wai wai-extra zlib
        ];
        description = "WAI application for static serving";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-cli" = callPackage
@@ -270649,8 +272126,8 @@ self: {
          warp-tls
        ];
        description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270666,7 +272143,7 @@ self: {
          base bytestring conduit http-types transformers wai
        ];
        description = "conduit wrappers for WAI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-control" = callPackage
@@ -270682,7 +272159,7 @@ self: {
          websockets
        ];
        description = "Run wai Applications in IO based monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-cors" = callPackage
@@ -270706,7 +272183,7 @@ self: {
          websockets
        ];
        description = "CORS for WAI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-devel" = callPackage
@@ -270734,8 +272211,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec stm ];
        description = "A web server for the development of WAI compliant web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270753,7 +272230,7 @@ self: {
        ];
        description = "Helpers to bind digestive-functors onto wai requests";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-dispatch" = callPackage
@@ -270765,7 +272242,7 @@ self: {
        libraryHaskellDepends = [ base text wai yesod-routes ];
        description = "Nice wrapper around yesod-routes for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-enforce-https" = callPackage
@@ -270786,7 +272263,7 @@ self: {
          base bytestring case-insensitive hspec http-types wai wai-extra
        ];
        description = "Enforce HTTPS in Wai server app safely";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-eventsource" = callPackage
@@ -270798,36 +272275,37 @@ self: {
        libraryHaskellDepends = [ wai ];
        doHaddock = false;
        description = "WAI support for server-sent events (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-extra" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, call-stack, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, void, wai, wai-logger, word8, zlib
+     , data-default-class, directory, fast-logger, hspec, http-types
+     , http2, HUnit, iproute, network, resourcet, streaming-commons
+     , text, time, transformers, unix, vault, wai, wai-logger, word8
+     , zlib
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.1.4.1";
-       sha256 = "0q95vz3x0avznpv0mcb71vlmamyws8sm50asrhcph5qwfwh9x13a";
+       version = "3.1.6";
+       sha256 = "03bbhmy8dc2ivhgbsrc39wk5kb9ci4p98pb2qcq2w92imy710cj6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base base64-bytestring bytestring call-stack
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types http2 HUnit iproute network
-         old-locale resourcet streaming-commons text time transformers unix
-         unix-compat vault void wai wai-logger word8 zlib
+         case-insensitive containers cookie data-default-class directory
+         fast-logger http-types http2 HUnit iproute network resourcet
+         streaming-commons text time transformers unix vault wai wai-logger
+         word8
        ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive cookie fast-logger hspec
-         http-types http2 HUnit resourcet text time transformers wai zlib
+         http-types http2 HUnit iproute resourcet text time transformers wai
+         zlib
        ];
        description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-feature-flags" = callPackage
@@ -270846,7 +272324,7 @@ self: {
        ];
        executableHaskellDepends = [ base wai warp ];
        description = "Feature flag support for WAI applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -270862,7 +272340,7 @@ self: {
          transformers wai
        ];
        description = "Run CGI apps on WAI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-git-http" = callPackage
@@ -270885,8 +272363,8 @@ self: {
          warp
        ];
        description = "Git http-backend CGI App of WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270898,8 +272376,8 @@ self: {
        sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq";
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        description = "Graceful shutdown for WAI applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270920,8 +272398,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "WAI server that automatically reloads code after modification. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270934,8 +272412,8 @@ self: {
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        librarySystemDepends = [ fcgi ];
        description = "Wai handler to fastcgi";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fcgi;};
 
@@ -270952,7 +272430,7 @@ self: {
          transformers wai warp
        ];
        description = "Launch a web app in the default browser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-handler-scgi" = callPackage
@@ -270963,8 +272441,8 @@ self: {
        sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        description = "Wai handler to SCGI (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270981,8 +272459,8 @@ self: {
          transformers wai
        ];
        description = "Web Application Interface handler using snap-server. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270995,8 +272473,8 @@ self: {
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {QtWebKit = null;};
 
@@ -271013,7 +272491,7 @@ self: {
        ];
        description = "Nice wrapper around hastache for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-hmac-auth" = callPackage
@@ -271035,8 +272513,8 @@ self: {
          wai-extra
        ];
        description = "hmac authentication tools for WAI apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271053,7 +272531,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "WAI utilities for HTTP/2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-lambda" = callPackage
@@ -271078,7 +272556,7 @@ self: {
          wai
        ];
        description = "Haskell Webapps on AWS Lambda";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-lens" = callPackage
@@ -271093,8 +272571,8 @@ self: {
          base bytestring http-types lens network text vault wai
        ];
        description = "Lenses for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271110,8 +272588,8 @@ self: {
          base bytestring conduit http-types text transformers wai wai-extra
        ];
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271128,7 +272606,7 @@ self: {
          time uuid wai
        ];
        description = "A logging middleware for WAI applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-logger" = callPackage
@@ -271145,7 +272623,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-logger-buffered" = callPackage
@@ -271168,8 +272646,8 @@ self: {
          base bytestring containers data-default time wai
        ];
        description = "Buffer requets before logging them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271186,8 +272664,8 @@ self: {
          wai-logger
        ];
        description = "A logging system for preforked WAI apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271217,8 +272695,8 @@ self: {
          warp wreq
        ];
        description = "Compiling and serving assets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271255,7 +272733,7 @@ self: {
          time uri-bytestring wai wai-extra warp
        ];
        description = "Authentication middleware that secures WAI application";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-middleware-brotli" = callPackage
@@ -271281,8 +272759,8 @@ self: {
          tasty-hunit wai wai-extra
        ];
        description = "WAI middleware for brotli compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-middleware-cache" = callPackage
@@ -271303,8 +272781,8 @@ self: {
          test-framework-hunit wai wai-test
        ];
        description = "Caching middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271323,8 +272801,8 @@ self: {
          wai-middleware-cache
        ];
        description = "Redis backend for wai-middleware-cache";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271340,7 +272818,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "WAI Middleware to cache things";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-caching-lru" = callPackage
@@ -271357,7 +272835,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-caching-redis" = callPackage
@@ -271374,7 +272852,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Cache Wai Middleware using Redis backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-catch" = callPackage
@@ -271387,8 +272865,8 @@ self: {
          base bytestring http-types lifted-base wai
        ];
        description = "Wai error catching middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271408,7 +272886,7 @@ self: {
          base base-compat-batteries http-types tasty tasty-wai wai
        ];
        description = "GNU Terry Pratchett - Add the X-Clacks-Overhead Header to Wai Responses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-consul" = callPackage
@@ -271430,8 +272908,8 @@ self: {
          transformers void wai wai-conduit
        ];
        description = "Wai Middleware for Consul";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271464,8 +272942,8 @@ self: {
          wai-logger wai-transformers warp
        ];
        description = "Route to different middlewares based on the incoming Accept header";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271497,8 +272975,8 @@ self: {
          text transformers wai wai-app-static wai-extra warp
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271525,8 +273003,8 @@ self: {
          random resourcet text vault wai wai-conduit warp warp-tls
        ];
        description = "WAI middleware that delegates handling of requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271544,8 +273022,8 @@ self: {
          http-types unix-compat unordered-containers wai
        ];
        description = "WAI ETag middleware for static files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271561,7 +273039,7 @@ self: {
          base bytestring http-types streaming-commons wai
        ];
        description = "WAI middleware to unzip request bodies";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "wai-middleware-headers" = callPackage
@@ -271572,8 +273050,8 @@ self: {
        sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh";
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "cors and addHeaders for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271596,7 +273074,7 @@ self: {
          regex-compat wai wai-extra
        ];
        description = "HMAC Authentication Middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-hmac-client" = callPackage
@@ -271616,8 +273094,8 @@ self: {
          word8
        ];
        description = "WAI HMAC Authentication Middleware Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271636,7 +273114,7 @@ self: {
          aeson base binary bytestring http-types text wai
        ];
        description = "Converts errors from plaintext to json";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-metrics" = callPackage
@@ -271658,7 +273136,7 @@ self: {
          wai-extra
        ];
        description = "A WAI middleware to collect EKG request metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -271676,8 +273154,8 @@ self: {
          base Cabal directory mtl split text wai wai-middleware-static warp
        ];
        description = "WAI middleware for preprocessing static files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271695,7 +273173,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "WAI middlware for exposing http://prometheus.io metrics.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "wai-middleware-rollbar" = callPackage
@@ -271711,8 +273189,8 @@ self: {
          rollbar-hs text time uuid wai
        ];
        description = "Middleware that communicates to Rollbar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271733,8 +273211,8 @@ self: {
          test-framework-hunit text wai wai-test
        ];
        description = "Wai dispatch middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271756,7 +273234,7 @@ self: {
          time wai wai-extra
        ];
        description = "WAI Slack request verification middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-middleware-static" = callPackage
@@ -271770,6 +273248,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.9.0";
        sha256 = "161s2lk9529008219q6fgbmv0rkf74jmfj1cii8zxkgnhpvi22zs";
+       revision = "1";
+       editedCabalFile = "1lvinpyfyb5ryxn3g41mgg6w7l7nzyh7sylmms7nvdvaqzx7l3lv";
        libraryHaskellDepends = [
          base bytestring containers cryptonite directory expiring-cache-map
          filepath http-types memory mime-types old-locale semigroups text
@@ -271781,7 +273261,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "WAI middleware that serves requests to static files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-static-caching" = callPackage
@@ -271799,8 +273279,8 @@ self: {
          unix wai
        ];
        description = "WAI middleware that serves requests to static files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271819,7 +273299,7 @@ self: {
          wai-extra
        ];
        description = "Serve embedded static files as a Wai middleware";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-throttle" = callPackage
@@ -271842,7 +273322,7 @@ self: {
          transformers wai wai-extra
        ];
        description = "WAI Middleware for Request Throttling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-travisci" = callPackage
@@ -271860,8 +273340,8 @@ self: {
          transformers vault wai
        ];
        description = "WAI middleware for authenticating webhook payloads from Travis CI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271881,7 +273361,7 @@ self: {
          transformers-base unordered-containers wai wai-transformers
        ];
        description = "Route Wai middlewares based on HTTP verbs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-predicates" = callPackage
@@ -271904,7 +273384,7 @@ self: {
        ];
        description = "WAI request predicates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-rate-limit" = callPackage
@@ -271915,7 +273395,7 @@ self: {
        sha256 = "1z7npcf0smzyfjvkmpa6dw08sg3ywx4cc4kafgxk95dh8yqnmidw";
        libraryHaskellDepends = [ base http-types wai ];
        description = "Rate limiting as WAI middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-rate-limit-redis" = callPackage
@@ -271932,8 +273412,8 @@ self: {
          wai wai-extra wai-rate-limit warp
        ];
        description = "Redis backend for rate limiting as WAI middleware";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271952,8 +273432,8 @@ self: {
          base bytestring criterion http-types text wai
        ];
        description = "Declarative request parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271965,8 +273445,8 @@ self: {
        sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va";
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "Response interface for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271989,7 +273469,7 @@ self: {
          unordered-containers wai
        ];
        description = "WAI middleware for path-based request routing with captures";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "wai-router" = callPackage
@@ -272000,8 +273480,8 @@ self: {
        sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7";
        libraryHaskellDepends = [ base text wai ];
        description = "Provides basic routing on URL paths for WAI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272026,8 +273506,8 @@ self: {
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
        description = "Typesafe URLs for Wai applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272054,8 +273534,8 @@ self: {
          base criterion http-types wai wai-predicates
        ];
        description = "Declarative routing for WAI";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272074,7 +273554,7 @@ self: {
          x509 x509-store xml-conduit
        ];
        description = "SAML2 assertion validation as WAI middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-secure-cookies" = callPackage
@@ -272097,8 +273577,8 @@ self: {
          base bytestring hspec hspec-expectations hspec-wai http-types wai
          wai-extra
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272117,7 +273597,7 @@ self: {
        ];
        description = "Flexible session middleware for WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-session-alt" = callPackage
@@ -272133,8 +273613,8 @@ self: {
          wai-transformers
        ];
        description = "An alternative session middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272152,7 +273632,7 @@ self: {
        ];
        description = "Session store based on clientsession";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-session-mysql" = callPackage
@@ -272172,8 +273652,8 @@ self: {
          base bytestring data-default mysql-simple text wai-session
        ];
        description = "MySQL backed Wai session store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272196,8 +273676,8 @@ self: {
          wai-session
        ];
        description = "PostgreSQL backed Wai session store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272215,7 +273695,7 @@ self: {
        ];
        description = "Session store based on Tokyo Cabinet";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-slack-middleware" = callPackage
@@ -272227,7 +273707,7 @@ self: {
        libraryHaskellDepends = [ aeson base http-client http-types wai ];
        testHaskellDepends = [ base ];
        description = "A Slack middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-static-cache" = callPackage
@@ -272246,8 +273726,8 @@ self: {
          vector-algorithms wai
        ];
        description = "A simple cache for serving static files in a WAI middleware";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272264,7 +273744,7 @@ self: {
          wai-extra
        ];
        description = "generate static html pages from a WAI application";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-test" = callPackage
@@ -272276,7 +273756,7 @@ self: {
        libraryHaskellDepends = [ wai ];
        doHaddock = false;
        description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-thrift" = callPackage
@@ -272291,8 +273771,8 @@ self: {
          base blaze-builder bytestring http-types thrift wai
        ];
        description = "Thrift transport layer for Wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272308,8 +273788,8 @@ self: {
          base bytestring containers http-types time wai
        ];
        description = "Wai middleware for request throttling";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272326,7 +273806,7 @@ self: {
          base exceptions extractable-singleton monad-control-aligned
          transformers wai wai-websockets websockets
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-util" = callPackage
@@ -272344,7 +273824,7 @@ self: {
        ];
        description = "Collection of utility functions for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-websockets" = callPackage
@@ -272367,7 +273847,7 @@ self: {
          transformers wai wai-app-static warp websockets
        ];
        description = "Provide a bridge between WAI and the websockets package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wait-handle" = callPackage
@@ -272378,7 +273858,7 @@ self: {
        sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m";
        libraryHaskellDepends = [ base ];
        description = "Wait handles are MVars which can only be written to once, and from which values can never be removed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "waitfree" = callPackage
@@ -272389,8 +273869,8 @@ self: {
        sha256 = "09hlqli7zpcxfa8w7vh937gc3rxp7s8q8v1zs8ciwnmh6ca4i8rq";
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272415,8 +273895,8 @@ self: {
          aeson base http-types tasty tasty-hunit wai wai-extra
        ];
        description = "A very simple Wai router";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272435,7 +273915,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Functions to manipulate records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "waldo" = callPackage
@@ -272467,8 +273947,8 @@ self: {
          warp zlib-conduit
        ];
        description = "A generator of comics based on some ascertainable data about the requester";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272490,8 +273970,8 @@ self: {
        executableHaskellDepends = [ base JuicyPixels yaml ];
        testHaskellDepends = [ base ];
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272520,7 +274000,7 @@ self: {
          pipes-zlib text time transformers
        ];
        description = "A parser for the Web Archive (WARC) format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "warp" = callPackage
@@ -272553,7 +274033,7 @@ self: {
          http-types network time-manager unix unix-compat x509
        ];
        description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -272569,8 +274049,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Dynamic configurable warp HTTP server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272588,7 +274068,7 @@ self: {
          http2-grpc-types unliftio-core wai warp warp-tls
        ];
        description = "A minimal gRPC server on top of Warp";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "warp-static" = callPackage
@@ -272608,8 +274088,8 @@ self: {
          wai-app-static wai-extra warp
        ];
        description = "Static file server based on Warp and wai-app-static (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272621,8 +274101,8 @@ self: {
        sha256 = "1gi9xkaa3wi5n2vhmlc7s4zm48l2fakwnd7bw007hzfqi17zz13x";
        libraryHaskellDepends = [ base network systemd unix wai warp ];
        description = "Socket activation and other systemd integration for the Warp web server (WAI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272639,7 +274119,7 @@ self: {
          streaming-commons tls tls-session-manager wai warp
        ];
        description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -272659,7 +274139,7 @@ self: {
          warp warp-tls x509
        ];
        description = "set group and user id before running server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "warped" = callPackage
@@ -272676,8 +274156,8 @@ self: {
          monad-control preamble uuid wai wai-conduit wai-cors warp
        ];
        description = "Warp and Wai Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272706,8 +274186,8 @@ self: {
        ];
        testToolDepends = [ alex happy ];
        description = "WebAssembly Language Toolkit and Interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272721,8 +274201,8 @@ self: {
        editedCabalFile = "1hmjlva0pbvbbl3vcngqlqrisx32qzlc9pl96zh2rb6m25riisdg";
        libraryHaskellDepends = [ base mtl time ];
        description = "Simple control structure to re-try an action with exponential backoff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272739,8 +274219,8 @@ self: {
          system-filepath
        ];
        description = "Opinionated filesystem watcher";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272769,8 +274249,8 @@ self: {
          system-filepath tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "File change watching utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272784,7 +274264,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
        description = "Command-line tool for converting audio files and filling in ID3 tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wave" = callPackage
@@ -272795,6 +274275,8 @@ self: {
        pname = "wave";
        version = "0.2.0";
        sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki";
+       revision = "1";
+       editedCabalFile = "19rxhnqhhv1qs35y723c15c8nifj8pakcrd09jlvg5271zg4qb0b";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal containers transformers
@@ -272804,7 +274286,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Work with WAVE and RF64 files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wavefront" = callPackage
@@ -272819,8 +274301,8 @@ self: {
          attoparsec base dlist filepath mtl text transformers vector
        ];
        description = "Wavefront OBJ loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272839,8 +274321,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec linear ];
        description = "Wavefront .obj file loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272857,8 +274339,8 @@ self: {
          delimited-text
        ];
        description = "Parse WaveSurfer files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272879,8 +274361,8 @@ self: {
          base bytestring filepath pretty-show split vector
        ];
        description = "Process WAVE files in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272894,7 +274376,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        description = "Native wcwidth";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "weak-bag" = callPackage
@@ -272905,8 +274387,8 @@ self: {
        sha256 = "0jh5xv02wlifjqdvm2cr9mi3wjj4f14s1ap5pphin2rdzklhl3rc";
        libraryHaskellDepends = [ base containers ];
        description = "Mutable bag backed by weak pointers to each item";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272923,8 +274405,8 @@ self: {
          utf8-string vector
        ];
        description = "Weather API implemented in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272937,7 +274419,7 @@ self: {
        libraryHaskellDepends = [ base gtk webkit ];
        description = "Web Browser In Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "web-css" = callPackage
@@ -272948,8 +274430,8 @@ self: {
        sha256 = "1havyvd6f0xagynxpar2jsmx5x1izwl7wgxia0wbwbzaj0fzn2k2";
        libraryHaskellDepends = [ base text ];
        description = "Simple functions for CSS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272967,8 +274449,8 @@ self: {
          base bytestring directory failure old-locale text time
        ];
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272984,7 +274466,7 @@ self: {
          base happstack-server safe snap snap-core snap-server
        ];
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "web-inv-route" = callPackage
@@ -273004,7 +274486,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing using invertible invariants and bijections";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -273022,8 +274504,8 @@ self: {
          zeromq-haskell
        ];
        description = "Bindings for the Mongrel2 web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273042,8 +274524,8 @@ self: {
          base directory filepath open-browser temporary text
        ];
        description = "Library to present content to an user via their browser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273063,8 +274545,8 @@ self: {
          lens mtl Stream text vector wl-pprint-text
        ];
        description = "Monoidally construct web pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273080,7 +274562,7 @@ self: {
          base binary bytestring containers http-types mtl stm text
        ];
        description = "dynamic plugin system for web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-push" = callPackage
@@ -273101,8 +274583,8 @@ self: {
          base base64-bytestring binary bytestring hspec
        ];
        description = "Send messages using Web Push protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273132,8 +274614,8 @@ self: {
          base doctest lens lucid numhask tasty tasty-hspec text
        ];
        description = "representations of a web page";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273152,7 +274634,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-boomerang" = callPackage
@@ -273165,7 +274647,7 @@ self: {
          base boomerang mtl parsec text web-routes
        ];
        description = "Use boomerang for type-safe URL parsers/printers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-generics" = callPackage
@@ -273176,7 +274658,7 @@ self: {
        sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy";
        libraryHaskellDepends = [ base parsec text web-routes ];
        description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-happstack" = callPackage
@@ -273191,7 +274673,7 @@ self: {
          base bytestring happstack-server text web-routes
        ];
        description = "Adds support for using web-routes with Happstack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-hsp" = callPackage
@@ -273202,7 +274684,7 @@ self: {
        sha256 = "1arc22l7xk49fp80i1fkvj8xj71lqxrs2g5gnvjzwlkc0azzaz6a";
        libraryHaskellDepends = [ base hsp text web-routes ];
        description = "Adds XMLGenerator instance for RouteT monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-mtl" = callPackage
@@ -273213,7 +274695,7 @@ self: {
        sha256 = "1k35ch294p2pkf7mbip8wy9rin956y31sq68b4cdrj9sj9891rx5";
        libraryHaskellDepends = [ base web-routes ];
        description = "Extends web-routes with mtl-based MonadIO / MonadTrans RouteT instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-quasi" = callPackage
@@ -273226,8 +274708,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273239,8 +274721,8 @@ self: {
        sha256 = "0fysbzdal8sl8pk4sj7i9cma351r0m9lry5pi3ra7fn0czcajajy";
        libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273257,7 +274739,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
        description = "Support for deriving PathInfo using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-transformers" = callPackage
@@ -273268,8 +274750,8 @@ self: {
        sha256 = "0pm1v9wqlzi6cg92lajbwbnhsdm509371i8mvyvvj6qa5m58cdib";
        libraryHaskellDepends = [ base transformers web-routes ];
        description = "Extends web-routes with some transformers instances for RouteT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273285,7 +274767,7 @@ self: {
          base bytestring http-types text wai web-routes
        ];
        description = "Library for maintaining correctness of URLs within an application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routing" = callPackage
@@ -273304,8 +274786,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "simple routing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273345,8 +274827,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Web3 API for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273373,8 +274855,8 @@ self: {
          http-types QuickCheck text time vector wai wai-extra warp
        ];
        description = "WAI based library for web api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273397,8 +274879,8 @@ self: {
          base hspec http-types network text transformers wai
        ];
        description = "Haskell web app framework based on WAI & Warp";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273418,8 +274900,8 @@ self: {
          hashable memory serialise text x509 x509-validation
        ];
        description = "Web Authentication API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273444,7 +274926,7 @@ self: {
          unliftio-core unordered-containers wai
        ];
        description = "A super-simple web server framework";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "webcloud" = callPackage
@@ -273460,8 +274942,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Turn an optparse-applicative program into a CGI program!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273489,8 +274971,8 @@ self: {
          unordered-containers
        ];
        description = "Webmachine inspired toolkit for building http applications and services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273506,8 +274988,8 @@ self: {
          base hvect mtl path-pieces reroute text unordered-containers
        ];
        description = "A simple request dispatcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273525,8 +275007,8 @@ self: {
          unordered-containers wai wai-lens webcrank webcrank-dispatch
        ];
        description = "Build a WAI Application from Webcrank Resources";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273550,7 +275032,7 @@ self: {
          transformers-base unordered-containers vector zip-archive
        ];
        description = "a Haskell client for the Selenium WebDriver protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "webdriver-angular" = callPackage
@@ -273571,8 +275053,8 @@ self: {
          webdriver
        ];
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273599,8 +275081,8 @@ self: {
        ];
        testHaskellDepends = [ base parallel text ];
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273636,8 +275118,8 @@ self: {
          transformers unordered-containers vector wreq
        ];
        description = "Bindings to the WebDriver API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273667,7 +275149,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A Haskell bindings for Webex Teams API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webex-teams-conduit" = callPackage
@@ -273693,7 +275175,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Conduit wrapper of Webex Teams List API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webex-teams-pipes" = callPackage
@@ -273719,7 +275201,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Pipes wrapper of Webex Teams List API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webfinger-client" = callPackage
@@ -273737,8 +275219,8 @@ self: {
          uri-bytestring
        ];
        description = "WebFinger client library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273751,8 +275233,8 @@ self: {
      }:
      mkDerivation {
        pname = "webgear-server";
-       version = "0.2.0";
-       sha256 = "0fyyb4f4dab24as2dv5vbvacwcvp9bcrwyr483yiqn3fhm7975nr";
+       version = "0.2.1";
+       sha256 = "0qf3w2vk7m4ci8lyxk37iz19zbz08afihrn4sw2cqza9yaw51bjh";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring bytestring-conversion
          case-insensitive http-api-data http-types mtl network
@@ -273765,7 +275247,7 @@ self: {
          template-haskell text unordered-containers wai
        ];
        description = "Composable, type-safe library to build HTTP API servers";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "webidl" = callPackage
@@ -273785,8 +275267,8 @@ self: {
          base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string
        ];
        description = "Parser and Pretty Printer for the Web IDL Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {LEXER = null;};
 
@@ -273806,7 +275288,7 @@ self: {
          filepath hopfli optparse-applicative text vector xmlgen zlib
        ];
        description = "webfont generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webkit" = callPackage
@@ -273825,8 +275307,8 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {webkit = null;};
 
   "webkit-javascriptcore" = callPackage
@@ -273839,8 +275321,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {webkit = null;};
 
@@ -273854,7 +275336,7 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -273874,8 +275356,8 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webkitgtk3-javascriptcore" = callPackage
@@ -273889,8 +275371,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        description = "JavaScriptCore FFI from webkitgtk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webp" = callPackage
@@ -273901,6 +275383,8 @@ self: {
        pname = "webp";
        version = "0.1.0.0";
        sha256 = "153icv3911drnjkii2b0csdq3ksavmxpz26zm9xcp24kfbsr6gvk";
+       revision = "1";
+       editedCabalFile = "1gh6k398c8kq9h0cikggcy9jppnw0234c28sy5ikdiir1i0db1p3";
        libraryHaskellDepends = [ base bytestring JuicyPixels vector ];
        libraryPkgconfigDepends = [ libwebp ];
        libraryToolDepends = [ c2hs ];
@@ -273908,7 +275392,7 @@ self: {
          base bytestring JuicyPixels tasty tasty-hunit
        ];
        description = "JuicyPixels support for WebP format";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) libwebp;};
 
   "webpage" = callPackage
@@ -273921,7 +275405,7 @@ self: {
          base blaze-html data-default lucid text
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "webrtc-vad" = callPackage
@@ -273932,7 +275416,7 @@ self: {
        sha256 = "0lylc3axcamrmjaarx3aacbjc9d0rkhmdgq1g2pc5j0lsf8ndk49";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Easy voice activity detection";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webserver" = callPackage
@@ -273949,8 +275433,8 @@ self: {
          old-locale parsec process stm time unix zlib
        ];
        description = "HTTP server library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273970,8 +275454,8 @@ self: {
          optparse-applicative optparse-simple pretty-show text wai warp
        ];
        description = "Show programming language printed values in a web UI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273985,8 +275469,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath gtk webkit ];
        description = "Transforms URLs to PNGs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "websockets" = callPackage
@@ -274020,7 +275504,7 @@ self: {
        ];
        doCheck = false;
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "websockets-rpc" = callPackage
@@ -274047,8 +275531,8 @@ self: {
          wai-transformers websockets websockets-simple
        ];
        description = "Simple streaming RPC mechanism using WebSockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274073,7 +275557,7 @@ self: {
          transformers wai-transformers websockets
        ];
        description = "Composable websockets clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "websockets-simple-extra" = callPackage
@@ -274083,7 +275567,7 @@ self: {
        version = "0.0.0";
        sha256 = "1ckni1imxh4k1nxivvj9p1mffzvdmyjc20nas8b90dkkxblgnk1j";
        libraryHaskellDepends = [ base mtl websockets-simple ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "websockets-snap" = callPackage
@@ -274099,7 +275583,7 @@ self: {
          snap-server websockets
        ];
        description = "Snap integration for the websockets library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "webwire" = callPackage
@@ -274119,8 +275603,8 @@ self: {
          wai-extra
        ];
        description = "Functional reactive web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274134,7 +275618,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "a wedding announcement";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "wedged" = callPackage
@@ -274153,7 +275637,7 @@ self: {
        ];
        description = "Wedged postcard generator";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "weeder" = callPackage
@@ -274177,7 +275661,7 @@ self: {
          optparse-applicative transformers
        ];
        description = "Detect dead code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "weekdaze" = callPackage
@@ -274207,7 +275691,7 @@ self: {
        ];
        description = "A school-timetable problem-solver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274223,7 +275707,7 @@ self: {
        ];
        testHaskellDepends = [ base deepseq ];
        description = "Measure allocations of a Haskell functions/values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "weighted" = callPackage
@@ -274234,8 +275718,8 @@ self: {
        sha256 = "1xizw6509rwj3l75haxl8sgdbd5mailj14d6qgy77r83g9qr6p8s";
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        description = "Writer monad which uses semiring constraint";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274250,8 +275734,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        description = "Weighted Regular Expression Matcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274263,7 +275747,7 @@ self: {
        sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv";
        libraryHaskellDepends = [ base ];
        description = "A weighted nondeterministic search monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "welshy" = callPackage
@@ -274282,8 +275766,8 @@ self: {
          resourcet text transformers unordered-containers wai warp
        ];
        description = "Haskell web framework (because Scotty had trouble yodeling)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274301,7 +275785,7 @@ self: {
          base bytestring filemanip filepath optparse-applicative split
        ];
        description = "Pretty-printing of codebases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "werewolf" = callPackage
@@ -274325,8 +275809,8 @@ self: {
          optparse-applicative random-shuffle text transformers
        ];
        description = "A game engine for playing werewolf within an arbitrary chat client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274346,8 +275830,8 @@ self: {
          mtl optparse-applicative process text wai warp werewolf
        ];
        description = "A chat interface for playing werewolf in Slack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274384,8 +275868,8 @@ self: {
          tasty-quickcheck text transformers versions
        ];
        description = "Solver-agnostic symbolic values support for issuing queries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274397,8 +275881,8 @@ self: {
        sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy";
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        description = "MongoDB plugin for Wheb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274410,8 +275894,8 @@ self: {
        sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h";
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        description = "Redis connection for Wheb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274423,8 +275907,8 @@ self: {
        sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp";
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        description = "Strapped templates for Wheb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274436,7 +275920,7 @@ self: {
        sha256 = "1c1l79bdpqfg4n3p5gkc3x362m9k11hmyydr2y3j0xs4hhm3d5aa";
        libraryHaskellDepends = [ base shelly template-haskell text ];
        description = "Determine the full path to an executable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "while-lang-parser" = callPackage
@@ -274447,8 +275931,8 @@ self: {
        sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll";
        libraryHaskellDepends = [ base indents parsec ];
        description = "Parser for the While language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274467,8 +275951,8 @@ self: {
          base containers GLUT mtl OpenGL process random X11
        ];
        description = "A Haskell window manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274480,8 +275964,8 @@ self: {
        sha256 = "0kbyv0q6z2d2plblafqcmwcfiyhdbijqnqg2w7qxr7dklka8245v";
        libraryHaskellDepends = [ base parsec template-haskell ];
        description = "Mustache templates with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274497,7 +275981,7 @@ self: {
        executableHaskellDepends = [ haskell98 random ];
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274511,8 +275995,8 @@ self: {
        editedCabalFile = "07jpszzhzfygz920y09j4xrkw6pgwbpxqn79lavzz0w6jpd447y1";
        libraryHaskellDepends = [ base network network-uri split ];
        description = "WHOIS client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274529,7 +276013,7 @@ self: {
          base cairo colour directory hsnoise MonadRandom mtl random
          random-fu random-shuffle random-source relude temporary time
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "why3" = callPackage
@@ -274547,8 +276031,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Haskell support for the Why3 input format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274566,7 +276050,9 @@ self: {
          quickcheck-classes semirings
        ];
        description = "Data types for large but fixed width signed and unsigned integers";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "wigner-symbols" = callPackage
@@ -274583,7 +276069,7 @@ self: {
          base criterion primitive random vector
        ];
        description = "CG coefficients and Wigner symbols";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wigner-ville-accelerate" = callPackage
@@ -274595,8 +276081,8 @@ self: {
        libraryHaskellDepends = [ accelerate accelerate-fft base ];
        testHaskellDepends = [ base wigner ];
        description = "Wigner-ville transform using the Accelerate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {wigner = null;};
 
@@ -274613,7 +276099,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring filepath hspec time ];
        description = "Scrape WikiCFP web site";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wikipedia4epub" = callPackage
@@ -274632,8 +276118,8 @@ self: {
          regex-base regex-posix tagsoup url xml zip-archive zlib
        ];
        description = "Wikipedia EPUB E-Book construction from Firefox history";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274652,7 +276138,7 @@ self: {
          base hspec microlens QuickCheck stm transformers
        ];
        description = "Dynamic key binding framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wild-bind-indicator" = callPackage
@@ -274669,8 +276155,8 @@ self: {
          wild-bind
        ];
        description = "Graphical indicator for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274687,8 +276173,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274708,7 +276194,7 @@ self: {
          async base hspec text time transformers wild-bind X11
        ];
        description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wilton-ffi" = callPackage
@@ -274719,7 +276205,7 @@ self: {
        sha256 = "1kpr1rg3nbvjvj29pa4b8ls52x0j6ixidnh6nm2jw3c2gplhmr5d";
        libraryHaskellDepends = [ aeson base bytestring utf8-string ];
        description = "Haskell modules support for Wilton JavaScript runtime";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "win-hp-path" = callPackage
@@ -274733,7 +276219,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        executableHaskellDepends = [ base process split ];
        description = "Work with multiple Haskell Platform versions on Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "windns" = callPackage
@@ -274747,8 +276233,8 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dnsapi = null;};
 
@@ -274766,8 +276252,8 @@ self: {
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274779,8 +276265,8 @@ self: {
        sha256 = "0xamx4yhyv264mka4ypp0r1xh3xv7ba31sis3lbhjycn4i07wlhd";
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274818,8 +276304,8 @@ self: {
          serialise store text vector
        ];
        description = "A compact, well-typed seralisation format for Haskell values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274836,8 +276322,8 @@ self: {
        ];
        librarySystemDepends = [ kernel32 ws2_32 ];
        description = "I/O library for Windows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {kernel32 = null; ws2_32 = null;};
 
@@ -274863,7 +276349,7 @@ self: {
          criterion io-streams transformers
        ];
        description = "Fast binary io-streams adapter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wires" = callPackage
@@ -274880,8 +276366,8 @@ self: {
          base deepseq mtl profunctors semigroupoids these
        ];
        description = "Functional reactive programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274898,8 +276384,8 @@ self: {
          base hspec mtl QuickCheck template-haskell transformers
        ];
        description = "Wiring, promotion and demotion of types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274914,7 +276400,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Access GPIO pins on Raspberry Pi via wiringPi library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "witch" = callPackage
@@ -274930,7 +276416,7 @@ self: {
          base bytestring containers hspec QuickCheck text
        ];
        description = "Convert values from one type into another";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "with-index" = callPackage
@@ -274941,7 +276427,7 @@ self: {
        sha256 = "0dv81mp66l0j0dfa0mm9vqmdfxvhfg5py1gxqwh1jvpr8iks1q8q";
        libraryHaskellDepends = [ base ];
        description = "A tiny library for composing indexed traversals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "with-location" = callPackage
@@ -274953,7 +276439,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Use ImplicitParams-based source locations in a backward compatible way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "with-utf8" = callPackage
@@ -274977,7 +276463,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Get your IO right on the first try";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "withdependencies" = callPackage
@@ -274993,25 +276479,30 @@ self: {
        ];
        testHaskellDepends = [ base conduit hspec HUnit mtl ];
        description = "Run computations that depend on one or more elements in a stream";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "witherable" = callPackage
-    ({ mkDerivation, base, base-orphans, containers, hashable, lens
-     , monoidal-containers, transformers, transformers-compat
-     , unordered-containers, vector, witherable-class
+    ({ mkDerivation, base, base-orphans, containers, hashable
+     , indexed-traversable, indexed-traversable-instances, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.3.5";
-       sha256 = "13r4g5fg3fgl3zall0daljivnk4gm1lm2s8qir1izwkmq25081wb";
+       version = "0.4.1";
+       sha256 = "1jj2dq0ddaa2v3hksnrv1z1ll19fa4npsqlp7fs4nn5g6833y58b";
        libraryHaskellDepends = [
-         base base-orphans containers hashable lens monoidal-containers
-         transformers transformers-compat unordered-containers vector
-         witherable-class
+         base base-orphans containers hashable indexed-traversable
+         indexed-traversable-instances transformers unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         base containers hashable QuickCheck quickcheck-instances tasty
+         tasty-quickcheck transformers unordered-containers vector
        ];
        description = "filterable traversable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "witherable-class" = callPackage
@@ -275027,7 +276518,19 @@ self: {
          unordered-containers vector
        ];
        description = "Witherable = Traversable + Filterable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "witherable-class_0_0_1" = callPackage
+    ({ mkDerivation, base, witherable }:
+     mkDerivation {
+       pname = "witherable-class";
+       version = "0.0.1";
+       sha256 = "0995ixa9yzym7fsrgj77j0lyz7y5nnbkn0m2ndxdc401viyhkigd";
+       libraryHaskellDepends = [ base witherable ];
+       description = "Witherable = Traversable + Filterable";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "within" = callPackage
@@ -275042,7 +276545,7 @@ self: {
          base comonad exceptions free hashable path path-like
        ];
        description = "A value within another path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "witness" = callPackage
@@ -275057,7 +276560,7 @@ self: {
          base constraints countable semigroupoids transformers
        ];
        description = "values that witness types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "witty" = callPackage
@@ -275070,8 +276573,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network unix ];
        description = "A network server to show bottlenecks of GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275083,7 +276586,7 @@ self: {
        sha256 = "0bldcvd7zjask8myh1nwj59ml4q6wlinp2h7q6hdfjg8djf2mnca";
        libraryHaskellDepends = [ base transformers ];
        description = "the fantastical wizard monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wizards" = callPackage
@@ -275100,7 +276603,7 @@ self: {
          base containers control-monad-free haskeline mtl transformers
        ];
        description = "High level, generic library for interrogative user interfaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wkt" = callPackage
@@ -275118,8 +276621,8 @@ self: {
          base filepath lens linear tasty tasty-golden trifecta
        ];
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275143,8 +276646,8 @@ self: {
          scientific trifecta vector
        ];
        description = "A parser of WKT, WKB and eWKB";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275156,7 +276659,7 @@ self: {
        sha256 = "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c";
        libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wl-pprint-annotated" = callPackage
@@ -275172,7 +276675,7 @@ self: {
          base containers deepseq tasty tasty-hunit text
        ];
        description = "Pretty printer with annotation support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wl-pprint-ansiterm" = callPackage
@@ -275188,8 +276691,8 @@ self: {
          transformers wl-pprint-extras
        ];
        description = "ANSI Terminal support with wl-pprint-extras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275205,7 +276708,7 @@ self: {
          base bytestring colorful-monoids text wl-pprint-annotated
        ];
        description = "Wadler/Leijen pretty printer supporting colorful console output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wl-pprint-extras" = callPackage
@@ -275224,8 +276727,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "A free monad based on the Wadler/Leijen pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275243,8 +276746,8 @@ self: {
          transformers wl-pprint-extras
        ];
        description = "A color pretty printer with terminfo support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275256,7 +276759,7 @@ self: {
        sha256 = "030ckgzz14sv2c317g4j5g68hyq9xi40cmv0apwclw6sc6xgsvly";
        libraryHaskellDepends = [ base base-compat text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wlc-hs" = callPackage
@@ -275274,8 +276777,8 @@ self: {
        librarySystemDepends = [ wlc ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the wlc library";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {wlc = null;};
 
@@ -275311,8 +276814,8 @@ self: {
          safe system-fileio system-filepath text transformers
        ];
        description = "A simple and highly performant HTTP file server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275324,8 +276827,8 @@ self: {
        sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b";
        libraryHaskellDepends = [ base ];
        description = "Convenient typeclass for defining arbitrary-index enums";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275341,8 +276844,8 @@ self: {
          base binary bytestring filepath zlib
        ];
        description = "Web Open Font Format (WOFF) unpacker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275357,8 +276860,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network split ];
        executableHaskellDepends = [ base ];
        description = "Send a Wake on LAN Magic Packet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275381,8 +276884,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-generic ];
        description = "Amazon Simple Workflow Service Wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275395,7 +276898,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        description = "Real time group editor without operational transform";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "word" = callPackage
@@ -275413,7 +276916,9 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Words of arbitrary size";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "word-trie" = callPackage
@@ -275427,7 +276932,7 @@ self: {
        libraryHaskellDepends = [ base binary containers ];
        testHaskellDepends = [ base binary containers hspec QuickCheck ];
        description = "Implementation of a finite trie over words";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "word-vector" = callPackage
@@ -275438,7 +276943,7 @@ self: {
        sha256 = "1fkbxrr7qh6dj9w7wihxjvb3d8kgcymz0zp8avnqpx5jsvwd5jdm";
        libraryHaskellDepends = [ base bytestring ghc-prim vector ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "word-wrap" = callPackage
@@ -275453,7 +276958,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "A library for word-wrapping";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "word24" = callPackage
@@ -275470,7 +276975,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "24-bit word and int types for GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "word2vec-model" = callPackage
@@ -275497,8 +277002,8 @@ self: {
          unordered-containers vector
        ];
        description = "Reading word2vec binary models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275512,7 +277017,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Word8 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordchoice" = callPackage
@@ -275538,8 +277043,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion pandoc text ];
        description = "Get word counts and distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275551,7 +277056,7 @@ self: {
        sha256 = "1jdcv5h41k5xckviyc0p0k0q68s371llcvmkdbg78vh4b3xw7cd5";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordexp" = callPackage
@@ -275563,7 +277068,7 @@ self: {
        libraryHaskellDepends = [ array base semigroups ];
        libraryToolDepends = [ c2hs ];
        description = "wordexp(3) wrappers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordify" = callPackage
@@ -275592,8 +277097,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
          unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275612,8 +277117,8 @@ self: {
          base MonadRandom optparse-applicative text vector
        ];
        description = "Command-line tool to get random words";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275634,7 +277139,7 @@ self: {
        benchmarkHaskellDepends = [ base deepseq gauge OddWord weigh ];
        doHaddock = false;
        description = "arbitrary bit size Words";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wordpass" = callPackage
@@ -275656,8 +277161,8 @@ self: {
          QuickCheck text unix-compat vector
        ];
        description = "Dictionary-based password generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275676,7 +277181,7 @@ self: {
          uri-encode
        ];
        description = "Validate Wordpress Cookies & Nonces; Build Wordpress Hashes & Salts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "words" = callPackage
@@ -275688,7 +277193,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory text ];
        description = "Cross-platform access to a list of words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordsearch" = callPackage
@@ -275702,8 +277207,8 @@ self: {
        libraryHaskellDepends = [ array base containers fclabels ];
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275722,7 +277227,7 @@ self: {
          process
        ];
        description = "Compare two files as sets of N-tuples of words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "work-time" = callPackage
@@ -275736,8 +277241,8 @@ self: {
        libraryHaskellDepends = [ base containers megaparsec text ];
        executableHaskellDepends = [ base text ];
        description = "A library for parsing a chat-based work hour reporting scheme";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275750,8 +277255,8 @@ self: {
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Workday calculations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275774,8 +277279,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275795,8 +277300,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275819,8 +277324,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "manipulate `workflow-types:Workflow`'s";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275839,8 +277344,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275855,8 +277360,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "Automate keyboard/mouse/clipboard/application interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275873,7 +277378,7 @@ self: {
          base doctest Glob should-not-typecheck tasty tasty-hunit text
        ];
        description = "Open Union and Open Product Types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "worldturtle" = callPackage
@@ -275884,7 +277389,7 @@ self: {
        sha256 = "0h5r74ba0wjhyp8yl3clxgq5yfdr51fdkfn2xz4ahizxycyrx14f";
        libraryHaskellDepends = [ base containers gloss lens matrix mtl ];
        description = "Turtle graphics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wp-archivebot" = callPackage
@@ -275899,8 +277404,8 @@ self: {
          base feed HTTP network parallel tagsoup
        ];
        description = "Subscribe to a wiki's RSS feed and archive external links";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275912,7 +277417,7 @@ self: {
        sha256 = "03pmfwwx2ykjglzrc4k09q2lv8piq107j32dg0r1aadj2ysc9fzq";
        libraryHaskellDepends = [ base ];
        description = "Wrap a function's return value with another function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wraparound" = callPackage
@@ -275923,7 +277428,7 @@ self: {
        sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf";
        libraryHaskellDepends = [ base ];
        description = "Convenient handling of points on a seamless 2-dimensional plane";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wraxml" = callPackage
@@ -275944,7 +277449,7 @@ self: {
        ];
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275983,8 +277488,8 @@ self: {
          optparse-applicative transformers wreq
        ];
        description = "An HTTP Performance Benchmarker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276017,8 +277522,8 @@ self: {
          resourcet scotty stm temporary text time transformers wai-cors
        ];
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276059,7 +277564,7 @@ self: {
          transformers unix-compat unordered-containers uuid vector
        ];
        description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wreq-helper" = callPackage
@@ -276074,7 +277579,7 @@ self: {
          aeson aeson-result base bytestring http-client lens text wreq
        ];
        description = "Wreq response process";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wreq-patchable" = callPackage
@@ -276112,8 +277617,8 @@ self: {
          transformers unix-compat unordered-containers uuid vector
        ];
        description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276151,8 +277656,8 @@ self: {
          transformers unix-compat uuid vector
        ];
        description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276164,7 +277669,7 @@ self: {
        sha256 = "0dgjjybbc4nza1a0af2j8jxscyhlcwdspmvy8zsmcczzcdhx2b2h";
        libraryHaskellDepends = [ base bytestring text utf8-string wreq ];
        description = "Simple wrapper to use wreq without Strings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wright" = callPackage
@@ -276181,8 +277686,8 @@ self: {
          assertions base bed-and-breakfast containers filepath lens
        ];
        description = "Colour space transformations and metrics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276199,7 +277704,7 @@ self: {
          monad-control mtl stm stm-chans
        ];
        description = "Buffer your writes, transparently";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "write-buffer-stm" = callPackage
@@ -276210,7 +277715,7 @@ self: {
        sha256 = "0q03pnkw3343jmcs2f2mrx84g3wj3plcagnjdviphzsg7rrf3a4l";
        libraryHaskellDepends = [ base stm stm-chans write-buffer-core ];
        description = "A write buffer for STM channels and queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "writer-cps-exceptions" = callPackage
@@ -276225,7 +277730,7 @@ self: {
          base exceptions transformers writer-cps-transformers
        ];
        description = "Control.Monad.Catch instances for the stricter CPS WriterT and RWST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "writer-cps-full" = callPackage
@@ -276243,8 +277748,8 @@ self: {
          writer-cps-transformers
        ];
        description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276261,8 +277766,8 @@ self: {
          writer-cps-transformers
        ];
        description = "Lens instances for the stricter CPS WriterT and RWST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276278,8 +277783,8 @@ self: {
          base monads-tf transformers writer-cps-transformers
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276293,8 +277798,8 @@ self: {
        editedCabalFile = "0dqpbpaidwa7ahk0n7pv397mv7ncr26p3vcrjh1xzl6vk26bdah5";
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        description = "MFunctor instance for CPS style WriterT and RWST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276309,7 +277814,7 @@ self: {
          base mtl transformers writer-cps-transformers
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "writer-cps-transformers" = callPackage
@@ -276321,7 +277826,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        doHaddock = false;
        description = "WriteT and RWST monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wryte" = callPackage
@@ -276333,7 +277838,7 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base ];
        description = "Pretty output for source generators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ws" = callPackage
@@ -276357,8 +277862,8 @@ self: {
          websockets wuss
        ];
        description = "A simple CLI utility for interacting with a websocket";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276381,7 +277886,7 @@ self: {
          wai-websockets warp websockets
        ];
        description = "Unagi chan based websocket client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wsdl" = callPackage
@@ -276400,8 +277905,8 @@ self: {
          base bytestring file-embed hspec network-uri
        ];
        description = "WSDL parsing in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276419,8 +277924,8 @@ self: {
          base bencode bytestring containers directory safe utf8-string
        ];
        description = "A small tool to list, add and remove webseeds from a torrent file";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276442,8 +277947,8 @@ self: {
          wai-app-static wai-websockets warp websockets
        ];
        description = "Terminal emulator over websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276462,8 +277967,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "WSJT-X UDP protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276482,8 +277987,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276512,8 +278017,8 @@ self: {
          network-conduit-tls streaming-commons text
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276525,8 +278030,8 @@ self: {
        sha256 = "080y0ks5q6bv7dvla08x4cvcmzd13b5v1c5p5336k0vkg2c3fq79";
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276542,8 +278047,8 @@ self: {
          base containers gtk lenses mtl old-locale parsec time wtk
        ];
        description = "GTK tools within Wojcik Tool Kit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276559,8 +278064,8 @@ self: {
          base directory symbolic-link unix yaml
        ];
        description = "Unimportant Unix adminstration tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276576,8 +278081,8 @@ self: {
          base containers directory filepath vector-space wumpus-core
        ];
        description = "Basic objects and system code built on Wumpus-Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276591,8 +278096,8 @@ self: {
        editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h";
        libraryHaskellDepends = [ base containers time vector-space ];
        description = "Pure Haskell PostScript and SVG generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276608,8 +278113,8 @@ self: {
          base containers vector-space wumpus-basic wumpus-core
        ];
        description = "High-level drawing objects built on Wumpus-Basic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276625,8 +278130,8 @@ self: {
          base vector-space wumpus-basic wumpus-core wumpus-drawing
        ];
        description = "Microprints - \"greek-text\" pictures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276643,8 +278148,8 @@ self: {
          wumpus-drawing
        ];
        description = "Drawing trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276659,7 +278164,7 @@ self: {
          base bytestring connection network websockets
        ];
        description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wx" = callPackage
@@ -276672,7 +278177,7 @@ self: {
        libraryHaskellDepends = [ base stm time wxcore ];
        description = "wxHaskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wxAsteroids" = callPackage
@@ -276686,8 +278191,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory random wx wxcore ];
        description = "Try to avoid the asteroids with your space ship";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276702,8 +278207,8 @@ self: {
        libraryHaskellDepends = [ base old-time wx wxcore Yampa ];
        executableHaskellDepends = [ base wx wxcore Yampa ];
        description = "An implementation of Fruit using wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276715,8 +278220,8 @@ self: {
        sha256 = "0q90djdvma20ngnp45q0kkyv2p1jsmsc7p9rzv76sywzqilha852";
        libraryHaskellDepends = [ base cubicbezier wx wxcore ];
        description = "Simple zoomable canvas for wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276741,7 +278246,7 @@ self: {
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs) wxGTK;};
 
@@ -276762,7 +278267,7 @@ self: {
        libraryPkgconfigDepends = [ wxGTK ];
        description = "wxHaskell core";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
@@ -276779,8 +278284,8 @@ self: {
          base containers directory filepath parsec process strict time
        ];
        description = "helper tool for building wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276795,8 +278300,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base wx wxcore ];
        description = "An example of how to implement a basic notepad with wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276812,8 +278317,8 @@ self: {
          base convertible Imlib wx yjsvg yjtools
        ];
        description = "turtle like LOGO with wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276835,7 +278340,7 @@ self: {
          semigroups terminal-size text transformers unix
        ];
        description = "Console line fuzzy search";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "wyvern" = callPackage
@@ -276853,8 +278358,8 @@ self: {
          parsec process sgf split
        ];
        description = "An autoresponder for Dragon Go Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276871,8 +278376,8 @@ self: {
          type-level
        ];
        description = "A embedded DSL for manipulating DSP languages in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276886,7 +278391,7 @@ self: {
        editedCabalFile = "1c561z9xvfcd7ddbiw3r0frhjvsrklachd38s66fzwjdgw1sl124";
        libraryHaskellDepends = [ base utf8-string X11 ];
        description = "A binding to the xim of X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x11-xinput" = callPackage
@@ -276899,7 +278404,7 @@ self: {
        librarySystemDepends = [ libXi ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509" = callPackage
@@ -276922,7 +278427,7 @@ self: {
          tasty-quickcheck
        ];
        description = "X509 reader and writer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-store" = callPackage
@@ -276942,7 +278447,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
        description = "X.509 collection accessing and storing methods";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-system" = callPackage
@@ -276958,7 +278463,7 @@ self: {
          x509-store
        ];
        description = "Handle per-operating-system X.509 accessors and storage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-util" = callPackage
@@ -276977,7 +278482,7 @@ self: {
          hourglass memory pem x509 x509-store x509-system x509-validation
        ];
        description = "Utility for X509 certificate and chain";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-validation" = callPackage
@@ -276999,7 +278504,7 @@ self: {
          x509-store
        ];
        description = "X.509 Certificate and CRL validation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x86-64bit" = callPackage
@@ -277015,7 +278520,7 @@ self: {
          base deepseq monads-tf QuickCheck tardis vector
        ];
        description = "Runtime code generation for x86 64 bit machine code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xattr" = callPackage
@@ -277033,8 +278538,8 @@ self: {
          test-framework-hunit unix
        ];
        description = "Haskell extended file attributes interface";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -277047,7 +278552,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base old-time select X11 ];
        description = "Simple battery indicator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xcb-types" = callPackage
@@ -277058,7 +278563,7 @@ self: {
        sha256 = "1168vg2f3qd5yiwg2fcps0ciqpwns6scyk89bd07ws3qh6kayqfr";
        libraryHaskellDepends = [ base containers mtl pretty xml ];
        description = "Parses XML files used by the XCB project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xcffib" = callPackage
@@ -277087,7 +278592,7 @@ self: {
        ];
        description = "A cffi-based python binding for X";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "xchat-plugin" = callPackage
@@ -277104,8 +278609,8 @@ self: {
          base directory filepath process unix
        ];
        description = "XChat";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277121,8 +278626,8 @@ self: {
          base bytestring containers mtl network transformers
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277148,8 +278653,8 @@ self: {
          text transformers transformers-base unix-compat
        ];
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277161,7 +278666,7 @@ self: {
        sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
        libraryHaskellDepends = [ base directory filepath ];
        description = "A basic implementation of the XDG Base Directory specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xdg-desktop-entry" = callPackage
@@ -277177,7 +278682,7 @@ self: {
          transformers unix
        ];
        description = "Parse files conforming to the xdg desktop entry spec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xdg-userdirs" = callPackage
@@ -277191,7 +278696,7 @@ self: {
          base containers directory filepath xdg-basedir
        ];
        description = "Basic implementation of XDG user directories specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xdot" = callPackage
@@ -277211,8 +278716,8 @@ self: {
          base cairo deepseq graphviz gtk3 text transformers
        ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277235,7 +278740,7 @@ self: {
          ghc-prim hexml hexpat time weigh xml
        ];
        description = "A fast event-based XML parser in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xenstore" = callPackage
@@ -277248,8 +278753,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277270,8 +278775,8 @@ self: {
        libraryPkgconfigDepends = [ libxfconf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "FFI bindings to xfconf";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libxfconf = null;};
 
@@ -277284,8 +278789,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277301,7 +278806,7 @@ self: {
        executableHaskellDepends = [ base foundation ];
        executableSystemDepends = [ xgboost ];
        description = "XGBoost library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) xgboost;};
 
   "xhaskell-library" = callPackage
@@ -277316,8 +278821,8 @@ self: {
          base bytestring containers ghc-prim mtl parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277334,8 +278839,8 @@ self: {
          Xauth
        ];
        description = "X Haskell Bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277351,8 +278856,8 @@ self: {
          base hashable mtl transformers unordered-containers xhb
        ];
        description = "Atom cache for XHB";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277369,8 +278874,8 @@ self: {
          xhb-atom-cache
        ];
        description = "EWMH utilities for XHB";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277382,8 +278887,8 @@ self: {
        sha256 = "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w";
        libraryHaskellDepends = [ base ];
        description = "An XHTML combinator library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "xhtml-combinators" = callPackage
@@ -277397,7 +278902,7 @@ self: {
          base containers random text transformers xml
        ];
        description = "Fast and easy to use XHTML combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xilinx-lava" = callPackage
@@ -277413,8 +278918,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277430,7 +278935,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to xine-lib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libxine = null; xine = null;};
 
@@ -277454,8 +278959,8 @@ self: {
          aeson base bytestring containers HTF text time
        ];
        description = "Wrapper for the XING API, v1";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277471,7 +278976,7 @@ self: {
          base bytestring conduit conduit-extra transformers
        ];
        description = "Conduit of keys pressed by xinput";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xkbcommon" = callPackage
@@ -277495,8 +279000,8 @@ self: {
        testHaskellDepends = [ base unix ];
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libxkbcommon;};
 
@@ -277516,8 +279021,8 @@ self: {
          base bytestring directory filepath HTTP network tagsoup
        ];
        description = "Downloads the most recent xkcd comic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277533,8 +279038,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl xml ];
        description = "A simple monadic language for parsing XML structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277556,8 +279061,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277581,8 +279086,8 @@ self: {
          zip-archive
        ];
        description = "Streaming Excel file generation and parsing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277611,8 +279116,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277629,8 +279134,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Xlsx table cell value extraction utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277649,8 +279154,8 @@ self: {
          transformers xlsx
        ];
        description = "Simple and incomplete Excel file templater";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277664,7 +279169,7 @@ self: {
        editedCabalFile = "15cxa19dp8nqvrrp0bmndkdas2jzg573x8ri75r6kiv8r4vkv8y7";
        libraryHaskellDepends = [ base bytestring text ];
        description = "A simple XML library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-basic" = callPackage
@@ -277680,7 +279185,7 @@ self: {
          utility-ht
        ];
        description = "Basics for XML/HTML representation and processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-catalog" = callPackage
@@ -277696,35 +279201,11 @@ self: {
          xml-conduit
        ];
        description = "Parse XML catalog files (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
-  "xml-conduit_1_8_0_1" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , bytestring, conduit, conduit-extra, containers
-     , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
-     , text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.8.0.1";
-       sha256 = "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup bytestring conduit
-         conduit-extra containers data-default-class deepseq resourcet text
-         transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers doctest hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "xml-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers
@@ -277745,7 +279226,7 @@ self: {
          resourcet text transformers xml-types
        ];
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -277764,8 +279245,8 @@ self: {
          xml-types
        ];
        description = "Historical cursors & decoding on top of xml-conduit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277790,7 +279271,7 @@ self: {
        ];
        description = "Streaming XML parser based on conduits";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "xml-conduit-stylist" = callPackage
@@ -277806,8 +279287,8 @@ self: {
          unordered-containers xml-conduit
        ];
        description = "Bridge between xml-conduit/html-conduit and stylist";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277824,7 +279305,7 @@ self: {
        ];
        testHaskellDepends = [ base text ];
        description = "Warm and fuzzy creation of XML documents";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-enumerator" = callPackage
@@ -277847,8 +279328,8 @@ self: {
          xml-types
        ];
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277866,8 +279347,8 @@ self: {
          base containers enumerator xml-enumerator xml-types
        ];
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277879,8 +279360,8 @@ self: {
        sha256 = "0ivzl1ikijrbz5mi75rxa340dxf7ilyzlxzka25si91jmjq0a9xa";
        libraryHaskellDepends = [ base mtl transformers xml ];
        description = "Extension to the xml package to extract data from parsed xml";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277901,7 +279382,7 @@ self: {
          text xml-conduit
        ];
        description = "Hamlet-style quasiquoter for XML content";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-helpers" = callPackage
@@ -277912,7 +279393,7 @@ self: {
        sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv";
        libraryHaskellDepends = [ base xml ];
        description = "Some useful helper functions for the xml library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-html-conduit-lens" = callPackage
@@ -277930,8 +279411,8 @@ self: {
          base doctest hspec hspec-expectations-lens lens xml-conduit
        ];
        description = "Optics for xml-conduit and html-conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277954,7 +279435,7 @@ self: {
          base doctest Glob tasty tasty-hunit text xml-conduit
        ];
        description = "Quasi-quoters for XML and HTML Documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-indexed-cursor" = callPackage
@@ -277973,7 +279454,7 @@ self: {
          xml-conduit
        ];
        description = "Indexed XML cursors similar to 'Text.XML.Cursor' from xml-conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-isogen" = callPackage
@@ -277996,7 +279477,7 @@ self: {
          xml-conduit-writer
        ];
        description = "Generate XML-isomorphic types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-lens" = callPackage
@@ -278005,15 +279486,13 @@ self: {
      }:
      mkDerivation {
        pname = "xml-lens";
-       version = "0.2";
-       sha256 = "1jvi8xcsvwzvh44karnsp9br6bfn59s5vhizwycg4fi7ljhm8fm3";
-       revision = "1";
-       editedCabalFile = "0agp2gpzzgrpy831cj47r8fi91r0s68a7bl8fqvbb1ya7jfadfll";
+       version = "0.3";
+       sha256 = "1i3b22sz7fkh9vjlfpwzz6fg57br8xq6q7zz76f66h6hymc284dz";
        libraryHaskellDepends = [
          base case-insensitive containers lens text xml-conduit
        ];
        description = "Lenses, traversals, and prisms for xml-conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-monad" = callPackage
@@ -278027,11 +279506,25 @@ self: {
          base mtl transformers transformers-compose xml
        ];
        description = "Monadic extensions to the xml package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
+  "xml-optics" = callPackage
+    ({ mkDerivation, base, containers, optics-core, text, xml-conduit
+     }:
+     mkDerivation {
+       pname = "xml-optics";
+       version = "0.1.0";
+       sha256 = "01sa1hk87aw32wafxxnvnljazi78bnishpmk5k77p28jmhpa1gn8";
+       libraryHaskellDepends = [
+         base containers optics-core text xml-conduit
+       ];
+       description = "Optics for xml-conduit";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "xml-parsec" = callPackage
     ({ mkDerivation, base, HaXml, parsec }:
      mkDerivation {
@@ -278041,7 +279534,7 @@ self: {
        libraryHaskellDepends = [ base HaXml parsec ];
        description = "Parsing XML with Parsec";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278059,7 +279552,7 @@ self: {
          xml-types
        ];
        description = "XML picklers based on xml-types, ported from hexpat-pickle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-pipe" = callPackage
@@ -278070,8 +279563,8 @@ self: {
        sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4";
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        description = "XML parser which uses simple-pipe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278086,8 +279579,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base cmdargs unix ];
        description = "Pretty print XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278108,8 +279601,8 @@ self: {
          x509 x509-store x509-validation xml-pipe xmpipe
        ];
        description = "Push XML from/to client to/from server over XMPP or HTTP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278121,8 +279614,8 @@ self: {
        sha256 = "16wszpvz8cp8nx18rmgyjy6mqk9awd3yf9w0is5rw77r73w88nwq";
        libraryHaskellDepends = [ base-prelude free text ];
        description = "A parser-agnostic declarative API for querying XML-documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278139,8 +279632,8 @@ self: {
          xml-types
        ];
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278164,8 +279657,8 @@ self: {
          tasty-smallcheck text xml-conduit xml-query xml-types
        ];
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278187,7 +279680,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Library and command line tool for converting XML files to json";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-to-json-fast" = callPackage
@@ -278201,7 +279694,7 @@ self: {
        libraryHaskellDepends = [ base tagsoup text ];
        executableHaskellDepends = [ base directory process ];
        description = "Fast, light converter of xml to json capable of handling huge xml files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-tydom-conduit" = callPackage
@@ -278222,8 +279715,8 @@ self: {
          tasty-quickcheck text time xml-conduit
        ];
        description = "Typed XML encoding for an xml-conduit backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278235,8 +279728,8 @@ self: {
        sha256 = "09svwcfcqmxrczs7qb4haf68dnb8q47cm19f504cqfnr4brs093l";
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
        description = "Typed XML encoding (core library)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278248,7 +279741,7 @@ self: {
        sha256 = "102cm0nvfmf9gn8hvn5z8qvmg931laczs33wwd5iyz9bc37f9mfs";
        libraryHaskellDepends = [ base deepseq text ];
        description = "Basic types for representing XML";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml2html" = callPackage
@@ -278259,7 +279752,7 @@ self: {
        sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska";
        libraryHaskellDepends = [ base xml-conduit ];
        description = "blaze-html instances for xml-conduit types (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml2json" = callPackage
@@ -278288,8 +279781,8 @@ self: {
          aeson base bytestring hspec resourcet text transformers
        ];
        description = "translate xml to json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278309,7 +279802,7 @@ self: {
        ];
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278331,7 +279824,7 @@ self: {
          tasty-quickcheck text transformers
        ];
        description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "xmlbf-xeno" = callPackage
@@ -278351,7 +279844,7 @@ self: {
          tasty-quickcheck text unordered-containers xmlbf
        ];
        description = "xeno backend support for the xmlbf library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "xmlbf-xmlhtml" = callPackage
@@ -278372,7 +279865,7 @@ self: {
          tasty-quickcheck text unordered-containers xmlbf
        ];
        description = "xmlhtml backend support for the xmlbf library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "xmlgen" = callPackage
@@ -278395,7 +279888,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Fast XML generation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmlhtml" = callPackage
@@ -278419,7 +279912,7 @@ self: {
          unordered-containers
        ];
        description = "XML parser and renderer with HTML 5 quirks mode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmltv" = callPackage
@@ -278441,8 +279934,8 @@ self: {
          wl-pprint-terminfo xdg-basedir xml
        ];
        description = "Show tv channels in the terminal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278459,8 +279952,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278473,8 +279966,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 xmms2-client ];
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278519,8 +280012,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mtl time ];
        description = "A Minimalistic Text Based Status Bar";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
 
@@ -278548,8 +280041,8 @@ self: {
          install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs
        '';
        description = "A tiling window manager";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "xmonad-bluetilebranch" = callPackage
@@ -278568,8 +280061,8 @@ self: {
          process unix X11
        ];
        description = "A tiling window manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278589,8 +280082,8 @@ self: {
          X11 X11-xft xmonad
        ];
        description = "Third party extensions for xmonad";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "xmonad-contrib-bluetilebranch" = callPackage
@@ -278608,8 +280101,8 @@ self: {
          xmonad-bluetilebranch
        ];
        description = "Third party extensions for xmonad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278621,8 +280114,8 @@ self: {
        sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9";
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        description = "Third party extensions for xmonad";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278637,8 +280130,8 @@ self: {
        libraryHaskellDepends = [ base dbus utf8-string ];
        executableHaskellDepends = [ base dbus utf8-string ];
        testHaskellDepends = [ base dbus utf8-string ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278655,7 +280148,7 @@ self: {
          xmonad xmonad-contrib
        ];
        description = "XMonad config entry point wrapper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xmonad-eval" = callPackage
@@ -278671,8 +280164,8 @@ self: {
          random unix X11 xmonad xmonad-contrib
        ];
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278692,7 +280185,7 @@ self: {
          regex-posix X11 xmonad xmonad-contrib
        ];
        description = "Third party extensions for xmonad with wacky dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-screenshot" = callPackage
@@ -278703,7 +280196,7 @@ self: {
        sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1";
        libraryHaskellDepends = [ base gtk xmonad ];
        description = "Workspaces screenshooting utility for XMonad";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xmonad-spotify" = callPackage
@@ -278714,7 +280207,7 @@ self: {
        sha256 = "0hps37yqn3grgg65wm3j41dh40fqi64ni12mgk0lfigw2fghfnvj";
        libraryHaskellDepends = [ base containers dbus X11 ];
        description = "Bind media keys to work with Spotify";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-utils" = callPackage
@@ -278727,7 +280220,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ghc random unix X11 ];
        description = "A small collection of X utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-vanessa" = callPackage
@@ -278750,8 +280243,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec xmonad ];
        description = "Custom xmonad, which builds with stack or cabal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278769,7 +280262,7 @@ self: {
          alsa-mixer base composition-prelude containers X11
        ];
        description = "XMonad volume controls";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-wallpaper" = callPackage
@@ -278782,7 +280275,7 @@ self: {
        editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28";
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "xmonad-windownames" = callPackage
@@ -278797,8 +280290,8 @@ self: {
          base containers utf8-string xmonad xmonad-contrib
        ];
        description = "A library to automatically put named windows into the DynamicLog";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278815,8 +280308,8 @@ self: {
          simple-pipe uuid xml-pipe
        ];
        description = "XMPP implementation using simple-PIPE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278837,8 +280330,8 @@ self: {
          base bytestring criterion ghc-byteorder
        ];
        description = "Efficient XOR masking";
-       license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278868,8 +280361,8 @@ self: {
          base gauge random xorshift Xorshift128Plus
        ];
        description = "Simple implementation of xorshift+ PRNG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278882,7 +280375,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ xosd ];
        description = "A binding to the X on-screen display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) xosd;};
 
   "xournal-builder" = callPackage
@@ -278899,8 +280392,8 @@ self: {
          xournal-types
        ];
        description = "text builder for xournal file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278922,8 +280415,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs ];
        description = "convert utility for xoj files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278943,8 +280436,8 @@ self: {
          xml-types xournal-types zlib-conduit
        ];
        description = "Xournal file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278962,8 +280455,8 @@ self: {
          TypeCompose xournal-types
        ];
        description = "Xournal file renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278981,8 +280474,8 @@ self: {
          base bytestring cereal containers lens strict TypeCompose
        ];
        description = "Data types for programs for xournal file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278999,7 +280492,7 @@ self: {
          base hxt hxt-xpath optparse-applicative text
        ];
        description = "Command line tool to extract DSV data from HTML and XML with XPATH expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xrefcheck" = callPackage
@@ -279042,8 +280535,8 @@ self: {
          universum with-utf8 yaml
        ];
        testToolDepends = [ hspec-discover ];
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279062,7 +280555,7 @@ self: {
        ];
        description = "Cluster EST sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279079,8 +280572,8 @@ self: {
          base directory doctest filepath QuickCheck quickcheck-instances
        ];
        description = "XML Schema data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279092,7 +280585,7 @@ self: {
        sha256 = "0xljcmc8rsvkpchrdam3lpp4igq1gmym9v3drp15a9k8rfa8irmi";
        libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ];
        description = "cryptanalysis of Blizzard's broken SHA-1 implementation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xslt" = callPackage
@@ -279104,8 +280597,8 @@ self: {
        libraryHaskellDepends = [ base libxml ];
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xslt = null;};
 
@@ -279126,7 +280619,7 @@ self: {
          text utf8-string
        ];
        description = "sanitize untrusted HTML to prevent XSS attacks";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "xtc" = callPackage
@@ -279138,8 +280631,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base wx wxcore ];
        description = "eXtended & Typed Controls for wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279152,7 +280645,7 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ libXtst ];
        description = "Thin FFI bindings to X11 XTest library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXtst;};
 
   "xturtle" = callPackage
@@ -279167,7 +280660,7 @@ self: {
          base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools
        ];
        description = "turtle like LOGO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xxhash" = callPackage
@@ -279184,8 +280677,8 @@ self: {
          base bytestring criterion deepseq digest hashable murmur-hash
        ];
        description = "A Haskell implementation of the xxHash algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279204,7 +280697,7 @@ self: {
          xxhash
        ];
        description = "Bindings to the C implementation the xxHash algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "y0l0bot" = callPackage
@@ -279222,8 +280715,8 @@ self: {
          split text time
        ];
        description = "#plaimi's all-encompassing bot";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279239,7 +280732,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base word8 ];
        description = "Yet Another Brainfuck Interpreter";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yabi-muno" = callPackage
@@ -279257,8 +280750,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Yet Another Brainfuck Interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279282,8 +280775,8 @@ self: {
          yesod-core yesod-form zlib
        ];
        description = "Personal Hackage replacement for testing new packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279305,8 +280798,8 @@ self: {
          servant servant-client
        ];
        description = "Read quotes from Yahoo Finance API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279322,8 +280815,8 @@ self: {
          attoparsec base cassava conduit lens mtl text vector wreq
        ];
        description = "Streaming aproach to the yahoo finance api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279335,8 +280828,8 @@ self: {
        sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck";
        libraryHaskellDepends = [ base HTTP network xml ];
        description = "Yahoo Web Search Services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279350,8 +280843,8 @@ self: {
        librarySystemDepends = [ yajl ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings for YAJL, an event-based JSON implementation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) yajl;};
 
@@ -279367,8 +280860,8 @@ self: {
          base bytestring enumerator json-types text transformers yajl
        ];
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279385,7 +280878,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "A strongly typed IRC library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yall" = callPackage
@@ -279396,8 +280889,8 @@ self: {
        sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s";
        libraryHaskellDepends = [ base categories transformers ];
        description = "Lenses with a southern twang";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279431,8 +280924,8 @@ self: {
          vector wai warp
        ];
        description = "A wrapper of servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279456,7 +280949,7 @@ self: {
          wai-logger yaml
        ];
        description = "Yam App";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yam-config" = callPackage
@@ -279472,8 +280965,8 @@ self: {
          unordered-containers vault yaml
        ];
        description = "Yam Configuation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279491,8 +280984,8 @@ self: {
          resourcet salak servant-server text unliftio-core yam
        ];
        description = "Yam DataSource Middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279503,7 +280996,7 @@ self: {
        version = "0.2.0";
        sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yam-logger" = callPackage
@@ -279518,8 +281011,8 @@ self: {
          aeson base fast-logger monad-logger text vault yam-config
        ];
        description = "Yam Logger";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279536,8 +281029,8 @@ self: {
          servant-server text yam
        ];
        description = "Yam Redis Middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279554,8 +281047,8 @@ self: {
          aeson base http-types lens servant servant-server servant-swagger
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279576,8 +281069,8 @@ self: {
          yam-logger
        ];
        description = "Yam transaction";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279590,8 +281083,8 @@ self: {
        libraryHaskellDepends = [
          base containers persistent-odbc yam-app
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279606,7 +281099,7 @@ self: {
        libraryHaskellDepends = [
          base containers persistent-postgresql unliftio-core yam-app
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yam-web" = callPackage
@@ -279635,8 +281128,8 @@ self: {
          vault wai wai-extra warp yam-config yam-logger yam-transaction
        ];
        description = "Yam Web";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279649,7 +281142,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl ];
        description = "Simple memoisation function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml" = callPackage
@@ -279678,7 +281171,7 @@ self: {
          unordered-containers vector
        ];
        description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-combinators" = callPackage
@@ -279698,7 +281191,7 @@ self: {
          aeson base doctest tasty tasty-hunit text unordered-containers
        ];
        description = "YAML parsing combinators for improved validation and error reporting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yaml-config" = callPackage
@@ -279717,7 +281210,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Configuration management";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yaml-light" = callPackage
@@ -279728,7 +281221,7 @@ self: {
        sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk";
        libraryHaskellDepends = [ base bytestring containers HsSyck ];
        description = "A light-weight wrapper with utility functions around HsSyck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-light-lens" = callPackage
@@ -279744,7 +281237,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Lens interface to yaml-light";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-pretty-extras" = callPackage
@@ -279756,8 +281249,8 @@ self: {
        libraryHaskellDepends = [ base microlens-platform rio yaml ];
        testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279776,8 +281269,8 @@ self: {
          vector wreq yaml
        ];
        description = "Simple library for network (HTTP REST-like) YAML RPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279794,8 +281287,8 @@ self: {
          yaml yaml-rpc
        ];
        description = "Scotty server backend for yaml-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279812,8 +281305,8 @@ self: {
          yaml yaml-rpc
        ];
        description = "Snap server backend for yaml-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279841,7 +281334,7 @@ self: {
          unordered-containers vector yaml
        ];
        description = "Read multiple yaml-files and override fields recursively";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-unscrambler" = callPackage
@@ -279867,8 +281360,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck
        ];
        description = "Flexible declarative YAML parsing toolkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279905,7 +281398,7 @@ self: {
        ];
        description = "Compares the keys from two yaml files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yamlparse-applicative" = callPackage
@@ -279932,7 +281425,7 @@ self: {
          unordered-containers
        ];
        description = "Declaritive configuration parsing with free docs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yampa-canvas" = callPackage
@@ -279947,7 +281440,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -279964,8 +281457,8 @@ self: {
          base GLFW-b newtype OpenGL vector-space Yampa
        ];
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279979,8 +281472,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base gloss Yampa ];
        description = "A GLOSS backend for Yampa";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279998,8 +281491,8 @@ self: {
          base GLUT newtype OpenGL vector-space Yampa-core
        ];
        description = "Connects Yampa and GLUT";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280018,8 +281511,8 @@ self: {
          base data-memocombinators linear sdl2 StateVar text vector Yampa
        ];
        description = "Yampa and SDL2 made easy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280038,8 +281531,8 @@ self: {
          base Cabal QuickCheck random tasty tasty-quickcheck Yampa
        ];
        description = "Testing library for Yampa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280053,8 +281546,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss random Yampa ];
        description = "2048 game clone using Yampa/Gloss";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280072,8 +281565,8 @@ self: {
          text transformers unordered-containers wreq
        ];
        description = "Bindings to Yandex translate API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280087,8 +281580,8 @@ self: {
        editedCabalFile = "0p55j9q5idzw5bmpg0i4vkifaadzvf3fdhjd02bh2ym2y15g0csk";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Yet another option parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280100,8 +281593,8 @@ self: {
        sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
        libraryHaskellDepends = [ base ];
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280121,7 +281614,7 @@ self: {
        executableHaskellDepends = [ base regex-tdfa ];
        testHaskellDepends = [ base ];
        description = "Yet Another Parser Builder (YAPB)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yarn-lock" = callPackage
@@ -280142,8 +281635,8 @@ self: {
          tasty-th text
        ];
        description = "Represent and parse yarn.lock files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280181,8 +281674,8 @@ self: {
          yarn-lock
        ];
        description = "Convert yarn.lock files to nix expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280199,8 +281692,8 @@ self: {
          template-haskell
        ];
        description = "Yet another array library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280213,8 +281706,8 @@ self: {
        libraryHaskellDepends = [ base yarr ];
        librarySystemDepends = [ libdevil ];
        description = "Image IO for Yarr library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -280234,7 +281727,7 @@ self: {
          attoparsec base hspec mtl unordered-containers vector
        ];
        description = "Yet Another Template Engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yavie" = callPackage
@@ -280253,8 +281746,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280273,7 +281766,7 @@ self: {
          th-abstraction transformers
        ];
        description = "Total recursion schemes";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "yaya-hedgehog" = callPackage
@@ -280284,7 +281777,7 @@ self: {
        sha256 = "0aw932d2yr3w84ia44y46w4w96bc8gdag63h66rhx3v7gwmkwdwg";
        libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
        description = "Hedgehog testing support for the Yaya recursion scheme library";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "yaya-test" = callPackage
@@ -280301,8 +281794,8 @@ self: {
          base deriving-compat hedgehog yaya yaya-hedgehog
        ];
        description = "Test suites for `yaya`";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280318,7 +281811,7 @@ self: {
          base bifunctors comonad either free lens yaya
        ];
        description = "Non-total extensions to the Yaya recursion scheme library";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "yaya-unsafe-test" = callPackage
@@ -280334,8 +281827,8 @@ self: {
          base hedgehog yaya yaya-hedgehog yaya-unsafe
        ];
        description = "Test suites for `yaya-unsafe`";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280350,8 +281843,8 @@ self: {
          base containers csv mtl uniplate yhccore
        ];
        description = "Additional utilities to work with Yhc Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280367,10 +281860,8 @@ self: {
      }:
      mkDerivation {
        pname = "yeamer";
-       version = "0.1.0.5";
-       sha256 = "0c8yrh43h9qhhdiz0dnrh00frfz0cymzzz9k723jnp03b8994srq";
-       revision = "1";
-       editedCabalFile = "0ivw54131s99kblah7n0flccb9h6qfiz55ifs2cwjwxxmrs9xi1n";
+       version = "0.1.1.0";
+       sha256 = "0i3ka3c4ci70kgrbmc7ynk587a4sihpqhyv6bjc1n9gwjbm9abxi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -280389,8 +281880,8 @@ self: {
          aeson base numbered-semigroups tasty tasty-hunit tasty-quickcheck
        ];
        description = "Yesod-based server for interactive presentation slides";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280409,7 +281900,7 @@ self: {
          xdg-basedir
        ];
        description = "small dmenu wrapper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yeller" = callPackage
@@ -280434,8 +281925,8 @@ self: {
          http-client-tls http-types network stm text unordered-containers
        ];
        description = "A Yeller Client For Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280457,7 +281948,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Extended yes command to reproduce phrases in Yes! Precure 5";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yeshql" = callPackage
@@ -280468,8 +281959,8 @@ self: {
        sha256 = "07wbblsyc1f2kc47s2z4sg4s7qmgn44kvpvdvq9cf59g5nvm4wkd";
        libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
        description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280489,7 +281980,7 @@ self: {
          base containers stm tasty tasty-hunit tasty-quickcheck
        ];
        description = "YesQL-style SQL database abstraction (core)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yeshql-hdbc" = callPackage
@@ -280509,8 +282000,8 @@ self: {
          base containers HDBC stm tasty tasty-hunit tasty-quickcheck
        ];
        description = "YesQL-style SQL database abstraction (HDBC backend)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280532,8 +282023,8 @@ self: {
          tasty-quickcheck
        ];
        description = "YesQL-style SQL database abstraction (postgresql-simple backend)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280555,7 +282046,7 @@ self: {
          wai-logger warp yaml yesod-core yesod-form yesod-persistent
        ];
        description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-alerts" = callPackage
@@ -280570,7 +282061,7 @@ self: {
          alerts base blaze-html blaze-markup safe text yesod-core
        ];
        description = "Alert messages for the Yesod framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-angular" = callPackage
@@ -280586,8 +282077,8 @@ self: {
          transformers yesod
        ];
        description = "Angular JS integratoin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280607,8 +282098,8 @@ self: {
          shakespeare template-haskell text transformers yesod yesod-core
        ];
        description = "Angular Helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280631,8 +282122,8 @@ self: {
          yesod-core yesod-test
        ];
        description = "Automatically generate article previews for a yesod site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280661,7 +282152,7 @@ self: {
          unordered-containers wai yesod-core yesod-form yesod-persistent
        ];
        description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -280683,8 +282174,8 @@ self: {
          text xml-conduit yesod yesod-auth yesod-test
        ];
        description = "An account authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280709,8 +282200,8 @@ self: {
          text xml-conduit yesod yesod-auth yesod-test
        ];
        description = "An account authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280728,7 +282219,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-bcrypt" = callPackage
@@ -280744,8 +282235,8 @@ self: {
          yesod-persistent
        ];
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280762,8 +282253,8 @@ self: {
          yesod-form yesod-persistent
        ];
        description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280785,8 +282276,8 @@ self: {
          yesod-auth yesod-core
        ];
        description = "Desk.com remote authentication support for Yesod apps.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280804,7 +282295,7 @@ self: {
          text time transformers unliftio wai yesod-auth yesod-core yesod-fb
        ];
        description = "Authentication backend for Yesod using Facebook";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -280829,7 +282320,7 @@ self: {
          yesod-test
        ];
        description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage
@@ -280847,8 +282338,8 @@ self: {
          text yesod-auth yesod-core yesod-form yesod-persistent yesod-static
        ];
        description = "An account authentication plugin for yesod with encrypted token transfer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280866,8 +282357,8 @@ self: {
          yesod-auth yesod-core yesod-form
        ];
        description = "Kerberos Authentication for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280884,8 +282375,8 @@ self: {
          yesod-auth yesod-core yesod-form
        ];
        description = "LDAP Authentication for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280901,8 +282392,8 @@ self: {
          aeson base LDAP text yesod-auth yesod-core yesod-form
        ];
        description = "Very simlple LDAP auth for yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280920,8 +282411,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Yesod LDAP authentication plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280933,8 +282424,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-lti13";
-       version = "0.1.2.2";
-       sha256 = "0r1hbnij2dyka1jgxrql9ymfcdc1y60x593a3dmnnw86qksbkb8r";
+       version = "0.2.0.0";
+       sha256 = "0g48g1ajzwp7k7q3vi1z4nvmmvcfiyziizfydnd3i26xf7nvzqnx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -280944,8 +282435,8 @@ self: {
          yesod-auth yesod-core
        ];
        description = "A yesod-auth plugin for LTI 1.3";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280962,8 +282453,8 @@ self: {
          yesod-core yesod-form
        ];
        description = "A plugin for Yesod to provide email-only authentication";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280980,7 +282471,7 @@ self: {
          yesod-core yesod-form
        ];
        description = "OAuth Authentication for Yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-oauth2" = callPackage
@@ -281002,8 +282493,32 @@ self: {
        ];
        testHaskellDepends = [ base hspec uri-bytestring ];
        description = "OAuth 2.0 authentication plugins";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "yesod-auth-oauth2_0_6_2_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cryptonite, errors
+     , hoauth2, hspec, http-client, http-conduit, http-types, memory
+     , microlens, safe-exceptions, text, uri-bytestring, yesod-auth
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-auth-oauth2";
+       version = "0.6.2.1";
+       sha256 = "1kzz271y69l47wikfmfix5v9csh6xy7cv8b36gxzlwr6vil59bmy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cryptonite errors hoauth2 http-client
+         http-conduit http-types memory microlens safe-exceptions text
+         uri-bytestring yesod-auth yesod-core
+       ];
+       testHaskellDepends = [ base hspec uri-bytestring ];
+       description = "OAuth 2.0 authentication plugins";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281019,8 +282534,8 @@ self: {
          base hamlet pam text yesod-auth yesod-core yesod-form
        ];
        description = "Provides PAM authentication module";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281037,8 +282552,8 @@ self: {
          yesod-form
        ];
        description = "Authentication plugin for Yesod using smbclient";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281057,8 +282572,8 @@ self: {
          yesod-auth yesod-core
        ];
        description = "Zendesk remote authentication support for Yesod apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281086,7 +282601,7 @@ self: {
          unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib
        ];
        description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -281102,8 +282617,8 @@ self: {
          transformers yesod-core yesod-elements
        ];
        description = "Bootstrap widgets for yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281122,8 +282637,8 @@ self: {
          yesod-core yesod-elements
        ];
        description = "Helper functions for using yesod with colonnade";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281142,8 +282657,8 @@ self: {
          yesod-form yesod-markdown
        ];
        description = "A generic comments interface for a Yesod application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281165,8 +282680,8 @@ self: {
          base blaze-html hspec hspec-expectations utf8-string
        ];
        description = "PDF Content Type for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281185,8 +282700,8 @@ self: {
          yesod
        ];
        description = "Continuations for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281224,7 +282739,7 @@ self: {
          base blaze-html bytestring gauge shakespeare text
        ];
        description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-crud" = callPackage
@@ -281241,8 +282756,8 @@ self: {
          random safe stm uuid yesod-core yesod-form yesod-persistent
        ];
        description = "Generic administrative CRUD operations as a Yesod subsite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281261,8 +282776,8 @@ self: {
          yesod-persistent
        ];
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281284,7 +282799,7 @@ self: {
          yesod-test
        ];
        description = "Add CSP headers to Yesod apps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-datatables" = callPackage
@@ -281310,8 +282825,8 @@ self: {
          test-framework-quickcheck2 text transformers
        ];
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281323,7 +282838,7 @@ self: {
        sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
        libraryHaskellDepends = [ base yesod-core ];
        description = "Default config and main functions for your yesod application (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-dsl" = callPackage
@@ -281349,8 +282864,8 @@ self: {
          shakespeare strict text
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281366,7 +282881,7 @@ self: {
          base blaze-html blaze-markup bytestring text yesod-core
        ];
        description = "Non template haskell markup building function in the spirit of lucid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-eventsource" = callPackage
@@ -281381,7 +282896,7 @@ self: {
          base blaze-builder conduit transformers wai wai-extra yesod-core
        ];
        description = "Server-sent events support for Yesod apps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-examples" = callPackage
@@ -281402,8 +282917,8 @@ self: {
        ];
        executableSystemDepends = [ sqlite ];
        description = "Example programs using the Yesod Web Framework. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -281425,8 +282940,8 @@ self: {
          text
        ];
        description = "Fast live-reloading for yesod applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281446,8 +282961,8 @@ self: {
          transformers utf8-string yesod-core yesod-form yesod-static
        ];
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281464,7 +282979,7 @@ self: {
          memory text wai yesod-core
        ];
        description = "Useful glue functions between the fb library and Yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-filter" = callPackage
@@ -281485,8 +283000,8 @@ self: {
          template-haskell text time yesod-persistent
        ];
        description = "Automatic filter generator for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281509,7 +283024,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
@@ -281524,7 +283039,7 @@ self: {
          base blaze-html blaze-markup shakespeare text yesod-core yesod-form
        ];
        description = "renderBootstrap4";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-bulma" = callPackage
@@ -281547,7 +283062,7 @@ self: {
          base email-validate shakespeare text yesod-core yesod-form
        ];
        description = "support Bulma form for Yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-form-json" = callPackage
@@ -281563,7 +283078,7 @@ self: {
          yesod-core yesod-form
        ];
        description = "Extension for Yesod web framework to handle JSON requests as applicative forms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-multi" = callPackage
@@ -281572,14 +283087,14 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-form-multi";
-       version = "1.7.0";
-       sha256 = "02xba6x59sx8c72vazbl5jhjkxgni6h3bkvidr4hvqrx2bscmk45";
+       version = "1.7.0.1";
+       sha256 = "0dpcyq6l28zbm12rzjp18bhjaghf38jhjzj6qp40qyvb5f8yx9dp";
        libraryHaskellDepends = [
          base containers network-uri shakespeare text transformers
          yesod-core yesod-form
        ];
        description = "Multi-input form handling for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-richtext" = callPackage
@@ -281595,8 +283110,8 @@ self: {
          yesod-core yesod-form
        ];
        description = "Various rich-text WYSIWYG editors for Yesod forms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281613,7 +283128,7 @@ self: {
          yesod-core
        ];
        description = "Host content provided by a Git repo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-gitrev" = callPackage
@@ -281628,8 +283143,8 @@ self: {
        ];
        testHaskellDepends = [ base yesod-core ];
        description = "A subsite for displaying git information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281646,8 +283161,8 @@ self: {
          text time yesod yesod-form
        ];
        description = "A collection of various small helpers useful in any yesod application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281666,8 +283181,8 @@ self: {
          yesod-form
        ];
        description = "Code for using the ip package with yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281689,8 +283204,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Background jobs library for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281702,7 +283217,7 @@ self: {
        sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
        libraryHaskellDepends = [ base yesod-core ];
        description = "Generate content for Yesod using the aeson package. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-katip" = callPackage
@@ -281719,7 +283234,7 @@ self: {
          monad-logger network text wai wai-extra yesod-core ytl
        ];
        description = "Logging bridge between Yesod and Katip";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-links" = callPackage
@@ -281730,8 +283245,8 @@ self: {
        sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y";
        libraryHaskellDepends = [ base text yesod-core ];
        description = "A typeclass which simplifies creating link widgets throughout your site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281743,8 +283258,8 @@ self: {
        sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip";
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281764,8 +283279,8 @@ self: {
          persistent-template text time yesod yesod-core
        ];
        description = "Yesod library for MangoPay API access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281784,8 +283299,8 @@ self: {
        ];
        testHaskellDepends = [ base blaze-html hspec text ];
        description = "Tools for using markdown in a yesod application";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281802,8 +283317,8 @@ self: {
          JuicyPixels vector yesod
        ];
        description = "Simple display of media types, served by yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281820,7 +283335,7 @@ self: {
          time xml-conduit yesod-core
        ];
        description = "Helper functions and data types for producing News feeds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-page-cursor" = callPackage
@@ -281832,8 +283347,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-page-cursor";
-       version = "2.0.0.0";
-       sha256 = "0dlr16jkv104siq7r7ff02x60dy6bvhrgq43s5g8iydc9khafai8";
+       version = "2.0.0.2";
+       sha256 = "1wlwzxc2amnq1ma2lvclrc3dzhh8s6d8ffz6yk9rq88aijgvw35m";
        libraryHaskellDepends = [
          aeson base bytestring containers http-link-header network-uri text
          unliftio yesod-core
@@ -281844,7 +283359,9 @@ self: {
          persistent persistent-sqlite persistent-template scientific text
          time unliftio unliftio-core wai-extra yesod yesod-core yesod-test
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-paginate" = callPackage
@@ -281855,8 +283372,8 @@ self: {
        sha256 = "088m7prg774wdh8fp7zljxj65zj5krl4pggl63anv2wk7nlw27py";
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281875,8 +283392,8 @@ self: {
          resourcet shakespeare utf8-string wai-test yesod yesod-test
        ];
        description = "Pagination in Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281900,7 +283417,7 @@ self: {
          yesod-test
        ];
        description = "A pagination approach for yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-paypal-rest" = callPackage
@@ -281913,8 +283430,8 @@ self: {
          base paypal-rest-client time yesod-core
        ];
        description = "Yesod plugin to use PayPal with the paypal-rest-client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281936,7 +283453,7 @@ self: {
          wai-extra yesod-core
        ];
        description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-platform" = callPackage
@@ -282005,8 +283522,8 @@ self: {
          yesod-routes yesod-static yesod-test
        ];
        description = "Meta package for Yesod (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282027,8 +283544,8 @@ self: {
          aeson base shakespeare text transformers yesod yesod-form
        ];
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282040,8 +283557,8 @@ self: {
        sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg";
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282061,8 +283578,8 @@ self: {
          system-filepath template-haskell text time transformers yesod-core
        ];
        description = "PureScript integration for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282086,8 +283603,8 @@ self: {
          vector yaml yesod-core
        ];
        description = "RAML style route definitions for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282110,8 +283627,8 @@ self: {
          yesod-raml-mock
        ];
        description = "The raml helper executable";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282128,8 +283645,8 @@ self: {
          yesod-markdown yesod-raml
        ];
        description = "A html documentation generator library for RAML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282153,8 +283670,8 @@ self: {
          yesod-raml yesod-test
        ];
        description = "A mock-handler generator library from RAML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282173,8 +283690,8 @@ self: {
          yesod-form
        ];
        description = "Dead simple support for reCAPTCHA on Yesod applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282190,7 +283707,7 @@ self: {
          aeson base classy-prelude http-conduit yesod-core yesod-form
        ];
        description = "yesod recaptcha2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-routes" = callPackage
@@ -282211,8 +283728,8 @@ self: {
          text
        ];
        description = "Efficient routing for Yesod. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282229,8 +283746,8 @@ self: {
          system-filepath text yesod-core
        ];
        description = "Generate Flow routes for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282247,8 +283764,8 @@ self: {
          yesod-routes
        ];
        description = "generate TypeScript routes for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282266,7 +283783,7 @@ self: {
        ];
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282283,8 +283800,8 @@ self: {
          text yesod-core
        ];
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282301,8 +283818,8 @@ self: {
          yesod-core
        ];
        description = "A simple quasiquoter to include sass code in yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282320,8 +283837,8 @@ self: {
          pool-conduit random text time wai yesod-core
        ];
        description = "Redis-Powered Sessions for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282338,7 +283855,7 @@ self: {
          xml-types yesod-core
        ];
        description = "Generate XML sitemaps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-static" = callPackage
@@ -282371,7 +283888,7 @@ self: {
          yesod-test
        ];
        description = "Static file serving subsite for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -282396,8 +283913,8 @@ self: {
          text yesod-core yesod-static yesod-test
        ];
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282414,8 +283931,8 @@ self: {
          template-haskell yesod-static
        ];
        testHaskellDepends = [ base yesod-static ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282431,7 +283948,7 @@ self: {
          base bytestring containers contravariant semigroups text yesod-core
        ];
        description = "HTML tables for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-tableview" = callPackage
@@ -282442,7 +283959,7 @@ self: {
        sha256 = "1qf7439c31a8xi0qs8fn2xdlrldi42n1k25lj6vn061lm8wg35yy";
        libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-test" = callPackage
@@ -282468,7 +283985,7 @@ self: {
          yesod-core yesod-form
        ];
        description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -282485,8 +284002,8 @@ self: {
          transformers wai wai-test yesod-default
        ];
        description = "Utility functions for testing JSON web services written in Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282503,7 +284020,7 @@ self: {
          yesod-form yesod-persistent
        ];
        description = "Yesod support for Text.Markdown.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-tls" = callPackage
@@ -282519,8 +284036,8 @@ self: {
          warp warp-tls yesod
        ];
        description = "Provides main functions using warp-tls for yesod projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282544,7 +284061,7 @@ self: {
          yesod-form yesod-test
        ];
        description = "Transloadit support for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-vend" = callPackage
@@ -282565,8 +284082,8 @@ self: {
          resourcet text yesod yesod-form
        ];
        description = "Simple CRUD classes for easy view creation for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282583,7 +284100,7 @@ self: {
          yesod-core
        ];
        description = "WebSockets support for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-websockets-extra" = callPackage
@@ -282598,7 +284115,7 @@ self: {
          base enclosed-exceptions transformers websockets yesod-websockets
        ];
        description = "Extension to yesod-websockets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-worker" = callPackage
@@ -282614,8 +284131,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282646,7 +284163,7 @@ self: {
          text transformers transformers-base void
        ];
        description = "Yet Another Logger";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "yggdrasil" = callPackage
@@ -282662,8 +284179,8 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite hspec QuickCheck ];
        description = "Executable specifications of composable cryptographic protocols";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282675,8 +284192,8 @@ self: {
        sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93";
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        description = "Yhc's Internal Core language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282695,8 +284212,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Calculation of YH sequence system";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282719,8 +284236,8 @@ self: {
          yi-mode-haskell yi-mode-javascript yi-rope
        ];
        description = "Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282739,8 +284256,8 @@ self: {
          yi-rope
        ];
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282771,8 +284288,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282789,8 +284306,8 @@ self: {
          transformers-base yi-core yi-rope
        ];
        description = "Dynamic configuration support for Yi";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282802,8 +284319,8 @@ self: {
        sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv";
        libraryHaskellDepends = [ base containers split yi-language ];
        description = "Simple mapping from colour names used in emacs to Color";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282823,8 +284340,8 @@ self: {
          yi-language yi-rope
        ];
        description = "Pango frontend for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282842,8 +284359,8 @@ self: {
          stm text vty yi-core yi-language yi-rope
        ];
        description = "Vty frontend for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282862,8 +284379,8 @@ self: {
          yi-rope
        ];
        description = "Fuzzy open plugin for yi";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282891,8 +284408,8 @@ self: {
          text yi-core yi-language yi-rope
        ];
        description = "Yi editor incremental reader";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282908,8 +284425,8 @@ self: {
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
        description = "Cua keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282927,8 +284444,8 @@ self: {
          text transformers-base yi-core yi-language yi-misc-modes yi-rope
        ];
        description = "Emacs keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282955,8 +284472,8 @@ self: {
          unordered-containers yi-core yi-language yi-rope
        ];
        description = "Vim keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282984,8 +284501,8 @@ self: {
          unordered-containers
        ];
        description = "Collection of language-related Yi libraries";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283003,8 +284520,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283022,8 +284539,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283042,8 +284559,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283055,8 +284572,8 @@ self: {
        sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
        libraryHaskellDepends = [ base yi ];
        description = "Monokai colour theme for the Yi text editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283076,7 +284593,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A rope data structure used by Yi";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "yi-snippet" = callPackage
@@ -283096,8 +284613,8 @@ self: {
          base containers tasty-hunit tasty-th yi-rope
        ];
        description = "Snippet support for yi";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283109,8 +284626,8 @@ self: {
        sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc";
        libraryHaskellDepends = [ base yi ];
        description = "Solarized colour theme for the Yi text editor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283122,8 +284639,8 @@ self: {
        sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q";
        libraryHaskellDepends = [ base yi ];
        description = "Spolsky colour theme for the Yi text editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283147,8 +284664,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283162,8 +284679,8 @@ self: {
          base bindings-yices containers transformers
        ];
        description = "Simple interface to the Yices SMT (SAT modulo theories) solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yices-painless" = callPackage
@@ -283179,8 +284696,8 @@ self: {
        ];
        librarySystemDepends = [ gmp yices ];
        description = "An embedded language for programming the Yices SMT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "yiyd" = callPackage
@@ -283202,7 +284719,7 @@ self: {
          yaml
        ];
        testToolDepends = [ hspec-discover ];
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
      }) {};
 
   "yjftp" = callPackage
@@ -283222,7 +284739,7 @@ self: {
        executableHaskellDepends = [ hsConfigure ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283237,7 +284754,7 @@ self: {
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283249,7 +284766,7 @@ self: {
        sha256 = "0zif4sqrd7kv1546vcp1q78bb8k94mkiqxh7glix6gvv7gabfdzp";
        libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yjtools" = callPackage
@@ -283276,7 +284793,7 @@ self: {
          base containers parsec QuickCheck quickcheck-instances
        ];
        description = "A Minimal JSON Parser & Printer for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yoctoparsec" = callPackage
@@ -283285,12 +284802,12 @@ self: {
        pname = "yoctoparsec";
        version = "0.1.0.0";
        sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp";
-       revision = "3";
-       editedCabalFile = "1yvbslg8y6kvagdjnm0wbknlf1pigqlk8hiqpvmicmqgaiaaxlb7";
+       revision = "4";
+       editedCabalFile = "00icvzsb8l70w5dcy0kkxrg0hpq273r8zyy6cx6hscpzgck090jf";
        libraryHaskellDepends = [ base free mtl ];
        description = "A truly tiny monadic parsing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283302,8 +284819,8 @@ self: {
        sha256 = "0qkg8aykr8whjrkwfnsds3bjbrb51r83rd60mpdwcs12zyqlpi0d";
        libraryHaskellDepends = [ base ];
        description = "Parser combinators for young padawans";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283317,7 +284834,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bindings-DSL ieee754 ];
        description = "Bindings to Facebook's Yoga layout library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yoko" = callPackage
@@ -283336,8 +284853,8 @@ self: {
          type-functions type-ord type-ord-spine-cereal type-spine
        ];
        description = "Generic Programming with Disbanded Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283349,8 +284866,8 @@ self: {
        sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb";
        libraryHaskellDepends = [ base containers haskell98 ];
        description = "A library for digital circuit description";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283365,7 +284882,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring process utility-ht ];
        description = "Upload video to YouTube via YouTube API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yql" = callPackage
@@ -283391,8 +284908,8 @@ self: {
          base containers ecma262 exceptions hxt opendatatable
        ];
        description = "A YQL engine to execute Open Data Tables";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283416,7 +284933,7 @@ self: {
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283431,7 +284948,7 @@ self: {
          base mtl pointed template-haskell yesod-core
        ];
        description = "mtl-style transformations for Yesod sites";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yu-auth" = callPackage
@@ -283445,8 +284962,8 @@ self: {
        libraryHaskellDepends = [ base cryptonite memory yu-utils ];
        testHaskellDepends = [ base MonadRandom random yu-utils ];
        description = "Auth module for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283459,8 +284976,8 @@ self: {
        libraryHaskellDepends = [ base yu-auth yu-utils ];
        testHaskellDepends = [ base blaze-markup hspec yu-utils ];
        description = "The core of Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283476,8 +284993,8 @@ self: {
          base cmdargs yaml yu-auth yu-core yu-utils
        ];
        description = "The launcher for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283495,8 +285012,8 @@ self: {
          base cmdargs directory echo filepath process yu-auth yu-utils
        ];
        description = "Tool for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283520,8 +285037,8 @@ self: {
          warp xml-hamlet yesod-core
        ];
        description = "Utils for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283534,7 +285051,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yuuko" = callPackage
@@ -283557,8 +285074,8 @@ self: {
          haskell98 mtl network parsec
        ];
        description = "A transcendental HTML parser gently wrapping the HXT library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283571,7 +285088,9 @@ self: {
        libraryHaskellDepends = [ array base bytestring lattices mtl ];
        testHaskellDepends = [ array base bytestring hspec mtl ];
        description = "Row-major coordinates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "yxdb-utils" = callPackage
@@ -283609,8 +285128,8 @@ self: {
          time transformers vector xml-conduit
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283628,7 +285147,7 @@ self: {
        librarySystemDepends = [ gomp z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings for the Z3 Theorem Prover";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gomp; inherit (pkgs) z3;};
 
   "z3-encoding" = callPackage
@@ -283640,8 +285159,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl z3 ];
        testHaskellDepends = [ base containers hspec z3 ];
        description = "High-level assertion encoding to Z3 solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283665,8 +285184,8 @@ self: {
          tasty-quickcheck text vector-sized
        ];
        description = "Implementation of the z85 binary codec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283679,8 +285198,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Simple-minded abstract binding trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283692,7 +285211,7 @@ self: {
        sha256 = "0nxz74svi7as52vr84jr58zmcykll8g5kcq795cxs4zf720ahqsz";
        libraryHaskellDepends = [ base ];
        description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zampolit" = callPackage
@@ -283710,8 +285229,8 @@ self: {
          parsec time
        ];
        description = "A tool for checking how much work is done on group projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283723,8 +285242,8 @@ self: {
        sha256 = "131lfik05gkr7mqnxf2ibbv5nxjy2x76r5mpvwgzj06nq4v9n527";
        libraryHaskellDepends = [ base papillon ];
        description = "lojban parser (zasni gerna)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283738,8 +285257,8 @@ self: {
        libraryPkgconfigDepends = [ zbar ];
        libraryToolDepends = [ c2hs ];
        description = "zbar bindings in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zbar;};
 
@@ -283753,7 +285272,7 @@ self: {
          array base containers mersenne-random-pure64
        ];
        description = "Zobrist keys for game state tracking";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zenacy-html" = callPackage
@@ -283786,7 +285305,7 @@ self: {
          raw-strings-qq text
        ];
        description = "A standard compliant HTML parsing library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zenacy-unicode" = callPackage
@@ -283802,7 +285321,7 @@ self: {
          base bytestring HUnit test-framework test-framework-hunit text
        ];
        description = "Unicode utilities for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zenc" = callPackage
@@ -283813,7 +285332,7 @@ self: {
        sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2";
        libraryHaskellDepends = [ base ];
        description = "GHC style name Z-encoding and Z-decoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zendesk-api" = callPackage
@@ -283834,8 +285353,8 @@ self: {
          transformers unordered-containers x509 x509-store x509-validation
        ];
        description = "Zendesk API for Haskell programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283849,8 +285368,8 @@ self: {
        editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z";
        libraryHaskellDepends = [ base ];
        description = "@zenhack's personal custom prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283870,8 +285389,8 @@ self: {
          random text transformers
        ];
        description = "An automated proof system for Haskell programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283897,7 +285416,7 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        doHaddock = false;
        description = "Zeolite is a statically-typed, general-purpose programming language";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "zephyr" = callPackage
@@ -283929,8 +285448,8 @@ self: {
        ];
        testToolDepends = [ purescript ];
        description = "Zephyr, tree-shaking for the PureScript language";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283942,7 +285461,7 @@ self: {
        sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw";
        libraryHaskellDepends = [ base semigroups ];
        description = "Semigroups with absorption";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zerobin" = callPackage
@@ -283963,8 +285482,8 @@ self: {
          base bytestring docopt raw-strings-qq
        ];
        description = "Post to 0bin services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283983,8 +285502,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bindings to ZeroMQ 2.1.x";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zeromq;};
 
@@ -284001,8 +285520,8 @@ self: {
          transformers zeromq3-haskell
        ];
        description = "Conduit bindings for zeromq3-haskell";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284025,8 +285544,8 @@ self: {
          MonadCatchIO-transformers QuickCheck transformers
        ];
        description = "Bindings to ZeroMQ 3.x";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zeromq;};
 
@@ -284053,8 +285572,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell implementation of the ZeroMQ clone pattern";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284073,8 +285592,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Conduit wrapper around zeromq4-haskell";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284096,7 +285615,7 @@ self: {
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Bindings to ZeroMQ 4.x";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-patterns" = callPackage
@@ -284119,8 +285638,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell implementation of several ZeroMQ patterns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284136,7 +285655,7 @@ self: {
          aeson base bytestring constraints hashable uuid zeromq4-haskell
        ];
        description = "More constrained extensions to zeromq4-haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zeroth" = callPackage
@@ -284159,8 +285678,8 @@ self: {
          monoid-record process syb template-haskell
        ];
        description = "ZeroTH - remove unnecessary TH dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284185,8 +285704,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Command-line utility for working with zettelkast files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284210,8 +285729,8 @@ self: {
          genvalidity-path hspec path path-io QuickCheck stm
        ];
        description = "zifter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284227,8 +285746,8 @@ self: {
          base directory filepath path path-io process safe zifter
        ];
        description = "zifter-cabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284240,8 +285759,8 @@ self: {
        sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8";
        libraryHaskellDepends = [ base path process zifter ];
        description = "zifter-git";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284257,8 +285776,8 @@ self: {
          base filepath path path-io process safe zifter
        ];
        description = "zifter-google-java-format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284274,8 +285793,8 @@ self: {
          base directory filepath path path-io process safe zifter
        ];
        description = "zifter-hindent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284290,8 +285809,8 @@ self: {
          base filepath hlint path path-io safe zifter
        ];
        description = "zifter-hlint";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284311,8 +285830,8 @@ self: {
          zifter
        ];
        description = "zifter-stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284329,8 +285848,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284351,7 +285870,7 @@ self: {
          conduit-extra hspec lzma
        ];
        description = "Read and parse ZIM files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "zinza" = callPackage
@@ -284373,7 +285892,7 @@ self: {
          tasty-golden tasty-hunit tasty-quickcheck
        ];
        description = "Typed templates with jinja like syntax";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "zio" = callPackage
@@ -284391,7 +285910,7 @@ self: {
          base mtl transformers unexceptionalio unexceptionalio-trans
        ];
        description = "App-centric Monad-transformer based on Scala ZIO (UIO + ReaderT + ExceptT)";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "zip" = callPackage
@@ -284399,19 +285918,19 @@ self: {
      , cereal, conduit, conduit-extra, conduit-zstd, containers, digest
      , directory, dlist, exceptions, filepath, hspec, monad-control, mtl
      , QuickCheck, resourcet, temporary, text, time, transformers
-     , transformers-base
+     , transformers-base, unix
      }:
      mkDerivation {
        pname = "zip";
-       version = "1.6.0";
-       sha256 = "1k00g2952yf3iyq1p6pjn307zsxsc9j3iq6lih3rr8vysiijivcx";
+       version = "1.7.0";
+       sha256 = "11vdxpyxnh7hbsrpk8g90fd9abbk27dxi9g0mhxc1lxc6syjkzgl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra conduit-zstd containers digest directory dlist
          exceptions filepath monad-control mtl resourcet text time
-         transformers transformers-base
+         transformers transformers-base unix
        ];
        executableHaskellDepends = [ base filepath ];
        testHaskellDepends = [
@@ -284419,7 +285938,7 @@ self: {
          filepath hspec QuickCheck temporary text time transformers
        ];
        description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zip-archive" = callPackage
@@ -284445,7 +285964,7 @@ self: {
        ];
        testToolDepends = [ unzip which ];
        description = "Library for creating and modifying zip archives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) unzip; inherit (pkgs) which;};
 
   "zip-conduit" = callPackage
@@ -284474,8 +285993,8 @@ self: {
          temporary zip-archive
        ];
        description = "Working with zip archives via conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284500,7 +286019,7 @@ self: {
          text time transformers
        ];
        description = "ZIP archive streaming using conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zipedit" = callPackage
@@ -284512,8 +286031,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process ];
        description = "Create simple list editor interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284529,8 +286048,8 @@ self: {
          base bytestring mersenne-random-pure64 mtl safe
        ];
        description = "Zipkin-style request tracing monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284542,8 +286061,8 @@ self: {
        sha256 = "1p8yn91snyv5p6bmll7d0gm0zbrhp99fl4kziq0vkbchlpcdjapf";
        libraryHaskellDepends = [ base multirec ];
        description = "Generic zipper for families of recursive datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284558,7 +286077,7 @@ self: {
          base comonad comonad-extras exceptions split
        ];
        description = "Zipper utils that weren't in Control.Comonad.Store.Zipper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zippers" = callPackage
@@ -284578,7 +286097,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Traversal based zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zippo" = callPackage
@@ -284589,8 +286108,8 @@ self: {
        sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2";
        libraryHaskellDepends = [ base mtl yall ];
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284612,8 +286131,8 @@ self: {
          iso3166-country-codes servant-client
        ];
        description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284633,8 +286152,8 @@ self: {
          aeson base base-compat here hspec iso3166-country-codes text tz
        ];
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284652,7 +286171,7 @@ self: {
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Compression and decompression in the gzip and zlib formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage
@@ -284666,7 +286185,7 @@ self: {
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        description = "Low-level bindings to the zlib package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zlib-conduit" = callPackage
@@ -284678,7 +286197,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Streaming compression/decompression via conduits. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zlib-enum" = callPackage
@@ -284695,8 +286214,8 @@ self: {
          base bytestring enumerator transformers zlib-bindings
        ];
        description = "Enumerator interface for zlib compression";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284708,7 +286227,7 @@ self: {
        sha256 = "1sv6yx7p06zk653d3rmcj0lh2rzwzfi25v9sz9n8kq4r712n79g5";
        libraryHaskellDepends = [ base bytestring profunctors zlib ];
        description = "Lenses for zlib";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zm" = callPackage
@@ -284730,8 +286249,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck text timeit
        ];
        description = "Language independent, reproducible, absolute types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284746,8 +286265,8 @@ self: {
        libraryHaskellDepends = [ base bytestring zeromq3-haskell ];
        executableHaskellDepends = [ base bytestring ];
        description = "Command-line tool for ZeroMQ";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284759,7 +286278,7 @@ self: {
        sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Read and write MIDI files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zmidi-score" = callPackage
@@ -284776,8 +286295,8 @@ self: {
          directory filepath mtl parallel-io text zmidi-core
        ];
        description = "Representing MIDI a simple score";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284796,7 +286315,7 @@ self: {
        ];
        description = "A socat-like tool for zeromq library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "zoneinfo" = callPackage
@@ -284807,8 +286326,8 @@ self: {
        sha256 = "1n27j8ca79a1ijn7k7dp61kjz62i6zfzlns8n0kwgyvpx413ws8y";
        libraryHaskellDepends = [ base time ];
        description = "ZoneInfo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284827,8 +286346,8 @@ self: {
          base directory filepath ghc hint mtl
        ];
        description = "A rake/thor-like task runner written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284860,8 +286379,8 @@ self: {
          test-framework-quickcheck2 transformers type-level unix
        ];
        description = "A streamable, seekable, zoomable cache file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284878,8 +286397,8 @@ self: {
          type-level zoom-cache
        ];
        description = "Library for zoom-cache PCM audio codecs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284899,8 +286418,8 @@ self: {
          mtl ui-command vector zoom-cache zoom-cache-pcm
        ];
        description = "Tools for generating zoom-cache-pcm files";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284912,8 +286431,8 @@ self: {
        sha256 = "0axkg2cp0gdlf82w0lfff740cd1d5zq4s9rqg0hg9v9vx7ahwg3l";
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284930,7 +286449,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zre" = callPackage
@@ -284963,8 +286482,8 @@ self: {
          base bytestring QuickCheck quickcheck-instances uuid
        ];
        description = "ZRE protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "zsdd" = callPackage
@@ -284979,8 +286498,8 @@ self: {
          base containers hashable mtl unordered-containers
        ];
        description = "Zero-Suppressed and Reduced Decision Diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284994,8 +286513,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath mtl ];
        description = "Ascii bars representing battery status";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285016,7 +286535,7 @@ self: {
          base bytestring criterion ghc-prim zlib
        ];
        description = "Haskell bindings to the Zstandard compression algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zsyntax" = callPackage
@@ -285030,8 +286549,8 @@ self: {
        ];
        testHaskellDepends = [ base containers mtl multiset ];
        description = "Automated theorem prover for the Zsyntax biochemical calculus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285052,7 +286571,7 @@ self: {
          unix unordered-containers
        ];
        description = "Multi-file, colored, filtered log tailer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ztar" = callPackage
@@ -285073,8 +286592,8 @@ self: {
          quickcheck-instances tasty tasty-quickcheck
        ];
        description = "Creating and extracting arbitrary archives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285113,8 +286632,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A lisp processor, An inline-lisp, in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285126,7 +286645,7 @@ self: {
        sha256 = "1382h7fib8vicjh7axdwp2i4zjm0ysgw0b1f5nkn38dqgwbfwlik";
        libraryHaskellDepends = [ base ];
        description = "Password strength estimation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zxcvbn-dvorak" = callPackage
@@ -285144,8 +286663,8 @@ self: {
          unordered-containers zlib zxcvbn-hs
        ];
        description = "Password strength estimation based on zxcvbn";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285182,7 +286701,7 @@ self: {
          unordered-containers vector zlib
        ];
        description = "Password strength estimation based on zxcvbn";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zydiskell" = callPackage
@@ -285200,7 +286719,7 @@ self: {
          base bytestring containers fixed-vector storable-record
        ];
        description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
 }
diff --git a/nixpkgs/pkgs/development/haskell-modules/hoogle.nix b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix
index 0f620d46cccd..cfa06b045de2 100644
--- a/nixpkgs/pkgs/development/haskell-modules/hoogle.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix
@@ -38,8 +38,8 @@ let
     else "haddock-ghcjs";
   ghcDocLibDir =
     if !isGhcjs
-    then ghc.doc + ''/share/doc/ghc*/html/libraries''
-    else ghc     + ''/doc/lib'';
+    then ghc.doc + "/share/doc/ghc*/html/libraries"
+    else ghc     + "/doc/lib";
   # On GHCJS, use a stripped down version of GHC's prologue.txt
   prologue =
     if !isGhcjs
@@ -120,7 +120,7 @@ buildPackages.stdenv.mkDerivation {
   meta = {
     description = "A local Hoogle database";
     platforms = ghc.meta.platforms;
-    hydraPlatforms = with stdenv.lib.platforms; none;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    hydraPlatforms = with lib.platforms; none;
+    maintainers = with lib.maintainers; [ ttuegel ];
   };
 }
diff --git a/nixpkgs/pkgs/development/haskell-modules/initial-packages.nix b/nixpkgs/pkgs/development/haskell-modules/initial-packages.nix
index 6ab7da969119..3bbf9c037dd4 100644
--- a/nixpkgs/pkgs/development/haskell-modules/initial-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/initial-packages.nix
@@ -1,2 +1,2 @@
-args@{ pkgs, stdenv, callPackage }: self:
+args@{ pkgs, lib, callPackage }: self:
    (import ./hackage-packages.nix args self)
diff --git a/nixpkgs/pkgs/development/haskell-modules/lib.nix b/nixpkgs/pkgs/development/haskell-modules/lib.nix
index 964c179fb65b..1537cd6466cd 100644
--- a/nixpkgs/pkgs/development/haskell-modules/lib.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/lib.nix
@@ -160,7 +160,7 @@ rec {
   addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; });
 
   addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
-  addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; });
+  addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkg-configDepends = (drv.pkg-configDepends or []) ++ xs; });
 
   addSetupDepend = drv: x: addSetupDepends drv [x];
   addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; });
diff --git a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix
index 4ae3f0b2427f..28b48bfcbc4a 100644
--- a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix
@@ -11,9 +11,13 @@
 , # package-set used for non-haskell dependencies (all of nixpkgs)
   pkgs
 
-, # stdenv to use for building haskell packages
+, # stdenv provides our build and host platforms
   stdenv
 
+, # this module provides the list of known licenses and maintainers
+  lib
+
+  # needed for overrideCabal & packageSourceOverrides
 , haskellLib
 
 , # hashes for downloading Hackage packages
@@ -22,7 +26,7 @@
 , # compiler to use
   ghc
 
-, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and
+, # A function that takes `{ pkgs, lib, callPackage }` as the first arg and
   # `self` as second, and returns a set of haskell packages
   package-set
 
@@ -37,7 +41,7 @@ self:
 let
   inherit (stdenv) buildPlatform hostPlatform;
 
-  inherit (stdenv.lib) fix' extends makeOverridable;
+  inherit (lib) fix' extends makeOverridable;
   inherit (haskellLib) overrideCabal;
 
   mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
@@ -80,8 +84,8 @@ let
       # lost on `.override`) but determine the auto-args based on `drv` (the problem here
       # is that nix has no way to "passthrough" args while preserving the reflection
       # info that callPackage uses to determine the arguments).
-      drv = if stdenv.lib.isFunction fn then fn else import fn;
-      auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope;
+      drv = if lib.isFunction fn then fn else import fn;
+      auto = builtins.intersectAttrs (lib.functionArgs drv) scope;
 
       # this wraps the `drv` function to add a `overrideScope` function to the result.
       drvScope = allArgs: drv allArgs // {
@@ -94,7 +98,7 @@ let
           # nothing.
           in callPackageWithScope newScope drv manualArgs;
       };
-    in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
+    in lib.makeOverridable drvScope (auto // manualArgs);
 
   mkScope = scope: let
       ps = pkgs.__splicedPackages;
@@ -169,7 +173,7 @@ let
       };
     });
 
-in package-set { inherit pkgs stdenv callPackage; } self // {
+in package-set { inherit pkgs lib callPackage; } self // {
 
     inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;
 
diff --git a/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
index b31f6c6289d5..af317c92a5ab 100644
--- a/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -25,6 +25,8 @@ self: super: {
   hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
   hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { };
   hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { };
+  hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { };
+  hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { };
 
   nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
 
diff --git a/nixpkgs/pkgs/development/idris-modules/glfw.nix b/nixpkgs/pkgs/development/idris-modules/glfw.nix
index da23ae18331c..c63cf8acb0f3 100644
--- a/nixpkgs/pkgs/development/idris-modules/glfw.nix
+++ b/nixpkgs/pkgs/development/idris-modules/glfw.nix
@@ -10,7 +10,7 @@ build-idris-package  {
 
   idrisDeps = [ effects ];
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
   extraBuildInputs = [ pkgs.glfw ];
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/idris-modules/sdl2.nix b/nixpkgs/pkgs/development/idris-modules/sdl2.nix
index 2e1cdaa9be3a..943db9e87a0f 100644
--- a/nixpkgs/pkgs/development/idris-modules/sdl2.nix
+++ b/nixpkgs/pkgs/development/idris-modules/sdl2.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , effects
 , lib
-, pkgconfig
+, pkg-config
 , SDL2
 , SDL2_gfx
 }:
@@ -13,7 +13,7 @@ build-idris-package rec {
   idrisDeps = [ effects ];
 
   extraBuildInputs = [
-    pkgconfig
+    pkg-config
     SDL2
     SDL2_gfx
   ];
diff --git a/nixpkgs/pkgs/development/idris-modules/tparsec.nix b/nixpkgs/pkgs/development/idris-modules/tparsec.nix
index 84f88e1598bb..ce040bebe355 100644
--- a/nixpkgs/pkgs/development/idris-modules/tparsec.nix
+++ b/nixpkgs/pkgs/development/idris-modules/tparsec.nix
@@ -8,7 +8,7 @@ build-idris-package  {
   version = "2020-02-11";
 
   ipkgName = "TParsec";
-  
+
   idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/idris-modules/with-packages.nix b/nixpkgs/pkgs/development/idris-modules/with-packages.nix
index 47136839d01a..72b9067b6915 100644
--- a/nixpkgs/pkgs/development/idris-modules/with-packages.nix
+++ b/nixpkgs/pkgs/development/idris-modules/with-packages.nix
@@ -1,10 +1,10 @@
 # Build a version of idris with a set of packages visible
 # packages: The packages visible to idris
-{ stdenv, idris, symlinkJoin, makeWrapper }: packages:
+{ stdenv, lib, idris, symlinkJoin, makeWrapper }: packages:
 
-let paths = stdenv.lib.closePropagation packages;
+let paths = lib.closePropagation packages;
 in
-stdenv.lib.appendToName "with-packages" (symlinkJoin {
+lib.appendToName "with-packages" (symlinkJoin {
 
   inherit (idris) name;
 
diff --git a/nixpkgs/pkgs/development/interpreters/acl2/default.nix b/nixpkgs/pkgs/development/interpreters/acl2/default.nix
index 83b54e442aa3..c089916158bd 100644
--- a/nixpkgs/pkgs/development/interpreters/acl2/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/acl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
+{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
 , sbcl, bash, which, perl, nettools
 , openssl, glucose, minisat, abc-verifier, z3, python2
 , certifyBooks ? true
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     # ACL2 itself only needs a Common Lisp compiler/interpreter:
     sbcl
-  ] ++ stdenv.lib.optionals certifyBooks [
+  ] ++ lib.optionals certifyBooks [
     # To build community books, we need Perl and a couple of utilities:
     which perl nettools
     # Some of the books require one or more of these external tools:
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     # When certifying books, ACL2 doesn't like $HOME not existing.
     export HOME=$(pwd)/fake-home
-  '' + stdenv.lib.optionalString certifyBooks ''
+  '' + lib.optionalString certifyBooks ''
     # Some books also care about $USER being nonempty.
     export USER=nobody
   '';
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     ln -s $out/share/${pname}/saved_acl2           $out/bin/${pname}
-  '' + stdenv.lib.optionalString certifyBooks ''
+  '' + lib.optionalString certifyBooks ''
     ln -s $out/share/${pname}/books/build/cert.pl  $out/bin/${pname}-cert
     ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean
   '';
@@ -100,7 +100,7 @@ in stdenv.mkDerivation rec {
     rm -rf $out/share/${pname}/books
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interpreter and a prover for a Lisp dialect";
     longDescription = ''
       ACL2 is a logic and programming language in which you can model computer
diff --git a/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix
index 5186cd69584e..b9a61b88a306 100644
--- a/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, unzip }:
+{ lib, stdenv, fetchurl, zlib, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "libipasirglucose4";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     install -D libipasirglucose4.so $out/lib/libipasirglucose4.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library providing IPASIR interface to the Glucose SAT solver";
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/interpreters/alda/default.nix b/nixpkgs/pkgs/development/interpreters/alda/default.nix
index b82b0b978f9c..19e90a00e6cb 100644
--- a/nixpkgs/pkgs/development/interpreters/alda/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/alda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre }:
+{ lib, stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
   pname = "alda";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A music programming language for musicians";
     homepage = "https://alda.io";
     license = licenses.epl10;
diff --git a/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix b/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
index 0449572da024..922d964e8abe 100644
--- a/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 let
   s = # Generated upstream information
   rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd angelscript/projects/gnuc
     sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
-    export SHARED=1 
+    export SHARED=1
     export VERSION="${s.version}"
     mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
   '';
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Light-weight scripting library";
-    license = stdenv.lib.licenses.zlib ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.zlib ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     badPlatforms = [ "aarch64-linux" ];
     downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
     homepage="http://www.angelcode.com/angelscript/";
diff --git a/nixpkgs/pkgs/development/interpreters/angelscript/default.nix b/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
index 0209bcaaafcd..fb8c6b2844d6 100644
--- a/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.34.0";
+    version = "2.35.0";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "1xxxpwln4v2yasa35y7552fsfd8fbg50gnbp4vxy0ajj2wvh9akg";
+    sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc=";
   };
   buildInputs = [
     unzip
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Light-weight scripting library";
-    license = stdenv.lib.licenses.zlib ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.zlib ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
     homepage="http://www.angelcode.com/angelscript/";
   };
diff --git a/nixpkgs/pkgs/development/interpreters/bats/default.nix b/nixpkgs/pkgs/development/interpreters/bats/default.nix
index bbc38e515424..aa3abc655343 100644
--- a/nixpkgs/pkgs/development/interpreters/bats/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/bats/default.nix
@@ -1,29 +1,37 @@
-{ stdenv, fetchzip, coreutils, gnugrep }:
+{ stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, doCheck ? true }:
 
 stdenv.mkDerivation rec {
   pname = "bats";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchzip {
     url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
-    sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq";
+    hash = "sha256-grB/rJaDU0fuw4Hm3/9nI2px8KZnSWqRjTJPd7Mmb7s=";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   patchPhase = ''
-    patchShebangs ./install.sh
+    patchShebangs .
+  '';
 
-    substituteInPlace ./libexec/bats-core/bats \
-        --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink'
-    substituteInPlace ./libexec/bats-core/bats-format-tap-stream \
-        --replace grep ${gnugrep}/bin/grep
+  installPhase = ''
+    ./install.sh $out
+    wrapProgram $out/bin/bats --suffix PATH : "${lib.makeBinPath [ bash coreutils gnugrep ]}"
   '';
 
-  installPhase = "./install.sh $out";
+  inherit doCheck;
+  checkPhase = ''
+    # test generates file with absolute shebang dynamically
+    substituteInPlace test/install.bats --replace \
+      "/usr/bin/env bash" "${bash}/bin/bash"
+    bin/bats test
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bats-core/bats-core";
     description = "Bash Automated Testing System";
-    maintainers = [ maintainers.lnl7 ];
+    maintainers = with maintainers; [ abathur ];
     license = licenses.mit;
     platforms = platforms.unix;
   };
diff --git a/nixpkgs/pkgs/development/interpreters/ceptre/default.nix b/nixpkgs/pkgs/development/interpreters/ceptre/default.nix
index de12185b96f0..a9b8f54ab877 100644
--- a/nixpkgs/pkgs/development/interpreters/ceptre/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/ceptre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, mlton }:
+{ lib, stdenv, fetchgit, mlton }:
 
 stdenv.mkDerivation {
   name = "ceptre-2016-11-27";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     cp ceptre $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A linear logic programming language for modeling generative interactive systems";
     homepage = "https://github.com/chrisamaphone/interactive-lp";
     maintainers = with maintainers; [ pSub ];
diff --git a/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/nixpkgs/pkgs/development/interpreters/chibi/default.nix
index 7bf4c0fd52d0..96c884ab602e 100644
--- a/nixpkgs/pkgs/development/interpreters/chibi/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/chibi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper }:
 let
   version = "0.9.1";
   name = "chibi-scheme-${version}";
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/ashinn/chibi-scheme";
     description = "Small Footprint Scheme for use as a C Extension Language";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.DerGuteMoritz ];
   };
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/interpreters/cling/default.nix b/nixpkgs/pkgs/development/interpreters/cling/default.nix
index c22ad3f4cb0f..8f80d2f4ee68 100644
--- a/nixpkgs/pkgs/development/interpreters/cling/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/cling/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python
 , libffi
 , git
@@ -50,7 +50,7 @@ let
       "-DCLING_INCLUDE_TESTS=ON"
     ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "The Interactive C++ Interpreter";
       homepage = "https://root.cern/cling/";
       license = with licenses; [ lgpl21 ncsa ];
@@ -73,7 +73,7 @@ let
   flags = [
     "-nostdinc"
     "-nostdinc++"
-    "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include"
+    "-isystem" "${lib.getDev stdenv.cc.libc}/include"
     "-I" "${unwrapped}/include"
     "-I" "${unwrapped}/lib/clang/5.0.2/include"
   ];
diff --git a/nixpkgs/pkgs/development/interpreters/clips/default.nix b/nixpkgs/pkgs/development/interpreters/clips/default.nix
index cf0710f36a1a..d38fb8279f0b 100644
--- a/nixpkgs/pkgs/development/interpreters/clips/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clips/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   version = "6.30";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   installPhase = ''
     install -D -t $out/bin core/clips
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Tool for Building Expert Systems";
     homepage = "http://www.clipsrules.net/";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/interpreters/clisp/default.nix b/nixpkgs/pkgs/development/interpreters/clisp/default.nix
index 1b7ff2c8cba3..566d16179b57 100644
--- a/nixpkgs/pkgs/development/interpreters/clisp/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clisp/default.nix
@@ -3,7 +3,7 @@
 # - base (default): contains readline and i18n, regexp and syscalls modules
 #   by default
 # - full: contains base plus modules in withModules
-{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
+{ lib, stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
 , libffi
 , libffcall
@@ -16,8 +16,8 @@
     "pcre"
     "rawsock"
   ]
-  ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
-  ++ stdenv.lib.optional x11Support "clx/new-clx"
+  ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
+  ++ lib.optional x11Support "clx/new-clx"
 }:
 
 assert x11Support -> (libX11 != null && libXau != null && libXt != null
@@ -37,14 +37,14 @@ stdenv.mkDerivation rec {
   ffcallAvailable = stdenv.isLinux && (libffcall != null);
 
   buildInputs = [libsigsegv]
-  ++ stdenv.lib.optional (gettext != null) gettext
-  ++ stdenv.lib.optional (ncurses != null) ncurses
-  ++ stdenv.lib.optional (pcre != null) pcre
-  ++ stdenv.lib.optional (zlib != null) zlib
-  ++ stdenv.lib.optional (readline != null) readline
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
-  ++ stdenv.lib.optional ffcallAvailable libffcall
-  ++ stdenv.lib.optionals x11Support [
+  ++ lib.optional (gettext != null) gettext
+  ++ lib.optional (ncurses != null) ncurses
+  ++ lib.optional (pcre != null) pcre
+  ++ lib.optional (zlib != null) zlib
+  ++ lib.optional (readline != null) readline
+  ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
+  ++ lib.optional ffcallAvailable libffcall
+  ++ lib.optionals x11Support [
     libX11 libXau libXt libXpm xorgproto libXext
   ];
 
@@ -68,14 +68,14 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "builddir" ]
-  ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
-  ++ stdenv.lib.optional (readline != null) "--with-readline"
+  ++ lib.optional (!dllSupport) "--without-dynamic-modules"
+  ++ lib.optional (readline != null) "--with-readline"
   # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
-  ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
-  ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
+  ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
+  ++ lib.optional ffcallAvailable "--with-ffcall"
+  ++ lib.optional (!ffcallAvailable) "--without-ffcall"
   ++ builtins.map (x: "--with-module=" + x) withModules
-  ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
+  ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -83,11 +83,11 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall =
-    stdenv.lib.optionalString (withModules != [])
+    lib.optionalString (withModules != [])
       (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
-      + stdenv.lib.concatMapStrings (x: " " + x) withModules);
+      + lib.concatMapStrings (x: " " + x) withModules);
 
-  NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
+  NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
 
   # TODO : make mod-check fails
   doCheck = false;
@@ -95,10 +95,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = "http://clisp.cons.org";
-    maintainers = with stdenv.lib.maintainers; [raskin tohl];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [raskin tohl];
+    platforms = lib.platforms.unix;
     # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
     broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/clisp/hg.nix b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix
index 6898f84669f7..83a1870d182b 100644
--- a/nixpkgs/pkgs/development/interpreters/clisp/hg.nix
+++ b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix
@@ -3,7 +3,7 @@
 # - base (default): contains readline and i18n, regexp and syscalls modules
 #   by default
 # - full: contains base plus modules in withModules
-{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
+{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
 , libffi, libffcall, automake
 , coreutils
@@ -15,8 +15,8 @@
     "pcre"
     "rawsock"
   ]
-  ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
-  ++ stdenv.lib.optional x11Support "clx/new-clx"
+  ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
+  ++ lib.optional x11Support "clx/new-clx"
 }:
 
 assert x11Support -> (libX11 != null && libXau != null && libXt != null
@@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ automake ]; # sometimes fails otherwise
   buildInputs = [libsigsegv]
-  ++ stdenv.lib.optional (gettext != null) gettext
-  ++ stdenv.lib.optional (ncurses != null) ncurses
-  ++ stdenv.lib.optional (pcre != null) pcre
-  ++ stdenv.lib.optional (zlib != null) zlib
-  ++ stdenv.lib.optional (readline != null) readline
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
-  ++ stdenv.lib.optional ffcallAvailable libffcall
-  ++ stdenv.lib.optionals x11Support [
+  ++ lib.optional (gettext != null) gettext
+  ++ lib.optional (ncurses != null) ncurses
+  ++ lib.optional (pcre != null) pcre
+  ++ lib.optional (zlib != null) zlib
+  ++ lib.optional (readline != null) readline
+  ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
+  ++ lib.optional ffcallAvailable libffcall
+  ++ lib.optionals x11Support [
     libX11 libXau libXt libXpm xorgproto libXext
   ];
 
@@ -63,14 +63,14 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "builddir" ]
-  ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
-  ++ stdenv.lib.optional (readline != null) "--with-readline"
+  ++ lib.optional (!dllSupport) "--without-dynamic-modules"
+  ++ lib.optional (readline != null) "--with-readline"
   # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
-  ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
-  ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
+  ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
+  ++ lib.optional ffcallAvailable "--with-ffcall"
+  ++ lib.optional (!ffcallAvailable) "--without-ffcall"
   ++ builtins.map (x: " --with-module=" + x) withModules
-  ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
+  ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -79,11 +79,11 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall =
-    stdenv.lib.optionalString (withModules != [])
+    lib.optionalString (withModules != [])
       (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
-      + stdenv.lib.concatMapStrings (x: " " + x) withModules);
+      + lib.concatMapStrings (x: " " + x) withModules);
 
-  NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
+  NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
 
   # TODO : make mod-check fails
   doCheck = false;
@@ -91,8 +91,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = "http://clisp.cons.org";
-    maintainers = with stdenv.lib.maintainers; [raskin tohl];
+    maintainers = with lib.maintainers; [raskin tohl];
     # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
index a6beaf1a5761..e10236fe1eee 100644
--- a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, graalvm11-ce, glibcLocales }:
+{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "babashka";
   version = "0.2.3";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     cp bb $out/bin/bb
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Clojure babushka for the grey areas of Bash";
     longDescription = ''
       The main idea behind babashka is to leverage Clojure in places where you
diff --git a/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix b/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
index d51fa76003b2..57da5e862e99 100644
--- a/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:
 
 let version = "0.4.4"; in
 
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A lightweight IDE for Clojure";
     homepage = "https://github.com/arthuredelstein/clooj";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix
index f12645ec2b62..ab5422378599 100644
--- a/nixpkgs/pkgs/development/interpreters/clojure/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
+{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "clojure";
-  version = "1.10.1.727";
+  version = "1.10.1.763";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "1mnxvy4n7g72vcwhvrgr0xqri3p9d9w76c8a78kphhmd8lq0m92q";
+    sha256 = "042d5bk59wv145fvjrk72g4hvaq7j2p4a2d1pg13b433qfkchgia";
   };
 
   nativeBuildInputs = [
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh
   installPhase =
     let
-      binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
+      binPath = lib.makeBinPath [ rlwrap jdk ];
     in
     ''
       clojure_lib_dir=$out
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       -Sverbose \
       -Scp $out/libexec/clojure-tools-${version}.jar
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Lisp dialect for the JVM";
     homepage = "https://clojure.org/";
     license = licenses.epl10;
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
       offers a software transactional memory system and reactive Agent
       system that ensure clean, correct, multithreaded designs.
     '';
-    maintainers = with maintainers; [ jlesquembre ];
+    maintainers = with maintainers; [ jlesquembre thiagokokada ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 61fd94c09bf4..a269d0b158e2 100644
--- a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -280,8 +280,8 @@ stdenv.mkDerivation {
       making it the fastest Clojure REPL in existence.
     '';
     homepage = "https://github.com/anmonteiro/lumo";
-    license = stdenv.lib.licenses.epl10;
-    maintainers = [ stdenv.lib.maintainers.hlolli ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.epl10;
+    maintainers = [ lib.maintainers.hlolli ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/cyclone/default.nix b/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
index 60a5fd9e65f6..c0a11cf9f026 100644
--- a/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libck, darwin }:
+{ lib, stdenv, fetchFromGitHub, libck, darwin }:
 
 let
   version = "0.21";
@@ -15,7 +15,7 @@ let
 
     enableParallelBuilding = true;
 
-    nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
 
     buildInputs = [ libck ];
 
@@ -36,13 +36,13 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ bootstrap ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
 
   buildInputs = [ libck ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://justinethier.github.io/cyclone/";
     description = "A brand-new compiler that allows practical application development using R7RS Scheme";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/interpreters/dart/default.nix b/nixpkgs/pkgs/development/interpreters/dart/default.nix
index 99e6d9662839..7fa59a18c5f1 100644
--- a/nixpkgs/pkgs/development/interpreters/dart/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/dart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, version ? "2.7.2" }:
+{ lib, stdenv, fetchurl, unzip, version ? "2.7.2" }:
 
 let
 
@@ -80,7 +80,7 @@ let
 
 in
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
 
diff --git a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
index 0978e47754b9..53adc5a9b125 100644
--- a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
+++ b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
@@ -25,8 +25,10 @@ lib.makePackageOverridable
     }@args:
 
     let
+      versionedName = "${name}-${rev}";
+
       src = fetchFromGitHub ({
-        name = "${name}-source";
+        name = "${versionedName}-source";
 
         inherit owner repo rev;
       } // removeAttrs args [
@@ -45,7 +47,9 @@ lib.makePackageOverridable
 
     in
       buildDhallPackage
-        ( { inherit name dependencies source;
+        ( { inherit dependencies source;
+
+            name = versionedName;
 
             code = "${src}/${prefix}${file}";
           }
diff --git a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix
index 039c50f06937..9fc9a4412156 100644
--- a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix
+++ b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix
@@ -85,6 +85,6 @@ in
     ${lib.optionalString (documentationRoot != null) ''
     mkdir -p $out/${dataDhall}
 
-    XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --output-link $out/docs
+    XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --package-name '${name}' --output-link $out/docs
     ''}
   ''
diff --git a/nixpkgs/pkgs/development/interpreters/duktape/default.nix b/nixpkgs/pkgs/development/interpreters/duktape/default.nix
index 8dbfee206417..f864f5bf6f9e 100644
--- a/nixpkgs/pkgs/development/interpreters/duktape/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/duktape/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "duktape";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An embeddable Javascript engine, with a focus on portability and compact footprint";
     homepage = "https://duktape.org/";
     downloadPage = "https://duktape.org/download.html";
diff --git a/nixpkgs/pkgs/development/interpreters/eff/default.nix b/nixpkgs/pkgs/development/interpreters/eff/default.nix
index cfd3bbbda4c3..8dba500c15bd 100644
--- a/nixpkgs/pkgs/development/interpreters/eff/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/eff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, ocamlPackages }:
+{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
 
 let version = "5.0"; in
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.eff-lang.org";
     description = "A functional programming language based on algebraic effects and their handlers";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix
index 8f9d869abf3c..4e50c737e39b 100644
--- a/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix
@@ -3,7 +3,7 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
 mkDerivation {
-  version = "1.11.2";
-  sha256 = "0b4nfgxhmi4gwba9h9k103zrkpbxxvk0gmdl0ggrd5xlg6v288ky";
+  version = "1.11.3";
+  sha256 = "sha256-DqmKpMLxrXn23fsX/hrjDsYCmhD5jbVtvOX8EwKBakc=";
   minimumOTPVersion = "21";
 }
diff --git a/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
index 8dddd5befd4d..358fff039c6a 100644
--- a/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper,
+{ pkgs, lib, stdenv, fetchFromGitHub, erlang, makeWrapper,
   coreutils, curl, bash, debugInfo ? false }:
 
 { baseName ? "elixir"
@@ -10,7 +10,7 @@
 } @ args:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast optional;
+  inherit (lib) getVersion versionAtLeast optional;
 
 in
   assert versionAtLeast (getVersion erlang) minimumOTPVersion;
@@ -46,7 +46,7 @@ in
        b=$(basename $f)
         if [ "$b" = mix ]; then continue; fi
         wrapProgram $f \
-          --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
+          --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \
           --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
       done
 
@@ -55,7 +55,7 @@ in
     '';
 
     pos = builtins.unsafeGetAttrPos "sha256" args;
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://elixir-lang.org/";
       description = "A functional, meta-programming aware language built on top of the Erlang VM";
 
diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
index c94528e674f4..69d0ac6b7a5f 100644
--- a/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
@@ -59,7 +59,7 @@ mkDerivation {
     knownVulnerabilities = [ "CVE-2017-1000385" ];
 
     platforms = ["x86_64-linux" "x86_64-darwin"];
-    license = pkgs.stdenv.lib.licenses.asl20;
-    maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ];
+    license = pkgs.lib.licenses.asl20;
+    maintainers = with pkgs.lib.maintainers; [ mdaiter ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
index 91ea2fe57ab9..4429dc1eaf37 100644
--- a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
+{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
 , libxml2, libxslt, ncurses, openssl, perl, autoconf
 # TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
 , openjdk8 ? null # javacSupport
@@ -41,7 +41,7 @@ assert odbcSupport -> unixODBC != null;
 assert javacSupport -> openjdk8 != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalAttrs optionalString;
+  inherit (lib) optional optionals optionalAttrs optionalString;
   wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
 
 in stdenv.mkDerivation ({
@@ -106,12 +106,12 @@ in stdenv.mkDerivation ({
   # Some erlang bin/ scripts run sed and awk
   postFixup = ''
     wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${lib.makeBinPath [ gnused gawk ]}"
   '';
 
   setupHook = ./setup-hook.sh;
 
-  meta = with stdenv.lib; ({
+  meta = with lib; ({
     homepage = "https://www.erlang.org/";
     downloadPage = "https://www.erlang.org/download.html";
     description = "Programming language used for massively scalable soft real-time systems";
diff --git a/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix
index a97f132b3b2f..fa428b983356 100644
--- a/nixpkgs/pkgs/development/interpreters/evcxr/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix
@@ -1,26 +1,26 @@
-{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }:
+{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }:
 
 rustPlatform.buildRustPackage rec {
   pname = "evcxr";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "evcxr";
     rev = "v${version}";
-    sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU=";
+    sha256 = "sha256-33XeepqwYmTMcObroPTuxykYuM9qYI1+LV5lZIFSomg=";
   };
 
-  cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A=";
+  cargoSha256 = "sha256-tjCID3YeGkxcq/LqJDMHGNpv1MCXKtcLlDnNkFwx1zU=";
 
   RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
 
-  nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [ pkg-config makeWrapper cmake ];
+  buildInputs = lib.optional stdenv.isDarwin Security;
   postInstall = let
     wrap = exe: ''
       wrapProgram $out/bin/${exe} \
-        --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \
+        --prefix PATH : ${lib.makeBinPath [ cargo gcc ]} \
         --set-default RUST_SRC_PATH "$RUST_SRC_PATH"
     '';
   in ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
     rm $out/bin/testing_runtime
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An evaluation context for Rust";
     homepage = "https://github.com/google/evcxr";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/interpreters/falcon/default.nix b/nixpkgs/pkgs/development/interpreters/falcon/default.nix
index 39d4918a70bf..ecac643f1ea9 100644
--- a/nixpkgs/pkgs/development/interpreters/falcon/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/falcon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
 
 stdenv.mkDerivation {
   pname = "falcon";
@@ -11,10 +11,10 @@ stdenv.mkDerivation {
     sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake pcre zlib sqlite ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ pcre zlib sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Programming language with macros and syntax at once";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
diff --git a/nixpkgs/pkgs/development/interpreters/gauche/boot.nix b/nixpkgs/pkgs/development/interpreters/gauche/boot.nix
new file mode 100644
index 000000000000..7fbc66406e67
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/gauche/boot.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchurl, pkg-config, texinfo, libiconv, gdbm, openssl, zlib
+, mbedtls, cacert }:
+
+stdenv.mkDerivation rec {
+  pname = "gauche-bootstrap";
+  version = "0.9.9";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
+    sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac";
+  };
+
+  nativeBuildInputs = [ pkg-config texinfo ];
+
+  buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  configureFlags = [
+    "--with-iconv=${libiconv}"
+    "--with-dbm=gdbm"
+    "--with-zlib=${zlib}"
+    "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt"
+    # TODO: Enable slib
+    #       Current slib in nixpkgs is specialized to Guile
+    # "--with-slib=${slibGuile}/lib/slib"
+  ];
+
+  enableParallelBuilding = true;
+
+  # TODO: Fix tests that fail in sandbox build
+  doCheck = false;
+
+  meta = with lib; {
+    description = "R7RS Scheme scripting engine";
+    homepage = "https://practical-scheme.net/gauche/";
+    maintainers = with maintainers; [ mnacamura ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/development/interpreters/gauche/default.nix b/nixpkgs/pkgs/development/interpreters/gauche/default.nix
index 58653fae8908..75a931c55629 100644
--- a/nixpkgs/pkgs/development/interpreters/gauche/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/gauche/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib
-, mbedtls, cacert
-}:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo
+,  libiconv, gdbm, openssl, zlib, mbedtls, cacert }:
 
 stdenv.mkDerivation rec {
   pname = "gauche";
-  version = "0.9.9";
+  version = "0.9.10";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
-    sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac";
+  src = fetchFromGitHub {
+    owner = "shirok";
+    repo = pname;
+    rev = "release${lib.replaceChars [ "." ] [ "_" ] version}";
+    sha256 = "0ki1w7sa10ivmg51sqjskby0gsznb0d3738nz80x589033km5hmb";
   };
 
-  nativeBuildInputs = [ pkgconfig texinfo ];
+  nativeBuildInputs = [ gaucheBootstrap pkg-config texinfo autoreconfHook ];
 
   buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ];
 
+  autoreconfPhase = ''
+    ./DIST gen
+  '';
+
   postPatch = ''
     patchShebangs .
   '';
@@ -34,7 +39,7 @@ stdenv.mkDerivation rec {
   # TODO: Fix tests that fail in sandbox build
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "R7RS Scheme scripting engine";
     homepage = "https://practical-scheme.net/gauche/";
     maintainers = with maintainers; [ mnacamura ];
diff --git a/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
index f01cfc2444bc..9ae373ff7a81 100644
--- a/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, gettext, ncurses }:
+{ lib, stdenv, fetchurl, readline, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "gnu-apl";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline gettext ncurses ];
 
   # Needed with GCC 8
-  NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [
+  NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [
     "-Wno-error=int-in-bool-context"
     "-Wno-error=class-memaccess"
     "-Wno-error=restrict"
     "-Wno-error=format-truncation"
    ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
   '';
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     find $out/share/doc/support-files -name 'Makefile*' -delete
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free interpreter for the APL programming language";
     homepage    = "https://www.gnu.org/software/apl/";
     license     = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/nixpkgs/pkgs/development/interpreters/groovy/default.nix
index dd9cac84ddd8..0e3a0a46afde 100644
--- a/nixpkgs/pkgs/development/interpreters/groovy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/groovy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
 
 # at runtime, need jdk
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An agile dynamic language for the Java Platform";
     homepage = "http://groovy-lang.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix b/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix
index 4a8330f2749c..3841785e8ac4 100644
--- a/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , glib
 , gtk3
 , libffcall
-, pkgconfig
+, pkg-config
 , wrapGAppsHook
 }:
 
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
   buildInputs = [ libffcall glib gtk3 ];
 
   configureOptions = [ "--with-gtk3" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "gtk-server for interpreted GUI programming";
     homepage = "http://www.gtk-server.org/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/interpreters/guile/1.8.nix b/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
index 6057480476f2..93eca9a73f1f 100644
--- a/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
+++ b/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
@@ -1,5 +1,5 @@
-{ stdenv, pkgsBuildBuild, buildPackages
-, fetchurl, makeWrapper, gawk, pkgconfig
+{ lib, stdenv, pkgsBuildBuild, buildPackages
+, fetchurl, makeWrapper, gawk, pkg-config
 , libtool, readline, gmp
 }:
 
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-error-on-warning" ]
     # Guile needs patching to preset results for the configure tests about
     # pthreads, which work only in native builds.
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                           "--with-threads=no";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                            pkgsBuildBuild.guile_1_8;
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  nativeBuildInputs = [ makeWrapper gawk pkg-config ];
   buildInputs = [ readline libtool ];
 
   propagatedBuildInputs = [
@@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = "https://www.gnu.org/software/guile/";
-    license     = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms   = stdenv.lib.platforms.unix;
+    license     = lib.licenses.lgpl2Plus;
+    maintainers = [ lib.maintainers.ludo ];
+    platforms   = lib.platforms.unix;
 
     longDescription = ''
       GNU Guile is an interpreter for the Scheme programming language,
diff --git a/nixpkgs/pkgs/development/interpreters/guile/2.0.nix b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix
index 5b26b38dbd4e..b93ec556cd43 100644
--- a/nixpkgs/pkgs/development/interpreters/guile/2.0.nix
+++ b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix
@@ -1,5 +1,5 @@
-{ stdenv, pkgsBuildBuild, buildPackages
-, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
+{ lib, stdenv, pkgsBuildBuild, buildPackages
+, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config
 , libffi, libtool, readline, gmp, boehmgc, libunistring
 , coverageAnalysis ? null
 }:
@@ -21,9 +21,9 @@
   setOutputFlags = false; # $dev gets into the library otherwise
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                            pkgsBuildBuild.guile_2_0;
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  nativeBuildInputs = [ makeWrapper gawk pkg-config ];
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [
@@ -46,8 +46,8 @@
     })
     ./riscv.patch
   ] ++
-    (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
-    ++ stdenv.lib.optionals stdenv.isDarwin [
+    (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
+    ++ lib.optionals stdenv.isDarwin [
       (fetchpatch {
         url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
         sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
@@ -59,10 +59,10 @@
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
 
   # don't have "libgcc_s.so.1" on darwin
-  LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
+  LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
 
   configureFlags = [ "--with-libreadline-prefix" ]
-    ++ stdenv.lib.optionals stdenv.isSunOS [
+    ++ lib.optionals stdenv.isSunOS [
       # Make sure the right <gmp.h> is found, and not the incompatible
       # /usr/include/mp.h from OpenSolaris.  See
       # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@@ -102,9 +102,9 @@
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = "https://www.gnu.org/software/guile/";
-    license     = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ ludo lovek323 ];
+    platforms   = lib.platforms.all;
 
     longDescription = ''
       GNU Guile is an implementation of the Scheme programming language, with
@@ -120,7 +120,7 @@
 
 //
 
-(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+(lib.optionalAttrs (!stdenv.isLinux) {
   # Work around <https://bugs.gnu.org/14201>.
   SHELL = stdenv.shell;
   CONFIG_SHELL = stdenv.shell;
diff --git a/nixpkgs/pkgs/development/interpreters/guile/default.nix b/nixpkgs/pkgs/development/interpreters/guile/default.nix
index 52a3488d0515..ed685682db66 100644
--- a/nixpkgs/pkgs/development/interpreters/guile/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/guile/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, pkgsBuildBuild, buildPackages
-, fetchurl, makeWrapper, gawk, pkgconfig
+{ lib, stdenv, pkgsBuildBuild, buildPackages
+, fetchurl, makeWrapper, gawk, pkg-config
 , libffi, libtool, readline, gmp, boehmgc, libunistring
 , coverageAnalysis ? null
 , fetchpatch
@@ -23,9 +23,9 @@
   setOutputFlags = false; # $dev gets into the library otherwise
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                            pkgsBuildBuild.guile;
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  nativeBuildInputs = [ makeWrapper gawk pkg-config ];
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [
@@ -48,8 +48,8 @@
 
   patches = [
     ./eai_system.patch
-  ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
-    ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+  ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
+    ++ lib.optional stdenv.isDarwin (fetchpatch {
       url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
       sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
     });
@@ -58,10 +58,11 @@
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
 
   # don't have "libgcc_s.so.1" on darwin
-  LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  LDFLAGS = lib.optionalString
+    (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";
 
   configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
-    ++ stdenv.lib.optionals stdenv.isSunOS [
+    ++ lib.optionals stdenv.isSunOS [
       # Make sure the right <gmp.h> is found, and not the incompatible
       # /usr/include/mp.h from OpenSolaris.  See
       # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@@ -100,9 +101,9 @@
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = "https://www.gnu.org/software/guile/";
-    license     = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ ludo lovek323 vrthra ];
+    platforms   = lib.platforms.all;
 
     longDescription = ''
       GNU Guile is an implementation of the Scheme programming language, with
diff --git a/nixpkgs/pkgs/development/interpreters/hugs/default.nix b/nixpkgs/pkgs/development/interpreters/hugs/default.nix
index 35463b161572..6af489473c9c 100644
--- a/nixpkgs/pkgs/development/interpreters/hugs/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/hugs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison }:
+{ lib, stdenv, fetchurl, bison }:
 
 stdenv.mkDerivation {
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     "--enable-pthreads"                 # build Hugs using POSIX threads C library
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.haskell.org/hugs";
     description = "Haskell interpreter";
     maintainers = with maintainers; [ joachifm ];
diff --git a/nixpkgs/pkgs/development/interpreters/hy/default.nix b/nixpkgs/pkgs/development/interpreters/hy/default.nix
index a8890b048fbe..6bfef26b4ddc 100644
--- a/nixpkgs/pkgs/development/interpreters/hy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/hy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "hy";
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     $out/bin/hy --help > /dev/null
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A LISP dialect embedded in Python";
     homepage = "http://hylang.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
index 02992e718718..5481f7825c98 100644
--- a/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libX11
 , libXt
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2";
   };
 
-  buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
+  buildInputs = lib.optionals withGraphics [ libX11 libXt ];
 
   configurePhase =
     let
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     mv $out/doc $out/share/doc/icon
   '';
 
-  meta = with stdenv.lib; {
-    description = ''A very high level general-purpose programming language'';
+  meta = with lib; {
+    description = "A very high level general-purpose programming language";
     maintainers = with maintainers; [ vrthra yurrriq ];
     platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/interpreters/io/default.nix b/nixpkgs/pkgs/development/interpreters/io/default.nix
index 42af3cc427b4..d0a3b20e5038 100644
--- a/nixpkgs/pkgs/development/interpreters/io/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/io/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
+{ lib, stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
   ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
   libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
-  python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
+  python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
 }:
 
 stdenv.mkDerivation {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     zlib sqlite gmp libffi cairo ncurses freetype
     libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2
     freeglut libsamplerate pcre libevent libedit yajl
-    pkgconfig glfw openssl libpthreadstubs libXdmcp
+    pkg-config glfw openssl libpthreadstubs libXdmcp
     libmemcached python3
   ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   # for gcc5; c11 inline semantics breaks the build
   NIX_CFLAGS_COMPILE = "-fgnu89-inline";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Io programming language";
     homepage = "http://iolanguage.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/interpreters/j/default.nix b/nixpkgs/pkgs/development/interpreters/j/default.nix
index b7f8b63d54ad..ab64505e091d 100644
--- a/nixpkgs/pkgs/development/interpreters/j/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/j/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, readline, libedit, bc
+{ lib, stdenv, fetchFromGitHub, readline, libedit, bc
 , avxSupport ? stdenv.hostPlatform.avxSupport
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Causes build failure due to warning
-  hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow";
+  hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
 
   buildPhase = ''
     export SOURCE_DIR=$(pwd)
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     cp -r $JLIB/bin "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "J programming language, an ASCII-based APL successor";
     maintainers = with maintainers; [ raskin synthetica ];
     platforms = with platforms; linux ++ darwin;
diff --git a/nixpkgs/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix
index 113a582392fe..9f8ab5a849ff 100644
--- a/nixpkgs/pkgs/development/interpreters/janet/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, meson, ninja }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "janet";
-  version = "1.12.2";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c";
+    sha256 = "sha256-cI0kcY8aYDkmitoju/C6Ule5gzflIe0nLVxZp4iHXnc=";
   };
 
   nativeBuildInputs = [ meson ninja ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Janet programming language";
     homepage = "https://janet-lang.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix b/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix
index d803fe43fd7a..78b9e40b6470 100644
--- a/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
+{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
 
 let
-  makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
+  makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
 
 in stdenv.mkDerivation rec {
   pname = "jimtcl";
@@ -52,8 +52,8 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "An open source small-footprint implementation of the Tcl programming language";
     homepage = "http://jim.tcl.tk/";
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ dbohdan vrthra ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix
index 2eb01b376446..3d36dde8e0f9 100644
--- a/nixpkgs/pkgs/development/interpreters/joker/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "joker";
@@ -21,7 +21,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/candid82/joker";
     description = "A small Clojure interpreter and linter written in Go";
     license = licenses.epl10;
diff --git a/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/nixpkgs/pkgs/development/interpreters/jruby/default.nix
index 9159f026e1f3..f792471c0619 100644
--- a/nixpkgs/pkgs/development/interpreters/jruby/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/jruby/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }:
 
 let
 # The version number here is whatever is reported by the RUBY_VERSION string
@@ -50,7 +50,7 @@ jruby = stdenv.mkDerivation rec {
     libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ruby interpreter written in Java";
     homepage = "http://jruby.org/";
     license = with licenses; [ cpl10 gpl2 lgpl21 ];
diff --git a/nixpkgs/pkgs/development/interpreters/jython/default.nix b/nixpkgs/pkgs/development/interpreters/jython/default.nix
index 35af365c1f7d..61cc8f9cd0f5 100644
--- a/nixpkgs/pkgs/development/interpreters/jython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/jython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   pname = "jython";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Python interpreter written in Java";
     homepage = "https://jython.org/";
-    license = stdenv.lib.licenses.psfl;
+    license = lib.licenses.psfl;
     platforms = jre.meta.platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/kona/default.nix b/nixpkgs/pkgs/development/interpreters/kona/default.nix
index 041616cc1f63..15ce9321a8d7 100644
--- a/nixpkgs/pkgs/development/interpreters/kona/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/kona/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "kona";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
   preInstall = ''mkdir -p "$out/bin"'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interpreter of K, APL-like programming language";
     homepage = "https://github.com/kevinlawler/kona/";
     maintainers = with maintainers; [ raskin ];
diff --git a/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix
index ba42c2d59d56..d6090152d158 100644
--- a/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
+{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
 
 { baseName ? "lfe"
 , version
@@ -10,7 +10,7 @@
 }:
 
 let
-  inherit (stdenv.lib)
+  inherit (lib)
     assertMsg makeBinPath optionalString
     getVersion versionAtLeast versionOlder versions;
 
@@ -75,7 +75,7 @@ buildRebar3 {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description     = "The best of Erlang and of Lisp; at the same time!";
     longDescription = ''
       LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang
diff --git a/nixpkgs/pkgs/development/interpreters/lolcode/default.nix b/nixpkgs/pkgs/development/interpreters/lolcode/default.nix
index bd4b93b835fc..65653701b806 100644
--- a/nixpkgs/pkgs/development/interpreters/lolcode/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/lolcode/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }:
+{ lib, stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "lolcode";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake doxygen ];
+  nativeBuildInputs = [ pkg-config cmake doxygen ];
   buildInputs = [ readline ];
 
   # Maybe it clashes with lci scientific logic software package...
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/interpreters/love/0.10.nix b/nixpkgs/pkgs/development/interpreters/love/0.10.nix
index dbe3f6fa2df0..ed002d99fbbe 100644
--- a/nixpkgs/pkgs/development/interpreters/love/0.10.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
+{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
   libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
   libtheora, which, autoconf, automake, libtool
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
     libvorbis libogg libtheora autoconf which libtool automake
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    license = lib.licenses.zlib;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/love/0.7.nix b/nixpkgs/pkgs/development/interpreters/love/0.7.nix
index 6f09c0764412..6cba19bff0f1 100644
--- a/nixpkgs/pkgs/development/interpreters/love/0.7.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , SDL, libGLU, libGL, openal, lua
 , libdevil, freetype, physfs
 , libmodplug, mpg123, libvorbis, libogg
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696)
   patches = [ ./0.7-gl-prototypes.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     SDL libGLU libGL openal lua
     libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/love/0.8.nix b/nixpkgs/pkgs/development/interpreters/love/0.8.nix
index 3a6c385ee5fc..8bad501170db 100644
--- a/nixpkgs/pkgs/development/interpreters/love/0.8.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , SDL, libGLU, libGL, openal, lua
 , libdevil, freetype, physfs
 , libmodplug, mpg123, libvorbis, libogg
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     SDL libGLU libGL openal lua
     libdevil freetype physfs libmodplug mpg123 libvorbis libogg
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/love/0.9.nix b/nixpkgs/pkgs/development/interpreters/love/0.9.nix
index 79b83f0643f1..b7e20498a39c 100644
--- a/nixpkgs/pkgs/development/interpreters/love/0.9.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , SDL2, libGLU, libGL, openal, luajit
 , libdevil, freetype, physfs
 , libmodplug, mpg123, libvorbis, libogg
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     SDL2 libGLU libGL openal luajit
     libdevil freetype physfs libmodplug mpg123 libvorbis libogg
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/love/11.1.nix b/nixpkgs/pkgs/development/interpreters/love/11.1.nix
index 2ef3a4ca05a4..bf76547a07a7 100644
--- a/nixpkgs/pkgs/development/interpreters/love/11.1.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/11.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
+{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
   libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
   libtheora, which, autoconf, automake, libtool
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
     libvorbis libogg libtheora autoconf which libtool automake
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    license = lib.licenses.zlib;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 98a98c0dd348..74f5b2b7b395 100644
--- a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -207,7 +207,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
 
   postFixup = lib.optionalString (!dontWrapLuaPrograms) ''
     wrapLuaPrograms
-  '' + attrs.postFixup or '''';
+  '' + attrs.postFixup or "";
 
   installPhase = attrs.installPhase or ''
     runHook preInstall
diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix
index d78d5ba0c2df..3a52d58ffaba 100644
--- a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix
@@ -40,7 +40,7 @@ in rec {
       sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
     '';
 
-    postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    postBuild = lib.optionalString (!stdenv.isDarwin) ''
       ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so )
     '';
   };
diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix
index a3e633bbab17..d4e68b5cb762 100644
--- a/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://github.com/keplerproject/luafilesystem";
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix
index 98e4684e0921..35a074add097 100644
--- a/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline
+{ lib, stdenv, fetchurl, readline
 , compat ? false
 , callPackage
 , packageOverrides ? (self: super: {})
@@ -50,7 +50,7 @@ self = stdenv.mkDerivation rec {
     runHook preConfigure
 
     makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" )
-    makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
+    makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
 
     installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \
       TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" )
@@ -83,7 +83,9 @@ self = stdenv.mkDerivation rec {
     Libs: -L$out/lib -llua -lm
     Cflags: -I$out/include
     EOF
+    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc"
     ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
+    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc"
   '';
 
   passthru = rec {
@@ -107,8 +109,8 @@ self = stdenv.mkDerivation rec {
       management with incremental garbage collection, making it ideal
       for configuration, scripting, and rapid prototyping.
     '';
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 };
 in self
diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix b/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix
index 73fbbc3e66a6..d16f068883ac 100644
--- a/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://w3.impa.br/~diego/software/luasocket/";
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix
index 53ec2baeb5e5..0459b67534d4 100644
--- a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lua, buildEnv, makeWrapper
+{ lib, stdenv, lua, buildEnv, makeWrapper
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
@@ -28,7 +28,7 @@ let
       addToLuaPath "$out"
 
       # take every binary from lua packages and put them into the env
-      for path in ${stdenv.lib.concatStringsSep " " paths}; do
+      for path in ${lib.concatStringsSep " " paths}; do
         nix_debug "looking for binaries in path = $path"
         if [ -d "$path/bin" ]; then
           cd "$path/bin"
@@ -37,7 +37,7 @@ let
               rm -f "$out/bin/$prg"
               if [ -x "$prg" ]; then
                 nix_debug "Making wrapper $prg"
-                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH"   --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH"   --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs}
               fi
             fi
           done
diff --git a/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/nixpkgs/pkgs/development/interpreters/luajit/default.nix
index e0e15ca32750..860642b0fd2f 100644
--- a/nixpkgs/pkgs/development/interpreters/luajit/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/luajit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPackages
+{ lib, stdenv, fetchFromGitHub, buildPackages
 , name ? "luajit-${version}"
 , isStable
 , sha256
@@ -26,7 +26,7 @@ assert enableValgrindSupport -> valgrind != null;
 let
   luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
 
-  XCFLAGS = with stdenv.lib;
+  XCFLAGS = with lib;
      optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
   ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
   ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = false;
 
-  buildInputs = stdenv.lib.optional enableValgrindSupport valgrind;
+  buildInputs = lib.optional enableValgrindSupport valgrind;
 
   buildFlags = [
     "amalg" # Build highly optimized version
@@ -70,14 +70,14 @@ stdenv.mkDerivation rec {
     "CROSS=${stdenv.cc.targetPrefix}"
     # TODO: when pointer size differs, we would need e.g. -m32
     "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
-  ] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
+  ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
   enableParallelBuilding = true;
   NIX_CFLAGS_COMPILE = XCFLAGS;
 
   postInstall = ''
     ( cd "$out/include"; ln -s luajit-*/* . )
     ln -s "$out"/bin/luajit-* "$out"/bin/lua
-  '' + stdenv.lib.optionalString (!isStable) ''
+  '' + lib.optionalString (!isStable) ''
     ln -s "$out"/bin/luajit-* "$out"/bin/luajit
   '';
 
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     interpreter = "${self}/bin/lua";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance JIT compiler for Lua 5.1";
     homepage    = "http://luajit.org";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/interpreters/lush/default.nix b/nixpkgs/pkgs/development/interpreters/lush/default.nix
index a8db08e87a2c..fe51d154956a 100644
--- a/nixpkgs/pkgs/development/interpreters/lush/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/lush/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
+{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
 , blas, libbfd, intltool, gettext, zlib, libSM}:
 
 stdenv.mkDerivation rec {
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lisp Universal SHell";
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/maude/default.nix b/nixpkgs/pkgs/development/interpreters/maude/default.nix
index e4e984fc4ac6..6dcb697d7639 100644
--- a/nixpkgs/pkgs/development/interpreters/maude/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/maude/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
+{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
 , libsigsegv, gmpxx, cln, yices
 }:
 
 let
 
-  version = "3.0";
+  version = "3.1";
 
   fullMaude = fetchurl {
-    url = "http://maude.cs.illinois.edu/w/images/0/04/Full-Maude-${version}.zip";
-    sha256 = "0gf36wlkkl343vlxgryqdhxmgyn8z0cc2zayccd7ac3inmj1iayw";
+    url = "http://maude.cs.illinois.edu/w/images/0/0a/Full-Maude-${version}.zip";
+    sha256 = "8b13af02c6243116c2ef9592622ecaa06d05dbe1dd6b1e595551ff33855948f2";
   };
 
 in
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    url = "http://maude.cs.illinois.edu/w/images/9/92/Maude-${version}.tar.gz";
-    sha256 = "0vhn3lsck6ji9skrgm67hqrn3k4f6y442q73jbw65qqznm321k5a";
+    url = "http://maude.cs.illinois.edu/w/images/d/d3/Maude-${version}.tar.gz";
+    sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
   };
 
   buildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   ];
 
   hardeningDisable = [ "stackprotector" ] ++
-    stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ];
+    lib.optionals stdenv.isi686 [ "pic" "fortify" ];
 
   preConfigure = ''
     configureFlagsArray=(
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   postInstall = ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
     unzip ${fullMaude}
-    install -D -m 444 full-maude3.maude $out/share/maude/full-maude.maude
+    install -D -m 444 full-maude31.maude $out/share/maude/full-maude.maude
   '';
 
   # bison -dv surface.yy -o surface.c
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://maude.cs.illinois.edu/";
     description = "High-level specification language";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     longDescription = ''
       Maude is a high-performance reflective language and system
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
       rewriting logic computation.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.peti ];
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/nixpkgs/pkgs/development/interpreters/metamath/default.nix
index cccb7434797a..34591c4c84b8 100644
--- a/nixpkgs/pkgs/development/interpreters/metamath/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/metamath/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
-stdenv.mkDerivation {
+let
+  version = "0.194";
+in stdenv.mkDerivation {
   pname = "metamath";
-  version = "0.193";
+  inherit version;
 
   buildInputs = [ autoreconfHook ];
 
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6";
-    sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b";
+    rev = "v${version}";
+    sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interpreter for the metamath proof language";
     longDescription = ''
       The metamath program is an ASCII-based ANSI C program with a command-line
@@ -23,7 +25,7 @@ stdenv.mkDerivation {
     '';
     homepage = "http://us.metamath.org";
     downloadPage = "http://us.metamath.org/#downloads";
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
     maintainers = [ maintainers.taneb ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/nixpkgs/pkgs/development/interpreters/micropython/default.nix
index 8d5a0252944a..0441e48685ea 100644
--- a/nixpkgs/pkgs/development/interpreters/micropython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/micropython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }:
+{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }:
 
 stdenv.mkDerivation rec {
   pname = "micropython";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ pkgconfig python3 ];
+  nativeBuildInputs = [ pkg-config python3 ];
 
   buildInputs = [ libffi readline ];
 
diff --git a/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/nixpkgs/pkgs/development/interpreters/mujs/default.nix
index 692aed3e4ee6..5e600a92fb77 100644
--- a/nixpkgs/pkgs/development/interpreters/mujs/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/mujs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline }:
+{ lib, stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
   pname = "mujs";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://mujs.com/";
     description = "A lightweight, embeddable Javascript interpreter";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix b/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix
index 0c976f2f0b05..c2a3fa2c7749 100644
--- a/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, nix, git }: let
+{ lib, stdenv, fetchurl, pkg-config, nix, git }: let
   version = "4.1.6";
 in stdenv.mkDerivation {
   pname = "nix-exec";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
     sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ nix git ];
 
   NIX_CFLAGS_COMPILE = "-std=c++1y";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
   meta = {
     description = "Run programs defined in nix expressions";
     homepage = "https://github.com/shlevy/nix-exec";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = nix.meta.platforms;
     broken = true;
   };
diff --git a/nixpkgs/pkgs/development/interpreters/octave/default.nix b/nixpkgs/pkgs/development/interpreters/octave/default.nix
index 67fca52dad51..6ad25d24eae6 100644
--- a/nixpkgs/pkgs/development/interpreters/octave/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/octave/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 # Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation
 # with wrapQtAppsHook (comes from libsForQt5.callPackage)
 , mkDerivation
@@ -14,7 +15,7 @@
 , libX11
 , graphicsmagick
 , pcre
-, pkgconfig
+, pkg-config
 , libGL
 , libGLU
 , fltk
@@ -124,37 +125,37 @@ in mkDerivation rec {
     libwebp
     gl2ps
   ]
-  ++ stdenv.lib.optionals enableQt [
+  ++ lib.optionals enableQt [
     qtbase
     qtsvg
     qscintilla
   ]
-  ++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ]
-  ++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ]
-  ++ stdenv.lib.optionals (glpk != null) [ glpk ]
-  ++ stdenv.lib.optionals (suitesparse != null) [ suitesparse' ]
-  ++ stdenv.lib.optionals (enableJava) [ jdk ]
-  ++ stdenv.lib.optionals (sundials != null) [ sundials ]
-  ++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ]
-  ++ stdenv.lib.optionals (python != null) [ python ]
-  ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals (ghostscript != null) [ ghostscript ]
+  ++ lib.optionals (hdf5 != null) [ hdf5 ]
+  ++ lib.optionals (glpk != null) [ glpk ]
+  ++ lib.optionals (suitesparse != null) [ suitesparse' ]
+  ++ lib.optionals (enableJava) [ jdk ]
+  ++ lib.optionals (sundials != null) [ sundials ]
+  ++ lib.optionals (gnuplot != null) [ gnuplot ]
+  ++ lib.optionals (python != null) [ python ]
+  ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
+  ++ lib.optionals stdenv.isDarwin [
     libiconv
     darwin.apple_sdk.frameworks.Accelerate
     darwin.apple_sdk.frameworks.Cocoa
   ]
   ;
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     gfortran
     # Listed here as well because it's outputs are split
     fftw
     fftwSinglePrec
     texinfo
   ]
-  ++ stdenv.lib.optionals (sundials != null) [ sundials ]
-  ++ stdenv.lib.optionals enableJIT [ llvm ]
-  ++ stdenv.lib.optionals enableQt [
+  ++ lib.optionals (sundials != null) [ sundials ]
+  ++ lib.optionals enableJIT [ llvm ]
+  ++ lib.optionals enableQt [
     qtscript
     qttools
   ]
@@ -172,11 +173,11 @@ in mkDerivation rec {
     "--with-lapack=lapack"
     (if use64BitIdx then "--enable-64" else "--disable-64")
   ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ]
-    ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
-    ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ]
-    ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ]
+    ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ]
+    ++ lib.optionals enableReadline [ "--enable-readline" ]
+    ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ]
+    ++ lib.optionals enableQt [ "--with-qt=5" ]
+    ++ lib.optionals enableJIT [ "--enable-jit" ]
   ;
 
   # Keep a copy of the octave tests detailed results in the output
@@ -198,13 +199,13 @@ in mkDerivation rec {
 
   meta = {
     homepage = "https://www.gnu.org/software/octave/";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ raskin doronbehar ];
     description = "Scientific Pragramming Language";
     # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
     broken = enableJIT;
     platforms = if overridePlatforms == null then
-      (with stdenv.lib; platforms.linux ++ platforms.darwin)
+      (lib.platforms.linux ++ lib.platforms.darwin)
     else overridePlatforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix
index 6b7d1d4d99cc..75fe1bac8cb4 100644
--- a/nixpkgs/pkgs/development/interpreters/perl/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix
@@ -39,12 +39,6 @@ let
         (if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch
          else ./no-sys-dirs-5.31.patch)
       ]
-      ++ optional (versionOlder version "5.29.6")
-        # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360
-        (fetchurl {
-          url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch";
-          sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0";
-        })
       ++ optional stdenv.isSunOS ./ld-shared.patch
       ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
       ++ optional crossCompiling ./MakeMaker-cross.patch;
@@ -174,11 +168,11 @@ let
       priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
     };
   } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
-    crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020
+    crossVersion = "4c55233ae95a6aef4d93291fe8ad12709b11e575"; # Jan 21, 2021
 
     perl-cross-src = fetchurl {
       url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
-      sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb";
+      sha256 = "04bxn43ir7b4c2bb1z1l71l93hrysjv00h879nm70m99q6vxq2hc";
     };
 
     depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -214,7 +208,7 @@ in {
   perldevel = common {
     perl = pkgs.perldevel;
     buildPerl = buildPackages.perldevel;
-    version = "5.33.5";
-    sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr";
+    version = "5.33.6";
+    sha256 = "1fx6b2q7wzd0xwy7qkmkvd5bdm09d3zfnynrb6afl9ghd8ww56fv";
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
index 2e3d394f8515..865d8fde9eac 100644
--- a/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
+++ b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, buildEnv, makeWrapper
+{ lib, stdenv, perl, buildEnv, makeWrapper
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
@@ -28,7 +28,7 @@ let
       mkdir -p "$out/bin"
 
       # take every binary from perl packages and put them into the env
-      for path in ${stdenv.lib.concatStringsSep " " paths}; do
+      for path in ${lib.concatStringsSep " " paths}; do
         if [ -d "$path/bin" ]; then
           cd "$path/bin"
           for prg in *; do
diff --git a/nixpkgs/pkgs/development/interpreters/php/7.3.nix b/nixpkgs/pkgs/development/interpreters/php/7.3.nix
index 30e26bf87a1b..13b64e8cb6e2 100644
--- a/nixpkgs/pkgs/development/interpreters/php/7.3.nix
+++ b/nixpkgs/pkgs/development/interpreters/php/7.3.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "7.3.25";
-    sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9";
+    version = "7.3.26";
+    sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
diff --git a/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/nixpkgs/pkgs/development/interpreters/php/7.4.nix
index b45da1fb86cb..9ee0c9c9e7cc 100644
--- a/nixpkgs/pkgs/development/interpreters/php/7.4.nix
+++ b/nixpkgs/pkgs/development/interpreters/php/7.4.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "7.4.13";
-    sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm";
+    version = "7.4.14";
+    sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8";
   });
 
 in base.withExtensions ({ all, ... }: with all; ([
diff --git a/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/nixpkgs/pkgs/development/interpreters/php/8.0.nix
index ded661e55853..5779c836dd4f 100644
--- a/nixpkgs/pkgs/development/interpreters/php/8.0.nix
+++ b/nixpkgs/pkgs/development/interpreters/php/8.0.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "8.0.0";
-    sha256 = "02cx3gvxqvkllp54jfvs83kl8bmpcqyzp9jf1d0l9x5bgv1jv0sy";
+    version = "8.0.1";
+    sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4";
   });
 
 in base.withExtensions ({ all, ... }: with all; ([
diff --git a/nixpkgs/pkgs/development/interpreters/php/fix-opcache-configure.patch b/nixpkgs/pkgs/development/interpreters/php/fix-opcache-configure.patch
deleted file mode 100644
index e67d2cc7bc79..000000000000
--- a/nixpkgs/pkgs/development/interpreters/php/fix-opcache-configure.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
-index 726188597496..781e51d3e44c 100644
---- a/Zend/Zend.m4
-+++ b/Zend/Zend.m4
-@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS
- dnl
- AC_DEFUN([LIBZEND_OTHER_CHECKS],[
- 
--AC_ARG_ENABLE([zts],
--  [AS_HELP_STRING([--enable-zts],
--    [Enable thread safety])],
--  [ZEND_ZTS=$enableval],
--  [ZEND_ZTS=no])
--
- AC_MSG_CHECKING(whether to enable thread-safety)
- AC_MSG_RESULT($ZEND_ZTS)
- 
-diff --git a/configure.ac b/configure.ac
-index 8d6e922fa9bf..e07a75d19ac7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then
-   ZEND_DEBUG=yes
- fi
- 
-+AC_ARG_ENABLE([zts],
-+  [AS_HELP_STRING([--enable-zts],
-+    [Enable thread safety])],
-+  [ZEND_ZTS=$enableval],
-+  [ZEND_ZTS=no])
-+
-+if test "$ZEND_ZTS" = "yes"; then
-+  AC_DEFINE(ZTS, 1,[ ])
-+  PHP_THREAD_SAFETY=yes
-+else
-+  PHP_THREAD_SAFETY=no
-+fi
-+
- PHP_ARG_ENABLE([rtld-now],
-   [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY],
-   [AS_HELP_STRING([--enable-rtld-now],
-@@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS
- LIBZEND_DLSYM_CHECK
- LIBZEND_OTHER_CHECKS
- 
--if test "$ZEND_ZTS" = "yes"; then
--  AC_DEFINE(ZTS,1,[ ])
--  PHP_THREAD_SAFETY=yes
--else
--  PHP_THREAD_SAFETY=no
--fi
--
- INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
- INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
- 
-diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
-index 054cd28c0247..93d72fb73d19 100644
---- a/ext/opcache/config.m4
-+++ b/ext/opcache/config.m4
-@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then
-       esac
-     fi
- 
--    if test "$enable_zts" = "yes"; then
-+    if test "$PHP_THREAD_SAFETY" = "yes"; then
-       DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
-     fi
- 
-diff --git a/ext/session/config.m4 b/ext/session/config.m4
-index 7abc8813b72a..da31bbde86cc 100644
---- a/ext/session/config.m4
-+++ b/ext/session/config.m4
-@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then
-     AC_MSG_ERROR(cannot find mm library)
-   fi
- 
--  if test "$enable_zts" = "yes"; then
-+  if test "$PHP_THREAD_SAFETY" = "yes"; then
-     dnl The mm library is not thread-safe, and mod_mm.c refuses to compile.
-     AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts)
-   fi
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/interpreters/php/generic.nix b/nixpkgs/pkgs/development/interpreters/php/generic.nix
index 82134e14406f..191d589aa90c 100644
--- a/nixpkgs/pkgs/development/interpreters/php/generic.nix
+++ b/nixpkgs/pkgs/development/interpreters/php/generic.nix
@@ -7,7 +7,7 @@ let
   generic =
     { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper
     , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool
-    , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
+    , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
     , systemd, system-sendmail, valgrind, xcbuild
 
     , version
@@ -149,7 +149,7 @@ let
 
           enableParallelBuilding = true;
 
-          nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]
+          nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ]
             ++ lib.optional stdenv.isDarwin xcbuild;
 
           buildInputs =
@@ -269,7 +269,7 @@ let
             inherit ztsSupport;
           };
 
-          meta = with stdenv.lib; {
+          meta = with lib; {
             description = "An HTML-embedded scripting language";
             homepage = "https://www.php.net/";
             license = licenses.php301;
diff --git a/nixpkgs/pkgs/development/interpreters/picoc/default.nix b/nixpkgs/pkgs/development/interpreters/picoc/default.nix
index f7343f6e4d60..2c674754935c 100644
--- a/nixpkgs/pkgs/development/interpreters/picoc/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/picoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, readline }:
+{ lib, stdenv, fetchFromGitHub, readline }:
 
 stdenv.mkDerivation rec {
   pname = "picoc";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     install -m644 *.h $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Very small C interpreter for scripting";
     longDescription = ''
       PicoC is a very small C interpreter for scripting. It was originally
diff --git a/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
index 1511698c9215..341797fa3f4c 100644
--- a/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
-with stdenv.lib;
+{ lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "picoLisp";
diff --git a/nixpkgs/pkgs/development/interpreters/pixie/default.nix b/nixpkgs/pkgs/development/interpreters/pixie/default.nix
index 9b57e153aa05..ca55eceaedbf 100644
--- a/nixpkgs/pkgs/development/interpreters/pixie/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/pixie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc,
+{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
   pypy, libffi, libedit, libuv, boost, zlib,
   variant ? "jit", buildWithPypy ? false }:
 
@@ -23,16 +23,16 @@ let
     sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";
   };
   libs = [ libffi libedit libuv boost.dev boost.out zlib ];
-  include-path = stdenv.lib.concatStringsSep ":"
+  include-path = lib.concatStringsSep ":"
                    (map (p: "${p}/include") libs);
-  library-path = stdenv.lib.concatStringsSep ":"
+  library-path = lib.concatStringsSep ":"
                    (map (p: "${p}/lib") libs);
-  bin-path = stdenv.lib.concatStringsSep ":"
+  bin-path = lib.concatStringsSep ":"
                (map (p: "${p}/bin") [ gcc ]);
   build = {flags, target}: stdenv.mkDerivation rec {
     pname = "pixie";
     version = "0-r${commit-count}-${variant}";
-    nativeBuildInputs = [ makeWrapper pkgconfig ];
+    nativeBuildInputs = [ makeWrapper pkg-config ];
     buildInputs = libs;
     PYTHON = if buildWithPypy
       then "${pypy}/pypy-c/pypy-c"
@@ -85,9 +85,9 @@ let
     meta = {
       description = "A clojure-like lisp, built with the pypy vm toolkit";
       homepage = "https://github.com/pixie-lang/pixie";
-      license = stdenv.lib.licenses.lgpl3;
+      license = lib.licenses.lgpl3;
       platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
-      maintainers = with stdenv.lib.maintainers; [ bendlas ];
+      maintainers = with lib.maintainers; [ bendlas ];
     };
   };
 in build (builtins.getAttr variant variants)
diff --git a/nixpkgs/pkgs/development/interpreters/pixie/dust.nix b/nixpkgs/pkgs/development/interpreters/pixie/dust.nix
index 4a7f3423defd..e6818cb03ed2 100644
--- a/nixpkgs/pkgs/development/interpreters/pixie/dust.nix
+++ b/nixpkgs/pkgs/development/interpreters/pixie/dust.nix
@@ -1,4 +1,4 @@
-{ stdenv, pixie, fetchFromGitHub }:
+{ lib, stdenv, pixie, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "dust-0-91";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
     homepage = src.meta.homepage;
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix b/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix
index 8ebbf6cf5012..2d4acbd398ea 100644
--- a/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
+{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
 
 let
   sexpr_wasm_prototype = stdenv.mkDerivation {
@@ -14,7 +14,8 @@ let
       # set this to nonempty string to disable default cmake configure
     '';
 
-    buildInputs = [ cmake clang python ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ clang python ];
 
     buildPhase = "make clang-debug-no-tests";
 
@@ -50,7 +51,7 @@ stdenv.mkDerivation {
     make install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "wasm runs WebAssembly from the command line";
     maintainers = with maintainers; [ proglodyte ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix
index 40eb1daf49c8..668adf2c44a2 100644
--- a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ lib, stdenv, fetchurl, python2Packages }:
 
 let version = "0.9.5.1.1"; in
 
@@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
   meta = {
     homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
     description = "A language for writing Python extension modules";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix
index e518edba1b39..2c4c74baecf1 100644
--- a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ lib, stdenv, fetchurl, python2Packages }:
 
 let version = "0.9.6.4"; in
 
@@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
   meta = {
     homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
     description = "A language for writing Python extension modules";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
index e6ab1f218795..85af394e3f65 100644
--- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , bzip2
 , expat
 , libffi
@@ -36,7 +36,7 @@ assert x11Support -> tcl != null
                   && xlibsWrapper != null
                   && libX11 != null;
 
-with stdenv.lib;
+with lib;
 
 let
   buildPackages = pkgsBuildHost;
@@ -114,6 +114,9 @@ let
       # libuuid, slowing down program startup a lot).
       ./no-ldconfig.patch
 
+      # Fix ctypes.util.find_library with gcc10.
+      ./find_library-gcc10.patch
+
     ] ++ optionals stdenv.hostPlatform.isCygwin [
       ./2.5.2-ctypes-util-find_library.patch
       ./2.5.2-tkinter-x11.patch
@@ -212,7 +215,7 @@ let
   };
 
   # Python 2.7 needs this
-  crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
+  crossCompileEnv = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
                       { _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; };
 
   # Build the basic Python interpreter without modules that have
@@ -224,7 +227,7 @@ in with passthru; stdenv.mkDerivation ({
 
     inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags;
 
-    LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+    LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
     inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"
@@ -295,9 +298,9 @@ in with passthru; stdenv.mkDerivation ({
         hierarchical packages; exception-based error handling; and very
         high level dynamic data types.
       '';
-      license = stdenv.lib.licenses.psfl;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ fridh ];
+      license = lib.licenses.psfl;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers; [ fridh ];
       # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2`
       # in case both 2 and 3 are installed.
       priority = -100;
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch
new file mode 100644
index 000000000000..4627baf119c1
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch
@@ -0,0 +1,79 @@
+Backport https://github.com/python/cpython/commit/82df3b3071bb003247c33eac4670775e9883c994
+and https://github.com/python/cpython/commit/27ac19cca2c639caaf6fedf3632fe6beb265f24f
+
+Fixes the check phase of python2Packages.cffi.
+
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -87,6 +87,12 @@ elif os.name == "posix":
+     # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
+     import re, tempfile, errno
+ 
++    def _is_elf(filename):
++        "Return True if the given file is an ELF file"
++        elf_header = b'\x7fELF'
++        with open(filename, 'rb') as thefile:
++            return thefile.read(4) == elf_header
++
+     def _findLib_gcc(name):
+         # Run GCC's linker with the -t (aka --trace) option and examine the
+         # library name it prints out. The GCC command will fail because we
+@@ -110,10 +116,17 @@ elif os.name == "posix":
+                 # the normal behaviour of GCC if linking fails
+                 if e.errno != errno.ENOENT:
+                     raise
+-        res = re.search(expr, trace)
++        res = re.findall(expr, trace)
+         if not res:
+             return None
+-        return res.group(0)
++
++        for file in res:
++            # Check if the given file is an elf file: gcc can report
++            # some files that are linker scripts and not actual
++            # shared objects. See bpo-41976 for more details
++            if not _is_elf(file):
++                continue
++            return file
+ 
+ 
+     if sys.platform == "sunos5":
+@@ -237,8 +250,37 @@ elif os.name == "posix":
+         def _findSoname_ldconfig(name):
+             return None
+ 
++        def _findLib_ld(name):
++            # See issue #9998 for why this is needed
++            expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
++            cmd = ['ld', '-t']
++            libpath = os.environ.get('LD_LIBRARY_PATH')
++            if libpath:
++                for d in libpath.split(':'):
++                    cmd.extend(['-L', d])
++            cmd.extend(['-o', os.devnull, '-l%s' % name])
++            result = None
++            try:
++                p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
++                                     stderr=subprocess.PIPE,
++                                     universal_newlines=True)
++                out, _ = p.communicate()
++                res = re.findall(expr, out)
++                for file in res:
++                    # Check if the given file is an elf file: gcc can report
++                    # some files that are linker scripts and not actual
++                    # shared objects. See bpo-41976 for more details
++                    if not _is_elf(file):
++                        continue
++                    return file
++            except Exception:
++                pass  # result will be None
++            return result
++
+         def find_library(name):
+-            return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
++            # See issue #9998
++            return _findSoname_ldconfig(name) or \
++                   _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name))
+ 
+ ################################################################
+ # test code
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch
new file mode 100644
index 000000000000..d324d10b39fc
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch
@@ -0,0 +1,54 @@
+From 45dfbbb4f5b67ab83e4365564ea569334e979f8e Mon Sep 17 00:00:00 2001
+From: Ben Wolsieffer <benwolsieffer@gmail.com>
+Date: Fri, 25 Sep 2020 16:49:16 -0400
+Subject: [PATCH] Fix finding headers when cross compiling
+
+When cross-compiling third-party extensions, get_python_inc() may be called to
+return the path to Python's headers. However, it uses the sys.prefix or
+sys.exec_prefix of the build Python, which returns incorrect paths when
+cross-compiling (paths pointing to build system headers).
+
+To fix this, we use the INCLUDEPY and CONFINCLUDEPY conf variables, which can
+be configured to point at host Python by setting _PYTHON_SYSCONFIGDATA_NAME.
+The existing behavior is maintained on non-POSIX platforms or if a prefix is
+manually specified.
+---
+ Lib/distutils/sysconfig.py | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index 2bcd1dd288..567375e488 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -84,8 +84,6 @@ def get_python_inc(plat_specific=0, prefix=None):
+     If 'prefix' is supplied, use it instead of sys.base_prefix or
+     sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
+     """
+-    if prefix is None:
+-        prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+     if os.name == "posix":
+         if python_build:
+             # Assume the executable is in the build directory.  The
+@@ -98,9 +96,17 @@ def get_python_inc(plat_specific=0, prefix=None):
+             else:
+                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                 return os.path.normpath(incdir)
+-        python_dir = 'python' + get_python_version() + build_flags
+-        return os.path.join(prefix, "include", python_dir)
++        if prefix is None:
++          if plat_specific:
++            return get_config_var('CONFINCLUDEPY')
++          else:
++            return get_config_var('INCLUDEPY')
++        else:
++          python_dir = 'python' + get_python_version() + build_flags
++          return os.path.join(prefix, "include", python_dir)
+     elif os.name == "nt":
++        if prefix is None:
++          prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+         return os.path.join(prefix, "include")
+     else:
+         raise DistutilsPlatformError(
+-- 
+2.28.0
+
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch
new file mode 100644
index 000000000000..543e267e94bf
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch
@@ -0,0 +1,54 @@
+From debccd4be0a8d619770f63622d9de1b451dd02ac Mon Sep 17 00:00:00 2001
+From: Ben Wolsieffer <benwolsieffer@gmail.com>
+Date: Fri, 25 Sep 2020 16:49:16 -0400
+Subject: [PATCH] Fix finding headers when cross compiling
+
+When cross-compiling third-party extensions, get_python_inc() may be called to
+return the path to Python's headers. However, it uses the sys.prefix or
+sys.exec_prefix of the build Python, which returns incorrect paths when
+cross-compiling (paths pointing to build system headers).
+
+To fix this, we use the INCLUDEPY and CONFINCLUDEPY conf variables, which can
+be configured to point at host Python by setting _PYTHON_SYSCONFIGDATA_NAME.
+The existing behavior is maintained on non-POSIX platforms or if a prefix is
+manually specified.
+---
+ Lib/distutils/sysconfig.py | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index 37feae5df7..6d4ad06696 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -95,8 +95,6 @@ def get_python_inc(plat_specific=0, prefix=None):
+     If 'prefix' is supplied, use it instead of sys.base_prefix or
+     sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
+     """
+-    if prefix is None:
+-        prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+     if os.name == "posix":
+         if python_build:
+             # Assume the executable is in the build directory.  The
+@@ -109,9 +107,17 @@ def get_python_inc(plat_specific=0, prefix=None):
+             else:
+                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                 return os.path.normpath(incdir)
+-        python_dir = 'python' + get_python_version() + build_flags
+-        return os.path.join(prefix, "include", python_dir)
++        if prefix is None:
++          if plat_specific:
++            return get_config_var('CONFINCLUDEPY')
++          else:
++            return get_config_var('INCLUDEPY')
++        else:
++          python_dir = 'python' + get_python_version() + build_flags
++          return os.path.join(prefix, "include", python_dir)
+     elif os.name == "nt":
++        if prefix is None:
++          prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+         if python_build:
+             # Include both the include and PC dir to ensure we can find
+             # pyconfig.h
+-- 
+2.28.0
+
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
index a1f9d68eb166..41d3ab52345b 100644
--- a/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
@@ -1,19 +1,19 @@
-From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Mon, 28 Aug 2017 09:24:06 +0200
+From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
+From: Greg Roodt <greg@canva.com>
+Date: Wed, 9 Dec 2020 17:59:24 +1100
 Subject: [PATCH] Don't use ldconfig
 
 ---
- Lib/ctypes/util.py | 70 ++----------------------------------------------------
- 1 file changed, 2 insertions(+), 68 deletions(-)
+ Lib/ctypes/util.py | 77 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 75 deletions(-)
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 5e8b31a854..7b45ce6c15 100644
+index 0c2510e161..7fb98af308 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -94,46 +94,7 @@ elif os.name == "posix":
-     import re, tempfile
- 
+@@ -100,53 +100,7 @@ elif os.name == "posix":
+             return thefile.read(4) == elf_header
+
      def _findLib_gcc(name):
 -        # Run GCC's linker with the -t (aka --trace) option and examine the
 -        # library name it prints out. The GCC command will fail because we
@@ -51,17 +51,24 @@ index 5e8b31a854..7b45ce6c15 100644
 -                # Raised if the file was already removed, which is the normal
 -                # behaviour of GCC if linking fails
 -                pass
--        res = re.search(expr, trace)
+-        res = re.findall(expr, trace)
 -        if not res:
 -            return None
--        return os.fsdecode(res.group(0))
+-
+-        for file in res:
+-            # Check if the given file is an elf file: gcc can report
+-            # some files that are linker scripts and not actual
+-            # shared objects. See bpo-41976 for more details
+-            if not _is_elf(file):
+-                continue
+-            return os.fsdecode(file)
 +        return None
- 
- 
+
+
      if sys.platform == "sunos5":
-@@ -255,34 +216,7 @@ elif os.name == "posix":
+@@ -268,34 +222,7 @@ elif os.name == "posix":
      else:
- 
+
          def _findSoname_ldconfig(name):
 -            import struct
 -            if struct.calcsize('l') == 4:
@@ -92,9 +99,8 @@ index 5e8b31a854..7b45ce6c15 100644
 -            except OSError:
 -                pass
 +            return None
- 
+
          def _findLib_ld(name):
              # See issue #9998 for why this is needed
--- 
-2.15.0
-
+--
+2.24.3 (Apple Git-128)
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
index f62a0b0bfe13..7bc6084f61dd 100644
--- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , bzip2
 , expat
 , libffi
@@ -35,7 +35,7 @@
 , rebuildBytecode ? true
 , stripBytecode ? false
 , includeSiteCustomize ? true
-, static ? false
+, static ? stdenv.hostPlatform.isStatic
 # Not using optimizations on Darwin
 # configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.
 , enableOptimizations ? (!stdenv.isDarwin)
@@ -54,7 +54,7 @@ assert x11Support -> tcl != null
 
 assert bluezSupport -> bluez != null;
 
-with stdenv.lib;
+with lib;
 
 let
   buildPackages = pkgsBuildHost;
@@ -100,6 +100,56 @@ let
     "$out/bin/python"
   else pythonForBuild.interpreter;
 
+  # The CPython interpreter contains a _sysconfigdata_<platform specific suffix>
+  # module that is imported by the sysconfig and distutils.sysconfig modules.
+  # The sysconfigdata module is generated at build time and contains settings
+  # required for building Python extension modules, such as include paths and
+  # other compiler flags. By default, the sysconfigdata module is loaded from
+  # the currently running interpreter (ie. the build platform interpreter), but
+  # when cross-compiling we want to load it from the host platform interpreter.
+  # This can be done using the _PYTHON_SYSCONFIGDATA_NAME environment variable.
+  # The _PYTHON_HOST_PLATFORM variable also needs to be set to get the correct
+  # platform suffix on extension modules. The correct values for these variables
+  # are not documented, and must be derived from the configure script (see links
+  # below).
+  sysconfigdataHook = with stdenv.hostPlatform; with passthru; let
+    # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428
+    # The configure script uses "arm" as the CPU name for all 32-bit ARM
+    # variants when cross-compiling, but native builds include the version
+    # suffix, so we do the same.
+    pythonHostPlatform = "${parsed.kernel.name}-${parsed.cpu.name}";
+
+    # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724
+    multiarchCpu =
+      if isAarch32 then
+        if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb"
+      else if isx86_32 then "i386"
+      else parsed.cpu.name;
+    pythonAbiName =
+      # python's build doesn't differentiate between musl and glibc in its
+      # abi detection, our wrapper should match.
+      if stdenv.hostPlatform.isMusl then
+        replaceStrings [ "musl" ] [ "gnu" ] parsed.abi.name
+        else parsed.abi.name;
+    multiarch =
+      if isDarwin then "darwin"
+      else "${multiarchCpu}-${parsed.kernel.name}-${pythonAbiName}";
+
+    abiFlags = optionalString (isPy36 || isPy37) "m";
+
+    # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78
+    pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${parsed.kernel.name}_${multiarch}";
+  in ''
+    sysconfigdataHook() {
+      if [ "$1" = '${placeholder "out"}' ]; then
+        export _PYTHON_HOST_PLATFORM='${pythonHostPlatform}'
+        export _PYTHON_SYSCONFIGDATA_NAME='${pythonSysconfigdataName}'
+      fi
+    }
+
+    addEnvHooks "$hostOffset" sysconfigdataHook
+  '';
+
 in with passthru; stdenv.mkDerivation {
   pname = "python3";
   inherit version;
@@ -165,7 +215,14 @@ in with passthru; stdenv.mkDerivation {
   ] ++ [
     # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules.
     ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
-  ] ++ optionals (isPy36 || isPy37 || isPy38) [
+    # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules.
+    (
+      if isPy36 then
+        ./3.6/fix-finding-headers-when-cross-compiling.patch
+      else
+        ./3.7/fix-finding-headers-when-cross-compiling.patch
+    )
+  ] ++ optionals (isPy36 || isPy37) [
     # Backport a fix for ctypes.util.find_library.
     ./3.7/find_library.patch
   ];
@@ -281,6 +338,10 @@ in with passthru; stdenv.mkDerivation {
     find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' +
     find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' +
 
+    # Make the sysconfigdata module accessible on PYTHONPATH
+    # This allows build Python to import host Python's sysconfigdata
+    mkdir -p "$out/${sitePackages}"
+    ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/"
     '' + optionalString stripConfig ''
     rm -R $out/bin/python*-config $out/lib/python*/config-*
     '' + optionalString stripIdlelib ''
@@ -308,16 +369,24 @@ in with passthru; stdenv.mkDerivation {
     find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}"
   '';
 
-  preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     # Ensure patch-shebangs uses shebangs of host interpreter.
-    export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH
+    export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH
+  '';
+
+  # Add CPython specific setup-hook that configures distutils.sysconfig to
+  # always load sysconfigdata from host Python.
+  postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    cat << "EOF" >> "$out/nix-support/setup-hook"
+    ${sysconfigdataHook}
+    EOF
   '';
 
   # Enforce that we don't have references to the OpenSSL -dev package, which we
   # explicitly specify in our configure flags above.
   disallowedReferences =
-    stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ]
-    ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    lib.optionals (openssl != null && !static) [ openssl.dev ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # Ensure we don't have references to build-time packages.
     # These typically end up in shebangs.
     pythonForBuild buildPackages.bash
diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix
index 2982cdc8856d..38b0382c2191 100644
--- a/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/default.nix
@@ -24,7 +24,7 @@ with pkgs;
       pythonPackages = callPackage
         ({ pkgs, stdenv, python, overrides }: let
           pythonPackagesFun = import ../../../top-level/python-packages.nix {
-            inherit stdenv pkgs;
+            inherit stdenv pkgs lib;
             python = self;
           };
           otherSplices = {
@@ -154,10 +154,10 @@ in {
     sourceVersion = {
       major = "3";
       minor = "8";
-      patch = "6";
+      patch = "7";
       suffix = "";
     };
-    sha256 = "qeC3nSeqBW65zOjWOkJ7X5urFGXe4/lC3P2yWoL0q4o=";
+    sha256 = "sha256-3cwd8Wu1uHqkLsXSCluQLy0IjKommyjgFZD5enmOxQo=";
     inherit (darwin) configd;
     inherit passthruFun;
   };
@@ -181,9 +181,9 @@ in {
       major = "3";
       minor = "10";
       patch = "0";
-      suffix = "a3";
+      suffix = "a4";
     };
-    sha256 = "sha256-sJjJdAdxOUfX7W7VioSGdxlgp2lyMOPZjg42MCd/JYY=";
+    sha256 = "sha256-McHBl7IZuOH96je/izkxur0Edirn+igVkQU/pbek73M=";
     inherit (darwin) configd;
     inherit passthruFun;
   };
diff --git a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix
index 670c870f1077..175454ea0559 100644
--- a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -162,7 +162,7 @@ let
 
     postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
       wrapPythonPrograms
-    '' + attrs.postFixup or '''';
+    '' + attrs.postFixup or "";
 
     # Python packages built through cross-compilation are always for the host platform.
     disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix
index 8feeb3c51bf3..cfa1ac71891c 100644
--- a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, substituteAll, fetchurl
-, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security
+{ lib, stdenv, substituteAll, fetchurl
+, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
 , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
 , self, gdbm, db, lzma
 , python-setup-hook
@@ -14,12 +14,12 @@
 , pythonVersion
 , sha256
 , passthruFun
-, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}"
+, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}"
 }:
 
 assert zlibSupport -> zlib != null;
 
-with stdenv.lib;
+with lib;
 
 let
   isPy3k = substring 0 1 pythonVersion == "3";
@@ -49,7 +49,7 @@ in with passthru; stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
   ]  ++ optionals isPy3k [
@@ -144,7 +144,7 @@ in with passthru; stdenv.mkDerivation rec {
     ln -s $out/${executable}-c/include $out/include/${libPrefix}
     ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
 
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable}
     ''}
 
@@ -158,7 +158,7 @@ in with passthru; stdenv.mkDerivation rec {
   inherit passthru;
   enableParallelBuilding = true;  # almost no parallelization without STM
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix
index 1522047a3806..6fd0ee2e925f 100644
--- a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -22,7 +22,7 @@
 # This version of PyPy is primarily added to speed-up translation of
 # our PyPy source build when developing that expression.
 
-with stdenv.lib;
+with lib;
 
 let
   isPy3k = majorVersion == "3";
@@ -78,7 +78,7 @@ in with passthru; stdenv.mkDerivation {
 
     pushd $out
     find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
-    find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \;
+    find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \;
 
     echo "Removing bytecode"
     find . -name "__pycache__" -type d -depth -exec rm -rf {} \;
@@ -115,7 +115,7 @@ in with passthru; stdenv.mkDerivation {
 
   inherit passthru;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/interpreters/python/tests.nix b/nixpkgs/pkgs/development/interpreters/python/tests.nix
index a291919b3277..61fc497024be 100644
--- a/nixpkgs/pkgs/development/interpreters/python/tests.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/tests.nix
@@ -93,4 +93,4 @@ let
 
 
 
-in stdenv.lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)
+in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)
diff --git a/nixpkgs/pkgs/development/interpreters/python/wrapper.nix b/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
index dffad6b98f5e..61ad4a8a6ad9 100644
--- a/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, buildEnv, makeWrapper
+{ lib, stdenv, python, buildEnv, makeWrapper
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
@@ -30,14 +30,14 @@ let
       fi
       mkdir -p "$out/bin"
 
-      for path in ${stdenv.lib.concatStringsSep " " paths}; do
+      for path in ${lib.concatStringsSep " " paths}; do
         if [ -d "$path/bin" ]; then
           cd "$path/bin"
           for prg in *; do
             if [ -f "$prg" ]; then
               rm -f "$out/bin/$prg"
               if [ -x "$prg" ]; then
-                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs}
               fi
             fi
           done
diff --git a/nixpkgs/pkgs/development/interpreters/qnial/default.nix b/nixpkgs/pkgs/development/interpreters/qnial/default.nix
index 1762edbbdb7d..ba46989c94a7 100644
--- a/nixpkgs/pkgs/development/interpreters/qnial/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/qnial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }:
+{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
 
 stdenv.mkDerivation {
   pname = "qnial";
@@ -26,15 +26,15 @@ stdenv.mkDerivation {
 
   buildInputs = [
      unzip
-     pkgconfig
+     pkg-config
      ncurses
   ];
 
   meta = {
     description = "An array language from Nial Systems";
     homepage = "https://github.com/vrthra/qnial";
-    license = stdenv.lib.licenses.artistic1;
-    maintainers = [ stdenv.lib.maintainers.vrthra ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.artistic1;
+    maintainers = [ lib.maintainers.vrthra ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/quickjs/default.nix b/nixpkgs/pkgs/development/interpreters/quickjs/default.nix
index b1d03252d7ef..23fe1dc78008 100644
--- a/nixpkgs/pkgs/development/interpreters/quickjs/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/quickjs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "quickjs";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p";
   };
 
-  makeFlags = [ "prefix=${placeholder ''out''}" ];
+  makeFlags = [ "prefix=${placeholder "out"}" ];
   enableParallelBuilding = true;
 
   doInstallCheck = true;
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small and embeddable Javascript engine";
     homepage = "https://bellard.org/quickjs/";
     maintainers = with maintainers; [ stesie ];
diff --git a/nixpkgs/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix
index 2c51c691a8b8..8d33962f914c 100644
--- a/nixpkgs/pkgs/development/interpreters/racket/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeFontsConf
+{ lib, stdenv, fetchurl, makeFontsConf
 , cacert
 , cairo, coreutils, fontconfig, freefont_ttf
 , glib, gmp
@@ -22,7 +22,7 @@ let
     fontDirectories = [ freefont_ttf ];
   };
 
-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = lib.makeLibraryPath [
     cairo
     fontconfig
     glib
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   pname = "racket";
   version = "7.9"; # always change at once with ./minimal.nix
 
-  src = (stdenv.lib.makeOverridable ({ name, sha256 }:
+  src = (lib.makeOverridable ({ name, sha256 }:
     fetchurl {
       url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
       inherit sha256;
@@ -60,15 +60,15 @@ stdenv.mkDerivation rec {
 
   FONTCONFIG_FILE = fontsConf;
   LD_LIBRARY_PATH = libPath;
-  NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [
-    (stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
-    (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
+  NIX_LDFLAGS = lib.concatStringsSep " " [
+    (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
+    (lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
   ];
 
   nativeBuildInputs = [ cacert wrapGAppsHook ];
 
   buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
 
   preConfigure = ''
     unset AR
@@ -83,15 +83,15 @@ stdenv.mkDerivation rec {
 
   shared = if stdenv.isDarwin then "dylib" else "shared";
   configureFlags = [ "--enable-${shared}"  "--enable-lt=${libtool}/bin/libtool" ]
-                   ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
-                   ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
+                   ++ lib.optional disableDocs [ "--disable-docs" ]
+                   ++ lib.optional stdenv.isDarwin [ "--enable-xonx" ];
 
   configureScript = "../configure";
 
   enableParallelBuilding = false;
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A programmable programming language";
     longDescription = ''
       Racket is a full-spectrum programming language. It goes beyond
diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
index c645fae0d848..99a812905d42 100644
--- a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # Some tests fail on Darwin
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Raku implementation on top of Moar virtual machine";
     homepage    = "https://www.rakudo.org";
     license     = licenses.artistic2;
diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
index 54b487c25951..f833c153b964 100644
--- a/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl
+{ lib, stdenv, fetchurl, perl
 , CoreServices, ApplicationServices }:
 
 stdenv.mkDerivation rec {
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
    };
 
-  buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
+  buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
   doCheck = false; # MoarVM does not come with its own test suite
 
   configureScript = "${perl}/bin/perl ./Configure.pl";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
     homepage    = "https://www.moarvm.org/";
     license     = licenses.artistic2;
diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
index 04b628bc9dae..b4b41fa88046 100644
--- a/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
     homepage    = "https://github.com/perl6/nqp";
     license     = licenses.artistic2;
diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
index b2cea4ad473b..860ffc0aea0a 100644
--- a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
+++ b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rakudo, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "zef";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Raku / Perl6 Module Management";
     homepage    = "https://github.com/ugexe/zef";
     license     = licenses.artistic2;
diff --git a/nixpkgs/pkgs/development/interpreters/rascal/default.nix b/nixpkgs/pkgs/development/interpreters/rascal/default.nix
index 8b802043fe3f..cd2b74db0520 100644
--- a/nixpkgs/pkgs/development/interpreters/rascal/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/rascal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
   name = "rascal-0.6.2";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.rascal-mpl.org/";
     description = "Command-line REPL for the Rascal metaprogramming language";
-    license = stdenv.lib.licenses.epl10;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.epl10;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/rebol/default.nix b/nixpkgs/pkgs/development/interpreters/rebol/default.nix
index b26af7f0b1b7..39a4108e041d 100644
--- a/nixpkgs/pkgs/development/interpreters/rebol/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/rebol/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
     cp r3 $out/bin
   '';
 
-  meta = with stdenv.lib; {
-    description = ''Relative expression based object language, a language where code is data'';
+  meta = with lib; {
+    description = "Relative expression based object language, a language where code is data";
     maintainers = with maintainers; [ vrthra ];
     platforms = [ "x86_64-linux" ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/interpreters/red/default.nix b/nixpkgs/pkgs/development/interpreters/red/default.nix
index 554dc81bffb9..6689f7eb5c3c 100644
--- a/nixpkgs/pkgs/development/interpreters/red/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/red/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
+{ lib, stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "red";
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       New programming language strongly inspired by Rebol, but with a
       broader field of usage thanks to its native-code compiler, from system
diff --git a/nixpkgs/pkgs/development/interpreters/regina/default.nix b/nixpkgs/pkgs/development/interpreters/regina/default.nix
index ec19b0679f4b..79258d2cc0fa 100644
--- a/nixpkgs/pkgs/development/interpreters/regina/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/regina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "Regina-REXX";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "--libdir=$(out)/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "REXX interpreter";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/nixpkgs/pkgs/development/interpreters/renpy/default.nix
index 41cf4c221c6a..ae5227fb1989 100644
--- a/nixpkgs/pkgs/development/interpreters/renpy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/renpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2
+{ lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2
 , libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib
 , glib
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "renpy";
   version = "7.3.5";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ren'Py Visual Novel Engine";
     homepage = "https://renpy.org/";
     license = licenses.mit;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter}
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     python cython wrapPython tkinter
     SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   pythonPath = [ pygame_sdl2 tkinter ];
 
-  RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
+  RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
     SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib
   ]);
 
diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix
index 7d688da61aa0..fee2c0cdb8bc 100644
--- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix
@@ -175,7 +175,7 @@ let
           export GEM_HOME="$out/${passthru.gemPath}"
         '';
 
-        installFlags = stdenv.lib.optional docSupport "install-doc";
+        installFlags = lib.optional docSupport "install-doc";
         # Bundler tries to create this directory
         postInstall = ''
           # Remove unnecessary groff reference from runtime closure, since it's big
@@ -224,7 +224,7 @@ let
 
         disallowedRequisites = op (!jitSupport) stdenv.cc.cc;
 
-        meta = with stdenv.lib; {
+        meta = with lib; {
           description = "The Ruby language";
           homepage    = "http://www.ruby-lang.org/en/";
           license     = licenses.ruby;
diff --git a/nixpkgs/pkgs/development/interpreters/scheme48/default.nix b/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
index 5a1e3f265b24..ca34d5055c56 100644
--- a/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "scheme48-1.9.2";
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://s48.org/";
     description = "Scheme 48";
-    platforms = with stdenv.lib.platforms; unix;
-    license = stdenv.lib.licenses.bsd3;
+    platforms = with lib.platforms; unix;
+    license = lib.licenses.bsd3;
   };
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/development/interpreters/scsh/default.nix b/nixpkgs/pkgs/development/interpreters/scsh/default.nix
index bb4f418f502a..6dcb8bd27c5b 100644
--- a/nixpkgs/pkgs/development/interpreters/scsh/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/scsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, scheme48 }:
+{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
 
 stdenv.mkDerivation {
   name = "scsh-0.7pre";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ scheme48 ];
   configureFlags = [ "--with-scheme48=${scheme48}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Scheme shell";
     homepage = "http://www.scsh.net/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/interpreters/self/default.nix b/nixpkgs/pkgs/development/interpreters/self/default.nix
index 0d5cc061f591..58cac6bbe9b1 100644
--- a/nixpkgs/pkgs/development/interpreters/self/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/self/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
+{ lib, stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
 
 stdenv.mkDerivation rec {
   # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       --set SELF_ROOT "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
     homepage = "https://selflanguage.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix b/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix
index 6d10669d20d8..f93e0ae5d958 100644
--- a/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , shen-sources
 , sbcl
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out
     install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://shenlanguage.org;
     description = "Port of Shen running on Steel Bank Common Lisp";
     platforms = sbcl.meta.platforms;
diff --git a/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix b/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix
index f35631daa282..84839cf42dee 100644
--- a/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp . $out -R
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://shenlanguage.org;
     description = "Source code for the Shen Language";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 37efeba3f9b6..4892e0b8abef 100644
--- a/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
+{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }:
 
 stdenv.mkDerivation {
   pname = "spidermonkey";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ nspr ];
 
-  nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213;
+  nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213;
   buildInputs = [ perl python2 zip ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
       url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch";
       sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
     })
-  ] ++ stdenv.lib.optionals stdenv.isAarch32 [
+  ] ++ lib.optionals stdenv.isAarch32 [
     # Explained below in configureFlags for ARM
     ./1.8.5-findvanilla.patch
     # Fix for hard float flags.
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   # of polkit, which is what matters most, it does not override the allocator
   # so the failure of that test does not matter much.
   configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++
-    stdenv.lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [
+    lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [
         "--with-cpu-arch=armv5t"
         "--disable-tracejit" ];
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
     rm jit-test/tests/sunspider/check-date-format-tofte.js    # https://bugzil.la/600522
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     # TODO: MPL/GPL/LGPL tri-license.
diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
index 22ce5a0b387c..482561a901ea 100644
--- a/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
+{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
 , libobjc }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "38.8.0";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libffi readline icu zlib ]
-               ++ stdenv.lib.optional stdenv.isDarwin libobjc;
-  nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
+               ++ lib.optional stdenv.isDarwin libobjc;
+  nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     # TODO: MPL/GPL/LGPL tri-license.
diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix
index 42731421d81d..d75e5e8b2859 100644
--- a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages
+{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
 , which, readline, zlib, icu }:
 
-with stdenv.lib;
+with lib;
 
 let
   version = "60.9.0";
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
   setOutputFlags = false; # Configure script only understands --includedir
 
   buildInputs = [ readline zlib icu ];
-  nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
+  nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ];
 
   patches = [
     # Fixed in 62.0
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix
index 36d28f62e2e1..0ac005b07dea 100644
--- a/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages
+{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
 , which, readline, zlib, icu, cargo, rustc, llvmPackages }:
 
-with stdenv.lib;
+with lib;
 
 let
   python3Env = buildPackages.python3.withPackages (p: [p.six]);
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoconf213
-    pkgconfig
+    pkg-config
     perl
     which
     python2
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
index a3d7242f453d..81ebcedf7bc0 100644
--- a/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , autoconf213
-, pkgconfig
+, pkg-config
 , perl
 , python3
 , zip
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     cargo
     llvmPackages.llvm # for llvm-objdump
     perl
-    pkgconfig
+    pkg-config
     python3
     rust-cbindgen
     rustc
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
     "--enable-optimize"
     "--enable-release"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # Spidermonkey seems to use different host/build terminology for cross
     # compilation here.
     "--host=${stdenv.buildPlatform.config}"
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
diff --git a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
index acdffba8d72b..f80e18c7bb96 100644
--- a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib
+{ lib, stdenv, fetchurl, cmake, pkg-config, alsaLib
 , libjack2, libsndfile, fftw, curl, gcc
 , libXt, qtbase, qttools, qtwebengine
 , readline, qtwebsockets, useSCEL ? false, emacs
 }:
 
-let optional = stdenv.lib.optional;
+let optional = lib.optional;
 in
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "supercollider";
   version = "3.11.2";
 
@@ -24,16 +24,14 @@ mkDerivation rec {
     "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig qttools ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake pkg-config qttools ];
 
   buildInputs = [
     gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
       ++ optional (!stdenv.isDarwin) alsaLib
       ++ optional useSCEL emacs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Programming language for real time audio synthesis";
     homepage = "https://supercollider.github.io";
     maintainers = with maintainers; [ mrmebelman ];
diff --git a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix
index 9aaf8223837d..e665e8cfb1ea 100644
--- a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix
+++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 
 # Version specific stuff
 , release, version, src
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     # Don't install tzdata because NixOS already has a more up-to-date copy.
     "--with-tzdata=no"
     "tcl_cv_strtod_unbroken=ok"
-  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
+  ] ++ lib.optional stdenv.is64bit "--enable-64bit";
 
   enableParallelBuilding = true;
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Tcl scripting language";
     homepage = "https://www.tcl.tk/";
     license = licenses.tcltk;
diff --git a/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix b/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix
index bbd34f71d22d..44d2745dac8b 100644
--- a/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , automake
 , autoconf
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   # The provided makefile leaves a wrong reference to /build/ in RPATH,
   # so we fix it after checking that everything is also present in $out
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  preFixup = lib.optionalString stdenv.isLinux ''
     needed_libraries=$(ls .libs | grep '\.\(so\|la\)$')
     for lib in $needed_libraries; do
       if ! ls $out/lib | grep "$lib"; then
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU readline for interactive tcl shells";
     homepage = "https://github.com/flightaware/tclreadline";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix b/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix
index b49a37a72856..8dd27b3f0006 100644
--- a/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "tinyscheme";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cp scheme $out/bin/tinyscheme
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight Scheme implementation";
     longDescription = ''
       TinyScheme is a lightweight Scheme interpreter that implements as large a
diff --git a/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
index 9bdd31f400a8..ac0a944f2105 100644
--- a/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
+{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
 
 stdenv.mkDerivation {
   pname = "unicon-lang";
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
     cp -r bin $out/
   '';
 
-  meta = with stdenv.lib; {
-    description = ''A very high level, goal-directed, object-oriented, general purpose applications language'';
+  meta = with lib; {
+    description = "A very high level, goal-directed, object-oriented, general purpose applications language";
     maintainers = with maintainers; [ vrthra ];
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
index 7b390c547163..60ce4d89f19c 100644
--- a/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
@@ -22,6 +22,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
+  # Since wasmer 0.17 no backends are enabled by default. Backends are now detected
+  # using the [makefile](https://github.com/wasmerio/wasmer/blob/master/Makefile).
+  # Enabling cranelift as this used to be the old default. At least one backend is
+  # needed for the run subcommand to work.
+  cargoBuildFlags = [ "--features 'backend-cranelift'" ];
+
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/java-modules/build-maven-package.nix b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix
index a7196c6e0314..cb895d9c6720 100644
--- a/nixpkgs/pkgs/development/java-modules/build-maven-package.nix
+++ b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix
@@ -1,11 +1,11 @@
-{ stdenv, maven, pkgs }:
+{ lib, stdenv, maven, pkgs }:
 { mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
 
 with builtins;
-with stdenv.lib;
+with lib;
 
 let
-  mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; };
+  mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; };
 in stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
diff --git a/nixpkgs/pkgs/development/java-modules/jogl/default.nix b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
index d4e5f1b62bf7..5f20adada23e 100644
--- a/nixpkgs/pkgs/development/java-modules/jogl/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
+{ lib, stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
 
 {
   jogl_2_3_2 =
@@ -55,7 +55,7 @@
         cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar  $out/share/java/
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Java libraries for 3D Graphics, Multimedia and Processing";
         homepage = "https://jogamp.org/";
         license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/java-modules/junit/default.nix b/nixpkgs/pkgs/development/java-modules/junit/default.nix
index dbbce6b62624..c4b02071ec04 100644
--- a/nixpkgs/pkgs/development/java-modules/junit/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/junit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, mavenbuild, fetchMaven }:
+{ lib, stdenv, pkgs, mavenbuild, fetchMaven }:
 
 with pkgs.javaPackages;
 
@@ -21,9 +21,9 @@ in rec {
     meta = {
       homepage = "https://junit.org/junit4/";
       description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
-      license = stdenv.lib.licenses.epl10;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers;
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers;
         [ nequissimus ];
     };
   };
diff --git a/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
index b4639d9ee1d1..e0087e857a47 100644
--- a/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, mavenbuild }:
+{ lib, stdenv, pkgs, mavenbuild }:
 
 with pkgs.javaPackages;
 
@@ -20,9 +20,9 @@ in rec {
     meta = {
       homepage = "https://github.com/NeQuissimus/maven-hello/";
       description = "Maven Hello World";
-      license = stdenv.lib.licenses.unlicense;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers;
+      license = lib.licenses.unlicense;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers;
         [ nequissimus ];
     };
   };
diff --git a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix
index 52edcd2104fd..9019e3ba28e9 100644
--- a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix
@@ -1,6 +1,6 @@
-{ stdenv, pkgs }:
+{ lib, stdenv, pkgs }:
 
-with stdenv.lib;
+with lib;
 with pkgs.javaPackages;
 
 let
diff --git a/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix b/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix
index 01041d775398..e7968cf80c0a 100644
--- a/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchMavenArtifact }:
+{ lib, stdenv, fetchMavenArtifact }:
 
 stdenv.mkDerivation rec {
   pname = "postgresql-jdbc";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://jdbc.postgresql.org/";
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
index ab9440c30345..c26672c1dabc 100644
--- a/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
+{ lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
 
 stdenv.mkDerivation {
   name = "AntTweakBar-1.16";
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
       to interactively tweak parameters on-screen
     '';
     homepage = "http://anttweakbar.sourceforge.net/";
-    license = stdenv.lib.licenses.zlib;
-    maintainers = [ stdenv.lib.maintainers.razvan ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.zlib;
+    maintainers = [ lib.maintainers.razvan ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/CGAL/4.nix b/nixpkgs/pkgs/development/libraries/CGAL/4.nix
index ad900744f545..7028572174ff 100644
--- a/nixpkgs/pkgs/development/libraries/CGAL/4.nix
+++ b/nixpkgs/pkgs/development/libraries/CGAL/4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
   version = "4.14.2";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = "http://cgal.org";
     license = with licenses; [ gpl3Plus lgpl3Plus];
diff --git a/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix
index ca3503489868..7ff9ac43343e 100644
--- a/nixpkgs/pkgs/development/libraries/CGAL/default.nix
+++ b/nixpkgs/pkgs/development/libraries/CGAL/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = "http://cgal.org";
     license = with licenses; [ gpl3Plus lgpl3Plus];
diff --git a/nixpkgs/pkgs/development/libraries/CoinMP/default.nix b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix
index 7adb6e6437e7..d34b465f135a 100644
--- a/nixpkgs/pkgs/development/libraries/CoinMP/default.nix
+++ b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "CoinMP";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://projects.coin-or.org/CoinMP/";
     description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/LAStools/default.nix b/nixpkgs/pkgs/development/libraries/LAStools/default.nix
index c231361acb55..61a39aa8e76d 100644
--- a/nixpkgs/pkgs/development/libraries/LAStools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/LAStools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "LAStools";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software for rapid LiDAR processing";
     homepage = http://lastools.org/;
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix b/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix
index 2eb309631289..b080153826ad 100644
--- a/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix
+++ b/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   version = "2.2.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
     homepage = "https://laszip.org";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/LASzip/default.nix b/nixpkgs/pkgs/development/libraries/LASzip/default.nix
index 0300aa37f0f9..f170ea44c0ee 100644
--- a/nixpkgs/pkgs/development/libraries/LASzip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/LASzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   version = "3.4.3";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
     homepage = "https://laszip.org";
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.michelk ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2;
+    maintainers = [ lib.maintainers.michelk ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/NSPlist/default.nix b/nixpkgs/pkgs/development/libraries/NSPlist/default.nix
index bfee99619840..1b8ae939ecaa 100644
--- a/nixpkgs/pkgs/development/libraries/NSPlist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/NSPlist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
   name = "NSPlist-713decf";
@@ -10,9 +10,9 @@ stdenv.mkDerivation {
     sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ matthewbauer ];
     description = "Parses .plist files";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix b/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix
index f7703b731b99..f7c47805748e 100644
--- a/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
 
 stdenv.mkDerivation {
   name = "PlistCpp-11615d";
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
     sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv";
   };
 
-  buildInputs = [ cmake boost NSPlist pugixml ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost NSPlist pugixml ];
 
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ matthewbauer ];
     description = "CPP bindings for Plist";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix
index 61609a90dd02..b51bc3f7cdd8 100644
--- a/nixpkgs/pkgs/development/libraries/SDL/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , openglSupport ? libGLSupported, libGL, libGLU
 , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
 , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
@@ -11,7 +11,7 @@
 # NOTE: When editing this expression see if the same change applies to
 # SDL2 expression too
 
-with stdenv.lib;
+with lib;
 
 let
   extraPropagatedBuildInputs = [ ]
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
   outputBin = "dev"; # sdl-config
 
-  nativeBuildInputs = [ pkgconfig ]
+  nativeBuildInputs = [ pkg-config ]
     ++ optional stdenv.isLinux libcap;
 
   propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs;
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform multimedia library";
     homepage    = "http://www.libsdl.org/";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix
index 31624bee2fb3..5212421a7b8e 100644
--- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, config, fetchurl, pkgconfig
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+{ lib, stdenv, config, fetchurl, pkg-config
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , openglSupport ? libGLSupported, libGL
 , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
 , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
@@ -21,7 +21,7 @@
 # NOTE: When editing this expression see if the same change applies to
 # SDL expression too
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "SDL2";
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
       --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`'
   '';
 
-  depsBuildBuild = [ pkgconfig ];
+  depsBuildBuild = [ pkg-config ];
 
-  nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ];
+  nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ];
 
   propagatedBuildInputs = dlopenPropagatedBuildInputs;
 
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit openglSupport; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform multimedia library";
     homepage = "http://www.libsdl.org/";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix
index 1ed56c6750ff..2da2189b1a87 100644
--- a/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, SDL2 }:
+{ lib, stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_gfx";
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ SDL2 ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+    ++ lib.optional stdenv.isDarwin darwin.libobjc;
 
   configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")]
-     ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+     ++ lib.optional stdenv.isDarwin "--disable-sdltest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL graphics drawing primitives and support functions";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix
index 00de774ba6e3..96f85ddb0ea5 100644
--- a/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }:
+{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_image";
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ]
-    ++ stdenv.lib.optional stdenv.isDarwin Foundation;
+    ++ lib.optional stdenv.isDarwin Foundation;
 
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL image library";
     homepage = "http://www.libsdl.org/projects/SDL_image/";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
index af0da7dc6270..7e1d097ba5cb 100644
--- a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , AudioToolbox
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isDarwin [
     AudioToolbox
     AudioUnit
     CoreServices
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
     "--disable-music-mp3-mpg123-shared"
     "--disable-music-opus-shared"
     "--disable-music-midi-fluidsynth-shared"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "--disable-sdltest"
     "--disable-smpegtest"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL multi-channel audio mixer library";
     platforms = platforms.unix;
     homepage = "https://www.libsdl.org/projects/SDL_mixer/";
diff --git a/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix
index 0bec12cdb24b..fe6cb9445a39 100644
--- a/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, SDL2 }:
+{ lib, stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_net";
@@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
   };
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+  buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   propagatedBuildInputs = [ SDL2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL multiplatform networking library";
     homepage = "https://www.libsdl.org/projects/SDL_net";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
index 571c953a81bc..e23b3fb92150 100644
--- a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
+{ lib, stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_ttf";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   buildInputs = [ SDL2 freetype libGL ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+    ++ lib.optional stdenv.isDarwin darwin.libobjc;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL TrueType library";
     platforms = platforms.unix;
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix b/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix
index 9340b9f70915..83afeaf2d67b 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkgconfig }:
+{ lib, stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_Pango";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz";
   };
 
-  patches = [ 
+  patches = [
     (fetchpatch {
       url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch";
       sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld";
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
 
   preConfigure = "autoreconf -i -f";
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ SDL pango ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Connects the Pango rendering engine to SDL";
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix
index 3696e485ad72..f5a3d8635531 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL }:
+{ lib, stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_gfx";
@@ -12,28 +12,28 @@ stdenv.mkDerivation rec {
   buildInputs = [ SDL ] ;
 
   configureFlags = [ "--disable-mmx" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+    ++ lib.optional stdenv.isDarwin "--disable-sdltest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL graphics drawing primitives and support functions";
 
-    longDescription =
-      '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
-	 which provided basic drawing routines such as lines, circles or
-	 polygons and SDL_rotozoom which implemented a interpolating
-	 rotozoomer for SDL surfaces.
+    longDescription = ''
+      The SDL_gfx library evolved out of the SDL_gfxPrimitives code
+      which provided basic drawing routines such as lines, circles or
+      polygons and SDL_rotozoom which implemented a interpolating
+      rotozoomer for SDL surfaces.
 
-	 The current components of the SDL_gfx library are:
+      The current components of the SDL_gfx library are:
 
-	    * Graphic Primitives (SDL_gfxPrimitves.h)
-	    * Rotozoomer (SDL_rotozoom.h)
-	    * Framerate control (SDL_framerate.h)
-	    * MMX image filters (SDL_imageFilter.h)
-	    * Custom Blit functions (SDL_gfxBlitFunc.h)
+        * Graphic Primitives (SDL_gfxPrimitves.h)
+        * Rotozoomer (SDL_rotozoom.h)
+        * Framerate control (SDL_framerate.h)
+        * MMX image filters (SDL_imageFilter.h)
+        * Custom Blit functions (SDL_gfxBlitFunc.h)
 
-	 The library is backwards compatible to the above mentioned
-         code. Its is written in plain C and can be used in C++ code.
-       '';
+      The library is backwards compatible to the above mentioned
+      code. Its is written in plain C and can be used in C++ code.
+    '';
 
     homepage = "https://sourceforge.net/projects/sdlgfx/";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix
index f15009c2f5d9..dc52e6afeea7 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
+{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
 
 stdenv.mkDerivation {
   pname = "SDL_gpu-unstable";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for high-performance, modern 2D graphics with SDL written in C";
     homepage = "https://github.com/grimfang4/sdl-gpu";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/SDL_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL_image/default.nix
index 968fc3d38af8..2e5841b3f482 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_image/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_image/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
+{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_image";
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
     "--disable-jpg-shared"
     "--disable-png-shared"
     "--disable-tif-shared"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  ] ++ lib.optional stdenv.isDarwin "--disable-sdltest";
 
   buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL image library";
     homepage    = "http://www.libsdl.org/projects/SDL_image/";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix
index e52273052b53..7f5e38f39b8d 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"
     ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL multi-channel audio mixer library";
     homepage    = "http://www.libsdl.org/projects/SDL_mixer/";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/nixpkgs/pkgs/development/libraries/SDL_net/default.nix b/nixpkgs/pkgs/development/libraries/SDL_net/default.nix
index a24020da0157..f55332a0ee0e 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_net/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_net/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL }:
+{ lib, stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_net";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   propagatedBuildInputs = [ SDL ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL networking library";
     platforms = platforms.unix;
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix
index 8d37124d3117..1bc4c8ba35c0 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libsixel }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel }:
 
 stdenv.mkDerivation {
   pname = "SDL_sixel";
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--enable-video-sixel" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsixel ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform multimedia library, that supports sixel graphics on consoles";
     homepage    = "https://github.com/saitoha/SDL1.2-SIXEL";
     maintainers = with maintainers; [ vrthra ];
diff --git a/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix b/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix
index 1f068c9e9768..e6318b84859e 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL }:
+{ lib, stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_stretch";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
      description = "Stretch Functions For SDL";
      homepage = "http://sdl-stretch.sourceforge.net/";
      license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix
index cd6355c9ce2b..5d353e3a6c0d 100644
--- a/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, SDL, freetype }:
+{ lib, stdenv, fetchurl, fetchpatch, SDL, freetype }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_ttf";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL freetype ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL TrueType library";
     license = licenses.zlib;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix b/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix
index d26a910638e9..88501ca1ee60 100644
--- a/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, imake, gccmakedep, bison, flex, pkgconfig
+{ lib, stdenv, fetchurl
+, imake, gccmakedep, bison, flex, pkg-config
 , xlibsWrapper, libXmu, libXpm, libXp }:
 
 stdenv.mkDerivation {
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
     sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
   };
   dontUseImakeConfigure = true;
-  nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
+  nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ];
   buildInputs = [ libXpm libXp ];
   propagatedBuildInputs = [ xlibsWrapper libXmu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "3D widget set based on the Athena Widget set";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/a52dec/default.nix b/nixpkgs/pkgs/development/libraries/a52dec/default.nix
index 7cbb36994013..faa819ec5615 100644
--- a/nixpkgs/pkgs/development/libraries/a52dec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/a52dec/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "a52dec";
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
 
   # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686
   # which can also be fixed with
-  # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
+  # hardeningDisable = lib.optional stdenv.isi686 "pic";
   # but it's better to disable tests than loose ASLR on i686
   doCheck = !stdenv.isi686;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ATSC A/52 stream decoder";
     homepage = "https://liba52.sourceforge.net/";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/aalib/default.nix b/nixpkgs/pkgs/development/libraries/aalib/default.nix
index 94453264419c..b007e71ce44d 100644
--- a/nixpkgs/pkgs/development/libraries/aalib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aalib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, automake}:
+{lib, stdenv, fetchurl, ncurses, automake}:
 
 stdenv.mkDerivation {
   name = "aalib-1.4rc5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   outputs = [ "bin" "dev" "out" "man" "info" ];
   setOutputFlags = false; # Doesn't support all the flags
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
 
   # The fuloong2f is not supported by aalib still
   preConfigure = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "ASCII art graphics library";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
index 45e73410d28e..95d1b873edd3 100644
--- a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "abseil-cpp";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open-source collection of C++ code designed to augment the C++ standard library";
     homepage = "https://abseil.io/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix
index 4e2e33b852e8..dcfe4a4ef27b 100644
--- a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }:
+{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake }:
 
 mkDerivation rec {
   pname = "accounts-qt";
@@ -12,7 +12,7 @@ mkDerivation rec {
   };
 
   propagatedBuildInputs = [ glib libaccounts-glib ];
-  nativeBuildInputs = [ doxygen pkgconfig qmake ];
+  nativeBuildInputs = [ doxygen pkg-config qmake ];
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" '';
diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix
index 6bd76c62b974..f87a0bbe68ba 100644
--- a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , substituteAll
-, pkgconfig
+, pkg-config
 , glib
 , shadow
 , gobject-introspection
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
   ];
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus interface for user account query and manipulation";
     homepage = "https://www.freedesktop.org/wiki/Software/AccountsService";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/ace/default.nix b/nixpkgs/pkgs/development/libraries/ace/default.nix
index 49c8e14a74f4..85df0b433539 100644
--- a/nixpkgs/pkgs/development/libraries/ace/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool, perl }:
+{ lib, stdenv, fetchurl, pkg-config, libtool, perl }:
 
 stdenv.mkDerivation rec {
   pname = "ace";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig libtool ];
+  nativeBuildInputs = [ pkg-config libtool ];
   buildInputs = [ perl ];
 
   NIX_CFLAGS_COMPILE = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     > include/makeinclude/platform_macros.GNU
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ADAPTIVE Communication Environment";
     homepage = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html";
     license = licenses.doc;
diff --git a/nixpkgs/pkgs/development/libraries/acl/default.nix b/nixpkgs/pkgs/development/libraries/acl/default.nix
index 6e863e4eebab..2161ad9e59c3 100644
--- a/nixpkgs/pkgs/development/libraries/acl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/acl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, attr }:
+{ lib, stdenv, fetchurl, gettext, attr }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://savannah.nongnu.org/projects/acl";
     description = "Library and tools for manipulating access control lists";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/afflib/default.nix b/nixpkgs/pkgs/development/libraries/afflib/default.nix
index 030ff73f97f8..b89683ac0539 100644
--- a/nixpkgs/pkgs/development/libraries/afflib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/afflib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl
+{ lib, stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl
 , autoreconfHook, python3
 }:
 
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ zlib curl expat openssl python3 ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ fuse ];
+    ++ lib.optionals stdenv.isLinux [ fuse ];
 
   meta = {
     homepage = "http://afflib.sourceforge.net/";
     description = "Advanced forensic format library";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsdOriginal;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsdOriginal;
+    maintainers = [ lib.maintainers.raskin ];
     inherit version;
     downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
   };
diff --git a/nixpkgs/pkgs/development/libraries/aften/default.nix b/nixpkgs/pkgs/development/libraries/aften/default.nix
index a1d4c2259091..1ae5ffb17ad3 100644
--- a/nixpkgs/pkgs/development/libraries/aften/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aften/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-	pname = "aften";
-	version = "0.0.8";
-	src = fetchurl {
-		url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
-		sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
-	};
+  pname = "aften";
+  version = "0.0.8";
+  src = fetchurl {
+    url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
+    sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
+  };
 
-	nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-	cmakeFlags = [ "-DSHARED=ON" ];
+  cmakeFlags = [ "-DSHARED=ON" ];
 
-	meta = {
-		description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
-		homepage = "http://aften.sourceforge.net/";
-		license = stdenv.lib.licenses.lgpl2;
-		platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
-	};
+  meta = {
+    description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
+    homepage = "http://aften.sourceforge.net/";
+    license = lib.licenses.lgpl2;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+  };
 }
diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
index f13cc6982365..79bb783cc9ff 100644
--- a/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub }:
 
 mkDerivation rec {
   version = "compat-2.6.1";
@@ -18,11 +18,11 @@ mkDerivation rec {
     cd ..
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/UlfNorell/agda-prelude";
     description = "Programming library for Agda";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     maintainers = with maintainers; [ mudri alexarice turion ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index dbcdaac532ec..7ec892bfe023 100644
--- a/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
     sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
     description = ''
       Formalizing linear algebra in Agda by representing matrices as functions
diff --git a/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix
index 55cd6a742e54..2ebb3f66ed08 100644
--- a/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub }:
 
 mkDerivation (rec {
   version = "1.5.0";
@@ -22,10 +22,10 @@ mkDerivation (rec {
   meta = {
     homepage = "https://github.com/cedille/ial";
     description = "Agda standard library developed at Iowa";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
     # broken since Agda 2.6.1
     broken = true;
-    maintainers = with stdenv.lib.maintainers; [ alexarice turion ];
+    maintainers = with lib.maintainers; [ alexarice turion ];
   };
 })
diff --git a/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
index e43e1bad3b6c..1d8dc03bbde9 100644
--- a/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }:
 
 mkDerivation rec {
   pname = "standard-library";
@@ -16,11 +16,11 @@ mkDerivation rec {
     runhaskell GenerateEverything.hs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
     description = "A standard library for use with the Agda compiler";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     maintainers = with maintainers; [ jwiegley mudri alexarice turion ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/agg/default.nix b/nixpkgs/pkgs/development/libraries/agg/default.nix
index d65ff369064e..89585d908da4 100644
--- a/nixpkgs/pkgs/development/libraries/agg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config
 , freetype, SDL, libX11 }:
 
 stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     url = "http://www.antigrain.com/${name}.tar.gz";
     sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ autoconf automake libtool freetype SDL libX11 ];
 
   postPatch = ''
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
       of course, AGG can do much more than that.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     homepage = "http://www.antigrain.com/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/alembic/default.nix b/nixpkgs/pkgs/development/libraries/alembic/default.nix
index 126300aa1945..cdcf4b7b8a49 100644
--- a/nixpkgs/pkgs/development/libraries/alembic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alembic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }:
 
 stdenv.mkDerivation rec
 {
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec
   nativeBuildInputs = [ unzip cmake ];
   buildInputs = [ openexr hdf5-threadsafe ];
 
-  enableParallelBuilding = true;
-
   buildPhase = ''
     cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF .
 
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec
     mv $out/include $dev/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open framework for storing and sharing scene data";
     homepage = "http://alembic.io/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/alkimia/default.nix b/nixpkgs/pkgs/development/libraries/alkimia/default.nix
index d7d8c268928f..18c40c5b5fb3 100644
--- a/nixpkgs/pkgs/development/libraries/alkimia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alkimia/default.nix
@@ -5,11 +5,11 @@
 
 mkDerivation rec {
   pname = "alkimia";
-  version = "8.0.2";
+  version = "8.0.4";
 
   src = fetchurl {
     url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0al5k9irmg9gsjc234qxjsqfzgzsavl18pspqk78mkp8zlv7fvv1";
+    sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8=";
   };
 
   nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
diff --git a/nixpkgs/pkgs/development/libraries/allegro/5.nix b/nixpkgs/pkgs/development/libraries/allegro/5.nix
index fd612170910e..ca1446dd9352 100644
--- a/nixpkgs/pkgs/development/libraries/allegro/5.nix
+++ b/nixpkgs/pkgs/development/libraries/allegro/5.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
+{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
 , libXxf86dga, libXxf86misc
 , libXxf86vm, openal, libGLU, libGL, libjpeg, flac
 , libXi, libXfixes, freetype, libopus, libtheora
-, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
+, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs
 , libXdmcp
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     libXxf86vm openal libGLU libGL
     libjpeg flac
     libXi libXfixes
-    enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
+    enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp
     libpulseaudio libpthreadstubs
   ];
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A game programming library";
     homepage = "https://liballeg.org/";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/allegro/default.nix b/nixpkgs/pkgs/development/libraries/allegro/default.nix
index 99d75225036e..9fefbe01ace0 100644
--- a/nixpkgs/pkgs/development/libraries/allegro/default.nix
+++ b/nixpkgs/pkgs/development/libraries/allegro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11
+{ lib, stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
 , libXxf86dga, libXxf86misc
 , libXxf86vm, openal, libGLU, libGL }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A game programming library";
     homepage = "https://liballeg.org/";
     license = licenses.free; # giftware
diff --git a/nixpkgs/pkgs/development/libraries/alure/default.nix b/nixpkgs/pkgs/development/libraries/alure/default.nix
index 59926f52b078..9ff83dcec404 100644
--- a/nixpkgs/pkgs/development/libraries/alure/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openal }:
+{ lib, stdenv, fetchurl, cmake, openal }:
 
 stdenv.mkDerivation rec {
   pname = "alure";
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
   };
 
-  buildInputs = [ cmake openal ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openal ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A utility library to help manage common tasks with OpenAL applications";
     homepage = "https://kcat.strangesoft.net/alure.html";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/alure2/default.nix b/nixpkgs/pkgs/development/libraries/alure2/default.nix
index 6da95a772648..fa42c4fd53a3 100644
--- a/nixpkgs/pkgs/development/libraries/alure2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alure2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }:
+{ lib, stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "alure2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openal libvorbis opusfile libsndfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming";
     homepage = "https://github.com/kcat/alure";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
index f6859c943642..fb48ef73905b 100644
--- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
@@ -5,7 +5,7 @@
 , ninja
 , patchelf
 , perl
-, pkgconfig
+, pkg-config
 , python3
 , expat
 , libdrm
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
     ninja
     patchelf
     perl
-    pkgconfig
+    pkg-config
     python3
   ];
 
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
   cmakeDir = "../drivers/xgl";
 
   # LTO is disabled in gcc for i686 as of #66528
-  cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"];
+  cmakeFlags = lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"];
 
   installPhase = ''
     install -Dm755 -t $out/lib icd/amdvlk${suffix}.so
@@ -83,7 +83,7 @@ in stdenv.mkDerivation rec {
   # Keep the rpath, otherwise vulkaninfo and vkcube segfault
   dontPatchELF = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AMD Open Source Driver For Vulkan";
     homepage = "https://github.com/GPUOpen-Drivers/AMDVLK";
     changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}";
diff --git a/nixpkgs/pkgs/development/libraries/aml/default.nix b/nixpkgs/pkgs/development/libraries/aml/default.nix
index 8b4eccb9ffff..899dafde76f2 100644
--- a/nixpkgs/pkgs/development/libraries/aml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, pkg-config, ninja }:
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "aml";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson pkg-config ninja ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Another main loop";
     inherit (src.meta) homepage;
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/amrnb/default.nix b/nixpkgs/pkgs/development/libraries/amrnb/default.nix
index aaee86c62ef7..b226c9e36d24 100644
--- a/nixpkgs/pkgs/development/libraries/amrnb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/amrnb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   name = "amrnb-11.0.0.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
 
   postConfigure = ''
-    cp $srcAmr 26104-b00.zip 
+    cp $srcAmr 26104-b00.zip
   '';
 
   meta = {
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     # The wrapper code is free, but not the libraries from 3gpp.
     # It's a source code reference implementation with patents and licenses on
     # some countries, not redistributable.
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/amrwb/default.nix b/nixpkgs/pkgs/development/libraries/amrwb/default.nix
index e6581d549115..776065b28bc7 100644
--- a/nixpkgs/pkgs/development/libraries/amrwb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/amrwb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "amrwb";
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     # The wrapper code is free, but not the libraries from 3gpp.
     # It's a source code reference implementation with patents and licenses on
     # some countries, not redistributable.
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/amtk/default.nix b/nixpkgs/pkgs/development/libraries/amtk/default.nix
index e514b8b5c31b..f144f847bcf0 100644
--- a/nixpkgs/pkgs/development/libraries/amtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/amtk/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , gtk3
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , gnome3
 , dbus
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   version = "5.2.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2";
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     dbus
     gobject-introspection
   ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gnome3.updateScript { packageName = pname; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Amtk";
     description = "Actions, Menus and Toolbars Kit for GTK applications";
     maintainers = [ maintainers.manveru ];
diff --git a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix
index 8490541546b5..976387d49eb0 100644
--- a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "apache-activemq";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://activemq.apache.org/";
     description = "Messaging and Integration Patterns server written in Java";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix b/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix
index 8e77f6aa34e3..1cd9fb2c8b76 100644
--- a/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , substituteAll
 , docbook_xml_dtd_42
@@ -19,7 +19,7 @@
 , libxslt
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , pngquant
 }:
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
-    rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
+    rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
     sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx";
   };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     libxslt
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     moveToOutput "share/installed-tests" "$installedTests"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Objects and helper methods to read and write AppStream metadata";
     homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix
index 820e73832462..1e3c2bcd2eb5 100644
--- a/nixpkgs/pkgs/development/libraries/appstream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext
 , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
 , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
 , pcre, itstool, gperf, vala, lmdb, libsoup
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext
+    meson ninja pkg-config gettext
     libxslt xmlto docbook_xsl docbook_xml_dtd_45
     gobject-introspection itstool vala
   ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     "-Dvapi=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software metadata handling library";
     homepage    = "https://www.freedesktop.org/wiki/Distributions/AppStream/";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/nixpkgs/pkgs/development/libraries/apr-util/default.nix
index ba12e2d0385a..51e9271b7d7c 100644
--- a/nixpkgs/pkgs/development/libraries/apr-util/default.nix
+++ b/nixpkgs/pkgs/development/libraries/apr-util/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, apr, expat, gnused
+{ lib, stdenv, fetchurl, makeWrapper, apr, expat, gnused
 , sslSupport ? true, openssl
 , bdbSupport ? true, db
 , ldapSupport ? !stdenv.isCygwin, openldap
@@ -10,7 +10,7 @@ assert sslSupport -> openssl != null;
 assert bdbSupport -> db != null;
 assert ldapSupport -> openldap != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   name = "apr-util-1.6.1";
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     inherit sslSupport bdbSupport ldapSupport;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://apr.apache.org/";
     description = "A companion library to APR, the Apache Portable Runtime";
     maintainers = [ maintainers.eelco ];
diff --git a/nixpkgs/pkgs/development/libraries/apr/default.nix b/nixpkgs/pkgs/development/libraries/apr/default.nix
index ce33c0534fa4..c7a1073d137a 100644
--- a/nixpkgs/pkgs/development/libraries/apr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/apr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "apr-1.7.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
 
   # This test needs the net
   postPatch = ''
@@ -23,22 +23,22 @@ stdenv.mkDerivation rec {
       configureFlagsArray+=("--with-installbuilddir=$dev/share/build")
     '';
 
-  configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_file__dev_zero=yes"
     "ac_cv_func_setpgrp_void=0"
     "apr_cv_process_shared_works=1"
     "apr_cv_tcp_nodelay_with_cork=1"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
+  ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
     # Including the Windows headers breaks unistd.h.
     # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
     "ac_cv_header_windows_h=no"
   ];
 
-  CPPFLAGS=stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
+  CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://apr.apache.org/";
     description = "The Apache Portable Runtime library";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix
index 37bc175fede0..1e11661b0098 100644
--- a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt
-, pkgconfig, gettext, xmlsec, zlib
+{ lib, stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt
+, pkg-config, gettext, xmlsec, zlib
 }:
 
 let
@@ -25,9 +25,9 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ];
 
-  nativeBuildInputs = [ pkgconfig gettext ];
+  nativeBuildInputs = [ pkg-config gettext ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interface to banking tasks, file formats and country information";
     homepage = "https://www.aquamaniac.de/";
     hydraPlatforms = [];
diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 4c5192574d86..d240e7e3a9dc 100644
--- a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext
+{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext
 , which
 
 # GUI support
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
     isRelative = path: builtins.substring 0 1 path != "/";
     mkSearchPath = path: ''
       p; g; s,\<PLUGINDIR\>,"${path}",g;
-    '' + stdenv.lib.optionalString (isRelative path) ''
+    '' + lib.optionalString (isRelative path) ''
       s/AddPath(\(.*\));/AddRelPath(\1, GWEN_PathManager_RelModeHome);/g
     '';
 
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     sed -i -e '/GWEN_PathManager_DefinePath.*GWEN_PM_PLUGINDIR/,/^#endif/ {
       /^#if/,/^#endif/ {
         H; /^#endif/ {
-          ${stdenv.lib.concatMapStrings mkSearchPath pluginSearchPaths}
+          ${lib.concatMapStrings mkSearchPath pluginSearchPaths}
         }
       }
     }' src/gwenhywfar.c
@@ -53,11 +53,11 @@ in stdenv.mkDerivation rec {
       configure
   '';
 
-  nativeBuildInputs = [ pkgconfig gettext which ];
+  nativeBuildInputs = [ pkg-config gettext which ];
 
   buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OS abstraction functions used by aqbanking and related tools";
     homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix
index 0e01480a4bdf..f483f232e37b 100644
--- a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }:
+{ lib, stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }:
 
 let
   inherit ((import ./sources.nix).libchipcard) sha256 releaseId version;
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ gwenhywfar pcsclite zlib ];
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for access to chipcards";
     homepage = "https://www.aquamaniac.de/rdm/projects/libchipcard";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix
index 40a96553fbe2..a915723e2ca7 100644
--- a/nixpkgs/pkgs/development/libraries/aravis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool
 , audit, glib, libusb1, libxml2
 , wrapGAppsHook
 , gstreamer ? null
@@ -19,11 +19,11 @@
 
 let
   gstreamerAtLeastVersion1 =
-    stdenv.lib.all
-      (pkg: pkg != null && stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0")
+    lib.all
+      (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0")
       [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
 in
-  assert enableGstPlugin -> stdenv.lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
+  assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
   assert enableViewer -> enableGstPlugin;
   assert enableViewer -> libnotify != null;
   assert enableViewer -> gnome3 != null;
@@ -46,29 +46,29 @@ in
 
     nativeBuildInputs = [
       autoreconfHook
-      pkgconfig
+      pkg-config
       intltool
       gtk-doc
-    ] ++ stdenv.lib.optional enableViewer wrapGAppsHook;
+    ] ++ lib.optional enableViewer wrapGAppsHook;
 
     buildInputs =
       [ glib libxml2 ]
-      ++ stdenv.lib.optional enableUsb libusb1
-      ++ stdenv.lib.optional enablePacketSocket audit
-      ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
-      ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
+      ++ lib.optional enableUsb libusb1
+      ++ lib.optional enablePacketSocket audit
+      ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
+      ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
 
-    preAutoreconf = ''./autogen.sh'';
+    preAutoreconf = "./autogen.sh";
 
     configureFlags =
-      stdenv.lib.optional enableUsb "--enable-usb"
-        ++ stdenv.lib.optional enablePacketSocket "--enable-packet-socket"
-        ++ stdenv.lib.optional enableViewer "--enable-viewer"
-        ++ stdenv.lib.optional enableGstPlugin
+      lib.optional enableUsb "--enable-usb"
+        ++ lib.optional enablePacketSocket "--enable-packet-socket"
+        ++ lib.optional enableViewer "--enable-viewer"
+        ++ lib.optional enableGstPlugin
         (if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin")
-        ++ stdenv.lib.optional enableCppTest "--enable-cpp-test"
-        ++ stdenv.lib.optional enableFastHeartbeat "--enable-fast-heartbeat"
-        ++ stdenv.lib.optional enableAsan "--enable-asan";
+        ++ lib.optional enableCppTest "--enable-cpp-test"
+        ++ lib.optional enableFastHeartbeat "--enable-fast-heartbeat"
+        ++ lib.optional enableAsan "--enable-asan";
 
     postPatch = ''
         ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
@@ -82,9 +82,9 @@ in
         Implements the gigabit ethernet and USB3 protocols used by industrial cameras.
       '';
       homepage = "https://aravisproject.github.io/docs/aravis-0.5";
-      license = stdenv.lib.licenses.lgpl2;
+      license = lib.licenses.lgpl2;
       maintainers = [];
-      platforms = stdenv.lib.platforms.unix;
+      platforms = lib.platforms.unix;
     };
   }
 
diff --git a/nixpkgs/pkgs/development/libraries/arb/default.nix b/nixpkgs/pkgs/development/libraries/arb/default.nix
index a9fb5de0bd9f..1c356b59d8a7 100644
--- a/nixpkgs/pkgs/development/libraries/arb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
+{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
 stdenv.mkDerivation rec {
   pname = "arb";
   version = "2.17.0";
@@ -16,12 +16,11 @@ stdenv.mkDerivation rec {
     "--with-flint=${flint}"
   ];
   doCheck = true;
-  meta = with stdenv.lib; {
-    inherit version;
-    description = ''A library for arbitrary-precision interval arithmetic'';
-    homepage = "http://arblib.org/";
-    license = stdenv.lib.licenses.lgpl21Plus;
+  meta = with lib; {
+    description = "A library for arbitrary-precision interval arithmetic";
+    homepage = "https://arblib.org/";
+    license = lib.licenses.lgpl21Plus;
     maintainers = teams.sage.members;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix
index f961c577aa7d..33b253718a7f 100644
--- a/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix
+++ b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 let
   patch-argp-fmtstream = fetchpatch {
@@ -28,12 +28,12 @@ stdenv.mkDerivation {
   };
 
   patches =
-       stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ];
+       lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ];
 
-  patchFlags = stdenv.lib.optional stdenv.hostPlatform.isDarwin "-p0";
+  patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0";
 
-  preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'";
+  preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'";
 
   postInstall = ''
     mkdir -p $out/lib $out/include
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.lysator.liu.se/~nisse/misc/";
     description = "Standalone version of arguments parsing functions from GLIBC";
     platforms = with platforms; darwin ++ linux;
diff --git a/nixpkgs/pkgs/development/libraries/argtable/default.nix b/nixpkgs/pkgs/development/libraries/argtable/default.nix
new file mode 100644
index 000000000000..a16885ab2549
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/argtable/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "argtable";
+  version = "3.1.5";
+  srcVersion = "v${version}.1c1bb23";
+
+  src = fetchFromGitHub {
+    owner = "argtable";
+    repo = "argtable3";
+    rev = srcVersion;
+    sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  postPatch = ''
+    patchShebangs tools/build
+  '';
+
+  meta = with lib; {
+    homepage = "https://argtable.org";
+    description = "A single-file, ANSI C command-line parsing library";
+    longDescription = ''
+      Argtable is an open source ANSI C library that parses GNU-style
+      command-line options. It simplifies command-line parsing by defining a
+      declarative-style API that you can use to specify what your command-line
+      syntax looks like. Argtable will automatically generate consistent error
+      handling logic and textual descriptions of the command line syntax, which
+      are essential but tedious to implement for a robust CLI program.
+    '';
+    license = with licenses; bsd3;
+    maintainers = with maintainers; [ AndersonTorres artuuge ];
+    platforms = with platforms; all;
+  };
+}
+# TODO [ AndersonTorres ]: a NixOS test suite
diff --git a/nixpkgs/pkgs/development/libraries/arguments/default.nix b/nixpkgs/pkgs/development/libraries/arguments/default.nix
index cb0c65e97e3b..85dafde83c27 100644
--- a/nixpkgs/pkgs/development/libraries/arguments/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arguments/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "arguments";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Library for argument handling for MINC programs";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/aribb25/default.nix b/nixpkgs/pkgs/development/libraries/aribb25/default.nix
index ceae86985456..3e171d757973 100644
--- a/nixpkgs/pkgs/development/libraries/aribb25/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aribb25/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitLab
 , fetchpatch
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , pcsclite
 , PCSC
 , xcbuild
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ] ++ lib.optional stdenv.isDarwin xcbuild;
   buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ];
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   buildFlags =
     lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.videolan.org/videolan/aribb25";
     description = "Sample implementation of the ARIB STD-B25 standard";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix
index 450182138a40..6696e5720e32 100644
--- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }:
+{ lib, stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "10.1.2";
+  version = "10.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "0pb3ypdaiiw0895x1zzzjvkrfp39bsl3s4f6zb5bzv4wbjv7kvwn";
+    sha256 = "sha256-gvhNUmyNpyJAqwXLErPz8eZ00gzLOOAI5L9TNVsapoo=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./use-unix-config-on-OS-X.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ linear algebra library";
     homepage = "http://arma.sourceforge.net";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
index 9dd4b1b93a9d..c636d672332c 100644
--- a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig
+{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
 , opencl-clhpp, ocl-icd, fftw, fftwFloat
 , blas, lapack, boost, mesa, libGLU, libGL
 , freeimage, python, clfft, clblas
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "-DAF_BUILD_OPENCL=OFF"
     "-DAF_BUILD_EXAMPLES=OFF"
     "-DBUILD_TESTING=OFF"
-  ] ++ stdenv.lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs";
+  ] ++ lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs";
 
   patches = [ ./no-download.patch ];
 
@@ -32,15 +32,13 @@ stdenv.mkDerivation rec {
     cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp
   '';
 
-  preBuild = stdenv.lib.optionalString cudaSupport ''
+  preBuild = lib.optionalString cudaSupport ''
     export CUDA_PATH="${cudatoolkit}"
   '';
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
     python
   ];
 
@@ -50,11 +48,11 @@ stdenv.mkDerivation rec {
     libGLU libGL
     mesa freeimage
     boost.out boost.dev
-  ] ++ (stdenv.lib.optional stdenv.isLinux ocl-icd)
-    ++ (stdenv.lib.optional cudaSupport cudatoolkit)
-    ++ (stdenv.lib.optional buildDocs doxygen);
+  ] ++ (lib.optional stdenv.isLinux ocl-icd)
+    ++ (lib.optional cudaSupport cudatoolkit)
+    ++ (lib.optional buildDocs doxygen);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A general-purpose library for parallel and massively-parallel computations";
     longDescription = ''
       A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.";
diff --git a/nixpkgs/pkgs/development/libraries/asio/generic.nix b/nixpkgs/pkgs/development/libraries/asio/generic.nix
index d83a48e61b8a..8bcc12ae2b3a 100644
--- a/nixpkgs/pkgs/development/libraries/asio/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/asio/generic.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, boost, openssl
+{lib, stdenv, fetchurl, boost, openssl
 , version, sha256, ...
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   pname = "asio";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     homepage = "http://asio.sourceforge.net/";
     description = "Cross-platform C++ library for network and low-level I/O programming";
     license = licenses.boost;
-    broken = stdenv.isDarwin && stdenv.lib.versionOlder version "1.16.1";
+    broken = stdenv.isDarwin && lib.versionOlder version "1.16.1";
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/aspell/default.nix b/nixpkgs/pkgs/development/libraries/aspell/default.nix
index 68faef7e7862..01acced98f6f 100644
--- a/nixpkgs/pkgs/development/libraries/aspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, fetchzip, perl
+{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl
 , searchNixProfiles ? true
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
   };
 
-  patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
+  patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
 
   postPatch = ''
     patch interfaces/cc/aspell.h < ${./clang.patch}
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Spell checker for many languages";
     homepage = "http://aspell.net/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     maintainers = [ ];
-    platforms = with stdenv.lib.platforms; all;
+    platforms = with lib.platforms; all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
index d40f4b5aae42..3923416c4a35 100644
--- a/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
@@ -49,7 +49,7 @@ let
 
       meta = {
         description = "Aspell dictionary for ${fullName}";
-        platforms = stdenv.lib.platforms.all;
+        platforms = lib.platforms.all;
       } // (args.meta or {});
     } // removeAttrs args [ "meta" ]);
 
diff --git a/nixpkgs/pkgs/development/libraries/assimp/default.nix b/nixpkgs/pkgs/development/libraries/assimp/default.nix
index c1972aa1ca81..a2cd3a2a4571 100644
--- a/nixpkgs/pkgs/development/libraries/assimp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/assimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "assimp";
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "00vxzfcrs856qnyk806wqr67nmpjk06mjby0fqmyhm6i1jj2hg1w";
   };
 
-  buildInputs = [ cmake boost zlib ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to import various 3D model formats";
     homepage = "http://assimp.sourceforge.net/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
index 04f8c266131b..1e5a1d3fd64c 100644
--- a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 
 , at-spi2-core
 , atk
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   version = "2.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8=";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
 
   doCheck = false; # fails with "No test data file provided"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
     homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
index ba77020ec703..7e1181cf3bdf 100644
--- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , gsettings-desktop-schemas
 , makeWrapper
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
   version = "2.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU=";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ];
   buildInputs = [ libX11 libXtst libXi ];
   # In atspi-2.pc dbus-1 glib-2.0
   propagatedBuildInputs = [ dbus glib ];
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Cannot use wrapGAppsHook'due to a dependency cycle
     wrapProgram $out/libexec/at-spi-bus-launcher \
-      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
     homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/atk/default.nix b/nixpkgs/pkgs/development/libraries/atk/default.nix
index aa132515b3e9..53eb4459770d 100644
--- a/nixpkgs/pkgs/development/libraries/atk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/atk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib
+{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
 , fixDarwinDylibNames, gobject-introspection, gnome3
 }:
 
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     # Required by atk.pc
@@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
 
     homepage = "http://library.gnome.org/devel/atk/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/atkmm/default.nix b/nixpkgs/pkgs/development/libraries/atkmm/default.nix
index cc45dc5a8d88..e9c63eb650f7 100644
--- a/nixpkgs/pkgs/development/libraries/atkmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/atkmm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }:
+{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "atkmm";
   version = "2.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ atk glibmm ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   doCheck = true;
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ wrappers for ATK accessibility toolkit";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     homepage = "https://gtkmm.org";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/attr/default.nix b/nixpkgs/pkgs/development/libraries/attr/default.nix
index d69d475f7370..b7c9287b68bc 100644
--- a/nixpkgs/pkgs/development/libraries/attr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/attr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext }:
+{ lib, stdenv, fetchurl, gettext }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://savannah.nongnu.org/projects/attr/";
     description = "Library and tools for manipulating extended attributes";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/aubio/default.nix b/nixpkgs/pkgs/development/libraries/aubio/default.nix
index bd1d86520c0c..7aa4859ef0ed 100644
--- a/nixpkgs/pkgs/development/libraries/aubio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aubio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
-, libsndfile, pkgconfig, python, wafHook
+{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
+, libsndfile, pkg-config, python, wafHook
 }:
 
 stdenv.mkDerivation rec {
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl";
   };
 
-  nativeBuildInputs = [ pkgconfig python wafHook ];
+  nativeBuildInputs = [ pkg-config python wafHook ];
   buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for audio labelling";
     homepage = "https://aubio.org/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/audiality2/default.nix b/nixpkgs/pkgs/development/libraries/audiality2/default.nix
index a311c5f5479f..e0ab0accdfde 100644
--- a/nixpkgs/pkgs/development/libraries/audiality2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audiality2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     jack2
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A realtime scripted modular audio engine for video games and musical applications";
     homepage = "http://audiality.org";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix b/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix
deleted file mode 100644
index 7c9b3ef67c9b..000000000000
--- a/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }:
-
-stdenv.mkDerivation rec {
-  version = "1.0-beta.1";
-  pname = "JamomaCore";
-
-  src = fetchFromGitHub {
-    owner = "jamoma";
-    repo = "JamomaCore";
-    rev = "v${version}";
-    sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ alsaLib portaudio portmidi libsndfile cmake libxml2 ];
-
-  meta = {
-    description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";
-    homepage = "http://www.jamoma.org";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
-    broken = true; # 2018-04-10
-  };
-}
diff --git a/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
index 593854bb280d..2e10dbd88150 100644
--- a/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, unzip, fetchurl }:
+{ lib, stdenv, unzip, fetchurl }:
 
 # Upstream changes files in-place, to update:
 # 1. Check latest version at http://www.un4seen.com/
@@ -55,7 +55,7 @@ let
         install -m644 -t $out/include/ ${bass.h}
       '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Shareware audio library";
       homepage = "https://www.un4seen.com/";
       license = licenses.unfreeRedistributable;
@@ -63,4 +63,4 @@ let
     };
   };
 
-in stdenv.lib.mapAttrs dropBass allBass
+in lib.mapAttrs dropBass allBass
diff --git a/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix
index bc98dab4ab62..11135b14fd48 100644
--- a/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libsndfile }:
+{ lib, stdenv, fetchurl, pkg-config, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "libbs2b";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsndfile ];
 
   hardeningDisable = [ "format" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://bs2b.sourceforge.net/";
     description = "Bauer stereophonic-to-binaural DSP library";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix b/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix
index 3ac8293986d8..927bd00656e6 100644
--- a/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
+{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
 let
   version = "0.6.3";
 in stdenv.mkDerivation {
   pname = "libgme";
   inherit version;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of video game music chip emulators";
     homepage = "https://bitbucket.org/mpyne/game-music-emu/overview";
     license = licenses.lgpl21;
@@ -20,15 +20,13 @@ in stdenv.mkDerivation {
     sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy";
   };
 
-  buildInputs = [ cmake ];
-
-  nativeBuildInputs = [ removeReferencesTo ];
+  nativeBuildInputs = [ cmake removeReferencesTo ];
 
   # It used to reference it, in the past, but thanks to the postFixup hook, now
   # it doesn't.
   disallowedReferences = [ stdenv.cc.cc ];
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)"
   '';
 }
diff --git a/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix b/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix
index 3968794d2dc7..29781446c8fe 100644
--- a/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "libinstpatch";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "-DLIB_SUFFIX=" # Install in $out/lib.
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.swamiproject.org/";
     description = "MIDI instrument patch files support library";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
index c2b2725c19cc..9c636e0205df 100644
--- a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libmysofa";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCODE_COVERAGE=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reader for AES SOFA files to get better HRTFs";
     homepage = "https://github.com/hoene/libmysofa";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix
index d521b7e76abb..0c173a6a99e0 100644
--- a/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }:
+{ lib, stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.3";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading and writing Standard MIDI Files";
     homepage = "https://github.com/stump/libsmf";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
index e8008058626a..79f09f48464f 100644
--- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }:
+{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "lilv";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   patches = [ ./lilv-pkgconfig.patch ];
 
-  nativeBuildInputs = [ pkgconfig python3 wafHook ];
+  nativeBuildInputs = [ pkg-config python3 wafHook ];
   buildInputs = [ serd sord sratom ];
   propagatedBuildInputs = [ lv2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/lilv";
     description = "A C library to make the use of LV2 plugins";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
index dac985846469..45caf0b36c50 100644
--- a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }:
+{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "lv2";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook ];
+  nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [ gtk2 libsndfile python3 ];
 
-  wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
+  wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lv2plug.in";
     description = "A plugin standard for audio systems";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix
index 6bc487e26162..cecae743da05 100644
--- a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
+{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "lvtk";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
   };
 
-  nativeBuildInputs = [ pkgconfig python wafHook ];
+  nativeBuildInputs = [ pkg-config python wafHook ];
   buildInputs = [ boost gtkmm2 lv2 ];
 
   enableParallelBuilding = true;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--boost-libs=${boost.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set C++ wrappers around the LV2 C API";
     homepage = "https://lvtk.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix b/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix
index 1fda3a919264..f13f6d7063cb 100644
--- a/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "mbelib";
@@ -13,15 +13,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
   preCheck = ''
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
     export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "P25 Phase 1 and ProVoice vocoder";
     homepage = https://github.com/szechyjs/mbelib;
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix
index f039e574d547..ecb0215a2287 100644
--- a/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
+{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "ntk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook ];
+  nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [
     cairo libjpeg libXft python2
   ];
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     description = "Fork of FLTK 1.3.0 with additional functionality";
     version = version;
     homepage = "http://non.tuxfamily.org/";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ magnetophon nico202 ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix b/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix
index a93b031a4d15..3d8e15f97cdb 100644
--- a/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , kissfft
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ library of functions for DSP and Music Informatics purposes";
     homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/audio/raul/default.nix b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix
index 8acd6d3c6664..a0089e310441 100644
--- a/nixpkgs/pkgs/development/libraries/audio/raul/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }:
+{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "raul";
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook ];
+  nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [ boost gtk2 python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ utility library primarily aimed at audio/musical applications";
     homepage = "http://drobilla.net/software/raul";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix
index 53efa598079b..820ea1e49b9e 100644
--- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2,  alsaLib, pulseaudio, rtmidi }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2,  alsaLib, pulseaudio, rtmidi }:
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ./configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of C++ classes that provide a cross platform API for realtime audio input/output";
     homepage =  "http://www.music.mcgill.ca/~gary/rtaudio/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
index d30b1ce6c64c..f6208bab6c60 100644
--- a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "4.0.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ autoconf automake libtool libjack2 alsaLib ];
 
   preConfigure = ''
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output";
     homepage =  "http://www.music.mcgill.ca/~gary/rtmidi/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix
index cec50290d09e..464e79f6c2dd 100644
--- a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }:
+{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "sratom";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook python3 ];
+  nativeBuildInputs = [ pkg-config wafHook python3 ];
   buildInputs = [ lv2 serd sord ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/sratom";
     description = "A library for serialising LV2 atoms to/from RDF";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/audio/suil/default.nix b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix
index c2496840b7d4..0f4dd0f62c47 100644
--- a/nixpkgs/pkgs/development/libraries/audio/suil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
+{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom
 , wafHook
 , withQt4 ? true, qt4 ? null
 , withQt5 ? false, qt5 ? null }:
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook ];
+  nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [ gtk2 lv2 python serd sord sratom ]
     ++ (lib.optionals withQt4 [ qt4 ])
     ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/suil";
     description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
index 0e49a6265120..4d033d99d295 100644
--- a/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
@@ -1,7 +1,7 @@
 # set VAMP_PATH ?
 # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
 
-{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "vamp-plugin-sdk";
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
     sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsndfile ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
     homepage = "https://vamp-plugins.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index c819f355e0b8..45f5fcfe3a44 100644
--- a/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl , alsaLib, }:
+{ lib, stdenv, fetchurl , alsaLib, }:
 
 stdenv.mkDerivation rec {
   pname = "zita-alsa-pcmi";
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
     description = "The successor of clalsadrv, provides easy access to ALSA PCM devices";
     version = version;
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix
index 2b7d89b30a17..3b77bf549ca6 100644
--- a/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fftwFloat }:
+{ lib, stdenv, fetchurl, fftwFloat }:
 
 stdenv.mkDerivation rec {
   pname = "zita-convolver";
@@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     # create lib link for building apps
-    ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${stdenv.lib.versions.major version}
+    ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${lib.versions.major version}
   '';
 
   meta = {
     description = "Convolution library by Fons Adriaensen";
     version = version;
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix
index 2881e5662180..88e81d733b32 100644
--- a/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "zita-resampler";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     description = "Resample library by Fons Adriaensen";
     version = version;
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/audiofile/default.nix b/nixpkgs/pkgs/development/libraries/audiofile/default.nix
index 86531a6ad25d..88b1840955d3 100644
--- a/nixpkgs/pkgs/development/libraries/audiofile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audiofile/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   name = "audiofile-0.3.6";
 
   buildInputs =
-    stdenv.lib.optionals stdenv.isLinux [
+    lib.optionals stdenv.isLinux [
       alsaLib
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    ] ++ lib.optionals stdenv.isDarwin [
       CoreServices AudioUnit
     ];
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing audio files in various formats";
     homepage    = "http://www.68k.org/~michael/audiofile/";
     license     = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix
index a560cc39d162..dd54ba79db72 100644
--- a/nixpkgs/pkgs/development/libraries/avahi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
+{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages
 , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent
 , gtk3Support ? false, gtk3 ? null
 , qt4 ? null
@@ -13,11 +13,11 @@ assert qt4Support -> qt4 != null;
 
 let
   # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it
-  pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"'';
+  pkg-config-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"'';
 in
 
 stdenv.mkDerivation rec {
-  name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
+  name = "avahi${lib.optionalString withLibdnssdCompat "-compat"}-${version}";
   version = "0.8";
 
   src = fetchurl {
@@ -36,32 +36,32 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libdaemon dbus glib expat libiconv libevent ]
     ++ (with perlPackages; [ perl XMLParser ])
-    ++ (stdenv.lib.optional gtk3Support gtk3)
-    ++ (stdenv.lib.optional qt4Support qt4)
-    ++ (stdenv.lib.optional qt5Support qt5);
+    ++ (lib.optional gtk3Support gtk3)
+    ++ (lib.optional qt4Support qt4)
+    ++ (lib.optional qt5Support qt5);
 
   propagatedBuildInputs =
-    stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
+    lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
 
-  nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ];
+  nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ];
 
   configureFlags =
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
       "--disable-gtk" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
-      (stdenv.lib.enableFeature gtk3Support "gtk3")
+      (lib.enableFeature gtk3Support "gtk3")
       "--${if qt4Support then "enable" else "disable"}-qt4"
       "--${if qt5Support then "enable" else "disable"}-qt5"
-      (stdenv.lib.enableFeature withPython "python")
+      (lib.enableFeature withPython "python")
       "--localstatedir=/var" "--with-distro=none"
       # A systemd unit is provided by the avahi-daemon NixOS module
       "--with-systemdsystemunitdir=no" ]
-    ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
+    ++ lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
     # autoipd won't build on darwin
-    ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd";
+    ++ lib.optional stdenv.isDarwin "--disable-autoipd";
 
   NIX_CFLAGS_COMPILE = "-DAVAHI_SERVICE_DIR=\"/etc/avahi/services\"";
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+  preBuild = lib.optionalString stdenv.isDarwin ''
     sed -i '20 i\
     #define __APPLE_USE_RFC_2292' \
     avahi-core/socket.c
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     # Maintain compat for mdnsresponder and howl
-    stdenv.lib.optionalString withLibdnssdCompat ''
+    lib.optionalString withLibdnssdCompat ''
       ln -s avahi-compat-libdns_sd/dns_sd.h "$out/include/dns_sd.h"
     '';
   /*  # these don't exist (anymore?)
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
   */
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "mDNS/DNS-SD implementation";
     homepage    = "http://avahi.org";
     license     = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix
index 3e7bc67d25b3..15e2516c1b6b 100644
--- a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost, python2}:
+{ lib, stdenv, fetchurl, cmake, boost, python2}:
 
 let version = "1.8.2"; in
 
@@ -11,24 +11,19 @@ stdenv.mkDerivation {
     sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k";
   };
 
-  buildInputs = [
-    cmake
-    python2
-    boost
-  ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ python2 boost ];
 
   preConfigure = ''
     substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"
     substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE"
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "A C++ library which implements parts of the Avro Specification";
     homepage = "https://avro.apache.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ rasendubi ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ rasendubi ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/nixpkgs/pkgs/development/libraries/avro-c/default.nix
index d96930f37f24..a5acd7c7898b 100644
--- a/nixpkgs/pkgs/development/libraries/avro-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/avro-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }:
+{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
 
 let
   version = "1.9.1";
@@ -15,13 +15,11 @@ in stdenv.mkDerivation {
     patchShebangs .
   '';
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   buildInputs = [ jansson zlib ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library which implements parts of the Avro Specification";
     homepage = "https://avro.apache.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix
new file mode 100644
index 000000000000..057aad447d5e
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl, Security }:
+
+stdenv.mkDerivation rec {
+  pname = "aws-c-cal";
+  version = "0.4.5";
+
+  src = fetchFromGitHub {
+    owner = "awslabs";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ aws-c-common openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
+  ];
+
+  meta = with lib; {
+    description = "AWS Crypto Abstraction Layer ";
+    homepage = "https://github.com/awslabs/aws-c-cal";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
index b028813558f5..23d7f9d8629a 100644
--- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
@@ -2,17 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-c-common";
-  version = "0.3.11";
+  version = "0.4.64";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0a7hi4crnc3j1j39qcnd44zqdfwzw1xghcf80marx5vdf1qdzy6p";
+    sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A=";
   };
 
   nativeBuildInputs = [ cmake ];
 
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
     "-Wno-nullability-extension -Wno-typedef-redefinition";
 
diff --git a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
index ca3203e3a6ab..4cfabc77bb2c 100644
--- a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
@@ -1,19 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, aws-checksums, libexecinfo }:
+{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n, libexecinfo }:
 
 stdenv.mkDerivation rec {
   pname = "aws-c-event-stream";
-  version = "0.1.1";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0anjynfghk3inysy21wqvhxha33xsswh3lm8pr7nx7cpj6cmr37m";
+    sha256 = "1hbri4dv924ph3cxkmwkl4kdca4dvhc9qda60rdzs6355l76k23n";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ aws-c-common aws-checksums ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo;
+  buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n ]
+    ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo;
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS:BOOL=ON"
diff --git a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
new file mode 100644
index 000000000000..e2074cc835a6
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n }:
+
+stdenv.mkDerivation rec {
+  pname = "aws-c-io";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "awslabs";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ aws-c-cal aws-c-common s2n ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
+  ];
+
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error";
+
+  meta = with lib; {
+    description = "AWS SDK for C module for IO and TLS";
+    homepage = "https://github.com/awslabs/aws-c-io";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix b/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
index d4ba15e52db4..bf50401a213e 100644
--- a/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
@@ -1,19 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common }:
 
 stdenv.mkDerivation rec {
   pname = "aws-checksums";
-  version = "0.1.7";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0am1hfzqir44zcx6y6c7jw74qvbsav8ppr9dahpdh3ac95cjf38a";
+    sha256 = "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ];
+  buildInputs = [ aws-c-common ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
+  ];
 
   meta = with lib; {
     description = "HW accelerated CRC32c and CRC32";
diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch
index 6e4cad9e73cf..b2f12e77025c 100644
--- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch
+++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch
@@ -1,15 +1,5 @@
-diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
-index e87252123e..5457bd5910 100644
 --- a/cmake/AWSSDKConfig.cmake
 +++ b/cmake/AWSSDKConfig.cmake
-@@ -82,6 +82,7 @@ if (AWSSDK_ROOT_DIR)
-             )
- else()
-     find_file(AWSSDK_CORE_HEADER_FILE Aws.h
-+        "/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
-         "/usr/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
-         "/usr/local/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
-         "C:/Progra~1/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
 @@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE)
      message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first")
  endif()
diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 94827743bf3d..7b10fc463dd1 100644
--- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch
-, aws-c-common, aws-c-event-stream, aws-checksums
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib
+, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums
 , CoreAudio, AudioToolbox
 , # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
   apis ? ["*"]
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-sdk-cpp";
-  version = "1.7.90";
+  version = "1.8.121";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga";
+    sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ=";
   };
 
   # FIXME: might be nice to put different APIs in different outputs
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake curl ];
 
   buildInputs = [
-    curl openssl zlib
-    aws-c-common aws-c-event-stream aws-checksums
+    curl openssl s2n zlib
+    aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums
   ] ++ lib.optionals (stdenv.isDarwin &&
                         ((builtins.elem "text-to-speech" apis) ||
                          (builtins.elem "*" apis)))
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
   ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     "-DENABLE_TESTING=OFF"
-    "-DCURL_HAS_H2=0"
+    "-DCURL_HAS_H2=1"
+    "-DCURL_HAS_TLS_PROXY=1"
   ] ++ lib.optional (apis != ["*"])
     "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
 
@@ -53,16 +54,12 @@ stdenv.mkDerivation rec {
   postFixupHooks = [
     # This bodge is necessary so that the file that the generated -config.cmake file
     # points to an existing directory.
-    ''mkdir -p $out/include''
+    "mkdir -p $out/include"
   ];
 
   __darwinAllowLocalNetworking = true;
 
   patches = [
-    (fetchpatch {
-      url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
-      sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
-    })
     ./cmake-dirs.patch
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix
index 127fe1c97504..60417426f76c 100644
--- a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , pkg-config, autoreconfHook
 , gtk3, gobject-introspection, gtk-doc, vala
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ayatana Display Indicator Objects";
     homepage = "https://github.com/AyatanaIndicators/ayatana-ido";
     changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog";
diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix
index 9bb6e9e1c5e0..6e3a5abaaa65 100644
--- a/nixpkgs/pkgs/development/libraries/babl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/babl/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , lcms2
 , vala
@@ -10,19 +10,19 @@
 
 stdenv.mkDerivation rec {
   pname = "babl";
-  version = "0.1.82";
+  version = "0.1.84";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1iddkwdfw1bmfl6n8y1d4kkm3rb15rzvrfri6a7cnx37mpa96bf6";
+    url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gobject-introspection
     vala
   ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     lcms2
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Image pixel format conversion library";
     homepage = "https://gegl.org/babl/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix
index d80413048560..95d54993e069 100644
--- a/nixpkgs/pkgs/development/libraries/bamf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , pantheon
 , autoconf
 , automake
@@ -10,7 +10,7 @@
 , libwnck3
 , glib
 , vala
-, pkgconfig
+, pkg-config
 , libstartup_notification
 , gobject-introspection
 , gtk-doc
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     gtk-doc
     libtool
-    pkgconfig
+    pkg-config
     vala
     which
     wrapGAppsHook
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   # glib-2.62 deprecations
   NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Application matching framework";
     longDescription = ''
       Removes the headache of applications matching
diff --git a/nixpkgs/pkgs/development/libraries/bashup-events/3.2.nix b/nixpkgs/pkgs/development/libraries/bashup-events/3.2.nix
new file mode 100644
index 000000000000..f7e88c382511
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/bashup-events/3.2.nix
@@ -0,0 +1,26 @@
+{ callPackage, fetchFromGitHub }:
+
+callPackage ./generic.nix {
+  variant = "3.2";
+  version = "2019-07-27";
+  branch = "master";
+  src = fetchFromGitHub {
+    owner = "bashup";
+    repo = "events";
+    rev = "83744c21bf720afb8325343674c62ab46a8f3d94";
+    hash = "sha256-0VDjd+1T1JBmSDGovWOOecUZmNztlwG32UcstfdigbI=";
+  };
+  fake = {
+    # Note: __ev.encode is actually defined, but it happens in a
+    # quoted arg to eval, which resholve currently doesn't (and may
+    # never) parse into. See abathur/resholve/issues/2.
+    function = [ "__ev.encode" ];
+  };
+  keep = {
+    # allow vars in eval
+    eval = [ "e" "f" "q" "r" ];
+    # allow vars executed as commands
+    "$f" = true;
+    "$n" = true;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/bashup-events/4.4.nix b/nixpkgs/pkgs/development/libraries/bashup-events/4.4.nix
new file mode 100644
index 000000000000..f880009ea71a
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/bashup-events/4.4.nix
@@ -0,0 +1,20 @@
+{ callPackage, fetchFromGitHub }:
+
+callPackage ./generic.nix {
+  variant = "4.4";
+  version = "2020-04-04";
+  branch = "bash44";
+  src = fetchFromGitHub {
+    owner = "bashup";
+    repo = "events";
+    rev = "e97654f5602fc4e31083b27afa18dcc89b3e8296";
+    hash = "sha256-51OSIod3mEg3MKs4rrMgRcOimDGC+3UIr4Bl/cTRyGM=";
+  };
+  keep = {
+    # allow vars in eval
+    eval = [ "e" "bashup_ev" "n" ];
+    # allow vars executed as commands
+    "$f" = true;
+    "$n" = true;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/bashup-events/default.nix b/nixpkgs/pkgs/development/libraries/bashup-events/default.nix
new file mode 100644
index 000000000000..bcefdd0fcacf
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/bashup-events/default.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+{
+  bashup-events32 = callPackage ./3.2.nix { };
+  bashup-events44 = callPackage ./4.4.nix { };
+}
diff --git a/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix
new file mode 100644
index 000000000000..78ef4c2f3369
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix
@@ -0,0 +1,83 @@
+{
+  # general
+  lib
+, callPackage
+, runCommand
+, resholvePackage
+, bash
+, shellcheck
+, doCheck ? true
+, doInstallCheck ? true
+  # variant-specific
+, variant
+, version
+, branch
+, src
+, fake ? false
+, keep
+}:
+let
+  # extracting this so that it's trivial to test in other shells
+  installCheck = shell:
+    ''
+      echo "testing bashup.events in ${shell}"
+      ${shell} <<'EOF'
+      source $out/bin/bashup.events
+      neat(){
+        echo $0: Hi from event \'test event\'. I can have both $1 and $2 arguments.
+        exit 0
+      }
+      event on "test event" @2 neat curried
+      echo event registered
+      event emit "test event" runtime
+      exit 1 # fail if emitting event didn't exit clean
+      EOF
+    '';
+
+in
+resholvePackage rec {
+  # bashup.events doesn't version yet but it has two variants with
+  # differing features/performance characteristics:
+  # - branch master: a variant for bash 3.2+
+  # - branch bash44: a variant for bash 4.4+
+  pname = "bashup-events${variant}-unstable";
+  # should be YYYY-MM-DD
+  inherit version;
+  inherit src;
+
+  installPhase = ''
+    install -Dt $out/bin bashup.events
+  '';
+
+  inherit doCheck;
+  checkInputs = [ shellcheck bash ];
+
+  # check based on https://github.com/bashup/events/blob/master/.dkrc
+  checkPhase = ''
+    SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events
+    ${bash}/bin/bash -n ./bashup.events
+    ${bash}/bin/bash ./bashup.events
+  '';
+
+  solutions = {
+    events = {
+      inputs = [ ];
+      interpreter = "none";
+      scripts = [ "bin/bashup.events" ];
+      inherit keep;
+    } // lib.optionalAttrs (lib.isAttrs fake) { inherit fake; };
+  };
+
+  inherit doInstallCheck;
+  installCheckInputs = [ bash ];
+  installCheckPhase = installCheck "${bash}/bin/bash";
+
+  meta = with lib; {
+    inherit branch;
+    description = "An event listener/callback API for creating extensible bash programs";
+    homepage = "https://github.com/bashup/events";
+    license = licenses.cc0;
+    maintainers = with maintainers; [ abathur ];
+    platforms = platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/bcg729/default.nix b/nixpkgs/pkgs/development/libraries/bcg729/default.nix
index f178c192de54..125512c3fed6 100644
--- a/nixpkgs/pkgs/development/libraries/bcg729/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bcg729/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , cmake
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec";
     homepage = "https://linphone.org/technical-corner/bcg729";
     changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS";
diff --git a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
index 655d3a5808a9..dd72b7eb41df 100644
--- a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
@@ -2,7 +2,7 @@
 , cmake
 , fetchFromGitLab
 , mbedtls
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Utilities library for Linphone";
     homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
diff --git a/nixpkgs/pkgs/development/libraries/beecrypt/default.nix b/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
index 2433edbfe8f3..6b86fca868f6 100644
--- a/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4}:
+{lib, stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation {
   name = "beecrypt-4.2.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--disable-optimized" "--enable-static" ];
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl2;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/beignet/default.nix b/nixpkgs/pkgs/development/libraries/beignet/default.nix
index 89ef702f4e50..8e8e455e59a6 100644
--- a/nixpkgs/pkgs/development/libraries/beignet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/beignet/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
-, pkgconfig
+, pkg-config
 , clang-unwrapped
 , llvm
 , libdrm
@@ -30,8 +30,6 @@ stdenv.mkDerivation rec {
 
   patches = [ ./clang_llvm.patch ];
 
-  enableParallelBuilding = true;
-
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors"
     patchShebangs src/git_sha1.sh
@@ -54,7 +52,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
     python3
   ];
 
@@ -66,12 +64,10 @@ stdenv.mkDerivation rec {
       cd utests
     '';
 
-    enableParallelBuilding = true;
-
     nativeBuildInputs = [
       cmake
       python3
-      pkgconfig
+      pkg-config
       makeWrapper
     ];
 
@@ -100,7 +96,7 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cgit.freedesktop.org/beignet/";
     description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/belcard/default.nix b/nixpkgs/pkgs/development/libraries/belcard/default.nix
index 35de9fb93477..03f6e96e187d 100644
--- a/nixpkgs/pkgs/development/libraries/belcard/default.nix
+++ b/nixpkgs/pkgs/development/libraries/belcard/default.nix
@@ -2,12 +2,12 @@
 , belr
 , cmake
 , fetchFromGitLab
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
   pname = "belcard";
-  version = "4.4.13";
+  version = "4.4.24";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m";
+    sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops=";
   };
 
   buildInputs = [ bctoolbox belr ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   # Do not build static libraries
   cmakeFlags = [ "-DENABLE_STATIC=NO" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library to manipulate VCard standard format";
     homepage = "https://gitlab.linphone.org/BC/public/belcard";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
index 8a028b5e0a06..e08fc1ae3ee3 100644
--- a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitLab
 , libantlr3c
 , mbedtls
-, stdenv
+, lib, stdenv
 , zlib
 }:
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://linphone.org/technical-corner/belle-sip";
     description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/belr/default.nix b/nixpkgs/pkgs/development/libraries/belr/default.nix
index ab3df9bae7ee..b38757525abd 100644
--- a/nixpkgs/pkgs/development/libraries/belr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/belr/default.nix
@@ -1,7 +1,7 @@
 { bctoolbox
 , cmake
 , fetchFromGitLab
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   # Do not build static libraries
   cmakeFlags = [ "-DENABLE_STATIC=NO" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Belledonne Communications' language recognition library";
     homepage = "https://gitlab.linphone.org/BC/public/belr";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/biblesync/default.nix b/nixpkgs/pkgs/development/libraries/biblesync/default.nix
index 27c6637d9fee..74a938cf2a5c 100644
--- a/nixpkgs/pkgs/development/libraries/biblesync/default.nix
+++ b/nixpkgs/pkgs/development/libraries/biblesync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }:
 
 stdenv.mkDerivation rec {
 
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ libuuid ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.crosswire.org/BibleSync";
     description = "A multicast protocol to Bible software shared conavigation";
     longDescription = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       navigation, and handling of incoming packets.
     '';
     license = licenses.publicDomain;
-    maintainers = [ maintainers.AndersonTorres ]; 
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/bobcat/default.nix b/nixpkgs/pkgs/development/libraries/bobcat/default.nix
index 5473801f85d2..06c7ac81dcd2 100644
--- a/nixpkgs/pkgs/development/libraries/bobcat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bobcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, icmake
+{ lib, stdenv, fetchFromGitLab, icmake
 , libmilter, libX11, openssl, readline
 , util-linux, yodl }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     ./build install x
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Brokken's Own Base Classes And Templates";
     homepage = "https://fbb-git.gitlab.io/bobcat/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
index 093c0880b066..e951bdc34e4e 100644
--- a/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libatomic_ops
 , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
 }:
 
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libatomic_ops ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   outputs = [ "out" "dev" "doc" ];
   separateDebugInfo = stdenv.isLinux;
 
-  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
+  preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
     export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
   '';
 
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     license = "https://hboehm.info/gc/license.txt";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
index 1af63a2e4260..85ae01036ed1 100644
--- a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "doc" ];
   separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
 
-  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
+  preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
     export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
   '';
 
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
     license = "https://hboehm.info/gc/license.txt";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/boolstuff/default.nix b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
index 9ec27d3e9ebc..b3d754fb5425 100644
--- a/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in
 
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   meta = {
     description = "Library for operations on boolean expression binary trees";
     homepage = "${baseurl}/boolstuff.html";
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/boost-process/default.nix b/nixpkgs/pkgs/development/libraries/boost-process/default.nix
index 92e02c6ca08f..97e879809528 100644
--- a/nixpkgs/pkgs/development/libraries/boost-process/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boost-process/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "boost-process-0.5";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     cp -r boost $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.highscore.de/boost/process0.5/";
     description = "Library to manage system processes";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/boost/1.67.nix b/nixpkgs/pkgs/development/libraries/boost/1.67.nix
index 31f545ab12be..29993ed02b8c 100644
--- a/nixpkgs/pkgs/development/libraries/boost/1.67.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.67.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.67.0";
@@ -9,7 +9,7 @@ callPackage ./generic.nix (args // {
       sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
       stripLen = 1;
     })
-  ] ++ stdenv.lib.optionals stdenv.cc.isClang [
+  ] ++ lib.optionals stdenv.cc.isClang [
     # Fixes https://github.com/boostorg/atomic/issues/15
     (fetchpatch {
       url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch";
diff --git a/nixpkgs/pkgs/development/libraries/boost/1.71.nix b/nixpkgs/pkgs/development/libraries/boost/1.71.nix
index f66bd4cd6fb1..7b128e25bb60 100644
--- a/nixpkgs/pkgs/development/libraries/boost/1.71.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.71.nix
@@ -5,7 +5,7 @@ callPackage ./generic.nix (args // rec {
 
   src = fetchurl {
     #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2";
-    urls = [ 
+    urls = [
       "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"
       "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
     ];
diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix
index ec3a28e2b1a3..abff1268bfae 100644
--- a/nixpkgs/pkgs/development/libraries/boost/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
+{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
 , fetchpatch
 , which
 , buildPackages
@@ -14,7 +14,8 @@
 , enableNumpy ? false
 , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
 , patches ? []
-, mpi ? null
+, useMpi ? false
+, mpi
 , extraB2Args ? []
 
 # Attributes inherit from specific versions
@@ -30,9 +31,9 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform;
 assert enableNumpy -> enablePython;
 
 # Boost <1.69 can't be build with clang >8, because pth was removed
-assert with stdenv.lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69"));
+assert with lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69"));
 
-with stdenv.lib;
+with lib;
 let
 
   variant = concatStringsSep ","
@@ -94,7 +95,7 @@ let
     ++ optional (variant == "release") "debug-symbols=off"
     ++ optional (toolset != null) "toolset=${toolset}"
     ++ optional (!enablePython) "--without-python"
-    ++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
+    ++ optional (useMpi || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
     ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "threadapi=win32"
   ] ++ extraB2Args
@@ -140,7 +141,7 @@ stdenv.mkDerivation {
         substituteInPlace tools/build/src/tools/clang-darwin.jam \
           --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)";
     fi;
-  '' + optionalString (mpi != null) ''
+  '' + optionalString useMpi ''
     cat << EOF >> user-config.jam
     using mpi : ${mpi}/bin/mpiCC ;
     EOF
@@ -150,7 +151,7 @@ stdenv.mkDerivation {
     EOF
   '';
 
-  NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin
+  NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin
                       "-headerpad_max_install_names";
 
   enableParallelBuilding = true;
diff --git a/nixpkgs/pkgs/development/libraries/bootil/default.nix b/nixpkgs/pkgs/development/libraries/bootil/default.nix
index a1924f59a8db..f21362962048 100644
--- a/nixpkgs/pkgs/development/libraries/bootil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bootil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, premake4 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }:
 
 stdenv.mkDerivation {
   name = "bootil-unstable-2015-12-17";
@@ -7,9 +7,9 @@ stdenv.mkDerivation {
     description = "Garry Newman's personal utility library";
     homepage = "https://github.com/garrynewman/bootil";
     # License unsure - see https://github.com/garrynewman/bootil/issues/21
-    license = stdenv.lib.licenses.free;
-    maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.free;
+    maintainers = [ lib.maintainers.abigailbuccaneer ];
+    platforms = lib.platforms.all;
     # Build uses `-msse` and `-mfpmath=sse`
     badPlatforms = [ "aarch64-linux" ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix
index 20524cf179cf..7019d39b16c7 100644
--- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, perl, go }:
+{ lib, stdenv, fetchgit, cmake, perl, go }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
 stdenv.mkDerivation {
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake perl go ];
-  enableParallelBuilding = true;
 
   makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ];
 
@@ -30,7 +29,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "bin" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free TLS/SSL implementation";
     homepage    = "https://boringssl.googlesource.com";
     platforms   = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix
index 4d2cf7515c03..0369f603b8e1 100644
--- a/nixpkgs/pkgs/development/libraries/botan/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
+{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
 # Passed by version specific builders
 , baseVersion, revision, sha256
 , sourceExtension ? "tar.xz"
 , extraConfigureFlags ? ""
 , postPatch ? null
-, darwin
+, CoreServices
+, Security
 , ...
 }:
 
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
   inherit postPatch;
 
   buildInputs = [ python bzip2 zlib gmp openssl boost ]
-             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+    ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   configurePhase = ''
     python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
@@ -42,11 +43,11 @@ stdenv.mkDerivation rec {
     ln -s botan-*.pc botan.pc || true
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Cryptographic algorithms library";
     maintainers = with maintainers; [ raskin ];
-    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
+    platforms = platforms.unix;
     license = licenses.bsd2;
   };
   passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";
diff --git a/nixpkgs/pkgs/development/libraries/box2d/default.nix b/nixpkgs/pkgs/development/libraries/box2d/default.nix
index 1672970d5051..47a1c0917f07 100644
--- a/nixpkgs/pkgs/development/libraries/box2d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/box2d/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
-, libXi, pkgconfig }:
+{ lib, stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
+, libXi, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "box2d";
@@ -12,10 +12,8 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "Box2D-${version}/Box2D";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    unzip cmake libGLU libGL freeglut libX11 xorgproto libXi
-  ];
+  nativeBuildInputs = [ cmake unzip pkg-config ];
+  buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ];
 
   cmakeFlags = [
     "-DBOX2D_INSTALL=ON"
@@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
       --replace 'b2_maxPolygonVertices	8' 'b2_maxPolygonVertices	15'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "2D physics engine";
     homepage = "https://box2d.org/";
     maintainers = [ maintainers.raskin ];
diff --git a/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/nixpkgs/pkgs/development/libraries/boxfort/default.nix
index 9a4e2c233561..740e43216984 100644
--- a/nixpkgs/pkgs/development/libraries/boxfort/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boxfort/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }:
 
 stdenv.mkDerivation rec {
   version = "unstable-2019-10-09";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convenient & cross-platform sandboxing C library";
     homepage = "https://github.com/Snaipe/BoxFort";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/brigand/default.nix b/nixpkgs/pkgs/development/libraries/brigand/default.nix
index cc5564d4bb7a..eb46ccc8cd7c 100644
--- a/nixpkgs/pkgs/development/libraries/brigand/default.nix
+++ b/nixpkgs/pkgs/development/libraries/brigand/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
   pname = "brigand";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Instant compile time C++ 11 metaprogramming library";
     longDescription = ''
       Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.
diff --git a/nixpkgs/pkgs/development/libraries/buddy/default.nix b/nixpkgs/pkgs/development/libraries/buddy/default.nix
index d025b8c28ed0..a333a69ffa1b 100644
--- a/nixpkgs/pkgs/development/libraries/buddy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/buddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison }:
+{ lib, stdenv, fetchurl, bison }:
 
 stdenv.mkDerivation rec {
   name = "buddy-2.4";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "Binary decision diagram package";
     license = "as-is";
 
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = lib.platforms.unix; # Once had cygwin problems
+    maintainers = [ lib.maintainers.peti ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/bullet/default.nix b/nixpkgs/pkgs/development/libraries/bullet/default.nix
index 1c9a10356a44..50bf56bfbd22 100644
--- a/nixpkgs/pkgs/development/libraries/bullet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bullet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
+{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
 , Cocoa,  OpenGL
 }:
 
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
+  buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
+    ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
 
   patches = [ ./gwen-narrowing.patch ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
     sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
   '';
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_CPU_DEMOS=OFF"
     "-DINSTALL_EXTRA_LIBS=ON"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DOPENGL_FOUND=true"
     "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
@@ -38,12 +38,10 @@ stdenv.mkDerivation rec {
     "-DBUILD_UNIT_TESTS=OFF"
   ];
 
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
     "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A professional free 3D Game Multiphysics Library";
     longDescription = ''
       Bullet 3D Game Multiphysics Library provides state of the art collision
diff --git a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix
index abb9d3e2ce3d..a3966eaa4a39 100644
--- a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
+{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
 , Cocoa,  OpenGL
 }:
 
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
+  buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
+    ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
 
   patches = [ ./gwen-narrowing.patch ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
     sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
   '';
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_CPU_DEMOS=OFF"
     "-DINSTALL_EXTRA_LIBS=ON"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DOPENGL_FOUND=true"
     "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
@@ -42,9 +42,7 @@ stdenv.mkDerivation {
     "-DBUILD_UNIT_TESTS=OFF"
   ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A professional free 3D Game Multiphysics Library";
     longDescription = ''
       Bullet 3D Game Multiphysics Library provides state of the art collision
diff --git a/nixpkgs/pkgs/development/libraries/bulletml/default.nix b/nixpkgs/pkgs/development/libraries/bulletml/default.nix
index f64090bd53a3..3da05302ac9f 100644
--- a/nixpkgs/pkgs/development/libraries/bulletml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bulletml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, bison, perl }:
+{ lib, stdenv, fetchpatch, fetchurl, bison, perl }:
 
 let
   version = "0.0.6";
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
     install -m 644 README.en "$out"/share/licenses/libbulletml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library to handle BulletML easily";
     longDescription = ''
       BulletML is the Bullet Markup Language. BulletML can describe the barrage
diff --git a/nixpkgs/pkgs/development/libraries/bwidget/default.nix b/nixpkgs/pkgs/development/libraries/bwidget/default.nix
index ff9e6aa038f5..f3f09497a660 100644
--- a/nixpkgs/pkgs/development/libraries/bwidget/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl }:
+{ lib, stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "bwidget";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sourceforge.net/projects/tcllib";
     description = "High-level widget set for Tcl/Tk";
-    license = stdenv.lib.licenses.tcltk;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.tcltk;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
index 3eb99549246e..0adcb327cc4d 100644
--- a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
@@ -2,7 +2,7 @@
 , cmake
 , fetchFromGitLab
 , sqlite
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An opensource implementation of ZRTP keys exchange protocol";
     homepage = "https://gitlab.linphone.org/BC/public/bzrtp";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix
index ac0dc43c67a5..20bcf80d9e59 100644
--- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix
+++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextDir }:
+{ lib, stdenv, fetchurl, writeTextDir }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for asynchronous DNS requests";
     homepage = "https://c-ares.haxx.se";
     license = licenses.mit;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
       set_target_properties(c-ares::cares PROPERTIES
         INTERFACE_INCLUDE_DIRECTORIES "${self}/include"
-        ${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''}
+        ${lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''}
       )
       set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
       set_target_properties(c-ares::cares PROPERTIES
diff --git a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix
index 20b82df6169f..a7420e300ed4 100644
--- a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "c-blosc";
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A blocking, shuffling and loss-less compression library";
     homepage = "https://www.blosc.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/caf/default.nix b/nixpkgs/pkgs/development/libraries/caf/default.nix
index 74ca27f2e3c0..fdc06df948d7 100644
--- a/nixpkgs/pkgs/development/libraries/caf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "actor-framework";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open source implementation of the actor model in C++";
     homepage = "http://actor-framework.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index 64d0e67b3f0f..799024f19acf 100644
--- a/nixpkgs/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook, gtk-doc
+{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, gtk-doc
 , pixman
 , zlibSupport ? true, zlib
 , pngSupport ? true, libpng
@@ -8,7 +8,7 @@
 , x11Support ? !stdenv.isDarwin, libX11, libXext
 , x11XrenderSupport ? x11Support, libXrender
 , xcbSupport ? !stdenv.isDarwin, libxcb # no longer experimental since 1.12
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
 , libGL ? null # libGLU libGL is no longer a big dependency
 , darwin
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     gtk-doc
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -100,7 +100,7 @@ in stdenv.mkDerivation rec {
 
   preConfigure =
   # On FreeBSD, `-ldl' doesn't exist.
-    stdenv.lib.optionalString stdenv.isFreeBSD
+    lib.optionalString stdenv.isFreeBSD
        '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
           do
             cat "$i" | sed -es/-ldl//g > t
diff --git a/nixpkgs/pkgs/development/libraries/cairomm/default.nix b/nixpkgs/pkgs/development/libraries/cairomm/default.nix
index 13550bf3faba..87b391d2ad0e 100644
--- a/nixpkgs/pkgs/development/libraries/cairomm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairomm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }:
+{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }:
 stdenv.mkDerivation rec {
   pname = "cairomm";
   version = "1.12.2";
@@ -6,22 +6,22 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz";
     # gnome doesn't have the latest version ATM; beware: same name but different hash
-    #url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ cairo libsigcxx ];
   buildInputs = [ fontconfig freetype ]
-  ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     ApplicationServices
   ]);
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/nixpkgs/pkgs/development/libraries/capnproto/default.nix
index ad2517f25890..da6aae64db52 100644
--- a/nixpkgs/pkgs/development/libraries/capnproto/default.nix
+++ b/nixpkgs/pkgs/development/libraries/capnproto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "capnproto";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://kentonv.github.io/capnproto";
     description = "Cap'n Proto cerealization protocol";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix
index 5140205ebc8a..cce14951c8be 100644
--- a/nixpkgs/pkgs/development/libraries/capstone/default.nix
+++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "capstone";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
   };
 
   # replace faulty macos detection
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile
   '';
 
-  configurePhase = '' patchShebangs make.sh '';
+  configurePhase = "patchShebangs make.sh ";
   buildPhase = "PREFIX=$out ./make.sh";
 
   doCheck = true;
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
     make check
   '';
 
-  installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
+  installPhase = (lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
     + "PREFIX=$out ./make.sh install";
-  
+
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
   ];
 
   enableParallelBuilding = true;
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Advanced disassembly library";
     homepage    = "http://www.capstone-engine.org";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ];
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ thoughtpolice ris ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/catch/default.nix b/nixpkgs/pkgs/development/libraries/catch/default.nix
index 36d4960cdccb..2aa5c788dc36 100644
--- a/nixpkgs/pkgs/development/libraries/catch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/catch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "catch";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
     homepage = "http://catch-lib.net";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix
index 4e41f39b49b1..34d61a519ab3 100644
--- a/nixpkgs/pkgs/development/libraries/catch2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "2.13.3";
+  version = "2.13.4";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    sha256="0m7pwsam1nb93akgnf5fxi737pgbrbcj0y28bavhzcss7yrm4gys";
+    sha256="sha256-8tR8MCFYK5XXtJQaIuZ59PJ3h3UYbfXKkaOfcBRt1Xo=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-H.." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
     homepage = "http://catch-lib.net";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/ccrtp/default.nix b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
index dba16b19e3b6..39792d4fd6a1 100644
--- a/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }:
+{ lib, stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }:
 
 stdenv.mkDerivation rec {
   name = "ccrtp-2.1.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ ucommon openssl libgcrypt ];
 
   configureFlags = [
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of the IETF real-time transport protocol (RTP)";
     homepage = "https://www.gnu.org/software/ccrtp/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cctz/default.nix b/nixpkgs/pkgs/development/libraries/cctz/default.nix
index 848927776f90..aff977edd912 100644
--- a/nixpkgs/pkgs/development/libraries/cctz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cctz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, darwin }:
+{ lib, stdenv, fetchFromGitHub, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "cctz";
@@ -13,17 +13,17 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation;
+  buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation;
 
   installTargets = [ "install_hdrs" "install_shared_lib" ];
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so
   '';
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/cctz";
     description = "C++ library for translating between absolute and civil times";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/nixpkgs/pkgs/development/libraries/cddlib/default.nix
index cebe6fb2bf6a..9ff54f8ebf9d 100644
--- a/nixpkgs/pkgs/development/libraries/cddlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cddlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , gmp
 , autoreconfHook
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
   # No actual checks yet (2018-05-05), but maybe one day.
   # Requested here: https://github.com/cddlib/cddlib/issues/25
   doCheck = true;
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
-    description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
+    description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron";
     license = licenses.gpl2Plus;
     maintainers = teams.sage.members;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/cdk/default.nix b/nixpkgs/pkgs/development/libraries/cdk/default.nix
index 4613eefd3b90..1a4f617cf469 100644
--- a/nixpkgs/pkgs/development/libraries/cdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cdk/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "cdk";
-  version ="5.0-20200923";
+  version ="5.0-20210109";
 
   buildInputs = [
     ncurses
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
       "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz"
       "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz"
     ];
-    sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0";
+    sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Curses development kit";
     license = licenses.bsdOriginal ;
     maintainers = [ maintainers.raskin ];
diff --git a/nixpkgs/pkgs/development/libraries/cdo/default.nix b/nixpkgs/pkgs/development/libraries/cdo/default.nix
index f582be81e86e..a038b5885c2b 100644
--- a/nixpkgs/pkgs/development/libraries/cdo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cdo/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, fetchurl, curl, hdf5, netcdf
-, enable_cdi_lib ? false    # build, install and link to a CDI library [default=no]
-, enable_all_static ? false # build a completely statically linked CDO binary  [default=no]
-, enable_cxx ? false        # Use CXX as default compiler [default=no]
+{ lib, stdenv, fetchurl, curl, hdf5, netcdf
+, # build, install and link to a CDI library [default=no]
+  enable_cdi_lib ? false
+, # build a completely statically linked CDO binary
+  enable_all_static ? stdenv.hostPlatform.isStatic
+, # Use CXX as default compiler [default=no]
+  enable_cxx ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -19,11 +22,11 @@ stdenv.mkDerivation rec {
  # Configure phase
  configureFlags = [
    "--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"]
-   ++ stdenv.lib.optional (enable_cdi_lib) "--enable-cdi-lib"
-   ++ stdenv.lib.optional (enable_all_static) "--enable-all-static"
-   ++ stdenv.lib.optional (enable_cxx) "--enable-cxx";
+   ++ lib.optional (enable_cdi_lib) "--enable-cdi-lib"
+   ++ lib.optional (enable_all_static) "--enable-all-static"
+   ++ lib.optional (enable_cxx) "--enable-cxx";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
     longDescription = ''
       Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG.
diff --git a/nixpkgs/pkgs/development/libraries/cegui/default.nix b/nixpkgs/pkgs/development/libraries/cegui/default.nix
index aaa93f19131a..ba3366198c2c 100644
--- a/nixpkgs/pkgs/development/libraries/cegui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cegui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
+{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
 
 stdenv.mkDerivation rec {
   pname = "cegui";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
   };
 
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ ogre freetype boost expat ];
 
-  buildInputs = [ cmake ogre freetype boost expat ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cegui.org.uk/";
     description = "C++ Library for creating GUIs";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/celt/generic.nix b/nixpkgs/pkgs/development/libraries/celt/generic.nix
index 6277c5cd931c..d4fe5e83658b 100644
--- a/nixpkgs/pkgs/development/libraries/celt/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/celt/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, src
+{ lib, stdenv, version, src
 , liboggSupport ? true, libogg ? null # if disabled only the library will be built
 , prePatch ? ""
 , ...
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
   inherit prePatch;
 
   buildInputs = []
-    ++ stdenv.lib.optional liboggSupport libogg;
+    ++ lib.optional liboggSupport libogg;
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ultra-low delay audio codec";
     homepage    = "http://www.celt-codec.org/";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/cereal/default.nix b/nixpkgs/pkgs/development/libraries/cereal/default.nix
index e17b42ea5c1d..d2321175f8bd 100644
--- a/nixpkgs/pkgs/development/libraries/cereal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cereal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "cereal";
   version = "1.3.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A header-only C++11 serialization library";
     homepage    = "https://uscilab.github.io/cereal/";
     platforms   = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
index 18f029c45852..14d0e38f3d9f 100644
--- a/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , eigen
 , fetchurl
 , cmake
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ eigen glog ]
-    ++ stdenv.lib.optional runTests gflags;
+    ++ lib.optional runTests gflags;
 
   # The Basel BUILD file conflicts with the cmake build directory on
   # case-insensitive filesystems, eg. darwin.
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for modeling and solving large, complicated optimization problems";
     license = licenses.bsd3;
     homepage = "http://ceres-solver.org";
diff --git a/nixpkgs/pkgs/development/libraries/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/cfitsio/default.nix
index 1b7dc58c0d66..28bb0761777c 100644
--- a/nixpkgs/pkgs/development/libraries/cfitsio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cfitsio/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv
+{ fetchurl, lib, stdenv
 
 # Optional dependencies
 , bzip2 ? null }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./darwin-rpath-universal.patch ];
 
-  configureFlags = stdenv.lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}";
+  configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}";
 
   hardeningDisable = [ "format" ];
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
    '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://heasarc.gsfc.nasa.gov/fitsio/";
     description = "Library for reading and writing FITS data files";
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/cgui/default.nix b/nixpkgs/pkgs/development/libraries/cgui/default.nix
index d6c550a8da87..1bc85d1fcd81 100644
--- a/nixpkgs/pkgs/development/libraries/cgui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cgui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
+{ lib, stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
 
 stdenv.mkDerivation rec {
   pname = "cgui";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "SYSTEM_DIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multiplatform basic GUI library";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/check/default.nix b/nixpkgs/pkgs/development/libraries/check/default.nix
index be000e457c40..37bde1caf437 100644
--- a/nixpkgs/pkgs/development/libraries/check/default.nix
+++ b/nixpkgs/pkgs/development/libraries/check/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv
+{ fetchurl, lib, stdenv
 , CoreServices
 }:
 
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   # Test can randomly fail: https://hydra.nixos.org/build/7243912
   doCheck = false;
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices;
+  buildInputs = lib.optional stdenv.isDarwin CoreServices;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Unit testing framework for C";
 
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/chipmunk/default.nix b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix
index 7618476d62a0..8290e60a4850 100644
--- a/nixpkgs/pkgs/development/libraries/chipmunk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto
+{ lib, stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto
 , libXi, libXmu, fetchpatch, libXrandr
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cp demo/chipmunk_demos $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast and lightweight 2D game physics library";
     homepage = "http://chipmunk2d.net/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/chmlib/default.nix b/nixpkgs/pkgs/development/libraries/chmlib/default.nix
index 9b95fd264446..8971acc7eddf 100644
--- a/nixpkgs/pkgs/development/libraries/chmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/chmlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "chmlib-0.40a";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.jedrea.com/chmlib";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
     description = "A library for dealing with Microsoft ITSS/CHM format files";
     platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
   };
diff --git a/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix
index 12f844aa5958..599ef02eec09 100644
--- a/nixpkgs/pkgs/development/libraries/chromaprint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://acoustid.org/chromaprint";
     description = "AcoustID audio fingerprinting library";
     maintainers = with maintainers; [ ehmry ];
diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix
index 61d3996a4f5b..eb55178db0df 100644
--- a/nixpkgs/pkgs/development/libraries/cimg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "cimg";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, open source, C++ toolkit for image processing";
     longDescription = ''
       CImg stands for Cool Image. It is easy to use, efficient and is intended
diff --git a/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix
index 4092a9c9c5b8..8a3474a491f3 100644
--- a/nixpkgs/pkgs/development/libraries/civetweb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Embedded C/C++ web server";
     homepage = "https://github.com/civetweb/civetweb";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cl/default.nix b/nixpkgs/pkgs/development/libraries/cl/default.nix
index aad14bead660..a4b526ea25d3 100644
--- a/nixpkgs/pkgs/development/libraries/cl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
+{lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp -ruv c_src doc ebin include priv src $DIR
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tonyrog/cl";
     description = "OpenCL binding for Erlang";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/classads/default.nix b/nixpkgs/pkgs/development/libraries/classads/default.nix
index f2377a59e7b2..ba8961c8f6c0 100644
--- a/nixpkgs/pkgs/development/libraries/classads/default.nix
+++ b/nixpkgs/pkgs/development/libraries/classads/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pcre }:
+{ lib, stdenv, fetchurl, pcre }:
 
 let version = "1.0.10"; in
 
@@ -16,11 +16,11 @@ stdenv.mkDerivation {
   configureFlags = [
     "--enable-namespace" "--enable-flexible-member"
   ];
-  
+
   meta = {
     homepage = "http://www.cs.wisc.edu/condor/classad/";
     description = "The Classified Advertisements library provides a generic means for matching resources";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/clearsilver/default.nix b/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
index 8b79619dff4b..74d167144a9f 100644
--- a/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python }:
+{ lib, stdenv, fetchurl, fetchpatch, python }:
 
 stdenv.mkDerivation rec {
   name = "clearsilver-0.10.5";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast, powerful, and language-neutral HTML template system";
     homepage = "http://www.clearsilver.net/";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/libraries/clfft/default.nix b/nixpkgs/pkgs/development/libraries/clfft/default.nix
index 5eb5b842ecfa..91267208d2e6 100644
--- a/nixpkgs/pkgs/development/libraries/clfft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clfft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
+{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
 
 let
   version = "2.12.2";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library containing FFT functions written in OpenCL";
     longDescription = ''
       clFFT is a software library containing FFT functions written in OpenCL.
diff --git a/nixpkgs/pkgs/development/libraries/clipp/default.nix b/nixpkgs/pkgs/development/libraries/clipp/default.nix
index f7c8f90e8686..12b393e597d4 100644
--- a/nixpkgs/pkgs/development/libraries/clipp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clipp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "clipp";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --subst-var version
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17";
     homepage = "https://github.com/muellan/clipp";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/clipper/default.nix b/nixpkgs/pkgs/development/libraries/clipper/default.nix
index ebb41fde4238..9eb34f6b6863 100644
--- a/nixpkgs/pkgs/development/libraries/clipper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clipper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ninja, unzip }:
+{ lib, stdenv, fetchurl, cmake, ninja, unzip }:
 
 stdenv.mkDerivation rec {
   version = "6.4.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja unzip ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A polygon and line clipping and offsetting library (C++, C#, Delphi)";
     longDescription = ''
       The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or,
diff --git a/nixpkgs/pkgs/development/libraries/cln/default.nix b/nixpkgs/pkgs/development/libraries/cln/default.nix
index 669ce90287bc..23bbd84a2096 100644
--- a/nixpkgs/pkgs/development/libraries/cln/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cln/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   pname = "cln";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C/C++ library for numbers, a part of GiNaC";
     homepage = "https://www.ginac.de/CLN/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix b/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix
index f7a0bd058e71..b2bd2adde43a 100644
--- a/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ppl, autoreconfHook }:
+{ fetchurl, lib, stdenv, ppl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "cloog-ppl-0.15.11";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     # CLooG-PPL is actually a port of GLooG from PolyLib to PPL.
     homepage = "http://www.cloog.org/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = [ ];
 
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+    platforms = lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix b/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
index b0f69d42e8cd..c952c1a563b8 100644
--- a/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gmp, isl }:
+{ fetchurl, lib, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
   name = "cloog-0.18.0";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     homepage = "http://www.cloog.org/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     /* Leads to an ICE on Cygwin:
 
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+    platforms = lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cloog/default.nix b/nixpkgs/pkgs/development/libraries/cloog/default.nix
index be506cdee173..54df2df9d4d2 100644
--- a/nixpkgs/pkgs/development/libraries/cloog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cloog/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gmp, isl }:
+{ fetchurl, lib, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
   name = "cloog-0.18.4";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
     homepage = "http://www.cloog.org/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     /* Leads to an ICE on Cygwin:
 
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+    platforms = lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
index 3776f1eac219..9c1f3c21cd27 100644
--- a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, boost, zlib}:
+{lib, stdenv, fetchurl, cmake, boost, zlib}:
 
 stdenv.mkDerivation rec {
   name = "clucene-core-2.3.3.4";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_CONTRIBS=ON"
     "-DBUILD_CONTRIBS_LIB=ON"
     "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0"
     "-D_CL_HAVE_NAMESPACES_EXITCODE=0"
     "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
@@ -30,15 +30,15 @@ stdenv.mkDerivation rec {
     [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
       ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
       ./Install-contribs-lib.patch
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
+    ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
 
   # fails with "Unable to find executable:
   # /build/clucene-core-2.3.3.4/build/bin/cl_test"
   doCheck = false;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core library for full-featured text search engine";
     longDescription = ''
       CLucene is a high-performance, scalable, cross platform, full-featured,
diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
index d71d01de9e25..20b0a3b547ca 100644
--- a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "clucene-core-0.9.21b";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gcc6.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core library for full-featured text search engine";
     longDescription = ''
       CLucene is a high-performance, scalable, cross platform, full-featured,
diff --git a/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix b/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix
index 1a9644991b61..166d4e12c252 100644
--- a/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
+{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
   pname = "clutter-gst";
@@ -7,12 +7,12 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   postBuild = "rm -rf $out/share/gtk-doc";
 
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
 
     homepage = "http://www.clutter-project.org/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    maintainers = with lib.maintainers; [ lethalman ];
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix b/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
index 973ae344dc92..0dfb8c7b9df0 100644
--- a/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, meson, ninja
+{ fetchurl, lib, stdenv, pkg-config, meson, ninja
 , gobject-introspection, clutter, gtk3, gnome3 }:
 
 let
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
   };
 
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
 
   postBuild = "rm -rf $out/share/gtk-doc";
 
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Clutter-GTK";
     homepage = "http://www.clutter-project.org/";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    license = lib.licenses.lgpl2Plus;
+    maintainers = with lib.maintainers; [ lethalman ];
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/clutter/default.nix b/nixpkgs/pkgs/development/libraries/clutter/default.nix
index 8a70a872b9ef..002db004dc19 100644
--- a/nixpkgs/pkgs/development/libraries/clutter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libGLU, libGL, libX11, libXext, libXfixes
+{ lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
 , gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon
 }:
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b";
   };
 
   outputs = [ "out" "dev" ];
 
   buildInputs = [ gtk3 ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs =
     [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango
       atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon
@@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
          specific needs.
       '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     homepage = "http://www.clutter-project.org/";
 
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = with lib.maintainers; [ lethalman ];
+    platforms = lib.platforms.mesaPlatforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cm256cc/default.nix b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
index eaddcb86f546..b40aea70b410 100644
--- a/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost } :
+{ lib, stdenv, fetchFromGitHub, cmake, boost } :
 
 stdenv.mkDerivation rec {
   pname = "cm256cc";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++";
     homepage = "https://github.com/f4exb/cm256cc";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix
index 52a02772268b..8a9534365f4e 100644
--- a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "cmark-gfm";
   version = "0.29.0.gfm.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   # tests load the library dynamically which for unknown reason failed
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C";
     homepage = "https://github.com/github/cmark-gfm";
     maintainers = with maintainers; [ cyplo ];
diff --git a/nixpkgs/pkgs/development/libraries/cmark/default.nix b/nixpkgs/pkgs/development/libraries/cmark/default.nix
index b132e958f67a..6061fd8f9123 100644
--- a/nixpkgs/pkgs/development/libraries/cmark/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   version = "0.29.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$(readlink -f ./src)
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CommonMark parsing and rendering library and program in C";
     homepage = "https://github.com/jgm/cmark";
     maintainers = [ maintainers.michelk ];
diff --git a/nixpkgs/pkgs/development/libraries/cminpack/default.nix b/nixpkgs/pkgs/development/libraries/cminpack/default.nix
index 3b2d748a8366..39d4849f3801 100644
--- a/nixpkgs/pkgs/development/libraries/cminpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cminpack/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "cminpack-1.3.6";
-  
+
   src = fetchurl {
     url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
     sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "Software for solving nonlinear equations and nonlinear least squares problems";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/cmocka/default.nix b/nixpkgs/pkgs/development/libraries/cmocka/default.nix
index 18c1843623f8..9bfbc410c007 100644
--- a/nixpkgs/pkgs/development/libraries/cmocka/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cmocka/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, cmake }:
+{ fetchurl, lib, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "cmocka";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight library to simplify and generalize unit tests for C";
 
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/cmrt/default.nix b/nixpkgs/pkgs/development/libraries/cmrt/default.nix
index 512a289152ad..43d73ba200ce 100644
--- a/nixpkgs/pkgs/development/libraries/cmrt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cmrt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }:
 
 stdenv.mkDerivation rec {
   pname = "cmrt";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ libdrm libva ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxmedia";
     description = "Intel C for Media Runtime";
     longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family";
diff --git a/nixpkgs/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix
index 4a648b1f32a8..09ec21cc63e8 100644
--- a/nixpkgs/pkgs/development/libraries/codec2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "codec2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Speech codec designed for communications quality speech at low data rates";
     homepage = "http://www.rowetel.com/blog/?page_id=452";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/cogl/default.nix b/nixpkgs/pkgs/development/libraries/cogl/default.nix
index f2a69e87d85e..8fd152072879 100644
--- a/nixpkgs/pkgs/development/libraries/cogl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl
 , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
 , mesa, automake, autoconf
 , gstreamerSupport ? true, gst_all_1 }:
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   version = "1.22.8";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
   };
 
@@ -33,27 +33,27 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig libintl automake autoconf ];
+  nativeBuildInputs = [ pkg-config libintl automake autoconf ];
 
   configureFlags = [
     "--enable-introspection"
     "--enable-kms-egl-platform"
     "--enable-wayland-egl-platform"
     "--enable-wayland-egl-server"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
-  ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
+  ] ++ lib.optional gstreamerSupport "--enable-cogl-gst"
+  ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
       glib gdk-pixbuf gobject-introspection wayland mesa
       libGL libXrandr libXfixes libXcomposite libXdamage
     ]
-    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
+    ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer
                                                gst_all_1.gst-plugins-base ];
 
-  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
+  buildInputs = lib.optionals pangoSupport [ pango cairo ];
 
   COGL_PANGO_DEP_CFLAGS
-    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
+    = lib.optionalString (stdenv.isDarwin && pangoSupport)
       "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
 
   #doCheck = true; # all tests fail (no idea why)
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small open source library for using 3D graphics hardware for rendering";
     maintainers = with maintainers; [ lovek323 ];
 
diff --git a/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix
index c76aaa4c8e53..3fe78e6d02e9 100644
--- a/nixpkgs/pkgs/development/libraries/coin3d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, boost, cmake, libX11, libGL, libGLU }:
+{ fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }:
 
 stdenv.mkDerivation rec {
   pname = "coin";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost libX11 libGL libGLU ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/coin3d/coin";
     license = licenses.bsd3;
     description = "High-level, retained-mode toolkit for effective 3D graphics development";
diff --git a/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/nixpkgs/pkgs/development/libraries/comedilib/default.nix
index 98811b97c87e..fef22dea06ae 100644
--- a/nixpkgs/pkgs/development/libraries/comedilib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/comedilib/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , autoreconfHook
 , flex
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Linux-Comedi";
     repo = "comedilib";
-    rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
+    rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
     sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw";
   };
 
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Linux Control and Measurement Device Interface Library";
     homepage = "https://github.com/Linux-Comedi/comedilib";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
index a54bc7547822..968c395d701f 100644
--- a/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "concurrencykit";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     url    = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
     sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp";
   };
-  
+
   #Deleting this line causes "Unknown option --disable-static"
   configurePhase = "./configure --prefix=$out";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library of safe, high-performance concurrent data structures";
     homepage    = "http://concurrencykit.org";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix
index 47ec7a1a6eb4..dfe7f7776703 100644
--- a/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
   pname = "cpp-hocon";
@@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost curl leatherman ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A C++ port of the Typesafe Config library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix
index 3c5921541a76..839ddb9b76fb 100644
--- a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
+{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
 
 stdenv.mkDerivation {
   pname = "cpp-ipfs-api";
@@ -11,10 +11,11 @@ stdenv.mkDerivation {
     sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g";
   };
 
-  buildInputs = [ cmake curl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ curl ];
   propagatedBuildInputs = [ nlohmann_json ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "IPFS C++ API client library";
     homepage = "https://github.com/vasild/cpp-ipfs-api";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix b/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix
index 50c4e05dfa1d..6085a3c849cc 100644
--- a/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "cpp-netlib";
@@ -12,14 +12,13 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  buildInputs = [ cmake boost openssl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost openssl ];
 
   cmakeFlags = [
     "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
   ];
 
-  enableParallelBuilding = true;
-
   # The test driver binary lacks an RPath to the library's libs
   preCheck = ''
     export LD_LIBRARY_PATH=$PWD/libs/network/src
@@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
   # Most tests make network GET requests to various websites
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of open-source libraries for high level network programming";
     homepage    = "https://cpp-netlib.org";
     license     = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
index 08940b4800df..cec6feded139 100644
--- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -7,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.9.0";
+  version = "5.10.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0lcbvmighmc03qxcf03vqmn6188wx4dr3m9d5ldxm2v7mw5xbq82";
+    sha256 = "sha256-ZqpgnxI6Py+Xrf+MK852j+kE2JGFz15kWAXOqy+bjVc=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
   checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ];
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Martchus/cpp-utilities";
     description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/cppcms/default.nix b/nixpkgs/pkgs/development/libraries/cppcms/default.nix
index 0063db95770c..aceb2d61e388 100644
--- a/nixpkgs/pkgs/development/libraries/cppcms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppcms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
+{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "cppcms";
@@ -9,15 +9,14 @@ stdenv.mkDerivation rec {
       sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
   };
 
-  enableParallelBuilding = true;
-
-  buildInputs = [ cmake pcre zlib python openssl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ pcre zlib python openssl ];
 
   cmakeFlags = [
     "--no-warn-unused-cli"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cppcms.com";
     description = "High Performance C++ Web Framework";
     platforms = platforms.linux ;
diff --git a/nixpkgs/pkgs/development/libraries/cppdb/default.nix b/nixpkgs/pkgs/development/libraries/cppdb/default.nix
index fc65dd739209..98c9c7ecac15 100644
--- a/nixpkgs/pkgs/development/libraries/cppdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
+{ lib, stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
   pname = "cppdb";
@@ -9,14 +9,13 @@ stdenv.mkDerivation rec {
       sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
   };
 
-  enableParallelBuilding = true;
-
-  buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ sqlite libmysqlclient postgresql unixODBC ];
 
   cmakeFlags = [ "--no-warn-unused-cli" ];
   NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cppcms.com/sql/cppdb/";
     description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers";
     platforms = platforms.linux ;
diff --git a/nixpkgs/pkgs/development/libraries/cpptest/default.nix b/nixpkgs/pkgs/development/libraries/cpptest/default.nix
index 5ed06b99f335..654ad955ae66 100644
--- a/nixpkgs/pkgs/development/libraries/cpptest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpptest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "cpptest-2.0.0";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cpptest.sourceforge.net/";
     description = "Simple C++ unit testing framework";
     maintainers = with maintainers; [ bosu ];
-    license = stdenv.lib.licenses.lgpl3;
+    license = lib.licenses.lgpl3;
     platforms = with platforms; linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cppunit/default.nix b/nixpkgs/pkgs/development/libraries/cppunit/default.nix
index bf65be715755..3cafa1c75d76 100644
--- a/nixpkgs/pkgs/development/libraries/cppunit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppunit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "cppunit";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://freedesktop.org/wiki/Software/cppunit/";
     description = "C++ unit testing framework";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/cpputest/default.nix b/nixpkgs/pkgs/development/libraries/cpputest/default.nix
index d219a8e0bec1..8e3fadc7f0dc 100644
--- a/nixpkgs/pkgs/development/libraries/cpputest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpputest/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   version = "4.0";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://cpputest.github.io/";
     description = "Unit testing and mocking framework for C/C++";
-    platforms = stdenv.lib.platforms.linux ;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.juliendehos ];
+    platforms = lib.platforms.linux ;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.juliendehos ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix
index fdd98cb00bf0..9237c3bd3071 100644
--- a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zeromq }:
+{ lib, stdenv, fetchFromGitHub, cmake, zeromq }:
 
 stdenv.mkDerivation rec {
   pname = "cppzmq";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "-DCPPZMQ_BUILD_TESTS=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zeromq/cppzmq";
     license = licenses.bsd2;
     description = "C++ binding for 0MQ";
diff --git a/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/nixpkgs/pkgs/development/libraries/cracklib/default.nix
index c10a69d72f94..13029f7739c5 100644
--- a/nixpkgs/pkgs/development/libraries/cracklib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cracklib/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib;
   buildInputs = [ zlib gettext ];
 
-  postPatch = stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+  postPatch = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
     chmod +x util/cracklib-format
     patchShebangs util
 
diff --git a/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/nixpkgs/pkgs/development/libraries/crc32c/default.nix
index b9c12b1889c2..bc46e80db9b3 100644
--- a/nixpkgs/pkgs/development/libraries/crc32c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/crc32c/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchFromGitHub, cmake, gflags
-, staticOnly ? false }:
+, staticOnly ? stdenv.hostPlatform.isStatic
+}:
 
 stdenv.mkDerivation rec {
   pname = "crc32c";
@@ -15,10 +16,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ gflags ];
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc";
   cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1"  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/crc32c";
     description = "CRC32C implementation with support for CPU-specific acceleration instructions";
     license = with licenses; [ bsd3 ];
diff --git a/nixpkgs/pkgs/development/libraries/crcpp/default.nix b/nixpkgs/pkgs/development/libraries/crcpp/default.nix
index c26578804baf..9410b0715006 100644
--- a/nixpkgs/pkgs/development/libraries/crcpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/crcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     cp inc/CRC.h $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/d-bahr/CRCpp";
     description = "Easy to use and fast C++ CRC library";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/cre2/default.nix b/nixpkgs/pkgs/development/libraries/cre2/default.nix
index fa4f5d232aa3..d85843a54f7c 100644
--- a/nixpkgs/pkgs/development/libraries/cre2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cre2/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook,
-  libtool, pkgconfig, re2, texinfo }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook,
+  libtool, pkg-config, re2, texinfo }:
 
 stdenv.mkDerivation rec {
   pname = "cre2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     libtool
-    pkgconfig
+    pkg-config
   ];
   buildInputs = [ re2 texinfo ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     "--enable-maintainer-mode"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://marcomaggi.github.io/docs/cre2.html";
     description = "C Wrapper for RE2";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/criterion/default.nix b/nixpkgs/pkgs/development/libraries/criterion/default.nix
index 3dc4b4624048..ba436fec0a26 100644
--- a/nixpkgs/pkgs/development/libraries/criterion/default.nix
+++ b/nixpkgs/pkgs/development/libraries/criterion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext
+{ lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext
 , dyncall , nanomsg, python37Packages }:
 
 stdenv.mkDerivation rec {
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform C and C++ unit testing framework for the 21th century";
     homepage = "https://github.com/Snaipe/Criterion";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix
index 3fe277481553..041e7d49d500 100644
--- a/nixpkgs/pkgs/development/libraries/crypto++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, nasm, which }:
+{ lib, stdenv, fetchFromGitHub, nasm, which }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "crypto++";
   version = "8.2.0";
diff --git a/nixpkgs/pkgs/development/libraries/csfml/default.nix b/nixpkgs/pkgs/development/libraries/csfml/default.nix
index ab63b7a21f25..78d8bce40a36 100644
--- a/nixpkgs/pkgs/development/libraries/csfml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/csfml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, sfml }:
+{ lib, stdenv, fetchFromGitHub, cmake, sfml }:
 
 let
   version = "2.5";
@@ -13,10 +13,11 @@ stdenv.mkDerivation {
     rev   = version;
     sha256 = "071magxif5nrdddzk2z34czqmz1dfws4d7dqynb2zpn7cwhwxcpm";
   };
-  buildInputs = [ cmake sfml ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ sfml ];
   cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.sfml-dev.org/";
     description = "Simple and fast multimedia library";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/ctl/default.nix b/nixpkgs/pkgs/development/libraries/ctl/default.nix
index 71e301044766..be643e3a52c6 100644
--- a/nixpkgs/pkgs/development/libraries/ctl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, ilmbase, libtiff, openexr }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }:
 
 stdenv.mkDerivation rec {
   pname = "ctl";
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libtiff ilmbase openexr ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Color Transformation Language";
     homepage = "https://github.com/ampas/CTL";
     license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible
diff --git a/nixpkgs/pkgs/development/libraries/ctpl/default.nix b/nixpkgs/pkgs/development/libraries/ctpl/default.nix
index 077ac63748c6..69380c2eeeb4 100644
--- a/nixpkgs/pkgs/development/libraries/ctpl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   pname = "ctpl";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://ctpl.tuxfamily.org/";
     description = "Template engine library written in C";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/ctpp2/default.nix b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix
index 82bbdfc2fc19..626606d0526d 100644
--- a/nixpkgs/pkgs/development/libraries/ctpp2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "ctpp2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   patchPhase = ''
     # include <unistd.h> to fix undefined getcwd
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high performance templating engine";
     homepage = "http://ctpp.havoc.ru";
     maintainers = [ maintainers.robbinch ];
diff --git a/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix b/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
index d82296c3e66b..644c68e85d86 100644
--- a/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
-, autoreconfHook, pkgconfig
+, autoreconfHook, pkg-config
 , zlib, libffi, elfutils, libdwarf
 }:
 
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ zlib libffi elfutils libdwarf ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A foreign function interface for bash";
     homepage = "https://github.com/taviso/ctypes.sh";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/cudd/default.nix b/nixpkgs/pkgs/development/libraries/cudd/default.nix
index 6749d2e94c0f..4e8cf59fbffd 100644
--- a/nixpkgs/pkgs/development/libraries/cudd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cudd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "cudd";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://davidkebo.com/cudd";
     description = "Binary Decision Diagram (BDD) library";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/curlcpp/default.nix b/nixpkgs/pkgs/development/libraries/curlcpp/default.nix
index ead4d1b76bd6..9d4ae41f384f 100644
--- a/nixpkgs/pkgs/development/libraries/curlcpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/curlcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl }: 
+{ lib, stdenv, fetchFromGitHub, cmake, curl }:
 
 stdenv.mkDerivation rec {
   pname = "curlcpp";
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n";
   };
 
-  buildInputs = [ cmake curl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://josephp91.github.io/curlcpp/";
     description = "Object oriented C++ wrapper for CURL";
     platforms = platforms.unix;
@@ -21,4 +22,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ rszibele ];
   };
 }
-
diff --git a/nixpkgs/pkgs/development/libraries/curlpp/default.nix b/nixpkgs/pkgs/development/libraries/curlpp/default.nix
index 810bd3f15dab..0aee75751d9e 100644
--- a/nixpkgs/pkgs/development/libraries/curlpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/curlpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl }:
+{ lib, stdenv, fetchFromGitHub, cmake, curl }:
 
 stdenv.mkDerivation rec {
   pname = "curlpp";
@@ -12,9 +12,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ curl ];
   nativeBuildInputs = [ cmake ];
-  enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.curlpp.org/";
     description = "C++ wrapper around libcURL";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/cutee/default.nix b/nixpkgs/pkgs/development/libraries/cutee/default.nix
index 661dc7c816c4..748d495063de 100644
--- a/nixpkgs/pkgs/development/libraries/cutee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cutee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "cutee";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp cutee $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Unit Testing Easy Environment";
     homepage    = "http://www.codesink.org/cutee_unit_testing.html";
     license     = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
index 1befa89c7d05..80ec1986f8cf 100644
--- a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook
 , qtbase, libuuid, libcap, uwsgi, grantlee, pcre
 }:
 
 stdenv.mkDerivation rec {
   pname = "cutelyst";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "cutelyst";
     repo = "cutelyst";
     rev = "v${version}";
-    sha256 = "1xbw8ag3iwm69dhrsg54anrlzvvflj6pwsj42z6hrl0yckabn99z";
+    sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c=";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
   buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ];
 
   cmakeFlags = [
diff --git a/nixpkgs/pkgs/development/libraries/cwiid/default.nix b/nixpkgs/pkgs/development/libraries/cwiid/default.nix
index 353a5ba90611..31a5420e375c 100644
--- a/nixpkgs/pkgs/development/libraries/cwiid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cwiid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "cwiid-${version}-git";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bison flex bluez gtk2 ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   NIX_LDFLAGS = "-lbluetooth";
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Linux Nintendo Wiimote interface";
     homepage    = "http://cwiid.org";
     license     = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix b/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix
index 34dc30abe614..f632fca714cf 100644
--- a/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "cxx-prettyprint-unstable";
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
     cp prettyprint.hpp "$out/include"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description    = "Header only C++ library for pretty printing standard containers";
     homepage       = "https://github.com/louisdx/cxx-prettyprint";
-    license        = stdenv.lib.licenses.boost;
+    license        = lib.licenses.boost;
     platforms      = platforms.all;
 
     # This is a header-only library, no point in hydra building it:
diff --git a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix
index e1898044efaf..1a828cc451dc 100644
--- a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub }:
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub }:
 
 buildPythonApplication rec {
   pname = "cxxtest";
@@ -26,7 +26,7 @@ buildPythonApplication rec {
 
   dontWrapPythonPrograms = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cxxtest.com";
     description = "Unit testing framework for C++";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/cxxtools/default.nix b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix
index ca3c48717329..0d8d2498ae73 100644
--- a/nixpkgs/pkgs/development/libraries/cxxtools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "2.2.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.tntnet.org/cxxtools.html";
     description = "Comprehensive C++ class library for Unix and Linux";
-    platforms = stdenv.lib.platforms.linux ;
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.juliendehos ];
+    platforms = lib.platforms.linux ;
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.juliendehos ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
index 96778e8960be..b1a6401284ac 100644
--- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -2,7 +2,7 @@
 , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
 , buildPackages, pruneLibtoolFiles, fetchpatch }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "cyrus-sasl";
   version = "2.1.27";
diff --git a/nixpkgs/pkgs/development/libraries/czmq/default.nix b/nixpkgs/pkgs/development/libraries/czmq/default.nix
index bdf4519f9bc3..bb8ecafbb347 100644
--- a/nixpkgs/pkgs/development/libraries/czmq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/czmq/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, zeromq }:
+{ lib, stdenv, fetchurl, zeromq }:
 
 stdenv.mkDerivation rec {
-  version = "4.2.0";
+  version = "4.2.1";
   pname = "czmq";
 
   src = fetchurl {
     url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg";
+    sha256 = "sha256-XXIKIEwqWGRdb3ZDrxXVY6cS2tmMnTLB7ZEzd9qmrDk=";
   };
 
   # Needs to be propagated for the .pc file to work
   propagatedBuildInputs = [ zeromq ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://czmq.zeromq.org/";
     description = "High-level C Binding for ZeroMQ";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix
index a56184e9a179..2b9357e3ef0f 100644
--- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitLab
-, meson, ninja, nasm, pkgconfig
+{ lib, stdenv, fetchFromGitLab
+, meson, ninja, nasm, pkg-config
 , withTools ? false # "dav1d" binary
 , withExamples ? false, SDL2 # "dav1dplay" binary
 , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers
@@ -9,27 +9,27 @@ assert useVulkan -> withExamples;
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = version;
-    sha256 = "0mjn87xjdqv0q1gj4s4f6fdmsj504mhk4qmqiyrhq2rs7yqj4csv";
+    sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x";
   };
 
-  nativeBuildInputs = [ meson ninja nasm pkgconfig ];
+  nativeBuildInputs = [ meson ninja nasm pkg-config ];
   # TODO: doxygen (currently only HTML and not build by default).
-  buildInputs = stdenv.lib.optional withExamples SDL2
-    ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
+  buildInputs = lib.optional withExamples SDL2
+    ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
 
   mesonFlags= [
-    "-Denable_tools=${stdenv.lib.boolToString withTools}"
-    "-Denable_examples=${stdenv.lib.boolToString withExamples}"
+    "-Denable_tools=${lib.boolToString withTools}"
+    "-Denable_examples=${lib.boolToString withExamples}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform AV1 decoder focused on speed and correctness";
     longDescription = ''
       The goal of this project is to provide a decoder for most platforms, and
diff --git a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix
index dc668a233b06..5cf9200a9ab9 100644
--- a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "4.8.30";
diff --git a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix
index 1223cb897e86..0bb5c4cd6a4a 100644
--- a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "5.3.28";
diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix
index 642054b5a018..49935dd2399b 100644
--- a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "6.0.20";
   sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
-  license = stdenv.lib.licenses.agpl3;
+  license = lib.licenses.agpl3;
   extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
 })
diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix
index dee07a9637e6..b2c0fd7ac8fc 100644
--- a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "6.2.23";
   sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7";
-  license = stdenv.lib.licenses.agpl3;
+  license = lib.licenses.agpl3;
   extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
 })
diff --git a/nixpkgs/pkgs/development/libraries/db/generic.nix b/nixpkgs/pkgs/development/libraries/db/generic.nix
index f439113efb3a..a564db369fba 100644
--- a/nixpkgs/pkgs/development/libraries/db/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/db/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , cxxSupport ? true
 , compat185 ? true
 , dbmSupport ? false
@@ -6,7 +6,7 @@
 # Options from inherited versions
 , version, sha256
 , extraPatches ? [ ]
-, license ? stdenv.lib.licenses.sleepycat
+, license ? lib.licenses.sleepycat
 , drvArgs ? {}
 }:
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation (rec {
       (if cxxSupport then "--enable-cxx" else "--disable-cxx")
       (if compat185 then "--enable-compat185" else "--disable-compat185")
     ]
-    ++ stdenv.lib.optional dbmSupport "--enable-dbm"
-    ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+    ++ lib.optional dbmSupport "--enable-dbm"
+    ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   preConfigure = ''
     cd build_unix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (rec {
     make examples_c examples_cxx
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
     description = "Berkeley DB";
     license = license;
diff --git a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
index 1c9f71311726..731c038527ce 100644
--- a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }:
+{ lib, stdenv, fetchurl, dbus, glib, pkg-config, expat }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-cplusplus";
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus glib expat ];
 
   configureFlags = [ "--disable-ecore" "--disable-tests" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://dbus-cplusplus.sourceforge.net";
     description = "C++ API for D-BUS";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
index b0dd8e91960f..f56a1eaac245 100644
--- a/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, buildPackages
-, pkgconfig, expat, gettext, libiconv, dbus, glib
+{ lib, stdenv, fetchurl, buildPackages
+, pkg-config, expat, gettext, libiconv, dbus, glib
 }:
 
 stdenv.mkDerivation rec {
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
-  nativeBuildInputs = [ pkgconfig gettext glib ];
+  nativeBuildInputs = [ pkg-config gettext glib ];
 
   buildInputs = [ expat libiconv ];
 
   propagatedBuildInputs = [ dbus glib ];
 
   configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++
-    stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
+    lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
       "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool";
 
   doCheck = false;
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://dbus.freedesktop.org";
-    license = with stdenv.lib.licenses; [ afl21 gpl2 ];
+    license = with lib.licenses; [ afl21 gpl2 ];
     description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism";
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 22c0a9137cae..f47c91ca3eaf 100644
--- a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp-glib";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ mono dbus-sharp-1_0 ];
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET: GLib integration module";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix
index 496a109b58f1..65cd89043663 100644
--- a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp-glib";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ mono dbus-sharp-2_0 ];
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET: GLib integration module";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index 084beae59727..eb1b20e29eb1 100644
--- a/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
+{lib, stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ mono ];
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix
index 0fd638dbf8eb..c64d7bbef992 100644
--- a/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }:
+{lib, stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
   # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
   # See: https://github.com/NixOS/nixpkgs/pull/46060
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix
index 4480d197fa7c..1f1eff189598 100644
--- a/nixpkgs/pkgs/development/libraries/dbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , fetchurl
-, pkgconfig
+, pkg-config
 , expat
 , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
 , systemd
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "lib" "doc" "man" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     docbook_xml_dtd_44
     docbook-xsl-nons
     xmlto
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-user-session"
     "--enable-xml-docs"
-    "--libexecdir=${placeholder ''out''}/libexec"
+    "--libexecdir=${placeholder "out"}/libexec"
     "--datadir=/etc"
     "--localstatedir=/var"
     "--runstatedir=/run"
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
     "--with-session-socket-dir=/tmp"
     "--with-system-pid-file=/run/dbus/pid"
     "--with-system-socket=/run/dbus/system_bus_socket"
-    "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
-    "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
   ] ++ lib.optional (!x11Support) "--without-x"
   ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ];
 
@@ -103,8 +103,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   installFlags = [
-    "sysconfdir=${placeholder ''out''}/etc"
-    "datadir=${placeholder ''out''}/share"
+    "sysconfdir=${placeholder "out"}/etc"
+    "datadir=${placeholder "out"}/share"
   ];
 
   # it's executed from $lib by absolute path
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
     daemon = dbus.out;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple interprocess messaging system";
     homepage = "http://www.freedesktop.org/wiki/Software/dbus/";
     license = licenses.gpl2Plus; # most is also under AFL-2.1
diff --git a/nixpkgs/pkgs/development/libraries/dbxml/default.nix b/nixpkgs/pkgs/development/libraries/dbxml/default.nix
index a0005f1bf720..b4e74d036191 100644
--- a/nixpkgs/pkgs/development/libraries/dbxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db62, xercesc, xqilla }:
+{ lib, stdenv, fetchurl, db62, xercesc, xqilla }:
 
 stdenv.mkDerivation rec {
   pname = "dbxml";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     cd dbxml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.oracle.com/database/berkeley-db/xml.html";
     description = "Embeddable XML database based on Berkeley DB";
     license = licenses.agpl3;
diff --git a/nixpkgs/pkgs/development/libraries/dclib/default.nix b/nixpkgs/pkgs/development/libraries/dclib/default.nix
index a9929ea2adda..b393b74f2b2f 100644
--- a/nixpkgs/pkgs/development/libraries/dclib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dclib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libxml2, openssl, bzip2}:
+{lib, stdenv, fetchurl, libxml2, openssl, bzip2}:
 
 stdenv.mkDerivation {
   name = "dclib-0.3.7";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   buildInputs = [libxml2 openssl bzip2];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Peer-to-Peer file sharing client";
     homepage = "http://dcgui.berlios.de";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/dclxvi/default.nix b/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
index 802befff14cc..8d7dc5a01781 100644
--- a/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "dclxvi-2013-01-27";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   patchPhase = ''
     substituteInPlace Makefile \
       --replace "gcc" "cc"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile \
       --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so"
   '';
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     find . -name \*.so -exec cp {} $out/lib \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/agl/dclxvi";
     description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
     platforms = platforms.x86_64;
diff --git a/nixpkgs/pkgs/development/libraries/dconf/default.nix b/nixpkgs/pkgs/development/libraries/dconf/default.nix
index c9c1b9be9228..6834a605f1a5 100644
--- a/nixpkgs/pkgs/development/libraries/dconf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -10,47 +10,47 @@
 , bash-completion
 , dbus
 , gnome3
-, libxml2
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_42
 }:
-
+let
+  isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
+in
 stdenv.mkDerivation rec {
   pname = "dconf";
   version = "0.38.0";
 
-  outputs = [ "out" "lib" "dev" "devdoc" ];
+  outputs = [ "out" "lib" "dev" ]
+    ++ lib.optional (!isCross) "devdoc";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    vala
     pkg-config
     python3
     libxslt
-    libxml2
     glib
-    gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_42
-  ];
+  ] ++ lib.optional (!isCross) gtk-doc;
 
   buildInputs = [
     glib
     bash-completion
     dbus
-  ];
+  ] ++ lib.optional (!isCross) vala;
+  # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling.
 
   mesonFlags = [
     "--sysconfdir=/etc"
-    "-Dgtk_doc=true"
-  ];
+    "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile.
+  ] ++ lib.optional isCross "-Dvapi=false";
 
   doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin;
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/dconf";
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/dee/default.nix b/nixpkgs/pkgs/development/libraries/dee/default.nix
index 594cac5002f6..3d46028ec438 100644
--- a/nixpkgs/pkgs/development/libraries/dee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dee/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , fetchpatch
-, pkgconfig
+, pkg-config
 , glib
 , icu
 , gobject-introspection
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     vala
     autoreconfHook
     gobject-introspection
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus";
     homepage = "https://launchpad.net/dee";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/directfb/default.nix b/nixpkgs/pkgs/development/libraries/directfb/default.nix
index d333b7866655..1b0b50d28f00 100644
--- a/nixpkgs/pkgs/development/libraries/directfb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/directfb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch
-, autoreconfHook, perl, pkgconfig, flux, zlib
+, autoreconfHook, perl, pkg-config, flux, zlib
 , libjpeg, freetype, libpng, giflib
 , enableX11 ? true, xorg
 , enableSDL ? true, SDL }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ];
+  nativeBuildInputs = [ autoreconfHook perl pkg-config flux ];
 
   buildInputs = [ zlib libjpeg freetype giflib libpng ]
     ++ lib.optional enableSDL SDL
diff --git a/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix b/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix
index 3a8290a6597a..213096f5abf1 100644
--- a/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , rapidjson
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     rapidjson
-  ] ++ stdenv.lib.optional stdenv.isDarwin AppKit;
+  ] ++ lib.optional stdenv.isDarwin AppKit;
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=true"
-    "-DBUILD_EXAMPLES=${stdenv.lib.boolToString buildExamples}"
+    "-DBUILD_EXAMPLES=${lib.boolToString buildExamples}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official library to interface with the Discord client";
     homepage = "https://github.com/discordapp/discord-rpc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index ff81ab727328..a24e0b8d0144 100644
--- a/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }:
+{ lib, stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }:
 
 stdenv.mkDerivation rec {
   pname = "dleyna-connector-dbus";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ dbus dleyna-core glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A D-Bus API for the dLeyna services";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix
index 1f0a9bc7c597..4a4eecfdc0f2 100644
--- a/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , gupnp
 }:
 
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
 
   propagatedBuildInputs = [
     gupnp
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library of utility functions that are used by the higher level dLeyna";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix
index 6b14bbc611a8..768af6a671a1 100644
--- a/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , dleyna-connector-dbus
 , dleyna-core
 , gssdp
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
     makeWrapper
   ];
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to discover and manipulate Digital Media Renderers";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix
index 90c4df8e6413..a0a414abf748 100644
--- a/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
 , makeWrapper
-, pkgconfig
+, pkg-config
 , dleyna-core
 , dleyna-connector-dbus
 , gssdp
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
     makeWrapper
   ];
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to discover, browse and manipulate Digital Media Servers";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/nixpkgs/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix
index 43ac2530cc13..fa7d70d52131 100644
--- a/nixpkgs/pkgs/development/libraries/dlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libpng, libjpeg
 , guiSupport ? false, libX11
 
   # see http://dlib.net/compile.html
@@ -25,11 +25,10 @@ stdenv.mkDerivation rec {
     "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
     "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];
 
-  enableParallelBuilding = true;
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A general purpose cross-platform C++ machine learning library";
     homepage = "http://www.dlib.net";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
index 36b791ccc98c..f9456b8acac4 100644
--- a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python }:
 
 stdenv.mkDerivation rec {
   version = "0.6.3";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++11 port of docopt";
     homepage = "https://github.com/docopt/docopt.cpp";
     license = with licenses; [ mit boost ];
diff --git a/nixpkgs/pkgs/development/libraries/doctest/default.nix b/nixpkgs/pkgs/development/libraries/doctest/default.nix
index d647d5f38880..702015e5d38f 100644
--- a/nixpkgs/pkgs/development/libraries/doctest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/doctest/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub, installShellFiles, cmake }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "doctest";
-  version = "2.4.1";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "onqtam";
     repo = "doctest";
     rev = version;
-    sha256 = "17g7n6rjs90i0b231x5s934qnr8m80ga2yg1z344bnsdiqcjd63w";
+    hash = "sha256-NqXC5948prTCi4gsaR8bJPBTrmH+rJbHsGvwkJlpjXY=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/onqtam/doctest";
     description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/dotconf/default.nix b/nixpkgs/pkgs/development/libraries/dotconf/default.nix
index f6320a64374c..39d71eee432b 100644
--- a/nixpkgs/pkgs/development/libraries/dotconf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dotconf/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, autoreconfHook }:
+{ fetchFromGitHub, lib, stdenv, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dotconf-" + version;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A configuration parser library";
     maintainers = with maintainers; [ pSub ];
     homepage = "https://github.com/williamh/dotconf";
diff --git a/nixpkgs/pkgs/development/libraries/dotnetfx35/default.nix b/nixpkgs/pkgs/development/libraries/dotnetfx35/default.nix
index e1c59846aec5..68569b516a9b 100644
--- a/nixpkgs/pkgs/development/libraries/dotnetfx35/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dotnetfx35/default.nix
@@ -12,12 +12,12 @@ in
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
-  
+
   assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
-  
+
   wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
-  
+
   referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
-  
+
   referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
 }
diff --git a/nixpkgs/pkgs/development/libraries/dotnetfx40/default.nix b/nixpkgs/pkgs/development/libraries/dotnetfx40/default.nix
index 701464071d03..1ffc10cfc605 100644
--- a/nixpkgs/pkgs/development/libraries/dotnetfx40/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dotnetfx40/default.nix
@@ -12,12 +12,12 @@ in
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
-  
+
   assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
-  
+
   wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
-  
+
   referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
-  
+
   referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
 }
diff --git a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
index ecd5ee67cf64..2bdcc3c8a997 100644
--- a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
+++ b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
     rm BUILD
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
     homepage = "https://github.com/google/double-conversion";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/nixpkgs/pkgs/development/libraries/dqlite/default.nix
index 49435ec67184..8f67259989b8 100644
--- a/nixpkgs/pkgs/development/libraries/dqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libco-canonical
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical
 , libuv, raft-canonical, sqlite-replication }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a";
   };
 
-  nativeBuildInputs = [ autoreconfHook file pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook file pkg-config ];
   buildInputs = [
     libco-canonical.dev
     libuv
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Expose a SQLite database over the network and replicate it across a
       cluster of peers
diff --git a/nixpkgs/pkgs/development/libraries/draco/default.nix b/nixpkgs/pkgs/development/libraries/draco/default.nix
index 317742f07b3d..41ffdd16f5a9 100644
--- a/nixpkgs/pkgs/development/libraries/draco/default.nix
+++ b/nixpkgs/pkgs/development/libraries/draco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 }:
 
 stdenv.mkDerivation rec {
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
     sha256 = "14ln4la52x38pf8syr7i5v4vd65ya4zij8zj5kgihah03cih0qcd";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
@@ -24,7 +22,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_UNITY_PLUGIN=1"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for compressing and decompressing 3D geometric meshes and point clouds";
     homepage = "https://google.github.io/draco/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/nixpkgs/pkgs/development/libraries/drumstick/default.nix
index 5cef17f11196..21572e52e235 100644
--- a/nixpkgs/pkgs/development/libraries/drumstick/default.nix
+++ b/nixpkgs/pkgs/development/libraries/drumstick/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook
 , alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio
 }:
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" ];
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [
     cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook
   ];
@@ -33,7 +31,7 @@ stdenv.mkDerivation rec {
     alsaLib fluidsynth libpulseaudio qtbase qtsvg
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ solson ];
     description = "MIDI libraries for Qt5/C++";
     homepage = "http://drumstick.sourceforge.net/";
diff --git a/nixpkgs/pkgs/development/libraries/dssi/default.nix b/nixpkgs/pkgs/development/libraries/dssi/default.nix
index 779e6b077625..9ce487b1b03a 100644
--- a/nixpkgs/pkgs/development/libraries/dssi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dssi/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
-, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig
+{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
+, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config
 }:
 
 stdenv.mkDerivation rec {
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM
-      libsamplerate libtool autoconf automake xorgproto libICE pkgconfig
+      libsamplerate libtool autoconf automake xorgproto libICE pkg-config
     ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A plugin SDK for virtual instruments";
     maintainers = with maintainers;
     [
diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix
index 1aedee5c3b68..60ccf5aeeb23 100644
--- a/nixpkgs/pkgs/development/libraries/duckdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cwida/duckdb";
     description = "Embeddable SQL OLAP Database Management System";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/dxflib/default.nix b/nixpkgs/pkgs/development/libraries/dxflib/default.nix
index 1b63d8805fd9..b2cd97398c61 100644
--- a/nixpkgs/pkgs/development/libraries/dxflib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dxflib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , qmake
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     cp -pr *.so* $out/lib
     install -d -m 0755 $out/include/dxflib
     cp -pr src/*.h $out/include/dxflib
-    # Generate pkgconfig file
+    # Generate pkg-config file
     install -d -m 0755 $out/lib/pkgconfig
     cat << 'EOF' > $out/lib/pkgconfig/dxflib.pc
     prefix=${placeholder "out"}
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    platforms = stdenv.lib.platforms.linux;
-    description = ''DXF file format library'';
+    maintainers = with lib.maintainers; [raskin];
+    platforms = lib.platforms.linux;
+    description = "DXF file format library";
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/dyncall/default.nix b/nixpkgs/pkgs/development/libraries/dyncall/default.nix
index e792fe1e0519..0e3fa3ac7dc0 100644
--- a/nixpkgs/pkgs/development/libraries/dyncall/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dyncall/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "dyncall";
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     install -D -t $out/share/man/man3 ./*/*.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Highly dynamic multi-platform foreign function call interface library";
     homepage = "https://www.dyncall.org";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix
index 29fdd0689593..ad582d933059 100644
--- a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix
@@ -1,22 +1,22 @@
 # To use this package with a CMake and pkg-config build:
 # pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp)
 # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc)
-{ stdenv, fetchFromGitHub, cmake, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
 stdenv.mkDerivation rec {
   pname = "easyloggingpp";
-  version = "9.96.7";
+  version = "9.97.0";
   src = fetchFromGitHub {
     owner = "muflihun";
     repo = "easyloggingpp";
     rev = "v${version}";
-    sha256 = "0nhszn0yyjwpnv7swm4vqs3i7admgbnifi5dvq5h01fk5nc8yjqz";
+    sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs=";
   };
 
   nativeBuildInputs = [cmake];
   buildInputs = [gtest];
   cmakeFlags = [ "-Dtest=ON" ];
   NIX_CFLAGS_COMPILE = "-std=c++11" +
-    stdenv.lib.optionalString stdenv.isLinux " -pthread";
+    lib.optionalString stdenv.isLinux " -pthread";
   postInstall = ''
     mkdir -p $out/include
     cp ../src/easylogging++.cc $out/include
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ logging library";
     homepage = "https://muflihun.github.io/easyloggingpp/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [acowley];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [acowley];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/nixpkgs/pkgs/development/libraries/eccodes/default.nix
index e3bed6186302..1050490a220b 100644
--- a/nixpkgs/pkgs/development/libraries/eccodes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eccodes/default.nix
@@ -1,9 +1,9 @@
-{ fetchurl, stdenv
+{ fetchurl, lib, stdenv
 , cmake, netcdf, openjpeg, libpng, gfortran
 , enablePython ? false, pythonPackages
 , enablePosixThreads ? false
 , enableOpenMPThreads ? false}:
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "eccodes";
   version = "2.12.5";
@@ -35,12 +35,10 @@ stdenv.mkDerivation rec {
                  "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}"
                ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
 
   # Only do tests that don't require downloading 120MB of testdata
-  checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
+  checkPhase = lib.optionalString (stdenv.isDarwin) ''
     substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
   '' + ''
     ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV
diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix
index 9273fb7fd78e..4709441a1011 100644
--- a/nixpkgs/pkgs/development/libraries/eclib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pari
@@ -29,16 +29,16 @@ stdenv.mkDerivation rec {
     pari
     ntl
     gmp
-  ] ++ stdenv.lib.optionals withFlint [
+  ] ++ lib.optionals withFlint [
     flint
   ];
   nativeBuildInputs = [
     autoreconfHook
   ];
   doCheck = true;
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
-    description = ''Elliptic curve tools'';
+    description = "Elliptic curve tools";
     homepage = "https://github.com/JohnCremona/eclib";
     license = licenses.gpl2Plus;
     maintainers = teams.sage.members;
diff --git a/nixpkgs/pkgs/development/libraries/editline/default.nix b/nixpkgs/pkgs/development/libraries/editline/default.nix
index 549ef7c56bda..82f65082b946 100644
--- a/nixpkgs/pkgs/development/libraries/editline/default.nix
+++ b/nixpkgs/pkgs/development/libraries/editline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "editline";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://troglobit.com/editline.html";
     description = "A readline() replacement for UNIX without termcap (ncurses)";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
index 1509db1b80de..be22e24044d6 100644
--- a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
+++ b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , libX11
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/eigen/2.0.nix b/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
index d15275719437..a2b1ba47e2d0 100644
--- a/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
+++ b/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "eigen";
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
     homepage = "https://eigen.tuxfamily.org";
-    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
+    maintainers = with lib.maintainers; [ sander raskin ];
     branch = "2";
-    platforms = with stdenv.lib.platforms; unix;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/eigen/default.nix b/nixpkgs/pkgs/development/libraries/eigen/default.nix
index 3c6a5cc1ca65..079269521c76 100644
--- a/nixpkgs/pkgs/development/libraries/eigen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eigen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "eigen";
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
     homepage = "https://eigen.tuxfamily.org";
     platforms = platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
+    maintainers = with lib.maintainers; [ sander raskin ];
     inherit version;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 1fbe6f8893bf..9f340545584f 100644
--- a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation {
   pname = "elementary-cmake-modules";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
       --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake"
   '';
 
-  propagatedBuildInputs = [ cmake pkgconfig ];
+  propagatedBuildInputs = [ cmake pkg-config ];
 
   setupHook = ./setup-hook.sh;
 
diff --git a/nixpkgs/pkgs/development/libraries/elf-header/default.nix b/nixpkgs/pkgs/development/libraries/elf-header/default.nix
index c1764e83c303..72166bb38ce9 100644
--- a/nixpkgs/pkgs/development/libraries/elf-header/default.nix
+++ b/nixpkgs/pkgs/development/libraries/elf-header/default.nix
@@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation {
     outputsToInstall = [ "out" ];
     description = "The datastructures of ELF according to the target platform's libc";
     longDescription = ''
-	  The Executable and Linkable Format (ELF, formerly named Extensible Linking
-	  Format), is usually defined in a header like this.
-	'';
+      The Executable and Linkable Format (ELF, formerly named Extensible Linking
+      Format), is usually defined in a header like this.
+    '';
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.ericson2314 ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/embree/2.x.nix b/nixpkgs/pkgs/development/libraries/embree/2.x.nix
index d8e102a0d40b..12d4e2a87ccd 100644
--- a/nixpkgs/pkgs/development/libraries/embree/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/embree/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
 openimageio, libjpeg, libpng, libpthreadstubs, libX11
 }:
 
@@ -14,11 +14,11 @@ stdenv.mkDerivation {
   };
 
   cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ];
-  enableParallelBuilding = true;
-  
-  buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
-  meta = with stdenv.lib; {
-    description = "High performance ray tracing kernels from Intel"; 
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
+  meta = with lib; {
+    description = "High performance ray tracing kernels from Intel";
     homepage = "https://embree.github.io/";
     maintainers = with maintainers; [ hodapp ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/embree/default.nix b/nixpkgs/pkgs/development/libraries/embree/default.nix
index 650c1d4ce497..5dee84d10070 100644
--- a/nixpkgs/pkgs/development/libraries/embree/default.nix
+++ b/nixpkgs/pkgs/development/libraries/embree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
   openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }:
 
 stdenv.mkDerivation rec {
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
   ];
 
 
-  nativeBuildInputs = [ ispc pkgconfig cmake ];
+  nativeBuildInputs = [ ispc pkg-config cmake ];
   buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]
                 ++ lib.optionals stdenv.isDarwin [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High performance ray tracing kernels from Intel";
     homepage = "https://embree.github.io/";
     maintainers = with maintainers; [ hodapp gebner ];
diff --git a/nixpkgs/pkgs/development/libraries/enchant/1.x.nix b/nixpkgs/pkgs/development/libraries/enchant/1.x.nix
index 0b7b4c9c8b17..172d6747aa1c 100644
--- a/nixpkgs/pkgs/development/libraries/enchant/1.x.nix
+++ b/nixpkgs/pkgs/development/libraries/enchant/1.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
+{ lib, stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }:
 
 stdenv.mkDerivation rec {
   version = "1.6.1";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ aspell glib hunspell hspell ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic spell checking library";
     homepage = "https://abiword.github.io/enchant";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix
index 02215a30418b..184d5dcc0517 100644
--- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , aspell
 , pkg-config
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     "--enable-relocatable" # needed for tests
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic spell checking library";
     homepage = "https://abiword.github.io/enchant/";
     license = licenses.lgpl21Plus; # with extra provision for non-free checkers
diff --git a/nixpkgs/pkgs/development/libraries/enet/default.nix b/nixpkgs/pkgs/development/libraries/enet/default.nix
index 61b8c1be4f2b..ef252ad19f6d 100644
--- a/nixpkgs/pkgs/development/libraries/enet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/enet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "enet-1.3.17";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://enet.bespin.org/";
     description = "Simple and robust network communication layer on top of UDP";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/entt/default.nix b/nixpkgs/pkgs/development/libraries/entt/default.nix
index 35e12eb00c7b..955dd2eeb369 100644
--- a/nixpkgs/pkgs/development/libraries/entt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/entt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "entt";
   version = "3.5.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/skypjack/entt";
     description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++";
     maintainers = with maintainers; [ twey ];
diff --git a/nixpkgs/pkgs/development/libraries/epoxy/default.nix b/nixpkgs/pkgs/development/libraries/epoxy/default.nix
index 15e634fe4b5b..7ae0e73953f4 100644
--- a/nixpkgs/pkgs/development/libraries/epoxy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/epoxy/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python3
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3
 , libGL, libX11
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "epoxy";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python3 ];
+  nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ];
   buildInputs = [ libGL libX11 ];
 
   preConfigure = optionalString stdenv.isDarwin ''
diff --git a/nixpkgs/pkgs/development/libraries/ethash/default.nix b/nixpkgs/pkgs/development/libraries/ethash/default.nix
index 05abb1f2aa51..0a10fa3c48c1 100644
--- a/nixpkgs/pkgs/development/libraries/ethash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ethash/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "ethash";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src =
     fetchFromGitHub {
       owner = "chfast";
       repo = "ethash";
       rev = "v${version}";
-      sha256 = "0shr3m33raxy9j2mpm3q9mdbchs3nhgfaywidyxgmwqaiw1xpyif";
+      sha256 = "sha256-N30v9OZwTmDbltPPmeSa0uOGJhos1VzyS5zY9vVCWfA=";
     };
 
   nativeBuildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
     homepage = "https://github.com/ethereum/ethash";
     platforms = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/development/libraries/eventlog/default.nix b/nixpkgs/pkgs/development/libraries/eventlog/default.nix
index d80fdb2213d5..ca460aa71f6b 100644
--- a/nixpkgs/pkgs/development/libraries/eventlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eventlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "eventlog-0.2.12";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
       combination of description and tag/value pairs.
     '';
     homepage = "https://www.balabit.com/support/community/products/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/exempi/default.nix b/nixpkgs/pkgs/development/libraries/exempi/default.nix
index 5638db712451..356959b429f2 100644
--- a/nixpkgs/pkgs/development/libraries/exempi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/exempi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
+{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "exempi";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ expat zlib boost ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
   doCheck = stdenv.isLinux;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of XMP (Adobe's Extensible Metadata Platform)";
     homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix
index a845e8998e78..9d29afd69279 100644
--- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , zlib
@@ -85,13 +85,13 @@ stdenv.mkDerivation rec {
     patchShebangs ../test/
     mkdir ../test/tmp
 
-    ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) ''
+    ${lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) ''
       # Fix tests on arm
       # https://github.com/Exiv2/exiv2/issues/933
       rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
     ''}
 
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
       # Removing tests depending on charset conversion
       substituteInPlace ../test/Makefile --replace "conversions.sh" ""
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.exiv2.org/";
     description = "A library and command-line utility to manage image metadata";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/exosip/default.nix b/nixpkgs/pkgs/development/libraries/exosip/default.nix
index 4968c38bfd33..f40dea19bb9d 100644
--- a/nixpkgs/pkgs/development/libraries/exosip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/exosip/default.nix
@@ -1,25 +1,18 @@
-{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }:
+{ lib, stdenv, fetchurl, libosip, openssl, pkg-config }:
 
 stdenv.mkDerivation rec {
  pname = "libexosip2";
- version = "4.1.0";
+ version = "5.2.0";
 
  src = fetchurl {
-    url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
-    sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw";
+    url = "mirror://savannah/exosip/${pname}-${version}.tar.gz";
+    sha256 = "09bj7cm6mk8yr68y5a09a625x10ql6an3zi4pj6y1jbkhpgqibp3";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libosip openssl ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/libe/libexosip2/4.1.0-2.1/debian/patches/openssl110.patch";
-      sha256 = "01q2dax7pwh197mn18r22y38mrsky85mvs9vbkn9fpcilrdayal6";
-    })
-  ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2Plus;
     description = "Library that hides the complexity of using the SIP protocol";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix
index 29d2c2b3acb9..ba9fb2b177de 100644
--- a/nixpkgs/pkgs/development/libraries/expat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/expat/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ]; # TODO: fix referrers
   outputBin = "dev";
 
-  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  configureFlags = lib.optional stdenv.isFreeBSD "--with-pic";
 
   outputMan = "dev"; # tiny page for a dev tool
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     patchShebangs ./test-driver-wrapper.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.libexpat.org/";
     description = "A stream-oriented XML parser library written in C";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/faac/default.nix b/nixpkgs/pkgs/development/libraries/faac/default.nix
index b2c4d3741e18..dbc56572d537 100644
--- a/nixpkgs/pkgs/development/libraries/faac/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faac/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, autoreconfHook
+{ lib, stdenv, fetchurl, autoreconfHook
 , mp4v2Support ? true, mp4v2 ? null
 , drmSupport ? false # Digital Radio Mondiale
 }:
 
 assert mp4v2Support -> (mp4v2 != null);
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "faac";
   version = "1.30";
diff --git a/nixpkgs/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix
index 90b1a182e553..0afef1c9fd82 100644
--- a/nixpkgs/pkgs/development/libraries/faad2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchFromGitHub, autoreconfHook
+{lib, stdenv, fetchFromGitHub, autoreconfHook
 , drmSupport ? false # Digital Radio Mondiale
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "faad2";
   version = "2.10.0";
diff --git a/nixpkgs/pkgs/development/libraries/farbfeld/default.nix b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix
index a528ad6f7f61..9473d09ffc55 100644
--- a/nixpkgs/pkgs/development/libraries/farbfeld/default.nix
+++ b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
+{ lib, stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
 
 stdenv.mkDerivation rec {
   pname = "farbfeld";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Suckless image format with conversion tools";
     license = licenses.isc;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/farstream/default.nix b/nixpkgs/pkgs/development/libraries/farstream/default.nix
index 0ce0f56d710e..b046b7aef737 100644
--- a/nixpkgs/pkgs/development/libraries/farstream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/farstream/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , libnice
-, pkgconfig
+, pkg-config
 , autoreconfHook
 , gstreamer
 , gst-plugins-base
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     autoreconfHook
     gobject-introspection
   ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     gst-libav
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.freedesktop.org/wiki/Software/Farstream";
     description = "Audio/Video Communications Framework formely known as farsight";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
new file mode 100644
index 000000000000..5a81e3f72746
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "fast-cpp-csv-parser";
+  version = "2021-01-03";
+
+  src = fetchFromGitHub {
+    owner = "ben-strasser";
+    repo = pname;
+    rev = "75600d0b77448e6c410893830df0aec1dbacf8e3";
+    sha256 = "04kalwgsr8khqr1j5j13vzwaml268c5dvc9wfcwfs13wp3snqwf2";
+  };
+
+  installPhase = ''
+    mkdir -p $out/lib/pkgconfig $out/include
+    cp -r *.h $out/include/
+    substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc
+  '';
+
+  meta = with lib; {
+    description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files";
+    homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bhipple ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
new file mode 100644
index 000000000000..4a8e57d20ffc
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
@@ -0,0 +1,8 @@
+prefix=@out@
+includedir=${prefix}/include
+
+Name: fast-cpp-csv-parser
+Description: Fast header-only library for reading CSV files
+URL: https://github.com/ben-strasser/fast-cpp-csv-parser
+Version: @version@
+Cflags: -isystem${includedir}
diff --git a/nixpkgs/pkgs/development/libraries/fastjson/default.nix b/nixpkgs/pkgs/development/libraries/fastjson/default.nix
index f1bd647b06d8..c56e05e07532 100644
--- a/nixpkgs/pkgs/development/libraries/fastjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fastjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   version = "0.99.8";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sh autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast json library for C";
     homepage = "https://github.com/rsyslog/libfastjson";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix b/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix
index 59056a9b9a37..ac90001fc397 100644
--- a/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, openssl }:
+{ lib, stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation {
   name = "fastpbkdf2-1.0.0";
-  
+
   src = fetchFromGitHub {
     owner = "ctz";
     repo = "fastpbkdf2";
     rev = "v1.0.0";
     sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2";
   };
-  
+
   buildInputs = [ openssl ];
 
   preBuild = ''
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     cp fastpbkdf2.h $out/include/fastpbkdf2
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C";
     homepage = "https://github.com/ctz/fastpbkdf2";
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix
index 02544d74782e..c030f53df26c 100644
--- a/nixpkgs/pkgs/development/libraries/faudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faudio/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, SDL2}:
+{ lib, stdenv, fetchFromGitHub, cmake, SDL2}:
 
 #TODO: tests
 
 stdenv.mkDerivation rec {
   pname = "faudio";
-  version = "20.12";
+  version = "21.01";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     rev = version;
-    sha256 = "1iwfsfbd2ji7lkk5fh0wla287gph0sadlf0pz2j0vyddpkvr0xgx";
+    sha256 = "sha256-D7nlwQnz2JPRB3JrrkyUcaaf4Ro/+Ap8sqq5Oz8naHw=";
   };
 
   nativeBuildInputs = [cmake];
 
   buildInputs = [ SDL2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library";
     homepage = "https://github.com/FNA-XNA/FAudio";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/fcft/default.nix b/nixpkgs/pkgs/development/libraries/fcft/default.nix
index 1ce09b63cbed..fd6f26c9789f 100644
--- a/nixpkgs/pkgs/development/libraries/fcft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fcft/default.nix
@@ -1,21 +1,28 @@
 { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc
-,freetype, fontconfig, harfbuzz, pixman, tllist, check }:
+, freetype, fontconfig, pixman, tllist, check
+, withHarfBuzz ? true
+, harfbuzz
+}:
 
 stdenv.mkDerivation rec {
   pname = "fcft";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchgit {
     url = "https://codeberg.org/dnkl/fcft.git";
     rev = version;
-    sha256 = "sha256-FD3KfaQbSEA1XdmS6YxH+c5fSsra9Ro/KKslb7Brv7U=";
+    sha256 = "0k2i57rakm4g86f7hbhkby8af0vv7v63a70lk3m58mkycpy5q2rm";
   };
 
   nativeBuildInputs = [ pkg-config meson ninja scdoc ];
-  buildInputs = [ freetype fontconfig pixman tllist harfbuzz ];
+  buildInputs = [ freetype fontconfig pixman tllist ]
+    ++ lib.optional withHarfBuzz harfbuzz;
   checkInputs = [ check ];
 
-  mesonFlags = [ "--buildtype=release" ];
+  mesonFlags = [
+    "--buildtype=release"
+    "-Dtext-shaping=${if withHarfBuzz then "enabled" else "disabled"}"
+  ];
 
   doCheck = true;
 
diff --git a/nixpkgs/pkgs/development/libraries/fcgi/default.nix b/nixpkgs/pkgs/development/libraries/fcgi/default.nix
index bde1682e3fc0..1ec666a920c3 100644
--- a/nixpkgs/pkgs/development/libraries/fcgi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fcgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "fcgi";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "ln -s . $out/include/fastcgi";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A language independent, scalable, open extension to CG";
     homepage = "http://www.fastcgi.com/";
     license = "FastCGI see LICENSE.TERMS";
diff --git a/nixpkgs/pkgs/development/libraries/fcppt/default.nix b/nixpkgs/pkgs/development/libraries/fcppt/default.nix
index 22d3bd889e11..380fdcce29f3 100644
--- a/nixpkgs/pkgs/development/libraries/fcppt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fcppt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, catch2, metal }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }:
 stdenv.mkDerivation rec {
   pname = "fcppt";
   version = "3.5.0";
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Freundlich's C++ toolkit";
     longDescription = ''
       Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on
diff --git a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix
index 53967381570d..dc64a6edce04 100644
--- a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , exampleSupport ? false # Example encoding program
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "fdk-aac";
   version = "2.0.1";
diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
index faa8ed3c70e4..fd7d89a88311 100644
--- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack
 , gmpxx
 }:
 
@@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
-  ] ++ stdenv.lib.optionals doCheck checkInputs;
+    pkg-config
+  ] ++ lib.optionals doCheck checkInputs;
 
   buildInputs = [ givaro blas lapack ];
 
   configureFlags = [
     "--with-blas-libs=-lcblas"
     "--with-lapack-libs=-llapacke"
-  ] ++ stdenv.lib.optionals stdenv.isx86_64 [
+  ] ++ lib.optionals stdenv.isx86_64 [
     # disable SIMD instructions (which are enabled *when available* by default)
     # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
     "--${if stdenv.hostPlatform.sse3Support   then "enable" else "disable"}-sse3"
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
   ];
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
-    description = ''Finite Field Linear Algebra Subroutines'';
+    description = "Finite Field Linear Algebra Subroutines";
     license = licenses.lgpl21Plus;
     maintainers = teams.sage.members;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
index a2f5e366e008..916ea2772e19 100644
--- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
+{ lib, stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
  */
@@ -111,6 +111,7 @@
 , opensslExtlib ? false, openssl ? null
 , libpulseaudio ? null # Pulseaudio input support
 , rav1e ? null # AV1 encoder (focused on speed and safety)
+, svt-av1 ? null # AV1 encoder/decoder (focused on speed and correctness)
 , rtmpdump ? null # RTMP[E] support
 #, libquvi ? null # Quvi input support
 , samba ? null # Samba protocol
@@ -183,7 +184,7 @@
 
 let
   inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64;
-  inherit (stdenv.lib) optional optionals optionalString enableFeature;
+  inherit (lib) optional optionals optionalString enableFeature;
 in
 
 /*
@@ -250,13 +251,18 @@ stdenv.mkDerivation rec {
       sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o=";
       name = "fix_libsrt.patch";
     })
+    # Patch ffmpeg for svt-av1 until version 4.4
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch";
+      sha256 = "1p4g8skr5gjw5h1648j7qrks81zx49lrnx9g0p81qgnrvxc2wwx0";
+    })
   ];
 
   prePatch = ''
     patchShebangs .
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c
-  '' + stdenv.lib.optionalString (frei0r != null) ''
+  '' + lib.optionalString (frei0r != null) ''
     substituteInPlace libavfilter/vf_frei0r.c \
       --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
     substituteInPlace doc/filters.texi \
@@ -393,6 +399,7 @@ stdenv.mkDerivation rec {
     (enableFeature (libpulseaudio != null) "libpulse")
     #(enableFeature quvi "libquvi")
     (enableFeature (rav1e != null) "librav1e")
+    (enableFeature (svt-av1 != null) "libsvtav1")
     (enableFeature (rtmpdump != null) "librtmp")
     #(enableFeature (schroedinger != null) "libschroedinger")
     (enableFeature (SDL2 != null) "sdl2")
@@ -423,13 +430,13 @@ stdenv.mkDerivation rec {
     "--enable-cross-compile"
   ];
 
-  nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ];
+  nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ];
 
   buildInputs = [
     bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
     libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
     libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
-    libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e rtmpdump opencore-amr
+    libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
     samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
     zeromq4 zlib
   ] ++ optionals openglExtlib [ libGL libGLU ]
@@ -460,7 +467,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     homepage = "https://www.ffmpeg.org/";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix
index 049ef32b72fb..daa03d0293a0 100644
--- a/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm
+{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm
 }:
 
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libsixel
     yasm
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics";
     homepage = "http://www.ffmpeg.org/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
index d763fb513545..99a084703967 100644
--- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm
+{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
 , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
 , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
 , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
@@ -44,7 +44,7 @@
 
 let
   inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32;
-  inherit (stdenv.lib) optional optionals optionalString enableFeature filter;
+  inherit (lib) optional optionals optionalString enableFeature filter;
 
   cmpVer = builtins.compareVersions;
   reqMin = requiredVersion: (cmpVer requiredVersion branch != 1);
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  postPatch = ''patchShebangs .'';
+  postPatch = "patchShebangs .";
   inherit patches;
 
   outputs = [ "bin" "dev" "out" "man" ]
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
   ] ++ optional stdenv.cc.isClang "--cc=clang");
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ];
+  nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ];
 
   buildInputs = [
     bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
     inherit vaapiSupport vdpauSupport;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     homepage = "http://www.ffmpeg.org/";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index 6c8e689840e8..2e68dbb1d120 100644
--- a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg
+{ fetchFromGitHub, lib, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ffmpeg_3 libpng libjpeg ];
   cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];
 
-  meta = with stdenv.lib;  {
+  meta = with lib;  {
     homepage = "https://github.com/dirkvdb/ffmpegthumbnailer";
     description = "A lightweight video thumbnailer";
     longDescription = "FFmpegthumbnailer is a lightweight video
diff --git a/nixpkgs/pkgs/development/libraries/ffms/default.nix b/nixpkgs/pkgs/development/libraries/ffms/default.nix
index ebbced19eb8e..7fa96cff7f88 100644
--- a/nixpkgs/pkgs/development/libraries/ffms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "ffms";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-fPIC";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib ffmpeg_3 ];
 
   # ffms includes a built-in vapoursynth plugin, see:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/libffms2.so $out/lib/vapoursynth/libffms2.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/FFMS/ffms2/";
     description = "Libav/ffmpeg based source library for easy frame accurate access";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/fftw/default.nix b/nixpkgs/pkgs/development/libraries/fftw/default.nix
index ba7e86747a7f..f0632e1460a0 100644
--- a/nixpkgs/pkgs/development/libraries/fftw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fftw/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   checkInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fastest Fourier Transform in the West library";
     homepage = "http://www.fftw.org/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/filter-audio/default.nix b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
index 3438bfee07b4..a412f7070470 100644
--- a/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "filter-audio";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight audio filtering library made from webrtc code";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/libraries/flann/default.nix b/nixpkgs/pkgs/development/libraries/flann/default.nix
index f65d283fd1d2..913393804249 100644
--- a/nixpkgs/pkgs/development/libraries/flann/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flann/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
 
 stdenv.mkDerivation {
   name = "flann-1.9.1";
@@ -18,13 +18,13 @@ stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ unzip cmake python ];
+  nativeBuildInputs = [ unzip cmake python ];
 
   meta = {
     homepage = "http://people.cs.ubc.ca/~mariusm/flann/";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "Fast approximate nearest neighbor searches in high dimensional spaces";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
index 424aeb8637d4..374203556a60 100644
--- a/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "flatbuffers";
@@ -10,20 +10,36 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
   };
+  patches = [
+    (fetchpatch {
+      # Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020.
+      # Should be included in the next release after 1.12.0
+      url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch";
+      sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s";
+      excludes = [ "src/idl_gen_cpp.cpp" ];
+    })
+    (fetchpatch {
+      # Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020.
+      # Should be included in the next release after 1.12.0
+      url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch";
+      sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4";
+    })
+  ];
 
-  preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin ''
+  preConfigure = lib.optional stdenv.buildPlatform.isDarwin ''
     rm BUILD
   '';
 
   nativeBuildInputs = [ cmake ];
-  enableParallelBuilding = true;
 
   cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ];
 
-  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+  # tests fail to compile
+  doCheck = false;
+  # doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
   checkTarget = "test";
 
-  meta = {
+  meta = with lib; {
     description = "Memory Efficient Serialization Library";
     longDescription = ''
       FlatBuffers is an efficient cross platform serialization library for
@@ -31,9 +47,9 @@ stdenv.mkDerivation rec {
       access serialized data without unpacking/parsing it first, while still
       having great forwards/backwards compatibility.
     '';
-    maintainers = [ stdenv.lib.maintainers.teh ];
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.teh ];
+    license = licenses.asl20;
+    platforms = platforms.unix;
     homepage = "https://google.github.io/flatbuffers/";
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/nixpkgs/pkgs/development/libraries/flatcc/default.nix
index 6239dba2836d..6b40814119c6 100644
--- a/nixpkgs/pkgs/development/libraries/flatcc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "FlatBuffers Compiler and Library in C for C ";
     homepage = "https://github.com/dvidelabs/flatcc";
-    license = [ stdenv.lib.licenses.asl20 ];
+    license = [ lib.licenses.asl20 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
index 6f8634c01ef8..1480f42750dd 100644
--- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , autoconf
@@ -196,7 +196,7 @@ stdenv.mkDerivation rec {
   in ''
     patchShebangs buildutil
     patchShebangs tests
-    PATH=${stdenv.lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
+    PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
   '';
 
   preConfigure = ''
@@ -215,7 +215,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Linux application sandboxing and distribution framework";
     homepage = "https://flatpak.org/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/flint/default.nix b/nixpkgs/pkgs/development/libraries/flint/default.nix
index 3c768fc472c7..7bfa701db739 100644
--- a/nixpkgs/pkgs/development/libraries/flint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , gmp
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     mpir
     mpfr
     ntl
-  ] ++ stdenv.lib.optionals withBlas [
+  ] ++ lib.optionals withBlas [
     openblas
   ];
   propagatedBuildInputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     "--with-mpir=${mpir}"
     "--with-mpfr=${mpfr}"
     "--with-ntl=${ntl}"
-  ] ++ stdenv.lib.optionals withBlas [
+  ] ++ lib.optionals withBlas [
     "--with-blas=${openblas}"
   ];
 
@@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
   meta = {
     inherit version;
-    description = ''Fast Library for Number Theory'';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "Fast Library for Number Theory";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     homepage = "http://www.flintlib.org/";
     downloadPage = "http://www.flintlib.org/downloads.html";
     updateWalker = true;
diff --git a/nixpkgs/pkgs/development/libraries/flite/default.nix b/nixpkgs/pkgs/development/libraries/flite/default.nix
index 1db8a9fbe2f3..24927fe853ba 100644
--- a/nixpkgs/pkgs/development/libraries/flite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, alsaLib }:
+{ lib, stdenv, fetchFromGitHub, alsaLib }:
 
 stdenv.mkDerivation rec {
   pname = "flite";
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ];
+  buildInputs = lib.optionals stdenv.isLinux [ alsaLib ];
 
   configureFlags = [
     "--enable-shared"
-  ] ++ stdenv.lib.optionals stdenv.isLinux [ "--with-audio=alsa" ];
+  ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, fast run-time speech synthesis engine";
     homepage = "http://www.festvox.org/flite/";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/libraries/fltk/1.4.nix b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
index c40a75edc090..2db0aea3ecf8 100644
--- a/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
+++ b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
+{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
 , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng
 , libtiff, freetype, Cocoa, AGL, GLUT
 }:
@@ -16,11 +16,11 @@ stdenv.mkDerivation {
     sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
-    ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
+    ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
 
   propagatedBuildInputs = [ xorgproto ]
     ++ (if stdenv.isDarwin
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ cross-platform lightweight GUI library";
     homepage = "https://www.fltk.org";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/nixpkgs/pkgs/development/libraries/fltk/default.nix b/nixpkgs/pkgs/development/libraries/fltk/default.nix
index ad4736533cf0..5cbd993fc646 100644
--- a/nixpkgs/pkgs/development/libraries/fltk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fltk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
+{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
 , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng
 , libtiff, freetype, Cocoa, AGL, GLUT
 }:
@@ -16,11 +16,11 @@ stdenv.mkDerivation {
     sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
-    ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
+    ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
 
   propagatedBuildInputs = [ xorgproto ]
     ++ (if stdenv.isDarwin
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ cross-platform lightweight GUI library";
     homepage = "https://www.fltk.org";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix
index 2f490891433b..0d2983b1f846 100644
--- a/nixpkgs/pkgs/development/libraries/fmt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -28,7 +28,7 @@ let
 
       doCheck = true;
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Small, safe and fast formatting library";
         longDescription = ''
           fmt (formerly cppformat) is an open-source formatting library. It can be
diff --git a/nixpkgs/pkgs/development/libraries/folks/default.nix b/nixpkgs/pkgs/development/libraries/folks/default.nix
index 6181cb45e19e..955b7e0d16f9 100644
--- a/nixpkgs/pkgs/development/libraries/folks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/folks/default.nix
@@ -1,6 +1,6 @@
 { fetchurl
-, stdenv
-, pkgconfig
+, lib, stdenv
+, pkg-config
 , meson
 , ninja
 , glib
@@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn";
   };
 
   mesonFlags = [
     "-Ddocs=true"
-    "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}"
+    "-Dtelepathy_backend=${lib.boolToString telepathySupport}"
   ];
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_43
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     vala
   ];
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     nspr
     nss
     readline
-  ] ++ stdenv.lib.optional telepathySupport telepathy-glib;
+  ] ++ lib.optional telepathySupport telepathy-glib;
 
   propagatedBuildInputs = [
     glib
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that aggregates people from multiple sources to create metacontacts";
     homepage = "https://wiki.gnome.org/Projects/Folks";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix
index 62f73a361916..51666cb8828e 100644
--- a/nixpkgs/pkgs/development/libraries/folly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/folly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (rec {
   pname = "folly";
-  version = "2020.09.28.00";
+  version = "2021.01.18.01";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1ry2nqfavcbz0jvsqw71105gbxm5hpmdi2k1w155m957jrv3n5vg";
+    sha256 = "sha256-Q70zD+8maRQp+f1fqPyhJEpjVYt3eORD85fIk7Za9lw=";
   };
 
   nativeBuildInputs = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation (rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open-source C++ library developed and used at Facebook";
     homepage = "https://github.com/facebook/folly";
     license = licenses.asl20;
@@ -60,6 +60,6 @@ stdenv.mkDerivation (rec {
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ abbradar pierreis ];
   };
-} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+} // lib.optionalAttrs stdenv.isDarwin {
   LDFLAGS = "-ljemalloc";
 })
diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
index e08149903a2b..daedaefcf9c5 100644
--- a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchpatch
 , substituteAll
 , fetchurl
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
     # just <1MB; this is what you get when loading config fails for some reason
     "--with-default-fonts=${dejavu_fonts.minimal}"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
     rm -r $bin/share/man/man3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for font customization and configuration";
     homepage = "http://fontconfig.org/";
     license = licenses.bsd2; # custom but very bsd-like
diff --git a/nixpkgs/pkgs/development/libraries/forge/default.nix b/nixpkgs/pkgs/development/libraries/forge/default.nix
index 83630aef9aa8..ba85cea73d69 100644
--- a/nixpkgs/pkgs/development/libraries/forge/default.nix
+++ b/nixpkgs/pkgs/development/libraries/forge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , arrayfire, expat, fontconfig, freeimage, freetype, boost
 , mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     arrayfire
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend";
     longDescription = ''
       An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.
diff --git a/nixpkgs/pkgs/development/libraries/fox/default.nix b/nixpkgs/pkgs/development/libraries/fox/default.nix
index 5dacf53b259f..408518ba79ce 100644
--- a/nixpkgs/pkgs/development/libraries/fox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
+{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
 , CoreServices ? null }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   patches = [ ./clang.patch ];
 
   buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
-    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+    ++ lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ based class library for building Graphical User Interfaces";
     longDescription = ''
       FOX stands for Free Objects for X.
diff --git a/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
index 208780a450ed..50f9e688cb9f 100644
--- a/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
+{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
 , libXrandr, libGLU, libGL, libXft, libXfixes, xinput
 , CoreServices }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
     libXft libGLU libGL libXfixes xinput
-  ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+  ] ++ lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;
 
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
         Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
       '';
     homepage = "http://fox-toolkit.org";
-    license = stdenv.lib.licenses.lgpl3;
+    license = lib.licenses.lgpl3;
     maintainers = [];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    platforms = lib.platforms.mesaPlatforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/fplll/20160331.nix b/nixpkgs/pkgs/development/libraries/fplll/20160331.nix
index aabbfd14a78b..374aec5904d6 100644
--- a/nixpkgs/pkgs/development/libraries/fplll/20160331.nix
+++ b/nixpkgs/pkgs/development/libraries/fplll/20160331.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
+{lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
 , gmp, mpfr
 }:
 stdenv.mkDerivation rec {
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   buildInputs = [gmp mpfr];
   meta = {
     inherit version;
-    description = ''Lattice algorithms using floating-point arithmetic'';
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Lattice algorithms using floating-point arithmetic";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/fplll/default.nix b/nixpkgs/pkgs/development/libraries/fplll/default.nix
index 82d56ea2af41..3a82b566a50f 100644
--- a/nixpkgs/pkgs/development/libraries/fplll/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fplll/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , gettext
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
     mpfr
   ];
 
-  meta = with stdenv.lib; {
-    description = ''Lattice algorithms using floating-point arithmetic'';
+  meta = with lib; {
+    description = "Lattice algorithms using floating-point arithmetic";
     changelog = [
       # Some release notes are added to the github tags, though they are not
       # always complete.
diff --git a/nixpkgs/pkgs/development/libraries/frame/default.nix b/nixpkgs/pkgs/development/libraries/frame/default.nix
index f266f07a631c..e96aa9394da9 100644
--- a/nixpkgs/pkgs/development/libraries/frame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/frame/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true
-,  stdenv, fetchurl, pkgconfig, xorg }:
+,  lib, stdenv, fetchurl, pkg-config, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "frame";
@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a";
   };
 
-  buildInputs = [ 
-    stdenv pkgconfig
-  ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
+  buildInputs = [
+    stdenv pkg-config
+  ] ++ lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
 
-  configureFlags = stdenv.lib.optional enableX11 "--with-x11";
+  configureFlags = lib.optional enableX11 "--with-x11";
 
   meta = {
     homepage = "https://launchpad.net/frame";
     description = "Handles the buildup and synchronization of a set of simultaneous touches";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/freealut/default.nix b/nixpkgs/pkgs/development/libraries/freealut/default.nix
index 2c9a893284be..3bb6eaddfa36 100644
--- a/nixpkgs/pkgs/development/libraries/freealut/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freealut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, openal }:
+{ lib, stdenv, darwin, fetchurl, openal }:
 
 stdenv.mkDerivation rec {
   name = "freealut-1.1.0";
@@ -9,14 +9,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openal
-  ] ++ stdenv.lib.optional stdenv.isDarwin
+  ] ++ lib.optional stdenv.isDarwin
     darwin.apple_sdk.frameworks.OpenAL
   ;
 
   meta = {
     homepage = "http://openal.org/";
     description = "Free implementation of OpenAL's ALUT standard";
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/nixpkgs/pkgs/development/libraries/freeglut/default.nix
index d23147095fcf..83e3eebdcc32 100644
--- a/nixpkgs/pkgs/development/libraries/freeglut/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freeglut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
+{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
 
 let version = "3.2.1";
 in stdenv.mkDerivation {
@@ -12,9 +12,10 @@ in stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ];
 
-  cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
+  cmakeFlags = lib.optionals stdenv.isDarwin [
                  "-DOPENGL_INCLUDE_DIR=${libGL}/include"
                  "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib"
                  "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib"
@@ -22,9 +23,7 @@ in stdenv.mkDerivation {
                  "-DFREEGLUT_BUILD_STATIC:BOOL=OFF"
                ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Create and manage windows containing OpenGL contexts";
     longDescription = ''
       FreeGLUT is an open source alternative to the OpenGL Utility Toolkit
diff --git a/nixpkgs/pkgs/development/libraries/freenect/default.nix b/nixpkgs/pkgs/development/libraries/freenect/default.nix
index 9021e78a5b69..2cf026514731 100644
--- a/nixpkgs/pkgs/development/libraries/freenect/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freenect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
+{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, freeglut, libGLU, libGL, libXi, libXmu
 , GLUT, Cocoa
  }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ]
     ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   meta = {
     description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix
index c1b9318130c1..8e6904a94b2f 100644
--- a/nixpkgs/pkgs/development/libraries/freetds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
 , openssl
 , odbcSupport ? true, unixODBC ? null }:
 
@@ -17,13 +17,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openssl
-  ] ++ stdenv.lib.optional odbcSupport unixODBC;
+  ] ++ lib.optional odbcSupport unixODBC;
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
     homepage    = "https://www.freetds.org";
     license     = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix
index b87e64c2afbf..7b5fff29a286 100644
--- a/nixpkgs/pkgs/development/libraries/freetype/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , buildPackages
-, pkgconfig, which, makeWrapper
+, pkg-config, which, makeWrapper
 , zlib, bzip2, libpng, gnumake, glib
 
 , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
@@ -10,13 +10,13 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 
 in stdenv.mkDerivation rec {
   pname = "freetype";
   version = "2.10.4";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A font rendering engine";
     longDescription = ''
       FreeType is a portable and efficient library for rendering fonts. It
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
 
   # dependence on harfbuzz is looser than the reverse dependence
-  nativeBuildInputs = [ pkgconfig which makeWrapper ]
+  nativeBuildInputs = [ pkg-config which makeWrapper ]
     # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
     ++ optional (!stdenv.isLinux) gnumake;
 
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
 
   postInstall = glib.flattenInclude + ''
     substituteInPlace $dev/bin/freetype-config \
-      --replace ${buildPackages.pkgconfig} ${pkgconfig}
+      --replace ${buildPackages.pkg-config} ${pkg-config}
 
     wrapProgram "$dev/bin/freetype-config" \
       --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
diff --git a/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/nixpkgs/pkgs/development/libraries/frei0r/default.nix
index 2dc7275559d4..c4f993462964 100644
--- a/nixpkgs/pkgs/development/libraries/frei0r/default.nix
+++ b/nixpkgs/pkgs/development/libraries/frei0r/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }:
+{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "frei0r-plugins";
@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
   };
 
-  nativeBuildInputs = [ autoconf pkgconfig ];
+  nativeBuildInputs = [ autoconf pkg-config ];
   buildInputs = [ cairo opencv ];
 
-  postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     for f in $out/lib/frei0r-1/*.so* ; do
       ln -s $f "''${f%.*}.dylib"
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://frei0r.dyne.org";
     description = "Minimalist, cross-platform, shared video plugins";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/nixpkgs/pkgs/development/libraries/fribidi/default.nix
index f10af240720d..27f3b825d10a 100644
--- a/nixpkgs/pkgs/development/libraries/fribidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fribidi/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , buildPackages
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , fixDarwinDylibNames
 , python3
 }:
@@ -24,15 +24,15 @@ stdenv.mkDerivation rec {
     patchShebangs test
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkg-config ]
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   doCheck = true;
   checkInputs = [ python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fribidi/fribidi";
     description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix
index 46b579d4abd8..c91e8517b078 100644
--- a/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }:
+{ lib, stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "fstrcmp";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Make fuzzy comparisons of strings and byte arrays";
     longDescription = ''
       The fstrcmp project provides a library that is used to make fuzzy
diff --git a/nixpkgs/pkgs/development/libraries/fstrm/default.nix b/nixpkgs/pkgs/development/libraries/fstrm/default.nix
index 7b1adb3e3f0c..46a7118cefe4 100644
--- a/nixpkgs/pkgs/development/libraries/fstrm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fstrm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "fstrm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "out" "dev" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libevent openssl ];
 
   preBuild = ''
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Frame Streams implementation in C";
     homepage = "https://github.com/farsightsec/fstrm";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/ftgl/default.nix b/nixpkgs/pkgs/development/libraries/ftgl/default.nix
index a0ce9db815bc..c3fd6ffb9407 100644
--- a/nixpkgs/pkgs/development/libraries/ftgl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ftgl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
+{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
 
 let
   name = "ftgl-2.1.3-rc5";
@@ -18,14 +18,14 @@ stdenv.mkDerivation {
       [ libGL libGLU ])
     ;
 
-  configureFlags = [ "--with-ft-prefix=${stdenv.lib.getDev freetype}" ];
+  configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ];
 
   enableParallelBuilding = true;
 
   meta = {
     homepage = "https://sourceforge.net/apps/mediawiki/ftgl/";
     description = "Font rendering library for OpenGL applications";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       FTGL is a free cross-platform Open Source C++ library that uses
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
       and extruded polygon rendering modes.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     maintainers = [];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/funambol/default.nix b/nixpkgs/pkgs/development/libraries/funambol/default.nix
index 064dbb39a2f9..377aa45cf5ec 100644
--- a/nixpkgs/pkgs/development/libraries/funambol/default.nix
+++ b/nixpkgs/pkgs/development/libraries/funambol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
+{ lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
 
 stdenv.mkDerivation {
   name = "funambol-client-cpp-9.0.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook unzip ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SyncML client sdk by Funambol project";
     homepage = "http://www.funambol.com";
     license = licenses.agpl3;
diff --git a/nixpkgs/pkgs/development/libraries/gaia/default.nix b/nixpkgs/pkgs/development/libraries/gaia/default.nix
index 46ed3626d2af..088354aecb28 100644
--- a/nixpkgs/pkgs/development/libraries/gaia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gaia/default.nix
@@ -4,7 +4,7 @@
 , libyaml
 , swig
 , eigen
-, pkgconfig
+, pkg-config
 , python2
 , wafHook
 , makeWrapper
@@ -31,15 +31,14 @@ stdenv.mkDerivation rec {
   };
 
   # Fix installation error when waf tries to put files in /etc/
-  prePatch = ''
-  '' + lib.optionalString cyclopsSupport ''
+  prePatch = "" + lib.optionalString cyclopsSupport ''
     substituteInPlace src/wscript \
       --replace "/etc/cyclops" "$out/etc/cyclops" \
       --replace "/etc/init.d" "$out/etc/init.d"
   '';
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     python2 # For wafHook
     swig
     wafHook
@@ -72,8 +71,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (cyclopsSupport) [ "--with-cyclops" ]
   ;
 
-  postFixup = ''
-  ''
+  postFixup = ""
     + lib.optionalString pythonSupport ''
       wrapPythonPrograms
     ''
diff --git a/nixpkgs/pkgs/development/libraries/galario/default.nix b/nixpkgs/pkgs/development/libraries/galario/default.nix
index 84594b8dbeb9..888f26f2da7d 100644
--- a/nixpkgs/pkgs/development/libraries/galario/default.nix
+++ b/nixpkgs/pkgs/development/libraries/galario/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 , fetchFromGitHub
 , cmake
@@ -30,17 +30,17 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ fftw fftwFloat ]
-  ++ stdenv.lib.optional enablePython pythonPackages.python
-  ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp
+  ++ lib.optional enablePython pythonPackages.python
+  ++ lib.optional stdenv.isDarwin llvmPackages.openmp
   ;
 
-  propagatedBuildInputs = stdenv.lib.optional enablePython [
+  propagatedBuildInputs = lib.optional enablePython [
     pythonPackages.numpy
     pythonPackages.cython
     pythonPackages.pytest
   ];
 
-  checkInputs = stdenv.lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ];
+  checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ];
 
   preConfigure = ''
     mkdir -p build/external/src
@@ -55,12 +55,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enablePython) ''
+  postInstall = lib.optionalString (stdenv.isDarwin && enablePython) ''
     install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so
     install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GPU Accelerated Library for Analysing Radio Interferometer Observations";
     longDescription = ''
       Galario is a library that exploits the computing power of modern
diff --git a/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix b/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix
new file mode 100644
index 000000000000..0546bfb8e08e
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }:
+
+stdenv.mkDerivation rec {
+  pname = "GameNetworkingSockets";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "ValveSoftware";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1zghyc4liml8gzxflyh5gp6zi11ny6ng5hv9wyqvp32rfx221gc6";
+  };
+
+  nativeBuildInputs = [ cmake ninja go ];
+
+  cmakeFlags = [ "-G Ninja" ];
+
+  # tmp home for go
+  preBuild = "export HOME=\"$TMPDIR\"";
+
+  buildInputs = [ protobuf openssl ];
+
+  meta = with lib; {
+    # build failure is resolved on master, remove at next release
+    broken = stdenv.isDarwin;
+    description = "GameNetworkingSockets is a basic transport layer for games";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    inherit (src.meta) homepage;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/gamin/default.nix b/nixpkgs/pkgs/development/libraries/gamin/default.nix
index 89096c887450..56de42d9dc5b 100644
--- a/nixpkgs/pkgs/development/libraries/gamin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gamin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }:
 
 let
   cross = stdenv.hostPlatform != stdenv.buildPlatform;
@@ -10,7 +10,7 @@ in stdenv.mkDerivation (rec {
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
   buildInputs = [ glib ];
 
@@ -24,15 +24,15 @@ in stdenv.mkDerivation (rec {
 
   patches = [ ./deadlock.patch ]
     ++ map fetchurl (import ./debian-patches.nix)
-    ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+    ++ lib.optional stdenv.cc.isClang ./returnval.patch
+    ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
       name = "fix-pthread-mutex.patch";
       url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
       sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
-    }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ;
+    }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ;
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://people.gnome.org/~veillard/gamin/";
     description = "A file and directory monitoring system";
     maintainers = with maintainers; [ lovek323 ];
@@ -41,7 +41,7 @@ in stdenv.mkDerivation (rec {
   };
 }
 
-// stdenv.lib.optionalAttrs stdenv.isDarwin {
+// lib.optionalAttrs stdenv.isDarwin {
   preBuild =  ''
     sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
   '';
diff --git a/nixpkgs/pkgs/development/libraries/ganv/default.nix b/nixpkgs/pkgs/development/libraries/ganv/default.nix
index cf9b04863043..bf6c030589b9 100644
--- a/nixpkgs/pkgs/development/libraries/ganv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ganv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }:
+{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "ganv";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook ];
+  nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [ graphviz gtk2 gtkmm2 python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interactive Gtk canvas widget for graph-based interfaces";
     homepage = "http://drobilla.net";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/garmintools/default.nix b/nixpkgs/pkgs/development/libraries/garmintools/default.nix
index 97449d944ec3..424e3751f407 100644
--- a/nixpkgs/pkgs/development/libraries/garmintools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/garmintools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1 }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
 stdenv.mkDerivation {
   name = "garmintools-0.10";
   src = fetchurl {
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface";
     homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
index 0eff8eafacfc..c1f485e18d9b 100644
--- a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "gbenchmark";
@@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
     chmod -R u+w googletest
   '';
 
-  enableParallelBuilding = true;
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A microbenchmark support library";
     homepage = "https://github.com/google/benchmark";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/gcab/default.nix b/nixpkgs/pkgs/development/libraries/gcab/default.nix
index 0034f7ed6333..0ad9f607dfea 100644
--- a/nixpkgs/pkgs/development/libraries/gcab/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gcab/default.nix
@@ -1,11 +1,11 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , gettext
 , gobject-introspection
 , gtk-doc
 , docbook_xsl
 , docbook_xml_dtd_43
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , git
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7";
   };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     git
-    pkgconfig
+    pkg-config
     vala
     gettext
     gobject-introspection
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dinstalled_tests=true"
-    "-Dinstalled_test_prefix=${placeholder ''installedTests''}"
+    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
   ];
 
   doCheck = true;
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject library to create cabinet files";
     homepage = "https://gitlab.gnome.org/GNOME/gcab";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix
index 486a24defd1b..b123f799ccaa 100644
--- a/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, flex, bison, file }:
+{ lib, stdenv, fetchurl, fetchpatch, flex, bison, file }:
 
 stdenv.mkDerivation rec {
   pname = "libstdc++5";
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/lib/!(libstdc++*)
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gcc.gnu.org/";
     license = licenses.lgpl3Plus;
     description = "GNU Compiler Collection, version ${version} -- C++ standard library";
diff --git a/nixpkgs/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix
index 212b087fbe2c..8add81e27969 100644
--- a/nixpkgs/pkgs/development/libraries/gcr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , gettext
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56";
   };
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     meson
     python3
     ninja
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     maintainers = teams.gnome.members;
     description = "GNOME crypto services (daemon and tools)";
diff --git a/nixpkgs/pkgs/development/libraries/gd/default.nix b/nixpkgs/pkgs/development/libraries/gd/default.nix
index 3b4533890a76..36a930956033 100644
--- a/nixpkgs/pkgs/development/libraries/gd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , autoconf
 , automake
 , pkg-config
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   # -pthread gets passed to clang, causing warnings
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no";
+  configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no";
 
   nativeBuildInputs = [ autoconf automake pkg-config ];
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails 2 tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libgd.github.io/";
     description = "A dynamic image creation library";
     license = licenses.free; # some custom license
diff --git a/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix b/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix
index d3505679e4d0..9cb9c448c1d2 100644
--- a/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
+{ lib, stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
 , postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2
 , netcdfSupport ? true, netcdf, hdf5, curl
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
     libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
   ++ (with pythonPackages; [ python numpy wrapPython ])
-  ++ stdenv.lib.optional stdenv.isDarwin libiconv
-  ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
+  ++ lib.optional stdenv.isDarwin libiconv
+  ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
 
   configureFlags = [
     "--with-expat=${expat.dev}"
@@ -97,8 +97,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = "https://www.gdal.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix
index 1295a1002328..8c02919126ba 100644
--- a/nixpkgs/pkgs/development/libraries/gdal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
+{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
 , libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
 , sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
 , autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
     libxml2
     postgresql
   ] ++ (with pythonPackages; [ python numpy wrapPython ])
-    ++ stdenv.lib.optional stdenv.isDarwin libiconv
-    ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
+    ++ lib.optional stdenv.isDarwin libiconv
+    ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
 
   configureFlags = [
     "--with-expat=${expat.dev}"
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = "https://www.gdal.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix b/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
index 3695407b8f2f..92d17452c941 100644
--- a/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
+{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
 , postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl
 , libpng }:
 
@@ -59,8 +59,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = "https://www.gdal.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix
index 893fc4f8d27c..21cb79ba8158 100644
--- a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }:
+{ lib, stdenv, fetchsvn, pkg-config, mono, dotnetPackages }:
 
 let
   newtonsoft-json = dotnetPackages.NewtonsoftJson;
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ mono newtonsoft-json ];
 
   sourceRoot = "svn-r1217/clients/cs";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.google.com/archive/p/google-gdata/";
 
     description = "The Google Data APIs";
diff --git a/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch b/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
deleted file mode 100644
index 7583deb81098..000000000000
--- a/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2c31a95d9e57a4308c5159c50e69b5c9178dee72 Mon Sep 17 00:00:00 2001
-From: Christian Kampka <christian@kampka.net>
-Date: Fri, 13 Nov 2020 16:52:12 +0100
-Subject: [PATCH] Remove duplicate assignments
-
----
- src/parseopt.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/parseopt.c b/src/parseopt.c
-index 268e080..a4c8576 100644
---- a/src/parseopt.c
-+++ b/src/parseopt.c
-@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin)
- }
- 
- char *parseopt_program_name;
--char *parseopt_program_doc;
--char *parseopt_program_args;
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
- void (*parseopt_help_hook) (FILE *stream);
- 
--- 
-2.25.4
-
diff --git a/nixpkgs/pkgs/development/libraries/gdbm/default.nix b/nixpkgs/pkgs/development/libraries/gdbm/default.nix
index 3d333e503b2e..16c045cd68ef 100644
--- a/nixpkgs/pkgs/development/libraries/gdbm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdbm/default.nix
@@ -2,17 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gdbm";
-  version = "1.18.1";
+  version = "1.19";
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz";
-    sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6";
+    sha256 = "sha256-N+0SIUEiuXLhig2UmVA55XdIGRk573QRWx1B2IETZLw=";
   };
 
   doCheck = true; # not cross;
 
-  patches = [ ./0001-Remove-duplicate-assignments.patch ];
-
   # Linking static stubs on cygwin requires correct ordering.
   # Consider upstreaming this.
 
diff --git a/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/nixpkgs/pkgs/development/libraries/gdcm/default.nix
index d05e44eae3e5..75ce95e0e46b 100644
--- a/nixpkgs/pkgs/development/libraries/gdcm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdcm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, vtk_7, darwin
+{ lib, stdenv, fetchurl, cmake, vtk_7, darwin
 , enablePython ? false, python ? null,  swig ? null}:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     "-DGDCM_BUILD_SHARED_LIBS=ON"
     "-DGDCM_USE_VTK=ON"
   ]
-  ++ stdenv.lib.optional enablePython [
+  ++ lib.optional enablePython [
     "-DGDCM_WRAP_PYTHON:BOOL=ON"
     "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}"
   ];
@@ -28,15 +28,15 @@ stdenv.mkDerivation rec {
     cd ../build
   '';
 
-  enableParallelBuilding = true;
-  buildInputs = [ cmake vtk_7 ]
-    ++ stdenv.lib.optional stdenv.isDarwin [
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ vtk_7 ]
+    ++ lib.optional stdenv.isDarwin [
       darwin.apple_sdk.frameworks.ApplicationServices
       darwin.apple_sdk.frameworks.Cocoa
-    ] ++ stdenv.lib.optional enablePython [ swig python ];
+    ] ++ lib.optional enablePython [ swig python ];
   propagatedBuildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The grassroots cross-platform DICOM implementation";
     longDescription = ''
       Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly.
diff --git a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
index ad92bf13c4ce..2d8e60d06a73 100644
--- a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3";
   };
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     makeWrapper
     glib
-  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     glib
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   postInstall =
     # meson erroneously installs loaders with .dylib extension on Darwin.
     # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       for f in $out/${passthru.moduleDir}/*.dylib; do
           install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
           mv $f ''${f%.dylib}.so
@@ -88,13 +88,13 @@ stdenv.mkDerivation rec {
     + ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
-    '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
       # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
       $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The fixDarwinDylibNames hook doesn't patch binaries.
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  preFixup = lib.optionalString stdenv.isDarwin ''
     for f in $out/bin/* $dev/bin/*; do
         install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
     done
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
     moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for image loading and manipulation";
     homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf";
     maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/xlib.nix
index edc5ce525635..bc4c14beb458 100644
--- a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/xlib.nix
+++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/xlib.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     "-Dgtk_doc=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Deprecated API for integrating GdkPixbuf with Xlib data types";
     homepage = "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/gdl/default.nix b/nixpkgs/pkgs/development/libraries/gdl/default.nix
index 338d0b6b91b0..f924571deae1 100644
--- a/nixpkgs/pkgs/development/libraries/gdl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdl/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
+{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }:
 
 stdenv.mkDerivation rec {
   pname = "gdl";
   version = "3.34.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkg-config intltool ];
   buildInputs = [ libxml2 gtk3 ];
 
   passthru = {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Gnome docking library";
     homepage = "https://developer.gnome.org/gdl/";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/gdome2/default.nix b/nixpkgs/pkgs/development/libraries/gdome2/default.nix
index e38cb7535b00..a7dd1f980138 100644
--- a/nixpkgs/pkgs/development/libraries/gdome2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdome2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}:
+{lib, stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}:
 
 let
   pname = "gdome2";
@@ -15,12 +15,12 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib libxml2 gtk-doc ];
   propagatedBuildInputs = [glib libxml2];
   patches = [ ./xml-document.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gdome2.cs.unibo.it/";
     description = "DOM C library developed for the Gnome project";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gecode/3.nix b/nixpkgs/pkgs/development/libraries/gecode/3.nix
index 545bdd12982e..5c660a99ef84 100644
--- a/nixpkgs/pkgs/development/libraries/gecode/3.nix
+++ b/nixpkgs/pkgs/development/libraries/gecode/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, perl }:
+{ lib, stdenv, fetchurl, bash, perl }:
 
 stdenv.mkDerivation rec {
   pname = "gecode";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "patchShebangs configure";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://www.gecode.org";
     description = "Toolkit for developing constraint-based systems";
diff --git a/nixpkgs/pkgs/development/libraries/gecode/default.nix b/nixpkgs/pkgs/development/libraries/gecode/default.nix
index 9d37199bff47..46b13e6e37f5 100644
--- a/nixpkgs/pkgs/development/libraries/gecode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gecode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
+{ lib, stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "gecode";
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ perl gmp mpfr ]
-    ++ stdenv.lib.optional enableGist qtbase;
+    ++ lib.optional enableGist qtbase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://www.gecode.org";
     description = "Toolkit for developing constraint-based systems";
diff --git a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix
index c25f9145ea5e..af3c9d84ac7c 100644
--- a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
-, pkgconfig
+, pkg-config
 , vala
 , gobject-introspection
 , gtk-doc
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
   };
 
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     gettext
     meson
     ninja
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     luajit
     openexr
     suitesparse
-  ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL;
+  ] ++ lib.optional stdenv.isDarwin OpenCL;
 
   # for gegl-4.0.pc
   propagatedBuildInputs = [
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
   # tests fail to connect to the com.apple.fonts daemon in sandboxed mode
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph-based image processing framework";
     homepage = "https://www.gegl.org";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gegl/default.nix b/nixpkgs/pkgs/development/libraries/gegl/default.nix
index a99ec05d771c..bd67f3e6b7ca 100644
--- a/nixpkgs/pkgs/development/libraries/gegl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , babl
 , libpng
 , cairo
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-docs" ];
 
   buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
-    ++ stdenv.lib.optional stdenv.isDarwin OpenGL;
+    ++ lib.optional stdenv.isDarwin OpenGL;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   doCheck = false; # fails 3 out of 19 tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph-based image processing framework";
     homepage = "https://www.gegl.org";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/geis/default.nix b/nixpkgs/pkgs/development/libraries/geis/default.nix
index fd3924fec3ea..1c1d4cfe507b 100644
--- a/nixpkgs/pkgs/development/libraries/geis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geis/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, pkgconfig
+{ lib, stdenv, fetchurl
+, pkg-config
 , python3Packages
 , wrapGAppsHook
 , atk
@@ -18,7 +18,7 @@
 , xorgserver
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "geis";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   pythonPath = with python3Packages;
     [ pygobject3  ];
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
+  nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython];
   buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
     gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
   ];
diff --git a/nixpkgs/pkgs/development/libraries/genann/default.nix b/nixpkgs/pkgs/development/libraries/genann/default.nix
index 6529d4f363d8..f1d7373183ab 100644
--- a/nixpkgs/pkgs/development/libraries/genann/default.nix
+++ b/nixpkgs/pkgs/development/libraries/genann/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "genann";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cp ./genann.{h,c} $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/codeplea/genann";
     description = "Simple neural network library in ANSI C";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix
index b3bf33f0e881..a568078f9911 100644
--- a/nixpkgs/pkgs/development/libraries/gensio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix
@@ -1,21 +1,42 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+{ autoreconfHook
+, fetchFromGitHub
+, fetchpatch
+, lib
+, nix-update-script
+, pkg-config
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
   pname = "gensio";
-  version = "2.1.7";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
     rev = "v${version}";
-    sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih";
+    sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb";
+  };
+
+  patches =  [
+    # Fix compilation without openipmi, can be dropped for the next release.
+    (fetchpatch {
+      url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch";
+      sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic";
+    })
+  ];
+
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = pname;
+    };
   };
 
   configureFlags = [
     "--with-python=no"
   ];
 
-  buildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   meta = with lib; {
     description = "General Stream I/O";
diff --git a/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/nixpkgs/pkgs/development/libraries/geoclue/default.nix
index 74d778c5c555..711f1a444b38 100644
--- a/nixpkgs/pkgs/development/libraries/geoclue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geoclue/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
+{ lib, stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
 , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
 , withDemoAgent ? false
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "geoclue";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
+    pkg-config intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
     # devdoc
     gtk-doc docbook_xsl docbook_xml_dtd_412
   ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     patchShebangs demo/install-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Geolocation framework and some data providers";
     homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
     maintainers = with maintainers; [ raskin ];
diff --git a/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix
index ec9bf2e5cb99..f401c25aa394 100644
--- a/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
+{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
 
 stdenv.mkDerivation rec {
   pname = "geocode-glib";
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ];
   buildInputs = [ glib libsoup json-glib ];
 
   patches = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A convenience library for the geocoding and reverse geocoding using Nominatim service";
     license = licenses.lgpl2Plus;
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/geoip/default.nix b/nixpkgs/pkgs/development/libraries/geoip/default.nix
index d55983952b8c..8747433047c6 100644
--- a/nixpkgs/pkgs/development/libraries/geoip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geoip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , drvName ? "geoip"
 
 # in geoipDatabase, you can insert a package defining
@@ -7,7 +7,7 @@
 }:
 
 let
-  dataDir = if stdenv.lib.isDerivation geoipDatabase
+  dataDir = if lib.isDerivation geoipDatabase
     then "${toString geoipDatabase}/share/GeoIP"
     else geoipDatabase;
 in
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   # Cross compilation shenanigans
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An API for GeoIP/Geolocation databases";
     maintainers = with maintainers; [ thoughtpolice raskin ];
     license     = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix
index 60fc4067c0c5..63806b31e251 100644
--- a/nixpkgs/pkgs/development/libraries/geos/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ lib, stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
   name = "geos-3.8.1";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
 
   # https://trac.osgeo.org/geos/ticket/993
-  configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-inline";
+  configureFlags = lib.optional stdenv.isAarch32 "--disable-inline";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ port of the Java Topology Suite (JTS)";
     homepage = "https://trac.osgeo.org/geos";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/getdata/default.nix b/nixpkgs/pkgs/development/libraries/getdata/default.nix
index 28bbe61d53d8..de76924844fe 100644
--- a/nixpkgs/pkgs/development/libraries/getdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/getdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool }:
+{ lib, stdenv, fetchurl, libtool }:
 stdenv.mkDerivation rec {
   pname = "getdata";
   version = "0.10.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libtool ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference implementation of the Dirfile Standards";
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/getdns/default.nix b/nixpkgs/pkgs/development/libraries/getdns/default.nix
index c0268c161aeb..edf0ac27ea97 100644
--- a/nixpkgs/pkgs/development/libraries/getdns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/getdns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }:
+{ lib, stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "getdns";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unbound libidn2 openssl doxygen ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern asynchronous DNS API";
     longDescription = ''
       getdns is an implementation of a modern asynchronous DNS API; the
diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix
index ec186db515d4..c9ee5866f597 100644
--- a/nixpkgs/pkgs/development/libraries/gettext/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
      "--disable-csharp" "--with-xz"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # On cross building, gettext supposes that the wchar.h from libc
     # does not fulfill gettext needs, so it tries to work with its
     # own wchar.h file, which does not cope well with the system's
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     xz.bin
   ];
   # HACK, see #10874 (and 14664)
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
+  buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
 
   setupHooks = [
     ../../../build-support/setup-hooks/role.bash
@@ -94,6 +94,6 @@ stdenv.mkDerivation rec {
   };
 }
 
-// stdenv.lib.optionalAttrs stdenv.isDarwin {
+// lib.optionalAttrs stdenv.isDarwin {
   makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
index 9b72ca3524cc..220b68fa18bc 100644
--- a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 
 stdenv.mkDerivation rec {
   pname = "gexiv2";
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
   buildInputs = [ glib ];
   propagatedBuildInputs = [ exiv2 ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/gexiv2";
     description = "GObject wrapper around the Exiv2 photo metadata library";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/gf2x/default.nix b/nixpkgs/pkgs/development/libraries/gf2x/default.nix
index 14ea3021914a..3440697989ee 100644
--- a/nixpkgs/pkgs/development/libraries/gf2x/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gf2x/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = ''Routines for fast arithmetic in GF(2)[x]'';
+    description = "Routines for fast arithmetic in GF(2)[x]";
     homepage = "http://gf2x.gforge.inria.fr";
     license = licenses.gpl2Plus;
     maintainers = teams.sage.members;
diff --git a/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix b/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix
index 4718e6ac015a..e3550b82a965 100644
--- a/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts
+{ lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts
 , gnome3, libsoup, json-glib, gobject-introspection
 , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }:
 
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0";
   };
 
   nativeBuildInputs = [
-    pkgconfig gobject-introspection gtk-doc
+    pkg-config gobject-introspection gtk-doc
     docbook-xsl-nons autoconf automake libtool
   ];
   buildInputs = [ glib gnome-online-accounts ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GFBGraph";
     description = "GLib/GObject wrapper for the Facebook Graph API";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/gflags/default.nix b/nixpkgs/pkgs/development/libraries/gflags/default.nix
index 51c13f974336..a690d8f2e154 100644
--- a/nixpkgs/pkgs/development/libraries/gflags/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gflags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ library that implements commandline flags processing";
     longDescription = ''
       The gflags package contains a C++ library that implements commandline flags processing.
diff --git a/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix
index 6003c5ea33ea..025423ecd8a4 100644
--- a/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, openssl, expat, libgcrypt }:
+{ lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }:
 
 stdenv.mkDerivation rec {
   version = "0.99.5";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "--with-tls"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GGZ Gaming zone libraries";
     maintainers = with maintainers;
     [
diff --git a/nixpkgs/pkgs/development/libraries/giblib/default.nix b/nixpkgs/pkgs/development/libraries/giblib/default.nix
index 2cb7a9dfe545..e66f7bfe2a8c 100644
--- a/nixpkgs/pkgs/development/libraries/giblib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/giblib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, imlib2 }:
+{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }:
 
 stdenv.mkDerivation rec {
   name = "giblib-1.2.4";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://linuxbrit.co.uk/giblib/";
     description = "wrapper library for imlib2, and other stuff";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/giflib/4.1.nix b/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
index 954e508152c2..c0afe067c499 100644
--- a/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
+++ b/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "giflib-4.1.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for reading and writing gif images";
     branch = "4.1";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/giflib/default.nix b/nixpkgs/pkgs/development/libraries/giflib/default.nix
index e2ff96d366a2..9eaf7b933d43 100644
--- a/nixpkgs/pkgs/development/libraries/giflib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/giflib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   name = "giflib-5.2.1";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
   };
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isDarwin
+  patches = lib.optional stdenv.hostPlatform.isDarwin
     (fetchpatch {
       # https://sourceforge.net/p/giflib/bugs/133/
       name = "darwin-soname.patch";
@@ -21,15 +21,15 @@ stdenv.mkDerivation rec {
       --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
   '';
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
+  nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
 
   meta = {
     description = "A library for reading and writing gif images";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     branch = "5.2";
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/giflib/libungif.nix b/nixpkgs/pkgs/development/libraries/giflib/libungif.nix
index 30cfa0db86a6..d8c32d14fca2 100644
--- a/nixpkgs/pkgs/development/libraries/giflib/libungif.nix
+++ b/nixpkgs/pkgs/development/libraries/giflib/libungif.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libungif-4.1.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library and utilities for processing GIFs";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix
index a19febbfd66e..91fbb86bd669 100644
--- a/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
   pname = "gio-sharp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf automake which ];
+  nativeBuildInputs = [ pkg-config autoconf automake which ];
   buildInputs = [ mono glib gtk-sharp-2_0 ];
 
   dontStrip = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ./autogen-2.22.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GIO API bindings";
     homepage = "https://github.com/mono/gio-sharp";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/git2/default.nix b/nixpkgs/pkgs/development/libraries/git2/default.nix
index 96b67c7ccca8..a118a611785e 100644
--- a/nixpkgs/pkgs/development/libraries/git2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/git2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, python3
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3
 , zlib, libssh2, openssl, pcre, http-parser
 , libiconv, Security
 }:
@@ -23,18 +23,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python3 pkg-config ];
 
   buildInputs = [ zlib libssh2 openssl pcre http-parser ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+    ++ lib.optional stdenv.isDarwin Security;
 
-  propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
-
-  enableParallelBuilding = true;
+  propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
 
   doCheck = false; # hangs. or very expensive?
 
   meta = {
     description = "The Git linkable library";
     homepage = "https://libgit2.github.com/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
+    license = lib.licenses.gpl2;
+    platforms = with lib.platforms; all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/givaro/3.7.nix b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix
index debddc6723fb..dfd6b6b476b6 100644
--- a/nixpkgs/pkgs/development/libraries/givaro/3.7.nix
+++ b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
   pname = "givaro";
   version = "3.7.2";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
   buildInputs = [autoconf automake libtool gmpxx];
   meta = {
     inherit version;
-    description = ''A C++ library for arithmetic and algebraic computations'';
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "A C++ library for arithmetic and algebraic computations";
+    license = lib.licenses.cecill-b;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/givaro/3.nix b/nixpkgs/pkgs/development/libraries/givaro/3.nix
index efed0926bb32..9d216b9d8e5c 100644
--- a/nixpkgs/pkgs/development/libraries/givaro/3.nix
+++ b/nixpkgs/pkgs/development/libraries/givaro/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
   pname = "givaro";
   version = "3.8.0";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
   buildInputs = [autoconf automake libtool gmpxx];
   meta = {
     inherit version;
-    description = ''A C++ library for arithmetic and algebraic computations'';
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "A C++ library for arithmetic and algebraic computations";
+    license = lib.licenses.cecill-b;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix
index 78b6b0882707..f6d6ddab4d0b 100644
--- a/nixpkgs/pkgs/development/libraries/givaro/default.nix
+++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
 stdenv.mkDerivation rec {
   pname = "givaro";
   version = "4.1.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-optimization"
-  ] ++ stdenv.lib.optionals stdenv.isx86_64 [
+  ] ++ lib.optionals stdenv.isx86_64 [
     # disable SIMD instructions (which are enabled *when available* by default)
     "--${if stdenv.hostPlatform.sse3Support   then "enable" else "disable"}-sse3"
     "--${if stdenv.hostPlatform.ssse3Support  then "enable" else "disable"}-ssse3"
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A C++ library for arithmetic and algebraic computations'';
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "A C++ library for arithmetic and algebraic computations";
+    license = lib.licenses.cecill-b;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix
index 9437d76335d0..a6b37c5efcc2 100644
--- a/nixpkgs/pkgs/development/libraries/gjs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix
@@ -1,9 +1,9 @@
 { fetchurl
 , fetchpatch
-, stdenv
+, lib, stdenv
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gnome3
 , gtk3
 , atk
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   version = "1.66.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld";
   };
 
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     makeWrapper
     which # for locale detection
     libxml2 # for xml-stripblanks
@@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
   postFixup = ''
     wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \
       --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \
-      --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
+      --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}"
   '';
 
   checkPhase = ''
@@ -127,7 +127,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JavaScript bindings for GNOME";
     homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gl2ps/default.nix b/nixpkgs/pkgs/development/libraries/gl2ps/default.nix
index 172531f9dc7c..0203e2fde93a 100644
--- a/nixpkgs/pkgs/development/libraries/gl2ps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gl2ps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , zlib
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     freeglut
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://geuz.org/gl2ps";
     description = "An OpenGL to PostScript printing library";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/glbinding/default.nix b/nixpkgs/pkgs/development/libraries/glbinding/default.nix
index 9ce5a23f9705..1b36baa24e42 100644
--- a/nixpkgs/pkgs/development/libraries/glbinding/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glbinding/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
+{ lib, stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
+
 stdenv.mkDerivation rec {
   pname = "glbinding";
   version = "3.1.0";
@@ -10,9 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08";
   };
 
-  buildInputs = [ cmake libGLU xlibsWrapper ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libGLU xlibsWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cginternals/glbinding/";
     description = "A C++ binding for the OpenGL API, generated using the gl.xml specification";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/gle/default.nix b/nixpkgs/pkgs/development/libraries/gle/default.nix
index d656473ba807..b7a4f7f2fef1 100644
--- a/nixpkgs/pkgs/development/libraries/gle/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gle/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
+{lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
 stdenv.mkDerivation {
   name = "gle-3.1.0";
   buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext];
@@ -10,9 +10,9 @@ stdenv.mkDerivation {
     sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw";
   };
   meta = {
-    description = ''Tubing and extrusion library'';
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Tubing and extrusion library";
+    license = lib.licenses.gpl2 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/glew/1.10.nix b/nixpkgs/pkgs/development/libraries/glew/1.10.nix
index 139b93c039ec..29376cb25672 100644
--- a/nixpkgs/pkgs/development/libraries/glew/1.10.nix
+++ b/nixpkgs/pkgs/development/libraries/glew/1.10.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
+{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
 , AGL, OpenGL
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   name = "glew-1.10.0";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenGL extension loading library for C(++)";
     homepage = "http://glew.sourceforge.net/";
     license = licenses.free; # different files under different licenses
diff --git a/nixpkgs/pkgs/development/libraries/glew/default.nix b/nixpkgs/pkgs/development/libraries/glew/default.nix
index 3b067e6d0f30..660276530aa8 100644
--- a/nixpkgs/pkgs/development/libraries/glew/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glew/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
+{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
 , OpenGL
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   name = "glew-2.2.0";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenGL extension loading library for C(++)";
     homepage = "http://glew.sourceforge.net/";
     license = licenses.free; # different files under different licenses
diff --git a/nixpkgs/pkgs/development/libraries/glfw/2.x.nix b/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
index e749ca733daa..d05fa6e5f772 100644
--- a/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libGLU, libGL, libX11, libXext }:
+{ lib, stdenv, fetchurl, libGLU, libGL, libX11, libXext }:
 
 stdenv.mkDerivation rec {
   name = "glfw-2.7.9";
@@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
     make x11-dist-install PREFIX=$out
     mv $out/lib/libglfw.so $out/lib/libglfw.so.2
     ln -s libglfw.so.2 $out/lib/libglfw.so
-  ''; 
-  
-  meta = with stdenv.lib; { 
+  '';
+
+  meta = with lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = "http://glfw.sourceforge.net/";
     license = licenses.zlib;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    maintainers = [ lib.maintainers.marcweber ];
     platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
index fbc1cb818ca8..8698b71567e2 100644
--- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw";
   };
 
-  enableParallelBuilding = true;
-
   propagatedBuildInputs = [ libGL ];
 
   nativeBuildInputs = [ cmake ]
@@ -30,7 +28,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = "https://www.glfw.org/";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
index fc85b50e07f3..585897341662 100644
--- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
@@ -1,10 +1,10 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , meson
 , ninja
 , nixosTests
-, pkgconfig
+, pkg-config
 , glib
 , gettext
 , makeWrapper
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5";
   };
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gettext
     makeWrapper
     python3 # for install_script
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Network-related giomodules for glib";
     homepage = "https://gitlab.gnome.org/GNOME/glib-networking";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/glib-testing/default.nix b/nixpkgs/pkgs/development/libraries/glib-testing/default.nix
index 085dfc7344f5..bdbced24a10e 100644
--- a/nixpkgs/pkgs/development/libraries/glib-testing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib-testing/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_43
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib";
     homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix
index 57f05d410fbf..0e8ed605a2d6 100644
--- a/nixpkgs/pkgs/development/libraries/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
+{ config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3
 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
 , util-linuxMinimal ? null
@@ -11,7 +11,7 @@
 , darwin, fetchpatch
 }:
 
-with stdenv.lib;
+with lib;
 
 assert stdenv.isLinux -> util-linuxMinimal != null;
 
@@ -29,7 +29,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null;
   * Support org.freedesktop.Application, including D-Bus activation from desktop files
 */
 let
-  # Some packages don't get "Cflags" from pkgconfig correctly
+  # Some packages don't get "Cflags" from pkg-config correctly
   # and then fail to build when directly including like <glib/...>.
   # This is intended to be run in postInstall of any package
   # which has $out/include/ containing just some disjunct directories.
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   version = "2.66.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ=";
   };
 
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
   ]);
 
   nativeBuildInputs = [
-    meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
+    meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
   ];
 
   propagatedBuildInputs = [ zlib libffi gettext libiconv ];
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
     # Instead we just copy them over from the native output.
     "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"
     "-Dnls=enabled"
-    "-Ddevbindir=${placeholder ''dev''}/bin"
+    "-Ddevbindir=${placeholder "dev"}/bin"
   ];
 
   NIX_CFLAGS_COMPILE = toString [
@@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "glib"; };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library of programming buildings blocks";
     homepage    = "https://www.gtk.org/";
     license     = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.32-10.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.32-25.patch.gz
index 6141f08efadb..d26ba012df60 100644
--- a/nixpkgs/pkgs/development/libraries/glibc/2.32-10.patch.gz
+++ b/nixpkgs/pkgs/development/libraries/glibc/2.32-25.patch.gz
Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix
index 74f8329788a5..6637a9bb2a39 100644
--- a/nixpkgs/pkgs/development/libraries/glibc/common.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix
@@ -42,7 +42,7 @@
 
 let
   version = "2.32";
-  patchSuffix = "-10";
+  patchSuffix = "-25";
   sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
 in
 
@@ -59,14 +59,14 @@ stdenv.mkDerivation ({
 
   patches =
     [
-      /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git
+      /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git
          and using git or something would complicate bootstrapping.
-         Fortunately it's not too big with 2.32-10.
+         Fortunately it's not too big.
           $ git checkout release/2.32/master; git describe
-          glibc-2.32-10-g0b9460d22e
-          $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-10.patch.gz
+          glibc-2.32-25-g0d9793e82a
+          $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-25.patch.gz
        */
-      ./2.32-10.patch.gz
+      ./2.32-25.patch.gz
 
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch
@@ -158,7 +158,7 @@ stdenv.mkDerivation ({
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       (lib.flip lib.withFeature "fp"
-         (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
+         (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
       "--with-__thread"
     ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
diff --git a/nixpkgs/pkgs/development/libraries/glibc/default.nix b/nixpkgs/pkgs/development/libraries/glibc/default.nix
index 150681ebda18..9043c8fd0d4f 100644
--- a/nixpkgs/pkgs/development/libraries/glibc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage
+{ lib, stdenv, callPackage
 , withLinuxHeaders ? true
 , profilingLibraries ? false
 , withGd ? false
@@ -14,7 +14,7 @@ let
 in
 
 callPackage ./common.nix { inherit stdenv; } {
-    name = "glibc" + stdenv.lib.optionalString withGd "-gd";
+    name = "glibc" + lib.optionalString withGd "-gd";
 
     inherit withLinuxHeaders profilingLibraries withGd;
 
@@ -46,15 +46,15 @@ callPackage ./common.nix { inherit stdenv; } {
     hardeningDisable = [ "stackprotector" "fortify" ]
     # XXX: Not actually musl-speciic but since only musl enables pie by default,
     #      limit rebuilds by only disabling pie w/musl
-      ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
+      ++ lib.optional stdenv.hostPlatform.isMusl "pie";
 
-    NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " "
+    NIX_CFLAGS_COMPILE = lib.concatStringsSep " "
       (builtins.concatLists [
-        (stdenv.lib.optionals withGd gdCflags)
+        (lib.optionals withGd gdCflags)
         # Fix -Werror build failure when building glibc with musl with GCC >= 8, see:
         # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
-        (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
-        (stdenv.lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [
+        (lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
+        (lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [
           # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'"
           # New warning as of GCC 9
           # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805
@@ -81,14 +81,14 @@ callPackage ./common.nix { inherit stdenv; } {
     postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then ''
       echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
       make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales
-    '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux ''
+    '' else lib.optionalString stdenv.buildPlatform.isLinux ''
       # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html
       # Instead of using their patch to build a build-native localedef,
       # we simply use the one from buildPackages
       pushd ../glibc-2*/localedata
       export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata
       mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale
-      ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \
+      ${lib.getBin buildPackages.glibc}/bin/localedef \
         --alias-file=../intl/locale.alias \
         -i locales/C \
         -f charmaps/UTF-8 \
@@ -122,7 +122,7 @@ callPackage ./common.nix { inherit stdenv; } {
     ''
       # For some reason these aren't stripped otherwise and retain reference
       # to bootstrap-tools; on cross-arm this stripping would break objects.
-    + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
 
       for i in "$out"/lib/*.a; do
           [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i"
diff --git a/nixpkgs/pkgs/development/libraries/glibc/locales.nix b/nixpkgs/pkgs/development/libraries/glibc/locales.nix
index 0dc191974155..238cebf6209f 100644
--- a/nixpkgs/pkgs/development/libraries/glibc/locales.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/locales.nix
@@ -6,7 +6,7 @@
    https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED
 */
 
-{ stdenv, buildPackages, callPackage, writeText
+{ lib, stdenv, buildPackages, callPackage, writeText
 , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ]
 }:
 
@@ -31,9 +31,9 @@ callPackage ./common.nix { inherit stdenv; } {
       # Hack to allow building of the locales (needed since glibc-2.12)
       sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile
     ''
-      + stdenv.lib.optionalString (!allLocales) ''
+      + lib.optionalString (!allLocales) ''
       # Check that all locales to be built are supported
-      echo -n '${stdenv.lib.concatMapStrings (s: s + " \\\n") locales}' \
+      echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \
         | sort > locales-to-build.txt
       cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \
         | sort > locales-supported.txt
diff --git a/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/nixpkgs/pkgs/development/libraries/glibmm/default.nix
index 53e924b1325a..19567a987212 100644
--- a/nixpkgs/pkgs/development/libraries/glibmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glibmm/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }:
+{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "glibmm";
   version = "2.64.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7";
   };
 
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     gnum4
     glib # for glib-compile-schemas
   ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     Cocoa
   ]);
   propagatedBuildInputs = [ glib libsigcxx ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface to the GLib library";
 
     homepage = "https://gtkmm.org/";
diff --git a/nixpkgs/pkgs/development/libraries/glm/default.nix b/nixpkgs/pkgs/development/libraries/glm/default.nix
index cb0ae47acded..f5652a61c1de 100644
--- a/nixpkgs/pkgs/development/libraries/glm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, cmake }:
+{ lib, stdenv, fetchurl, fetchzip, cmake }:
 
 stdenv.mkDerivation rec {
   version = "0.9.8.5";
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
     cp ${gcc7PlatformPatch} glm/simd/platform.h
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0";
 
   postInstall = ''
     mkdir -p $doc/share/doc/glm
     cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenGL Mathematics library for C++";
     longDescription = ''
       OpenGL Mathematics (GLM) is a header only C++ mathematics library for
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = "http://glm.g-truc.net/";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix
index 5f700f73515a..1f70946cbcec 100644
--- a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix
+++ b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
-, blas, gfortran, openssh, openmpi
+{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
+, blas, gfortran, openssh, mpi
 } :
 
 let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ openmpi blas gfortran openssh ];
+  buildInputs = [ mpi blas gfortran openssh ];
 
   preConfigure = ''
     configureFlagsArray+=( "--enable-i8" \
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Global Arrays Programming Models";
     homepage = "http://hpc.pnl.gov/globalarrays/";
     maintainers = [ maintainers.markuskowa ];
diff --git a/nixpkgs/pkgs/development/libraries/globalplatform/default.nix b/nixpkgs/pkgs/development/libraries/globalplatform/default.nix
index 3ab157598a4e..a8dfa430f599 100644
--- a/nixpkgs/pkgs/development/libraries/globalplatform/default.nix
+++ b/nixpkgs/pkgs/development/libraries/globalplatform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }:
+{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }:
 
 stdenv.mkDerivation rec {
   pname = "globalplatform";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib openssl_1_0_2 pcsclite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
     description = "Library for interacting with smart card devices";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
index 043be9e91b50..a3ea4305bea7 100644
--- a/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ b/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }:
+{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }:
 
 stdenv.mkDerivation rec {
   pname = "gppcscconnectionplugin";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ globalplatform openssl_1_0_2 pcsclite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
     description = "GlobalPlatform pcsc connection plugin";
     license = [ licenses.lgpl3 licenses.gpl3 ];
diff --git a/nixpkgs/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix
index aa846e41d550..4bb20ebfd93e 100644
--- a/nixpkgs/pkgs/development/libraries/glog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glog/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/glog";
     license = licenses.bsd3;
     description = "Library for application-level logging";
diff --git a/nixpkgs/pkgs/development/libraries/gloox/default.nix b/nixpkgs/pkgs/development/libraries/gloox/default.nix
index ef731b3c35a6..b01d858cfb92 100644
--- a/nixpkgs/pkgs/development/libraries/gloox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gloox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , zlibSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , idnSupport ? true, libidn ? null
@@ -8,7 +8,7 @@ assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 assert idnSupport -> libidn != null;
 
-with stdenv.lib;
+with lib;
 
 let
   version = "1.0.24";
diff --git a/nixpkgs/pkgs/development/libraries/glpk/default.nix b/nixpkgs/pkgs/development/libraries/glpk/default.nix
index d771f7df7892..a46c84844e89 100644
--- a/nixpkgs/pkgs/development/libraries/glpk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glpk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , libmysqlclient
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ libmysqlclient
-    ] ++ stdenv.lib.optionals withGmp [
+    ] ++ lib.optionals withGmp [
       gmp
     ];
 
-  configureFlags = stdenv.lib.optionals withGmp [
+  configureFlags = lib.optionals withGmp [
     "--with-gmp"
   ];
 
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Linear Programming Kit";
 
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/glui/default.nix b/nixpkgs/pkgs/development/libraries/glui/default.nix
index d84a9227c3b8..511ec60db2fb 100644
--- a/nixpkgs/pkgs/development/libraries/glui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , freeglut
 , libGL
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     cp LICENSE.txt "$out/share/glui/doc"
   '';
 
-  meta = with stdenv.lib; {
-    description = ''A user interface library using OpenGL'';
+  meta = with lib; {
+    description = "A user interface library using OpenGL";
     license = licenses.zlib ;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/gmime/2.nix b/nixpkgs/pkgs/development/libraries/gmime/2.nix
index c902aac23a14..0e10d12ed1f1 100644
--- a/nixpkgs/pkgs/development/libraries/gmime/2.nix
+++ b/nixpkgs/pkgs/development/libraries/gmime/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
+{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   version = "2.6.23";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection ];
+  nativeBuildInputs = [ pkg-config gobject-introspection ];
   propagatedBuildInputs = [ glib zlib libgpgerror ];
   configureFlags = [ "--enable-introspection=yes" ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jstedfast/gmime/";
     description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gmime/3.nix b/nixpkgs/pkgs/development/libraries/gmime/3.nix
index f2ba29d461e7..a8e39047256c 100644
--- a/nixpkgs/pkgs/development/libraries/gmime/3.nix
+++ b/nixpkgs/pkgs/development/libraries/gmime/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
+{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
 , vala }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ glib ];
   configureFlags = [
     "--enable-introspection=yes"
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jstedfast/gmime/";
     description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gmm/default.nix b/nixpkgs/pkgs/development/libraries/gmm/default.nix
index 278059465ecb..3c145b3c1e38 100644
--- a/nixpkgs/pkgs/development/libraries/gmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "gmm";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic C++ template library for sparse, dense and skyline matrices";
     homepage = "http://getfem.org/gmm.html";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix b/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix
index 29310aa9f00e..ce870581f5e9 100644
--- a/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, cxx ? true }:
+{ lib, stdenv, fetchurl, m4, cxx ? true }:
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-4.3.2";
@@ -28,8 +28,8 @@ let self = stdenv.mkDerivation rec {
     else ''echo "Darwin host is `./config.guess`."'';
 
   configureFlags = [
-    (stdenv.lib.enableFeature cxx "cxx")
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    (lib.enableFeature cxx "cxx")
+  ] ++ lib.optionals stdenv.isDarwin [
     "ac_cv_build=x86_64-apple-darwin13.4.0"
     "ac_cv_host=x86_64-apple-darwin13.4.0"
   ];
@@ -65,10 +65,10 @@ let self = stdenv.mkDerivation rec {
       '';
 
     homepage = "https://gmplib.org/";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     badPlatforms = [ "x86_64-darwin" ];
   };
 };
diff --git a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix
index a514934e9645..73061a3d2efd 100644
--- a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, m4
+{ lib, stdenv, fetchurl, m4
 , cxx ? true
 , withStatic ? stdenv.hostPlatform.isStatic
 }:
 
-let inherit (stdenv.lib) optional; in
+let inherit (lib) optional; in
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-5.1.3";
@@ -25,13 +25,13 @@ let self = stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-pic"
-    (stdenv.lib.enableFeature cxx "cxx")
+    (lib.enableFeature cxx "cxx")
     # Build a "fat binary", with routines for several sub-architectures
     # (x86), except on Solaris where some tests crash with "Memory fault".
     # See <https://hydra.nixos.org/build/2760931>, for instance.
     #
     # no darwin because gmp uses ASM that clang doesn't like
-    (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
+    (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
     # The config.guess in GMP tries to runtime-detect various
     # ARM optimization flags via /proc/cpuinfo (and is also
     # broken on multicore CPUs). Avoid this impurity.
@@ -46,7 +46,7 @@ let self = stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gmplib.org/";
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
index 522976d3ab2c..bf03bf08779b 100644
--- a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4
+{ lib, stdenv, fetchurl, m4
 , cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm
 , buildPackages
 , withStatic ? stdenv.hostPlatform.isStatic
@@ -9,7 +9,7 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-let inherit (stdenv.lib) optional; in
+let inherit (lib) optional; in
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-6.2.1";
@@ -30,13 +30,13 @@ let self = stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-pic"
-    (stdenv.lib.enableFeature cxx "cxx")
+    (lib.enableFeature cxx "cxx")
     # Build a "fat binary", with routines for several sub-architectures
     # (x86), except on Solaris where some tests crash with "Memory fault".
     # See <https://hydra.nixos.org/build/2760931>, for instance.
     #
     # no darwin because gmp uses ASM that clang doesn't like
-    (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
+    (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
     # The config.guess in GMP tries to runtime-detect various
     # ARM optimization flags via /proc/cpuinfo (and is also
     # broken on multicore CPUs). Avoid this impurity.
@@ -54,7 +54,7 @@ let self = stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gmplib.org/";
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gmtk/default.nix b/nixpkgs/pkgs/development/libraries/gmtk/default.nix
index f6516815bb92..6f2906a8234e 100644
--- a/nixpkgs/pkgs/development/libraries/gmtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gmtk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3
+{lib, stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3
 , libpulseaudio, mplayer, gnome_mplayer }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i";
   };
 
-  nativeBuildInputs = [ libtool pkgconfig intltool ];
+  nativeBuildInputs = [ libtool pkg-config intltool ];
   buildInputs = [ glib gtk3 libpulseaudio ];
 
   patches = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common functions for gnome-mplayer and gecko-mediaplayer";
     homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/gnet/default.nix b/nixpkgs/pkgs/development/libraries/gnet/default.nix
index 749b021890ac..8f35407f9ddd 100644
--- a/nixpkgs/pkgs/development/libraries/gnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, glib, libtool }:
+{lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }:
 
 stdenv.mkDerivation {
   name = "gnet-2.0.8";
@@ -9,12 +9,12 @@ stdenv.mkDerivation {
     sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ autoconf automake glib libtool ];
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A network library, written in C, object-oriented, and built upon GLib";
     homepage = "https://developer.gnome.org/gnet/";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix
index f8e25640f29a..c8e77148c6d8 100644
--- a/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-menus";
   version = "3.36.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r";
   };
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
   ];
 
-  nativeBuildInputs = [ pkgconfig gettext ];
+  nativeBuildInputs = [ pkg-config gettext ];
   buildInputs = [ glib gobject-introspection ];
 
   passthru = {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-menus";
     description = "Library that implements freedesktops's Desktop Menu Specification in GNOME";
     license = with licenses; [ gpl2 lgpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
index 342cfcbc4da2..c5846b523cd2 100644
--- a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , pkg-config
 , vala
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts";
     description = "Single sign-on framework for GNOME";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix
index 5926f59cc37e..4aa510f36068 100644
--- a/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , gtk2
 , mono
 , gtk-sharp-2_0
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
+  nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
   buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
   ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.mono-project.com/docs/gui/gtksharp/";
     description = "A .NET language binding for assorted GNOME libraries";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix
index dfbb2c3b1e67..a2206c19b1b4 100644
--- a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , gettext
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "0.5.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gettext
   ];
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of GStreamer effects to be used in different GNOME Modules";
     homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
index 5acab2a70e08..74b94e68f564 100644
--- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
     cp ${configSub} $out/config.sub
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Attempt to guess a canonical system name";
     homepage = "https://savannah.gnu.org/projects/config";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix
index 402c3585d53f..ef8ef7648ebd 100644
--- a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPackages, fetchurl, fetchpatch, pciutils }:
+{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gnu-efi";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU EFI development toolchain";
     homepage = "https://sourceforge.net/projects/gnu-efi/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix
index c6d35b682360..245b0c1e6381 100644
--- a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip
 , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
 , guileBindings ? config.gnutls.guile or false, guile
 , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
@@ -62,12 +62,12 @@ stdenv.mkDerivation {
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
+  nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs;
 
   #inherit doCheck;
   doCheck = false;
 
-  # Fixup broken libtool and pkgconfig files
+  # Fixup broken libtool and pkg-config files
   preFixup = lib.optionalString (!stdenv.isDarwin) ''
     sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
         -e 's,-lz,-L${zlib.out}/lib -lz,' \
diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix
index ae3775002ec9..2cd1e783ea92 100644
--- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip
 , perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv
 , unbound, dns-root-data, gettext, cacert, util-linux
 , guileBindings ? config.gnutls.guile or false, guile
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
 
   # Skip some tests:
-  #  - pkgconfig: building against the result won't work before installing (3.5.11)
+  #  - pkg-config: building against the result won't work before installing (3.5.11)
   #  - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular)
   #  - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11)
   #  - psk-file: no idea; it broke between 3.6.3 and 3.6.4
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ]
+  nativeBuildInputs = [ perl pkg-config ]
     ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
     ++ lib.optionals doCheck [ which nettools util-linux ];
 
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
   #   Error setting the x509 trust file: Error while reading file.
   checkInputs = [ cacert ];
 
-  # Fixup broken libtool and pkgconfig files
+  # Fixup broken libtool and pkg-config files
   preFixup = lib.optionalString (!isDarwin) ''
     sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
         -e 's,-lz,-L${zlib.out}/lib -lz,' \
diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix
index 97b3ea9a8f10..ae65f5aed280 100644
--- a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , glib
 , flex
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x";
   };
 
@@ -46,12 +46,12 @@ stdenv.mkDerivation rec {
       src = ./absolute_shlib_path.patch;
       inherit nixStoreDir;
     })
-  ] ++ stdenv.lib.optionals x11Support [
+  ] ++ lib.optionals x11Support [
     # Hardcode the cairo shared library path in the Cairo gir shipped with this package.
     # https://github.com/NixOS/nixpkgs/issues/34080
     (substituteAll {
       src = ./absolute_gir_path.patch;
-      cairoLib = "${stdenv.lib.getLib cairo}/lib";
+      cairoLib = "${lib.getLib cairo}/lib";
     })
   ];
 
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  checkInputs = stdenv.lib.optionals stdenv.isDarwin [
+  checkInputs = lib.optionals stdenv.isDarwin [
     cctools # for otool
   ];
 
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage = "https://gi.readthedocs.io/";
     maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]);
diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix
index 46b40d00d780..d544dd7625dc 100644
--- a/nixpkgs/pkgs/development/libraries/goffice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem
+{ fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkg-config intltool ];
 
   propagatedBuildInputs = [
     glib gtk3 libxml2 cairo pango libgsf lasem
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
       documents, undo/redo.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gom/default.nix b/nixpkgs/pkgs/development/libraries/gom/default.nix
index 753db22f4f9f..4b5effefa57c 100644
--- a/nixpkgs/pkgs/development/libraries/gom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gom/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , glib
 , python3
 , sqlite
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "py" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38";
   };
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GObject to SQLite object mapper";
     homepage = "https://wiki.gnome.org/Projects/Gom";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix
index a744cf314e29..c4df9f1f0fd7 100644
--- a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
 
 let
   version = "2.0.4";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
   };
 
-  nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ];
+  nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];
   buildInputs = [ gtk3 cairo glib gobject-introspection ];
 
   configureFlags = [
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Canvas widget for GTK based on the the Cairo 2D library";
     homepage = "https://wiki.gnome.org/Projects/GooCanvas";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/default.nix b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix
index 024ac363af18..c9fd5b263429 100644
--- a/nixpkgs/pkgs/development/libraries/goocanvas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig, gnome3 }:
+{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "goocanvas";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk2 cairo glib ];
 
   passthru = {
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Canvas widget for GTK based on the the Cairo 2D library";
     homepage = "https://wiki.gnome.org/Projects/GooCanvas";
     license = licenses.lgpl2;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix b/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
index d8a910d4799c..632e434631c9 100644
--- a/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "goocanvasmm";
@@ -7,10 +7,10 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ gtkmm3 goocanvas2 ];
 
   enableParallelBuilding = true;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ bindings for GooCanvas";
     homepage = "https://wiki.gnome.org/Projects/GooCanvas";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
index 7528925088e5..fdf425432817 100644
--- a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, clang-tools, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
+{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
 let
   googleapis = fetchFromGitHub {
     owner = "googleapis";
@@ -16,7 +16,7 @@ let
       sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n";
     };
 
-    nativeBuildInputs = [ cmake pkgconfig ];
+    nativeBuildInputs = [ cmake pkg-config ];
     buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ];
 
     postPatch = ''
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ];
-  nativeBuildInputs = [ clang-tools cmake pkgconfig doxygen ];
+  nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ];
 
   outputs = [ "out" "dev" ];
 
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS:BOOL=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = with licenses; [ asl20 ];
     homepage = "https://github.com/googleapis/google-cloud-cpp";
     description = "C++ Idiomatic Clients for Google Cloud Platform services";
diff --git a/nixpkgs/pkgs/development/libraries/gperftools/default.nix b/nixpkgs/pkgs/development/libraries/gperftools/default.nix
index 91b2c2929a48..bdb4e67f85fe 100644
--- a/nixpkgs/pkgs/development/libraries/gperftools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gperftools/default.nix
@@ -1,11 +1,20 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, libunwind
+}:
 
 stdenv.mkDerivation rec {
-  name = "gperftools-2.8";
-
-  src = fetchurl {
-    url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394";
+  pname = "gperftools";
+  version = "2.8.1";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1";
   };
 
   patches = [
@@ -20,21 +29,19 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
-  buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
+  buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
 
   # Disable general dynamic TLS on AArch to support dlopen()'ing the library:
   # https://bugzilla.redhat.com/show_bug.cgi?id=1483558
-  configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
+  configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
     "--disable-general-dynamic-tls";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.am --replace stdc++ c++
-    substituteInPlace Makefile.in --replace stdc++ c++
-    substituteInPlace libtool --replace stdc++ c++
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
-    "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
+    "-D_XOPEN_SOURCE";
 
   # some packages want to link to the static tcmalloc_minimal
   # to drop the runtime dependency on gperftools
@@ -42,7 +49,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gperftools/gperftools";
     description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
     platforms = with platforms; linux ++ darwin;
diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix
index 067d62a11a27..5b24955af437 100644
--- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch
-, autoreconfHook, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
+, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan
 , file, which, ncurses
 , texinfo
 , buildPackages
@@ -14,11 +14,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gpgme";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
-    sha256 = "0nqfipv5s4npfidsm1rs3kpq0r0av9bfqfd5r035jibx5k0jniqb";
+    sha256 = "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f";
   };
 
   patches = [
@@ -34,7 +34,9 @@ stdenv.mkDerivation rec {
       sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g";
     })
     # Disable python tests on Darwin as they use gpg (see configureFlags below)
-  ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch;
+  ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch
+  # Fix _AC_UNDECLARED_WARNING for autoconf≥2.70. See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html
+  ++ lib.optional stdenv.cc.isClang ./fix-clang-autoconf-undeclared-warning.patch;
 
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
     [ libgpgerror glib libassuan pth ]
     ++ lib.optional (qtbase != null) qtbase;
 
-  nativeBuildInputs = [ pkgconfig gnupg texinfo autoreconfHook ]
+  nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ]
   ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -70,7 +72,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gnupg.org/software/gpgme/index.html";
     changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-${version}";
     description = "Library for making GnuPG easier to use";
diff --git a/nixpkgs/pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch b/nixpkgs/pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch
new file mode 100644
index 000000000000..2d08f982ce6f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch
@@ -0,0 +1,36 @@
+diff -Naur gpgme.old/configure.ac gpgme.new/configure.ac
+--- gpgme.old/configure.ac	2020-11-12 04:19:50.000000000 -0500
++++ gpgme.new/configure.ac	2021-01-08 03:04:38.000000000 -0500
+@@ -166,6 +166,16 @@
+                           mym4_minor mym4_micro)
+ AC_SUBST(VERSION_NUMBER)
+ 
++# Try to find a thread-safe version of ttyname().
++gnupg_REPLACE_TTYNAME_R
++if test "$ac_cv_func_ttyname_r" != yes; then
++  AC_MSG_WARN([
++***
++*** ttyname() is not thread-safe and ttyname_r() does not exist
++***])
++fi
++
++
+ # We need to compile and run a program on the build machine.  A
+ # comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
+ # the AC archive is broken for autoconf 2.57.  Given that there is no
+@@ -658,15 +668,6 @@
+ 
+ AC_FUNC_FSEEKO
+ 
+-# Try to find a thread-safe version of ttyname().
+-gnupg_REPLACE_TTYNAME_R
+-if test "$ac_cv_func_ttyname_r" != yes; then
+-  AC_MSG_WARN([
+-***
+-*** ttyname() is not thread-safe and ttyname_r() does not exist
+-***])
+-fi
+-
+ # Try to find a thread-safe version of getenv().
+ have_thread_safe_getenv=no
+ jm_GLIBC21
diff --git a/nixpkgs/pkgs/development/libraries/grail/default.nix b/nixpkgs/pkgs/development/libraries/grail/default.nix
index 6efc1fca39a8..b11ec3a9f5c3 100644
--- a/nixpkgs/pkgs/development/libraries/grail/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grail/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true,
-  stdenv, fetchurl, pkgconfig, xorg, python3, frame }:
+  lib, stdenv, fetchurl, pkg-config, xorg, python3, frame }:
 
 stdenv.mkDerivation rec {
   pname = "grail";
@@ -10,16 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ python3 frame ]
-  ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
+  ++ lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
 
-  configureFlags = stdenv.lib.optional enableX11 "--with-x11";
+  configureFlags = lib.optional enableX11 "--with-x11";
 
   meta = {
     homepage = "https://launchpad.net/canonical-multitouch/grail";
     description = "Gesture Recognition And Instantiation Library";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/grantlee/default.nix b/nixpkgs/pkgs/development/libraries/grantlee/default.nix
index a8e692bdd51d..869430538e89 100644
--- a/nixpkgs/pkgs/development/libraries/grantlee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grantlee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, cmake }:
+{ lib, stdenv, fetchurl, qt4, cmake }:
 
 stdenv.mkDerivation rec {
   name = "grantlee-0.5.1";
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r";
   };
 
-  buildInputs = [ cmake qt4 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
 
   meta = {
     description = "Qt4 port of Django template system";
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = "http://gitorious.org/grantlee";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix
index c60b09144929..726666ec06f3 100644
--- a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "graphene-hardened-malloc";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/GrapheneOS/hardened_malloc";
     description = "Hardened allocator designed for modern systems";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/graphene/default.nix b/nixpkgs/pkgs/development/libraries/graphene/default.nix
index ee147d82afdb..57cad4497653 100644
--- a/nixpkgs/pkgs/development/libraries/graphene/default.nix
+++ b/nixpkgs/pkgs/development/libraries/graphene/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , nix-update-script
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , python3
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     gtk-doc
     meson
     ninja
-    pkgconfig
+    pkg-config
     gobject-introspection
     python3
   ];
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A thin layer of graphic data types";
     homepage = "https://ebassi.github.com/graphene";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/grib-api/default.nix b/nixpkgs/pkgs/development/libraries/grib-api/default.nix
index db884957d1e0..182f05a8ca89 100644
--- a/nixpkgs/pkgs/development/libraries/grib-api/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grib-api/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv,
+{ fetchurl, fetchpatch, lib, stdenv,
   cmake, netcdf, gfortran, libpng, openjpeg,
   enablePython ? false, pythonPackages }:
 
@@ -23,16 +23,15 @@ stdenv.mkDerivation rec {
     substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_    = 1;" ""
   '';
 
-  buildInputs = [ cmake
-                  netcdf
-                  gfortran
+  nativeBuildInputs = [ cmake gfortran ];
+  buildInputs = [ netcdf
                   libpng
                   openjpeg
-                ] ++ stdenv.lib.optionals enablePython [
+                ] ++ lib.optionals enablePython [
                   pythonPackages.python
                 ];
 
-  propagatedBuildInputs = stdenv.lib.optionals enablePython [
+  propagatedBuildInputs = lib.optionals enablePython [
                   pythonPackages.numpy
                 ];
 
@@ -42,21 +41,19 @@ stdenv.mkDerivation rec {
                  "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}"
                ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
 
   # Only do tests that don't require downloading 120MB of testdata
   # We fix the darwin checkPhase, which searches for libgrib_api.dylib
   # in /nix/store by setting DYLD_LIBRARY_PATH
-  checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
+  checkPhase = lib.optionalString (stdenv.isDarwin) ''
     substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
   '' + ''
     ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
   '';
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
     license = licenses.asl20;
     platforms = with platforms; linux ++ darwin;
diff --git a/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix
index 9073a501c09f..b80e6256e467 100644
--- a/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gettext
 , gperf
 , sqlite
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   version = "0.3.12";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6";
   };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     # * chromaprint (gst-plugins-bad)
     (substituteAll {
       src = ./chromaprint-gst-plugins.patch;
-      load_plugins = stdenv.lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
+      load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
         gstreamer
         gst-plugins-base
         gst-plugins-bad
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gettext
     itstool
     gperf # for lua-factory
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Grilo";
     description = "A collection of plugins for the Grilo framework";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/grilo/default.nix b/nixpkgs/pkgs/development/libraries/grilo/default.nix
index 858e8d81fd42..fbab49273e82 100644
--- a/nixpkgs/pkgs/development/libraries/grilo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grilo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }:
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i";
   };
 
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext gobject-introspection vala
+    meson ninja pkg-config gettext gobject-introspection vala
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
   buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ];
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Grilo";
     description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix
index c41bd5ff5aa3..92cf619ab5bd 100644
--- a/nixpkgs/pkgs/development/libraries/grpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf
 , gflags, abseil-cpp, libnsl
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.34.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+  version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
   pname = "grpc";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "0kipk26kg2x06mrkhb74k8vk5cn4mr89kw1f9mb04n616wkxjyxy";
+    sha256 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk";
     fetchSubmodules = true;
   };
   patches = [
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ];
+    ++ lib.optionals stdenv.isLinux [ libnsl ];
 
   cmakeFlags =
     [ "-DgRPC_ZLIB_PROVIDER=package"
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";
 
   enableParallelBuilds = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
     license = licenses.asl20;
     maintainers = [ maintainers.lnl7 maintainers.marsam ];
diff --git a/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/nixpkgs/pkgs/development/libraries/gsasl/default.nix
index 4e22c38e9c84..48ee0ddd4a51 100644
--- a/nixpkgs/pkgs/development/libraries/gsasl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsasl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libidn, kerberos }:
+{ fetchurl, lib, stdenv, libidn, kerberos }:
 
 stdenv.mkDerivation rec {
   name = "gsasl-1.8.0";
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
        '';
 
     homepage = "https://www.gnu.org/software/gsasl/";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ shlevy ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with lib.maintainers; [ shlevy ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index 1032f15196cc..318d07dfacc8 100644
--- a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , glib
 , gobject-introspection
 , meson
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     glib
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
   ];
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of GSettings schemas for settings shared by various components of a desktop";
     license = licenses.lgpl21Plus;
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix
index cbba9c5fcea2..21b63875db6c 100644
--- a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig
+{ lib, stdenv, fetchFromGitLab, pkg-config
 , qmake, qtbase, qtdeclarative, wrapQtAppsHook
 , glib, gobject-introspection
 , genericUpdater, common-updater-scripts
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     qmake
     gobject-introspection
     wrapQtAppsHook
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to access GSettings from Qt";
     homepage = "https://gitlab.com/ubports/core/gsettings-qt";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/gsignond/default.nix b/nixpkgs/pkgs/development/libraries/gsignond/default.nix
index b0db776bd616..92123dbc3ea5 100644
--- a/nixpkgs/pkgs/development/libraries/gsignond/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking
 , sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl
 , docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
 , symlinkJoin, gsignondPlugins, plugins }:
@@ -26,7 +26,7 @@ unwrapped = stdenv.mkDerivation rec {
     gtk-doc
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
   ];
 
@@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec {
     ./plugin-load-env.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus service which performs user authentication on behalf of its clients";
     homepage = "https://gitlab.com/accounts-sso/gsignond";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index b1a383ee5918..a05069f205fe 100644
--- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
 
 stdenv.mkDerivation {
   pname = "gsignond-plugin-lastfm";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     gobject-introspection
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
   ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix
index 4ac6e6a6f9ff..8bce32f976ab 100644
--- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }:
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "gsignond-plugin-mail";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
   ];
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix
index b4b16a57af41..3bf3ab194643 100644
--- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check
 , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
 , docbook_xsl, glibcLocales, gobject-introspection }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     gtk-doc
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix
index 1a1f34681cea..b73559f8a532 100644
--- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check
 , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation {
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     gtk-doc
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gsl/default.nix b/nixpkgs/pkgs/development/libraries/gsl/default.nix
index 4a9208cff32a..04c8bcbbbecc 100644
--- a/nixpkgs/pkgs/development/libraries/gsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-2.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";
 
   # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
   doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The GNU Scientific Library, a large numerical library";
     homepage = "https://www.gnu.org/software/gsl/";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       The GNU Scientific Library (GSL) is a numerical library for C
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
       fitting.  There are over 1000 functions in total with an
       extensive test suite.
     '';
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
index 9a31563c6cca..d26651875756 100644
--- a/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv }:
+{ fetchurl, fetchpatch, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-1.16";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";
 
   patches = [
     (fetchpatch {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The GNU Scientific Library, a large numerical library";
     homepage = "https://www.gnu.org/software/gsl/";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       The GNU Scientific Library (GSL) is a numerical library for C
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       fitting.  There are over 1000 functions in total with an
       extensive test suite.
     '';
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     # Failing "eigen" tests on aarch64.
     badPlatforms = [ "aarch64-linux" ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/gsm/default.nix b/nixpkgs/pkgs/development/libraries/gsm/default.nix
index 30cffa89938d..13088dda0c91 100644
--- a/nixpkgs/pkgs/development/libraries/gsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsm/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl
-, staticSupport ? false # Compile statically (support for packages that look for the static object)
+{ lib, stdenv, fetchurl
+, # Compile statically (support for packages that look for the static object)
+  staticSupport ? stdenv.hostPlatform.isStatic
 }:
 
 let
   inherit (stdenv) isDarwin;
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
 
   parallelBuild = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lossy speech compression codec";
     homepage    = "http://www.quut.com/gsm/";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/gsmlib/default.nix b/nixpkgs/pkgs/development/libraries/gsmlib/default.nix
index 88bec83e624f..ec6646d98f57 100644
--- a/nixpkgs/pkgs/development/libraries/gsmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsmlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 stdenv.mkDerivation rec {
   pname = "gsmlib";
   version = "unstable-2017-10-06";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5";
   };
   nativeBuildInputs = [ autoreconfHook ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to access GSM mobile phones through GSM modems";
     homepage = "https://github.com/x-logLT/gsmlib";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/gsoap/default.nix b/nixpkgs/pkgs/development/libraries/gsoap/default.nix
index 2614c50cca78..08b8146ac0a8 100644
--- a/nixpkgs/pkgs/development/libraries/gsoap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsoap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }:
+{ lib, stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }:
 
 let
   majorVersion = "2.8";
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
       --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C/C++ toolkit for SOAP web services and XML-based applications";
     homepage = "http://www.cs.fsu.edu/~engelen/soap.html";
     # gsoap is dual/triple licensed (see homepage for details):
diff --git a/nixpkgs/pkgs/development/libraries/gsound/default.nix b/nixpkgs/pkgs/development/libraries/gsound/default.nix
index bae1b17e5322..2a3e846d38d6 100644
--- a/nixpkgs/pkgs/development/libraries/gsound/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsound/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gsound";
   version = "1.0.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
   };
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ];
+  nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ];
   buildInputs = [ glib libcanberra ];
 
   passthru = {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GSound";
     description = "Small library for playing system sounds";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix
index 37e54c825955..890fcb981181 100644
--- a/nixpkgs/pkgs/development/libraries/gspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , libxml2
 , glib
 , gtk3
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw";
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     vala
     gobject-introspection
     libxml2
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    # required for pkgconfig
+    # required for pkg-config
     enchant2
   ];
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A spell-checking library for GTK applications";
     homepage = "https://wiki.gnome.org/Projects/gspell";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gss/default.nix b/nixpkgs/pkgs/development/libraries/gss/default.nix
index 363e7ba7d10f..ec4e54c339b0 100644
--- a/nixpkgs/pkgs/development/libraries/gss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , withShishi ? !stdenv.isDarwin, shishi ? null
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
-  buildInputs = stdenv.lib.optional withShishi shishi;
+  buildInputs = lib.optional withShishi shishi;
 
   configureFlags = [
     "--${if withShishi != null then "enable" else "disable"}-kereberos5"
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Fixup .la files
-  postInstall = stdenv.lib.optionalString withShishi ''
+  postInstall = lib.optionalString withShishi ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/gss/";
     description = "Generic Security Service";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gssdp/default.nix b/nixpkgs/pkgs/development/libraries/gssdp/default.nix
index 0a808b71a71c..440caba25476 100644
--- a/nixpkgs/pkgs/development/libraries/gssdp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gssdp/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , vala
 , gtk-doc
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "bin" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1s57i8a8wnnxnsfl27cq4503dkdlzbrhry5zpg23sfqfffvdqqx2";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gobject-introspection
     vala
     gtk-doc
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = "http://www.gupnp.org/";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
index 49343e79c878..313a063cae89 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,11 +1,11 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
 , ninja
 , gettext
 , config
-, pkgconfig
+, pkg-config
 , python3
 , gst-plugins-base
 , orc
@@ -86,7 +86,7 @@
 assert faacSupport -> faac != null;
 
 let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "gst-plugins-bad";
   version = "1.18.2";
@@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     orc # for orcc
     python3
     gettext
@@ -293,7 +293,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = false; # fails 20 out of 58 tests, expensive
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GStreamer Bad Plugins";
     homepage = "https://gstreamer.freedesktop.org";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
index 4728e49c5162..bac59ac4c48c 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchurl
 , lib
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , gettext
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     gettext
     orc
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
index 0d33d28196ca..a5b4c0b827a1 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gettext
 , gobject-introspection
 , bison
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gettext
     bison
     flex
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
   ] ++ lib.optionals stdenv.isDarwin [
-    # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it.
+    # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
     "-Dlibunwind=disabled"
     "-Dlibdw=disabled"
   ];
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
index 6743a5ecd675..dc53a76bbca6 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gstreamer
 , gst-plugins-base
 , python3
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gobject-introspection
 
     # documentation
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Integration testing infrastructure for the GStreamer framework";
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
index 75e065e6d2be..ebd5f83dd15f 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , python3
 , bash-completion
 , gst-plugins-base
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gettext
     gobject-introspection
     gst-devtools
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
       scripts/extract-release-date-from-doap-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for creation of audio/video non-linear editors";
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
index d4c3b99c7ca9..a032f5f5b5a4 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , nasm
 , ninja
-, pkgconfig
+, pkg-config
 , python3
 , gst-plugins-base
 , orc
@@ -47,7 +47,7 @@ assert gtkSupport -> gtk3 != null;
 assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64);
 
 let
-  inherit (stdenv.lib) optionals;
+  inherit (lib) optionals;
 in
 stdenv.mkDerivation rec {
   pname = "gst-plugins-good";
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     python3
     meson
     ninja
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
   # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GStreamer Good Plugins";
     homepage = "https://gstreamer.freedesktop.org";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 35c278da03b1..2c683a84da4d 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }:
 stdenv.mkDerivation rec {
   pname = "gstreamermm";
   version = "1.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig file ];
+  nativeBuildInputs = [ pkg-config file ];
 
   propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ];
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface for GStreamer";
     homepage = "https://gstreamer.freedesktop.org/bindings/cplusplus.html";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
index c75d439cd53f..3175cff4acaa 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , python3
 , gst-plugins-base
 , gettext
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     gettext
-    pkgconfig
+    pkg-config
     python3
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 4167b1727769..bcecd11ce2d2 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , python3
 , gettext
 , gobject-introspection
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     ninja
     gettext
     gobject-introspection
-    pkgconfig
+    pkg-config
     python3
 
     # documentation
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       scripts/extract-release-date-from-doap-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GStreamer RTSP server";
     homepage = "https://gstreamer.freedesktop.org";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
index 1cdc0a519300..8f35829ed384 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , python3
 , gst-plugins-base
 , orc
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     gettext
-    pkgconfig
+    pkg-config
     python3
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 52a6cb27894b..a90d21c28e8c 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gst-plugins-base
 , bzip2
 , libva
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     bzip2
 
     # documentation
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       scripts/extract-release-date-from-doap-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of VAAPI GStreamer Plug-ins";
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
index b848af6c318a..0e467b294330 100644
--- a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}:
+{lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}:
 let
   s = # Generated upstream information
   rec {
@@ -9,7 +9,7 @@ let
     url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip";
     sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cdk unzip gtk2 glib ncurses
   ];
@@ -23,10 +23,10 @@ stdenv.mkDerivation {
   makeFlags = ["PREFIX=$(out)"];
   meta = {
     inherit (s) version;
-    description = ''Cross-platform helper for creating interactive dialogs'';
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Cross-platform helper for creating interactive dialogs";
+    license = lib.licenses.mit ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "http://foicica.com/gtdialog";
     downloadPage = "http://foicica.com/gtdialog/download";
   };
diff --git a/nixpkgs/pkgs/development/libraries/gtest/default.nix b/nixpkgs/pkgs/development/libraries/gtest/default.nix
index 4e8ce95737d9..d15ce77213ca 100644
--- a/nixpkgs/pkgs/development/libraries/gtest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "gtest";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google's framework for writing C++ tests";
     homepage = "https://github.com/google/googletest";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/gthree/default.nix b/nixpkgs/pkgs/development/libraries/gthree/default.nix
index 2da9847f3cb4..990e151efe44 100644
--- a/nixpkgs/pkgs/development/libraries/gthree/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gthree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , ninja
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "-Dexamples=false"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject/GTK port of three.js";
     homepage = "https://github.com/alexlarsson/gthree";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
index 99ca221f5ba2..84920060c5ea 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
 
 stdenv.mkDerivation {
   name = "gtk-engine-bluecurve-1.0";
@@ -8,14 +8,14 @@ stdenv.mkDerivation {
     sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkg-config intltool ];
 
   buildInputs = [ gtk2 ];
 
   meta = {
     description = "Original Bluecurve engine from Red Hat's artwork package";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.gnidorah ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.gnidorah ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix
index 9acb7b25a0dd..8d40499fb626 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-engine-murrine";
   version = "0.98.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ intltool gtk2 ];
 
   meta = {
     description = "A very flexible theme engine";
     homepage = "https://gitlab.gnome.org/Archive/murrine";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
index 2f56f6eb4c5c..115547a72f73 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
 
 stdenv.mkDerivation {
   name = "gtk-engines-2.20.2";
@@ -8,12 +8,12 @@ stdenv.mkDerivation {
     sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ intltool gtk2 ];
 
   meta = {
     description = "Theme engines for GTK 2";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
index 87f9698bec0a..56693d24c7a8 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , meson
 , ninja
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gtk-layer-shell";
-  version = "0.5.1";
+  version = "0.5.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "wmww";
     repo = "gtk-layer-shell";
     rev = "v${version}";
-    sha256 = "1yfqfv3hn92cy9y5zgvz7qhq2ypill2z5857ki5snjimhjdz0cnw";
+    sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     "-Ddocs=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ eonpatapon ];
diff --git a/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix
index 5cf62b319a6b..f244a97edf24 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }:
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-mac-integration";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ];
+  nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ];
   buildInputs = [ glib ];
   propagatedBuildInputs = [ gtk ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     gtkdocize
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides integration for GTK applications into the Mac desktop";
     license = licenses.lgpl21;
     homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration";
diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix
index 2b83a8ef52e2..69ef71f1506f 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-sharp-beans";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook which ];
+  nativeBuildInputs = [ pkg-config autoreconfHook which ];
   buildInputs = [ mono gtk-sharp-2_0 gio-sharp ];
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Binds some API from GTK that isn't in GTK# 2.12.x";
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix
index ed53105f7581..1e7c86530658 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , mono
 , glib
 , pango
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
+  nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
 
   buildInputs = [
     mono glib pango gtk2 GConf libglade libgnomecanvas
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     gtk = gtk2;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graphical User Interface Toolkit for mono and .Net";
     homepage = "https://www.mono-project.com/docs/gui/gtksharp";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix
index 49405c655e15..491656a0c682 100644
--- a/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
-, pkgconfig
+, pkg-config
 , mono
 , glib
 , pango
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     mono glib pango gtk3 GConf libglade libgnomecanvas
     libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
index be5f8521f9c8..43b7ff5f127f 100644
--- a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
+{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
 , gdk-pixbuf, xlibsWrapper, gobject-introspection
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
@@ -10,7 +10,7 @@
 assert xineramaSupport -> xorg.libXinerama != null;
 assert cupsSupport -> cups != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gtk+";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     ./hooks/drop-icon-theme-cache.sh
   ];
 
-  nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ];
+  nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
 
   patches = [
     ./patches/2.0-immodules.cache.patch
diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
index 59685ca07ccb..0e5c6edc9640 100644
--- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
-, pkgconfig
+, pkg-config
 , gettext
-, docbook_xsl
+, docbook-xsl-nons
 , docbook_xml_dtd_43
 , gtk-doc
 , meson
@@ -48,13 +48,11 @@
 
 assert cupsSupport -> cups != null;
 
-with stdenv.lib;
-
 stdenv.mkDerivation rec {
   pname = "gtk+3";
   version = "3.24.24";
 
-  outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
+  outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
   outputBin = "dev";
 
   setupHooks = [
@@ -63,18 +61,19 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
     sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc";
   };
 
   patches = [
     ./patches/3.0-immodules.cache.patch
+
     (fetchpatch {
       name = "Xft-setting-fallback-compute-DPI-properly.patch";
       url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
       sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
     })
-  ] ++ optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
     # let’s drop that dependency in similar way to how other parts of the library do it
     # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
@@ -82,47 +81,18 @@ stdenv.mkDerivation rec {
     ./patches/3.0-darwin-x11.patch
   ];
 
-  separateDebugInfo = stdenv.isLinux;
-
-  mesonFlags = [
-    "-Dgtk_doc=${boolToString withGtkDoc}"
-    "-Dtests=false"
-    "-Dtracker3=${boolToString trackerSupport}"
-    "-Dbroadway_backend=${boolToString broadwaySupport}"
-  ];
-
-  # These are the defines that'd you'd get with --enable-debug=minimum (default).
-  # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
-  NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
-
-  postPatch = ''
-    files=(
-      build-aux/meson/post-install.py
-      demos/gtk-demo/geninclude.py
-      gdk/broadway/gen-c-array.py
-      gdk/gen-gdk-gresources-xml.py
-      gtk/cursor/dnd-copy.png
-      gtk/gen-gtk-gresources-xml.py
-      gtk/gen-rc.py
-      gtk/gentypefuncs.py
-    )
-
-    chmod +x ''${files[@]}
-    patchShebangs ''${files[@]}
-  '';
-
   nativeBuildInputs = [
     gettext
     gobject-introspection
     makeWrapper
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     sassc
-  ] ++ setupHooks ++ optionals withGtkDoc [
+  ] ++ setupHooks ++ lib.optionals withGtkDoc [
     docbook_xml_dtd_43
-    docbook_xsl
+    docbook-xsl-nons
     gtk-doc
     # For xmllint
     libxml2
@@ -133,10 +103,12 @@ stdenv.mkDerivation rec {
     epoxy
     json-glib
     isocodes
-  ]
-  ++ optional stdenv.isDarwin AppKit
-  ++ optional trackerSupport tracker
-  ;
+  ] ++ lib.optionals stdenv.isDarwin [
+    AppKit
+  ] ++ lib.optionals trackerSupport [
+    tracker
+  ];
+  #TODO: colord?
 
   propagatedBuildInputs = with xorg; [
     at-spi2-atk
@@ -155,17 +127,51 @@ stdenv.mkDerivation rec {
     libXrandr
     libXrender
     pango
-  ]
-  ++ optional stdenv.isDarwin Cocoa  # explicitly propagated, always needed
-  ++ optionals waylandSupport [ mesa wayland wayland-protocols ]
-  ++ optional xineramaSupport libXinerama
-  ++ optional cupsSupport cups
-  ;
-  #TODO: colord?
+  ] ++ lib.optionals stdenv.isDarwin [
+    # explicitly propagated, always needed
+    Cocoa
+  ] ++ lib.optionals waylandSupport [
+    mesa
+    wayland
+    wayland-protocols
+  ] ++ lib.optionals xineramaSupport [
+    libXinerama
+  ] ++ lib.optionals cupsSupport [
+    cups
+  ];
+
+  mesonFlags = [
+    "-Dgtk_doc=${lib.boolToString withGtkDoc}"
+    "-Dtests=false"
+    "-Dtracker3=${lib.boolToString trackerSupport}"
+    "-Dbroadway_backend=${lib.boolToString broadwaySupport}"
+  ];
 
   doCheck = false; # needs X11
 
-  postInstall = optionalString (!stdenv.isDarwin) ''
+  separateDebugInfo = stdenv.isLinux;
+
+  # These are the defines that'd you'd get with --enable-debug=minimum (default).
+  # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
+  NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
+
+  postPatch = ''
+    files=(
+      build-aux/meson/post-install.py
+      demos/gtk-demo/geninclude.py
+      gdk/broadway/gen-c-array.py
+      gdk/gen-gdk-gresources-xml.py
+      gtk/cursor/dnd-copy.png
+      gtk/gen-gtk-gresources-xml.py
+      gtk/gen-rc.py
+      gtk/gentypefuncs.py
+    )
+
+    chmod +x ''${files[@]}
+    patchShebangs ''${files[@]}
+  '';
+
+  postInstall = lib.optionalString (!stdenv.isDarwin) ''
     # The updater is needed for nixos env and it's tiny.
     moveToOutput bin/gtk-update-icon-cache "$out"
     # Launcher
@@ -178,7 +184,7 @@ stdenv.mkDerivation rec {
   '';
 
   # Wrap demos
-  postFixup =  optionalString (!stdenv.isDarwin) ''
+  postFixup =  lib.optionalString (!stdenv.isDarwin) ''
     demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory)
 
     for program in ''${demos[@]}; do
@@ -194,7 +200,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = {
+  meta = with lib; {
     description = "A multi-platform toolkit for creating graphical user interfaces";
     longDescription = ''
       GTK is a highly usable, feature rich toolkit for creating
diff --git a/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix
index 5cef820db149..ccaceabd4e98 100644
--- a/nixpkgs/pkgs/development/libraries/gtkd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
-, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }:
+{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
+, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
 
 let
   inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
     stripRoot = false;
   };
 
-  nativeBuildInputs = [ dmd pkgconfig which ];
+  nativeBuildInputs = [ dmd pkg-config which ];
   propagatedBuildInputs = [
     atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
     libgda libpeas librsvg pango vte
@@ -117,7 +117,7 @@ in stdenv.mkDerivation rec {
 
   makeFlags  = [
     "prefix=${placeholder "out"}"
-    "PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
+    "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
   ];
 
   # The .pc files does not declare an `includedir=`, so the multiple
@@ -129,7 +129,7 @@ in stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D binding and OO wrapper for GTK";
     homepage = "https://gtkd.org";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
index 54054270c3c6..d7cca43841e4 100644
--- a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "gtkdatabox-0.9.3.1";
@@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ gtk2 ];
 
   meta = {
     description = "GTK widget for displaying large amounts of numerical data";
 
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix
index babcaa993340..438f7feab6ce 100644
--- a/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gtk2 }:
+{ fetchurl, lib, stdenv, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "gtkimageview-1.6.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk2 ];
 
   preConfigure = ''
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
          interpolation; GIF animation support.
        '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix b/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix
index 0c72f8501cc2..b5399553f960 100644
--- a/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }:
+{lib, stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }:
 
 let
   pname = "gtkmathview";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ t1lib glib gmetadom libxml2 popt];
   propagatedBuildInputs = [gtk2 t1lib];
 
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://helm.cs.unibo.it/mml-widget/";
     description = "C++ rendering engine for MathML documents";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.roconnor ];
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix
index 24262d263cbf..521f4ca15f30 100644
--- a/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }:
 
 stdenv.mkDerivation rec {
   name = "gtkmm-${minVer}.5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];
 
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
 
     homepage = "https://gtkmm.org/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ raskin vcunat ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [ raskin vcunat ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix
index 5794b2ddf46f..4a31acd2ff66 100644
--- a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gtkmm";
   version = "3.24.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ epoxy ];
 
   propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface to the GTK graphical user interface library";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix
index d32a0eebf137..84a20154b13c 100644
--- a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
+{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala
 , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.24.11";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ];
+  nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];
 
   checkInputs = [ xvfb_run dbus ];
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       make check
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
     platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
index 2041e83fb0c3..2d469c191e03 100644
--- a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala
+{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
 , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
 , meson, ninja }:
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "4.8.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ];
+  nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ];
 
   checkInputs = [ xvfb_run dbus ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
     platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix
index 1607a5819961..5e80f91abc1b 100644
--- a/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gtksourceviewmm";
   version = "3.91.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy";
   };
 
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     homepage = "https://developer.gnome.org/gtksourceviewmm/";
     description = "C++ wrapper for gtksourceview";
diff --git a/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix
index 7bf510207ab3..7ee6b656ead1 100644
--- a/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gtksourceviewmm";
   version = "3.21.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceviewmm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
   };
 
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glibmm gtkmm3 gtksourceview3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     homepage = "https://developer.gnome.org/gtksourceviewmm/";
     description = "C++ wrapper for gtksourceview";
diff --git a/nixpkgs/pkgs/development/libraries/gtkspell/3.nix b/nixpkgs/pkgs/development/libraries/gtkspell/3.nix
index 707acfcd3820..d3a1a178856b 100644
--- a/nixpkgs/pkgs/development/libraries/gtkspell/3.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkspell/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}:
+{lib, stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}:
 
 stdenv.mkDerivation rec {
   pname = "gtkspell";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ];
+  nativeBuildInputs = [ pkg-config intltool gobject-introspection vala ];
   buildInputs = [ aspell gtk3 enchant isocodes ];
   propagatedBuildInputs = [ enchant ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "--enable-vala"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gtkspell.sourceforge.net/";
     description = "Word-processor-style highlighting GtkTextView widget";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gtkspell/default.nix b/nixpkgs/pkgs/development/libraries/gtkspell/default.nix
index b6ee2c6825d6..78d9956d30a2 100644
--- a/nixpkgs/pkgs/development/libraries/gtkspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkspell/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}:
+{lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}:
 
 stdenv.mkDerivation {
   name = "gtkspell-2.0.16";
@@ -8,10 +8,10 @@ stdenv.mkDerivation {
     sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [aspell gtk2 enchant intltool];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Word-processor-style highlighting and replacement of misspelled words";
     homepage = "http://gtkspell.sourceforge.net";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix b/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix
index b3bca9bd7b6d..31380b5ab793 100644
--- a/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, pkgconfig
+{ lib, stdenv, fetchurl
+, pkg-config
 , gtk3, glib, glibmm, gtkmm3, gtkspell3
 }:
 
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     gtkspell3
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gtk3 glib glibmm gtkmm3
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ binding for the gtkspell library";
     homepage = "http://gtkspell.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/gts/default.nix b/nixpkgs/pkgs/development/libraries/gts/default.nix
index 48bdfc9b5e1b..815dfb634c9f 100644
--- a/nixpkgs/pkgs/development/libraries/gts/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gts/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib, buildPackages }:
+{ fetchurl, lib, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }:
 
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     autoreconfHook
     glib  # required to satisfy AM_PATH_GLIB_2_0
   ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails with "permission denied"
 
-  preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     pushd src
     make CC=${buildPackages.stdenv.cc}/bin/cc predicates_init
     mv predicates_init predicates_init_build
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://gts.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     description = "GNU Triangulated Surface Library";
 
     longDescription = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       3D surfaces meshed with interconnected triangles.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = [ lib.maintainers.viric ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/nixpkgs/pkgs/development/libraries/gumbo/default.nix
index e8035d8b1cf9..91053828b586 100644
--- a/nixpkgs/pkgs/development/libraries/gumbo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gumbo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "gumbo";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C99 HTML parsing algorithm";
     homepage = "https://github.com/google/gumbo-parser";
     maintainers = [ maintainers.nico202 ];
diff --git a/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix
index 80fb9e3affff..9bf39d94aed3 100644
--- a/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , vala
 , gtk-doc
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8";
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     gobject-introspection
     vala
     gtk-doc
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gupnp.org/";
     description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix
index 8fc001de3d56..e11d86f82e19 100644
--- a/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , vala
 , gtk-doc
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj";
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     gobject-introspection
     vala
     gtk-doc
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GUPnP/";
     description = "Library to ease DLNA-related bits for applications using GUPnP";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix
index a8ed1f7cadd0..2dad33949f3f 100644
--- a/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , gettext
 , gobject-introspection
 , gtk-doc
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
   };
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     autoreconfHook
     gettext
     gobject-introspection
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to handle UPnP IGD port mapping";
     homepage = "http://www.gupnp.org/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/nixpkgs/pkgs/development/libraries/gupnp/default.nix
index 153eb681d633..fe3463eeff20 100644
--- a/nixpkgs/pkgs/development/libraries/gupnp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , vala
 , gtk-doc
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x";
   };
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gobject-introspection
     vala
     gtk-doc
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.gupnp.org/";
     description = "An implementation of the UPnP specification";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/gusb/default.nix b/nixpkgs/pkgs/development/libraries/gusb/default.nix
index a2e157691459..c3ae6faecfd7 100644
--- a/nixpkgs/pkgs/development/libraries/gusb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gusb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection
 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3
 , glib, systemd, libusb1, vala, hwdata
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext pythonEnv
+    meson ninja pkg-config gettext pythonEnv
     gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
     gobject-introspection vala
   ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # tests try to access USB
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GLib libusb wrapper";
     homepage = "https://github.com/hughsie/libgusb";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix
index f79ffa579c87..c30d678e02d5 100644
--- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gettext
 , dbus
 , glib
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   version = "1.46.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2";
   };
 
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     python3
-    pkgconfig
+    pkg-config
     gettext
     wrapGAppsHook
     libxml2
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     openssh
     gsettings-desktop-schemas
     # TODO: a ligther version of libsoup to have FTP/HTTP support?
-  ] ++ stdenv.lib.optionals gnomeSupport [
+  ] ++ lib.optionals gnomeSupport [
     gnome3.libsoup
     gcr
     glib-networking # TLS support
@@ -102,13 +102,13 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
     "-Dtmpfilesdir=no"
-  ] ++ stdenv.lib.optionals (!gnomeSupport) [
+  ] ++ lib.optionals (!gnomeSupport) [
     "-Dgcr=false"
     "-Dgoa=false"
     "-Dkeyring=false"
     "-Dhttp=false"
     "-Dgoogle=false"
-  ] ++ stdenv.lib.optionals (samba == null) [
+  ] ++ lib.optionals (samba == null) [
     # Xfce don't want samba
     "-Dsmb=false"
   ];
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/half/default.nix b/nixpkgs/pkgs/development/libraries/half/default.nix
index b0f4c3a0e9e0..5232dfa51230 100644
--- a/nixpkgs/pkgs/development/libraries/half/default.nix
+++ b/nixpkgs/pkgs/development/libraries/half/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
   version = "2.1.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for half precision floating point arithmetics";
     platforms = platforms.all;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/hamlib/default.nix b/nixpkgs/pkgs/development/libraries/hamlib/default.nix
index 8ef8b55be522..98b494610057 100644
--- a/nixpkgs/pkgs/development/libraries/hamlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hamlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig,
+{lib, stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config,
  boost, libtool, perlPackages }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2
-                  tcl libusb-compat-0_1 pkgconfig boost libtool ];
+                  tcl libusb-compat-0_1 pkg-config boost libtool ];
 
   configureFlags = [ "--with-perl-binding" "--with-python-binding"
                      "--with-tcl-binding" "--with-rigmatrix" ];
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     which lets one control a radio transceiver or receiver, either from
     command line interface or in a text-oriented interactive interface.
     '';
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
     homepage = "http://hamlib.sourceforge.net";
-    maintainers = with stdenv.lib.maintainers; [ relrod ];
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ relrod ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
index 6c5703f521d7..b3615893b532 100644
--- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, glib, freetype, cairo, libintl
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl
 , meson, ninja
 , gobject-introspection
 , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
@@ -12,7 +12,7 @@
 
 let
   version = "2.7.2";
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
   mesonFeatureFlag = opt: b:
     "-D${opt}=${if b then "enabled" else "disabled"}";
 in
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   postPatch = ''
     patchShebangs src/*.py
     patchShebangs test
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # ApplicationServices.framework headers have cast-align warnings.
     substituteInPlace src/hb.hh \
       --replace '#pragma GCC diagnostic error   "-Wcast-align"' ""
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     ninja
     gobject-introspection
     libintl
-    pkgconfig
+    pkg-config
     python3
     gtk-doc
     docbook-xsl-nons
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [ glib freetype cairo ] # recommended by upstream
-    ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ];
+    ++ lib.optionals withCoreText [ ApplicationServices CoreText ];
 
   propagatedBuildInputs = []
     ++ optional withGraphite2 graphite2
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
     ''}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenType text shaping engine";
     homepage = "https://harfbuzz.github.io/";
     maintainers = [ maintainers.eelco ];
diff --git a/nixpkgs/pkgs/development/libraries/hawknl/default.nix b/nixpkgs/pkgs/development/libraries/hawknl/default.nix
index e9d5d5d97310..0525fcd0eba6 100644
--- a/nixpkgs/pkgs/development/libraries/hawknl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hawknl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   name = "hawknl-1.68";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://hawksoft.com/hawknl/";
     description = "Free, open source, game oriented network API";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in b/nixpkgs/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in
new file mode 100644
index 000000000000..04e29515d9b1
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in
@@ -0,0 +1,13 @@
+prefix=@out@
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: blosc_filter
+Description: Blosc Filter
+URL: http://blosc.org/
+Version: @version@
+Requires: \
+  blosc \
+  hdf5
+Cflags: -isystem${includedir}
+Libs: -L${libdir} -Wl,-rpath,${libdir} -lblosc_filter
diff --git a/nixpkgs/pkgs/development/libraries/hdf5-blosc/default.nix b/nixpkgs/pkgs/development/libraries/hdf5-blosc/default.nix
new file mode 100644
index 000000000000..985660ff9073
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/hdf5-blosc/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv, c-blosc, cmake, hdf5, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "hdf5-blosc";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "Blosc";
+    repo = pname;
+    rev =  "v${version}";
+    sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs";
+  };
+
+  patches = [ ./no-external-blosc.patch ];
+
+  outputs = [ "out" "dev" "plugin" ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ c-blosc hdf5 ];
+
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'
+  '';
+
+  cmakeFlags = [
+    "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/lib/pkgconfig
+    substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc
+  '';
+
+  meta = with lib; {
+    description = "Filter for HDF5 that uses the Blosc compressor";
+    homepage = "https://github.com/Blosc/hdf5-blosc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bhipple ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch
new file mode 100644
index 000000000000..8f2bd8579ed8
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt      2019-10-11 12:12:27.445417039 -0400
++++ b/CMakeLists.txt      2019-10-11 12:27:26.630691742 -0400
+@@ -22,14 +22,6 @@
+ message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'")
+ message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'")
+
+-ExternalProject_Add(project_blosc
+-  PREFIX ${BLOSC_PREFIX}
+-  GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
+-  INSTALL_DIR ${BLOSC_INSTALL_DIR}
+-  CMAKE_ARGS ${BLOSC_CMAKE_ARGS}
+-)
+-
+-
+ # sources
+ set(SOURCES src/blosc_filter.c)
+ set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c )
+@@ -53,7 +45,6 @@
+ # add blosc libraries
+ add_library(blosc_shared SHARED IMPORTED)
+ set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX})
+-add_dependencies(blosc_shared project_blosc)
+ include_directories(${BLOSC_INSTALL_DIR}/include)
+
+ add_library(blosc_filter_shared SHARED ${SOURCES})
+
diff --git a/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/nixpkgs/pkgs/development/libraries/hidapi/default.nix
index c42a35282233..6a3665809b4a 100644
--- a/nixpkgs/pkgs/development/libraries/hidapi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hidapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1
 , darwin }:
 
 stdenv.mkDerivation rec {
@@ -12,16 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];
+    ++ lib.optionals stdenv.isLinux [ libusb1 udev ];
 
   enableParallelBuilding = true;
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]);
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for communicating with USB and Bluetooth HID devices";
     homepage = "https://github.com/libusb/hidapi";
     maintainers = with maintainers; [ prusnak ];
diff --git a/nixpkgs/pkgs/development/libraries/highfive/default.nix b/nixpkgs/pkgs/development/libraries/highfive/default.nix
index c514a44f851a..a9db80468ee6 100644
--- a/nixpkgs/pkgs/development/libraries/highfive/default.nix
+++ b/nixpkgs/pkgs/development/libraries/highfive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
     "-DHIGHFIVE_UNIT_TESTS=OFF"
     "-DHIGHFIVE_USE_INSTALL_DEPS=ON"
   ]
-  ++ (stdenv.lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
+  ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Header-only C++ HDF5 interface";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/hiredis/default.nix b/nixpkgs/pkgs/development/libraries/hiredis/default.nix
index 2f7fe184845d..d4998b51592f 100644
--- a/nixpkgs/pkgs/development/libraries/hiredis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hiredis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "hiredis";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   PREFIX = "\${out}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/redis/hiredis";
     description = "Minimalistic C client for Redis >= 1.2";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/hivex/default.nix b/nixpkgs/pkgs/development/libraries/hivex/default.nix
index ee22726414ac..fb77e08ca6b0 100644
--- a/nixpkgs/pkgs/development/libraries/hivex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hivex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
 , perlPackages, libxml2, libiconv }:
 
 stdenv.mkDerivation rec {
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./hivex-syms.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     autoreconfHook makeWrapper libxml2
   ]
   ++ (with perlPackages; [ perl IOStringy ])
-  ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+  ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   postInstall = ''
     wrapProgram $out/bin/hivexregedit \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
         --prefix "PATH" : "$out/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Windows registry hive extraction library";
     license = licenses.lgpl2;
     homepage = "https://github.com/libguestfs/hivex";
diff --git a/nixpkgs/pkgs/development/libraries/hotpatch/default.nix b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
index df3581cc8095..9857f9f281cc 100644
--- a/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "hotpatch-0.2";
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
     sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh";
   };
 
-  enableParallelBuilding = true;
   doCheck = true;
 
   nativeBuildInputs = [ cmake ];
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
     LD_LIBRARY_PATH=$(pwd)/src make test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hot patching executables on Linux using .so file injection";
     homepage = src.meta.homepage;
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix
index df6e43293887..2611203a3894 100644
--- a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix
+++ b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "howard-hinnant-date-unstable";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     description = "A date and time library based on the C++11/14/17 <chrono> header";
     homepage = "https://github.com/HowardHinnant/date";
diff --git a/nixpkgs/pkgs/development/libraries/hpx/default.nix b/nixpkgs/pkgs/development/libraries/hpx/default.nix
index ba7da8f5b774..329fa99fa1cd 100644
--- a/nixpkgs/pkgs/development/libraries/hpx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hpx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }:
+{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }:
 
 stdenv.mkDerivation rec {
   pname = "hpx";
@@ -12,15 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ boost hwloc gperftools ];
-  nativeBuildInputs = [ cmake pkgconfig python ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake pkg-config python ];
 
   meta = {
     description = "C++ standard library for concurrency and parallelism";
     homepage = "https://github.com/STEllAR-GROUP/hpx";
-    license = stdenv.lib.licenses.boost;
-    platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ bobakker ];
+    license = lib.licenses.boost;
+    platforms = [ "x86_64-linux" ]; # lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bobakker ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/hspell/default.nix b/nixpkgs/pkgs/development/libraries/hspell/default.nix
index 8501bf88b6d4..9cf98bbbdc5d 100644
--- a/nixpkgs/pkgs/development/libraries/hspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, zlib }:
+{ lib, stdenv, fetchurl, perl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "${passthru.pname}-${passthru.version}";
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6";
   };
 
-  patchPhase = ''patchShebangs .'';
+  patchPhase = "patchShebangs .";
   buildInputs = [ perl zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hebrew spell checker";
     homepage = "http://hspell.ivrix.org.il/";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix
index ed3171da90f7..286834112f27 100644
--- a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "htmlcxx";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./ptrdiff.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://htmlcxx.sourceforge.net/";
     description = "A simple non-validating css1 and html parser for C++";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/nixpkgs/pkgs/development/libraries/http-parser/default.nix
index 203fcaa19ec8..9d1d23ede8b6 100644
--- a/nixpkgs/pkgs/development/libraries/http-parser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/http-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 let
   version = "2.9.4";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTTP message parser written in C";
     homepage = "https://github.com/nodejs/http-parser";
     maintainers = with maintainers; [ matthewbauer ];
diff --git a/nixpkgs/pkgs/development/libraries/hunspell/default.nix b/nixpkgs/pkgs/development/libraries/hunspell/default.nix
index 20acc49bb83e..fe4fc1e6d338 100644
--- a/nixpkgs/pkgs/development/libraries/hunspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hunspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.7.0";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://hunspell.sourceforge.net";
     description = "Spell checker";
     longDescription = ''
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.all;
     license = with licenses; [ gpl2 lgpl21 mpl11 ];
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
index 2cdc30109d90..00d0933bdd70 100644
--- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -1,6 +1,6 @@
 /* hunspell dictionaries */
 
-{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }:
+{ lib, stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }:
 
 
 let
@@ -37,7 +37,7 @@ let
         rev = "v${version}";
         sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8";
       };
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Hunspell dictionary for ${shortDescription} from rla";
         homepage = "https://github.com/sbosio/rla-es";
         license = with licenses; [ gpl3 lgpl3 mpl11 ];
@@ -76,7 +76,7 @@ let
         url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt";
         sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc";
       };
-      meta = with stdenv.lib; {
+      meta = with lib; {
         longDescription = ''
         Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran
         Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från
@@ -118,7 +118,7 @@ let
          url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip";
          sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0";
       };
-      meta = with stdenv.lib; {
+      meta = with lib; {
         inherit longDescription;
         description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
         homepage = "https://www.dicollecte.org/home.php?prj=fr";
@@ -132,7 +132,7 @@ let
       unpackCmd = ''
         unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
       '';
-      postInstall = stdenv.lib.optionalString isDefault ''
+      postInstall = lib.optionalString isDefault ''
         for ext in aff dic; do
           ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext
           ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext
@@ -148,7 +148,7 @@ let
       name = "hunspell-dict-${shortName}-wordlist-${version}";
       srcReadmeFile = "README_" + srcFileName + ".txt";
       readmeFile = "README_" + dictFileName + ".txt";
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Hunspell dictionary for ${shortDescription} from Wordlist";
         homepage = "http://wordlist.aspell.net/";
         license = licenses.bsd3;
@@ -175,7 +175,7 @@ let
       version = "2.4";
       name = "hunspell-dict-${shortName}-linguistico-${version}";
       readmeFile = dictFileName + "_README.txt";
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Hunspell dictionary for ${shortDescription}";
         homepage = "https://sourceforge.net/projects/linguistico/";
         license = licenses.gpl3;
@@ -217,7 +217,7 @@ let
         ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "http://xuxen.eus/";
         description = shortDescription;
         longDescription = longDescription;
@@ -254,7 +254,7 @@ let
         ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "https://www.j3e.de/ispell/igerman98/index_en.html";
         description = shortDescription;
         license = with licenses; [ gpl2 gpl3 ];
@@ -283,7 +283,7 @@ let
       buildPhase = ''
         cp -a ${sourceRoot}/* .
       '';
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "https://wiki.documentfoundation.org/Development/Dictionaries";
         description = "Hunspell dictionary for ${shortDescription} from LibreOffice";
         license = license;
@@ -651,7 +651,7 @@ in rec {
     shortName = "hu-hu";
     dictFileName = "hu_HU";
     shortDescription = "Hungarian (Hungary)";
-    license = with stdenv.lib.licenses; [ mpl20 lgpl3 ];
+    license = with lib.licenses; [ mpl20 lgpl3 ];
   };
 
   /* SWEDISH */
@@ -714,7 +714,7 @@ in rec {
       unzip $src ${dictFileName}/{${dictFileName}.dic,${dictFileName}.aff,${readmeFile}}
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice";
       homepage = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/";
       license = licenses.mpl20;
@@ -730,7 +730,7 @@ in rec {
     shortName = "ru-ru";
     dictFileName = "ru_RU";
     shortDescription = "Russian (Russian)";
-    license = with stdenv.lib.licenses; [ mpl20 lgpl3 ];
+    license = with lib.licenses; [ mpl20 lgpl3 ];
   };
 
   /* CZECH */
@@ -741,7 +741,7 @@ in rec {
     dictFileName = "cs_CZ";
     shortDescription = "Czech (Czechia)";
     readmeFile = "README_cs.txt";
-    license = with stdenv.lib.licenses; [ gpl2 ];
+    license = with lib.licenses; [ gpl2 ];
   };
 
   /* SLOVAK */
@@ -752,7 +752,7 @@ in rec {
     dictFileName = "sk_SK";
     shortDescription = "Slovak (Slovakia)";
     readmeFile = "README_sk.txt";
-    license = with stdenv.lib.licenses; [ gpl2 lgpl21 mpl11 ];
+    license = with lib.licenses; [ gpl2 lgpl21 mpl11 ];
   };
 
   /* DANISH */
@@ -776,10 +776,10 @@ in rec {
       unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} -d ${dictFileName}
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Hunspell dictionary for Danish (Denmark) from Stavekontrolden";
       homepage = "https://github.com/jeppebundsgaard/stavekontrolden";
-      license = with stdenv.lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
+      license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
       maintainers = with maintainers; [ louisdk1 ];
     };
   };
diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
index 561a4693c1d7..6a939835cf56 100644
--- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl
+{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
 , x11Support ? false, libX11 ? null, cairo ? null
 }:
 
 assert x11Support -> libX11 != null && cairo != null;
 
-with stdenv.lib;
+with lib;
 
 let
   version = "2.4.0";
@@ -25,11 +25,11 @@ in stdenv.mkDerivation {
   ];
 
   # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   # Filter out `null' inputs.  This allows users to `.override' the
   # derivation and set optional dependencies to `null'.
-  buildInputs = stdenv.lib.filter (x: x != null)
+  buildInputs = lib.filter (x: x != null)
    ([ expat ncurses ]
      ++  (optionals x11Support [ cairo libX11 ])
      ++  (optionals stdenv.isLinux [ numactl ]));
diff --git a/nixpkgs/pkgs/development/libraries/hyena/default.nix b/nixpkgs/pkgs/development/libraries/hyena/default.nix
index 09b7751c8284..177f6fe7909d 100644
--- a/nixpkgs/pkgs/development/libraries/hyena/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyena/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }:
+{ lib, stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }:
 
 stdenv.mkDerivation rec {
   pname = "hyena";
   version = "0.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     mono gtk-sharp-2_0
   ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   inherit monoDLLFixer;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Attic/Hyena";
     description = "A C# library which contains a hodge-podge of random stuff";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
index 17246f0aa0a9..f160afb99b7c 100644
--- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, cmake, ragel, python3
+{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3
 , coreutils, gnused, util-linux
 , boost
 , withStatic ? false # build only shared libs by default, build static+shared if true
 }:
 
-# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
-#         pcap used only in examples, pkgconfig used only to check for pcre
+# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs
+#         pcap used only in examples, pkg-config used only to check for pcre
 #         which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
 #         I not see any reason (for now) to backport 8.41.
 
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     "-DFAT_RUNTIME=ON"
     "-DBUILD_AVX512=ON"
   ]
-  ++ stdenv.lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
-  ++ stdenv.lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
+  ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
+  ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
 
   postPatch = ''
     sed -i '/examples/d' CMakeLists.txt
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance multiple regex matching library";
     longDescription = ''
       Hyperscan is a high-performance multiple regex matching library.
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
       Hyperscan uses hybrid automata techniques to allow simultaneous
       matching of large numbers (up to tens of thousands) of regular
-      expressions and for the matching of regular expressions across 
+      expressions and for the matching of regular expressions across
       streams of data.
 
       Hyperscan is typically used in a DPI library stack.
diff --git a/nixpkgs/pkgs/development/libraries/hyphen/default.nix b/nixpkgs/pkgs/development/libraries/hyphen/default.nix
index 9251b2853f1c..ed3980f7a90d 100644
--- a/nixpkgs/pkgs/development/libraries/hyphen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyphen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, ... }:
+{ lib, stdenv, fetchurl, perl, ... }:
 
 let
   version = "2.8.8";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     sha256 = "01ap9pr6zzzbp4ky0vy7i1983fwyqy27pl0ld55s30fdxka3ciih";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A text hyphenation library";
     homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/icu/base.nix b/nixpkgs/pkgs/development/libraries/icu/base.nix
index d8e9bd16ab89..47eea8ba1af1 100644
--- a/nixpkgs/pkgs/development/libraries/icu/base.nix
+++ b/nixpkgs/pkgs/development/libraries/icu/base.nix
@@ -30,18 +30,18 @@ let
 
       # $(includedir) is different from $(prefix)/include due to multiple outputs
       sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in
-    '' + stdenv.lib.optionalString stdenv.isAarch32 ''
+    '' + lib.optionalString stdenv.isAarch32 ''
       # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
       sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
     '';
 
     configureFlags = [ "--disable-debug" ]
-      ++ stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath"
-      ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}";
+      ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath"
+      ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}";
 
     enableParallelBuilding = true;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Unicode and globalization support library";
       homepage = "http://site.icu-project.org/";
       maintainers = with maintainers; [ raskin ];
@@ -57,10 +57,10 @@ let
 
     # FIXME: This fixes dylib references in the dylibs themselves, but
     # not in the programs in $out/bin.
-    nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     # remove dependency on bootstrap-tools in early stdenv build
-    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    postInstall = lib.optionalString stdenv.isDarwin ''
       sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
     '' + (let
       replacements = [
diff --git a/nixpkgs/pkgs/development/libraries/id3lib/default.nix b/nixpkgs/pkgs/development/libraries/id3lib/default.nix
index 6889a9f573ac..31fc4fd6ba33 100644
--- a/nixpkgs/pkgs/development/libraries/id3lib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/id3lib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib}:
+{lib, stdenv, fetchurl, zlib}:
 
 stdenv.mkDerivation {
   name = "id3lib-3.8.3";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   doCheck = false; # fails to compile
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags";
     homepage = "http://id3lib.sourceforge.net";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/idnkit/default.nix b/nixpkgs/pkgs/development/libraries/idnkit/default.nix
index da7b9f1f2711..472a23a2b74e 100644
--- a/nixpkgs/pkgs/development/libraries/idnkit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/idnkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "idnkit";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libiconv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nic.ad.jp/ja/idn/idnkit";
     description = "Provides functionalities about i18n domain name processing";
     license = "idnkit-2 license";
diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix
index 7d8015210383..b98588eb410f 100644
--- a/nixpkgs/pkgs/development/libraries/igraph/default.nix
+++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub,
-  pkgconfig, autoreconfHook,
+  pkg-config, autoreconfHook,
   flex, yacc, zlib, libxml2 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ flex yacc zlib libxml2 ];
 
   # Normally, igraph wants us to call bootstrap.sh, which will call
diff --git a/nixpkgs/pkgs/development/libraries/ijs/default.nix b/nixpkgs/pkgs/development/libraries/ijs/default.nix
index 46ed422b5409..b300731ce440 100644
--- a/nixpkgs/pkgs/development/libraries/ijs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ijs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, ghostscript }:
+{ lib, stdenv, autoreconfHook, ghostscript }:
 
 stdenv.mkDerivation {
   name = "ijs-${ghostscript.version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--enable-shared" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openprinting.org/download/ijs/";
     description = "Raster printer driver architecture";
 
diff --git a/nixpkgs/pkgs/development/libraries/iksemel/default.nix b/nixpkgs/pkgs/development/libraries/iksemel/default.nix
index 7f7645edc91f..6ba64dcaa588 100644
--- a/nixpkgs/pkgs/development/libraries/iksemel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iksemel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }:
+{ lib, stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }:
 
 stdenv.mkDerivation rec {
   pname = "iksemel";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ];
+  nativeBuildInputs = [ pkg-config autoreconfHook libtool texinfo ];
   buildInputs = [ gnutls ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XML parser for jabber";
 
     homepage = "https://github.com/timothytylee/iksemel-1.4";
diff --git a/nixpkgs/pkgs/development/libraries/ilbc/default.nix b/nixpkgs/pkgs/development/libraries/ilbc/default.nix
index 37885c767bd3..39d7b7b61b04 100644
--- a/nixpkgs/pkgs/development/libraries/ilbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ilbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gawk, cmake }:
+{ lib, stdenv, fetchurl, gawk, cmake }:
 
 stdenv.mkDerivation rec {
   name = "ilbc-rfc3951";
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ilixi/default.nix b/nixpkgs/pkgs/development/libraries/ilixi/default.nix
index 6f789174ec07..b6f1c0ac78a5 100644
--- a/nixpkgs/pkgs/development/libraries/ilixi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ilixi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }:
+{ lib, stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }:
 
 # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
 # Reflex, Wnn, NLS
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ directfb libsigcxx libxml2 fontconfig ];
 
   configureFlags = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "--with-examples"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight C++ GUI toolkit for embedded Linux systems";
     homepage = "https://github.com/ilixi/ilixi";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
index 68bd677cf777..219d961f9f96 100644
--- a/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ilmbase";
-  version = stdenv.lib.getVersion openexr;
+  version = lib.getVersion openexr;
 
   # the project no longer provides separate tarballs. We may even want to merge
   # the ilmbase package into openexr in the future.
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cd IlmBase
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics";
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/iml/default.nix b/nixpkgs/pkgs/development/libraries/iml/default.nix
index cf1d9018fd51..09ae213eb5d8 100644
--- a/nixpkgs/pkgs/development/libraries/iml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, autoreconfHook, fetchurl, gmp, blas}:
+{lib, stdenv, autoreconfHook, fetchurl, gmp, blas}:
 stdenv.mkDerivation rec {
   pname = "iml";
   version = "1.0.5";
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   ];
   meta = {
     inherit version;
-    description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers'';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html";
     updateWalker = true;
   };
diff --git a/nixpkgs/pkgs/development/libraries/imlib/default.nix b/nixpkgs/pkgs/development/libraries/imlib/default.nix
index b94af22c0a76..53612f8205fe 100644
--- a/nixpkgs/pkgs/development/libraries/imlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/imlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}:
+{lib, stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}:
 
 stdenv.mkDerivation {
   name = "imlib-1.9.15";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An image loading and rendering library for X11";
     platforms = platforms.unix;
     license = with licenses; [ gpl2 lgpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/nixpkgs/pkgs/development/libraries/imlib2/default.nix
index 458b3d29d520..666fcab989b7 100644
--- a/nixpkgs/pkgs/development/libraries/imlib2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/imlib2/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 # Image file formats
 , libjpeg, libtiff, giflib, libpng, libwebp
 # imlib2 can load images from ID3 tags.
 , libid3tag
-, freetype , bzip2, pkgconfig
+, freetype , bzip2, pkg-config
 , x11Support ? true, xlibsWrapper ? null
 }:
 
 let
-  inherit (stdenv.lib) optional;
+  inherit (lib) optional;
 in
 stdenv.mkDerivation rec {
   pname = "imlib2";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     bzip2 freetype libid3tag
   ] ++ optional x11Support xlibsWrapper;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   enableParallelBuilding = true;
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     moveToOutput bin/imlib2-config "$dev"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Image manipulation library";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/impy/default.nix b/nixpkgs/pkgs/development/libraries/impy/default.nix
index c865b25c0009..1f5d9070dd37 100644
--- a/nixpkgs/pkgs/development/libraries/impy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/impy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     SDL2
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple library for loading/saving images and animations, written in C";
     homepage = "https://github.com/bcampbell/impy";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/inchi/default.nix b/nixpkgs/pkgs/development/libraries/inchi/default.nix
index 869011007599..6acdf340c91a 100644
--- a/nixpkgs/pkgs/development/libraries/inchi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/inchi/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, stdenv, unzip }:
+{ pkgs, fetchurl, lib, stdenv, unzip }:
 stdenv.mkDerivation {
   pname = "inchi";
   version = "1.05";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       install -m 644 INCHI-1-DOC/*.pdf $doc/share
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.inchi-trust.org/";
     description = "IUPAC International Chemical Identifier library";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix
index c08d5924b0c5..67ae5623db12 100644
--- a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, tcl }:
+{ lib, stdenv, fetchurl, writeText, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "incrtcl";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     rmdir $out/bin
     mv $out/lib/itcl${version}/* $out/lib
     ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \
-      $out/lib/libitcl${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
+      $out/lib/libitcl${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
     rmdir $out/lib/itcl${version}
   '';
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://incrtcl.sourceforge.net/";
     description = "Object Oriented Enhancements for Tcl/Tk";
     license     = licenses.tcltk;
diff --git a/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix
index 6ac74988dff4..f75ade98c6d8 100644
--- a/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix
+++ b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, file
-, pkgconfig, autoconf
+, pkg-config, autoconf
 , glib, dbus-glib, json-glib
 , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xqsb6c1pwawabw854f7aybjrgyhc2r1316i9lyjspci51zk5m7v";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf ];
+  nativeBuildInputs = [ pkg-config autoconf ];
 
   buildInputs = [
     glib dbus-glib json-glib
diff --git a/nixpkgs/pkgs/development/libraries/indicator-application/gtk3.nix b/nixpkgs/pkgs/development/libraries/indicator-application/gtk3.nix
index a523019e78c2..8947e33e9001 100644
--- a/nixpkgs/pkgs/development/libraries/indicator-application/gtk3.nix
+++ b/nixpkgs/pkgs/development/libraries/indicator-application/gtk3.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchbzr
-, pkgconfig, systemd, autoreconfHook
+{ lib, stdenv, fetchbzr
+, pkg-config, systemd, autoreconfHook
 , glib, dbus-glib, json-glib
 , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
   buildInputs = [
     glib dbus-glib json-glib systemd
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/upstart
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Indicator to take menus from applications and place them in the panel";
     homepage = "https://launchpad.net/indicator-application";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/indilib/default.nix b/nixpkgs/pkgs/development/libraries/indilib/default.nix
index 1635827340e2..035356ac861a 100644
--- a/nixpkgs/pkgs/development/libraries/indilib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/indilib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , cfitsio
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "indilib";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "indilib";
     repo = "indi";
     rev = "v${version}";
-    sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz";
+    sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU=";
   };
 
   patches = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     fftw
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.indilib.org/";
     description = "Implementation of the INDI protocol for POSIX operating systems";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/inih/default.nix b/nixpkgs/pkgs/development/libraries/inih/default.nix
index 62de607f7d43..11e49f7ddc49 100644
--- a/nixpkgs/pkgs/development/libraries/inih/default.nix
+++ b/nixpkgs/pkgs/development/libraries/inih/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "inih";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "-Dwith_INIReader=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple .INI file parser in C, good for embedded systems";
     homepage = "https://github.com/benhoyt/inih";
     changelog = "https://github.com/benhoyt/inih/releases/tag/${version}";
diff --git a/nixpkgs/pkgs/development/libraries/iniparser/default.nix b/nixpkgs/pkgs/development/libraries/iniparser/default.nix
index 51c6728e8b00..8c7fdfd04d6b 100644
--- a/nixpkgs/pkgs/development/libraries/iniparser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iniparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "iniparser";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = ./no-usr.patch;
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile \
         --replace -Wl,-soname= -Wl,-install_name,
   '';
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     ln -s libiniparser.so.1 $out/lib/libiniparser.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Free standalone ini file parsing library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
index 30d572853cfd..28138f103b9d 100644
--- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake
 }:
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "20.3.3";
+  version = "20.4.1";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
     rev    = "${pname}-${version}";
-    sha256 = "1diq1gqpfv5bawvag6bzwnd3ilhacwmwx3bl67abjvbb0m3jw4lk";
+    sha256 = "0qb0wpinfv8lg1pq1pxkl6v0kd8ax86m8zxzm6zjx91alsch1mi6";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/intel/gmmlib";
     license = licenses.mit;
     description = "Intel Graphics Memory Management Library";
+    longDescription = ''
+      The Intel(R) Graphics Memory Management Library provides device specific
+      and buffer management for the Intel(R) Graphics Compute Runtime for
+      OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
+    '';
     platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ primeos ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
index 153e41a777cc..6e62484ac681 100644
--- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, pkg-config
-, libva, libpciaccess, intel-gmmlib, libX11
+, libva, libpciaccess, intel-gmmlib
+, enableX11 ? true, libX11
 }:
 
 stdenv.mkDerivation rec {
   pname = "intel-media-driver";
-  version = "20.4.5";
+  version = "21.1.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "media-driver";
     rev    = "intel-media-${version}";
-    sha256 = "149xkhhp8q06c1jzxjs24lnbfrlvf19m0hcwld593vv4arfpbpmf";
+    sha256 = "17cgs52f42jdvfb6q3wpkxaz2b41z59jdribpgb9qmcvizsnglxc";
   };
 
   cmakeFlags = [
@@ -23,9 +24,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
+  buildInputs = [ libva libpciaccess intel-gmmlib ]
+    ++ lib.optional enableX11 libX11;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
     longDescription = ''
       The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API)
@@ -38,4 +40,9 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos jfrankenau ];
   };
+
+  postFixup = lib.optionalString enableX11 ''
+    patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11  ]}" \
+      $out/lib/dri/iHD_drv_video.so
+  '';
 }
diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix
index 71e6d3d700ab..dd605aaae5cd 100644
--- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11
 , libXau, libXdmcp, libpthreadstubs }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [
     libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs
   ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel Media SDK";
     license = licenses.mit;
     maintainers = with maintainers; [ midchildan ];
diff --git a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
index 8387aa67161b..23801d3436da 100644
--- a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "ip2location-c";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # databases are available, downloading them for just 1 test seems excessive):
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to look up locations of host names and IP addresses";
     longDescription = ''
       A C library to find the country, region, city,coordinates,
diff --git a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
index 84e7fae60450..e283a2909474 100644
--- a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
+++ b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
+{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
 
 let
   common = import ./common.nix { inherit fetchzip; };
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://irrlicht.sourceforge.net/";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix b/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix
index 5f8335efab2b..b41486ce9dd6 100644
--- a/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix
+++ b/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
+{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
 
 let
   common = import ./common.nix { inherit fetchzip; };
@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
   version = common.version;
 
   src = fetchFromGitHub {
-		owner = "quiark";
-		repo = "IrrlichtCMake";
-		rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
-		sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
+    owner = "quiark";
+    repo = "IrrlichtCMake";
+    rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
+    sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
   };
 
   postUnpack = ''
     cp -r ${common.src}/* $sourceRoot/
     chmod -R 777 $sourceRoot
-	'';
+  '';
 
   patches = [ ./mac_device.patch ];
   dontFixCmake = true;
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://irrlicht.sourceforge.net/";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
-    platforms = stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix b/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix
index 1cac0d369fed..5beffd1f0d2e 100644
--- a/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation {
   name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://www.kotnet.org/~skimo/isl/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/isl/0.14.1.nix b/nixpkgs/pkgs/development/libraries/isl/0.14.1.nix
index a97e05b0431a..8936d6c5f3be 100644
--- a/nixpkgs/pkgs/development/libraries/isl/0.14.1.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.14.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   name = "isl-0.14.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://www.kotnet.org/~skimo/isl/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/isl/0.17.1.nix b/nixpkgs/pkgs/development/libraries/isl/0.17.1.nix
index 018f70850881..a823b69fa27b 100644
--- a/nixpkgs/pkgs/development/libraries/isl/0.17.1.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.17.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   name = "isl-0.17.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://www.kotnet.org/~skimo/isl/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/isl/0.20.0.nix b/nixpkgs/pkgs/development/libraries/isl/0.20.0.nix
index 3775bdc71e02..c35588555a7f 100644
--- a/nixpkgs/pkgs/development/libraries/isl/0.20.0.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.20.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   name = "isl-0.20";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://isl.gforge.inria.fr/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix
index 8ba9ea31b801..6d770430ce56 100644
--- a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext, python3}:
+{lib, stdenv, fetchurl, gettext, python3}:
 
 stdenv.mkDerivation rec {
   pname = "iso-codes";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://salsa.debian.org/iso-codes-team/iso-codes";
     description = "Various ISO codes packaged as XML files";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/itk/4.x.nix b/nixpkgs/pkgs/development/libraries/itk/4.x.nix
index 112b77650d29..54a3c33cd017 100644
--- a/nixpkgs/pkgs/development/libraries/itk/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/itk/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }:
+{ lib, stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname = "itk";
@@ -22,16 +22,14 @@ stdenv.mkDerivation rec {
     "-DModule_ITKReview=ON"
   ];
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake xz ];
-  buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   meta = {
     description = "Insight Segmentation and Registration Toolkit";
     homepage = "https://www.itk.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/itk/default.nix b/nixpkgs/pkgs/development/libraries/itk/default.nix
index c0416b23dc22..ac899ce26f10 100644
--- a/nixpkgs/pkgs/development/libraries/itk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/itk/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper
-, pkgconfig, libX11, libuuid, xz, vtk_7, Cocoa }:
+{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper
+, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname = "itk";
@@ -28,19 +28,17 @@ stdenv.mkDerivation rec {
     "-DModule_ITKReview=ON"
   ];
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake xz makeWrapper ];
-  buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   postInstall = ''
-    wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin"
+    wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
   '';
 
   meta = {
     description = "Insight Segmentation and Registration Toolkit";
     homepage = "https://www.itk.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [viric];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/itktcl/default.nix b/nixpkgs/pkgs/development/libraries/itktcl/default.nix
index 3c70369eb91e..570190a43c1e 100644
--- a/nixpkgs/pkgs/development/libraries/itktcl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/itktcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, tk, incrtcl }:
+{ lib, stdenv, fetchurl, tcl, tk, incrtcl }:
 
 stdenv.mkDerivation rec {
   pname = "itk-tcl";
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
     rmdir $out/bin
     mv $out/lib/itk${version}/* $out/lib
     ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \
-      $out/lib/libitk${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
+      $out/lib/libitk${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
     rmdir $out/lib/itk${version}
   '';
 
   outputs = [ "out" "dev" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://incrtcl.sourceforge.net/";
     description = "Mega-widget toolkit for incr Tk";
     license     = licenses.tcltk;
diff --git a/nixpkgs/pkgs/development/libraries/jabcode/default.nix b/nixpkgs/pkgs/development/libraries/jabcode/default.nix
index c875e4a39435..36c4c8c61c53 100644
--- a/nixpkgs/pkgs/development/libraries/jabcode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jabcode/default.nix
@@ -3,7 +3,7 @@
 , lib
 , subproject ? "library" # one of "library", "reader" or  "writer"
 , zlib, libpng, libtiff
-, jabcode 
+, jabcode
 }:
 let
   subdir = lib.getAttr subproject {
diff --git a/nixpkgs/pkgs/development/libraries/jama/default.nix b/nixpkgs/pkgs/development/libraries/jama/default.nix
index 5c7473be647a..02dd4a5635b5 100644
--- a/nixpkgs/pkgs/development/libraries/jama/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jama/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, tnt}:
+{lib, stdenv, fetchurl, unzip, tnt}:
 
 stdenv.mkDerivation rec {
   pname = "jama";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       cp *.h $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://math.nist.gov/tnt/";
     description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/jansson/default.nix b/nixpkgs/pkgs/development/libraries/jansson/default.nix
index 7ecf7579a307..85451511d7e4 100644
--- a/nixpkgs/pkgs/development/libraries/jansson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jansson/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "jansson-2.13.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.digip.org/jansson/";
     description = "C library for encoding, decoding and manipulating JSON data";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix
index 4a2b030a3dbf..9d34aaf6c8e9 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   version = "5.2";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-bcel/";
     description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
index 46bd3c0fd155..629ab7ec131a 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "commons-bsf-1.2";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Interface to scripting languages, including JSR-223";
     homepage = "http://commons.apache.org/proper/commons-bsf/";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix
index 5307c635834c..79f63026e388 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "1.20";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-compress";
     description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix
index cd439b503971..868f2da4e537 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   version = "1.3.1";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-fileupload";
     description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix
index 10587a72ecda..0c5ac8f4dded 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "2.8.0";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-io";
     description = "A library of utilities to assist with developing IO functionality";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix
index bd0f7c273e79..5009fe6cac7f 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "3.11";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-lang";
     description = "Provides additional methods to manipulate standard Java library classes";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
index 7c2192e4952e..d63a214e2ad7 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "commons-logging-1.2";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Wrapper around a variety of logging API implementations";
     homepage = "http://commons.apache.org/proper/commons-logging";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix
index 7c4fc5c632e2..960f12fb8bfb 100644
--- a/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "3.6.1";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-math/";
     description = "A library of lightweight, self-contained mathematics and statistics components";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/cup/default.nix b/nixpkgs/pkgs/development/libraries/java/cup/default.nix
index acf8cc9b83d9..f7732ff637af 100644
--- a/nixpkgs/pkgs/development/libraries/java/cup/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/cup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, ant } :
+{ lib, stdenv, fetchurl, jdk, ant } :
 
 stdenv.mkDerivation rec {
   pname = "java-cup";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www2.cs.tum.edu/projects/cup/";
     description = "LALR parser generator for Java";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
index 0133138b4784..9fbcf8b020ce 100644
--- a/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
+{lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
 
 let jdk = jdk8; in
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
   JAVA_HOME=jdk;
   JAVA="${jdk}/bin/java";
-  PREFIX=''''${out}'';
+  PREFIX="\${out}";
   JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni";
   JAVAUNIXJARDIR="${libmatthew_java}/share/java";
   buildInputs = [ gettext jdk ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
            -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.sander ];
     license = licenses.afl21;
diff --git a/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
index 6d4dfbfe61c6..4d9902cbbe9a 100644
--- a/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jdk, unzip}:
+{lib, stdenv, fetchurl, jdk, unzip}:
 
 stdenv.mkDerivation {
   name = "GeoIPJava-1.2.5";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
   };
   buildInputs = [ jdk unzip ];
-  buildPhase = 
+  buildPhase =
     ''
       cd source
       javac $(find . -name \*.java)
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
     '';
   meta = {
     description = "GeoIP Java API";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.sander ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix
index 37d7cac0da26..34a0e8c530a4 100644
--- a/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "gwt-dnd-2.6.5";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.unix;
     license = licenses.asl20;
   };
diff --git a/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix b/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix
index a968ebc5fd8e..692326a21895 100644
--- a/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "gwt-widgets-0.2.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.unix;
     license = with licenses; [ afl21 lgpl2 ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix
index 88f32866b0d0..32b000622391 100644
--- a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, unzip, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   pname = "hsqldb";
   version = "2.5.1";
-  underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version);
+  underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
 
   src = fetchurl {
     url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://hsqldb.org";
     description = "A relational, embedable database management system written in Java and a set of related tools";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix b/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix
index 34af97605d2a..ad276fcdd636 100644
--- a/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip} :
+{lib, stdenv, fetchurl, unzip} :
 
 stdenv.mkDerivation {
   name = "httpunit-1.7";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   inherit unzip;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://httpunit.sourceforge.net";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 54e85ec55897..19bc3524c590 100644
--- a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, stdenv, ant, jdk }:
+{ fetchgit, lib, stdenv, ant, jdk }:
 
 stdenv.mkDerivation {
   pname = "hydra-ant-logger";
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/jdom/default.nix b/nixpkgs/pkgs/development/libraries/java/jdom/default.nix
index 60558f72cfc8..4bb90dd98874 100644
--- a/nixpkgs/pkgs/development/libraries/java/jdom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/jdom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{lib, stdenv, fetchurl} :
 
 stdenv.mkDerivation {
   name = "jdom-1.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code";
     homepage = "http://www.jdom.org";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/java/jflex/default.nix b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
index d0258d5896be..cf5b42a0ac21 100644
--- a/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre} :
+{lib, stdenv, fetchurl, jre} :
 
 stdenv.mkDerivation rec {
   name = "jflex-1.8.2";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.jflex.de/";
     description = "Lexical analyzer generator for Java, written in Java";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/junit/default.nix b/nixpkgs/pkgs/development/libraries/java/junit/default.nix
index c114ddeac274..1695d11cb25f 100644
--- a/nixpkgs/pkgs/development/libraries/java/junit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/junit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, antBuild, fetchgit, perl }:
+{ lib, stdenv, antBuild, fetchgit, perl }:
 
 let
   version = "4.11";
@@ -22,7 +22,7 @@ in antBuild {
   meta = {
     homepage = "http://www.junit.org/";
     description = "A framework for repeatable tests in Java";
-    license = stdenv.lib.licenses.epl10;
+    license = lib.licenses.epl10;
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix
index cb88df276a57..7a7d6a933bc0 100644
--- a/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ant, jdk, junit }:
+{ lib, stdenv, fetchurl, ant, jdk, junit }:
 
 stdenv.mkDerivation rec {
   name = "junixsocket-1.3";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
     (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
     ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true";
+    ++ lib.optional stdenv.isDarwin "-DisMac=true";
 
   installPhase =
     ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Java/JNI library for using Unix Domain Sockets from Java";
     homepage = "https://github.com/kohlschutter/junixsocket";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix b/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
index 8b8123dff2b3..a3cdaa37ed06 100644
--- a/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jdk}:
+{lib, stdenv, fetchurl, jdk}:
 
 stdenv.mkDerivation {
   name = "libmatthew-java-0.8";
@@ -7,10 +7,10 @@ stdenv.mkDerivation {
     sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85";
   };
   JAVA_HOME=jdk;
-  PREFIX=''''${out}'';
+  PREFIX="\${out}";
   buildInputs = [ jdk ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.sander ];
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
index 6d09bead53e4..ddf95ead249a 100644
--- a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
   name = "lombok-1.18.16";
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A library that can write a lot of boilerplate for your Java project";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.mit;
+    platforms = lib.platforms.all;
+    license = lib.licenses.mit;
     homepage = "https://projectlombok.org/";
-    maintainers = [ stdenv.lib.maintainers.CrystalGamma ];
+    maintainers = [ lib.maintainers.CrystalGamma ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/lucene/default.nix b/nixpkgs/pkgs/development/libraries/java/lucene/default.nix
index c0eabe51657d..417c7b969000 100644
--- a/nixpkgs/pkgs/development/libraries/java/lucene/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/lucene/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{lib, stdenv, fetchurl} :
 
 stdenv.mkDerivation rec {
   pname = "lucene";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Java full-text search engine";
     platforms = platforms.unix;
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
index 817c861436f8..e20d7e707e71 100644
--- a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{lib, stdenv, fetchurl} :
 
 stdenv.mkDerivation {
   name = "mockobjects-0.09";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic unit testing framework and methodology for testing any kind of code";
     platforms = platforms.unix;
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
index d3d10f61b70f..d34787d8b1f0 100644
--- a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unzip, ant, javac, jvm }:
+{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }:
 
 let
   version = "1.7R2";
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
       cp -v *.jar "$out/share/java"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of JavaScript written in Java";
 
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/java/saxon/default.nix b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix
index ef403be60df4..e6f2fcadbe75 100644
--- a/nixpkgs/pkgs/development/libraries/java/saxon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, unzip, jre }:
+{ lib, stdenv, fetchurl, unzip, jre }:
 
 let
   common = { pname, version, src, description
-           , prog ? null, jar ? null, license ? stdenv.lib.licenses.mpl20 }:
+           , prog ? null, jar ? null, license ? lib.licenses.mpl20 }:
     stdenv.mkDerivation {
       name = "${pname}-${version}";
       inherit pname version src;
@@ -26,7 +26,7 @@ let
         chmod a+x $out/bin/${prog'}
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         inherit description license;
         homepage = "http://saxon.sourceforge.net/";
         maintainers = with maintainers; [ rvl ];
@@ -44,7 +44,7 @@ in {
     };
     description = "XSLT 1.0 processor";
     # http://saxon.sourceforge.net/saxon6.5.3/conditions.html
-    license = stdenv.lib.licenses.mpl10;
+    license = lib.licenses.mpl10;
   };
 
   saxonb_8_8 = common {
diff --git a/nixpkgs/pkgs/development/libraries/java/smack/default.nix b/nixpkgs/pkgs/development/libraries/java/smack/default.nix
index c1d41e7743d5..f831bfc8b933 100644
--- a/nixpkgs/pkgs/development/libraries/java/smack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/smack/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "smack-4.1.9";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A XMPP (Jabber) client library for instant messaging and presence";
     homepage = "http://www.igniterealtime.org/projects/smack/";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/java/swt/default.nix b/nixpkgs/pkgs/development/libraries/java/swt/default.nix
index b96c91713248..bf35490f9a88 100644
--- a/nixpkgs/pkgs/development/libraries/java/swt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/swt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
+{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2
 , libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg
 , pango, gdk-pixbuf, glib
 }:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ unzip pkgconfig ];
+  nativeBuildInputs = [ unzip pkg-config ];
   buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
 
   NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) +
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
     cd out && jar -c * > $out/jars/swt.jar
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.eclipse.org/swt/";
     description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented";
     license = licenses.epl10;
diff --git a/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix
index 4004c9f387ef..6f9d88d63666 100644
--- a/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, autoreconfHook }:
+{ lib, stdenv, fetchurl, python3, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "jbig2dec";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.jbig2dec.com/";
     description = "Decoder implementation of the JBIG2 image compression format";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/jbigkit/default.nix b/nixpkgs/pkgs/development/libraries/jbigkit/default.nix
index c21d51bc5a7c..ab55e76f29a3 100644
--- a/nixpkgs/pkgs/development/libraries/jbigkit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jbigkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "jbigkit-2.1";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
-    "AR=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
-    "RANLIB=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
+    "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
+    "RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
   ];
 
   postPatch = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
     description = "A software implementation of the JBIG1 data compression standard";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/jcal/default.nix b/nixpkgs/pkgs/development/libraries/jcal/default.nix
index a40de74037a2..2b57bd4064b7 100644
--- a/nixpkgs/pkgs/development/libraries/jcal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jcal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , readline
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   preAutoreconf = "cd sources/";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system";
     homepage =  "http://nongnu.org/jcal/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/jemalloc/common.nix b/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
index fc4f0f2fe6e8..d5fe07b00f2a 100644
--- a/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
+++ b/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
@@ -1,5 +1,5 @@
 { version, sha256 }:
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
 # then stops downstream builds (mariadb in particular) from detecting it. This
 # option should remove the prefix and give us a working jemalloc.
@@ -9,7 +9,7 @@
 , disableInitExecTls ? false
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "jemalloc";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://jemalloc.net";
     description = "General purpose malloc(3) implementation";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/jemalloc/jemalloc450.nix b/nixpkgs/pkgs/development/libraries/jemalloc/jemalloc450.nix
index d328ab8016a1..85b4fb100f74 100644
--- a/nixpkgs/pkgs/development/libraries/jemalloc/jemalloc450.nix
+++ b/nixpkgs/pkgs/development/libraries/jemalloc/jemalloc450.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
   version = "4.5.0";
   sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
-} 
+}
diff --git a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix
index 4cafa7434b12..11f6141872db 100644
--- a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "jitterentropy";
   version = "2.2.0";
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides a noise source using the CPU execution timing jitter";
     homepage = "https://github.com/smuellerDD/jitterentropy-library";
-    license = with stdenv.lib.licenses; [ gpl2 bsd3 ];
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
+    license = with lib.licenses; [ gpl2 bsd3 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/jose/default.nix b/nixpkgs/pkgs/development/libraries/jose/default.nix
index 4c3095681ed0..b15fead62699 100644
--- a/nixpkgs/pkgs/development/libraries/jose/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jose/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , zlib, jansson, openssl
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ zlib jansson openssl ];
 
   outputs = [ "out" "dev" "man" ];
diff --git a/nixpkgs/pkgs/development/libraries/json-c/default.nix b/nixpkgs/pkgs/development/libraries/json-c/default.nix
index d72d50214348..5a77ea789afe 100644
--- a/nixpkgs/pkgs/development/libraries/json-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/json-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "json-c";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JSON implementation in C";
     homepage    = "https://github.com/json-c/json-c/wiki";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/nixpkgs/pkgs/development/libraries/json-glib/default.nix
index f89d4bc45341..a820d947b7f8 100644
--- a/nixpkgs/pkgs/development/libraries/json-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/json-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext
+{ lib, stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext
 , gobject-introspection, fixDarwinDylibNames, gnome3
 }:
 
@@ -9,13 +9,13 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j";
   };
 
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   outputs = [ "out" "dev" ];
 
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
     homepage = "https://wiki.gnome.org/Projects/JsonGlib";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
index 73aaaec4e4c4..71b0d7b9a922 100644
--- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "jsoncpp";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     homepage = "https://github.com/open-source-parsers/jsoncpp";
     description = "A C++ library for interacting with JSON";
diff --git a/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix b/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix
index 61f357689c4d..1ec9c3da41e2 100644
--- a/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
+{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 stdenv.mkDerivation rec {
   pname = "jsonrpc-glib";
   version = "3.38.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
   buildInputs = [ glib json-glib ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI=";
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to communicate using the JSON-RPC 2.0 specification";
     homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/judy/default.nix b/nixpkgs/pkgs/development/libraries/judy/default.nix
index ad422db3d48e..037225b86e5b 100644
--- a/nixpkgs/pkgs/development/libraries/judy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/judy/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "judy-1.0.5";
@@ -10,14 +10,14 @@ stdenv.mkDerivation {
 
   # gcc 4.8 optimisations break judy.
   # https://sourceforge.net/p/judy/mailman/message/31995144/
-  preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
+  preConfigure = lib.optionalString stdenv.cc.isGNU ''
     configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
   '';
 
   meta = {
     homepage = "http://judy.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     description = "State-of-the-art C library that implements a sparse dynamic array";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
index f0f5b9d77934..78cc48d82097 100644
--- a/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python }:
+{ lib, stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
   pname = "jxrlib";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
   };
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile \
       --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \
       --replace '.so' '.dylib'
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the JPEG XR image codec standard";
     homepage = "https://jxrlib.codeplex.com";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index 645d05afc2be..0aa400c644d6 100644
--- a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, cmake, pkgconfig }:
+{ mkDerivation, lib, cmake, pkg-config }:
 
 mkDerivation {
   name = "extra-cmake-modules";
@@ -9,7 +9,7 @@ mkDerivation {
 
   outputs = [ "out" ];  # this package has no runtime components
 
-  propagatedBuildInputs = [ cmake pkgconfig ];
+  propagatedBuildInputs = [ cmake pkg-config ];
 
   setupHook = ./setup-hook.sh;
 
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
index f4fc40f6d31d..751e3d7b73f1 100644
--- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations }:
+{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }:
 
 mkDerivation {
   name = "kirigami2";
@@ -6,6 +6,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase qtquickcontrols2 qttranslations ];
+  buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ];
   outputs = [ "out" "dev" ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
index 2eb9262d189e..804749bbdb53 100644
--- a/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex
 , texinfo, perlPackages
 , openldap, libcap_ng, sqlite, openssl, db, libedit, pam
 , CoreFoundation, Security, SystemConfiguration
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "heimdal";
   version = "7.7.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./heimdal-make-missing-headers.patch ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ]
+  nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ]
     ++ (with perlPackages; [ JSON ]);
   buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
     ++ [ db sqlite openssl libedit openldap pam]
diff --git a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
index 004d7d2227c1..5ef9e496b94d 100644
--- a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
+++ b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds
+{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds
 , openssl, openldap, libedit, keyutils
 
 # Extra Arguments
@@ -16,7 +16,7 @@
 let
   libOnly = type == "lib";
 in
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
   majorVersion = "1.18"; # remove patches below with next upgrade
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
          "ac_cv_printf_positional=yes"
        ];
 
-  nativeBuildInputs = [ pkgconfig perl ]
+  nativeBuildInputs = [ pkg-config perl ]
     ++ optional (!libOnly) yacc
     # Provides the mig command used by the build scripts
     ++ optional stdenv.isDarwin bootstrap_cmds;
diff --git a/nixpkgs/pkgs/development/libraries/keybinder/default.nix b/nixpkgs/pkgs/development/libraries/keybinder/default.nix
index e3084b9733e4..663abb152804 100644
--- a/nixpkgs/pkgs/development/libraries/keybinder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/keybinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3
 , gtk-doc, gtk2, python2Packages, lua, gobject-introspection
 }:
 
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     autoconf automake libtool gnome3.gnome-common gtk-doc gtk2
     python pygtk lua gobject-introspection
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
     ./autogen.sh --prefix="$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for registering global key bindings";
     longDescription = ''
       keybinder is a library for registering global keyboard shortcuts.
diff --git a/nixpkgs/pkgs/development/libraries/keybinder3/default.nix b/nixpkgs/pkgs/development/libraries/keybinder3/default.nix
index 1c8dbfdcd818..e291ec56bb21 100644
--- a/nixpkgs/pkgs/development/libraries/keybinder3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/keybinder3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3
 , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
   buildInputs = [
     gnome3.gnome-common gtk-doc gtk3
     libX11 libXext libXrender gobject-introspection
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh --prefix="$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for registering global key bindings";
     homepage = "https://github.com/kupferlauncher/keybinder/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/keystone/default.nix b/nixpkgs/pkgs/development/libraries/keystone/default.nix
index 869d7ae1b02d..70864bcf24a9 100644
--- a/nixpkgs/pkgs/development/libraries/keystone/default.nix
+++ b/nixpkgs/pkgs/development/libraries/keystone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pkg-config
 , cmake
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight multi-platform, multi-architecture assembler framework";
     homepage = "https://www.keystone-engine.org";
     license = licenses.gpl2Only;
diff --git a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
index a42f1c0a513c..f4688f34982c 100644
--- a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
+{ lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
 
 stdenv.mkDerivation rec {
   name = "khronos-ocl-icd-loader-${version}";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
   };
 
-  patches = stdenv.lib.lists.optional withTracing ./tracing.patch;
+  patches = lib.lists.optional withTracing ./tracing.patch;
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ opencl-headers ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Offical Khronos OpenCL ICD Loader";
     homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/kissfft/default.nix b/nixpkgs/pkgs/development/libraries/kissfft/default.nix
index 370f628ff7a8..5395ac4ab9c1 100644
--- a/nixpkgs/pkgs/development/libraries/kissfft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kissfft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     "DATATYPE=double"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A mixed-radix Fast Fourier Transform based up on the KISS principle";
     homepage = "https://github.com/mborgerding/kissfft";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
index 5bd311af2d85..65dce915f144 100644
--- a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm
 , withPython ? false, python }:
 
 stdenv.mkDerivation {
@@ -13,14 +13,12 @@ stdenv.mkDerivation {
     sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh";
   };
 
-  enableParallelBuilding = true;
+  cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
 
-  cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
-
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libdrm python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
     homepage = "https://github.com/tomba/kmsxx";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
index 1c00b6be2f20..837333407b29 100644
--- a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
@@ -24,9 +24,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ extra-cmake-modules ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with lib.maintainers; [ peterhoeg ];
     # The build requires at least Qt 5.14:
     broken = lib.versionOlder qtbase.version "5.14";
diff --git a/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix b/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix
index 9c360ce0531d..4e8aa57d9568 100644
--- a/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "kyotocabinet-1.2.76";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1";
   };
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace kccommon.h \
       --replace tr1/unordered_map unordered_map \
       --replace tr1/unordered_set unordered_set \
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://fallabs.com/kyotocabinet";
     description = "A library of routines for managing a database";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/l-smash/default.nix b/nixpkgs/pkgs/development/libraries/l-smash/default.nix
index 34dab6bb3ff4..b1b5fd012062 100644
--- a/nixpkgs/pkgs/development/libraries/l-smash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/l-smash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which }:
+{ lib, stdenv, fetchFromGitHub, which }:
 
 stdenv.mkDerivation rec {
   pname = "l-smash";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://l-smash.github.io/l-smash/";
     description = "MP4 container utilities";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/lame/default.nix b/nixpkgs/pkgs/development/libraries/lame/default.nix
index da3784100ab6..8ed0962bece8 100644
--- a/nixpkgs/pkgs/development/libraries/lame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , nasmSupport ? true, nasm ? null # Assembly optimizations
 , cpmlSupport ? true # Compaq's fast math library
 #, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging
@@ -20,7 +20,7 @@ let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "lame";
   version = "3.100";
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix b/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix
index 4829d67de45a..a44535fbf90e 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
 , libxml2, icu
 , languageMachines
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frog-v${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2 icu
                   languageMachines.ticcutils
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     make check
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
     homepage    = "https://languagemachines.github.io/frog";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix b/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix
index 196a697d8f6f..7e890a8d09c9 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, libtool, pkg-config, autoconf-archive
 }:
 
 let
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frogdata-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf libtool autoconf-archive
                 ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     sh bootstrap.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
     homepage    = "https://languagemachines.github.io/frog";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix
index 852615cbf3b2..fc5e622bcf4f 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, icu, bzip2, libtar
 , languageMachines }:
 
@@ -12,14 +12,14 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "libfolia-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
   preConfigure = "sh bootstrap.sh";
 
   # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
   CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format.";
     homepage    = "https://proycon.github.io/folia/";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix b/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix
index 9477abeef3fc..efa9ada7d56c 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
 , libxml2
 , languageMachines
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "mbt-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2
                   languageMachines.ticcutils
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     sh bootstrap.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Memory Based Tagger";
     homepage    = "https://languagemachines.github.io/mbt/";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix b/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix
index 8676e08e4174..c09f00b1160b 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, zlib, bzip2, libtar }:
 
 let
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ticcutils-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf libtool autoconf-archive libxml2
                   # optional:
                   zlib bzip2 libtar
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
                 ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This module contains useful functions for general use in the TiCC software stack and beyond.";
     homepage    = "https://github.com/LanguageMachines/ticcutils";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix
index b912ed97bd5a..de22c41ec497 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, bzip2, libtar
 , languageMachines
 }:
@@ -13,14 +13,14 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timbl-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2
                   languageMachines.ticcutils
                 ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "TiMBL implements several memory-based learning algorithms";
     homepage    = "https://github.com/LanguageMachines/timbl/";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix b/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix
index e0634103a7ee..27812e8b3f05 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
 , libxml2
 , languageMachines
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timblserver-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2
                   languageMachines.ticcutils
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
                 ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This server for TiMBL implements several memory-based learning algorithms";
     homepage    = "https://github.com/LanguageMachines/timblserver/";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix
index d60ff5fa2460..d8c8d99552c8 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, icu, bzip2, libtar
 , languageMachines
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ucto-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf bzip2 libtool autoconf-archive
                   icu libtar libxml2
                   languageMachines.ticcutils
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     done;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A rule-based tokenizer for natural language";
     homepage    = "https://languagemachines.github.io/ucto/";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix b/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix
index 29eaf78b75a8..cad636227249 100644
--- a/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+{ lib, stdenv, fetchurl
+, automake, autoconf, libtool, pkg-config, autoconf-archive
  }:
 
 let
@@ -11,11 +11,11 @@ stdenv.mkDerivation {
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "uctodata-${release.version}.tar.gz"; };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf libtool autoconf-archive ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A rule-based tokenizer for natural language";
     homepage    = "https://languagemachines.github.io/ucto/";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/lasem/default.nix b/nixpkgs/pkgs/development/libraries/lasem/default.nix
index b3742514ced6..22f0436edca9 100644
--- a/nixpkgs/pkgs/development/libraries/lasem/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lasem/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk-pixbuf
+{ fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf
 , libxml2, cairo, pango, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
+  nativeBuildInputs = [ pkg-config intltool gobject-introspection ];
 
   propagatedBuildInputs = [
     glib gdk-pixbuf libxml2 cairo pango
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     description = "SVG and MathML rendering library";
 
     homepage = "https://wiki.gnome.org/Projects/Lasem";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/lasso/default.nix b/nixpkgs/pkgs/development/libraries/lasso/default.nix
index c79b4a51262a..24efa689c581 100644
--- a/nixpkgs/pkgs/development/libraries/lasso/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lasso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:
+{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }:
 
 stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
 
   configurePhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                 --prefix=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lasso.entrouvert.org/";
     description = "Liberty Alliance Single Sign-On library";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/lcms/default.nix b/nixpkgs/pkgs/development/libraries/lcms/default.nix
index 8fe2484facaf..9a957a119243 100644
--- a/nixpkgs/pkgs/development/libraries/lcms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lcms/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "lcms";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Color management engine";
     homepage = "http://www.littlecms.com/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/nixpkgs/pkgs/development/libraries/lcms2/default.nix
index 6e81dfc0718a..129b57851989 100644
--- a/nixpkgs/pkgs/development/libraries/lcms2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lcms2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtiff, libjpeg, zlib }:
+{ lib, stdenv, fetchurl, libtiff, libjpeg, zlib }:
 
 stdenv.mkDerivation rec {
   name = "lcms2-2.11";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # See https://trac.macports.org/ticket/60656
   LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Color management engine";
     homepage = "http://www.littlecms.com/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
index 36a0c8e1316b..36092507b8ae 100644
--- a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AOSP libldac dispatcher";
     homepage    = "https://github.com/EHfive/ldacBT";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix
index 9810234eefa6..ba035eed05bc 100644
--- a/nixpkgs/pkgs/development/libraries/ldb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python3
 , pkg-config
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   stripDebugList = [ "bin" "lib" "modules" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A LDAP-like embedded database";
     homepage = "https://ldb.samba.org/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/ldns/default.nix b/nixpkgs/pkgs/development/libraries/ldns/default.nix
index f64d263901bd..5873e707e7cc 100644
--- a/nixpkgs/pkgs/development/libraries/ldns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, perl, which, dns-root-data }:
+{ lib, stdenv, fetchurl, openssl, perl, which, dns-root-data }:
 
 stdenv.mkDerivation rec {
   pname = "ldns";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--with-drill"
     "--disable-gost"
     "--with-examples"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     moveToOutput "bin/ldns-config" "$dev"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library with the aim of simplifying DNS programming in C";
     license = licenses.bsd3;
     homepage = "http://www.nlnetlabs.nl/projects/ldns/";
diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix
index a1de88ef1ca4..8a9c80a61754 100644
--- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
+{ lib, stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
 
 stdenv.mkDerivation rec {
   pname = "leatherman";
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost curl ruby ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/puppetlabs/leatherman/";
     description = "A collection of C++ and CMake utility libraries";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/lensfun/default.nix b/nixpkgs/pkgs/development/libraries/lensfun/default.nix
index 830facc56720..23675c9f9f89 100644
--- a/nixpkgs/pkgs/development/libraries/lensfun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lensfun/default.nix
@@ -1,24 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, cmake }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }:
 
-stdenv.mkDerivation rec {
+let
   version = "0.3.95";
   pname = "lensfun";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
+  # Fetch a more recent version of the repo containing a more recent lens
+  # database
+  lensfunDatabase = fetchFromGitHub {
+    owner = "lensfun";
+    repo = "lensfun";
+    rev = "4672d765a17bfef7bc994ca7008cb717c61045d5";
+    sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+in
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "lensfun";
+    repo = "lensfun";
+    rev = "v${version}";
+    sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r";
+  };
+
+  # replace database with a more recent snapshot
+  postUnpack = ''
+    rm -R source/data/db
+    cp -R ${lensfunDatabase}/data/db source/data
+  '';
+
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ glib zlib libpng ];
 
-  configureFlags = [ "-v" ];
+  cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ enzime ];
-    license = stdenv.lib.licenses.lgpl3;
+    maintainers = with maintainers; [ flokli ];
+    license = lib.licenses.lgpl3;
     description = "An opensource database of photographic lenses and their characteristics";
-    homepage = "http://lensfun.sourceforge.net/";
+    homepage = "https://lensfun.github.io";
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/nixpkgs/pkgs/development/libraries/leptonica/default.nix
index a0f0814fec53..11f1c7fd9c67 100644
--- a/nixpkgs/pkgs/development/libraries/leptonica/default.nix
+++ b/nixpkgs/pkgs/development/libraries/leptonica/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, which, gnuplot
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot
 , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ];
   enableParallelBuilding = true;
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Image processing and analysis library";
     homepage = "http://www.leptonica.org/";
-    license = stdenv.lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/lesstif/default.nix b/nixpkgs/pkgs/development/libraries/lesstif/default.nix
index 6e68a9128d0d..d0ba47186559 100644
--- a/nixpkgs/pkgs/development/libraries/lesstif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lesstif/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
+{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
 
 stdenv.mkDerivation rec {
   name = "lesstif-0.95.2";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     ./c-xpmpipethrough.patch
     ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open source clone of the Motif widget set";
     homepage = "http://lesstif.sourceforge.net";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/nixpkgs/pkgs/development/libraries/leveldb/default.nix
index 14d426701ba3..0a1dabef328c 100644
--- a/nixpkgs/pkgs/development/libraries/leveldb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/leveldb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }:
 
 stdenv.mkDerivation rec {
   pname = "leveldb";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ snappy ];
 
   nativeBuildInputs = []
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildPhase = ''
     make all
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     cp out-static/leveldbutil $out/bin
   ";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/leveldb";
     description = "Fast and lightweight key/value database library by Google";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/levmar/default.nix b/nixpkgs/pkgs/development/libraries/levmar/default.nix
index e8ef17081c9f..c5d6877a8446 100644
--- a/nixpkgs/pkgs/development/libraries/levmar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/levmar/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl }:
-        
+{ lib, stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "levmar-2.6";
 
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
     cp liblevmar.a $out/lib
   '';
 
-  meta = { 
+  meta = {
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
     homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/lib3ds/default.nix b/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
index 406b61e43938..db0bd26f4d29 100644
--- a/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, unzip }:
-        
+{ lib, stdenv, fetchurl, unzip }:
+
 stdenv.mkDerivation rec {
   name = "lib3ds-1.3.0";
 
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  meta = { 
+  meta = {
     description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
     homepage = "http://lib3ds.sourceforge.net/";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
index 10732a14e488..fec910bd5952 100644
--- a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "lib3mf";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix b/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix
index 8936603d18b0..1c88459ba9b6 100644
--- a/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation {
   pname = "libAfterImage";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.afterstep.org/afterimage/";
     description = "A generic image manipulation library";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libHX/default.nix b/nixpkgs/pkgs/development/libraries/libHX/default.nix
index 59afede9cae7..c059b9d412aa 100644
--- a/nixpkgs/pkgs/development/libraries/libHX/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libHX/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "libHX-3.22";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sh autogen.sh
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libhx.sourceforge.net/";
     longDescription = ''
       libHX is a C library (with some C++ bindings available) that provides data structures
diff --git a/nixpkgs/pkgs/development/libraries/libLAS/default.nix b/nixpkgs/pkgs/development/libraries/libLAS/default.nix
index 27db14e71660..7d762fc80775 100644
--- a/nixpkgs/pkgs/development/libraries/libLAS/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libLAS/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   name = "libLAS-1.8.1";
 
   src = fetchurl {
-
     url = "https://download.osgeo.org/liblas/${name}.tar.bz2";
     sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
   };
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-  buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ];
 
   cmakeFlags = [
     "-DGDAL_CONFIG=${gdal}/bin/gdal-config"
@@ -21,15 +20,15 @@ stdenv.mkDerivation rec {
     "-DCMAKE_EXE_LINKER_FLAGS=-pthread"
   ];
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib
   '';
 
   meta = {
     description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
     homepage = "https://liblas.org";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.michelk ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.michelk ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/nixpkgs/pkgs/development/libraries/libaacs/default.nix
index d6c90ee172b6..c3934db5b3fb 100644
--- a/nixpkgs/pkgs/development/libraries/libaacs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaacs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
+{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
 
 # library that allows libbluray to play AACS protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ yacc flex ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.videolan.org/developers/libaacs.html";
     description = "Library to access AACS protected Blu-Ray disks";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libaal/default.nix b/nixpkgs/pkgs/development/libraries/libaal/default.nix
index fdfd855470d9..e3c960681c5f 100644
--- a/nixpkgs/pkgs/development/libraries/libaal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "1.0.6";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.namesys.com/";
     description = "Support library for Reiser4";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ ];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libabigail/default.nix b/nixpkgs/pkgs/development/libraries/libabigail/default.nix
index 54dbb349eb6d..7543c6ddff73 100644
--- a/nixpkgs/pkgs/development/libraries/libabigail/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libabigail/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , elfutils
 , libxml2
-, pkgconfig
+, pkg-config
 , strace
 , python3
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
     strace
   ];
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     patchShebangs tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ABI Generic Analysis and Instrumentation Library";
     homepage = "https://sourceware.org/libabigail/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libabw/default.nix b/nixpkgs/pkgs/development/libraries/libabw/default.nix
index 91107ad4cb06..f1c4f49adc67 100644
--- a/nixpkgs/pkgs/development/libraries/libabw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libabw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }:
+{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libabw";
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
     sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ boost doxygen gperf librevenge libxml2 perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw";
     description = "Library parsing abiword documents";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix
index 07e0a3500a76..8dfc222f36ac 100644
--- a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales
-, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
+{ lib, stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales
+, libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "libaccounts-glib";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     gtk-doc
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
   ];
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for managing accounts which can be used from GLib applications";
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libaec/default.nix b/nixpkgs/pkgs/development/libraries/libaec/default.nix
index bf6fd029de16..4c539860be72 100644
--- a/nixpkgs/pkgs/development/libraries/libaec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab
+{ lib, stdenv, fetchFromGitLab
 , cmake
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.dkrz.de/k202009/libaec";
     description = "Adaptive Entropy Coding library";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libagar/default.nix b/nixpkgs/pkgs/development/libraries/libagar/default.nix
index 616879a979cb..7aeccdf583e0 100644
--- a/nixpkgs/pkgs/development/libraries/libagar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libagar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
+{ lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc
 , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL
 , libsndfile, portaudio, libmysqlclient, fontconfig
 }:
@@ -26,14 +26,14 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "devdoc" ];
 
-  nativeBuildInputs = [ pkgconfig libtool gettext ];
+  nativeBuildInputs = [ pkg-config libtool gettext ];
 
   buildInputs = [
     bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc
     freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform GUI toolkit";
     homepage = "http://libagar.org/index.html";
     license = with licenses; bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix
index 4de113718d4a..2b31da7aa535 100644
--- a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
+{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
 stdenv.mkDerivation {
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tests for libagar";
     homepage = "http://libagar.org/index.html";
     license = with licenses; bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix
index eca7170bfff2..67404f9e5cf9 100644
--- a/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, openssl }:
+{ lib, stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "libamqpcpp";
-  version = "4.3.10";
+  version = "4.3.11";
 
   src = fetchFromGitHub {
     owner = "CopernicaMarketingSoftware";
     repo = "AMQP-CPP";
     rev = "v${version}";
-    sha256 = "0yy6sq4rvv9c0f09vljnqx92zvr39bn1spl735hzn6253d7fm3a5";
+    sha256 = "sha256-ZEvzZ++0f7Kf3iVbf3vQbyE8yd/dasU+dSxDDUu8Xug=";
   };
 
   buildInputs = [ openssl ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for communicating with a RabbitMQ server";
     homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix b/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix
index 4c3d1d2a2132..d51eac7bdb6e 100644
--- a/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libantlr3c-3.4";
@@ -7,9 +7,9 @@ stdenv.mkDerivation {
     sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.is64bit "--enable-64bit";
+  configureFlags = lib.optional stdenv.is64bit "--enable-64bit";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C runtime libraries of ANTLR v3";
     homepage = "https://www.antlr3.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libao/default.nix b/nixpkgs/pkgs/development/libraries/libao/default.nix
index 3ecee2599f61..99d38f0cfc43 100644
--- a/nixpkgs/pkgs/development/libraries/libao/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap
 , CoreAudio, CoreServices, AudioUnit
 , usePulseAudio }:
 
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     lib.optionals stdenv.isLinux  [ alsaLib libcap ] ++
     lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     longDescription = ''
       Libao is Xiph.org's cross-platform audio library that allows
       programs to output audio using a simple API on a wide variety of
diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix
index 2c67e6ac1588..9706cda03f8b 100644
--- a/nixpkgs/pkgs/development/libraries/libaom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }:
+{ lib, stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "libaom";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   patches = [ ./outputs.patch ];
 
   nativeBuildInputs = [
-    yasm perl cmake pkgconfig python3
+    yasm perl cmake pkg-config python3
   ];
 
   preConfigure = ''
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "bin" "dev" "static" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Alliance for Open Media AV1 codec library";
     longDescription = ''
       Libaom is the reference implementation of the AV1 codec from the Alliance
diff --git a/nixpkgs/pkgs/development/libraries/libaosd/default.nix b/nixpkgs/pkgs/development/libraries/libaosd/default.nix
index c33f3a873a68..a6b9d531abf6 100644
--- a/nixpkgs/pkgs/development/libraries/libaosd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaosd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cairo, pango,
+{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, pango,
   libX11, libXcomposite, autoconf, automake }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a";
   };
 
-  nativeBuildInputs = [ autoconf automake pkgconfig ];
+  nativeBuildInputs = [ autoconf automake pkg-config ];
   buildInputs = [ cairo pango libX11 libXcomposite ];
   enableParallelBuilding = true;
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     longDescription = ''
       libaosd is an advanced on screen display library.
 
diff --git a/nixpkgs/pkgs/development/libraries/libappindicator/default.nix b/nixpkgs/pkgs/development/libraries/libappindicator/default.nix
index 7a7ad22756c7..469235e2e6af 100644
--- a/nixpkgs/pkgs/development/libraries/libappindicator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libappindicator/default.nix
@@ -1,7 +1,7 @@
 # TODO: Resolve the issues with the Mono bindings.
 
 { stdenv, fetchgit, lib
-, pkgconfig, autoreconfHook
+, pkg-config, autoreconfHook
 , glib, dbus-glib, gtkVersion ? "3"
 , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
 , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ];
+  nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ];
 
   propagatedBuildInputs =
     if gtkVersion == "2"
diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix
index 787745a6bdad..a8fb7e382659 100644
--- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix
@@ -1,5 +1,5 @@
 {
-  fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
+  fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook,
   acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,
 
   # Optional but increases closure only negligibly. Also, while libxml2
@@ -23,17 +23,17 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs =
-    stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils
+    lib.optional stdenv.hostPlatform.isUnix sharutils
     ++ [ zlib bzip2 openssl xz lzo zstd ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
-    ++ stdenv.lib.optional xarSupport libxml2;
+    ++ lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
+    ++ lib.optional xarSupport libxml2;
 
-  # Without this, pkgconfig-based dependencies are unhappy
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ];
+  # Without this, pkg-config-based dependencies are unhappy
+  propagatedBuildInputs = lib.optionals stdenv.isLinux [ attr acl ];
 
-  configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2";
+  configureFlags = lib.optional (!xarSupport) "--without-xml2";
 
   preBuild = if stdenv.isCygwin then ''
     echo "#include <windows.h>" >> config.h
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://libarchive.org";
     changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = with stdenv.lib.platforms; all;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = lib.licenses.bsd3;
+    platforms = with lib.platforms; all;
+    maintainers = with lib.maintainers; [ jcumming ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libargon2/default.nix b/nixpkgs/pkgs/development/libraries/libargon2/default.nix
index f559c10456bb..2003c8957ffa 100644
--- a/nixpkgs/pkgs/development/libraries/libargon2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libargon2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   pname = "libargon2";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "PKGCONFIG_REL=lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015";
     longDescription = ''
       A password-hashing function created by by Alex Biryukov, Daniel Dinu, and
diff --git a/nixpkgs/pkgs/development/libraries/libasr/default.nix b/nixpkgs/pkgs/development/libraries/libasr/default.nix
index 561e7e1017da..8d5b6d128ddf 100644
--- a/nixpkgs/pkgs/development/libraries/libasr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libasr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libevent, openssl }:
+{ lib, stdenv, fetchurl, libevent, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "libasr";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libevent openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/OpenSMTPD/libasr";
     description = "Free, simple and portable asynchronous resolver library";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/libass/default.nix b/nixpkgs/pkgs/development/libraries/libass/default.nix
index 9d8cf7434c23..6a180cb62c19 100644
--- a/nixpkgs/pkgs/development/libraries/libass/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yasm
+{ lib, stdenv, fetchurl, pkg-config, yasm
 , freetype, fribidi, harfbuzz
 , encaSupport ? true, enca ? null # enca support
 , fontconfigSupport ? true, fontconfig ? null # fontconfig support
@@ -14,7 +14,7 @@ let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libass";
   version = "0.15.0";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     (mkFlag largeTilesSupport "large-tiles")
   ];
 
-  nativeBuildInputs = [ pkgconfig yasm ];
+  nativeBuildInputs = [ pkg-config yasm ];
 
   buildInputs = [ freetype fribidi harfbuzz ]
     ++ optional encaSupport enca
diff --git a/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/nixpkgs/pkgs/development/libraries/libassuan/default.nix
index aa798668f8ea..a531cdff5b96 100644
--- a/nixpkgs/pkgs/development/libraries/libassuan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libassuan/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }:
+{ fetchurl, lib, stdenv, gettext, npth, libgpgerror, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "libassuan";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "IPC library used by GnuPG and related software";
     longDescription = ''
       Libassuan is a small library implementing the so-called Assuan
diff --git a/nixpkgs/pkgs/development/libraries/libast/default.nix b/nixpkgs/pkgs/development/libraries/libast/default.nix
index dfe2dd76ef7d..b48971bc4313 100644
--- a/nixpkgs/pkgs/development/libraries/libast/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libast/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, pkgconfig }:
+{ lib, stdenv, fetchurl
+, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libast";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library of Assorted Spiffy Things";
     homepage = "https://www.eterm.org";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libasyncns/default.nix b/nixpkgs/pkgs/development/libraries/libasyncns/default.nix
index 9a91551c3a43..0dc26b686117 100644
--- a/nixpkgs/pkgs/development/libraries/libasyncns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libasyncns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libasyncns-0.8";
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg";
   };
 
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://0pointer.de/lennart/projects/libasyncns/";
     description = "A C library for Linux/Unix for executing name service queries asynchronously";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix
index b576896876e4..f9e850f91ffa 100644
--- a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libatomic_ops";
@@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
+  nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isCygwin ''
+  preConfigure = lib.optionalString stdenv.isCygwin ''
     sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
     ./autogen.sh
   '';
 
   meta = {
-    description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = with stdenv.lib.platforms; unix ++ windows;
+    description = "A library for semi-portable access to hardware-provided atomic memory update operations";
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = with lib.platforms; unix ++ windows;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libaudclient/default.nix b/nixpkgs/pkgs/development/libraries/libaudclient/default.nix
index ad33c624b141..f90815f4ee9f 100644
--- a/nixpkgs/pkgs/development/libraries/libaudclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaudclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }:
 
 stdenv.mkDerivation rec {
   name = "libaudclient-3.5-rc2";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib dbus-glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Legacy D-Bus client library for Audacious";
     homepage = "https://audacious-media-player.org/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libav/default.nix b/nixpkgs/pkgs/development/libraries/libav/default.nix
index 15b6a275214d..51aa634e4084 100644
--- a/nixpkgs/pkgs/development/libraries/libav/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash
+{ lib, stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash
 , mp3Support    ? true,   lame      ? null
 , speexSupport  ? true,   speex     ? null
 , theoraSupport ? true,   libtheora ? null
@@ -17,7 +17,7 @@
 
 assert faacSupport -> enableUnfree;
 
-let inherit (stdenv.lib) optional hasPrefix enableFeature; in
+let inherit (lib) optional hasPrefix enableFeature; in
 
 /* ToDo:
     - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools
@@ -52,7 +52,7 @@ let
     '';
 
     configurePlatforms = [];
-    configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; [
+    configureFlags = assert lib.all (x: x!=null) buildInputs; [
       "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
       "--target_os=${stdenv.hostPlatform.parsed.kernel.name}"
       #"--enable-postproc" # it's now a separate package in upstream
@@ -81,7 +81,7 @@ let
       "--enable-cross-compile"
     ];
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkg-config perl ];
     buildInputs = [ lame yasm zlib bzip2 SDL bash ]
       ++ [ perl ] # for install-man target
       ++ optional mp3Support lame
@@ -120,7 +120,7 @@ let
 
     passthru = { inherit vdpauSupport; };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://libav.org/";
       description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
       license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
diff --git a/nixpkgs/pkgs/development/libraries/libavc1394/default.nix b/nixpkgs/pkgs/development/libraries/libavc1394/default.nix
index 01f39052e930..d9c10415b67a 100644
--- a/nixpkgs/pkgs/development/libraries/libavc1394/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libavc1394/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libraw1394 }:
+{ lib, stdenv, fetchurl, pkg-config, libraw1394 }:
 
 stdenv.mkDerivation rec {
   name = "libavc1394-0.5.4";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = { 
+  meta = {
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = "https://sourceforge.net/projects/libavc1394/";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libavif/default.nix b/nixpkgs/pkgs/development/libraries/libavif/default.nix
index 25422c8b7d90..8c33e6f1b6dd 100644
--- a/nixpkgs/pkgs/development/libraries/libavif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libavif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libaom
 , cmake
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     dav1d
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description  = "C implementation of the AV1 Image File Format";
     longDescription = ''
       Libavif aims to be a friendly, portable C implementation of the
diff --git a/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix b/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
index 248c33f7e0e5..ef9823130f43 100644
--- a/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gtk=${gtkVersion}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ayatana Application Indicators Shared Library";
     homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator";
     changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog";
diff --git a/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix b/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix
index dd9bc616944d..c3c271c17194 100644
--- a/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gtk=${gtkVersion}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ayatana Indicators Shared Library";
     homepage = "https://github.com/AyatanaIndicators/libayatana-indicator";
     changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog";
diff --git a/nixpkgs/pkgs/development/libraries/libb2/default.nix b/nixpkgs/pkgs/development/libraries/libb2/default.nix
index dad5d40ea530..b142a0a41565 100644
--- a/nixpkgs/pkgs/development/libraries/libb2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libb2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libb2";
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  configureFlags = stdenv.lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes";
+  configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes";
 
   nativeBuildInputs = [ autoconf automake libtool pkg-config ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The BLAKE2 family of cryptographic hash functions";
     homepage = "https://blake2.net/";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/libb64/default.nix b/nixpkgs/pkgs/development/libraries/libb64/default.nix
index 3c9a97684275..f524e9321f9d 100644
--- a/nixpkgs/pkgs/development/libraries/libb64/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libb64/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "libb64";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "ANSI C routines for fast base64 encoding/decoding";
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.publicDomain;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix b/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix
index ea7f4eb9fa8a..93927807af85 100644
--- a/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub
+{ lib, stdenv, callPackage, fetchFromGitHub
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     "--enable-static=${yesno enableStatic}"
     "--enable-shared=${yesno enableShared}"
   ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces";
     homepage = https://github.com/ianlancetaylor/libbacktrace;
     maintainers = with maintainers; [ twey ];
diff --git a/nixpkgs/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix
index 411c3ae740f2..7c458bae19ce 100644
--- a/nixpkgs/pkgs/development/libraries/libbap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook,
+{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook,
   which }:
 
 stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     mkdir -p $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/binaryanalysisplatform/bap-bindings";
     description = "A C library for interacting with BAP";
     maintainers = [ maintainers.maurer ];
diff --git a/nixpkgs/pkgs/development/libraries/libbdplus/default.nix b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix
index c9b7bfa3c0e6..ca7b305122e3 100644
--- a/nixpkgs/pkgs/development/libraries/libbdplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }:
+{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, gettext }:
 
 # library that allows libbluray to play BDplus protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.videolan.org/developers/libbdplus.html";
     description = "Library to access BD+ protected Blu-Ray disks";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libbfd/default.nix b/nixpkgs/pkgs/development/libraries/libbfd/default.nix
index 75db780b7bb6..499f04349b5d 100644
--- a/nixpkgs/pkgs/development/libraries/libbfd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbfd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped
 , libiberty, zlib
 }:
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for manipulating containers of machine code";
     longDescription = ''
       BFD is a library which provides a single interface to read and write
diff --git a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
index b2853011b140..f9bac3835d45 100644
--- a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
+{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla
 , libusb1, udev }:
 
 let
@@ -23,9 +23,18 @@ in stdenv.mkDerivation {
     sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  # This patch is required for version 2.2.1. As the patch is already part of
+  # upstream master, it will be incorporated into the next release. The patch
+  # fixes a (well-justified) compiler warning which breaks the build because
+  # we compile with -Werror.
+  patches = [ (fetchpatch {
+    url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch";
+    sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw";
+  }) ];
+
+  nativeBuildInputs = [ cmake pkg-config git doxygen help2man ];
   # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
-  buildInputs = [ cmake git doxygen help2man tecla libusb1 ]
+  buildInputs = [ tecla libusb1 ]
     ++ lib.optionals stdenv.isLinux [ udev ]
     ++ lib.optionals stdenv.isDarwin [ ncurses ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
index 39646db87ecd..11a65006422f 100644
--- a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc
+{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
 , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
 , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
 , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43
+    autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43
     python3 gobject-introspection autoconf-archive makeWrapper
   ];
 
@@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \
-      ${stdenv.lib.makeBinPath [ thin-provisioning-tools ]}
+      ${lib.makeBinPath [ thin-provisioning-tools ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for manipulating block devices";
     homepage = "http://storaged.org/libblockdev/";
     license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils
diff --git a/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix b/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix
index aff56994f498..6ba832fb3cda 100644
--- a/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, clang }:
+{ lib, stdenv, fetchFromGitHub, clang }:
 
 stdenv.mkDerivation {
   name = "blocksruntime-20140624";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   installPhase = ''prefix="/" DESTDIR=$out ./installlib'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Installs the BlocksRuntime library from the compiler-rt";
     homepage = "https://github.com/mackyle/blocksruntime";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix b/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix
index d9639cf5c145..7cb4c9e2b32c 100644
--- a/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4 }:
+{ lib, stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   pname = "libbluedevil";
@@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
   };
 
-  buildInputs = [ cmake qt4 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix
index a00e2272d668..3f90bb878adc 100644
--- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration
+{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
 , withJava ? false, jdk ? null, ant ? null
 , withAACS ? false, libaacs ? null
 , withBDplus ? false, libbdplus ? null
@@ -6,7 +6,7 @@
 , withFonts ? true, freetype ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert withJava -> jdk != null && ant != null;
 assert withAACS -> libaacs != null;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   patches = optional withJava ./BDJ-JARFILE-path.patch;
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ]
+  nativeBuildInputs = [ pkg-config autoreconfHook ]
                       ++ optionals withJava [ ant ]
                       ;
 
@@ -50,13 +50,13 @@ stdenv.mkDerivation rec {
     ${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
   '';
 
-  configureFlags =  with stdenv.lib;
+  configureFlags =  with lib;
                     optional (! withJava) "--disable-bdjava-jar"
                  ++ optional (! withMetadata) "--without-libxml2"
                  ++ optional (! withFonts) "--without-freetype"
                  ;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.videolan.org/developers/libbluray.html";
     description = "Library to access Blu-Ray disks for video playback";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libbsd/default.nix b/nixpkgs/pkgs/development/libraries/libbsd/default.nix
index 7aea38bdb58d..778b61d83158 100644
--- a/nixpkgs/pkgs/development/libraries/libbsd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libbsd";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./darwin.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common functions found on BSD systems";
     homepage = "https://libbsd.freedesktop.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libbson/default.nix b/nixpkgs/pkgs/development/libraries/libbson/default.nix
index 1d2043b20cd4..e03d7c194847 100644
--- a/nixpkgs/pkgs/development/libraries/libbson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbson/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, perl, stdenv, cmake }:
+{ fetchFromGitHub, perl, lib, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libbson";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C Library for parsing, editing, and creating BSON documents";
     homepage = "https://github.com/mongodb/libbson";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix
index 42c680835f14..02e73b0c04cf 100644
--- a/nixpkgs/pkgs/development/libraries/libburn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libburn";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libburnia-project.org/";
     description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
index c93a59d462fe..a84f010b9e67 100644
--- a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
 , gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl
 , python3, pcre2, gmp, mpfr
 }:
@@ -18,11 +18,11 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ];
+  nativeBuildInputs = [ autoreconfHook pkg-config gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ];
 
   buildInputs = [ pcre2 gmp mpfr ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tiny library providing a C “class” for working with arbitrary big sizes in bytes";
     homepage = src.meta.homepage;
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libcaca/default.nix b/nixpkgs/pkgs/development/libraries/libcaca/default.nix
index 84df50e117a5..ca879a60c7a0 100644
--- a/nixpkgs/pkgs/development/libraries/libcaca/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcaca/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2
+{ lib, stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2
 , x11Support ? !stdenv.isDarwin, libX11, libXext
 }:
 
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
     (if x11Support then "--enable-x11" else "--disable-x11")
     ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
+  NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
 
   enableParallelBuilding = true;
 
-  propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
-    ++ stdenv.lib.optionals x11Support [ libX11 libXext ];
+  propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ]
+    ++ lib.optionals x11Support [ libX11 libXext ];
 
   postInstall = ''
     mkdir -p $dev/bin
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://libcaca.zoy.org/";
     description = "A graphics library that outputs text instead of pixels";
-    license = stdenv.lib.licenses.wtfpl;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.wtfpl;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcacard/default.nix b/nixpkgs/pkgs/development/libraries/libcacard/default.nix
index 474e51e8c465..c484a49b1a2b 100644
--- a/nixpkgs/pkgs/development/libraries/libcacard/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcacard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, nss }:
+{ lib, stdenv, fetchurl, pkg-config, glib, nss }:
 
 stdenv.mkDerivation rec {
   pname = "libcacard";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib nss ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smart card emulation library";
     homepage = "https://gitlab.freedesktop.org/spice/libcacard";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libcanberra/default.nix b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
index 9dea5956d652..a2dfe1322f84 100644
--- a/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool
+{ stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool
 , gtk ? null
 , libpulseaudio, gst_all_1, libvorbis, libcap
 , CoreServices
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
   };
 
-  nativeBuildInputs = [ pkgconfig libtool ];
+  nativeBuildInputs = [ pkg-config libtool ];
   buildInputs = [
     libpulseaudio libvorbis gtk
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch = (stdenv.lib.optional stdenv.isDarwin) ''
+  postPatch = (lib.optional stdenv.isDarwin) ''
     patch -p0 < ${fetchpatch {
       url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff";
       sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31";
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
 
     homepage = "http://0pointer.de/lennart/projects/libcanberra/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcangjie/default.nix b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix
index b71b630675de..c6bbbcdb61ab 100644
--- a/nixpkgs/pkgs/development/libraries/libcangjie/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
+{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "libcangjie";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf libtool m4 sqlite ];
 
   configureScript = "./autogen.sh";
-  
+
   preConfigure = ''
     find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
   '';
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
       libcangjie is a library implementing the Cangjie input method.
     '';
     homepage = "http://cangjians.github.io/projects/libcangjie/";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
-    maintainers = [ stdenv.lib.maintainers.linquize ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.linquize ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/nixpkgs/pkgs/development/libraries/libcbor/default.nix
index ae5154eac034..349b715d8520 100644
--- a/nixpkgs/pkgs/development/libraries/libcbor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcbor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, cmocka }:
+{ lib, stdenv, fetchFromGitHub, cmake, cmocka }:
 
 stdenv.mkDerivation rec {
   pname = "libcbor";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CBOR protocol implementation for C and others";
     homepage = "https://github.com/PJK/libcbor";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix b/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix
index abc5f84a0e32..e5f6324e261c 100644
--- a/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libcdaudio-0.99.12p2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A portable library for controlling audio CDs";
     homepage = "http://libcdaudio.sourceforge.net";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl2;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcddb/default.nix b/nixpkgs/pkgs/development/libraries/libcddb/default.nix
index 2b837ff1ce1a..c1b28e22e103 100644
--- a/nixpkgs/pkgs/development/libraries/libcddb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcddb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libcddb-1.3.2";
@@ -8,16 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim";
   };
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
   doCheck = false; # fails 3 of 5 tests with locale errors
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library to access data on a CDDB server (freedb.org)";
     homepage = "http://libcddb.sourceforge.net/";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix
index 8ad3231dc36b..905d39dbd8ea 100644
--- a/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config,
   libiconv, IOKit, DiskArbitration}:
 
 stdenv.mkDerivation {
@@ -11,17 +11,17 @@ stdenv.mkDerivation {
     sha256 = "1wjgmmaca4baw7k5c3vdap9hnjc49ciagi5kvpvync3aqfmdvkha";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libcdio ] ++
-    stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
+    lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
 
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration;
+  propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration;
 
-  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+  configureFlags = lib.optionals stdenv.isDarwin [
     "--disable-ld-version-script"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CD paranoia on top of libcdio";
     longDescription = ''
       This is a port of xiph.org's cdda paranoia to use libcdio for CDROM
diff --git a/nixpkgs/pkgs/development/libraries/libcdio/default.nix b/nixpkgs/pkgs/development/libraries/libcdio/default.nix
index b0b7b55a19db..cfe796b14d06 100644
--- a/nixpkgs/pkgs/development/libraries/libcdio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }:
+{ lib, stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "libcdio-2.1.0";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  nativeBuildInputs = [ pkgconfig help2man ];
+  nativeBuildInputs = [ pkg-config help2man ];
   buildInputs = [ libcddb ncurses ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for OS-independent CD-ROM and CD image access";
     longDescription = ''
       GNU libcdio is a library for OS-independent CD-ROM and
diff --git a/nixpkgs/pkgs/development/libraries/libcdr/default.nix b/nixpkgs/pkgs/development/libraries/libcdr/default.nix
index 72996e28996c..087c928b79ce 100644
--- a/nixpkgs/pkgs/development/libraries/libcdr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
+{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
 
 stdenv.mkDerivation rec {
   name = "libcdr-0.1.6";
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
 
   meta = {
     description = "A library providing ability to interpret and import Corel Draw drawings into various applications";
     homepage = "http://www.freedesktop.org/wiki/Software/libcdr";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.mpl20;
+    platforms = lib.platforms.all;
+    license = lib.licenses.mpl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcec/default.nix b/nixpkgs/pkgs/development/libraries/libcec/default.nix
index 792d899333e0..341754376aae 100644
--- a/nixpkgs/pkgs/development/libraries/libcec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
 
 let version = "4.0.7"; in
 
@@ -11,9 +11,9 @@ stdenv.mkDerivation {
     sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ udev libcec_platform ] ++
-    stdenv.lib.optional (libraspberrypi != null) libraspberrypi;
+    lib.optional (libraspberrypi != null) libraspberrypi;
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
 
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
     substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling";
     homepage = "http://libcec.pulse-eight.com";
     repositories.git = "https://github.com/Pulse-Eight/libcec.git";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.titanous ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/libcec/platform.nix b/nixpkgs/pkgs/development/libraries/libcec/platform.nix
index 2132cf7a065e..15972272a187 100644
--- a/nixpkgs/pkgs/development/libraries/libcec/platform.nix
+++ b/nixpkgs/pkgs/development/libraries/libcec/platform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 let version = "2.1.0.1"; in
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Platform library for libcec and Kodi addons";
     homepage = "https://github.com/Pulse-Eight/platform";
     repositories.git = "https://github.com/Pulse-Eight/platform.git";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.titanous ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix
index 93aaebc110e2..ec1a5ee38281 100644
--- a/nixpkgs/pkgs/development/libraries/libcef/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
+{ lib, stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
 , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
 , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
 , libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core
@@ -6,7 +6,7 @@
 
 let
   libPath =
-    stdenv.lib.makeLibraryPath [
+    lib.makeLibraryPath [
       alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
       libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
       libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     cp -r ../include $out/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple framework for embedding Chromium-based browsers in other applications";
     homepage = "http://opensource.spotify.com/cefbuilds/index.html";
     maintainers = with maintainers; [ puffnfresh ];
diff --git a/nixpkgs/pkgs/development/libraries/libcello/default.nix b/nixpkgs/pkgs/development/libraries/libcello/default.nix
index 908c9cb15dd2..100077bcc706 100644
--- a/nixpkgs/pkgs/development/libraries/libcello/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcello/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libcello";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://libcello.org/";
     description = "Higher level programming in C";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.MostAwesomeDude ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.MostAwesomeDude ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix
index 6a74941a3a0f..22a062acd6ef 100644
--- a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
+{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3
 , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
@@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
   version = "0.12.20";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
 
   buildInputs = [ sqlite libsoup ];
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/libchamplain";
     license = licenses.lgpl2Plus;
 
diff --git a/nixpkgs/pkgs/development/libraries/libchardet/default.nix b/nixpkgs/pkgs/development/libraries/libchardet/default.nix
index 168217678c0a..260c332f7ef4 100644
--- a/nixpkgs/pkgs/development/libraries/libchardet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchardet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libchardet";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's Universal Charset Detector C/C++ API";
     homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html";
     license = licenses.mpl11;
diff --git a/nixpkgs/pkgs/development/libraries/libchewing/default.nix b/nixpkgs/pkgs/development/libraries/libchewing/default.nix
index cd2df385f488..1436d4bd59dc 100644
--- a/nixpkgs/pkgs/development/libraries/libchewing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchewing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sqlite }:
+{ lib, stdenv, fetchurl, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "libchewing";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intelligent Chinese phonetic input method";
     homepage = "http://chewing.im/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libchop/default.nix b/nixpkgs/pkgs/development/libraries/libchop/default.nix
index d2040b72311c..f02ac04621fc 100644
--- a/nixpkgs/pkgs/development/libraries/libchop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchop/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, zlib, bzip2, libgcrypt
+{ fetchurl, lib, stdenv, zlib, bzip2, libgcrypt
 , gdbm, gperf, tdb, gnutls, db, libuuid
-, lzo, pkgconfig, guile, rpcsvc-proto, libtirpc
+, lzo, pkg-config, guile, rpcsvc-proto, libtirpc
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gets-undeclared.patch ./size_t.patch ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch ];
 
-  nativeBuildInputs = [ pkgconfig gperf rpcsvc-proto ];
+  nativeBuildInputs = [ pkg-config gperf rpcsvc-proto ];
 
   NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
   NIX_LDFLAGS = [ "-ltirpc" ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools & library for data backup and distributed storage";
 
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/libcint/default.nix b/nixpkgs/pkgs/development/libraries/libcint/default.nix
index 8415b964bb99..bd8e8bd4aaf0 100644
--- a/nixpkgs/pkgs/development/libraries/libcint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcint/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcint";
-  version = "4.0.6";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "sunqm";
     repo = "libcint";
     rev = "v${version}";
-    sha256 = "1bgzsyz1i0hvla5ax0lawp1kw25fkhzh9ddhq92mplizrj9y05c1";
+    sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/libraries/libck/default.nix b/nixpkgs/pkgs/development/libraries/libck/default.nix
index c4f38e96f3d2..accb6556011d 100644
--- a/nixpkgs/pkgs/development/libraries/libck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "ck";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance concurrency research library";
     longDescription = ''
       Concurrency primitives, safe memory reclamation mechanisms and non-blocking data structures for the research, design and implementation of high performance concurrent systems.
diff --git a/nixpkgs/pkgs/development/libraries/libclc/default.nix b/nixpkgs/pkgs/development/libraries/libclc/default.nix
index 0672e7942cbb..a6334bf9998c 100644
--- a/nixpkgs/pkgs/development/libraries/libclc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libclc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, llvmPackages }:
+{ lib, stdenv, fetchFromGitHub, python, llvmPackages }:
 
 let
   llvm = llvmPackages.llvm;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libclc.llvm.org/";
     description = "Implementation of the library requirements of the OpenCL C programming language";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libcli/default.nix b/nixpkgs/pkgs/development/libraries/libcli/default.nix
index 6cabe1343c48..ceb0338e5cc1 100644
--- a/nixpkgs/pkgs/development/libraries/libcli/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl }:
+{ lib, stdenv, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libcli";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Emulate a Cisco-style telnet command-line interface";
     homepage = "http://sites.dparrish.com/libcli";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
index 87c86ea2fbea..08601db08342 100644
--- a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
 
 # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed
 
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
     "-Denable-gtk-doc=true"
   ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl ];
 
   buildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DBus API that allows cloud storage sync clients to expose their services";
     homepage = "https://gitlab.gnome.org/World/libcloudproviders";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libclthreads/default.nix b/nixpkgs/pkgs/development/libraries/libclthreads/default.nix
index 53cff9a19d3d..e4548420a057 100644
--- a/nixpkgs/pkgs/development/libraries/libclthreads/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libclthreads/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libclthreads";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Zita thread library";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libclxclient/default.nix b/nixpkgs/pkgs/development/libraries/libclxclient/default.nix
index b086dfc08f68..0d39a5e55b26 100644
--- a/nixpkgs/pkgs/development/libraries/libclxclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libclxclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
+{ lib, stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libclxclient";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include";
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Zita X11 library";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libcmis/default.nix b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
index 8b1093ac21fc..2898c9a1c835 100644
--- a/nixpkgs/pkgs/development/libraries/libcmis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }:
+{ lib, stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }:
 
 stdenv.mkDerivation rec {
   pname = "libcmis";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ];
+  nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ];
   buildInputs = [ boost libxml2 curl cppunit ];
 
   configureFlags = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ client library for the CMIS interface";
     homepage = "https://sourceforge.net/projects/libcmis/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libco-canonical/default.nix b/nixpkgs/pkgs/development/libraries/libco-canonical/default.nix
index 56974fcca7b6..a01bbf7419cc 100644
--- a/nixpkgs/pkgs/development/libraries/libco-canonical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libco-canonical/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, pkg-config }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libco-canonical";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix
index f945434842ee..df8db3ac9f89 100644
--- a/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, collectd }:
-with stdenv.lib;
+{ lib, stdenv, collectd }:
+with lib;
 
 collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
@@ -12,7 +12,7 @@ collectd.overrideAttrs (oldAttrs: {
 
   postInstall = "rm -rf $out/{bin,etc,sbin,share}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C Library for collectd, a daemon which collects system performance statistics periodically";
     homepage = "http://collectd.org";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix
index 3f91c8e579f5..47360e11bc5e 100644
--- a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , qtbase, qtdeclarative, qmake, which
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = "rm -rf lib";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform IRC framework written with Qt";
     homepage = "https://communi.github.io";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libconfig/default.nix b/nixpkgs/pkgs/development/libraries/libconfig/default.nix
index 7d7f95d757ce..ae5f11764633 100644
--- a/nixpkgs/pkgs/development/libraries/libconfig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libconfig";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.hyperrealm.com/libconfig";
     description = "A simple library for processing structured configuration files";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libconfuse/default.nix b/nixpkgs/pkgs/development/libraries/libconfuse/default.nix
index b7afe5ed03af..7545fe9617cc 100644
--- a/nixpkgs/pkgs/development/libraries/libconfuse/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libconfuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, flex }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex }:
 
 stdenv.mkDerivation rec {
   pname = "libconfuse";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
   installCheckTarget = "check";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Small configuration file parser library for C";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
index 92b000bc4efe..9f75eafdf247 100644
--- a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}:
 
 stdenv.mkDerivation rec {
   pname = "libcouchbase";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libevent openssl ];
 
   # Running tests in parallel does not work
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C client library for Couchbase";
     homepage = "https://github.com/couchbase/libcouchbase";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libcrafter/default.nix b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix
index 20bcc9183ec4..e7a6e6c98372 100644
--- a/nixpkgs/pkgs/development/libraries/libcrafter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
+{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
 
 stdenv.mkDerivation rec {
   pname = "libcrafter";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/pellegre/libcrafter";
     description = "High level C++ network packet sniffing and crafting library";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.lethalman ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.lethalman ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcredis/default.nix b/nixpkgs/pkgs/development/libraries/libcredis/default.nix
index 1368cd30adbb..902f5a6ee26f 100644
--- a/nixpkgs/pkgs/development/libraries/libcredis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcredis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libcredis-0.2.3";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     cp -v *.h "$out/include/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C client library for Redis (key-value database)";
     homepage = "https://code.google.com/archive/p/credis/";
     license = licenses.bsd3; # from homepage
diff --git a/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix b/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix
index 8e2be72987cf..c81dbb86f6a0 100644
--- a/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libuuid }:
+{ lib, stdenv, fetchFromGitHub, libuuid }:
 
 stdenv.mkDerivation rec {
   name = "lib" + pname + "-" + version;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     install -D -m644 guid.h "$out/include/guid.h"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight cross platform C++ GUID/UUID library";
     license = licenses.mit;
     maintainers = with maintainers; [ edwtjo ];
diff --git a/nixpkgs/pkgs/development/libraries/libcryptui/default.nix b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
index df1558a1e49a..5fdd60abe115 100644
--- a/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }:
 
 stdenv.mkDerivation rec {
   pname = "libcryptui";
   version = "3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
+  nativeBuildInputs = [ pkg-config intltool autoreconfHook ];
   buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ];
   propagatedBuildInputs = [ dbus-glib ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interface components for OpenPGP";
     homepage = "https://gitlab.gnome.org/GNOME/libcryptui";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix
index fcb5aa2bbfee..e30165054aa0 100644
--- a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libcsptr";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smart pointer constructs for the (GNU) C programming language";
     homepage = "https://github.com/Snaipe/libcsptr";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libctb/default.nix b/nixpkgs/pkgs/development/libraries/libctb/default.nix
index 161c7c98c63f..d52adac556d8 100644
--- a/nixpkgs/pkgs/development/libraries/libctb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libctb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   pname = "libctb";
   version = "0.16";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "prefix=$(out)"
   ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Communications toolbox";
     homepage = "https://iftools.com";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libctemplate/default.nix b/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
index b571e816fc40..2aa36bfe9914 100644
--- a/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }:
+{ lib, stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "ctemplate";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
       embed application logic in this template language.
     '';
     homepage = "https://github.com/OlafvdSpek/ctemplate";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcue/default.nix b/nixpkgs/pkgs/development/libraries/libcue/default.nix
index 73a110c07f69..227dfd77f463 100644
--- a/nixpkgs/pkgs/development/libraries/libcue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, bison, flex }:
+{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }:
 
 stdenv.mkDerivation rec {
   pname = "libcue";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails all the tests (ctest)
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CUE Sheet Parser Library";
     longDescription = ''
       libcue is intended to parse a so called cue sheet from a char string or
diff --git a/nixpkgs/pkgs/development/libraries/libcutl/default.nix b/nixpkgs/pkgs/development/libraries/libcutl/default.nix
index b13805aa37aa..7a5c39849291 100644
--- a/nixpkgs/pkgs/development/libraries/libcutl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcutl/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, xercesc }:
+{ lib, stdenv, fetchurl, xercesc }:
 
 stdenv.mkDerivation rec {
   pname = "libcutl";
   version = "1.10.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ utility library from Code Synthesis";
     longDescription = ''
         libcutl is a C++ utility library.
-        It contains a collection of generic and independent components such as 
+        It contains a collection of generic and independent components such as
         meta-programming tests, smart pointers, containers, compiler building blocks, etc.
     '';
     homepage = "https://codesynthesis.com/projects/libcutl/";
diff --git a/nixpkgs/pkgs/development/libraries/libdaemon/default.nix b/nixpkgs/pkgs/development/libraries/libdaemon/default.nix
index d906e119dca6..eeb034ed0678 100644
--- a/nixpkgs/pkgs/development/libraries/libdaemon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdaemon/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "libdaemon-0.14";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-includes.patch ];
 
   configureFlags = [ "--disable-lynx" ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
     [ # Can't run this test while cross-compiling
       "ac_cv_func_setpgrp_void=yes"
     ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight C library that eases the writing of UNIX daemons";
     homepage = "http://0pointer.de/lennart/projects/libdaemon/";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdap/default.nix b/nixpkgs/pkgs/development/libraries/libdap/default.nix
index a643c25f0bfd..8eacd9706a88 100644
--- a/nixpkgs/pkgs/development/libraries/libdap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
+{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
 
 stdenv.mkDerivation rec {
   version = "3.20.6";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ SDK which contains an implementation of DAP";
     homepage = "https://www.opendap.org/software/libdap";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
index 168773662f6a..f4e2df36d917 100644
--- a/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , autoreconfHook, autoconf-archive
 , installShellFiles, libiconv }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     installShellFiles
   ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
   preAutoreconf = let
     reports = "https://github.com/tlwg/libdatrie/issues";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     installManPage man/trietool.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://linux.thai.net/~thep/datrie/datrie.html";
     description = "This is an implementation of double-array structure for representing trie";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix
index 6c430682251f..d6ecb6e9747e 100644
--- a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2
+{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1";
   };
 
-  nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
+  nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
   buildInputs = [ glib gtk3 ];
 
   mesonFlags = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to delight your users with fancy features";
     longDescription = ''
       The libdazzle library is a companion library to GObject and GTK. It
diff --git a/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix b/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
index 871c9f971675..6a86d4941bff 100644
--- a/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libdbi
+{ lib, stdenv, fetchurl, libdbi
 , libmysqlclient ? null
 , sqlite ? null
 , postgresql ? null
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   name = "libdbi-drivers-0.9.0";
 
diff --git a/nixpkgs/pkgs/development/libraries/libdbi/default.nix b/nixpkgs/pkgs/development/libraries/libdbi/default.nix
index 64c511503d09..48812f091bea 100644
--- a/nixpkgs/pkgs/development/libraries/libdbi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libdbi-0.9.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libdbi.sourceforge.net/";
     description = "DB independent interface to DB";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 6b4be0db4144..e44f3e37d200 100644
--- a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, cmake }:
+{ lib, stdenv, fetchurl, qt4, cmake }:
 
 let
   baseName = "libdbusmenu-qt";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DWITH_DOC=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
     inherit homepage;
     inherit (qt4.meta) platforms;
diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index d7eab2968092..5ce811e9fea2 100644
--- a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, qtbase }:
+{ lib, stdenv, fetchgit, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "libdbusmenu-qt";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DWITH_DOC=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/libdbusmenu-qt";
     description = "Provides a Qt implementation of the DBusMenu spec";
     maintainers = [ maintainers.ttuegel ];
diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix
index 5e11864b1f17..8e9fe4de88ae 100644
--- a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, file
-, pkgconfig, intltool
+, pkg-config, intltool
 , glib, dbus-glib, json-glib
 , gobject-introspection, vala
 , gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
   };
 
-  nativeBuildInputs = [ vala pkgconfig intltool gobject-introspection ];
+  nativeBuildInputs = [ vala pkg-config intltool gobject-introspection ];
 
   buildInputs = [
     glib dbus-glib json-glib
diff --git a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
index 8a688ef37c6d..a666eb3a650b 100644
--- a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libraw1394
+{ lib, stdenv, fetchurl, libraw1394
 , libusb1, CoreServices }:
 
 stdenv.mkDerivation rec {
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libusb1 ]
-    ++ stdenv.lib.optional stdenv.isLinux libraw1394
-    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+    ++ lib.optional stdenv.isLinux libraw1394
+    ++ lib.optional stdenv.isDarwin CoreServices;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/projects/libdc1394/";
     description = "Capture and control API for IIDC compliant cameras";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix
index 6c2f3b8e1071..bbbcdc3f0544 100644
--- a/nixpkgs/pkgs/development/libraries/libde265/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.0.8";
@@ -11,16 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   enableParallelBuilding = true;
 
   meta = {
     homepage = "https://github.com/strukturag/libde265";
     description = "Open h.265 video codec implementation";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ gebner ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ gebner ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/nixpkgs/pkgs/development/libraries/libdevil/default.nix
index 5d00d6b01ff3..fa48c773dfc9 100644
--- a/nixpkgs/pkgs/development/libraries/libdevil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdevil/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL
-, libX11, pkgconfig, OpenGL
+{ lib, stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL
+, libX11, pkg-config, OpenGL
 }:
 
 stdenv.mkDerivation rec {
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
-  nativeBuildInputs = [ pkgconfig ];
+    ++ lib.optionals stdenv.isDarwin [ OpenGL ];
+  nativeBuildInputs = [ pkg-config ];
 
   configureFlags = [ "--enable-ILU" "--enable-ILUT" ];
 
   preConfigure = ''
     sed -i 's, -std=gnu99,,g' configure
     sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in
   '';
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://openil.sourceforge.net/";
     description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix b/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix
index 5936853dcbcb..7ee268e4e7d9 100644
--- a/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }:
+{ lib, stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }:
 
 stdenv.mkDerivation rec {
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ openssl pcsclite opensc libxml2 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+    ++ lib.optionals stdenv.isDarwin [ Security ];
 
-  cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ];
+  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     homepage = "https://github.com/open-eid/libdigidoc";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix
index d966631dc276..f7170fa7f103 100644
--- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
-, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
+{ lib, stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
+, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
 
 stdenv.mkDerivation rec {
   version = "3.14.4";
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
      sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig xxd ];
+  nativeBuildInputs = [ cmake pkg-config xxd ];
 
   buildInputs = [
     libdigidoc minizip pcsclite opensc openssl xercesc
     xml-security-c xsd zlib xalanc
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     homepage = "http://www.id.ee/";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libdiscid/default.nix b/nixpkgs/pkgs/development/libraries/libdiscid/default.nix
index 698aac87b892..3021aced93f6 100644
--- a/nixpkgs/pkgs/development/libraries/libdiscid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdiscid/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, cmake, pkgconfig, darwin }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "libdiscid";
   version = "0.6.2";
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
-  
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";
     sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";
+  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for creating MusicBrainz DiscIDs from audio CDs";
     homepage = "http://musicbrainz.org/doc/libdiscid";
     maintainers = with maintainers; [ ehmry ];
diff --git a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix
index 5f9417bd03c8..0f65a5cee5ce 100644
--- a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libdivecomputer";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.libdivecomputer.org";
     description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
     maintainers = [ maintainers.mguentner ];
diff --git a/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix b/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix
index 0d82db7cee4e..0f332f8ac74c 100644
--- a/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libdivsufsort-2.0.1";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://github.com/y-256/libdivsufsort";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     description = "Library to construct the suffix array and the BW transformed string";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdmtx/default.nix b/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
index 0bdf3fbe15a0..994f010252fd 100644
--- a/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libdmtx-0.7.4";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   meta = {
     description = "An open source software for reading and writing Data Matrix barcodes";
     homepage = "http://libdmtx.org";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     maintainers = [ ];
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdnet/default.nix b/nixpkgs/pkgs/development/libraries/libdnet/default.nix
index 176e0a22abaf..43d9d2077fe3 100644
--- a/nixpkgs/pkgs/development/libraries/libdnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdnet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, libtool}:
+{lib, stdenv, fetchurl, automake, autoconf, libtool}:
 
 stdenv.mkDerivation {
   name = "libdnet-1.12";
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Provides a simplified, portable interface to several low-level networking routines";
     homepage = "https://github.com/dugsong/libdnet";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index b9825d9cfdff..3b5daad854c2 100644
--- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
+{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libpthreadstubs, libpciaccess
 , withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "bin" ];
 
-  nativeBuildInputs = [ pkgconfig meson ninja ];
+  nativeBuildInputs = [ pkg-config meson ninja ];
   buildInputs = [ libpthreadstubs libpciaccess ]
     ++ lib.optional withValgrind valgrind-light;
 
diff --git a/nixpkgs/pkgs/development/libraries/libdv/default.nix b/nixpkgs/pkgs/development/libraries/libdv/default.nix
index ed1e2cd74a3b..ff3c7f6f8631 100644
--- a/nixpkgs/pkgs/development/libraries/libdv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, popt }:
+{ lib, stdenv, fetchurl, popt }:
 
 stdenv.mkDerivation rec {
   name = "libdv-1.0.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # This fixes an undefined symbol: _sched_setscheduler error on compile.
   # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section
-  LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
+  LDFLAGS = lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
 
   configureFlags = [
     "--disable-asm"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ popt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = "https://sourceforge.net/projects/libdv/";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix b/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix
index 327aacb6f37e..5d539a7a4882 100644
--- a/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "libdvbpsi";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0";
     homepage = "http://www.videolan.org/developers/libdvbpsi.html";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.lgpl21;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix b/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix
index f097aad702ae..278e3d60d906 100644
--- a/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, IOKit}:
+{lib, stdenv, fetchurl, IOKit}:
 
 stdenv.mkDerivation rec {
   pname = "libdvdcss";
   version = "1.4.2";
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
+  buildInputs = lib.optional stdenv.isDarwin IOKit;
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.videolan.org/developers/libdvdcss.html";
     description = "A library for decrypting DVDs";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix
index c8ebf180b315..1f832de5bb3b 100644
--- a/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libdvdread}:
+{lib, stdenv, fetchurl, pkg-config, libdvdread}:
 
 stdenv.mkDerivation {
   name = "libdvdnav-4.2.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [libdvdread];
 
   configureScript = "./configure2"; # wtf?
@@ -20,9 +20,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library that implements DVD navigation features such as DVD menus";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.linux;
   };
 
   passthru = { inherit libdvdread; };
diff --git a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix
index 2afc11c60095..3eb1032b2a79 100644
--- a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libdvdread}:
+{lib, stdenv, fetchurl, pkg-config, libdvdread}:
 
 stdenv.mkDerivation rec {
   pname = "libdvdnav";
@@ -9,15 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [libdvdread];
 
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library that implements DVD navigation features such as DVD menus";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.unix;
   };
 
   passthru = { inherit libdvdread; };
diff --git a/nixpkgs/pkgs/development/libraries/libdvdread/4.9.9.nix b/nixpkgs/pkgs/development/libraries/libdvdread/4.9.9.nix
index 33b04b0f7c03..7049e1dd9935 100644
--- a/nixpkgs/pkgs/development/libraries/libdvdread/4.9.9.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdread/4.9.9.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, libdvdcss}:
+{lib, stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation {
   name = "libdvdread-4.9.9";
-  
+
   src = fetchurl {
     url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz";
     sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library for reading DVDs";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
index 997018a29709..32dfe4ee0fa5 100644
--- a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libdvdcss}:
+{lib, stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation rec {
   pname = "libdvdread";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library for reading DVDs";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
index ba4ebaec111a..0d512b04201a 100644
--- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libelf, zlib }:
+{ lib, stdenv, fetchurl, libelf, zlib }:
 
 let
   version = "20181024";
@@ -11,8 +11,8 @@ let
   };
   meta = {
     homepage = "https://www.prevanders.net/dwarf.html";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
   };
 
 in rec {
diff --git a/nixpkgs/pkgs/development/libraries/libdwg/default.nix b/nixpkgs/pkgs/development/libraries/libdwg/default.nix
index 9b1aa3132e93..5a0347e59542 100644
--- a/nixpkgs/pkgs/development/libraries/libdwg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdwg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, indent}:
+{lib, stdenv, fetchurl, indent}:
 
 stdenv.mkDerivation {
   name = "libdwg-0.6";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Library reading dwg files";
     homepage = "http://libdwg.sourceforge.net/en/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdynd/default.nix b/nixpkgs/pkgs/development/libraries/libdynd/default.nix
index cc9018421feb..4f1fd3904d98 100644
--- a/nixpkgs/pkgs/development/libraries/libdynd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdynd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 let version = "0.7.2"; in
 stdenv.mkDerivation {
@@ -26,12 +26,12 @@ stdenv.mkDerivation {
     "-Wno-error=deprecated-copy"
   ];
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   outputs = [ "out" "dev" ];
   outputDoc = "dev";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ dynamic ndarray library, with Python exposure";
     homepage = "http://libdynd.org";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libe-book/default.nix b/nixpkgs/pkgs/development/libraries/libe-book/default.nix
index 805b1869ac38..f467a01ea7ab 100644
--- a/nixpkgs/pkgs/development/libraries/libe-book/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libe-book/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu
+{ lib, stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu
 , cppunit, zlib, liblangtag
 }:
 
@@ -13,7 +13,7 @@ let
     sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gperf librevenge libxml2 boost icu cppunit zlib liblangtag
   ];
@@ -33,9 +33,9 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
   meta = {
     inherit (s) version;
-    description = ''Library for import of reflowable e-book formats'';
-    license = stdenv.lib.licenses.lgpl21Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "Library for import of reflowable e-book formats";
+    license = lib.licenses.lgpl21Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libe57format/default.nix b/nixpkgs/pkgs/development/libraries/libe57format/default.nix
index 137c73990f6a..49b75906bdbc 100644
--- a/nixpkgs/pkgs/development/libraries/libe57format/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libe57format/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   cmake,
   fetchFromGitHub,
   boost,
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading & writing the E57 file format (fork of E57RefImpl)";
     homepage = "https://github.com/asmaloney/libE57Format";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
index da7a186bea6f..70fab2da5688 100644
--- a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, strace, which }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, strace, which }:
 
 stdenv.mkDerivation rec {
   pname = "libeatmydata";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-  ] ++ stdenv.lib.optionals doCheck [ strace which ];
+  ] ++ lib.optionals doCheck [ strace which ];
 
   # while we can *build* in parallel, the tests also run in parallel which does
   # not work with v105. Later versions (unreleased) have a fix for that. The
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small LD_PRELOAD library to disable fsync and friends";
     homepage = "https://www.flamingspork.com/projects/libeatmydata/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libeb/default.nix b/nixpkgs/pkgs/development/libraries/libeb/default.nix
index 2fdb1d071b62..fe0011f9c997 100644
--- a/nixpkgs/pkgs/development/libraries/libeb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libeb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, zlib }:
+{ lib, stdenv, fetchurl, perl, zlib }:
 stdenv.mkDerivation rec {
   pname = "libeb";
   version = "4.4.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl ];
   buildInputs = [ zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for accessing Japanese CD-ROM books";
     longDescription = ''
       The EB library is a library for accessing CD-ROM books, which are a
diff --git a/nixpkgs/pkgs/development/libraries/libebml/default.nix b/nixpkgs/pkgs/development/libraries/libebml/default.nix
index 29c4b4c3b09f..5a8f1f003165 100644
--- a/nixpkgs/pkgs/development/libraries/libebml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libebml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libebml";
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=YES"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extensible Binary Meta Language library";
     homepage = "https://dl.matroska.org/downloads/libebml/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libebur128/default.nix b/nixpkgs/pkgs/development/libraries/libebur128/default.nix
index cb5291922989..ba4f84f8c803 100644
--- a/nixpkgs/pkgs/development/libraries/libebur128/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libebur128/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake speexdsp ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ speexdsp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the EBU R128 loudness standard";
     homepage = "https://github.com/jiixyj/libebur128";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libechonest/default.nix b/nixpkgs/pkgs/development/libraries/libechonest/default.nix
index cde046bf1327..29a0a63a03e7 100644
--- a/nixpkgs/pkgs/development/libraries/libechonest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libechonest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
 
 stdenv.mkDerivation rec {
   pname = "libechonest";
@@ -25,13 +25,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake doxygen ];
   buildInputs = [ qt4 qjson ];
 
-  enableParallelBuilding = true;
   doCheck = false; # requires network access
 
   meta = {
     description = "A C++/Qt wrapper around the Echo Nest API";
     homepage = "https://projects.kde.org/projects/playground/libs/libechonest";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix
index 09bd41dbed0b..92f3eeb79957 100644
--- a/nixpkgs/pkgs/development/libraries/libedit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "libedit";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.thrysoee.dk/editline/";
     description = "A port of the NetBSD Editline library (libedit)";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libee/default.nix b/nixpkgs/pkgs/development/libraries/libee/default.nix
index 36d88f88786d..7172df01e223 100644
--- a/nixpkgs/pkgs/development/libraries/libee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libestr }:
+{ lib, stdenv, fetchurl, pkg-config, libestr }:
 stdenv.mkDerivation {
   name = "libee-0.4.1";
 
@@ -7,13 +7,13 @@ stdenv.mkDerivation {
     sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libestr];
 
   meta = {
     homepage = "http://www.libee.org/";
     description = "An Event Expression Library inspired by CEE";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
index 635070512073..c3a4986c8321 100644
--- a/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk";
-    rev = (stdenv.lib.strings.toInt version);
+    rev = (lib.strings.toInt version);
     name = "elftoolchain-${version}";
   };
 
@@ -29,9 +29,9 @@ stdenv.mkDerivation (rec {
 
     homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/";
 
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
 
-    platforms = stdenv.lib.platforms.freebsd;
+    platforms = lib.platforms.freebsd;
     maintainers = [ ];
   };
 })
diff --git a/nixpkgs/pkgs/development/libraries/libelf/default.nix b/nixpkgs/pkgs/development/libraries/libelf/default.nix
index 2b56f973b5db..2b8cd51ba5f6 100644
--- a/nixpkgs/pkgs/development/libraries/libelf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libelf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, autoreconfHook, gettext
 }:
 
@@ -27,26 +27,26 @@ stdenv.mkDerivation rec {
   configureFlags = []
        # Configure check for dynamic lib support is broken, see
        # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes"
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes"
        # Libelf's custom NLS macros fail to determine the catalog file extension
        # on Darwin, so disable NLS for now.
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
+    ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
 
   nativeBuildInputs = [ gettext ]
        # Need to regenerate configure script with newer version in order to pass
        # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
        # which doesn't work with the bootstrapTools bash, so can only do this
        # for cross builds when `stdenv.shell` is a newer bash.
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook;
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook;
 
   meta = {
     description = "ELF object file access library";
 
     homepage = "https://github.com/Distrotech/libelf";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libelfin/default.nix b/nixpkgs/pkgs/development/libraries/libelfin/default.nix
index 8a8de854fc90..950639850db5 100644
--- a/nixpkgs/pkgs/development/libraries/libelfin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libelfin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, python3, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "libelfin";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/aclements/libelfin/";
     license = licenses.mit;
     description = "C++11 ELF/DWARF parser";
diff --git a/nixpkgs/pkgs/development/libraries/libepc/default.nix b/nixpkgs/pkgs/development/libraries/libepc/default.nix
index b8b28f49d1d5..ee8dfb6e94f7 100644
--- a/nixpkgs/pkgs/development/libraries/libepc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libepc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
 
 let
   avahiWithGtk = avahi.override { gtk3Support = true; };
@@ -9,12 +9,12 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91";
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     intltool
     gtk-doc
   ];
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy Publish and Consume Library";
     homepage = "https://wiki.gnome.org/Projects/libepc";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/liberfa/default.nix b/nixpkgs/pkgs/development/libraries/liberfa/default.nix
index a1ca15536da6..8ffd86cd3169 100644
--- a/nixpkgs/pkgs/development/libraries/liberfa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liberfa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "erfa";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-shared" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Essential Routines for Fundamental Astronomy";
     homepage = "https://github.com/liberfa/erfa";
     maintainers = with maintainers; [ mir06 ];
diff --git a/nixpkgs/pkgs/development/libraries/liberio/default.nix b/nixpkgs/pkgs/development/libraries/liberio/default.nix
index b4023d5f36a9..743455b836d5 100644
--- a/nixpkgs/pkgs/development/libraries/liberio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liberio/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , autoreconfHook
 , systemd
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ettus Research DMA I/O Library";
     homepage = "https://github.com/EttusResearch/liberio";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libesmtp/default.nix b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix
index e5a7f5609a38..542cff712c82 100644
--- a/nixpkgs/pkgs/development/libraries/libesmtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "libESMTP";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://brianstafford.info/libesmtp/index.html";
     description = "A Library for Posting Electronic Mail";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libestr/default.nix b/nixpkgs/pkgs/development/libraries/libestr/default.nix
index add7ea00a980..8699e83d0fd0 100644
--- a/nixpkgs/pkgs/development/libraries/libestr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libestr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libestr-0.1.11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libestr.adiscon.com/";
     description = "Some essentials for string handling";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libetpan/default.nix b/nixpkgs/pkgs/development/libraries/libetpan/default.nix
index 9050320773af..b4b48dcb777d 100644
--- a/nixpkgs/pkgs/development/libraries/libetpan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libetpan/default.nix
@@ -1,31 +1,29 @@
-{ stdenv, fetchFromGitHub
-, autoconf
-, automake
-, libtool
-, openssl
+{ stdenv, lib, fetchFromGitHub
+, autoconf, automake, libtool, openssl, pkg-config
 }:
 
 stdenv.mkDerivation rec {
   pname = "libetpan";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "dinhviethoa";
     repo = "libetpan";
     rev = version;
-    sha256 = "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f";
+    sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn";
   };
 
-  nativeBuildInputs = [ libtool autoconf automake ];
+  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
 
   buildInputs = [ openssl ];
 
   configureScript = "./autogen.sh";
 
-  meta = with stdenv.lib; {
-    description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP";
+  meta = with lib; {
+    description = "Mail Framework for the C Language";
     homepage = "http://www.etpan.org/libetpan.html";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ oxzi ];
     platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libev/default.nix b/nixpkgs/pkgs/development/libraries/libev/default.nix
index 1ea0615dc234..750cb3974cf7 100644
--- a/nixpkgs/pkgs/development/libraries/libev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libev/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, static ? false }:
+{ lib, stdenv, fetchurl
+, # Note: -static hasn’t work on darwin
+  static ? with stdenv.hostPlatform; isStatic && !isDarwin
+}:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -14,12 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh";
   };
 
-  configureFlags = stdenv.lib.optional (static) "LDFLAGS=-static";
+  configureFlags = lib.optional (static) "LDFLAGS=-static";
 
   meta = {
     description = "A high-performance event loop/event model with lots of features";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.bsd2; # or GPL2+
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd2; # or GPL2+
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/nixpkgs/pkgs/development/libraries/libevdev/default.nix
index ba846ed07db2..daae6984ab25 100644
--- a/nixpkgs/pkgs/development/libraries/libevdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python3 }:
+{ lib, stdenv, fetchurl, fetchpatch, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "libevdev";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wrapper library for evdev devices";
     homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix b/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix
index 0f2b3e052665..66c5f1b06964 100644
--- a/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libevdevplus";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "18z6pn4j7fhmwwh0q22ip5nn7sc1hfgwvkdzqhkja60i8cw2cvvj";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Easy-to-use event device library in C++";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix
index cbde32067172..b33e94114f63 100644
--- a/nixpkgs/pkgs/development/libraries/libevent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, findutils, fixDarwinDylibNames
+{ lib, stdenv, fetchurl, findutils, fixDarwinDylibNames
 , sslSupport? true, openssl
 }:
 
@@ -16,25 +16,25 @@ stdenv.mkDerivation rec {
   # libevent_openssl is moved into its own output, so that openssl isn't present
   # in the default closure.
   outputs = [ "out" "dev" ]
-    ++ stdenv.lib.optional sslSupport "openssl"
+    ++ lib.optional sslSupport "openssl"
     ;
   outputBin = "dev";
   propagatedBuildOutputs = [ "out" ]
-    ++ stdenv.lib.optional sslSupport "openssl"
+    ++ lib.optional sslSupport "openssl"
     ;
 
   nativeBuildInputs = []
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
     ;
 
   buildInputs = []
-    ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optional stdenv.isCygwin findutils
+    ++ lib.optional sslSupport openssl
+    ++ lib.optional stdenv.isCygwin findutils
     ;
 
   doCheck = false; # needs the net
 
-  postInstall = stdenv.lib.optionalString sslSupport ''
+  postInstall = lib.optionalString sslSupport ''
     moveToOutput "lib/libevent_openssl*" "$openssl"
     substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \
       --replace "$out" "$openssl"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Event notification library";
     longDescription = ''
       The libevent API provides a mechanism to execute a callback function
diff --git a/nixpkgs/pkgs/development/libraries/libewf/default.nix b/nixpkgs/pkgs/development/libraries/libewf/default.nix
index ff644599b8a6..f38f09410ff1 100644
--- a/nixpkgs/pkgs/development/libraries/libewf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libewf/default.nix
@@ -1,23 +1,23 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }:
+{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }:
 
 stdenv.mkDerivation rec {
-  version = "20201129";
+  version = "20201210";
   pname = "libewf";
 
   src = fetchurl {
     url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
-    sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk";
+    sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc=";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib openssl libuuid ];
 
   meta = {
     description = "Library for support of the Expert Witness Compression Format";
     homepage = "https://sourceforge.net/projects/libewf/";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.raskin ] ;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl3;
+    maintainers = [ lib.maintainers.raskin ] ;
+    platforms = lib.platforms.unix;
     inherit version;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
index feee754590b6..f3f89209707a 100644
--- a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , enableStatic ? true
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -33,21 +33,21 @@ stdenv.mkDerivation rec {
   makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ];
 
   buildFlags =
-      stdenv.lib.optional enableStatic "static"
-   ++ stdenv.lib.optional enableShared "dynamic";
+      lib.optional enableStatic "static"
+   ++ lib.optional enableShared "dynamic";
 
   patchFlags = [ "-p0" ];
 
   installPhase = ''
     install -Dm644 execinfo.h stacktraverse.h -t $out/include
-  '' + stdenv.lib.optionalString enableShared ''
+  '' + lib.optionalString enableShared ''
     install -Dm755 libexecinfo.so.1 -t $out/lib
     ln -s $out/lib/libexecinfo.so{.1,}
-  '' + stdenv.lib.optionalString enableStatic ''
+  '' + lib.optionalString enableStatic ''
     install -Dm755 libexecinfo.a -t $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility";
     license = licenses.bsd2;
     homepage = "https://www.freshports.org/devel/libexecinfo";
diff --git a/nixpkgs/pkgs/development/libraries/libexif/default.nix b/nixpkgs/pkgs/development/libraries/libexif/default.nix
index a0f831e927ef..20e69c4ad664 100644
--- a/nixpkgs/pkgs/development/libraries/libexif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libexif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "libexif";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook gettext ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libexif.github.io/";
     description = "A library to read and manipulate EXIF data in digital photographs";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/nixpkgs/pkgs/development/libraries/libextractor/default.nix
index f7e9606bbe77..59916bfb33f7 100644
--- a/nixpkgs/pkgs/development/libraries/libextractor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libextractor/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, substituteAll
+{ fetchurl, lib, stdenv, substituteAll
 , libtool, gettext, zlib, bzip2, flac, libvorbis
-, exiv2, libgsf, rpm, pkgconfig, fetchpatch
+, exiv2, libgsf, rpm, pkg-config, fetchpatch
 , gstreamerSupport ? true, gst_all_1 ? null
 # ^ Needed e.g. for proper id3 and FLAC support.
 #   Set to `false` to decrease package closure size by about 87 MB (53%).
@@ -41,12 +41,12 @@ stdenv.mkDerivation rec {
       sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw";
       excludes = [ "ChangeLog" ];
     })
-  ] ++ stdenv.lib.optionals gstreamerSupport [
+  ] ++ lib.optionals gstreamerSupport [
 
     # Libraries cannot be wrapped so we need to hardcode the plug-in paths.
     (substituteAll {
       src = ./gst-hardcode-plugins.patch;
-      load_gst_plugins = stdenv.lib.concatMapStrings
+      load_gst_plugins = lib.concatMapStrings
         (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'')
         (gstPlugins gst_all_1);
     })
@@ -61,11 +61,11 @@ stdenv.mkDerivation rec {
   buildInputs =
    [ libtool gettext zlib bzip2 flac libvorbis exiv2
      libgsf rpm
-     pkgconfig
-   ] ++ stdenv.lib.optionals gstreamerSupport
+     pkg-config
+   ] ++ lib.optionals gstreamerSupport
           ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
-     ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ]
-     ++ stdenv.lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ];
+     ++ lib.optionals gtkSupport [ glib gtk3 ]
+     ++ lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ];
 
   configureFlags = [
     "--disable-ltdl-install"
@@ -105,9 +105,9 @@ stdenv.mkDerivation rec {
          additional MIME types are detected.
       '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix b/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix
index 3adb606dd2d5..8e5cc8685da9 100644
--- a/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libexttextcat-3.4.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
     homepage = "https://wiki.documentfoundation.org/Libexttextcat";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/libf2c/default.nix b/nixpkgs/pkgs/development/libraries/libf2c/default.nix
index 66b193d4ea8d..85ff493ca04e 100644
--- a/nixpkgs/pkgs/development/libraries/libf2c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libf2c/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
   name = "libf2c-20160102";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "F2c converts Fortran 77 source code to C";
     homepage = "http://www.netlib.org/f2c/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libfakekey/default.nix b/nixpkgs/pkgs/development/libraries/libfakekey/default.nix
index f95d150cc250..3e568759c1bc 100644
--- a/nixpkgs/pkgs/development/libraries/libfakekey/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfakekey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }:
+{ lib, stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }:
 
 stdenv.mkDerivation rec {
   pname = "libfakekey";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libX11 libXi libXtst xorgproto ];
   NIX_LDFLAGS = "-lX11";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "X virtual keyboard library";
     homepage = "https://www.yoctoproject.org/tools-resources/projects/matchbox";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
index 6c751e07b831..170bb116a8a8 100644
--- a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libfaketime";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-date-in-gzip-man-page.patch
-  ] ++ (stdenv.lib.optionals stdenv.cc.isClang [
+  ] ++ (lib.optionals stdenv.cc.isClang [
     # https://github.com/wolfcw/libfaketime/issues/277
     ./0001-Remove-unsupported-clang-flags.patch
   ]);
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
   PREFIX = placeholder "out";
   LIBDIRNAME = "/lib";
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation";
 
   checkInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Report faked system time to programs without having to change the system-wide time";
     homepage = "https://github.com/wolfcw/libfaketime/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libff/default.nix b/nixpkgs/pkgs/development/libraries/libff/default.nix
index 874f45cae709..72d2406aa82b 100644
--- a/nixpkgs/pkgs/development/libraries/libff/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libff";
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
 
   # CMake is hardcoded to always build static library which causes linker
   # failure for Haskell applications depending on haskellPackages.hevm on macOS.
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED"
   '';
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ boost gmp openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for Finite Fields and Elliptic Curves";
     changelog = "https://github.com/scipr-lab/libff/blob/develop/CHANGELOG.md";
     homepage = "https://github.com/scipr-lab/libff";
diff --git a/nixpkgs/pkgs/development/libraries/libffcall/default.nix b/nixpkgs/pkgs/development/libraries/libffcall/default.nix
index 7fdc04d116ef..8967ec49a094 100644
--- a/nixpkgs/pkgs/development/libraries/libffcall/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libffcall/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libffcall";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Foreign function call library";
     homepage = "https://www.gnu.org/software/libffcall/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libffi/default.nix b/nixpkgs/pkgs/development/libraries/libffi/default.nix
index d7dad6d956d7..29b76e34d652 100644
--- a/nixpkgs/pkgs/development/libraries/libffi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , autoreconfHook
 
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A foreign function call interface library";
     longDescription = ''
       The libffi library provides a portable, high level programming
diff --git a/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/nixpkgs/pkgs/development/libraries/libfido2/default.nix
index 48b457b09ded..f44ae4d01f24 100644
--- a/nixpkgs/pkgs/development/libraries/libfido2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfido2/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , cmake
-, pkgconfig
+, pkg-config
 , hidapi
 , libcbor
 , openssl
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "08iizxq3w8mpkwfrfpl59csffc20yz8x398bl3kf23rrr4izk42r";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ hidapi libcbor openssl ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ udev ];
+    ++ lib.optionals stdenv.isLinux [ udev ];
 
   cmakeFlags = [
     "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
     Provides library functionality for FIDO 2.0, including communication with a device over USB.
     '';
diff --git a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix
index e5b76b1435fa..daacf325e973 100644
--- a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix
@@ -1,31 +1,31 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , gettext
 , gnutls
 , nettle
-, pkgconfig
+, pkg-config
 , libiconv
 , ApplicationServices
 }:
 
 stdenv.mkDerivation rec {
   pname = "libfilezilla";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv";
+    sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ gettext gnutls nettle ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lib.filezilla-project.org/";
     description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libfishsound/default.nix b/nixpkgs/pkgs/development/libraries/libfishsound/default.nix
index 23d828033e3e..72dc29867115 100644
--- a/nixpkgs/pkgs/development/libraries/libfishsound/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfishsound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }:
+{ lib, stdenv, fetchurl, libvorbis, speex, flac, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libfishsound-1.0.0";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libvorbis speex flac ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://xiph.org/fishsound/";
     description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)";
     longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files.
diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix
index 2670f94fbc2f..0f6ad84fe755 100644
--- a/nixpkgs/pkgs/development/libraries/libfive/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , cmake
 , ninja
-, pkgconfig
+, pkg-config
 , eigen
 , zlib
 , libpng
@@ -23,7 +23,7 @@ mkDerivation {
     sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg";
   };
 
-  nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ];
+  nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
   buildInputs = [ eigen zlib libpng boost guile ];
 
   # Link "Studio" binary to "libfive-studio" to be more obvious:
diff --git a/nixpkgs/pkgs/development/libraries/libfixposix/default.nix b/nixpkgs/pkgs/development/libraries/libfixposix/default.nix
index 4fdb22f8bd49..d8659b9e15f0 100644
--- a/nixpkgs/pkgs/development/libraries/libfixposix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfixposix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libfixposix";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sionescu/libfixposix";
     description = "Thin wrapper over POSIX syscalls and some replacement functionality";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/libfm/default.nix b/nixpkgs/pkgs/development/libraries/libfm/default.nix
index 94476984de00..dc8359241257 100644
--- a/nixpkgs/pkgs/development/libraries/libfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfm/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala
+{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala
 , extraOnly ? false
 , withGtk3 ? false, gtk2, gtk3 }:
 let
     gtk = if withGtk3 then gtk3 else gtk2;
-    inherit (stdenv.lib) optional;
+    inherit (lib) optional;
 in
 stdenv.mkDerivation rec {
   name = if extraOnly
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn";
   };
 
-  nativeBuildInputs = [ vala pkgconfig intltool ];
+  nativeBuildInputs = [ vala pkg-config intltool ];
   buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache;
 
   configureFlags = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://blog.lxde.org/category/pcmanfm/";
     license = licenses.lgpl21Plus;
     description = "A glib-based library for file management";
diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix
index 4984d95ffa4e..f3f7313accbb 100644
--- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , gusb
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     meson
     ninja
     gtk-doc
@@ -44,11 +44,13 @@ stdenv.mkDerivation rec {
     nss
   ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
+
   mesonFlags = [
     "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fprint.freedesktop.org/";
     description = "A library designed to make it easy to add support for consumer fingerprint readers";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libfpx/default.nix b/nixpkgs/pkgs/development/libraries/libfpx/default.nix
index 52c64ed8629c..2576d426af55 100644
--- a/nixpkgs/pkgs/development/libraries/libfpx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfpx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "libfpx-1.3.1-7";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   # Darwin gets misdetected as Windows without this
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__unix";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix";
 
   patches = [
     (fetchpatch {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
   '' else null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.imagemagick.org";
     description = "A library for manipulating FlashPIX images";
     license = "Flashpix";
diff --git a/nixpkgs/pkgs/development/libraries/libfreefare/default.nix b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix
index 4af7d44a2945..9fd8c1e6b613 100644
--- a/nixpkgs/pkgs/development/libraries/libfreefare/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libnfc, openssl
+{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl
 , libobjc ? null }:
 
 stdenv.mkDerivation {
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
     sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc;
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ libnfc openssl ] ++ lib.optional stdenv.isDarwin libobjc;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations";
     license = licenses.lgpl3;
     homepage = "https://github.com/nfc-tools/libfreefare";
diff --git a/nixpkgs/pkgs/development/libraries/libfsm/default.nix b/nixpkgs/pkgs/development/libraries/libfsm/default.nix
index e1c7f892aabd..5e3c40da82c7 100644
--- a/nixpkgs/pkgs/development/libraries/libfsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfsm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , bmake
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  # fix up multi-output install. we also have to fix the pkgconfig libdir
+  # fix up multi-output install. we also have to fix the pkg-config libdir
   # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in
   # our case; libdir should really be set to the $lib output.
   postInstall = ''
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DFA regular expression library & friends";
     homepage    = "https://github.com/katef/libfsm";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix b/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix
index 0e2e24d0f3b4..ae599a97529b 100644
--- a/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse
+{ lib, stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse
 , cppSupport ? true, boost ? null
 , pythonSupport ? true, python3 ? null, swig ? null
 , docSupport ? true, doxygen ? null
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = with stdenv.lib; [ libconfuse ]
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = with lib; [ libconfuse ]
     ++ optionals cppSupport [ boost ]
     ++ optionals pythonSupport [ python3 swig ]
     ++ optionals docSupport [ doxygen ];
 
-  preBuild = stdenv.lib.optionalString docSupport ''
+  preBuild = lib.optionalString docSupport ''
     make doc_i
   '';
 
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/etc/udev/rules.d/"
     cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/"
     cp -r doc/man "$out/share/"
-  '' + stdenv.lib.optionalString docSupport ''
+  '' + lib.optionalString docSupport ''
     mkdir -p "$out/share/libftdi/doc/"
     cp -r doc/html "$out/share/libftdi/doc/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to talk to FTDI chips using libusb";
     homepage = "https://www.intra2net.com/en/developer/libftdi/";
     license = with licenses; [ lgpl2 gpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
index 5ce8cd6c6a1d..69b7bdc7d1e1 100644
--- a/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnum4 }:
+{ lib, stdenv, fetchurl, gnum4 }:
 
 stdenv.mkDerivation rec {
   pname = "libfyaml";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gnum4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pantoniou/libfyaml";
     description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libgadu/default.nix b/nixpkgs/pkgs/development/libraries/libgadu/default.nix
index 4e9ce765b963..72bf067b2db4 100644
--- a/nixpkgs/pkgs/development/libraries/libgadu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgadu/default.nix
@@ -1,21 +1,25 @@
-{stdenv, fetchurl, zlib}:
+{ lib, stdenv, fetchFromGitHub, zlib, protobufc, autoreconfHook }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "libgadu";
+  version = "1.12.2";
 
-  name = "libgadu-1.11.2";
-
-  src = fetchurl {
-    url = "http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz";
-    sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z";
+  src = fetchFromGitHub {
+    owner = "wojtekka";
+    repo = pname;
+    rev = version;
+    sha256 = "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h";
   };
 
   propagatedBuildInputs = [ zlib ];
+  buildInputs = [ protobufc ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   meta = {
     description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)";
-    homepage = "http://toxygen.net/libgadu/";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl21;
+    homepage = "https://libgadu.net/index.en.html";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl21;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix b/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix
index c0aa67238bff..f059d6c73a2f 100644
--- a/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gettext
+{ lib, stdenv, fetchurl, cmake, pkg-config, gettext
 , gtk2, libcanberra, libnotify, pcre, sqlite, xorg
 , harfbuzz
 }:
@@ -14,14 +14,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "bin" ];
 
-  nativeBuildInputs = [ cmake pkgconfig gettext ];
+  nativeBuildInputs = [ cmake pkg-config gettext ];
 
   propagatedBuildInputs = [
     gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs
   ];
 
-  enableParallelBuilding = true;
-
   cmakeFlags = [
     "-DINSTALL_CMAKE_MODULESDIR=lib/cmake"
     "-DINSTALL_PKGCONFIGDIR=lib/pkgconfig"
@@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides functionality for gaming input devices";
     homepage = "https://sourceforge.net/projects/libgaminggear/";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix
index 9de5cf2d2d1b..f90ea502c406 100644
--- a/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix
+++ b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     (fetchpatch {
       name = "fix-x86_64-apple-darwin.patch";
       sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi";
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postInstall = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
-  '' + stdenv.lib.optionalString enableCapabilities ''
+  '' + lib.optionalString enableCapabilities ''
     sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/libgcrypt/";
     description = "General-pupose cryptographic library";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
index cd529cb06ee6..6c6d73740f20 100644
--- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
+{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
 , buildPackages
 }:
 
@@ -19,16 +19,16 @@ stdenv.mkDerivation rec {
   # The CPU Jitter random number generator must not be compiled with
   # optimizations and the optimize -O0 pragma only works for gcc.
   # The build enables -O2 by default for everything else.
-  hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
+  hardeningDisable = lib.optional stdenv.cc.isClang "fortify";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = [ libgpgerror ]
-    ++ stdenv.lib.optional stdenv.isDarwin gettext
-    ++ stdenv.lib.optional enableCapabilities libcap;
+    ++ lib.optional stdenv.isDarwin gettext
+    ++ lib.optional enableCapabilities libcap;
 
   configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
-   ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
+   ++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
 
   # Necessary to generate correct assembly when compiling for aarch32 on
   # aarch64
@@ -43,20 +43,20 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postFixup = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
-  '' + stdenv.lib.optionalString enableCapabilities ''
+  '' + lib.optionalString enableCapabilities ''
     sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   # TODO: figure out why this is even necessary and why the missing dylib only crashes
   # random instead of every test
-  preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+  preCheck = lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/lib
     cp src/.libs/libgcrypt.20.dylib $out/lib
   '';
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/libgcrypt/";
     description = "General-purpose cryptographic library";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libgda/default.nix b/nixpkgs/pkgs/development/libraries/libgda/default.nix
index f0b430c91d81..73e71de4aac6 100644
--- a/nixpkgs/pkgs/development/libraries/libgda/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgda/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
-, overrideCC, gcc6
+{ lib, stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
+, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools
 , mysqlSupport ? false, libmysqlclient ? null
 , postgresSupport ? false, postgresql ? null
 }:
@@ -12,11 +12,19 @@ assert postgresSupport -> postgresql != null;
   version = "5.2.10";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g";
   };
-  configureFlags = with stdenv.lib; [
-    "--enable-gi-system-install=no"
+
+  patches = [
+    # fix compile error with mysql
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff";
+      sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv";
+    })
+  ];
+
+  configureFlags = with lib; [
     "--with-mysql=${if mysqlSupport then "yes" else "no"}"
     "--with-postgres=${if postgresSupport then "yes" else "no"}"
 
@@ -32,8 +40,8 @@ assert postgresSupport -> postgresql != null;
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
-  buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
+  nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ];
+  buildInputs = with lib; [ gtk3 openssl libgee ]
     ++ optional (mysqlSupport) libmysqlclient
     ++ optional (postgresSupport) postgresql;
 
@@ -43,7 +51,7 @@ assert postgresSupport -> postgresql != null;
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database access library";
     homepage = "https://www.gnome-db.org/";
     license = [ licenses.lgpl2 licenses.gpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/libgdamm/default.nix b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix
index be3e2e469ade..44a0e8bc2121 100644
--- a/nixpkgs/pkgs/development/libraries/libgdamm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3
+{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3
 , mysqlSupport ? false
 , postgresSupport ? false }:
 
@@ -13,11 +13,11 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glibmm libxml2 ];
   propagatedBuildInputs = [ gda ];
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ bindings for libgda";
     homepage = "https://www.gnome-db.org/";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix
index 50eac4057062..86e3f4274fcf 100644
--- a/nixpkgs/pkgs/development/libraries/libgdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , nixosTests
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga";
   };
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
   ];
 
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GData API library";
     homepage = "https://wiki.gnome.org/Projects/libgdata";
     maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
index 70043d1132d0..705205df396c 100644
--- a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig
 , libtiff, giflib, libjpeg, libpng
 , libXrender, libexif, autoreconfHook, fetchpatch }:
 
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}";
+  configureFlags = lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}";
 
   enableParallelBuilding = true;
 
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
     [ glib cairo fontconfig libtiff giflib
       libjpeg libpng libXrender libexif
     ]
-    ++ stdenv.lib.optional stdenv.isDarwin Carbon;
+    ++ lib.optional stdenv.isDarwin Carbon;
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
   '';
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     make check -w
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
     homepage = "https://www.mono-project.com/docs/gui/libgdiplus/";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libgee/default.nix b/nixpkgs/pkgs/development/libraries/libgee/default.nix
index c2d1c197fe96..407b99b5a57b 100644
--- a/nixpkgs/pkgs/development/libraries/libgee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libgee";
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh";
   };
 
   doCheck = true;
 
-  nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ];
+  nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ];
   buildInputs = [ glib ];
 
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
     homepage = "https://wiki.gnome.org/Projects/Libgee";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix
index 1b973fd5eeeb..eb35d5316c0e 100644
--- a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.5.1";
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
     homepage = "https://github.com/OSGeo/libgeotiff";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libgepub/default.nix b/nixpkgs/pkgs/development/libraries/libgepub/default.nix
index cf62e0cabc9d..e058c7ed5af3 100644
--- a/nixpkgs/pkgs/development/libraries/libgepub/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgepub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3
 , webkitgtk, libsoup, libxml2, libarchive }:
 
 stdenv.mkDerivation rec {
@@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
   version = "0.6.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7";
   };
 
   doCheck = true;
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
   buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];
 
   passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject based library for handling and rendering epub documents";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libgig/default.nix b/nixpkgs/pkgs/development/libraries/libgig/default.nix
index 84d44969a142..f78a51db5de6 100644
--- a/nixpkgs/pkgs/development/libraries/libgig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:
+{ lib, stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }:
 
 stdenv.mkDerivation rec {
   pname = "libgig";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
 
   buildInputs = [ libsndfile libuuid ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.linuxsampler.org";
     description = "Gigasampler file access library";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix
index 9a05a01bee61..fe36a9d663f3 100644
--- a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2
+{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2
 , gtk-doc, gobject-introspection, libgit2, glib, python3 }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.99.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig vala gtk-doc gobject-introspection
+    meson ninja pkg-config vala gtk-doc gobject-introspection
   ];
 
   propagatedBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     python3.pkgs.pygobject3 # this should really be a propagated input of python output
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A glib wrapper library around the libgit2 git access library";
     homepage = "https://wiki.gnome.org/Projects/Libgit2-glib";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libgksu/default.nix b/nixpkgs/pkgs/development/libraries/libgksu/default.nix
index 9ead3a97c048..cf8f5ab48786 100644
--- a/nixpkgs/pkgs/development/libraries/libgksu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgksu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
+{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3,
   libstartup_notification, libgtop, perlPackages,
   autoreconfHook, intltool, docbook_xsl, xauth
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook
+    pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook
   ];
 
   buildInputs = [
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
       programs in an X session.
     '';
     homepage = "https://www.nongnu.org/gksu/";
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl2;
+    maintainers = [ lib.maintainers.romildo ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
index 3a4737d483bf..88ba7dacc22f 100644
--- a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
   pname = "libglvnd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ];
+  nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ];
   buildInputs = [ libX11 libXext xorgproto ];
 
   postPatch = lib.optionalString stdenv.isDarwin ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional stdenv.cc.isClang "-Wno-error");
 
   # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
-  configureFlags  = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
+  configureFlags  = lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
 
   outputs = [ "out" "dev" ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit (addOpenGLRunpath) driverLink; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GL Vendor-Neutral Dispatch library";
     homepage = "https://github.com/NVIDIA/libglvnd";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix
index 33a6a075ae44..3f5a5961ba0f 100644
--- a/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }:
+{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }:
 
 stdenv.mkDerivation rec {
   pname = "libgnome-keyring";
   version = "2.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n";
   };
 
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ glib dbus libgcrypt ];
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkg-config intltool ];
 
   meta = {
     inherit (glib.meta) platforms maintainers;
     homepage = "https://wiki.gnome.org/Projects/GnomeKeyring";
-    license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
+    license = with lib.licenses; [ gpl2 lgpl2 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix b/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix
index c02fd503eb0d..62228b8837a8 100644
--- a/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libgnomekbd";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     file
     intltool
-    pkgconfig
+    pkg-config
     wrapGAppsHook
   ];
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Keyboard management library";
     maintainers = teams.gnome.members;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libgnurl/default.nix b/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
index 5daeba2c06e6..a7d91d0c81ad 100644
--- a/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls,
+{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls,
   libidn2, libunistring, nghttp2 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi";
   };
 
-  nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
+  nativeBuildInputs = [ libtool groff perl pkg-config python2 ];
 
   buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     "--without-librtmp"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fork of libcurl used by GNUnet";
     homepage    = "https://gnunet.org/en/gnurl.html";
     maintainers = with maintainers; [ vrthra ];
diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
index 972ca4c04a57..39d0b185660f 100644
--- a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation (rec {
 
   doCheck = true; # not cross
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
     description = "A small library that defines common error values for all GnuPG components";
 
diff --git a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
index 89bca2ee75fb..4dec3151a7cd 100644
--- a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
 , libusb1
 , libtool
 , libexif
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
     gettext
     libtool
   ];
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
       from digital cameras.
     '';
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = with lib.platforms; unix;
+    maintainers = with lib.maintainers; [ jcumming ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix
index a3178e548048..8f6d9fcab5ed 100644
--- a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod
+{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod
 , enable-tools ? true
 , enablePython ? false, python3, ncurses }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
   nativeBuildInputs = [
     autoconf-archive
-    pkgconfig
+    pkg-config
     autoreconfHook
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libgpod/default.nix b/nixpkgs/pkgs/development/libraries/libgpod/default.nix
index d23a52382950..49dcec3ee781 100644
--- a/nixpkgs/pkgs/development/libraries/libgpod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgpod/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gtkpod.sourceforge.net/";
     description = "Library used by gtkpod to access the contents of an ipod";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libgringotts/default.nix b/nixpkgs/pkgs/development/libraries/libgringotts/default.nix
index 323f5af70973..16595a12eb50 100644
--- a/nixpkgs/pkgs/development/libraries/libgringotts/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgringotts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }:
+{ lib, stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }:
 
 stdenv.mkDerivation rec {
   pname = "libgringotts";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib bzip2 libmcrypt libmhash ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small library to encapsulate data in an encrypted structure";
     homepage = "http://libgringotts.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libgroove/default.nix b/nixpkgs/pkgs/development/libraries/libgroove/default.nix
index 3fea527c450e..963bf722b2a3 100644
--- a/nixpkgs/pkgs/development/libraries/libgroove/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgroove/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }:
+{ lib, stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }:
 
 stdenv.mkDerivation rec {
   version = "4.3.0";
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./no-warnings-as-errors.patch ];
 
-  buildInputs = [ cmake libav SDL2 chromaprint libebur128 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libav SDL2 chromaprint libebur128 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Streaming audio processing library";
     homepage = "https://github.com/andrewrk/libgroove";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libgrss/default.nix b/nixpkgs/pkgs/development/libraries/libgrss/default.nix
index fdad5369813f..b8c7c7bc4977 100644
--- a/nixpkgs/pkgs/development/libraries/libgrss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgrss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
 
 let
   version = "0.7.0";
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
   };
 
-  nativeBuildInputs = [ pkgconfig vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ glib libxml2 libsoup ];
 
   configureFlags = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Glib abstaction to handle feeds in RSS, Atom and other formats";
     homepage = "https://wiki.gnome.org/Projects/Libgrss";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/nixpkgs/pkgs/development/libraries/libgsf/default.nix
index 34cb1ef3381f..77fa161b773a 100644
--- a/nixpkgs/pkgs/development/libraries/libgsf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgsf/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
+{ fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2
 , perl, gdk-pixbuf, libiconv, libintl, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   version = "1.14.47";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool libintl ];
+  nativeBuildInputs = [ pkg-config intltool libintl ];
 
   buildInputs = [ gettext bzip2 zlib ];
   checkInputs = [ perl ];
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNOME's Structured File Library";
     homepage    = "https://www.gnome.org/projects/libgsf";
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = lib.platforms.unix;
 
     longDescription = ''
       Libgsf aims to provide an efficient extensible I/O abstraction for
diff --git a/nixpkgs/pkgs/development/libraries/libgssglue/default.nix b/nixpkgs/pkgs/development/libraries/libgssglue/default.nix
index d13c0940205f..678af459a30d 100644
--- a/nixpkgs/pkgs/development/libraries/libgssglue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgssglue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kerberos }:
+{ lib, stdenv, fetchurl, kerberos }:
 
 stdenv.mkDerivation rec {
   name = "libgssglue-0.4";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/";
     description = "Exports a gssapi interface which calls other random gssapi libraries";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libgtop/default.nix b/nixpkgs/pkgs/development/libraries/libgtop/default.nix
index 65f5e2750e51..af4fe04a0b42 100644
--- a/nixpkgs/pkgs/development/libraries/libgtop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgtop/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , glib
-, pkgconfig
+, pkg-config
 , perl
 , gettext
 , gobject-introspection
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   version = "2.40.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq";
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     gtk-doc
     perl
     gettext
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that reads information about processes and the running system";
     license = licenses.gpl2Plus;
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/nixpkgs/pkgs/development/libraries/libgudev/default.nix
index c7c3064acb8d..feeae05bf526 100644
--- a/nixpkgs/pkgs/development/libraries/libgudev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgudev/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , udev
 , glib
 , gobject-introspection
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv";
   };
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection ];
+  nativeBuildInputs = [ pkg-config gobject-introspection ];
   buildInputs = [ udev glib ];
 
   # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that provides GObject bindings for libudev";
     homepage = "https://wiki.gnome.org/Projects/libgudev";
     maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix
index b875b3579037..0f56f8c97f38 100644
--- a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
-, gmp, readline, file, numactl, xen, libapparmor, jansson
+, gmp, readline, file, numactl, libapparmor, jansson
 , getopt, perlPackages, ocamlPackages
 , libtirpc
 , appliance ? null
 , javaSupport ? false, jdk ? null }:
 
-assert appliance == null || stdenv.lib.isDerivation appliance;
+assert appliance == null || lib.isDerivation appliance;
 assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
@@ -19,16 +19,16 @@ stdenv.mkDerivation rec {
     sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058";
   };
 
-  nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
   buildInputs = [
     ncurses cpio gperf jansson
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex db
-    numactl xen libapparmor getopt perlPackages.ModuleBuild
+    numactl libapparmor getopt perlPackages.ModuleBuild
     libtirpc
   ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
     ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ])
-    ++ stdenv.lib.optional javaSupport jdk;
+    ++ lib.optional javaSupport jdk;
 
   prePatch = ''
     # build-time scripts
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
   configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ]
-    ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
+    ++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
   patches = [ ./libguestfs-syms.patch ];
   NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
   installFlags = [ "REALLY_INSTALL=yes" ];
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  postFixup = stdenv.lib.optionalString (appliance != null) ''
+  postFixup = lib.optionalString (appliance != null) ''
     mkdir -p $out/{lib,lib64}
     ln -s ${appliance} $out/lib64/guestfs
     ln -s ${appliance} $out/lib/guestfs
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     runHook postInstallCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for accessing and modifying virtual machine disk images";
     license = with licenses; [ gpl2 lgpl21 ];
     homepage = "https://libguestfs.org/";
diff --git a/nixpkgs/pkgs/development/libraries/libgumath/default.nix b/nixpkgs/pkgs/development/libraries/libgumath/default.nix
index 55e89d876649..f82401f524fa 100644
--- a/nixpkgs/pkgs/development/libraries/libgumath/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgumath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libndtypes
 , libxnd
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library supporting function dispatch on general data containers. C base and Python wrapper";
     homepage = "https://xnd.io/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/nixpkgs/pkgs/development/libraries/libgweather/default.nix
index 5493343fc239..9351d3f707fa 100644
--- a/nixpkgs/pkgs/development/libraries/libgweather/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgweather/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
+  nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
   buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ];
 
   postPatch = ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to access weather information from online services for numerous locations";
     homepage = "https://wiki.gnome.org/Projects/LibGWeather";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/nixpkgs/pkgs/development/libraries/libgxps/default.nix
index 095b5c8f61cf..f7392ffb7dd5 100644
--- a/nixpkgs/pkgs/development/libraries/libgxps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgxps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo
 , libarchive, freetype, libjpeg, libtiff, gnome3, lcms2
 }:
 
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
   version = "0.3.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
   buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ];
   propagatedBuildInputs = [ libarchive ];
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GObject based library for handling and rendering XPS documents";
     homepage = "https://wiki.gnome.org/Projects/libgxps";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix b/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix
index 9cf4f615dd28..ff2093255cf0 100644
--- a/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
+{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , gtk3, gnome3
 , dbus, xvfb_run, libxml2
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gobject-introspection vala libxml2
+    meson ninja pkg-config gobject-introspection vala libxml2
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
   buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       meson test --print-errorlogs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library full of GTK widgets for mobile phones";
     homepage = "https://source.puri.sm/Librem5/libhandy";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
index 7dce08b4cc24..5ab6dde09d78 100644
--- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , vala
 , gtk-doc
@@ -23,14 +23,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libhandy";
-  version = "1.0.2";
+  version = "1.0.3";
 
   outputs = [ "out" "dev" "devdoc" "glade" ];
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o=";
   };
 
   nativeBuildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     libxml2
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
   ];
 
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     "-Dgtk_doc=true"
   ];
 
-  # Uses define_variable in pkgconfig, but we still need it to use the glade output
+  # Uses define_variable in pkg-config, but we still need it to use the glade output
   PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
   PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
 
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
       meson test --print-errorlogs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}";
     description = "Building blocks for modern adaptive GNOME apps";
     homepage = "https://gitlab.gnome.org/GNOME/libhandy";
diff --git a/nixpkgs/pkgs/development/libraries/libhangul/default.nix b/nixpkgs/pkgs/development/libraries/libhangul/default.nix
index eb62337c502e..eea513a137cf 100644
--- a/nixpkgs/pkgs/development/libraries/libhangul/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhangul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libhangul-0.1.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core algorithm library for Korean input routines";
     homepage = "https://github.com/choehwanjin/libhangul";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libharu/default.nix b/nixpkgs/pkgs/development/libraries/libharu/default.nix
index 68dba64618f5..53c14027ff36 100644
--- a/nixpkgs/pkgs/development/libraries/libharu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libharu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, cmake, zlib, libpng }:
+{ lib, stdenv, fetchzip, cmake, zlib, libpng }:
 
 stdenv.mkDerivation {
   name = "libharu-2.3.0";
@@ -8,13 +8,14 @@ stdenv.mkDerivation {
     sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q";
   };
 
-  buildInputs = [ zlib libpng cmake ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib libpng ];
 
   meta = {
     description = "Cross platform, open source library for generating PDF files";
     homepage = "http://libharu.org/";
-    license = stdenv.lib.licenses.zlib;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.zlib;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix
index 577457afdbf8..ab0ad6fab23e 100644
--- a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # libhdhomerun requires UDP port 65001 to be open in order to detect and communicate with tuners.
 # If your firewall is enabled, make sure to have something like:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb";
   };
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile --replace "gcc" "cc"
     substituteInPlace Makefile --replace "-arch i386" ""
   '';
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp *.h $out/include/hdhomerun
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners";
     homepage = "https://www.silicondust.com/support/linux";
     license = licenses.lgpl21Only;
diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix
index 4a5f6ab3bd88..b0872b9da1e4 100644
--- a/nixpkgs/pkgs/development/libraries/libheif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng,
   libjpeg, libaom }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libde265 x265 libpng libjpeg libaom ];
   # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config
 
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.libheif.org/";
     description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ gebner ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ gebner ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
index 2de7e08fb025..f54929c5378b 100644
--- a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch
+{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
 , gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
 
 let
@@ -8,11 +8,11 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
   };
 
-  nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ];
+  nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
   buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
 
   # Fixes build with vala >=0.42
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to use HTTPSEverywhere in desktop applications";
     homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libiberty/default.nix b/nixpkgs/pkgs/development/libraries/libiberty/default.nix
index c7babb3038d3..2040ef3bee08 100644
--- a/nixpkgs/pkgs/development/libraries/libiberty/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiberty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ lib, stdenv, buildPackages
 , staticBuild ? stdenv.hostPlatform.isStatic
 }:
 
@@ -15,13 +15,13 @@ stdenv.mkDerivation {
   postUnpack = "sourceRoot=\${sourceRoot}/libiberty";
 
   configureFlags = [ "--enable-install-libiberty" ]
-    ++ stdenv.lib.optional (!staticBuild) "--enable-shared";
+    ++ lib.optional (!staticBuild) "--enable-shared";
 
-  postInstall = stdenv.lib.optionalString (!staticBuild) ''
+  postInstall = lib.optionalString (!staticBuild) ''
     cp pic/libiberty.a $out/lib*/libiberty.a
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gcc.gnu.org/";
     license = licenses.lgpl2;
     description = "Collection of subroutines used by various GNU programs";
diff --git a/nixpkgs/pkgs/development/libraries/libibmad/default.nix b/nixpkgs/pkgs/development/libraries/libibmad/default.nix
index 8c46efa9710a..b6df338f122e 100644
--- a/nixpkgs/pkgs/development/libraries/libibmad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libibmad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libibumad }:
+{ lib, stdenv, fetchurl, libibumad }:
 
 stdenv.mkDerivation rec {
   name = "libibmad-1.3.13";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libibumad ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openfabrics.org/";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libibumad/default.nix b/nixpkgs/pkgs/development/libraries/libibumad/default.nix
index 4c37f8564b0a..6de97ad77cd7 100644
--- a/nixpkgs/pkgs/development/libraries/libibumad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libibumad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libibumad-1.3.10.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openfabrics.org/";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix
index c03367da97ba..7f5e739a99cd 100644
--- a/nixpkgs/pkgs/development/libraries/libical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libical/default.nix
@@ -9,7 +9,7 @@
 , libxml2
 , ninja
 , perl
-, pkgconfig
+, pkg-config
 , libical
 , python3
 , tzdata
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     cmake
     ninja
     perl
-    pkgconfig
+    pkg-config
     # Docs building fails:
     # https://github.com/NixOS/nixpkgs/pull/67204
     # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     runHook postInstallCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libical/libical";
     description = "An Open Source implementation of the iCalendar protocols";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/libraries/libicns/default.nix b/nixpkgs/pkgs/development/libraries/libicns/default.nix
index 10d68ee3a4e9..1df2a8abb82c 100644
--- a/nixpkgs/pkgs/development/libraries/libicns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libicns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }:
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }:
 
 stdenv.mkDerivation rec {
   pname = "libicns";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng openjpeg ];
   NIX_CFLAGS_COMPILE = [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for manipulation of the Mac OS icns resource format";
     homepage = "https://icns.sourceforge.io";
     license = with licenses; [ gpl2 lgpl2 lgpl21 ];
diff --git a/nixpkgs/pkgs/development/libraries/libid3tag/default.nix b/nixpkgs/pkgs/development/libraries/libid3tag/default.nix
index 9847312a34a9..8cedd1bcb418 100644
--- a/nixpkgs/pkgs/development/libraries/libid3tag/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libid3tag/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, gperf}:
+{lib, stdenv, fetchurl, zlib, gperf}:
 
 stdenv.mkDerivation rec {
   pname = "libid3tag";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       --subst-var-by version "${version}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ID3 tag manipulation library";
     homepage = "http://mad.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libidn/default.nix b/nixpkgs/pkgs/development/libraries/libidn/default.nix
index e936f3fd92a2..afe5e550b339 100644
--- a/nixpkgs/pkgs/development/libraries/libidn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libidn/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libiconv }:
+{ fetchurl, lib, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libidn-1.36";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
   doCheck = false; # fails
 
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
     '';
 
     repositories.git = "git://git.savannah.gnu.org/libidn.git";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
index c5af2d16bb21..30a334266395 100644
--- a/nixpkgs/pkgs/development/libraries/libidn2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
@@ -1,11 +1,11 @@
-{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }:
+{ fetchurl, lib, stdenv, libiconv, libunistring, help2man, buildPackages }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libidn2";
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
     '';
 
     repositories.git = "https://gitlab.com/jas/libidn2";
-    license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ];
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ fpletz ];
+    license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libiec61883/default.nix b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix
index 77b2424bfee7..911210202fe0 100644
--- a/nixpkgs/pkgs/development/libraries/libiec61883/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libraw1394 }:
+{ lib, stdenv, fetchurl, pkg-config, libraw1394 }:
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.linux1394.org";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libieee1284/default.nix b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix
index b5708a83a7d3..7c20d1b4947c 100644
--- a/nixpkgs/pkgs/development/libraries/libieee1284/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   pname = "libieee1284";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     ./bootstrap
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parallel port communication library";
     homepage = "http://cyberelk.net/tim/software/libieee1284/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libiio/default.nix b/nixpkgs/pkgs/development/libraries/libiio/default.nix
index 3c3ccf27884f..043e27fb4b2a 100644
--- a/nixpkgs/pkgs/development/libraries/libiio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiio/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     moveToOutput ${python.sitePackages} "$python"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "API for interfacing with the Linux Industrial I/O Subsystem";
     homepage = "https://github.com/analogdevicesinc/libiio";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
index 2bca09be45f4..83a5a462ee00 100644
--- a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libimagequant";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pngquant.org/lib/";
     description = "Image quantization library";
     longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.";
diff --git a/nixpkgs/pkgs/development/libraries/libime/default.nix b/nixpkgs/pkgs/development/libraries/libime/default.nix
new file mode 100644
index 000000000000..f9fcdedf1803
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libime/default.nix
@@ -0,0 +1,63 @@
+{ lib, stdenv
+, fetchurl
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+, boost
+, python3
+, fcitx5
+}:
+
+let
+  table = fetchurl {
+    url = "https://download.fcitx-im.org/data/table.tar.gz";
+    sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1";
+  };
+  arpaVer = "20140820";
+  arpa = fetchurl {
+    url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2";
+    sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm";
+  };
+  dictVer = "20200715";
+  dict = fetchurl {
+    url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz";
+    sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "libime";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "fcitx";
+    repo = "libime";
+    rev = version;
+    sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg=";
+    fetchSubmodules = true;
+  };
+
+  prePatch = ''
+    ln -s ${table} data/$(stripHash ${table})
+    ln -s ${arpa} data/$(stripHash ${arpa})
+    ln -s ${dict} data/$(stripHash ${dict})
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    python3
+  ];
+
+  buildInputs = [
+    boost
+    fcitx5
+  ];
+
+  meta = with lib; {
+    description = "A library to support generic input method implementation";
+    homepage = "https://github.com/fcitx/libime";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ poscat ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix
index a9a2fb6b4c18..b805be1257bd 100644
--- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls
 , libgcrypt, libtasn1, glib, libplist, libusbmuxd }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     libtool
-    pkgconfig
+    pkg-config
   ];
   propagatedBuildInputs = [
     glib
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     "--without-cython"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libimobiledevice/libimobiledevice";
     description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libindicator/default.nix b/nixpkgs/pkgs/development/libraries/libindicator/default.nix
index 8bb90180300c..139672f6d805 100644
--- a/nixpkgs/pkgs/development/libraries/libindicator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libindicator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, file
-, pkgconfig
+, pkg-config
 , gtkVersion ? "3", gtk2 ? null, gtk3 ? null }:
 
 with lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix
index e018c1a9f5ea..e68d27cacff5 100644
--- a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix
@@ -1,6 +1,6 @@
 { gtkWidgets ? false # build GTK widgets for libinfinity
 , avahiSupport ? false # build support for Avahi in libinfinity
-, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
+, lib, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl
 , gobject-introspection
 , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss
 , libintl }:
@@ -13,18 +13,18 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "libinfinity";
-    version = "0.7.1";
+    version = "0.7.2";
     src = fetchurl {
-      url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz";
-      sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";
+      url = "https://github.com/gobby/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
+      sha256 = "17i3g61hxz9pzl3ryd1yr15142r25m06jfzjrpdy7ic1b8vjjw3f";
     };
 
     outputs = [ "bin" "out" "dev" "man" "devdoc" ];
 
-    nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
+    nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
     buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ]
-      ++ stdenv.lib.optional gtkWidgets gtk3
-      ++ stdenv.lib.optional avahiSupport avahi;
+      ++ lib.optional gtkWidgets gtk3
+      ++ lib.optional avahiSupport avahi;
 
     propagatedBuildInputs = [ gnutls ];
 
@@ -39,15 +39,15 @@ let
     ];
 
     passthru = {
-      infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}";
+      infinoted = "${self.bin}/bin/infinoted-${lib.versions.majorMinor version}";
     };
 
     meta = {
-      homepage = "http://gobby.0x539.de/";
+      homepage = "https://gobby.github.io/";
       description = "An implementation of the Infinote protocol written in GObject-based C";
-      license = stdenv.lib.licenses.lgpl2Plus;
-      maintainers = [ stdenv.lib.maintainers.phreedom ];
-      platforms = with stdenv.lib.platforms; linux ++ darwin;
+      license = lib.licenses.lgpl2Plus;
+      maintainers = [ lib.maintainers.phreedom ];
+      platforms = with lib.platforms; linux ++ darwin;
     };
   };
 in self
diff --git a/nixpkgs/pkgs/development/libraries/libinjection/default.nix b/nixpkgs/pkgs/development/libraries/libinjection/default.nix
index b3bdbb41588a..f678136637ae 100644
--- a/nixpkgs/pkgs/development/libraries/libinjection/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinjection/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , python
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   # no binaries, so out = library, dev = headers
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SQL / SQLI tokenizer parser analyzer";
     homepage    = "https://github.com/client9/libinjection";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libinklevel/default.nix b/nixpkgs/pkgs/development/libraries/libinklevel/default.nix
index 90f6936d458a..c5dc7987ca62 100644
--- a/nixpkgs/pkgs/development/libraries/libinklevel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinklevel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "libinklevel";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for checking the ink level of your printer";
     longDescription = ''
       Libinklevel is a library for checking the ink level of your printer on a
diff --git a/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix b/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
index 074d2954ef18..ff74060d3d46 100644
--- a/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, autoreconfHook }:
+{ lib, stdenv, fetchzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libinotify-kqueue";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkFlags = [ "test" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Inotify shim for macOS and BSD";
     homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix
index dff2ca829559..8f1511de3304 100644
--- a/nixpkgs/pkgs/development/libraries/libinput/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja
 , libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
@@ -10,7 +10,7 @@ assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
 assert testsSupport -> check != null && valgrind != null && python3 != null;
 
 let
-  mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}";
+  mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}";
 
   sphinx-build = if documentationSupport then
     python3.pkgs.sphinx.overrideAttrs (super: {
@@ -24,7 +24,7 @@ let
   else null;
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
   version = "1.16.4";
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     "--libexecdir=${placeholder "bin"}/libexec"
   ];
 
-  nativeBuildInputs = [ pkgconfig meson ninja ]
+  nativeBuildInputs = [ pkg-config meson ninja ]
     ++ optionals documentationSupport [ doxygen graphviz sphinx-build ];
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/libiodbc/default.nix b/nixpkgs/pkgs/development/libraries/libiodbc/default.nix
index c80a9bb1f920..29d4c3432ebd 100644
--- a/nixpkgs/pkgs/development/libraries/libiodbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiodbc/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, pkgconfig, gtk2, Carbon
+{ config, lib, stdenv, fetchurl, pkg-config, gtk2, Carbon
 , useGTK ? config.libiodbc.gtk or false }:
 
 stdenv.mkDerivation rec {
@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]
-                ++ stdenv.lib.optional stdenv.isDarwin Carbon;
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = lib.optionals useGTK [ gtk2 ]
+                ++ lib.optional stdenv.isDarwin Carbon;
 
   preBuild =
     ''
       export NIX_LDFLAGS_BEFORE="-rpath $out/lib"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "iODBC driver manager";
     homepage = "http://www.iodbc.org";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/nixpkgs/pkgs/development/libraries/libipfix/default.nix
index 69918b5d36c7..173bfafc8cc9 100644
--- a/nixpkgs/pkgs/development/libraries/libipfix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libipfix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "libipfix";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz";
     sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libipfix.sourceforge.net/";
     description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libipt/default.nix b/nixpkgs/pkgs/development/libraries/libipt/default.nix
index e585a2b090fc..272c61c47a5e 100644
--- a/nixpkgs/pkgs/development/libraries/libipt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libipt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libipt";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel Processor Trace decoder library";
     homepage = "https://github.com/intel/libipt";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
index 01b23d9e2d28..140faab43b1a 100644
--- a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "libiptcdata-1.0.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library for reading and writing the IPTC metadata in images and other files";
     homepage = "http://libiptcdata.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libircclient/default.nix b/nixpkgs/pkgs/development/libraries/libircclient/default.nix
index 4bef2de28c05..56a9f1b961cf 100644
--- a/nixpkgs/pkgs/development/libraries/libircclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libircclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "1.10";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --replace "cp "              "install "
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small but extremely powerful library which implements the client IRC protocol";
     homepage    = "http://www.ulduzsoft.com/libircclient/";
     license     = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix
index bc91593a960d..6a2f926d79ef 100644
--- a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config
 , libusb1
 , readline
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     libtool
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""''
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libimobiledevice/libirecovery";
     description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libiscsi/default.nix b/nixpkgs/pkgs/development/libraries/libiscsi/default.nix
new file mode 100644
index 000000000000..adc721bc6d07
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libiscsi/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "libiscsi";
+  version = "1.19.0";
+
+  src = fetchFromGitHub {
+    owner = "sahlberg";
+    repo = "libiscsi";
+    rev = version;
+    sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  # This problem is gone on libiscsi master.
+  NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null;
+
+  meta = with lib; {
+    description = "iscsi client library and utilities";
+    homepage = "https://github.com/sahlberg/libiscsi";
+    license = licenses.lgpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ misuzu ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libisds/default.nix b/nixpkgs/pkgs/development/libraries/libisds/default.nix
index 28a8d7d874b8..268acb2f948d 100644
--- a/nixpkgs/pkgs/development/libraries/libisds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libisds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , expat
 , gpgme
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
     homepage = "http://xpisar.wz.cz/libisds/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix
index 0b4984fc82a3..1e2ae41f3f22 100644
--- a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
+{ lib, stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
 
 stdenv.mkDerivation rec {
   pname = "libisoburn";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ attr zlib libburn libisofs ];
   propagatedBuildInputs = [ acl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libburnia-project.org/";
     description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD ";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libisofs/default.nix b/nixpkgs/pkgs/development/libraries/libisofs/default.nix
index 0c01389f0b82..a291410941c6 100644
--- a/nixpkgs/pkgs/development/libraries/libisofs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libisofs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, acl, attr, zlib }:
+{ lib, stdenv, fetchurl, acl, attr, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libisofs";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ attr zlib ];
   propagatedBuildInputs = [ acl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libburnia-project.org/";
     description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libite/default.nix b/nixpkgs/pkgs/development/libraries/libite/default.nix
index 240636d518c3..c57876e9c4fd 100644
--- a/nixpkgs/pkgs/development/libraries/libite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }:
 
 stdenv.mkDerivation rec {
   pname = "libite";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libconfuse ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Lightweight library of frog DNA";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libivykis/default.nix b/nixpkgs/pkgs/development/libraries/libivykis/default.nix
index 1226d1c489ef..9a1c728bd55d 100644
--- a/nixpkgs/pkgs/development/libraries/libivykis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libivykis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }:
 
 stdenv.mkDerivation rec {
   pname = "libivykis";
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "0abi0rc3wnncvr68hy6rmzp96x6napd7fs1mff20dr8lb0jyvy3f";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ file protobufc ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libivykis.sourceforge.net/";
     description = ''
       A thin wrapper over various OS'es implementation of I/O readiness
diff --git a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
index e971136b088b..489f526248aa 100644
--- a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, txt2tags }:
+{ lib, stdenv, fetchurl, unzip, txt2tags }:
 
 stdenv.mkDerivation rec {
   rev = "148";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp
     description = "Portable, simple C-language 9P client and server libary";
-    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kovirobi ];
+    license = lib.licenses.mit;
     inherit version;
-    platforms = with stdenv.lib.platforms; unix;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/nixpkgs/pkgs/development/libraries/libjcat/default.nix
index 1eca110f8cb5..974f1f6674fb 100644
--- a/nixpkgs/pkgs/development/libraries/libjcat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , docbook_xml_dtd_43
 , docbook-xsl-nons
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libjcat";
-  version = "0.1.4";
+  version = "0.1.5";
 
   outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "libjcat";
     rev = version;
-    sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh";
+    sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc=";
   };
 
   patches = [
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing Jcat files";
     homepage = "https://github.com/hughsie/libjcat";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
index c4e81d034fc9..5fe1c2ee9ecf 100644
--- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, nasm
+{ lib, stdenv, fetchFromGitHub, cmake, nasm
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   patches =
-    stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
+    lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
       ./mingw-boolean.patch;
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
   installCheckTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libjpeg-turbo.org/";
     description = "A faster (using SIMD) libjpeg implementation";
     license = licenses.ijg; # and some parts under other BSD-style licenses
diff --git a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix
index 05fbb7de701e..f462d9824a42 100644
--- a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, static ? false }:
+{ lib, stdenv, fetchurl, static ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "libjpeg-9d";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.ijg.org/";
     description = "A library that implements the JPEG image file format";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libjreen/default.nix b/nixpkgs/pkgs/development/libraries/libjreen/default.nix
index 141598839b06..5a70e4b01dd8 100644
--- a/nixpkgs/pkgs/development/libraries/libjreen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjreen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }:
+{ lib, stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }:
 
 stdenv.mkDerivation rec {
   pname = "libjreen";
@@ -9,14 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake qt4 gsasl ];
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ qt4 gsasl ];
 
   meta = {
     description = "C++ Jabber library using Qt framework";
     homepage = "https://qutim.org/jreen/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 03d77c11bec3..e2dd30fc616f 100644
--- a/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,19 +1,47 @@
-{ stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd
-, doxygen, catch, pkgconfig
+{ lib, stdenv
+, fetchFromGitHub
+, fetchpatch
+, pkg-config
+, cmake
+, argtable
+, catch2
+, curl
+, doxygen
+, hiredis
+, jsoncpp
+, libmicrohttpd
 }:
 
 stdenv.mkDerivation rec {
   pname = "libjson-rpc-cpp";
-  version = "0.7.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "cinemast";
     repo = "libjson-rpc-cpp";
-    sha256 = "07bg4nyvx0yyhy8c4x9i22kwqpx5jlv36dvpabgbb46ayyndhr7a";
+    sha256 = "sha256-EAakiqlfMprwLjloDekOssaB/EnAmn5njcwHGZtYs9w=";
     rev = "v${version}";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${catch}/include/catch";
+  NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2";
+
+  patches = [
+    (fetchpatch {
+      name = "int-to-MHD_Result.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/cinemast/libjson-rpc-cpp/pull/299.patch";
+      sha256 = "sha256-hiey6etzbOxhMElTMX7offKbey7c2OO/UWeN03k0AaM=";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config cmake doxygen ];
+  buildInputs = [
+    argtable
+    catch2
+    curl
+    hiredis
+    jsoncpp
+    libmicrohttpd
+  ];
 
   postPatch = ''
     for f in cmake/FindArgtable.cmake \
@@ -26,39 +54,45 @@ stdenv.mkDerivation rec {
     sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake
   '';
 
-  configurePhase = ''
+  preConfigure = ''
     mkdir -p Build/Install
     pushd Build
+  '';
 
+  # this hack is needed because the cmake scripts
+  # require write permission to absolute paths
+  configurePhase = ''
+    runHook preConfigure
     cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \
              -DCMAKE_BUILD_TYPE=Release
+    runHook postConfigure
   '';
 
-  installPhase = ''
-    mkdir -p $out
-
+  preInstall = ''
     function fixRunPath {
       p=$(patchelf --print-rpath $1)
-      q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
+      q="$p:${lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
       patchelf --set-rpath $q $1
     }
 
-    make install
+    mkdir -p $out
+  '';
 
-    sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib/pkgconfig/*.pc
-    for f in Install/lib/*.so* $(find Install/bin -executable -type f); do
+  postInstall = ''
+    sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib64/pkgconfig/*.pc
+    for f in Install/lib64/*.so* $(find Install/bin -executable -type f); do
       fixRunPath $f
     done
-
     cp -r Install/* $out
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ];
-
-  enableParallelBuilding = true;
+  installPhase = ''
+    runHook preInstall
+    make install
+    runHook postInstall
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ framework for json-rpc (json remote procedure call)";
     homepage = "https://github.com/cinemast/libjson-rpc-cpp";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libjson/default.nix b/nixpkgs/pkgs/development/libraries/libjson/default.nix
index 1d6fb1e72897..42d723b3b1b4 100644
--- a/nixpkgs/pkgs/development/libraries/libjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 let
   version = "7.6.1";
 in stdenv.mkDerivation {
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
   makeFlags = [ "prefix=$(out)" ];
   preInstall = "mkdir -p $out/lib";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libjson.sourceforge.net/";
     description = "A JSON reader and writer";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libkate/default.nix b/nixpkgs/pkgs/development/libraries/libkate/default.nix
index a999f813fbb4..2135cc37d91e 100644
--- a/nixpkgs/pkgs/development/libraries/libkate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libkate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libogg, libpng }:
+{ lib, stdenv, fetchurl, libogg, libpng }:
 
 stdenv.mkDerivation rec {
   name = "libkate-0.4.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libogg libpng ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for encoding and decoding Kate streams";
     longDescription = ''
       This is libkate, the reference implementation of a codec for the Kate
diff --git a/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
index b6aa19c442a7..d2aecccdedff 100644
--- a/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
+{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   pname = "libkeyfinder";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cp -a lib*.so* $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Musical key detection for digital audio (C++ library)";
     homepage = "http://www.ibrahimshaath.co.uk/keyfinder/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libkml/default.nix b/nixpkgs/pkgs/development/libraries/libkml/default.nix
index 690d9b9801ca..0e2ab21ee792 100644
--- a/nixpkgs/pkgs/development/libraries/libkml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libkml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_TESTING=ON"
   # Darwin tests require rpath for libs in build dir
-  ] ++ stdenv.lib.optional stdenv.isDarwin [
+  ] ++ lib.optional stdenv.isDarwin [
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
   ];
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference implementation of OGC KML 2.2";
     homepage = "https://github.com/libkml/libkml";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libksba/default.nix b/nixpkgs/pkgs/development/libraries/libksba/default.nix
index 7e14c1b533b5..e623aa0d1119 100644
--- a/nixpkgs/pkgs/development/libraries/libksba/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libksba/default.nix
@@ -1,4 +1,4 @@
-{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }:
+{ buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }:
 
 stdenv.mkDerivation rec {
   name = "libksba-1.5.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     rmdir --ignore-fail-on-non-empty $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnupg.org";
     description = "CMS and X.509 access library";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/libksi/default.nix b/nixpkgs/pkgs/development/libraries/libksi/default.nix
index 2701cc513598..015121811710 100644
--- a/nixpkgs/pkgs/development/libraries/libksi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libksi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
 
 stdenv.mkDerivation rec {
   pname = "libksi";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "--with-cafile=/etc/ssl/certs/ca-certificates.crt"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/GuardTime/libksi";
     description = "Keyless Signature Infrastructure API library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libktorrent/default.nix b/nixpkgs/pkgs/development/libraries/libktorrent/default.nix
index 19c24ec37549..610efa7ed4f4 100644
--- a/nixpkgs/pkgs/development/libraries/libktorrent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libktorrent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules
+{ lib, stdenv, fetchurl, cmake, extra-cmake-modules
 , karchive, kcrash, ki18n, kio, solid
 , boost, gmp, qca-qt5, libgcrypt
 }:
@@ -23,13 +23,11 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gmp boost ];
 
-  enableParallelBuilding = true;
-
   passthru = {
     inherit mainVersion;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A BitTorrent library used by KTorrent";
     homepage    = "https://www.kde.org/applications/internet/ktorrent/";
     maintainers = with maintainers; [ eelco ];
diff --git a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
index b724789188cd..5a7f2fe4b36f 100644
--- a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
-, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip
+{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
+, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip
 }:
 
 stdenv.mkDerivation rec {
@@ -32,19 +32,19 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias''
+    "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"
   ];
 
   buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
     unzip ];
-  nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ];
 
   meta = {
     inherit version;
     description = "An interface library to access tags for identifying languages";
-    license = stdenv.lib.licenses.mpl20;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mpl20;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     # There are links to a homepage that are broken by a BitBucket change
     homepage = "https://bitbucket.org/tagoh/liblangtag/overview";
   };
diff --git a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix
index 830e125685e7..10cdb3014791 100644
--- a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake
 , fftwSinglePrec, libsamplerate, qtbase
 , darwin }:
 
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
     sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l";
   })];
 
-  nativeBuildInputs = [ pkgconfig which cmake ];
+  nativeBuildInputs = [ pkg-config which cmake ];
   buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lastfm/liblastfm";
     repositories.git = "git://github.com/lastfm/liblastfm.git";
     description = "Official LastFM library";
diff --git a/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix b/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix
index 46152e792763..fe3038c3249a 100644
--- a/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, curl, openssl }:
+{ lib, stdenv, fetchurl, pkg-config, curl, openssl }:
 
 stdenv.mkDerivation {
   name = "liblastfm-SF-0.5";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ curl openssl ];
 
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://liblastfm.sourceforge.net";
     description = "Unofficial C lastfm library";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix b/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix
index b932f9e928b3..9464714d5cc9 100644
--- a/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   version = "1.0.5";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for parsing JSON config files";
     homepage = "https://github.com/andrewrk/liblaxjson";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/nixpkgs/pkgs/development/libraries/liblcf/default.nix
index 82ac1b3144ea..2c7f09892820 100644
--- a/nixpkgs/pkgs/development/libraries/liblcf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblcf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }:
 
 stdenv.mkDerivation rec {
   pname = "liblcf";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   propagatedBuildInputs = [ expat icu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects";
     homepage = "https://github.com/EasyRPG/liblcf";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/nixpkgs/pkgs/development/libraries/liblinear/default.nix
index 67eb8748f16c..3989cc59e4d8 100644
--- a/nixpkgs/pkgs/development/libraries/liblinear/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblinear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames }:
 
 let
   soVersion = "4";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" ];
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
+  nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
 
   buildFlags = [ "lib" "predict" "train" ];
 
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     install -Dm444 -t $dev/include linear.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for large linear classification";
     homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
index 7d7f035f77f1..f56e6a9a5c78 100644
--- a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
@@ -34,13 +34,13 @@
 , openldap
 , ortp
 , pango
-, pkgconfig
+, pkg-config
 , python
 , readline
 , soci
 , speex
 , sqlite
-, stdenv
+, lib, stdenv
 , udev
 , xercesc
 , xsd
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     graphviz
     intltool
     makeWrapper
-    pkgconfig
+    pkg-config
   ];
 
   # Some grammar files needed to be copied too from some dependencies. I suppose
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
     ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.linphone.org/technical-corner/liblinphone";
     description = "Library for SIP calls and instant messaging";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/liblo/default.nix b/nixpkgs/pkgs/development/libraries/liblo/default.nix
index a25666dfcf26..5f5b23cdc3a1 100644
--- a/nixpkgs/pkgs/development/libraries/liblo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "liblo-0.31";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
     homepage = "https://sourceforge.net/projects/liblo";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.gpl2;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/liblockfile/default.nix b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix
index 6ed995572ef3..a2587702bb3f 100644
--- a/nixpkgs/pkgs/development/libraries/liblockfile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   _name   = "liblockfile";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Shared library with NFS-safe locking functions";
     homepage = "http://packages.debian.org/unstable/libs/liblockfile1";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.bluescreen303 ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/liblogging/default.nix b/nixpkgs/pkgs/development/libraries/liblogging/default.nix
index b9b787f41829..4a28bf677412 100644
--- a/nixpkgs/pkgs/development/libraries/liblogging/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblogging/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , systemd ? null
 }:
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ systemd ];
 
   configureFlags = [
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "--enable-man-pages"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.liblogging.org/";
     description = "Lightweight signal-safe logging library";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/liblognorm/default.nix b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix
index bef1048dde46..293f72d67b2b 100644
--- a/nixpkgs/pkgs/development/libraries/liblognorm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }:
+{ lib, stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }:
 
 stdenv.mkDerivation rec {
   name = "liblognorm-2.0.6";
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libestr json_c pcre fastJson ];
 
   configureFlags = [ "--enable-regexp" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.liblognorm.com/";
     description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix
index d29cbf6a7195..1dec830566f8 100644
--- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub
-, stdenv
+, lib, stdenv
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , gettext
 , python3
 , texinfo
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
     gettext
     python3
     # Docs, man, info
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source braille translator and back-translator";
     homepage = "http://liblouis.org/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix b/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix
index 5f37989c20b8..b871dbdb19d2 100644
--- a/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   name = "liblqr-1-0.4.2";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://liblqr.wikidot.com";
     description = "Seam-carving C/C++ library called Liquid Rescaling";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/liblscp/default.nix b/nixpkgs/pkgs/development/libraries/liblscp/default.nix
index 101e11deaa51..dcb862f2cd4d 100644
--- a/nixpkgs/pkgs/development/libraries/liblscp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblscp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "liblscp";
@@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
 
   preConfigure = "make -f Makefile.git";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.linuxsampler.org";
     description = "LinuxSampler Control Protocol (LSCP) wrapper library";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libltc/default.nix b/nixpkgs/pkgs/development/libraries/libltc/default.nix
index 4513396d7eaf..2391d281d46a 100644
--- a/nixpkgs/pkgs/development/libraries/libltc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libltc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libltc-1.3.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://x42.github.io/libltc/";
     description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/liblxi/default.nix b/nixpkgs/pkgs/development/libraries/liblxi/default.nix
new file mode 100644
index 000000000000..1ca4043a024d
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/liblxi/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchFromGitHub
+, pkg-config, autoreconfHook
+, libtirpc, rpcsvc-proto, avahi, libxml2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "liblxi";
+  version = "1.13";
+
+  src = fetchFromGitHub {
+    owner = "lxi-tools";
+    repo = "liblxi";
+    rev = "v${version}";
+    sha256 = "129m0k2wrlgs25qkskynljddqspasla1x8iq51vmg38nhnilpqf6";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkg-config rpcsvc-proto ];
+
+  buildInputs = [ libtirpc avahi libxml2 ];
+
+  meta = with lib; {
+    description = "Library for communicating with LXI compatible instruments";
+    longDescription = ''
+      liblxi is an open source software library which offers a simple
+      API for communicating with LXI compatible instruments.
+      The API allows applications to easily discover instruments
+      on networks and communicate SCPI commands.
+    '';
+    homepage = "https://lxi-tools.github.io/";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.vq ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libmad/default.nix b/nixpkgs/pkgs/development/libraries/libmad/default.nix
index 84800f309fb4..dd7923486865 100644
--- a/nixpkgs/pkgs/development/libraries/libmad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoconf }:
+{ lib, stdenv, fetchurl, fetchpatch, autoconf }:
 
 stdenv.mkDerivation rec {
   pname = "libmad";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
   # It is included here in order to fix a build failure in Clang
   # But it may be useful to fix other, currently unknown problems as well
-  ++ stdenv.lib.optionals stdenv.cc.isClang [
+  ++ lib.optionals stdenv.cc.isClang [
     (fetchpatch {
       url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
       sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "autoconf";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://sourceforge.net/projects/mad/";
     description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/nixpkgs/pkgs/development/libraries/libmanette/default.nix
index 0cb233ad271c..76dd4eb20c1a 100644
--- a/nixpkgs/pkgs/development/libraries/libmanette/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmanette/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ninja
 , meson
-, pkgconfig
+, pkg-config
 , vala
 , gobject-introspection
 , gtk-doc
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
     gobject-introspection
     gtk-doc
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple GObject game controller library";
     homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix b/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix
index 49769359ed32..50b66eccfb3d 100644
--- a/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
+{ lib, stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
 
 stdenv.mkDerivation rec {
   pname = "libmatchbox";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library of the matchbox X window manager";
     homepage = "http://matchbox-project.org/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmatheval/default.nix b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix
index a24b931c6605..b0fe1c35ef3a 100644
--- a/nixpkgs/pkgs/development/libraries/libmatheval/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }:
+{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "1.1.11";
   pname = "libmatheval";
 
-  nativeBuildInputs = [ pkgconfig autoconf flex ];
+  nativeBuildInputs = [ pkg-config autoconf flex ];
   buildInputs = [ guile ];
 
   src = fetchurl {
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
       symbolic derivatives and output expressions to strings.
     '';
     homepage = "https://www.gnu.org/software/libmatheval/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.bzizou ];
+    platforms = lib.platforms.linux;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/libmatroska/default.nix b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix
index 5d065636a922..1d3cf4032dda 100644
--- a/nixpkgs/pkgs/development/libraries/libmatroska/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , libebml }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ libebml ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=YES"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to parse Matroska files";
     homepage = "https://matroska.org/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
index 94a4b9ec57c6..078865198a45 100644
--- a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libmaxminddb";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchurl {
     url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5";
+    sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for working with MaxMind geolocation DB files";
     homepage = "https://github.com/maxmind/libmaxminddb";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix
index fdf724c09fda..850c7aa1df0c 100644
--- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , gobject-introspection
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.freedesktop.org/wiki/Software/libmbim/";
     description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
index a29fca45a99f..44c55cb4682b 100644
--- a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, darwin, disablePosixThreads ? false }:
+{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "libmcrypt-2.5.8";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz";
     sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
diff --git a/nixpkgs/pkgs/development/libraries/libmd/default.nix b/nixpkgs/pkgs/development/libraries/libmd/default.nix
index e3dd0b206f10..7093376aa7e5 100644
--- a/nixpkgs/pkgs/development/libraries/libmd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libmd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.hadrons.org/software/${pname}/";
     changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce";
     # Git: https://git.hadrons.org/cgit/libmd.git
diff --git a/nixpkgs/pkgs/development/libraries/libmediaart/default.nix b/nixpkgs/pkgs/development/libraries/libmediaart/default.nix
index 38adebb2a487..28c8ae6db940 100644
--- a/nixpkgs/pkgs/development/libraries/libmediaart/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmediaart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "libmediaart";
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
   buildInputs = [ glib gdk-pixbuf ];
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library tasked with managing, extracting and handling media art caches";
     maintainers = teams.gnome.members;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
index 31d64101e6bf..d78ccbc50aba 100644
--- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
 
 stdenv.mkDerivation rec {
   version = "20.09";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libzen zlib ];
 
   sourceRoot = "./MediaInfoLib/Project/GNU/Library/";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library for mediainfo";
     homepage = "https://mediaarea.net/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libmemcached/default.nix b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix
index 8cbb76377fb0..0ee0701d9290 100644
--- a/nixpkgs/pkgs/development/libraries/libmemcached/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
+{ lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
 
 stdenv.mkDerivation {
   name = "libmemcached-1.0.18";
@@ -13,19 +13,19 @@ stdenv.mkDerivation {
   # https://bugs.launchpad.net/libmemcached/+bug/1281907
   # Fix building on macOS (patch from Homebrew)
   # https://bugs.launchpad.net/libmemcached/+bug/1245562
-  patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
-    ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+  patches = lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
+    ++ lib.optional stdenv.isDarwin (fetchpatch {
       url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb";
       sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8";
     })
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch;
+    ++ lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch;
 
   buildInputs = [ libevent ];
   propagatedBuildInputs = [ cyrus_sasl ];
 
   NIX_CFLAGS_COMPILE = "-fpermissive";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libmemcached.org";
     description = "Open source C/C++ client library and tools for the memcached server";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libmesode/default.nix b/nixpkgs/pkgs/development/libraries/libmesode/default.nix
index 54ff0dccb90e..128975246a8a 100644
--- a/nixpkgs/pkgs/development/libraries/libmesode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmesode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , libtool
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client";
     longDescription = ''
       Reasons for forking:
diff --git a/nixpkgs/pkgs/development/libraries/libmhash/default.nix b/nixpkgs/pkgs/development/libraries/libmhash/default.nix
index 2a61c5710669..f569ce7fac75 100644
--- a/nixpkgs/pkgs/development/libraries/libmhash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmhash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "mhash";
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://mhash.sourceforge.net";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix b/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix
index 69dd052dc036..c9dd899a2b00 100644
--- a/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 }:
 
 stdenv.mkDerivation rec {
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimal mDNS resolver library, used by VLC";
     homepage = "https://github.com/videolabs/libmicrodns";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
new file mode 100644
index 000000000000..8eeb94cdc295
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
@@ -0,0 +1,10 @@
+{ stdenv, callPackage, fetchurl }:
+
+callPackage ./generic.nix ( rec {
+  version = "0.9.72";
+
+  src = fetchurl {
+    url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
+    sha256 = "sha256-Cugl+ODX9BIB/USg3xz0VMHLC8UP6dWcJlUiYCZML/g=";
+  };
+})
diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix
index 9b817f21b94c..336b66ac8323 100644
--- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -1,11 +1,11 @@
-{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }:
+{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }:
 
 stdenv.mkDerivation rec {
   pname = "libmicrohttpd";
   inherit version src;
 
   outputs = [ "out" "dev" "devdoc" "info" ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libgcrypt curl gnutls libiconv libintl ];
 
   preCheck = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # Disabled because the tests can time-out.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Embeddable HTTP server library";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libmikmod/default.nix b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix
index 59967bcba5a2..a734a4b80092 100644
--- a/nixpkgs/pkgs/development/libraries/libmikmod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }:
+{ lib, stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }:
 
 let
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 
 in stdenv.mkDerivation rec {
   name = "libmikmod-3.3.11.1";
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for playing tracker music module files";
     homepage    = "https://mikmod.shlomifish.org/";
     license     = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libmilter/default.nix b/nixpkgs/pkgs/development/libraries/libmilter/default.nix
index f937d818a559..9287b0a0dea7 100644
--- a/nixpkgs/pkgs/development/libraries/libmilter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmilter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4 }:
+{ lib, stdenv, fetchurl, m4 }:
 
 stdenv.mkDerivation rec {
   pname = "libmilter";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ m4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sendmail Milter mail filtering API library";
     platforms = platforms.unix;
     maintainers = with maintainers; [ fpletz ];
diff --git a/nixpkgs/pkgs/development/libraries/libminc/default.nix b/nixpkgs/pkgs/development/libraries/libminc/default.nix
index ce39285e0d23..2440082cce9d 100644
--- a/nixpkgs/pkgs/development/libraries/libminc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libminc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }:
+{ lib, stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }:
 
 stdenv.mkDerivation rec {
   pname   = "libminc";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     # ezminc_rw_test: can't find libminc_io.so.5.2.0
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BIC-MNI/libminc";
     description = "Medical imaging library based on HDF5";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/libmkv/default.nix b/nixpkgs/pkgs/development/libraries/libmkv/default.nix
index 9a754eda592f..584d76e1cf2b 100644
--- a/nixpkgs/pkgs/development/libraries/libmkv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmkv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   pname = "libmkv";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
       It is written in plain C, and intended to be very portable.
     '';
     homepage = "https://github.com/saintdev/libmkv";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmms/default.nix b/nixpkgs/pkgs/development/libraries/libmms/default.nix
index 3753101ebf98..83add1d42a5d 100644
--- a/nixpkgs/pkgs/development/libraries/libmms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig }:
+{ lib, stdenv, fetchurl, glib, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libmms-0.6.4";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for downloading (streaming) media files using the mmst and mmsh protocols";
     homepage = "http://libmms.sourceforge.net";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/libmng/default.nix b/nixpkgs/pkgs/development/libraries/libmng/default.nix
index e13bda567932..f1704a527b44 100644
--- a/nixpkgs/pkgs/development/libraries/libmng/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:
+{ lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:
 
 stdenv.mkDerivation rec {
   name = "libmng-2.0.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
     homepage = "http://www.libmng.com";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/libmnl/default.nix b/nixpkgs/pkgs/development/libraries/libmnl/default.nix
index 3db6ab0da081..4e99258a3e80 100644
--- a/nixpkgs/pkgs/development/libraries/libmnl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmnl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libmnl-1.0.4";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       re-inventing the wheel.
     '';
     homepage = "https://netfilter.org/projects/libmnl/index.html";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmodbus/default.nix b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix
index 14f80e9b2e5a..b311c4f04181 100644
--- a/nixpkgs/pkgs/development/libraries/libmodbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libmodbus-3.1.6";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to send/receive data according to the Modbus protocol";
     homepage = "https://libmodbus.org/";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libmodplug/default.nix b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
index 2d38a5021e51..790674f1649e 100644
--- a/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file }:
+{ lib, stdenv, fetchurl, file }:
 
 let
   version = "0.8.9.0";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
         --replace /usr/bin/file ${file}/bin/file
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MOD playing library";
     homepage    = "http://modplug-xmms.sourceforge.net/";
     license     = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/libraries/libmodule/default.nix b/nixpkgs/pkgs/development/libraries/libmodule/default.nix
index d608a08d2d92..d77d2bcbdcd7 100644
--- a/nixpkgs/pkgs/development/libraries/libmodule/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodule/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub
-, cmake, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub
+, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libmodule";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "libmodule";
     rev = version;
-    sha256 = "1cf81sl33xmfn5g150iqcdrjn0lpjlgp53mganwi6x7jda2qk7r6";
+    sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg=";
   };
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C simple and elegant implementation of an actor library";
     homepage = "https://github.com/FedeDP/libmodule";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
index a0d32f5178a9..8a8d9adf53d8 100644
--- a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , substituteAll
 , fetchFromGitHub
 , fetchpatch
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C Library for manipulating module metadata files";
     homepage = "https://github.com/fedora-modularity/libmodulemd";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix b/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix
index b3231d1af91c..f81f63133384 100644
--- a/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   name = "libmongo-client-0.1.8";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ ];
   propagatedBuildInputs = [ glib ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://algernon.github.io/libmongo-client/";
     description = "An alternative C driver for MongoDB";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libmowgli/default.nix b/nixpkgs/pkgs/development/libraries/libmowgli/default.nix
index ae3a9efef24f..e227c09b2b61 100644
--- a/nixpkgs/pkgs/development/libraries/libmowgli/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmowgli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libmowgli";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A development framework for C providing high performance and highly flexible algorithms";
     homepage = "https://github.com/atheme/libmowgli-2";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix b/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix
index 237e3f94cfc9..58da7560e137 100644
--- a/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool, libmad, libid3tag }:
+{ lib, stdenv, fetchurl, libtool, libmad, libid3tag }:
 
 stdenv.mkDerivation rec {
   name = "libmp3splt-0.9.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-pcre" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://sourceforge.net/projects/mp3splt/";
     description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
     maintainers = with maintainers; [ bosu ];
diff --git a/nixpkgs/pkgs/development/libraries/libmpack/default.nix b/nixpkgs/pkgs/development/libraries/libmpack/default.nix
index 736474d29a5f..b62da40499cd 100644
--- a/nixpkgs/pkgs/development/libraries/libmpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool }:
+{ lib, stdenv, fetchFromGitHub, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libmpack";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple implementation of msgpack in C";
     homepage = "https://github.com/tarruda/libmpack/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/nixpkgs/pkgs/development/libraries/libmpc/default.nix
index 79fa17437819..66e38fbfbc04 100644
--- a/nixpkgs/pkgs/development/libraries/libmpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , gmp, mpfr
 }:
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation {
       '';
 
     homepage = "http://mpc.multiprecision.org/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix b/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix
index 3ee37e6ae9c6..b42d9a3d1e43 100644
--- a/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libmpcdec-1.2.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Musepack SV7 decoder library";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix b/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
index d6fb28c0e88c..bf5f25ca43f8 100644
--- a/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "0.5.1";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
   };
 
   # Otherwise clang fails with 'duplicate symbol ___sputc'
-  buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89";
+  buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89";
 
   meta = {
     homepage = "http://libmpeg2.sourceforge.net/";
     description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmrss/default.nix b/nixpkgs/pkgs/development/libraries/libmrss/default.nix
index aa70e4c4ddff..df3460970d17 100644
--- a/nixpkgs/pkgs/development/libraries/libmrss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmrss/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, curl, libnxml, pkgconfig}:
+{lib, stdenv, fetchurl, curl, libnxml, pkg-config}:
 
 stdenv.mkDerivation {
   name = "libmrss-0.19.2";
@@ -8,15 +8,15 @@ stdenv.mkDerivation {
     sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ curl libnxml ];
 
   meta = {
     homepage = "http://www.autistici.org/bakunin/libmrss/doc";
     description = "C library for parsing, writing and creating RSS/ATOM files or streams";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.viric ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmspack/default.nix b/nixpkgs/pkgs/development/libraries/libmspack/default.nix
index 70fdd7e913ed..4ad60bcfb181 100644
--- a/nixpkgs/pkgs/development/libraries/libmspack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmspack/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "libmspack-0.7.1alpha";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A de/compression library for various Microsoft formats";
     homepage = "https://www.cabextract.org.uk/libmspack";
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmtp/default.nix b/nixpkgs/pkgs/development/libraries/libmtp/default.nix
index e9cfd0f9856a..a49026c35dcd 100644
--- a/nixpkgs/pkgs/development/libraries/libmtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config
 , libusb1
 , libiconv
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     automake
     gettext
     libtool
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # tried to install files to /lib/udev, hopefully OK
   configureFlags = [ "--with-udev=$$bin/lib/udev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libmtp.sourceforge.net";
     description = "An implementation of Microsoft's Media Transfer Protocol";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 2fdcdc7d86d6..3e7a2f1a0ba0 100644
--- a/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
   pname = "libmusicbrainz";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake neon libdiscid libxml2 ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ neon libdiscid libxml2 ];
 
   src = fetchFromGitHub {
     owner  = "metabrainz";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeBuildDir=true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://musicbrainz.org/doc/libmusicbrainz";
     description = "MusicBrainz Client Library (5.x version)";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix
index 0db539a23afe..ab67d544a1df 100644
--- a/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, cmake, neon, libdiscid }:
+{ lib, stdenv, fetchurl, cmake, neon, libdiscid }:
 
 stdenv.mkDerivation rec {
   name = "libmusicbrainz-3.0.3";
 
-  buildInputs = [ cmake neon libdiscid ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ neon libdiscid ];
 
   src = fetchurl {
     url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
     sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://musicbrainz.org/doc/libmusicbrainz";
     description = "MusicBrainz Client Library (3.x version)";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
index 2ab23015af32..17e20e3d3997 100644
--- a/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
+{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
 let
   s = # Generated upstream information
   rec {
@@ -10,7 +10,7 @@ let
     sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     boost cppunit zlib libwpg libwpd librevenge
   ];
@@ -23,9 +23,9 @@ stdenv.mkDerivation {
   };
   meta = {
     inherit (s) version;
-    description = ''Import library for some old mac text documents'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "Import library for some old mac text documents";
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmx/default.nix b/nixpkgs/pkgs/development/libraries/libmx/default.nix
index 623c872fa1ac..f4256de6981b 100644
--- a/nixpkgs/pkgs/development/libraries/libmx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmx/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, libtool, pkgconfig, automake, autoconf, intltool
+{ lib, stdenv, fetchurl
+, libtool, pkg-config, automake, autoconf, intltool
 , glib, gobject-introspection, gtk2, gtk-doc
 , clutter, clutter-gtk
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   configureScript = "sh autogen.sh";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     automake autoconf libtool
     intltool
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.clutter-project.org/";
     description = "A Clutter-based toolkit";
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix
index 074e38429331..655480f75a2f 100644
--- a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , fetchFromGitHub
@@ -6,7 +6,7 @@
 , intltool
 , json_c
 , libtool
-, pkgconfig
+, pkg-config
 , python3
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     automake
     intltool
     libtool
-    pkgconfig
+    pkg-config
     python3
   ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mypaint.org/";
     description = "Library for making brushstrokes which is used by MyPaint and other projects";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 6c4874112b73..4c00d6425880 100644
--- a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , boost
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://dev.mysql.com/downloads/connector/cpp/";
     description = "C++ library for connecting to mysql servers";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libnabo/default.nix b/nixpkgs/pkgs/development/libraries/libnabo/default.nix
index 4c3ceee1e561..af5e78c25d66 100644
--- a/nixpkgs/pkgs/development/libraries/libnabo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnabo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake, eigen, boost}:
+{lib, stdenv, fetchFromGitHub, cmake, eigen, boost}:
 
 stdenv.mkDerivation rec {
   version = "1.0.7";
@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "17vxlmszzpm95vvfdxnm98d5p297i10fyblblj6kf0ynq8r2mpsh";
   };
 
-  buildInputs = [cmake eigen boost];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ eigen boost ];
 
   cmakeFlags = [
     "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3"
@@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A fast K Nearest Neighbor library for low-dimensional spaces";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix
index a2aae1263597..dd902c0021dd 100644
--- a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libnatpmp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "INSTALLPREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://miniupnp.free.fr/libnatpmp.html";
     description = "NAT-PMP client";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix
index 3916ff35f696..3d1e2b7ac4a3 100644
--- a/nixpkgs/pkgs/development/libraries/libnats-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, protobuf, protobufc
 , libsodium, openssl
 }:
@@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ libsodium openssl protobuf protobufc ];
 
   separateDebugInfo = true;
-  enableParallelBuilding = true;
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C API for the NATS messaging system";
     homepage    = "https://github.com/nats-io/nats.c";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libnatspec/default.nix b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix
index 8ac2859faeda..17e43ec29d94 100644
--- a/nixpkgs/pkgs/development/libraries/libnatspec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, popt, libiconv }:
+{ lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }:
 
 stdenv.mkDerivation (rec {
   name = "libnatspec-0.3.0";
@@ -12,12 +12,12 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [ popt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://natspec.sourceforge.net/";
     description = "A library intended to smooth national specificities in using of programs";
     platforms = platforms.unix;
     license = licenses.lgpl21;
   };
-} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+} // lib.optionalAttrs (!stdenv.isLinux) {
   propagatedBuildInputs = [ libiconv ];
 })
diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix
index 6ca6c3018316..b7e082f2b9ba 100644
--- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
-, asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
+, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
 , json_c, kmod, which, util-linux, udev, keyutils
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "man" "dev" ];
 
   nativeBuildInputs =
-    [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+    [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt
       which
     ];
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     echo "m4_define([GIT_VERSION], [${version}])" > version.m4;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for managing the Linux Non-Volatile Memory Device sub-system";
     homepage    = "https://github.com/pmem/ndctl";
     license     = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libndp/default.nix b/nixpkgs/pkgs/development/libraries/libndp/default.nix
index 2592b7184f8e..fc68149c14c3 100644
--- a/nixpkgs/pkgs/development/libraries/libndp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libndp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libndp-1.7";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libndp.org/";
     description = "Library for Neighbor Discovery Protocol";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix
index d27c1ba376d1..1f0709af6cfc 100644
--- a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Dynamic types for data description and in-memory computations";
     homepage = "https://xnd.io/";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/libraries/libnest2d/default.nix b/nixpkgs/pkgs/development/libraries/libnest2d/default.nix
index ee61ef8a7232..567598500d61 100644
--- a/nixpkgs/pkgs/development/libraries/libnest2d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnest2d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
+{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
 
 stdenv.mkDerivation rec {
   version = "2020-10-09-unstable";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   CLIPPER_PATH = "${clipper.out}";
   cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "2D irregular bin packaging and nesting library written in modern C++";
     homepage = "https://github.com/Ultimaker/libnest2d";
diff --git a/nixpkgs/pkgs/development/libraries/libnet/default.nix b/nixpkgs/pkgs/development/libraries/libnet/default.nix
index 7987fccc06fb..cb3375708df1 100644
--- a/nixpkgs/pkgs/development/libraries/libnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libnet";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-includes.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sam-github/libnet";
     description = "Portable framework for low-level network packet construction";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix
index 268da3813e73..72766471d2f1 100644
--- a/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netfilter.org/projects/libnetfilter_acct/";
     description = "Userspace library providing interface to extended accounting infrastructure";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 851357f6404f..a2097bb17e25 100644
--- a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_conntrack";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libmnl ];
   propagatedBuildInputs = [ libnfnetlink ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index ca1671989899..b8b05e57dad2 100644
--- a/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_cthelper";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
   meta = {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       is used by conntrack-tools.
     '';
     homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index 64bcc08ffb91..a8d0c2680dfe 100644
--- a/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_cttimeout";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
   meta = {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       be attached to traffic flows. This library is used by conntrack-tools.
     '';
     homepage = "https://netfilter.org/projects/libnetfilter_cttimeout/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix
index 18346814750b..4ac20cf29cb4 100644
--- a/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_log";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libmnl ];
   propagatedBuildInputs = [ libnfnetlink ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library providing interface to packets that have been logged by the kernel packet filter";
     longDescription = ''
       libnetfilter_log is a userspace library providing interface to packets
diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix
index 7a0796166270..7dafcd42223f 100644
--- a/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }:
 
 stdenv.mkDerivation rec {
   version = "1.0.5";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl libnfnetlink ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
     description = "Userspace API to packets queued by the kernel packet filter";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libnfc/default.nix b/nixpkgs/pkgs/development/libraries/libnfc/default.nix
index ed7412d66110..b4daab97388e 100644
--- a/nixpkgs/pkgs/development/libraries/libnfc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnfc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1, readline }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }:
 
 stdenv.mkDerivation {
   pname = "libnfc";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ libusb-compat-0_1 readline ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source library libnfc for Near Field Communication";
     license = licenses.gpl3;
     homepage = "https://github.com/nfc-tools/libnfc";
diff --git a/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix b/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix
index ecce38ac23e3..4c7b4a5cc2dd 100644
--- a/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libnfnetlink-1.0.1";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
       It is only used by other netfilter.org projects, like the aforementioned ones.
     '';
     homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libnfs/default.nix b/nixpkgs/pkgs/development/libraries/libnfs/default.nix
index 03a4dbe02d5f..4e12553b00ba 100644
--- a/nixpkgs/pkgs/development/libraries/libnfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libnfs";
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "NFS client library";
     homepage    = "https://github.com/sahlberg/libnfs";
     license     = with licenses; [ lgpl2 bsd2 gpl3 ];
diff --git a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
index 3da2ccce4422..025ddf8e7b1d 100644
--- a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   version = "1.1.8";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
     homepage = "http://netfilter.org/projects/libnftnl";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix
index 84bd9b33e790..72fbcd1ab084 100644
--- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, bison, flex, fftw}:
+{lib, stdenv, fetchurl, bison, flex, fftw}:
 
 # Note that this does not provide the ngspice command-line utility. For that see
 # the ngspice derivation.
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = "http://ngspice.sourceforge.net";
     license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
diff --git a/nixpkgs/pkgs/development/libraries/libnice/default.nix b/nixpkgs/pkgs/development/libraries/libnice/default.nix
index e7b01ca29cb1..7c5043165f9d 100644
--- a/nixpkgs/pkgs/development/libraries/libnice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnice/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , python3
 , gobject-introspection
 , gtk-doc
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     gobject-introspection
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GLib ICE implementation";
     longDescription = ''
       Libnice is an implementation of the IETF's Interactice Connectivity
diff --git a/nixpkgs/pkgs/development/libraries/libnih/default.nix b/nixpkgs/pkgs/development/libraries/libnih/default.nix
index 0c38a9c17d7c..fbe01bf4062d 100644
--- a/nixpkgs/pkgs/development/libraries/libnih/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnih/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus, expat }:
+{ lib, stdenv, fetchurl, pkg-config, dbus, expat }:
 
 let version = "1.0.3"; in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus expat ];
 
   doCheck = false; # fails 1 of 17 test
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A small library for C application development";
     homepage = "https://launchpad.net/libnih";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/nixpkgs/pkgs/development/libraries/libnixxml/default.nix
index 5741d4cb5b8a..abbffcf0f942 100644
--- a/nixpkgs/pkgs/development/libraries/libnixxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnixxml/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }:
+{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
 
 stdenv.mkDerivation {
   name = "libnixxml";
@@ -11,13 +11,13 @@ stdenv.mkDerivation {
   configureFlags = [ "--with-gd" "--with-glib" ];
   CFLAGS = "-Wall";
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ];
+  buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ];
   doCheck = false;
   postPatch = ''
     ./bootstrap
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XML-based Nix-friendly data integration library";
     homepage = https://github.com/svanderburg/libnixxml;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/nixpkgs/pkgs/development/libraries/libnotify/default.nix
index 34d8d800c38b..29b371642280 100644
--- a/nixpkgs/pkgs/development/libraries/libnotify/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnotify/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , libxslt
 , docbook-xsl-ns
 , glib
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "man" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36";
   };
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     meson
     ninja
-    pkgconfig
+    pkg-config
     libxslt
     docbook-xsl-ns
   ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.gnome.org/notification-spec/";
     description = "A library that sends desktop notifications to a notification daemon";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libnova/default.nix b/nixpkgs/pkgs/development/libraries/libnova/default.nix
index 8cdbdbd747a9..f6a8d01ab845 100644
--- a/nixpkgs/pkgs/development/libraries/libnova/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnova/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook }:
+{ lib, stdenv, fetchgit, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libnova";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Celestial Mechanics, Astrometry and Astrodynamics Library";
     homepage = "http://libnova.sf.net";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libnsl/default.nix b/nixpkgs/pkgs/development/libraries/libnsl/default.nix
index 76aa3c99e335..ac4c6bf9ad3f 100644
--- a/nixpkgs/pkgs/development/libraries/libnsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libnsl";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libtirpc ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client interface library for NIS(YP) and NIS+";
     homepage = "https://github.com/thkukuk/libnsl";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libnxml/default.nix b/nixpkgs/pkgs/development/libraries/libnxml/default.nix
index dc5e8dfc55e9..846170011437 100644
--- a/nixpkgs/pkgs/development/libraries/libnxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnxml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, curl}:
+{lib, stdenv, fetchurl, curl}:
 
 stdenv.mkDerivation {
   name = "libnxml-0.18.3";
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.autistici.org/bakunin/libnxml/";
     description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.viric ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/liboauth/default.nix b/nixpkgs/pkgs/development/libraries/liboauth/default.nix
index c816bdc90e57..caab0a83fcf6 100644
--- a/nixpkgs/pkgs/development/libraries/liboauth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboauth/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, nss, nspr, pkgconfig }:
+{ fetchurl, lib, stdenv, nss, nspr, pkg-config }:
 
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ nss nspr ];
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       --replace "-lnss3" "-L${nss.out}/lib -lnss3"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     description = "C library implementing the OAuth secure authentication protocol";
     homepage = "http://liboauth.sourceforge.net/";
diff --git a/nixpkgs/pkgs/development/libraries/libodfgen/default.nix b/nixpkgs/pkgs/development/libraries/libodfgen/default.nix
index 1723219e8597..b891c320e868 100644
--- a/nixpkgs/pkgs/development/libraries/libodfgen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libodfgen/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
+{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
 let
   s = # Generated upstream information
   rec {
@@ -9,7 +9,7 @@ let
     url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz";
     sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     boost cppunit zlib libwpg libwpd librevenge
   ];
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
   };
   meta = {
     inherit (s) version;
-    description = ''A base library for generating ODF documents'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "A base library for generating ODF documents";
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libofa/default.nix b/nixpkgs/pkgs/development/libraries/libofa/default.nix
index c24023380340..c78aa3f617ef 100644
--- a/nixpkgs/pkgs/development/libraries/libofa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libofa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, curl, fftw }:
+{ lib, stdenv, fetchurl, expat, curl, fftw }:
 
 let
   version = "0.9.3";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ expat curl fftw ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.google.com/archive/p/musicip-libofa/";
     description = "Library Open Fingerprint Architecture";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libofx/default.nix b/nixpkgs/pkgs/development/libraries/libofx/default.nix
index 692bddeab7dd..10197bd8db09 100644
--- a/nixpkgs/pkgs/development/libraries/libofx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libofx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl
+{ lib, stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl
 , autoconf, automake, libtool, gengetopt, libiconv }:
 
 stdenv.mkDerivation rec {
@@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
   configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
-  nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ];
-  buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+  nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ];
+  buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.isDarwin libiconv;
 
-  meta = { 
+  meta = {
     description = "Opensource implementation of the Open Financial eXchange specification";
     homepage = "http://libofx.sourceforge.net/";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libogg/default.nix b/nixpkgs/pkgs/development/libraries/libogg/default.nix
index 50950a15a870..83555ccab8ce 100644
--- a/nixpkgs/pkgs/development/libraries/libogg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libogg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "libogg-1.3.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64
     (fetchpatch {
       url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Media container library to manipulate Ogg files";
     longDescription = ''
       Library to work with Ogg multimedia container format.
diff --git a/nixpkgs/pkgs/development/libraries/liboggz/default.nix b/nixpkgs/pkgs/development/libraries/liboggz/default.nix
index 07613f0564b0..15856c0262c7 100644
--- a/nixpkgs/pkgs/development/libraries/liboggz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboggz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libogg, pkgconfig }:
+{ lib, stdenv, fetchurl, libogg, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "liboggz-1.1.1";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libogg ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://xiph.org/oggz/";
     description = "A C library and tools for manipulating with Ogg files and streams";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/liboil/default.nix b/nixpkgs/pkgs/development/libraries/liboil/default.nix
index 22adceccecf2..8d9299758159 100644
--- a/nixpkgs/pkgs/development/libraries/liboil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboil/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig }:
+{lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "liboil-0.3.17";
@@ -13,16 +13,16 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev"; # oil-bugreport
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix"
   # errors
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
+  configureFlags = lib.optional stdenv.isDarwin "--build=x86_64";
 
   # fixes a cast in inline asm: easier than patching
-  buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions";
+  buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library of simple functions that are optimized for various CPUs";
     homepage    = "https://liboil.freedesktop.org";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix
index 854c2732c12c..5e3b0c6798a6 100644
--- a/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libomxil-bellagio";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags =
-    stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ];
+    lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ];
 
   patches = [ ./fedora-fixes.patch ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # developed anymore. Alternatively, gcc7Stdenv could be used.
   NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/projects/omxil/";
     description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/liboop/default.nix b/nixpkgs/pkgs/development/libraries/liboop/default.nix
index 6438fd5eb322..5d849ebe1caf 100644
--- a/nixpkgs/pkgs/development/libraries/liboop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboop/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "liboop-1.0";
-  
+
   src = fetchurl {
     url = "http://download.ofb.net/liboop/liboop.tar.gz";
     sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c";
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
     description = "Event loop library";
     homepage = "http://liboop.ofb.net/";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libopcodes/default.nix b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix
index 8db034683dc7..e448d225b993 100644
--- a/nixpkgs/pkgs/development/libraries/libopcodes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ lib, stdenv, buildPackages
 , autoreconfHook, bison, binutils-unwrapped
 , libiberty, libbfd
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library from binutils for manipulating machine code";
     homepage = "https://www.gnu.org/software/binutils/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix
index 5b02d70f6836..9cc57d1a465a 100644
--- a/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libopenaptx";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Audio Processing Technology codec (aptX)";
     license = licenses.lgpl21Plus;
     homepage = "https://github.com/pali/libopenaptx";
diff --git a/nixpkgs/pkgs/development/libraries/liboping/default.nix b/nixpkgs/pkgs/development/libraries/liboping/default.nix
index 956538b76240..c309c70e3d3b 100644
--- a/nixpkgs/pkgs/development/libraries/liboping/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboping/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses perl ];
 
-  configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no";
+  configureFlags = lib.optional (perl == null) "--with-perl-bindings=no";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library to generate ICMP echo requests (a.k.a. ping packets)";
     longDescription = ''
       liboping is a C library to generate ICMP echo requests, better known as
diff --git a/nixpkgs/pkgs/development/libraries/libopus/default.nix b/nixpkgs/pkgs/development/libraries/libopus/default.nix
index e8d3682b8b31..51179ecb9a05 100644
--- a/nixpkgs/pkgs/development/libraries/libopus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , fixedPoint ? false, withCustomModes ? true }:
 
 let
@@ -15,14 +15,14 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point"
-                ++ stdenv.lib.optional withCustomModes "--enable-custom-modes";
+  configureFlags = lib.optional fixedPoint "--enable-fixed-point"
+                ++ lib.optional withCustomModes "--enable-custom-modes";
 
   doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open, royalty-free, highly versatile audio codec";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     homepage = "https://www.opus-codec.org/";
     platforms = platforms.unix;
   };
diff --git a/nixpkgs/pkgs/development/libraries/libopusenc/default.nix b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix
index 989dfc517f0d..c2d77185e692 100644
--- a/nixpkgs/pkgs/development/libraries/libopusenc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libopus }:
+{ lib, stdenv, fetchurl, pkg-config, libopus }:
 
 let
   version = "0.2.1";
@@ -16,10 +16,10 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libopus ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for encoding .opus audio files and live streams";
     license = licenses.bsd3;
     homepage = "https://www.opus-codec.org/";
diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
index 6e7512535949..a6b170167198 100644
--- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , gettext
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     meson
     ninja
     vala
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support";
     homepage = "https://libosinfo.org/";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/nixpkgs/pkgs/development/libraries/libosmium/default.nix
index 830465fb113c..c5b801f5d47b 100644
--- a/nixpkgs/pkgs/development/libraries/libosmium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosmium/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
+{ lib, stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
 
 stdenv.mkDerivation rec {
   pname = "libosmium";
-  version = "2.15.6";
+  version = "2.16.0";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "libosmium";
     rev = "v${version}";
-    sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2";
+    sha256 = "1na51g6xfm1bx0d0izbg99cwmqn0grp0g41znn93xnhs202qnb2h";
   };
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ protozero zlib bzip2 expat boost ];
 
+  cmakeFlags = [ "-DINSTALL_GDALCPP:BOOL=ON" ];
+
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast and flexible C++ library for working with OpenStreetMap data";
     homepage = "https://osmcode.org/libosmium/";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix b/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix
index d1f6ea5c2ea3..1cbfe44ef4e5 100644
--- a/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, protobuf}:
+{lib, stdenv, fetchurl, protobuf}:
 
 stdenv.mkDerivation {
   name = "libosmpbf-1.3.3";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/scrosby/OSM-binary";
     description = "C library to read and write OpenStreetMap PBF files";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix b/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix
index 15b6da0ac5bc..824dac3a2f56 100644
--- a/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 let version = "1.6.2"; in
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation {
 
   configureFlags = [
     "ac_cv_va_copy=yes"
-  ] ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  ] ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   patches = [ ./shtool.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.ossp.org/pkg/lib/uuid/";
     description = "OSSP uuid ISO-C and C++ shared library";
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/libotr/default.nix b/nixpkgs/pkgs/development/libraries/libotr/default.nix
index 10619f9682bf..7c2a2b9a6b9a 100644
--- a/nixpkgs/pkgs/development/libraries/libotr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libotr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, autoreconfHook }:
+{ lib, stdenv, fetchurl, libgcrypt, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libotr-4.1.1";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libgcrypt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.cypherpunks.ca/otr/";
     repositories.git = "git://git.code.sf.net/p/otr/libotr";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libow/default.nix b/nixpkgs/pkgs/development/libraries/libow/default.nix
index d7e83e7a9e3d..e4a8d95f4b0e 100644
--- a/nixpkgs/pkgs/development/libraries/libow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }:
 
 stdenv.mkDerivation rec {
   version = "3.2p4";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s";
   };
 
-  nativeBuildInputs = [ autoconf automake pkgconfig ];
+  nativeBuildInputs = [ autoconf automake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "1-Wire File System full library";
     homepage = "https://owfs.org/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libowfat/default.nix b/nixpkgs/pkgs/development/libraries/libowfat/default.nix
index 068711586091..14270a36ec5d 100644
--- a/nixpkgs/pkgs/development/libraries/libowfat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libowfat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libowfat-0.32";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "prefix=$(out)" ];
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GPL reimplementation of libdjb";
     homepage = "https://www.fefe.de/libowfat/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libp11/default.nix b/nixpkgs/pkgs/development/libraries/libp11/default.nix
index a1e6d05440c0..eb577a7f5a17 100644
--- a/nixpkgs/pkgs/development/libraries/libp11/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libp11/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config
 , openssl }:
 
 stdenv.mkDerivation rec {
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
     "--with-enginesdir=${placeholder "out"}/lib/engines"
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+  nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
 
   buildInputs = [ openssl ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
     homepage = "https://github.com/OpenSC/libp11";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix b/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix
index f8359cded93a..7d026eb5a091 100644
--- a/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , cmake
 , linux-pam
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
     sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p";
   };
 
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional enablePython [ python ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional enablePython [ python ];
 
   # We must use linux-pam, using openpam will result in broken fprintd.
   buildInputs = [ linux-pam ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wrapper for testing PAM modules";
     homepage = "https://cwrap.org/pam_wrapper.html";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libpaper/default.nix b/nixpkgs/pkgs/development/libraries/libpaper/default.nix
index d7863e29d58d..b9372ba1d407 100644
--- a/nixpkgs/pkgs/development/libraries/libpaper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpaper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.1.28";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library for handling paper characteristics";
     homepage = "http://packages.debian.org/unstable/source/libpaper";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libpar2/default.nix b/nixpkgs/pkgs/development/libraries/libpar2/default.nix
index 9447b83af170..625e780d1921 100644
--- a/nixpkgs/pkgs/development/libraries/libpar2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpar2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libsigcxx }:
+{ lib, stdenv, fetchurl, pkg-config, libsigcxx }:
 
 let version = "0.4"; in
 
@@ -11,17 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsigcxx ];
 
   patches = [ ./libpar2-0.4-external-verification.patch ];
 
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
 
   meta = {
     homepage = "http://parchive.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     description = "A library for using Parchives (parity archive volume sets)";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/nixpkgs/pkgs/development/libraries/libpcap/default.nix
index 604fd3ee4465..0b30bf6c2b0d 100644
--- a/nixpkgs/pkgs/development/libraries/libpcap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpcap/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }:
+{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libpcap";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ flex bison ]
-    ++ optionals withBluez [ bluez.dev pkgconfig ];
+    ++ optionals withBluez [ bluez.dev pkg-config ];
 
   # We need to force the autodetection because detection doesn't
   # work in pure build environments.
diff --git a/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/nixpkgs/pkgs/development/libraries/libpeas/default.nix
index 1d360b45052a..a8ef9e2f9bb2 100644
--- a/nixpkgs/pkgs/development/libraries/libpeas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpeas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3
 , glib, gtk3, gobject-introspection, python3, ncurses
 }:
 
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2";
   };
 
-  nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
+  nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ];
   buildInputs =  [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ];
   propagatedBuildInputs = [
     # Required by libpeas-1.0.pc
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GObject-based plugins engine";
     homepage = "https://wiki.gnome.org/Projects/Libpeas";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libpfm/default.nix b/nixpkgs/pkgs/development/libraries/libpfm/default.nix
index 63b826258ae6..20c4c0a1c6e2 100644
--- a/nixpkgs/pkgs/development/libraries/libpfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Helper library to program the performance monitoring events";
     longDescription = ''
       This package provides a library, called libpfm4 which is used to
@@ -32,7 +32,7 @@ stdenv.mkDerivation (rec {
     maintainers = [ maintainers.pierron ];
     platforms = platforms.linux;
   };
-} // stdenv.lib.optionalAttrs ( ! enableShared )
+} // lib.optionalAttrs ( ! enableShared )
 {
   CONFIG_PFMLIB_SHARED = "n";
 }
diff --git a/nixpkgs/pkgs/development/libraries/libpgf/default.nix b/nixpkgs/pkgs/development/libraries/libpgf/default.nix
index 7710c2081996..682ff485d65c 100644
--- a/nixpkgs/pkgs/development/libraries/libpgf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpgf/default.nix
@@ -1,29 +1,25 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix }:
+{ lib, stdenv, fetchzip, autoreconfHook }:
 
-with stdenv.lib;
-
-let
-  version = "6.14.12";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libpgf";
-  inherit version;
+  version = "7.21.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz";
-    sha256 = "1ssqjbh6l5jc04f67n47m9bqcigl46c6lgyabyi6cabnh1frk9dx";
+  src = fetchzip {
+    url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip";
+    sha256 = "0l1j5b1d02jn27miggihlppx656i0pc70cn6x89j1rpj33zn0g9r";
   };
 
-  buildInputs = [ autoconf automake libtool dos2unix ];
-
-  preConfigure = "dos2unix configure.ac; sh autogen.sh";
+  nativeBuildInputs = [ autoreconfHook ];
 
-# configureFlags = optional static "--enable-static --disable-shared";
+  autoreconfPhase = ''
+    mv README.txt README
+    sh autogen.sh
+  '';
 
   meta = {
     homepage = "https://www.libpgf.org/";
     description = "Progressive Graphics Format";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix
index 918c663dfb46..2ff59e055f98 100644
--- a/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }:
+{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }:
 
 stdenv.mkDerivation rec {
   pname = "phonenumber";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     gmock
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   checkPhase = "./libphonenumber_test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google's i18n library for parsing and using phone numbers";
     license = licenses.asl20;
     maintainers = with maintainers; [ illegalprime ];
diff --git a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
index 63035f74ea0e..2d802cf28d76 100644
--- a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchFromGitHub
 , autoreconfHook
 , glib
 , db
-, pkgconfig
+, pkg-config
 }:
 
 let
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     tar -xzf ${modelData} -C $sourceRoot/data
   '';
 
-  nativeBuildInputs = [ autoreconfHook glib db pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook glib db pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for intelligent sentence-based Chinese pinyin input method";
     homepage    = "https://sourceforge.net/projects/libpinyin";
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libpipeline/default.nix b/nixpkgs/pkgs/development/libraries/libpipeline/default.nix
index be3ab953c0a5..b5310c3cb8ca 100644
--- a/nixpkgs/pkgs/development/libraries/libpipeline/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpipeline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libpipeline-1.5.3";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libpipeline.nongnu.org";
     description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
index ac8552fa9ef4..94301b34fbce 100644
--- a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , fetchpatch
 , meson
@@ -11,18 +11,28 @@
 , glslang
 , lcms2
 , epoxy
+, libGL
+, xorg
 }:
 
 stdenv.mkDerivation rec {
   pname = "libplacebo";
-  version = "2.72.2";
+  version = "3.104.0";
+
+  patches = [
+    (fetchpatch {
+      # support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131
+      url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch";
+      sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc";
+    })
+  ];
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i";
+    sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb";
   };
 
   nativeBuildInputs = [
@@ -39,13 +49,15 @@ stdenv.mkDerivation rec {
     glslang
     lcms2
     epoxy
+    libGL
+    xorg.libX11
   ];
 
   mesonFlags = [
     "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reusable library for GPU-accelerated video/image rendering primitives";
     longDescription = ''
       Reusable library for GPU-accelerated image/view processing primitives and
diff --git a/nixpkgs/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix
index 1f311dda9f02..c8e9ddb82c5f 100644
--- a/nixpkgs/pkgs/development/libraries/libplist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, enablePython ? false, python, glib }:
+{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }:
 
 stdenv.mkDerivation rec {
   pname = "libplist";
@@ -11,27 +11,27 @@ stdenv.mkDerivation rec {
     sha256 = "1vxhpjxniybqsg5wcygmdmr5dv7p2zb34dqnd3bi813rnnzsdjm6";
   };
 
-  outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py";
+  outputs = ["bin" "dev" "out" ] ++ lib.optional enablePython "py";
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     autoreconfHook
-  ] ++ stdenv.lib.optionals enablePython [
+  ] ++ lib.optionals enablePython [
     python
     python.pkgs.cython
   ];
 
-  configureFlags = stdenv.lib.optionals (!enablePython) [
+  configureFlags = lib.optionals (!enablePython) [
     "--without-cython"
   ];
 
   propagatedBuildInputs = [ glib ];
 
-  postFixup = stdenv.lib.optionalString enablePython ''
+  postFixup = lib.optionalString enablePython ''
     moveToOutput "lib/${python.libPrefix}" "$py"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to handle Apple Property List format in binary or XML";
     homepage = "https://github.com/libimobiledevice/libplist";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libpng/12.nix b/nixpkgs/pkgs/development/libraries/libpng/12.nix
index 7199695ae74b..bf3d5168d6c6 100644
--- a/nixpkgs/pkgs/development/libraries/libpng/12.nix
+++ b/nixpkgs/pkgs/development/libraries/libpng/12.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null;
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''mv "$out/bin" "$dev/bin"'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official reference implementation for the PNG file format";
     homepage = "http://www.libpng.org/pub/png/libpng.html";
     license = licenses.libpng;
diff --git a/nixpkgs/pkgs/development/libraries/libpng/default.nix b/nixpkgs/pkgs/development/libraries/libpng/default.nix
index 489007bc417d..aeb3fcba06fa 100644
--- a/nixpkgs/pkgs/development/libraries/libpng/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, apngSupport ? true }:
+{ lib, stdenv, fetchurl, zlib, apngSupport ? true }:
 
 assert zlib != null;
 
@@ -8,7 +8,7 @@ let
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
     sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2";
   };
-  whenPatched = stdenv.lib.optionalString apngSupport;
+  whenPatched = lib.optionalString apngSupport;
 
 in stdenv.mkDerivation rec {
   name = "libpng" + whenPatched "-apng" + "-${version}";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
 
   passthru = { inherit zlib; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
     homepage = "http://www.libpng.org/pub/png/libpng.html";
     license = licenses.libpng2;
diff --git a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix
index 20b2988417cc..31fb5cb05ba7 100644
--- a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }:
+{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }:
 
 stdenv.mkDerivation rec {
   pname = "libpointmatcher";
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ eigen boost libnabo ];
 
-  enableParallelBuilding = true;
-
   cmakeFlags = [
     "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3"
   ];
@@ -26,7 +24,7 @@ stdenv.mkDerivation rec {
     ./utest/utest --path ../examples/data/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libportal/default.nix b/nixpkgs/pkgs/development/libraries/libportal/default.nix
index 0f31115f50f0..5eacdaa8f3c8 100644
--- a/nixpkgs/pkgs/development/libraries/libportal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libportal/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_45
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_45
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flatpak portal library";
     homepage = "https://github.com/flatpak/libportal";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix
index 7fcc8c58c1ce..afd1a6365b45 100644
--- a/nixpkgs/pkgs/development/libraries/libproxy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , cmake
 , zlib
 , fetchpatch
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "py3" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     cmake
     makeWrapper
   ];
@@ -82,21 +82,21 @@ stdenv.mkDerivation rec {
       sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8";
     })
 
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     (fetchpatch {
       url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
       sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
     })
   ];
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     # config_gnome3 uses the helper to find GNOME proxy settings
     wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
   '';
 
   doCheck = false; # fails 1 out of 10 tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.lgpl21;
     homepage = "http://libproxy.github.io/libproxy/";
diff --git a/nixpkgs/pkgs/development/libraries/libpseudo/default.nix b/nixpkgs/pkgs/development/libraries/libpseudo/default.nix
index e08feaddc606..f06381505739 100644
--- a/nixpkgs/pkgs/development/libraries/libpseudo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpseudo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, ncurses}:
+{lib, stdenv, fetchurl, pkg-config, glib, ncurses}:
 stdenv.mkDerivation rec {
   name = "libpseudo-1.2.0";
 
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ncurses ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libpseudo.sourceforge.net/";
     description = "Simple, thread-safe messaging between threads";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
index 67e87a5faab4..e68219f63485 100644
--- a/nixpkgs/pkgs/development/libraries/libpsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , docbook_xsl
@@ -8,7 +8,7 @@
 , libidn2
 , libunistring
 , libxslt
-, pkgconfig
+, pkg-config
 , python3
 , valgrind
 , publicsuffix-list
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_43
     gtk-doc
     lzip
-    pkgconfig
+    pkg-config
     python3
     libxslt
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     valgrind
   ];
 
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     "--enable-valgrind-tests"
   ];
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for the Publix Suffix List";
     longDescription = ''
       libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
diff --git a/nixpkgs/pkgs/development/libraries/libpst/default.nix b/nixpkgs/pkgs/development/libraries/libpst/default.nix
index e69cc04d6f0b..40f6b3b1aee1 100644
--- a/nixpkgs/pkgs/development/libraries/libpst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpst/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, autoreconfHook, boost, libgsf,
-  pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
+{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf,
+  pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "libpst-0.6.75";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [
     boost libgsf bzip2
     xmlto gettext imagemagick doxygen
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.five-ten-sg.com/libpst/";
     description = "A library to read PST (MS Outlook Personal Folders) files";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
index bc142b0a57c2..80e6e6fe6689 100644
--- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkgconfig, doxygen,
+{ lib, stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen,
   autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "libqalculate";
-  version = "3.14.0";
+  version = "3.16.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "1j4sr9s7152xmci677pnz64spv8s3ia26fbp5cqx8ydv7swlivh2";
+    sha256 = "0nrf03q3qrsvxf6kjpv69l49yfal79834a3jv75mzi6y674ach9g";
   };
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ];
+  nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ];
   buildInputs = [ curl gettext libiconv readline ];
+  configureFlags = ["--with-readline=${readline.dev}"];
   propagatedBuildInputs = [ libxml2 mpfr icu ];
   enableParallelBuilding = true;
 
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
     substituteInPlace libqalculate/Calculator-plot.cc \
       --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
       --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     substituteInPlace src/qalc.cc \
       --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'
   '';
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An advanced calculator library";
     homepage = "http://qalculate.github.io";
     maintainers = with maintainers; [ gebner ];
diff --git a/nixpkgs/pkgs/development/libraries/libqb/default.nix b/nixpkgs/pkgs/development/libraries/libqb/default.nix
index 244dcf0999b4..3f0a9a28d194 100644
--- a/nixpkgs/pkgs/development/libraries/libqb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libqb-0.17.2";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/clusterlabs/libqb";
     description = "A library providing high performance logging, tracing, ipc, and poll";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix
index 0d1da964adb5..4fc50f207309 100644
--- a/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }:
+{ lib, stdenv, fetchurl, qmake, qtbase, libGLU, AGL }:
 
 stdenv.mkDerivation rec {
   pname = "libqglviewer";
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase libGLU ]
-    ++ stdenv.lib.optional stdenv.isDarwin AGL;
+    ++ lib.optional stdenv.isDarwin AGL;
 
   postPatch = ''
     cd QGLViewer
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers";
     homepage = "http://libqglviewer.com";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix
index de38e5d3b6e7..e616fae92502 100644
--- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
+{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
 
 stdenv.mkDerivation rec {
   pname = "libqmi";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
     description = "Modem protocol helper library";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix
index 84d7c51fd59e..10b2451e7c85 100644
--- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "libquotient";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "libQuotient";
     rev = version;
-    sha256 = "sha256-RYEcFClRdAippG0kspNi9QZIzZAuU4++9LOQTZcqpVc=";
+    sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ=";
   };
 
   buildInputs = [ qtbase qtmultimedia ];
diff --git a/nixpkgs/pkgs/development/libraries/libr3/default.nix b/nixpkgs/pkgs/development/libraries/libr3/default.nix
index 0584203a581a..34ac547f4920 100644
--- a/nixpkgs/pkgs/development/libraries/libr3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libr3/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pcre
-, pkgconfig
+, pkg-config
 , check
 , autoreconfHook
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ check ];
   propagatedBuildInputs = [ pcre ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A high-performance path dispatching library";
     homepage = "https://github.com/c9s/r3";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
index 664b8d1a7e0d..217a83bcebc3 100644
--- a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DVMCS_INSTALL_PREFIX=${placeholder "out"}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userland tools & libraries for interfacing with Raspberry Pi hardware";
     homepage = "https://github.com/raspberrypi/userland";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix
index f59f63c38ac7..3ff7e725f3d8 100644
--- a/nixpkgs/pkgs/development/libraries/libraw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libraw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libraw";
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ lcms2 ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = "https://www.libraw.org/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libraw1394/default.nix b/nixpkgs/pkgs/development/libraries/libraw1394/default.nix
index a99e4d22077e..7bf99e739f31 100644
--- a/nixpkgs/pkgs/development/libraries/libraw1394/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libraw1394/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libraw1394-2.1.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
     homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/librdf/raptor.nix b/nixpkgs/pkgs/development/libraries/librdf/raptor.nix
index ef194bb0b1ec..8d1b1f2a0ea4 100644
--- a/nixpkgs/pkgs/development/libraries/librdf/raptor.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/raptor.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, curl }:
+{ lib, stdenv, fetchurl, libxml2, curl }:
 
 stdenv.mkDerivation rec {
   name = "raptor-1.4.21";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
-    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ lgpl21 asl20 ];
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
index 4645b5ea0d83..bb8aeefa102c 100644
--- a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, libxslt }:
+{ lib, stdenv, fetchurl, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
   pname = "raptor2";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
-    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ lgpl21 asl20 ];
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix b/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix
index d9b94a668c60..88acc372f7f5 100644
--- a/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }:
+{ lib, stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }:
 
 stdenv.mkDerivation rec {
   name = "rasqal-0.9.33";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ gmp pcre libxml2 ];
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
-    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ lgpl21 asl20 ];
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/librdf/redland.nix b/nixpkgs/pkgs/development/libraries/librdf/redland.nix
index a85500d2c6ec..731d1cf18684 100644
--- a/nixpkgs/pkgs/development/libraries/librdf/redland.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/redland.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
+{ lib, stdenv, fetchurl, pkg-config, openssl, libxslt, perl
 , curl, pcre, libxml2, librdf_rasqal, gmp
 , libmysqlclient, withMysql ? false
 , postgresql, withPostgresql ? false
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681";
   };
 
-  nativeBuildInputs = [ perl pkgconfig ];
+  nativeBuildInputs = [ perl pkg-config ];
 
   buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
-    ++ stdenv.lib.optional withMysql libmysqlclient
-    ++ stdenv.lib.optional withSqlite sqlite
-    ++ stdenv.lib.optional withPostgresql postgresql
-    ++ stdenv.lib.optional withBdb db;
+    ++ lib.optional withMysql libmysqlclient
+    ++ lib.optional withSqlite sqlite
+    ++ lib.optional withPostgresql postgresql
+    ++ lib.optional withBdb db;
 
   propagatedBuildInputs = [ librdf_rasqal ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--with-threads" ]
-    ++ stdenv.lib.optionals withBdb [
+    ++ lib.optionals withBdb [
       "--with-bdb-include=${db.dev}/include"
       "--with-bdb-lib=${db.out}/lib"
     ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails 1 out of 17 tests with a segmentation fault
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C libraries that provide support for the Resource Description Framework (RDF)";
     homepage = "http://librdf.org/";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libre/default.nix b/nixpkgs/pkgs/development/libraries/libre/default.nix
index 6e1d0a8ce3c4..e960fe8f4b26 100644
--- a/nixpkgs/pkgs/development/libraries/libre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libre/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, openssl}:
+{lib, stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
   version = "0.6.1";
   pname = "libre";
@@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ zlib openssl ];
   makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
-  ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
-  ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
   ;
   meta = {
     description = "A library for real-time communications with async IO support and a complete SIP stack";
     homepage = "http://www.creytiv.com/re.html";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.bsd3;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix
index 2ceb2125dbc9..82761dc3d009 100644
--- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkgconfig, gcc
+{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkg-config, gcc
 , cudaSupport ? config.cudaSupport or false, cudatoolkit
 , enablePython ? false, pythonPackages ? null }:
 
@@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null;
 
 stdenv.mkDerivation rec {
   pname = "librealsense";
-  version = "2.40.0";
+  version = "2.41.0";
 
   outputs = [ "out" "dev" ];
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "IntelRealSense";
     repo = pname;
     rev = "v${version}";
-    sha256 = "KZNriNDxRKR14KFJrAbzZLfSQ3iiZ8PKC80fVh0AQls=";
+    sha256 = "0ngv9fgja72vg7hq1aiwpa7x4dhniawhpd8mqm85pqkjxiph8s1k";
   };
 
   buildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   cmakeFlags = [
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)";
     homepage = "https://github.com/IntelRealSense/librealsense";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/nixpkgs/pkgs/development/libraries/libredwg/default.nix
index 71667460e239..5fca199acb0a 100644
--- a/nixpkgs/pkgs/development/libraries/libredwg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libredwg/default.nix
@@ -6,17 +6,17 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libredwg";
-  version = "0.10.1.3707";
+  version = "0.12";
 
   src = fetchFromGitHub {
     owner = "LibreDWG";
     repo = pname;
     rev = version;
-    sha256 = "009n96lx4ahf05ryvm09z0l9956vz94r8pliyb88j0jficl0pxkf";
+    sha256 = "0ayhp3ym30hzp5f6dz7mmp9hpxf6a48nx3kq5crcmzycm5fllbn7";
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] 
+  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]
     ++ lib.optional enablePython swig;
 
   buildInputs = [ pcre2 ]
diff --git a/nixpkgs/pkgs/development/libraries/librelp/default.nix b/nixpkgs/pkgs/development/libraries/librelp/default.nix
index 7d0eb7f67dd8..edf927e86647 100644
--- a/nixpkgs/pkgs/development/libraries/librelp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librelp/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook
 , gnutls
 , openssl
-, pkgconfig
+, pkg-config
 , zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "librelp";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "rsyslog";
     repo = "librelp";
     rev = "v${version}";
-    sha256 = "132i1b1m7c7hkbxsnpa7n07cbghxjxmcbb8zhgwziaxg4nzxsa6l";
+    sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ gnutls zlib openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A reliable logging library";
     homepage = "https://www.librelp.com/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/librem/default.nix b/nixpkgs/pkgs/development/libraries/librem/default.nix
index 012ac2a46a74..349384b4674c 100644
--- a/nixpkgs/pkgs/development/libraries/librem/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librem/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, openssl, libre}:
+{lib, stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
   version = "0.6.0";
   pname = "librem";
@@ -10,17 +10,17 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
     "LIBRE_INC=${libre}/include/re"
-    ''PREFIX=$(out)''
+    "PREFIX=$(out)"
   ]
-  ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}"
-  ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
   ;
   meta = {
     description = " A library for real-time audio and video processing";
     homepage = "http://www.creytiv.com/rem.html";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.bsd3;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.bsd3;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
     downloadURLRegexp = "/rem-.*[.]tar[.].*";
diff --git a/nixpkgs/pkgs/development/libraries/librep/default.nix b/nixpkgs/pkgs/development/libraries/librep/default.nix
index bed92477a3fc..74c45f00adcf 100644
--- a/nixpkgs/pkgs/development/libraries/librep/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librep/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl
-, pkgconfig, autoreconfHook
+{ lib, stdenv, fetchurl
+, pkg-config, autoreconfHook
 , readline, texinfo
 , gdbm, gmp, libffi }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "librep";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ readline texinfo ];
   propagatedBuildInputs = [ gdbm gmp libffi ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libresample/default.nix b/nixpkgs/pkgs/development/libraries/libresample/default.nix
index 85d8d5c586b5..0756874b3e75 100644
--- a/nixpkgs/pkgs/development/libraries/libresample/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libresample/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake}:
+{lib, stdenv, fetchurl, cmake}:
 
 let
   patch = fetchurl {
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
   preConfigure = ''
     cat debian/patches/1001_shlib-cmake.patch | patch -p1
   '';
-  buildInputs = [ cmake ];
-  
+  nativeBuildInputs = [ cmake ];
+
   meta = {
     description = "A real-time library for sampling rate conversion library";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.sander ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix
index 1f6313d8caab..d67342eebc11 100644
--- a/nixpkgs/pkgs/development/libraries/libressl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch, buildShared ? true }:
+{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch
+, buildShared ? !stdenv.hostPlatform.isStatic
+}:
 
 let
 
@@ -40,8 +42,6 @@ let
       substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"'
     '';
 
-    enableParallelBuilding = true;
-
     outputs = [ "bin" "dev" "out" "man" "nc" ];
 
     postFixup = ''
diff --git a/nixpkgs/pkgs/development/libraries/librest/default.nix b/nixpkgs/pkgs/development/libraries/librest/default.nix
index e1d7b336273d..7b1ff8235aac 100644
--- a/nixpkgs/pkgs/development/libraries/librest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librest/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "rest";
   version = "0.8.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
   };
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection ];
+  nativeBuildInputs = [ pkg-config gobject-introspection ];
   buildInputs = [ glib libsoup ];
 
   configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Helper library for RESTful services";
     homepage = "https://wiki.gnome.org/Projects/Librest";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/librevenge/default.nix b/nixpkgs/pkgs/development/libraries/librevenge/default.nix
index 2c6e792ae8ce..1d7754bfcaef 100644
--- a/nixpkgs/pkgs/development/libraries/librevenge/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librevenge/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}:
+{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib}:
 let
   s = # Generated upstream information
   rec {
@@ -9,7 +9,7 @@ let
     url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz";
     sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     boost cppunit zlib
   ];
@@ -34,9 +34,9 @@ stdenv.mkDerivation {
 
   meta = {
     inherit (s) version;
-    description = ''A base library for writing document import filters'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "A base library for writing document import filters";
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/librevisa/default.nix b/nixpkgs/pkgs/development/libraries/librevisa/default.nix
index b49fb3f7ee77..892bbbbbfc04 100644
--- a/nixpkgs/pkgs/development/libraries/librevisa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librevisa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 # TODO: add VXI development files, for VXI-11 (TCPIP) support
 
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb1 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the VISA standard (for instrument control)";
     longDescription = ''
       LibreVISA aims to be a compliant implementation of the VISA standard in a
diff --git a/nixpkgs/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix
index a9a17eca786a..b6db462f3c34 100644
--- a/nixpkgs/pkgs/development/libraries/librime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
+{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
   libyamlcpp, gmock }:
 
 stdenv.mkDerivation rec {
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://rime.im/";
     description = "Rime Input Method Engine, the core library";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libroxml/default.nix b/nixpkgs/pkgs/development/libraries/libroxml/default.nix
index b72ffb5b7ecc..de1877f2ab40 100644
--- a/nixpkgs/pkgs/development/libraries/libroxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libroxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libroxml-2.3.0";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz";
     sha256  = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.libroxml.net/";
     description = "This library is minimum, easy-to-use, C implementation for xml file parsing";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/librseq/default.nix b/nixpkgs/pkgs/development/libraries/librseq/default.nix
index 4fd8bb7e33a4..12b9b4109c70 100644
--- a/nixpkgs/pkgs/development/libraries/librseq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librseq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook, linuxHeaders
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library for the Linux Restartable Sequence API";
     homepage    = "https://github.com/compudj/librseq";
     license     = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix
index ecf518d04dae..efdbf5934630 100644
--- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2
+{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2
 , bzip2, libintl, darwin, rustc, cargo, gnome3
 , vala, gobject-introspection }:
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gdk-pixbuf cairo ];
 
-  nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
+  nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ]
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       ApplicationServices
     ]);
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     "--enable-vala"
     "--enable-installed-tests"
     "--enable-always-build-tests"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+  ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
   makeFlags = [
     "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG"
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   NIX_CFLAGS_COMPILE
-    = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";
+    = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";
 
   # It wants to add loaders and update the loaders.cache in gdk-pixbuf
   # Patching the Makefiles to it creates rsvg specific loaders and the
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small library to render SVG images to Cairo surfaces";
     homepage = "https://wiki.gnome.org/Projects/LibRsvg";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/librsync/0.9.nix b/nixpkgs/pkgs/development/libraries/librsync/0.9.nix
index 35ccdcdf0782..74dca4e30854 100644
--- a/nixpkgs/pkgs/development/libraries/librsync/0.9.nix
+++ b/nixpkgs/pkgs/development/libraries/librsync/0.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "librsync-0.9.7";
@@ -11,16 +11,16 @@ stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   configureFlags = [
-    (stdenv.lib.enableFeature stdenv.isCygwin    "static")
-    (stdenv.lib.enableFeature (!stdenv.isCygwin) "shared")
+    (lib.enableFeature stdenv.isCygwin    "static")
+    (lib.enableFeature (!stdenv.isCygwin) "shared")
   ];
 
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
   meta = {
     homepage = "http://librsync.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     description = "Implementation of the rsync remote-delta algorithm";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/librsync/default.nix b/nixpkgs/pkgs/development/libraries/librsync/default.nix
index 9499be80f033..9211d9d233f8 100644
--- a/nixpkgs/pkgs/development/libraries/librsync/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librsync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
+{ lib, stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
 
 stdenv.mkDerivation rec {
   pname = "librsync";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://librsync.sourceforge.net/";
     license = licenses.lgpl2Plus;
     description = "Implementation of the rsync remote-delta algorithm";
diff --git a/nixpkgs/pkgs/development/libraries/librtprocess/default.nix b/nixpkgs/pkgs/development/libraries/librtprocess/default.nix
index adabbe11cb3e..3e44bfd3d7dd 100644
--- a/nixpkgs/pkgs/development/libraries/librtprocess/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librtprocess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "librtprocess";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/CarVac/librtprocess";
     description = "Highly optimized library for processing RAW images";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libs3/default.nix b/nixpkgs/pkgs/development/libraries/libs3/default.nix
index 3012263cb414..5a2b8636774f 100644
--- a/nixpkgs/pkgs/development/libraries/libs3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libs3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, curl, libxml2 }:
+{ lib, stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
   name = "libs3-2018-12-03";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   makeFlags = [ "DESTDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bji/libs3";
     description = "A library for interfacing with amazon s3";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix
index 92958f389f04..5cf872c3fc39 100644
--- a/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }:
+{ lib, stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }:
 
 let
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
 in stdenv.mkDerivation rec {
   name = "libsamplerate-0.1.9";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsndfile ]
     ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
 
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sample Rate Converter for audio";
     homepage    = "http://www.mega-nerd.com/SRC/index.html";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libsass/default.nix b/nixpkgs/pkgs/development/libraries/libsass/default.nix
index cebfdfe38389..f4caa22b3229 100644
--- a/nixpkgs/pkgs/development/libraries/libsass/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libsass";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C/C++ implementation of a Sass compiler";
     homepage = "https://github.com/sass/libsass";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libschrift/default.nix b/nixpkgs/pkgs/development/libraries/libschrift/default.nix
new file mode 100644
index 000000000000..3781d9346125
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libschrift/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "libschrift";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "tomolt";
+    repo = pname;
+    rev = "c6d20460d6e602e8829d3a227fd7be4c4c3cda86";
+    hash = "sha256-BuTmWaWFZ0DXujlbhbmK3Woit8fR9F4DWmKszHX6gOI=";
+  };
+
+  postPatch = ''
+    substituteInPlace config.mk \
+      --replace "PREFIX = /usr/local" "PREFIX = $out"
+  '';
+
+  makeFlags = [ "libschrift.a" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/tomolt/libschrift";
+    description = "A lightweight TrueType font rendering library";
+    license = licenses.isc;
+    platforms = platforms.all;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libscrypt/default.nix b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix
index 7eaa8f855784..1bd22b2f7901 100644
--- a/nixpkgs/pkgs/development/libraries/libscrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libscrypt";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng";
   };
 
-  buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
+  buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
 
   installFlags = [ "PREFIX=$(out)" ];
-  installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx";
+  installTargets = lib.optional stdenv.isDarwin "install-osx";
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library that implements scrypt() functionality";
     homepage = "https://lolware.net/2014/04/29/libscrypt.html";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix
index c9c105d1b18a..1ac5cef7c5f6 100644
--- a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
+{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}:
 
 stdenv.mkDerivation rec {
   version = "3.2.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./libsearpc.pc.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ];
   propagatedBuildInputs = [ glib jansson ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/haiwen/libsearpc";
     description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
index a0414f5ba55f..7ea7add23f3e 100644
--- a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, getopt, util-linux, gperf }:
+{ lib, stdenv, fetchurl, getopt, util-linux, gperf }:
 
 stdenv.mkDerivation rec {
   pname = "libseccomp";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High level library for the Linux Kernel seccomp filter";
     homepage = "https://github.com/seccomp/libseccomp";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix
index d614ab01297e..6c28b7d16c16 100644
--- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3
+{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
 , gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.20.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib ];
   nativeBuildInputs = [
-    pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl
+    pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl
     gobject-introspection vala gtk-doc glib
   ];
   buildInputs = [ libgcrypt ];
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A library for storing and retrieving passwords and other secrets";
     homepage = "https://wiki.gnome.org/Projects/Libsecret";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     inherit (glib.meta) platforms maintainers;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libserialport/default.nix b/nixpkgs/pkgs/development/libraries/libserialport/default.nix
index c7f34362f39f..0a2adc4126f1 100644
--- a/nixpkgs/pkgs/development/libraries/libserialport/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libserialport/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, darwin }:
+{ lib, stdenv, fetchurl, pkg-config, udev, darwin }:
 
 stdenv.mkDerivation rec {
   name = "libserialport-0.1.1";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = stdenv.lib.optional stdenv.isLinux udev
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit;
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = lib.optional stdenv.isLinux udev
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform shared library for serial port access";
     homepage = "https://sigrok.org/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libshout/default.nix b/nixpkgs/pkgs/development/libraries/libshout/default.nix
index 075855fada46..c810034f8478 100644
--- a/nixpkgs/pkgs/development/libraries/libshout/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libshout/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , libvorbis, libtheora, speex }:
 
-# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
+# need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc
 
 stdenv.mkDerivation rec {
   name = "libshout-2.4.4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libvorbis libtheora speex ];
 
   meta = {
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://www.icecast.org";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ jcumming ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
index 5845916239c3..d5f8dd6e5730 100644
--- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , fetchurl
-, pkgconfig
+, pkg-config
 , docSupport ? true
 , doxygen ? null
 , graphviz ? null
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0";
   };
 
-  nativeBuildInputs = [ pkgconfig ]
+  nativeBuildInputs = [ pkg-config ]
     ++ optionals docSupport [ doxygen graphviz ];
 
   installTargets = [ "install" ]
diff --git a/nixpkgs/pkgs/development/libraries/libsieve/default.nix b/nixpkgs/pkgs/development/libraries/libsieve/default.nix
index e1c6f3efe526..8253d1df74fe 100644
--- a/nixpkgs/pkgs/development/libraries/libsieve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsieve/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   version = "2.3.1";
   pname = "libsieve";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interpreter for RFC 3028 Sieve and various extensions";
     homepage = "http://sodabrew.com/libsieve/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix
index 0fc19d207596..a417e0bcc1d7 100644
--- a/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, m4}:
+{lib, stdenv, fetchurl, pkg-config, m4}:
 
 stdenv.mkDerivation rec {
   name = "libsigc++-1.2.7";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ m4];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
     description = "A typesafe callback system for standard C++";
     branch = "1.2";
diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix
index 8f883626d823..eac383fae0d9 100644
--- a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libsigc++";
   version = "2.10.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
   };
 
-  nativeBuildInputs = [ pkgconfig gnum4 ];
+  nativeBuildInputs = [ pkg-config gnum4 ];
 
   doCheck = true;
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
     description = "A typesafe callback system for standard C++";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix b/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix
index 6278f6234f0b..203d3613af85 100644
--- a/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "libsignal-protocol-c";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Signal Protocol C Library";
     homepage = "https://github.com/signalapp/libsignal-protocol-c";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix b/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
index 1f453dc291e4..ae7a6775de55 100644
--- a/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, nix-update-script, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }:
+{ lib, stdenv, fetchgit, nix-update-script, pkg-config, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "libsignon-glib";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     gtk-doc
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     vala
   ];
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for managing single signon credentials which can be used from GLib applications";
     homepage = "https://gitlab.com/accounts-sso/libsignon-glib";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix b/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
index 30921ade4cf5..20cb80b1ff85 100644
--- a/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , enableSigbusFix ? false # required by kernels < 3.18.6
 }:
 
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
       more.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libsixel/default.nix b/nixpkgs/pkgs/development/libraries/libsixel/default.nix
index 9e151931e653..e82ecde5ddd2 100644
--- a/nixpkgs/pkgs/development/libraries/libsixel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsixel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub}:
+{lib, stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
   version = "1.8.6";
   pname = "libsixel";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The SIXEL library for console graphics, and converter programs";
     homepage = "http://saitoha.github.com/libsixel";
     maintainers = with maintainers; [ vrthra ];
diff --git a/nixpkgs/pkgs/development/libraries/libskk/default.nix b/nixpkgs/pkgs/development/libraries/libskk/default.nix
index e5fd031b5fff..c4b36704cb97 100644
--- a/nixpkgs/pkgs/development/libraries/libskk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libskk/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub,
-  libtool, gettext, pkgconfig,
+{ lib, stdenv, fetchFromGitHub,
+  libtool, gettext, pkg-config,
   vala, gnome-common, gobject-introspection,
   libgee, json-glib, skk-dicts, libxkbcommon }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ skk-dicts libxkbcommon ];
-  nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkgconfig ];
+  nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ];
   propagatedBuildInputs = [ libgee json-glib ];
 
   preConfigure = ''
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
       user dictionary, skkserv, and CDB format dictionary.
     '';
     homepage = "https://github.com/ueno/libskk";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ yuriaisaka ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/nixpkgs/pkgs/development/libraries/libslirp/default.nix
index af6d26bc22b6..8bd74d292430 100644
--- a/nixpkgs/pkgs/development/libraries/libslirp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libslirp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     echo ${version} > .tarball-version
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "General purpose TCP-IP emulator";
     homepage = "https://gitlab.freedesktop.org/slirp/libslirp";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix b/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix
index bb3de08cf72e..3ef1f3148994 100644
--- a/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}:
 
 stdenv.mkDerivation rec {
   name = "libsmartcols";
   version = "v2.36.1";
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python3 ];
+  nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ];
 
   src = fetchFromGitHub {
     owner = "karelzak";
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "smart column output alignment library";
     homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ rb2k ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ rb2k ];
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/libsmi/default.nix b/nixpkgs/pkgs/development/libraries/libsmi/default.nix
index 881af18d5592..9b71a91efed2 100644
--- a/nixpkgs/pkgs/development/libraries/libsmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv , fetchurl }:
+{ lib, stdenv , fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libsmi";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Library to Access SMI MIB Information";
     homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html";
     license = licenses.free;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libsnark/default.nix b/nixpkgs/pkgs/development/libraries/libsnark/default.nix
index 227353e0a9f8..3864a99f5e98 100644
--- a/nixpkgs/pkgs/development/libraries/libsnark/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsnark/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }:
+{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }:
 
 let
   rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
   inherit (stdenv) lib;
 in stdenv.mkDerivation rec {
   name = "libsnark-pre${version}";
-  version = stdenv.lib.substring 0 8 rev;
+  version = lib.substring 0 8 rev;
 
-  buildInputs = [ cmake pkgconfig openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
 
   cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ];
 
@@ -19,12 +20,10 @@ in stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for zkSNARKs";
     homepage = "https://github.com/scipr-lab/libsnark";
     license = licenses.mit;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix
index 739bc7d73323..61e6d9cd7652 100644
--- a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkgconfig, python3
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3
 , Carbon, AudioToolbox
 }:
 
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
     sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa";
   };
 
-  nativeBuildInputs = [ autoreconfHook autogen pkgconfig python3 ];
+  nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ];
   buildInputs = [ flac libogg libopus libvorbis ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
+    ++ lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
 
   enableParallelBuilding = true;
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   # need headers from the Carbon.framework in /System/Library/Frameworks to
   # compile this on darwin -- not sure how to handle
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin
+  preConfigure = lib.optionalString stdenv.isDarwin
     ''
       NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
     '';
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   # Needed on Darwin.
   NIX_CFLAGS_LINK = "-logg -lvorbis";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading and writing files containing sampled sound";
     homepage    = "https://libsndfile.github.io/libsndfile/";
     license     = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
index c6381e2a1414..db2cd044592b 100644
--- a/nixpkgs/pkgs/development/libraries/libsodium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libsodium-1.0.18";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern and easy-to-use crypto library";
     homepage = "http://doc.libsodium.org/";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix
index d75d9cc07805..bfacecde256d 100644
--- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
   version  = "0.7.16";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ zlib expat rpm db ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free package dependency solver";
     homepage    = "https://github.com/openSUSE/libsolv";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libsoundio/default.nix b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix
index a4a81af532ad..ac9f3b256546 100644
--- a/nixpkgs/pkgs/development/libraries/libsoundio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }:
+{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }:
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ libjack2 libpulseaudio ]
-    ++ stdenv.lib.optional stdenv.isLinux alsaLib
-    ++ stdenv.lib.optional stdenv.isDarwin AudioUnit;
+    ++ lib.optional stdenv.isLinux alsaLib
+    ++ lib.optional stdenv.isDarwin AudioUnit;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross platform audio input and output";
     homepage = "http://libsound.io/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix
index 88c6a359ba8d..47fcdd41f8ab 100644
--- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture
+{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture
 , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
 , libpsl, python3, brotli
 }:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2.72.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p";
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals stdenv.isLinux [
     libsysprof-capture
   ];
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
+  nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala glib ];
   propagatedBuildInputs = [ glib libxml2 ];
 
   NIX_CFLAGS_COMPILE = [ "-lpthread" ];
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "HTTP client/server library for GNOME";
     homepage = "https://wiki.gnome.org/Projects/libsoup";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     inherit (glib.meta) maintainers platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix
index 4b5f7f4b3f10..4c778fbd6902 100644
--- a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let version = "1.8.5"; in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Extensible spatial index library in C++";
     homepage = "http://libspatialindex.github.io/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libspatialite/default.nix b/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
index bdc4504ad5ac..2e9dadf0bf5d 100644
--- a/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
+{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }:
 
 with lib;
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libxml2 sqlite zlib proj geos libiconv ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libspectre/default.nix b/nixpkgs/pkgs/development/libraries/libspectre/default.nix
index 11400a6a3e23..465aa941f396 100644
--- a/nixpkgs/pkgs/development/libraries/libspectre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspectre/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }:
+{ fetchurl, lib, stdenv, pkg-config, ghostscript, cairo }:
 
 stdenv.mkDerivation rec {
   name = "libspectre-0.2.7";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     # Need `libgs.so'.
-    pkgconfig ghostscript cairo /*for tests*/
+    pkg-config ghostscript cairo /*for tests*/
   ];
 
   doCheck = true;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       handling and rendering Postscript documents.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libspectrum/default.nix b/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
index 24b9b9241c21..8922bedccdc8 100644
--- a/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perl, pkgconfig, audiofile, bzip2, glib, libgcrypt, zlib }:
+{ lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }:
 
 stdenv.mkDerivation rec {
   name = "libspectrum-1.4.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx";
   };
 
-  nativeBuildInputs = [ perl pkgconfig ];
+  nativeBuildInputs = [ perl pkg-config ];
 
   buildInputs = [ audiofile bzip2 glib libgcrypt zlib ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libspf2/default.nix b/nixpkgs/pkgs/development/libraries/libspf2/default.nix
index 42b39179b204..6a9cb8b647cc 100644
--- a/nixpkgs/pkgs/development/libraries/libspf2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspf2/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libspf2";
diff --git a/nixpkgs/pkgs/development/libraries/libspiro/default.nix b/nixpkgs/pkgs/development/libraries/libspiro/default.nix
index a77e209119bb..03bfe14d3bee 100644
--- a/nixpkgs/pkgs/development/libraries/libspiro/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspiro/default.nix
@@ -1,4 +1,4 @@
-{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }:
+{lib, stdenv, pkg-config, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libspiro";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that simplifies the drawing of beautiful curves";
     homepage = "https://github.com/fontforge/libspiro";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libspotify/default.nix b/nixpkgs/pkgs/development/libraries/libspotify/default.nix
index 69cd24dfd6e8..b39944d13dca 100644
--- a/nixpkgs/pkgs/development/libraries/libspotify/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }:
+{ lib, stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }:
 
 let
   version = "12.1.51";
@@ -47,14 +47,14 @@ else stdenv.mkDerivation {
 
 
   # darwin-specific
-  buildInputs = stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
+  buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
 
   # linux-specific
-  installFlags = stdenv.lib.optional isLinux
+  installFlags = lib.optional isLinux
     "prefix=$(out)";
-  patchPhase = stdenv.lib.optionalString isLinux
+  patchPhase = lib.optionalString isLinux
     "${gnused}/bin/sed -i 's/ldconfig//' Makefile";
-  postInstall = stdenv.lib.optionalString isLinux
+  postInstall = lib.optionalString isLinux
     "mv -v share $out";
 
   passthru = {
@@ -65,9 +65,9 @@ else stdenv.mkDerivation {
         pname = "libspotify-samples";
         inherit version;
         src = libspotify.src;
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
         buildInputs = [ libspotify readline ]
-          ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+          ++ lib.optional (!stdenv.isDarwin) alsaLib;
         postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples";
         patchPhase = "cp ${apiKey} appkey.c";
         installPhase = ''
@@ -82,7 +82,7 @@ else stdenv.mkDerivation {
     inherit apiKey;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Spotify API library";
     homepage    = "https://developer.spotify.com/technologies/libspotify";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/nixpkgs/pkgs/development/libraries/libsrs2/default.nix b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix
index 0d186204f92f..3da48f772545 100644
--- a/nixpkgs/pkgs/development/libraries/libsrs2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
     description = "The next generation SRS library from the original designer of SRS";
     license = with lib.licenses; [ gpl2 bsd3 ];
     homepage = "https://www.libsrs2.org/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libssh/default.nix b/nixpkgs/pkgs/development/libraries/libssh/default.nix
index c6accad9c3c8..c613cfab777b 100644
--- a/nixpkgs/pkgs/development/libraries/libssh/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
+{ lib, stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
   pname = "libssh";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib openssl libsodium ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SSH client library";
     homepage = "https://libssh.org";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix
index 8ce9c814df05..ed09e8ba5624 100644
--- a/nixpkgs/pkgs/development/libraries/libssh2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, zlib, windows }:
+{ lib, stdenv, fetchurl, openssl, zlib, windows }:
 
 stdenv.mkDerivation rec {
   pname = "libssh2";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   buildInputs = [ openssl zlib ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
+    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
 
   patches = [
     # Not able to use fetchpatch here: infinite recursion
     ./CVE-2019-17498.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = "https://www.libssh2.org";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix b/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix
index 70a632dd4a79..6d874fe23678 100644
--- a/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav";
   };
 
-  buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit;
+  buildInputs = [] ++ lib.optional stdenv.isDarwin IOKit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.i-scream.org/libstatgrab/";
     description = "A library that provides cross platforms access to statistics about the running system";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libstroke/default.nix b/nixpkgs/pkgs/development/libraries/libstroke/default.nix
index e97b96d71d09..76f5b6b4b8c6 100644
--- a/nixpkgs/pkgs/development/libraries/libstroke/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libstroke/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
+{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
 
 stdenv.mkDerivation {
   name = "libstroke-0.5.1";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A library for simple gesture recognition";
     homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
 
     longDescription =
       '' libstroke, last updated in 2001, still successfully provides a basic
@@ -29,6 +29,6 @@ stdenv.mkDerivation {
         easy to work with, and notably used by FVWM.
       '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix
index 428e23f33f51..ccc6fedd9169 100644
--- a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix
@@ -1,26 +1,32 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }:
+{ lib, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libtool
+, openssl
+, expat
+, pkg-config
+, check
+}:
 
 stdenv.mkDerivation rec {
   pname = "libstrophe";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "strophe";
     repo = pname;
     rev = version;
-    sha256 = "1hizw695fw0cy88h1dpl9pvniapml2zw9yvxck8xvxbqfz54jwja";
+    sha256 = "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79";
   };
 
-  nativeBuildInputs = [ automake autoconf pkgconfig libtool check ];
-  buildInputs = [ openssl expat ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  buildInputs = [ openssl expat libtool check ];
 
   dontDisableStatic = true;
 
-  preConfigure = "mkdir m4 && sh bootstrap.sh";
-
   doCheck = true;
 
-  meta = {
+  meta = with lib; {
     description = "A simple, lightweight C library for writing XMPP clients";
     longDescription = ''
       libstrophe is a lightweight XMPP client library written in C. It has
@@ -28,8 +34,10 @@ stdenv.mkDerivation rec {
       runs well on both Linux, Unix, and Windows based platforms.
     '';
     homepage = "https://strophe.im/libstrophe/";
-    license = with stdenv.lib.licenses; [ gpl3 mit ];
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ devhell flosse ];
+    license = with licenses; [ gpl3Only mit ];
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
+    maintainers = with maintainers; [ devhell flosse ];
   };
 }
+
diff --git a/nixpkgs/pkgs/development/libraries/libsurvive/default.nix b/nixpkgs/pkgs/development/libraries/libsurvive/default.nix
new file mode 100644
index 000000000000..08be9c1a35d2
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libsurvive/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, freeglut
+, liblapack
+, libusb1
+, openblas
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libsurvive";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "cntools";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0m21fnq8pfw2pcvqfgjws531zmalda423q9i65v4qzm8sdb54hl4";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = [
+    freeglut
+    liblapack
+    libusb1
+    openblas
+    zlib
+  ];
+
+  meta = with lib; {
+    description = "Open Source Lighthouse Tracking System";
+    homepage = "https://github.com/cntools/libsurvive";
+    license = licenses.mit;
+    maintainers = with maintainers; [ expipiplus1 prusnak ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libsvm/default.nix b/nixpkgs/pkgs/development/libraries/libsvm/default.nix
index 5dc4deb30be9..6f4741ed4d05 100644
--- a/nixpkgs/pkgs/development/libraries/libsvm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsvm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "libsvm";
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
     ln -s $out/include/svm.h $out/include/libsvm/svm.h
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for support vector machines";
     homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix
index b46a848a0416..1ce7ef58c886 100644
--- a/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, gettext, python, elfutils}:
+{lib, stdenv, fetchgit, gettext, python, elfutils}:
 
 stdenv.mkDerivation {
   pname = "libsystemtap";
@@ -20,11 +20,11 @@ stdenv.mkDerivation {
     cp -r includes/* $out/include/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Statically defined probes development files";
     homepage = "https://sourceware.org/systemtap/";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.farlion ];
+    maintainers = [ lib.maintainers.farlion ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libtap/default.nix b/nixpkgs/pkgs/development/libraries/libtap/default.nix
index c1c506ef5e32..ce7cb6bfd1ee 100644
--- a/nixpkgs/pkgs/development/libraries/libtap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtap/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, cmake, perl }:
+{ lib, stdenv, fetchurl, pkg-config, cmake, perl }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "libtap";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ cmake perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to implement a test protocol";
     longDescription = ''
       libtap is a library to implement the Test Anything Protocol for
diff --git a/nixpkgs/pkgs/development/libraries/libtar/default.nix b/nixpkgs/pkgs/development/libraries/libtar/default.nix
index a31fde0d31d2..3e5b4cd23e9d 100644
--- a/nixpkgs/pkgs/development/libraries/libtar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.2.20";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for manipulating POSIX tar files";
     homepage = "https://repo.or.cz/libtar";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libtasn1/default.nix b/nixpkgs/pkgs/development/libraries/libtasn1/default.nix
index 90dde37a4161..2239d7311f5a 100644
--- a/nixpkgs/pkgs/development/libraries/libtasn1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtasn1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, texinfo }:
+{ lib, stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "libtasn1-4.16.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   else
     null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/libtasn1/";
     description = "An ASN.1 library";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libtcod/default.nix b/nixpkgs/pkgs/development/libraries/libtcod/default.nix
index c8c59b15f3ae..3e77d0876be8 100644
--- a/nixpkgs/pkgs/development/libraries/libtcod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtcod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }:
+{ lib, stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }:
 
 stdenv.mkDerivation {
 
@@ -21,13 +21,14 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DLIBTCOD_SAMPLES=OFF" ];
 
-  buildInputs = [ cmake SDL libGLU libGL upx zlib ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL libGLU libGL upx zlib ];
 
   meta = {
     description = "API for roguelike games";
     homepage = "http://roguecentral.org/doryen/libtcod/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.skeidel ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.skeidel ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libtelnet/default.nix b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix
index df500cd7a419..eebaee394ee0 100644
--- a/nixpkgs/pkgs/development/libraries/libtelnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }:
 
 stdenv.mkDerivation {
   pname = "libtelnet";
@@ -11,14 +11,14 @@ stdenv.mkDerivation {
     sha256 = "1lp6gdbndsp2w8mhy88c2jknxj2klvnggvq04ln7qjg8407ifpda";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ zlib ];
 
   meta = {
     description = "Simple RFC-complient TELNET implementation as a C library";
     homepage = "https://github.com/seanmiddleditch/libtelnet";
-    license = stdenv.lib.licenses.publicDomain;
-    maintainers = [ stdenv.lib.maintainers.tomberek ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.publicDomain;
+    maintainers = [ lib.maintainers.tomberek ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libtermkey/default.nix b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
index bb2e1b05bcec..9779ad6b9e5f 100644
--- a/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses, unibilium }:
+{ stdenv, lib, fetchzip, libtool, pkg-config, ncurses, unibilium }:
 
 stdenv.mkDerivation rec {
   pname = "libtermkey";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+    ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
-  nativeBuildInputs = [ libtool pkgconfig ];
+  nativeBuildInputs = [ libtool pkg-config ];
   buildInputs = [ ncurses unibilium ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/libraries/libthai/default.nix b/nixpkgs/pkgs/development/libraries/libthai/default.nix
index 6179ad0f6bda..ad00906bb8cc 100644
--- a/nixpkgs/pkgs/development/libraries/libthai/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libthai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }:
+{ lib, stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }:
 
 stdenv.mkDerivation rec {
   pname = "libthai";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     installManPage man/man3/*.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://linux.thai.net/projects/libthai/";
     description = "Set of Thai language support routines";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libtheora/default.nix b/nixpkgs/pkgs/development/libraries/libtheora/default.nix
index 656204fb0ce8..1638150c2632 100644
--- a/nixpkgs/pkgs/development/libraries/libtheora/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtheora/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libogg, libvorbis, pkgconfig}:
+{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config}:
 
 stdenv.mkDerivation rec {
   name = "libtheora-1.1.1";
@@ -11,16 +11,16 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
   outputDoc = "devdoc";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libogg libvorbis ];
 
   # GCC's -fforce-addr flag is not supported by clang
   # It's just an optimization, so it's safe to simply remove it
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace "-fforce-addr" ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.theora.org/";
     description = "Library for Theora, a free and open video compression format";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/nixpkgs/pkgs/development/libraries/libthreadar/default.nix
index 587ef2e208a3..c67be246928c 100644
--- a/nixpkgs/pkgs/development/libraries/libthreadar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libthreadar/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "1.3.1";
diff --git a/nixpkgs/pkgs/development/libraries/libticables2/default.nix b/nixpkgs/pkgs/development/libraries/libticables2/default.nix
new file mode 100644
index 000000000000..f22d7b796e15
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libticables2/default.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+, libusb1
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libticables2";
+  version = "1.3.5";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libusb1
+    glib
+  ];
+
+  configureFlags = [
+    "--enable-libusb10"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/etc/udev/rules.d
+    cat > $out/etc/udev/rules.d/69-libsane.rules << EOF
+      ACTION!="add", GOTO="libticables_end"
+
+      # serial device (assume TI calculator)
+      KERNEL=="ttyS[0-3]", ENV{ID_PDA}="1"
+      # parallel device (assume TI calculator)
+      SUBSYSTEM=="ppdev", ENV{ID_PDA}="1"
+      # SilverLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", ENV{ID_PDA}="1"
+      # TI-84+ DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", ENV{ID_PDA}="1"
+      # TI-89 Titanium DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", ENV{ID_PDA}="1"
+      # TI-84+ SE DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", ENV{ID_PDA}="1"
+      # TI-Nspire DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", ENV{ID_PDA}="1"
+
+      LABEL="libticables_end"
+    EOF
+  '';
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix b/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix
new file mode 100644
index 000000000000..6eb013a7ffd7
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+, libticonv
+, libtifiles2
+, libticables2
+, lzma
+, bzip2
+, acl
+, libobjc
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libticalcs2";
+  version = "1.1.9";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    libticonv
+    libtifiles2
+    libticables2
+    lzma
+    bzip2
+  ] ++ lib.optionals stdenv.isLinux [
+    acl
+  ] ++ lib.optionals stdenv.isDarwin [
+    libobjc
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libticonv/default.nix b/nixpkgs/pkgs/development/libraries/libticonv/default.nix
new file mode 100644
index 000000000000..0c075406dee2
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libticonv/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libticonv";
+  version = "1.1.5";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+  ];
+
+  configureFlags = [
+    "--enable-iconv"
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix
index 6d4109621826..3d3b3529483a 100644
--- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 
-, pkgconfig
+, pkg-config
 
 , zlib
 , libjpeg
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # not cross;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library and utilities for working with the TIFF image file format";
     homepage = "http://download.osgeo.org/libtiff";
     license = licenses.libtiff;
diff --git a/nixpkgs/pkgs/development/libraries/libtifiles2/default.nix b/nixpkgs/pkgs/development/libraries/libtifiles2/default.nix
new file mode 100644
index 000000000000..874cbc87c875
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libtifiles2/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+, libarchive
+, libticonv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libtifiles2";
+  version = "1.1.7";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    libarchive
+    libticonv
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libtiger/default.nix b/nixpkgs/pkgs/development/libraries/libtiger/default.nix
index fbc726a45198..094ff565b3c5 100644
--- a/nixpkgs/pkgs/development/libraries/libtiger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtiger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, libkate, pango, cairo, pkgconfig, darwin }:
+{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }:
 
 stdenv.mkDerivation rec {
   name = "libtiger-0.3.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libkate pango cairo ]
     ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices;
 
diff --git a/nixpkgs/pkgs/development/libraries/libtins/default.nix b/nixpkgs/pkgs/development/libraries/libtins/default.nix
index bde1cbf44e1f..7279dc9ddfa2 100644
--- a/nixpkgs/pkgs/development/libraries/libtins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtins/default.nix
@@ -1,4 +1,4 @@
-{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }:
+{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "libtins";
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     "--with-boost=${boost.dev}"
   ];
 
-  enableParallelBuilding = true;
   doCheck = true;
   preCheck = ''
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib
@@ -37,12 +36,12 @@ stdenv.mkDerivation rec {
   '';
   checkTarget = "tests test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-level, multiplatform C++ network packet sniffing and crafting library";
     homepage = "https://libtins.github.io/";
     changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = with maintainers; [ fdns ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
index 4587701011dd..7ed8fca3babd 100644
--- a/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libtool }:
+{ lib, stdenv, fetchurl, fetchpatch, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libtomcrypt";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.libtom.net/LibTomCrypt/";
     description = "A fairly comprehensive, modular and portable cryptographic toolkit";
     license = with licenses; [ publicDomain wtfpl ];
diff --git a/nixpkgs/pkgs/development/libraries/libtommath/default.nix b/nixpkgs/pkgs/development/libraries/libtommath/default.nix
index 9a0a2def4b71..058ae5242315 100644
--- a/nixpkgs/pkgs/development/libraries/libtommath/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtommath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool }:
+{ lib, stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libtommath";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.libtom.net/LibTomMath/";
     description = "A library for integer-based number-theoretic applications";
     license = with licenses; [ publicDomain wtfpl ];
diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
index b2c958795f3e..a898dd8e24e6 100644
--- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
+++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf
+{ stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf
 , zlib, boost, openssl, libtool, python, libiconv, ncurses
 }:
 
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  nativeBuildInputs = [ automake autoconf libtool pkg-config ];
   buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
   preConfigure = "./autotool.sh";
 
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
     "--with-boost-libdir=${boostPython.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libtorrent.org/";
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
index 9a165780b7e2..fc97b629a52f 100644
--- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
+++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, automake, autoconf
+{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf
 , zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration
 }:
 
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ automake autoconf libtool pkg-config ];
 
   buildInputs = [ boostPython openssl zlib python libiconv ncurses ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+    ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
 
   preConfigure = "./autotool.sh";
 
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
     "--with-boost-libdir=${boostPython.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libtorrent.org/";
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index e9c59ed97e82..ad3a47f99ce3 100644
--- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , zlib, boost, openssl, python, ncurses, SystemConfiguration
 }:
 
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ boostPython openssl zlib python ncurses ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+    ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
 
   postInstall = ''
     moveToOutput "include" "$dev"
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
     "-Dpython-bindings=on"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libtorrent.org/";
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix
index 6d170c798d0a..4badf32fe8cc 100644
--- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
-, libvpx, check, libconfig, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
+, libvpx, check, libconfig, pkg-config }:
 
 let
   generic = { version, sha256 }:
@@ -22,13 +22,11 @@ let
 
     buildInputs = [
       libsodium msgpack ncurses libconfig
-    ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
+    ] ++ lib.optionals (!stdenv.isAarch32) [
       libopus libvpx
     ];
 
-    nativeBuildInputs = [ cmake pkgconfig ];
-
-    enableParallelBuilding = true;
+    nativeBuildInputs = [ cmake pkg-config ];
 
     doCheck = false; # hangs, tries to access the net?
     checkInputs = [ check ];
@@ -39,7 +37,7 @@ let
         -e "s|^includedir=.*|includedir=$out/include|"
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "P2P FOSS instant messaging application aimed to replace Skype";
       homepage = "https://tox.chat";
       license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
index 6cd5f9122a4f..77119e2830fe 100644
--- a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
-, libvpx, check, libconfig, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
+, libvpx, check, libconfig, pkg-config }:
 
 stdenv.mkDerivation {
   name = "tox-core-new-20160727";
@@ -30,14 +30,14 @@ stdenv.mkDerivation {
   ];
 
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [
     autoreconfHook libsodium ncurses check libconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
+  ] ++ lib.optionals (!stdenv.isAarch32) [
     libopus
   ];
 
-  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ];
+  propagatedBuildInputs = lib.optionals (!stdenv.isAarch32) [ libvpx ];
 
   # Some tests fail randomly due to timeout. This kind of problem is well known
   # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
   # NOTE: run the tests locally on your machine before upgrading this package!
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/libraries/libtsm/default.nix b/nixpkgs/pkgs/development/libraries/libtsm/default.nix
index 21108fa108e4..d959306c9718 100644
--- a/nixpkgs/pkgs/development/libraries/libtsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtsm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libxkbcommon, pkgconfig, cmake }:
+{ lib, stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libtsm";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxkbcommon ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Terminal-emulator State Machine";
     homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix b/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix
index a9c62673115a..3be758c906f1 100644
--- a/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, hidapi }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
   pname = "libu2f-host";
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ json_c hidapi ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developers.yubico.com/libu2f-host";
     description = "A C library and command-line tool that implements the host-side of the U2F protocol";
     license = with licenses; [ gpl3Plus lgpl21Plus ];
diff --git a/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix b/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix
index cd961cde1d28..7f596978cf06 100644
--- a/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }:
 
 stdenv.mkDerivation rec {
   name = "libu2f-server-1.1.0";
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ json_c openssl check file help2man which gengetopt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developers.yubico.com/libu2f-server/";
     description = "A C library that implements the server-side of the U2F protocol";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix
index 2cd5bd8a3412..f8dfa80a9597 100644
--- a/nixpkgs/pkgs/development/libraries/libubox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }:
+{ stdenv, lib, fetchgit, cmake, pkg-config, json_c }:
 
 stdenv.mkDerivation {
   pname = "libubox";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ json_c ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
index 43fa300f1076..443791f24519 100644
--- a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "uchardet";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's Universal Charset Detector C/C++ API";
     homepage = "https://www.freedesktop.org/wiki/Software/uchardet/";
     license = licenses.mpl11;
diff --git a/nixpkgs/pkgs/development/libraries/libucl/default.nix b/nixpkgs/pkgs/development/libraries/libucl/default.nix
index b9b33453a4c6..e65d0d475ff9 100644
--- a/nixpkgs/pkgs/development/libraries/libucl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libucl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pkg-config
 , autoreconfHook
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
 
-  buildInputs = with stdenv.lib;
+  buildInputs = with lib;
     concatLists (
       mapAttrsToList (feat: enabled:
         optionals enabled (featureDeps."${feat}" or [])
@@ -45,10 +45,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = with stdenv.lib;
+  configureFlags = with lib;
     mapAttrsToList (feat: enabled: strings.enableFeature enabled feat) features;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Universal configuration library parser";
     homepage = "https://github.com/vstakhov/libucl";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libuecc/default.nix b/nixpkgs/pkgs/development/libraries/libuecc/default.nix
index ff6801ef18f4..1cc3ac8ebea1 100644
--- a/nixpkgs/pkgs/development/libraries/libuecc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuecc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake }:
+{ lib, stdenv, fetchgit, cmake }:
 
 stdenv.mkDerivation rec {
   version = "7";
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Very small Elliptic Curve Cryptography library";
     homepage = "https://git.universe-factory.net/libuecc";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libui/default.nix b/nixpkgs/pkgs/development/libraries/libui/default.nix
index 5cb19f863ccc..7002f75cc45e 100644
--- a/nixpkgs/pkgs/development/libraries/libui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, Cocoa }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }:
 
 let
   shortName = "libui";
@@ -15,21 +15,21 @@ stdenv.mkDerivation {
     sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  propagatedBuildInputs = lib.optional stdenv.isLinux gtk3
+    ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
   '';
 
   installPhase = ''
     mkdir -p $out/{include,lib}
     mkdir -p $out/lib/pkgconfig
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     mv ./out/${shortName}.so.0 $out/lib/
     ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     mv ./out/${shortName}.A.dylib $out/lib/
     ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib
   '' + ''
@@ -41,11 +41,11 @@ stdenv.mkDerivation {
       --subst-var-by out $out \
       --subst-var-by version "${version}"
   '';
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/andlabs/libui";
     description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix b/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix
index 700a4701fc87..9085b8610789 100644
--- a/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libuinputplus";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0jy5i7bmjad7hw1qcyjl4swqribp2027s9g3609zwj7lj8z5x0bg";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Easy-to-use uinput library in C++";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libunarr/default.nix b/nixpkgs/pkgs/development/libraries/libunarr/default.nix
index 3bc5f1370918..523ce82ce22d 100644
--- a/nixpkgs/pkgs/development/libraries/libunarr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunarr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libunarr";
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/selmf/unarr";
     description = "A lightweight decompression library with support for rar, tar and zip archives";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libunibreak/default.nix b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix
index d30c84b52a2e..9e6cec471d4d 100644
--- a/nixpkgs/pkgs/development/libraries/libunibreak/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libunibreak";
   version = "4.3";
 
   src = let
-      rev_version = stdenv.lib.replaceStrings ["."] ["_"] version;
+      rev_version = lib.replaceStrings ["."] ["_"] version;
   in fetchFromGitHub {
     owner = "adah1972";
     repo = pname;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/adah1972/libunibreak";
     description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix b/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix
index afae04cb6b23..2e75c783681e 100644
--- a/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fontforge/libuninameslist/";
     description = "A Library of Unicode names and annotation data";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
index e960117125e6..72027b85ed43 100644
--- a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , dbus, dbus-glib, gtk3, gobject-introspection
 , gtk-doc, docbook_xml_dtd_45, docbook_xsl
 , libxslt, libxml2 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   majorVer = "3.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
 
   meta = {
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "A library for writing single instance applications";
     license = licenses.lgpl21;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libunique/default.nix b/nixpkgs/pkgs/development/libraries/libunique/default.nix
index 502fd27ebb6c..27db05ee98ab 100644
--- a/nixpkgs/pkgs/development/libraries/libunique/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunique/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }:
 
 stdenv.mkDerivation rec {
   pname = "libunique";
   version = "1.1.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ./1.1.6-include-terminator.patch
   ] ++ [ ./gcc7-bug.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib gtk2 dbus-glib ];
 
   # Don't make deprecated usages hard errors
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://wiki.gnome.org/Attic/LibUnique";
     description = "A library for writing single instance applications";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.lgpl21;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libunistring/default.nix b/nixpkgs/pkgs/development/libraries/libunistring/default.nix
index 5f300ef51997..f7a77832c183 100644
--- a/nixpkgs/pkgs/development/libraries/libunistring/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunistring/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libiconv }:
+{ fetchurl, lib, stdenv, libiconv }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "info" "doc" ];
 
-  propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
 
   configureFlags = [
     "--with-libiconv-prefix=${libiconv}"
@@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
       strings as internal in-memory representation.
     '';
 
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libunity/default.nix b/nixpkgs/pkgs/development/libraries/libunity/default.nix
index 037e84069b42..f6fb9a13e4cd 100644
--- a/nixpkgs/pkgs/development/libraries/libunity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunity/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
-, pkgconfig
+, pkg-config
 , glib
 , vala
 , dee
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     autoreconfHook
     gobject-introspection
     intltool
-    pkgconfig
+    pkg-config
     python3
     vala
   ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for instrumenting and integrating with all aspects of the Unity shell";
     homepage = "https://launchpad.net/libunity";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/nixpkgs/pkgs/development/libraries/libunwind/default.nix
index 3816788f9299..b2b5db2309c1 100644
--- a/nixpkgs/pkgs/development/libraries/libunwind/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunwind/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   # Without latex2man, no man pages are installed despite being
   # prebuilt in the source tarball.
-  configureFlags = "LATEX2MAN=${coreutils}/bin/true";
+  configureFlags = [ "LATEX2MAN=${coreutils}/bin/true" ];
 
   propagatedBuildInputs = [ xz ];
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nongnu.org/libunwind";
     description = "A portable and efficient API to determine the call-chain of a program";
     maintainers = with maintainers; [ orivej ];
diff --git a/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
index 6046bcf8eab3..d108bf4e6df4 100644
--- a/nixpkgs/pkgs/development/libraries/liburcu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "0.12.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   preCheck = "patchShebangs tests/unit";
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace RCU (read-copy-update) library";
     homepage = "https://lttng.org/urcu";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix
index 938846ace54f..6a94f37181d4 100644
--- a/nixpkgs/pkgs/development/libraries/liburing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit
+{ lib, stdenv, fetchgit
 , fetchpatch
 }:
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   ''
   ;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library for the Linux io_uring API";
     homepage    = "https://git.kernel.dk/cgit/liburing/";
     license     = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix b/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix
index 2830ef284587..b23123f56eaa 100644
--- a/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix
+++ b/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , autoreconfHook
 , patchelf
-, pkgconfig
+, pkg-config
 , libusb1
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
   outputBin = "dev";
 
-  nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook patchelf pkg-config ];
 
   buildInputs = [ libusb1 ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5";
   };
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
 
   # without this, libusb-compat is unable to find libusb1
   postFixup = ''
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libusb.info/";
     repositories.git = "https://github.com/libusb/libusb-compat-0.1";
     description = "cross-platform user-mode USB device library";
diff --git a/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix
index 10310e22da7b..33cd34ea5a0e 100644
--- a/nixpkgs/pkgs/development/libraries/libusb1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
 , udev ? null
 , libobjc
@@ -24,20 +24,20 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   propagatedBuildInputs =
-    stdenv.lib.optional enableUdev udev ++
-    stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+    lib.optional enableUdev udev ++
+    lib.optionals stdenv.isDarwin [ libobjc IOKit ];
 
   dontDisableStatic = withStatic;
 
-  configureFlags = stdenv.lib.optional (!enableUdev) "--disable-udev";
+  configureFlags = lib.optional (!enableUdev) "--disable-udev";
 
-  preFixup = stdenv.lib.optionalString enableUdev ''
-    sed 's,-ludev,-L${stdenv.lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
+  preFixup = lib.optionalString enableUdev ''
+    sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libusb.info/";
     repositories.git = "https://github.com/libusb/libusb";
     description = "cross-platform user-mode USB device library";
diff --git a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix
index e2e0a6d9d75d..66198a6ec33f 100644
--- a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }:
 
 stdenv.mkDerivation rec {
   pname = "libusbmuxd";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libplist ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client library to multiplex connections from and to iOS devices";
     homepage    = "https://github.com/libimobiledevice/libusbmuxd";
     license     = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix
index fa661446b9a1..a4447ed33789 100644
--- a/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
   version = "1.40.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       "threadpool_multiple_event_loops" # times out on slow machines
       "get_passwd" # passed on NixOS but failed on other Linuxes
       "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    ] ++ lib.optionals stdenv.isDarwin [
         # Sometimes: timeout (no output), failed uv_listen. Someone
         # should report these failures to libuv team. There tests should
         # be much more robust.
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
         "fs_event_watch_dir_recursive" "fs_event_watch_file"
         "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path"
         "process_priority" "udp_create_early_bad_bind"
-    ] ++ stdenv.lib.optionals stdenv.isAarch32 [
+    ] ++ lib.optionals stdenv.isAarch32 [
       # I observe this test failing with some regularity on ARMv7:
       # https://github.com/libuv/libuv/issues/1871
       "shutdown_close_pipe"
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
       sed '/${tdRegexp}/d' -i test/test-list.h
     '';
 
-  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
+  nativeBuildInputs = [ automake autoconf libtool pkg-config ];
+  buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
 
   preConfigure = ''
     LIBTOOLIZE=libtoolize ./autogen.sh
diff --git a/nixpkgs/pkgs/development/libraries/libuvc/default.nix b/nixpkgs/pkgs/development/libraries/libuvc/default.nix
new file mode 100644
index 000000000000..e7ff4bb7f288
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libuvc/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, libusb1
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libuvc";
+  version = "unstable-2020-11-29";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "5cddef71b17d41f7e98875a840c50d9704c3d2b2";
+    sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = [ libusb1 ];
+
+  meta = with lib; {
+    homepage = "https://ken.tossell.net/libuvc/";
+    description = "Cross-platform library for USB video devices";
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ prusnak ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix b/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix
index 1debefed0ad9..ade56ac16ee9 100644
--- a/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix
+++ b/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
+{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi
 , libGL, mesa
 , minimal ? false, libva1-minimal
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libdrm ]
     ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.freedesktop.org/wiki/Software/vaapi";
     license = licenses.mit;
     description = "VAAPI library: Video Acceleration API";
diff --git a/nixpkgs/pkgs/development/libraries/libva/default.nix b/nixpkgs/pkgs/development/libraries/libva/default.nix
index f37780f5d6d6..d78332bf5aae 100644
--- a/nixpkgs/pkgs/development/libraries/libva/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libva/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation for VA-API (Video Acceleration API)";
     longDescription = ''
       VA-API is an open-source library and API specification, which provides
diff --git a/nixpkgs/pkgs/development/libraries/libva/utils.nix b/nixpkgs/pkgs/development/libraries/libva/utils.nix
index f860c328fe7a..bcd24d519535 100644
--- a/nixpkgs/pkgs/development/libraries/libva/utils.nix
+++ b/nixpkgs/pkgs/development/libraries/libva/utils.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
 , libdrm, libva, libX11, libXext, libXfixes, wayland
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of utilities and examples for VA-API";
     longDescription = ''
       libva-utils is a collection of utilities and examples to exercise VA-API
diff --git a/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 98176cd41f14..85ebef12fe1f 100644
--- a/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp
 , libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }:
 
 stdenv.mkDerivation rec {
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ];
 
   doCheck = false; # fails. needs DRI access
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/i-rinat/libvdpau-va-gl";
     description = "VDPAU driver with OpenGL/VAAPI backend";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix
index cbb312e0f0d8..75dcd337c38b 100644
--- a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }:
+{ lib, stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "libvdpau";
@@ -12,17 +12,17 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = with xorg; [ xorgproto libXext ];
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  mesonFlags = stdenv.lib.optional stdenv.isLinux
+  mesonFlags = lib.optional stdenv.isLinux
     [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11";
+  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://people.freedesktop.org/~aplattner/vdpau/";
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
     license = licenses.mit; # expat version
diff --git a/nixpkgs/pkgs/development/libraries/libversion/default.nix b/nixpkgs/pkgs/development/libraries/libversion/default.nix
index a26aa9b56941..98ad4ef7feec 100644
--- a/nixpkgs/pkgs/development/libraries/libversion/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libversion/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Advanced version string comparison library";
     homepage = "https://github.com/repology/libversion";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/libraries/libviper/default.nix b/nixpkgs/pkgs/development/libraries/libviper/default.nix
index f9c695aedf71..e3b3674acc9f 100644
--- a/nixpkgs/pkgs/development/libraries/libviper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libviper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}:
+{lib, stdenv, fetchurl, pkg-config, glib, ncurses, gpm}:
 stdenv.mkDerivation rec {
   name = "libviper-1.4.6";
 
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ncurses gpm];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libviper.sourceforge.net/";
     description = "Simple window creation and management facilities for the console";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix
index bf8d0b373f08..a61094d17fe8 100644
--- a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala
+{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala
 , libcap_ng, libvirt, libxml2
 }:
 
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
+  nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ];
   buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ];
 
   enableParallelBuilding = true;
   strictDeps = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for working with virtual machines";
     longDescription = ''
       libvirt-glib wraps libvirt to provide a high-level object-oriented API better
diff --git a/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
new file mode 100644
index 000000000000..8c164f354990
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
@@ -0,0 +1,340 @@
+From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001
+From: Euan Kemp <euank@euank.com>
+Date: Thu, 14 Jan 2021 00:32:00 -0800
+Subject: [PATCH] meson: patch in an install prefix for building on nix
+
+Used in the nixpkgs version of libvirt so that we can install things in
+the nix store, but read them from the root filesystem.
+---
+ meson.build                       |  9 +++++++++
+ meson_options.txt                 |  2 ++
+ src/libxl/meson.build             |  6 +++---
+ src/locking/meson.build           |  8 ++++----
+ src/lxc/meson.build               |  6 +++---
+ src/meson.build                   | 18 +++++++++---------
+ src/network/meson.build           | 12 ++++++------
+ src/nwfilter/xml/meson.build      |  2 +-
+ src/qemu/meson.build              | 14 +++++++-------
+ src/remote/meson.build            |  6 +++---
+ src/security/apparmor/meson.build |  8 ++++----
+ tools/meson.build                 |  4 ++--
+ 12 files changed, 53 insertions(+), 42 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2e57a435df..4a72902a63 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,6 +39,8 @@ if host_machine.system() == 'windows'
+   conf.set('WINVER', '0x0600') # Win Vista / Server 2008
+ endif
+ 
++# patched in for nix
++install_prefix = get_option('install_prefix')
+ 
+ # set various paths
+ 
+@@ -57,6 +59,13 @@ else
+   sysconfdir = prefix / get_option('sysconfdir')
+ endif
+ 
++# nix: don't prefix the localstatedir; some things need to write to it, so it
++# can't be in the nix store, and that's what the prefix is.
++# We'll prefix things ourselves where needed
++localstatedir = get_option('localstatedir')
++# Same for sysconfidr
++sysconfdir = get_option('sysconfdir')
++
+ # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for
+ # sysconfdir as this makes a lot of things break in testing situations
+ if prefix == '/usr'
+diff --git a/meson_options.txt b/meson_options.txt
+index 74de064384..0a21eb845e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,5 @@
++option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation')
++
+ option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update')
+ option('packager', type: 'string', value: '', description: 'Extra packager name')
+ option('packager_version', type: 'string', value: '', description: 'Extra packager version')
+diff --git a/src/libxl/meson.build b/src/libxl/meson.build
+index 3bb6cc5f2e..78d7be0ace 100644
+--- a/src/libxl/meson.build
++++ b/src/libxl/meson.build
+@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL')
+   }
+ 
+   virt_install_dirs += [
+-    localstatedir / 'lib' / 'libvirt' / 'libxl',
+-    runstatedir / 'libvirt' / 'libxl',
+-    localstatedir / 'log' / 'libvirt' / 'libxl',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl',
++    install_prefix + runstatedir / 'libvirt' / 'libxl',
++    install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl',
+   ]
+ endif
+diff --git a/src/locking/meson.build b/src/locking/meson.build
+index 8a28310e40..9da81cc574 100644
+--- a/src/locking/meson.build
++++ b/src/locking/meson.build
+@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD')
+   }
+ 
+   virt_install_dirs += [
+-    localstatedir / 'lib' / 'libvirt' / 'lockd',
+-    localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files',
+-    runstatedir / 'libvirt' / 'lockd',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files',
++    install_prefix + runstatedir / 'libvirt' / 'lockd',
+   ]
+ 
+   if conf.has('WITH_SANLOCK')
+     virt_install_dirs += [
+-      localstatedir / 'lib' / 'libvirt' / 'sanlock',
++      install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock',
+     ]
+   endif
+ endif
+diff --git a/src/lxc/meson.build b/src/lxc/meson.build
+index f8e2a8852a..96d6687c5d 100644
+--- a/src/lxc/meson.build
++++ b/src/lxc/meson.build
+@@ -182,8 +182,8 @@ if conf.has('WITH_LXC')
+   }
+ 
+   virt_install_dirs += [
+-    localstatedir / 'lib' / 'libvirt' / 'lxc',
+-    runstatedir / 'libvirt' / 'lxc',
+-    localstatedir / 'log' / 'libvirt' / 'lxc',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc',
++    install_prefix + runstatedir / 'libvirt' / 'lxc',
++    install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc',
+   ]
+ endif
+diff --git a/src/meson.build b/src/meson.build
+index 29c8210ab2..bc960e0b69 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -669,7 +669,7 @@ endforeach
+ 
+ virt_conf_files += 'libvirt.conf'
+ 
+-install_data(virt_conf_files, install_dir: confdir)
++install_data(virt_conf_files, install_dir: install_prefix + confdir)
+ install_data(virt_aug_files, install_dir: virt_aug_dir)
+ 
+ # augeas_test_data:
+@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs
+     output: '@0@.conf'.format(data['name']),
+     configuration: daemon_conf,
+     install: true,
+-    install_dir: confdir,
++    install_dir: install_prefix + confdir,
+   )
+ 
+   if data.get('with_ip', false)
+@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD')
+ 
+       install_data(
+         init_file,
+-        install_dir: sysconfdir / 'init.d',
++        install_dir: install_prefix + sysconfdir / 'init.d',
+         rename: [ init['name'] ],
+       )
+ 
+       if init.has_key('confd')
+         install_data(
+           init['confd'],
+-          install_dir: sysconfdir / 'conf.d',
++          install_dir: install_prefix + sysconfdir / 'conf.d',
+           rename: [ init['name'] ],
+         )
+       endif
+@@ -872,7 +872,7 @@ if init_script != 'none'
+   foreach sysconf : sysconf_files
+     install_data(
+       sysconf['file'],
+-      install_dir: sysconfdir / 'sysconfig',
++      install_dir: install_prefix + sysconfdir / 'sysconfig',
+       rename: [ sysconf['name'] ],
+     )
+   endforeach
+@@ -897,10 +897,10 @@ endif
+ # Install empty directories
+ 
+ virt_install_dirs += [
+-  localstatedir / 'cache' / 'libvirt',
+-  localstatedir / 'lib' / 'libvirt' / 'images',
+-  localstatedir / 'lib' / 'libvirt' / 'filesystems',
+-  localstatedir / 'lib' / 'libvirt' / 'boot',
++  install_prefix + localstatedir / 'cache' / 'libvirt',
++  install_prefix + localstatedir / 'lib' / 'libvirt' / 'images',
++  install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems',
++  install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot',
+ ]
+ 
+ meson.add_install_script(
+diff --git a/src/network/meson.build b/src/network/meson.build
+index 13dd2c26b2..1be020081f 100644
+--- a/src/network/meson.build
++++ b/src/network/meson.build
+@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK')
+   }
+ 
+   virt_install_dirs += [
+-    localstatedir / 'lib' / 'libvirt' / 'network',
+-    localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
+-    runstatedir / 'libvirt' / 'network',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'network',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
++    install_prefix + runstatedir / 'libvirt' / 'network',
+   ]
+ 
+   uuidgen_prog = find_program('uuidgen', required: false)
+@@ -98,7 +98,7 @@ if conf.has('WITH_NETWORK')
+       ],
+       capture: true,
+       install: true,
+-      install_dir: confdir / 'qemu' / 'networks',
++      install_dir: install_prefix + confdir / 'qemu' / 'networks',
+     )
+   else
+     configure_file(
+@@ -106,13 +106,13 @@ if conf.has('WITH_NETWORK')
+       output: '@BASENAME@',
+       copy: true,
+       install: true,
+-      install_dir: confdir / 'qemu' / 'networks',
++      install_dir: install_prefix + confdir / 'qemu' / 'networks',
+     )
+   endif
+ 
+   meson.add_install_script(
+     meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(),
+-    confdir / 'qemu' / 'networks' / 'autostart',
++    install_prefix + confdir / 'qemu' / 'networks' / 'autostart',
+     '../default.xml', 'default.xml',
+   )
+ 
+diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build
+index 95af75bb15..7fe99076f4 100644
+--- a/src/nwfilter/xml/meson.build
++++ b/src/nwfilter/xml/meson.build
+@@ -19,4 +19,4 @@ nwfilter_xml_files = [
+   'qemu-announce-self.xml',
+ ]
+ 
+-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter')
++install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter')
+diff --git a/src/qemu/meson.build b/src/qemu/meson.build
+index 4e599d1e69..ba558d78f8 100644
+--- a/src/qemu/meson.build
++++ b/src/qemu/meson.build
+@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU')
+   }
+ 
+   virt_install_dirs += [
+-    localstatedir / 'lib' / 'libvirt' / 'qemu',
+-    runstatedir / 'libvirt' / 'qemu',
+-    localstatedir / 'cache' / 'libvirt' / 'qemu',
+-    localstatedir / 'log' / 'libvirt' / 'qemu',
+-    localstatedir / 'lib' / 'libvirt' / 'swtpm',
+-    runstatedir / 'libvirt' / 'qemu' / 'swtpm',
+-    localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu',
++    install_prefix + runstatedir / 'libvirt' / 'qemu',
++    install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu',
++    install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm',
++    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
++    install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
+   ]
+ endif
+diff --git a/src/remote/meson.build b/src/remote/meson.build
+index 9ad2f6ab1c..429a15b326 100644
+--- a/src/remote/meson.build
++++ b/src/remote/meson.build
+@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE')
+     }
+ 
+     virt_install_dirs += [
+-      localstatedir / 'log' / 'libvirt',
++      install_prefix + localstatedir / 'log' / 'libvirt',
+     ]
+ 
+     logrotate_conf = configuration_data()
+@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE')
+       )
+       install_data(
+         log_file,
+-        install_dir: sysconfdir / 'logrotate.d',
++        install_dir: install_prefix + sysconfdir / 'logrotate.d',
+         rename: [ name ],
+       )
+     endforeach
+@@ -309,7 +309,7 @@ endif
+ if conf.has('WITH_SASL')
+   install_data(
+     'libvirtd.sasl',
+-    install_dir: sysconfdir / 'sasl2',
++    install_dir: install_prefix + sysconfdir / 'sasl2',
+     rename: [ 'libvirt.conf' ],
+   )
+ endif
+diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
+index af43780211..e2d6c812f8 100644
+--- a/src/security/apparmor/meson.build
++++ b/src/security/apparmor/meson.build
+@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles
+     output: name,
+     configuration: apparmor_gen_profiles_conf,
+     install: true,
+-    install_dir: apparmor_dir,
++    install_dir: install_prefix + apparmor_dir,
+   )
+ endforeach
+ 
+ install_data(
+   [ 'libvirt-qemu', 'libvirt-lxc' ],
+-  install_dir: apparmor_dir / 'abstractions',
++  install_dir: install_prefix + apparmor_dir / 'abstractions',
+ )
+ 
+ install_data(
+   [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
+-  install_dir: apparmor_dir / 'libvirt',
++  install_dir: install_prefix + apparmor_dir / 'libvirt',
+ )
+ 
+ install_data(
+   'usr.lib.libvirt.virt-aa-helper.local',
+-  install_dir: apparmor_dir / 'local',
++  install_dir: install_prefix + apparmor_dir / 'local',
+   rename: 'usr.lib.libvirt.virt-aa-helper',
+ )
+diff --git a/tools/meson.build b/tools/meson.build
+index b8c6802f0a..dacd0ff1ce 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL')
+     install_rpath: libvirt_rpath,
+   )
+ 
+-  install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
++  install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt')
+ endif
+ 
+ if host_machine.system() == 'windows'
+@@ -274,7 +274,7 @@ configure_file(
+ if init_script == 'systemd'
+   install_data(
+     'libvirt-guests.sysconf',
+-    install_dir: sysconfdir / 'sysconfig',
++    install_dir: install_prefix + sysconfdir / 'sysconfig',
+     rename: 'libvirt-guests',
+   )
+ 
+-- 
+2.29.2
+
diff --git a/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix b/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix
index b880d3642745..76466a1a9f50 100644
--- a/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix
+++ b/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchgit
-, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
+{ lib, stdenv, fetchurl, fetchgit
+, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr
 , iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
@@ -10,7 +10,7 @@
 , enableCeph ? false, ceph
 }:
 
-with stdenv.lib;
+with lib;
 
 # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
 let
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
         fetchSubmodules = true;
       };
 
-  nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ];
+  nativeBuildInputs = [ makeWrapper pkg-config rpcsvc-proto ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
 
   preConfigure = ''
     ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
-    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
+    PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
     substituteInPlace src/lxc/lxc_conf.c \
diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix
index 224168888c02..f3f48cec770b 100644
--- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix
@@ -1,42 +1,58 @@
-{ stdenv, fetchurl, fetchgit
-, pkgconfig, makeWrapper, autoreconfHook, fetchpatch
+{ lib, stdenv, fetchurl, fetchgit
+, makeWrapper, autoreconfHook, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
-, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
-, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
+, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext
+, libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin
+, meson, ninja, audit, cmake, bash-completion, pkg-config
 , enableXen ? false, xen ? null
 , enableIscsi ? false, openiscsi
 , enableCeph ? false, ceph
 }:
 
-with stdenv.lib;
+with lib;
 
 # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
 let
   buildFromTarball = stdenv.isDarwin;
+  # libvirt hardcodes the binary name 'ebtables', but in nixpkgs the ebtables
+  # binary we want to use is named 'ebtables-legacy'.
+  # Create a derivation to alias the binary name so that libvirt can find the right one, and use that below.
+  ebtables-compat = stdenv.mkDerivation {
+    pname = "ebtables-compat";
+    version = ebtables.version;
+    src = null;
+    buildInputs = [ ebtables ];
+    buildCommand = ''
+      mkdir -p $out/bin
+      ln -sf ${ebtables}/bin/ebtables-legacy $out/bin/ebtables
+    '';
+  };
 in stdenv.mkDerivation rec {
   pname = "libvirt";
-  version = "6.6.0";
+  version = "6.8.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "https://libvirt.org/sources/${pname}-${version}.tar.xz";
-        sha256 = "1y8y13zvh820f4b15287wb77wq7ra7kbfnpblzhm1dki5pfjvrcl";
+        sha256 = "0hhk2r0dnm9zmfwmnsnmnacm4pik6z60llp22axx7kcpqxv98nv5";
       }
     else
       fetchgit {
         url = "https://gitlab.com/libvirt/libvirt.git";
         rev = "v${version}";
-        sha256 = "09hsbm2qmx0jfmm418rf5lx374g85bwgg0kzlga62x5180jhsssn";
+        sha256 = "sha256-BQZPdmDE0g7xWd6QOHMKosP2HgVpIjsfgfohA9VxEHs=";
         fetchSubmodules = true;
       };
 
+  patches = [
+    ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+  ];
+
   nativeBuildInputs = [
-    makeWrapper pkgconfig docutils
-  ] ++ optionals (!buildFromTarball) [
-    autoreconfHook
+    ninja meson cmake makeWrapper pkg-config docutils
   ] ++ optional (!stdenv.isDarwin) [
     rpcsvc-proto
   ] ++ optionals stdenv.isDarwin [
@@ -44,10 +60,11 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    bash-completion pkg-config
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus
   ] ++ optionals stdenv.isLinux [
-    libpciaccess lvm2 util-linux systemd libnl numad zfs
+    audit libpciaccess lvm2 util-linux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted libtirpc
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
@@ -59,69 +76,67 @@ in stdenv.mkDerivation rec {
     libiconv gmp
   ];
 
-  preConfigure = ''
-    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
+  preConfigure = let
+    overrides = {
+      QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper";
+      QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper";
+    };
+    patchBuilder = var: value: ''
+      sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|"
+    '';
+  in ''
+    PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
     substituteInPlace src/lxc/lxc_conf.c \
       --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
     patchShebangs . # fixes /usr/bin/python references
-    mkdir -p build && cd build
-  '';
+  ''
+  + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
 
-  configureScript = "../configure";
+  mesonAutoFeatures = "auto";
 
-  dontAddDisableDepTrack = true;
-
-  configureFlags = [
-    "--with-runstatedir=/run" # TODO: remove when autoconf 2.70 is released
-    "--localstatedir=/var"
+  mesonFlags = let
+    opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}";
+  in [
     "--sysconfdir=/var/lib"
-    "--with-libpcap"
-    "--with-qemu"
-    "--with-vmware"
-    "--with-vbox"
-    "--with-test"
-    "--with-esx"
-    "--with-remote"
-    "--with-polkit"
+    "-Dinstall_prefix=${placeholder "out"}"
+    "-Dlocalstatedir=/var"
+    "-Drunstatedir=/run"
+    "-Dlibpcap=enabled"
+    "-Ddriver_qemu=enabled"
+    "-Ddriver_vmware=enabled"
+    "-Ddriver_vbox=enabled"
+    "-Ddriver_test=enabled"
+    "-Ddriver_esx=enabled"
+    "-Ddriver_remote=enabled"
+    "-Dpolkit=enabled"
+    "-Ddbus=enabled"
+    (opt "storage_iscsi" enableIscsi)
   ] ++ optionals stdenv.isLinux [
-    "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
-    "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
-    "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy"
-    "CFLAGS=-I${libtirpc.dev}/include/tirpc"
-    "--with-attr"
-    "--with-apparmor"
-    "--with-secdriver-apparmor"
-    "--with-numad"
-    "--with-macvtap"
-    "--with-virtualport"
-    "--with-storage-disk"
-  ] ++ optionals (stdenv.isLinux && zfs != null) [
-    "--with-storage-zfs"
-  ] ++ optionals enableIscsi [
-    "--with-storage-iscsi"
-  ] ++ optionals enableCeph [
-    "--with-storage-rbd"
+    (opt "storage_zfs" (zfs != null))
+    "-Dattr=enabled"
+    "-Dapparmor=enabled"
+    "-Dsecdriver_apparmor=enabled"
+    "-Dnumad=enabled"
+    "-Dmacvtap=enabled"
+    "-Dvirtualport=enabled"
+    "-Dstorage_disk=enabled"
+    (opt "storage_rbd" enableCeph)
   ] ++ optionals stdenv.isDarwin [
-    "--with-init-script=none"
-  ];
-
-  installFlags = [
-    "runstatedir=${placeholder "out"}/run"
-    "localstatedir=$(TMPDIR)/var"
-    "sysconfdir=$(out)/var/lib"
+    "-Dinit_script=none"
   ];
 
   postInstall = let
-    binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
+    # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332)
+    binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
   in ''
     substituteInPlace $out/libexec/libvirt-guests.sh \
-      --replace 'ON_BOOT=start'       'ON_BOOT=''${ON_BOOT:-start}' \
-      --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
-      --replace "$out/bin"            '${gettext}/bin' \
-      --replace 'lock/subsys'         'lock' \
-      --replace 'gettext.sh'          'gettext.sh
+      --replace 'ON_BOOT="start"'       'ON_BOOT=''${ON_BOOT:-start}' \
+      --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
+      --replace "$out/bin"              '${gettext}/bin' \
+      --replace 'lock/subsys'           'lock' \
+      --replace 'gettext.sh'            'gettext.sh
   # Added in nixpkgs:
   gettext() { "${gettext}/bin/gettext" "$@"; }
   '
@@ -132,8 +147,6 @@ in stdenv.mkDerivation rec {
       --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     homepage = "https://libvirt.org/";
     repositories.git = "git://libvirt.org/libvirt.git";
diff --git a/nixpkgs/pkgs/development/libraries/libvisio/default.nix b/nixpkgs/pkgs/development/libraries/libvisio/default.nix
index b84ba92e2bfb..42051fe66a63 100644
--- a/nixpkgs/pkgs/development/libraries/libvisio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvisio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf
+{ lib, stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf
 , librevenge, libxml2, icu, perl, cppunit, doxygen
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg";
   };
 
-  nativeBuildInputs = [ pkgconfig cppunit doxygen ];
+  nativeBuildInputs = [ pkg-config cppunit doxygen ];
   buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ];
 
   configureFlags = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library providing ability to interpret and import visio diagrams into various applications";
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/libraries/libvisual/default.nix b/nixpkgs/pkgs/development/libraries/libvisual/default.nix
index 8fe53acc2456..7a996d3b8079 100644
--- a/nixpkgs/pkgs/development/libraries/libvisual/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvisual/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   name = "libvisual-0.4.0";
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ];
 
   hardeningDisable = [ "format" ];
 
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An abstraction library for audio visualisations";
     homepage = "https://sourceforge.net/projects/libvisual/";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix
index 9f7e84558f7d..c4b945bed446 100644
--- a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, fetchFromGitHub, meson, ninja, nasm }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, nasm }:
 
 stdenv.mkDerivation rec {
   pname = "libvmaf";
-  version = "1.5.3";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "netflix";
     repo = "vmaf";
     rev = "v${version}";
-    sha256 = "0x3l3g0hgrrjh3ygmxr1pd3rd5589s07c7id35nvj76ch5b7gy63";
+    sha256 = "0dynk1pmsyf23vfxljaazqkr27vfrvhj3dyjzm06zxpzsn59aif3";
   };
 
   sourceRoot = "source/libvmaf";
 
   nativeBuildInputs = [ meson ninja nasm ];
+
+  mesonFlags = [ "-Denable_avx512=true" ];
+
   outputs = [ "out" "dev" ];
-  doCheck = true;
+  doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Netflix/vmaf";
     description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
+    changelog = "https://github.com/Netflix/vmaf/blob/v${version}/CHANGELOG.md";
     platforms = platforms.unix;
     license = licenses.bsd2Patent;
     maintainers = [ maintainers.cfsmp3 maintainers.marsam ];
diff --git a/nixpkgs/pkgs/development/libraries/libvmi/default.nix b/nixpkgs/pkgs/development/libraries/libvmi/default.nix
index 1603d32ba797..9d9e47407b62 100644
--- a/nixpkgs/pkgs/development/libraries/libvmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvmi/default.nix
@@ -1,16 +1,16 @@
-{ stdenv,
+{ lib, stdenv,
   fetchFromGitHub,
   autoreconfHook,
   bison,
   flex,
   glib,
-  pkgconfig,
+  pkg-config,
   json_c,
   xen,
   libvirt,
   xenSupport ? true }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libvmi";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen);
-  nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
 
   configureFlags = optional (!xenSupport) "--disable-xen";
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libvmi.com/";
     description = "A C library for virtual machine introspection";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libvncserver/default.nix b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
index c4e82b1c326c..7c8d4a76fc95 100644
--- a/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchpatch, cmake
+{ lib, stdenv, fetchzip, fetchpatch, cmake
 , libjpeg, openssl, zlib, libgcrypt, libpng
 , systemd
 }:
@@ -21,14 +21,14 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libjpeg openssl libgcrypt libpng
-  ] ++ stdenv.lib.optional stdenv.isLinux systemd;
+  ] ++ lib.optional stdenv.isLinux systemd;
   propagatedBuildInputs = [ zlib ];
   meta = {
     inherit (s) version;
     description = "VNC server library";
     homepage = "https://libvnc.github.io/";
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libvorbis/default.nix b/nixpkgs/pkgs/development/libraries/libvorbis/default.nix
index 2a9f97cf67f5..9fd3fc59ab39 100644
--- a/nixpkgs/pkgs/development/libraries/libvorbis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvorbis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libogg, pkgconfig }:
+{ lib, stdenv, fetchurl, libogg, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libvorbis-1.3.7";
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libogg ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Vorbis audio compression reference implementation";
     homepage = "https://xiph.org/vorbis/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix b/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix
index c82b7a674acc..f1a2bf377cc0 100644
--- a/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix
+++ b/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, yasm
+{ lib, stdenv, fetchFromGitHub, perl, yasm
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
 , vp9DecoderSupport ? true # VP9 decoder
@@ -40,7 +40,7 @@
 
 let
   inherit (stdenv) is64bit isMips isDarwin isCygwin;
-  inherit (stdenv.lib) enableFeature optional optionals;
+  inherit (lib) enableFeature optional optionals;
 in
 
 assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 #    ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
   ];
 
-  postPatch = ''patchShebangs .'';
+  postPatch = "patchShebangs .";
 
   outputs = [ "bin" "dev" "out" ];
   setOutputFlags = false;
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''moveToOutput bin "$bin" '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = "https://www.webmproject.org/";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/nixpkgs/pkgs/development/libraries/libvpx/default.nix
index 83e60466c146..5aa8cf704910 100644
--- a/nixpkgs/pkgs/development/libraries/libvpx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvpx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, yasm
+{ lib, stdenv, fetchFromGitHub, perl, yasm
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
 , vp9DecoderSupport ? true # VP9 decoder
@@ -40,7 +40,7 @@
 
 let
   inherit (stdenv) is64bit isMips isDarwin isCygwin;
-  inherit (stdenv.lib) enableFeature optional optionals;
+  inherit (lib) enableFeature optional optionals;
 in
 
 assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
@@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''moveToOutput bin "$bin" '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = "https://www.webmproject.org/";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
index ca50345f5b21..e4a053601833 100644
--- a/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , perl
 , libtool
@@ -20,11 +20,11 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ libtool ];
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+    ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "VT220/xterm/ECMA-48 terminal emulator library";
     homepage = "http://www.leonerd.org.uk/code/libvterm/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libvterm/default.nix b/nixpkgs/pkgs/development/libraries/libvterm/default.nix
index 40324ec49327..90914d4186ea 100644
--- a/nixpkgs/pkgs/development/libraries/libvterm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, ncurses }:
+{ lib, stdenv, fetchurl, pkg-config, glib, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "libvterm-0.99.7";
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ncurses ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libvterm.sourceforge.net/";
     description = "Terminal emulator library to mimic both vt100 and rxvt";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix
index 6ae116356f8a..14b996145aff 100644
--- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }:
 
 stdenv.mkDerivation rec {
   pname = "libwacom";
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci";
   };
 
-  nativeBuildInputs = [ pkgconfig meson ninja doxygen ];
+  nativeBuildInputs = [ pkg-config meson ninja doxygen ];
 
   mesonFlags = [ "-Dtests=disabled" ];
 
   buildInputs = [ glib udev libgudev ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     homepage = "https://linuxwacom.github.io/";
     description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
diff --git a/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/nixpkgs/pkgs/development/libraries/libwebp/default.nix
index 6d24ba7f2ed2..4908dc4a9ce1 100644
--- a/nixpkgs/pkgs/development/libraries/libwebp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwebp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
 , threadingSupport ? true # multi-threading
 , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp)
 , pngSupport ? true, libpng ? null # PNG image format
@@ -24,7 +24,7 @@ let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libwebp";
   version = "1.1.0";
diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix
index c56781931f3f..8f749d9fe6aa 100644
--- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
+{ fetchFromGitHub, lib, stdenv, cmake, openssl, zlib, libuv }:
 
 let
   generic = { version, sha256 }: stdenv.mkDerivation rec {
@@ -22,9 +22,9 @@ let
       "-DLWS_WITH_SOCKS5=ON"
     ];
 
-    NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Light, portable C library for websockets";
       longDescription = ''
         Libwebsockets is a lightweight pure C library built to
diff --git a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
index 59e349b4e6a1..d0dd593a03dd 100644
--- a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
   pname = "libwhereami";
@@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost curl leatherman ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Library to report hypervisor information from inside a VM";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/libwmf/default.nix b/nixpkgs/pkgs/development/libraries/libwmf/default.nix
index 5c684c7fd778..e955fee57207 100644
--- a/nixpkgs/pkgs/development/libraries/libwmf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwmf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig
+{ lib, stdenv, fetchFromGitHub, pkg-config
 , freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib
 }:
 
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
     sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ];
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WMF library from wvWare";
     homepage = "http://wvware.sourceforge.net/libwmf.html";
     downloadPage = "https://github.com/caolanm/libwmf/releases";
diff --git a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix
index 78aa231bda3a..3792b826f594 100644
--- a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , gtk-doc
 , docbook_xsl
 , docbook_xml_dtd_412
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gettext
     gobject-introspection
     gtk-doc
@@ -62,11 +62,11 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-      attrPath = "${pname}${stdenv.lib.versions.major version}";
+      attrPath = "${pname}${lib.versions.major version}";
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/nixpkgs/pkgs/development/libraries/libwnck/default.nix
index 2872181a36d8..c0019ee268af 100644
--- a/nixpkgs/pkgs/development/libraries/libwnck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwnck/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "libwnck";
   version = "2.31.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ];
   # ?another optional: startup-notification
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A library for creating task lists and pagers";
     homepage = "https://gitlab.gnome.org/GNOME/libwnck";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix b/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
index f47208cda440..df21f2640966 100644
--- a/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
+++ b/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.8.14";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib libgsf libxml2 ];
 
-  nativeBuildInputs = [ pkgconfig bzip2 ];
+  nativeBuildInputs = [ pkg-config bzip2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for importing WordPerfect documents";
     homepage = "http://libwpd.sourceforge.net";
     license = with licenses; [ lgpl21 mpl20 ];
diff --git a/nixpkgs/pkgs/development/libraries/libwpd/default.nix b/nixpkgs/pkgs/development/libraries/libwpd/default.nix
index 3464c55805dd..8afe549cb68f 100644
--- a/nixpkgs/pkgs/development/libraries/libwpd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwpd/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }:
+{ lib, stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }:
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.10.0";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.xz";
     sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx";
   };
-  
+
   buildInputs = [ glib libgsf libxml2 zlib librevenge ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for importing and exporting WordPerfect documents";
     homepage = "http://libwpd.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/nixpkgs/pkgs/development/libraries/libwpe/default.nix
new file mode 100644
index 000000000000..102d658000c3
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libwpe/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, lib
+, fetchurl
+, meson
+, pkg-config
+, libxkbcommon
+, libGL
+, ninja
+, libX11 }:
+
+stdenv.mkDerivation rec {
+  pname = "libwpe";
+  version = "1.7.1";
+
+  src = fetchurl {
+    url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
+    sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    libxkbcommon
+    libGL
+    libX11
+  ];
+
+  meta = with lib; {
+    description = "General-purpose library for WPE WebKit";
+    license = licenses.bsd2;
+    homepage = "https://wpewebkit.org";
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix b/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix
new file mode 100644
index 000000000000..6f9356a6ad88
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, lib
+, fetchurl
+, meson
+, pkg-config
+, ninja
+, wayland
+, epoxy
+, glib
+, libwpe
+, libxkbcommon
+, libGL
+, libX11 }:
+
+stdenv.mkDerivation rec {
+  pname = "wpebackend-fdo";
+  version = "1.7.1";
+
+  src = fetchurl {
+    url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
+    sha256 = "1xf6akagvpyh0nyxkfijrx5avp6ravnivy28dhk64dsfx9rhm64v";
+  };
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+    wayland
+  ];
+
+  buildInputs = [
+    wayland
+    epoxy
+    glib
+    libwpe
+    libxkbcommon
+    libGL
+    libX11
+  ];
+
+  meta = with lib; {
+    description = "Freedesktop.org backend for WPE WebKit";
+    license = licenses.bsd2;
+    homepage = "https://wpewebkit.org";
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libwpg/default.nix b/nixpkgs/pkgs/development/libraries/libwpg/default.nix
index c844daf51f03..cf85d57a7f20 100644
--- a/nixpkgs/pkgs/development/libraries/libwpg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwpg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }:
+{ lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }:
 
 stdenv.mkDerivation rec {
   name = "libwpg-0.3.3";
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libwpd zlib librevenge ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libwpg.sourceforge.net";
     description = "C++ library to parse WPG";
     license = with licenses; [ lgpl21 mpl20 ];
diff --git a/nixpkgs/pkgs/development/libraries/libwps/default.nix b/nixpkgs/pkgs/development/libraries/libwps/default.nix
index 3d40d204bdc6..7dd7153bae9f 100644
--- a/nixpkgs/pkgs/development/libraries/libwps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }:
+{ lib, stdenv, fetchurl, boost, pkg-config, librevenge, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libwps";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ boost librevenge zlib ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libwps.sourceforge.net/";
     description = "Microsoft Works document format import filter library";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libx86/default.nix b/nixpkgs/pkgs/development/libraries/libx86/default.nix
index 271823ace288..1abefa8f4374 100644
--- a/nixpkgs/pkgs/development/libraries/libx86/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libx86/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libx86";
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
   #  http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
   makeFlags = [
     "DESTDIR=$(out)"
-  ] ++ stdenv.lib.optional (!stdenv.isi686) "BACKEND=x86emu";
+  ] ++ lib.optional (!stdenv.isi686) "BACKEND=x86emu";
 
   preBuild = ''
     sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
     sed -e s@/usr@@ -i Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Real-mode x86 code emulator";
     maintainers = with maintainers; [ raskin ];
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix b/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix
index 30be467f9fd2..a681d9e58902 100644
--- a/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix
+++ b/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix
@@ -4,6 +4,6 @@ rec {
    hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav";
    url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz";
    advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz";
-  
-  
+
+
 }
diff --git a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix
index 1b10ac5fdaab..8f9669561d62 100644
--- a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libx86emu";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "x86 emulation library";
     license = licenses.bsd2;
     homepage = "https://github.com/wfeldt/libx86emu";
diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix
index 3f687ad26c8b..d26518c7de98 100644
--- a/nixpkgs/pkgs/development/libraries/libxc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ lib, stdenv, fetchurl, gfortran, perl }:
 
 let
   version = "4.3.4";
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   doCheck = true;
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library of exchange-correlation functionals for density-functional theory";
     homepage = "https://octopus-code.org/wiki/Libxc";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/libxcomp/default.nix b/nixpkgs/pkgs/development/libraries/libxcomp/default.nix
index 9ecfa0ffd1ad..b66fe5c5a21a 100644
--- a/nixpkgs/pkgs/development/libraries/libxcomp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxcomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libxcomp";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libjpeg libpng libX11 zlib ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   preAutoreconf = ''
     cd nxcomp/
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "NX compression library";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix
index fdf62e38269e..58a58f2726bd 100644
--- a/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch}:
+{lib, stdenv, fetchurl, fetchpatch}:
 
 stdenv.mkDerivation rec {
   name = "libxdg-basedir-1.2.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/devnev/libxdg-basedir";
     description = "Implementation of the XDG Base Directory specification";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix
index 6ed331a8a6b9..c0785b34e891 100644
--- a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,32 +1,49 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen
+, xkeyboard_config, libxcb, libxml2
+, python3
+, libX11
+}:
 
 stdenv.mkDerivation rec {
   pname = "libxkbcommon";
-  version = "0.10.0";
+  version = "1.0.3";
 
   src = fetchurl {
     url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz";
-    sha256 = "1wmnl0hngn6vrqrya4r8hvimlkr4jag39yjprls4gyrqvh667hsp";
+    sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852";
   };
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ];
-  buildInputs = [ xkeyboard_config libxcb ];
+  nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ];
+  buildInputs = [ xkeyboard_config libxcb libxml2 ];
+  checkInputs = [ python3 ];
 
   mesonFlags = [
-    "-Denable-wayland=false"
     "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
+    "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc)
     "-Dx-locale-root=${libX11.out}/share/X11/locale"
+    "-Denable-wayland=false"
+    "-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output)
   ];
 
-  doCheck = false; # fails, needs unicode locale
+  doCheck = true;
+  preCheck = ''
+    patchShebangs ../test/
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to handle keyboard descriptions";
+    longDescription = ''
+      libxkbcommon is a keyboard keymap compiler and support library which
+      processes a reduced subset of keymaps as defined by the XKB (X Keyboard
+      Extension) specification. It also contains a module for handling Compose
+      and dead keys.
+    ''; # and a separate library for listing available keyboard layouts.
     homepage = "https://xkbcommon.org";
+    changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS";
     license = licenses.mit;
-    maintainers = with maintainers; [ ttuegel ];
+    maintainers = with maintainers; [ primeos ttuegel ];
     platforms = with platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
index a73fb7cb870e..cf5f6e320c0b 100644
--- a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
+++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
+{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "libxkbcommon-0.7.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ yacc flex xkeyboard_config libxcb ];
 
   configureFlags = [
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     "--with-x-locale-root=${libX11.out}/share/X11/locale"
   ];
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+  preBuild = lib.optionalString stdenv.isDarwin ''
     sed -i 's/,--version-script=.*$//' Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to handle keyboard descriptions";
     homepage = "https://xkbcommon.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libxklavier/default.nix b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix
index febe7f7b38ca..60b52152f67f 100644
--- a/nixpkgs/pkgs/development/libraries/libxklavier/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
 , glib, isocodes, gobject-introspection }:
 
 let
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # TODO: enable xmodmap support, needs xmodmap DB
   propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ];
+  nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl ];
 
   buildInputs = [ gobject-introspection ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     "--enable-gtk-doc"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library providing high-level API for X Keyboard Extension known as XKB";
     homepage = "http://freedesktop.org/wiki/Software/LibXklavier";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libxl/default.nix b/nixpkgs/pkgs/development/libraries/libxl/default.nix
index 6f11d4c461f9..600e94d0a757 100644
--- a/nixpkgs/pkgs/development/libraries/libxl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libxl";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp -rva lib64 $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for parsing Excel files";
     homepage    = "https://www.libxl.com/";
     license     = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/libraries/libxls/default.nix b/nixpkgs/pkgs/development/libraries/libxls/default.nix
index 00300899589a..3e8034f8baa8 100644
--- a/nixpkgs/pkgs/development/libraries/libxls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "libxls";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extract Cell Data From Excel xls files";
     homepage = "https://sourceforge.net/projects/libxls/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libxmi/default.nix b/nixpkgs/pkgs/development/libraries/libxmi/default.nix
index 89b96467155c..037e7036f499 100644
--- a/nixpkgs/pkgs/development/libraries/libxmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool }:
+{ lib, stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation {
   name = "libxmi-1.2";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Library for rasterizing 2-D vector graphics";
     homepage = "https://www.gnu.org/software/libxmi/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix
index 10ad110d24e5..30a65e3a0a36 100644
--- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   preInstall = lib.optionalString pythonSupport
     ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
   installFlags = lib.optional pythonSupport
-    "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\"";
+    "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\"";
 
   postFixup = ''
     moveToOutput bin/xml2-config "$dev"
diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
index 97e8d23c0700..b958f018b604 100644
--- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , docbook_xml_dtd_43
 , docbook_xsl
@@ -7,7 +7,7 @@
 , gtk-doc
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , python3
 , shared-mime-info
 , nixosTests
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     gtk-doc
     meson
     ninja
-    pkgconfig
+    pkg-config
     (python3.withPackages (pkgs: with pkgs; [ setuptools ]))
     shared-mime-info
   ];
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to help create and query binary XML blobs";
     homepage = "https://github.com/hughsie/libxmlb";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
index c80808081ffb..19282ddc822d 100644
--- a/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libxml++";
   version = "2.40.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a";
   };
 
   outputs = [ "out" "devdoc" ];
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkg-config perl ];
 
   propagatedBuildInputs = [ libxml2 glibmm ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libxmlplusplus.sourceforge.net/";
     description = "C++ wrapper for the libxml2 XML parser library";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
index be5c019e31ee..41c842220c7d 100644
--- a/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
+{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libxml++";
   version = "3.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libxml++/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
   };
 
   outputs = [ "out" "dev" "doc" "devdoc" ];
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkg-config perl ];
 
   buildInputs = [ glibmm ];
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       --replace 'docdir=''${datarootdir}' "docdir=$doc/share"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libxmlplusplus.sourceforge.net/";
     description = "C++ wrapper for the libxml2 XML parser library, version 3";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libxmp/default.nix b/nixpkgs/pkgs/development/libraries/libxmp/default.nix
index ca4d7edbf32d..0b953f95d7eb 100644
--- a/nixpkgs/pkgs/development/libraries/libxmp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmp/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libxmp-4.4.1";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extended module player library";
     homepage    = "http://xmp.sourceforge.net/";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/nixpkgs/pkgs/development/libraries/libxslt/default.nix
index cf91d7656bf0..eff9f2b2b792 100644
--- a/nixpkgs/pkgs/development/libraries/libxslt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt
+{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt
 , cryptoSupport ? false
 , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
 }:
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq";
   };
 
-  outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
+  outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py";
 
   buildInputs = [ libxml2.dev ]
-    ++ stdenv.lib.optional stdenv.isDarwin gettext
-    ++ stdenv.lib.optionals pythonSupport [ libxml2.py python ]
-    ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];
+    ++ lib.optional stdenv.isDarwin gettext
+    ++ lib.optionals pythonSupport [ libxml2.py python ]
+    ++ lib.optionals cryptoSupport [ libgcrypt ];
 
   propagatedBuildInputs = [ findXMLCatalogs ];
 
@@ -26,14 +26,14 @@ stdenv.mkDerivation rec {
     "--without-debug"
     "--without-mem-debug"
     "--without-debugger"
-  ] ++ stdenv.lib.optional pythonSupport "--with-python=${python}"
-    ++ stdenv.lib.optional (!cryptoSupport) "--without-crypto";
+  ] ++ lib.optional pythonSupport "--with-python=${python}"
+    ++ lib.optional (!cryptoSupport) "--without-crypto";
 
   postFixup = ''
     moveToOutput bin/xslt-config "$dev"
     moveToOutput lib/xsltConf.sh "$dev"
     moveToOutput share/man/man1 "$bin"
-  '' + stdenv.lib.optionalString pythonSupport ''
+  '' + lib.optionalString pythonSupport ''
     mkdir -p $py/nix-support
     echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
     moveToOutput ${python.libPrefix} "$py"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     inherit pythonSupport;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://xmlsoft.org/XSLT/";
     description = "A C library and tools to do XSL transformations";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix
index 5e4a56a6d4de..a2b4800ec4c4 100644
--- a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused
+{ lib, stdenv, fetchFromGitHub, coreutils, gfortran, gnused
 , python3, util-linux, which
 
 , enableStatic ? stdenv.hostPlatform.isStatic
@@ -42,11 +42,11 @@ in stdenv.mkDerivation {
     patchShebangs .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives";
     license = licenses.bsd3;
     homepage = "https://github.com/hfp/libxsmm";
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ chessai ];
+    maintainers = with lib.maintainers; [ chessai ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix
index cf880ef1e16c..13141923202a 100644
--- a/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libyaml-cpp";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A YAML parser and emitter for C++";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libyaml/default.nix b/nixpkgs/pkgs/development/libraries/libyaml/default.nix
index 37b8ebcc3efa..03e7e4715f88 100644
--- a/nixpkgs/pkgs/development/libraries/libyaml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libyaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pyyaml.org/";
     description = "A YAML 1.1 parser and emitter written in C";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/libykclient/default.nix b/nixpkgs/pkgs/development/libraries/libykclient/default.nix
index ea900477f356..6aacfc5ea2fa 100644
--- a/nixpkgs/pkgs/development/libraries/libykclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libykclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }:
 
 stdenv.mkDerivation {
   pname = "libykclient";
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
     sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig help2man ];
+  nativeBuildInputs = [ autoreconfHook pkg-config help2man ];
   buildInputs = [ curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yubikey C client library";
     homepage = "https://developers.yubico.com/yubico-c-client";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix b/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix
index cb4f3bec0118..a7d35950f034 100644
--- a/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }:
+{ lib, stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }:
 
 stdenv.mkDerivation rec {
   name = "libykneomgr-0.1.8";
@@ -8,14 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ pcsclite libzip help2man ];
 
   configureFlags = [
     "--with-backend=pcsc"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developers.yubico.com/libykneomgr";
     description = "A C library to interact with the CCID-part of the Yubikey NEO";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libyubikey/default.nix b/nixpkgs/pkgs/development/libraries/libyubikey/default.nix
index 75170d7ff8aa..b3aa2b57bdf8 100644
--- a/nixpkgs/pkgs/development/libraries/libyubikey/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libyubikey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libyubikey-1.13";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://opensource.yubico.com/yubico-c/";
     description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libzapojit/default.nix b/nixpkgs/pkgs/development/libraries/libzapojit/default.nix
index 4341b1e20412..d16f34039f19 100644
--- a/nixpkgs/pkgs/development/libraries/libzapojit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzapojit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }:
+{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "libzapojit";
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
+  nativeBuildInputs = [ pkg-config intltool gobject-introspection ];
   propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc
 
   passthru = {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";
     homepage = "https://wiki.gnome.org/Projects/Zapojit";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/libzdb/default.nix b/nixpkgs/pkgs/development/libraries/libzdb/default.nix
index 95f8e78cfb26..986f27e27c89 100644
--- a/nixpkgs/pkgs/development/libraries/libzdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzdb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, sqlite}:
+{lib, stdenv, fetchurl, sqlite}:
 
 stdenv.mkDerivation rec
 {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec
   {
     homepage = "http://www.tildeslash.com/libzdb/";
     description = "A small, easy to use Open Source Database Connection Pool Library";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libzen/default.nix b/nixpkgs/pkgs/development/libraries/libzen/default.nix
index 80a570dd697f..2d19ca4b22be 100644
--- a/nixpkgs/pkgs/development/libraries/libzen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "0.4.38";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library for libmediainfo and mediainfo";
     homepage = "https://mediaarea.net/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/libzip/default.nix b/nixpkgs/pkgs/development/libraries/libzip/default.nix
index 79933d402f7a..c65a9b6f583a 100644
--- a/nixpkgs/pkgs/development/libraries/libzip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, perl, zlib }:
+{ lib, stdenv, fetchurl, cmake, perl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libzip";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6";
   };
 
-  # Fix pkgconfig file paths
+  # Fix pkg-config file paths
   postPatch = ''
     sed -i CMakeLists.txt \
       -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     patchShebangs regress
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nih.at/libzip";
     description = "A C library for reading, creating and modifying zip archives";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/libzmf/default.nix b/nixpkgs/pkgs/development/libraries/libzmf/default.nix
index d3cbc430efc4..f71b6d0c0b97 100644
--- a/nixpkgs/pkgs/development/libraries/libzmf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzmf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}:
+{lib, stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}:
 
 stdenv.mkDerivation rec {
   pname = "libzmf";
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ boost icu libpng librevenge zlib cppunit ];
-  nativeBuildInputs = [ doxygen pkgconfig ];
+  nativeBuildInputs = [ doxygen pkg-config ];
   configureFlags = [ "--disable-werror" ];
 
   meta = {
     inherit version;
-    description = ''A library that parses the file format of Zoner Callisto/Draw documents'';
-    license = stdenv.lib.licenses.mpl20;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "A library that parses the file format of Zoner Callisto/Draw documents";
+    license = lib.licenses.mpl20;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf";
     downloadPage = "http://dev-www.libreoffice.org/src/libzmf/";
     updateWalker = true;
diff --git a/nixpkgs/pkgs/development/libraries/libzra/default.nix b/nixpkgs/pkgs/development/libraries/libzra/default.nix
index b5fe6e593566..3ebfc21095d1 100644
--- a/nixpkgs/pkgs/development/libraries/libzra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzra/default.nix
@@ -1,23 +1,23 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
 
 stdenv.mkDerivation rec {
   pname = "libzra";
-  version = "unstable-2020-08-10";
+  version = "unstable-2020-09-11";
 
   src = fetchFromGitHub {
     owner = "zraorg";
     repo = "zra";
-    rev = "e678980ae7e79efd716b4a6610fe9f148425fd6b";
-    sha256 = "132xyzhadahm01nas8gycjza5hs839fnpsh73im2a7wwfdw76z4h";
+    rev = "57abf2774dfc4624f14a0bc5bba71f044ce54a38";
+    sha256 = "10rlqj6ma02005gdcp57wp48d6cg0vkbv4vl9ai0zlgxyx1g6kc4";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zraorg/ZRA";
     description = "Library for ZStandard random access";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/lief/default.nix b/nixpkgs/pkgs/development/libraries/lief/default.nix
index 0854987436e6..3b57d0c2f7ae 100644
--- a/nixpkgs/pkgs/development/libraries/lief/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lief/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
 fetchzip {
   url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz";
   sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to Instrument Executable Formats";
     homepage = "https://lief.quarkslab.com/";
     license = [ licenses.asl20 ];
diff --git a/nixpkgs/pkgs/development/libraries/lightning/default.nix b/nixpkgs/pkgs/development/libraries/lightning/default.nix
index 65d0a18cedd0..5fdc06bce012 100644
--- a/nixpkgs/pkgs/development/libraries/lightning/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lightning/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, libopcodes }:
+{ lib, stdenv, fetchurl, libopcodes }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "lightning";
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ maintainers.AndersonTorres ];
     license = licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index 2e6b36446285..d47c7b50abef 100644
--- a/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
+{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
 , opentracing-cpp, protobuf, zlib
 , enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null
 }:
@@ -9,17 +9,17 @@ assert enableGrpc -> c-ares != null;
 
 stdenv.mkDerivation rec {
   pname = "lightstep-tracer-cpp";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "lightstep";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0d7z9isf0n8s63mvp3j75949w0yv7jsva29i62lq8yxbym688fxb";
+    sha256 = "1xr11dm94qpbx3nxb7si7zy7hzg2akj01pyxkd8pzzbvmkmic16j";
   };
 
   nativeBuildInputs = [
-    cmake pkgconfig
+    cmake pkg-config
   ];
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/lime/default.nix b/nixpkgs/pkgs/development/libraries/lime/default.nix
index aa34ff2e927c..3a16b5202c47 100644
--- a/nixpkgs/pkgs/development/libraries/lime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lime/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitLab
 , soci
 , sqlite
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   # Do not build static libraries
   cmakeFlags = [ "-DENABLE_STATIC=NO" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "End-to-end encryption library for instant messaging";
     homepage = "http://www.linphone.org/technical-corner/lime";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix
index 7bca0c295c4b..8a21bd3bcde4 100644
--- a/nixpkgs/pkgs/development/libraries/linbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , givaro
-, pkgconfig
+, pkg-config
 , blas
 , lapack
 , fflas-ffpack
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-blas-libs=-lblas"
     "--disable-optimization"
-  ] ++ stdenv.lib.optionals stdenv.isx86_64 [
+  ] ++ lib.optionals stdenv.isx86_64 [
     # disable SIMD instructions (which are enabled *when available* by default)
     "--${if stdenv.hostPlatform.sse3Support   then "enable" else "disable"}-sse3"
     "--${if stdenv.hostPlatform.ssse3Support  then "enable" else "disable"}-ssse3"
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     "--${if stdenv.hostPlatform.avx2Support   then "enable" else "disable"}-avx2"
     "--${if stdenv.hostPlatform.fmaSupport    then "enable" else "disable"}-fma"
     "--${if stdenv.hostPlatform.fma4Support   then "enable" else "disable"}-fma4"
-  ] ++ stdenv.lib.optionals withSage [
+  ] ++ lib.optionals withSage [
     "--enable-sage"
   ];
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "C++ library for exact, high-performance linear algebra";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix b/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
index 0a2dacb48db9..d19d6748147c 100644
--- a/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "linenoise-ng";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/arangodb/linenoise-ng";
     description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";
-    maintainers = with stdenv.lib.maintainers; [ cstrahan ];
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ cstrahan ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/linenoise/default.nix b/nixpkgs/pkgs/development/libraries/linenoise/default.nix
index 3de9f08bf971..d465b48a8f46 100644
--- a/nixpkgs/pkgs/development/libraries/linenoise/default.nix
+++ b/nixpkgs/pkgs/development/libraries/linenoise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "linenoise";
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/antirez/linenoise";
     description = "A minimal, zero-config, BSD licensed, readline replacement";
-    maintainers = with stdenv.lib.maintainers; [ mpsyco ];
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ mpsyco ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
index b882e233c079..746771f44fe4 100644
--- a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, autoreconfHook }:
+{lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation {
   pname = "liquid-dsp";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://liquidsdr.org/";
     description = "Digital signal processing library for software-defined radios";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix
index 1beae81ad16f..29531a299966 100644
--- a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }:
+{ lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }:
 
-let 
+let
   sourceInfo = rec {
     version="1.1.0";
     name="liquidfun-${version}";
@@ -16,7 +16,8 @@ stdenv.mkDerivation {
   };
 
   inherit (sourceInfo) name version;
-  buildInputs = [ cmake libGLU libGL libX11 libXi ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libGLU libGL libX11 libXi ];
 
   sourceRoot = "liquidfun/Box2D/";
 
@@ -26,23 +27,22 @@ stdenv.mkDerivation {
     sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
     substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h"
   '';
-      
+
   configurePhase = ''
     mkdir Build
-    cd Build; 
+    cd Build;
     cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
   '';
 
   meta = {
     description = "2D physics engine based on Box2D";
-    maintainers = with stdenv.lib.maintainers;
+    maintainers = with lib.maintainers;
     [
       qknight
     ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
     hydraPlatforms = [];
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     homepage = "https://google.github.io/liquidfun/";
   };
 }
-
diff --git a/nixpkgs/pkgs/development/libraries/lirc/default.nix b/nixpkgs/pkgs/development/libraries/lirc/default.nix
index 97079be09623..6b7f0c102ee8 100644
--- a/nixpkgs/pkgs/development/libraries/lirc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lirc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3,
   alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     touch lib/lirc/input_map.inc
   '';
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig help2man
+  nativeBuildInputs = [ autoreconfHook pkg-config help2man
     (python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
 
   buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ];
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     "localstatedir=$TMPDIR"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows to receive and send infrared signals";
     homepage = "https://www.lirc.org/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/live555/default.nix b/nixpkgs/pkgs/development/libraries/live555/default.nix
index 84907a428605..85302bc7c966 100644
--- a/nixpkgs/pkgs/development/libraries/live555/default.nix
+++ b/nixpkgs/pkgs/development/libraries/live555/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sed \
       -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
       -i config.linux
-  '' + stdenv.lib.optionalString (stdenv ? glibc) ''
+  '' + lib.optionalString (stdenv ? glibc) ''
     substituteInPlace liveMedia/include/Locale.hh \
       --replace '<xlocale.h>' '<locale.h>'
   '';
diff --git a/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/nixpkgs/pkgs/development/libraries/lmdb/default.nix
index 64f6fccefa79..a59b460734d0 100644
--- a/nixpkgs/pkgs/development/libraries/lmdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lmdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   pname = "lmdb";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc.targetPrefix}cc"
     "AR=${stdenv.cc.targetPrefix}ar"
   ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
+    ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
 
   doCheck = true;
   checkPhase = "make test";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightning memory-mapped database";
     longDescription = ''
       LMDB is an ultra-fast, ultra-compact key-value embedded data store
diff --git a/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
index 95d8f45eec46..9b1d320678a0 100644
--- a/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , lmdb }:
 
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/drycpp/lmdbxx#readme";
     description = "C++11 wrapper for the LMDB embedded B+ tree database library";
-    license = stdenv.lib.licenses.unlicense;
-    maintainers = with stdenv.lib.maintainers; [ fgaz ];
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ fgaz ];
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
index 097ff0c48c90..1e16ee96ae7f 100644
--- a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   name = "log4cplus-2.0.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://log4cplus.sourceforge.net/";
     description = "A port the log4j library from Java to C++";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/log4cpp/default.nix b/nixpkgs/pkgs/development/libraries/log4cpp/default.nix
index d2918c87f335..d4b703a2bda7 100644
--- a/nixpkgs/pkgs/development/libraries/log4cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "log4cpp-1.1.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://log4cpp.sourceforge.net/";
     description = "A logging framework for C++ patterned after Apache log4j";
     license     = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix
index cec0ec9ab287..aaf7ea5ee9c9 100644
--- a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool, libxml2, cppunit, boost
+{ lib, stdenv, fetchurl, libtool, libxml2, cppunit, boost
 , apr, aprutil, db, expat
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     }' src/examples/cpp/console.cpp \
        src/main/cpp/inputstreamreader.cpp \
        src/main/cpp/socketoutputstream.cpp
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h
     sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp
   '';
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://logging.apache.org/log4cxx/index.html";
     description = "A logging framework for C++ patterned after Apache log4j";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/log4shib/default.nix b/nixpkgs/pkgs/development/libraries/log4shib/default.nix
index 17046d17b78a..0602b4c3b523 100644
--- a/nixpkgs/pkgs/development/libraries/log4shib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4shib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook }:
+{ lib, stdenv, fetchgit, autoreconfHook }:
 
 stdenv.mkDerivation {
   pname = "log4shib";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A forked version of log4cpp that has been created for the Shibboleth project";
     maintainers = [ maintainers.jammerful ];
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/loki/default.nix b/nixpkgs/pkgs/development/libraries/loki/default.nix
index 9c7e36113d86..49b850eae65b 100644
--- a/nixpkgs/pkgs/development/libraries/loki/default.nix
+++ b/nixpkgs/pkgs/development/libraries/loki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "loki";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms";
     homepage = "http://loki-lib.sourceforge.net";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix
index e00fc07480e2..0245417bbf9b 100644
--- a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }:
+{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }:
 
 stdenv.mkDerivation rec {
   version = "1.5.3";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ openssl libidn glib zlib ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight C library for the Jabber protocol";
     platforms = platforms.linux;
     downloadPage = "http://mcabber.com/files/loudmouth/";
diff --git a/nixpkgs/pkgs/development/libraries/lrdf/default.nix b/nixpkgs/pkgs/development/libraries/lrdf/default.nix
index 80c8702b0b94..51b2635b89e0 100644
--- a/nixpkgs/pkgs/development/libraries/lrdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lrdf/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
+{ config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
 , librdf_raptor2, ladspaH, openssl, zlib
 , doCheck ? config.doCheckByDefault or false, ladspaPlugins
 }:
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4";
   };
 
-  postPatch = stdenv.lib.optionalString doCheck ''
+  postPatch = lib.optionalString doCheck ''
     sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c
   '';
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   propagatedBuildInputs = [ librdf_raptor2 ];
 
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight RDF library with special support for LADSPA plugins";
     homepage = "https://sourceforge.net/projects/lrdf/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/luabind/default.nix b/nixpkgs/pkgs/development/libraries/luabind/default.nix
index eded6b6527fe..d7aed656fdb9 100644
--- a/nixpkgs/pkgs/development/libraries/luabind/default.nix
+++ b/nixpkgs/pkgs/development/libraries/luabind/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost-build, lua, boost}:
+{lib, stdenv, fetchurl, boost-build, lua, boost}:
 
 stdenv.mkDerivation {
   name = "luabind-0.9.1";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/luabind/luabind";
     description = "A library that helps you create bindings between C++ and Lua";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/lucene++/default.nix b/nixpkgs/pkgs/development/libraries/lucene++/default.nix
index 3d54cf5e7c13..2761329ea23c 100644
--- a/nixpkgs/pkgs/development/libraries/lucene++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lucene++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost, gtest }:
+{ lib, stdenv, fetchurl, cmake, boost, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "lucene++";
@@ -17,16 +17,16 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ];
-  buildInputs = [ cmake boost gtest ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost gtest ];
 
-  enableParallelBuilding = true;
   doCheck = true;
   checkTarget = "test";
 
   meta = {
     description = "C++ port of the popular Java Lucene search engine";
     homepage = "https://github.com/luceneplusplus/LucenePlusPlus";
-    license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ asl20 lgpl3Plus ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/luksmeta/default.nix b/nixpkgs/pkgs/development/libraries/luksmeta/default.nix
index 9e01605d2df1..afefcfed82c7 100644
--- a/nixpkgs/pkgs/development/libraries/luksmeta/default.nix
+++ b/nixpkgs/pkgs/development/libraries/luksmeta/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc
 , cryptsetup
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ];
+  nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ];
   buildInputs = [ cryptsetup ];
 
   meta = {
diff --git a/nixpkgs/pkgs/development/libraries/lyra/default.nix b/nixpkgs/pkgs/development/libraries/lyra/default.nix
index 8d5d083d82b0..9f5fd1d3a342 100644
--- a/nixpkgs/pkgs/development/libraries/lyra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lyra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "lyra";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     cp -R $src/include/* $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bfgroup/Lyra";
     description = "A simple to use, composable, command line parser for C++ 11 and beyond";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/lzo/default.nix b/nixpkgs/pkgs/development/libraries/lzo/default.nix
index 446f91464145..8ea933f0e3ab 100644
--- a/nixpkgs/pkgs/development/libraries/lzo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lzo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "lzo-2.10";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # not cross;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Real-time data (de)compression library";
     longDescription = ''
       LZO is a portable lossless data compression library written in ANSI C.
diff --git a/nixpkgs/pkgs/development/libraries/mac/default.nix b/nixpkgs/pkgs/development/libraries/mac/default.nix
index a896b9261d52..7445d283c6f4 100644
--- a/nixpkgs/pkgs/development/libraries/mac/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, yasm }:
+{ lib, stdenv, fetchurl, fetchpatch, yasm }:
 
 stdenv.mkDerivation rec {
   pname = "mac";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ yasm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "APE codec and decompressor";
     homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php";
     license = licenses.unfreeRedistributable;
diff --git a/nixpkgs/pkgs/development/libraries/mailcore2/default.nix b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix
index d5f20f6761c2..4e5a5fdbcdbc 100644
--- a/nixpkgs/pkgs/development/libraries/mailcore2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate
-, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl
+, libuchardet, pkg-config, glib, html-tidy, libxml2, libuuid, openssl
 }:
 
 stdenv.mkDerivation rec {
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [
-    libetpan cmake icu cyrus_sasl libctemplate libuchardet glib
+    libetpan icu cyrus_sasl libctemplate libuchardet glib
     html-tidy libxml2 libuuid openssl
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/nixpkgs/pkgs/development/libraries/malcontent/default.nix
index 49ffade85460..641f3b87c3fe 100644
--- a/nixpkgs/pkgs/development/libraries/malcontent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/malcontent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , fetchpatch
 , meson
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # We need to install Polkit & AccountsService data files in `out`
     # but `buildEnv` only uses `bin` when both `bin` and `out` are present.
     outputsToInstall = [ "bin" "out" "man" ];
diff --git a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix
index 54382cfc0d57..e306267154ae 100644
--- a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix
+++ b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , meson
 , ninja
 , pkg-config
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     "-Dui=enabled"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "UI components for parental controls library";
     homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/nixpkgs/pkgs/development/libraries/mapnik/default.nix
index cf0539fe266f..40ef1fde563a 100644
--- a/nixpkgs/pkgs/development/libraries/mapnik/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mapnik/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip
+{ lib, stdenv, fetchzip
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
 , libwebp, libxml2, proj, python, sqlite, zlib
 
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "XML2_LIBS=${libxml2.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open source toolkit for developing mapping applications";
     homepage = "https://mapnik.org";
     maintainers = with maintainers; [ hrdinka ];
diff --git a/nixpkgs/pkgs/development/libraries/marisa/default.nix b/nixpkgs/pkgs/development/libraries/marisa/default.nix
index 99d82970fe06..4a3f8be04172 100644
--- a/nixpkgs/pkgs/development/libraries/marisa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/marisa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "marisa";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/s-yata/marisa-trie";
     description = "Static and space-efficient trie data structure library";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/marl/default.nix b/nixpkgs/pkgs/development/libraries/marl/default.nix
index 2bf23962d53e..4545264aad9e 100644
--- a/nixpkgs/pkgs/development/libraries/marl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/marl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ lib, stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "marl";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # Turn on the flag to install after building the library.
   cmakeFlags = ["-DMARL_INSTALL=ON"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/marl";
     description = "A hybrid thread / fiber task scheduler written in C++ 11";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/martyr/default.nix b/nixpkgs/pkgs/development/libraries/martyr/default.nix
index 51fd6962e704..609033e22ead 100644
--- a/nixpkgs/pkgs/development/libraries/martyr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/martyr/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, ant, jdk}:
+{lib, stdenv, fetchurl, ant, jdk}:
 
 stdenv.mkDerivation rec {
-	pname = "martyr";
+  pname = "martyr";
   version = "0.3.9";
-	src = fetchurl {
-		url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
-		sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
-	};
+  src = fetchurl {
+    url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
+    sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
+  };
 
   buildInputs = [ ant jdk ];
 
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
     homepage = "http://martyr.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/matio/default.nix b/nixpkgs/pkgs/development/libraries/matio/default.nix
index bc629dc25064..b6330f69e302 100644
--- a/nixpkgs/pkgs/development/libraries/matio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/matio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "matio-1.5.19";
   src = fetchurl {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading and writing Matlab MAT files";
     license = licenses.bsd2;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix
index f24232ac7aec..e3e0d2ecd78d 100644
--- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 
 , cmake
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja perl python ];
 
-  postConfigure = stdenv.lib.optionals enableThreading ''
+  postConfigure = lib.optionals enableThreading ''
     perl scripts/config.pl set MBEDTLS_THREADING_C    # Threading abstraction layer
     perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD    # POSIX thread wrapper layer for the threading layer.
   '';
 
   cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://tls.mbed.org/";
     description = "Portable cryptographic and TLS library, formerly known as PolarSSL";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/mdds/default.nix b/nixpkgs/pkgs/development/libraries/mdds/default.nix
index b69e99de414d..0fc749632994 100644
--- a/nixpkgs/pkgs/development/libraries/mdds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mdds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, llvmPackages }:
+{ lib, stdenv, fetchurl, boost, llvmPackages }:
 
 stdenv.mkDerivation rec {
   pname = "mdds";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
     cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
   '';
 
-  buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   checkInputs = [ boost ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     homepage = "https://gitlab.com/mdds/mdds";
     description = "A collection of multi-dimensional data structure and indexing algorithm";
diff --git a/nixpkgs/pkgs/development/libraries/medfile/default.nix b/nixpkgs/pkgs/development/libraries/medfile/default.nix
index 246bdb1480c0..a89cb43d2611 100644
--- a/nixpkgs/pkgs/development/libraries/medfile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/medfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, hdf5 }:
+{ lib, stdenv, fetchurl, cmake, hdf5 }:
 
 stdenv.mkDerivation rec {
   pname = "medfile";
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "1khzclkrd1yn9mz3g14ndgpsbj8j50v8dsjarcj6kkn9zgbbazc4";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [ hdf5 ];
 
@@ -18,7 +16,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -r $out/bin/testc";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to read and write MED files";
     homepage = "http://salome-platform.org/";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
index 64ddba517df8..3cda9ff3006d 100644
--- a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
@@ -23,12 +23,12 @@
 , libv4l
 , libvpx
 , ortp
-, pkgconfig
+, pkg-config
 , python
 , SDL
 , speex
 , srtp
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     cmake
     doxygen
     intltool
-    pkgconfig
+    pkg-config
     python
   ];
 
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   ];
   NIX_LDFLAGS = "-lXext";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
     homepage = "http://www.linphone.org/technical-corner/mediastreamer2";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix
index 45b3c83bfe24..08842889f865 100644
--- a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -4,8 +4,8 @@
 , fetchpatch
 , mediastreamer
 , openh264
-, pkgconfig
-, stdenv
+, pkg-config
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr";
   };
 
-  nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
   buildInputs = [ mediastreamer openh264 ];
 
   # Do not build static libraries
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "H.264 encoder/decoder plugin for mediastreamer2";
     homepage = "https://www.linphone.org/technical-corner/mediastreamer2";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/menu-cache/default.nix b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
index d7b39c28a425..b2f06b9e627b 100644
--- a/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
+++ b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
+{ lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }:
 
 let name = "menu-cache-1.1.0";
 in
@@ -9,11 +9,11 @@ stdenv.mkDerivation {
     sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ glib libfm-extra ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to read freedesktop.org menu files";
     homepage = "https://blog.lxde.org/tag/menu-cache/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
index 9679ddb94e8c..85950daea68a 100644
--- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }:
+{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices }:
 
 stdenv.mkDerivation rec {
   pname = "glu";
@@ -9,17 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libGL ]
-    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+    ++ lib.optional stdenv.isDarwin ApplicationServices;
 
   outputs = [ "out" "dev" ];
 
   meta = {
     description = "OpenGL utility library";
     homepage = "https://cgit.freedesktop.org/mesa/glu/";
-    license = stdenv.lib.licenses.sgi-b-20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.sgi-b-20;
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isAndroid;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index c96d1edfadfe..44dddac7d32c 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchpatch, buildPackages
-, pkgconfig, intltool, ninja, meson
+, pkg-config, intltool, ninja, meson
 , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
 , libelf, libvdpau, python3Packages
@@ -26,12 +26,12 @@
   - libOSMesa is in $osmesa (~4 MB)
 */
 
-with stdenv.lib;
+with lib;
 
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "20.3.1";
+  version = "20.3.2";
   branch  = versions.major version;
 in
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "03vqm9kqrcpijg6bxldj0bg360z8d7c767n3b16jdc1apd4inxdg";
+    sha256 = "0gakhsj5qgm4wran7nlnz7kzgg3aj0a8f4q4dfbznfnjhnv03q6c";
   };
 
   prePatch = "patchShebangs .";
@@ -65,10 +65,9 @@ stdenv.mkDerivation {
       url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
       sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
     })
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    # Fix for pre macOS SDK 10.13
-    # TODO(r-burns) can be applied unconditionally, at the cost of a mass linux rebuild
-    (fetchpatch {
+    # Fix for pre macOS SDK 10.13:
+    (fetchpatch { # util: Disable memstream for Apple builds
+      # MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269
       url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch";
       sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5";
     })
@@ -130,10 +129,10 @@ stdenv.mkDerivation {
     ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
     ++ lib.optional withValgrind valgrind-light;
 
-  depsBuildBuild = [ pkgconfig ];
+  depsBuildBuild = [ pkg-config ];
 
   nativeBuildInputs = [
-    pkgconfig meson ninja
+    pkg-config meson ninja
     intltool bison flex file
     python3Packages.python python3Packages.Mako
   ] ++ lib.optionals (elem "wayland" eglPlatforms) [
@@ -208,7 +207,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-fno-common";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-common";
 
   passthru = {
     inherit libdrm;
diff --git a/nixpkgs/pkgs/development/libraries/metal/default.nix b/nixpkgs/pkgs/development/libraries/metal/default.nix
index 7e047c28d0a6..18b1f116b876 100644
--- a/nixpkgs/pkgs/development/libraries/metal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/metal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "metal";
   version = "2.1.1";
@@ -12,9 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Single-header C++11 library designed to make you love template metaprogramming";
     homepage = "https://github.com/brunocodutra/metal";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
index a0356497818a..af1c1c91a94f 100644
--- a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, catch, cmake
+{ lib, stdenv, fetchFromGitHub, catch, cmake
 }:
 
 let
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     mv ../include/ $out/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Core Guideline support library";
     longDescription = ''
      The Guideline Support Library (GSL) contains functions and types that are suggested for
diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
index 7382ed57c640..2ac2087054fe 100644
--- a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja
+{ lib, stdenv, fetchFromGitHub, cmake, ninja
 , secureBuild ? false
 }:
 
@@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ninja ];
-  enableParallelBuilding = true;
-  cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
+  cmakeFlags = lib.optional secureBuild [ "-DMI_SECURE=ON" ];
 
   postInstall = let
-    rel = stdenv.lib.versions.majorMinor version;
+    rel = lib.versions.majorMinor version;
   in ''
     # first, install headers, that's easy
     mkdir -p $dev
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compact, fast, general-purpose memory allocator";
     homepage    = "https://github.com/microsoft/mimalloc";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/mimetic/default.nix b/nixpkgs/pkgs/development/libraries/mimetic/default.nix
index 0147a2973053..1638caa0d1f8 100644
--- a/nixpkgs/pkgs/development/libraries/mimetic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mimetic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cutee }:
+{ lib, stdenv, fetchurl, cutee }:
 
 stdenv.mkDerivation rec {
   pname = "mimetic";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cutee ];
 
-  patches = stdenv.lib.optional stdenv.isAarch64 ./narrowing.patch;
+  patches = lib.optional stdenv.isAarch64 ./narrowing.patch;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MIME handling library";
     homepage    = "http://www.codesink.org/mimetic_mime_library.html";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/miniball/default.nix b/nixpkgs/pkgs/development/libraries/miniball/default.nix
index d1804b9bf95f..e48857861d68 100644
--- a/nixpkgs/pkgs/development/libraries/miniball/default.nix
+++ b/nixpkgs/pkgs/development/libraries/miniball/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "miniball";
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Smallest Enclosing Balls of Points";
     homepage = "https://www.inf.ethz.ch/personal/gaertner/miniball.html";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.erikryb ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.erikryb ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/minixml/default.nix b/nixpkgs/pkgs/development/libraries/minixml/default.nix
index 8938ab90fbc1..93c03b31a8a7 100644
--- a/nixpkgs/pkgs/development/libraries/minixml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/minixml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "mxml";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small XML library";
     homepage = "https://www.msweet.org/mxml/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/minizip/default.nix b/nixpkgs/pkgs/development/libraries/minizip/default.nix
index 5ee1f38ca8b5..bb62a9b3b2ba 100644
--- a/nixpkgs/pkgs/development/libraries/minizip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/minizip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, zlib, autoreconfHook }:
+{ lib, stdenv, zlib, autoreconfHook }:
 
 stdenv.mkDerivation {
   name = "minizip-${zlib.version}";
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
     inherit (zlib.meta) license homepage;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/minizip2/default.nix b/nixpkgs/pkgs/development/libraries/minizip2/default.nix
index 6c6d8b3ef86c..16bb2b8d44e6 100644
--- a/nixpkgs/pkgs/development/libraries/minizip2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/minizip2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "minizip";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib bzip2 xz zstd openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
     homepage = "https://github.com/nmoinvaz/minizip";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix
index 1f2915c5071b..633a7325b098 100644
--- a/nixpkgs/pkgs/development/libraries/mlt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif
-, libvorbis, libxml2, movit, pkgconfig, sox, fftw, opencv4, SDL2
+, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
 , gtk2, genericUpdater, common-updater-scripts, libebur128
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
-    makeWrapper movit pkgconfig sox libexif gtk2 fftw libebur128
+    makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128
     opencv4 SDL2
   ];
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     rev-prefix = "v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source multimedia framework, designed for television broadcasting";
     homepage = "https://www.mltframework.org";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix
index 7bcbff78767f..7004a5e11c04 100644
--- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix
+++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , SDL
 , ffmpeg
@@ -9,7 +9,7 @@
 , libvorbis
 , libxml2
 , movit
-, pkgconfig
+, pkg-config
 , sox
 , qtbase
 , qtsvg
@@ -23,7 +23,7 @@
 , mkDerivation
 , which
 }:
-let inherit (stdenv.lib) getDev; in
+let inherit (lib) getDev; in
 mkDerivation rec {
   pname = "mlt";
   version = "6.22.1";
@@ -45,7 +45,7 @@ mkDerivation rec {
     libvorbis
     libxml2
     movit
-    pkgconfig
+    pkg-config
     qtbase
     qtsvg
     sox
@@ -75,8 +75,6 @@ mkDerivation rec {
 
   CXXFLAGS = "-std=c++11";
 
-  enableParallelBuilding = true;
-
   qtWrapperArgs = [
     "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
     "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
@@ -104,7 +102,7 @@ mkDerivation rec {
     rev-prefix = "v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source multimedia framework, designed for television broadcasting";
     homepage = "https://www.mltframework.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/nixpkgs/pkgs/development/libraries/mm-common/default.nix
index 3981e05ef067..a43d99503a3f 100644
--- a/nixpkgs/pkgs/development/libraries/mm-common/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mm-common/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , gnome3
 , meson
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.0.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common build files of GLib/GTK C++ bindings";
     longDescription = ''
       The mm-common module provides the build infrastructure and utilities
diff --git a/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix
index d011419cea7f..e9779cf0a054 100644
--- a/nixpkgs/pkgs/development/libraries/mongoc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mongoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, perl, pkgconfig, libbson
+{ lib, stdenv, fetchzip, perl, pkg-config, libbson
 , openssl, which, zlib, snappy
 }:
 
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8";
   };
 
-  nativeBuildInputs = [ pkgconfig which perl ];
+  nativeBuildInputs = [ pkg-config which perl ];
   buildInputs = [ openssl zlib ];
   propagatedBuildInputs = [ libbson snappy ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official C client library for MongoDB";
     homepage = "https://github.com/mongodb/mongo-c-driver";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/mono-addins/default.nix b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix
index d9c1636e59ba..158b39a8186a 100644
--- a/nixpkgs/pkgs/development/libraries/mono-addins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
   pname = "mono-addins";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
   # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
   buildInputs = [ mono4 gtk-sharp-2_0 ];
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.mono-project.com/archived/monoaddins/";
     description = "A generic framework for creating extensible applications";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/motif/default.nix b/nixpkgs/pkgs/development/libraries/motif/default.nix
index f03ba81e8686..0499aaec532d 100644
--- a/nixpkgs/pkgs/development/libraries/motif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/motif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool
+{ lib, stdenv, fetchurl, pkg-config, libtool
 , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt
 , expat, libjpeg, libpng, libiconv
 , flex
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     expat libjpeg libpng libiconv
   ];
 
-  nativeBuildInputs = [ pkgconfig flex ];
+  nativeBuildInputs = [ pkg-config flex ];
 
   propagatedBuildInputs = [ libXp libXau ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     rm lib/Xm/Xm.h
-  '' + stdenv.lib.optionalString (!demoSupport) ''
+  '' + lib.optionalString (!demoSupport) ''
     sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in}
   '';
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
               ./Add-X.Org-to-bindings-file.patch
             ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://motif.ics.com";
     description = "Unix standard widget-toolkit and window-manager";
     platforms = with platforms; linux ++ darwin;
diff --git a/nixpkgs/pkgs/development/libraries/movit/default.nix b/nixpkgs/pkgs/development/libraries/movit/default.nix
index 901d299728fa..9c03a9f6c491 100644
--- a/nixpkgs/pkgs/development/libraries/movit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/movit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:
+{ lib, stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "movit";
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ eigen epoxy ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ SDL2 fftw gtest ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance, high-quality video filters for the GPU";
     homepage = "https://movit.sesse.net";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/mp4v2/default.nix b/nixpkgs/pkgs/development/libraries/mp4v2/default.nix
index 3a036fcf6fbf..7a6bbb552027 100644
--- a/nixpkgs/pkgs/development/libraries/mp4v2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mp4v2/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713";
       sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
     })
+  ] ++ lib.optionals stdenv.cc.isClang [
+    # unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678
+    ./fix-build-clang.patch
   ];
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
diff --git a/nixpkgs/pkgs/development/libraries/mp4v2/fix-build-clang.patch b/nixpkgs/pkgs/development/libraries/mp4v2/fix-build-clang.patch
new file mode 100644
index 000000000000..5d99f1951f7a
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/mp4v2/fix-build-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/src/mp4.cpp b/src/mp4.cpp
+index c2a7238..9bb3e38 100644
+--- a/src/mp4.cpp
++++ b/src/mp4.cpp
+@@ -870,7 +870,7 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file
+         }
+ 
+         catch (...) {
+-            return MP4_INVALID_TRACK_ID;
++            return NULL;
+         }
+     }
+ 
diff --git a/nixpkgs/pkgs/development/libraries/mpfi/default.nix b/nixpkgs/pkgs/development/libraries/mpfi/default.nix
index 88617e9a7409..399c5416d781 100644
--- a/nixpkgs/pkgs/development/libraries/mpfi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpfi/default.nix
@@ -1,22 +1,22 @@
-{stdenv, fetchurl, mpfr}:
+{lib, stdenv, fetchurl, mpfr}:
 stdenv.mkDerivation rec {
   pname = "mpfi";
-  version = "1.5.3";
+  version = "1.5.4";
   file_nr = "37331";
   src = fetchurl {
     # NOTE: the file_nr is whats important here. The actual package name (including the version)
     # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/
     # and click on Download in the section "Latest File Releases".
     url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2";
-    sha256 = "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3";
+    sha256 = "sha256-I4PUV7IIxs088uZracTOR0d7Kg2zH77AzUseuqJHGS8=";
   };
   buildInputs = [mpfr];
   meta = {
     inherit version;
-    description = ''A multiple precision interval arithmetic library based on MPFR'';
+    description = "A multiple precision interval arithmetic library based on MPFR";
     homepage = "https://gforge.inria.fr/projects/mpfi/";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/mpfr/default.nix b/nixpkgs/pkgs/development/libraries/mpfr/default.nix
index 4a744b7483ea..fc7eeeab9420 100644
--- a/nixpkgs/pkgs/development/libraries/mpfr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpfr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gmp ];
 
   configureFlags =
-    stdenv.lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++
-    stdenv.lib.optional stdenv.hostPlatform.is64bit "--with-pic";
+    lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++
+    lib.optional stdenv.hostPlatform.is64bit "--with-pic";
 
   doCheck = true; # not cross;
 
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
       floating-point arithmetic (53-bit mantissa).
     '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix
index 0c1ea8be1c83..f7cdf7f97c02 100644
--- a/nixpkgs/pkgs/development/libraries/mpich/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gfortran
+{ lib, stdenv, fetchurl, perl, gfortran
 ,  openssh, hwloc
 } :
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation  rec {
     sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
     sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
   ''
-  + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  + lib.optionalString (!stdenv.isDarwin) ''
     # /tmp/nix-build... ends up in the RPATH, fix it manually
     for entry in $out/bin/mpichversion $out/bin/mpivars; do
       echo "fix rpath: $entry"
@@ -36,7 +36,7 @@ stdenv.mkDerivation  rec {
     done
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the Message Passing Interface (MPI) standard";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/mpir/default.nix b/nixpkgs/pkgs/development/libraries/mpir/default.nix
index 8da59530ea5a..7f7df407e4e8 100644
--- a/nixpkgs/pkgs/development/libraries/mpir/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, which, yasm }:
+{ lib, stdenv, fetchurl, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
   pname = "mpir";
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A highly optimised library for bignum arithmetic forked from GMP'';
-    license = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "A highly optimised library for bignum arithmetic forked from GMP";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     downloadPage = "http://mpir.org/downloads.html";
     homepage = "http://mpir.org/";
     updateWalker = true;
diff --git a/nixpkgs/pkgs/development/libraries/mps/default.nix b/nixpkgs/pkgs/development/libraries/mps/default.nix
index 8c1f3aea4667..81b102d9bc36 100644
--- a/nixpkgs/pkgs/development/libraries/mps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, sqlite }:
+{ lib, stdenv, fetchurl, autoreconfHook, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "mps";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A flexible memory management and garbage collection library";
     homepage    = "https://www.ravenbrook.com/project/mps";
-    license     = stdenv.lib.licenses.sleepycat;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.sleepycat;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/msgpack/generic.nix b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix
index 4cb743a38f8f..a784bc026361 100644
--- a/nixpkgs/pkgs/development/libraries/msgpack/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake
+{ lib, stdenv, cmake
 , version, src, patches ? [ ]
 , ...
 }:
@@ -11,14 +11,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
+  cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF";
 
-  cmakeFlags = []
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
-                           "-DMSGPACK_BUILD_EXAMPLES=OFF"
-    ;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MessagePack implementation for C and C++";
     homepage    = "https://msgpack.org";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/msgpuck/default.nix b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix
index 26066f1194f0..53fb3bec908c 100644
--- a/nixpkgs/pkgs/development/libraries/msgpuck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "msgpuck";
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
-     description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file'';
+  meta = with lib; {
+     description = "A simple and efficient MsgPack binary serialization library in a self-contained header file";
      homepage = "https://github.com/rtsisyk/msgpuck";
      license = licenses.bsd2;
      platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/msilbc/default.nix b/nixpkgs/pkgs/development/libraries/msilbc/default.nix
index 601e70427a13..cdcc0548abbc 100644
--- a/nixpkgs/pkgs/development/libraries/msilbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/msilbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }:
+{ lib, stdenv, fetchurl, ilbc, mediastreamer, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "msilbc-2.1.2";
@@ -9,14 +9,14 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ ilbc mediastreamer ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   configureFlags = [
     "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include"
     "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mediastreamer plugin for the iLBC audio codec";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/mtdev/default.nix b/nixpkgs/pkgs/development/libraries/mtdev/default.nix
index 5c04c6a69428..7873608e5891 100644
--- a/nixpkgs/pkgs/development/libraries/mtdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mtdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mtdev-1.1.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://bitmath.org/code/mtdev/";
     description = "Multitouch Protocol Translation Library";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
index 842d144005d7..d1834de55588 100644
--- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
@@ -1,12 +1,10 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
-, pkgconfig
+, pkg-config
 , boost17x
 , openssl
-, zlib
-, libsodium
 , olm
 , spdlog
 , nlohmann_json
@@ -14,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mtxclient";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "mtxclient";
     rev = "v${version}";
-    sha256 = "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x";
+    sha256 = "1x820rcfz5r203dc8a0rzavcjjx10fsv1dicqg65m6kxx1w95j5r";
   };
 
   cmakeFlags = [
@@ -36,22 +34,20 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
   ];
   buildInputs = [
     spdlog
     boost17x
     openssl
-    zlib
-    libsodium
     olm
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client API library for Matrix, built on top of Boost.Asio";
     homepage = "https://github.com/Nheko-Reborn/mtxclient";
     license = licenses.mit;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz pstn ];
     platforms = platforms.all;
     # Should be fixable if a higher clang version is used, see:
     # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
diff --git a/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
index b2bdf5d04476..45b0abdee71b 100644
--- a/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Http multipart parser implemented in C ";
     homepage = "https://github.com/iafonov/multipart-parser-c";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/mumlib/default.nix b/nixpkgs/pkgs/development/libraries/mumlib/default.nix
index f936fc8b3df6..02f0cd671f28 100644
--- a/nixpkgs/pkgs/development/libraries/mumlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mumlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
 , boost, openssl, log4cpp, libopus, protobuf }:
 with lib; stdenv.mkDerivation {
   pname = "mumlib";
@@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation {
   };
 
   buildInputs = [ boost openssl libopus protobuf log4cpp ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   installPhase = ''
     install -Dm555 libmumlib.so $out/lib/libmumlib.so
     cp -a ../include $out
diff --git a/nixpkgs/pkgs/development/libraries/muparser/default.nix b/nixpkgs/pkgs/development/libraries/muparser/default.nix
index 8aac20e19d0f..85c9f781cc60 100644
--- a/nixpkgs/pkgs/development/libraries/muparser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/muparser/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, unzip, setfile}:
+{lib, stdenv, fetchurl, unzip, setfile}:
 
 stdenv.mkDerivation rec {
   pname = "muparser";
   version = "2.2.3";
-  url-version = stdenv.lib.replaceChars ["."] ["_"] version;
+  url-version = lib.replaceChars ["."] ["_"] version;
 
   src = fetchurl {
     url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     unzip
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile];
+  ] ++ lib.optionals stdenv.isDarwin [setfile];
 
   meta = {
     homepage = "http://muparser.sourceforge.net";
     description = "An extensible high performance math expression parser library written in C++";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/nixpkgs/pkgs/development/libraries/muparserx/default.nix
index d7de5ff00f3f..ef6b254b8a37 100644
--- a/nixpkgs/pkgs/development/libraries/muparserx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/muparserx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more";
     homepage = "https://beltoforion.de/en/muparserx/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/mutest/default.nix b/nixpkgs/pkgs/development/libraries/mutest/default.nix
index ae40ab9f8953..9470b812586a 100644
--- a/nixpkgs/pkgs/development/libraries/mutest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mutest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , meson
 , ninja
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ebassi.github.io/mutest/mutest.md.html";
     description = "A BDD testing framework for C, inspired by Mocha";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/mygui/default.nix b/nixpkgs/pkgs/development/libraries/mygui/default.nix
index 894d35eb3d8a..4260e30561b4 100644
--- a/nixpkgs/pkgs/development/libraries/mygui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mygui/default.nix
@@ -1,5 +1,5 @@
-{  stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
-   boost, pkgconfig, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
+{  lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
+   boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
 
 let
   renderSystem = if withOgre then "3" else "4";
@@ -14,16 +14,14 @@ in stdenv.mkDerivation rec {
     sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
   };
 
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libX11 unzip cmake ois freetype libuuid boost ]
-    ++ (if withOgre then [ ogre ] else [libGL libGLU]);
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ libX11 unzip ois freetype libuuid boost ]
+    ++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
 
   # Tools are disabled due to compilation failures.
   cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mygui.info/";
     description = "Library for creating GUIs for games and 3D applications";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix b/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 570588e22fb7..73acfd9287f7 100644
--- a/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 }:
 
 stdenv.mkDerivation rec {
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoconf
     automake
-    pkgconfig
+    pkg-config
   ];
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mypaint.org/";
     description = "Brushes used by MyPaint and other software using libmypaint";
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
index d2fb8ed143a0..acdee52b85ef 100644
--- a/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 }:
 
 stdenv.mkDerivation rec {
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoconf
     automake
-    pkgconfig
+    pkg-config
   ];
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mypaint.org/";
     description = "Brushes used by MyPaint and other software using libmypaint";
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/development/libraries/mysocketw/default.nix b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix
index 1e2e3982d55d..3b5da68a59d7 100644
--- a/nixpkgs/pkgs/development/libraries/mysocketw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ lib, stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation {
   name = "mysocketw-031026";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ openssl ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/Makefile \
         --replace -Wl,-soname, -Wl,-install_name,$out/lib/
   '';
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/mythes/default.nix b/nixpkgs/pkgs/development/libraries/mythes/default.nix
index 1cd8612c3bb0..b678baf98819 100644
--- a/nixpkgs/pkgs/development/libraries/mythes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mythes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }:
+{ lib, stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }:
 
 stdenv.mkDerivation rec {
   name = "mythes-1.2.4";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ hunspell ];
-  nativeBuildInputs = [ ncurses pkgconfig perl ];
+  nativeBuildInputs = [ ncurses pkg-config perl ];
 
   meta = {
     homepage = "http://hunspell.sourceforge.net/";
     description = "Thesaurus library from Hunspell project";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     inherit (hunspell.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
index 3bd6bb02a054..0dbbd461dc21 100644
--- a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake}:
+{lib, stdenv, fetchFromGitHub, cmake}:
 
 stdenv.mkDerivation rec {
   version = "1.3.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-DBUILD_EXAMPLES=OFF"
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/jlblancoc/nanoflann";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     description = "Header only C++ library for approximate nearest neighbor search";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/nanomsg/default.nix b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix
index 5772581d5ec1..49a93abd7fb0 100644
--- a/nixpkgs/pkgs/development/libraries/nanomsg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ lib, stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "1.1.5";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description= "Socket library that provides several common communication patterns";
     homepage = "https://nanomsg.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix
index 5f6c85411b18..e8053ce27023 100644
--- a/nixpkgs/pkgs/development/libraries/nco/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nco/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
+{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
 
 stdenv.mkDerivation rec {
-  version = "4.9.6";
+  version = "4.9.7";
   pname = "nco";
 
   nativeBuildInputs = [ flex which ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/nco/nco/archive/${version}.tar.gz";
-    sha256 = "0f8vf66700dcr48jqd371bbldc61xkrilby13xp8j5l9q4xal808";
+    sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4=";
   };
 
   prePatch = ''
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
     description = "NetCDF Operator toolkit";
     longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
     homepage = "http://nco.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.bzizou ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/nixpkgs/pkgs/development/libraries/ncurses/default.nix
index 17a924e6e74c..742de6cf92e7 100644
--- a/nixpkgs/pkgs/development/libraries/ncurses/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ncurses/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 
 , abiVersion ? "6"
 , mouseSupport ? false
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
   ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     buildPackages.ncurses
   ];
diff --git a/nixpkgs/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix
index c0e1816c0e12..75d2a2db0218 100644
--- a/nixpkgs/pkgs/development/libraries/ndi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, avahi }:
+{ lib, stdenv, requireFile, avahi }:
 
 stdenv.mkDerivation rec {
   pname = "ndi";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   # Stripping breaks ndi-record.
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ndi.tv/sdk/";
     description = "NDI Software Developer Kit";
     platforms = ["x86_64-linux"];
diff --git a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
index 893f82a6d526..f2510d6f6bbe 100644
--- a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , doxygen
 , pkg-config
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     "--boost-libs=${boost.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://named-data.net/";
     description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/nixpkgs/pkgs/development/libraries/ndpi/default.nix
index 43da97c2edd8..c3df23052e22 100644
--- a/nixpkgs/pkgs/development/libraries/ndpi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ndpi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap
+{ lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap
 , pkg-config }:
 
 let version = "3.4"; in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for deep-packet inspection";
     longDescription = ''
       nDPI is a library for deep-packet inspection based on OpenDPI.
diff --git a/nixpkgs/pkgs/development/libraries/neardal/default.nix b/nixpkgs/pkgs/development/libraries/neardal/default.nix
index 6f0dbf032a9a..5e02a9fd5222 100644
--- a/nixpkgs/pkgs/development/libraries/neardal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/neardal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "neardal-0.7-post-git-20150930";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ autoconf automake libtool glib readline makeWrapper ];
 
   preConfigure = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C APIs to exchange datas with the NFC daemon 'Neard'";
     license = licenses.lgpl2;
     homepage = "https://01.org/linux-nfc";
diff --git a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix
index db7940536f1b..980424b7fd48 100644
--- a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, pkg-config, ninja
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja
 , pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson pkg-config ninja ];
   buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A VNC server library";
     longDescription = ''
       This is a liberally licensed VNC server library that's intended to be
diff --git a/nixpkgs/pkgs/development/libraries/neon/0.29.nix b/nixpkgs/pkgs/development/libraries/neon/0.29.nix
index c60f5e60fb8f..e0437fb7cea1 100644
--- a/nixpkgs/pkgs/development/libraries/neon/0.29.nix
+++ b/nixpkgs/pkgs/development/libraries/neon/0.29.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkgconfig, perl
+{ lib, stdenv, fetchurl, libxml2, pkg-config, perl
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? false
@@ -10,7 +10,7 @@ assert sslSupport -> openssl != null;
 assert static || shared;
 
 let
-   inherit (stdenv.lib) optionals;
+   inherit (lib) optionals;
 in
 
 stdenv.mkDerivation rec {
@@ -24,15 +24,15 @@ stdenv.mkDerivation rec {
 
   patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [libxml2 openssl]
-    ++ stdenv.lib.optional compressionSupport zlib;
+    ++ lib.optional compressionSupport zlib;
 
   configureFlags = [
-    (stdenv.lib.enableFeature shared "shared")
-    (stdenv.lib.enableFeature static "static")
-    (stdenv.lib.withFeature compressionSupport "zlib")
-    (stdenv.lib.withFeature sslSupport "ssl")
+    (lib.enableFeature shared "shared")
+    (lib.enableFeature static "static")
+    (lib.withFeature compressionSupport "zlib")
+    (lib.withFeature sslSupport "ssl")
   ];
 
   passthru = {inherit compressionSupport sslSupport;};
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails, needs the net
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTTP and WebDAV client library";
     homepage = "http://www.webdav.org/neon/";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix
index e9ce6ee18b4f..c0c62deb0ace 100644
--- a/nixpkgs/pkgs/development/libraries/neon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/neon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkgconfig, perl
+{ lib, stdenv, fetchurl, libxml2, pkg-config, perl
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? stdenv.hostPlatform.isStatic
@@ -10,7 +10,7 @@ assert sslSupport -> openssl != null;
 assert static || shared;
 
 let
-   inherit (stdenv.lib) optionals;
+   inherit (lib) optionals;
 in
 
 stdenv.mkDerivation rec {
@@ -24,15 +24,15 @@ stdenv.mkDerivation rec {
 
   patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [libxml2 openssl]
-    ++ stdenv.lib.optional compressionSupport zlib;
+    ++ lib.optional compressionSupport zlib;
 
   configureFlags = [
-    (stdenv.lib.enableFeature shared "shared")
-    (stdenv.lib.enableFeature static "static")
-    (stdenv.lib.withFeature compressionSupport "zlib")
-    (stdenv.lib.withFeature sslSupport "ssl")
+    (lib.enableFeature shared "shared")
+    (lib.enableFeature static "static")
+    (lib.withFeature compressionSupport "zlib")
+    (lib.withFeature sslSupport "ssl")
   ];
 
   passthru = {inherit compressionSupport sslSupport;};
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails, needs the net
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTTP and WebDAV client library";
     homepage = "http://www.webdav.org/neon/";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix
index 526e02e89079..b594a672140f 100644
--- a/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, netcdf, hdf5, curl }:
+{ lib, stdenv, fetchurl, netcdf, hdf5, curl }:
 stdenv.mkDerivation rec {
   pname = "netcdf-cxx4";
   version = "4.3.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ API to manipulate netcdf files";
     homepage = "https://www.unidata.ucar.edu/software/netcdf/";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
index ab10c6861635..0cdeda238792 100644
--- a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
+{ lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
 stdenv.mkDerivation rec {
   pname = "netcdf-fortran";
   version = "4.4.5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ netcdf hdf5 curl gfortran ];
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fortran API to manipulate netcdf files";
     homepage = "https://www.unidata.ucar.edu/software/netcdf/";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/libraries/netcdf/default.nix b/nixpkgs/pkgs/development/libraries/netcdf/default.nix
index fecc4100f5e6..c345f66e872a 100644
--- a/nixpkgs/pkgs/development/libraries/netcdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/netcdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , hdf5
 , m4
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
       "--enable-shared"
       "--disable-dap-remote-tests"
   ]
-  ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
+  ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
 
   disallowedReferences = [ stdenv.cc ];
 
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
       description = "Libraries for the Unidata network Common Data Format";
-      platforms = stdenv.lib.platforms.unix;
+      platforms = lib.platforms.unix;
       homepage = "https://www.unidata.ucar.edu/software/netcdf/";
       license = {
         url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html";
diff --git a/nixpkgs/pkgs/development/libraries/nettle/generic.nix b/nixpkgs/pkgs/development/libraries/nettle/generic.nix
index 4c3c6d04ca88..735fe373533d 100644
--- a/nixpkgs/pkgs/development/libraries/nettle/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/nettle/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, gmp, gnum4
+{ lib, stdenv, buildPackages, gmp, gnum4
 
 # Version specific args
 , version, src
@@ -22,10 +22,10 @@ stdenv.mkDerivation ({
 
   enableParallelBuilding = true;
 
-  patches = stdenv.lib.optional (stdenv.hostPlatform.system == "i686-cygwin")
+  patches = lib.optional (stdenv.hostPlatform.system == "i686-cygwin")
               ./cygwin.patch;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cryptographic library";
 
     longDescription = ''
@@ -61,7 +61,7 @@ stdenv.mkDerivation ({
 
 //
 
-stdenv.lib.optionalAttrs stdenv.isSunOS {
+lib.optionalAttrs stdenv.isSunOS {
   # Make sure the right <gmp.h> is found, and not the incompatible
   # /usr/include/mp.h from OpenSolaris.  See
   # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
diff --git a/nixpkgs/pkgs/development/libraries/networking-ts-cxx/default.nix b/nixpkgs/pkgs/development/libraries/networking-ts-cxx/default.nix
new file mode 100644
index 000000000000..7dc6d4b11fee
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/networking-ts-cxx/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "networking-ts-cxx";
+  version = "2019-02-27";
+
+  # Used until https://github.com/chriskohlhoff/networking-ts-impl/issues/17 is
+  # resolved and we can generate in Nix.
+  src = fetchFromGitHub {
+    owner = "chriskohlhoff";
+    repo = "networking-ts-impl";
+    rev = "c97570e7ceef436581be3c138868a19ad96e025b";
+    sha256 = "12b5lg989nn1b8v6x9fy3cxsf3hs5hr67bd1mfyh8pjikir7zv6j";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{include,lib/pkgconfig}
+    cp -r include $out/
+    substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc
+  '';
+
+  meta = with lib; {
+    description = "Experimental implementation of the C++ Networking Technical Specification";
+    homepage = "https://github.com/chriskohlhoff/networking-ts-impl";
+    license = licenses.boost;
+    maintainers = with maintainers; [ bhipple ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/nixpkgs/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in
new file mode 100644
index 000000000000..d52f68f4c155
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in
@@ -0,0 +1,8 @@
+prefix=@out@
+includedir=${prefix}/include
+
+Name: networking_ts
+Description: Experimental implementation of the C++ Networking Technical Specification
+URL: https://github.com/chriskohlhoff/networking-ts-impl
+Version: ${networking_ts_version}
+Cflags: -isystem${includedir}
diff --git a/nixpkgs/pkgs/development/libraries/newt/default.nix b/nixpkgs/pkgs/development/libraries/newt/default.nix
index 41d9671b204e..dc6b604bd8e2 100644
--- a/nixpkgs/pkgs/development/libraries/newt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/newt/default.nix
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
     unset CPP
   '';
 
-  makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+  makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fedorahosted.org/newt/";
     description = "Library for color text mode, widget based user interfaces";
 
diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
index c9ccf63f8895..6464679b9489 100644
--- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 
 # Optional Dependencies
 , openssl ? null, zlib ? null
@@ -8,7 +8,7 @@
 , enableAsioLib ? false, boost ? null
 , enableGetAssets ? false, libxml2 ? null
 , enableJemalloc ? false, jemalloc ? null
-, enableApp ? !stdenv.hostPlatform.isWindows
+, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
 , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null
 }:
 
@@ -23,7 +23,7 @@ assert enableGetAssets -> libxml2 != null;
 assert enableJemalloc -> jemalloc != null;
 assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null;
 
-let inherit (stdenv.lib) optional optionals optionalString; in
+let inherit (lib) optional optionals optionalString; in
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" "lib" ]
     ++ optional enablePython "python";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]
     ++ optional enableLibEv libev
     ++ [ zlib ]
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-spdylay=no"
     "--disable-examples"
-    (stdenv.lib.enableFeature enableApp "app")
+    (lib.enableFeature enableApp "app")
   ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"
     ++ (if enablePython then [
     "--with-cython=${cython}/bin/cython"
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   #doCheck = true;  # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://nghttp2.org/";
     description = "A C implementation of HTTP/2";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/ngt/default.nix b/nixpkgs/pkgs/development/libraries/ngt/default.nix
index 977bdf9afe37..385f2d84f8a6 100644
--- a/nixpkgs/pkgs/development/libraries/ngt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ngt/default.nix
@@ -1,8 +1,13 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, enableAVX ? false }:
+{ lib, stdenv
+, fetchFromGitHub
+, cmake
+, llvmPackages
+, enableAVX ? stdenv.hostPlatform.avxSupport
+}:
+
 stdenv.mkDerivation rec {
   pname = "NGT";
   version = "v1.12.3-alpha";
-  nativeBuildInputs = [ cmake ];
 
   src = fetchFromGitHub {
     owner = "yahoojapan";
@@ -11,13 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY=";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ llvmPackages.openmp ];
-  NIX_ENFORCE_NO_NATIVE=! enableAVX;
-  __AVX2__ = if enableAVX then 1 else 0;
 
-  enableParallelBuilding = true;
+  NIX_ENFORCE_NO_NATIVE = ! enableAVX;
+  __AVX2__ = if enableAVX then 1 else 0;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/yahoojapan/NGT";
     description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix
index f7a608d5c0a9..915e733473e1 100644
--- a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
+{ lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }:
 let version = "6.0.0"; in
 stdenv.mkDerivation {
   pname = "nix-plugins";
@@ -11,14 +11,14 @@ stdenv.mkDerivation {
     sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ nix boost ];
 
   meta = {
     description = "Collection of miscellaneous plugins for the nix expression language";
     homepage = "https://github.com/shlevy/nix-plugins";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
index 84b86b47157d..742135345328 100644
--- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 }:
 
 stdenv.mkDerivation rec {
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
   cmakeFlags = [
     "-DBuildTests=${if doCheck then "ON" else "OFF"}"
     "-DJSON_MultipleHeaders=ON"
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/lib64";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Header only C++ library for the JSON file format";
     homepage = "https://github.com/nlohmann/json";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/nixpkgs/pkgs/development/libraries/nlopt/default.nix
index 64eb6d79abd1..36fcf9081182 100644
--- a/nixpkgs/pkgs/development/libraries/nlopt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nlopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, octave ? null }:
+{ lib, stdenv, fetchFromGitHub, cmake, octave ? null }:
 
 stdenv.mkDerivation rec {
   pname = "nlopt";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "--without-guile"
     "--without-python"
     "--without-matlab"
-  ] ++ stdenv.lib.optionals (octave != null) [
+  ] ++ lib.optionals (octave != null) [
     "--with-octave"
     "M_INSTALL_DIR=$(out)/${octave.sitePath}/m"
     "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct"
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://nlopt.readthedocs.io/en/latest/";
     description = "Free open-source library for nonlinear optimization";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    hydraPlatforms = lib.platforms.linux;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/nixpkgs/pkgs/development/libraries/notcurses/default.nix
index 189e36c1b448..7b9bffb9bc95 100644
--- a/nixpkgs/pkgs/development/libraries/notcurses/default.nix
+++ b/nixpkgs/pkgs/development/libraries/notcurses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, pkgconfig, pandoc, libunistring, ncurses, ffmpeg,
+{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg,
   fetchFromGitHub, lib,
   multimediaSupport ? true
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cmake pkgconfig pandoc ];
+  nativeBuildInputs = [ cmake pkg-config pandoc ];
 
   buildInputs = [ libunistring ncurses ]
     ++ lib.optional multimediaSupport ffmpeg;
diff --git a/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix b/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix
index 58d35767d1e0..1cd69074911b 100644
--- a/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook
+{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook
 , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig autoreconfHook
+    pkg-config autoreconfHook
   ];
 
   buildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix b/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix
index c3ef724501e2..6611f99bdfc2 100644
--- a/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "npapi-sdk";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A bundle of NPAPI headers by Mozilla";
 
     homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk
diff --git a/nixpkgs/pkgs/development/libraries/npth/default.nix b/nixpkgs/pkgs/development/libraries/npth/default.nix
index 51512a160570..a5ac9ce99127 100644
--- a/nixpkgs/pkgs/development/libraries/npth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/npth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "npth-1.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The New GNU Portable Threads Library";
     longDescription = ''
       This is a library to provide the GNU Pth API and thus a non-preemptive
diff --git a/nixpkgs/pkgs/development/libraries/nspr/default.nix b/nixpkgs/pkgs/development/libraries/nspr/default.nix
index e8893bc2040d..17b8b9226d50 100644
--- a/nixpkgs/pkgs/development/libraries/nspr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nspr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , CoreServices ? null
 , buildPackages }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     cd nspr
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '@executable_path/' "$out/lib/"
     substituteInPlace configure.in --replace '@executable_path/' "$out/lib/"
   '';
@@ -32,18 +32,18 @@ stdenv.mkDerivation {
   configureFlags = [
     "--enable-optimize"
     "--disable-debug"
-  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
+  ] ++ lib.optional stdenv.is64bit "--enable-64bit";
 
   postInstall = ''
     find $out -name "*.a" -delete
     moveToOutput share "$dev" # just aclocal
   '';
 
-  buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+  buildInputs = [] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.mozilla.org/projects/nspr/";
     description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/nss/3.44.nix b/nixpkgs/pkgs/development/libraries/nss/3.44.nix
index 1c89dd793316..b08b8b3ed2a7 100644
--- a/nixpkgs/pkgs/development/libraries/nss/3.44.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/3.44.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
+{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
 
 let
   nssPEM = fetchurl {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ zlib sqlite ];
 
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
   '';
 
@@ -61,16 +61,16 @@ in stdenv.mkDerivation rec {
     "USE_SYSTEM_ZLIB=1"
     "NSS_USE_SYSTEM_SQLITE=1"
     "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with
     # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64
     "OS_TEST=${cpu}"
     "CPU_ARCH=${cpu}"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=1"
     "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling
-  ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"
-    ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++";
+  ] ++ lib.optional stdenv.is64bit "USE_64=1"
+    ++ lib.optional stdenv.isDarwin "CCC=clang++";
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
@@ -135,7 +135,7 @@ in stdenv.mkDerivation rec {
     rm -f "$out"/lib/*.a
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.mozilla.org/en-US/docs/NSS";
     description = "A set of libraries for development of security-enabled client and server applications";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/libraries/nss/3.53.nix b/nixpkgs/pkgs/development/libraries/nss/3.53.nix
index dcd9ade629b7..9f281743f6cf 100644
--- a/nixpkgs/pkgs/development/libraries/nss/3.53.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/3.53.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
+{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
 , # allow FIPS mode. Note that this makes the output non-reproducible.
   # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
   enableFIPS ? false
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
 
   buildInputs = [ zlib sqlite ];
 
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
      substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
      substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
    '';
@@ -90,9 +90,9 @@ in stdenv.mkDerivation rec {
       -Dhost_arch=${host} \
       -Duse_system_zlib=1 \
       --enable-libpkix \
-      ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \
-      ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
-      ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
+      ${lib.optionalString enableFIPS "--enable-fips"} \
+      ${lib.optionalString stdenv.isDarwin "--clang"} \
+      ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
 
     runHook postBuild
   '';
@@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
     isCross = stdenv.hostPlatform != stdenv.buildPlatform;
     nss = if isCross then buildPackages.nss.tools else "$out";
   in
-  (stdenv.lib.optionalString enableFIPS (''
+  (lib.optionalString enableFIPS (''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -160,7 +160,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.mozilla.org/en-US/docs/NSS";
     description = "A set of libraries for development of security-enabled client and server applications";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix
index 17dc93c9f1ea..8c98d7ae9bbd 100644
--- a/nixpkgs/pkgs/development/libraries/nss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
+{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
 , # allow FIPS mode. Note that this makes the output non-reproducible.
   # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
   enableFIPS ? false
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
 
   buildInputs = [ zlib sqlite ];
 
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
      substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
      substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
    '';
@@ -96,9 +96,9 @@ in stdenv.mkDerivation rec {
       -Dhost_arch=${host} \
       -Duse_system_zlib=1 \
       --enable-libpkix \
-      ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \
-      ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
-      ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
+      ${lib.optionalString enableFIPS "--enable-fips"} \
+      ${lib.optionalString stdenv.isDarwin "--clang"} \
+      ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
 
     runHook postBuild
   '';
@@ -143,7 +143,7 @@ in stdenv.mkDerivation rec {
     isCross = stdenv.hostPlatform != stdenv.buildPlatform;
     nss = if isCross then buildPackages.nss.tools else "$out";
   in
-  (stdenv.lib.optionalString enableFIPS (''
+  (lib.optionalString enableFIPS (''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -166,7 +166,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.mozilla.org/en-US/docs/NSS";
     description = "A set of libraries for development of security-enabled client and server applications";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
index c03b09447789..3cdeb93dc9b1 100644
--- a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "nss_wrapper-1.1.11";
@@ -8,10 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/nsss/default.nix b/nixpkgs/pkgs/development/libraries/nsss/default.nix
index 3e3530215bf8..4e71c4d65e6e 100644
--- a/nixpkgs/pkgs/development/libraries/nsss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nsss/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "nsss";
-  version = "0.0.2.2";
-  sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k";
+  version = "0.1.0.0";
+  sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq";
 
   description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
 
diff --git a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix
index 5ea43097b8ca..98ea6fa943f8 100644
--- a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
+{ lib, stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "ntbtls";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" ];
 
   buildInputs = [ libgcrypt libgpgerror libksba zlib ]
-    ++ stdenv.lib.optional stdenv.isDarwin gettext;
+    ++ lib.optional stdenv.isDarwin gettext;
 
   postInstall = ''
     moveToOutput "bin/ntbtls-config" $dev
diff --git a/nixpkgs/pkgs/development/libraries/ntdb/default.nix b/nixpkgs/pkgs/development/libraries/ntdb/default.nix
index d0a9a2e5b49a..021436516c22 100644
--- a/nixpkgs/pkgs/development/libraries/ntdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python2
 , python3
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace,ccan"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The not-so trivial database";
     homepage = "https://tdb.samba.org/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/ntirpc/default.nix b/nixpkgs/pkgs/development/libraries/ntirpc/default.nix
index 48ef98dab499..e98cfac78581 100644
--- a/nixpkgs/pkgs/development/libraries/ntirpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntirpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , krb5, liburcu , libtirpc, libnsl
 } :
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cp ${libtirpc}/etc/netconfig $out/etc/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Transport-independent RPC (TI-RPC)";
     homepage = "https://github.com/nfs-ganesha/ntirpc";
     maintainers = [ maintainers.markuskowa ];
diff --git a/nixpkgs/pkgs/development/libraries/ntrack/default.nix b/nixpkgs/pkgs/development/libraries/ntrack/default.nix
index 17a294adc4b7..cb9f9ff575f8 100644
--- a/nixpkgs/pkgs/development/libraries/ntrack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }:
+{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }:
 
 let
   version = "016";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libnl qt4 ];
 
-  nativeBuildInputs = [ pkgconfig python ];
+  nativeBuildInputs = [ pkg-config python ];
 
   # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]
   NIX_CFLAGS_COMPILE = "-Wno-error";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Network Connectivity Tracking library for Desktop Applications";
     homepage = "https://launchpad.net/ntrack";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/nixpkgs/pkgs/development/libraries/nuraft/default.nix
index 1554e1678156..58e5e4013590 100644
--- a/nixpkgs/pkgs/development/libraries/nuraft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nuraft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "nuraft";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost172 asio openssl zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/eBay/NuRaft";
     description = "C++ implementation of Raft core logic as a replication library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix
index b0a9227b8c93..c16305018d71 100644
--- a/nixpkgs/pkgs/development/libraries/nuspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, icu, catch2, pandoc }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }:
 
 stdenv.mkDerivation rec {
   pname = "nuspell";
@@ -11,13 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ=";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig pandoc ];
+  nativeBuildInputs = [ cmake pkg-config pandoc ];
   buildInputs = [ icu ];
 
   outputs = [ "out" "lib" "dev" "man" ];
 
-  enableParallelBuilding = true;
-
   postPatch = ''
     rm -rf external/Catch2
     ln -sf ${catch2.src} external/Catch2
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/doc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free and open source C++ spell checking library";
     homepage = "https://nuspell.github.io/";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix
index 8d3c2179bff9..9b8323e6c978 100644
--- a/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   pname = "nv-codec-headers";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "FFmpeg version of headers for NVENC";
     homepage = "https://ffmpeg.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.MP2E ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.MP2E ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
index 667f3d94e05a..f9c2547d4246 100644
--- a/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "nvidia-optical-flow-sdk";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -R * $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Nvidia optical flow headers for computing the relative motion of pixels between images";
     homepage = "https://developer.nvidia.com/opticalflow-sdk";
     license = licenses.bsd3; # applies to the header files only
diff --git a/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix
index a2bdbc798eb0..676245967202 100644
--- a/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "nvidia-texture-tools";
@@ -37,9 +37,7 @@ stdenv.mkDerivation rec {
     moveToOutput lib "$lib"
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of cuda-enabled texture tools and compressors";
     homepage = "https://github.com/castano/nvidia-texture-tools";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
index d08f71855882..3a63bad03dcb 100644
--- a/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "nvidia-video-sdk-6.0.1";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -R Samples/common/inc/* $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The NVIDIA Video Codec SDK";
     homepage = "https://developer.nvidia.com/nvidia-video-codec-sdk";
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/libraries/oatpp/default.nix b/nixpkgs/pkgs/development/libraries/oatpp/default.nix
index 38c021707615..084f3c4a935b 100644
--- a/nixpkgs/pkgs/development/libraries/oatpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/oatpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://oatpp.io/";
     description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
index 30a8790b99a4..b84aa6a146d7 100644
--- a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }:
+{lib, stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
   pname = "ocl-icd";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL ICD Loader for ${opencl-headers.name}";
     homepage    = "https://forge.imag.fr/projects/ocl-icd/";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/ode/default.nix b/nixpkgs/pkgs/development/libraries/ode/default.nix
index d6047d1b1921..d9c82f79bb35 100644
--- a/nixpkgs/pkgs/development/libraries/ode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "ode";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Dynamics Engine";
     homepage = "https://sourceforge.net/projects/opende";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/odpic/default.nix b/nixpkgs/pkgs/development/libraries/odpic/default.nix
index 22d48c8c6092..b79de9278d46 100644
--- a/nixpkgs/pkgs/development/libraries/odpic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/odpic/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 let
   version = "4.1.0";
-  libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ];
+  libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
 
 in stdenv.mkDerivation {
   inherit version;
@@ -16,24 +16,24 @@ in stdenv.mkDerivation {
     sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x";
   };
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ oracle-instantclient ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libaio ];
+    ++ lib.optionals stdenv.isLinux [ libaio ];
 
   dontPatchELF = true;
   makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"];
 
   postFixup = ''
-    ${stdenv.lib.optionalString (stdenv.isLinux) ''
+    ${lib.optionalString (stdenv.isLinux) ''
       patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
     ''}
-    ${stdenv.lib.optionalString (stdenv.isDarwin) ''
+    ${lib.optionalString (stdenv.isDarwin) ''
       install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
     ''}
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Oracle ODPI-C library";
     homepage = "https://oracle.github.io/odpi/";
     maintainers = with maintainers; [ mkazulak flokli ];
diff --git a/nixpkgs/pkgs/development/libraries/ogdf/default.nix b/nixpkgs/pkgs/development/libraries/ogdf/default.nix
index bbef1d8b93d6..bee64afd2900 100644
--- a/nixpkgs/pkgs/development/libraries/ogdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ogdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen }:
+{ lib, stdenv, fetchFromGitHub, cmake, doxygen }:
 
 stdenv.mkDerivation rec {
   pname = "ogdf";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   #> 766 |      sprintf(messageOut_,format_+2);
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework";
     homepage = "http://www.ogdf.net";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix
index fe23181cfc67..849db216b921 100644
--- a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix
+++ b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix
@@ -2,7 +2,7 @@
 , cmake, libGLU, libGL
 , freetype, freeimage, zziplib, xorgproto, libXrandr
 , libXaw, freeglut, libXt, libpng, boost, ois
-, libX11, libXmu, libSM, pkgconfig
+, libX11, libXmu, libSM, pkg-config
 , libXxf86vm, libICE
 , libXrender
 , withNvidiaCg ? false, nvidia_cg_toolkit
@@ -21,13 +21,12 @@ stdenv.mkDerivation {
            ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
     ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
 
-  enableParallelBuilding = true;
-
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs =
-   [ cmake libGLU libGL
+   [ libGLU libGL
      freetype freeimage zziplib xorgproto libXrandr
      libXaw freeglut libXt libpng boost ois
-     libX11 libXmu libSM pkgconfig
+     libX11 libXmu libSM
      libXxf86vm libICE
      libXrender
    ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
@@ -35,8 +34,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A 3D engine";
     homepage = "https://www.ogre3d.org/";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix
index 29c83a2962ee..30d1dd185547 100644
--- a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix
@@ -2,7 +2,7 @@
 , cmake, libGLU, libGL
 , freetype, freeimage, zziplib, xorgproto, libXrandr
 , libXaw, freeglut, libXt, libpng, boost, ois
-, libX11, libXmu, libSM, pkgconfig
+, libX11, libXmu, libSM, pkg-config
 , libXxf86vm, libICE
 , libXrender
 , withNvidiaCg ? false, nvidia_cg_toolkit
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
            ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
     ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
 
-  enableParallelBuilding = true;
 
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs =
-   [ cmake libGLU libGL
+   [ libGLU libGL
      freetype freeimage zziplib xorgproto libXrandr
      libXaw freeglut libXt libpng boost ois
-     libX11 libXmu libSM pkgconfig
+     libX11 libXmu libSM
      libXxf86vm libICE
      libXrender
    ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A 3D engine";
     homepage = "https://www.ogre3d.org/";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix
index 491ff4edddc6..ae65da3f418b 100644
--- a/nixpkgs/pkgs/development/libraries/ogre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix
@@ -2,7 +2,7 @@
 , cmake, libGLU, libGL
 , freetype, freeimage, zziplib, xorgproto, libXrandr
 , libXaw, freeglut, libXt, libpng, boost, ois
-, libX11, libXmu, libSM, pkgconfig
+, libX11, libXmu, libSM, pkg-config
 , libXxf86vm, libICE
 , unzip
 , libXrender
@@ -23,24 +23,22 @@ stdenv.mkDerivation rec {
            ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
     ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
 
-  enableParallelBuilding = true;
 
+  nativeBuildInputs = [ cmake unzip pkg-config ];
   buildInputs =
    [ cmake libGLU libGL
      freetype freeimage zziplib xorgproto libXrandr
      libXaw freeglut libXt libpng boost ois
-     libX11 libXmu libSM pkgconfig
+     libX11 libXmu libSM
      libXxf86vm libICE
      libXrender
    ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
 
-  nativeBuildInputs = [ unzip ];
-
   meta = {
     description = "A 3D engine";
     homepage = "https://www.ogre3d.org/";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix b/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix
index e4dc186f389c..0aefedb52575 100644
--- a/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }:
+{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
 
 stdenv.mkDerivation rec {
   pname = "ogre-paged";
@@ -27,16 +27,14 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ ois ogre libX11 boost ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Paged Geometry for Ogre3D";
     homepage = "https://github.com/RigsOfRods/ogre-paged";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ois/default.nix b/nixpkgs/pkgs/development/libraries/ois/default.nix
index ee85e64966f6..2edbc35aa899 100644
--- a/nixpkgs/pkgs/development/libraries/ois/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ois/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Object-oriented C++ input system";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix
index 9efe524b12d0..4fbc34bcce63 100644
--- a/nixpkgs/pkgs/development/libraries/olm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/olm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "olm";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Implements double cryptographic ratchet and Megolm ratchet";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://gitlab.matrix.org/matrix-org/olm";
-    platforms = with stdenv.lib.platforms; darwin ++ linux;
+    platforms = with lib.platforms; darwin ++ linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix
index 44420c85cf55..016207c13060 100644
--- a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "onig";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kkos/oniguruma";
     description = "Regular expressions library";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/opae/default.nix b/nixpkgs/pkgs/development/libraries/opae/default.nix
index 683f2c43bdc8..cba7e7b285d9 100644
--- a/nixpkgs/pkgs/development/libraries/opae/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opae/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , libuuid, json_c
 , doxygen, perl, python2, python2Packages
 }:
@@ -37,9 +37,8 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [ "-DBUILD_ASE=1" ];
-  enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Programmable Acceleration Engine SDK";
     homepage    = "https://01.org/opae";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix
index efc5a18f2b0f..43c781cf52ce 100644
--- a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , alsaSupport ? !stdenv.isDarwin, alsaLib ? null
 , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
 , CoreServices, AudioUnit, AudioToolbox
 }:
 
-with stdenv.lib;
+with lib;
 
 assert alsaSupport -> alsaLib != null;
 assert pulseSupport -> libpulseaudio != null;
diff --git a/nixpkgs/pkgs/development/libraries/openbabel/2.nix b/nixpkgs/pkgs/development/libraries/openbabel/2.nix
new file mode 100644
index 000000000000..11265c643f94
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/openbabel/2.nix
@@ -0,0 +1,31 @@
+{stdenv, lib, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
+
+stdenv.mkDerivation rec {
+  pname = "openbabel";
+  version = "2.4.1";
+
+  src = fetchurl {
+    url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
+  };
+
+  patches = [
+    # ARM / AArch64 fixes.
+    (fetchpatch {
+      url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch";
+      sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g";
+    })
+  ];
+
+  buildInputs = [ zlib libxml2 eigen python cairo pcre ];
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  meta = with lib; {
+    description = "A toolbox designed to speak the many languages of chemical data";
+    homepage = "http://openbabel.org";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ danielbarter ];
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/openbabel/default.nix b/nixpkgs/pkgs/development/libraries/openbabel/default.nix
index d074db7d165c..63784d94d8f0 100644
--- a/nixpkgs/pkgs/development/libraries/openbabel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openbabel/default.nix
@@ -1,34 +1,45 @@
-{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
+{stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
 
 stdenv.mkDerivation rec {
   pname = "openbabel";
-  version = "2.4.1";
+  version = "3.1.1";
 
   src = fetchurl {
-    url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
-    sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
+    url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02";
   };
 
-  patches = [
-    # ARM / AArch64 fixes.
-    (fetchpatch {
-      url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch";
-      sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g";
-    })
+
+  buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ];
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  pythonMajorMinor = "${python.sourceVersion.major}.${python.sourceVersion.minor}";
+
+  cmakeFlags = [
+    "-DRUN_SWIG=ON"
+    "-DPYTHON_BINDINGS=ON"
   ];
 
-  # TODO : perl & python bindings;
-  # TODO : wxGTK: I have no time to compile
-  # TODO : separate lib and apps
-  buildInputs = [ zlib libxml2 eigen python cairo pcre ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  postFixup = ''
+    cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py
+    from distutils.core import setup
+
+    setup(
+        name = 'pyopenbabel',
+        version = '${version}',
+        packages = ['openbabel'],
+        package_data = {'openbabel' : ['_openbabel.so']}
+    )
+    EOF
+    '';
 
-  meta = {
+  meta = with lib; {
     description = "A toolbox designed to speak the many languages of chemical data";
     homepage = "http://openbabel.org";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.all;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ danielbarter ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/openbr/default.nix b/nixpkgs/pkgs/development/libraries/openbr/default.nix
index 1516e675d739..8e56e250ac40 100644
--- a/nixpkgs/pkgs/development/libraries/openbr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openbr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
+{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
 
 stdenv.mkDerivation {
 
@@ -16,14 +16,12 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Open Source Biometric Recognition";
     homepage = "http://openbiometrics.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [flosse];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [flosse];
+    platforms = with lib.platforms; linux;
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
index ac2b8ba6d1ed..59c1f0ef7dbc 100644
--- a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk,
+{ lib, stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk,
   libGL, libGLU, libXext, libXmu, libXi, darwin }:
 
 stdenv.mkDerivation rec {
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
     homepage = "https://www.opencascade.org/";
     license = licenses.lgpl21;  # essentially...
diff --git a/nixpkgs/pkgs/development/libraries/opencascade/default.nix b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
index c0b2366ab7fc..5c262a3680c5 100644
--- a/nixpkgs/pkgs/development/libraries/opencascade/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
-  pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb,
+{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
+  pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb,
   OpenCL, Cocoa
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "opencascade-oce";
   version = "0.18.3";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig";
   };
 
-  nativeBuildInputs = [ cmake ninja pkgconfig ];
+  nativeBuildInputs = [ cmake ninja pkg-config ];
   buildInputs = [
     libGL libGLU libXmu freetype fontconfig expat freeimage vtk
     gl2ps tbb
diff --git a/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
index 8b7df317b2ba..8bbde9796d9a 100644
--- a/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -15,10 +16,10 @@ let
     inherit spirv-llvm-translator;
   };
 
-  inherit (stdenv.lib) getVersion;
+  inherit (lib) getVersion;
 
   addPatches = component: pkg:
-    with builtins; with stdenv.lib;
+    with builtins; with lib;
     let path = "${passthru.patchesOut}/${component}";
     in pkg.overrideAttrs (super: {
       postPatch = (if super ? postPatch then super.postPatch + "\n" else "") + ''
@@ -39,7 +40,7 @@ let
 
     patchesOut = stdenv.mkDerivation rec {
       pname = "opencl-clang-patches";
-      inherit (lib) version src patches;
+      inherit (library) version src patches;
       installPhase = ''
         [ -d patches ] && cp -r patches/ $out || mkdir $out
         mkdir -p $out/clang $out/spirv
@@ -50,7 +51,7 @@ let
 
   };
 
-  lib = let
+  library = let
     inherit (llvmPkgs) llvm;
     inherit (if buildWithPatches then passthru else llvmPkgs) clang-unwrapped spirv-llvm-translator;
   in
@@ -85,7 +86,7 @@ let
         "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}"
       ];
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage    = "https://github.com/intel/opencl-clang/";
         description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules";
         license     = licenses.ncsa;
@@ -94,4 +95,4 @@ let
       };
     };
 in
-  lib
+  library
diff --git a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
index 1486ea93175b..ec40bc393d51 100644
--- a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
+{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
 
 stdenv.mkDerivation rec {
   pname = "opencl-clhpp";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTS=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL Host API C++ bindings";
     homepage = "http://github.khronos.org/OpenCL-CLHPP/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix
index aaf6390d00a5..1ef27bf58316 100644
--- a/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp CL/* $out/include/CL
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Khronos OpenCL headers version ${version}";
     homepage = "https://www.khronos.org/registry/cl/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/opencollada/default.nix b/nixpkgs/pkgs/development/libraries/opencollada/default.nix
index 388c473125b8..d05822174339 100644
--- a/nixpkgs/pkgs/development/libraries/opencollada/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencollada/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2, pcre
 , darwin}:
 
 stdenv.mkDerivation rec {
@@ -13,14 +13,11 @@ stdenv.mkDerivation rec {
     sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake ]
-    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]);
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]);
 
   propagatedBuildInputs = [ libxml2 pcre ];
 
-  enableParallelBuilding = true;
-
   patchPhase = ''
     patch -p1 < ${./pcre.patch}
   '' + lib.optionalString stdenv.isDarwin ''
@@ -31,8 +28,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A library for handling the COLLADA file format";
     homepage = "https://github.com/KhronosGroup/OpenCOLLADA/";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix
index a60051dbd5f5..8908f4866156 100644
--- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, boost, pkgconfig, lcms2, tinyxml, git }:
+{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }:
 
 with lib;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" ];
 
   # TODO: Investigate whether git can be dropped: It's only used to apply patches
-  nativeBuildInputs = [ cmake pkgconfig git ];
+  nativeBuildInputs = [ cmake pkg-config git ];
 
   buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost;
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     mkdir -p $bin/bin; mv $out/bin $bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://opencolorio.org";
     description = "A color management framework for visual effects and animation";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix b/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix
index 4848ef864bf2..d1348d96e3b1 100644
--- a/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
     version = "0.1.5";
-in 
+in
 stdenv.mkDerivation {
   pname = "opencore-amr";
   inherit version;
@@ -10,12 +10,12 @@ stdenv.mkDerivation {
     url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
     sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
   };
-  
+
   meta = {
     homepage = "https://opencore-amr.sourceforge.io/";
-    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. 
+    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.
     Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.kiloreux ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.kiloreux ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/opencsg/default.nix b/nixpkgs/pkgs/development/libraries/opencsg/default.nix
index 00d489508add..53adbdf414f7 100644
--- a/nixpkgs/pkgs/development/libraries/opencsg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencsg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
+{lib, stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
 , qmake, GLUT, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ qmake ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ glew ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
-    ++ stdenv.lib.optional stdenv.isDarwin GLUT;
+    ++ lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
+    ++ lib.optional stdenv.isDarwin GLUT;
 
   doCheck = false;
 
@@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     install -D license.txt "$out/share/doc/opencsg/license.txt"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/Applications
     mv $out/bin/*.app $out/Applications
     rmdir $out/bin || true
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample
     install_name_tool -change \
       $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       $app
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Constructive Solid Geometry library";
     homepage = "http://www.opencsg.org/";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/openct/default.nix b/nixpkgs/pkgs/development/libraries/openct/default.nix
index 27a832daf475..92dec5ee2334 100644
--- a/nixpkgs/pkgs/development/libraries/openct/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1
 , doxygen, libxslt
 }:
 
@@ -25,14 +25,14 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ];
 
   preInstall = ''
     mkdir -p $out/etc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/OpenSC/openct/";
     license = licenses.lgpl21;
     description = "Drivers for several smart card readers";
diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
index 2ad2d016c9fd..11872cd47cc3 100644
--- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
@@ -1,6 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub, fetchpatch
-, cmake, pkgconfig, unzip, zlib, pcre, hdf5
+, cmake, pkg-config, unzip, zlib, pcre, hdf5
 , glog, boost, gflags, protobuf
 , config
 
@@ -206,7 +206,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
 
-  nativeBuildInputs = [ cmake pkgconfig unzip ];
+  nativeBuildInputs = [ cmake pkg-config unzip ];
 
   NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
 
@@ -245,8 +245,6 @@ stdenv.mkDerivation {
     "-DEIGEN_INCLUDE_PATH=${eigen}/include/eigen3"
   ];
 
-  enableParallelBuilding = true;
-
   postBuild = lib.optionalString enableDocs ''
     make doxygen
   '';
@@ -271,7 +269,7 @@ stdenv.mkDerivation {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = "https://opencv.org/";
     license = with licenses; if enableUnfree then unfree else bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
index c6547f118d06..c9ac76b65544 100644
--- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
@@ -1,6 +1,6 @@
 { lib, stdenv
 , fetchurl, fetchFromGitHub, fetchpatch
-, cmake, pkgconfig, unzip, zlib, pcre, hdf5
+, cmake, pkg-config, unzip, zlib, pcre, hdf5
 , glog, boost, gflags, protobuf
 , config
 
@@ -216,7 +216,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
 
-  nativeBuildInputs = [ cmake pkgconfig unzip ];
+  nativeBuildInputs = [ cmake pkg-config unzip ];
 
   NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
 
@@ -253,8 +253,6 @@ stdenv.mkDerivation {
     "-DOPENCV_SKIP_PYTHON_LOADER=ON"
   ];
 
-  enableParallelBuilding = true;
-
   postBuild = lib.optionalString enableDocs ''
     make doxygen
   '';
@@ -280,7 +278,7 @@ stdenv.mkDerivation {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = "https://opencv.org/";
     license = with licenses; if enableUnfree then unfree else bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/opencv/default.nix b/nixpkgs/pkgs/development/libraries/opencv/default.nix
index 56414cfa3979..2575f6bb45d5 100644
--- a/nixpkgs/pkgs/development/libraries/opencv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unzip
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip
 , zlib
 , enablePython ? false, pythonPackages
 , enableGtk2 ? false, gtk2
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
 
-  nativeBuildInputs = [ cmake pkgconfig unzip ];
+  nativeBuildInputs = [ cmake pkg-config unzip ];
 
   NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
 
@@ -69,11 +69,9 @@ stdenv.mkDerivation rec {
     (opencvFlag "GSTREAMER" enableGStreamer)
   ];
 
-  enableParallelBuilding = true;
-
   hardeningDisable = [ "bindnow" "relro" ];
 
-  # Fix pkgconfig file that gets broken with multiple outputs
+  # Fix pkg-config file that gets broken with multiple outputs
   postFixup = ''
     sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_old=.*|includedir_old=$dev/include/opencv|"
     sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|"
@@ -81,7 +79,7 @@ stdenv.mkDerivation rec {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = "https://opencv.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/opendbx/default.nix b/nixpkgs/pkgs/development/libraries/opendbx/default.nix
index 954e6cc6b663..a9eb209edda8 100644
--- a/nixpkgs/pkgs/development/libraries/opendbx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendbx/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
+{ lib, stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
 
-let inherit (stdenv.lib) getDev; in
+let inherit (lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline libmysqlclient postgresql sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extremely lightweight but extensible database access library written in C";
     license = licenses.lgpl21;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix
index e160bfb7d367..7f4f186c923d 100644
--- a/nixpkgs/pkgs/development/libraries/opendht/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, pkg-config
 , asio, nettle, gnutls, msgpack, readline, libargon2
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++11 Kademlia distributed hash table implementation";
     homepage    = "https://github.com/savoirfairelinux/opendht";
     license     = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/opendkim/default.nix b/nixpkgs/pkgs/development/libraries/opendkim/default.nix
index 7cbd85055ef6..90c7fb85d426 100644
--- a/nixpkgs/pkgs/development/libraries/opendkim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendkim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter
+{ lib, stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter
 , autoreconfHook, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
+  nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
 
   buildInputs = [ libbsd openssl libmilter perl ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       --prefix PATH : ${openssl.bin}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service";
     homepage = "http://www.opendkim.org/";
     maintainers = with maintainers; [ abbradar ];
diff --git a/nixpkgs/pkgs/development/libraries/opendmarc/default.nix b/nixpkgs/pkgs/development/libraries/opendmarc/default.nix
index 9b45cc244f26..0dedfa3a85ed 100644
--- a/nixpkgs/pkgs/development/libraries/opendmarc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendmarc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "opendmarc";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free open source software implementation of the DMARC specification";
     homepage = "http://www.trusteddomain.org/opendmarc/";
     license = with licenses; [ bsd3 sendmail ];
diff --git a/nixpkgs/pkgs/development/libraries/openexr/default.nix b/nixpkgs/pkgs/development/libraries/openexr/default.nix
index b33b284f45cb..4e04de30d654 100644
--- a/nixpkgs/pkgs/development/libraries/openexr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openexr/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   propagatedBuildInputs = [ ilmbase zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high dynamic-range (HDR) image file format";
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
index 92cd343cf6a1..ce35aa1c655e 100644
--- a/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
+{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
 
 stdenv.mkDerivation {
   pname = "openexrid-unstable";
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
       mv $out/lib $lib/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing";
     homepage = "https://github.com/MercenariesEngineering/openexrid";
     maintainers = [ maintainers.guibou ];
diff --git a/nixpkgs/pkgs/development/libraries/openfst/default.nix b/nixpkgs/pkgs/development/libraries/openfst/default.nix
index f652c5ee7b7c..51e661eabb3b 100644
--- a/nixpkgs/pkgs/development/libraries/openfst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openfst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "openfst";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for working with finite-state transducers";
     longDescription = ''
       Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs).
diff --git a/nixpkgs/pkgs/development/libraries/openfx/default.nix b/nixpkgs/pkgs/development/libraries/openfx/default.nix
index 4a7927bfcb2e..0d8afe53df8b 100644
--- a/nixpkgs/pkgs/development/libraries/openfx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip }:
+{ lib, stdenv, fetchFromGitHub, unzip }:
 
 stdenv.mkDerivation {
   pname = "openfx";
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
      cp -r include/* $dev/include/OpenFX/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Image processing plug-in standard";
     homepage = "http://openeffects.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix b/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix
index ab546c6d0d45..9b105808b8bb 100644
--- a/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, fetchurl, openfst }:
+{ lib, stdenv, autoreconfHook, fetchurl, openfst }:
 
 stdenv.mkDerivation rec {
   pname = "opengrm-ngram";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers";
     homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/openh264/default.nix b/nixpkgs/pkgs/development/libraries/openh264/default.nix
index ee430f800dd3..6e856b04ac4a 100644
--- a/nixpkgs/pkgs/development/libraries/openh264/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openh264/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nasm }:
+{ lib, stdenv, fetchFromGitHub, nasm }:
 
 stdenv.mkDerivation rec {
   pname = "openh264";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A codec library which supports H.264 encoding and decoding";
     homepage = "https://www.openh264.org";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/openhmd/default.nix b/nixpkgs/pkgs/development/libraries/openhmd/default.nix
index 66656a142342..a692dcb5e4e3 100644
--- a/nixpkgs/pkgs/development/libraries/openhmd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openhmd/default.nix
@@ -1,45 +1,52 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, hidapi
-, withExamples ? true, SDL2 ? null, libGL ? null, glew ? null
+{ lib, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, hidapi
+, SDL2
+, libGL
+, glew
+, withExamples ? true
 }:
 
-with lib;
+let examplesOnOff = if withExamples then "ON" else "OFF"; in
 
-let onoff = if withExamples then "ON" else "OFF"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "openhmd";
-  version = "0.3.0-rc1-20181218";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "OpenHMD";
     repo = "OpenHMD";
-    rev = "80d51bea575a5bf71bb3a0b9683b80ac3146596a";
-    sha256 = "09011vnlsn238r5vbb1ab57x888ljaa34xibrnfbm5bl9417ii4z";
+    rev = version;
+    sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [
     hidapi
-  ] ++ optionals withExamples [
-    SDL2 libGL glew
+  ] ++ lib.optionals withExamples [
+    SDL2
+    glew
+    libGL
   ];
 
   cmakeFlags = [
     "-DBUILD_BOTH_STATIC_SHARED_LIBS=ON"
-    "-DOPENHMD_EXAMPLE_SIMPLE=${onoff}"
-    "-DOPENHMD_EXAMPLE_SDL=${onoff}"
+    "-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}"
+    "-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}"
     "-DOpenGL_GL_PREFERENCE=GLVND"
   ];
 
-  postInstall = optionalString withExamples ''
+  postInstall = lib.optionalString withExamples ''
     mkdir -p $out/bin
     install -D examples/simple/simple $out/bin/openhmd-example-simple
     install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl
   '';
 
-  meta = {
-    homepage = "http://www.openhmd.net";
+  meta = with lib; {
+    homepage = "http://www.openhmd.net"; # https does not work
     description = "Library API and drivers immersive technology";
     longDescription = ''
       OpenHMD is a very simple FLOSS C library and a set of drivers
@@ -48,7 +55,7 @@ stdenv.mkDerivation {
       Oculus Rift, HTC Vive, Windows Mixed Reality, and etc.
     '';
     license = licenses.boost;
-    maintainers = [ maintainers.oxij ];
+    maintainers = with maintainers; [ oxij ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix
index 2ac74c6c240b..03f9118ef7c0 100644
--- a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, cmake, tbb, python, ispc }:
+{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }:
 
 stdenv.mkDerivation rec {
   pname = "openimagedenoise";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python ispc ];
   buildInputs = [ tbb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://openimagedenoise.github.io";
     description = "High-Performance Denoising Library for Ray Tracing";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix b/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix
index fe0e5aeb6914..edb9c9bf8c90 100644
--- a/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2.3.1";
-  branch = "2.3";
+  version = "2.4.0";
+  branch = "2.4";
   revision = "v${version}";
-  sha256 = "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb";
+  sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf";
 
   extraFlags = [
     "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}"
@@ -14,24 +14,8 @@ callPackage ./generic.nix (args // rec {
   patches = [
     ./fix-cmake-config-includedir.patch
     (fetchpatch {
-      url = "https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3.patch";
-      name = "CVE-2019-12973-1.patch";
-      sha256 = "161yvnfbzy2016qqapm0ywfgglgs1v8ljnk6fj8d2bwdh1cxxz8f";
-    })
-    (fetchpatch {
-      url = "https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66.patch";
-      name = "CVE-2019-12973-2.patch";
-      sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq";
-    })
-    (fetchpatch {
-      url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch";
-      name = "CVE-2020-6851.patch";
-      sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw";
-    })
-    (fetchpatch {
-      url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch";
-      name = "CVE-2020-8112.patch";
-      sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49";
+      url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch";
+      sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8";
     })
   ];
 })
diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch b/nixpkgs/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch
index 6ff720ead4e1..21306400dd46 100644
--- a/nixpkgs/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch
@@ -1,14 +1,3 @@
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -32,7 +32,7 @@
-   set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
- 
--  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-+  get_filename_component(OPENJPEG_INCLUDE_DIRS "@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
- 
- else()
-   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
 --- a/src/lib/openjp2/libopenjp2.pc.cmake.in
 +++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
 @@ -3,7 +3,7 @@
diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix
index 07d7b19ede4b..8c1f18b987d5 100644
--- a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , libpng, libtiff, lcms2, jpylyzer
 , mj2Support ? true # MJ2 executables
 , jpwlLibSupport ? true # JPWL library & executables
@@ -19,7 +19,7 @@ assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
 assert (openjpegJarSupport || jpipLibSupport) -> jdk != null;
 
 let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
   mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
 in
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
     (mkFlag testsSupport "BUILD_TESTING")
   ] ++ extraFlags;
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ ]
     ++ optionals jpipServerSupport [ curl fcgi ]
@@ -74,9 +74,9 @@ stdenv.mkDerivation {
     incDir = "openjpeg-${branch}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source JPEG 2000 codec written in C language";
-    homepage = "http://www.openjpeg.org/";
+    homepage = "https://www.openjpeg.org/";
     license = licenses.bsd2;
     maintainers = with maintainers; [ codyopel ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix
index fdf3298a6fad..4d4ec1763f0f 100644
--- a/nixpkgs/pkgs/development/libraries/openldap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
+{ lib, stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "openldap";
@@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--enable-crypt"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "--with-yielding_select=yes"
     "ac_cv_func_memcmp_working=yes"
-  ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
-    ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
-    ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  ] ++ lib.optional (openssl == null) "--without-tls"
+    ++ lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
+    ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   postBuild = ''
     make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     chmod +x "$out"/lib/*.{so,dylib}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openldap.org/";
     description = "An open source implementation of the Lightweight Directory Access Protocol";
     license = licenses.openldap;
diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix
index 95c2a9c3fcf4..802685970ace 100644
--- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
+{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
 , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
 , libpsm2, libfabric, pmix, ucx
 
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
   pname = "openmpi";
   inherit version;
 
-  src = with stdenv.lib.versions; fetchurl {
+  src = with lib.versions; fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
     sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5";
   };
@@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {
     inherit cudaSupport cudatoolkit;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.open-mpi.org/";
     description = "Open source MPI-3 implementation";
     longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
diff --git a/nixpkgs/pkgs/development/libraries/openpa/default.nix b/nixpkgs/pkgs/development/libraries/openpa/default.nix
index 46729f660b14..bc8efdc857eb 100644
--- a/nixpkgs/pkgs/development/libraries/openpa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openpa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file }:
+{ lib, stdenv, fetchurl, file }:
 
 stdenv.mkDerivation rec {
   pname = "openpa";
@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy";
   };
 
-  prePatch = ''substituteInPlace configure --replace /usr/bin/file ${file}/bin/file'';
+  prePatch = "substituteInPlace configure --replace /usr/bin/file ${file}/bin/file";
 
   doCheck = true;
 
   meta = {
     description = "Atomic primitives for high performance, concurrent software";
     homepage = "https://trac.mpich.org/projects/openpa";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ leenaars ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ leenaars ];
+    platforms = with lib.platforms; linux;
     longDescription = ''
       OPA (or sometimes OpenPA or Open Portable Atomics) is an
       open source library intended to provide a consistent C API for performing
diff --git a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix
index 0edf6dfa7283..4f83f22856e3 100644
--- a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
 , boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib
 }:
 
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib
   ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://shibboleth.net/products/opensaml-cpp.html";
     description = "A low-level library written in C++ that provides support for producing and consuming SAML messages";
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
index e2a52a933333..8eeff3de9435 100644
--- a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen,
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,
   libX11, libXinerama, libXrandr, libGLU, libGL,
   glib, ilmbase, libxml2, pcre, zlib,
   AGL, Carbon, Cocoa, Foundation,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake doxygen ];
+  nativeBuildInputs = [ pkg-config cmake doxygen ];
 
   buildInputs = [
     libX11 libXinerama libXrandr libGLU libGL
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 3D graphics toolkit";
     homepage = "http://www.openscenegraph.org/";
     maintainers = with maintainers; [ aanderse raskin ];
diff --git a/nixpkgs/pkgs/development/libraries/openslp/default.nix b/nixpkgs/pkgs/development/libraries/openslp/default.nix
index 68cb40abf723..ddc0e893596f 100644
--- a/nixpkgs/pkgs/development/libraries/openslp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openslp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation {
   name = "openslp-2.0.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     ./CVE-2016-4912.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.openslp.org/";
     description = "An open-source implementation of the IETF Service Location Protocol";
     maintainers = with maintainers; [ ttuegel ];
diff --git a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix
index b37142082d81..bae3e53f441f 100644
--- a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, perl, zlib
+{ lib, stdenv, fetchFromGitHub, perl, zlib
 , withCryptodev ? false, cryptodev
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation {
   pname = "openssl-chacha";
   version = "2016-08-22";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   setOutputFlags = false;
 
   nativeBuildInputs = [ perl zlib ];
-  buildInputs = stdenv.lib.optional withCryptodev cryptodev;
+  buildInputs = lib.optional withCryptodev cryptodev;
 
   configureScript = "./config";
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     "enable-gost"
     "--libdir=lib"
     "--openssldir=etc/ssl"
-  ] ++ stdenv.lib.optionals withCryptodev [
+  ] ++ lib.optionals withCryptodev [
     "-DHAVE_CRYPTODEV"
     "-DUSE_CRYPTODEV_DIGESTS"
   ];
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
     homepage = "https://www.openssl.org/";
     description = "A cryptographic library that implements the SSL and TLS protocols";
     platforms = [ "x86_64-linux" ];
-    maintainers = [ stdenv.lib.maintainers.cstrahan ];
+    maintainers = [ lib.maintainers.cstrahan ];
     license = licenses.openssl;
     priority = 10; # resolves collision with ‘man-pages’
   };
diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix
index 2570c7cdb25a..ce4374be3312 100644
--- a/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPackages, perl, coreutils
+{ lib, stdenv, fetchurl, buildPackages, perl, coreutils
 , withCryptodev ? false, cryptodev
 , enableSSL2 ? false
 , enableSSL3 ? false
@@ -10,7 +10,7 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-with stdenv.lib;
+with lib;
 
 let
   common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }:
@@ -46,7 +46,7 @@ let
     separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
 
     nativeBuildInputs = [ perl ];
-    buildInputs = stdenv.lib.optional withCryptodev cryptodev;
+    buildInputs = lib.optional withCryptodev cryptodev;
 
     # TODO(@Ericson2314): Improve with mass rebuild
     configurePlatforms = [];
@@ -78,16 +78,16 @@ let
       "shared" # "shared" builds both shared and static libraries
       "--libdir=lib"
       "--openssldir=etc/ssl"
-    ] ++ stdenv.lib.optionals withCryptodev [
+    ] ++ lib.optionals withCryptodev [
       "-DHAVE_CRYPTODEV"
       "-DUSE_CRYPTODEV_DIGESTS"
-    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
-      ++ stdenv.lib.optional enableSSL3 "enable-ssl3"
-      ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
+    ] ++ lib.optional enableSSL2 "enable-ssl2"
+      ++ lib.optional enableSSL3 "enable-ssl3"
+      ++ lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
       # OpenSSL needs a specific `no-shared` configure flag.
       # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
       # for a comprehensive list of configuration options.
-      ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && static) "no-shared";
+      ++ lib.optional (versionAtLeast version "1.1.0" && static) "no-shared";
 
     makeFlags = [
       "MANDIR=$(man)/share/man"
@@ -101,7 +101,7 @@ let
     enableParallelBuilding = true;
 
     postInstall =
-    stdenv.lib.optionalString (!static) ''
+    lib.optionalString (!static) ''
       # If we're building dynamic libraries, then don't install static
       # libraries.
       if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
@@ -111,7 +111,7 @@ let
     '' +
     ''
       mkdir -p $bin
-    '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
+    '' + lib.optionalString (!stdenv.hostPlatform.isWindows)
     ''
       substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl}
     '' +
@@ -127,7 +127,7 @@ let
       rmdir $out/etc/ssl/{certs,private}
     '';
 
-    postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) ''
+    postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
       # Check to make sure the main output doesn't depend on perl
       if grep -r '${buildPackages.perl}' $out; then
         echo "Found an erroneous dependency on perl ^^^" >&2
@@ -135,7 +135,7 @@ let
       fi
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://www.openssl.org/";
       description = "A cryptographic library that implements the SSL and TLS protocols";
       license = licenses.openssl;
diff --git a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
index 35a8358b5148..9228424797e2 100644
--- a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU
+{ config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU
 , libGL, glew, ocl-icd, python3
 , cudaSupport ? config.cudaSupport or false, cudatoolkit
 , darwin
@@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs =
-    [ cmake pkgconfig libGLU libGL python3
+    [ libGLU libGL python3
       # FIXME: these are not actually needed, but the configure script wants them.
       glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor
       xorg.libXinerama xorg.libXi
@@ -40,8 +41,6 @@ stdenv.mkDerivation rec {
       "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
     ];
 
-  enableParallelBuilding = true;
-
   postInstall = "rm $out/lib/*.a";
 
   meta = {
diff --git a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix
index a31350a5f962..9c99ee6027dd 100644
--- a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "opentracing-cpp";
   version = "1.5.1";
@@ -8,13 +8,14 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "04kw19g8qrv3kd40va3sqbfish7kfczkdpxdwraifk9950wfs3gx";
   };
-  buildInputs = [ cmake ];
+
+  nativeBuildInputs = [ cmake ];
 
   meta = {
     description = "C++ implementation of the OpenTracing API";
     homepage = "https://opentracing.io";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ rob ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ rob ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix
index 38e50fb367e1..5f3a03a3f5bf 100644
--- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
+{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
 
 stdenv.mkDerivation rec
 {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec
   NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/";
   NIX_LDFLAGS="-lboost_iostreams";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open framework for voxel";
     homepage = "https://www.openvdb.org";
     maintainers = [ maintainers.guibou ];
diff --git a/nixpkgs/pkgs/development/libraries/openwsman/default.nix b/nixpkgs/pkgs/development/libraries/openwsman/default.nix
index a16b8356e618..05f1ef65a304 100644
--- a/nixpkgs/pkgs/development/libraries/openwsman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openwsman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , curl, libxml2, pam, sblim-sfcc }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ curl libxml2 pam sblim-sfcc ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-more-warnings" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description  = "Openwsman server implementation and client API with bindings";
     downloadPage = "https://github.com/Openwsman/openwsman/releases";
     homepage     = "https://openwsman.github.io";
diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix
index f0c4c47db03b..2f901f0e4128 100644
--- a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }:
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python3 ];
   buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL ];
-  enableParallelBuilding = true;
 
   cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
 
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
     mv "$out/lib/libXrApiLayer"* "$layers/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Khronos OpenXR loader";
     homepage    = "https://www.khronos.org/openxr";
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/openzwave/default.nix b/nixpkgs/pkgs/development/libraries/openzwave/default.nix
index dd7a367652d7..0a617561a892 100644
--- a/nixpkgs/pkgs/development/libraries/openzwave/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openzwave/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub
-, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which
+{ lib, stdenv, fetchFromGitHub
+, doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which
 , systemd }:
 
 let
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
     sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1";
   };
 
-  nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ];
+  nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ];
 
   buildInputs = [ systemd ];
 
@@ -48,10 +48,10 @@ in stdenv.mkDerivation {
       --replace dir=    dir=$out
 
     substituteInPlace $out/bin/ozw_config \
-      --replace pcfile=${pkgconfig} pcfile=$out
+      --replace pcfile=${pkg-config} pcfile=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller";
     homepage = "http://www.openzwave.net/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix
index aba9c75ad465..c6efc901e8ae 100644
--- a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoPatchelfHook
 , fixDarwinDylibNames
@@ -12,7 +12,7 @@
 assert odbcSupport -> unixODBC != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
@@ -114,7 +114,7 @@ in stdenv.mkDerivation {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Oracle instant client libraries and sqlplus CLI";
     longDescription = ''
       Oracle instant client provides access to Oracle databases (OCI,
diff --git a/nixpkgs/pkgs/development/libraries/orcania/default.nix b/nixpkgs/pkgs/development/libraries/orcania/default.nix
index 4a01de54a6d9..5c9c2c8da7f2 100644
--- a/nixpkgs/pkgs/development/libraries/orcania/default.nix
+++ b/nixpkgs/pkgs/development/libraries/orcania/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, check, subunit }:
+{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }:
 stdenv.mkDerivation rec {
   pname = "orcania";
   version = "2.1.1";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Potluck with different functions for different purposes that can be shared among C programs";
     homepage = "https://github.com/babelouest/orcania";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/ortp/default.nix b/nixpkgs/pkgs/development/libraries/ortp/default.nix
index ecd15498432c..196cac4bcafc 100644
--- a/nixpkgs/pkgs/development/libraries/ortp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ortp/default.nix
@@ -1,7 +1,7 @@
 { bctoolbox
 , cmake
 , fetchFromGitLab
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bctoolbox ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Real-Time Transport Protocol (RFC3550) stack";
     homepage = "https://linphone.org/technical-corner/ortp";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/osip/default.nix b/nixpkgs/pkgs/development/libraries/osip/default.nix
index 8b2dce1d950f..322ed30a8476 100644
--- a/nixpkgs/pkgs/development/libraries/osip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/osip/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   version = "5.2.0";
   src = fetchurl {
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   pname = "libosip2";
 
   meta = {
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     homepage = "https://www.gnu.org/software/osip/";
     description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
     inherit version;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix
index e34a80e1d4a5..17a3af68a808 100644
--- a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,4 +1,4 @@
-{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }:
+{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "osm-gps-map";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     cairo glib gobject-introspection
     gnome3.gnome-common gtk3 gnome3.libsoup
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GTK widget for displaying OpenStreetMap tiles";
     homepage = "https://nzjrs.github.io/osm-gps-map";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
index 31a7e7e90867..0e09d563ea1f 100644
--- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which
 , gettext, libffi, libiconv, libtasn1
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # at the same time, libtasn1 in buildInputs provides the libasn1 library
   # to link against for the target platform.
   # hence, libtasn1 is required in both native and build inputs.
-  nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ];
+  nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ];
   buildInputs = [ gettext libffi libiconv libtasn1 ];
 
   autoreconfPhase = ''
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     "exampledir=${placeholder "out"}/etc/pkcs11"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for loading and sharing PKCS#11 modules";
     longDescription = ''
       Provides a way to load and enumerate PKCS#11 modules.
diff --git a/nixpkgs/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix
index 017cb25a9d17..7bf0cb2c5fbc 100644
--- a/nixpkgs/pkgs/development/libraries/packr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/packr/default.nix
@@ -22,7 +22,7 @@ let p2 = buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The simple and easy way to embed static files into Go binaries";
     homepage = "https://github.com/gobuffalo/packr";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix
index 4723292199da..abef3d6cd1dd 100644
--- a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub
-, stdenv
+, lib, stdenv
 , cmake
 , eigen
 , nlopt
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   # tests pass but take 30+ minutes
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://esa.github.io/pagmo2/";
     description = "Scientific library for massively parallel optimization";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix
index b3dd2062ca0b..68511003215c 100644
--- a/nixpkgs/pkgs/development/libraries/pango/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pango/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz
 , libintl, libthai, gobject-introspection, darwin, fribidi, gnome3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
 , meson, ninja, glib
 , x11Support? !stdenv.isDarwin, libXft
 }:
 
-with stdenv.lib;
+with lib;
 
 let
   pname = "pango";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk";
   };
 
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson ninja
     glib # for glib-mkenum
-    pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
+    pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
   buildInputs = [
     fribidi
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-Dxft=disabled"  # only works with x11
   ];
 
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/nixpkgs/pkgs/development/libraries/pangolin/default.nix
index 2b0e15468b12..0e5d705a1ce6 100644
--- a/nixpkgs/pkgs/development/libraries/pangolin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangolin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew
 , xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen
 , Carbon ? null, Cocoa ? null
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig doxygen ];
+  nativeBuildInputs = [ cmake pkg-config doxygen ];
 
   buildInputs = [
     libGL
@@ -30,8 +30,6 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 
-  enableParallelBuilding = true;
-
   # The tests use cmake's findPackage to find the installed version of
   # pangolin, which isn't what we want (or available).
   doCheck = false;
@@ -50,8 +48,8 @@ stdenv.mkDerivation {
       graphical data.
     '';
     homepage = "https://github.com/stevenlovegrove/Pangolin";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.expipiplus1 ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.expipiplus1 ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/nixpkgs/pkgs/development/libraries/pangomm/default.nix
index b0488435ded6..0ff0d9a7d4e9 100644
--- a/nixpkgs/pkgs/development/libraries/pangomm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangomm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3
+{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3
 , ApplicationServices }:
 
 stdenv.mkDerivation rec {
@@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
   version= "2.42.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [
+  nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [
     ApplicationServices
   ];
   propagatedBuildInputs = [ pango glibmm cairomm ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface to the Pango text rendering library";
     homepage    = "https://www.pango.org/";
     license     = with licenses; [ lgpl2 lgpl21 ];
diff --git a/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix b/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix
index 26d012e81e1d..7d314a930f25 100644
--- a/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, pango}:
+{lib, stdenv, fetchurl, pkg-config, glib, pango}:
 
 stdenv.mkDerivation {
   name = "pangoxsl-1.6.0.3";
@@ -7,13 +7,13 @@ stdenv.mkDerivation {
     sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     glib
     pango
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango";
     homepage = "https://sourceforge.net/projects/pangopdf";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix
index ba042562320b..0247d12715f6 100644
--- a/nixpkgs/pkgs/development/libraries/partio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/partio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }:
 
 stdenv.mkDerivation {
   pname = "partio";
@@ -16,8 +16,6 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ unzip cmake doxygen ];
   buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ];
 
-  enableParallelBuilding = true;
-
   buildPhase = ''
     make partio
 
@@ -34,7 +32,7 @@ stdenv.mkDerivation {
     mv $dev/include/*.h $dev/include/partio
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC";
     homepage = "https://www.disneyanimation.com/technology/partio.html";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix b/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix
index 7d7dbd53383b..1777b0856f80 100644
--- a/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }:
+{ lib, stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }:
 
 stdenv.mkDerivation rec {
   pname = "pc-ble-driver";
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [
 
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     IOKit
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     udev
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Desktop library for Bluetooth low energy development";
     homepage = "https://github.com/NordicSemiconductor/pc-ble-driver";
     license = licenses.unfreeRedistributable;
diff --git a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix
index e9c5301aac56..ebdacdfc9bdb 100644
--- a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix
@@ -1,5 +1,5 @@
 { config, stdenv, lib, fetchFromGitHub
-, autoconf, automake, which, libtool, pkgconfig
+, autoconf, automake, which, libtool, pkg-config
 , portaudio, alsaLib
 , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0";
   };
 
-  nativeBuildInputs = [ autoconf automake which libtool pkgconfig ];
+  nativeBuildInputs = [ autoconf automake which libtool pkg-config ];
 
   buildInputs = [ portaudio ]
     ++ lib.optionals stdenv.isLinux [ alsaLib ]
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a C API to different audio devices";
     homepage = "https://github.com/espeak-ng/pcaudiolib";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/pcg-c/default.nix b/nixpkgs/pkgs/development/libraries/pcg-c/default.nix
index 593794c9c4df..9722210b9d10 100644
--- a/nixpkgs/pkgs/development/libraries/pcg-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcg-c/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "0.94";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A family of better random number generators";
     homepage = "https://www.pcg-random.org/";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       PCG is a family of simple fast space-efficient statistically good
       algorithms for random number generation. Unlike many general-purpose RNGs,
diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix
index 753f5ae39110..436e0f85e162 100644
--- a/nixpkgs/pkgs/development/libraries/pcl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake
-, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
+{ lib, stdenv, fetchFromGitHub, cmake
+, qhull, flann, boost, vtk, eigen, pkg-config, qtbase
 , libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL
 }:
 
@@ -13,23 +13,21 @@ stdenv.mkDerivation rec {
     sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1";
   };
 
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ qhull flann boost eigen libusb1 libpcap
                   libpng vtk qtbase libXt ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ];
+    ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
 
-  cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
+  cmakeFlags = lib.optionals stdenv.isDarwin [
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
   ];
 
   meta = {
     homepage = "https://pointclouds.org/";
-    broken = stdenv.lib.versionAtLeast qtbase.version "5.15";
+    broken = lib.versionAtLeast qtbase.version "5.15";
     description = "Open project for 2D/3D image and point cloud processing";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/pcre/default.nix b/nixpkgs/pkgs/development/libraries/pcre/default.nix
index 8f19034c924b..8d9b9ec02599 100644
--- a/nixpkgs/pkgs/development/libraries/pcre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcre/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pcre, windows ? null
 , variant ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert elem variant [ null "cpp" "pcre16" "pcre32" ];
 
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
   meta = {
     homepage = "http://www.pcre.org/";
     description = "A library for Perl Compatible Regular Expressions";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
 
     longDescription = ''
       The PCRE library is a set of functions that implement regular
diff --git a/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/nixpkgs/pkgs/development/libraries/pcre2/default.nix
index 8f06630882c8..6bf6cff98bbe 100644
--- a/nixpkgs/pkgs/development/libraries/pcre2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcre2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "pcre2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-pcre2-16"
     "--enable-pcre2-32"
-  ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit";
+  ] ++ lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit";
 
   outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     moveToOutput bin/pcre2-config "$dev"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Perl Compatible Regular Expressions";
     homepage = "http://www.pcre.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/pdal/default.nix b/nixpkgs/pkgs/development/libraries/pdal/default.nix
index 4405d3812b76..42e05d5d7ff4 100644
--- a/nixpkgs/pkgs/development/libraries/pdal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pdal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_PLUGIN_RIVLIB=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
     homepage = "https://pdal.io";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix b/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix
index 855df954eb14..2dfd35466858 100644
--- a/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libxpdf, libxml2}:
+{lib, stdenv, fetchurl, libxpdf, libxml2}:
 
 stdenv.mkDerivation {
   name = "pdf2xml";
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     cp exe/* $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PDF to XML converter";
     platforms = platforms.unix;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/pe-parse/default.nix b/nixpkgs/pkgs/development/libraries/pe-parse/default.nix
new file mode 100644
index 000000000000..445188bd0d9b
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/pe-parse/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "pe-parse";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "trailofbits";
+    repo = "pe-parse";
+    rev = "v${version}";
+    sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/dump-pe ../test/assets/example.exe
+  '';
+
+  meta = with lib; {
+    description = "A principled, lightweight parser for Windows portable executable files";
+    homepage = "https://github.com/trailofbits/pe-parse";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ arturcygan ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/phash/default.nix b/nixpkgs/pkgs/development/libraries/phash/default.nix
index 16d19f570d1c..250089c30b1c 100644
--- a/nixpkgs/pkgs/development/libraries/phash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/phash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }:
 
 stdenv.mkDerivation rec {
   pname = "pHash";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   # at runtime
   propagatedBuildInputs = [ imagemagick ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"];
   postInstall = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Compute the perceptual hash of an image";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/phonetisaurus/default.nix b/nixpkgs/pkgs/development/libraries/phonetisaurus/default.nix
index 126a91fe2900..9ba00833d623 100644
--- a/nixpkgs/pkgs/development/libraries/phonetisaurus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/phonetisaurus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , openfst
 , pkg-config
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   pname = "phonetisaurus";
-  version = "2020-07-31";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "AdolfVonKleist";
     repo = pname;
-    rev = "2831870697de5b4fbcb56a6e1b975e0e1ea10deb";
+    rev = version;
     sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python3 openfst ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Framework for Grapheme-to-phoneme models for speech recognition using the OpenFst framework";
     inherit (src.meta) homepage;
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 5c0901596b04..249ce4e3629a 100644
--- a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig
+{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config
 , extra-cmake-modules, qttools, qtbase, qtx11extras
 , debug ? false
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "phonon-backend-gstreamer";
   version = "4.10.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://phonon.kde.org/";
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
             gst-libav
           ]);
     in toString [
-      # This flag should be picked up through pkgconfig, but it isn't.
+      # This flag should be picked up through pkg-config, but it isn't.
       "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
 
       ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"''
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
     extra-cmake-modules
     qttools
   ];
diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix
index d54ee6e56304..07e6ccf1f346 100644
--- a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc
+{ stdenv, lib, fetchurl, cmake, phonon, pkg-config, libvlc
 , extra-cmake-modules, qttools, qtbase, qtx11extras
 , debug ? false
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "phonon-backend-vlc";
   version = "0.11.1";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://phonon.kde.org/";
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
     qttools
     extra-cmake-modules
   ];
diff --git a/nixpkgs/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix
index 85ba37a9d8a6..88a6af658dd4 100644
--- a/nixpkgs/pkgs/development/libraries/phonon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix
@@ -4,7 +4,7 @@
 , cmake
 , libGLU
 , libGL
-, pkgconfig
+, pkg-config
 , libpulseaudio
 , extra-cmake-modules
 , qtbase
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://community.kde.org/Phonon";
     description = "Multimedia API for Qt";
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
   };
 
   src = fetchurl {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
     extra-cmake-modules
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/physfs/default.nix b/nixpkgs/pkgs/development/libraries/physfs/default.nix
index 160f2f64cf40..3eb4077d9852 100644
--- a/nixpkgs/pkgs/development/libraries/physfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, doxygen, darwin
+{ lib, stdenv, fetchurl, cmake, doxygen, darwin
 , zlib }:
 
 let
@@ -15,9 +15,7 @@ let
     nativeBuildInputs = [ cmake doxygen ];
 
     buildInputs = [ zlib ]
-      ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ];
-
-    enableParallelBuilding = true;
+      ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ];
 
     patchPhase = ''
       sed s,-Werror,, -i CMakeLists.txt
@@ -29,7 +27,7 @@ let
       ./test_physfs --version
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://icculus.org/physfs/";
       description = "Library to provide abstract access to various archives";
       license = licenses.free;
diff --git a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix
index 7b201cf9b164..e3fd0a26a7fd 100644
--- a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }:
+{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "apfel";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A PDF Evolution Library";
     license     = licenses.gpl3;
     homepage    = "https://apfel.mi.infn.it/";
diff --git a/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix
index 5c63ce7c4b9e..33ca03267270 100644
--- a/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
 
 stdenv.mkDerivation rec {
   pname = "apfelgrid";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ultra-fast theory predictions for collider observables";
     license     = licenses.mit;
     homepage    = "http://nhartland.github.io/APFELgrid/";
diff --git a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix
index 6b1bc71c660c..65aa7b8b4703 100644
--- a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
+{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "applgrid";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics";
     license     = licenses.gpl3;
     homepage    = "http://applgrid.hepforge.org";
diff --git a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix
index 3c2cd4c69145..84657d726797 100644
--- a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
+{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
 
 stdenv.mkDerivation rec {
   version = "2006";
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     description = "Legacy collection of libraries and modules for data analysis in high energy physics";
     broken = stdenv.isDarwin;
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
-    license = stdenv.lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ veprbl ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix
index 68e07e7b42dd..a09f031e7651 100644
--- a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastjet }:
+{ lib, stdenv, fetchurl, fastjet }:
 
 stdenv.mkDerivation rec {
   pname = "fastjet-contrib";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     make fragile-shared-install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Third party extensions for FastJet";
     homepage = "http://fastjet.fr/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix
index b854fa88cd67..35ce8dedca74 100644
--- a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2 }:
+{ lib, stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
   pname = "fastjet";
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A software package for jet finding in pp and e+e− collisions";
-    license     = stdenv.lib.licenses.gpl2Plus;
+    license     = lib.licenses.gpl2Plus;
     homepage    = "http://fastjet.fr/";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
index 22251e10a4f1..916303f00cec 100644
--- a/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
+{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "fastnlo_toolkit";
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
-    license      = stdenv.lib.licenses.gpl3;
+    license      = lib.licenses.gpl3;
     homepage     = "http://fastnlo.hepforge.org";
-    platforms    = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms    = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
index 42014949c0b6..5646f4e02bac 100644
--- a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, geant_version }:
+{ lib, stdenv, fetchurl, geant_version }:
 
 let
   mkDataset = { name, version, sha256, envvar }:
@@ -24,7 +24,7 @@ let
       inherit envvar;
       setupHook = ./datasets-hook.sh;
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Data files for the Geant4 toolkit";
         homepage = "https://geant4.web.cern.ch/support/download";
         license = licenses.g4sl;
diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
index 7caae2c52d33..159c746fecd8 100644
--- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
@@ -9,7 +9,7 @@
 , enableRaytracerX11   ? false
 
 # Standard build environment with cmake.
-, stdenv, fetchurl, fetchpatch, cmake
+, lib, stdenv, fetchurl, fetchpatch, cmake
 
 # Optional system packages, otherwise internal GEANT4 packages are used.
 , clhep ? null # not packaged currently
@@ -80,24 +80,23 @@ stdenv.mkDerivation rec {
     "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
     "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
     "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
-  ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [
+  ] ++ lib.optionals (enableMultiThreading && enablePython) [
     "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
-  ] ++ stdenv.lib.optionals enableInventor [
+  ] ++ lib.optionals enableInventor [
     "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
     "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
   ];
 
-  enableParallelBuilding = true;
   nativeBuildInputs =  [ cmake ];
 
   buildInputs = [ libGLU xlibsWrapper libXmu ]
-    ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ]
-    ++ stdenv.lib.optionals enablePython [ boost_python python3 ];
+    ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
+    ++ lib.optionals enablePython [ boost_python python3 ];
 
   propagatedBuildInputs = [ clhep expat zlib libGL ]
-    ++ stdenv.lib.optionals enableGDML [ xercesc ]
-    ++ stdenv.lib.optionals enableXM [ motif ]
-    ++ stdenv.lib.optionals enableQT [ qtbase ];
+    ++ lib.optionals enableGDML [ xercesc ]
+    ++ lib.optionals enableXM [ motif ]
+    ++ lib.optionals enableQT [ qtbase ];
 
   postFixup = ''
     # Don't try to export invalid environment variables.
@@ -108,7 +107,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     data = import ./datasets.nix {
-          inherit stdenv fetchurl;
+          inherit lib stdenv fetchurl;
           geant_version = version;
       };
 
@@ -120,7 +119,7 @@ stdenv.mkDerivation rec {
     source $out/nix-support/setup-hook
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A toolkit for the simulation of the passage of particles through matter";
     longDescription = ''
       Geant4 is a toolkit for the simulation of the passage of particles through matter.
diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix
index b27d947ea5c4..e2ab42c418a0 100644
--- a/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "hepmc";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "-Dlength:STRING=MM"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators";
     license     = licenses.lgpl21;
     homepage    = "http://hepmc.web.cern.ch/hepmc/";
diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
index 10b789f514f9..0b1b1f8fa578 100644
--- a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, coreutils, python, root }:
+{ lib, stdenv, fetchurl, cmake, coreutils, python, root }:
 
 let
-  pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
+  pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
   withPython = python != null;
   # ensure that root is built with the same python interpreter, as it links against numpy
   root_py = if withPython then root.override { inherit python; } else root;
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ root_py ]
-    ++ stdenv.lib.optional withPython python;
+    ++ lib.optional withPython python;
 
   cmakeFlags = [
     "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
-  ] ++ stdenv.lib.optionals withPython [
+  ] ++ lib.optionals withPython [
     "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}"
     "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}"
   ];
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = withPython;
   # prevent nix from trying to dereference a null python
-  installCheckPhase = stdenv.lib.optionalString withPython ''
+  installCheckPhase = lib.optionalString withPython ''
     PYTHONPATH=${placeholder "out"}/${python.sitePackages} python -c 'import pyHepMC3'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation";
     license = licenses.gpl3;
     homepage = "http://hepmc.web.cern.ch/hepmc/";
diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
index c1a803fd314b..d3f6bcb74747 100644
--- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
+{ lib, stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "herwig";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-purpose particle physics event generator";
     homepage = "https://herwig.hepforge.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix
index 6ac3b950be34..7ad5b9861a1d 100644
--- a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ lib, stdenv, fetchurl, gfortran, perl }:
 
 stdenv.mkDerivation rec {
   pname = "hoppet";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Higher Order Perturbative Parton Evolution Toolkit";
     license     = licenses.gpl2;
     homepage    = "https://hoppet.hepforge.org";
diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix
index 7d412f86596d..19e9f9d9ec86 100644
--- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, makeWrapper }:
+{ lib, stdenv, fetchurl, python2, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "lhapdf";
@@ -15,18 +15,18 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru = {
-    pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; };
+    pdf_sets = import ./pdf_sets.nix { inherit lib stdenv fetchurl; };
   };
 
   postInstall = ''
     wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = licenses.gpl2;
     homepage    = "http://lhapdf.hepforge.org";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 2309e6671f85..7fb3e640c7d6 100644
--- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   mkPdfSet = name: sha256:
@@ -20,7 +20,7 @@ let
       setupHook = ./pdfset-hook.sh;
     };
 in
-  stdenv.lib.mapAttrs mkPdfSet {
+  lib.mapAttrs mkPdfSet {
     "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0";
     "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i";
     "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll";
diff --git a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix
index 1e31577026c1..90cf5ac8b2d1 100644
--- a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gfortran }:
+{ lib, stdenv, fetchFromGitHub, gfortran }:
 
 stdenv.mkDerivation rec {
   pname = "mela";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "a Mellin Evolution LibrAry";
     license     = licenses.gpl3;
     homepage    = "https://github.com/vbertone/MELA";
diff --git a/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix b/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix
index 20df49d9ae7f..f84c1bda32d3 100644
--- a/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "nlojet++";
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage    = "http://www.desy.de/~znagy/Site/NLOJet++.html";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = lib.licenses.gpl2;
     description = "Implementation of calculation of the hadron jet cross sections";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix
index 53b2889a25c8..1bec3300f80a 100644
--- a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
+{ lib, stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "pythia";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-shared"
     "--with-lhapdf6=${lhapdf}"
-  ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [
+  ] ++ (if lib.versions.major hepmc.version == "3" then [
     "--with-hepmc3=${hepmc}"
   ] else [
     "--with-hepmc2=${hepmc}"
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A program for the generation of high-energy physics events";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = lib.licenses.gpl2;
     homepage    = "http://home.thep.lu.se/~torbjorn/Pythia.html";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix
index 1c17b318c9dc..834e3fcbba89 100644
--- a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, zlib }:
+{ lib, stdenv, fetchurl, gfortran, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "QCDNUM";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A very fast QCD evolution program written in FORTRAN77";
-    license     = stdenv.lib.licenses.gpl3;
+    license     = lib.licenses.gpl3;
     homepage    = "https://www.nikhef.nl/~h24/qcdnum/index.html";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
index f95328964bfb..ce905bff17c5 100644
--- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
+{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "rivet";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-fastjet=${fastjet}"
     "--with-yoda=${yoda}"
-  ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [
+  ] ++ (if lib.versions.major hepmc.version == "3" then [
     "--with-hepmc3=${hepmc}"
   ] else [
     "--with-hepmc=${hepmc}"
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions";
     license     = licenses.gpl3;
     homepage    = "https://rivet.hepforge.org";
diff --git a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
index 876aeec0fab7..d5a272955f40 100644
--- a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
+{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "thepeg";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Toolkit for High Energy Physics Event Generation";
     homepage = "https://herwig.hepforge.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
index 39bffb65237e..bf53cfcb62c9 100644
--- a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
+{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
 
 stdenv.mkDerivation rec {
   pname = "yoda";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
   buildInputs = [ python ]
     ++ (with python.pkgs; [ numpy matplotlib ])
-    ++ stdenv.lib.optional withRootSupport root;
+    ++ lib.optional withRootSupport root;
   propagatedBuildInputs = [ zlib ];
 
   enableParallelBuilding = true;
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
-    license     = stdenv.lib.licenses.gpl3;
+    license     = lib.licenses.gpl3;
     homepage    = "https://yoda.hepforge.org";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
     # https://gitlab.com/hepcedar/yoda/-/issues/24
     broken      = withRootSupport;
   };
diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix b/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix
index eaedc2c0ac3e..1e686b980043 100644
--- a/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix
+++ b/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind
 , glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg
 , sbc, SDL2, makeFontsConf
 }:
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "dev" "doc" ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig doxygen graphviz valgrind
+    meson ninja pkg-config doxygen graphviz valgrind
   ];
   buildInputs = [
     glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Server and user space API to deal with multimedia pipelines";
     homepage = "https://pipewire.org/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix
index c9697ee1a424..fdd45b4bb0d9 100644
--- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix
@@ -6,7 +6,7 @@
 , meson
 , ninja
 , systemd
-, pkgconfig
+, pkg-config
 , doxygen
 , graphviz
 , valgrind
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     graphviz
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Server and user space API to deal with multimedia pipelines";
     homepage = "https://pipewire.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix
index d7f5b34e5d75..a8cea4638069 100644
--- a/nixpkgs/pkgs/development/libraries/pixman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }:
+{ lib, stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
   pname = "pixman";
@@ -9,17 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libpng ];
 
-  configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt";
+  configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt";
 
   doCheck = true;
 
   postInstall = glib.flattenInclude;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pixman.org";
     description = "A low-level library for pixel manipulation";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix
index cb8e05b6a76e..4148ca4fc47d 100644
--- a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "pkcs11-helper";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ openssl ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/OpenSC/pkcs11-helper";
     license = with licenses; [ bsd3 gpl2 ];
     description = "Library that simplifies the interaction with PKCS#11 providers";
diff --git a/nixpkgs/pkgs/development/libraries/pkger/default.nix b/nixpkgs/pkgs/development/libraries/pkger/default.nix
index 8c8fd4f8fd6b..4d7c682f0229 100644
--- a/nixpkgs/pkgs/development/libraries/pkger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pkger/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Embed static files in Go binaries (replacement for gobuffalo/packr) ";
     homepage = "https://github.com/markbates/pkger";
     changelog = "https://github.com/markbates/pkger/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/libraries/plib/default.nix b/nixpkgs/pkgs/development/libraries/plib/default.nix
index 2736de0630f6..7a1c39715797 100644
--- a/nixpkgs/pkgs/development/libraries/plib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/plib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, libGLU, libGL, freeglut, SDL
+{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, freeglut, SDL
 , libXi, libSM, libXmu, libXext, libX11 }:
 
 stdenv.mkDerivation rec {
@@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
       GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can.
     '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     homepage = "http://plib.sourceforge.net/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/plplot/default.nix b/nixpkgs/pkgs/development/libraries/plplot/default.nix
index e99ddc3dd085..05f12d0148be 100644
--- a/nixpkgs/pkgs/development/libraries/plplot/default.nix
+++ b/nixpkgs/pkgs/development/libraries/plplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname   = "plplot";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform scientific graphics plotting library";
     homepage    = "https://plplot.org";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/pmdk/default.nix b/nixpkgs/pkgs/development/libraries/pmdk/default.nix
index fe3176f9f76e..01392f232d9c 100644
--- a/nixpkgs/pkgs/development/libraries/pmdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pmdk/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub
-, autoconf, libndctl, pkgconfig
+{ lib, stdenv, fetchFromGitHub
+, autoconf, libndctl, pkg-config
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i";
   };
 
-  nativeBuildInputs = [ autoconf pkgconfig ];
+  nativeBuildInputs = [ autoconf pkg-config ];
   buildInputs = [ libndctl ];
   enableParallelBuilding = true;
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     mv $out/lib     $lib/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Persistent Memory Development Kit";
     homepage    = "https://github.com/pmem/pmdk";
     license     = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/pmix/default.nix b/nixpkgs/pkgs/development/libraries/pmix/default.nix
index f68833bdac4d..bb8debbce916 100644
--- a/nixpkgs/pkgs/development/libraries/pmix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pmix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, autoconf, automake
+{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake
 , libtool, flex, libevent, hwloc, munge, zlib, pandoc
 } :
 
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Process Management Interface for HPC environments";
     homepage = "https://openpmix.github.io/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/png++/default.nix b/nixpkgs/pkgs/development/libraries/png++/default.nix
index 7ae7406c9896..dfd74e495e76 100644
--- a/nixpkgs/pkgs/development/libraries/png++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/png++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpng
+{ lib, stdenv, fetchurl, libpng
 , docSupport ? true, doxygen ? null
 }:
 assert docSupport -> doxygen != null;
@@ -21,21 +21,21 @@ stdenv.mkDerivation rec {
 
   postCheck = "cat test/test.log";
 
-  buildInputs = stdenv.lib.optional docSupport doxygen;
+  buildInputs = lib.optional docSupport doxygen;
 
   propagatedBuildInputs = [ libpng ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE"
   '' + ''
     sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile
   '';
 
-  makeFlags = stdenv.lib.optional docSupport "docs";
+  makeFlags = lib.optional docSupport "docs";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nongnu.org/pngpp/";
     description = "C++ wrapper for libpng library";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix b/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix
index 0f9be199d958..18d5d0bcfa22 100644
--- a/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , sphinxbase
-, pkgconfig
+, pkg-config
 , python27 # >= 2.6
 , swig2 # 2.0
 }:
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ sphinxbase ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ python27 swig2 ];
 
   meta = {
     description = "Voice recognition library written in C";
     homepage = "http://cmusphinx.sourceforge.net";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix
index b2a4fb1b0c32..8f963bb366a9 100644
--- a/nixpkgs/pkgs/development/libraries/poco/default.nix
+++ b/nixpkgs/pkgs/development/libraries/poco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
 
 stdenv.mkDerivation rec {
   pname = "poco";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
 
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
     "-DPOCO_UNBUNDLED=ON"
   ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pocoproject.org/";
     description = "Cross-platform C++ libraries with a network/internet focus";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix
index 242645ebfdbc..e50a2111b437 100644
--- a/nixpkgs/pkgs/development/libraries/podofo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/podofo/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch
+{ lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
+, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "lib" ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng
                   libidn expat lua5 ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     moveToOutput lib "$lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://podofo.sourceforge.net";
     description = "A library to work with the PDF file format";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index b13335561ac0..0da6e15eb274 100644
--- a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib, qt4 }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "polkit-qt-1-qt4-0.112.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cmake pkgconfig automoc4 ];
+  nativeBuildInputs = [ cmake pkg-config automoc4 ];
 
   propagatedBuildInputs = [ polkit glib qt4 ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
       done
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Qt wrapper around PolKit";
     maintainers = [ maintainers.ttuegel ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix
index f6cbf7e972b3..be425b394019 100644
--- a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix
+++ b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, pkgconfig, polkit, glib, qtbase }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "polkit-qt-1-qt5-0.112.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   propagatedBuildInputs = [ polkit glib qtbase ];
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A Qt wrapper around PolKit";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/polkit/default.nix b/nixpkgs/pkgs/development/libraries/polkit/default.nix
index 2ec49a2d3c08..7e8e95ef1eac 100644
--- a/nixpkgs/pkgs/development/libraries/polkit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/polkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch
+{ lib, stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch
 , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
 , docbook_xml_dtd_412, gtk-doc, coreutils
 , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch";
       sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
     })
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     # Make netgroup support optional (musl does not have it)
     # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10
     # We use the version of the patch that Alpine uses successfully.
@@ -45,20 +45,20 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i -e "s/-Wl,--as-needed//" configure.ac
   '';
 
   outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
 
   nativeBuildInputs =
-    [ glib gtk-doc pkgconfig intltool perl ]
+    [ glib gtk-doc pkg-config intltool perl ]
     ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
   buildInputs =
     [ expat pam spidermonkey_78 ]
     # On Linux, fall back to elogind when systemd support is off.
-    ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
-    ++ stdenv.lib.optional withIntrospection gobject-introspection;
+    ++ lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
+    ++ lib.optional withIntrospection gobject-introspection;
 
   propagatedBuildInputs = [
     glib # in .pc Requires
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
       --replace   /bin/true ${coreutils}/bin/true \
       --replace   /bin/false ${coreutils}/bin/false
 
-  '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
+  '' + lib.optionalString useSystemd /* bogus chroot detection */ ''
     sed '/libsystemd autoconfigured/s/.*/:/' -i configure
   '';
 
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
     "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
     (if withIntrospection then "--enable-introspection" else "--disable-introspection")
-  ] ++ stdenv.lib.optional (!doCheck) "--disable-test";
+  ] ++ lib.optional (!doCheck) "--disable-test";
 
   makeFlags = [
     "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0"
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.freedesktop.org/wiki/Software/polkit";
     description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix
index a3e42b3ae4b2..1f0ee81da951 100644
--- a/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , glib
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" ];
 
   src = fetchFromGitHub {
-    owner = "Paul-Browne";
+    owner = "Mattey40";
     repo = "poly2tri-c";
     rev = "p2tc-${version}";
     sha256 = "158vm3wqfxs22b74kqc4prlvjny38qqm3kz5wrgasmx0qciwh0g8";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
     "-Wno-error"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations";
     homepage = "https://code.google.com/archive/p/poly2tri-c/";
     license = licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ jtojnar ];
+    maintainers = with lib.maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/poppler/0.61.nix b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix
index 0603f49fad41..a49bfad7ab31 100644
--- a/nixpkgs/pkgs/development/libraries/poppler/0.61.nix
+++ b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
+{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
 , withData ? true, poppler_data
 , qt5Support ? false, qtbase ? null
@@ -39,10 +39,10 @@ stdenv.mkDerivation rec {
     ++ optional qt5Support qtbase
     ++ optional introspectionSupport gobject-introspection;
 
-  nativeBuildInputs = [ cmake ninja pkgconfig ];
+  nativeBuildInputs = [ cmake ninja pkg-config ];
 
   # Not sure when and how to pass it.  It seems an upstream bug anyway.
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
 
   cmakeFlags = [
     (mkFlag true "XPDF_HEADERS")
diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix
index e7b9a26f19fd..3f2b8453d7f0 100644
--- a/nixpkgs/pkgs/development/libraries/poppler/default.nix
+++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl
+{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
 , withData ? true, poppler_data
 , qt5Support ? false, qtbase ? null
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
     ++ optional utils nss
     ++ optional introspectionSupport gobject-introspection;
 
-  nativeBuildInputs = [ cmake ninja pkgconfig ];
+  nativeBuildInputs = [ cmake ninja pkg-config ];
 
   # Workaround #54606
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
   '';
 
diff --git a/nixpkgs/pkgs/development/libraries/popt/default.nix b/nixpkgs/pkgs/development/libraries/popt/default.nix
index b04a2242ab7a..393ef2c2c33a 100644
--- a/nixpkgs/pkgs/development/libraries/popt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/popt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "popt";
@@ -9,14 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
   };
 
-  patches = stdenv.lib.optionals stdenv.isCygwin [
+  patches = lib.optionals stdenv.isCygwin [
     ./1.16-cygwin.patch
     ./1.16-vpath.patch
   ];
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line option parsing library";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/portaudio/default.nix b/nixpkgs/pkgs/development/libraries/portaudio/default.nix
index aa8afb7ac97f..c7de116e879b 100644
--- a/nixpkgs/pkgs/development/libraries/portaudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/portaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2
+{ lib, stdenv, fetchurl, alsaLib, pkg-config, libjack2
 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
 
 stdenv.mkDerivation {
@@ -9,17 +9,17 @@ stdenv.mkDerivation {
     sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libjack2 ]
-    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+    ++ lib.optional (!stdenv.isDarwin) alsaLib;
 
   configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays";
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = lib.optionalString stdenv.isDarwin ''
     sed -i '50 i\
       #include <CoreAudio/AudioHardware.h>\
       #include <CoreAudio/AudioHardwareBase.h>\
@@ -30,14 +30,14 @@ stdenv.mkDerivation {
   # not sure why, but all the headers seem to be installed by the make install
   installPhase = ''
     make install
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     # fixup .pc file to find alsa library
     sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     cp include/pa_mac_core.h $out/include/pa_mac_core.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Portable cross-platform Audio API";
     homepage    = "http://www.portaudio.com/";
     # Not exactly a bsd license, but alike
diff --git a/nixpkgs/pkgs/development/libraries/portmidi/default.nix b/nixpkgs/pkgs/development/libraries/portmidi/default.nix
index a0001691302e..e9a868240bb3 100644
--- a/nixpkgs/pkgs/development/libraries/portmidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/portmidi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
+{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
 
 stdenv.mkDerivation rec {
   pname = "portmidi";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   # XXX: This is to deactivate Java support.
-  patches = stdenv.lib.singleton (fetchurl {
+  patches = lib.singleton (fetchurl {
     url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/"
         + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch";
     sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h";
@@ -44,14 +44,15 @@ stdenv.mkDerivation rec {
     ln -s libportmidi.so "$out/lib/libporttime.so"
   '';
 
-  buildInputs = [ unzip cmake /*jdk*/ alsaLib ];
+  nativeBuildInputs = [ unzip cmake ];
+  buildInputs = [ alsaLib ];
 
   hardeningDisable = [ "format" ];
 
   meta = {
     homepage = "http://portmedia.sourceforge.net/portmidi/";
     description = "Platform independent library for MIDI I/O";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ppl/default.nix b/nixpkgs/pkgs/development/libraries/ppl/default.nix
index f1c93e0fa7c7..a94cf9e38d0e 100644
--- a/nixpkgs/pkgs/development/libraries/ppl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ppl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, gmpxx, perl, gnum4 }:
+{ fetchurl, fetchpatch, lib, stdenv, gmpxx, perl, gnum4 }:
 
 let version = "1.2"; in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ gmpxx ];
 
   configureFlags = [ "--disable-watchdog" ] ++
-    stdenv.lib.optionals stdenv.isDarwin [
+    lib.optionals stdenv.isDarwin [
       "CPPFLAGS=-fexceptions"
       "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
     ];
@@ -53,9 +53,9 @@ stdenv.mkDerivation {
 
     homepage = "http://bugseng.com/products/ppl/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/precice/default.nix b/nixpkgs/pkgs/development/libraries/precice/default.nix
index e8ae15ed31f4..c3c75e2413f0 100644
--- a/nixpkgs/pkgs/development/libraries/precice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/precice/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, petsc }:
+{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc }:
 
 stdenv.mkDerivation rec {
   pname = "precice";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = pname;
     rev = "v${version}";
-    sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg";
+    sha256 = "sha256-AQc+p/twsfkzwpWeznGpLLSqINKSrWCwH+PdNIrdYA8=";
   };
 
   cmakeFlags = [
@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ];
 
   nativeBuildInputs = [ cmake gcc ];
-  buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ];
-  enableParallelBuilding = true;
+  buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ];
 
   meta = {
     description = "preCICE stands for Precise Code Interaction Coupling Environment";
diff --git a/nixpkgs/pkgs/development/libraries/prison/default.nix b/nixpkgs/pkgs/development/libraries/prison/default.nix
index d40b4442e38e..4275622c24f4 100644
--- a/nixpkgs/pkgs/development/libraries/prison/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prison/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }:
+{ lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }:
 
 let v = "1.0"; in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt4 library for QR-codes";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
index c7a25f621714..93e415f62699 100644
--- a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "proj-datumgrid";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     cp nad2bin $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Repository for proj datum grids";
     homepage = "https://proj4.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/proj/5.2.nix b/nixpkgs/pkgs/development/libraries/proj/5.2.nix
index 7a97491d8ea1..ee76c668716c 100644
--- a/nixpkgs/pkgs/development/libraries/proj/5.2.nix
+++ b/nixpkgs/pkgs/development/libraries/proj/5.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "proj-5.2.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   doCheck = stdenv.is64bit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cartographic Projections Library";
     homepage = "https://proj4.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix
index 8618d62e834f..22d6206fd851 100644
--- a/nixpkgs/pkgs/development/libraries/proj/default.nix
+++ b/nixpkgs/pkgs/development/libraries/proj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "proj";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = stdenv.is64bit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cartographic Projections Library";
     homepage = "https://proj4.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix b/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix
index 57f4ef5956f6..9b18b25c7268 100644
--- a/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -50,9 +50,9 @@ let
       meta = {
         homepage = "https://github.com/digitalocean/prometheus-client-c/";
         inherit description;
-        platforms = stdenv.lib.platforms.unix;
-        license = stdenv.lib.licenses.asl20;
-        maintainers = [ stdenv.lib.maintainers.cfsmp3 ];
+        platforms = lib.platforms.unix;
+        license = lib.licenses.asl20;
+        maintainers = [ lib.maintainers.cfsmp3 ];
       };
     };
 in
diff --git a/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
index 5377d2b96d00..173ee6d2e09d 100644
--- a/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gbenchmark
@@ -33,10 +33,15 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-ldl";
 
+  postInstall = ''
+    mkdir -p $out/lib/pkgconfig
+    substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc
+  '';
+
   meta = {
     description = "Prometheus Client Library for Modern C++";
     homepage = "https://github.com/jupp0r/prometheus-cpp";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/nixpkgs/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in
new file mode 100644
index 000000000000..c373f4153b55
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in
@@ -0,0 +1,10 @@
+prefix=@out@
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: prometheus-cpp
+Description: Prometheus Client Library for Modern C++
+URL: https://github.com/jupp0r/prometheus-cpp
+Version: @version@
+Cflags: -isystem${includedir}
+Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push
diff --git a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
index 54fea18fd17e..431e6348b3fa 100644
--- a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , pkg-config
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtest doxygen graphviz lcov ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/properties-cpp";
     description = "A very simple convenience library for handling properties and signals in C++11";
     license = licenses.lgpl3Only;
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
index 4166aac7246b..f31a7868d5ec 100644
--- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook, zlib, gmock, buildPackages
 , version, sha256
@@ -25,7 +25,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
     chmod -R a+w gmock
     chmod -R a+w googletest
     ln -s ../googletest gmock/gtest
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
   '';
@@ -48,8 +48,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
         yet extensible format. Google uses Protocol Buffers for almost all of
         its internal RPC protocols and file formats.
       '';
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
     homepage = "https://developers.google.com/protocol-buffers/";
   };
 
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix
index 32d6f70d1eb6..7d64df436260 100644
--- a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, src
+{ lib, stdenv, version, src
 , autoreconfHook, zlib, gtest
 , ...
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     rm -rf gtest
     cp -r ${gtest.src}/googletest gtest
     chmod -R a+w gtest
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
   '';
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
       '';
     license = "mBSD";
     homepage = "https://developers.google.com/protocol-buffers/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
   passthru.version = version;
diff --git a/nixpkgs/pkgs/development/libraries/protobufc/generic.nix b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix
index 4b0d273ac44d..b64d75076baf 100644
--- a/nixpkgs/pkgs/development/libraries/protobufc/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix
@@ -1,5 +1,5 @@
-{ stdenv, src, version
-, autoreconfHook, pkgconfig, protobuf, zlib
+{ lib, stdenv, src, version
+, autoreconfHook, pkg-config, protobuf, zlib
 , ...
 }:
 
@@ -9,10 +9,10 @@ stdenv.mkDerivation {
 
   inherit src;
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ protobuf zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/protobuf-c/protobuf-c/";
     description = "C bindings for Google's Protocol Buffers";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/prototypejs/default.nix b/nixpkgs/pkgs/development/libraries/prototypejs/default.nix
index 3753dfacac3b..81e72036694b 100644
--- a/nixpkgs/pkgs/development/libraries/prototypejs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prototypejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... }:
+{ lib, stdenv, fetchurl, ... }:
 let
   version = "1.7.3.0";
 in fetchurl {
@@ -6,7 +6,7 @@ in fetchurl {
   url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js";
   sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A foundation for ambitious web user interfaces";
     longDescription = ''
       Prototype takes the complexity out of client-side web
diff --git a/nixpkgs/pkgs/development/libraries/protozero/default.nix b/nixpkgs/pkgs/development/libraries/protozero/default.nix
index 1c8e7e99313a..6bff5998b56d 100644
--- a/nixpkgs/pkgs/development/libraries/protozero/default.nix
+++ b/nixpkgs/pkgs/development/libraries/protozero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "protozero";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimalistic protocol buffer decoder and encoder in C++";
     homepage = "https://github.com/mapbox/protozero";
     license = with licenses; [ bsd2 asl20 ];
diff --git a/nixpkgs/pkgs/development/libraries/pslib/default.nix b/nixpkgs/pkgs/development/libraries/pslib/default.nix
index 08accd5d7df1..ec2362009ff3 100644
--- a/nixpkgs/pkgs/development/libraries/pslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, zlib, libpng, libjpeg, libungif, libtiff
+{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ zlib libpng libjpeg libungif libtiff ];
 
   doCheck = true;
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     cp -r ../doc/. $doc/share/doc/${pname}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C-library for generating multi page PostScript documents";
     homepage = "http://pslib.sourceforge.net/";
     changelog =
diff --git a/nixpkgs/pkgs/development/libraries/psol/generic.nix b/nixpkgs/pkgs/development/libraries/psol/generic.nix
index c61926fe13fa..57784c3a5028 100644
--- a/nixpkgs/pkgs/development/libraries/psol/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/psol/generic.nix
@@ -1,4 +1,4 @@
-{ fetchzip, stdenv }:
+{ fetchzip, lib, stdenv }:
 { version, sha256 }:
 { inherit version; } // fetchzip {
   inherit sha256;
@@ -8,9 +8,9 @@
   meta = {
     description = "PageSpeed Optimization Libraries";
     homepage    = "https://developers.google.com/speed/pagespeed/psol";
-    license     = stdenv.lib.licenses.asl20;
+    license     = lib.licenses.asl20;
     # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux.
     # TODO: Build PSOL from source to support more platforms.
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix b/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
index 43da67d3d9b6..82ee5c3ae44d 100644
--- a/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiodbc, postgresql, openssl }:
+{ lib, stdenv, fetchurl, libiodbc, postgresql, openssl }:
 
 stdenv.mkDerivation rec {
   name = "psqlodbc-09.01.0200";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-iodbc=${libiodbc}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://odbc.postgresql.org/";
     description = "ODBC driver for PostgreSQL";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/pstreams/default.nix b/nixpkgs/pkgs/development/libraries/pstreams/default.nix
index e3cb9dd67a3b..bb9b6bc9c84b 100644
--- a/nixpkgs/pkgs/development/libraries/pstreams/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pstreams/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 }:
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/pstreams/code";
-    rev = let dot2Underscore = stdenv.lib.strings.stringAsChars (c: if c == "." then "_" else c);
+    rev = let dot2Underscore = lib.strings.stringAsChars (c: if c == "." then "_" else c);
           in "RELEASE_${dot2Underscore version}";
     sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys";
   };
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     # `make install` fails on case-insensitive file systems (e.g. APFS by
     # default) because this target exists
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "POSIX Process Control in C++";
     longDescription = ''
       PStreams allows you to run another program from your C++ application and
diff --git a/nixpkgs/pkgs/development/libraries/ptex/default.nix b/nixpkgs/pkgs/development/libraries/ptex/default.nix
index b4571d07fbf3..3f62d672ea97 100644
--- a/nixpkgs/pkgs/development/libraries/ptex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ptex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }:
 
 stdenv.mkDerivation rec
 {
@@ -14,9 +14,8 @@ stdenv.mkDerivation rec
 
   outputs = [ "bin" "dev" "out" "lib" ];
 
-  buildInputs = [ zlib python cmake pkg-config ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib python pkg-config ];
 
   # Can be removed in the next release
   # https://github.com/wdas/ptex/pull/42
@@ -24,7 +23,7 @@ stdenv.mkDerivation rec
     echo v${version} >version
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Per-Face Texture Mapping for Production Rendering";
     homepage = "http://ptex.us/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/pth/default.nix b/nixpkgs/pkgs/development/libraries/pth/default.nix
index c64d0b37686b..240c903a8a77 100644
--- a/nixpkgs/pkgs/development/libraries/pth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "pth-2.0.7";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
   };
 
-  preConfigure = stdenv.lib.optionalString stdenv.isAarch32 ''
+  preConfigure = lib.optionalString stdenv.isAarch32 ''
     configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
+  '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
     configureFlagsArray+=("ac_cv_check_sjlj=ssjlj")
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Portable Threads library";
     homepage = "https://www.gnu.org/software/pth";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/nixpkgs/pkgs/development/libraries/pupnp/default.nix
index 4930b222d03c..150005646379 100644
--- a/nixpkgs/pkgs/development/libraries/pupnp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pupnp/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config }:
+{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libupnp";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = "BSD-style";
 
     homepage = "http://pupnp.sourceforge.net/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/pxlib/default.nix b/nixpkgs/pkgs/development/libraries/pxlib/default.nix
index 2624c718d274..3acaf8bac157 100644
--- a/nixpkgs/pkgs/development/libraries/pxlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pxlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool }:
+{ lib, stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
   pname = "pxlib";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to read and write Paradox files";
     homepage = "http://pxlib.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
index 047142c8a5df..58d38651a760 100644
--- a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , python3, qmake, qtbase, qtquickcontrols, qtsvg, ncurses }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   patches = [ ./qml-path.patch ];
   installTargets = [ "sub-src-install_subtargets" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Asynchronous Python 3 Bindings for Qt 5";
     homepage = "https://thp.io/2011/pyotherside/";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/nixpkgs/pkgs/development/libraries/python-qt/default.nix
index 6f2550ca9aca..bd778f1a945d 100644
--- a/nixpkgs/pkgs/development/libraries/python-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/python-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, qmake,
+{ lib, stdenv, fetchurl, python, qmake,
   qtwebengine, qtxmlpatterns,
   qttools, unzip }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     cp -r ./extensions $out/include/PythonQt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications";
     homepage = "http://pythonqt.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix
index 06de3f7c5693..d1b545884b53 100644
--- a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }:
+{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "qca-qt5";
@@ -10,19 +10,19 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openssl qtbase ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   # Without this patch cmake fails with a "No known features for CXX compiler"
   # error on darwin
-  patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ;
+  patches = lib.optional stdenv.isDarwin ./move-project.patch ;
 
   # tells CMake to use this CA bundle file if it is accessible
-  preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
+  preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
 
   # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
   cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt 5 Cryptographic Architecture";
     homepage = "http://delta.affinix.com/qca";
     maintainers = with maintainers; [ ttuegel ];
diff --git a/nixpkgs/pkgs/development/libraries/qca2/default.nix b/nixpkgs/pkgs/development/libraries/qca2/default.nix
index bb89d6926815..42dcf1a87d36 100644
--- a/nixpkgs/pkgs/development/libraries/qca2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qca2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, cmake, pkgconfig, qt, darwin }:
+{ lib, stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "qca";
@@ -9,11 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ openssl qt ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
-
-  enableParallelBuilding = true;
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   # tells CMake to use this CA bundle file if it is accessible
   preConfigure = ''
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
     sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt Cryptographic Architecture";
     license = "LGPL";
     homepage = "http://delta.affinix.com/qca";
diff --git a/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix b/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix
index 3ff642bbfb98..f739c1bc275e 100644
--- a/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchFromGitHub
 , nix-update-script
-, pkgconfig
+, pkg-config
 , gtk3
 , glib
 , qtbase
@@ -33,7 +33,7 @@ mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     qmake
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/qhull/default.nix b/nixpkgs/pkgs/development/libraries/qhull/default.nix
index 689a4877541c..78e111353115 100644
--- a/nixpkgs/pkgs/development/libraries/qhull/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qhull/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
   name = "qhull-2016.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.qhull.org/";
     description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more";
     license = licenses.qhull;
diff --git a/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix b/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix
index 51253676341f..709a3fb1533d 100644
--- a/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, qt4}:
+{lib, stdenv, fetchurl, cmake, qt4}:
 
 let
   pn = "qimageblitz";
@@ -13,14 +13,15 @@ stdenv.mkDerivation {
     sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
   };
 
-  buildInputs = [ cmake qt4 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
 
   patches = [ ./qimageblitz-9999-exec-stack.patch ];
 
   meta = {
     description = "Graphical effect and filter library for KDE4";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     homepage = "http://${pn}.sourceforge.net";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/qjson/default.nix b/nixpkgs/pkgs/development/libraries/qjson/default.nix
index ab4a96e65ea6..a6ee272a38b5 100644
--- a/nixpkgs/pkgs/development/libraries/qjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt4 }:
+{ lib, stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   version = "0.9.0";
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
   };
 
-  buildInputs = [ cmake qt4 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight data-interchange format";
     homepage = "http://qjson.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix
index 03247f9d695b..88c945430451 100644
--- a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix
@@ -1,4 +1,4 @@
-{stdenv, qtdeclarative, fetchFromGitHub, qmake }:
+{lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }:
 stdenv.mkDerivation {
   name = "qml-box2d-2018-04-06";
   src = fetchFromGitHub {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A QML plugin for Box2D engine";
     homepage = "https://github.com/qml-box2d/qml-box2d";
     maintainers = [ maintainers.guibou ];
diff --git a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix
index ac2584573114..75f95a53800a 100644
--- a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
+{ lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }:
 
 stdenv.mkDerivation {
   version = "2018-11-24";
@@ -12,10 +12,18 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ qtbase qtquick1 qtmultimedia ]
-                ++ stdenv.lib.optional stdenv.isDarwin utmp;
+                ++ lib.optional stdenv.isDarwin utmp;
   nativeBuildInputs = [ qmake ];
 
-  patchPhase = ''
+  patches = [
+    (fetchpatch {
+      name = "fix-missing-includes.patch";
+      url = "https://github.com/Swordfish90/qmltermwidget/pull/27/commits/485f8d6d841b607ba49e55a791f7f587e4e193bc.diff";
+      sha256 = "186s8pv3642vr4lxsds919h0y2vrkl61r7wqq9mc4a5zk5vprinj";
+    })
+  ];
+
+  postPatch = ''
     substituteInPlace qmltermwidget.pro \
       --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/"
   '';
@@ -27,8 +35,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A QML port of qtermwidget";
     homepage = "https://github.com/Swordfish90/qmltermwidget";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ skeidel ];
+    license = lib.licenses.gpl2;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ skeidel ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/qoauth/default.nix b/nixpkgs/pkgs/development/libraries/qoauth/default.nix
index 41e4b80d9c3a..8afa19c229fa 100644
--- a/nixpkgs/pkgs/development/libraries/qoauth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qoauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }:
+{ lib, stdenv, fetchurl, qtbase, qmake, qca-qt5 }:
 
 stdenv.mkDerivation {
   name = "qoauth-2.0.0";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto";
   NIX_LDFLAGS = "-lqca-qt5";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt library for OAuth authentication";
     inherit (qtbase.meta) platforms;
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix
index a427bd5d0518..aba9e77691a9 100644
--- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libjpeg, zlib, perl }:
+{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }:
 
 stdenv.mkDerivation rec {
   pname = "qpdf";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://qpdf.sourceforge.net/";
     description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = licenses.asl20; # as of 7.0.0, people may stay at artistic2
diff --git a/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix b/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix
index b5faaf90ef7a..80ce9e1d0f85 100644
--- a/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "qrcodegen";
   version = "1.6.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp qrcodegen.h $out/include/qrcodegen/
   '';
 
-  meta = with stdenv.lib;
+  meta = with lib;
     {
       description = "qrcode generator library in multiple languages";
 
diff --git a/nixpkgs/pkgs/development/libraries/qrencode/default.nix b/nixpkgs/pkgs/development/libraries/qrencode/default.nix
index 2c60c4c10d07..c005b835a932 100644
--- a/nixpkgs/pkgs/development/libraries/qrencode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qrencode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }:
+{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "qrencode";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4=";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   configureFlags = [
     "--with-tests"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fukuchi.org/works/qrencode/";
     description = "C library for encoding data in a QR Code symbol";
 
diff --git a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
index b941021cb688..ad7e88d4647e 100644
--- a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchurl
 , gfortran
 , blas
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
       "LAPACK=-L${lapack}/lib -llapack"
       "BLAS=-L${blas}/lib -lblas"
       "PREFIX=${placeholder "out"}"
-      ${stdenv.lib.optionalString blas.isILP64
+      ${lib.optionalString blas.isILP64
       # If another application intends to use qrupdate compiled with blas with
       # 64 bit support, it should add this to it's FFLAGS as well. See (e.g):
       # https://savannah.gnu.org/bugs/?50339
@@ -39,13 +40,13 @@ stdenv.mkDerivation rec {
 
   buildFlags = [ "lib" "solib" ];
 
-  installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];
+  installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];
 
   buildInputs = [ gfortran ];
 
   nativeBuildInputs = [ which ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for fast updating of qr and cholesky decompositions";
     homepage = "https://sourceforge.net/projects/qrupdate/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix
index 19aebd715d6b..26a3c2e36d3b 100644
--- a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
       --replace '$$[QT_INSTALL_DATA]'         $out/share${lib.optionalString (! withQt5) "/qt"}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Qt port of the Scintilla text editing library";
     longDescription = ''
       QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
diff --git a/nixpkgs/pkgs/development/libraries/qt-3/default.nix b/nixpkgs/pkgs/development/libraries/qt-3/default.nix
index f5837717622c..b2d818a2972d 100644
--- a/nixpkgs/pkgs/development/libraries/qt-3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , xftSupport ? true, libXft ? null
 , xrenderSupport ? true, libXrender ? null
 , xrandrSupport ? true, libXrandr ? null
@@ -6,8 +6,8 @@
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
 , mysqlSupport ? false, libmysqlclient ? null
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , libGL ? null, libGLU ? null, libXmu ? null
 , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   configureFlags = let
-    mk = cond: name: "-${stdenv.lib.optionalString (!cond) "no-"}${name}";
+    mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}";
   in [
     "-v"
     "-system-zlib" "-system-libpng" "-system-libjpeg"
@@ -49,21 +49,21 @@ stdenv.mkDerivation {
     (mk xineramaSupport "xinerama")
     (mk xrandrSupport "xrandr")
     (mk xftSupport "xft")
-  ] ++ stdenv.lib.optionals openglSupport [
+  ] ++ lib.optionals openglSupport [
     "-dlopen-opengl"
     "-L${libGL}/lib" "-I${libGLU}/include"
     "-L${libXmu.out}/lib" "-I${libXmu.dev}/include"
-  ] ++ stdenv.lib.optionals xrenderSupport [
+  ] ++ lib.optionals xrenderSupport [
     "-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
-  ] ++ stdenv.lib.optionals xrandrSupport [
+  ] ++ lib.optionals xrandrSupport [
     "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include"
-  ] ++ stdenv.lib.optionals xineramaSupport [
+  ] ++ lib.optionals xineramaSupport [
     "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include"
-  ] ++ stdenv.lib.optionals cursorSupport [
+  ] ++ lib.optionals cursorSupport [
     "-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
-  ] ++ stdenv.lib.optionals mysqlSupport [
+  ] ++ lib.optionals mysqlSupport [
     "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
-  ] ++ stdenv.lib.optionals xftSupport [
+  ] ++ lib.optionals xftSupport [
     "-L${libXft.out}/lib" "-I${libXft.dev}/include"
     "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
     "-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include"
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
 
   passthru = {inherit mysqlSupport;};
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = with licenses; [ gpl2 qpl ];
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 3deea882bb6c..7dddd2bc67d2 100644
--- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchurl, fetchpatch, substituteAll
 , libXrender, libXinerama, libXcursor, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
-, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
+, libmng, which, libGLU, openssl, dbus, cups, pkg-config
 , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
 , alsaLib
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , flashplayerFix ? false, gdk-pixbuf
 , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
@@ -199,7 +199,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
     ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
 
-  nativeBuildInputs = [ perl pkgconfig which ];
+  nativeBuildInputs = [ perl pkg-config which ];
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
index 87a88ddf9b0d..cf5a0de11ad1 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
+  lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
   llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
   debug ? false,
 }:
 
-with stdenv.lib;
+with lib;
 
 let
 
@@ -119,7 +119,7 @@ let
     import ../qtModule.nix
     {
       inherit perl;
-      inherit (stdenv) lib;
+      inherit lib;
       # Use a variant of mkDerivation that does not include wrapQtApplications
       # to avoid cyclic dependencies between Qt modules.
       mkDerivation =
@@ -136,7 +136,7 @@ let
 
       mkDerivationWith =
         import ../mkDerivation.nix
-        { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
+        { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
 
       mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
 
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
index 3eefd23fde73..7139a3b73541 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
+  lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
   llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
   debug ? false,
 }:
 
-with stdenv.lib;
+with lib;
 
 let
 
@@ -87,6 +87,22 @@ let
         stripLen = 1;
         extraPrefix = "src/3rdparty/";
       })
+      # Fix build with GCC 10 (part 1): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=fad3e27b
+      (fetchpatch {
+        name = "qtwebengine-gcc10-part1.patch";
+        url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=fad3e27bfb50d1e23a07577f087a826b5e00bb1d";
+        sha256 = "0c55j9zww8jyif6wl7jy1qqidgw9fdhiyfjgzhzi85r716m4pwwd";
+        stripLen = 1;
+        extraPrefix = "src/3rdparty/";
+      })
+      # Fix build with GCC 10 (part 2): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=193c5bed
+      (fetchpatch {
+        name = "qtwebengine-gcc10-part2.patch";
+        url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=193c5bed1cff123e21b7e6d12f464d6709ace2e3";
+        sha256 = "1jb6s32ara6l4rbn4h3gg95mzv8sd8dl1zpjaqwywf1w7p8ymk86";
+        stripLen = 1;
+        extraPrefix = "src/3rdparty/";
+      })
     ]
       ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
     qtwebkit = [
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index 08fd3a9720cf..a3a0496f160f 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
+  lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
   llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
   debug ? false,
 }:
 
-with stdenv.lib;
+with lib;
 
 let
 
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
index cc6e45e3ebde..24f1d6f81a24 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -2,7 +2,7 @@
   stdenv, lib,
   src, patches, version, qtCompatVersion,
 
-  coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3,
+  coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3,
   which,
   # darwin support
   darwin, libiconv,
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs =
-    [ bison flex gperf lndir perl pkgconfig which ];
+    [ bison flex gperf lndir perl pkg-config which ];
 
   propagatedNativeBuildInputs = [ lndir ];
 
@@ -356,8 +356,6 @@ stdenv.mkDerivation {
         ]
     );
 
-  enableParallelBuilding = true;
-
   postInstall =
     # Move selected outputs.
     ''
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
index 36a736d03dc5..f6aeb23fb7b4 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
@@ -1,8 +1,8 @@
-{ qtModule, stdenv, qtbase, qtdeclarative, bluez }:
+{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
 
 qtModule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
-  buildInputs = stdenv.lib.optional stdenv.isLinux bluez;
+  buildInputs = lib.optional stdenv.isLinux bluez;
   outputs = [ "out" "dev" "bin" ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
index 281f6e0b8ecd..6bc023eb9bbd 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
@@ -1,9 +1,9 @@
-{ qtModule, qtbase, qtdeclarative, pkgconfig }:
+{ qtModule, qtbase, qtdeclarative, pkg-config }:
 
 qtModule {
   name = "qtgamepad";
   qtInputs = [ qtbase qtdeclarative ];
   buildInputs = [ ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   outputs = [ "out" "dev" "bin" ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index a80785d8099a..182b5f5bc334 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix
@@ -1,10 +1,10 @@
-{ stdenv, qtModule, qtbase, qtmultimedia }:
+{ lib, stdenv, qtModule, qtbase, qtmultimedia }:
 
 qtModule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
   outputs = [ "bin" "out" "dev" ];
-  qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
+  qmakeFlags = lib.optional stdenv.isDarwin [
      # boost uses std::auto_ptr which has been disabled in clang with libcxx
      # This flag re-enables this feature
      # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 11964caf17b1..6639e4c8d697 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
@@ -1,9 +1,9 @@
-{ stdenv, qtModule, qtbase }:
+{ lib, stdenv, qtModule, qtbase }:
 
 qtModule {
   name = "qtmacextras";
   qtInputs = [ qtbase ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ periklis ];
     platforms = platforms.darwin;
   };
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index 42ed23bb6dc9..eb2c3bc7431d 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
@@ -1,13 +1,13 @@
-{ qtModule, stdenv, qtbase, qtdeclarative, pkgconfig
+{ qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
 }:
 
-with stdenv.lib;
+with lib;
 
 qtModule {
   name = "qtmultimedia";
   qtInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]
     ++ optional (stdenv.isLinux) alsaLib
     ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix
index c7a7704f2837..5291ea9c9a78 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix
@@ -1,9 +1,9 @@
-{ qtModule, qtbase, qtquickcontrols, wayland, pkgconfig }:
+{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }:
 
 qtModule {
   name = "qtwayland";
   qtInputs = [ qtbase qtquickcontrols ];
   buildInputs = [ wayland ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   outputs = [ "out" "dev" "bin" ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index b98b711c0f5d..b79479e5dbab 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -1,7 +1,7 @@
 { qtModule
 , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
 
-, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which
+, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which
 
 , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
 , fontconfig, freetype, harfbuzz, icu, dbus, libdrm
@@ -18,13 +18,13 @@
 , lib, stdenv, fetchpatch
 }:
 
-with stdenv.lib;
+with lib;
 
 qtModule {
   name = "qtwebengine";
   qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
   nativeBuildInputs = [
-    bison coreutils flex git gperf ninja pkgconfig python2 which gn
+    bison coreutils flex git gperf ninja pkg-config python2 which gn
   ] ++ optional stdenv.isDarwin xcbuild;
   doCheck = true;
   outputs = [ "bin" "dev" "out" ];
@@ -88,7 +88,7 @@ qtModule {
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
     # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
     "-Wno-class-memaccess"
-  ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
+  ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
     # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
     # TODO: investigate and fix properly
     "-march=westmere"
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 3d9e72bb54fa..ed41a4ac9bc0 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -2,7 +2,7 @@
 , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel
 , fontconfig, gtk2, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1, cmake
-, bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby
+, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby
 , darwin
 , flashplayerFix ? false
 }:
@@ -31,7 +31,7 @@ qtModule {
     ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ])
     ++ optional usingAnnulenWebkitFork hyphen;
   nativeBuildInputs = [
-    bison flex gdb gperf perl pkgconfig python2 ruby
+    bison flex gdb gperf perl pkg-config python2 ruby
   ] ++ optional usingAnnulenWebkitFork cmake;
 
   cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ]
@@ -43,7 +43,7 @@ qtModule {
 
   # QtWebKit overrides qmake's default_pre and default_post features,
   # so its custom qmake files must be found first at the front of QMAKEPATH.
-  preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) ''
+  preConfigure = lib.optionalString (!usingAnnulenWebkitFork) ''
     QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
     fixQtBuiltinPaths . '*.pr?'
     # Fix hydra's "Log limit exceeded"
@@ -72,6 +72,6 @@ qtModule {
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
 
   meta = {
-    maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
+    maintainers = with lib.maintainers; [ abbradar periklis ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix
index 906d750c5d3f..4034dce49f56 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix
@@ -1,6 +1,6 @@
-{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }:
+{ darwin, lib, stdenv, qtModule, qtdeclarative, qtwebengine }:
 
-with stdenv.lib;
+with lib;
 
 qtModule {
   name = "qtwebview";
diff --git a/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix b/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix
index ba44a217e3d7..60c1d2754d70 100644
--- a/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
+{ lib, stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
 # possible additional dependencies: pulseaudio udev networkmanager immerson qmf
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qt4 libX11 bluez perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt Mobility";
     homepage = "http://qt.nokia.com/products/qt-addons/mobility";
     maintainers = [ maintainers.qknight ];
diff --git a/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix
index 3c4c192bd4b9..91f853711066 100644
--- a/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''Qt installer framework'';
+    description = "Qt installer framework";
     inherit (qtbase.meta) platforms license homepage;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix
index ddfdc2f67d30..6da4abb756e6 100644
--- a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null
 , withQt5 ? false, qtbase ? null, qttools ? null
 , darwin ? null
 , libsecret
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
 
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret
+    ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
   ;
 
-  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ]
+  buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
     ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ])
-    ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       CoreFoundation Security
     ])
   ;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Platform-independent Qt API for storing passwords securely";
     homepage = "https://github.com/frankosterfeld/qtkeychain";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix b/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix
index ecff7f7f8215..3558201015c6 100644
--- a/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, protobuf }:
+{ lib, stdenv, fetchFromGitHub, qmake, qtbase, protobuf }:
 
 stdenv.mkDerivation rec {
   pname = "qtpbfimageplugin";
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
     # Fix plugin dir
     substituteInPlace pbfplugin.pro \
       --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # Fix darwin build
     substituteInPlace pbfplugin.pro \
       --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt image plugin for displaying Mapbox vector tiles";
     longDescription = ''
       QtPBFImagePlugin is a Qt image plugin that enables applications capable of
diff --git a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix
index a6cffd73c3ff..0164f8884a27 100644
--- a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4 }:
+{ lib, stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation {
   name = "qtscriptgenerator-0.1.0";
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
     description = "QtScript bindings generator";
     homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/";
     inherit (qt4.meta) platforms;
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
index a5c96dc351b9..7290b3830d07 100644
--- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }:
+{ lib, stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }:
 
 stdenv.mkDerivation rec {
   pname = "qtstyleplugin-kvantum-qt4";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     mv $TMP/kvantum/${qt4}/lib $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SVG-based Qt4 theme engine";
     homepage = "https://github.com/tsujan/Kvantum";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 71ca8e720a41..c2fa32b6d05a 100644
--- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
+{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
 , libX11, libXext, qttools, wrapQtAppsHook
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SVG-based Qt5 theme engine plus a config tool and extra themes";
     homepage = "https://github.com/tsujan/Kvantum";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix
index 1970dd183c1c..84d7f46a2b29 100644
--- a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
 
 mkDerivation {
   name = "qtstyleplugins-2017-03-11";
@@ -12,10 +12,10 @@ mkDerivation {
 
   patches = [ ./fix-build-against-Qt-5.15.patch ];
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  nativeBuildInputs = [ pkg-config qmake ];
   buildInputs = [ gtk2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique";
     homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix
index 916e381ab4da..831c51fa234d 100644
--- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix
@@ -1,4 +1,12 @@
-{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkgconfig }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, cpp-utilities
+, qttools
+, qtbase
+, cmake
+, pkg-config
+}:
 
 stdenv.mkDerivation rec {
   pname = "qtutilities";
@@ -14,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase cpp-utilities ];
   nativeBuildInputs = [ cmake qttools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Martchus/qtutilities";
     description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
index d1b921deac02..652c49aa6ca2 100644
--- a/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
+{ lib, stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
 
 stdenv.mkDerivation {
   name = "qtwebkit-plugins-2017-01-25";
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
   buildInputs = [ qtwebkit hunspell ];
 
   postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-${stdenv.lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
+    sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
     sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit";
     homepage = "https://github.com/QupZilla/qtwebkit-plugins";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/quazip/default.nix b/nixpkgs/pkgs/development/libraries/quazip/default.nix
index c399298b8f86..3f186314d013 100644
--- a/nixpkgs/pkgs/development/libraries/quazip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }:
+{ fetchFromGitHub, lib, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   pname = "quazip";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib qtbase ];
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides access to ZIP archives from Qt programs";
     license = licenses.lgpl21Plus;
     homepage = "https://stachenov.github.io/quazip/"; # Migrated from http://quazip.sourceforge.net/
diff --git a/nixpkgs/pkgs/development/libraries/quesoglc/default.nix b/nixpkgs/pkgs/development/libraries/quesoglc/default.nix
index 6aebb7a6511d..1a4fcca9d9b0 100644
--- a/nixpkgs/pkgs/development/libraries/quesoglc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/quesoglc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }:
+{ lib, stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }:
 stdenv.mkDerivation rec {
   pname = "quesoglc";
   version = "0.7.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ libGLU libGL glew freetype fontconfig fribidi libX11 ];
   # FIXME: Configure fails to use system glew.
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free implementation of the OpenGL Character Renderer";
     longDescription = ''
       QuesoGLC is a free (as in free speech) implementation of the OpenGL
diff --git a/nixpkgs/pkgs/development/libraries/quickder/default.nix b/nixpkgs/pkgs/development/libraries/quickder/default.nix
index e5346b42b9fb..28933f96fa1c 100644
--- a/nixpkgs/pkgs/development/libraries/quickder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages, hexio
+{ lib, stdenv, fetchFromGitHub, python2Packages, hexio
 , cmake, bash, arpa2cm, git, asn2quickder }:
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     export PREFIX=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Quick (and Easy) DER, a Library for parsing ASN.1";
     homepage = "https://github.com/vanrein/quick-der";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/quickfix/default.nix b/nixpkgs/pkgs/development/libraries/quickfix/default.nix
new file mode 100644
index 000000000000..6644b9885c25
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/quickfix/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  pname = "quickfix";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev =  "v${version}";
+    sha256 = "1fgpwgvyw992mbiawgza34427aakn5zrik3sjld0i924a9d17qwg";
+  };
+
+  patches = [
+    # Improved C++17 compatibility
+    (fetchpatch {
+      url = "https://github.com/quickfix/quickfix/commit/a46708090444826c5f46a5dbf2ba4b069b413c58.diff";
+      sha256 = "1wlk4j0wmck0zm6a70g3nrnq8fz0id7wnyxn81f7w048061ldhyd";
+    })
+    ./disableUnitTests.patch
+  ];
+
+  # autoreconfHook does not work
+  nativeBuildInputs = [ autoconf automake libtool ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    ./bootstrap
+  '';
+
+  # More hacking out of the unittests
+  preBuild = ''
+    substituteInPlace Makefile --replace 'UnitTest++' ' '
+  '';
+
+  meta = with lib; {
+    description = "QuickFIX C++ Fix Engine Library";
+    homepage = "http://www.quickfixengine.org";
+    license = licenses.free; # similar to BSD 4-clause
+    maintainers = with maintainers; [ bhipple ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/quickfix/disableUnitTests.patch b/nixpkgs/pkgs/development/libraries/quickfix/disableUnitTests.patch
new file mode 100644
index 000000000000..41a2f698e55f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/quickfix/disableUnitTests.patch
@@ -0,0 +1,65 @@
+diff -u -r source-baseline-patchPhase/configure.ac source/configure.ac
+--- source-baseline-patchPhase/configure.ac	1970-01-01 00:00:01.000000000 +0000
++++ source/configure.ac	2021-01-12 22:49:28.948861699 +0000
+@@ -43,7 +43,7 @@
+ 
+ AC_CANONICAL_HOST
+ 
+-build_no_unit_test = no
++build_no_unit_test = yes
+ 
+ # Detect the target system
+ case "${host_os}" in
+@@ -344,8 +344,6 @@
+     examples/Makefile
+     examples/executor/Makefile
+     examples/executor/C++/Makefile
+-    examples/ordermatch/Makefile
+-    examples/ordermatch/test/Makefile
+     examples/tradeclient/Makefile
+     examples/tradeclientgui/Makefile
+     examples/tradeclientgui/banzai/Makefile
+diff -u -r source-baseline-patchPhase/examples/Makefile.am source/examples/Makefile.am
+--- source-baseline-patchPhase/examples/Makefile.am	1970-01-01 00:00:01.000000000 +0000
++++ source/examples/Makefile.am	2021-01-12 22:51:55.782568550 +0000
+@@ -1,3 +1,3 @@
+-SUBDIRS = executor ordermatch tradeclient tradeclientgui
++SUBDIRS = executor tradeclient tradeclientgui
+ 
+-EXTRA_DIST = examples.dsw configure configure.in bootstrap Makefile.am
+\ No newline at end of file
++EXTRA_DIST = examples.dsw configure configure.in bootstrap Makefile.am
+diff -u -r source-baseline-patchPhase/src/Makefile.am source/src/Makefile.am
+--- source-baseline-patchPhase/src/Makefile.am	1970-01-01 00:00:01.000000000 +0000
++++ source/src/Makefile.am	2021-01-12 22:53:02.593432380 +0000
+@@ -15,27 +15,23 @@
+ if NO_UNIT_TEST
+ noinst_PROGRAMS =
+ else
+-noinst_PROGRAMS = at ut pt
++noinst_PROGRAMS = at pt
+ endif
+ 
+ at_SOURCES = at.cpp at_application.h
+-ut_SOURCES = ut.cpp
+ pt_SOURCES = pt.cpp
+ 
+ EXTRA_DIST = getopt.c getopt-repl.h
+ 
+ at_LDADD = C++/libquickfix.la
+-ut_LDADD = C++/test/libquickfixcpptest.la C++/libquickfix.la
+ pt_LDADD = C++/libquickfix.la
+ 
+ INCLUDES =-IC++ -IC++/test -I../UnitTest++/src
+-LDFLAGS =-L../UnitTest++ -lUnitTest++
++ 
+ 
+ all-local:
+-	rm -f ../test/ut ../test/pt ../test/at ../test/ut_debug
+-	ln -s ../src/ut ../test/ut
++	rm -rf ../test/pt ../test/at ../test/ut_debug
+ 	ln -s ../src/pt ../test/pt
+ 	ln -s ../src/at ../test/at
+-	ln -s ../src/.libs/ut ../test/ut_debug
+ 
+ clean-local:
diff --git a/nixpkgs/pkgs/development/libraries/qwt/6.nix b/nixpkgs/pkgs/development/libraries/qwt/6.nix
index 1a29bb90fbb4..edfd3b4e24a3 100644
--- a/nixpkgs/pkgs/development/libraries/qwt/6.nix
+++ b/nixpkgs/pkgs/development/libraries/qwt/6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
+{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qwt-6.1.5";
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
 
   qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = stdenv.lib.licenses.qwt;
+    license = lib.licenses.qwt;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
     branch = "6";
diff --git a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix
index 4b7aa9cf7f98..61903af93fac 100644
--- a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix
+++ b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, AGL }:
+{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }:
 
 stdenv.mkDerivation rec {
   name = "qwt-6.1.5";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     qt4
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AGL ];
+  ] ++ lib.optionals stdenv.isDarwin [ AGL ];
 
   nativeBuildInputs = [ qmake4Hook ];
 
@@ -22,18 +22,18 @@ stdenv.mkDerivation rec {
 
   # qwt.framework output includes a relative reference to itself, which breaks dependents
   preFixup =
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       echo "Attempting to repair qwt"
       install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt"
     '';
 
   qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = stdenv.lib.licenses.qwt;
+    license = lib.licenses.qwt;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.bjornfor ];
     branch = "6";
diff --git a/nixpkgs/pkgs/development/libraries/qwt/default.nix b/nixpkgs/pkgs/development/libraries/qwt/default.nix
index c206ffdd5db0..e158fe348856 100644
--- a/nixpkgs/pkgs/development/libraries/qwt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qwt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "qwt-5.2.3";
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
     qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = stdenv.lib.licenses.qwt;
+    license = lib.licenses.qwt;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/qxt/default.nix b/nixpkgs/pkgs/development/libraries/qxt/default.nix
index 3104aefb9edb..9d035ce9d89a 100644
--- a/nixpkgs/pkgs/development/libraries/qxt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qxt/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, which, coreutils, fetchzip, qt4 }:
+{ lib, stdenv, which, coreutils, fetchzip, qt4 }:
 
 stdenv.mkDerivation rec {
   pname = "qxt";
   version = "0.6.2";
-  
+
   src = fetchzip {
     url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz";
     sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz";
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
       classes to add functionality not readily available in the Qt toolkit by Qt
       Development Frameworks, Nokia.
     '';
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ forkk ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ forkk ];
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
index d24bce96997d..94a9adcae877 100644
--- a/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }:
+{ lib, stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }:
 
 stdenv.mkDerivation rec {
   pname = "rabbitmq-c";
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1iv7aww4pam8497s524xjxbbxypyqd01qgrb0b429y3q9x06m4sw";
   };
 
-  buildInputs = [ cmake openssl popt xmlto ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openssl popt xmlto ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RabbitMQ C AMQP client library";
     homepage = "https://github.com/alanxz/rabbitmq-c";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
index e84770ec0f5b..b649b1d9c113 100644
--- a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }:
+{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "rabbitmq-java-client-3.3.4";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
       --add-flags "-Djava.awt.headless=true -cp $out/share/java/\* com.rabbitmq.examples.PerfTest"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers";
     homepage = "https://www.rabbitmq.com/java-client.html";
     license = with licenses; [ mpl11 gpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix
index 68c4a95d0b68..69fa7f6eadc5 100644
--- a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libuv }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }:
 
 stdenv.mkDerivation rec {
   pname = "raft-canonical";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr";
   };
 
-  nativeBuildInputs = [ autoreconfHook file pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook file pkg-config ];
   buildInputs = [ libuv ];
 
   preConfigure = ''
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Fully asynchronous C implementation of the Raft consensus protocol
     '';
diff --git a/nixpkgs/pkgs/development/libraries/randomx/default.nix b/nixpkgs/pkgs/development/libraries/randomx/default.nix
index 6de7ecdfef36..8e99ca1be354 100644
--- a/nixpkgs/pkgs/development/libraries/randomx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/randomx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "randomX";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Proof of work algorithm based on random code execution";
     homepage = "https://github.com/tevador/RandomX";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/rang/default.nix b/nixpkgs/pkgs/development/libraries/rang/default.nix
index b3d300baca2e..79ab52fc8351 100644
--- a/nixpkgs/pkgs/development/libraries/rang/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "rang";
   version = "v3.1.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s";
   };
   nativeBuildInputs = [ cmake ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "A Minimal, Header only Modern c++ library for terminal goodies";
     homepage = "https://agauniyal.github.io/rang/";
diff --git a/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/nixpkgs/pkgs/development/libraries/range-v3/default.nix
index 3799ccbb59c6..1e9df5be2346 100644
--- a/nixpkgs/pkgs/development/libraries/range-v3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/range-v3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "range-v3";
@@ -19,14 +19,12 @@ stdenv.mkDerivation rec {
 
   # Building the tests currently fails on AArch64 due to internal compiler
   # errors (with GCC 9.2):
-  cmakeFlags = stdenv.lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
+  cmakeFlags = lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
 
   doCheck = !stdenv.isAarch64;
   checkTarget = "test";
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Experimental range library for C++11/14/17";
     homepage = "https://github.com/ericniebler/range-v3";
     changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}";
diff --git a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
index 492e12289781..4df98c3026e5 100644
--- a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ lib, stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "rapidcheck";
-  version = "unstable-2018-09-27";
+  version = "unstable-2020-12-19";
 
   src = fetchFromGitHub {
     owner = "emil-e";
     repo  = "rapidcheck";
-    rev   = "de54478fa35c0d9cea14ec0c5c9dfae906da524c";
-    sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs";
+    rev   = "b78f89288c7e086d06e2a1e10b605d8375517a8a";
+    sha256 = "0fj11gbhkaxbsgix2im7vdfvr26l75b8djk462sfw8xrwrfkjbdz";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     rm $out/extras/**/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ framework for property based testing inspired by QuickCheck";
     inherit (src.meta) homepage;
     maintainers = with maintainers; [ jb55 ];
diff --git a/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
index ea91c1507dc3..52a0877e77f3 100644
--- a/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }:
+{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "rapidjson";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt --replace "-Werror" ""
diff --git a/nixpkgs/pkgs/development/libraries/rapidxml/default.nix b/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
index ca072f2ca4b0..e5ae16087cbd 100644
--- a/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "rapidxml";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp * $out/include/${pname}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast XML DOM-style parser in C++";
     homepage = "http://rapidxml.sourceforge.net/";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/rarian/default.nix b/nixpkgs/pkgs/development/libraries/rarian/default.nix
index 1e2d954fa942..522456cfa40d 100644
--- a/nixpkgs/pkgs/development/libraries/rarian/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rarian/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
+{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
 let
   pname = "rarian";
   version = "0.8.1";
@@ -6,11 +6,11 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.gz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.gz";
     sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libxml2 libxslt ]
     ++ (with perlPackages; [ perl XMLParser ]);
   configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Documentation metadata library based on the proposed Freedesktop.org spec";
     homepage = "https://rarian.freedesktop.org/";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
index da595dfb3b67..2a4f9973bde6 100644
--- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }:
+{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "rdkafka";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ zlib perl python openssl ];
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "librdkafka - Apache Kafka C/C++ client library";
     homepage = "https://github.com/edenhill/librdkafka";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix
index d36b24d61084..2d8d00597647 100644
--- a/nixpkgs/pkgs/development/libraries/re2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/re2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "re2";
@@ -17,17 +17,21 @@ stdenv.mkDerivation {
     substituteInPlace Makefile  --replace "SED_INPLACE=sed -i '''" "SED_INPLACE=sed -i"
   '';
 
+  buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ];
+
   preCheck = "patchShebangs runtests";
   doCheck = true;
   checkTarget = "test";
 
+  installTargets = lib.optionals stdenv.hostPlatform.isStatic [ "static-install" ];
+
   doInstallCheck = true;
   installCheckTarget = "testinstall";
 
   meta = {
     homepage = "https://github.com/google/re2";
     description = "An efficient, principled regular expression library";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = with stdenv.lib.platforms; all;
+    license = lib.licenses.bsd3;
+    platforms = with lib.platforms; all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/readline/5.x.nix b/nixpkgs/pkgs/development/libraries/readline/5.x.nix
index 5833ca714e41..b2eab66387f5 100644
--- a/nixpkgs/pkgs/development/libraries/readline/5.x.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/5.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
   name = "readline-5.2";
@@ -10,9 +10,9 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ncurses];
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
+  patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "5";
     platforms = platforms.unix;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/readline/6.2.nix b/nixpkgs/pkgs/development/libraries/readline/6.2.nix
index 3f3ca01961df..98db664dd8fc 100644
--- a/nixpkgs/pkgs/development/libraries/readline/6.2.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/6.2.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 }:
 
 stdenv.mkDerivation (rec {
@@ -47,11 +47,11 @@ stdenv.mkDerivation (rec {
 
     homepage = "https://savannah.gnu.org/projects/readline/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
     branch = "6.2";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/libraries/readline/6.3.nix b/nixpkgs/pkgs/development/libraries/readline/6.3.nix
index 2b0cf978d43e..2f63c4a3043c 100644
--- a/nixpkgs/pkgs/development/libraries/readline/6.3.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/6.3.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, lib, stdenv, ncurses }:
 
 stdenv.mkDerivation {
   name = "readline-6.3p08";
@@ -14,14 +14,14 @@ stdenv.mkDerivation {
 
   patchFlags = [ "-p0" ];
 
-  configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+  configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
     # This test requires running host code
     "bash_cv_wcwidth_broken=no";
 
   patches =
     [ ./link-against-ncurses.patch
       ./no-arch_only-6.3.patch
-    ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch
+    ] ++ lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch
     ++
     (let
        patch = nr: sha256:
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
      in
        import ./readline-6.3-patches.nix patch);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for interactive line editing";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/readline/7.0.nix b/nixpkgs/pkgs/development/libraries/readline/7.0.nix
index 248ef55cce88..25ef4b97a863 100644
--- a/nixpkgs/pkgs/development/libraries/readline/7.0.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/7.0.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     ]
     ++ upstreamPatches;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for interactive line editing";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/readline/8.0.nix b/nixpkgs/pkgs/development/libraries/readline/8.0.nix
index 6e1182647c29..9ea0277467e5 100644
--- a/nixpkgs/pkgs/development/libraries/readline/8.0.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/8.0.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     ]
     ++ upstreamPatches;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for interactive line editing";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/readosm/default.nix b/nixpkgs/pkgs/development/libraries/readosm/default.nix
index 6aed49d65e35..760546fc471c 100644
--- a/nixpkgs/pkgs/development/libraries/readosm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/readosm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, zlib, geos, libspatialite }:
+{ lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }:
 
 stdenv.mkDerivation rec {
   name = "readosm-1.1.0a";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open source library to extract valid data from within an Open Street Map input file";
     homepage = "https://www.gaia-gis.it/fossil/readosm";
-    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/redkite/default.nix b/nixpkgs/pkgs/development/libraries/redkite/default.nix
index ce3ac37895e0..bc82e95be713 100644
--- a/nixpkgs/pkgs/development/libraries/redkite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/redkite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, cairo }:
+{ lib, stdenv, fetchFromGitHub, cmake, cairo }:
 
 stdenv.mkDerivation rec {
   pname = "redkite";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cairo ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.com/iurie-sw/redkite";
     description = "A small GUI toolkit";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
index 0f8caecf8083..618c91421b6a 100644
--- a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "rep-gtk";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ ];
   propagatedBuildInputs = [ librep gtk2 ];
 
diff --git a/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix
index 168b82eec160..5b73bc41475d 100644
--- a/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "resolv_wrapper-1.1.6";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/rlog/default.nix b/nixpkgs/pkgs/development/libraries/rlog/default.nix
index cbc564fe2300..88a96209993b 100644
--- a/nixpkgs/pkgs/development/libraries/rlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "rlog-1.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.arg0.net/rlog";
     description = "A C++ logging library used in encfs";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl3;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/rlottie/default.nix b/nixpkgs/pkgs/development/libraries/rlottie/default.nix
index 3713bcf1df79..a8cd88cae507 100644
--- a/nixpkgs/pkgs/development/libraries/rlottie/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rlottie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "rlottie";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Samsung/rlottie";
     description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime";
     license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING
diff --git a/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix b/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix
index 9ec9eabebebb..e68f74e28960 100644
--- a/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, SDL2, fetchFromGitHub, cmake }:
+{ lib, stdenv, SDL2, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "rnnoise-plugin";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise";
     homepage = "https://github.com/werman/noise-suppression-for-voice";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/robin-map/default.nix b/nixpkgs/pkgs/development/libraries/robin-map/default.nix
index 9c0774f925bc..a0a068dc1422 100644
--- a/nixpkgs/pkgs/development/libraries/robin-map/default.nix
+++ b/nixpkgs/pkgs/development/libraries/robin-map/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Tessil/robin-map";
     description = "C++ implementation of a fast hash map and hash set using robin hood hashing";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/nixpkgs/pkgs/development/libraries/rocclr/default.nix
index 5e6ce5d67978..9337680f55c7 100644
--- a/nixpkgs/pkgs/development/libraries/rocclr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocclr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , rocm-cmake
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       --replace "/build/source/build" "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Radeon Open Compute common language runtime";
     homepage = "https://github.com/ROCm-Developer-Tools/ROCclr";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
index 12a731385ffe..d6f685ff4dee 100644
--- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ];
 
-  buildInputs = stdenv.lib.optional enableJemalloc jemalloc;
+  buildInputs = lib.optional enableJemalloc jemalloc;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move";
 
   cmakeFlags = [
     "-DPORTABLE=1"
@@ -47,17 +47,17 @@ stdenv.mkDerivation rec {
     "-DWITH_GFLAGS=0"
     "-DUSE_RTTI=1"
     "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere
-    (stdenv.lib.optional
+    (lib.optional
         (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.isLinux)
         "-DFORCE_SSE42=1")
-    (stdenv.lib.optional enableLite "-DROCKSDB_LITE=1")
+    (lib.optional enableLite "-DROCKSDB_LITE=1")
     "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}"
-  ] ++ stdenv.lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
+  ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
 
   # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
-  hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format";
+  hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://rocksdb.org";
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
index f8254991013c..96f7108e3fe0 100644
--- a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }:
+{ lib, stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }:
 
 stdenv.mkDerivation rec {
   pname = "rocm-comgr";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
         -i CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "APIs for compiling and inspecting AMDGPU code objects";
     homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr";
     license = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
index 7c50e3752280..965d92179b67 100644
--- a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , clang
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DCLANG=${clang}/bin/clang"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of AMD-specific device-side language runtime libraries";
     homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs";
     license = licenses.ncsa;
diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix
index 5f2188f6e7e6..903c238f4553 100644
--- a/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rocm-opencl-runtime }:
+{ lib, stdenv, rocm-opencl-runtime }:
 
 stdenv.mkDerivation rec {
   pname = "rocm-opencl-icd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL ICD definition for AMD GPUs using the ROCm stack";
     license = licenses.mit;
     maintainers = with maintainers; [ danieldk ];
diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index ecd9e0f7e825..ab0957474adc 100644
--- a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , addOpenGLRunpath
 , cmake
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL runtime for AMD GPUs, part of the ROCm stack";
     homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime";
     license = with licenses; [ asl20 mit ];
diff --git a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
index 15435e7914d3..beb0c61e683c 100644
--- a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , addOpenGLRunpath
 , clang-unwrapped
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/hsa
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Platform runtime for ROCm";
     homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
     license = with licenses; [ ncsa ];
diff --git a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
index 535f686f23d0..5863e1f0a57c 100644
--- a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cp -r $src/include $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Radeon open compute thunk interface";
     homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface";
     license = with licenses; [ bsd2 mit ];
diff --git a/nixpkgs/pkgs/development/libraries/rote/default.nix b/nixpkgs/pkgs/development/libraries/rote/default.nix
index 5ae66f676d64..e5fb04626836 100644
--- a/nixpkgs/pkgs/development/libraries/rote/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rote/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "rote";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Our Own Terminal Emulation Library";
     longDescription = ''
       ROTE is a simple C library for VT102 terminal emulation. It allows the
diff --git a/nixpkgs/pkgs/development/libraries/rttr/default.nix b/nixpkgs/pkgs/development/libraries/rttr/default.nix
index b4d9204c226f..b0f4f2a567a2 100644
--- a/nixpkgs/pkgs/development/libraries/rttr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rttr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "rttr";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_PACKAGE=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Reflection Library";
     homepage = "https://www.rttr.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/rubberband/default.nix b/nixpkgs/pkgs/development/libraries/rubberband/default.nix
index 54bb57e2e662..7fc8fe98db29 100644
--- a/nixpkgs/pkgs/development/libraries/rubberband/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rubberband/default.nix
@@ -1,28 +1,19 @@
-{ stdenv, fetchurl, fetchpatch,  pkgconfig, libsamplerate, libsndfile, fftw
+{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw
 , vamp-plugin-sdk, ladspaH }:
 
 stdenv.mkDerivation rec {
   pname = "rubberband";
-  version = "1.8.2";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2";
-    sha256 = "1jn3ys16g4rz8j3yyj5np589lly0zhs3dr9asd0l9dhmf5mx1gl6";
+    sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ];
 
-  # https://github.com/breakfastquay/rubberband/issues/17
-  # In master, but there hasn't been an official release
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/breakfastquay/rubberband/commit/419a9bcf7066473b0d31e9a8a81fe0b2a8e41fed.patch";
-      sha256 = "0drkfb2ahi31g4w1cawgsjjz26wszgg52yn3ih5l2ql1g25dqqn9";
-    })
-  ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High quality software library for audio time-stretching and pitch-shifting";
     homepage = "https://breakfastquay.com/rubberband/";
     # commercial license available as well, see homepage. You'll get some more optimized routines
diff --git a/nixpkgs/pkgs/development/libraries/s2n/default.nix b/nixpkgs/pkgs/development/libraries/s2n/default.nix
new file mode 100644
index 000000000000..3ec66ebf52d1
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/s2n/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
+
+stdenv.mkDerivation rec {
+  pname = "s2n";
+  version = "0.10.23";
+
+  src = fetchFromGitHub {
+    owner = "awslabs";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "063wqpszhfcbxm7a7s6d6kinqd6b6dxij85lk9jjkrslg5fgqbki";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
+  meta = with lib; {
+    description = "C99 implementation of the TLS/SSL protocols";
+    homepage = "https://github.com/awslabs/s2n";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/safefile/default.nix b/nixpkgs/pkgs/development/libraries/safefile/default.nix
index e4a3e586614d..db18621d8e43 100644
--- a/nixpkgs/pkgs/development/libraries/safefile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/safefile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, path, runtimeShell }:
+{ lib, stdenv, fetchurl, path, runtimeShell }:
 stdenv.mkDerivation rec {
   pname = "safefile";
   version = "1.0.5";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "File open routines to safely open a file when in the presence of an attack";
-    license = stdenv.lib.licenses.asl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.asl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "https://research.cs.wisc.edu/mist/safefile/";
     updateWalker = true;
   };
diff --git a/nixpkgs/pkgs/development/libraries/sbc/default.nix b/nixpkgs/pkgs/development/libraries/sbc/default.nix
index d3710043e6f6..0ff6db175611 100644
--- a/nixpkgs/pkgs/development/libraries/sbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libsndfile }:
+{ lib, stdenv, fetchurl, pkg-config, libsndfile }:
 
 stdenv.mkDerivation rec {
   name = "sbc-1.4";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsndfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SubBand Codec Library";
     homepage = "http://www.bluez.org/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix b/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix
index 91baa8d03b88..c871f18e69b3 100644
--- a/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, curl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, curl }:
 
 stdenv.mkDerivation rec {
   pname = "sblim-sfcc";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small Footprint CIM Client Library";
     homepage    = "https://sourceforge.net/projects/sblim/";
     license     = licenses.cpl10;
diff --git a/nixpkgs/pkgs/development/libraries/schroedinger/default.nix b/nixpkgs/pkgs/development/libraries/schroedinger/default.nix
index 712138b0edfc..7706366dd6da 100644
--- a/nixpkgs/pkgs/development/libraries/schroedinger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/schroedinger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation {
   name = "schroedinger-1.0.11";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ orc ];
 
   doCheck = (!stdenv.isDarwin);
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of the Dirac video codec in ANSI C";
     homepage = "https://sourceforge.net/projects/schrodinger/";
     maintainers = [ maintainers.spwhitt ];
diff --git a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
index 00a6e50aa7f7..c265f24c182b 100644
--- a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://icl.utk.edu/papi/";
     description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix
index c60fe31aaaff..b75ac06627fb 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc }:
 
 stdenv.mkDerivation rec {
   pname = "EBTKS";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BIC-MNI/${pname}";
     description = "Library for working with MINC files";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix
index 4cc7dcada522..bc2de6e882f9 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }:
 
 stdenv.mkDerivation rec {
   pname = "bicgl";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "-DBICPL_DIR=${bicpl}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Brain Imaging Centre graphics library";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix
index 96199f0478ea..0bdcbf5a828a 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, netpbm }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc, netpbm }:
 
 stdenv.mkDerivation rec {
   pname = "bicpl";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Brain Imaging Centre programming library";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix
index cfbe19d724be..d1eb096e08e6 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "bpp-core";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Main_Page";
     changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog";
     description = "C++ bioinformatics libraries and tools";
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix
index 79fd0fe67716..ef3f3d5756e9 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = bpp-core.meta // { 
+  meta = bpp-core.meta // {
     changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog";
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix
index e55a72fb9f84..55ee5ab4fb66 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname    = "elastix";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake python3 ];
-  buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   doCheck = !stdenv.isDarwin;  # usual dynamic linker issues
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$(pwd)/bin
   ";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://elastix.isi.uu.nl/";
     description = "Image registration toolkit based on ITK";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix
index dddf29fb0193..306324129cbd 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "gifticlib";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nitrc.org/projects/gifti";
     description = "Medical imaging geometry format C API";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
index 9da6595e7a43..cb3a543ad2af 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
+{ lib, stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "htslib";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading/writing high-throughput sequencing data";
     license = licenses.mit;
     homepage = "http://www.htslib.org/";
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
index 4291e11ed33f..0d23489696f1 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }:
+{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }:
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
@@ -31,12 +31,10 @@ stdenv.mkDerivation rec {
     install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk
   '';
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake gtest ];
   buildInputs = [ boost eigen python vtk zlib tbb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BioMedIA/MIRTK";
     description = "Medical image registration library and tools";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix
index 572c31dd1e52..fee2ea8772b4 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "nifticlib";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://nifti-imaging.github.io";
     description = "Medical imaging format C API";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix
index e5ecda0390bd..626e6475ba18 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }:
 
 stdenv.mkDerivation rec {
   pname = "oobicpl";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                  "-DARGUMENTS_DIR=${arguments}/lib"
                  "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Brain Imaging Centre object-oriented programming library (and tools)";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
index 7e73354363ea..a20f6973384a 100644
--- a/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
@@ -37,8 +37,6 @@ mkDerivation {
     qtbase
   ];
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "Qt library for CSXCAD";
     homepage = "https://github.com/thliebig/QCSXCAD";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index b5fa5c8825e0..254ce08dc60f 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "QuadProgpp";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/liuq/QuadProgpp";
     license = licenses.mit;
     description = ''
diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
index 9bddba0261fe..42c84b3ed610 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , perl
 , python3
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-cblas"
     "--blas-int-size=${blasIntSize}"
-  ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ]
+  ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
     ++ [ withArchitecture ];
 
   postPatch = ''
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "BLAS-compatible library optimized for AMD CPUs";
     homepage = "https://developer.amd.com/amd-aocl/blas-library/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix
index 1e331bca695c..ac35385f9835 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/libflame.so.${version} $out/lib/liblapacke.so.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "LAPACK-compatible linear algebra library optimized for AMD CPUs";
     homepage = "https://developer.amd.com/amd-aocl/blas-library/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
index 0b927bb3eac8..382f868a99ac 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , gfortran, blas, lapack, eigen }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
-    "-DINTERFACE64=${stdenv.lib.optionalString blas.isILP64 "1"}"
+    "-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}"
   ];
 
   preCheck = if stdenv.isDarwin then ''
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
       A collection of Fortran77 subroutines to solve large scale eigenvalue
       problems.
     '';
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
index c240a19cca67..332806c495c9 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran }:
+{ lib, stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation rec {
   pname = "blas";
@@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
   installPhase =
     # FreeBSD's stdenv doesn't use Coreutils.
     let dashD = if stdenv.isFreeBSD then "" else "-D"; in
-    (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;")
+    (lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;")
     + ''
     install ${dashD} -m755 libblas.a "$out/lib/libblas.a"
     install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}"
     ln -s libblas.so.${version} "$out/lib/libblas.so.3"
     ln -s libblas.so.${version} "$out/lib/libblas.so"
-    # Write pkgconfig alias.
+    # Write pkg-config alias.
     # See also openblas/default.nix
     mkdir $out/lib/pkgconfig
     cat <<EOF > $out/lib/pkgconfig/blas.pc
@@ -55,7 +55,7 @@ Libs: -L$out/lib -lblas
 EOF
   '';
 
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  preFixup = lib.optionalString stdenv.isDarwin ''
     for fn in $(find $out/lib -name "*.so*"); do
       if [ -L "$fn" ]; then continue; fi
       install_name_tool -id "$fn" "$fn"
@@ -64,8 +64,8 @@ EOF
 
   meta = {
     description = "Basic Linear Algebra Subprograms";
-    license = stdenv.lib.licenses.publicDomain;
+    license = lib.licenses.publicDomain;
     homepage = "http://www.netlib.org/blas/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix
index 3943c4dbbcaa..eb91e0a3d222 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , perl
 , python3
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-cblas"
     "--blas-int-size=${blasIntSize}"
-  ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ]
+  ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
     ++ [ withArchitecture ];
 
   postPatch = ''
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "BLAS-compatible linear algebra library";
     homepage = "https://github.com/flame/blis";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
index 175de67ad7ee..870568c9ac95 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , boost
 , m4ri
 , gd
@@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BRiAl/BRiAl";
     description = "Legacy version of PolyBoRi maintained by sagemath developers";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
index 7755efb30658..fe9a8b671459 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -90,26 +90,26 @@ stdenv.mkDerivation rec {
     ./fix_compilation_on_gcc7.patch
   ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];
 
-  cmakeFlags = [ ''-DBUILD_TEST=OFF''
-                 ''-DBUILD_PYTHON=ON''
-                 ''-DUSE_CUDA=${if useCuda then ''ON''else ''OFF''}''
-                 ''-DUSE_OPENMP=${if useOpenmp then ''ON''else ''OFF''}''
-                 ''-DUSE_OPENCV=${if useOpencv3 then ''ON''else ''OFF''}''
-                 ''-DUSE_MPI=${if useMpi then ''ON''else ''OFF''}''
-                 ''-DUSE_LEVELDB=${if useLeveldb then ''ON''else ''OFF''}''
-                 ''-DUSE_LMDB=${if useLmdb then ''ON''else ''OFF''}''
-                 ''-DUSE_ROCKSDB=${if useRocksdb then ''ON''else ''OFF''}''
-                 ''-DUSE_ZMQ=${if useZeromq  then ''ON''else ''OFF''}''
-                 ''-DUSE_GLOO=OFF''
-                 ''-DUSE_NNPACK=OFF''
-                 ''-DUSE_NCCL=OFF''
-                 ''-DUSE_REDIS=OFF''
-                 ''-DUSE_FFMPEG=OFF''
+  cmakeFlags = [ "-DBUILD_TEST=OFF"
+                 "-DBUILD_PYTHON=ON"
+                 ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}''
+                 ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}''
+                 ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}''
+                 ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}''
+                 ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}''
+                 ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}''
+                 ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}''
+                 ''-DUSE_ZMQ=${if useZeromq  then "ON"else "OFF"}''
+                 "-DUSE_GLOO=OFF"
+                 "-DUSE_NNPACK=OFF"
+                 "-DUSE_NCCL=OFF"
+                 "-DUSE_REDIS=OFF"
+                 "-DUSE_FFMPEG=OFF"
                ]
                ++ lib.optional useCuda [
-                 ''-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}''
-                 ''-DCUDA_FAST_MATH=ON''
-                 ''-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc''
+                 "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}"
+                 "-DCUDA_FAST_MATH=ON"
+                 "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"
                ];
 
   preConfigure = ''
@@ -126,7 +126,6 @@ stdenv.mkDerivation rec {
   '';
 
   doCheck = false;
-  enableParallelBuilding = true;
 
   meta = {
     homepage = "https://caffe2.ai/";
@@ -137,8 +136,8 @@ stdenv.mkDerivation rec {
       algorithms. You can bring your creations to scale using the power of GPUs in the
       cloud or to the masses on mobile with Caffe2's cross-platform libraries.
     '';
-    platforms = with stdenv.lib.platforms; linux;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
+    platforms = with lib.platforms; linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ yuriaisaka ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
index c381f56277e8..38d1b126ea4e 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }:
+{ lib, stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }:
 stdenv.mkDerivation rec {
   pname = "cholmod-extra";
   version = "1.2.0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jluttine/cholmod-extra";
     description = "A set of additional routines for SuiteSparse CHOLMOD Module";
     license = with licenses; [ gpl2Plus ];
diff --git a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
index 8a474e06e556..aca395001f96 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gfortran
@@ -35,27 +35,25 @@ stdenv.mkDerivation rec {
      "-DBUILD_TEST=OFF"
   ];
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    cmake
     gfortran
     blas
     python
     boost
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     ocl-icd
     opencl-headers
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     Accelerate
     CoreGraphics
     CoreVideo
   ];
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [
     OpenCL
   ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/clMathLibraries/clBLAS";
     description = "A software library containing BLAS functions written in OpenCL";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
index 7fe80c323f68..0d8bafffb44f 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://users.aalto.fi/~pat/cliquer.html";
     downloadPage = src.meta.homepage; # autocliquer
     description = "Routines for clique searching";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix
index 2e798a6b83e7..60a3afb50774 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }:
+{ lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }:
 
-with stdenv.lib;
+with lib;
 
 let 
   version = "1.3.0";
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
     cp ${incfile} make.inc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port";
     license = licenses.bsd3;
     homepage = "http://icl.cs.utk.edu/magma/index.html";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
index e727218c0555..59c0b7f44980 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
     majorVersion = lib.versions.major version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
     homepage = "https://developer.nvidia.com/cudnn";
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
index 2ba69a34a4a7..b60bd1fe76c1 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "ecos";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     cp -r include $out/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight conic solver for second-order cone programming";
     homepage = "https://www.embotech.com/ECOS";
     downloadPage = "https://github.com/embotech/ecos/releases";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
index 4e89aeebe2b7..e80607ab9556 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , boost
@@ -50,8 +50,8 @@ let
     meta = {
       description = "Distributed just-in-time shared library building";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 
@@ -80,8 +80,8 @@ let
     meta = {
       description = "Automatic generation of finite element basis functions";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 
@@ -102,8 +102,8 @@ let
     meta = {
       description = "A domain-specific language for finite element variational forms";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 
@@ -139,8 +139,8 @@ let
     meta = {
       description = "A compiler for finite element variational forms";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
   dolfin = stdenv.mkDerivation {
@@ -215,7 +215,7 @@ let
     meta = {
       description = "The FEniCS Problem Solving Environment in Python and C++";
       homepage = "https://fenicsproject.org/";
-      license = stdenv.lib.licenses.lgpl3;
+      license = lib.licenses.lgpl3;
     };
   };
   python-dolfin = pythonPackages.buildPythonPackage rec {
@@ -233,8 +233,8 @@ let
       export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH
       substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11"
       substituteInPlace dolfin/jit/jit.py \
-        --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \
-        --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")'
+        --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \
+        --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")'
     '';
     buildInputs = [
       dolfin
@@ -254,8 +254,8 @@ let
     meta = {
       description = "Python bindings for the DOLFIN FEM compiler";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 in python-dolfin
diff --git a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
index 32fb70978cf9..c956eae4f710 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , gmp
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sagemath/FlintQS";
     description = "Highly optimized multi-polynomial quadratic sieve for integer factorization";
     license = with licenses; [ gpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
index 97374fb0d477..d1d7a9b9f342 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, blas, lapack, gfortran }:
+{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A software package for large-scale nonlinear optimization";
     homepage = "https://projects.coin-or.org/Ipopt";
     license = licenses.epl10;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix
index c74a7408e98e..81303a3653ec 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , gtest
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
     "-DGTEST_DIR:PATH=${gtest.src}/googletest"
   ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
 
   checkPhase = ''
@@ -45,7 +43,7 @@ stdenv.mkDerivation rec {
     ./gtests/itpp_gtests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions";
     homepage = http://itpp.sourceforge.net/;
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
index 6f80e1fd23e0..95034c3637a9 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , pari
@@ -68,13 +68,13 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71";
       sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3";
     })
-  ] ++ stdenv.lib.optional stdenv.isDarwin
+  ] ++ lib.optional stdenv.isDarwin
   (fetchpatch {
     url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch";
     sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18";
   });
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/Makefile --replace g++ c++
   '';
 
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     "PARI_PREFIX=${pari}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html";
     description = "A program for calculating with L-functions";
     license = with licenses; [ gpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
index 36d4ad54c3df..cc5d3baf3442 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # no tests included for now (2018-08-05), but can't hurt to activate
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/miguelmarco/libbraiding/";
     description = "C++ library for computations on braid groups";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
index 788f534cc779..b756109aa8fc 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boehmgc
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/miguelmarco/libhomfly/";
     description = "Library to compute the homfly polynomial of knots and links";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
index 045cccbd2ebf..c742cc60b27f 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   fetchFromGitHub,
   gfortran,
   cmake,
@@ -7,7 +7,7 @@
   shared ? true
 }:
 let
-  inherit (stdenv.lib) optional;
+  inherit (lib) optional;
   version = "3.9.0";
 in
 
@@ -33,9 +33,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix
index 49108e5e3305..20c5a2070a05 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 stdenv.mkDerivation {
   name = "liblbfgs-1.10";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)";
     homepage = "http://www.chokkan.org/software/liblbfgs/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
index fba8bcb9367b..9631f3931cab 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs =
     if stdenv.isDarwin then [ fixDarwinDylibNames ]
     else [ addOpenGLRunpath patchelf ]
-      ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ];
+      ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
 
   buildInputs = [
     stdenv.cc.cc
@@ -57,9 +57,9 @@ in stdenv.mkDerivation {
 
   postFixup = let
     libPaths = [ stdenv.cc.cc.lib ]
-      ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ];
-    rpath = stdenv.lib.makeLibraryPath libPaths;
-  in stdenv.lib.optionalString stdenv.isLinux ''
+      ++ lib.optionals cudaSupport [ nvidia_x11 ];
+    rpath = lib.makeLibraryPath libPaths;
+  in lib.optionalString stdenv.isLinux ''
     find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting rpath for $lib..."
       patchelf --set-rpath "${rpath}:$out/lib" "$lib"
@@ -67,7 +67,7 @@ in stdenv.mkDerivation {
         addOpenGLRunpath "$lib"
       ''}
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib
     install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib
     install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib
@@ -110,7 +110,7 @@ in stdenv.mkDerivation {
 
   passthru.tests.cmake = callPackage ./test { };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ API of the PyTorch machine learning framework";
     homepage = "https://pytorch.org/";
     license = licenses.unfree; # Includes CUDA and Intel MKL.
diff --git a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
index b0cfbca5aa33..f7f981e223b2 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gmp}:
+{lib, stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation rec {
   pname = "lrs";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems";
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html";
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
index f50c15abbdf1..26e26e4ffdbc 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromBitbucket
 , autoreconfHook
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://malb.bitbucket.io/m4ri/";
     description = "Library to do fast arithmetic with dense matrices over F_2";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
index 532285991a3c..38a633e58c71 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromBitbucket
 , autoreconfHook
 , m4ri
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://malb.bitbucket.io/m4rie/";
     description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
index b4ac119ce6cf..b8e3999ffe83 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }:
+{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }:
 
-with stdenv.lib;
+with lib;
 
 let version = "2.5.4";
 
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
         > $out/lib/pkgconfig/magma.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Matrix Algebra on GPU and Multicore Architectures";
     license = licenses.bsd3;
     homepage = "http://icl.cs.utk.edu/magma/index.html";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix
index 8d6381c8d48d..b06b432372a7 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, cmake }:
+{ lib, stdenv, fetchurl, unzip, cmake }:
 
 stdenv.mkDerivation {
   name = "metis-5.1.0";
@@ -9,12 +9,12 @@ stdenv.mkDerivation {
   };
 
   cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ];
-  buildInputs = [ unzip cmake ];
+  nativeBuildInputs = [ unzip cmake ];
 
   meta = {
     description = "Serial graph partitioning and fill-reducing matrix ordering";
     homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix
index 36c53b2994f5..7dd52f3b663d 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph Coarsening and Partitioning Library";
     homepage = "https://github.com/ScottKolo/Mongoose";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix
index eb194c0e9e47..5036ad890799 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }:
+{ lib, stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
   name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs";
     homepage = "https://developer.nvidia.com/nccl";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
index 8df04e80ceb3..bd7b739bd77f 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, which
+{ lib, stdenv, fetchFromGitHub, perl, which
 # Most packages depending on openblas expect integer width to match
 # pointer width, but some expect to use 32-bit integers always
 # (for compatibility with reference BLAS).
@@ -19,7 +19,7 @@
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
-with stdenv.lib;
+with lib;
 
 let blas64_ = blas64; in
 
@@ -68,7 +68,6 @@ let
       BINARY = 64;
       TARGET = setTarget "ATHLON";
       DYNAMIC_ARCH = true;
-      NO_AVX512 = true;
       USE_OPENMP = !stdenv.hostPlatform.isMusl;
     };
 
@@ -106,7 +105,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
-  version = "0.3.12";
+  version = "0.3.13";
 
   outputs = [ "out" "dev" ];
 
@@ -114,7 +113,7 @@ stdenv.mkDerivation rec {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y";
+    sha256 = "14jxh0v3jfbw4mfjx4mcz4dd51lyq7pqvh9k8dg94539ypzjr2lj";
   };
 
   inherit blas64;
@@ -161,7 +160,7 @@ stdenv.mkDerivation rec {
     NO_BINARY_MODE = if stdenv.isx86_64
         then toString (stdenv.hostPlatform != stdenv.buildPlatform)
         else stdenv.hostPlatform != stdenv.buildPlatform;
-  } // (stdenv.lib.optionalAttrs singleThreaded {
+  } // (lib.optionalAttrs singleThreaded {
     # As described on https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded
     USE_THREAD = false;
     USE_LOCKING = true; # available with openblas >= 0.3.7
@@ -189,14 +188,14 @@ EOF
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+  '' + lib.optionalString stdenv.hostPlatform.isLinux ''
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
index 17197823d6ef..2c4198d9679a 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "openlibm";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High quality system independent, portable, open source libm implementation";
     homepage = "https://openlibm.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix
index 3689df607074..a341264d9894 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran }:
+{ lib, stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation {
   name = "openspecfun-0.5.3";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A collection of special mathematical functions";
     homepage = "https://github.com/JuliaLang/openspecfun";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
index 926f7ba4789c..53c117233d20 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
+{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
 , lsb-release, glog, protobuf, cbc, zlib
 , ensureNewerSourcesForZipFilesHook, python, swig }:
 
@@ -53,11 +53,9 @@ stdenv.mkDerivation rec {
     python.pkgs.protobuf python.pkgs.six
   ];
 
-  enableParallelBuilding = true;
-
   outputs = [ "out" "python" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/or-tools";
     license = licenses.asl20;
     description = ''
diff --git a/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix b/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix
index b6f367ff4fe9..b61cd8406064 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, gfortran, pkgconfig
+{ stdenv, lib, fetchurl, gfortran, pkg-config
 , blas, zlib, bzip2
 , withGurobi ? false, gurobi
 , withCplex ? false, cplex }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     [ blas zlib bzip2 ]
     ++ lib.optional withGurobi gurobi
     ++ lib.optional withCplex cplex;
-  nativeBuildInputs = [ gfortran pkgconfig ];
+  nativeBuildInputs = [ gfortran pkg-config ];
   configureFlags =
     lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ]
     ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit withGurobi withCplex; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An abstract base class to a generic linear programming (LP) solver";
     homepage = "https://github.com/coin-or/Osi";
     license = licenses.epl10;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/osqp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/osqp/default.nix
index 9cd062d21f2f..00f2726f60fe 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/osqp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/osqp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A quadratic programming solver using operator splitting";
     homepage = "https://osqp.org";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
index 8f24356c7336..db70bf8dd7a4 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , mpi
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0pvfpvb36djvqlcc3lq7si0c5xpb2cqndjg8wvzg35ygnwqs5ngj";
   };
 
-  buildInputs = [ cmake mpi ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ mpi ];
 
   # metis and GKlib are packaged with distribution
   # AUR https://aur.archlinux.org/packages/parmetis/ has reported that
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
     make config metis_path=$PWD/metis gklib_path=$PWD/metis/GKlib prefix=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
     homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
index a1e9d1e30515..f06a028fe64f 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv , darwin , fetchurl , blas , gfortran , lapack , python }:
+{ lib, stdenv , darwin , fetchurl , blas , gfortran , lapack , python }:
 
 stdenv.mkDerivation rec {
   pname = "petsc";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   prePatch = ''
     substituteInPlace configure \
       --replace /bin/sh /usr/bin/python
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace config/install.py \
       --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
   '';
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Library of linear algebra algorithms for solving partial differential
       equations
diff --git a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
index b1d6a072e130..a257b84ca54b 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite";
     description = "A library for implementing graph algorithms";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
index 46709ff218a0..d99026bc5659 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "primesieve";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast C/C++ prime number generator";
     homepage = "https://primesieve.org/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
index 53f4313a2069..38c9444d0d31 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   # check phase is empty for now (as of version 0.7)
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Calculates rank-width and rank-decompositions";
     license = with licenses; [ gpl2Plus ];
     maintainers = teams.sage.members;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
index 44f8150386e7..b4b670884989 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , coreutils
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.sagemath.org/spkg/rubiks";
     description = "Several programs for working with Rubik's cubes";
     # The individual websites are no longer available
diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
index 1cf9c2ed8d53..3b84a9d99cbe 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssh
+{ lib, stdenv, fetchFromGitHub, cmake, openssh
 , gfortran, mpi, blas, lapack
 } :
 
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake openssh ];
   buildInputs = [ mpi gfortran blas lapack ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
 
   preConfigure = ''
@@ -38,13 +36,16 @@ stdenv.mkDerivation rec {
     # make sure the test starts even if we have less than 4 cores
     export OMPI_MCA_rmaps_base_oversubscribe=1
 
+    # Fix to make mpich run in a sandbox
+    export HYDRA_IFACE=lo
+
     # Run single threaded
     export OMP_NUM_THREADS=1
 
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netlib.org/scalapack/";
     description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
index 3820f2b95275..96f543e430f0 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }:
+{ lib, stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --replace "gcc" "cc"
   '';
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ blas lapack gfortran.cc.lib ];
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Splitting Conic Solver";
     longDescription = ''
       Numerical optimization package for solving large-scale convex cone problems
diff --git a/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix
index c55a1b8002e1..6f4ddb3f787e 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ lib, stdenv, fetchurl, gfortran, perl }:
 
 stdenv.mkDerivation rec {
   pname = "spooles";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ./spooles.patch
   ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name'
   '';
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netlib.org/linalg/spooles/";
     description = "Library for solving sparse real and complex linear systems of equations";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
index 1c910a4f75bb..7696b18e7ca4 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gnum4
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     gnum4
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph algorithms in the language of linear algebra";
     homepage = "http://faculty.cse.tamu.edu/davis/GraphBLAS.html";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index b1c1202c5780..b8ce3eca888c 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, blas, lapack }:
+{ lib, stdenv, fetchurl, gfortran, blas, lapack }:
 
 let
   int_t = if blas.isILP64 then "int64_t" else "int32_t";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     "LAPACK=-llapack"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html";
     description = "A suite of sparse matrix algorithms";
     license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix
index 81a80c920b53..1ebac6ac445d 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, blas, lapack
+{ lib, stdenv, fetchurl, gfortran, blas, lapack
 , enableCuda ? false, cudatoolkit
 }:
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
         -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
         -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   ''
-  + stdenv.lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
         -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
   ''
-  + stdenv.lib.optionalString enableCuda ''
+  + lib.optionalString enableCuda ''
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
         -e 's|^[[:space:]]*\(CUDA_ROOT     =\)|CUDA_ROOT = ${cudatoolkit}|' \
         -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     "LAPACK=-llapack"
   ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER";
 
   postInstall = ''
     # Build and install shared library
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
         for i in "$out"/lib/lib*.a; do
           ar -x $i
         done
-        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
+        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"}
     )
     for i in umfpack cholmod amd camd colamd spqr; do
       ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT}
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ gfortran ];
   buildInputs = [ blas lapack ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html";
     description = "A suite of sparse matrix algorithms";
     license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix
index 2e76050aa989..f0c82e7190f9 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , gfortran
 , blas, lapack
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   # Use compatible indexing for lapack and blas used
   buildInputs = assert (blas.isILP64 == lapack.isILP64); [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     gfortran.cc.lib
     gmp
     mpfr
-  ] ++ stdenv.lib.optional enableCuda cudatoolkit;
+  ] ++ lib.optional enableCuda cudatoolkit;
 
   preConfigure = ''
     # Mongoose and GraphBLAS are packaged separately
@@ -45,13 +45,13 @@ stdenv.mkDerivation rec {
     "INSTALL_INCLUDE=${placeholder "dev"}/include"
     "JOBS=$(NIX_BUILD_CORES)"
     "MY_METIS_LIB=-lmetis"
-  ] ++ stdenv.lib.optionals blas.isILP64 [
+  ] ++ lib.optionals blas.isILP64 [
     "CFLAGS=-DBLAS64"
-  ] ++ stdenv.lib.optionals enableCuda [
+  ] ++ lib.optionals enableCuda [
     "CUDA_PATH=${cudatoolkit}"
     "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so"
     "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     # Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
     # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368
     "BLAS=-lblas"
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     "library"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html";
     description = "A suite of sparse matrix algorithms";
     license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
diff --git a/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
index ff59297bd839..26dd00d96069 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake,
+{ lib, stdenv, fetchurl, cmake,
   gfortran, blas, lapack}:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8";
   };
 
-  buildInputs = [ cmake gfortran ];
+  nativeBuildInputs = [ cmake gfortran ];
 
   propagatedBuildInputs = [ blas ];
 
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/";
     license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt";
     description = "A library for the solution of large, sparse, nonsymmetric systems of linear equations";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
index a83e2c835461..3c31ed8a361b 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , makeWrapper
 , which
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compute special values of symmetric power elliptic curve L-functions";
     license = {
       shortName = "sympow";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix
index dc0ca5da4cfa..d42026c13cf9 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix
@@ -1,30 +1,25 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , addOpenGLRunpath
 , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
 }:
 
-with stdenv.lib;
+with lib;
 let
-  unavailable = throw "libtensorflow is not available for this platform!";
+  broken = !stdenv.isLinux && !stdenv.isDarwin;
 
   tfType = if cudaSupport then "gpu" else "cpu";
 
-  system = 
-    if      stdenv.isLinux  then "linux"
-    else if stdenv.isDarwin then "darwin"
-    else unavailable;
+  system =
+    if stdenv.isLinux then "linux"
+    else "darwin";
 
-  platform =
-    if stdenv.isx86_64 then "x86_64"
-    else unavailable;
+  platform =  "x86_64";
 
-  rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] ++
-            optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
+  rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib]
+                           ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
 
   packages = import ./binary-hashes.nix;
-  packageName = "${tfType}-${system}-${platform}";
-  url = packages.${packageName} or unavailable;
 
   patchLibs =
     if stdenv.isDarwin
@@ -44,7 +39,7 @@ in stdenv.mkDerivation rec {
   pname = "libtensorflow";
   inherit (packages) version;
 
-  src = fetchurl url;
+  src = fetchurl packages."${tfType}-${system}-${platform}";
 
   nativeBuildInputs = optional cudaSupport addOpenGLRunpath;
 
@@ -55,7 +50,7 @@ in stdenv.mkDerivation rec {
     chmod -R +w $out
     ${patchLibs}
 
-    # Write pkgconfig file.
+    # Write pkg-config file.
     mkdir $out/lib/pkgconfig
     cat > $out/lib/pkgconfig/tensorflow.pc << EOF
     Name: TensorFlow
@@ -72,6 +67,5 @@ in stdenv.mkDerivation rec {
     homepage = "https://www.tensorflow.org/install/lang_c";
     license = licenses.asl20;
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
-    maintainers = with maintainers; [ basvandijk ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
index 76f0c5eea7fa..b606e45477a9 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
@@ -1,15 +1,15 @@
 {
-version = "1.14.0";
-cpu-linux-x86_64 = {
-  url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz";
-  sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k";
+version = "2.4.0";
+"cpu-linux-x86_64" = {
+  url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.4.0.tar.gz";
+  sha256 = "022p5jjwmb8rhyyis3cpk2lw45apl2vz49m2rgxmd75h783x1gjk";
 };
-gpu-linux-x86_64 = {
-  url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz";
-  sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6";
+"gpu-linux-x86_64" = {
+  url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.4.0.tar.gz";
+  sha256 = "1fclvbrn3fs8qmhmh3lzni7s7wl1w30a071b4gzh9ifnxdhip6lq";
 };
-cpu-darwin-x86_64 = {
-  url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz";
-  sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92";
+"cpu-darwin-x86_64" = {
+  url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-2.4.0.tar.gz";
+  sha256 = "09x096nslg04c8sr7bd5v68a5gfinc0f1h36lbzn8bahs8b1agi3";
 };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh
index 515f25df4c1f..d571d38f7719 100755
--- a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh
+++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
-version=1.14.0
-hashfile=binary-hashes.nix
+# ./prefetcher.sh 2.4.0 binary-hashes.nix
+
+version="$1"
+hashfile="$2"
 rm -f $hashfile
 echo "{" >> $hashfile
 echo "version = \"$version\";" >> $hashfile
diff --git a/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix
index b611a2baf8e2..4a90f082dc08 100644
--- a/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitLab
+, fetchpatch
 , python
 , wafHook
 
@@ -32,22 +33,22 @@
 
 let
   pythonEnv = python.withPackages(ps:
-    stdenv.lib.optional withManual ps.sphinx
-    ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
+    lib.optional withManual ps.sphinx
+    ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
   );
 in
 stdenv.mkDerivation rec {
   pname = "ns-3";
-  version = "32";
+  version = "33";
 
   src = fetchFromGitLab {
     owner = "nsnam";
     repo   = "ns-3-dev";
     rev    = "ns-3.${version}";
-    sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k";
+    sha256 = "0ds8h0f2qcb0gc2a8bk38cbhdb122i4sbg589bjn59rblzw0hkq4";
   };
 
-  nativeBuildInputs = [ wafHook ];
+  nativeBuildInputs = [ wafHook python ];
 
   outputs = [ "out" ] ++ lib.optional pythonSupport "py";
 
@@ -60,11 +61,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs doc/ns3_html_theme/get_version.sh
-    # FIX/Remove when https://github.com/NixOS/nixpkgs/pull/69310 gets merged
-    sed -i 's/program.ns3_module_dependencies.copy()/program.ns3_module_dependencies[:]/g' wscript
   '';
 
-  wafConfigureFlags = with stdenv.lib; [
+  wafConfigureFlags = with lib; [
       "--enable-modules=${concatStringsSep "," modules}"
       "--with-python=${pythonEnv.interpreter}"
   ]
@@ -82,7 +81,7 @@ stdenv.mkDerivation rec {
   # to prevent fatal error: 'backward_warning.h' file not found
   CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH";
 
-  postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
+  postBuild = with lib; let flags = concatStringsSep ";" (
       optional enableDoxygen "./waf doxygen"
       ++ optional withManual "./waf sphinx"
     );
@@ -99,14 +98,22 @@ stdenv.mkDerivation rec {
     ${pythonEnv.interpreter} ./test.py --nowaf
   '';
 
+  patches = [
+    (fetchpatch {
+      name = "upstream-issue-336.patch";
+      url = "https://gitlab.com/nsnam/ns-3-dev/-/commit/673004edae1112e6cb249b698aad856d728530fb.patch";
+      sha256 = "0q96ividinbh9xlws014b2ir6gaavygnln5ca9m1db06m4vfwhng";
+    })
+  ];
+
   # strictoverflow prevents clang from discovering pyembed when bindings
   hardeningDisable = [ "fortify" "strictoverflow"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.nsnam.org";
     license = licenses.gpl3;
     description = "A discrete time event network simulator";
     platforms = with platforms; unix;
-    maintainers = with maintainers; [ teto ];
+    maintainers = with maintainers; [ teto rgrunbla ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
index 39f412e8dd56..b3eed2e326e6 100644
--- a/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, cmake, boost
-}:
+{ lib, stdenv, fetchurl, cmake, boost }:
 
 stdenv.mkDerivation rec {
   pname = "ispike";
@@ -10,15 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp";
   };
 
-  buildInputs = [ cmake boost ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost ];
 
   meta = {
     description = "Spiking neural interface between iCub and a spiking neural simulator";
     homepage = "https://sourceforge.net/projects/ispike/";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.nico202 ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.nico202 ];
   };
-
-  
 }
diff --git a/nixpkgs/pkgs/development/libraries/scmccid/default.nix b/nixpkgs/pkgs/development/libraries/scmccid/default.nix
index 0d980d9d1a2b..0fcb4884de5c 100644
--- a/nixpkgs/pkgs/development/libraries/scmccid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/scmccid/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, patchelf, libusb-compat-0_1}:
+{lib, stdenv, fetchurl, patchelf, libusb-compat-0_1}:
 
 assert stdenv ? cc && stdenv.cc.libc != null;
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html";
     description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix
index f4e5ae378928..c2beda45ab3a 100644
--- a/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix
+++ b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
   pname = "scriptaculous";
   version = "1.9.0";
 
@@ -14,7 +14,7 @@
     cp src/*.js $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of JavaScript libraries to enhance the user interface of web sites";
     longDescription = ''
       script.aculo.us provides you with
diff --git a/nixpkgs/pkgs/development/libraries/seasocks/default.nix b/nixpkgs/pkgs/development/libraries/seasocks/default.nix
index 241046b09fe8..8c5b4e87d9bb 100644
--- a/nixpkgs/pkgs/development/libraries/seasocks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/seasocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "seasocks";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mattgodbolt/seasocks";
     description = "Tiny embeddable C++ HTTP and WebSocket server";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
index e918a3b3d1d2..8ab0f8ef69a6 100644
--- a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
@@ -9,20 +9,22 @@
 
 stdenv.mkDerivation rec {
   pname = "sentencepiece";
-  version = "0.1.94";
+  version = "0.1.95";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x";
+    sha256 = "0mv7vgsvd7hjssidxy7fjfmwqy68vjcia8pajji11q2fkfp3cg67";
   };
 
-  nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools;
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = lib.optionals withGPerfTools [ gperftools ];
 
   outputs = [ "bin" "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/sentencepiece";
     description = "Unsupervised text tokenizer for Neural Network-based text generation";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/serd/default.nix b/nixpkgs/pkgs/development/libraries/serd/default.nix
index 88fd1ea82d3b..641a5120e8d9 100644
--- a/nixpkgs/pkgs/development/libraries/serd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/serd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python3, wafHook }:
+{ lib, stdenv, fetchurl, pkg-config, python3, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "serd";
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c";
   };
 
-  nativeBuildInputs = [ pkgconfig python3 wafHook ];
+  nativeBuildInputs = [ pkg-config python3 wafHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/serd";
     description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/serf/default.nix b/nixpkgs/pkgs/development/libraries/serf/default.nix
index 92dde2111fc8..dbdc9ce28714 100644
--- a/nixpkgs/pkgs/development/libraries/serf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/serf/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
-, pkgconfig, libiconv }:
+{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
+, pkg-config, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "serf-1.3.9";
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
   };
 
-  nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ];
+  nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ];
   buildInputs = [ apr openssl aprutil zlib libiconv ]
-    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
+    ++ lib.optional (!stdenv.isCygwin) kerberos;
 
   patches = [ ./scons.patch ];
 
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
     sconsFlags+=" CC=$CC"
     sconsFlags+=" OPENSSL=${openssl}"
     sconsFlags+=" ZLIB=${zlib}"
-  '' + stdenv.lib.optionalString (!stdenv.isCygwin) ''
+  '' + lib.optionalString (!stdenv.isCygwin) ''
     sconsFlags+=" GSSAPI=${kerberos.dev}"
   '';
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "HTTP client library based on APR";
     license = licenses.asl20;
     maintainers = with maintainers; [ orivej raskin ];
diff --git a/nixpkgs/pkgs/development/libraries/serialdv/default.nix b/nixpkgs/pkgs/development/libraries/serialdv/default.nix
index 47d4e68f6589..d1d9c6299b35 100644
--- a/nixpkgs/pkgs/development/libraries/serialdv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/serialdv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "serialdv";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link";
     homepage = "https://github.com/f4exb/serialdv";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/sfml/default.nix b/nixpkgs/pkgs/development/libraries/sfml/default.nix
index 7b5e1dcdb2b4..c9a326afa7fe 100644
--- a/nixpkgs/pkgs/development/libraries/sfml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sfml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
+{ lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
 , glew, libXrandr, libXrender, udev, xcbutilimage
 , IOKit, Foundation, AppKit, OpenAL
 }:
@@ -18,16 +18,16 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
-    ++ stdenv.lib.optional stdenv.isLinux udev
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+    ++ lib.optional stdenv.isLinux udev
+    ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
+    ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
 
   cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
                  "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
                  "-DSFML_BUILD_FRAMEWORKS=no"
                  "-DSFML_USE_SYSTEM_DEPS=yes" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.sfml-dev.org/";
     description = "Simple and fast multimedia library";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/sfsexp/default.nix b/nixpkgs/pkgs/development/libraries/sfsexp/default.nix
index 40009a8b7c36..7c3fbb9f39e4 100644
--- a/nixpkgs/pkgs/development/libraries/sfsexp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sfsexp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "sfsexp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small, fast s-expression library";
     homepage = "http://sexpr.sourceforge.net/";
     maintainers = with maintainers; [ jb55 ];
diff --git a/nixpkgs/pkgs/development/libraries/shapelib/default.nix b/nixpkgs/pkgs/development/libraries/shapelib/default.nix
index 8fd4987ac70c..abb27a132c23 100644
--- a/nixpkgs/pkgs/development/libraries/shapelib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shapelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "shapelib-1.5.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qfsgb8b3yiqwvr6h9m81g6k9fjhfys70c22p7kzkbick20a9h0z";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C Library for reading, writing and updating ESRI Shapefiles";
     homepage = "http://shapelib.maptools.org/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/shhmsg/default.nix b/nixpkgs/pkgs/development/libraries/shhmsg/default.nix
index 04b764afc946..0c736e4cb911 100644
--- a/nixpkgs/pkgs/development/libraries/shhmsg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shhmsg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "shhmsg-1.4.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "INSTBASEDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for displaying messages";
     homepage = "https://shh.thathost.com/pub-unix/";
     license = licenses.artistic1;
diff --git a/nixpkgs/pkgs/development/libraries/shhopt/default.nix b/nixpkgs/pkgs/development/libraries/shhopt/default.nix
index 45ec31ca4dff..da1b820fcd54 100644
--- a/nixpkgs/pkgs/development/libraries/shhopt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shhopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "shhopt-1.1.7";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "INSTBASEDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for parsing command line options";
     homepage = "https://shh.thathost.com/pub-unix/";
     license = licenses.artistic1;
diff --git a/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix
index 77b9714066dd..f3b80c0b548f 100644
--- a/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }:
+{ lib, stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }:
 
 stdenv.mkDerivation rec {
   pname = "shibboleth-sp";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ];
 
   configureFlags = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://shibboleth.net/products/service-provider.html";
     description = "Enables SSO and Federation web applications written with any programming language or framework";
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/default.nix b/nixpkgs/pkgs/development/libraries/silgraphite/default.nix
index 9d0aca0ab14b..06cf75876162 100644
--- a/nixpkgs/pkgs/development/libraries/silgraphite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/silgraphite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }:
+{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }:
 
 stdenv.mkDerivation rec {
   version = "2.3.1";
@@ -9,14 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ freetype libXft pango fontconfig];
 
   NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
 
   meta = {
     description = "An advanced font engine";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
index 564c32bf10db..166d0f2911d6 100644
--- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, freetype, cmake, python }:
+{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }:
 
 stdenv.mkDerivation rec {
   version = "1.3.14";
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ freetype ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ];
 
   checkInputs = [ python ];
   doCheck = false; # fails, probably missing something
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An advanced font engine";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix
index 63ad97cbe2bf..e41d08c7cd38 100644
--- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "simdjson";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
     rev = "v${version}";
-    sha256 = "14gi2zq430nfjy424q6r57imc2gnz30nhx4r0wbajzp9qvna819w";
+    sha256 = "0lpb8la74xwd78d5mgwnzx4fy632jbmh0ip19v0dydwm0kagm0a3";
   };
 
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-DSIMDJSON_JUST_LIBRARY=ON"
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isStatic "-DSIMDJSON_BUILD_STATIC=ON";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://simdjson.org/";
     description = "Parsing gigabytes of JSON per second";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/simgear/default.nix b/nixpkgs/pkgs/development/libraries/simgear/default.nix
index e6fb1d7caf75..2f1006404b7a 100644
--- a/nixpkgs/pkgs/development/libraries/simgear/default.nix
+++ b/nixpkgs/pkgs/development/libraries/simgear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi
+{ lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi
 , libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut
 , openscenegraph, openal, expat, cmake, apr
 , curl
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
                   libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut
                   openscenegraph openal expat apr curl ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simulation construction toolkit";
     homepage = "https://gitorious.org/fg/simgear";
     maintainers = with maintainers; [ raskin ];
diff --git a/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
index e6b013aa1370..2ae8b28b64f2 100644
--- a/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, swig, lua, itk }:
+{ lib, stdenv, fetchFromGitHub, cmake, swig, lua, itk }:
 
 stdenv.mkDerivation rec {
   pname = "simpleitk";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # 2.0.0: linker error building examples
   cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.simpleitk.org";
     description = "Simplified interface to ITK";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/nixpkgs/pkgs/development/libraries/skalibs/default.nix
index a691107f9a1d..1efac7fc5e48 100644
--- a/nixpkgs/pkgs/development/libraries/skalibs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "skalibs";
-  version = "2.9.3.0";
-  sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph";
+  version = "2.10.0.1";
+  sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg";
 
   description = "A set of general-purpose C programming libraries";
 
diff --git a/nixpkgs/pkgs/development/libraries/slang/default.nix b/nixpkgs/pkgs/development/libraries/slang/default.nix
index 9b7905c180a9..a3db5ce0d3be 100644
--- a/nixpkgs/pkgs/development/libraries/slang/default.nix
+++ b/nixpkgs/pkgs/development/libraries/slang/default.nix
@@ -1,10 +1,19 @@
-{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
+{ lib, stdenv, fetchurl
+, libiconv
+, libpng
+, ncurses
+, pcre
+, readline
+, zlib
+}:
 
 stdenv.mkDerivation rec {
-  name = "slang-2.3.2";
+  pname = "slang";
+  version = "2.3.2";
+
   src = fetchurl {
-    url = "https://www.jedsoft.org/releases/slang/${name}.tar.bz2";
-    sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw";
+    url = "https://www.jedsoft.org/releases/slang/${pname}-${version}.tar.bz2";
+    sha256 = "sha256-/J47D8T2fDwfbUPJDBalxC0Re44oRXxbRoMbi1064xo=";
   };
 
   outputs = [ "out" "dev" "man" "doc" ];
@@ -13,22 +22,25 @@ stdenv.mkDerivation rec {
 
   # Fix some wrong hardcoded paths
   preConfigure = ''
-    sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure
-    sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c
-    sed -i -e "s|/bin/ln|ln|" src/Makefile.in
-    sed -i -e "s|-ltermcap|-lncurses|" ./configure
+    sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure
+    sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c
+    sed -ie "s|/bin/ln|ln|" src/Makefile.in
+    sed -ie "s|-ltermcap|-lncurses|" ./configure
   '';
 
   configureFlags = [
-    "--with-png=${libpng.dev}"
-    "--with-z=${zlib.dev}"
     "--with-pcre=${pcre.dev}"
+    "--with-png=${libpng.dev}"
     "--with-readline=${readline.dev}"
+    "--with-z=${zlib.dev}"
   ];
 
   buildInputs = [
-    pcre libpng zlib readline
-  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
+    libpng
+    pcre
+    readline
+    zlib
+  ] ++ lib.optionals (stdenv.isDarwin) [ libiconv ];
 
   propagatedBuildInputs = [ ncurses ];
 
@@ -40,11 +52,31 @@ stdenv.mkDerivation rec {
     sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc
   '';
 
-  meta = with stdenv.lib; {
-    description = "A multi-platform programmer's library designed to allow a developer to create robust software";
+  meta = with lib; {
+    description = "A small, embeddable multi-platform programming library";
+    longDescription = ''
+      S-Lang is an interpreted language that was designed from the start to be
+      easily embedded into a program to provide it with a powerful extension
+      language. Examples of programs that use S-Lang as an extension language
+      include the jed text editor and the slrn newsreader. Although S-Lang does
+      not exist as a separate application, it is distributed with a quite
+      capable program called slsh ("slang-shell") that embeds the interpreter
+      and allows one to execute S-Lang scripts, or simply experiment with S-Lang
+      at an interactive prompt. Many of the the examples in this document are
+      presented in the context of one of the above applications.
+
+      S-Lang is also a programmer's library that permits a programmer to develop
+      sophisticated platform-independent software. In addition to providing the
+      S-Lang interpreter, the library provides facilities for screen management,
+      keymaps, low-level terminal I/O, etc. However, this document is concerned
+      only with the extension language and does not address these other features
+      of the S-Lang library. For information about the other components of the
+      library, the reader is referred to the S-Lang Library C Programmer's
+      Guide.
+    '';
     homepage = "http://www.jedsoft.org/slang/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/slib/default.nix b/nixpkgs/pkgs/development/libraries/slib/default.nix
index 401564342b59..47f633f5096b 100644
--- a/nixpkgs/pkgs/development/libraries/slib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/slib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unzip, scheme, texinfo }:
+{ fetchurl, lib, stdenv, unzip, scheme, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "slib-3b5";
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
     '';
 
     # Public domain + permissive (non-copyleft) licensing of some files.
-    license = stdenv.lib.licenses.publicDomain;
+    license = lib.licenses.publicDomain;
 
     homepage = "http://people.csail.mit.edu/jaffer/SLIB";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix
index d93a59efe6e7..7fb6b1adb5a8 100644
--- a/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
   pname = "smarty-i18n";
   version = "1.0";
 
@@ -14,7 +14,7 @@
     cp block.t.php $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "gettext for the smarty3 framework";
     license = licenses.lgpl21;
     homepage = "https://github.com/kikimosha/smarty3-i18n";
diff --git a/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/nixpkgs/pkgs/development/libraries/smarty3/default.nix
index d5708cb6b1e8..2070a3bab790 100644
--- a/nixpkgs/pkgs/development/libraries/smarty3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smarty3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
   pname = "smarty3";
   version = "3.1.36";
 
@@ -14,7 +14,7 @@
     cp -r libs/* $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smarty 3 template engine";
     longDescription = ''
       Smarty is a template engine for PHP, facilitating the
diff --git a/nixpkgs/pkgs/development/libraries/smesh/default.nix b/nixpkgs/pkgs/development/libraries/smesh/default.nix
index 1b1f590109fd..8494799333be 100644
--- a/nixpkgs/pkgs/development/libraries/smesh/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smesh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade
 , Cocoa }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake ninja ];
-  buildInputs = [ opencascade ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extension to OCE providing advanced meshing features";
     homepage = "https://github.com/tpaviot/smesh";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/nixpkgs/pkgs/development/libraries/smpeg/default.nix
index 3a34bf54c3cb..83b4b2193c03 100644
--- a/nixpkgs/pkgs/development/libraries/smpeg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU, libGL, makeWrapper }:
+{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "smpeg-svn${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL gtk2 libGLU libGL ];
 
-  nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ];
+  nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ];
 
   preConfigure = ''
     touch NEWS AUTHORS ChangeLog
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       $out/include/smpeg/*.h
 
     wrapProgram $out/bin/smpeg-config \
-      --prefix PATH ":" "${pkgconfig}/bin" \
+      --prefix PATH ":" "${pkg-config}/bin" \
       --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
   '';
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://icculus.org/smpeg/";
     description = "MPEG decoding library";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
index 270e418174e4..d57cc91f26e2 100644
--- a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , darwin
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
 
   buildInputs = [ SDL2 ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+    ++ lib.optional stdenv.isDarwin darwin.libobjc;
 
   preConfigure = ''
     sh autogen.sh
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://icculus.org/smpeg/";
     description = "SDL2 MPEG Player Library";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/snack/default.nix b/nixpkgs/pkgs/development/libraries/snack/default.nix
index 7aa7cf3d452f..4948e481ff58 100644
--- a/nixpkgs/pkgs/development/libraries/snack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/snack/default.nix
@@ -1,6 +1,6 @@
 # alsaLib vorbis-tools python can be made optional
 
-{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }:
+{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
 
 stdenv.mkDerivation {
   name = "snack-2.2.10";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   postUnpack = ''sourceRoot="$sourceRoot/unix"'';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ];
 
   hardeningDisable = [ "format" ];
@@ -23,13 +23,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out
-    make install DESTDIR="$out" 
+    make install DESTDIR="$out"
   '';
 
-  meta = { 
+  meta = {
     description = "The Snack Sound Toolkit (Tcl)";
     homepage = "http://www.speech.kth.se/snack/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix
index e626db8efb78..ece425e85c41 100644
--- a/nixpkgs/pkgs/development/libraries/snappy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, static ? false }:
+{ lib, stdenv, fetchFromGitHub, cmake
+, static ? stdenv.hostPlatform.isStatic
+}:
 
 stdenv.mkDerivation rec {
   pname = "snappy";
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://google.github.io/snappy/";
     license = licenses.bsd3;
     description = "Compression/decompression library for very high speeds";
diff --git a/nixpkgs/pkgs/development/libraries/soci/default.nix b/nixpkgs/pkgs/development/libraries/soci/default.nix
index 1f9b77cc3c92..f561864a7502 100644
--- a/nixpkgs/pkgs/development/libraries/soci/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soci/default.nix
@@ -1,7 +1,7 @@
 { cmake
 , fetchFromGitHub
 , sqlite
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database access library for C++";
     homepage = "http://soci.sourceforge.net/";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix
index 188405365cd3..e1ba9dbc1e61 100644
--- a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "socket_wrapper-1.2.5";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library passing all socket communications through unix sockets";
     homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix
index f8b1c1028520..1395f3e60cf8 100644
--- a/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "sofia-sip";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ glib openssl ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
     homepage = "https://github.com/freeswitch/sofia-sip";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/sonic/default.nix b/nixpkgs/pkgs/development/libraries/sonic/default.nix
index fc45e220a51c..38dcee84a928 100644
--- a/nixpkgs/pkgs/development/libraries/sonic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, fftw, installShellFiles }:
 
 stdenv.mkDerivation {
   pname = "sonic-unstable";
@@ -19,11 +19,11 @@ stdenv.mkDerivation {
 
   postInstall = ''
     installManPage sonic.1
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple library to speed up or slow down speech";
     homepage = "https://github.com/waywardgeek/sonic";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/soprano/default.nix b/nixpkgs/pkgs/development/libraries/soprano/default.nix
index 40ec30c6c858..c9debd36110e 100644
--- a/nixpkgs/pkgs/development/libraries/soprano/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soprano/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
-, pkgconfig }:
+{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
+, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "soprano-2.9.4";
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
   buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   meta = {
     homepage = "http://soprano.sourceforge.net/";
     description = "An object-oriented C++/Qt4 framework for RDF data";
     license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ sander ];
+    maintainers = with lib.maintainers; [ sander ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/soqt/default.nix b/nixpkgs/pkgs/development/libraries/soqt/default.nix
index 8d69c328eed9..2be6c6621454 100644
--- a/nixpkgs/pkgs/development/libraries/soqt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soqt/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkgconfig }:
+{ fetchFromGitHub, lib, stdenv, coin3d, qtbase, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "soqt";
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ coin3d qtbase ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/coin3d/soqt";
     license = licenses.bsd3;
     description = "Glue between Coin high-level 3D visualization library and Qt";
diff --git a/nixpkgs/pkgs/development/libraries/sord/default.nix b/nixpkgs/pkgs/development/libraries/sord/default.nix
index eb91ec2986a3..820c577908ab 100644
--- a/nixpkgs/pkgs/development/libraries/sord/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sord/default.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, python3, serd, pcre, wafHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, python3, serd, pcre, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "sord";
-  version = "0.16.4";
+  version = "unstable-2021-01-12";
 
-  src = fetchurl {
-    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi";
+  # Commit picked in mitigation of #109729
+  src = fetchFromGitHub {
+    owner = "drobilla";
+    repo = pname;
+    rev = "d2efdb2d026216449599350b55c2c85c0d3efb89";
+    sha256 = "hHTwK+K6cj9MGO77a1IXiUZtEbXZ08cLGkYZ5eMOIVA=";
+    fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ pkgconfig python3 wafHook ];
+  nativeBuildInputs = [ pkg-config python3 wafHook ];
   buildInputs = [ pcre ];
   propagatedBuildInputs = [ serd ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/sord";
     description = "A lightweight C library for storing RDF data in memory";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/soxt/default.nix b/nixpkgs/pkgs/development/libraries/soxt/default.nix
index fe0d93344c0e..5ea23aae8791 100644
--- a/nixpkgs/pkgs/development/libraries/soxt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soxt/default.nix
@@ -1,4 +1,4 @@
-{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }:
+{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }:
 
 stdenv.mkDerivation {
   pname = "soxt";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
     license = licenses.bsd3;
     description = "A GUI binding for using Open Inventor with Xt/Motif";
diff --git a/nixpkgs/pkgs/development/libraries/spandsp/3.nix b/nixpkgs/pkgs/development/libraries/spandsp/3.nix
index ac587f0492b0..b3522afdf860 100644
--- a/nixpkgs/pkgs/development/libraries/spandsp/3.nix
+++ b/nixpkgs/pkgs/development/libraries/spandsp/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
 stdenv.mkDerivation rec {
   version = "3.0.0";
   pname = "spandsp";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A portable and modular SIP User-Agent with audio and video support";
     homepage = "https://github.com/freeswitch/spandsp";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [ ajs124 ];
-    license = stdenv.lib.licenses.gpl2;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [ ajs124 ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/spandsp/default.nix b/nixpkgs/pkgs/development/libraries/spandsp/default.nix
index 1f9834c08f47..85a3059f27bc 100644
--- a/nixpkgs/pkgs/development/libraries/spandsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spandsp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, audiofile, libtiff}:
+{lib, stdenv, fetchurl, audiofile, libtiff}:
 stdenv.mkDerivation rec {
   version = "0.0.6";
   pname = "spandsp";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A portable and modular SIP User-Agent with audio and video support";
     homepage = "http://www.creytiv.com/baresip.html";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.gpl2;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.gpl2;
     downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
     inherit version;
     updateWalker = true;
diff --git a/nixpkgs/pkgs/development/libraries/sparsehash/default.nix b/nixpkgs/pkgs/development/libraries/sparsehash/default.nix
index 6007560a11ff..41b765bcb07d 100644
--- a/nixpkgs/pkgs/development/libraries/sparsehash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sparsehash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "sparsehash-2.0.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sparsehash/sparsehash";
     description = "An extremely memory-efficient hash_map implementation";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix b/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix
index 939371e9209f..ffded04510b4 100644
--- a/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, sqlite, expat, zlib, proj, geos, libspatialite, readosm }:
+{ lib, stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }:
 
 stdenv.mkDerivation rec {
   name = "spatialite-tools-4.1.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ];
 
   configureFlags = [ "--disable-freexl" ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A complete sqlite3-compatible CLI front-end for libspatialite";
     homepage = "https://www.gaia-gis.it/fossil/spatialite-tools";
-    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix
index 1b5abe16f370..a0c875079c44 100644
--- a/nixpkgs/pkgs/development/libraries/spdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchFromGitHub
 , fetchpatch
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of libraries for fast user-mode storage";
     homepage = "https://spdk.io/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix
index fbe7af1825ed..ac74b74ccf1e 100644
--- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fmt }:
+{ lib, stdenv, fetchFromGitHub, cmake, fmt }:
 
 let
   generic = { version, sha256 }:
@@ -17,7 +17,8 @@ let
       buildInputs = [ fmt ];
 
       cmakeFlags = [
-        "-DSPDLOG_BUILD_SHARED=ON"
+        "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+        "-DSPDLOG_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
         "-DSPDLOG_BUILD_EXAMPLE=OFF"
         "-DSPDLOG_BUILD_BENCH=OFF"
         "-DSPDLOG_BUILD_TESTS=ON"
@@ -34,7 +35,7 @@ let
       doCheck = true;
       preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH";
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description    = "Very fast, header only, C++ logging library";
         homepage       = "https://github.com/gabime/spdlog";
         license        = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/speech-tools/default.nix b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix
index 771ad033ed91..c54b4a3721f6 100644
--- a/nixpkgs/pkgs/development/libraries/speech-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, ncurses }:
+{ lib, stdenv, fetchurl, alsaLib, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "speech_tools-${version}.0";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Text-to-speech engine";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/speechd/default.nix b/nixpkgs/pkgs/development/libraries/speechd/default.nix
index 483b8eeb2065..e85b6d4cbf40 100644
--- a/nixpkgs/pkgs/development/libraries/speechd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speechd/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , substituteAll
-, pkgconfig
+, pkg-config
 , fetchurl
 , python3Packages
 , gettext
@@ -24,7 +24,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
   inherit (python3Packages) python pyxdg wrapPython;
 
   # speechd hard-codes espeak, even when built without support for it.
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     autoreconfHook
     gettext
     libtool
@@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     # Audio method falls back from left to right.
     "--with-default-audio-method=\"libao,pulse,alsa,oss\""
-    "--with-systemdsystemunitdir=${placeholder ''out''}/lib/systemd/system"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
   ] ++ optional withPulse "--with-pulse"
     ++ optional withAlsa "--with-alsa"
     ++ optional withLibao "--with-libao"
@@ -110,7 +110,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common interface to speech synthesis";
     homepage = "https://devel.freebsoft.org/speechd";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/speex/default.nix b/nixpkgs/pkgs/development/libraries/speex/default.nix
index f7c3fc50fd79..9633f435fb8e 100644
--- a/nixpkgs/pkgs/development/libraries/speex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }:
 
 stdenv.mkDerivation rec {
   name = "speex-1.2.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ fftw speexdsp ];
 
   # TODO: Remove this will help with immediate backward compatability
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--with-fft=gpl-fftw3"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.speex.org/";
     description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/speexdsp/default.nix b/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
index 421b3ec08c48..f87d79ca6e48 100644
--- a/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }:
 
 stdenv.mkDerivation rec {
   name = "speexdsp-1.2.0";
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ fftw ];
 
   configureFlags = [
     "--with-fft=gpl-fftw3"
-  ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon";
+  ] ++ lib.optional stdenv.isAarch64 "--disable-neon";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.speex.org/";
     description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix b/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix
index 008fb608ca08..a7d59cd8bf6f 100644
--- a/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , bison
-, pkgconfig
+, pkg-config
 , python27 # >= 2.6
 , swig2 # 2.0
 , multipleOutputs ? false #Uses incomplete features of nix!
@@ -15,18 +15,18 @@ stdenv.mkDerivation (rec {
     sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ swig2 python27 bison ];
 
   meta = {
     description = "Support Library for Pocketsphinx";
     homepage = "http://cmusphinx.sourceforge.net";
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ];
   };
 
-} // (stdenv.lib.optionalAttrs multipleOutputs {
+} // (lib.optionalAttrs multipleOutputs {
   outputs = [ "out" "lib" "headers" ];
 
   postInstall = ''
diff --git a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
index 22370cee448e..3d76e67f67ad 100644
--- a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , acl
 , cyrus_sasl
@@ -23,7 +23,7 @@
 , perl
 , phodav
 , pixman
-, pkgconfig
+, pkg-config
 , polkit
 , python3
 , spice-protocol
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     perl
-    pkgconfig
+    pkg-config
     python3
     python3.pkgs.pyparsing
     python3.pkgs.six
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     spice-protocol
     usbredir
     zlib
-  ] ++ stdenv.lib.optionals withPolkit [ polkit acl usbutils ] ;
+  ] ++ lib.optionals withPolkit [ polkit acl usbutils ] ;
 
   PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
     "-Dpulse=disabled" # is deprecated upstream
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GTK 3 SPICE widget";
     longDescription = ''
       spice-gtk is a GTK 3 SPICE widget. It features glib-based
diff --git a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix
index cae975b9a589..07b670a2718f 100644
--- a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "spice-protocol";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     ln -sv ../share/pkgconfig $out/lib/pkgconfig
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Protocol headers for the SPICE protocol";
     homepage = "https://www.spice-space.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/spice/default.nix b/nixpkgs/pkgs/development/libraries/spice/default.nix
index 2e158b98b583..584b1e15a8e3 100644
--- a/nixpkgs/pkgs/development/libraries/spice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , pixman
 , alsaLib
 , openssl
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     spice-protocol
     python3
     python3.pkgs.six
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     ln -s spice-server $out/include/spice
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Complete open source solution for interaction with virtualized desktop devices";
     longDescription = ''
       The Spice project aims to provide a complete open source solution for interaction
diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix
index 79b8e7c2dda1..9d464f7300ae 100644
--- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "spirv-headers";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Machine-readable components of the Khronos SPIR-V Registry";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
index f40c80391a23..cc5656dcc643 100644
--- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     installManPage sqlcipher.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.zetetic.net/sqlcipher/";
     description = "SQLite extension that provides 256 bit AES encryption of database files";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix
index f0bbc93a6f1d..2b7a472d1e78 100644
--- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
+{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null
+, python3Packages
+}:
 
 assert interactive -> readline != null && ncurses != null;
 
-with stdenv.lib;
+with lib;
 
 let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
+  archiveVersion = import ./archive-version.nix lib;
 in
 
 stdenv.mkDerivation rec {
@@ -73,6 +75,10 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails to link against tcl
 
+  passthru.tests = {
+    inherit (python3Packages) sqlalchemy;
+  };
+
   meta = {
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
     downloadPage = "https://sqlite.org/download.html";
diff --git a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
index 78ac8ba6448a..0828f2f45543 100644
--- a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fuse, zlib }:
+{ lib, stdenv, fetchurl, fuse, zlib }:
 
 stdenv.mkDerivation {
   pname = "sqlar";
@@ -11,13 +11,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ fuse zlib ];
 
-  buildFlags = [ "sqlar" "sqlarfs" ];
+  buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ];
 
   installPhase = ''
     install -D -t $out/bin sqlar sqlarfs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sqlite.org/sqlar";
     description = "SQLite Archive utilities";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
index 0eb913adb3b9..3ec528719e9e 100644
--- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
+{ lib, stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
 
 let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
+  archiveVersion = import ./archive-version.nix lib;
   mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
     inherit pname;
     version = "3.34.0";
@@ -12,13 +12,13 @@ let
     };
 
     nativeBuildInputs = [ unzip ];
-    buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation;
+    buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation;
 
     makeFlags = [ makeTarget ];
 
     installPhase = "install -Dt $out/bin ${makeTarget}";
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       inherit description homepage;
       downloadPage = http://sqlite.org/download.html;
       license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/libraries/srt/default.nix b/nixpkgs/pkgs/development/libraries/srt/default.nix
index 6947c674a914..c8d8fafbf355 100644
--- a/nixpkgs/pkgs/development/libraries/srt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/srt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, openssl
+{ lib, stdenv, fetchFromGitHub, cmake, openssl
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "srt";
   version = "1.4.2";
diff --git a/nixpkgs/pkgs/development/libraries/srtp/default.nix b/nixpkgs/pkgs/development/libraries/srtp/default.nix
index e8a3ca944343..0dbfef2c6394 100644
--- a/nixpkgs/pkgs/development/libraries/srtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/srtp/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, pkgconfig
+{ lib, stdenv, fetchFromGitHub, pkg-config
 , openssl ? null, libpcap ? null
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libsrtp";
   version = "2.3.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   # libsrtp.pc references -lcrypto -lpcap without -L
   propagatedBuildInputs = [ openssl libpcap ];
diff --git a/nixpkgs/pkgs/development/libraries/startup-notification/default.nix b/nixpkgs/pkgs/development/libraries/startup-notification/default.nix
index bf2522ca780b..f334bb2f35a4 100644
--- a/nixpkgs/pkgs/development/libraries/startup-notification/default.nix
+++ b/nixpkgs/pkgs/development/libraries/startup-notification/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}:
+{lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}:
 
 let
   version = "0.12";
@@ -11,12 +11,12 @@ stdenv.mkDerivation {
     sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libX11 libxcb xcbutil ];
 
   meta = {
     homepage = "http://www.freedesktop.org/software/startup-notification";
     description = "Application startup notification and feedback library";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/stb/default.nix b/nixpkgs/pkgs/development/libraries/stb/default.nix
index 8e57222ded0b..a3020e14d3e1 100644
--- a/nixpkgs/pkgs/development/libraries/stb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "stb";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp *.h $out/include/stb/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Single-file public domain libraries for C/C++";
     homepage = "https://github.com/nothings/stb";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix b/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix
index 69417299615b..8badf60d9421 100644
--- a/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, cmake,
+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake,
   qtbase, cfitsio, gsl, wcslib, withTester ? false }:
 
 mkDerivation rec {
@@ -20,7 +20,7 @@ mkDerivation rec {
     "-DBUILD_TESTER=${if withTester then "on" else "off"}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rlancaste/stellarsolver";
     description = "Astrometric plate solving library";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/stfl/default.nix b/nixpkgs/pkgs/development/libraries/stfl/default.nix
index b0da3dbfa278..20676c16b9c6 100644
--- a/nixpkgs/pkgs/development/libraries/stfl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stfl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, libiconv }:
+{ lib, stdenv, fetchurl, ncurses, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "stfl-0.24";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     sed -i s/gcc/cc/g Makefile
     sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
-  '' + ( stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + ( lib.optionalString stdenv.isDarwin ''
     sed -i s/-soname/-install_name/ Makefile
   '' ) + ''
     make
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://www.clifford.at/stfl/";
     description = "A library which implements a curses-based widget set for text terminals";
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    license     = stdenv.lib.licenses.lgpl3;
-    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [ lovek323 ];
+    license     = lib.licenses.lgpl3;
+    platforms   = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/stlport/default.nix b/nixpkgs/pkgs/development/libraries/stlport/default.nix
index 2d344ab293d8..5af77d90053f 100644
--- a/nixpkgs/pkgs/development/libraries/stlport/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stlport/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "STLport-5.2.1";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of the C++ Standard Library";
     homepage = "https://sourceforge.net/projects/stlport/";
-    license = stdenv.lib.licenses.free; # seems BSD-like
+    license = lib.licenses.free; # seems BSD-like
     broken = true; # probably glibc-2.20 -related issue
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/stxxl/default.nix b/nixpkgs/pkgs/development/libraries/stxxl/default.nix
index fead2c8c1a53..eec4f722d411 100644
--- a/nixpkgs/pkgs/development/libraries/stxxl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stxxl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ lib, stdenv, fetchurl, cmake
 , parallel ? true
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     inherit parallel;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     homepage = "https://github.com/stxxl/stxxl";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/subunit/default.nix b/nixpkgs/pkgs/development/libraries/subunit/default.nix
index bf3b6a9ffd13..cb824decc6ca 100644
--- a/nixpkgs/pkgs/development/libraries/subunit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/subunit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }:
+{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }:
 
 # NOTE: for subunit python library see pkgs/top-level/python-packages.nix
 
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ check cppunit perl pythonPackages.wrapPython ];
 
   propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ];
 
   postFixup = "wrapPythonPrograms";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A streaming protocol for test results";
     homepage = "https://launchpad.net/subunit";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix
index 2e1fd527e9a7..f8db8f3c379a 100644
--- a/nixpkgs/pkgs/development/libraries/sundials/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix
@@ -1,6 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , cmake
 , fetchurl
+, fetchpatch
 , python
 , blas
 , lapack
@@ -12,12 +13,30 @@
 
 stdenv.mkDerivation rec {
   pname = "sundials";
-  version = "5.3.0";
+  version = "5.6.1";
+
+  outputs = [ "out" "examples" ];
+
+  src = fetchurl {
+    url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
+    sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM=";
+  };
+
+  patches = [
+    # Fixing an upstream regression in treating cmake prefix directories:
+    # https://github.com/LLNL/sundials/pull/58
+    (fetchpatch {
+      url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch";
+      sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc=";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [
     python
   ]
-    ++ stdenv.lib.optionals (lapackSupport)
+    ++ lib.optionals (lapackSupport)
     # Check that the same index size is used for both libraries
     (assert (blas.isILP64 == lapack.isILP64); [
       gfortran
@@ -27,46 +46,34 @@ stdenv.mkDerivation rec {
   # KLU support is based on Suitesparse.
   # It is tested upstream according to the section 1.1.4 of
   # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf)
-  ++ stdenv.lib.optionals (kluSupport) [
+  ++ lib.optionals (kluSupport) [
     suitesparse
   ];
 
-  nativeBuildInputs = [ cmake ];
-
-  src = fetchurl {
-    url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-    sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8";
-  };
-
-  patches = [
-    (fetchurl {
-      # https://github.com/LLNL/sundials/pull/19
-      url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
-      sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
-    })
-  ];
-
   cmakeFlags = [
-    "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
-  ] ++ stdenv.lib.optionals (lapackSupport) [
-    "-DLAPACK_ENABLE=ON"
+    "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
+  ] ++ lib.optionals (lapackSupport) [
+    "-DENABLE_LAPACK=ON"
     "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
-  ] ++ stdenv.lib.optionals (kluSupport) [
-    "-DKLU_ENABLE=ON"
+  ] ++ lib.optionals (kluSupport) [
+    "-DENABLE_KLU=ON"
     "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
     "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
-  ] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [
-    # Use the correct index type according to lapack which is supposed to be
-    # the same index type compatible with blas, thanks to the assertion of
-    # buildInputs
-    "-DSUNDIALS_INDEX_TYPE=int32_t"
-  ]
+  ] ++ [(
+    # Use the correct index type according to lapack and blas used. They are
+    # already supposed to be compatible but we check both for extra safety. 64
+    # should be the default but we prefer to be explicit, for extra safety.
+    if blas.isILP64 then
+      "-DSUNDIALS_INDEX_SIZE=64"
+    else
+      "-DSUNDIALS_INDEX_SIZE=32"
+  )]
   ;
 
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Suite of nonlinear differential/algebraic equation solvers";
     homepage    = "https://computation.llnl.gov/projects/sundials";
     platforms   = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/svrcore/default.nix b/nixpkgs/pkgs/development/libraries/svrcore/default.nix
index 628ab7e28ef1..fbc17a5e7b21 100644
--- a/nixpkgs/pkgs/development/libraries/svrcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/svrcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, nss, nspr }:
+{ lib, stdenv, fetchurl, pkg-config, nss, nspr }:
 
 stdenv.mkDerivation rec {
   pname = "svrcore";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ nss nspr ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Secure PIN handling using NSS crypto";
     license = licenses.mpl11;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/swiften/default.nix b/nixpkgs/pkgs/development/libraries/swiften/default.nix
index 2fe20cc9e882..980d034682f5 100644
--- a/nixpkgs/pkgs/development/libraries/swiften/default.nix
+++ b/nixpkgs/pkgs/development/libraries/swiften/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchurl, openssl, boost, sconsPackages }:
+{ lib, stdenv, python, fetchurl, openssl, boost, sconsPackages }:
 stdenv.mkDerivation rec {
   pname = "swiften";
   version = "4.0.2";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An XMPP library for C++, used by the Swift client";
     homepage    = "http://swift.im/swiften.html";
     license     = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/swiftshader/default.nix b/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
index 3631b8b4fe7c..2c508a3735f9 100644
--- a/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }:
+{ lib, stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "swiftshader";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "A high-performance CPU-based implementation of the Vulkan, OpenGL ES, and Direct3D 9 graphics APIs";
     homepage = "https://opensource.google/projects/swiftshader";
diff --git a/nixpkgs/pkgs/development/libraries/sword/default.nix b/nixpkgs/pkgs/development/libraries/sword/default.nix
index 7349d7f81eb6..35c1e6e15e29 100644
--- a/nixpkgs/pkgs/development/libraries/sword/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sword/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }:
+{ lib, stdenv, fetchurl, pkg-config, icu, clucene_core, curl }:
 
 stdenv.mkDerivation rec {
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ icu clucene_core curl ];
 
   prePatch = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "-DU_USING_ICU_NAMESPACE=1"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A software framework that allows research manipulation of Biblical texts";
     homepage = "http://www.crosswire.org/sword/";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/sycl-info/default.nix b/nixpkgs/pkgs/development/libraries/sycl-info/default.nix
index f294c887b0ce..9d86017e084e 100644
--- a/nixpkgs/pkgs/development/libraries/sycl-info/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sycl-info/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , installShellFiles
 , cmake
@@ -40,13 +40,13 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTING=ON"
     "-DBUILD_DOCS=ON"
     "-DBUILD_SHARED_LIBS=ON"
-    "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include"
+    "-DLYRA_INCLUDE_DIRS=${lib.getDev lyra}/include"
   ];
 
   # Required for ronn to compile the manpage.
   RUBYOPT = "-KU -E utf-8:utf-8";
 
-  meta = with stdenv.lib;
+  meta = with lib;
     {
       homepage = "https://github.com/codeplaysoftware/sycl-info";
       description = "Tool to show information about available SYCL implementations";
diff --git a/nixpkgs/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix
index cc3abd80d6f6..3a3f5c79763e 100644
--- a/nixpkgs/pkgs/development/libraries/symengine/default.nix
+++ b/nixpkgs/pkgs/development/libraries/symengine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gmp
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     ctest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast symbolic manipulation library";
     homepage = "https://github.com/symengine/symengine";
     platforms = platforms.unix ++ platforms.windows;
diff --git a/nixpkgs/pkgs/development/libraries/szip/default.nix b/nixpkgs/pkgs/development/libraries/szip/default.nix
index 2419cf554421..f6d0c619c770 100644
--- a/nixpkgs/pkgs/development/libraries/szip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/szip/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl }:
-    
+{ lib, stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   pname = "szip";
   version = "2.1.1";
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Compression library that can be used with the hdf5 library";
     homepage = "https://www.hdfgroup.org/doc_resource/SZIP/";
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/t1lib/default.nix b/nixpkgs/pkgs/development/libraries/t1lib/default.nix
index 7d42abc6ea19..495993a64ab6 100644
--- a/nixpkgs/pkgs/development/libraries/t1lib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/t1lib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libX11, libXaw }:
+{ lib, stdenv, fetchurl, fetchpatch, libX11, libXaw }:
 
 let
   getPatch = { name, sha256 }: fetchpatch {
@@ -28,9 +28,9 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXaw ];
   buildFlags = [ "without_doc" ];
 
-  postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
+  postInstall = lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A type 1 font rasterizer library for UNIX/X11";
     homepage = "http://www.t1lib.org/";
     license = with licenses; [ gpl2 lgpl2 ];
diff --git a/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix
index 20dc80b253d2..f536442295ef 100644
--- a/nixpkgs/pkgs/development/libraries/tachyon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , Carbon ? null
 , libjpeg ? null
@@ -18,19 +18,19 @@ stdenv.mkDerivation rec {
     url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
     sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
   };
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isDarwin [
     Carbon
-  ] ++ stdenv.lib.optionals withJpegSupport [
+  ] ++ lib.optionals withJpegSupport [
     libjpeg
-  ] ++ stdenv.lib.optionals withPngSupport [
+  ] ++ lib.optionals withPngSupport [
     libpng
   ];
   preBuild = ''
     cd unix
-  '' + stdenv.lib.optionalString withJpegSupport ''
+  '' + lib.optionalString withJpegSupport ''
     export USEJPEG=" -DUSEJPEG"
     export JPEGLIB=" -ljpeg"
-  '' + stdenv.lib.optionalString withPngSupport ''
+  '' + lib.optionalString withPngSupport ''
     export USEPNG=" -DUSEPNG"
     export PNGLIB=" -lpng -lz"
   '';
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     ./make-archs.patch
   ] ++
   # Ensure looks for nix-provided Carbon, not system frameworks
-  stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
+  lib.optional stdenv.isDarwin ./darwin.patch;
 
   installPhase = ''
     cd ../compile/${arch}
@@ -66,10 +66,10 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     inherit version;
-    description = ''A Parallel / Multiprocessor Ray Tracing System'';
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin;
+    description = "A Parallel / Multiprocessor Ray Tracing System";
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.raskin];
+    platforms = with lib.platforms; linux ++ cygwin ++ darwin;
     homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/";
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix b/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix
index b667e6047400..44e107693c97 100644
--- a/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix
+++ b/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, taglib}:
+{lib, stdenv, fetchurl, cmake, taglib}:
 
 stdenv.mkDerivation rec {
   name = "taglib-extras-1.0.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Additional taglib plugins";
     platforms = platforms.unix;
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix b/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix
index 89d676cf3a34..78a4026455e6 100644
--- a/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }:
 
 stdenv.mkDerivation rec {
   pname = "taglib-sharp";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook which ];
+  nativeBuildInputs = [ pkg-config autoreconfHook which ];
   buildInputs = [ mono ];
 
   dontStrip = true;
 
   configureFlags = [ "--disable-docs" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing metadata in media files";
     homepage = "https://github.com/mono/taglib-sharp";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/taglib/default.nix b/nixpkgs/pkgs/development/libraries/taglib/default.nix
index 28373605a6bd..3fcfaa12339a 100644
--- a/nixpkgs/pkgs/development/libraries/taglib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/taglib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchpatch
+{ lib, stdenv, fetchurl, cmake, fetchpatch
 , zlib
 }:
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://taglib.org/";
     repositories.git = "git://github.com/taglib/taglib.git";
     description = "A library for reading and editing audio file metadata";
diff --git a/nixpkgs/pkgs/development/libraries/talloc/default.nix b/nixpkgs/pkgs/development/libraries/talloc/default.nix
index fa920d037a92..553c42da7c4f 100644
--- a/nixpkgs/pkgs/development/libraries/talloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/talloc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python3
 , pkg-config
@@ -43,7 +43,7 @@ stdenv.mkDerivation (rec {
   ];
 
   # this must not be exported before the ConfigurePhase otherwise waf whines
-  preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
     export NIX_CFLAGS_LINK="-no-pie -shared";
   '';
 
@@ -51,13 +51,13 @@ stdenv.mkDerivation (rec {
     ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hierarchical pool based memory allocator with destructors";
     homepage = "https://tdb.samba.org/";
     license = licenses.gpl3;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
   # python-config from build Python gives incorrect values when cross-compiling.
   # If python-config is not found, the build falls back to using the sysconfig
   # module, which works correctly when cross-compiling.
diff --git a/nixpkgs/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix
index 8f045802d3af..2047b0d5bc2e 100644
--- a/nixpkgs/pkgs/development/libraries/tbb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
 
-with stdenv.lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation rec {
   pname = "tbb";
   version = "2019_U9";
 
@@ -16,13 +16,17 @@ with stdenv.lib; stdenv.mkDerivation rec {
   makeFlags = optional (compiler != null) "compiler=${compiler}"
     ++ optional (stdver != null) "stdver=${stdver}";
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/lib
     cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/
     mv include $out/
     rm $out/include/index.html
+
+    runHook postInstall
   '';
 
   enableParallelBuilding = true;
diff --git a/nixpkgs/pkgs/development/libraries/tclap/default.nix b/nixpkgs/pkgs/development/libraries/tclap/default.nix
index 22fd7b11681c..451f17a2cd72 100644
--- a/nixpkgs/pkgs/development/libraries/tclap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tclap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tclap-1.2.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://tclap.sourceforge.net/";
     description = "Templatized C++ Command Line Parser Library";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/tcllib/default.nix b/nixpkgs/pkgs/development/libraries/tcllib/default.nix
index 2cb65b9c6981..4cab15ca5c22 100644
--- a/nixpkgs/pkgs/development/libraries/tcllib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tcllib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl }:
+{ lib, stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "tcllib";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sourceforge.net/projects/tcllib/";
     description = "Tcl-only library of standard routines for Tcl";
-    license = stdenv.lib.licenses.tcltk;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.tcltk;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tcltls/default.nix b/nixpkgs/pkgs/development/libraries/tcltls/default.nix
index c26394f6cd50..e88358bbce0a 100644
--- a/nixpkgs/pkgs/development/libraries/tcltls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tcltls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, openssl }:
+{ lib, stdenv, fetchurl, tcl, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "tcltls";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://tls.sourceforge.net/";
     description = "An OpenSSL / RSA-bsafe Tcl extension";
-    license = stdenv.lib.licenses.tcltk;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.tcltk;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tclx/default.nix b/nixpkgs/pkgs/development/libraries/tclx/default.nix
index 5d4727a1831e..85eae730575f 100644
--- a/nixpkgs/pkgs/development/libraries/tclx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tclx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl }:
+{ lib, stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
   name = "tclx-${version}.${patch}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://tclx.sourceforge.net/";
     description = "Tcl extensions";
-    license = stdenv.lib.licenses.tcltk;
-    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
+    license = lib.licenses.tcltk;
+    maintainers = with lib.maintainers; [ kovirobi ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix
index b8e6552bc7b5..658bdb2f9d5d 100644
--- a/nixpkgs/pkgs/development/libraries/tdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , wafHook
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The trivial database";
     longDescription = ''
       TDB is a Trivial Database. In concept, it is very much like GDBM,
diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix
index 1a36a68a33bd..895faa8847ac 100644
--- a/nixpkgs/pkgs/development/libraries/tdlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
+{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   version = "1.7.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gperf openssl readline zlib ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform library for building Telegram clients";
     homepage = "https://core.telegram.org/tdlib/";
     license = [ licenses.boost ];
diff --git a/nixpkgs/pkgs/development/libraries/tecla/default.nix b/nixpkgs/pkgs/development/libraries/tecla/default.nix
index a47f39be10a7..6d8a334ce3fb 100644
--- a/nixpkgs/pkgs/development/libraries/tecla/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tecla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tecla-1.6.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     description = "Command-line editing library";
     license = "as-is";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.peti ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix
index 455c761f6ee9..2885f3cbb12d 100644
--- a/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-0.6.2";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
     homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
index ee2f34776d66..8bb7522b1976 100644
--- a/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt
+{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
 , gobject-introspection, vala, glibcLocales }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   LC_ALL = "en_US.UTF-8";
   propagatedBuildInputs = [ dbus-glib glib ];
 
-  nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ];
+  nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ];
   buildInputs = [ glibcLocales python2 ];
 
   enableParallelBuilding = true;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   passthru.python = python2;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://telepathy.freedesktop.org";
     platforms = platforms.unix;
     license = with licenses; [ bsd2 bsd3 lgpl21Plus ];
diff --git a/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
index 2addb86246dd..b606c56445ed 100644
--- a/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus
+{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
 , telepathy-farstream, telepathy-glib, fetchpatch }:
 
 let
@@ -11,19 +11,18 @@ in stdenv.mkDerivation rec {
     sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig python ];
+  nativeBuildInputs = [ cmake pkg-config python ];
   propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
   buildInputs = [ dbus-glib ];
   checkInputs = [ dbus.daemon dbus-python ];
 
   # No point in building tests if they are not run
   # On 0.9.7, they do not even build with QT4
-  cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
+  cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
 
-  enableParallelBuilding = true;
   doCheck = false; # giving up for now
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Telepathy Qt bindings";
     homepage = "https://telepathy.freedesktop.org/components/telepathy-qt/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/template-glib/default.nix b/nixpkgs/pkgs/development/libraries/template-glib/default.nix
index 385b198a755a..2c89e3f433ab 100644
--- a/nixpkgs/pkgs/development/libraries/template-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/template-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 let
   version = "3.34.0";
   pname = "template-glib";
@@ -9,11 +9,11 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1";
   };
 
-  buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
   nativeBuildInputs = [ glib gobject-introspection ];
 
   mesonFlags = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for template expansion which supports calling into GObject Introspection from templates";
     homepage = "https://gitlab.gnome.org/GNOME/template-glib";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/tepl/default.nix b/nixpkgs/pkgs/development/libraries/tepl/default.nix
index 77cf9fd0247d..d9d740817355 100644
--- a/nixpkgs/pkgs/development/libraries/tepl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tepl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6";
   };
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gnome3.updateScript { packageName = pname; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Tepl";
     description = "Text editor product line";
     maintainers = teams.gnome.members ++ [ maintainers.manveru ];
diff --git a/nixpkgs/pkgs/development/libraries/termbox/default.nix b/nixpkgs/pkgs/development/libraries/termbox/default.nix
index 22082f7198f4..e809240bcd10 100644
--- a/nixpkgs/pkgs/development/libraries/termbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/termbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "termbox";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python3 wafHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for writing text-based user interfaces";
     license = licenses.mit;
     homepage = "https://github.com/nsf/termbox#readme";
diff --git a/nixpkgs/pkgs/development/libraries/tevent/default.nix b/nixpkgs/pkgs/development/libraries/tevent/default.nix
index 2d5fd0564bad..568751f48aa3 100644
--- a/nixpkgs/pkgs/development/libraries/tevent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python3
 , pkg-config
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An event system based on the talloc memory management library";
     homepage = "https://tevent.samba.org/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/libraries/theft/default.nix b/nixpkgs/pkgs/development/libraries/theft/default.nix
index 646cc60406a5..3d39075dd26a 100644
--- a/nixpkgs/pkgs/development/libraries/theft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/theft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "0.4.5";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkTarget = "test";
-  
+
   installFlags = [ "PREFIX=$(out)" ];
 
   # fix the libtheft.pc file to use the right installation
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/lib/pkgconfig/libtheft.pc \
       --replace "/usr/local" "$out"
   '';
-  
-  meta = with stdenv.lib; {
+
+  meta = with lib; {
     description = "A C library for property-based testing";
     homepage    = "https://github.com/silentbicycle/theft/";
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/thrift/0.10.nix b/nixpkgs/pkgs/development/libraries/thrift/0.10.nix
index d626673a227a..a735e146214a 100644
--- a/nixpkgs/pkgs/development/libraries/thrift/0.10.nix
+++ b/nixpkgs/pkgs/development/libraries/thrift/0.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison
+{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison
 , flex, twisted
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
   pythonPath = [];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     boost zlib libevent openssl python bison flex twisted
   ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-tests=no" ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for scalable cross-language services";
     homepage = "http://thrift.apache.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix
index f5c8f64633bb..669dff21147e 100644
--- a/nixpkgs/pkgs/development/libraries/thrift/default.nix
+++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig
+{ lib, stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config
 , bison, flex, twisted
 , static ? stdenv.hostPlatform.isStatic
 }:
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
   # pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
   pythonPath = [];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ boost zlib libevent openssl python bison flex ]
-    ++ stdenv.lib.optional (!static) twisted;
+  nativeBuildInputs = [ cmake pkg-config bison flex ];
+  buildInputs = [ boost zlib libevent openssl ]
+    ++ lib.optionals (!static) [ python twisted ];
 
   preConfigure = "export PY_PREFIX=$out";
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     # FIXME: Fails to link in static mode with undefined reference to
     # `boost::unit_test::unit_test_main(bool (*)(), int, char**)'
     "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}"
-  ] ++ stdenv.lib.optionals static [
+  ] ++ lib.optionals static [
     "-DWITH_STATIC_LIB:BOOL=ON"
     "-DOPENSSL_USE_STATIC_LIBS=ON"
   ];
@@ -44,13 +44,13 @@ stdenv.mkDerivation rec {
   checkPhase = ''
     runHook preCheck
 
-    ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket
+    ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket
 
     runHook postCheck
   '';
   enableParallelChecking = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for scalable cross-language services";
     homepage = "http://thrift.apache.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix b/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix
index 3d163ef6ded6..044c09a5bc48 100644
--- a/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
+{ fetchurl, lib, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
   pname = "libtirpc";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/projects/libtirpc/";
     description = "The transport-independent Sun RPC implementation (TI-RPC)";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/ticpp/default.nix b/nixpkgs/pkgs/development/libraries/ticpp/default.nix
index 37b093c8e2ec..20de3d7f2b89 100644
--- a/nixpkgs/pkgs/development/libraries/ticpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ticpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Interface to TinyXML";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/wxFormBuilder/ticpp";
   };
 
diff --git a/nixpkgs/pkgs/development/libraries/tidyp/default.nix b/nixpkgs/pkgs/development/libraries/tidyp/default.nix
index f75b8cb01510..5c0ad8463b4a 100644
--- a/nixpkgs/pkgs/development/libraries/tidyp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tidyp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tidyp-1.04";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A program that can validate your HTML, as well as modify it to be more clean and standard";
     homepage = "http://tidyp.com/";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix
index eb65d07b2837..560a991c44af 100644
--- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix
@@ -47,8 +47,6 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  enableParallelBuilding = true;
-
   buildInputs = [
     catch2
     zlib
diff --git a/nixpkgs/pkgs/development/libraries/timezonemap/default.nix b/nixpkgs/pkgs/development/libraries/timezonemap/default.nix
index 131d66e45cce..372b0e74b06f 100644
--- a/nixpkgs/pkgs/development/libraries/timezonemap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/timezonemap/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , autoreconfHook
 , fetchbzr
-, pkgconfig
+, pkg-config
 , gtk3
 , glib
 , file
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     autoreconfHook
     gobject-introspection
   ];
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     sed "s|/usr/share/libtimezonemap|$out/share/libtimezonemap|g" -i ./src/tz.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/timezonemap";
     description = "A GTK+3 Timezone Map Widget";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/tinycbor/default.nix b/nixpkgs/pkgs/development/libraries/tinycbor/default.nix
index 62f2a8071852..d03e20cb7e21 100644
--- a/nixpkgs/pkgs/development/libraries/tinycbor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tinycbor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "tinycbor";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Concise Binary Object Representation (CBOR) Library";
     homepage = "https://github.com/intel/tinycbor";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix b/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix
index 92eb5b3d8f4b..c7939a6be255 100644
--- a/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tinyobjloader/tinyobjloader";
     description = "Tiny but powerful single file wavefront obj loader";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix
index 310b5a447c7a..1e2eea7ac899 100644
--- a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "tinyxml-2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple, small, efficient, C++ XML parser";
     homepage = "http://www.grinninglizard.com/tinyxml2/index.html";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.zlib;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.zlib;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix
index 9c909d5e14d6..e8c5dd1dacdf 100644
--- a/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 let
   version = "2.6.2";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
   };
 
   patches = [
-    # add pkgconfig file
+    # add pkg-config file
     ./2.6.2-add-pkgconfig.patch
 
     # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   NIX_CFLAGS_COMPILE =
-    stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
+    lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
 
   nativeBuildInputs = [ unzip ];
   buildPhase = ''
@@ -67,14 +67,14 @@ in stdenv.mkDerivation {
     cp -v tinyxml.pc $out/lib/pkgconfig/
 
     cp -v docs/* $out/share/doc/tinyxml/
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
   '';
 
   meta = {
     description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
     homepage = "http://www.grinninglizard.com/tinyxml/index.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tix/default.nix b/nixpkgs/pkgs/development/libraries/tix/default.nix
index f0b460b6f3dc..e0f91330efca 100644
--- a/nixpkgs/pkgs/development/libraries/tix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, tk, fetchpatch } :
+{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } :
 
 stdenv.mkDerivation {
   version = "8.4.3";
@@ -7,13 +7,13 @@ stdenv.mkDerivation {
      url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
      sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
   };
-  patches = [ 
+  patches = [
   (fetchpatch {
     name = "tix-8.4.3-tcl8.5.patch";
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
     sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj";
     })
-  ] ++ stdenv.lib.optional (tcl.release == "8.6")
+  ] ++ lib.optional (tcl.release == "8.6")
   (fetchpatch {
     name = "tix-8.4.3-tcl8.6.patch";
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   buildInputs = [ tcl tk ];
   # the configure script expects to find the location of the sources of
   # tcl and tk in {tcl,tk}Config.sh
-  # In fact, it only needs some private headers. We copy them in 
+  # In fact, it only needs some private headers. We copy them in
   # the private_headers folders and trick the configure script into believing
   # the sources are here.
   preConfigure = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     "--libdir=\${prefix}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A widget library for Tcl/Tk";
     homepage    = "http://tix.sourceforge.net/";
     platforms   = platforms.all;
diff --git a/nixpkgs/pkgs/development/libraries/tk/8.6.nix b/nixpkgs/pkgs/development/libraries/tk/8.6.nix
index c30f9a819478..fdffbeba2c93 100644
--- a/nixpkgs/pkgs/development/libraries/tk/8.6.nix
+++ b/nixpkgs/pkgs/development/libraries/tk/8.6.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, tcl, stdenv, ... } @ args:
+{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args:
 
 callPackage ./generic.nix (args // {
 
@@ -7,6 +7,6 @@ callPackage ./generic.nix (args // {
     sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg";
   };
 
-  patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
+  patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
 
 })
diff --git a/nixpkgs/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix
index 1cbf4026cb88..57dc3dac2d09 100644
--- a/nixpkgs/pkgs/development/libraries/tk/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? []
+{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? []
 , enableAqua ? stdenv.isDarwin, darwin
 , ... }:
 
@@ -21,17 +21,17 @@ stdenv.mkDerivation {
     cp ../{unix,generic}/*.h $out/include
     ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary}
   ''
-  + stdenv.lib.optionalString (stdenv.isDarwin) ''
+  + lib.optionalString (stdenv.isDarwin) ''
     cp ../macosx/*.h $out/include
   '';
 
   configureFlags = [
     "--enable-threads"
     "--with-tcl=${tcl}/lib"
-  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"
-    ++ stdenv.lib.optional enableAqua "--enable-aqua";
+  ] ++ lib.optional stdenv.is64bit "--enable-64bit"
+    ++ lib.optional enableAqua "--enable-aqua";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
 
   propagatedBuildInputs = [ tcl libXft ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     libdir = "lib/${libPrefix}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = "https://www.tcl.tk/";
     license = licenses.tcltk;
diff --git a/nixpkgs/pkgs/development/libraries/tl-expected/default.nix b/nixpkgs/pkgs/development/libraries/tl-expected/default.nix
index e91c42c884cb..4915fd7e700d 100644
--- a/nixpkgs/pkgs/development/libraries/tl-expected/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tl-expected/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "tl-expected-unstable";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++11/14/17 std::expected with functional-style extensions";
     homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html";
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/development/libraries/tnt/default.nix b/nixpkgs/pkgs/development/libraries/tnt/default.nix
index 7e8aa2983cfd..932239a485fd 100644
--- a/nixpkgs/pkgs/development/libraries/tnt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tnt/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   pname = "tnt";
   version = "3.0.12";
-  
+
   src = fetchurl {
     url = "https://math.nist.gov/tnt/tnt_3_0_12.zip";
     sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://math.nist.gov/tnt/";
     description = "Template Numerical Toolkit: C++ headers for array and matrices";
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.publicDomain;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tntdb/default.nix b/nixpkgs/pkgs/development/libraries/tntdb/default.nix
index ff14c8c3305e..a21a71b89bfd 100644
--- a/nixpkgs/pkgs/development/libraries/tntdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tntdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
+{ lib, stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "tntdb";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tntnet.org/tntdb.html";
     description = "C++ library which makes accessing SQL databases easy and robust";
     platforms = platforms.linux ;
diff --git a/nixpkgs/pkgs/development/libraries/tntnet/default.nix b/nixpkgs/pkgs/development/libraries/tntnet/default.nix
index 332750d7694c..a80b923e2358 100644
--- a/nixpkgs/pkgs/development/libraries/tntnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tntnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
+{ lib, stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
 
 stdenv.mkDerivation rec {
   pname = "tntnet";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tntnet.org/tntnet.html";
     description = "Web server which allows users to develop web applications using C++";
     platforms = platforms.linux ;
diff --git a/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix b/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix
index b8969588b3c5..22d3266b93a6 100644
--- a/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, bzip2 }:
+{ fetchurl, lib, stdenv, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "tokyocabinet-1.4.48";
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
          robustness, supports 64-bit architecture.
       '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix b/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix
index 5b58bf416724..6431e6a1a7a5 100644
--- a/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, tokyocabinet, pkgconfig }:
+{ fetchurl, lib, stdenv, tokyocabinet, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "tokyotyrant-1.1.41";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ tokyocabinet ];
 
   doCheck = false;                                # FIXME
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
 
     homepage = "https://fallabs.com/tokyotyrant/";
 
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
 
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;         # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;         # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
index 266538d43c25..c93ec8dccf9b 100644
--- a/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "totem-pl-parser";
   version = "3.26.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k";
   };
 
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ];
   buildInputs = [ libxml2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Apps/Videos";
     description = "Simple GObject-based library to parse and save a host of playlist formats";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix
index 0670fdcdbd15..2ca5dd6bd93a 100644
--- a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , asciidoc
@@ -11,7 +11,7 @@
 , tracker
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , vala
 , wrapGAppsHook
 , bzip2
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   version = "3.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6";
   };
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     libxslt
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
     wrapGAppsHook
   ];
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Tracker";
     description = "Desktop-neutral user information store, search tool and indexer";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix
index e37db9f25330..38885048fcc5 100644
--- a/nixpkgs/pkgs/development/libraries/tracker/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix
@@ -1,10 +1,10 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , gettext
 , meson
 , ninja
-, pkgconfig
+, pkg-config
 , asciidoc
 , gobject-introspection
 , python3
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr";
   };
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     vala
-    pkgconfig
+    pkg-config
     asciidoc
     gettext
     libxslt
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_45
     python3 # for data-generators
     systemd # used for checks to install systemd user service
-    dbus # used for checks and pkgconfig to install dbus service/s
+    dbus # used for checks and pkg-config to install dbus service/s
   ];
 
   buildInputs = [
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Tracker";
     description = "Desktop-neutral user information store, search tool and indexer";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/libraries/tre/default.nix b/nixpkgs/pkgs/development/libraries/tre/default.nix
index 80806848846f..e515dd1673fa 100644
--- a/nixpkgs/pkgs/development/libraries/tre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tre/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch}:
+{lib, stdenv, fetchurl, fetchpatch}:
 
 stdenv.mkDerivation rec {
   name = "tre-0.8.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight and robust POSIX compliant regexp matching library";
     homepage = "https://laurikari.net/tre/";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/tremor/default.nix b/nixpkgs/pkgs/development/libraries/tremor/default.nix
index 722094f859c5..16e1a78d396e 100644
--- a/nixpkgs/pkgs/development/libraries/tremor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tremor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }:
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }:
 
 stdenv.mkDerivation {
   name = "tremor-unstable-2018-03-16";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   propagatedBuildInputs = [ libogg ];
 
   preConfigure = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://xiph.org/tremor/";
     description = "Fixed-point version of the Ogg Vorbis decoder";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix
index 929627f3e1bf..800b35640111 100644
--- a/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "trompeloeil";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Header only C++14 mocking framework";
     homepage = "https://github.com/rollbear/trompeloeil";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/libraries/tsocks/default.nix b/nixpkgs/pkgs/development/libraries/tsocks/default.nix
index f2018286a3ea..728c6e71f7fb 100644
--- a/nixpkgs/pkgs/development/libraries/tsocks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tsocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "tsocks";
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
       -e "/SAVE/d" Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Transparent SOCKS v4 proxying library";
     homepage = "http://tsocks.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = with maintainers; [ edwtjo phreedom ];
     platforms = platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/nixpkgs/pkgs/development/libraries/tweeny/default.nix b/nixpkgs/pkgs/development/libraries/tweeny/default.nix
index f2de470288de..8340e47fbf9b 100644
--- a/nixpkgs/pkgs/development/libraries/tweeny/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tweeny/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , cmake
 }:
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern C++ tweening library";
     license = licenses.mit;
     homepage = "http://mobius3.github.io/tweeny";
diff --git a/nixpkgs/pkgs/development/libraries/twolame/default.nix b/nixpkgs/pkgs/development/libraries/twolame/default.nix
index cb8ee14535dc..3537dd3029b6 100644
--- a/nixpkgs/pkgs/development/libraries/twolame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/twolame/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub
-, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub
+, autoreconfHook, pkg-config
 , libsndfile }:
 
 stdenv.mkDerivation {
@@ -14,12 +14,12 @@ stdenv.mkDerivation {
     sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libsndfile ];
 
   doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found"
 
-  meta = with stdenv.lib;{
+  meta = with lib;{
     description = "A MP2 encoder";
     longDescription = ''
       TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on
diff --git a/nixpkgs/pkgs/development/libraries/ubus/default.nix b/nixpkgs/pkgs/development/libraries/ubus/default.nix
index 1f7124411ac3..db947d373a2d 100644
--- a/nixpkgs/pkgs/development/libraries/ubus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ubus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchgit, libubox, libjson }:
+{ lib, stdenv, cmake, fetchgit, libubox, libjson }:
 
 stdenv.mkDerivation {
   pname = "ubus";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ libubox libjson ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenWrt system message/RPC bus";
     homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/uci/default.nix b/nixpkgs/pkgs/development/libraries/uci/default.nix
index aa2a88653bb3..0a5af8b907b8 100644
--- a/nixpkgs/pkgs/development/libraries/uci/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uci/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchgit, pkgconfig, libubox }:
+{ lib, stdenv, cmake, fetchgit, pkg-config, libubox }:
 
 stdenv.mkDerivation {
   pname = "uci";
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
   hardeningDisable = [ "all" ];
   cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
   buildInputs = [ libubox ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenWrt Unified Configuration Interface";
     homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/ucl/default.nix b/nixpkgs/pkgs/development/libraries/ucl/default.nix
index f25a63137526..43f7ddf63af9 100644
--- a/nixpkgs/pkgs/development/libraries/ucl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ucl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "ucl-1.03";
@@ -8,12 +8,12 @@ stdenv.mkDerivation {
   };
 
   # needed to successfully compile with gcc 6
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=c90";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c90";
 
   meta = {
     homepage = "http://www.oberhumer.com/opensource/ucl/";
     description = "Portable lossless data compression library";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ucommon/default.nix b/nixpkgs/pkgs/development/libraries/ucommon/default.nix
index 1c20ce6d9c83..7cfd9f1edf5c 100644
--- a/nixpkgs/pkgs/development/libraries/ucommon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ucommon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , openssl ? null, zlib ? null, gnutls ? null
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   # disable flaky networking test
   postPatch = ''
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ library to facilitate using C++ design patterns";
     homepage = "https://www.gnu.org/software/commoncpp/";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/ucx/default.nix b/nixpkgs/pkgs/development/libraries/ucx/default.nix
index a4120b7ba43b..fae81276878e 100644
--- a/nixpkgs/pkgs/development/libraries/ucx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ucx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, doxygen
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen
 , numactl, rdma-core, libbfd, libiberty, perl, zlib
 }:
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Unified Communication X library";
     homepage = "http://www.openucx.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/udns/default.nix b/nixpkgs/pkgs/development/libraries/udns/default.nix
index 41fb6e7abff6..fc0b4a42b55d 100644
--- a/nixpkgs/pkgs/development/libraries/udns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/udns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # this expression is mostly based on debian's packaging
 # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   # keep man3
   outputDevdoc = "out";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.corpit.ru/mjt/udns.html";
     description = "Async-capable DNS stub resolver library";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/udunits/default.nix b/nixpkgs/pkgs/development/libraries/udunits/default.nix
index 65e88f8fd8c1..deed5b64d2c5 100644
--- a/nixpkgs/pkgs/development/libraries/udunits/default.nix
+++ b/nixpkgs/pkgs/development/libraries/udunits/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook,
   texinfo, bison, flex, expat, file
 }:
 
 stdenv.mkDerivation rec {
   pname = "udunits";
   version = "2.2.27.6";
-  
+
   src = fetchFromGitHub {
     owner = "Unidata";
     repo = "UDUNITS-2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook texinfo bison flex file ];
   buildInputs = [ expat ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.unidata.ucar.edu/software/udunits/";
     description = "A C-based package for the programatic handling of units of physical quantities";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix b/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
index 085741a66f88..5420eb204e3d 100644
--- a/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobject-introspection }:
+{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   version="0.5.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ];
 
   preConfigure = "./autogen.sh";
diff --git a/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix
index e78e72bf9b87..ec7626a7e8bc 100644
--- a/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "uid_wrapper-1.2.8";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix
index 5050650635f4..d27adb2a061d 100644
--- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , docbook_xsl
 , fetchurl
 , glib
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     mv docs/reference $doc/share/doc/umockdev/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mock hardware devices for creating unit tests";
     license = licenses.lgpl2;
     maintainers = with maintainers; [ flokli ];
diff --git a/nixpkgs/pkgs/development/libraries/unibilium/default.nix b/nixpkgs/pkgs/development/libraries/unibilium/default.nix
index dca24c7f9ea5..f5fd4f82bae2 100644
--- a/nixpkgs/pkgs/development/libraries/unibilium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unibilium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
+{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "unibilium-unstable";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+    ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkg-config perl ];
   buildInputs = [ libtool ncurses ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/libraries/unicap/default.nix b/nixpkgs/pkgs/development/libraries/unicap/default.nix
index 87ca28fee983..17e91f7e2365 100644
--- a/nixpkgs/pkgs/development/libraries/unicap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unicap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }:
 
 stdenv.mkDerivation rec {
   pname = "libunicap";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Universal video capture API";
     homepage = "http://www.unicap-imaging.org/";
     maintainers = [ maintainers.raskin ];
diff --git a/nixpkgs/pkgs/development/libraries/unicorn/default.nix b/nixpkgs/pkgs/development/libraries/unicorn/default.nix
index cea35519ad87..7f768d9631bb 100644
--- a/nixpkgs/pkgs/development/libraries/unicorn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unicorn/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , cmake
 }:
 
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight multi-platform CPU emulator library";
     homepage = "http://www.unicorn-engine.org";
     license = licenses.gpl2Only;
diff --git a/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
index 7dd8e071567a..d185d32c816f 100644
--- a/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchFromGitHub, cmake}:
+{lib, stdenv, fetchFromGitHub, cmake}:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "unittest-cpp";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i";
   };
 
-  buildInputs = [cmake];
+  nativeBuildInputs = [ cmake ];
 
   doCheck = false;
 
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Lightweight unit testing framework for C++";
     license = licenses.mit;
     maintainers = [];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/unixODBC/default.nix b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix
index a4fcac2a3580..8b2558c08504 100644
--- a/nixpkgs/pkgs/development/libraries/unixODBC/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "unixODBC";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ODBC driver manager for Unix";
     homepage = "http://www.unixodbc.org/";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix
index 04aa7e6c6854..edbe51998c3e 100644
--- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -19,7 +19,7 @@
       driver = "lib/psqlodbcw.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Official PostgreSQL ODBC Driver";
       homepage =  "https://odbc.postgresql.org/";
       license = licenses.lgpl2;
@@ -60,7 +60,7 @@
       driver = if stdenv.isDarwin then "lib/libmaodbc.dylib" else "lib/libmaodbc.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "MariaDB ODBC database driver";
       homepage =  "https://downloads.mariadb.org/connector-odbc/";
       license = licenses.gpl2;
@@ -88,7 +88,7 @@
       driver = "lib/libmyodbc3-3.51.12.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "MariaDB ODBC database driver";
       homepage = "https://dev.mysql.com/downloads/connector/odbc/";
       license = licenses.gpl2;
@@ -123,7 +123,7 @@
       driver = "lib/libsqlite3odbc.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "ODBC driver for SQLite";
       homepage = "http://www.ch-werner.de/sqliteodbc";
       license = licenses.bsd2;
@@ -166,7 +166,7 @@
       driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "ODBC Driver 17 for SQL Server";
       homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017";
       license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/libraries/unqlite/default.nix b/nixpkgs/pkgs/development/libraries/unqlite/default.nix
index 9d0ab3868565..c0e405c8849c 100644
--- a/nixpkgs/pkgs/development/libraries/unqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://unqlite.org/";
     description = "Self-contained, serverless, zero-conf, transactional NoSQL DB library";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/uri/default.nix b/nixpkgs/pkgs/development/libraries/uri/default.nix
index c96629072f99..48a80aacdf59 100644
--- a/nixpkgs/pkgs/development/libraries/uri/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uri/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen }:
+{ lib, stdenv, fetchFromGitHub, cmake, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "uri-${version}";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ URI library";
     homepage = "https://cpp-netlib.org";
-    license = stdenv.lib.licenses.boost;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.boost;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/nixpkgs/pkgs/development/libraries/uriparser/default.nix
index a12f040bf49c..ad1719984807 100644
--- a/nixpkgs/pkgs/development/libraries/uriparser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uriparser/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ gtest ];
   doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://uriparser.github.io/";
     description = "Strictly RFC 3986 compliant URI parsing library";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/nixpkgs/pkgs/development/libraries/usbredir/default.nix
index 2ac7c823e22a..0313b8c81ef2 100644
--- a/nixpkgs/pkgs/development/libraries/usbredir/default.nix
+++ b/nixpkgs/pkgs/development/libraries/usbredir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "usbredir";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libusb1 ];
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "USB traffic redirection protocol";
     homepage = "https://www.spice-space.org/usbredir.html";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/ustr/default.nix b/nixpkgs/pkgs/development/libraries/ustr/default.nix
index b6bb02d56e44..2b04d8c0c5b7 100644
--- a/nixpkgs/pkgs/development/libraries/ustr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ustr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "ustr";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     find $out/lib -name \*debug\* -delete
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.and.org/ustr/";
     description = "Micro String API for C language";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix
index ef02ca2c3134..e627b97849a0 100644
--- a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "utf8cpp";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nemtrif/utfcpp";
     description = "UTF-8 with C++ in a Portable Way";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
index ea455e2c92c1..b78999e96a76 100644
--- a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "utf8proc";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A clean C library for processing UTF-8 Unicode data";
     homepage = "https://juliastrings.github.io/utf8proc/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/uthash/default.nix b/nixpkgs/pkgs/development/libraries/uthash/default.nix
index d2c5b6ab11d6..7ddae062f766 100644
--- a/nixpkgs/pkgs/development/libraries/uthash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uthash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 let
   version = "2.1.0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     cp ./src/* "$out/include/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A hash table for C structures";
     homepage    = "http://troydhanson.github.io/uthash";
     license     = licenses.bsd2; # it's one-clause, actually, as it's source-only
diff --git a/nixpkgs/pkgs/development/libraries/uthenticode/default.nix b/nixpkgs/pkgs/development/libraries/uthenticode/default.nix
new file mode 100644
index 000000000000..9957eccd4267
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/uthenticode/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, pe-parse }:
+
+stdenv.mkDerivation rec {
+  pname = "uthenticode";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "trailofbits";
+    repo = "uthenticode";
+    rev = "v${version}";
+    sha256 = "16j91cki63zk4d7wzwvq8al98l8hmvcdil3vfp44ink4q4bfswkx";
+  };
+
+  patches = [
+    # adds USE_SYSTEM_GTEST cmake flag, the patch won't be necessary in next versions
+    (fetchpatch {
+      url = "https://github.com/trailofbits/uthenticode/commit/7a4c5499c8e5ea7bfae1c620e1f96c112866b1dd.patch";
+      sha256 = "17637j5zwp71jmi803mv1z04arld3k3kmrm8nvrkpg08q5kizh28";
+    })
+  ];
+
+  cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_SYSTEM_GTEST=1" ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ pe-parse openssl gtest ];
+
+  doCheck = true;
+  checkPhase = "test/uthenticode_test";
+
+  meta = with lib; {
+    description = "A small cross-platform library for verifying Authenticode digital signatures.";
+    homepage = "https://github.com/trailofbits/uthenticode";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ arturcygan ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/utmps/default.nix b/nixpkgs/pkgs/development/libraries/utmps/default.nix
index 16b4cd563b2b..107c23dcb59b 100644
--- a/nixpkgs/pkgs/development/libraries/utmps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/utmps/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "utmps";
-  version = "0.0.3.2";
-  sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh";
+  version = "0.1.0.0";
+  sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml";
 
   description = "A secure utmpx and wtmp implementation";
 
diff --git a/nixpkgs/pkgs/development/libraries/v8/5_x.nix b/nixpkgs/pkgs/development/libraries/v8/5_x.nix
index 050abe9e81bf..441a5559b527 100644
--- a/nixpkgs/pkgs/development/libraries/v8/5_x.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/5_x.nix
@@ -151,11 +151,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
   buildInputs = [ readline python icu ]
-    ++ stdenv.lib.optional stdenv.isDarwin xcbuild
-    ++ stdenv.lib.optional stdenv.isLinux patchelf;
+    ++ lib.optional stdenv.isDarwin xcbuild
+    ++ lib.optional stdenv.isLinux patchelf;
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"
-    + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";
+    + lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";
 
   buildFlags = [
     "LINK=c++"
diff --git a/nixpkgs/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix
index e6696626cb5d..c79073f04e4c 100644
--- a/nixpkgs/pkgs/development/libraries/v8/default.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchgit, fetchFromGitHub
-, gn, ninja, python, glib, pkgconfig, icu
+, gn, ninja, python, glib, pkg-config, icu
 , xcbuild, darwin
 , fetchpatch
 }:
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     chmod u+w -R .
   '';
 
-  postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+  postPatch = lib.optionalString stdenv.isAarch64 ''
     substituteInPlace build/toolchain/linux/BUILD.gn \
       --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
   '';
@@ -95,14 +95,14 @@ stdenv.mkDerivation rec {
     # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
     ''host_toolchain="//build/toolchain/linux/unbundle:default"''
     ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
-  ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
+  ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
 
   # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit
   # to be exceeded
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
 
-  nativeBuildInputs = [ gn ninja pkgconfig python ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
+  nativeBuildInputs = [ gn ninja pkg-config python ]
+    ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
   buildInputs = [ glib icu ];
 
   ninjaFlags = [ ":d8" "v8_monolith" ];
diff --git a/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix
index 782d324c8be0..71e14a82c3e5 100644
--- a/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -4,7 +4,7 @@
 # 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which
 # is a bit outdated.  plv8 3.x is planned to support v8 7.x
 
-{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
+{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config
 , doCheck ? false
 , snapshot ? true
 }:
@@ -158,7 +158,7 @@ stdenv.mkDerivation rec {
         use_custom_libcxx_for_host=false
   '';
 
-  nativeBuildInputs = [ gn ninja pkgconfig ];
+  nativeBuildInputs = [ gn ninja pkg-config ];
   buildInputs = [ python glib ];
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
index 6462bfd5e624..00e9a2042b7a 100644
--- a/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
 
 stdenv.mkDerivation rec {
   pname = "intel-hybrid-driver";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ cmrt libdrm libva libX11 libGL wayland ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxmedia";
     description = "Intel driver for the VAAPI library with partial HW acceleration";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
index 81edb9caea0d..f21a947a533f 100644
--- a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3
 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
 , enableHybridCodec ? false, vaapi-intel-hybrid
 }:
@@ -17,23 +17,23 @@ stdenv.mkDerivation rec {
   # Set the correct install path:
   LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri";
 
-  postInstall = stdenv.lib.optionalString enableHybridCodec ''
+  postInstall = lib.optionalString enableHybridCodec ''
     ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/
   '';
 
   configureFlags = [
     "--enable-x11"
     "--enable-wayland"
-  ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec";
+  ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
 
   nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ];
 
   buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]
-    ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid;
+    ++ lib.optional enableHybridCodec vaapi-intel-hybrid;
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxmedia";
     license = licenses.mit;
     description = "VA-API user mode driver for Intel GEN Graphics family";
diff --git a/nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix
index 94f96b867d55..fd38eba73974 100644
--- a/nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkgconfig }:
+{ lib, stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libva-vdpau-driver";
@@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
                   sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libvdpau libGLU libGL libva ];
 
   postPatch = ''
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver";
     license = licenses.gpl2Plus;
     description = "VDPAU driver for the VAAPI library";
diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index 1030aefc1a54..76ce9a36c713 100644
--- a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook,
   vapoursynth, nasm, fftwFloat
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     autoreconfHook
     nasm vapoursynth fftwFloat
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of filters for motion estimation and compensation";
     homepage = "https://github.com/dubhater/vapoursynth-mvtools";
     license  = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
index 87f35fbf60c2..93f8d3c5ae5f 100644
--- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
 , zimg, libass, python3, libiconv
 , ApplicationServices
 , ocrSupport ?  false, tesseract ? null
@@ -8,20 +8,20 @@
 assert ocrSupport   -> tesseract != null;
 assert imwriSupport -> imagemagick7 != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth";
-  version = "R49";
+  version = "R52";
 
   src = fetchFromGitHub {
     owner  = "vapoursynth";
     repo   = "vapoursynth";
     rev    = version;
-    sha256 = "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl";
+    sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ];
+  nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ];
   buildInputs = [
     zimg libass
     (python3.withPackages (ps: with ps; [ sphinx cython ]))
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
         --prefix PYTHONPATH : $out/${python3.sitePackages}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A video processing framework with the future in mind";
     homepage    = "http://www.vapoursynth.com/";
     license     = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
index 196c700af17a..76b50a10907e 100644
--- a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
+++ b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromBitbucket
+{ lib, stdenv, mkDerivation, fetchFromBitbucket
 , python3, vapoursynth
 , qmake, qtbase, qtwebsockets
 }:
@@ -10,7 +10,7 @@ mkDerivation rec {
   src = fetchFromBitbucket {
     owner = "mystery_keeper";
     repo = pname;
-    rev = stdenv.lib.toLower version;
+    rev = lib.toLower version;
     sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
   };
 
@@ -33,7 +33,7 @@ mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform editor for VapourSynth scripts";
     homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/vc/0.7.nix b/nixpkgs/pkgs/development/libraries/vc/0.7.nix
index 46a3a3e52f0f..dd5b03f2dc50 100644
--- a/nixpkgs/pkgs/development/libraries/vc/0.7.nix
+++ b/nixpkgs/pkgs/development/libraries/vc/0.7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "Vc";
@@ -13,14 +13,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
   postPatch = ''
     sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake
     sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for multiprecision complex arithmetic with exact rounding";
     homepage = "https://github.com/VcDevel/Vc";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/vc/default.nix b/nixpkgs/pkgs/development/libraries/vc/default.nix
index 49d3f9af7193..40347940ff04 100644
--- a/nixpkgs/pkgs/development/libraries/vc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "Vc";
@@ -13,14 +13,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
   postPatch = ''
     sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake
     sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for multiprecision complex arithmetic with exact rounding";
     homepage = "https://github.com/VcDevel/Vc";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/vcdimager/default.nix b/nixpkgs/pkgs/development/libraries/vcdimager/default.nix
index c7f375c20789..0235912ce539 100644
--- a/nixpkgs/pkgs/development/libraries/vcdimager/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vcdimager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt
+{ stdenv, lib, fetchurl, pkg-config, libcdio, libxml2, popt
 , libiconv, darwin }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libxml2 popt libiconv ]
              ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]);
diff --git a/nixpkgs/pkgs/development/libraries/vcg/default.nix b/nixpkgs/pkgs/development/libraries/vcg/default.nix
index a8a24750744b..380f533fe6f7 100644
--- a/nixpkgs/pkgs/development/libraries/vcg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vcg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, eigen }:
+{ lib, stdenv, fetchFromGitHub, eigen }:
 
 stdenv.mkDerivation rec {
   pname = "vcg";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
     description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/libraries/vid-stab/default.nix b/nixpkgs/pkgs/development/libraries/vid-stab/default.nix
index 2921719e7554..d224c2f3be58 100644
--- a/nixpkgs/pkgs/development/libraries/vid-stab/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vid-stab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openmp }:
+{ lib, stdenv, fetchFromGitHub, cmake, openmp }:
 
 stdenv.mkDerivation rec {
   pname = "vid.stab";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ openmp ];
+  buildInputs = lib.optionals stdenv.cc.isClang [ openmp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Video stabilization library";
     homepage = "http://public.hronopik.de/vid.stab/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/vigra/default.nix b/nixpkgs/pkgs/development/libraries/vigra/default.nix
index 8720a39f301a..56402172d9ff 100644
--- a/nixpkgs/pkgs/development/libraries/vigra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vigra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
+{ lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
 , libjpeg, libpng, libtiff, openexr, python2Packages }:
 
 let
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   version = "1.11.1";
 
   src = fetchurl {
-    url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
+    url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz";
     sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";
   };
 
@@ -21,21 +21,20 @@ in stdenv.mkDerivation rec {
                                 sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; };
     in [ clangPatch ];
 
-  buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
                   libtiff numpy openexr python ];
 
   preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
 
   cmakeFlags = [ "-DWITH_OPENEXR=1" ]
-            ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
+            ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
                   [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
 
-  enableParallelBuilding = true;
-
   # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";
     homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix
index 8951ed4b002a..38688d90246e 100644
--- a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3
+{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3
 , libGLU, epoxy, libX11, libdrm, mesa
 }:
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libGLU epoxy libX11 libdrm mesa ];
 
-  nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ];
+  nativeBuildInputs = [ cmake meson ninja pkg-config python3 ];
 
   dontUseCmakeConfigure = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
     homepage = "https://virgil3d.github.io/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/vmime/default.nix b/nixpkgs/pkgs/development/libraries/vmime/default.nix
index e0c58096cfa5..3f33df66339e 100644
--- a/nixpkgs/pkgs/development/libraries/vmime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vmime/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchFromGitHub
-, gsasl, gnutls, pkgconfig, cmake, zlib, libtasn1, libgcrypt, gtk3
+{lib, stdenv, fetchFromGitHub
+, gsasl, gnutls, pkg-config, cmake, zlib, libtasn1, libgcrypt, gtk3
 # this will not work on non-nixos systems
 , sendmailPath ? "/run/wrappers/bin/sendmail"
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ];
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   cmakeFlags = [
     "-DVMIME_SENDMAIL_PATH=${sendmailPath}"
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.vmime.org/";
     description = "Free mail library for C++";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/vmmlib/default.nix b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix
index f191a9764378..4aa525feb193 100644
--- a/nixpkgs/pkgs/development/libraries/vmmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, lapack
 , Accelerate, CoreGraphics, CoreVideo
 }:
 
@@ -17,17 +17,15 @@ stdenv.mkDerivation rec {
     ./disable-cpack.patch   #disable the need of cpack/rpm
   ];
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ boost lapack ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
-
-  enableParallelBuilding = true;
+    ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
 
   doCheck = !stdenv.isDarwin;
 
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A vector and matrix math library implemented using C++ templates";
 
     longDescription = ''vmmlib is a vector and matrix math library implemented
diff --git a/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix
index 9f35bf4ad84e..dccbd1349d2c 100644
--- a/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 let
     version = "0.1.3";
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://sourceforge.net/projects/opencore-amr/";
     description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.Esteth ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.Esteth ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/nixpkgs/pkgs/development/libraries/volume-key/default.nix
index 084b42c9a2dc..567a5e3e251a 100644
--- a/nixpkgs/pkgs/development/libraries/volume-key/default.nix
+++ b/nixpkgs/pkgs/development/libraries/volume-key/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3
 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme
 , autoconf, automake, libtool
 , buildPackages
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
 
   outputs = [ "out" "man" "dev" "py" ];
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ];
+  nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig ];
 
   buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ];
 
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
 
   doCheck = false; # fails 1 out of 1 tests, needs `certutil`
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool";
     homepage = "https://pagure.io/volume_key/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/vrb/default.nix b/nixpkgs/pkgs/development/libraries/vrb/default.nix
index a85e27d42b7c..1ebc37cdf2f3 100644
--- a/nixpkgs/pkgs/development/libraries/vrb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vrb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "vrb";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     cp -p vrb/man/man3/*.3 $out/share/man/man3/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A virtual ring buffer library written in C";
     license     = licenses.lgpl21;
     homepage    = "http://vrb.sourceforge.net/";
diff --git a/nixpkgs/pkgs/development/libraries/vrpn/default.nix b/nixpkgs/pkgs/development/libraries/vrpn/default.nix
index b45c83ab1ae8..f9eed6b2f747 100644
--- a/nixpkgs/pkgs/development/libraries/vrpn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vrpn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }:
 
 stdenv.mkDerivation rec {
   name    = "${pname}-${date}";
@@ -12,12 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh";
   };
 
-  buildInputs = [ unzip cmake libGLU libGL ];
+  nativeBuildInputs = [ cmake unzip ];
+  buildInputs = [ libGLU libGL ];
 
   doCheck = false; # FIXME: test failure
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Virtual Reality Peripheral Network";
     longDescription = ''
       The Virtual-Reality Peripheral Network (VRPN) is a set of classes
diff --git a/nixpkgs/pkgs/development/libraries/vsqlite/default.nix b/nixpkgs/pkgs/development/libraries/vsqlite/default.nix
index a4c9cb556b9b..6981de6aa074 100644
--- a/nixpkgs/pkgs/development/libraries/vsqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vsqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, sqlite }:
+{ lib, stdenv, fetchurl, boost, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "vsqlite";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost sqlite ];
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.in \
         --replace '-Wl,--as-needed' "" \
         --replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \
                   "-Wl,-install_name,$out/lib/libvsqlitepp.3.dylib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://vsqlite.virtuosic-bytes.com/";
     description = "C++ wrapper library for sqlite";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/vte/2.90.nix b/nixpkgs/pkgs/development/libraries/vte/2.90.nix
index 59d0acada137..4a9e4d8a66c9 100644
--- a/nixpkgs/pkgs/development/libraries/vte/2.90.nix
+++ b/nixpkgs/pkgs/development/libraries/vte/2.90.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk3, ncurses, gobject-introspection }:
+{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   versionMajor = "0.36";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ];
 
   configureFlags = [ "--enable-introspection" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnome.org/";
     description = "A library implementing a terminal emulator widget for GTK";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix
index 014b2615d5bf..9f2722a9ae8f 100644
--- a/nixpkgs/pkgs/development/libraries/vte/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vte/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , fetchpatch
 , gettext
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , gnome3
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3";
   };
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     libxml2
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
   ];
 
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     patchShebangs src/box_drawing_generate.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnome.org/";
     description = "A library implementing a terminal emulator widget for GTK";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/libraries/vtk/7.x.nix b/nixpkgs/pkgs/development/libraries/vtk/7.x.nix
index 55f950e0ac90..860f17639454 100644
--- a/nixpkgs/pkgs/development/libraries/vtk/7.x.nix
+++ b/nixpkgs/pkgs/development/libraries/vtk/7.x.nix
@@ -5,5 +5,10 @@ import ./generic.nix {
   patchesToFetch = [{
    url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
    sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
- }];
+ }
+ {
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f";
+    sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5";
+  }
+  ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/vtk/8.x.nix b/nixpkgs/pkgs/development/libraries/vtk/8.x.nix
index 1563991f47f3..ad84ec163cfa 100644
--- a/nixpkgs/pkgs/development/libraries/vtk/8.x.nix
+++ b/nixpkgs/pkgs/development/libraries/vtk/8.x.nix
@@ -5,5 +5,14 @@ import ./generic.nix {
   patchesToFetch = [{
    url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff";
    sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy";
-  }];
+  }
+  {
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f";
+    sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5";
+  }
+  {
+    url = "https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6943.diff";
+    sha256 = "sha256:1nzdw3f6bsri04y528zj2klqkb9p8s4lnl9g5zvm119m1cmyhn04";
+  }
+  ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/nixpkgs/pkgs/development/libraries/vtk/generic.nix
index 7bfd8d9fcfff..273bff8852ee 100644
--- a/nixpkgs/pkgs/development/libraries/vtk/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/vtk/generic.nix
@@ -1,5 +1,5 @@
 { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
-{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
+{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff
 , fetchpatch
 , enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
 , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ libtiff ]
+  buildInputs = [ libpng libtiff ]
     ++ optionals enableQt [ qtbase qtx11extras qttools ]
     ++ optionals stdenv.isLinux [
       libGLU
@@ -65,6 +65,7 @@ in stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DCMAKE_C_FLAGS=-fPIC"
     "-DCMAKE_CXX_FLAGS=-fPIC"
+    "-DVTK_USE_SYSTEM_PNG=ON"
     "-DVTK_USE_SYSTEM_TIFF=1"
     "-DOPENGL_INCLUDE_DIR=${libGL}/include"
     "-DCMAKE_INSTALL_LIBDIR=lib"
@@ -84,8 +85,6 @@ in stdenv.mkDerivation rec {
     sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
   '';
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "Open source libraries for 3D computer graphics, image processing and visualization";
     homepage = "https://www.vtk.org/";
diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix
index 154ed9deb490..f065b83bcc84 100644
--- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
   version = "1.2.162.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Vulkan Header files and API registry";
     homepage    = "https://www.lunarg.com";
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
index f2fb44f8b9d1..b3882a919421 100644
--- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config
 , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
@@ -12,24 +12,27 @@ stdenv.mkDerivation rec {
     sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ];
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    substituteInPlace loader/vulkan.pc.in \
-      --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \
-      --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@'
-  '';
 
   cmakeFlags = [
     "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
     "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
+    "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
   ];
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || {
+      echo vulkan-headers include directory not found in pkg-config file
+      exit 1
+    }
+  '';
+
+  meta = with lib; {
     description = "LunarG Vulkan loader";
     homepage    = "https://www.lunarg.com";
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/vxl/default.nix b/nixpkgs/pkgs/development/libraries/vxl/default.nix
index 58622cb98cb7..6858cd93ab36 100644
--- a/nixpkgs/pkgs/development/libraries/vxl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vxl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
 stdenv.mkDerivation {
   name = "vxl-1.17.0-nix1";
 
@@ -9,7 +9,8 @@ stdenv.mkDerivation {
     sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8";
   };
 
-  buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ];
+  nativeBuildInputs = [ cmake unzip ];
+  buildInputs = [ libtiff expat zlib libpng libjpeg ];
 
   cmakeFlags = [
     # BUILD_OUL wants old linux headers for videodev.h, not available
@@ -18,18 +19,16 @@ stdenv.mkDerivation {
     # BUILD_BRL fails to find open()
     "-DBUILD_BRL=OFF"
     "-DBUILD_CONTRIB=OFF"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
+  ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
     "-DCMAKE_CXX_FLAGS=-fPIC"
     "-DCMAKE_C_FLAGS=-fPIC"
   ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "C++ Libraries for Computer Vision Research and Implementation";
     homepage = "http://vxl.sourceforge.net/";
     license = "VXL License";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/waffle/default.nix b/nixpkgs/pkgs/development/libraries/waffle/default.nix
index 0f1e36b35795..dd783036f230 100644
--- a/nixpkgs/pkgs/development/libraries/waffle/default.nix
+++ b/nixpkgs/pkgs/development/libraries/waffle/default.nix
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libGL
-  ] ++ stdenv.lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
+  ] ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
     libglvnd
-  ] ++ stdenv.lib.optionals x11Support [
+  ] ++ lib.optionals x11Support [
     libX11
     libxcb
-  ] ++ stdenv.lib.optionals waylandSupport [
+  ] ++ lib.optionals waylandSupport [
     wayland
-  ] ++ stdenv.lib.optionals useGbm [
+  ] ++ lib.optionals useGbm [
     mesa
     libudev
   ];
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/wflinfo \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]}
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]}
   '';
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/libraries/wasilibc/default.nix b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix
index bca025d622af..f8142f046b74 100644
--- a/nixpkgs/pkgs/development/libraries/wasilibc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WASI libc implementation for WebAssembly";
     homepage    = "https://wasi.dev";
     platforms   = platforms.wasi;
diff --git a/nixpkgs/pkgs/development/libraries/wavpack/default.nix b/nixpkgs/pkgs/development/libraries/wavpack/default.nix
index 78794430860c..41f3076dbe94 100644
--- a/nixpkgs/pkgs/development/libraries/wavpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wavpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "wavpack";
@@ -6,14 +6,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
   src = fetchurl {
     url = "http://www.wavpack.com/${pname}-${version}.tar.bz2";
     sha256 = "00baiag7rlkzc6545dqdp4p5sr7xc3n97n7qdkgx58c544x0pw5n";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hybrid audio compression format";
     homepage    = "http://www.wavpack.com/";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix
index 2b18bc31a452..7ec8936267bb 100644
--- a/nixpkgs/pkgs/development/libraries/wayland/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , fetchpatch
 , meson
-, pkgconfig
+, pkg-config
 , substituteAll
 , ninja
 , libffi
@@ -57,12 +57,12 @@ stdenv.mkDerivation rec {
   '';
 
   depsBuildBuild = [
-    pkgconfig
+    pkg-config
   ];
 
   nativeBuildInputs = [
     meson
-    pkgconfig
+    pkg-config
     ninja
   ] ++ lib.optionals isCross [
     wayland # For wayland-scanner during the build
diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
index 66d5d50c9d81..23258aff3e93 100644
--- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , wayland
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ wayland ];
 
diff --git a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix
index 5fc466cec201..0aa77b771e48 100644
--- a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
-, pkgconfig
+, pkg-config
 , pugixml
 , wayland
 , libGL
@@ -13,7 +13,7 @@
 
 assert docSupport -> doxygen != null;
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "waylandpp";
   version = "0.2.8";
@@ -25,18 +25,18 @@ stdenv.mkDerivation rec {
     sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq";
   };
 
-  cmakeFlags = [ 
-    "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" 
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen;
+  nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen;
   buildInputs = [ pugixml wayland libGL libffi ];
 
   outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wayland C++ binding";
     homepage = "https://github.com/NilsBrause/waylandpp/";
     license = with licenses; [ bsd2 hpnd ];
diff --git a/nixpkgs/pkgs/development/libraries/wcslib/default.nix b/nixpkgs/pkgs/development/libraries/wcslib/default.nix
index 2b3414df1a4b..c12118a99de4 100644
--- a/nixpkgs/pkgs/development/libraries/wcslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wcslib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl,  stdenv, flex }:
+{ fetchurl,  lib, stdenv, flex }:
 
 stdenv.mkDerivation rec {
   version = "7.3.1";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     systems. This is the standard library for this purpose in
     astronomy.'';
 
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index ed97e1c8a85b..1abfd3a9194c 100644
--- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , perl
 , python3
@@ -7,7 +7,7 @@
 , gperf
 , cmake
 , ninja
-, pkgconfig
+, pkg-config
 , gettext
 , gobject-introspection
 , libnotify
@@ -51,11 +51,13 @@
 , xdg-dbus-proxy
 , substituteAll
 , glib
+, libwpe
+, libwpe-fdo
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
@@ -78,7 +80,7 @@ stdenv.mkDerivation rec {
     ./libglvnd-headers.patch
   ];
 
-  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     # Ignore gettext in cmake_prefix_path so that find_program doesn't
     # pick up the wrong gettext. TODO: Find a better solution for
     # this, maybe make cmake not look up executables in
@@ -94,11 +96,11 @@ stdenv.mkDerivation rec {
     gperf
     ninja
     perl
-    pkgconfig
+    pkg-config
     python3
     ruby
     glib # for gdbus-codegen
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     wayland # for wayland-scanner
   ];
 
@@ -120,6 +122,8 @@ stdenv.mkDerivation rec {
     libsecret
     libtasn1
     libwebp
+    libwpe
+    libwpe-fdo
     libxkbcommon
     libxml2
     libxslt
@@ -154,7 +158,6 @@ stdenv.mkDerivation rec {
     "-DENABLE_INTROSPECTION=ON"
     "-DPORT=GTK"
     "-DUSE_LIBHYPHEN=OFF"
-    "-DUSE_WPE_RENDERER=OFF"
   ] ++ optionals stdenv.isDarwin [
     "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
     "-DENABLE_GTKDOC=OFF"
diff --git a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix
index 91d93352da1b..efd2ce3b1fcc 100644
--- a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, darwin }:
+{ lib, stdenv, fetchurl, darwin }:
 
 stdenv.mkDerivation rec {
   name = "webrtc-audio-processing-0.3.1";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
+  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
 
-  patchPhase = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  patchPhase = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
     description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/websocket++/default.nix b/nixpkgs/pkgs/development/libraries/websocket++/default.nix
index d04cadb483b0..5c9271f2a85a 100644
--- a/nixpkgs/pkgs/development/libraries/websocket++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/websocket++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "websocket++";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.zaphoyd.com/websocketpp/";
     description = "C++/Boost Asio based websocket client/server library";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/wildmidi/default.nix b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix
index ea63a73fc925..880823a84732 100644
--- a/nixpkgs/pkgs/development/libraries/wildmidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, alsaLib, freepats }:
+{ lib, stdenv, fetchurl, cmake, alsaLib, freepats }:
 
 stdenv.mkDerivation rec {
   name = "wildmidi-0.4.3";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software MIDI player and library";
     longDescription = ''
       WildMIDI is a simple software midi player which has a core softsynth
diff --git a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix
index 9a7cee6623ee..469da2523d99 100644
--- a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool
 
 # Optional Dependencies
 , lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null
 , gperftools ? null, leveldb ? null
 }:
 
-with stdenv.lib;
+with lib;
 let
   mkFlag = trueStr: falseStr: cond: name: val: "--"
     + (if cond then trueStr else falseStr)
@@ -14,7 +14,7 @@ let
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index 13132c8cc1c9..a21179e20259 100644
--- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
 , libGL, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
 , libpng, ffmpeg
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modular Wayland compositor library";
     longDescription = ''
       Pluggable, composable, unopinionated modules for building a Wayland
diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
index 30fc90ec8c09..c0c0218a318f 100644
--- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "wolfssl";
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
      mkdir -p "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
     homepage    = "https://www.wolfssl.com/";
     platforms   = platforms.all;
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = with maintainers; [ mcmtroffaes ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/wt/default.nix b/nixpkgs/pkgs/development/libraries/wt/default.nix
index 7c819487a334..8887c4410f4c 100644
--- a/nixpkgs/pkgs/development/libraries/wt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
+{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu
 , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
 , pcre, harfbuzz
 }:
@@ -17,11 +17,9 @@ let
         inherit sha256;
       };
 
-      enableParallelBuilding = true;
-
-      nativeBuildInputs = [ pkgconfig ];
+      nativeBuildInputs = [ cmake pkg-config ];
       buildInputs = [
-        cmake boost doxygen qt48Full libharu
+        boost doxygen qt48Full libharu
         pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
         openssl pcre
       ];
@@ -30,16 +28,16 @@ let
         "-DWT_CPP_11_MODE=-std=c++11"
         "--no-warn-unused-cli"
       ]
-      ++ stdenv.lib.optionals (graphicsmagick != null) [
+      ++ lib.optionals (graphicsmagick != null) [
         "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
         "-DGM_PREFIX=${graphicsmagick}"
       ]
-      ++ stdenv.lib.optional (harfbuzz != null)
+      ++ lib.optional (harfbuzz != null)
         "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
-      ++ stdenv.lib.optional (libmysqlclient != null)
+      ++ lib.optional (libmysqlclient != null)
         "-DMYSQL_PREFIX=${libmysqlclient}";
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "https://www.webtoolkit.eu/wt";
         description = "C++ library for developing web applications";
         platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/wtk/default.nix b/nixpkgs/pkgs/development/libraries/wtk/default.nix
index d66a628dac79..9ddc95a9ccc7 100644
--- a/nixpkgs/pkgs/development/libraries/wtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, unzip, xorg }:
+{ lib, stdenv, requireFile, unzip, xorg }:
 
 assert stdenv.hostPlatform.system == "i686-linux";
 
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://java.sun.com/products/sjwtoolkit/download.html";
     description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC";
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix
index 9fa64be4d53e..5e7f7b71fbe5 100644
--- a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, pkgconfig, wxGTK
+{ lib, stdenv, fetchurl
+, pkg-config, wxGTK
 , ffmpeg_3, libexif
 , cairo, pango }:
 
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ];
 
   buildInputs = [ cairo pango ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A SVG manipulation library built with wxWidgets";
     longDescription = ''
     wxSVG is C++ library to create, manipulate and render
diff --git a/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
index db5e91b74d66..8acd4e99636b 100644
--- a/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , wxGTK
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   buildInputs = [ wxGTK sqlite ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://utelle.github.io/wxsqlite3/";
     description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix
index 18ecea4cbe18..7cf5484bef77 100644
--- a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
+{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "wxsqliteplus";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     install -D wxsqliteplus $out/bin/wxsqliteplus
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/guanlisheng/wxsqliteplus";
     description = "A simple SQLite database browser built with wxWidgets";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix
index deb7d19c0de1..8029477708df 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
+{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , libX11, cairo
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
 assert withMesa -> libGLU != null && libGL != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "2.8.12.1";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ]
     ++ optional withMesa libGLU;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 5db7cfc26ba9..77e0e20eaf5e 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
+{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , setfile
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
@@ -9,7 +9,7 @@
 
 assert withMesa -> libGLU != null && libGL != null;
 
-with stdenv.lib;
+with lib;
 
 let
   version = "2.9.4";
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     ++ optional withMesa libGLU
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = optional stdenv.isDarwin AGL;
 
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix
index df90342a972e..a1c2820a5fdb 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
+{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config
 , libXinerama, libSM, libXxf86vm
 , gtk2, gtk3
 , xorgproto, gst_all_1, setfile
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , withMesa ? libGLSupported
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
@@ -11,7 +11,7 @@
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert withMesa -> libGLU != null && libGL != null;
 assert withWebKit -> webkitgtk != null;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     ++ optional withWebKit webkitgtk
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = optional stdenv.isDarwin AGL;
 
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 1b4c67024515..22e818409913 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
+{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
 # darwin only attributes
 , derez, rez, setfile
-, AGL, Cocoa, Kernel
+, AGL, Cocoa, Kernel, WebKit
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.4";
+  version = "3.0.5.1";
   pname = "wxmac";
 
   src = fetchzip {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     expat libiconv libjpeg libpng libtiff zlib
     derez rez setfile
-    AGL Cocoa Kernel
+    AGL Cocoa Kernel WebKit
   ];
 
   postPatch = ''
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.darwin;
     license = licenses.wxWindows;
     maintainers = [ maintainers.lnl7 ];
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix
index 8b0e6811efff..cab0197c9390 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchurl
-, pkgconfig
+, pkg-config
 , libXinerama
 , libSM
 , libXxf86vm
@@ -12,7 +12,7 @@
 , xorgproto
 , gst_all_1
 , setfile
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , withMesa ? libGLSupported
 , libGLU ? null
 , libGL ? null
@@ -29,7 +29,7 @@
 , QTKit ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert withMesa -> libGLU != null && libGL != null;
 assert withWebKit -> webkitgtk != null;
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   ++ optional withWebKit webkitgtk
   ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = optional stdenv.isDarwin AGL;
 
diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix
index 49797b5dd759..93d0b42a889f 100644
--- a/nixpkgs/pkgs/development/libraries/x264/default.nix
+++ b/nixpkgs/pkgs/development/libraries/x264/default.nix
@@ -29,12 +29,12 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "--enable-shared" ]
-    ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
-    ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";
+    ++ lib.optional (!stdenv.isi686) "--enable-pic"
+    ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";
 
   nativeBuildInputs = lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686) nasm;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for encoding H264/AVC video streams";
     homepage    = "http://www.videolan.org/developers/x264.html";
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/x265/default.nix b/nixpkgs/pkgs/development/libraries/x265/default.nix
index 3ad200cfc637..495bbc4aaabb 100644
--- a/nixpkgs/pkgs/development/libraries/x265/default.nix
+++ b/nixpkgs/pkgs/development/libraries/x265/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, cmake, nasm, numactl
+{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl
 , numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)  # Enabled by default on NUMA platforms
 , debugSupport ? false # Run-time sanity checks (debugging)
 , werrorSupport ? false # Warnings as errors
@@ -21,7 +21,7 @@ let
     (mkFlag custatsSupport "DETAILED_CU_STATS")
     (mkFlag unittestsSupport "ENABLE_TESTS")
     (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isPower [
+  ] ++ lib.optionals stdenv.hostPlatform.isPower [
     "-DENABLE_ALTIVEC=OFF"
   ];
 
@@ -37,7 +37,6 @@ let
   buildLib = has12Bit: stdenv.mkDerivation rec {
     name = "libx265-${if has12Bit then "12" else "10"}-${version}";
     inherit src;
-    enableParallelBuilding = true;
 
     postPatch = ''
       sed -i 's/unknown/${version}/g' source/cmake/version.cmake
@@ -57,7 +56,7 @@ let
       cd source
     '';
 
-    nativeBuildInputs = [cmake nasm] ++ stdenv.lib.optional numaSupport numactl;
+    nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl;
   };
 
   libx265-10 = buildLib false;
@@ -68,8 +67,6 @@ stdenv.mkDerivation rec {
   pname = "x265";
   inherit version src;
 
-  enableParallelBuilding = true;
-
   postPatch = ''
     sed -i 's/unknown/${version}/g' source/cmake/version.cmake
     sed -i 's/0.0/${version}/g' source/cmake/version.cmake
@@ -79,7 +76,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_SHARED=ON"
     "-DHIGH_BIT_DEPTH=OFF"
     "-DENABLE_HDR10_PLUS=OFF"
-  ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [
+  ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [
     "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a"
     "-DLINKED_10BIT=ON"
     "-DLINKED_12BIT=ON"
@@ -95,9 +92,9 @@ stdenv.mkDerivation rec {
     rm $out/lib/*.a
   '';
 
-  nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl;
+  nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for encoding h.265/HEVC video streams";
     homepage    = "http://x265.org";
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/xalanc/default.nix b/nixpkgs/pkgs/development/libraries/xalanc/default.nix
index 30ab7f4496d8..b757b737f976 100644
--- a/nixpkgs/pkgs/development/libraries/xalanc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xalanc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xercesc, getopt }:
+{ lib, stdenv, fetchurl, xercesc, getopt }:
 
 let
   platform = if stdenv.isLinux then "linux" else
@@ -25,8 +25,8 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = "http://xalan.apache.org/";
     description = "A XSLT processor for transforming XML documents";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = [ lib.maintainers.jagajaga ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix
index 195aea5c2f18..cfca33a62d2e 100644
--- a/nixpkgs/pkgs/development/libraries/xapian/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook
+{ lib, stdenv, fetchurl, autoreconfHook
 , libuuid, zlib }:
 
 let
@@ -20,16 +20,16 @@ let
     doCheck = true;
     AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
 
-    patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
+    patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
 
     # the configure script thinks that Darwin has ___exp10
     # but it’s not available on my systems (or hydra apparently)
-    postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    postConfigure = lib.optionalString stdenv.isDarwin ''
       substituteInPlace config.h \
         --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10"
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Search engine library";
       homepage = "https://xapian.org/";
       license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix
index a496e3886d83..79e5786f0488 100644
--- a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }:
+{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }:
 
 stdenv.mkDerivation rec {
   pname = "xapian-omega";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ xapian perl pcre zlib libmagic ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Indexer and CGI search front-end built on Xapian library";
     homepage = "https://xapian.org/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/libraries/xavs/default.nix b/nixpkgs/pkgs/development/libraries/xavs/default.nix
index 18b10376315f..11d73a9decb7 100644
--- a/nixpkgs/pkgs/development/libraries/xavs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xavs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn }:
+{ lib, stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
   pname = "xavs";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     patchShebangs tools/patcheck
     patchShebangs tools/regression-test.pl
     patchShebangs tools/xavs-format
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace config.guess --replace 'uname -p' 'uname -m'
     substituteInPlace configure \
       --replace '-O4' '-O3' \
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "--disable-asm"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AVS encoder and decoder";
     homepage    = "http://xavs.sourceforge.net/";
     license     = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/libraries/xbase/default.nix b/nixpkgs/pkgs/development/libraries/xbase/default.nix
index ae7ceb18c0ab..db36c2a34c15 100644
--- a/nixpkgs/pkgs/development/libraries/xbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "xbase-3.1.2";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://linux.techass.com/projects/xdb/";
     description = "C++ class library formerly known as XDB";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix b/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix
new file mode 100644
index 000000000000..a3bcc822b367
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+, uthash
+, xcbutil
+, xcbutilkeysyms
+, xorgproto
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xcb-imdkit";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "fcitx";
+    repo = "xcb-imdkit";
+    rev = version;
+    sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    xorgproto
+    uthash
+  ];
+
+  buildInputs = [
+    xcbutil
+    xcbutilkeysyms
+  ];
+
+  meta = with lib; {
+    description = "input method development support for xcb";
+    homepage = "https://github.com/fcitx/xcb-imdkit";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ poscat ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 5457487edcc7..f296f59d408b 100644
--- a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig
+{ lib, stdenv, fetchgit, autoconf, automake, libtool, pkg-config
 , xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XCB cursor library (libxcursor port)";
     homepage    = "https://cgit.freedesktop.org/xcb/util-cursor";
     license     = licenses.mit;
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     gperf
     libtool
     libxcb
-    pkgconfig
+    pkg-config
     xorg.utilmacros
     xorg.xcbutilimage
     xorg.xcbutilrenderutil
diff --git a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix
index 38d7d447e289..21d6b6fa73e8 100644
--- a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
-, pkgconfig
+, pkg-config
 , libxslt
 , docbook_xsl
 , docbook_xml_dtd_43
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     libxslt
     docbook_xsl
     docbook_xml_dtd_43
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DBus proxy for Flatpak and others";
     homepage = "https://github.com/flatpak/xdg-dbus-proxy";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index b7e589485534..be96001c46fb 100644
--- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc)
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Desktop integration portals for sandboxed apps";
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
index c6faa4fc017a..151c74f0b70d 100644
--- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig, wayland-protocols
+{ lib, stdenv, fetchFromGitHub
+, meson, ninja, pkg-config, wayland-protocols
 , pipewire, wayland, elogind, systemd, libdrm }:
 
 stdenv.mkDerivation rec {
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
+  nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
   buildInputs = [ pipewire wayland elogind systemd libdrm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/emersion/xdg-desktop-portal-wlr";
     description = "xdg-desktop-portal backend for wlroots";
     maintainers = with maintainers; [ minijackson ];
diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 83b4dda0c6e2..cab358528311 100644
--- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , nixosTests
 , substituteAll
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , libxml2
 , glib
 , pipewire
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
     libxml2
     wrapGAppsHook
   ];
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Desktop integration portals for sandboxed apps";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ jtojnar ];
diff --git a/nixpkgs/pkgs/development/libraries/xed/default.nix b/nixpkgs/pkgs/development/libraries/xed/default.nix
index 1d6dcdc67ade..395b399d8fe2 100644
--- a/nixpkgs/pkgs/development/libraries/xed/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ lib, stdenv, fetchFromGitHub, python3Packages }:
 
 let
   # mbuild is a custom build system used only to build xed
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   dontInstall = true; # already installed during buildPhase
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel X86 Encoder Decoder (Intel XED)";
     homepage    = "https://intelxed.github.io/";
     license     = licenses.apsl20;
diff --git a/nixpkgs/pkgs/development/libraries/xercesc/default.nix b/nixpkgs/pkgs/development/libraries/xercesc/default.nix
index 8c7b12320148..f5109a1ebd6a 100644
--- a/nixpkgs/pkgs/development/libraries/xercesc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xercesc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "xerces-c";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://xerces.apache.org/xerces-c/";
     description = "Validating XML parser written in a portable subset of C++";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix
index d9d660062a25..973e7dc028e0 100644
--- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
     sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp;
 
   buildInputs = lib.optional cudaSupport cudatoolkit
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
     install -Dm755 ../xgboost $out/bin/xgboost
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
     homepage = "https://github.com/dmlc/xgboost";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/xine-lib/default.nix b/nixpkgs/pkgs/development/libraries/xine-lib/default.nix
index 4322278e2fd6..cbdc1a2dcf0b 100644
--- a/nixpkgs/pkgs/development/libraries/xine-lib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xine-lib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib
 , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3
 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
 , libmpcdec
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj";
   };
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkg-config perl ];
 
   buildInputs = [
     xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.xine-project.org/";
     description = "A high-performance, portable and reusable multimedia playback engine";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix b/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
index 049c54d792b4..735cc278debf 100644
--- a/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, packages}:
+{lib, stdenv, packages}:
 
 stdenv.mkDerivation {
   name = "xlibs-wrapper";
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
   buildClientLibs = true;
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/xlslib/default.nix b/nixpkgs/pkgs/development/libraries/xlslib/default.nix
index ee3942c360b7..77a11b531100 100644
--- a/nixpkgs/pkgs/development/libraries/xlslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xlslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, unzip }:
+{ lib, stdenv, fetchurl, autoreconfHook, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "xlslib";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++/C library to construct Excel .xls files in code";
     homepage = "https://sourceforge.net/projects/xlslib/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
index 3a784a2e38b2..7548a45e5d41 100644
--- a/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }:
+{ lib, stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "xml-security-c";
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
     "--with-xalan"
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ xalanc xercesc openssl ];
 
   meta = {
     homepage = "http://santuario.apache.org/";
     description = "C++ Implementation of W3C security standards for XML";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.jagajaga ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix
index d5e1eb08fa49..9cf3ddb92190 100644
--- a/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
 , boost, curl, openssl, log4shib, xercesc, xml-security-c
 }:
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2";
     platforms   = platforms.unix;
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix
index 41cdbf0b4f16..7b6907a01627 100644
--- a/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, curl, libxml2 }:
+{ lib, stdenv, fetchurl, curl, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "xmlrpc-c-1.51.06";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight RPC library based on XML and HTTP";
     homepage = "http://xmlrpc-c.sourceforge.net/";
     # <xmlrpc-c>/doc/COPYING also lists "Expat license",
diff --git a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
index 6d310443e70c..8bf987609500 100644
--- a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool
+{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool
 # nss_3_53 is used instead of the latest due to a number of issues:
 # https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss
 , openssl, nss_3_53, lib, runCommandCC, writeText }:
@@ -18,14 +18,14 @@ stdenv.mkDerivation {
 
   patches = [
     ./lt_dladdsearchdir.patch
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
+  ] ++ lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
   postPatch = ''
     substituteAllInPlace src/dl.c
   '';
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ];
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
 
   passthru.tests.libxmlsec1-crypto = runCommandCC "libxmlsec1-crypto-test"
     {
-      nativeBuildInputs = [ pkgconfig ];
+      nativeBuildInputs = [ pkg-config ];
       buildInputs = [ self libxml2 libxslt libtool ];
     } ''
     $CC $(pkg-config --cflags --libs xmlsec1) -o crypto-test ${writeText "crypto-test.c" ''
@@ -76,8 +76,8 @@ stdenv.mkDerivation {
     homepage = "http://www.aleksey.com/xmlsec";
     downloadPage = "https://www.aleksey.com/xmlsec/download.html";
     description = "XML Security Library in C based on libxml2";
-    license = stdenv.lib.licenses.mit;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    platforms = with lib.platforms; linux ++ darwin;
     updateWalker = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/xsd/default.nix b/nixpkgs/pkgs/development/libraries/xsd/default.nix
index 7541ee427045..2d614ee0e731 100644
--- a/nixpkgs/pkgs/development/libraries/xsd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xsd/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchurl, xercesc }:
+{ lib, stdenv, fetchurl, xercesc }:
 
 let
-  fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "xsd";
   version = "4.0.0";
 
@@ -14,25 +13,27 @@ stdenv.mkDerivation {
 
   patches = [ ./xsdcxx.patch ];
 
-  configurePhase = ''
+  postPatch = ''
     patchShebangs .
   '';
 
-  buildPhase = ''
-    make ${fixed_paths}
-  '';
+  enableParallelBuilding = true;
 
-  buildInputs = [ xercesc ];
+  buildFlags = [
+    "LDFLAGS=-L${xercesc}/lib"
+    "CPPFLAGS=-I${xercesc}/include"
+  ];
+  installFlags = buildFlags ++ [
+    "install_prefix=${placeholder "out"}"
+  ];
 
-  installPhase = ''
-    make ${fixed_paths} install_prefix="$out" install
-  '';
+  buildInputs = [ xercesc ];
 
   meta = {
     homepage = "http://www.codesynthesis.com/products/xsd";
     description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.jagajaga ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/xvidcore/default.nix b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix
index ab68693ea5ef..dbc3d837a45a 100644
--- a/nixpkgs/pkgs/development/libraries/xvidcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, yasm, autoconf, automake, libtool }:
+{ lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "xvidcore";
   version = "1.3.5";
diff --git a/nixpkgs/pkgs/development/libraries/xxHash/default.nix b/nixpkgs/pkgs/development/libraries/xxHash/default.nix
index e572e8bb31ff..fbeadc2b353a 100644
--- a/nixpkgs/pkgs/development/libraries/xxHash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xxHash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "xxHash";
@@ -11,11 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "0hpbzdd6kfki5f61g103vp7pfczqkdj0js63avl0ss552jfb8h96";
   };
 
+  # Upstream Makefile does not anticipate that user may not want to
+  # build .so library.
+  postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
+    sed -i 's/lib: libxxhash.a libxxhash/lib: libxxhash.a/' Makefile
+    sed -i '/LIBXXH) $(DESTDIR/ d' Makefile
+  '';
+
   outputs = [ "out" "dev" ];
 
   makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extremely fast hash algorithm";
     longDescription = ''
       xxHash is an Extremely fast Hash algorithm, running at RAM speed limits.
diff --git a/nixpkgs/pkgs/development/libraries/xylib/default.nix b/nixpkgs/pkgs/development/libraries/xylib/default.nix
index 2b4cb1d56dae..f7d7eed7e70e 100644
--- a/nixpkgs/pkgs/development/libraries/xylib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xylib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
+{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
 
 stdenv.mkDerivation rec {
   pname = "xylib";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost zlib bzip2 wxGTK30 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";
     license = licenses.lgpl21;
     homepage = "http://xylib.sourceforge.net/";
diff --git a/nixpkgs/pkgs/development/libraries/yajl/default.nix b/nixpkgs/pkgs/development/libraries/yajl/default.nix
index 62fe652724f8..df47168c79b7 100644
--- a/nixpkgs/pkgs/development/libraries/yajl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yajl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   name = "yajl-2.1.0";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       C, and a small validating JSON generator.
     '';
     homepage = "http://lloyd.github.com/yajl/";
-    license = stdenv.lib.licenses.isc;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ maggesi ];
+    license = lib.licenses.isc;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ maggesi ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/yojimbo/default.nix b/nixpkgs/pkgs/development/libraries/yojimbo/default.nix
index 9e6cc37e661c..b72820c77a68 100644
--- a/nixpkgs/pkgs/development/libraries/yojimbo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yojimbo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
+{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
 
 stdenv.mkDerivation {
   pname = "yojimbo";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A network library for client/server games with dedicated servers";
     longDescription = ''
       yojimbo is a network library for client/server games with dedicated servers.
diff --git a/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
index 60d3defcb1ff..1289b03618c6 100644
--- a/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , asciidoc, libxslt, docbook_xsl
 , pam, yubikey-personalization, libyubikey, libykclient }:
 
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ];
+  nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ];
   buildInputs = [ pam yubikey-personalization libyubikey libykclient ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yubico PAM module";
     homepage = "https://developers.yubico.com/yubico-pam";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/nixpkgs/pkgs/development/libraries/zchunk/default.nix
index a0cb85ed71ab..a0d1378aa708 100644
--- a/nixpkgs/pkgs/development/libraries/zchunk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zchunk/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
-, pkgconfig
+, pkg-config
 , meson
 , ninja
 , zstd
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
     zstd
     curl
-  ] ++ stdenv.lib.optional stdenv.isDarwin argp-standalone;
+  ] ++ lib.optional stdenv.isDarwin argp-standalone;
 
   # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS
   # https://github.com/zchunk/zchunk/pull/35
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   })
 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "File format designed for highly efficient deltas while maintaining good compression";
     homepage = "https://github.com/zchunk/zchunk";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix b/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix
index 95f09f595048..039ecc610f41 100644
--- a/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , fetchpatch
-, pkgconfig
+, pkg-config
 , glib
 , sqlite
 , gobject-introspection
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   pname = "zeitgeist";
   version = "1.0.2";
 
-  outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional pythonSupport "py";
+  outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     libtool
-    pkgconfig
+    pkg-config
     gettext
     gobject-introspection
     vala
@@ -75,11 +75,11 @@ stdenv.mkDerivation rec {
     NOCONFIGURE=1 ./autogen.sh
   '';
 
-  postFixup = stdenv.lib.optionalString pythonSupport ''
+  postFixup = lib.optionalString pythonSupport ''
     moveToOutput lib/${python3.libPrefix} "$py"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A service which logs the users’s activities and events";
     homepage = "https://zeitgeist.freedesktop.org/";
     maintainers = with maintainers; [ lethalman worldofpeace ];
diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix
index 7f6c7323fff3..896973e32eb8 100644
--- a/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix
+++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/slice
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.zeroc.com/ice.html";
     description = "The internet communications engine";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
index 2fb36c0aea58..ef16e381bcfd 100644
--- a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
     mv $out/share/ice $dev/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.zeroc.com/ice.html";
     description = "The internet communications engine";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
index d5819ff7ee9a..a3c35d123b6a 100644
--- a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium
 , enableDrafts ? false }:
 
 stdenv.mkDerivation rec {
@@ -15,13 +15,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake asciidoc pkg-config ];
   buildInputs = [ libsodium ];
 
-  enableParallelBuilding = true;
-
   doCheck = false; # fails all the tests (ctest)
 
-  cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON";
+  cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "4";
     homepage = "http://www.zeromq.org";
     description = "The Intelligent Transport Layer";
diff --git a/nixpkgs/pkgs/development/libraries/zimg/default.nix b/nixpkgs/pkgs/development/libraries/zimg/default.nix
index afb13a03cbbf..56ced97653ea 100644
--- a/nixpkgs/pkgs/development/libraries/zimg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "zimg";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scaling, colorspace conversion and dithering library";
     homepage    = "https://github.com/sekrit-twc/zimg";
     license     = licenses.wtfpl;
diff --git a/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix
index 7f5168080fa3..6dc998cd0e27 100644
--- a/nixpkgs/pkgs/development/libraries/zimlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zimlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lzma }:
+{ lib, stdenv, fetchurl, lzma }:
 
 stdenv.mkDerivation rec {
   pname = "zimlib";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing ZIM files";
     homepage =  "https://www.openzim.org/wiki/Zimlib";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix
index b780fcda3930..da8aac5229b6 100644
--- a/nixpkgs/pkgs/development/libraries/zlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , shared ? !stdenv.hostPlatform.isStatic
 , static ? true
@@ -33,9 +33,9 @@ stdenv.mkDerivation (rec {
     sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
   };
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch;
+  patches = lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch;
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace configure \
       --replace '/usr/bin/libtool' 'ar' \
       --replace 'AR="libtool"' 'AR="ar"' \
@@ -43,7 +43,7 @@ stdenv.mkDerivation (rec {
   '';
 
   outputs = [ "out" "dev" ]
-    ++ stdenv.lib.optional splitStaticOutput "static";
+    ++ lib.optional splitStaticOutput "static";
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
@@ -60,8 +60,8 @@ stdenv.mkDerivation (rec {
   # Of these, we choose `--shared`, only because that's
   # what we did in the past and we can avoid mass rebuilds this way.
   # As a result, we pass `--static` only when we want just static.
-  configureFlags = stdenv.lib.optional (static && !shared) "--static"
-                   ++ stdenv.lib.optional shared "--shared";
+  configureFlags = lib.optional (static && !shared) "--static"
+                   ++ lib.optional shared "--shared";
 
   # Note we don't need to set `dontDisableStatic`, because static-disabling
   # works by grepping for `enable-static` in the `./configure` script
@@ -71,33 +71,33 @@ stdenv.mkDerivation (rec {
   # here (in case zlib ever switches to autoconf in the future),
   # but we don't do it simply to avoid mass rebuilds.
 
-  postInstall = stdenv.lib.optionalString splitStaticOutput ''
+  postInstall = lib.optionalString splitStaticOutput ''
     moveToOutput lib/libz.a "$static"
   ''
     # jww (2015-01-06): Sometimes this library install as a .so, even on
     # Darwin; others time it installs as a .dylib.  I haven't yet figured out
     # what causes this difference.
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
     for file in $out/lib/*.so* $out/lib/*.dylib* ; do
       ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file
     done
   ''
     # Non-typical naming confuses libtool which then refuses to use zlib's DLL
     # in some cases, e.g. when compiling libpng.
-  + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
+  + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
     ln -s zlib1.dll $out/bin/libz.dll
   '';
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc";
+  NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc";
 
   # We don't strip on static cross-compilation because of reports that native
   # stripping corrupted the target library; see commit 12e960f5 for the report.
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static;
   configurePlatforms = [];
 
-  installFlags = stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
+  installFlags = lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "BINARY_PATH=$(out)/bin"
     "INCLUDE_PATH=$(dev)/include"
     "LIBRARY_PATH=$(out)/lib"
@@ -108,9 +108,9 @@ stdenv.mkDerivation (rec {
 
   makeFlags = [
     "PREFIX=${stdenv.cc.targetPrefix}"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
+  ] ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "-f" "win32/Makefile.gcc"
-  ] ++ stdenv.lib.optionals shared [
+  ] ++ lib.optionals shared [
     # Note that as of writing (zlib 1.2.11), this flag only has an effect
     # for Windows as it is specific to `win32/Makefile.gcc`.
     "SHARED_MODE=1"
@@ -120,16 +120,16 @@ stdenv.mkDerivation (rec {
     inherit version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zlib.net";
     description = "Lossless data-compression library";
     license = licenses.zlib;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
   preConfigure = ''
     export CHOST=${stdenv.hostPlatform.config}
   '';
-} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
+} // lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
   dontConfigure = true;
 })
diff --git a/nixpkgs/pkgs/development/libraries/zlog/default.nix b/nixpkgs/pkgs/development/libraries/zlog/default.nix
index f0ca99b76679..b115cf7b675b 100644
--- a/nixpkgs/pkgs/development/libraries/zlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "1.2.15";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library";
     homepage = "https://hardysimpson.github.io/zlog/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/zmqpp/default.nix b/nixpkgs/pkgs/development/libraries/zmqpp/default.nix
index 98211e6e3eb5..733573b3e237 100644
--- a/nixpkgs/pkgs/development/libraries/zmqpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zmqpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }:
 
 stdenv.mkDerivation rec {
   pname = "zmqpp";
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   propagatedBuildInputs = [ zeromq ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
index ea786d770eb6..978321f96e7e 100644
--- a/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , jre
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "zookeeper_mt";
-  version = stdenv.lib.getVersion zookeeper;
+  version = lib.getVersion zookeeper;
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     "--without-cppunit"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zookeeper.apache.org";
     description = "Apache Zookeeper";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix
index 7a524e72318f..e74bb9ddc32e 100644
--- a/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "zxcvbn-c";
   version = "2.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     install -D -t $out/lib libzxcvbn.so*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tsyrogit/zxcvbn-c";
     description = "A C/C++ implementation of the zxcvbn password strength estimation";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/nixpkgs/pkgs/development/libraries/zziplib/default.nix
index 228dfdcf77a4..8cfec83af542 100644
--- a/nixpkgs/pkgs/development/libraries/zziplib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zziplib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , perl
 , pkg-config
 , fetchFromGitHub
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
   checkTarget = "check";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to extract data from files archived in a zip file";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix
index 2afdf05546fe..41b971ebae28 100644
--- a/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     inherit (s) version;
-    description = ''Standard software-system definition library for Common Lisp'';
+    description = "Standard software-system definition library for Common Lisp";
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix
index 445295830b25..9149155fb2f2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     inherit (s) version;
-    description = ''Standard software-system definition library for Common Lisp'';
+    description = "Standard software-system definition library for Common Lisp";
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.unix;
diff --git a/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix
index 2b1b846d319e..579788194473 100644
--- a/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     inherit (s) version;
-    description = ''Standard software-system definition library for Common Lisp'';
+    description = "Standard software-system definition library for Common Lisp";
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.unix;
diff --git a/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix b/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix
index 3cb8219e6874..821fe8920484 100644
--- a/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = ''Script used to wrap Common Lisp implementations'';
+    description = "Script used to wrap Common Lisp implementations";
     maintainers = [stdenv.lib.maintainers.raskin];
   };
 }
diff --git a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
index f8338e48e19a..63b9540522ec 100644
--- a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
@@ -27,7 +27,7 @@ let lispPackages = rec {
         url = "https://beta.quicklisp.org/dist/quicklisp/2020-10-16/distinfo.txt";
         sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65";
       };
-      buildPhase = '' true; '';
+      buildPhase = "true; ";
       postInstall = ''
         substituteAll ${./quicklisp.sh} "$out"/bin/quicklisp
         chmod a+x "$out"/bin/quicklisp
@@ -80,19 +80,19 @@ let lispPackages = rec {
 
   clx-truetype = buildLispPackage rec {
           baseName = "clx-truetype";
-          version = ''20160825-git'';
+          version = "20160825-git";
 
           buildSystems = [ "clx-truetype" ];
           parasites = [ "clx-truetype-test" ];
 
-          description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
+          description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.";
           deps = with pkgs.lispPackages; [
                   alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store
                           cl-vectors clx trivial-features zpb-ttf
           ];
           src = pkgs.fetchurl {
-                  url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
-                  sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
+                  url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz";
+                  sha256 = "0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67";
           };
 
           packageName = "clx-truetype";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix
index 6c08e0e1c95e..70de895a5866 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''_3bmd-ext-code-blocks'';
-  version = ''3bmd-20200925-git'';
+  baseName = "_3bmd-ext-code-blocks";
+  version = "3bmd-20200925-git";
 
-  description = ''extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma'';
+  description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma";
 
   deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz'';
-    sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw'';
+    url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz";
+    sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw";
   };
 
   packageName = "3bmd-ext-code-blocks";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index dd1959893fd5..b49b183b24cf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''_3bmd'';
-  version = ''20200925-git'';
+  baseName = "_3bmd";
+  version = "20200925-git";
 
-  description = ''markdown processor in CL using esrap parser.'';
+  description = "markdown processor in CL using esrap parser.";
 
   deps = [ args."alexandria" args."esrap" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz'';
-    sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw'';
+    url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz";
+    sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw";
   };
 
   packageName = "3bmd";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
index deb0c7f89cb7..d4f68526f18e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''access'';
-  version = ''20151218-git'';
+  baseName = "access";
+  version = "20151218-git";
 
   parasites = [ "access-test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz'';
-    sha256 = ''0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl'';
+    url = "http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz";
+    sha256 = "0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl";
   };
 
   packageName = "access";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix
index f93506505a11..69d28a65c148 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''acclimation'';
-  version = ''20200925-git'';
+  baseName = "acclimation";
+  version = "20200925-git";
 
-  description = ''Library supporting internationalization'';
+  description = "Library supporting internationalization";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz'';
-    sha256 = ''11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw'';
+    url = "http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz";
+    sha256 = "11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw";
   };
 
   packageName = "acclimation";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 7f257bc4baf5..f1eaf5874260 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''alexandria'';
-  version = ''20200925-git'';
+  baseName = "alexandria";
+  version = "20200925-git";
 
-  description = ''Alexandria is a collection of portable public domain utilities.'';
+  description = "Alexandria is a collection of portable public domain utilities.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz'';
-    sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl'';
+    url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz";
+    sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl";
   };
 
   packageName = "alexandria";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 9af6ed369800..1d5e3a5997a4 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''anaphora'';
-  version = ''20191007-git'';
+  baseName = "anaphora";
+  version = "20191007-git";
 
   parasites = [ "anaphora/test" ];
 
-  description = ''The Anaphoric Macro Package from Hell'';
+  description = "The Anaphoric Macro Package from Hell";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz'';
-    sha256 = ''0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv'';
+    url = "http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz";
+    sha256 = "0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv";
   };
 
   packageName = "anaphora";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
index 97ae196c0f52..5ac59f713e9d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''arnesi'';
-  version = ''20170403-git'';
+  baseName = "arnesi";
+  version = "20170403-git";
 
   parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ];
 
-  description = ''A bag-of-tools utilities library used to aid in implementing the bese.it toolkit'';
+  description = "A bag-of-tools utilities library used to aid in implementing the bese.it toolkit";
 
   deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz'';
-    sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4'';
+    url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz";
+    sha256 = "01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4";
   };
 
   packageName = "arnesi";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index efa5dc6e7698..07aca0eb9df6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''array-utils'';
-  version = ''20190710-git'';
+  baseName = "array-utils";
+  version = "20190710-git";
 
-  description = ''A few utilities for working with arrays.'';
+  description = "A few utilities for working with arrays.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz'';
-    sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh'';
+    url = "http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz";
+    sha256 = "1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh";
   };
 
   packageName = "array-utils";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
index 1a56676f0363..b0fa62899364 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''asdf-package-system'';
-  version = ''20150608-git'';
+  baseName = "asdf-package-system";
+  version = "20150608-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
-    sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
+    url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz";
+    sha256 = "17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29";
   };
 
   packageName = "asdf-package-system";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 65df45d95a50..7133bf257702 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''asdf-system-connections'';
-  version = ''20170124-git'';
+  baseName = "asdf-system-connections";
+  version = "20170124-git";
 
-  description = ''Allows for ASDF system to be connected so that auto-loading may occur.'';
+  description = "Allows for ASDF system to be connected so that auto-loading may occur.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz'';
-    sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq'';
+    url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz";
+    sha256 = "0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq";
   };
 
   packageName = "asdf-system-connections";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 5a362fc1f036..1c99fc6944ed 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''babel'';
-  version = ''20200925-git'';
+  baseName = "babel";
+  version = "20200925-git";
 
-  description = ''Babel, a charset conversion library.'';
+  description = "Babel, a charset conversion library.";
 
   deps = [ args."alexandria" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz'';
-    sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi'';
+    url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz";
+    sha256 = "1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi";
   };
 
   packageName = "babel";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index a660882f36b1..15100222894b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''blackbird'';
-  version = ''20160531-git'';
+  baseName = "blackbird";
+  version = "20160531-git";
 
-  description = ''A promise implementation for Common Lisp.'';
+  description = "A promise implementation for Common Lisp.";
 
   deps = [ args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
-    sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
+    url = "http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz";
+    sha256 = "0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9";
   };
 
   packageName = "blackbird";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index cef514715e09..b8c225174a85 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''bordeaux-threads'';
-  version = ''v0.8.8'';
+  baseName = "bordeaux-threads";
+  version = "v0.8.8";
 
   parasites = [ "bordeaux-threads/test" ];
 
-  description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.'';
+  description = "Bordeaux Threads makes writing portable multi-threaded apps simple.";
 
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz'';
-    sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp'';
+    url = "http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz";
+    sha256 = "1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp";
   };
 
   packageName = "bordeaux-threads";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 5d7f3f2dd10b..18d22d1cf320 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''buildnode-xhtml'';
-  version = ''buildnode-20170403-git'';
+  baseName = "buildnode-xhtml";
+  version = "buildnode-20170403-git";
 
-  description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';
+  description = "Tool for building up an xml dom of an excel spreadsheet nicely.";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
-    sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6'';
+    url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+    sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6";
   };
 
   packageName = "buildnode-xhtml";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index 0a2e56a9c9b8..b3a281ed3a0e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''buildnode'';
-  version = ''20170403-git'';
+  baseName = "buildnode";
+  version = "20170403-git";
 
   parasites = [ "buildnode-test" ];
 
-  description = ''Tool for building up an xml dom nicely.'';
+  description = "Tool for building up an xml dom nicely.";
 
   deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
-    sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6'';
+    url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+    sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6";
   };
 
   packageName = "buildnode";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index c90021bbeecc..3b44cbbb971d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''caveman'';
-  version = ''20200325-git'';
+  baseName = "caveman";
+  version = "20200325-git";
 
-  description = ''Web Application Framework for Common Lisp'';
+  description = "Web Application Framework for Common Lisp";
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-colors2" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz'';
-    sha256 = ''0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py'';
+    url = "http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz";
+    sha256 = "0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py";
   };
 
   packageName = "caveman";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index e4d6546e9018..97328db25432 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cffi-grovel'';
-  version = ''cffi_0.23.0'';
+  baseName = "cffi-grovel";
+  version = "cffi_0.23.0";
 
-  description = ''The CFFI Groveller'';
+  description = "The CFFI Groveller";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
-    sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
+    url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
+    sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
   };
 
   packageName = "cffi-grovel";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index ad5ecb7acc80..51fe6a00f1fa 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cffi-toolchain'';
-  version = ''cffi_0.23.0'';
+  baseName = "cffi-toolchain";
+  version = "cffi_0.23.0";
 
-  description = ''The CFFI toolchain'';
+  description = "The CFFI toolchain";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
-    sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
+    url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
+    sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
   };
 
   packageName = "cffi-toolchain";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index e234301f1fe7..a56fbf6b2653 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cffi'';
-  version = ''cffi_0.23.0'';
+  baseName = "cffi";
+  version = "cffi_0.23.0";
 
   parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
 
-  description = ''The Common Foreign Function Interface'';
+  description = "The Common Foreign Function Interface";
 
   deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
-    sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
+    url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
+    sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
   };
 
   packageName = "cffi";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix
index b0dea4fbd226..3b9e089b3138 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''chanl'';
-  version = ''20201016-git'';
+  baseName = "chanl";
+  version = "20201016-git";
 
   parasites = [ "chanl/examples" "chanl/tests" ];
 
-  description = ''Communicating Sequential Process support for Common Lisp'';
+  description = "Communicating Sequential Process support for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz'';
-    sha256 = ''13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1'';
+    url = "http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz";
+    sha256 = "13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1";
   };
 
   packageName = "chanl";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c30c68e53c8d..3c05684de53f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''chipz'';
-  version = ''20190202-git'';
+  baseName = "chipz";
+  version = "20190202-git";
 
-  description = ''A library for decompressing deflate, zlib, and gzip data'';
+  description = "A library for decompressing deflate, zlib, and gzip data";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz'';
-    sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a'';
+    url = "http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz";
+    sha256 = "1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a";
   };
 
   packageName = "chipz";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 644daa8af922..e08a2efe96ec 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''chunga'';
-  version = ''20200427-git'';
+  baseName = "chunga";
+  version = "20200427-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz'';
-    sha256 = ''0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk'';
+    url = "http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz";
+    sha256 = "0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk";
   };
 
   packageName = "chunga";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 2e387d29833f..f0b211d27d2c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''circular-streams'';
-  version = ''20161204-git'';
+  baseName = "circular-streams";
+  version = "20161204-git";
 
-  description = ''Circularly readable streams for Common Lisp'';
+  description = "Circularly readable streams for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
-    sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
+    url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz";
+    sha256 = "1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128";
   };
 
   packageName = "circular-streams";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 531d429df244..8f1448e436b0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-aa'';
-  version = ''cl-vectors-20180228-git'';
+  baseName = "cl-aa";
+  version = "cl-vectors-20180228-git";
 
-  description = ''cl-aa: polygon rasterizer'';
+  description = "cl-aa: polygon rasterizer";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-aa";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index 5f93167a1141..c85c60a0f1d8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-annot'';
-  version = ''20150608-git'';
+  baseName = "cl-annot";
+  version = "20150608-git";
 
-  description = ''Python-like Annotation Syntax for Common Lisp'';
+  description = "Python-like Annotation Syntax for Common Lisp";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
-    sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
+    url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz";
+    sha256 = "0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3";
   };
 
   packageName = "cl-annot";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index a413743eb8d5..2ae0f7d36deb 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-anonfun'';
-  version = ''20111203-git'';
+  baseName = "cl-anonfun";
+  version = "20111203-git";
 
-  description = ''Anonymous function helpers for Common Lisp'';
+  description = "Anonymous function helpers for Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
-    sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
+    url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz";
+    sha256 = "16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m";
   };
 
   packageName = "cl-anonfun";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 33f696f36167..dd6eeba98afc 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ansi-text'';
-  version = ''20200218-git'';
+  baseName = "cl-ansi-text";
+  version = "20200218-git";
 
-  description = ''ANSI control string characters, focused on color'';
+  description = "ANSI control string characters, focused on color";
 
   deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz'';
-    sha256 = ''1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r'';
+    url = "http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz";
+    sha256 = "1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r";
   };
 
   packageName = "cl-ansi-text";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index 83d32317b5b7..5a5a8b362fc1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-async-repl'';
-  version = ''cl-async-20200610-git'';
+  baseName = "cl-async-repl";
+  version = "cl-async-20200610-git";
 
-  description = ''REPL integration for CL-ASYNC.'';
+  description = "REPL integration for CL-ASYNC.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz'';
-    sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h'';
+    url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz";
+    sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
   };
 
   packageName = "cl-async-repl";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 606a4ffc213d..93de96b5ea63 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-async-ssl'';
-  version = ''cl-async-20200610-git'';
+  baseName = "cl-async-ssl";
+  version = "cl-async-20200610-git";
 
-  description = ''SSL Wrapper around cl-async socket implementation.'';
+  description = "SSL Wrapper around cl-async socket implementation.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz'';
-    sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h'';
+    url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz";
+    sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
   };
 
   packageName = "cl-async-ssl";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index f2ad6b509d01..ce188aeee1a9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-async'';
-  version = ''20200610-git'';
+  baseName = "cl-async";
+  version = "20200610-git";
 
   parasites = [ "cl-async-base" "cl-async-util" ];
 
-  description = ''Asynchronous operations for Common Lisp.'';
+  description = "Asynchronous operations for Common Lisp.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz'';
-    sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h'';
+    url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz";
+    sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
   };
 
   packageName = "cl-async";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 15843d1c2feb..37a0fa0c32fc 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-base64'';
-  version = ''20201016-git'';
+  baseName = "cl-base64";
+  version = "20201016-git";
 
   parasites = [ "cl-base64/test" ];
 
-  description = ''Base64 encoding and decoding with URI support.'';
+  description = "Base64 encoding and decoding with URI support.";
 
   deps = [ args."kmrcl" args."ptester" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz'';
-    sha256 = ''1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z'';
+    url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz";
+    sha256 = "1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z";
   };
 
   packageName = "cl-base64";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix
index d240e3e842d9..be751aa0e120 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-cairo'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-cairo";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to Cairo'';
+  description = "A Lisp binding to Cairo";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-cairo";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix
index 0c2d3abc2829..a331c048fdbe 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gdk-pixbuf'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gdk-pixbuf";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GDK Pixbuf 2'';
+  description = "A Lisp binding to GDK Pixbuf 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gdk-pixbuf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix
index 748cc9a0d6cc..02140a47a333 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gdk'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gdk";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GDK 3'';
+  description = "A Lisp binding to GDK 3";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gdk";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix
index af53a5945875..920fc4edeccf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gio'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gio";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GIO 2'';
+  description = "A Lisp binding to GIO 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gio";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix
index 4ad75bf507aa..429dfb7889b8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-glib'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-glib";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GLib 2'';
+  description = "A Lisp binding to GLib 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-glib";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix
index c2e2deef0033..d2f7f2e164f1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gobject'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gobject";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding GObject 2'';
+  description = "A Lisp binding GObject 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gobject";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix
index 896528cf1663..72b3ad647c7a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-pango'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-pango";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to Pango'';
+  description = "A Lisp binding to Pango";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-pango";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix
index 7055aec51211..98256cc740dc 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk'';
-  version = ''20201016-git'';
+  baseName = "cl-cffi-gtk";
+  version = "20201016-git";
 
-  description = ''A Lisp binding to GTK 3'';
+  description = "A Lisp binding to GTK 3";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
index 158158fefad6..ce74ce967e2f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-change-case'';
-  version = ''20191007-git'';
+  baseName = "cl-change-case";
+  version = "20191007-git";
 
-  description = ''Convert strings between camelCase, param-case, PascalCase and more'';
+  description = "Convert strings between camelCase, param-case, PascalCase and more";
 
   deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz'';
-    sha256 = ''097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1'';
+    url = "http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz";
+    sha256 = "097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1";
   };
 
   packageName = "cl-change-case";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
index 36641b73b750..cbc4deba6b5f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cli'';
-  version = ''20151218-git'';
+  baseName = "cl-cli";
+  version = "20151218-git";
 
-  description = ''Command line parser'';
+  description = "Command line parser";
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz'';
-    sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay'';
+    url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz";
+    sha256 = "0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay";
   };
 
   packageName = "cl-cli";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 0d0337a65cec..8882b1473c2f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-colors'';
-  version = ''20180328-git'';
+  baseName = "cl-colors";
+  version = "20180328-git";
 
   parasites = [ "cl-colors-tests" ];
 
-  description = ''Simple color library for Common Lisp'';
+  description = "Simple color library for Common Lisp";
 
   deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz'';
-    sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a'';
+    url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz";
+    sha256 = "0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a";
   };
 
   packageName = "cl-colors";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
index 519f43ff3245..3432660cffdf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-colors2'';
-  version = ''20200218-git'';
+  baseName = "cl-colors2";
+  version = "20200218-git";
 
   parasites = [ "cl-colors2/tests" ];
 
-  description = ''Simple color library for Common Lisp'';
+  description = "Simple color library for Common Lisp";
 
   deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz'';
-    sha256 = ''0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29'';
+    url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz";
+    sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29";
   };
 
   packageName = "cl-colors2";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
index bd0483b45240..c8dc5ca9a992 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-containers'';
-  version = ''20200427-git'';
+  baseName = "cl-containers";
+  version = "20200427-git";
 
   parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ];
 
-  description = ''A generic container library for Common Lisp'';
+  description = "A generic container library for Common Lisp";
 
   deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz'';
-    sha256 = ''0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy'';
+    url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz";
+    sha256 = "0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy";
   };
 
   packageName = "cl-containers";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index ddc3611d50d5..f35d40fb41c5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cookie'';
-  version = ''20191007-git'';
+  baseName = "cl-cookie";
+  version = "20191007-git";
 
-  description = ''HTTP cookie manager'';
+  description = "HTTP cookie manager";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz'';
-    sha256 = ''1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh'';
+    url = "http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz";
+    sha256 = "1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh";
   };
 
   packageName = "cl-cookie";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
index ba295b6e43a6..0d0b2aa1dcf7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-css'';
-  version = ''20140914-git'';
+  baseName = "cl-css";
+  version = "20140914-git";
 
-  description = ''Simple inline CSS generator'';
+  description = "Simple inline CSS generator";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
-    sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
+    url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz";
+    sha256 = "16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n";
   };
 
   packageName = "cl-css";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 051ffabfc564..c9badad400e9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-csv'';
-  version = ''20201016-git'';
+  baseName = "cl-csv";
+  version = "20201016-git";
 
   parasites = [ "cl-csv/speed-test" "cl-csv/test" ];
 
-  description = ''Facilities for reading and writing CSV format files'';
+  description = "Facilities for reading and writing CSV format files";
 
   deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz'';
-    sha256 = ''1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf'';
+    url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz";
+    sha256 = "1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf";
   };
 
   packageName = "cl-csv";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index c5d0f114e10b..8dc68dc36fae 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-dbi'';
-  version = ''20200610-git'';
+  baseName = "cl-dbi";
+  version = "20200610-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "cl-dbi";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
index 53cf2214ed25..a01f8be35368 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-dot'';
-  version = ''20200925-git'';
+  baseName = "cl-dot";
+  version = "20200925-git";
 
-  description = ''Generate Dot Output from Arbitrary Lisp Data'';
+  description = "Generate Dot Output from Arbitrary Lisp Data";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz'';
-    sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla'';
+    url = "http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz";
+    sha256 = "01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla";
   };
 
   packageName = "cl-dot";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 1510495a4cbc..b78dd2339b15 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-emb'';
-  version = ''20190521-git'';
+  baseName = "cl-emb";
+  version = "20190521-git";
 
-  description = ''A templating system for Common Lisp'';
+  description = "A templating system for Common Lisp";
 
   deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz'';
-    sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d'';
+    url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz";
+    sha256 = "1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d";
   };
 
   packageName = "cl-emb";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 12d7a7ae2730..28cf369206c7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-fad'';
-  version = ''20200610-git'';
+  baseName = "cl-fad";
+  version = "20200610-git";
 
   parasites = [ "cl-fad-test" ];
 
-  description = ''Portable pathname library'';
+  description = "Portable pathname library";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz'';
-    sha256 = ''08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x'';
+    url = "http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz";
+    sha256 = "08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x";
   };
 
   packageName = "cl-fad";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 6a40d0fa8c92..bf3c36d62b14 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-fuse-meta-fs'';
-  version = ''20190710-git'';
+  baseName = "cl-fuse-meta-fs";
+  version = "20190710-git";
 
-  description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+  description = "CFFI bindings to FUSE (Filesystem in user space)";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz'';
-    sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7'';
+    url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz";
+    sha256 = "1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7";
   };
 
   packageName = "cl-fuse-meta-fs";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index b0a549096b2d..a2384c0ffaa8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-fuse'';
-  version = ''20200925-git'';
+  baseName = "cl-fuse";
+  version = "20200925-git";
 
-  description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+  description = "CFFI bindings to FUSE (Filesystem in user space)";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz'';
-    sha256 = ''1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp'';
+    url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz";
+    sha256 = "1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp";
   };
 
   packageName = "cl-fuse";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
index 72eafacb1902..f7b787827913 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-hooks'';
-  version = ''architecture.hooks-20181210-git'';
+  baseName = "cl-hooks";
+  version = "architecture.hooks-20181210-git";
 
   parasites = [ "cl-hooks/test" ];
 
@@ -11,8 +11,8 @@ mechanism (as known, e.g., from GNU Emacs).'';
   deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz'';
-    sha256 = ''04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns'';
+    url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz";
+    sha256 = "04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns";
   };
 
   packageName = "cl-hooks";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 6cd859c2cad7..60cb467f9a06 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-html-parse'';
-  version = ''20200925-git'';
+  baseName = "cl-html-parse";
+  version = "20200925-git";
 
-  description = ''HTML Parser'';
+  description = "HTML Parser";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz'';
-    sha256 = ''14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f'';
+    url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz";
+    sha256 = "14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f";
   };
 
   packageName = "cl-html-parse";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index dde2cc31dd05..64a877638105 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-html5-parser'';
-  version = ''20190521-git'';
+  baseName = "cl-html5-parser";
+  version = "20190521-git";
 
-  description = ''A HTML5 parser for Common Lisp'';
+  description = "A HTML5 parser for Common Lisp";
 
   deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz'';
-    sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p'';
+    url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
+    sha256 = "055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p";
   };
 
   packageName = "cl-html5-parser";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index 50ad66faa23c..8719adf631c5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-interpol'';
-  version = ''20200715-git'';
+  baseName = "cl-interpol";
+  version = "20200715-git";
 
   parasites = [ "cl-interpol-test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz'';
-    sha256 = ''0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw'';
+    url = "http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz";
+    sha256 = "0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw";
   };
 
   packageName = "cl-interpol";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
index 713aff0ea405..1f9fdc420fe7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-jpeg'';
-  version = ''20170630-git'';
+  baseName = "cl-jpeg";
+  version = "20170630-git";
 
-  description = ''A self-contained baseline JPEG codec implementation'';
+  description = "A self-contained baseline JPEG codec implementation";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz'';
-    sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0'';
+    url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz";
+    sha256 = "1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0";
   };
 
   packageName = "cl-jpeg";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index d8bc535f3559..00f8b90e485a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-json'';
-  version = ''20141217-git'';
+  baseName = "cl-json";
+  version = "20141217-git";
 
   parasites = [ "cl-json.test" ];
 
-  description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.'';
+  description = "JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
-    sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
+    url = "http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz";
+    sha256 = "00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g";
   };
 
   packageName = "cl-json";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index dfabda0428f0..3162edc38625 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-l10n-cldr'';
-  version = ''20120909-darcs'';
+  baseName = "cl-l10n-cldr";
+  version = "20120909-darcs";
 
-  description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.'';
+  description = "The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
-    sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
+    url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz";
+    sha256 = "03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv";
   };
 
   packageName = "cl-l10n-cldr";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index f37e653bc564..61c37acb829e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-l10n'';
-  version = ''20161204-darcs'';
+  baseName = "cl-l10n";
+  version = "20161204-darcs";
 
   parasites = [ "cl-l10n/test" ];
 
-  description = ''Portable CL Locale Support'';
+  description = "Portable CL Locale Support";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
-    sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
+    url = "http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz";
+    sha256 = "1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl";
   };
 
   packageName = "cl-l10n";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index ad4780cebe0b..7c3f1b7c0694 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-libuv'';
-  version = ''20200610-git'';
+  baseName = "cl-libuv";
+  version = "20200610-git";
 
-  description = ''Low-level libuv bindings for Common Lisp.'';
+  description = "Low-level libuv bindings for Common Lisp.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz'';
-    sha256 = ''1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19'';
+    url = "http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz";
+    sha256 = "1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19";
   };
 
   packageName = "cl-libuv";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
index f0d727a633f5..656cb7046342 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-locale'';
-  version = ''20151031-git'';
+  baseName = "cl-locale";
+  version = "20151031-git";
 
-  description = ''Simple i18n library for Common Lisp'';
+  description = "Simple i18n library for Common Lisp";
 
   deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz'';
-    sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg'';
+    url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
+    sha256 = "14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg";
   };
 
   packageName = "cl-locale";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index b1916c27bfdd..56853f0dfcde 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-markup'';
-  version = ''20131003-git'';
+  baseName = "cl-markup";
+  version = "20131003-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
-    sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
+    url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz";
+    sha256 = "1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r";
   };
 
   packageName = "cl-markup";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index 97b714d8b649..c2ede1ee6ecf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-mysql'';
-  version = ''20200610-git'';
+  baseName = "cl-mysql";
+  version = "20200610-git";
 
-  description = ''Common Lisp MySQL library bindings'';
+  description = "Common Lisp MySQL library bindings";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz'';
-    sha256 = ''0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w'';
+    url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz";
+    sha256 = "0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w";
   };
 
   packageName = "cl-mysql";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index cfca59e3b503..249a54ed0fbe 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-paths-ttf'';
-  version = ''cl-vectors-20180228-git'';
+  baseName = "cl-paths-ttf";
+  version = "cl-vectors-20180228-git";
 
-  description = ''cl-paths-ttf: vectorial paths manipulation'';
+  description = "cl-paths-ttf: vectorial paths manipulation";
 
   deps = [ args."cl-paths" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-paths-ttf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index e8034b11c237..9f7fc95a9190 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-paths'';
-  version = ''cl-vectors-20180228-git'';
+  baseName = "cl-paths";
+  version = "cl-vectors-20180228-git";
 
-  description = ''cl-paths: vectorial paths manipulation'';
+  description = "cl-paths: vectorial paths manipulation";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-paths";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index 16bf7d3a6382..35deef0c2a36 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-pdf'';
-  version = ''20191007-git'';
+  baseName = "cl-pdf";
+  version = "20191007-git";
 
-  description = ''Common Lisp PDF Generation Library'';
+  description = "Common Lisp PDF Generation Library";
 
   deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz'';
-    sha256 = ''0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd'';
+    url = "http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz";
+    sha256 = "0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd";
   };
 
   packageName = "cl-pdf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 85212e613284..f26326f307e5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-postgres'';
-  version = ''postmodern-20201016-git'';
+  baseName = "cl-postgres";
+  version = "postmodern-20201016-git";
 
   parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
 
-  description = ''Low-level client library for PostgreSQL'';
+  description = "Low-level client library for PostgreSQL";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "cl-postgres";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 3856d777c563..f681b384b54f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20200925-git'';
+  baseName = "cl-ppcre-template";
+  version = "cl-unification-20200925-git";
 
   description = ''A system used to conditionally load the CL-PPCRE Template.
 
@@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.'';
   deps = [ args."cl-ppcre" args."cl-unification" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz'';
-    sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais'';
+    url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz";
+    sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais";
   };
 
   packageName = "cl-ppcre-template";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 27887f12497e..8002137e77bd 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ppcre-unicode'';
-  version = ''cl-ppcre-20190521-git'';
+  baseName = "cl-ppcre-unicode";
+  version = "cl-ppcre-20190521-git";
 
   parasites = [ "cl-ppcre-unicode-test" ];
 
-  description = ''Perl-compatible regular expression library (Unicode)'';
+  description = "Perl-compatible regular expression library (Unicode)";
 
   deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
-    sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
+    url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz";
+    sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx";
   };
 
   packageName = "cl-ppcre-unicode";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 8bb8fb2478d8..3d038b19dce3 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ppcre'';
-  version = ''20190521-git'';
+  baseName = "cl-ppcre";
+  version = "20190521-git";
 
   parasites = [ "cl-ppcre-test" ];
 
-  description = ''Perl-compatible regular expression library'';
+  description = "Perl-compatible regular expression library";
 
   deps = [ args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
-    sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
+    url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz";
+    sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx";
   };
 
   packageName = "cl-ppcre";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
index ddfc92b2cb3d..3fa35243c2f1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-prevalence'';
-  version = ''20200715-git'';
+  baseName = "cl-prevalence";
+  version = "20200715-git";
 
-  description = ''Common Lisp Prevalence Package'';
+  description = "Common Lisp Prevalence Package";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz'';
-    sha256 = ''1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd'';
+    url = "http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz";
+    sha256 = "1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd";
   };
 
   packageName = "cl-prevalence";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index e88b9efe366b..55edc3cf1211 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-project'';
-  version = ''20200715-git'';
+  baseName = "cl-project";
+  version = "20200715-git";
 
-  description = ''Generate a skeleton for modern project'';
+  description = "Generate a skeleton for modern project";
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-emb" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz'';
-    sha256 = ''044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306'';
+    url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz";
+    sha256 = "044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306";
   };
 
   packageName = "cl-project";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
index 7339fcdffeb3..fdbb48c3754f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-protobufs'';
-  version = ''20200325-git'';
+  baseName = "cl-protobufs";
+  version = "20200325-git";
 
-  description = ''Protobufs for Common Lisp'';
+  description = "Protobufs for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz'';
-    sha256 = ''1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin'';
+    url = "http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz";
+    sha256 = "1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin";
   };
 
   packageName = "cl-protobufs";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
index 1ccf6af5cba4..72f7d85bc2c2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-qprint'';
-  version = ''20150804-git'';
+  baseName = "cl-qprint";
+  version = "20150804-git";
 
-  description = ''Encode and decode quoted-printable encoded strings.'';
+  description = "Encode and decode quoted-printable encoded strings.";
 
   deps = [ args."flexi-streams" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz'';
-    sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28'';
+    url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz";
+    sha256 = "042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28";
   };
 
   packageName = "cl-qprint";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 916af5b29727..a4ada8ee9e59 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-reexport'';
-  version = ''20150709-git'';
+  baseName = "cl-reexport";
+  version = "20150709-git";
 
-  description = ''Reexport external symbols in other packages.'';
+  description = "Reexport external symbols in other packages.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz'';
-    sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi'';
+    url = "http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz";
+    sha256 = "1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi";
   };
 
   packageName = "cl-reexport";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
index 2c4fd03f94da..464cddbd5f7e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-slice'';
-  version = ''20171130-git'';
+  baseName = "cl-slice";
+  version = "20171130-git";
 
   parasites = [ "cl-slice-tests" ];
 
-  description = ''DSL for array slices in Common Lisp.'';
+  description = "DSL for array slices in Common Lisp.";
 
   deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz'';
-    sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn'';
+    url = "http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz";
+    sha256 = "0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn";
   };
 
   packageName = "cl-slice";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index accb8a014c89..58957c7826ad 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-smtp'';
-  version = ''20191130-git'';
+  baseName = "cl-smtp";
+  version = "20191130-git";
 
-  description = ''Common Lisp smtp client.'';
+  description = "Common Lisp smtp client.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz'';
-    sha256 = ''04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq'';
+    url = "http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz";
+    sha256 = "04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq";
   };
 
   packageName = "cl-smtp";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index d97bd34f2753..f7571c4bfcc8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-store'';
-  version = ''20200925-git'';
+  baseName = "cl-store";
+  version = "20200925-git";
 
   parasites = [ "cl-store-tests" ];
 
-  description = ''Serialization package'';
+  description = "Serialization package";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz'';
-    sha256 = ''0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3'';
+    url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz";
+    sha256 = "0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3";
   };
 
   packageName = "cl-store";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index add200b09a1d..6cedd33973df 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax-annot'';
-  version = ''cl-syntax-20150407-git'';
+  baseName = "cl-syntax-annot";
+  version = "cl-syntax-20150407-git";
 
-  description = ''CL-Syntax Reader Syntax for cl-annot'';
+  description = "CL-Syntax Reader Syntax for cl-annot";
 
   deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax-annot";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index c19a47df6c23..c862b137b02e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax-anonfun'';
-  version = ''cl-syntax-20150407-git'';
+  baseName = "cl-syntax-anonfun";
+  version = "cl-syntax-20150407-git";
 
-  description = ''CL-Syntax Reader Syntax for cl-anonfun'';
+  description = "CL-Syntax Reader Syntax for cl-anonfun";
 
   deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax-anonfun";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index cded8dc2d06d..ed1158f09986 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax-markup'';
-  version = ''cl-syntax-20150407-git'';
+  baseName = "cl-syntax-markup";
+  version = "cl-syntax-20150407-git";
 
-  description = ''CL-Syntax Reader Syntax for CL-Markup'';
+  description = "CL-Syntax Reader Syntax for CL-Markup";
 
   deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax-markup";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 353c8210885e..195071e88ce8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax'';
-  version = ''20150407-git'';
+  baseName = "cl-syntax";
+  version = "20150407-git";
 
-  description = ''Reader Syntax Coventions for Common Lisp and SLIME'';
+  description = "Reader Syntax Coventions for Common Lisp and SLIME";
 
   deps = [ args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index 419994fb248d..8b5bff40c60a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-test-more'';
-  version = ''prove-20200218-git'';
+  baseName = "cl-test-more";
+  version = "prove-20200218-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."prove" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
-    sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
+    url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+    sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
   };
 
   packageName = "cl-test-more";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
index 358666877a6d..2e43b2c37ec0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-typesetting'';
-  version = ''20170830-git'';
+  baseName = "cl-typesetting";
+  version = "20170830-git";
 
-  description = ''Common Lisp Typesetting system'';
+  description = "Common Lisp Typesetting system";
 
   deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz'';
-    sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3'';
+    url = "http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz";
+    sha256 = "1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3";
   };
 
   packageName = "cl-typesetting";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 7849acb57c0a..f7ad7a8592c6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-unicode'';
-  version = ''20190521-git'';
+  baseName = "cl-unicode";
+  version = "20190521-git";
 
   parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];
 
-  description = ''Portable Unicode Library'';
+  description = "Portable Unicode Library";
 
   deps = [ args."cl-ppcre" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz'';
-    sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc'';
+    url = "http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz";
+    sha256 = "0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc";
   };
 
   packageName = "cl-unicode";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 38903abe98bc..d4328b7319e3 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-unification'';
-  version = ''20200925-git'';
+  baseName = "cl-unification";
+  version = "20200925-git";
 
   description = ''The CL-UNIFICATION system.
 
@@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.'';
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz'';
-    sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais'';
+    url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz";
+    sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais";
   };
 
   packageName = "cl-unification";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index ba8be7927f04..1304b11990a5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-utilities'';
-  version = ''1.2.4'';
+  baseName = "cl-utilities";
+  version = "1.2.4";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
-    sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
+    url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz";
+    sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87";
   };
 
   packageName = "cl-utilities";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index f44bd0f22e0c..14cee3176123 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-vectors'';
-  version = ''20180228-git'';
+  baseName = "cl-vectors";
+  version = "20180228-git";
 
-  description = ''cl-paths: vectorial paths manipulation'';
+  description = "cl-paths: vectorial paths manipulation";
 
   deps = [ args."cl-aa" args."cl-paths" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-vectors";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
index 01a2732a7ecc..9c547943317f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-webkit2'';
-  version = ''cl-webkit-20201016-git'';
+  baseName = "cl-webkit2";
+  version = "cl-webkit-20201016-git";
 
-  description = ''An FFI binding to WebKit2GTK+'';
+  description = "An FFI binding to WebKit2GTK+";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz'';
-    sha256 = ''15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh'';
+    url = "http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz";
+    sha256 = "15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh";
   };
 
   packageName = "cl-webkit2";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 3be45384d418..4b4f4314251e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-who'';
-  version = ''20190710-git'';
+  baseName = "cl-who";
+  version = "20190710-git";
 
   parasites = [ "cl-who-test" ];
 
-  description = ''(X)HTML generation macros'';
+  description = "(X)HTML generation macros";
 
   deps = [ args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz'';
-    sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir'';
+    url = "http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz";
+    sha256 = "0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir";
   };
 
   packageName = "cl-who";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
index 223c50f47164..86c9f0c594a0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-xmlspam'';
-  version = ''20101006-http'';
+  baseName = "cl-xmlspam";
+  version = "20101006-http";
 
-  description = ''Streaming pattern matching for XML'';
+  description = "Streaming pattern matching for XML";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
-    sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
+    url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz";
+    sha256 = "1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h";
   };
 
   packageName = "cl-xmlspam";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index 5a1ae8550aae..1826e79f5a92 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl_plus_ssl'';
-  version = ''cl+ssl-20200610-git'';
+  baseName = "cl_plus_ssl";
+  version = "cl+ssl-20200610-git";
 
-  description = ''Common Lisp interface to OpenSSL.'';
+  description = "Common Lisp interface to OpenSSL.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz'';
-    sha256 = ''1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql'';
+    url = "http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz";
+    sha256 = "1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql";
   };
 
   packageName = "cl+ssl";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 5a831da39b82..75a30decba4c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-handler-hunchentoot'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-handler-hunchentoot";
+  version = "clack-20191007-git";
 
-  description = ''Clack handler for Hunchentoot.'';
+  description = "Clack handler for Hunchentoot.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-handler-hunchentoot";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index a9294b293cc3..5b39ac9e5a30 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-socket'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-socket";
+  version = "clack-20191007-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-socket";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 64e6a694628a..b990af443977 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-test'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-test";
+  version = "clack-20191007-git";
 
-  description = ''Testing Clack Applications.'';
+  description = "Testing Clack Applications.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-test";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index d52c21e7c005..5c0a58643143 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-v1-compat'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-v1-compat";
+  version = "clack-20191007-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-v1-compat";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 1453232cb66a..878b037cb3e8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack'';
-  version = ''20191007-git'';
+  baseName = "clack";
+  version = "20191007-git";
 
-  description = ''Web application environment for Common Lisp'';
+  description = "Web application environment for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
new file mode 100644
index 000000000000..b7073858601d
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = "clfswm";
+  version = "20161204-git";
+
+  description = "CLFSWM: Fullscreen Window Manager";
+
+  deps = [ args."clx" ];
+
+  src = fetchurl {
+    url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz";
+    sha256 = "1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73";
+  };
+
+  packageName = "clfswm";
+
+  asdFilesToKeep = ["clfswm.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM clfswm DESCRIPTION CLFSWM: Fullscreen Window Manager SHA256
+    1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73 URL
+    http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz
+    MD5 dc976785ef899837ab0fc50a4ed6b740 NAME clfswm FILENAME clfswm DEPS
+    ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION 20161204-git SIBLINGS
+    NIL PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index a942542e336e..5c7f91ac88c3 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''closer-mop'';
-  version = ''20201016-git'';
+  baseName = "closer-mop";
+  version = "20201016-git";
 
-  description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
+  description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz'';
-    sha256 = ''1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd'';
+    url = "http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz";
+    sha256 = "1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd";
   };
 
   packageName = "closer-mop";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index c1b36b6b653c..86e19bc347f2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''closure-common'';
-  version = ''20181018-git'';
+  baseName = "closure-common";
+  version = "20181018-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz'';
-    sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn'';
+    url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz";
+    sha256 = "18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn";
   };
 
   packageName = "closure-common";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 7d9d8730f293..d1d07573809a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''closure-html'';
-  version = ''20180711-git'';
+  baseName = "closure-html";
+  version = "20180711-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz'';
-    sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq'';
+    url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz";
+    sha256 = "0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq";
   };
 
   packageName = "closure-html";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
index cbe9caf93ceb..a01522b032f8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-postgresql-socket'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-postgresql-socket";
+  version = "clsql-20201016-git";
 
-  description = ''Common Lisp SQL PostgreSQL Socket Driver'';
+  description = "Common Lisp SQL PostgreSQL Socket Driver";
 
   deps = [ args."clsql" args."md5" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-postgresql-socket";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
index 9e449d555534..1c5ee972844b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-postgresql'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-postgresql";
+  version = "clsql-20201016-git";
 
-  description = ''Common Lisp PostgreSQL API Driver'';
+  description = "Common Lisp PostgreSQL API Driver";
 
   deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-postgresql";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
index 1756cea10bbd..500eddc5c500 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-sqlite3'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-sqlite3";
+  version = "clsql-20201016-git";
 
-  description = ''Common Lisp Sqlite3 Driver'';
+  description = "Common Lisp Sqlite3 Driver";
 
   deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-sqlite3";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
index 413998912068..898df2931931 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-uffi'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-uffi";
+  version = "clsql-20201016-git";
 
-  description = ''Common UFFI Helper functions for Common Lisp SQL Interface Library'';
+  description = "Common UFFI Helper functions for Common Lisp SQL Interface Library";
 
   deps = [ args."clsql" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-uffi";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 6a202f7efa2d..3ec382632241 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql'';
-  version = ''20201016-git'';
+  baseName = "clsql";
+  version = "20201016-git";
 
-  description = ''Common Lisp SQL Interface library'';
+  description = "Common Lisp SQL Interface library";
 
   deps = [ args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index aa89d5e45cc3..19a1e5ebb164 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clss'';
-  version = ''20191130-git'';
+  baseName = "clss";
+  version = "20191130-git";
 
-  description = ''A DOM tree searching engine based on CSS selectors.'';
+  description = "A DOM tree searching engine based on CSS selectors.";
 
   deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz'';
-    sha256 = ''0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka'';
+    url = "http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz";
+    sha256 = "0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka";
   };
 
   packageName = "clss";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix
index 10ab18a8cafd..bc9a8beb66a4 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clump-2-3-tree'';
-  version = ''clump-20160825-git'';
+  baseName = "clump-2-3-tree";
+  version = "clump-20160825-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."acclimation" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
-    sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
+    url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+    sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl";
   };
 
   packageName = "clump-2-3-tree";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix
index ad2844715400..96543b9ba80a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clump-binary-tree'';
-  version = ''clump-20160825-git'';
+  baseName = "clump-binary-tree";
+  version = "clump-20160825-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."acclimation" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
-    sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
+    url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+    sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl";
   };
 
   packageName = "clump-binary-tree";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix
index 476cacb6f325..8c6c9e022002 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clump'';
-  version = ''20160825-git'';
+  baseName = "clump";
+  version = "20160825-git";
 
-  description = ''Library for operations on different kinds of trees'';
+  description = "Library for operations on different kinds of trees";
 
   deps = [ args."acclimation" args."clump-2-3-tree" args."clump-binary-tree" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
-    sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
+    url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+    sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl";
   };
 
   packageName = "clump";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
index 7ab00c034463..7ef0b4a52ddd 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clunit'';
-  version = ''20171019-git'';
+  baseName = "clunit";
+  version = "20171019-git";
 
-  description = ''CLUnit is a Common Lisp unit testing framework.'';
+  description = "CLUnit is a Common Lisp unit testing framework.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz'';
-    sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5'';
+    url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz";
+    sha256 = "1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5";
   };
 
   packageName = "clunit";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
index 6a143073b5c6..c62d20e6e2b1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clunit2'';
-  version = ''20201016-git'';
+  baseName = "clunit2";
+  version = "20201016-git";
 
-  description = ''CLUnit is a Common Lisp unit testing framework.'';
+  description = "CLUnit is a Common Lisp unit testing framework.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz'';
-    sha256 = ''1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp'';
+    url = "http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz";
+    sha256 = "1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp";
   };
 
   packageName = "clunit2";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 856d54115573..9592921de1da 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clx'';
-  version = ''20200715-git'';
+  baseName = "clx";
+  version = "20200715-git";
 
   parasites = [ "clx/test" ];
 
-  description = ''An implementation of the X Window System protocol in Lisp.'';
+  description = "An implementation of the X Window System protocol in Lisp.";
 
   deps = [ args."fiasco" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz'';
-    sha256 = ''1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra'';
+    url = "http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz";
+    sha256 = "1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra";
   };
 
   packageName = "clx";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
index 7375b8dd7094..20b0435fafa7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''collectors'';
-  version = ''20161204-git'';
+  baseName = "collectors";
+  version = "20161204-git";
 
   parasites = [ "collectors-test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz'';
-    sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf'';
+    url = "http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz";
+    sha256 = "0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf";
   };
 
   packageName = "collectors";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix
index 9084d6a309bd..2abbb9565519 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''colorize'';
-  version = ''20180228-git'';
+  baseName = "colorize";
+  version = "20180228-git";
 
-  description = ''A Syntax highlighting library'';
+  description = "A Syntax highlighting library";
 
   deps = [ args."alexandria" args."html-encode" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz'';
-    sha256 = ''1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h'';
+    url = "http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz";
+    sha256 = "1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h";
   };
 
   packageName = "colorize";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index ed4e48cd83bb..1beb758a79fb 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''command-line-arguments'';
-  version = ''20200325-git'';
+  baseName = "command-line-arguments";
+  version = "20200325-git";
 
-  description = ''small library to deal with command-line arguments'';
+  description = "small library to deal with command-line arguments";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz'';
-    sha256 = ''0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz'';
+    url = "http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz";
+    sha256 = "0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz";
   };
 
   packageName = "command-line-arguments";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 38ea5aa106ce..41ac2a90aaec 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-lite'';
-  version = ''20120407-git'';
+  baseName = "css-lite";
+  version = "20120407-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
-    sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
+    url = "http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz";
+    sha256 = "1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg";
   };
 
   packageName = "css-lite";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index 98c565648dcb..5fc683cdc95e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-selectors-simple-tree'';
-  version = ''css-selectors-20160628-git'';
+  baseName = "css-selectors-simple-tree";
+  version = "css-selectors-20160628-git";
 
-  description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
+  description = "An implementation of css selectors that interacts with cl-html5-parser's simple-tree";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
-    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+    url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+    sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
   };
 
   packageName = "css-selectors-simple-tree";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fcdb69f3c351..9d03244efa10 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-selectors-stp'';
-  version = ''css-selectors-20160628-git'';
+  baseName = "css-selectors-stp";
+  version = "css-selectors-20160628-git";
 
-  description = ''An implementation of css selectors that interacts with cxml-stp'';
+  description = "An implementation of css selectors that interacts with cxml-stp";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
-    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+    url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+    sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
   };
 
   packageName = "css-selectors-stp";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index aa523d6f838b..b18d3a03b63b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-selectors'';
-  version = ''20160628-git'';
+  baseName = "css-selectors";
+  version = "20160628-git";
 
   parasites = [ "css-selectors-test" ];
 
-  description = ''An implementation of css selectors'';
+  description = "An implementation of css selectors";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
-    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+    url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+    sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
   };
 
   packageName = "css-selectors";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index 2816b4510879..4491687d6120 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cxml-stp'';
-  version = ''20200325-git'';
+  baseName = "cxml-stp";
+  version = "20200325-git";
 
   parasites = [ "cxml-stp/test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml_slash_test" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz'';
-    sha256 = ''1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n'';
+    url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz";
+    sha256 = "1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n";
   };
 
   packageName = "cxml-stp";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 8f5e05048c62..cd7ac83f2e5a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cxml'';
-  version = ''20200610-git'';
+  baseName = "cxml";
+  version = "20200610-git";
 
   parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ];
 
-  description = ''Closure XML - a Common Lisp XML parser'';
+  description = "Closure XML - a Common Lisp XML parser";
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz'';
-    sha256 = ''0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq'';
+    url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz";
+    sha256 = "0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq";
   };
 
   packageName = "cxml";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 9dcea72f391d..1b84a8c038ed 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbd-mysql";
+  version = "cl-dbi-20200610-git";
 
-  description = ''Database driver for MySQL.'';
+  description = "Database driver for MySQL.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbd-mysql";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 5a7b261f7248..7590319fbc2e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbd-postgres";
+  version = "cl-dbi-20200610-git";
 
-  description = ''Database driver for PostgreSQL.'';
+  description = "Database driver for PostgreSQL.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbd-postgres";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 5566e807549a..b2a264159170 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbd-sqlite3";
+  version = "cl-dbi-20200610-git";
 
-  description = ''Database driver for SQLite3.'';
+  description = "Database driver for SQLite3.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbd-sqlite3";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
index 889afc1231da..f24003e87cfa 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbi-test'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbi-test";
+  version = "cl-dbi-20200610-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbi-test";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 75fab11cf445..b4f9fc45de07 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbi'';
-  version = ''cl-20200610-git'';
+  baseName = "dbi";
+  version = "cl-20200610-git";
 
   parasites = [ "dbi/test" ];
 
-  description = ''Database independent interface for Common Lisp'';
+  description = "Database independent interface for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbi";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
index 1ea512d0ab78..b5ebe86a190c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbus'';
-  version = ''20200610-git'';
+  baseName = "dbus";
+  version = "20200610-git";
 
-  description = ''A D-BUS client library for Common Lisp'';
+  description = "A D-BUS client library for Common Lisp";
 
   deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz'';
-    sha256 = ''1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79'';
+    url = "http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz";
+    sha256 = "1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79";
   };
 
   packageName = "dbus";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 1fb2381ffc20..d5af479b22c8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dexador'';
-  version = ''20200427-git'';
+  baseName = "dexador";
+  version = "20200427-git";
 
-  description = ''Yet another HTTP client for Common Lisp'';
+  description = "Yet another HTTP client for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz'';
-    sha256 = ''0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld'';
+    url = "http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz";
+    sha256 = "0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld";
   };
 
   packageName = "dexador";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
index 2df2c14c1291..54f55a4d3ef5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dissect'';
-  version = ''20200427-git'';
+  baseName = "dissect";
+  version = "20200427-git";
 
-  description = ''A lib for introspecting the call stack and active restarts.'';
+  description = "A lib for introspecting the call stack and active restarts.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz'';
-    sha256 = ''1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a'';
+    url = "http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz";
+    sha256 = "1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a";
   };
 
   packageName = "dissect";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
index 1b919e63a5f3..7010a186bfcf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''djula'';
-  version = ''20201016-git'';
+  baseName = "djula";
+  version = "20201016-git";
 
-  description = ''An implementation of Django templates for Common Lisp.'';
+  description = "An implementation of Django templates for Common Lisp.";
 
   deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz'';
-    sha256 = ''09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy'';
+    url = "http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz";
+    sha256 = "09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy";
   };
 
   packageName = "djula";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 3dbacdf0f81a..09a27df91e02 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''do-urlencode'';
-  version = ''20181018-git'';
+  baseName = "do-urlencode";
+  version = "20181018-git";
 
-  description = ''Percent Encoding (aka URL Encoding) library'';
+  description = "Percent Encoding (aka URL Encoding) library";
 
   deps = [ args."alexandria" args."babel" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz'';
-    sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2'';
+    url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz";
+    sha256 = "1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2";
   };
 
   packageName = "do-urlencode";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7c25ed9a0377..27e05af70be0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''documentation-utils'';
-  version = ''20190710-git'';
+  baseName = "documentation-utils";
+  version = "20190710-git";
 
-  description = ''A few simple tools to help you with documenting your library.'';
+  description = "A few simple tools to help you with documenting your library.";
 
   deps = [ args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz'';
-    sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3'';
+    url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz";
+    sha256 = "1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3";
   };
 
   packageName = "documentation-utils";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index e880d94f433b..7ba2b4f9a37f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''drakma'';
-  version = ''v2.0.7'';
+  baseName = "drakma";
+  version = "v2.0.7";
 
-  description = ''Full-featured http/https client based on usocket'';
+  description = "Full-featured http/https client based on usocket";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz'';
-    sha256 = ''1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw'';
+    url = "http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz";
+    sha256 = "1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw";
   };
 
   packageName = "drakma";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix
index a5e44cefa4b5..f0bdf6d0376f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''enchant'';
-  version = ''cl-20190521-git'';
+  baseName = "enchant";
+  version = "cl-20190521-git";
 
-  description = ''Programming interface for Enchant spell-checker library'';
+  description = "Programming interface for Enchant spell-checker library";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz'';
-    sha256 = ''16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14'';
+    url = "http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz";
+    sha256 = "16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14";
   };
 
   packageName = "enchant";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
index d8258ea57dfd..367e268f3447 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''esrap-peg'';
-  version = ''20191007-git'';
+  baseName = "esrap-peg";
+  version = "20191007-git";
 
-  description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions'';
+  description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
 
   deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz'';
-    sha256 = ''0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis'';
+    url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz";
+    sha256 = "0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis";
   };
 
   packageName = "esrap-peg";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 946c71a2f5b8..7eca78ca53e9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''esrap'';
-  version = ''20200325-git'';
+  baseName = "esrap";
+  version = "20200325-git";
 
   parasites = [ "esrap/tests" ];
 
-  description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
+  description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp.";
 
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz'';
-    sha256 = ''1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68'';
+    url = "http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz";
+    sha256 = "1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68";
   };
 
   packageName = "esrap";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 4fd752342530..f0936fe5c4bf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''external-program'';
-  version = ''20190307-git'';
+  baseName = "external-program";
+  version = "20190307-git";
 
   parasites = [ "external-program-test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz'';
-    sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz'';
+    url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz";
+    sha256 = "1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz";
   };
 
   packageName = "external-program";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
index 67d75b89dbd2..8c088a149f7d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-csv'';
-  version = ''20171227-git'';
+  baseName = "fare-csv";
+  version = "20171227-git";
 
-  description = ''Robust CSV parser and printer'';
+  description = "Robust CSV parser and printer";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz'';
-    sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x'';
+    url = "http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz";
+    sha256 = "1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x";
   };
 
   packageName = "fare-csv";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
index a5cec39c15fd..929f0f820bd3 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-mop'';
-  version = ''20151218-git'';
+  baseName = "fare-mop";
+  version = "20151218-git";
 
-  description = ''Utilities using the MOP; notably make informative pretty-printing trivial'';
+  description = "Utilities using the MOP; notably make informative pretty-printing trivial";
 
   deps = [ args."closer-mop" args."fare-utils" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz'';
-    sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9'';
+    url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz";
+    sha256 = "0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9";
   };
 
   packageName = "fare-mop";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
index ff03567a1a6e..1b9be4dea1a4 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote-extras'';
-  version = ''fare-quasiquote-20200925-git'';
+  baseName = "fare-quasiquote-extras";
+  version = "fare-quasiquote-20200925-git";
 
-  description = ''fare-quasiquote plus extras'';
+  description = "fare-quasiquote plus extras";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote-extras";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
index 2f1ef3e5b127..2f1c97bbb6ba 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote-optima'';
-  version = ''fare-quasiquote-20200925-git'';
+  baseName = "fare-quasiquote-optima";
+  version = "fare-quasiquote-20200925-git";
 
-  description = ''fare-quasiquote extension for optima'';
+  description = "fare-quasiquote extension for optima";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote-optima";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
index 7d332085e205..47c7c3851bd2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote-readtable'';
-  version = ''fare-quasiquote-20200925-git'';
+  baseName = "fare-quasiquote-readtable";
+  version = "fare-quasiquote-20200925-git";
 
-  description = ''Using fare-quasiquote with named-readtable'';
+  description = "Using fare-quasiquote with named-readtable";
 
   deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote-readtable";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
index d5b282e289af..3560c48fee36 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote'';
-  version = ''20200925-git'';
+  baseName = "fare-quasiquote";
+  version = "20200925-git";
 
-  description = ''Portable, matchable implementation of quasiquote'';
+  description = "Portable, matchable implementation of quasiquote";
 
   deps = [ args."fare-utils" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
index d7af897eafb8..b4e77dad9129 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-utils'';
-  version = ''20170124-git'';
+  baseName = "fare-utils";
+  version = "20170124-git";
 
-  description = ''Basic functions and macros, interfaces, pure and stateful datastructures'';
+  description = "Basic functions and macros, interfaces, pure and stateful datastructures";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz'';
-    sha256 = ''0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq'';
+    url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz";
+    sha256 = "0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq";
   };
 
   packageName = "fare-utils";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index cea5d251d72a..345b94124d90 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fast-http'';
-  version = ''20191007-git'';
+  baseName = "fast-http";
+  version = "20191007-git";
 
-  description = ''A fast HTTP protocol parser in Common Lisp'';
+  description = "A fast HTTP protocol parser in Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz'';
-    sha256 = ''00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32'';
+    url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz";
+    sha256 = "00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32";
   };
 
   packageName = "fast-http";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 9d7999b750c1..22ccfd78de9c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fast-io'';
-  version = ''20200925-git'';
+  baseName = "fast-io";
+  version = "20200925-git";
 
-  description = ''Alternative I/O mechanism to a stream or vector'';
+  description = "Alternative I/O mechanism to a stream or vector";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz'';
-    sha256 = ''1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975'';
+    url = "http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz";
+    sha256 = "1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975";
   };
 
   packageName = "fast-io";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 68e5e00085cf..ab8118deac5c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fiasco'';
-  version = ''20200610-git'';
+  baseName = "fiasco";
+  version = "20200610-git";
 
   parasites = [ "fiasco-self-tests" ];
 
-  description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.'';
+  description = "A Common Lisp test framework that treasures your failures, logical continuation of Stefil.";
 
   deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz'';
-    sha256 = ''1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4'';
+    url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz";
+    sha256 = "1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4";
   };
 
   packageName = "fiasco";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
index 45af1934223e..d02f9de5b0b5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fiveam'';
-  version = ''20200925-git'';
+  baseName = "fiveam";
+  version = "20200925-git";
 
   parasites = [ "fiveam/test" ];
 
-  description = ''A simple regression testing framework'';
+  description = "A simple regression testing framework";
 
   deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz'';
-    sha256 = ''0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d'';
+    url = "http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz";
+    sha256 = "0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d";
   };
 
   packageName = "fiveam";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index a1828981c073..328c91cd2bd7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''flexi-streams'';
-  version = ''20200925-git'';
+  baseName = "flexi-streams";
+  version = "20200925-git";
 
   parasites = [ "flexi-streams-test" ];
 
-  description = ''Flexible bivalent streams for Common Lisp'';
+  description = "Flexible bivalent streams for Common Lisp";
 
   deps = [ args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz'';
-    sha256 = ''1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2'';
+    url = "http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz";
+    sha256 = "1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2";
   };
 
   packageName = "flexi-streams";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 90ce8b83dde6..56de0edc9c99 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''form-fiddle'';
-  version = ''20190710-git'';
+  baseName = "form-fiddle";
+  version = "20190710-git";
 
-  description = ''A collection of utilities to destructure lambda forms.'';
+  description = "A collection of utilities to destructure lambda forms.";
 
   deps = [ args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz'';
-    sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl'';
+    url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz";
+    sha256 = "12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl";
   };
 
   packageName = "form-fiddle";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
index 12e168e44f60..20f41296a8ea 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fset'';
-  version = ''20200925-git'';
+  baseName = "fset";
+  version = "20200925-git";
 
   parasites = [ "fset/test" ];
 
@@ -12,8 +12,8 @@ See: http://www.ergy.com/FSet.html
   deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz'';
-    sha256 = ''19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv'';
+    url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz";
+    sha256 = "19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv";
   };
 
   packageName = "fset";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
index ffc517973d5d..0a9d812d5fcd 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''gettext'';
-  version = ''20171130-git'';
+  baseName = "gettext";
+  version = "20171130-git";
 
-  description = ''An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.'';
+  description = "An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.";
 
   deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz'';
-    sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd'';
+    url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
+    sha256 = "0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd";
   };
 
   packageName = "gettext";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
index 42cdca06d905..a4d135188fe7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''global-vars'';
-  version = ''20141106-git'';
+  baseName = "global-vars";
+  version = "20141106-git";
 
-  description = ''Define efficient global variables.'';
+  description = "Define efficient global variables.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz'';
-    sha256 = ''0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j'';
+    url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz";
+    sha256 = "0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j";
   };
 
   packageName = "global-vars";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix
index 9f4672644fa0..646bcff47209 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''html-encode'';
-  version = ''1.2'';
+  baseName = "html-encode";
+  version = "1.2";
 
-  description = ''A library for encoding text in various web-savvy encodings.'';
+  description = "A library for encoding text in various web-savvy encodings.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz'';
-    sha256 = ''06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf'';
+    url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz";
+    sha256 = "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf";
   };
 
   packageName = "html-encode";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 4242d9590463..09ba474e5a62 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''http-body'';
-  version = ''20190813-git'';
+  baseName = "http-body";
+  version = "20190813-git";
 
-  description = ''HTTP POST data parser for Common Lisp'';
+  description = "HTTP POST data parser for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz'';
-    sha256 = ''1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8'';
+    url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz";
+    sha256 = "1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8";
   };
 
   packageName = "http-body";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index 074e2ac96714..ed8b80752d24 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hu_dot_dwim_dot_asdf'';
-  version = ''20200925-darcs'';
+  baseName = "hu_dot_dwim_dot_asdf";
+  version = "20200925-darcs";
 
-  description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
+  description = "Various ASDF extensions such as attached test and documentation system, explicit development support, etc.";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz'';
-    sha256 = ''1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h'';
+    url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz";
+    sha256 = "1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h";
   };
 
   packageName = "hu.dwim.asdf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
index a554ef8d6800..13f4d11fb56e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hu_dot_dwim_dot_defclass-star'';
-  version = ''20150709-darcs'';
+  baseName = "hu_dot_dwim_dot_defclass-star";
+  version = "20150709-darcs";
 
-  description = ''Simplify class like definitions with defclass* and friends.'';
+  description = "Simplify class like definitions with defclass* and friends.";
 
   deps = [ args."hu_dot_dwim_dot_asdf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz'';
-    sha256 = ''032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs'';
+    url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz";
+    sha256 = "032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs";
   };
 
   packageName = "hu.dwim.defclass-star";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
index d49a382a3a3a..af6529582a46 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hu_dot_dwim_dot_stefil'';
-  version = ''20200218-darcs'';
+  baseName = "hu_dot_dwim_dot_stefil";
+  version = "20200218-darcs";
 
   parasites = [ "hu.dwim.stefil/test" ];
 
-  description = ''A Simple Test Framework In Lisp.'';
+  description = "A Simple Test Framework In Lisp.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz'';
-    sha256 = ''16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf'';
+    url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz";
+    sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf";
   };
 
   packageName = "hu.dwim.stefil";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index d874120e7d8d..883d75549008 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hunchentoot'';
-  version = ''v1.3.0'';
+  baseName = "hunchentoot";
+  version = "v1.3.0";
 
   parasites = [ "hunchentoot-test" ];
 
@@ -13,8 +13,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz'';
-    sha256 = ''08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8'';
+    url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz";
+    sha256 = "08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8";
   };
 
   packageName = "hunchentoot";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 1b948bcf325e..8c3ffe879c4d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''idna'';
-  version = ''20120107-git'';
+  baseName = "idna";
+  version = "20120107-git";
 
-  description = ''IDNA (international domain names) string encoding and decoding routines'';
+  description = "IDNA (international domain names) string encoding and decoding routines";
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
-    sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
+    url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz";
+    sha256 = "0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c";
   };
 
   packageName = "idna";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
index 4211dfbc9194..2544cd99dffc 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''ieee-floats'';
-  version = ''20170830-git'';
+  baseName = "ieee-floats";
+  version = "20170830-git";
 
   parasites = [ "ieee-floats-tests" ];
 
-  description = ''Convert floating point values to IEEE 754 binary representation'';
+  description = "Convert floating point values to IEEE 754 binary representation";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz'';
-    sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk'';
+    url = "http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz";
+    sha256 = "15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk";
   };
 
   packageName = "ieee-floats";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
index 2072945f2645..5aa30e92cdca 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''inferior-shell'';
-  version = ''20200925-git'';
+  baseName = "inferior-shell";
+  version = "20200925-git";
 
   parasites = [ "inferior-shell/test" ];
 
-  description = ''spawn local or remote processes and shell pipes'';
+  description = "spawn local or remote processes and shell pipes";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz'';
-    sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80'';
+    url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz";
+    sha256 = "1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80";
   };
 
   packageName = "inferior-shell";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
index 68024ad2a5a1..4590e55ffd6a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''introspect-environment'';
-  version = ''20200715-git'';
+  baseName = "introspect-environment";
+  version = "20200715-git";
 
-  description = ''Small interface to portable but nonstandard introspection of CL environments.'';
+  description = "Small interface to portable but nonstandard introspection of CL environments.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz'';
-    sha256 = ''1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns'';
+    url = "http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz";
+    sha256 = "1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns";
   };
 
   packageName = "introspect-environment";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index c4ae44cd6761..8d547d93b593 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib'';
-  version = ''v0.8.3'';
+  baseName = "iolib";
+  version = "v0.8.3";
 
   parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/trivial-sockets" "iolib/zstreams" ];
 
-  description = ''I/O library.'';
+  description = "I/O library.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
index 195b52c08c45..b4136a5dc86b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_asdf'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_asdf";
+  version = "iolib-v0.8.3";
 
-  description = ''A few ASDF component classes.'';
+  description = "A few ASDF component classes.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.asdf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
index aa650edde020..97763556c1ad 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_base'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_base";
+  version = "iolib-v0.8.3";
 
-  description = ''Base IOlib package, used instead of CL.'';
+  description = "Base IOlib package, used instead of CL.";
 
   deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.base";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
index c0ec72d48695..2482a76453b9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_common-lisp'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_common-lisp";
+  version = "iolib-v0.8.3";
 
-  description = ''Slightly modified Common Lisp.'';
+  description = "Slightly modified Common Lisp.";
 
   deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.common-lisp";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
index 4ba0cfa1ce2e..d9d055fab062 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_conf'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_conf";
+  version = "iolib-v0.8.3";
 
-  description = ''Compile-time configuration for IOLib.'';
+  description = "Compile-time configuration for IOLib.";
 
   deps = [ args."alexandria" args."iolib_dot_asdf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.conf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
index 7a1a12243fe2..5e7df7a5c76f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_grovel'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_grovel";
+  version = "iolib-v0.8.3";
 
-  description = ''The CFFI Groveller'';
+  description = "The CFFI Groveller";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.grovel";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 84298e818209..48e7595f3e06 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''ironclad'';
-  version = ''v0.51'';
+  baseName = "ironclad";
+  version = "v0.51";
 
   parasites = [ "ironclad/tests" ];
 
-  description = ''A cryptographic toolkit written in pure Common Lisp'';
+  description = "A cryptographic toolkit written in pure Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz'';
-    sha256 = ''0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn'';
+    url = "http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz";
+    sha256 = "0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn";
   };
 
   packageName = "ironclad";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index e3e1fa689a05..d82d371ca0cd 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iterate'';
-  version = ''20200610-git'';
+  baseName = "iterate";
+  version = "20200610-git";
 
   parasites = [ "iterate/tests" ];
 
-  description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility'';
+  description = "Jonathan Amsterdam's iterator/gatherer/accumulator facility";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz'';
-    sha256 = ''0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb'';
+    url = "http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz";
+    sha256 = "0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb";
   };
 
   packageName = "iterate";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index a29a02c5e618..547a909c0673 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''jonathan'';
-  version = ''20200925-git'';
+  baseName = "jonathan";
+  version = "20200925-git";
 
-  description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
+  description = "High performance JSON encoder and decoder. Currently support: SBCL, CCL.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz'';
-    sha256 = ''1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx'';
+    url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz";
+    sha256 = "1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx";
   };
 
   packageName = "jonathan";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index 49bc7d4cab5e..d785fbd2257b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''kmrcl'';
-  version = ''20201016-git'';
+  baseName = "kmrcl";
+  version = "20201016-git";
 
   parasites = [ "kmrcl/test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz'';
-    sha256 = ''0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf'';
+    url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz";
+    sha256 = "0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf";
   };
 
   packageName = "kmrcl";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 0260d37f0bb1..2af6575754a0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack-component'';
-  version = ''lack-20201016-git'';
+  baseName = "lack-component";
+  version = "lack-20201016-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack-component";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 610950054fad..edadaa07c148 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20201016-git'';
+  baseName = "lack-middleware-backtrace";
+  version = "lack-20201016-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack-middleware-backtrace";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 1af4ec3f4301..ad8bdc84b597 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack-util'';
-  version = ''lack-20201016-git'';
+  baseName = "lack-util";
+  version = "lack-20201016-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack-util";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index a85fab15c423..06f596509a6f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack'';
-  version = ''20201016-git'';
+  baseName = "lack";
+  version = "20201016-git";
 
-  description = ''A minimal Clack'';
+  description = "A minimal Clack";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 9d130c2b053e..791c7f0a2d2a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''let-plus'';
-  version = ''20191130-git'';
+  baseName = "let-plus";
+  version = "20191130-git";
 
   parasites = [ "let-plus/tests" ];
 
-  description = ''Destructuring extension of LET*.'';
+  description = "Destructuring extension of LET*.";
 
   deps = [ args."alexandria" args."anaphora" args."lift" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz'';
-    sha256 = ''0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p'';
+    url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz";
+    sha256 = "0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p";
   };
 
   packageName = "let-plus";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9dd6baad1bdc..e4bbb44a4682 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lev'';
-  version = ''20150505-git'';
+  baseName = "lev";
+  version = "20150505-git";
 
-  description = ''libev bindings for Common Lisp'';
+  description = "libev bindings for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
-    sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
+    url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz";
+    sha256 = "0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl";
   };
 
   packageName = "lev";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
index 10977c16f838..448f41e5b51b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-client'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-client";
+  version = "lfarm-20150608-git";
 
-  description = ''Client component of lfarm, a library for distributing work across machines.'';
+  description = "Client component of lfarm, a library for distributing work across machines.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-client";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
index 4a5fe87982ae..fc92bbe89b43 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-common'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-common";
+  version = "lfarm-20150608-git";
 
   description = ''(private) Common components of lfarm, a library for distributing
 work across machines.'';
@@ -9,8 +9,8 @@ work across machines.'';
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-common";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
index 354d6c315076..5cc5cc1e9da2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-server'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-server";
+  version = "lfarm-20150608-git";
 
-  description = ''Server component of lfarm, a library for distributing work across machines.'';
+  description = "Server component of lfarm, a library for distributing work across machines.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-server";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
index 348c71fe9663..0ba638611c15 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-ssl'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-ssl";
+  version = "lfarm-20150608-git";
 
-  description = ''SSL support for lfarm'';
+  description = "SSL support for lfarm";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-ssl";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index 1edb65596a6c..c0e4f0caee35 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lift'';
-  version = ''20190521-git'';
+  baseName = "lift";
+  version = "20190521-git";
 
-  description = ''LIsp Framework for Testing'';
+  description = "LIsp Framework for Testing";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz'';
-    sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9'';
+    url = "http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz";
+    sha256 = "0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9";
   };
 
   packageName = "lift";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index 7f88beb974b0..80b0431799b1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lisp-namespace'';
-  version = ''20171130-git'';
+  baseName = "lisp-namespace";
+  version = "20171130-git";
 
-  description = ''Provides LISP-N --- extensible namespaces in Common Lisp.'';
+  description = "Provides LISP-N --- extensible namespaces in Common Lisp.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz'';
-    sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j'';
+    url = "http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz";
+    sha256 = "0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j";
   };
 
   packageName = "lisp-namespace";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 8d21f88cbf82..12d82701e086 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lisp-unit2'';
-  version = ''20180131-git'';
+  baseName = "lisp-unit2";
+  version = "20180131-git";
 
   parasites = [ "lisp-unit2-test" ];
 
-  description = ''Common Lisp library that supports unit testing.'';
+  description = "Common Lisp library that supports unit testing.";
 
   deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz'';
-    sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7'';
+    url = "http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz";
+    sha256 = "04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7";
   };
 
   packageName = "lisp-unit2";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index c7d2f061f4bd..9bf7ea7fa14a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''local-time'';
-  version = ''20200925-git'';
+  baseName = "local-time";
+  version = "20200925-git";
 
   parasites = [ "local-time/test" ];
 
-  description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
+  description = "A library for manipulating dates and times, based on a paper by Erik Naggum";
 
   deps = [ args."stefil" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz'';
-    sha256 = ''0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f'';
+    url = "http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz";
+    sha256 = "0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f";
   };
 
   packageName = "local-time";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
index 222178b1556d..e4b4795fe0b9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''log4cl'';
-  version = ''20200925-git'';
+  baseName = "log4cl";
+  version = "20200925-git";
 
   parasites = [ "log4cl/syslog" "log4cl/test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz'';
-    sha256 = ''1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf'';
+    url = "http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz";
+    sha256 = "1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf";
   };
 
   packageName = "log4cl";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index 1a6f217a2f96..73b42c3fc9af 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lparallel'';
-  version = ''20160825-git'';
+  baseName = "lparallel";
+  version = "20160825-git";
 
-  description = ''Parallelism for Common Lisp'';
+  description = "Parallelism for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz'';
-    sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1'';
+    url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
+    sha256 = "0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1";
   };
 
   packageName = "lparallel";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index cf27f8ceaa38..e287b7519a63 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lquery'';
-  version = ''20200715-git'';
+  baseName = "lquery";
+  version = "20200715-git";
 
-  description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
+  description = "A library to allow jQuery-like HTML/DOM manipulation.";
 
   deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz'';
-    sha256 = ''1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd'';
+    url = "http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz";
+    sha256 = "1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd";
   };
 
   packageName = "lquery";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index 8187c99f94a4..fd6213f30768 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''map-set'';
-  version = ''20190307-hg'';
+  baseName = "map-set";
+  version = "20190307-hg";
 
-  description = ''Set-like data structure.'';
+  description = "Set-like data structure.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz'';
-    sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9'';
+    url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz";
+    sha256 = "1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9";
   };
 
   packageName = "map-set";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 414dee98b711..94b8e64bfb47 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''marshal'';
-  version = ''cl-20201016-git'';
+  baseName = "marshal";
+  version = "cl-20201016-git";
 
-  description = ''marshal: Simple (de)serialization of Lisp datastructures.'';
+  description = "marshal: Simple (de)serialization of Lisp datastructures.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz'';
-    sha256 = ''03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz'';
+    url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz";
+    sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz";
   };
 
   packageName = "marshal";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 953dd0a58a4a..845c235d49d4 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''md5'';
-  version = ''20180228-git'';
+  baseName = "md5";
+  version = "20180228-git";
 
-  description = ''The MD5 Message-Digest Algorithm RFC 1321'';
+  description = "The MD5 Message-Digest Algorithm RFC 1321";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz'';
-    sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4'';
+    url = "http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz";
+    sha256 = "1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4";
   };
 
   packageName = "md5";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 6e0339bf9f97..993f36392033 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''metabang-bind'';
-  version = ''20200218-git'';
+  baseName = "metabang-bind";
+  version = "20200218-git";
 
-  description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.'';
+  description = "Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz'';
-    sha256 = ''0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq'';
+    url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz";
+    sha256 = "0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq";
   };
 
   packageName = "metabang-bind";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
index 1cac24088379..bf553ddf3700 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''metatilities-base'';
-  version = ''20191227-git'';
+  baseName = "metatilities-base";
+  version = "20191227-git";
 
-  description = ''These are metabang.com's Common Lisp basic utilities.'';
+  description = "These are metabang.com's Common Lisp basic utilities.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz'';
-    sha256 = ''1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil'';
+    url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz";
+    sha256 = "1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil";
   };
 
   packageName = "metatilities-base";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
index 0271bf98cf7d..33cc8bc90bfa 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''mgl-pax'';
-  version = ''20201016-git'';
+  baseName = "mgl-pax";
+  version = "20201016-git";
 
   parasites = [ "mgl-pax/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz'';
-    sha256 = ''0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li'';
+    url = "http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz";
+    sha256 = "0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li";
   };
 
   packageName = "mgl-pax";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 16609db5c22c..163f85182e58 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''misc-extensions'';
-  version = ''20150608-git'';
+  baseName = "misc-extensions";
+  version = "20150608-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz'';
-    sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj'';
+    url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz";
+    sha256 = "0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj";
   };
 
   packageName = "misc-extensions";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
index dc63474679a9..3bd71c00d94f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''mk-string-metrics'';
-  version = ''20180131-git'';
+  baseName = "mk-string-metrics";
+  version = "20180131-git";
 
-  description = ''efficient implementations of various string metric algorithms'';
+  description = "efficient implementations of various string metric algorithms";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz'';
-    sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4'';
+    url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz";
+    sha256 = "10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4";
   };
 
   packageName = "mk-string-metrics";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
index 1f2dd20ee4be..458acc6e94e5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''moptilities'';
-  version = ''20170403-git'';
+  baseName = "moptilities";
+  version = "20170403-git";
 
-  description = ''Common Lisp MOP utilities'';
+  description = "Common Lisp MOP utilities";
 
   deps = [ args."closer-mop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz'';
-    sha256 = ''0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8'';
+    url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz";
+    sha256 = "0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8";
   };
 
   packageName = "moptilities";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
index 9a014c416037..40460f6d71c6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''more-conditions'';
-  version = ''20180831-git'';
+  baseName = "more-conditions";
+  version = "20180831-git";
 
   parasites = [ "more-conditions/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz'';
-    sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x'';
+    url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz";
+    sha256 = "0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x";
   };
 
   packageName = "more-conditions";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index a8cfc070bf99..a5628dddeca4 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''mt19937'';
-  version = ''1.1.1'';
+  baseName = "mt19937";
+  version = "1.1.1";
 
-  description = ''Portable MT19937 Mersenne Twister random number generator'';
+  description = "Portable MT19937 Mersenne Twister random number generator";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz'';
-    sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv'';
+    url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz";
+    sha256 = "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv";
   };
 
   packageName = "mt19937";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 415b508713c4..cb35cd2c4ef1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''myway'';
-  version = ''20200325-git'';
+  baseName = "myway";
+  version = "20200325-git";
 
-  description = ''Sinatra-compatible routing library.'';
+  description = "Sinatra-compatible routing library.";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz'';
-    sha256 = ''07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15'';
+    url = "http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz";
+    sha256 = "07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15";
   };
 
   packageName = "myway";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 3504443d4532..9479bf85d012 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''named-readtables'';
-  version = ''20200925-git'';
+  baseName = "named-readtables";
+  version = "20200925-git";
 
   parasites = [ "named-readtables/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz'';
-    sha256 = ''0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl'';
+    url = "http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz";
+    sha256 = "0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl";
   };
 
   packageName = "named-readtables";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
index a9c492795636..0bb4d755d628 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''net-telent-date'';
-  version = ''net-telent-date_0.42'';
+  baseName = "net-telent-date";
+  version = "net-telent-date_0.42";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz'';
-    sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1'';
+    url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz";
+    sha256 = "06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1";
   };
 
   packageName = "net-telent-date";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 4e7c84566a0a..039277bcc0ee 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''net_dot_didierverna_dot_asdf-flv'';
-  version = ''asdf-flv-version-2.1'';
+  baseName = "net_dot_didierverna_dot_asdf-flv";
+  version = "asdf-flv-version-2.1";
 
-  description = ''ASDF extension to provide support for file-local variables.'';
+  description = "ASDF extension to provide support for file-local variables.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz'';
-    sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc'';
+    url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz";
+    sha256 = "12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc";
   };
 
   packageName = "net.didierverna.asdf-flv";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index 75ea9b55220d..f6fbd1e1b63a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''nibbles'';
-  version = ''20200925-git'';
+  baseName = "nibbles";
+  version = "20200925-git";
 
   parasites = [ "nibbles/tests" ];
 
-  description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders'';
+  description = "A library for accessing octet-addressed blocks of data in big- and little-endian orders";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz'';
-    sha256 = ''14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4'';
+    url = "http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz";
+    sha256 = "14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4";
   };
 
   packageName = "nibbles";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 07b86f58fe7c..487fd2c50aa5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''optima'';
-  version = ''20150709-git'';
+  baseName = "optima";
+  version = "20150709-git";
 
-  description = ''Optimized Pattern Matching Library'';
+  description = "Optimized Pattern Matching Library";
 
   deps = [ args."alexandria" args."closer-mop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
-    sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
+    url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
+    sha256 = "0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc";
   };
 
   packageName = "optima";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
index cb05bef0a1cc..bc7f59d5fb79 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''osicat'';
-  version = ''20200925-git'';
+  baseName = "osicat";
+  version = "20200925-git";
 
   parasites = [ "osicat/tests" ];
 
-  description = ''A lightweight operating system interface'';
+  description = "A lightweight operating system interface";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz'';
-    sha256 = ''191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk'';
+    url = "http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz";
+    sha256 = "191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk";
   };
 
   packageName = "osicat";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index bf6216dcaddc..952b9cbdf0d6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parenscript'';
-  version = ''Parenscript-2.7.1'';
+  baseName = "parenscript";
+  version = "Parenscript-2.7.1";
 
-  description = ''Lisp to JavaScript transpiler'';
+  description = "Lisp to JavaScript transpiler";
 
   deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz'';
-    sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f'';
+    url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz";
+    sha256 = "1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f";
   };
 
   packageName = "parenscript";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
index ea153987c0bb..3e59fcfa5f28 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parse-declarations-1_dot_0'';
-  version = ''parse-declarations-20101006-darcs'';
+  baseName = "parse-declarations-1_dot_0";
+  version = "parse-declarations-20101006-darcs";
 
-  description = ''Library to parse and rebuild declarations.'';
+  description = "Library to parse and rebuild declarations.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz'';
-    sha256 = ''0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd'';
+    url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz";
+    sha256 = "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd";
   };
 
   packageName = "parse-declarations-1.0";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index e636df0805e7..a4b9488a34ac 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parse-number'';
-  version = ''v1.7'';
+  baseName = "parse-number";
+  version = "v1.7";
 
   parasites = [ "parse-number/tests" ];
 
-  description = ''Number parsing library'';
+  description = "Number parsing library";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz'';
-    sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha'';
+    url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz";
+    sha256 = "11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha";
   };
 
   packageName = "parse-number";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
index 5105ec992351..391f04bd767b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parser-combinators'';
-  version = ''cl-20131111-git'';
+  baseName = "parser-combinators";
+  version = "cl-20131111-git";
 
-  description = ''An implementation of parser combinators for Common Lisp'';
+  description = "An implementation of parser combinators for Common Lisp";
 
   deps = [ args."alexandria" args."iterate" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz'';
-    sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds'';
+    url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
+    sha256 = "0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds";
   };
 
   packageName = "parser-combinators";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
index ee6532261c06..d438d4b157b6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parser_dot_common-rules'';
-  version = ''20200715-git'';
+  baseName = "parser_dot_common-rules";
+  version = "20200715-git";
 
   parasites = [ "parser.common-rules/test" ];
 
-  description = ''Provides common parsing rules that are useful in many grammars.'';
+  description = "Provides common parsing rules that are useful in many grammars.";
 
   deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz'';
-    sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy'';
+    url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz";
+    sha256 = "17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy";
   };
 
   packageName = "parser.common-rules";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index fe9ccae2886a..a60f3f377b5d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''pcall-queue'';
-  version = ''pcall-0.3'';
+  baseName = "pcall-queue";
+  version = "pcall-0.3";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
-    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+    url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
+    sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y";
   };
 
   packageName = "pcall-queue";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 99e9517e50e4..6b3ef96ca1cc 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''pcall'';
-  version = ''0.3'';
+  baseName = "pcall";
+  version = "0.3";
 
   parasites = [ "pcall-tests" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
-    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+    url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
+    sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y";
   };
 
   packageName = "pcall";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 5490b882c815..a82c9c54c637 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''plump'';
-  version = ''20200427-git'';
+  baseName = "plump";
+  version = "20200427-git";
 
-  description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
+  description = "An XML / XHTML / HTML parser that aims to be as lenient as possible.";
 
   deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz'';
-    sha256 = ''0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic'';
+    url = "http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz";
+    sha256 = "0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic";
   };
 
   packageName = "plump";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index 7dc27566bca4..32345ee367a9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''postmodern'';
-  version = ''20201016-git'';
+  baseName = "postmodern";
+  version = "20201016-git";
 
   parasites = [ "postmodern/tests" ];
 
-  description = ''PostgreSQL programming API'';
+  description = "PostgreSQL programming API";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "postmodern";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index d9146cede100..8cb24f674fde 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''proc-parse'';
-  version = ''20190813-git'';
+  baseName = "proc-parse";
+  version = "20190813-git";
 
-  description = ''Procedural vector parser'';
+  description = "Procedural vector parser";
 
   deps = [ args."alexandria" args."babel" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz'';
-    sha256 = ''126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j'';
+    url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz";
+    sha256 = "126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j";
   };
 
   packageName = "proc-parse";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
index 21babe8f0151..379fbbbe9ac0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''prove-asdf'';
-  version = ''prove-20200218-git'';
+  baseName = "prove-asdf";
+  version = "prove-20200218-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
-    sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
+    url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+    sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
   };
 
   packageName = "prove-asdf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index c3aa1dcaafed..9bb12d3e3c08 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''prove'';
-  version = ''20200218-git'';
+  baseName = "prove";
+  version = "20200218-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
-    sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
+    url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+    sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
   };
 
   packageName = "prove";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index ffa2e595c26a..fef37625dd0d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''ptester'';
-  version = ''20160929-git'';
+  baseName = "ptester";
+  version = "20160929-git";
 
-  description = ''Portable test harness package'';
+  description = "Portable test harness package";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz'';
-    sha256 = ''04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz'';
+    url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz";
+    sha256 = "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz";
   };
 
   packageName = "ptester";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index e45802c194d9..b349fccd6d37 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''puri'';
-  version = ''20201016-git'';
+  baseName = "puri";
+  version = "20201016-git";
 
   parasites = [ "puri/test" ];
 
-  description = ''Portable Universal Resource Indentifier Library'';
+  description = "Portable Universal Resource Indentifier Library";
 
   deps = [ args."ptester" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz'';
-    sha256 = ''16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx'';
+    url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz";
+    sha256 = "16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx";
   };
 
   packageName = "puri";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix
index ae810d347908..ff6cdb460e7a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''pythonic-string-reader'';
-  version = ''20180711-git'';
+  baseName = "pythonic-string-reader";
+  version = "20180711-git";
 
   description = ''A simple and unintrusive read table modification that allows for
 simple string literal definition that doesn't require escaping characters.'';
@@ -9,8 +9,8 @@ simple string literal definition that doesn't require escaping characters.'';
   deps = [ args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz'';
-    sha256 = ''0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx'';
+    url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz";
+    sha256 = "0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx";
   };
 
   packageName = "pythonic-string-reader";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 06957e45f818..1cac12f86000 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''query-fs'';
-  version = ''20200610-git'';
+  baseName = "query-fs";
+  version = "20200610-git";
 
-  description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
+  description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz'';
-    sha256 = ''1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413'';
+    url = "http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz";
+    sha256 = "1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413";
   };
 
   packageName = "query-fs";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 1972f6b8d4a1..a38d024ea88f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''quri'';
-  version = ''20200610-git'';
+  baseName = "quri";
+  version = "20200610-git";
 
-  description = ''Yet another URI library for Common Lisp'';
+  description = "Yet another URI library for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz'';
-    sha256 = ''1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6'';
+    url = "http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz";
+    sha256 = "1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6";
   };
 
   packageName = "quri";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 25d535176a6a..bc94b7fe3de7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''rfc2388'';
-  version = ''20180831-git'';
+  baseName = "rfc2388";
+  version = "20180831-git";
 
-  description = ''Implementation of RFC 2388'';
+  description = "Implementation of RFC 2388";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz'';
-    sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33'';
+    url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz";
+    sha256 = "1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33";
   };
 
   packageName = "rfc2388";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
index b3fc3b0cd2d1..91e94b2cc736 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''rove'';
-  version = ''20200325-git'';
+  baseName = "rove";
+  version = "20200325-git";
 
-  description = ''Yet another testing framework intended to be a successor of Prove'';
+  description = "Yet another testing framework intended to be a successor of Prove";
 
   deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz'';
-    sha256 = ''0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5'';
+    url = "http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz";
+    sha256 = "0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5";
   };
 
   packageName = "rove";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index d5be4be7daf4..7a53315daf66 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''rt'';
-  version = ''20101006-git'';
+  baseName = "rt";
+  version = "20101006-git";
 
-  description = ''MIT Regression Tester'';
+  description = "MIT Regression Tester";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz'';
-    sha256 = ''1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v'';
+    url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz";
+    sha256 = "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v";
   };
 
   packageName = "rt";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
index 1f896dc4158b..d4397b822171 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''s-sql'';
-  version = ''postmodern-20201016-git'';
+  baseName = "s-sql";
+  version = "postmodern-20201016-git";
 
   parasites = [ "s-sql/tests" ];
 
-  description = ''Lispy DSL for SQL'';
+  description = "Lispy DSL for SQL";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "s-sql";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
index b35f44067d3f..3d9e001dde4f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''s-sysdeps'';
-  version = ''20200427-git'';
+  baseName = "s-sysdeps";
+  version = "20200427-git";
 
-  description = ''An abstraction layer over platform dependent functionality'';
+  description = "An abstraction layer over platform dependent functionality";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz'';
-    sha256 = ''04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy'';
+    url = "http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz";
+    sha256 = "04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy";
   };
 
   packageName = "s-sysdeps";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
index ec12dde52231..08bd208a89fa 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''s-xml'';
-  version = ''20150608-git'';
+  baseName = "s-xml";
+  version = "20150608-git";
 
   parasites = [ "s-xml.examples" "s-xml.test" ];
 
-  description = ''Simple Common Lisp XML Parser'';
+  description = "Simple Common Lisp XML Parser";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz'';
-    sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq'';
+    url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
+    sha256 = "0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq";
   };
 
   packageName = "s-xml";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9056cfbdcca8..f5f294cfdbbc 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''salza2'';
-  version = ''2.0.9'';
+  baseName = "salza2";
+  version = "2.0.9";
 
   description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP
   data formats'';
@@ -9,8 +9,8 @@ rec {
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
-    sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
+    url = "http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz";
+    sha256 = "1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va";
   };
 
   packageName = "salza2";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
index 85d85463c3db..143a8fad1df2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''serapeum'';
-  version = ''20201016-git'';
+  baseName = "serapeum";
+  version = "20201016-git";
 
-  description = ''Utilities beyond Alexandria.'';
+  description = "Utilities beyond Alexandria.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz'';
-    sha256 = ''0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq'';
+    url = "http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz";
+    sha256 = "0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq";
   };
 
   packageName = "serapeum";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
index 1f2759cf388e..31f818a8e69d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''simple-date-time'';
-  version = ''20160421-git'';
+  baseName = "simple-date-time";
+  version = "20160421-git";
 
-  description = ''date and time library for common lisp'';
+  description = "date and time library for common lisp";
 
   deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz'';
-    sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h'';
+    url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz";
+    sha256 = "1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h";
   };
 
   packageName = "simple-date-time";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 55671ce13361..c4bae5608ae9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''simple-date'';
-  version = ''postmodern-20201016-git'';
+  baseName = "simple-date";
+  version = "postmodern-20201016-git";
 
   parasites = [ "simple-date/tests" ];
 
-  description = ''Simple date library that can be used with postmodern'';
+  description = "Simple date library that can be used with postmodern";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "simple-date";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix
index 55d35ba8c0f8..596e509608a0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''simple-tasks'';
-  version = ''20190710-git'';
+  baseName = "simple-tasks";
+  version = "20190710-git";
 
-  description = ''A very simple task scheduling framework.'';
+  description = "A very simple task scheduling framework.";
 
   deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz'';
-    sha256 = ''12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3'';
+    url = "http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz";
+    sha256 = "12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3";
   };
 
   packageName = "simple-tasks";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 63adab55741b..18d669225a3d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''smart-buffer'';
-  version = ''20160628-git'';
+  baseName = "smart-buffer";
+  version = "20160628-git";
 
-  description = ''Smart octets buffer'';
+  description = "Smart octets buffer";
 
   deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
-    sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
+    url = "http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz";
+    sha256 = "1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s";
   };
 
   packageName = "smart-buffer";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index a22076facd39..3971d410441b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''split-sequence'';
-  version = ''v2.0.0'';
+  baseName = "split-sequence";
+  version = "v2.0.0";
 
   parasites = [ "split-sequence/tests" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz'';
-    sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba'';
+    url = "http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz";
+    sha256 = "09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba";
   };
 
   packageName = "split-sequence";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index ac04ba80a0d5..145156be45de 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''sqlite'';
-  version = ''cl-20190813-git'';
+  baseName = "sqlite";
+  version = "cl-20190813-git";
 
-  description = ''CL-SQLITE package is an interface to the SQLite embedded relational database engine.'';
+  description = "CL-SQLITE package is an interface to the SQLite embedded relational database engine.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz'';
-    sha256 = ''07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk'';
+    url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz";
+    sha256 = "07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk";
   };
 
   packageName = "sqlite";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 7a84f077711a..cf1f1655a361 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''static-vectors'';
-  version = ''v1.8.6'';
+  baseName = "static-vectors";
+  version = "v1.8.6";
 
   parasites = [ "static-vectors/test" ];
 
-  description = ''Create vectors allocated in static memory.'';
+  description = "Create vectors allocated in static memory.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz'';
-    sha256 = ''0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc'';
+    url = "http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz";
+    sha256 = "0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc";
   };
 
   packageName = "static-vectors";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
index df63a5c9836a..a4a688e1243c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''stefil'';
-  version = ''20181210-git'';
+  baseName = "stefil";
+  version = "20181210-git";
 
   parasites = [ "stefil-test" ];
 
-  description = ''Stefil - Simple Test Framework In Lisp'';
+  description = "Stefil - Simple Test Framework In Lisp";
 
   deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz'';
-    sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g'';
+    url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz";
+    sha256 = "10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g";
   };
 
   packageName = "stefil";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
index 1109c9da04c5..5fff3b8c5687 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''str'';
-  version = ''cl-20200925-git'';
+  baseName = "str";
+  version = "cl-20200925-git";
 
-  description = ''Modern, consistent and terse Common Lisp string manipulation library.'';
+  description = "Modern, consistent and terse Common Lisp string manipulation library.";
 
   deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz'';
-    sha256 = ''06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn'';
+    url = "http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz";
+    sha256 = "06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn";
   };
 
   packageName = "str";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 17a56c09b7e8..616d3aa88b69 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''string-case'';
-  version = ''20180711-git'';
+  baseName = "string-case";
+  version = "20180711-git";
 
-  description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality'';
+  description = "string-case is a macro that generates specialised decision trees to dispatch on string equality";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz'';
-    sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z'';
+    url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz";
+    sha256 = "1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z";
   };
 
   packageName = "string-case";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 2ad15d1bd130..fe13a7d8c175 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''stumpwm'';
-  version = ''20201016-git'';
+  baseName = "stumpwm";
+  version = "20201016-git";
 
-  description = ''A tiling, keyboard driven window manager'';
+  description = "A tiling, keyboard driven window manager";
 
   deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz'';
-    sha256 = ''06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2'';
+    url = "http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz";
+    sha256 = "06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2";
   };
 
   packageName = "stumpwm";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 69deb9044c38..e2f1ba6bd26b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''swank'';
-  version = ''slime-v2.26'';
+  baseName = "swank";
+  version = "slime-v2.26";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz'';
-    sha256 = ''0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc'';
+    url = "http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz";
+    sha256 = "0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc";
   };
 
   packageName = "swank";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index de11d48c9341..7c19a2713547 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''swap-bytes'';
-  version = ''v1.2'';
+  baseName = "swap-bytes";
+  version = "v1.2";
 
   parasites = [ "swap-bytes/test" ];
 
-  description = ''Optimized byte-swapping primitives.'';
+  description = "Optimized byte-swapping primitives.";
 
   deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz'';
-    sha256 = ''05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8'';
+    url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz";
+    sha256 = "05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8";
   };
 
   packageName = "swap-bytes";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
index 4bae3cc1ceed..30a4a0bcbb05 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''symbol-munger'';
-  version = ''20150407-git'';
+  baseName = "symbol-munger";
+  version = "20150407-git";
 
   description = ''Functions to convert between the spacing and
   capitalization conventions of various environments'';
@@ -9,8 +9,8 @@ rec {
   deps = [ args."alexandria" args."iterate" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz'';
-    sha256 = ''0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6'';
+    url = "http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz";
+    sha256 = "0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6";
   };
 
   packageName = "symbol-munger";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
index 141937219cdb..bd318dcad1f8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia'';
-  version = ''20200925-git'';
+  baseName = "trivia";
+  version = "20200925-git";
 
-  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+  description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
index 6b5e161a2144..3f66d67eac39 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_balland2006'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_balland2006";
+  version = "trivia-20200925-git";
 
-  description = ''Optimizer for Trivia based on (Balland 2006)'';
+  description = "Optimizer for Trivia based on (Balland 2006)";
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.balland2006";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
index 1c883c07ab03..d6885e3f500d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_level0'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_level0";
+  version = "trivia-20200925-git";
 
-  description = ''Bootstrapping Pattern Matching Library for implementing Trivia'';
+  description = "Bootstrapping Pattern Matching Library for implementing Trivia";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.level0";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
index 1e9394d64472..d208c06e8b2f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_level1'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_level1";
+  version = "trivia-20200925-git";
 
-  description = ''Core patterns of Trivia'';
+  description = "Core patterns of Trivia";
 
   deps = [ args."alexandria" args."trivia_dot_level0" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.level1";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
index 75ee2bd8ee7c..c6ce58bceb7d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_level2'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_level2";
+  version = "trivia-20200925-git";
 
-  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+  description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
 
   deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.level2";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
index 07ad7a56c2e9..1dd177652577 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_quasiquote'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_quasiquote";
+  version = "trivia-20200925-git";
 
-  description = ''fare-quasiquote extension for trivia'';
+  description = "fare-quasiquote extension for trivia";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.quasiquote";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
index e2b8add6dfc7..ef84229d7a07 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_trivial'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_trivial";
+  version = "trivia-20200925-git";
 
   description = ''Base level system of Trivia with a trivial optimizer.
  Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.trivial";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 2d2bc4110dca..f095ecc223b8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-backtrace'';
-  version = ''20200610-git'';
+  baseName = "trivial-backtrace";
+  version = "20200610-git";
 
-  description = ''trivial-backtrace'';
+  description = "trivial-backtrace";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz'';
-    sha256 = ''0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks'';
+    url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz";
+    sha256 = "0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks";
   };
 
   packageName = "trivial-backtrace";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
index 3e21ceab87d0..c72e79dac511 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-clipboard'';
-  version = ''20200925-git'';
+  baseName = "trivial-clipboard";
+  version = "20200925-git";
 
-  description = ''trivial-clipboard let access system clipboard.'';
+  description = "trivial-clipboard let access system clipboard.";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz'';
-    sha256 = ''1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc'';
+    url = "http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz";
+    sha256 = "1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc";
   };
 
   packageName = "trivial-clipboard";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
index 278ad5b0ac42..a73c24e9f5e0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-cltl2'';
-  version = ''20200325-git'';
+  baseName = "trivial-cltl2";
+  version = "20200325-git";
 
-  description = ''Compatibility package exporting CLtL2 functionality'';
+  description = "Compatibility package exporting CLtL2 functionality";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz'';
-    sha256 = ''0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys'';
+    url = "http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz";
+    sha256 = "0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys";
   };
 
   packageName = "trivial-cltl2";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 53669a4675bd..5988055841c2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-features'';
-  version = ''20200715-git'';
+  baseName = "trivial-features";
+  version = "20200715-git";
 
-  description = ''Ensures consistent *FEATURES* across multiple CLs.'';
+  description = "Ensures consistent *FEATURES* across multiple CLs.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz'';
-    sha256 = ''0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2'';
+    url = "http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz";
+    sha256 = "0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2";
   };
 
   packageName = "trivial-features";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
index 892e1d49d504..a06eda6ff186 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-file-size'';
-  version = ''20200427-git'';
+  baseName = "trivial-file-size";
+  version = "20200427-git";
 
   parasites = [ "trivial-file-size/tests" ];
 
-  description = ''Stat a file's size.'';
+  description = "Stat a file's size.";
 
   deps = [ args."fiveam" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz'';
-    sha256 = ''1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa'';
+    url = "http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz";
+    sha256 = "1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa";
   };
 
   packageName = "trivial-file-size";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index ce1f75522aa3..7804dc8b9ab6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-garbage'';
-  version = ''20200925-git'';
+  baseName = "trivial-garbage";
+  version = "20200925-git";
 
   parasites = [ "trivial-garbage/tests" ];
 
-  description = ''Portable finalizers, weak hash-tables and weak pointers.'';
+  description = "Portable finalizers, weak hash-tables and weak pointers.";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz'';
-    sha256 = ''00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83'';
+    url = "http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz";
+    sha256 = "00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83";
   };
 
   packageName = "trivial-garbage";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index acefb692184b..2b763b0480d8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-gray-streams'';
-  version = ''20200925-git'';
+  baseName = "trivial-gray-streams";
+  version = "20200925-git";
 
-  description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
+  description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz'';
-    sha256 = ''1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b'';
+    url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz";
+    sha256 = "1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b";
   };
 
   packageName = "trivial-gray-streams";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index de16d810824a..42e09023af3f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-indent'';
-  version = ''20191007-git'';
+  baseName = "trivial-indent";
+  version = "20191007-git";
 
-  description = ''A very simple library to allow indentation hints for SWANK.'';
+  description = "A very simple library to allow indentation hints for SWANK.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz'';
-    sha256 = ''0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv'';
+    url = "http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz";
+    sha256 = "0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv";
   };
 
   packageName = "trivial-indent";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
index 473a41063e70..b41649492035 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-macroexpand-all'';
-  version = ''20171023-git'';
+  baseName = "trivial-macroexpand-all";
+  version = "20171023-git";
 
-  description = ''Call each implementation's macroexpand-all equivalent'';
+  description = "Call each implementation's macroexpand-all equivalent";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz'';
-    sha256 = ''0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm'';
+    url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz";
+    sha256 = "0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm";
   };
 
   packageName = "trivial-macroexpand-all";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix
index dc0de9da624c..de53bf5bd05e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-main-thread'';
-  version = ''20190710-git'';
+  baseName = "trivial-main-thread";
+  version = "20190710-git";
 
-  description = ''Compatibility library to run things in the main thread.'';
+  description = "Compatibility library to run things in the main thread.";
 
   deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" args."simple-tasks" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz'';
-    sha256 = ''1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h'';
+    url = "http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz";
+    sha256 = "1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h";
   };
 
   packageName = "trivial-main-thread";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 2e2888444e5c..36c6e31cc8dd 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-mimes'';
-  version = ''20200715-git'';
+  baseName = "trivial-mimes";
+  version = "20200715-git";
 
-  description = ''Tiny library to detect mime types in files.'';
+  description = "Tiny library to detect mime types in files.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz'';
-    sha256 = ''10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1'';
+    url = "http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz";
+    sha256 = "10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1";
   };
 
   packageName = "trivial-mimes";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix
index 9cd37f807230..78dcc5163b4b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-package-local-nicknames'';
-  version = ''20200610-git'';
+  baseName = "trivial-package-local-nicknames";
+  version = "20200610-git";
 
-  description = ''Portability library for package-local nicknames'';
+  description = "Portability library for package-local nicknames";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz'';
-    sha256 = ''1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5'';
+    url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz";
+    sha256 = "1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5";
   };
 
   packageName = "trivial-package-local-nicknames";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 8cc04c2c64ac..83785140dbdf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-types'';
-  version = ''20120407-git'';
+  baseName = "trivial-types";
+  version = "20120407-git";
 
-  description = ''Trivial type definitions'';
+  description = "Trivial type definitions";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
-    sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
+    url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz";
+    sha256 = "0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx";
   };
 
   packageName = "trivial-types";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index e01eac48a2d4..c38ca16d2ffe 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-utf-8'';
-  version = ''20200925-git'';
+  baseName = "trivial-utf-8";
+  version = "20200925-git";
 
   parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ];
 
-  description = ''A small library for doing UTF-8-based input and output.'';
+  description = "A small library for doing UTF-8-based input and output.";
 
   deps = [ args."mgl-pax" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz'';
-    sha256 = ''06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b'';
+    url = "http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz";
+    sha256 = "06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b";
   };
 
   packageName = "trivial-utf-8";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
index e76be59540b6..bc08f1683de3 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''type-i'';
-  version = ''20191227-git'';
+  baseName = "type-i";
+  version = "20191227-git";
 
-  description = ''Type Inference Utility on Fundamentally 1-arg Predicates'';
+  description = "Type Inference Utility on Fundamentally 1-arg Predicates";
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz'';
-    sha256 = ''0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5'';
+    url = "http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz";
+    sha256 = "0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5";
   };
 
   packageName = "type-i";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
index a2980a9d40ee..35754246347c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uax-15'';
-  version = ''20200325-git'';
+  baseName = "uax-15";
+  version = "20200325-git";
 
   parasites = [ "uax-15/tests" ];
 
-  description = ''Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)'';
+  description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)";
 
   deps = [ args."cl-ppcre" args."fiveam" args."split-sequence" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz'';
-    sha256 = ''0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc'';
+    url = "http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz";
+    sha256 = "0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc";
   };
 
   packageName = "uax-15";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 1986f7c88f7a..2c36113658af 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uffi'';
-  version = ''20180228-git'';
+  baseName = "uffi";
+  version = "20180228-git";
 
-  description = ''Universal Foreign Function Library for Common Lisp'';
+  description = "Universal Foreign Function Library for Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz'';
-    sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479'';
+    url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz";
+    sha256 = "1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479";
   };
 
   packageName = "uffi";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index ab96b0322572..b5a77d6ea345 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uiop'';
-  version = ''3.3.4'';
+  baseName = "uiop";
+  version = "3.3.4";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz'';
-    sha256 = ''0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav'';
+    url = "http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz";
+    sha256 = "0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav";
   };
 
   packageName = "uiop";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 6c4564967320..8f54a89416e6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''unit-test'';
-  version = ''20120520-git'';
+  baseName = "unit-test";
+  version = "20120520-git";
 
-  description = ''unit-testing framework for common lisp'';
+  description = "unit-testing framework for common lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz'';
-    sha256 = ''1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l'';
+    url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz";
+    sha256 = "1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l";
   };
 
   packageName = "unit-test";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
index 7243d5a17ed0..250ef24f9ad1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''unix-options'';
-  version = ''20151031-git'';
+  baseName = "unix-options";
+  version = "20151031-git";
 
-  description = ''Easy to use command line option parser'';
+  description = "Easy to use command line option parser";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz'';
-    sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5'';
+    url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz";
+    sha256 = "0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5";
   };
 
   packageName = "unix-options";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
index 8475b8e4ffdd..b7af624f7a58 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''unix-opts'';
-  version = ''20200925-git'';
+  baseName = "unix-opts";
+  version = "20200925-git";
 
   parasites = [ "unix-opts/tests" ];
 
-  description = ''minimalistic parser of command line arguments'';
+  description = "minimalistic parser of command line arguments";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz'';
-    sha256 = ''0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35'';
+    url = "http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz";
+    sha256 = "0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35";
   };
 
   packageName = "unix-opts";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix
index 04a09a8ab404..977ee934c90f 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''usocket-server'';
-  version = ''usocket-0.8.3'';
+  baseName = "usocket-server";
+  version = "usocket-0.8.3";
 
-  description = ''Universal socket library for Common Lisp (server side)'';
+  description = "Universal socket library for Common Lisp (server side)";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz'';
-    sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7'';
+    url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz";
+    sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7";
   };
 
   packageName = "usocket-server";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 6b75384ea10c..4dbf781f968a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''usocket'';
-  version = ''0.8.3'';
+  baseName = "usocket";
+  version = "0.8.3";
 
-  description = ''Universal socket library for Common Lisp'';
+  description = "Universal socket library for Common Lisp";
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz'';
-    sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7'';
+    url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz";
+    sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7";
   };
 
   packageName = "usocket";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
index b672d0c2ec58..5b992620ecd2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''utilities_dot_print-items'';
-  version = ''20190813-git'';
+  baseName = "utilities_dot_print-items";
+  version = "20190813-git";
 
   parasites = [ "utilities.print-items/test" ];
 
-  description = ''A protocol for flexible and composable printing.'';
+  description = "A protocol for flexible and composable printing.";
 
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz'';
-    sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2'';
+    url = "http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz";
+    sha256 = "12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2";
   };
 
   packageName = "utilities.print-items";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
index 80ff6d9ff768..2f2345fe0be5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''utilities_dot_print-tree'';
-  version = ''20200325-git'';
+  baseName = "utilities_dot_print-tree";
+  version = "20200325-git";
 
   parasites = [ "utilities.print-tree/test" ];
 
-  description = ''This system provides simple facilities for printing tree structures.'';
+  description = "This system provides simple facilities for printing tree structures.";
 
   deps = [ args."alexandria" args."fiveam" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz'';
-    sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww'';
+    url = "http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz";
+    sha256 = "1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww";
   };
 
   packageName = "utilities.print-tree";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
index 43ae799961db..a64d913d1d90 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uuid'';
-  version = ''20200715-git'';
+  baseName = "uuid";
+  version = "20200715-git";
 
-  description = ''UUID Generation'';
+  description = "UUID Generation";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz'';
-    sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0'';
+    url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz";
+    sha256 = "1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0";
   };
 
   packageName = "uuid";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 6a4751f799ea..401466e8a59c 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''vom'';
-  version = ''20160825-git'';
+  baseName = "vom";
+  version = "20160825-git";
 
-  description = ''A tiny logging utility.'';
+  description = "A tiny logging utility.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
-    sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
+    url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz";
+    sha256 = "0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93";
   };
 
   packageName = "vom";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 78c2e30d7ee3..e4ddb59c3986 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''woo'';
-  version = ''20200427-git'';
+  baseName = "woo";
+  version = "20200427-git";
 
-  description = ''An asynchronous HTTP server written in Common Lisp'';
+  description = "An asynchronous HTTP server written in Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz'';
-    sha256 = ''1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29'';
+    url = "http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz";
+    sha256 = "1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29";
   };
 
   packageName = "woo";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 257ed57df4e4..b28c751fdd4d 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''wookie'';
-  version = ''20191130-git'';
+  baseName = "wookie";
+  version = "20191130-git";
 
-  description = ''An evented webserver for Common Lisp.'';
+  description = "An evented webserver for Common Lisp.";
 
   deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz'';
-    sha256 = ''13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2'';
+    url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz";
+    sha256 = "13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2";
   };
 
   packageName = "wookie";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 5a1b9039425f..5130b81c91ab 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xembed'';
-  version = ''clx-20191130-git'';
+  baseName = "xembed";
+  version = "clx-20191130-git";
 
-  description = ''An implementation of the XEMBED protocol that integrates with CLX.'';
+  description = "An implementation of the XEMBED protocol that integrates with CLX.";
 
   deps = [ args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz'';
-    sha256 = ''1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd'';
+    url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz";
+    sha256 = "1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd";
   };
 
   packageName = "xembed";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
index 4bfc0678f0f1..f46bff1f58f0 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xkeyboard'';
-  version = ''clx-20120811-git'';
+  baseName = "xkeyboard";
+  version = "clx-20120811-git";
 
   parasites = [ "xkeyboard-test" ];
 
-  description = ''XKeyboard is X11 extension for clx of the same name.'';
+  description = "XKeyboard is X11 extension for clx of the same name.";
 
   deps = [ args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz'';
-    sha256 = ''11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n'';
+    url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz";
+    sha256 = "11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n";
   };
 
   packageName = "xkeyboard";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
index 35854cd6b96c..730b1287ba27 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xml_dot_location'';
-  version = ''20200325-git'';
+  baseName = "xml_dot_location";
+  version = "20200325-git";
 
   parasites = [ "xml.location/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz'';
-    sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx'';
+    url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz";
+    sha256 = "0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx";
   };
 
   packageName = "xml.location";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index c02e6e248186..e1da47fe37af 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xmls'';
-  version = ''3.0.2'';
+  baseName = "xmls";
+  version = "3.0.2";
 
   parasites = [ "xmls/test" "xmls/unit-test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz'';
-    sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi'';
+    url = "http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz";
+    sha256 = "1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi";
   };
 
   packageName = "xmls";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index 3e14a5ba9f06..1f062549a0a2 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xpath'';
-  version = ''plexippus-20190521-git'';
+  baseName = "xpath";
+  version = "plexippus-20190521-git";
 
   parasites = [ "xpath/test" ];
 
-  description = ''An implementation of the XML Path Language (XPath) Version 1.0'';
+  description = "An implementation of the XML Path Language (XPath) Version 1.0";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz'';
-    sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa'';
+    url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz";
+    sha256 = "15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa";
   };
 
   packageName = "xpath";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index b9ab71744c3a..7d0c52d28a72 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xsubseq'';
-  version = ''20170830-git'';
+  baseName = "xsubseq";
+  version = "20170830-git";
 
   description = ''Efficient way to manage "subseq"s in Common Lisp'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz'';
-    sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml'';
+    url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz";
+    sha256 = "1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml";
   };
 
   packageName = "xsubseq";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index c7031f4aa3fc..5ec84290c4dd 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''yacc'';
-  version = ''cl-20101006-darcs'';
+  baseName = "yacc";
+  version = "cl-20101006-darcs";
 
-  description = ''A LALR(1) parser generator for Common Lisp'';
+  description = "A LALR(1) parser generator for Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz'';
-    sha256 = ''0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7'';
+    url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz";
+    sha256 = "0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7";
   };
 
   packageName = "yacc";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 9f6ac0a84cad..727bb74e57b8 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''yason'';
-  version = ''v0.7.8'';
+  baseName = "yason";
+  version = "v0.7.8";
 
-  description = ''JSON parser/encoder'';
+  description = "JSON parser/encoder";
 
   deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz'';
-    sha256 = ''11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1'';
+    url = "http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz";
+    sha256 = "11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1";
   };
 
   packageName = "yason";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 74e5d7e97e95..bed825c24b26 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''zpb-ttf'';
-  version = ''1.0.3'';
+  baseName = "zpb-ttf";
+  version = "1.0.3";
 
-  description = ''Access TrueType font metrics and outlines from Common Lisp'';
+  description = "Access TrueType font metrics and outlines from Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
-    sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
+    url = "http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz";
+    sha256 = "1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6";
   };
 
   packageName = "zpb-ttf";
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 96d5867a3b30..412fd4b8dee5 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -81,7 +81,7 @@ in
       postInstall = ((x.overrides y).postInstall or "") + ''
         export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS
 $out/lib/common-lisp/query-fs"
-	export HOME=$PWD
+        export HOME=$PWD
         export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \
                     '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'"
         "$out/bin/query-fs-lisp-launcher.sh"
@@ -231,4 +231,14 @@ $out/lib/common-lisp/query-fs"
   cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3];
   cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3];
   cl-webkit2 = addNativeLibs [pkgs.webkitgtk];
+  clfswm = x: {
+    overrides = y: (x.overrides y) // {
+      postInstall = ''
+        export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system clfswm '(function clfswm:main)'"
+        "$out/bin/clfswm-lisp-launcher.sh"
+
+        cp "$out/lib/common-lisp/clfswm/clfswm" "$out/bin"
+      '';
+    };
+  };
 }
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 52d626888a3a..383510df777e 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -82,6 +82,7 @@ cl-utilities
 cl-vectors
 cl-webkit2
 cl-who
+clfswm
 clx
 collectors
 command-line-arguments
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 11244ec84a6d..cbaa13af9624 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -2848,6 +2848,13 @@ let quicklisp-to-nix-packages = rec {
            "fiasco" = quicklisp-to-nix-packages."fiasco";
        }));
 
+  "clfswm" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clfswm" or (x: {}))
+       (import ./quicklisp-to-nix-output/clfswm.nix {
+         inherit fetchurl;
+           "clx" = quicklisp-to-nix-packages."clx";
+       }));
 
   "cl-who" = buildLispPackage
     ((f: x: (x // (f x)))
diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
index 500766585632..8ec44d17016a 100644
--- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
+++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
@@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul
 
 These packages are manually refined in lua-overrides.nix
 */
-{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args:
+{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args:
 self: super:
 with self;
 {
@@ -21,7 +21,7 @@ alt-getopt = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cheusov/lua-alt-getopt";
     description = "Process application arguments the same way as getopt_long";
     maintainers = with maintainers; [ arobyn ];
@@ -39,7 +39,7 @@ ansicolors = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kikito/ansicolors.lua";
     description = "Library for color Manipulation.";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -56,7 +56,7 @@ argparse = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/luarocks/argparse";
     description = "A feature-rich command-line argument parser";
     license.fullName = "MIT";
@@ -79,7 +79,7 @@ basexx = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/aiq/basexx";
     description = "A base2, base16, base32, base64 and base85 library for Lua";
     license.fullName = "MIT";
@@ -96,7 +96,7 @@ binaryheap = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Tieske/binaryheap.lua";
     description = "Binary heap implementation in pure Lua";
     maintainers = with maintainers; [ vcunat ];
@@ -114,7 +114,7 @@ bit32 = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.lua.org/manual/5.2/manual.html#6.7";
     description = "Lua 5.2 bit manipulation library";
     maintainers = with maintainers; [ lblasc ];
@@ -138,7 +138,7 @@ busted = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://olivinelabs.com/busted/";
     description = "Elegant Lua unit testing.";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -154,7 +154,7 @@ cassowary = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lua penlight ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sile-typesetter/cassowary.lua";
     description = "The cassowary constraint solver";
     maintainers = with maintainers; [ marsam alerque ];
@@ -172,7 +172,7 @@ cjson = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php";
     description = "A fast JSON encoding/parsing module";
     license.fullName = "MIT";
@@ -189,7 +189,7 @@ compat53 = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/keplerproject/lua-compat-5.3";
     description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1";
     maintainers = with maintainers; [ vcunat ];
@@ -206,7 +206,7 @@ cosmo = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lpeg ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cosmo.luaforge.net";
     description = "Safe templates for Lua";
     maintainers = with maintainers; [ marsam ];
@@ -222,7 +222,7 @@ coxpcall = buildLuarocksPackage {
     sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://keplerproject.github.io/coxpcall";
     description = "Coroutine safe xpcall and pcall";
     license.fullName = "MIT/X11";
@@ -239,7 +239,7 @@ cqueues = buildLuarocksPackage {
   disabled = (lua.luaversion != "5.2");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://25thandclement.com/~william/projects/cqueues.html";
     description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix.";
     maintainers = with maintainers; [ vcunat ];
@@ -267,7 +267,7 @@ cyrussasl = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/JorjBauer/lua-cyrussasl";
     description = "Cyrus SASL library for Lua 5.1+";
     maintainers = with maintainers; [ vcunat ];
@@ -285,7 +285,7 @@ digestif = buildLuarocksPackage {
   disabled = (luaOlder "5.3");
   propagatedBuildInputs = [ lua lpeg dkjson ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/astoff/digestif/";
     description = "A code analyzer for TeX";
     license.fullName = "MIT";
@@ -302,7 +302,7 @@ dkjson = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://dkolf.de/src/dkjson-lua.fsl/";
     description = "David Kolf's JSON module for Lua";
     license.fullName = "MIT/X11";
@@ -318,7 +318,7 @@ fifo = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/daurnimator/fifo.lua";
     description = "A lua library/'class' that implements a FIFO";
     license.fullName = "MIT/X11";
@@ -335,7 +335,7 @@ http = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/daurnimator/lua-http";
     description = "HTTP library for Lua";
     maintainers = with maintainers; [ vcunat ];
@@ -353,7 +353,7 @@ inspect = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kikito/inspect.lua";
     description = "Lua table visualizer, ideal for debugging";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -380,7 +380,7 @@ ldbus = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/daurnimator/ldbus";
     description = "A Lua library to access dbus.";
     license.fullName = "MIT/X11";
@@ -402,7 +402,7 @@ ldoc = buildLuarocksPackage {
 
   propagatedBuildInputs = [ penlight markdown ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://stevedonovan.github.com/ldoc";
     description = "A Lua Documentation Tool";
     license.fullName = "MIT/X11";
@@ -419,7 +419,7 @@ lgi = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pavouk/lgi";
     description = "Lua bindings to GObject libraries";
     license.fullName = "MIT/X11";
@@ -442,7 +442,7 @@ linenoise = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/hoelzro/lua-linenoise";
     description = "A binding for the linenoise command line library";
     license.fullName = "MIT/X11";
@@ -459,7 +459,7 @@ ljsyscall = buildLuarocksPackage {
   disabled = (lua.luaversion != "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.myriabit.com/ljsyscall/";
     description = "LuaJIT Linux syscall FFI";
     maintainers = with maintainers; [ lblasc ];
@@ -477,7 +477,7 @@ lpeg = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html";
     description = "Parsing Expression Grammars For Lua";
     maintainers = with maintainers; [ vyp ];
@@ -494,7 +494,7 @@ lpeg_patterns = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lua lpeg ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
     description = "a collection of LPEG patterns";
     license.fullName = "MIT";
@@ -511,7 +511,7 @@ lpeglabel = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sqmedeiros/lpeglabel/";
     description = "Parsing Expression Grammars For Lua with Labeled Failures";
     license.fullName = "MIT/X11";
@@ -528,7 +528,7 @@ lpty = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tset.de/lpty/";
     description = "A simple facility for lua to control other programs via PTYs.";
     license.fullName = "MIT";
@@ -545,7 +545,7 @@ lrexlib-gnu = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (GNU flavour).";
     license.fullName = "MIT/X11";
@@ -562,7 +562,7 @@ lrexlib-pcre = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (PCRE flavour).";
     maintainers = with maintainers; [ vyp ];
@@ -580,7 +580,7 @@ lrexlib-posix = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (POSIX flavour).";
     license.fullName = "MIT/X11";
@@ -597,7 +597,7 @@ ltermbox = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://code.google.com/p/termbox";
     description = "A termbox library package";
     license.fullName = "New BSD License";
@@ -624,7 +624,7 @@ lua-cmsgpack = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/antirez/lua-cmsgpack";
     description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
     license.fullName = "Two-clause BSD";
@@ -641,7 +641,7 @@ lua-iconv = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://ittner.github.com/lua-iconv/";
     description = "Lua binding to the iconv";
     license.fullName = "MIT/X11";
@@ -668,7 +668,7 @@ lua-lsp = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua dkjson lpeglabel inspect ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Alloyed/lua-lsp";
     description = "No summary";
     license.fullName = "MIT";
@@ -685,7 +685,7 @@ lua-messagepack = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fperrad.frama.io/lua-MessagePack/";
     description = "a pure Lua implementation of the MessagePack serialization format";
     license.fullName = "MIT/X11";
@@ -702,7 +702,7 @@ lua-resty-http = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ledgetech/lua-resty-http";
     description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
     license.fullName = "2-clause BSD";
@@ -719,7 +719,7 @@ lua-resty-jwt = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cdbattags/lua-resty-jwt";
     description = "JWT for ngx_lua and LuaJIT.";
     license.fullName = "Apache License Version 2";
@@ -736,7 +736,7 @@ lua-resty-openidc = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zmartzone/lua-resty-openidc";
     description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
     license.fullName = "Apache 2.0";
@@ -753,7 +753,7 @@ lua-resty-session = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bungle/lua-resty-session";
     description = "Session Library for OpenResty – Flexible and Secure";
     license.fullName = "BSD";
@@ -774,7 +774,7 @@ lua-term = buildLuarocksPackage {
   };
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/hoelzro/lua-term";
     description = "Terminal functions for Lua";
     license.fullName = "MIT/X11";
@@ -791,7 +791,7 @@ lua-toml = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jonstoler/lua-toml";
     description = "toml decoder/encoder for Lua";
     license.fullName = "MIT";
@@ -808,7 +808,7 @@ lua-zlib = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/brimworks/lua-zlib";
     description = "Simple streaming interface to zlib for Lua.";
     maintainers = with maintainers; [ koral ];
@@ -826,7 +826,7 @@ lua_cliargs = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/amireh/lua_cliargs";
     description = "A command-line argument parser.";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -853,7 +853,7 @@ luabitop = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.3");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://bitop.luajit.org/";
     description = "Lua Bit Operations Module";
     license.fullName = "MIT/X license";
@@ -870,7 +870,7 @@ luacheck = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua argparse luafilesystem ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mpeterv/luacheck";
     description = "A static analyzer and a linter for Lua";
     license.fullName = "MIT";
@@ -887,7 +887,7 @@ luacov = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://keplerproject.github.io/luacov/";
     description = "Coverage analysis tool for Lua scripts";
     license.fullName = "MIT";
@@ -904,7 +904,7 @@ luadbi = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mwild1/luadbi";
     description = "Database abstraction layer";
     license.fullName = "MIT/X11";
@@ -921,7 +921,7 @@ luadbi-mysql = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua luadbi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mwild1/luadbi";
     description = "Database abstraction layer";
     license.fullName = "MIT/X11";
@@ -938,7 +938,7 @@ luadbi-postgresql = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua luadbi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mwild1/luadbi";
     description = "Database abstraction layer";
     license.fullName = "MIT/X11";
@@ -955,7 +955,7 @@ luadbi-sqlite3 = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua luadbi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mwild1/luadbi";
     description = "Database abstraction layer";
     license.fullName = "MIT/X11";
@@ -971,7 +971,7 @@ luadoc = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lualogging luafilesystem ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://luadoc.luaforge.net/";
     description = "LuaDoc is a documentation tool for Lua source code";
     license.fullName = "MIT/X11";
@@ -988,7 +988,7 @@ luaepnf = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua lpeg ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://siffiejoe.github.io/lua-luaepnf/";
     description = "Extended PEG Notation Format (easy grammars for LPeg)";
     license.fullName = "MIT";
@@ -1005,7 +1005,7 @@ luaevent = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/harningt/luaevent";
     description = "libevent binding for Lua";
     license.fullName = "MIT";
@@ -1022,7 +1022,7 @@ luaexpat = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.keplerproject.org/luaexpat/";
     description = "XML Expat parsing";
     maintainers = with maintainers; [ arobyn flosse ];
@@ -1040,7 +1040,7 @@ luaffi = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/facebook/luaffifb";
     description = "FFI library for calling C functions from lua";
     license.fullName = "BSD";
@@ -1057,7 +1057,7 @@ luafilesystem = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "git://github.com/keplerproject/luafilesystem";
     description = "File System Library for the Lua Programming Language";
     maintainers = with maintainers; [ flosse vcunat ];
@@ -1074,7 +1074,7 @@ lualogging = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ luasocket ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Neopallium/lualogging";
     description = "A simple API to use logging features";
     license.fullName = "MIT/X11";
@@ -1090,7 +1090,7 @@ luaossl = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://25thandclement.com/~william/projects/luaossl.html";
     description = "Most comprehensive OpenSSL module in the Lua universe.";
     maintainers = with maintainers; [ vcunat ];
@@ -1108,7 +1108,7 @@ luaposix = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ bit32 lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/luaposix/luaposix/";
     description = "Lua bindings for POSIX";
     maintainers = with maintainers; [ vyp lblasc ];
@@ -1132,7 +1132,7 @@ luarepl = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/hoelzro/lua-repl";
     description = "A reusable REPL component for Lua, written in Lua";
     license.fullName = "MIT/X11";
@@ -1149,7 +1149,7 @@ luasec = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua luasocket ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/brunoos/luasec/wiki";
     description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.";
     maintainers = with maintainers; [ flosse ];
@@ -1167,7 +1167,7 @@ luasocket = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://luaforge.net/projects/luasocket/";
     description = "Network support for the Lua language";
     license.fullName = "MIT";
@@ -1194,7 +1194,7 @@ luasql-sqlite3 = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.keplerproject.org/luasql/";
     description = "Database connectivity for Lua (SQLite3 driver)";
     maintainers = with maintainers; [ vyp ];
@@ -1218,7 +1218,7 @@ luassert = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua say ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://olivinelabs.com/busted/";
     description = "Lua Assertions Extension";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -1235,7 +1235,7 @@ luasystem = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://olivinelabs.com/luasystem/";
     description = "Platform independent system calls for Lua.";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -1252,7 +1252,7 @@ luautf8 = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/starwing/luautf8";
     description = "A UTF-8 support module for Lua";
     maintainers = with maintainers; [ pstn ];
@@ -1270,7 +1270,7 @@ luazip = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mpeterv/luazip";
     description = "Library for reading files inside zip files";
     license.fullName = "MIT";
@@ -1287,7 +1287,7 @@ lua-yajl = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/brimworks/lua-yajl";
     description = "Integrate the yajl JSON library with Lua.";
     maintainers = with maintainers; [ pstn ];
@@ -1305,7 +1305,7 @@ luuid = buildLuarocksPackage {
   disabled = (luaOlder "5.2") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid";
     description = "A library for UUID generation";
     license.fullName = "Public domain";
@@ -1322,7 +1322,7 @@ luv = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/luvit/luv";
     description = "Bare libuv bindings for lua";
     license.fullName = "Apache 2.0";
@@ -1339,7 +1339,7 @@ lyaml = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gvvaughan/lyaml";
     description = "libYAML binding for Lua";
     maintainers = with maintainers; [ lblasc ];
@@ -1357,7 +1357,7 @@ markdown = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mpeterv/markdown";
     description = "Markdown text-to-html markup system.";
     license.fullName = "MIT/X11";
@@ -1380,7 +1380,7 @@ mediator_lua = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://olivinelabs.com/mediator_lua/";
     description = "Event handling through channels";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -1401,7 +1401,7 @@ mpack = buildLuarocksPackage {
   };
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz";
     description = "Lua binding to libmpack";
     license.fullName = "MIT";
@@ -1418,7 +1418,7 @@ moonscript = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://moonscript.org";
     description = "A programmer friendly language that compiles to Lua";
     maintainers = with maintainers; [ arobyn ];
@@ -1436,7 +1436,7 @@ nvim-client = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua mpack luv coxpcall ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/neovim/lua-client";
     description = "Lua client to Nvim";
     license.fullName = "Apache";
@@ -1452,7 +1452,7 @@ penlight = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ luafilesystem ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://tieske.github.io/Penlight";
     description = "Lua utility libraries loosely based on the Python standard libraries";
     maintainers = with maintainers; [ alerque ];
@@ -1470,7 +1470,7 @@ rapidjson = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/xpol/lua-rapidjson";
     description = "Json module based on the very fast RapidJSON.";
     license.fullName = "MIT";
@@ -1487,7 +1487,7 @@ readline = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua luaposix ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.pjb.com.au/comp/lua/readline.html";
     description = "Interface to the readline library";
     license.fullName = "MIT/X11";
@@ -1510,7 +1510,7 @@ say = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://olivinelabs.com/busted/";
     description = "Lua String Hashing/Indexing Library";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -1527,7 +1527,7 @@ std__debug = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://lua-stdlib.github.io/_debug";
     description = "Debug Hints Library";
     license.fullName = "MIT/X11";
@@ -1544,7 +1544,7 @@ std_normalize = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
   propagatedBuildInputs = [ lua std__debug ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lua-stdlib.github.io/normalize";
     description = "Normalized Lua Functions";
     license.fullName = "MIT/X11";
@@ -1561,7 +1561,7 @@ stdlib = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://lua-stdlib.github.io/lua-stdlib";
     description = "General Lua Libraries";
     maintainers = with maintainers; [ vyp ];
@@ -1579,7 +1579,7 @@ vstruct = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.3");
   propagatedBuildInputs = [ lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ToxicFrog/vstruct";
     description = "Lua library to manipulate binary data";
   };
diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix
index 8e77c1902471..eec969f99caf 100644
--- a/nixpkgs/pkgs/development/lua-modules/overrides.nix
+++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix
@@ -108,7 +108,7 @@ with super;
 
   lgi = super.lgi.override({
     nativeBuildInputs = [
-      pkgs.pkgconfig
+      pkgs.pkg-config
     ];
     buildInputs = [
       pkgs.glib
diff --git a/nixpkgs/pkgs/development/misc/avr/libc/default.nix b/nixpkgs/pkgs/development/misc/avr/libc/default.nix
index 6682f72c62de..83054b46a94c 100644
--- a/nixpkgs/pkgs/development/misc/avr/libc/default.nix
+++ b/nixpkgs/pkgs/development/misc/avr/libc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf }:
+{ lib, stdenv, fetchurl, automake, autoconf }:
 
 let
   version = "2.0.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     incdir = "/avr/include";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "a C runtime library for AVR microcontrollers";
     homepage = "https://savannah.nongnu.org/projects/avr-libc/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix b/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
index 1a92f8fdd9da..0a9d666f8b7f 100644
--- a/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, runtimeShell }:
+{ lib, stdenv, fetchurl, unzip, runtimeShell }:
 
 stdenv.mkDerivation {
   name = "avr8-burn-omat-2.1.2";
@@ -24,10 +24,10 @@ stdenv.mkDerivation {
     chmod +x $out/bin/avr8-burn-omat
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GUI tool for avrdude";
     homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
     platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/misc/breakpad/default.nix b/nixpkgs/pkgs/development/misc/breakpad/default.nix
new file mode 100644
index 000000000000..7fb2b329667d
--- /dev/null
+++ b/nixpkgs/pkgs/development/misc/breakpad/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchgit }:
+let
+  lss = fetchgit {
+    url = "https://chromium.googlesource.com/linux-syscall-support";
+    rev = "d9ad2969b369a9f1c455fef92d04c7628f7f9eb8";
+    sha256 = "952dv+ZE1ge/WF5RyHmEqht+AofoRHKAeFmGasVF9BA=";
+  };
+in stdenv.mkDerivation {
+  pname = "breakpad";
+
+  version = "unstable-3b3469e";
+
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/breakpad/breakpad";
+    rev = "3b3469e9ed0de3d02e4450b9b95014a4266cf2ff";
+    sha256 = "bRGOBrGPK+Zxp+KK+E5MFkYlDUNVhVeInVSwq+eCAF0=";
+  };
+
+  postUnpack = ''
+    ln -s ${lss} $sourceRoot/src/third_party/lss
+  '';
+
+  meta = with lib; {
+    description = "An open-source multi-platform crash reporting system";
+    homepage = "https://chromium.googlesource.com/breakpad";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ berberman ];
+    platforms = platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/development/misc/google-clasp/default.nix b/nixpkgs/pkgs/development/misc/google-clasp/default.nix
index 1e138aaa8f7e..12598e9fd86c 100644
--- a/nixpkgs/pkgs/development/misc/google-clasp/default.nix
+++ b/nixpkgs/pkgs/development/misc/google-clasp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs }:
+{ lib, stdenv, pkgs }:
 let
   version = "2.2.1";
 in
@@ -12,8 +12,8 @@ in
   meta = {
     description = "Command Line tool for Google Apps Script Projects";
     homepage = "https://developers.google.com/apps-script/guides/clasp";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.michojel ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.michojel ];
     priority = 100;
   };
 }
diff --git a/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix b/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
index be260edb643a..b565c6d2f5d9 100644
--- a/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix
index c73c122e572a..a58f58e05c64 100644
--- a/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix
+++ b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix
@@ -2102,4 +2102,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/misc/h3/default.nix b/nixpkgs/pkgs/development/misc/h3/default.nix
index 8b8515261a1c..1d12e0f2b01f 100644
--- a/nixpkgs/pkgs/development/misc/h3/default.nix
+++ b/nixpkgs/pkgs/development/misc/h3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , cmake
 , fetchFromGitHub
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_LINTING=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/uber/h3";
     description = "Hexagonal hierarchical geospatial indexing system";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix
index 53c85a2e5ba1..55b070a9f773 100644
--- a/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix
+++ b/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
-, hpack, stdenv, template-haskell, text, th-lift-instances
+, hpack, lib, stdenv, template-haskell, text, th-lift-instances
 , unordered-containers
 }:
 mkDerivation {
@@ -18,5 +18,5 @@ mkDerivation {
   libraryToolDepends = [ hpack ];
   prePatch = "hpack";
   homepage = "https://github.com/hasura/ci-info-hs#readme";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }
diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
index 055459514e44..3cf840c15e15 100644
--- a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
+++ b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
@@ -13,7 +13,7 @@
 , optparse-applicative, pem, pg-client, postgresql-binary
 , postgresql-libpq, process, profunctors, psqueues, QuickCheck
 , regex-tdfa, safe, scientific, semver, shakespeare, split
-, Spock-core, stdenv, stm, stm-containers, template-haskell, text
+, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text
 , text-builder, text-conversions, th-lift-instances, these, time
 , transformers, transformers-base, unix, unordered-containers
 , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
@@ -68,8 +68,8 @@ mkDerivation {
   doCheck = false;
   homepage = "https://www.hasura.io";
   description = "GraphQL API over Postgres";
-  license = stdenv.lib.licenses.asl20;
-  maintainers = with stdenv.lib.maintainers; [ offline ];
+  license = lib.licenses.asl20;
+  maintainers = with lib.maintainers; [ offline ];
   hydraPlatforms = [];
   broken = true;
 }
diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
index 991b5384d5c2..82314a7485ba 100644
--- a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
+++ b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, attoparsec, base, bytestring, containers
 , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
-, protolude, regex-tdfa, scientific, stdenv, template-haskell, text
+, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text
 , text-builder, th-lift-instances, unordered-containers, vector
 }:
 mkDerivation {
@@ -32,5 +32,5 @@ mkDerivation {
   doCheck = false;
   prePatch = "hpack";
   homepage = "https://github.com/hasura/graphql-parser-hs#readme";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix
index 725e5e7f6408..aa780abd8e99 100644
--- a/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix
+++ b/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix
@@ -2,7 +2,7 @@
 , criterion, fetchgit, file-embed, hashable, hashtables, hasql
 , hasql-pool, hasql-transaction, monad-control, mtl
 , postgresql-binary, postgresql-libpq, resource-pool, retry
-, scientific, stdenv, template-haskell, text, text-builder, th-lift
+, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift
 , th-lift-instances, time, transformers-base, uuid, vector
 }:
 mkDerivation {
@@ -26,5 +26,5 @@ mkDerivation {
     hasql-transaction mtl postgresql-libpq text text-builder
   ];
   homepage = "https://github.com/hasura/platform";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/misc/loc/default.nix b/nixpkgs/pkgs/development/misc/loc/default.nix
index d8b65a7c1473..74b5ca09d2a2 100644
--- a/nixpkgs/pkgs/development/misc/loc/default.nix
+++ b/nixpkgs/pkgs/development/misc/loc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
@@ -15,11 +15,11 @@ buildRustPackage rec {
 
   cargoSha256 = "1fgv1kxiif48q9mm60ygn88r5nkxfyiacmvbgwp0jxiacv8r7779";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cgag/loc";
     description = "Count lines of code quickly";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix
index 471dd5b31229..122b3cec4b72 100644
--- a/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix
+++ b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoPatchelfHook
 , libusb-compat-0_1
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config
-  ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
+  nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config
+  ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
   buildInputs = [ libusb-compat-0_1 ]
-  ++ stdenv.lib.optional stdenv.isDarwin hidapi
-  ++ stdenv.lib.optional enableReadline readline;
+  ++ lib.optional stdenv.isDarwin hidapi
+  ++ lib.optional enableReadline readline;
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     # TODO: remove once a new 0.26+ release is made
     substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary}
 
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
   '';
 
   # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+
-  runtimeDependencies = stdenv.lib.optional enableMspds mspds;
-  postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) ''
+  runtimeDependencies = lib.optional enableMspds mspds;
+  postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) ''
     # autoPatchelfHook only works on linux so...
     for dep in $runtimeDependencies; do
       install_name_tool -add_rpath $dep/lib $out/bin/$pname
@@ -50,10 +50,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
   makeFlags = [ "UNAME_S=$(unameS)" ] ++
-    stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1";
-  unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin";
+    lib.optional (!enableReadline) "WITHOUT_READLINE=1";
+  unameS = lib.optionalString stdenv.isDarwin "Darwin";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";
     homepage = "https://dlbeer.co.nz/mspdebug/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/misc/rappel/default.nix b/nixpkgs/pkgs/development/misc/rappel/default.nix
index 761d2ea98ba0..67e202a005fc 100644
--- a/nixpkgs/pkgs/development/misc/rappel/default.nix
+++ b/nixpkgs/pkgs/development/misc/rappel/default.nix
@@ -2,7 +2,7 @@
 , libedit
 , makeWrapper
 , nasm
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/yrp604/rappel";
     description = "A pretty janky assembly REPL";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/misc/resholve/README.md b/nixpkgs/pkgs/development/misc/resholve/README.md
new file mode 100644
index 000000000000..6b99aebb5979
--- /dev/null
+++ b/nixpkgs/pkgs/development/misc/resholve/README.md
@@ -0,0 +1,158 @@
+# Using resholve's Nix API
+
+resholve converts bare executable references in shell scripts to absolute
+paths. This will hopefully make its way into the Nixpkgs manual soon, but
+until then I'll outline how to use the `resholvePackage` function.
+
+> Fair warning: resholve does *not* aspire to resolving all valid Shell
+> scripts. It depends on the OSH/Oil parser, which aims to support most (but
+> not all) Bash. resholve aims to be a ~90% sort of solution.
+
+## API Concepts
+
+The main difference between `resholvePackage` and other builder functions
+is the `solutions` attrset, which describes which scripts to resolve and how.
+Each "solution" (k=v pair) in this attrset describes one resholve invocation.
+
+> NOTE: For most shell packages, one invocation will probably be enough:
+> - Packages with a single script will only need one solution.
+> - Packages with multiple scripts can still use one solution if the scripts
+>   don't require conflicting directives.
+> - Packages with scripts that require conflicting directives can use multiple
+>   solutions to resolve the scripts separately, but produce a single package.
+
+## Basic Example
+
+Here's a simple example from one of my own projects, with annotations:
+<!--
+TODO: ideally this will use a nixpkgs example; but we don't have any IN yet
+and the first package PR (bashup-events) is too complex for this context.
+-->
+
+```nix
+{ stdenv, lib, resholvePackage, fetchFromGitHub, bashup-events44, bashInteractive_5, doCheck ? true, shellcheck }:
+
+resholvePackage rec {
+  pname = "shellswain";
+  version = "unreleased";
+
+  src = fetchFromGitHub {
+    # ...
+  };
+
+  solutions = {
+    # Give each solution a short name. This is what you'd use to
+    # override its settings, and it shows in (some) error messages.
+    profile = {
+      # the only *required* arguments are the 3 below
+
+      # Specify 1 or more $out-relative script paths. Unlike many
+      # builders, resholvePackage modifies the output files during
+      # fixup (to correctly resolve in-package sourcing).
+      scripts = [ "bin/shellswain.bash" ];
+
+      # "none" for no shebang, "${bash}/bin/bash" for bash, etc.
+      interpreter = "none";
+
+      # packages resholve should resolve executables from
+      inputs = [ bashup-events44 ];
+    };
+  };
+
+  makeFlags = [ "prefix=${placeholder "out"}" ];
+
+  inherit doCheck;
+  checkInputs = [ shellcheck ];
+
+  # ...
+}
+```
+
+## Options
+
+`resholvePackage` maps Nix types/idioms into the flags and environment variables
+that the `resholve` CLI expects. Here's an overview:
+
+| Option        | Type    | Containing                                            |
+| ------------- | ------- | ----------------------------------------------------- |
+| scripts       | list    | $out-relative string paths to resolve                 |
+| inputs        | list    | packages to resolve executables from                  |
+| interpreter   | string  | 'none' or abspath for shebang                         |
+| prologue      | file    | text to insert before the first code-line             |
+| epilogue      | file    | text to isnert after the last code-line               |
+| flags         | list    | strings to pass as flags                              |
+| fake          | attrset | [directives](#controlling-resolution-with-directives) |
+| fix           | attrset | [directives](#controlling-resolution-with-directives) |
+| keep          | attrset | [directives](#controlling-resolution-with-directives) |
+
+## Controlling resolution with directives
+
+In order to resolve a script, resholve will make you disambiguate how it should
+handle any potential problems it encounters with directives. There are currently
+3 types:
+1. `fake` directives tell resholve to pretend it knows about an identifier
+   such as a function, builtin, external command, etc. if there's a good reason
+   it doesn't already know about it. Common examples:
+   - builtins for a non-bash shell
+   - loadable builtins
+   - platform-specific external commands in cross-platform conditionals
+2. `fix` directives give resholve permission to fix something that it can't
+   safely fix automatically. Common examples:
+   - resolving commands in aliases (this is appropriate for standalone scripts
+     that use aliases non-interactively--but it would prevent profile/rc
+     scripts from using the latest current-system symlinks.)
+   - resolve commands in a variable definition
+   - resolve an absolute command path from inputs as if it were a bare reference
+3. `keep` directives tell resholve not to raise an error (i.e., ignore)
+   something it would usually object to. Common examples:
+   - variables used as/within the first word of a command
+   - pre-existing absolute or user-relative (~) command paths
+   - dynamic (variable) arguments to commands known to accept/run other commands
+
+> NOTE: resholve has a (growing) number of directives detailed in `man resholve`
+> via `nixpkgs.resholve`.
+
+Each of these 3 types is represented by its own attrset, where you can think
+of the key as a scope. The value should be:
+- `true` for any directives that the resholve CLI accepts as a single word
+- a list of strings for all other options
+<!--
+TODO: these should be fully-documented here, but I'm already maintaining
+more copies of their specification/behavior than I like, and continuing to
+add more at this early date will only ensure that I spend more time updating
+docs and less time filling in feature gaps.
+
+Full documentation may be greatly accellerated if someone can help me sort out
+single-sourcing. See: https://github.com/abathur/resholve/issues/19
+-->
+
+This will hopefully make more sense when you see it. Here are CLI examples
+from the manpage, and the Nix equivalents:
+
+```nix
+# --fake 'f:setUp;tearDown builtin:setopt source:/etc/bashrc'
+fake = {
+  # fake accepts the initial of valid identifier types as a CLI convienience.
+  # Use full names in the Nix API.
+  function = [ "setUp" "tearDown" ];
+  builtin = [ "setopt" ];
+  source = [ "/etc/bashrc" ];
+};
+
+# --fix 'aliases xargs:ls $GIT:gix'
+fix = {
+  # all single-word directives use `true` as value
+  aliases = true;
+  xargs = [ "ls" ];
+  "$GIT" = [ "gix" ];
+};
+
+# --keep 'which:git;ls .:$HOME $LS:exa /etc/bashrc ~/.bashrc'
+keep = {
+  which = [ "git" "ls" ];
+  "." = [ "$HOME" ];
+  "$LS" = [ "exa" ];
+  "/etc/bashrc" = true;
+  "~/.bashrc" = true;
+};
+```
diff --git a/nixpkgs/pkgs/development/misc/resholve/default.nix b/nixpkgs/pkgs/development/misc/resholve/default.nix
new file mode 100644
index 000000000000..7b5a79dd221a
--- /dev/null
+++ b/nixpkgs/pkgs/development/misc/resholve/default.nix
@@ -0,0 +1,9 @@
+{ callPackage
+, doCheck ? true
+}:
+
+rec {
+  resholve = callPackage ./resholve.nix { inherit doCheck; };
+  resholvePackage =
+    callPackage ./resholve-package.nix { inherit resholve; };
+}
diff --git a/nixpkgs/pkgs/development/misc/resholve/deps.nix b/nixpkgs/pkgs/development/misc/resholve/deps.nix
new file mode 100644
index 000000000000..86bcba570759
--- /dev/null
+++ b/nixpkgs/pkgs/development/misc/resholve/deps.nix
@@ -0,0 +1,120 @@
+{ lib, stdenv
+, python27Packages
+, fetchFromGitHub
+, makeWrapper
+, # re2c deps
+  autoreconfHook
+, # py-yajl deps
+  git
+, # oil deps
+  readline
+, cmark
+, file
+, glibcLocales
+, oilPatches ? [ ]
+}:
+
+/*
+Notes on specific dependencies:
+- if/when python2.7 is removed from nixpkgs, this may need to figure
+  out how to build oil's vendored python2
+- I'm not sure if glibcLocales is worth the addition here. It's to fix
+  a libc test oil runs. My oil fork just disabled the libc tests, but
+  I haven't quite decided if that's the right long-term call, so I
+  didn't add a patch for it here yet.
+*/
+
+rec {
+  # had to add this as well; 1.3 causes a break here; sticking
+  # to oil's official 1.0.3 dep for now.
+  re2c = stdenv.mkDerivation rec {
+    pname = "re2c";
+    version = "1.0.3";
+    sourceRoot = "${src.name}/re2c";
+    src = fetchFromGitHub {
+      owner = "skvadrik";
+      repo = "re2c";
+      rev = version;
+      sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi";
+    };
+    nativeBuildInputs = [ autoreconfHook ];
+    preCheck = ''
+      patchShebangs run_tests.sh
+    '';
+  };
+
+  py-yajl = python27Packages.buildPythonPackage rec {
+    pname = "oil-pyyajl-unstable";
+    version = "2019-12-05";
+    src = fetchFromGitHub {
+      owner = "oilshell";
+      repo = "py-yajl";
+      rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df";
+      sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh";
+      fetchSubmodules = true;
+    };
+    # just for submodule IIRC
+    nativeBuildInputs = [ git ];
+  };
+
+  # resholve's primary dependency is this developer build of the oil shell.
+  oildev = python27Packages.buildPythonPackage rec {
+    pname = "oildev-unstable";
+    version = "2020-03-31";
+
+    src = fetchFromGitHub {
+      owner = "oilshell";
+      repo = "oil";
+      rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a";
+      sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2";
+
+      /*
+      It's not critical to drop most of these; the primary target is
+      the vendored fork of Python-2.7.13, which is ~ 55M and over 3200
+      files, dozens of which get interpreter script patches in fixup.
+      */
+      extraPostFetch = ''
+        rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp
+      '';
+    };
+
+    # TODO: not sure why I'm having to set this for nix-build...
+    #       can anyone tell if I'm doing something wrong?
+    SOURCE_DATE_EPOCH = 315532800;
+
+    # These aren't, strictly speaking, nix/nixpkgs specific, but I've
+    # had hell upstreaming them. Pulling from resholve source and
+    # passing in from resholve.nix
+    patches = oilPatches;
+
+    buildInputs = [ readline cmark py-yajl ];
+
+    nativeBuildInputs = [ re2c file makeWrapper ];
+
+    propagatedBuildInputs = with python27Packages; [ six typing ];
+
+    doCheck = true;
+
+    preBuild = ''
+      build/dev.sh all
+    '';
+
+    postPatch = ''
+      patchShebangs asdl build core doctools frontend native oil_lang
+    '';
+
+    _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}";
+
+    # See earlier note on glibcLocales
+    LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
+
+    meta = {
+      description = "A new unix shell";
+      homepage = "https://www.oilshell.org/";
+      license = with lib.licenses; [
+        psfl # Includes a portion of the python interpreter and standard library
+        asl20 # Licence for Oil itself
+      ];
+    };
+  };
+}
diff --git a/nixpkgs/pkgs/development/misc/resholve/resholve-package.nix b/nixpkgs/pkgs/development/misc/resholve/resholve-package.nix
new file mode 100644
index 000000000000..cc971196a4f8
--- /dev/null
+++ b/nixpkgs/pkgs/development/misc/resholve/resholve-package.nix
@@ -0,0 +1,97 @@
+{ stdenv, lib, resholve }:
+
+{ pname
+, src
+, version
+, passthru ? { }
+, solutions
+, ...
+}@attrs:
+let
+  inherit stdenv;
+  /* These functions break up the work of partially validating the
+   * 'solutions' attrset and massaging it into env/cli args.
+   *
+   * Note: some of the left-most args do not *have* to be passed as
+   * deep as they are, but I've done so to provide more error context
+   */
+
+  # for brevity / line length
+  spaces = l: builtins.concatStringsSep " " l;
+  semicolons = l: builtins.concatStringsSep ";" l;
+
+  /* Throw a fit with dotted attr path context */
+  nope = path: msg:
+    throw "${builtins.concatStringsSep "." path}: ${msg}";
+
+  /* Special-case directive value representations by type */
+  makeDirective = solution: env: name: val:
+    if builtins.isInt val then builtins.toString val
+    else if builtins.isString val then name
+    else if true == val then name
+    else if false == val then "" # omit!
+    else if null == val then "" # omit!
+    else if builtins.isList val then "${name}:${semicolons val}"
+    else nope [ solution env name ] "unexpected type: ${builtins.typeOf val}";
+
+  /* Build fake/fix/keep directives from Nix types */
+  makeDirectives = solution: env: val:
+    lib.mapAttrsToList (makeDirective solution env) val;
+
+  /* Special-case value representation by type/name */
+  makeEnvVal = solution: env: val:
+    if env == "inputs" then lib.makeBinPath val
+    else if builtins.isString val then val
+    else if builtins.isList val then spaces val
+    else if builtins.isAttrs val then spaces (makeDirectives solution env val)
+    else nope [ solution env ] "unexpected type: ${builtins.typeOf val}";
+
+  /* Shell-format each env value */
+  shellEnv = solution: env: value:
+    lib.escapeShellArg (makeEnvVal solution env value);
+
+  /* Build a single ENV=val pair */
+  makeEnv = solution: env: value:
+    "RESHOLVE_${lib.toUpper env}=${shellEnv solution env value}";
+
+  /* Discard attrs claimed by makeArgs */
+  removeCliArgs = value:
+    removeAttrs value [ "scripts" "flags" ];
+
+  /* Verify required arguments are present */
+  validateSolution = { scripts, inputs, interpreter, ... }: true;
+
+  /* Pull out specific solution keys to build ENV=val pairs */
+  makeEnvs = solution: value:
+    spaces (lib.mapAttrsToList (makeEnv solution) (removeCliArgs value));
+
+  /* Pull out specific solution keys to build CLI argstring */
+  makeArgs = { flags ? [ ], scripts, ... }:
+    spaces (flags ++ scripts);
+
+  /* Build a single resholve invocation */
+  makeInvocation = solution: value:
+    if validateSolution value then
+      "${makeEnvs solution value} resholve --overwrite ${makeArgs value}"
+    else throw "invalid solution"; # shouldn't trigger for now
+
+  /* Build resholve invocation for each solution. */
+  makeCommands = solutions:
+    lib.mapAttrsToList makeInvocation solutions;
+
+  self = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ])
+    // {
+    inherit pname version src;
+    buildInputs = [ resholve ];
+
+    # enable below for verbose debug info if needed
+    # supports default python.logging levels
+    # LOGLEVEL="INFO";
+    preFixup = ''
+      pushd "$out"
+      ${builtins.concatStringsSep "\n" (makeCommands solutions)}
+      popd
+    '';
+  }));
+in
+lib.extendDerivation true passthru self
diff --git a/nixpkgs/pkgs/development/misc/resholve/resholve.nix b/nixpkgs/pkgs/development/misc/resholve/resholve.nix
new file mode 100644
index 000000000000..e8b4ed2cfb25
--- /dev/null
+++ b/nixpkgs/pkgs/development/misc/resholve/resholve.nix
@@ -0,0 +1,80 @@
+{ lib
+, callPackage
+, python27Packages
+, installShellFiles
+, fetchFromGitHub
+, file
+, findutils
+, gettext
+, bats
+, bash
+, doCheck ? true
+}:
+let
+  version = "0.4.2";
+  rSrc = fetchFromGitHub {
+    owner = "abathur";
+    repo = "resholve";
+    rev = "v${version}";
+    hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0=";
+  };
+  deps = callPackage ./deps.nix {
+    /*
+    resholve needs to patch Oil, but trying to avoid adding
+    them all *to* nixpkgs, since they aren't specific to
+    nix/nixpkgs.
+    */
+    oilPatches = [
+      "${rSrc}/0001-add_setup_py.patch"
+      "${rSrc}/0002-add_MANIFEST_in.patch"
+      "${rSrc}/0003-fix_codegen_shebang.patch"
+      "${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch"
+    ];
+  };
+in
+python27Packages.buildPythonApplication {
+  pname = "resholve";
+  inherit version;
+  src = rSrc;
+  format = "other";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  propagatedBuildInputs = [ deps.oildev python27Packages.ConfigArgParse ];
+
+  patchPhase = ''
+    for file in resholve; do
+      substituteInPlace $file --subst-var-by version ${version}
+    done
+  '';
+
+  installPhase = ''
+    install -Dm755 resholve $out/bin/resholve
+    installManPage resholve.1
+  '';
+
+  inherit doCheck;
+  checkInputs = [ bats ];
+  RESHOLVE_PATH = "${lib.makeBinPath [ file findutils gettext ]}";
+
+  checkPhase = ''
+    # explicit interpreter for test suite
+    export INTERP="${bash}/bin/bash" PATH="$out/bin:$PATH"
+    patchShebangs .
+    ./test.sh
+  '';
+
+  # Do not propagate Python; may be obsoleted by nixos/nixpkgs#102613
+  # for context on why, see abathur/resholve#20
+  postFixup = ''
+    rm $out/nix-support/propagated-build-inputs
+  '';
+
+  meta = with lib; {
+    description = "Resolve external shell-script dependencies";
+    homepage = "https://github.com/abathur/resholve";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ abathur ];
+    platforms = platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix b/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix
index f12f5a845f17..d0cb663fb74b 100644
--- a/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix
+++ b/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libusb1 }:
+{ lib, stdenv, fetchFromGitHub, libusb1 }:
 
 stdenv.mkDerivation {
   pname = "rpiboot";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     cp -r msd $out/share/rpiboot
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/raspberrypi/usbboot";
     description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix
index dee5f51b290d..486ca04d36a5 100644
--- a/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , gcc-arm-embedded, binutils-arm-embedded, python2
 , skipTargets ? [
   # These targets do not build, for the reasons listed, along with the last version checked.
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft";
     homepage = "https://github.com/betaflight/betaflight";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/misc/stm32/inav/default.nix b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix
index 8ff8b45f06d4..c7e59a5d27ea 100644
--- a/nixpkgs/pkgs/development/misc/stm32/inav/default.nix
+++ b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , gcc-arm-embedded, binutils-arm-embedded, ruby
 }:
 
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Navigation-enabled flight control software";
     homepage = "https://inavflight.github.io";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/misc/yelp-tools/default.nix b/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
index 19e345b3c2fd..9d5eb2af4968 100644
--- a/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
+++ b/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
+{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "yelp-tools";
   version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
   };
 
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Apps/Yelp/Tools";
     description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
     maintainers = with maintainers; [ domenkozar ];
diff --git a/nixpkgs/pkgs/development/mobile/abootimg/default.nix b/nixpkgs/pkgs/development/mobile/abootimg/default.nix
index 21d24004645c..bec022f08c7e 100644
--- a/nixpkgs/pkgs/development/mobile/abootimg/default.nix
+++ b/nixpkgs/pkgs/development/mobile/abootimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }:
+{ lib, stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }:
 
 let
   version = "0.6";
@@ -28,13 +28,13 @@ stdenv.mkDerivation {
     install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1;
 
     install -D -m 755 abootimg-pack-initrd $out/bin
-    wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]}
+    wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${lib.makeBinPath [ coreutils cpio findutils gzip ]}
 
     install -D -m 755 abootimg-unpack-initrd $out/bin
-    wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]}
+    wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${lib.makeBinPath [ cpio gzip ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ggrandou/abootimg";
     description = "Manipulate Android Boot Images";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix
index 98f69ed88b16..c88ac5dbca5e 100644
--- a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix
+++ b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, platform-tools, makeWrapper
+{ lib, stdenv, fetchFromGitHub, python3, platform-tools, makeWrapper
 , socat, go-mtpfs, adbfs-rootless
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   installPhase = let
-    dependencies = stdenv.lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ];
+    dependencies = lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ];
   in ''
     runHook preInstall
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)";
     homepage = "https://github.com/google/adb-sync";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix b/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix
index 2033fa78ae58..85bf2fb44906 100644
--- a/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }:
 
 stdenv.mkDerivation rec {
   pname = "adbfs-rootless";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse ];
 
   postPatch = ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     install -D adbfs $out/bin/adbfs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mount Android phones on Linux with adb, no root required";
     inherit (src.meta) homepage;
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/.gitignore b/nixpkgs/pkgs/development/mobile/androidenv/.gitignore
new file mode 100644
index 000000000000..c15750760a44
--- /dev/null
+++ b/nixpkgs/pkgs/development/mobile/androidenv/.gitignore
@@ -0,0 +1,2 @@
+/xml
+local.properties
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix b/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix
index 1aeef467642c..ade111cf3f9e 100644
--- a/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix
@@ -2,8 +2,8 @@
 
 deployAndroidPackage {
   inherit package os;
-  buildInputs = [ autoPatchelfHook ]
-    ++ lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc ];
+  nativeBuildInputs = [ autoPatchelfHook ];
+  buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
   patchInstructions = lib.optionalString (os == "linux") ''
     autoPatchelf $packageBaseDir/bin
   '';
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 794de2276645..fd78fa9ac0f8 100644
--- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -1,23 +1,26 @@
-{requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686, licenseAccepted ? false}:
+{ requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686
+, licenseAccepted ? false
+}:
 
-{ toolsVersion ? "25.2.5"
-, platformToolsVersion ? "29.0.6"
-, buildToolsVersions ? [ "28.0.3" ]
+{ toolsVersion ? "26.1.1"
+, platformToolsVersion ? "30.0.5"
+, buildToolsVersions ? [ "30.0.3" ]
 , includeEmulator ? false
-, emulatorVersion ? "30.0.3"
+, emulatorVersion ? "30.3.4"
 , platformVersions ? []
 , includeSources ? false
-, includeDocs ? false
 , includeSystemImages ? false
-, systemImageTypes ? [ "default" ]
+, systemImageTypes ? [ "google_apis_playstore" ]
 , abiVersions ? [ "armeabi-v7a" ]
-, lldbVersions ? [ ]
 , cmakeVersions ? [ ]
 , includeNDK ? false
-, ndkVersion ? "21.0.6113669"
+, ndkVersion ? "22.0.7026061"
 , useGoogleAPIs ? false
 , useGoogleTVAddOns ? false
 , includeExtras ? []
+, repoJson ? ./repo.json
+, repoXmls ? null
+, extraLicenses ? []
 }:
 
 let
@@ -28,48 +31,86 @@ let
     else if stdenv.system == "x86_64-darwin" then "macosx"
     else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}";
 
-  # Generated Nix packages
-  packages = import ./generated/packages.nix {
-    inherit fetchurl;
-  };
-
-  # Generated system images
-  system-images-packages-android = import ./generated/system-images-android.nix {
-    inherit fetchurl;
-  };
-
-  system-images-packages-android-tv = import ./generated/system-images-android-tv.nix {
-    inherit fetchurl;
-  };
-
-  system-images-packages-android-wear = import ./generated/system-images-android-wear.nix {
-    inherit fetchurl;
-  };
-
-  system-images-packages-android-wear-cn = import ./generated/system-images-android-wear-cn.nix {
-    inherit fetchurl;
-  };
-
-  system-images-packages-google_apis = import ./generated/system-images-google_apis.nix {
-    inherit fetchurl;
+  # Uses mkrepo.rb to create a repo spec.
+  mkRepoJson = { packages ? [], images ? [], addons ? [] }: let
+    mkRepoRuby = (pkgs.ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ]));
+    mkRepoRubyArguments = lib.lists.flatten [
+      (builtins.map (package: ["--packages" "${package}"]) packages)
+      (builtins.map (image: ["--images" "${image}"]) images)
+      (builtins.map (addon: ["--addons" "${addon}"]) addons)
+    ];
+  in
+  stdenv.mkDerivation {
+    name = "androidenv-repo-json";
+    buildInputs = [ mkRepoRuby ];
+    preferLocalBuild = true;
+    unpackPhase = "true";
+    buildPhase = ''
+      ruby ${./mkrepo.rb} ${lib.escapeShellArgs mkRepoRubyArguments} > repo.json
+    '';
+    installPhase = ''
+      mv repo.json $out
+    '';
   };
 
-  system-images-packages-google_apis_playstore = import ./generated/system-images-google_apis_playstore.nix {
-    inherit fetchurl;
+  # Reads the repo JSON. If repoXmls is provided, will build a repo JSON into the Nix store.
+  repo = if repoXmls != null then
+           let
+             repoXmlSpec = {
+               packages = repoXmls.packages or [];
+               images = repoXmls.images or [];
+               addons = repoXmls.addons or [];
+             };
+           in
+           builtins.fromJSON (builtins.readFile "${mkRepoJson repoXmlSpec}")
+         else
+           builtins.fromJSON (builtins.readFile repoJson);
+
+  # Converts all 'archives' keys in a repo spec to fetchurl calls.
+  fetchArchives = attrSet:
+    lib.attrsets.mapAttrsRecursive
+      (path: value:
+        if (builtins.elemAt path ((builtins.length path) - 1)) == "archives" then
+          (builtins.listToAttrs
+            (builtins.map
+              (archive: lib.attrsets.nameValuePair archive.os (fetchurl { inherit (archive) url sha1; })) value))
+        else value
+      )
+      attrSet;
+
+  # Converts the repo attrset into fetch calls
+  packages = fetchArchives repo.packages;
+  system-images-packages = fetchArchives repo.images;
+  addons = {
+    addons = fetchArchives repo.addons;
+    extras = fetchArchives repo.extras;
   };
 
-  system-images-packages =
-    lib.recursiveUpdate
-      system-images-packages-android
-      (lib.recursiveUpdate system-images-packages-android-tv
-        (lib.recursiveUpdate system-images-packages-android-wear
-          (lib.recursiveUpdate system-images-packages-android-wear-cn
-            (lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore))));
-
-  # Generated addons
-  addons = import ./generated/addons.nix {
-    inherit fetchurl;
-  };
+  # Converts a license name to a list of license texts.
+  mkLicenses = licenseName: repo.licenses.${licenseName};
+
+  # Converts a list of license names to a flattened list of license texts.
+  # Just used for displaying licenses.
+  mkLicenseTexts = licenseNames:
+    lib.lists.flatten
+      (builtins.map
+        (licenseName:
+          builtins.map
+            (licenseText: "--- ${licenseName} ---\n${licenseText}")
+            (mkLicenses licenseName))
+      licenseNames);
+
+  # Converts a license name to a list of license hashes.
+  mkLicenseHashes = licenseName:
+    builtins.map
+      (licenseText: builtins.hashString "sha1" licenseText)
+      (mkLicenses licenseName);
+
+  # The list of all license names we're accepting. Put android-sdk-license there
+  # by default.
+  licenseNames = lib.lists.unique ([
+    "android-sdk-license"
+  ] ++ extraLicenses);
 in
 rec {
   deployAndroidPackage = import ./deploy-androidpackage.nix {
@@ -88,14 +129,9 @@ rec {
     }
   ) buildToolsVersions;
 
-  docs = deployAndroidPackage {
-    inherit os;
-    package = packages.docs."1";
-  };
-
   emulator = import ./emulator.nix {
     inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib;
-    package = packages.emulator.${emulatorVersion}.${os};
+    package = packages.emulator.${emulatorVersion};
   };
 
   platforms = map (version:
@@ -115,27 +151,22 @@ rec {
   system-images = lib.flatten (map (apiVersion:
     map (type:
       map (abiVersion:
-        deployAndroidPackage {
-          inherit os;
-          package = system-images-packages.${apiVersion}.${type}.${abiVersion};
-          # Patch 'google_apis' system images so they're recognized by the sdk.
-          # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead
-          # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error.
-          patchInstructions = lib.optionalString (lib.hasPrefix "google_apis" type) ''
-            sed -i '/^Addon.Vendor/d' source.properties
-          '';
-        }
+        if lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages then
+          deployAndroidPackage {
+            inherit os;
+            package = system-images-packages.${apiVersion}.${type}.${abiVersion};
+            # Patch 'google_apis' system images so they're recognized by the sdk.
+            # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead
+            # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error.
+            patchInstructions = lib.optionalString (lib.hasPrefix "google_apis" type) ''
+              sed -i '/^Addon.Vendor/d' source.properties
+            '';
+          }
+        else []
       ) abiVersions
     ) systemImageTypes
   ) platformVersions);
 
-  lldb = map (version:
-    import ./lldb.nix {
-      inherit deployAndroidPackage os autoPatchelfHook pkgs lib;
-      package = packages.lldb.${version};
-    }
-  ) lldbVersions;
-
   cmake = map (version:
     import ./cmake.nix {
       inherit deployAndroidPackage os autoPatchelfHook pkgs lib;
@@ -187,12 +218,15 @@ rec {
     ''; # */
 
   # This derivation deploys the tools package and symlinks all the desired
-  # plugins that we want to use.
-
+  # plugins that we want to use. If the license isn't accepted, prints all the licenses
+  # requested and throws.
   androidsdk = if !licenseAccepted then throw ''
-    You must accept the Android Software Development Kit License Agreement at
-    https://developer.android.com/studio/terms
-    by setting nixpkgs config option 'android_sdk.accept_license = true;'
+    ${builtins.concatStringsSep "\n\n" (mkLicenseTexts licenseNames)}
+
+    You must accept the following licenses:
+    ${lib.concatMapStringsSep "\n" (str: "  - ${str}") licenseNames}
+
+    by setting nixpkgs config option 'android_sdk.accept_license = true;'.
   '' else import ./tools.nix {
     inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686 lib;
 
@@ -202,10 +236,8 @@ rec {
       ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
       ${linkPlugins { name = "build-tools"; plugins = build-tools; }}
       ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
-      ${linkPlugin { name = "docs"; plugin = docs; check = includeDocs; }}
       ${linkPlugins { name = "platforms"; plugins = platforms; }}
       ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }}
-      ${linkPlugins { name = "lldb"; plugins = lldb; }}
       ${linkPlugins { name = "cmake"; plugins = cmake; }}
       ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}
 
@@ -253,6 +285,17 @@ rec {
       do
           ln -s $i $out/bin
       done
+
+      # Write licenses
+      mkdir -p licenses
+      ${lib.concatMapStrings (licenseName:
+        let
+          licenseHashes = builtins.concatStringsSep "\n" (mkLicenseHashes licenseName);
+          licenseHashFile = pkgs.writeText "androidenv-${licenseName}" licenseHashes;
+        in
+        ''
+          ln -s ${licenseHashFile} licenses/${licenseName}
+        '') licenseNames}
     '';
   };
 }
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl
deleted file mode 100644
index 20f007eca048..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:addon="http://schemas.android.com/sdk/android/repo/addon2/01"
-  xmlns:sdk="http://schemas.android.com/repository/android/common/01"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-
-  <!-- Template that puts a google HTTP prefix in front of relative URLs -->
-  <xsl:template name="repository-url">
-    <xsl:variable name="raw-url" select="complete/url"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($raw-url, 'http')">
-        <xsl:value-of select="$raw-url"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
-        <xsl:value-of select="$raw-url"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="/addon:sdk-addon">
-{fetchurl}:
-
-{
-  addons = {
-    <!-- Convert all addons, but skip the entry for google APIs version 25 because it is inconsistent with the spec -->
-    <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:addonDetailsType' and archives/archive/complete/url != 'google_apis-25_r1.zip' ]"><xsl:sort select="@path" />
-    "<xsl:value-of select="type-details/api-level" />"."<xsl:value-of select="type-details/tag/id" />" = {
-      name = "<xsl:value-of select="type-details/tag/id" />";
-      path = "<xsl:value-of select="translate(@path, ';', '/')" />";
-      revision = "<xsl:value-of select="type-details/api-level" />";
-      displayName = "<xsl:value-of select="display-name" />";
-      archives = {
-      <xsl:for-each select="archives/archive[not(host-os)]">
-        all = fetchurl {
-          url = "<xsl:call-template name="repository-url"/>";
-          sha1 = "<xsl:value-of select="complete/checksum" />";
-        };
-      </xsl:for-each>
-      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
-        <xsl:value-of select="host-os" /> = fetchurl {
-          url = "<xsl:call-template name="repository-url"/>";
-          sha1 = "<xsl:value-of select="complete/checksum" />";
-        };
-      </xsl:for-each>
-      };
-    };
-    </xsl:for-each>
-
-    <!-- Workaround to make google APIs version 25 work. Hopefully, we can get rid of this at some point -->
-    <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:addonDetailsType' and archives/archive/complete/url = 'google_apis-25_r1.zip' ]">
-    "<xsl:value-of select="25" />"."<xsl:value-of select="type-details/tag/id" />" = {
-      name = "<xsl:value-of select="type-details/tag/id" />";
-      path = "add-ons/addon-google_apis-google-25";
-      revision = "<xsl:value-of select="25" />";
-      displayName = "<xsl:value-of select="display-name" />";
-      archives = {
-      <xsl:for-each select="archives/archive[not(host-os)]">
-        all = fetchurl {
-          url = "<xsl:call-template name="repository-url"/>";
-          sha1 = "<xsl:value-of select="complete/checksum" />";
-        };
-      </xsl:for-each>
-      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
-        <xsl:value-of select="host-os" /> = fetchurl {
-          url = "<xsl:call-template name="repository-url"/>";
-          sha1 = "<xsl:value-of select="complete/checksum" />";
-        };
-      </xsl:for-each>
-      };
-    };
-    </xsl:for-each>
-  };
-
-  extras = {
-    <!-- Convert all extras and maven artefacts -->
-    <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:extraDetailsType' or type-details/@xsi:type='addon:mavenType']"><xsl:sort select="@path" />
-    
-    <!-- Compose revision string from revision attributes -->
-    <xsl:variable name="revision">
-      <xsl:choose>
-        <xsl:when test="revision/major">
-          <xsl:value-of select="revision/major" />
-        </xsl:when>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" />
-        </xsl:when>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" />
-        </xsl:when>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" />
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-
-    "<xsl:value-of select="@path" />" = {
-      name = "<xsl:value-of select="translate(@path, ';', '-')" />";
-      path = "<xsl:value-of select="translate(@path, ';', '/')" />";
-      revision = "<xsl:value-of select="$revision" />";
-      displayName = "<xsl:value-of select="display-name" />";
-      archives = {
-      <xsl:for-each select="archives/archive[not(host-os)]">
-        all = fetchurl {
-          url = "<xsl:call-template name="repository-url"/>";
-          sha1 = "<xsl:value-of select="complete/checksum" />";
-        };
-      </xsl:for-each>
-      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
-        <xsl:value-of select="host-os" /> = fetchurl {
-          url = "<xsl:call-template name="repository-url"/>";
-          sha1 = "<xsl:value-of select="complete/checksum" />";
-        };
-      </xsl:for-each>
-      };
-    };
-    </xsl:for-each>
-  };
-}
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl
deleted file mode 100644
index edc9074a8984..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:common="http://schemas.android.com/repository/android/common/01"
-  xmlns:generic="http://schemas.android.com/repository/android/generic/01"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repo/repository2/01"
-  xmlns:sdk-common="http://schemas.android.com/sdk/android/repo/common/01"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-
-  <!-- Template that puts a google HTTP prefix in front of relative URLs -->
-  <xsl:template name="repository-url">
-    <xsl:variable name="raw-url" select="complete/url"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($raw-url, 'http')">
-        <xsl:value-of select="$raw-url"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
-        <xsl:value-of select="$raw-url"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="/sdk:sdk-repository">
-{fetchurl}:
-
-{
-  <!-- Convert all remote packages -->
-  <xsl:for-each select="remotePackage[not(contains(@path, ';') and substring-after(@path, ';') = 'latest')]"><xsl:sort select="@path" />
-
-  <!-- Extract the package name from the path -->
-  <xsl:variable name="name">
-    <xsl:choose>
-      <xsl:when test="contains(@path, ';')">
-        <xsl:value-of select="substring-before(@path, ';')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@path" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Compose version string from version attributes -->
-  <xsl:variable name="revision">
-    <xsl:choose>
-      <!-- Compose revision for a generic package from the revision attributes -->
-      <xsl:when test="type-details/@xsi:type='generic:genericDetailsType'">
-        <xsl:choose>
-          <xsl:when test="revision/major">
-            <xsl:value-of select="revision/major" />
-          </xsl:when>
-        </xsl:choose>
-        <xsl:choose>
-          <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" />
-          </xsl:when>
-        </xsl:choose>
-        <xsl:choose>
-          <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" />
-          </xsl:when>
-        </xsl:choose>
-        <xsl:choose>
-          <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" />
-          </xsl:when>
-        </xsl:choose>
-      </xsl:when>
-      <!-- Compose revision of a platform SDK from the API-level or codename if the latter exists -->
-      <xsl:when test="type-details/@xsi:type='sdk:platformDetailsType'">
-        <xsl:choose>
-          <xsl:when test="not(type-details/codename='')">
-            <xsl:value-of select="type-details/codename" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="type-details/api-level" />
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- Compose revision of a source SDK from the API-level -->
-      <xsl:when test="type-details/@xsi:type='sdk:sourceDetailsType'">
-        <xsl:value-of select="type-details/api-level" />
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@path='emulator'"> <!-- An emulator package provides one archive per operating system but the same versions -->
-  "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />".<xsl:value-of select="archives/archive/host-os" /> = {
-    </xsl:when>
-    <xsl:otherwise>
-  "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />" = {
-    </xsl:otherwise>
-  </xsl:choose>
-    name = "<xsl:value-of select="$name" />";
-    path = "<xsl:value-of select="translate(@path, ';', '/')" />";
-    revision = "<xsl:value-of select="$revision" />";
-    displayName = "<xsl:value-of select="display-name" />";
-    archives = {
-      <xsl:for-each select="archives/archive[not(host-os)]">
-        all = fetchurl {
-          url = !<xsl:call-template name="repository-url"/>";
-          sha1 = "<xsl:value-of select="complete/checksum" />";
-        };
-      </xsl:for-each>
-      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
-        <xsl:value-of select="host-os" /> = fetchurl {
-        url = "<xsl:call-template name="repository-url"/>";
-        sha1 = "<xsl:value-of select="complete/checksum" />";
-      };
-      </xsl:for-each>
-    };
-  };
-  </xsl:for-each>
-}
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl
deleted file mode 100644
index 947950badb4b..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sys-img="http://schemas.android.com/sdk/android/repo/sys-img2/01"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <xsl:param name="imageType" />
-
-  <xsl:output method="text" omit-xml-declaration="yes" indent="no" />
-
-  <xsl:template name="repository-url">
-    <xsl:variable name="raw-url" select="complete/url"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($raw-url, 'http')">
-        <xsl:value-of select="$raw-url"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>https://dl.google.com/android/repository/sys-img/</xsl:text><xsl:value-of select="$imageType" /><xsl:text>/</xsl:text><xsl:value-of select="$raw-url"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template mode="revision" match="type-details[codename]">
-    <xsl:value-of select="codename" />-<xsl:value-of select="tag/id" />-<xsl:value-of select="abi" />
-  </xsl:template>
-
-  <xsl:template mode="revision" match="type-details[not(codename)]">
-    <xsl:value-of select="api-level" />-<xsl:value-of select="tag/id" />-<xsl:value-of select="abi" />
-  </xsl:template>
-
-  <xsl:template mode="attrkey" match="type-details[codename]">
-    <xsl:text>"</xsl:text>
-    <xsl:value-of select="codename" />
-    <xsl:text>".</xsl:text>
-    <xsl:value-of select="tag/id" />
-    <xsl:text>."</xsl:text>
-    <xsl:value-of select="abi" />
-    <xsl:text>"</xsl:text>
-  </xsl:template>
-
-  <xsl:template mode="attrkey" match="type-details[not(codename)]">
-    <xsl:text>"</xsl:text>
-    <xsl:value-of select="api-level" />
-    <xsl:text>".</xsl:text>
-    <xsl:value-of select="tag/id" />
-    <xsl:text>."</xsl:text>
-    <xsl:value-of select="abi" />
-    <xsl:text>"</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="/sys-img:sdk-sys-img">
-<xsl:text>{fetchurl}:
-
-{
-</xsl:text><xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]">
-  <xsl:variable name="revision"><xsl:apply-templates mode="revision" select="type-details" /></xsl:variable>
-
-  <xsl:variable name="attrkey"><xsl:apply-templates mode="attrkey" select="type-details" /></xsl:variable>
-
-  <xsl:text>  </xsl:text><xsl:value-of select="$attrkey" /><xsl:text> = {
-    name = "system-image-</xsl:text><xsl:value-of select="$revision" /><xsl:text>";
-    path = "</xsl:text><xsl:value-of select="translate(@path, ';', '/')" /><xsl:text>";
-    revision = "</xsl:text><xsl:value-of select="$revision" /><xsl:text>";
-    displayName = "</xsl:text><xsl:value-of select="display-name" /><xsl:text>";
-    archives.all = fetchurl {</xsl:text>
-    <xsl:for-each select="archives/archive"><xsl:text>
-      url = "</xsl:text><xsl:call-template name="repository-url"/><xsl:text>";
-      sha1 = "</xsl:text><xsl:value-of select="complete/checksum" /><xsl:text>";</xsl:text>
-    </xsl:for-each><xsl:text>
-    };
-  };
-</xsl:text>
-  </xsl:for-each>
-<xsl:text>}</xsl:text>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
index 5840598d1c32..e08078ea6725 100644
--- a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
@@ -38,7 +38,7 @@ deployAndroidPackage {
 
     # Wrap emulator so that it can load required libraries at runtime
     wrapProgram $out/libexec/android-sdk/emulator/emulator \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ 
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
         pkgs.dbus
         pkgs.systemd
       ]} \
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix b/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix
new file mode 100644
index 000000000000..aa5337c92988
--- /dev/null
+++ b/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix
@@ -0,0 +1,145 @@
+{
+  # If you copy this example out of nixpkgs, use these lines instead of the next.
+  # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html
+  /*nixpkgsSource ? (builtins.fetchTarball {
+    name = "nixpkgs-20.09";
+    url = https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz;
+    sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
+  }),
+  pkgs ? import nixpkgsSource {},
+  pkgs_i686 ? import nixpkgsSource { system = "i686-linux"; },*/
+
+  # If you want to use the in-tree version of nixpkgs:
+  pkgs ? import ../../../../.. {},
+  pkgs_i686 ? import ../../../../.. { system = "i686-linux"; },
+
+  config ? pkgs.config
+}:
+
+# Copy this file to your Android project.
+let
+  # Declaration of versions for everything. This is useful since these
+  # versions may be used in multiple places in this Nix expression.
+  android = {
+    versions = {
+      tools = "26.1.1";
+      platformTools = "30.0.5";
+      buildTools = "30.0.3";
+      ndk = "22.0.7026061";
+
+      # or the LTS NDK:
+      # ndk = "21.3.6528147";
+      cmake = "3.10.2";
+      emulator = "30.3.4";
+    };
+
+    platforms = ["23" "24" "25" "26" "27" "28" "29" "30"];
+    abis = ["armeabi-v7a" "arm64-v8a"];
+    extras = ["extras;google;gcm"];
+  };
+
+  # If you copy this example out of nixpkgs, something like this will work:
+  /*androidEnvNixpkgs = fetchTarball {
+    name = "androidenv";
+    url = https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz;
+    sha256 = "<fill me in with nix-prefetch-url --unpack>";
+  };
+
+  androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {
+    inherit config pkgs pkgs_i686;
+    licenseAccepted = true;
+  };*/
+
+  # Otherwise, just use the in-tree androidenv:
+  androidEnv = pkgs.callPackage ./.. {
+    inherit config pkgs pkgs_i686;
+    licenseAccepted = true;
+  };
+
+  androidComposition = androidEnv.composeAndroidPackages {
+    toolsVersion = android.versions.tools;
+    platformToolsVersion = android.versions.platformTools;
+    buildToolsVersions = [android.versions.buildTools];
+    platformVersions = android.platforms;
+    abiVersions = android.abis;
+
+    includeSources = true;
+    includeSystemImages = true;
+    includeEmulator = true;
+    emulatorVersion = android.versions.emulator;
+
+    includeNDK = true;
+    ndkVersion = android.versions.ndk;
+    cmakeVersions = [android.versions.cmake];
+
+    useGoogleAPIs = true;
+    includeExtras = android.extras;
+
+    # If you want to use a custom repo JSON:
+    # repoJson = ../repo.json;
+
+    # If you want to use custom repo XMLs:
+    /*repoXmls = {
+      packages = [ ../xml/repository2-1.xml ];
+      images = [
+        ../xml/android-sys-img2-1.xml
+        ../xml/android-tv-sys-img2-1.xml
+        ../xml/android-wear-sys-img2-1.xml
+        ../xml/android-wear-cn-sys-img2-1.xml
+        ../xml/google_apis-sys-img2-1.xml
+        ../xml/google_apis_playstore-sys-img2-1.xml
+      ];
+      addons = [ ../xml/addon2-1.xml ];
+    };*/
+
+    # Accepting more licenses declaratively:
+    extraLicenses = [
+      # Already accepted for you with the global accept_license = true or
+      # licenseAccepted = true on androidenv.
+      # "android-sdk-license"
+
+      # These aren't, but are useful for more uncommon setups.
+      "android-sdk-preview-license"
+      "android-googletv-license"
+      "android-sdk-arm-dbt-license"
+      "google-gdk-license"
+      "intel-android-extra-license"
+      "intel-android-sysimage-license"
+      "mips-android-sysimage-license"
+    ];
+  };
+
+  androidSdk = androidComposition.androidsdk;
+  platformTools = androidComposition.platform-tools;
+  jdk = pkgs.jdk;
+in
+pkgs.mkShell rec {
+  name = "androidenv-demo";
+  buildInputs = [ androidSdk platformTools jdk pkgs.android-studio ];
+
+  LANG = "C.UTF-8";
+  LC_ALL = "C.UTF-8";
+  JAVA_HOME = jdk.home;
+
+  # Note: ANDROID_HOME is deprecated. Use ANDROID_SDK_ROOT.
+  ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+  ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
+
+  # Ensures that we don't have to use a FHS env by using the nix store's aapt2.
+  GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${android.versions.buildTools}/aapt2";
+
+  shellHook = ''
+    # Add cmake to the path.
+    cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/${android.versions.cmake}".*/)"
+    export PATH="$cmake_root/bin:$PATH"
+
+    # Write out local.properties for Android Studio.
+    cat <<EOF > local.properties
+# This file was automatically generated by nix-shell.
+sdk.dir=$ANDROID_SDK_ROOT
+ndk.dir=$ANDROID_NDK_ROOT
+cmake.dir=$cmake_root
+EOF
+  '';
+}
+
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/fetchrepo.sh b/nixpkgs/pkgs/development/mobile/androidenv/fetchrepo.sh
new file mode 100755
index 000000000000..ab5bf419c31a
--- /dev/null
+++ b/nixpkgs/pkgs/development/mobile/androidenv/fetchrepo.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl
+
+die() {
+    echo "$1" >&2
+    exit 1
+}
+
+fetch() {
+    local url="https://dl.google.com/android/repository/$1"
+    echo "$url -> $2"
+    curl -s "$url" -o "$2" || die "Failed to fetch $url"
+}
+
+pushd "$(dirname "$0")" &>/dev/null || exit 1
+
+mkdir -p xml
+
+fetch repository2-1.xml xml/repository2-1.xml
+for img in android android-tv android-wear android-wear-cn android-automotive google_apis google_apis_playstore
+do
+    fetch sys-img/$img/sys-img2-1.xml xml/$img-sys-img2-1.xml
+done
+fetch addon2-1.xml xml/addon2-1.xml
+
+popd &>/dev/null
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generate.sh b/nixpkgs/pkgs/development/mobile/androidenv/generate.sh
index 895a741adffe..2c9a0a9f591b 100755
--- a/nixpkgs/pkgs/development/mobile/androidenv/generate.sh
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generate.sh
@@ -1,36 +1,3 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl libxslt
+#!/bin/sh
 
-set -e
-
-die() {
-    echo "$1" >&2
-    exit 1
-}
-
-fetch() {
-    local url="https://dl.google.com/android/repository/$1"
-    echo "$url -> $2"
-    curl -s "$url" -o "$2" || die "Failed to fetch $url"
-}
-
-pushd "$(dirname "$0")" &>/dev/null || exit 1
-
-mkdir -p xml
-
-# Convert base packages
-fetch repository2-1.xml xml/repository2-1.xml
-xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix
-
-# Convert system images
-for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore
-do
-    fetch sys-img/$img/sys-img2-1.xml xml/$img-sys-img2-1.xml
-    xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix
-done
-
-# Convert system addons
-fetch addon2-1.xml xml/addon2-1.xml
-xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix
-
-popd &>/dev/null
+./fetchrepo.sh && ./mkrepo.sh
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix
deleted file mode 100644
index 231e5b8ea22f..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix
+++ /dev/null
@@ -1,964 +0,0 @@
-
-{fetchurl}:
-
-{
-  addons = {
-    
-    "10"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-10";
-      revision = "10";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-10_r02.zip";
-          sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
-        };
-      
-      };
-    };
-    
-    "11"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-11";
-      revision = "11";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-11_r01.zip";
-          sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
-        };
-      
-      };
-    };
-    
-    "12"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-12";
-      revision = "12";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-12_r01.zip";
-          sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
-        };
-      
-      };
-    };
-    
-    "13"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-13";
-      revision = "13";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-13_r01.zip";
-          sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
-        };
-      
-      };
-    };
-    
-    "14"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-14";
-      revision = "14";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-14_r02.zip";
-          sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39";
-        };
-      
-      };
-    };
-    
-    "15"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-15";
-      revision = "15";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-15_r03.zip";
-          sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9";
-        };
-      
-      };
-    };
-    
-    "16"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-16";
-      revision = "16";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-16_r04.zip";
-          sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792";
-        };
-      
-      };
-    };
-    
-    "17"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-17";
-      revision = "17";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-17_r04.zip";
-          sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f";
-        };
-      
-      };
-    };
-    
-    "18"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-18";
-      revision = "18";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-18_r04.zip";
-          sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b";
-        };
-      
-      };
-    };
-    
-    "19"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-19";
-      revision = "19";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-19_r20.zip";
-          sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311";
-        };
-      
-      };
-    };
-    
-    "21"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-21";
-      revision = "21";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-21_r01.zip";
-          sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a";
-        };
-      
-      };
-    };
-    
-    "22"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-22";
-      revision = "22";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-22_r01.zip";
-          sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5";
-        };
-      
-      };
-    };
-    
-    "23"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-23";
-      revision = "23";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-23_r01.zip";
-          sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db";
-        };
-      
-      };
-    };
-    
-    "24"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-24";
-      revision = "24";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-24_r1.zip";
-          sha1 = "31361c2868f27343ee917fbd259c1463821b6145";
-        };
-      
-      };
-    };
-    
-    "3"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-3";
-      revision = "3";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-3-r03.zip";
-          sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a";
-        };
-      
-      };
-    };
-    
-    "4"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-4";
-      revision = "4";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-4_r02.zip";
-          sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
-        };
-      
-      };
-    };
-    
-    "5"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-5";
-      revision = "5";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-5_r01.zip";
-          sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
-        };
-      
-      };
-    };
-    
-    "6"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-6";
-      revision = "6";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-6_r01.zip";
-          sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
-        };
-      
-      };
-    };
-    
-    "7"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-7";
-      revision = "7";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-7_r01.zip";
-          sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
-        };
-      
-      };
-    };
-    
-    "8"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-8";
-      revision = "8";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-8_r02.zip";
-          sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
-        };
-      
-      };
-    };
-    
-    "9"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-9";
-      revision = "9";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-9_r02.zip";
-          sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
-        };
-      
-      };
-    };
-    
-    "12"."google_tv_addon" = {
-      name = "google_tv_addon";
-      path = "add-ons/addon-google_tv_addon-google-12";
-      revision = "12";
-      displayName = "Google TV Addon";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_tv-12_r02.zip";
-          sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840";
-        };
-      
-      };
-    };
-    
-    "13"."google_tv_addon" = {
-      name = "google_tv_addon";
-      path = "add-ons/addon-google_tv_addon-google-13";
-      revision = "13";
-      displayName = "Google TV Addon";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_tv-13_r01.zip";
-          sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09";
-        };
-      
-      };
-    };
-    
-    "25"."google_apis" = {
-      name = "google_apis";
-      path = "add-ons/addon-google_apis-google-25";
-      revision = "25";
-      displayName = "Google APIs";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_apis-25_r1.zip";
-          sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3";
-        };
-      
-      };
-    };
-    
-  };
-
-  extras = {
-    
-
-    "extras;android;gapid;1" = {
-      name = "extras-android-gapid-1";
-      path = "extras/android/gapid/1";
-      revision = "1.0.3";
-      displayName = "GPU Debugging tools";
-      archives = {
-      linux = fetchurl {
-          url = "https://dl.google.com/android/repository/gapid_r01_linux.zip";
-          sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653";
-        };
-      macosx = fetchurl {
-          url = "https://dl.google.com/android/repository/gapid_r01_osx.zip";
-          sha1 = "597eb271349d890566274861eba2770a84ee4c69";
-        };
-      
-      };
-    };
-    
-
-    "extras;android;gapid;3" = {
-      name = "extras-android-gapid-3";
-      path = "extras/android/gapid/3";
-      revision = "3.1.0";
-      displayName = "GPU Debugging tools";
-      archives = {
-      linux = fetchurl {
-          url = "https://dl.google.com/android/repository/gapid_2994895_linux.zip";
-          sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46";
-        };
-      macosx = fetchurl {
-          url = "https://dl.google.com/android/repository/gapid_2994895_osx.zip";
-          sha1 = "ad86a2350b7b9908300277bf03d41649659de384";
-        };
-      
-      };
-    };
-    
-
-    "extras;android;m2repository" = {
-      name = "extras-android-m2repository";
-      path = "extras/android/m2repository";
-      revision = "47.0.0";
-      displayName = "Android Support Repository";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android_m2repository_r47.zip";
-          sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;Android_Emulator_Hypervisor_Driver" = {
-      name = "extras-google-Android_Emulator_Hypervisor_Driver";
-      path = "extras/google/Android_Emulator_Hypervisor_Driver";
-      revision = "1.4.0";
-      displayName = "Android Emulator Hypervisor Driver for AMD Processors (installer)";
-      archives = {
-      
-      };
-    };
-    
-
-    "extras;google;admob_ads_sdk" = {
-      name = "extras-google-admob_ads_sdk";
-      path = "extras/google/admob_ads_sdk";
-      revision = "11";
-      displayName = "Google AdMob Ads SDK";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip";
-          sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;analytics_sdk_v2" = {
-      name = "extras-google-analytics_sdk_v2";
-      path = "extras/google/analytics_sdk_v2";
-      revision = "3";
-      displayName = "Google Analytics App Tracking SDK";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip";
-          sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;auto" = {
-      name = "extras-google-auto";
-      path = "extras/google/auto";
-      revision = "1.1";
-      displayName = "Android Auto Desktop Head Unit emulator";
-      archives = {
-      linux = fetchurl {
-          url = "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip";
-          sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169";
-        };
-      macosx = fetchurl {
-          url = "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip";
-          sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;gcm" = {
-      name = "extras-google-gcm";
-      path = "extras/google/gcm";
-      revision = "3";
-      displayName = "Google Cloud Messaging for Android Library";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/gcm_r03.zip";
-          sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;google_play_services" = {
-      name = "extras-google-google_play_services";
-      path = "extras/google/google_play_services";
-      revision = "49";
-      displayName = "Google Play services";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip";
-          sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;google_play_services_froyo" = {
-      name = "extras-google-google_play_services_froyo";
-      path = "extras/google/google_play_services_froyo";
-      revision = "12";
-      displayName = "Google Play services for Froyo";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_play_services_3265130_r12.zip";
-          sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;instantapps" = {
-      name = "extras-google-instantapps";
-      path = "extras/google/instantapps";
-      revision = "1.9.0";
-      displayName = "Google Play Instant Development SDK";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip";
-          sha1 = "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;m2repository" = {
-      name = "extras-google-m2repository";
-      path = "extras/google/m2repository";
-      revision = "58";
-      displayName = "Google Repository";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip";
-          sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;market_apk_expansion" = {
-      name = "extras-google-market_apk_expansion";
-      path = "extras/google/market_apk_expansion";
-      revision = "1";
-      displayName = "Google Play APK Expansion library";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/market_apk_expansion-r03.zip";
-          sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;market_licensing" = {
-      name = "extras-google-market_licensing";
-      path = "extras/google/market_licensing";
-      revision = "1";
-      displayName = "Google Play Licensing Library";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/market_licensing-r02.zip";
-          sha1 = "355e8dc304a92a5616db235af8ee7bd554356254";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;simulators" = {
-      name = "extras-google-simulators";
-      path = "extras/google/simulators";
-      revision = "1";
-      displayName = "Android Auto API Simulators";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/simulator_r01.zip";
-          sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7";
-        };
-      
-      };
-    };
-    
-
-    "extras;google;usb_driver" = {
-      name = "extras-google-usb_driver";
-      path = "extras/google/usb_driver";
-      revision = "12";
-      displayName = "Google USB Driver";
-      archives = {
-      
-      };
-    };
-    
-
-    "extras;google;webdriver" = {
-      name = "extras-google-webdriver";
-      path = "extras/google/webdriver";
-      revision = "2";
-      displayName = "Google Web Driver";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/webdriver_r02.zip";
-          sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.0";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip";
-          sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
-      revision = "1";
-      displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip";
-          sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.0-alpha8";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip";
-          sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.0-beta1";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip";
-          sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.0-beta2";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip";
-          sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.0-beta3";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip";
-          sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.0-beta4";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip";
-          sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.0-beta5";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip";
-          sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.1";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip";
-          sha1 = "76f8823def9a6da8954a54737762a6820bc1d043";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2";
-      revision = "1";
-      displayName = "Solver for ConstraintLayout 1.0.2";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip";
-          sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.0";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip";
-          sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
-      revision = "1";
-      displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip";
-          sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.0-alpha8";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip";
-          sha1 = "7912ba03b04831f918f523648f118c4ee4da7604";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.0-beta1";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip";
-          sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.0-beta2";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip";
-          sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.0-beta3";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip";
-          sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.0-beta4";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip";
-          sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.0-beta5";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip";
-          sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.1";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip";
-          sha1 = "342b0894b8651fff37586f80f383733e97aba9f9";
-        };
-      
-      };
-    };
-    
-
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" = {
-      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2";
-      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2";
-      revision = "1";
-      displayName = "ConstraintLayout for Android 1.0.2";
-      archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip";
-          sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4";
-        };
-      
-      };
-    };
-    
-  };
-}
-  
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/packages.nix
deleted file mode 100644
index 4ac14c419edd..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/packages.nix
+++ /dev/null
@@ -1,2563 +0,0 @@
-
-{fetchurl}:
-
-{
-  
-  "build-tools"."17.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/17.0.0";
-    revision = "17.0.0";
-    displayName = "Android SDK Build-Tools 17";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r17-linux.zip";
-        sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r17-macosx.zip";
-        sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930";
-      };
-      
-    };
-  };
-  
-  "build-tools"."18.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/18.0.1";
-    revision = "18.0.1";
-    displayName = "Android SDK Build-Tools 18.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip";
-        sha1 = "f11618492b0d2270c332325d45d752d3656a9640";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip";
-        sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902";
-      };
-      
-    };
-  };
-  
-  "build-tools"."18.1.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/18.1.0";
-    revision = "18.1.0";
-    displayName = "Android SDK Build-Tools 18.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r18.1-linux.zip";
-        sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip";
-        sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
-      };
-      
-    };
-  };
-  
-  "build-tools"."18.1.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/18.1.1";
-    revision = "18.1.1";
-    displayName = "Android SDK Build-Tools 18.1.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip";
-        sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip";
-        sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4";
-      };
-      
-    };
-  };
-  
-  "build-tools"."19.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/19.0.0";
-    revision = "19.0.0";
-    displayName = "Android SDK Build-Tools 19";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19-linux.zip";
-        sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19-macosx.zip";
-        sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90";
-      };
-      
-    };
-  };
-  
-  "build-tools"."19.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/19.0.1";
-    revision = "19.0.1";
-    displayName = "Android SDK Build-Tools 19.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip";
-        sha1 = "18d2312dc4368858914213087f4e61445aca4517";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip";
-        sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b";
-      };
-      
-    };
-  };
-  
-  "build-tools"."19.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/19.0.2";
-    revision = "19.0.2";
-    displayName = "Android SDK Build-Tools 19.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip";
-        sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip";
-        sha1 = "145bc43065d45f756d99d87329d899052b9a9288";
-      };
-      
-    };
-  };
-  
-  "build-tools"."19.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/19.0.3";
-    revision = "19.0.3";
-    displayName = "Android SDK Build-Tools 19.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip";
-        sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip";
-        sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4";
-      };
-      
-    };
-  };
-  
-  "build-tools"."19.1.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/19.1.0";
-    revision = "19.1.0";
-    displayName = "Android SDK Build-Tools 19.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.1-linux.zip";
-        sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip";
-        sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1";
-      };
-      
-    };
-  };
-  
-  "build-tools"."20.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/20.0.0";
-    revision = "20.0.0";
-    displayName = "Android SDK Build-Tools 20";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r20-linux.zip";
-        sha1 = "b688905526a5584d1327a662d871a635ff502758";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r20-macosx.zip";
-        sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
-      };
-      
-    };
-  };
-  
-  "build-tools"."21.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/21.0.0";
-    revision = "21.0.0";
-    displayName = "Android SDK Build-Tools 21";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21-linux.zip";
-        sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21-macosx.zip";
-        sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa";
-      };
-      
-    };
-  };
-  
-  "build-tools"."21.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/21.0.1";
-    revision = "21.0.1";
-    displayName = "Android SDK Build-Tools 21.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip";
-        sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip";
-        sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7";
-      };
-      
-    };
-  };
-  
-  "build-tools"."21.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/21.0.2";
-    revision = "21.0.2";
-    displayName = "Android SDK Build-Tools 21.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip";
-        sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip";
-        sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1";
-      };
-      
-    };
-  };
-  
-  "build-tools"."21.1.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/21.1.0";
-    revision = "21.1.0";
-    displayName = "Android SDK Build-Tools 21.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.1-linux.zip";
-        sha1 = "b7455e543784d52a8925f960bc880493ed1478cb";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip";
-        sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246";
-      };
-      
-    };
-  };
-  
-  "build-tools"."21.1.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/21.1.1";
-    revision = "21.1.1";
-    displayName = "Android SDK Build-Tools 21.1.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip";
-        sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip";
-        sha1 = "836a146eab0504aa9387a5132e986fe7c7381571";
-      };
-      
-    };
-  };
-  
-  "build-tools"."21.1.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/21.1.2";
-    revision = "21.1.2";
-    displayName = "Android SDK Build-Tools 21.1.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip";
-        sha1 = "5e35259843bf2926113a38368b08458735479658";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip";
-        sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48";
-      };
-      
-    };
-  };
-  
-  "build-tools"."22.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/22.0.0";
-    revision = "22.0.0";
-    displayName = "Android SDK Build-Tools 22";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r22-linux.zip";
-        sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r22-macosx.zip";
-        sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d";
-      };
-      
-    };
-  };
-  
-  "build-tools"."22.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/22.0.1";
-    revision = "22.0.1";
-    displayName = "Android SDK Build-Tools 22.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip";
-        sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip";
-        sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf";
-      };
-      
-    };
-  };
-  
-  "build-tools"."23.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/23.0.0";
-    revision = "23.0.0";
-    displayName = "Android SDK Build-Tools 23";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23-linux.zip";
-        sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23-macosx.zip";
-        sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03";
-      };
-      
-    };
-  };
-  
-  "build-tools"."23.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/23.0.1";
-    revision = "23.0.1";
-    displayName = "Android SDK Build-Tools 23.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip";
-        sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip";
-        sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718";
-      };
-      
-    };
-  };
-  
-  "build-tools"."23.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/23.0.2";
-    revision = "23.0.2";
-    displayName = "Android SDK Build-Tools 23.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip";
-        sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip";
-        sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf";
-      };
-      
-    };
-  };
-  
-  "build-tools"."23.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/23.0.3";
-    revision = "23.0.3";
-    displayName = "Android SDK Build-Tools 23.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip";
-        sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip";
-        sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0";
-      };
-      
-    };
-  };
-  
-  "build-tools"."24.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/24.0.0";
-    revision = "24.0.0";
-    displayName = "Android SDK Build-Tools 24";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24-linux.zip";
-        sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24-macosx.zip";
-        sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de";
-      };
-      
-    };
-  };
-  
-  "build-tools"."24.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/24.0.1";
-    revision = "24.0.1";
-    displayName = "Android SDK Build-Tools 24.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip";
-        sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip";
-        sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848";
-      };
-      
-    };
-  };
-  
-  "build-tools"."24.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/24.0.2";
-    revision = "24.0.2";
-    displayName = "Android SDK Build-Tools 24.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip";
-        sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip";
-        sha1 = "8bb8fc575477491d5957de743089df412de55cda";
-      };
-      
-    };
-  };
-  
-  "build-tools"."24.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/24.0.3";
-    revision = "24.0.3";
-    displayName = "Android SDK Build-Tools 24.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip";
-        sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip";
-        sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c";
-      };
-      
-    };
-  };
-  
-  "build-tools"."25.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/25.0.0";
-    revision = "25.0.0";
-    displayName = "Android SDK Build-Tools 25";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25-linux.zip";
-        sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25-macosx.zip";
-        sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606";
-      };
-      
-    };
-  };
-  
-  "build-tools"."25.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/25.0.1";
-    revision = "25.0.1";
-    displayName = "Android SDK Build-Tools 25.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip";
-        sha1 = "ff063d252ab750d339f5947d06ff782836f22bac";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip";
-        sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f";
-      };
-      
-    };
-  };
-  
-  "build-tools"."25.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/25.0.2";
-    revision = "25.0.2";
-    displayName = "Android SDK Build-Tools 25.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip";
-        sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip";
-        sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16";
-      };
-      
-    };
-  };
-  
-  "build-tools"."25.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/25.0.3";
-    revision = "25.0.3";
-    displayName = "Android SDK Build-Tools 25.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip";
-        sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip";
-        sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e";
-      };
-      
-    };
-  };
-  
-  "build-tools"."26.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/26.0.0";
-    revision = "26.0.0";
-    displayName = "Android SDK Build-Tools 26";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26-linux.zip";
-        sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26-macosx.zip";
-        sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086";
-      };
-      
-    };
-  };
-  
-  "build-tools"."26.0.0-rc1" = {
-    
-    name = "build-tools";
-    path = "build-tools/26.0.0-rc1";
-    revision = "26.0.0-rc1";
-    displayName = "Android SDK Build-Tools 26-rc1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip";
-        sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip";
-        sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137";
-      };
-      
-    };
-  };
-  
-  "build-tools"."26.0.0-rc2" = {
-    
-    name = "build-tools";
-    path = "build-tools/26.0.0-rc2";
-    revision = "26.0.0-rc2";
-    displayName = "Android SDK Build-Tools 26-rc2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip";
-        sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip";
-        sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70";
-      };
-      
-    };
-  };
-  
-  "build-tools"."26.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/26.0.1";
-    revision = "26.0.1";
-    displayName = "Android SDK Build-Tools 26.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip";
-        sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip";
-        sha1 = "cbde59de198916b390777dd0227921bfa2120832";
-      };
-      
-    };
-  };
-  
-  "build-tools"."26.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/26.0.2";
-    revision = "26.0.2";
-    displayName = "Android SDK Build-Tools 26.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip";
-        sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip";
-        sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0";
-      };
-      
-    };
-  };
-  
-  "build-tools"."26.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/26.0.3";
-    revision = "26.0.3";
-    displayName = "Android SDK Build-Tools 26.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip";
-        sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip";
-        sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df";
-      };
-      
-    };
-  };
-  
-  "build-tools"."27.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/27.0.0";
-    revision = "27.0.0";
-    displayName = "Android SDK Build-Tools 27";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27-linux.zip";
-        sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27-macosx.zip";
-        sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1";
-      };
-      
-    };
-  };
-  
-  "build-tools"."27.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/27.0.1";
-    revision = "27.0.1";
-    displayName = "Android SDK Build-Tools 27.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip";
-        sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip";
-        sha1 = "1edd07bfdbadd95652d093040e16d858f7489594";
-      };
-      
-    };
-  };
-  
-  "build-tools"."27.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/27.0.2";
-    revision = "27.0.2";
-    displayName = "Android SDK Build-Tools 27.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip";
-        sha1 = "b687ddf6be84f11607871138aad32cf857d0b837";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip";
-        sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be";
-      };
-      
-    };
-  };
-  
-  "build-tools"."27.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/27.0.3";
-    revision = "27.0.3";
-    displayName = "Android SDK Build-Tools 27.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip";
-        sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip";
-        sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d";
-      };
-      
-    };
-  };
-  
-  "build-tools"."28.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/28.0.0";
-    revision = "28.0.0";
-    displayName = "Android SDK Build-Tools 28";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28-linux.zip";
-        sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28-macosx.zip";
-        sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade";
-      };
-      
-    };
-  };
-  
-  "build-tools"."28.0.0-rc1" = {
-    
-    name = "build-tools";
-    path = "build-tools/28.0.0-rc1";
-    revision = "28.0.0-rc1";
-    displayName = "Android SDK Build-Tools 28-rc1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip";
-        sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip";
-        sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc";
-      };
-      
-    };
-  };
-  
-  "build-tools"."28.0.0-rc2" = {
-    
-    name = "build-tools";
-    path = "build-tools/28.0.0-rc2";
-    revision = "28.0.0-rc2";
-    displayName = "Android SDK Build-Tools 28-rc2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip";
-        sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip";
-        sha1 = "0d0314b353589feb10e528b44c5a685b6658d797";
-      };
-      
-    };
-  };
-  
-  "build-tools"."28.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/28.0.1";
-    revision = "28.0.1";
-    displayName = "Android SDK Build-Tools 28.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip";
-        sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip";
-        sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462";
-      };
-      
-    };
-  };
-  
-  "build-tools"."28.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/28.0.2";
-    revision = "28.0.2";
-    displayName = "Android SDK Build-Tools 28.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip";
-        sha1 = "b4492209810a3fd48deaa982f9852fef12433d55";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip";
-        sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9";
-      };
-      
-    };
-  };
-  
-  "build-tools"."28.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/28.0.3";
-    revision = "28.0.3";
-    displayName = "Android SDK Build-Tools 28.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip";
-        sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip";
-        sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a";
-      };
-      
-    };
-  };
-  
-  "build-tools"."29.0.0" = {
-    
-    name = "build-tools";
-    path = "build-tools/29.0.0";
-    revision = "29.0.0";
-    displayName = "Android SDK Build-Tools 29";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-linux.zip";
-        sha1 = "ad314caf1802209c4b00a5f3517af5ceb0d48eae";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-macosx.zip";
-        sha1 = "35dc6bc7a53bd9d206847e72f02cab21cfdaa869";
-      };
-      
-    };
-  };
-  
-  "build-tools"."29.0.0-rc1" = {
-    
-    name = "build-tools";
-    path = "build-tools/29.0.0-rc1";
-    revision = "29.0.0-rc1";
-    displayName = "Android SDK Build-Tools 29-rc1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip";
-        sha1 = "1c897f5885ac5468613e40e1ea598c21c05d345d";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip";
-        sha1 = "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034";
-      };
-      
-    };
-  };
-  
-  "build-tools"."29.0.0-rc2" = {
-    
-    name = "build-tools";
-    path = "build-tools/29.0.0-rc2";
-    revision = "29.0.0-rc2";
-    displayName = "Android SDK Build-Tools 29-rc2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip";
-        sha1 = "b4b41d429c35b42db07b6c65d4aa998ba8c4093c";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip";
-        sha1 = "7a960367999169ccac5dbc60817e5f1725c4c738";
-      };
-      
-    };
-  };
-  
-  "build-tools"."29.0.0-rc3" = {
-    
-    name = "build-tools";
-    path = "build-tools/29.0.0-rc3";
-    revision = "29.0.0-rc3";
-    displayName = "Android SDK Build-Tools 29-rc3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip";
-        sha1 = "8b7177f198e8b92da8f9537aaf859f6edf222b01";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip";
-        sha1 = "643e8d76625f6e2cfcd5494e50bae5e14725ec0c";
-      };
-      
-    };
-  };
-  
-  "build-tools"."29.0.1" = {
-    
-    name = "build-tools";
-    path = "build-tools/29.0.1";
-    revision = "29.0.1";
-    displayName = "Android SDK Build-Tools 29.0.1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip";
-        sha1 = "fc209e5d91ab2daeac24345a5cb17261940547e4";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip";
-        sha1 = "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd";
-      };
-      
-    };
-  };
-  
-  "build-tools"."29.0.2" = {
-    
-    name = "build-tools";
-    path = "build-tools/29.0.2";
-    revision = "29.0.2";
-    displayName = "Android SDK Build-Tools 29.0.2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip";
-        sha1 = "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip";
-        sha1 = "f781d9e03d5c2debcf51fed3792ee7a9d066723f";
-      };
-      
-    };
-  };
-  
-  "build-tools"."29.0.3" = {
-    
-    name = "build-tools";
-    path = "build-tools/29.0.3";
-    revision = "29.0.3";
-    displayName = "Android SDK Build-Tools 29.0.3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip";
-        sha1 = "64efff52165cda5e31848acafa46a05e3f3b4651";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip";
-        sha1 = "76520eb7712fb0bb4c023b55c6f65588ee268289";
-      };
-      
-    };
-  };
-  
-  "build-tools"."30.0.0-rc1" = {
-    
-    name = "build-tools";
-    path = "build-tools/30.0.0-rc1";
-    revision = "30.0.0-rc1";
-    displayName = "Android SDK Build-Tools 30-rc1";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r30-rc1-linux.zip";
-        sha1 = "afcb370bb6956bbf9e90557230088a3e1417e8a8";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/build-tools_r30-rc1-macosx.zip";
-        sha1 = "2761a0ea9466685aaaf93e85bf8bd47575bc91b8";
-      };
-      
-    };
-  };
-  
-  "cmake"."3.10.2" = {
-    
-    name = "cmake";
-    path = "cmake/3.10.2.4988404";
-    revision = "3.10.2";
-    displayName = "CMake 3.10.2.4988404";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip";
-        sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip";
-        sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561";
-      };
-      
-    };
-  };
-  
-  "cmake"."3.6.4111459" = {
-    
-    name = "cmake";
-    path = "cmake/3.6.4111459";
-    revision = "3.6.4111459";
-    displayName = "CMake 3.6.4111459";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip";
-        sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip";
-        sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782";
-      };
-      
-    };
-  };
-  
-  "cmdline-tools"."1.0" = {
-    
-    name = "cmdline-tools";
-    path = "cmdline-tools/1.0";
-    revision = "1.0";
-    displayName = "Android SDK Command-line Tools";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip";
-        sha1 = "6ffc5bd72db2c755f9b374ed829202262a6d8aaf";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip";
-        sha1 = "23f803c07e392bb769507c88b23c2c7868cc7a6f";
-      };
-      
-    };
-  };
-  
-  "docs"."1" = {
-    
-    name = "docs";
-    path = "docs";
-    revision = "1";
-    displayName = "Documentation for Android SDK";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/docs-24_r01.zip";
-          sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d";
-        };
-      
-    };
-  };
-  
-  "emulator"."30.0.0".macosx = {
-    
-    name = "emulator";
-    path = "emulator";
-    revision = "30.0.0";
-    displayName = "Android Emulator";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/emulator-darwin-6203977.zip";
-        sha1 = "3bb965869577be4e62dec053de34c279f5024a12";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/emulator-linux-6203977.zip";
-        sha1 = "356cac370c03460ca82166464de7ecd7da1f4a49";
-      };
-      
-    };
-  };
-  
-  "emulator"."28.0.25".windows = {
-    
-    name = "emulator";
-    path = "emulator";
-    revision = "28.0.25";
-    displayName = "Android Emulator";
-    archives = {
-      
-    };
-  };
-  
-  "emulator"."30.0.3".linux = {
-    
-    name = "emulator";
-    path = "emulator";
-    revision = "30.0.3";
-    displayName = "Android Emulator";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/emulator-linux-6258612.zip";
-        sha1 = "a891e1532443a55c3ce9986b484effdabd842f8e";
-      };
-      
-    };
-  };
-  
-  "emulator"."30.0.2".macosx = {
-    
-    name = "emulator";
-    path = "emulator";
-    revision = "30.0.2";
-    displayName = "Android Emulator";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/emulator-darwin-6237347.zip";
-        sha1 = "702b6a050a230b3b45f667867f6fc99b3f973d9a";
-      };
-      
-    };
-  };
-  
-  "lldb"."2.0.2558144" = {
-    
-    name = "lldb";
-    path = "lldb/2.0";
-    revision = "2.0.2558144";
-    displayName = "LLDB 2.0";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip";
-        sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip";
-        sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326";
-      };
-      
-    };
-  };
-  
-  "lldb"."2.1.2852477" = {
-    
-    name = "lldb";
-    path = "lldb/2.1";
-    revision = "2.1.2852477";
-    displayName = "LLDB 2.1";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip";
-        sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip";
-        sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240";
-      };
-      
-    };
-  };
-  
-  "lldb"."2.2.3271982" = {
-    
-    name = "lldb";
-    path = "lldb/2.2";
-    revision = "2.2.3271982";
-    displayName = "LLDB 2.2";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip";
-        sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip";
-        sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113";
-      };
-      
-    };
-  };
-  
-  "lldb"."2.3.3614996" = {
-    
-    name = "lldb";
-    path = "lldb/2.3";
-    revision = "2.3.3614996";
-    displayName = "LLDB 2.3";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip";
-        sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip";
-        sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13";
-      };
-      
-    };
-  };
-  
-  "lldb"."3.0.4213617" = {
-    
-    name = "lldb";
-    path = "lldb/3.0";
-    revision = "3.0.4213617";
-    displayName = "LLDB 3.0";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip";
-        sha1 = "2492651690a215317b86c755cd4d584ec9838677";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip";
-        sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db";
-      };
-      
-    };
-  };
-  
-  "lldb"."3.1.4508709" = {
-    
-    name = "lldb";
-    path = "lldb/3.1";
-    revision = "3.1.4508709";
-    displayName = "LLDB 3.1";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip";
-        sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip";
-        sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."21.1.6210238-rc1" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "21.1.6210238-rc1";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip";
-        sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip";
-        sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."21.0.6113669" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "21.0.6113669";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip";
-        sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip";
-        sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."21.0.6011959-rc2" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "21.0.6011959-rc2";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip";
-        sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip";
-        sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."20.1.5948944" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "20.1.5948944";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip";
-        sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip";
-        sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."20.0.5594570" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "20.0.5594570";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip";
-        sha1 = "96d5f1c50452596912d1982439c514194b5751e6";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip";
-        sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."20.0.5471264-rc3" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "20.0.5471264-rc3";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip";
-        sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip";
-        sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."20.0.5392854-rc2" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "20.0.5392854-rc2";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip";
-        sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip";
-        sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."19.2.5345600" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "19.2.5345600";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip";
-        sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip";
-        sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."19.0.5232133" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "19.0.5232133";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip";
-        sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip";
-        sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."18.1.5063045" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "18.1.5063045";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip";
-        sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip";
-        sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."17.2.4988734" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "17.2.4988734";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip";
-        sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip";
-        sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048";
-      };
-      
-    };
-  };
-  
-  "ndk-bundle"."16.1.4479499" = {
-    
-    name = "ndk-bundle";
-    path = "ndk-bundle";
-    revision = "16.1.4479499";
-    displayName = "NDK";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip";
-        sha1 = "e51e615449b98c716cf912057e2682e75d55e2de";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip";
-        sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128";
-      };
-      
-    };
-  };
-  
-  "ndk"."16.1.4479499" = {
-    
-    name = "ndk";
-    path = "ndk/16.1.4479499";
-    revision = "16.1.4479499";
-    displayName = "NDK (Side by side) 16.1.4479499";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip";
-        sha1 = "e51e615449b98c716cf912057e2682e75d55e2de";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip";
-        sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128";
-      };
-      
-    };
-  };
-  
-  "ndk"."17.2.4988734" = {
-    
-    name = "ndk";
-    path = "ndk/17.2.4988734";
-    revision = "17.2.4988734";
-    displayName = "NDK (Side by side) 17.2.4988734";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip";
-        sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip";
-        sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048";
-      };
-      
-    };
-  };
-  
-  "ndk"."18.1.5063045" = {
-    
-    name = "ndk";
-    path = "ndk/18.1.5063045";
-    revision = "18.1.5063045";
-    displayName = "NDK (Side by side) 18.1.5063045";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip";
-        sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip";
-        sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b";
-      };
-      
-    };
-  };
-  
-  "ndk"."19.0.5232133" = {
-    
-    name = "ndk";
-    path = "ndk/19.0.5232133";
-    revision = "19.0.5232133";
-    displayName = "NDK (Side by side) 19.0.5232133";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip";
-        sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip";
-        sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac";
-      };
-      
-    };
-  };
-  
-  "ndk"."19.2.5345600" = {
-    
-    name = "ndk";
-    path = "ndk/19.2.5345600";
-    revision = "19.2.5345600";
-    displayName = "NDK (Side by side) 19.2.5345600";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip";
-        sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip";
-        sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834";
-      };
-      
-    };
-  };
-  
-  "ndk"."20.0.5392854-rc2" = {
-    
-    name = "ndk";
-    path = "ndk/20.0.5392854";
-    revision = "20.0.5392854-rc2";
-    displayName = "NDK (Side by side) 20.0.5392854";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip";
-        sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip";
-        sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02";
-      };
-      
-    };
-  };
-  
-  "ndk"."20.0.5471264-rc3" = {
-    
-    name = "ndk";
-    path = "ndk/20.0.5471264";
-    revision = "20.0.5471264-rc3";
-    displayName = "NDK (Side by side) 20.0.5471264";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip";
-        sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip";
-        sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3";
-      };
-      
-    };
-  };
-  
-  "ndk"."20.0.5594570" = {
-    
-    name = "ndk";
-    path = "ndk/20.0.5594570";
-    revision = "20.0.5594570";
-    displayName = "NDK (Side by side) 20.0.5594570";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip";
-        sha1 = "96d5f1c50452596912d1982439c514194b5751e6";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip";
-        sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff";
-      };
-      
-    };
-  };
-  
-  "ndk"."20.1.5948944" = {
-    
-    name = "ndk";
-    path = "ndk/20.1.5948944";
-    revision = "20.1.5948944";
-    displayName = "NDK (Side by side) 20.1.5948944";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip";
-        sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip";
-        sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b";
-      };
-      
-    };
-  };
-  
-  "ndk"."21.0.6011959-rc2" = {
-    
-    name = "ndk";
-    path = "ndk/21.0.6011959";
-    revision = "21.0.6011959-rc2";
-    displayName = "NDK (Side by side) 21.0.6011959";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip";
-        sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip";
-        sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44";
-      };
-      
-    };
-  };
-  
-  "ndk"."21.0.6113669" = {
-    
-    name = "ndk";
-    path = "ndk/21.0.6113669";
-    revision = "21.0.6113669";
-    displayName = "NDK (Side by side) 21.0.6113669";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip";
-        sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip";
-        sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c";
-      };
-      
-    };
-  };
-  
-  "ndk"."21.1.6210238-rc1" = {
-    
-    name = "ndk";
-    path = "ndk/21.1.6210238";
-    revision = "21.1.6210238-rc1";
-    displayName = "NDK (Side by side) 21.1.6210238";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip";
-        sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip";
-        sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd";
-      };
-      
-    };
-  };
-  
-  "patcher"."1" = {
-    
-    name = "patcher";
-    path = "patcher/v4";
-    revision = "1";
-    displayName = "SDK Patch Applier v4";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip";
-          sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e";
-        };
-      
-    };
-  };
-  
-  "platform-tools"."29.0.6" = {
-    
-    name = "platform-tools";
-    path = "platform-tools";
-    revision = "29.0.6";
-    displayName = "Android SDK Platform-Tools";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-darwin.zip";
-        sha1 = "3232179dce22d8a6332018729026ed39f5d5cd0b";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-linux.zip";
-        sha1 = "e95ed28330406705d47fe96bafb589be6c1f2f23";
-      };
-      
-    };
-  };
-  
-  "platforms"."10" = {
-    
-    name = "platforms";
-    path = "platforms/android-10";
-    revision = "10";
-    displayName = "Android SDK Platform 10";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-2.3.3_r02.zip";
-          sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
-        };
-      
-    };
-  };
-  
-  "platforms"."11" = {
-    
-    name = "platforms";
-    path = "platforms/android-11";
-    revision = "11";
-    displayName = "Android SDK Platform 11";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-3.0_r02.zip";
-          sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
-        };
-      
-    };
-  };
-  
-  "platforms"."12" = {
-    
-    name = "platforms";
-    path = "platforms/android-12";
-    revision = "12";
-    displayName = "Android SDK Platform 12";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-3.1_r03.zip";
-          sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
-        };
-      
-    };
-  };
-  
-  "platforms"."13" = {
-    
-    name = "platforms";
-    path = "platforms/android-13";
-    revision = "13";
-    displayName = "Android SDK Platform 13";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-3.2_r01.zip";
-          sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
-        };
-      
-    };
-  };
-  
-  "platforms"."14" = {
-    
-    name = "platforms";
-    path = "platforms/android-14";
-    revision = "14";
-    displayName = "Android SDK Platform 14";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-14_r04.zip";
-          sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
-        };
-      
-    };
-  };
-  
-  "platforms"."15" = {
-    
-    name = "platforms";
-    path = "platforms/android-15";
-    revision = "15";
-    displayName = "Android SDK Platform 15";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-15_r05.zip";
-          sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
-        };
-      
-    };
-  };
-  
-  "platforms"."16" = {
-    
-    name = "platforms";
-    path = "platforms/android-16";
-    revision = "16";
-    displayName = "Android SDK Platform 16";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-16_r05.zip";
-          sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
-        };
-      
-    };
-  };
-  
-  "platforms"."17" = {
-    
-    name = "platforms";
-    path = "platforms/android-17";
-    revision = "17";
-    displayName = "Android SDK Platform 17";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-17_r03.zip";
-          sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
-        };
-      
-    };
-  };
-  
-  "platforms"."18" = {
-    
-    name = "platforms";
-    path = "platforms/android-18";
-    revision = "18";
-    displayName = "Android SDK Platform 18";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-18_r03.zip";
-          sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
-        };
-      
-    };
-  };
-  
-  "platforms"."19" = {
-    
-    name = "platforms";
-    path = "platforms/android-19";
-    revision = "19";
-    displayName = "Android SDK Platform 19";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-19_r04.zip";
-          sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
-        };
-      
-    };
-  };
-  
-  "platforms"."2" = {
-    
-    name = "platforms";
-    path = "platforms/android-2";
-    revision = "2";
-    displayName = "Android SDK Platform 2";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-1.1_r1-linux.zip";
-        sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-1.1_r1-macosx.zip";
-        sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe";
-      };
-      
-    };
-  };
-  
-  "platforms"."20" = {
-    
-    name = "platforms";
-    path = "platforms/android-20";
-    revision = "20";
-    displayName = "Android SDK Platform 20";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-20_r02.zip";
-          sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
-        };
-      
-    };
-  };
-  
-  "platforms"."21" = {
-    
-    name = "platforms";
-    path = "platforms/android-21";
-    revision = "21";
-    displayName = "Android SDK Platform 21";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-21_r02.zip";
-          sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
-        };
-      
-    };
-  };
-  
-  "platforms"."22" = {
-    
-    name = "platforms";
-    path = "platforms/android-22";
-    revision = "22";
-    displayName = "Android SDK Platform 22";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-22_r02.zip";
-          sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
-        };
-      
-    };
-  };
-  
-  "platforms"."23" = {
-    
-    name = "platforms";
-    path = "platforms/android-23";
-    revision = "23";
-    displayName = "Android SDK Platform 23";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-23_r03.zip";
-          sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0";
-        };
-      
-    };
-  };
-  
-  "platforms"."24" = {
-    
-    name = "platforms";
-    path = "platforms/android-24";
-    revision = "24";
-    displayName = "Android SDK Platform 24";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-24_r02.zip";
-          sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee";
-        };
-      
-    };
-  };
-  
-  "platforms"."25" = {
-    
-    name = "platforms";
-    path = "platforms/android-25";
-    revision = "25";
-    displayName = "Android SDK Platform 25";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-25_r03.zip";
-          sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
-        };
-      
-    };
-  };
-  
-  "platforms"."26" = {
-    
-    name = "platforms";
-    path = "platforms/android-26";
-    revision = "26";
-    displayName = "Android SDK Platform 26";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-26_r02.zip";
-          sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
-        };
-      
-    };
-  };
-  
-  "platforms"."27" = {
-    
-    name = "platforms";
-    path = "platforms/android-27";
-    revision = "27";
-    displayName = "Android SDK Platform 27";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-27_r03.zip";
-          sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353";
-        };
-      
-    };
-  };
-  
-  "platforms"."28" = {
-    
-    name = "platforms";
-    path = "platforms/android-28";
-    revision = "28";
-    displayName = "Android SDK Platform 28";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-28_r06.zip";
-          sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6";
-        };
-      
-    };
-  };
-  
-  "platforms"."29" = {
-    
-    name = "platforms";
-    path = "platforms/android-29";
-    revision = "29";
-    displayName = "Android SDK Platform 29";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-29_r04.zip";
-          sha1 = "8d644c39902038e0bd529165d5ba4f5a8607daea";
-        };
-      
-    };
-  };
-  
-  "platforms"."3" = {
-    
-    name = "platforms";
-    path = "platforms/android-3";
-    revision = "3";
-    displayName = "Android SDK Platform 3";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-1.5_r04-linux.zip";
-        sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-1.5_r04-macosx.zip";
-        sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e";
-      };
-      
-    };
-  };
-  
-  "platforms"."4" = {
-    
-    name = "platforms";
-    path = "platforms/android-4";
-    revision = "4";
-    displayName = "Android SDK Platform 4";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-1.6_r03-linux.zip";
-        sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-1.6_r03-macosx.zip";
-        sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625";
-      };
-      
-    };
-  };
-  
-  "platforms"."5" = {
-    
-    name = "platforms";
-    path = "platforms/android-5";
-    revision = "5";
-    displayName = "Android SDK Platform 5";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-2.0_r01-linux.zip";
-        sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-2.0_r01-macosx.zip";
-        sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314";
-      };
-      
-    };
-  };
-  
-  "platforms"."6" = {
-    
-    name = "platforms";
-    path = "platforms/android-6";
-    revision = "6";
-    displayName = "Android SDK Platform 6";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip";
-        sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip";
-        sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0";
-      };
-      
-    };
-  };
-  
-  "platforms"."7" = {
-    
-    name = "platforms";
-    path = "platforms/android-7";
-    revision = "7";
-    displayName = "Android SDK Platform 7";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-2.1_r03.zip";
-          sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
-        };
-      
-    };
-  };
-  
-  "platforms"."8" = {
-    
-    name = "platforms";
-    path = "platforms/android-8";
-    revision = "8";
-    displayName = "Android SDK Platform 8";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-2.2_r03.zip";
-          sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
-        };
-      
-    };
-  };
-  
-  "platforms"."9" = {
-    
-    name = "platforms";
-    path = "platforms/android-9";
-    revision = "9";
-    displayName = "Android SDK Platform 9";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/android-2.3.1_r02.zip";
-          sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
-        };
-      
-    };
-  };
-  
-  "platforms"."R" = {
-    
-    name = "platforms";
-    path = "platforms/android-R";
-    revision = "R";
-    displayName = "Android SDK Platform R";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/platform-R_r01.zip";
-          sha1 = "f6ce3ef0ec8526550fc3b517bdb29051275bcd1a";
-        };
-      
-    };
-  };
-  
-  "skiaparser"."1-rc02" = {
-    
-    name = "skiaparser";
-    path = "skiaparser/1";
-    revision = "1-rc02";
-    displayName = "Skia Parser Server";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/skiaparser-6172737-linux.zip";
-        sha1 = "d2eac6deff2c257d47853251bda5528c96a41720";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/skiaparser-6172737-mac.zip";
-        sha1 = "1e3b8da7a4f5e9887479b4e4186db3cb22422c82";
-      };
-      
-    };
-  };
-  
-  "sources"."14" = {
-    
-    name = "sources";
-    path = "sources/android-14";
-    revision = "14";
-    displayName = "Sources for Android 14";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-14_r01.zip";
-          sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555";
-        };
-      
-    };
-  };
-  
-  "sources"."15" = {
-    
-    name = "sources";
-    path = "sources/android-15";
-    revision = "15";
-    displayName = "Sources for Android 15";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-15_r02.zip";
-          sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa";
-        };
-      
-    };
-  };
-  
-  "sources"."16" = {
-    
-    name = "sources";
-    path = "sources/android-16";
-    revision = "16";
-    displayName = "Sources for Android 16";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-16_r02.zip";
-          sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84";
-        };
-      
-    };
-  };
-  
-  "sources"."17" = {
-    
-    name = "sources";
-    path = "sources/android-17";
-    revision = "17";
-    displayName = "Sources for Android 17";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-17_r01.zip";
-          sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a";
-        };
-      
-    };
-  };
-  
-  "sources"."18" = {
-    
-    name = "sources";
-    path = "sources/android-18";
-    revision = "18";
-    displayName = "Sources for Android 18";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-18_r01.zip";
-          sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78";
-        };
-      
-    };
-  };
-  
-  "sources"."19" = {
-    
-    name = "sources";
-    path = "sources/android-19";
-    revision = "19";
-    displayName = "Sources for Android 19";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-19_r02.zip";
-          sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7";
-        };
-      
-    };
-  };
-  
-  "sources"."20" = {
-    
-    name = "sources";
-    path = "sources/android-20";
-    revision = "20";
-    displayName = "Sources for Android 20";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-20_r01.zip";
-          sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76";
-        };
-      
-    };
-  };
-  
-  "sources"."21" = {
-    
-    name = "sources";
-    path = "sources/android-21";
-    revision = "21";
-    displayName = "Sources for Android 21";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-21_r01.zip";
-          sha1 = "137a5044915d32bea297a8c1552684802bbc2e25";
-        };
-      
-    };
-  };
-  
-  "sources"."22" = {
-    
-    name = "sources";
-    path = "sources/android-22";
-    revision = "22";
-    displayName = "Sources for Android 22";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-22_r01.zip";
-          sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6";
-        };
-      
-    };
-  };
-  
-  "sources"."23" = {
-    
-    name = "sources";
-    path = "sources/android-23";
-    revision = "23";
-    displayName = "Sources for Android 23";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-23_r01.zip";
-          sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2";
-        };
-      
-    };
-  };
-  
-  "sources"."24" = {
-    
-    name = "sources";
-    path = "sources/android-24";
-    revision = "24";
-    displayName = "Sources for Android 24";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-24_r01.zip";
-          sha1 = "6b96115830a83d654479f32ce4b724ca9011148b";
-        };
-      
-    };
-  };
-  
-  "sources"."25" = {
-    
-    name = "sources";
-    path = "sources/android-25";
-    revision = "25";
-    displayName = "Sources for Android 25";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-25_r01.zip";
-          sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c";
-        };
-      
-    };
-  };
-  
-  "sources"."26" = {
-    
-    name = "sources";
-    path = "sources/android-26";
-    revision = "26";
-    displayName = "Sources for Android 26";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-26_r01.zip";
-          sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9";
-        };
-      
-    };
-  };
-  
-  "sources"."27" = {
-    
-    name = "sources";
-    path = "sources/android-27";
-    revision = "27";
-    displayName = "Sources for Android 27";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-27_r01.zip";
-          sha1 = "7b714670561d08f54751af42aca929867b806596";
-        };
-      
-    };
-  };
-  
-  "sources"."28" = {
-    
-    name = "sources";
-    path = "sources/android-28";
-    revision = "28";
-    displayName = "Sources for Android 28";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-28_r01.zip";
-          sha1 = "5610e0c24235ee3fa343c899ddd551be30315255";
-        };
-      
-    };
-  };
-  
-  "sources"."29" = {
-    
-    name = "sources";
-    path = "sources/android-29";
-    revision = "29";
-    displayName = "Sources for Android 29";
-    archives = {
-      
-        all = fetchurl {
-          url = "https://dl.google.com/android/repository/sources-29_r01.zip";
-          sha1 = "d0ad249e152b3a8fe3cb7c4a329453a048be29e4";
-        };
-      
-    };
-  };
-  
-  "tools"."25.2.5" = {
-    
-    name = "tools";
-    path = "tools";
-    revision = "25.2.5";
-    displayName = "Android SDK Tools 25.2.5";
-    archives = {
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/tools_r25.2.5-linux.zip";
-        sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1";
-      };
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip";
-        sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659";
-      };
-      
-    };
-  };
-  
-  "tools"."26.1.1" = {
-    
-    name = "tools";
-    path = "tools";
-    revision = "26.1.1";
-    displayName = "Android SDK Tools";
-    archives = {
-      macosx = fetchurl {
-        url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip";
-        sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad";
-      };
-      linux = fetchurl {
-        url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip";
-        sha1 = "8c7c28554a32318461802c1291d76fccfafde054";
-      };
-      
-    };
-  };
-  
-}
-  
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
deleted file mode 100644
index 22da6ee9800c..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-{fetchurl}:
-
-{
-  "21".android-tv."x86" = {
-    name = "system-image-21-android-tv-x86";
-    path = "system-images/android-21/android-tv/x86";
-    revision = "21-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip";
-      sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8";
-    };
-  };
-  "21".android-tv."armeabi-v7a" = {
-    name = "system-image-21-android-tv-armeabi-v7a";
-    path = "system-images/android-21/android-tv/armeabi-v7a";
-    revision = "21-android-tv-armeabi-v7a";
-    displayName = "Android TV ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip";
-      sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331";
-    };
-  };
-  "22".android-tv."x86" = {
-    name = "system-image-22-android-tv-x86";
-    path = "system-images/android-22/android-tv/x86";
-    revision = "22-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip";
-      sha1 = "c78efd5a155622eb490be9d326f5783993375c35";
-    };
-  };
-  "23".android-tv."x86" = {
-    name = "system-image-23-android-tv-x86";
-    path = "system-images/android-23/android-tv/x86";
-    revision = "23-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r19.zip";
-      sha1 = "47e8d6b08a337a0672f0f105bf907d39ed9457ec";
-    };
-  };
-  "23".android-tv."armeabi-v7a" = {
-    name = "system-image-23-android-tv-armeabi-v7a";
-    path = "system-images/android-23/android-tv/armeabi-v7a";
-    revision = "23-android-tv-armeabi-v7a";
-    displayName = "Android TV ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip";
-      sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52";
-    };
-  };
-  "24".android-tv."x86" = {
-    name = "system-image-24-android-tv-x86";
-    path = "system-images/android-24/android-tv/x86";
-    revision = "24-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r20.zip";
-      sha1 = "0b8cd98dec9ebd04376ce4f6e270193ceae8acea";
-    };
-  };
-  "25".android-tv."x86" = {
-    name = "system-image-25-android-tv-x86";
-    path = "system-images/android-25/android-tv/x86";
-    revision = "25-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r14.zip";
-      sha1 = "1c88f11683375c059803c3a7be8e880cc23a6f9a";
-    };
-  };
-  "26".android-tv."x86" = {
-    name = "system-image-26-android-tv-x86";
-    path = "system-images/android-26/android-tv/x86";
-    revision = "26-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r12.zip";
-      sha1 = "d8b12e543925a0454403d2a854996a76410ec374";
-    };
-  };
-  "27".android-tv."x86" = {
-    name = "system-image-27-android-tv-x86";
-    path = "system-images/android-27/android-tv/x86";
-    revision = "27-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r07.zip";
-      sha1 = "5ed40e568c0d8d023c5b6c76634b22a477ed54aa";
-    };
-  };
-  "28".android-tv."x86" = {
-    name = "system-image-28-android-tv-x86";
-    path = "system-images/android-28/android-tv/x86";
-    revision = "28-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r08.zip";
-      sha1 = "f5f8f296dfaca7945434992761c8d47d50257c21";
-    };
-  };
-  "Q".android-tv."x86" = {
-    name = "system-image-Q-android-tv-x86";
-    path = "system-images/android-Q/android-tv/x86";
-    revision = "Q-android-tv-x86";
-    displayName = "Android TV Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-Q_r01.zip";
-      sha1 = "80c66ddce0dbe53fe6fedcade230d518112fffb1";
-    };
-  };
-}
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
deleted file mode 100644
index 36ff0b01cd6d..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{fetchurl}:
-
-{
-  "25".android-wear."armeabi-v7a" = {
-    name = "system-image-25-android-wear-armeabi-v7a";
-    path = "system-images/android-25/android-wear-cn/armeabi-v7a";
-    revision = "25-android-wear-armeabi-v7a";
-    displayName = "China version of Android Wear ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip";
-      sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41";
-    };
-  };
-  "25".android-wear."x86" = {
-    name = "system-image-25-android-wear-x86";
-    path = "system-images/android-25/android-wear-cn/x86";
-    revision = "25-android-wear-x86";
-    displayName = "China version of Android Wear Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip";
-      sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d";
-    };
-  };
-  "26".android-wear."x86" = {
-    name = "system-image-26-android-wear-x86";
-    path = "system-images/android-26/android-wear-cn/x86";
-    revision = "26-android-wear-x86";
-    displayName = "China version of Android Wear Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip";
-      sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096";
-    };
-  };
-  "28".android-wear."x86" = {
-    name = "system-image-28-android-wear-x86";
-    path = "system-images/android-28/android-wear-cn/x86";
-    revision = "28-android-wear-x86";
-    displayName = "China version of Wear OS Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-28_r03.zip";
-      sha1 = "2099d87709c5e064273925dbf2cf1fd081bf0262";
-    };
-  };
-}
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
deleted file mode 100644
index e672c75031ff..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{fetchurl}:
-
-{
-  "23".android-wear."armeabi-v7a" = {
-    name = "system-image-23-android-wear-armeabi-v7a";
-    path = "system-images/android-23/android-wear/armeabi-v7a";
-    revision = "23-android-wear-armeabi-v7a";
-    displayName = "Android Wear ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip";
-      sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71";
-    };
-  };
-  "23".android-wear."x86" = {
-    name = "system-image-23-android-wear-x86";
-    path = "system-images/android-23/android-wear/x86";
-    revision = "23-android-wear-x86";
-    displayName = "Android Wear Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip";
-      sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e";
-    };
-  };
-  "25".android-wear."armeabi-v7a" = {
-    name = "system-image-25-android-wear-armeabi-v7a";
-    path = "system-images/android-25/android-wear/armeabi-v7a";
-    revision = "25-android-wear-armeabi-v7a";
-    displayName = "Android Wear ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip";
-      sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c";
-    };
-  };
-  "25".android-wear."x86" = {
-    name = "system-image-25-android-wear-x86";
-    path = "system-images/android-25/android-wear/x86";
-    revision = "25-android-wear-x86";
-    displayName = "Android Wear Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip";
-      sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6";
-    };
-  };
-  "26".android-wear."x86" = {
-    name = "system-image-26-android-wear-x86";
-    path = "system-images/android-26/android-wear/x86";
-    revision = "26-android-wear-x86";
-    displayName = "Android Wear Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip";
-      sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c";
-    };
-  };
-  "28".android-wear."x86" = {
-    name = "system-image-28-android-wear-x86";
-    path = "system-images/android-28/android-wear/x86";
-    revision = "28-android-wear-x86";
-    displayName = "Wear OS Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r03.zip";
-      sha1 = "b80bd53ab69f19441714bff2e4d55931e6d3f7be";
-    };
-  };
-}
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android.nix
deleted file mode 100644
index f5863cb0d4e8..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android.nix
+++ /dev/null
@@ -1,364 +0,0 @@
-{fetchurl}:
-
-{
-  "10".default."armeabi-v7a" = {
-    name = "system-image-10-default-armeabi-v7a";
-    path = "system-images/android-10/default/armeabi-v7a";
-    revision = "10-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip";
-      sha1 = "8537616a7add47cce24c60f18bc2429e3dc90ae3";
-    };
-  };
-  "14".default."armeabi-v7a" = {
-    name = "system-image-14-default-armeabi-v7a";
-    path = "system-images/android-14/default/armeabi-v7a";
-    revision = "14-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip";
-      sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
-    };
-  };
-  "15".default."armeabi-v7a" = {
-    name = "system-image-15-default-armeabi-v7a";
-    path = "system-images/android-15/default/armeabi-v7a";
-    revision = "15-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip";
-      sha1 = "03d7ed95a9d3b107e3f2e5b166d017ea12529e70";
-    };
-  };
-  "16".default."armeabi-v7a" = {
-    name = "system-image-16-default-armeabi-v7a";
-    path = "system-images/android-16/default/armeabi-v7a";
-    revision = "16-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip";
-      sha1 = "69b944b0d5a18c8563fa80d7d229af64890f724e";
-    };
-  };
-  "17".default."armeabi-v7a" = {
-    name = "system-image-17-default-armeabi-v7a";
-    path = "system-images/android-17/default/armeabi-v7a";
-    revision = "17-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip";
-      sha1 = "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6";
-    };
-  };
-  "18".default."armeabi-v7a" = {
-    name = "system-image-18-default-armeabi-v7a";
-    path = "system-images/android-18/default/armeabi-v7a";
-    revision = "18-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip";
-      sha1 = "580b583720f7de671040d5917c8c9db0c7aa03fd";
-    };
-  };
-  "19".default."armeabi-v7a" = {
-    name = "system-image-19-default-armeabi-v7a";
-    path = "system-images/android-19/default/armeabi-v7a";
-    revision = "19-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip";
-      sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa";
-    };
-  };
-  "21".default."armeabi-v7a" = {
-    name = "system-image-21-default-armeabi-v7a";
-    path = "system-images/android-21/default/armeabi-v7a";
-    revision = "21-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip";
-      sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10";
-    };
-  };
-  "22".default."armeabi-v7a" = {
-    name = "system-image-22-default-armeabi-v7a";
-    path = "system-images/android-22/default/armeabi-v7a";
-    revision = "22-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip";
-      sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1";
-    };
-  };
-  "23".default."armeabi-v7a" = {
-    name = "system-image-23-default-armeabi-v7a";
-    path = "system-images/android-23/default/armeabi-v7a";
-    revision = "23-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip";
-      sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d";
-    };
-  };
-  "24".default."armeabi-v7a" = {
-    name = "system-image-24-default-armeabi-v7a";
-    path = "system-images/android-24/default/armeabi-v7a";
-    revision = "24-default-armeabi-v7a";
-    displayName = "ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip";
-      sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033";
-    };
-  };
-  "24".default."arm64-v8a" = {
-    name = "system-image-24-default-arm64-v8a";
-    path = "system-images/android-24/default/arm64-v8a";
-    revision = "24-default-arm64-v8a";
-    displayName = "ARM 64 v8a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip";
-      sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f";
-    };
-  };
-  "16".default."mips" = {
-    name = "system-image-16-default-mips";
-    path = "system-images/android-16/default/mips";
-    revision = "16-default-mips";
-    displayName = "MIPS System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip";
-      sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
-    };
-  };
-  "17".default."mips" = {
-    name = "system-image-17-default-mips";
-    path = "system-images/android-17/default/mips";
-    revision = "17-default-mips";
-    displayName = "MIPS System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip";
-      sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
-    };
-  };
-  "10".default."x86" = {
-    name = "system-image-10-default-x86";
-    path = "system-images/android-10/default/x86";
-    revision = "10-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip";
-      sha1 = "a166d5ccbb165e1dd5464fbfeec30a61f77790d8";
-    };
-  };
-  "15".default."x86" = {
-    name = "system-image-15-default-x86";
-    path = "system-images/android-15/default/x86";
-    revision = "15-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-15_r05.zip";
-      sha1 = "c387e0efed2cdc610e5944eea67b7b692d03760c";
-    };
-  };
-  "16".default."x86" = {
-    name = "system-image-16-default-x86";
-    path = "system-images/android-16/default/x86";
-    revision = "16-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip";
-      sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd";
-    };
-  };
-  "17".default."x86" = {
-    name = "system-image-17-default-x86";
-    path = "system-images/android-17/default/x86";
-    revision = "17-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip";
-      sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec";
-    };
-  };
-  "18".default."x86" = {
-    name = "system-image-18-default-x86";
-    path = "system-images/android-18/default/x86";
-    revision = "18-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip";
-      sha1 = "7a4ced4d9b0ab48047825491b4072dc2eb9b610e";
-    };
-  };
-  "19".default."x86" = {
-    name = "system-image-19-default-x86";
-    path = "system-images/android-19/default/x86";
-    revision = "19-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip";
-      sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d";
-    };
-  };
-  "21".default."x86" = {
-    name = "system-image-21-default-x86";
-    path = "system-images/android-21/default/x86";
-    revision = "21-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip";
-      sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff";
-    };
-  };
-  "22".default."x86" = {
-    name = "system-image-22-default-x86";
-    path = "system-images/android-22/default/x86";
-    revision = "22-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip";
-      sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e";
-    };
-  };
-  "23".default."x86" = {
-    name = "system-image-23-default-x86";
-    path = "system-images/android-23/default/x86";
-    revision = "23-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip";
-      sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb";
-    };
-  };
-  "24".default."x86" = {
-    name = "system-image-24-default-x86";
-    path = "system-images/android-24/default/x86";
-    revision = "24-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip";
-      sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511";
-    };
-  };
-  "25".default."x86" = {
-    name = "system-image-25-default-x86";
-    path = "system-images/android-25/default/x86";
-    revision = "25-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip";
-      sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f";
-    };
-  };
-  "26".default."x86" = {
-    name = "system-image-26-default-x86";
-    path = "system-images/android-26/default/x86";
-    revision = "26-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip";
-      sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90";
-    };
-  };
-  "27".default."x86" = {
-    name = "system-image-27-default-x86";
-    path = "system-images/android-27/default/x86";
-    revision = "27-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip";
-      sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582";
-    };
-  };
-  "28".default."x86" = {
-    name = "system-image-28-default-x86";
-    path = "system-images/android-28/default/x86";
-    revision = "28-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip";
-      sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780";
-    };
-  };
-  "21".default."x86_64" = {
-    name = "system-image-21-default-x86_64";
-    path = "system-images/android-21/default/x86_64";
-    revision = "21-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip";
-      sha1 = "9078a095825a69e5e215713f0866c83cef65a342";
-    };
-  };
-  "22".default."x86_64" = {
-    name = "system-image-22-default-x86_64";
-    path = "system-images/android-22/default/x86_64";
-    revision = "22-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip";
-      sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4";
-    };
-  };
-  "23".default."x86_64" = {
-    name = "system-image-23-default-x86_64";
-    path = "system-images/android-23/default/x86_64";
-    revision = "23-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip";
-      sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51";
-    };
-  };
-  "24".default."x86_64" = {
-    name = "system-image-24-default-x86_64";
-    path = "system-images/android-24/default/x86_64";
-    revision = "24-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip";
-      sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684";
-    };
-  };
-  "25".default."x86_64" = {
-    name = "system-image-25-default-x86_64";
-    path = "system-images/android-25/default/x86_64";
-    revision = "25-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip";
-      sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37";
-    };
-  };
-  "26".default."x86_64" = {
-    name = "system-image-26-default-x86_64";
-    path = "system-images/android-26/default/x86_64";
-    revision = "26-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip";
-      sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3";
-    };
-  };
-  "27".default."x86_64" = {
-    name = "system-image-27-default-x86_64";
-    path = "system-images/android-27/default/x86_64";
-    revision = "27-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip";
-      sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60";
-    };
-  };
-  "28".default."x86_64" = {
-    name = "system-image-28-default-x86_64";
-    path = "system-images/android-28/default/x86_64";
-    revision = "28-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip";
-      sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0";
-    };
-  };
-}
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
deleted file mode 100644
index a67ce9cfea40..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
+++ /dev/null
@@ -1,384 +0,0 @@
-{fetchurl}:
-
-{
-  "10".google_apis."armeabi-v7a" = {
-    name = "system-image-10-google_apis-armeabi-v7a";
-    path = "system-images/android-10/google_apis/armeabi-v7a";
-    revision = "10-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip";
-      sha1 = "970abf3a2a9937a43576afd9bb56e4a8191947f8";
-    };
-  };
-  "10".google_apis."x86" = {
-    name = "system-image-10-google_apis-x86";
-    path = "system-images/android-10/google_apis/x86";
-    revision = "10-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip";
-      sha1 = "070a9552e3d358d8e72e8b2042e539e2b7a1b035";
-    };
-  };
-  "15".google_apis."x86" = {
-    name = "system-image-15-google_apis-x86";
-    path = "system-images/android-15/google_apis/x86";
-    revision = "15-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r06.zip";
-      sha1 = "a7deb32c12396b6c4fd60ad14a62e19f8bdcae20";
-    };
-  };
-  "15".google_apis."armeabi-v7a" = {
-    name = "system-image-15-google_apis-armeabi-v7a";
-    path = "system-images/android-15/google_apis/armeabi-v7a";
-    revision = "15-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip";
-      sha1 = "6deb76cf34760a6037cb18d89772c9e986d07497";
-    };
-  };
-  "16".google_apis."armeabi-v7a" = {
-    name = "system-image-16-google_apis-armeabi-v7a";
-    path = "system-images/android-16/google_apis/armeabi-v7a";
-    revision = "16-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip";
-      sha1 = "5a5ff097680c6dae473c8719296ce6d7b70edb2d";
-    };
-  };
-  "16".google_apis."x86" = {
-    name = "system-image-16-google_apis-x86";
-    path = "system-images/android-16/google_apis/x86";
-    revision = "16-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r06.zip";
-      sha1 = "b57adef2f43dd176b8c02c980c16a796021b2071";
-    };
-  };
-  "17".google_apis."armeabi-v7a" = {
-    name = "system-image-17-google_apis-armeabi-v7a";
-    path = "system-images/android-17/google_apis/armeabi-v7a";
-    revision = "17-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip";
-      sha1 = "a59f26cb5707da97e869a27d87b83477204ac594";
-    };
-  };
-  "17".google_apis."x86" = {
-    name = "system-image-17-google_apis-x86";
-    path = "system-images/android-17/google_apis/x86";
-    revision = "17-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip";
-      sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6";
-    };
-  };
-  "18".google_apis."armeabi-v7a" = {
-    name = "system-image-18-google_apis-armeabi-v7a";
-    path = "system-images/android-18/google_apis/armeabi-v7a";
-    revision = "18-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip";
-      sha1 = "7faaccabbcc5f08e410436d3f63eea42521ea974";
-    };
-  };
-  "18".google_apis."x86" = {
-    name = "system-image-18-google_apis-x86";
-    path = "system-images/android-18/google_apis/x86";
-    revision = "18-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip";
-      sha1 = "dd674d719cad61602702be4b3d98edccfbfea53e";
-    };
-  };
-  "19".google_apis."x86" = {
-    name = "system-image-19-google_apis-x86";
-    path = "system-images/android-19/google_apis/x86";
-    revision = "19-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r38.zip";
-      sha1 = "928e4ec82876c61ef53451425d10ccb840cdd0f2";
-    };
-  };
-  "19".google_apis."armeabi-v7a" = {
-    name = "system-image-19-google_apis-armeabi-v7a";
-    path = "system-images/android-19/google_apis/armeabi-v7a";
-    revision = "19-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r38.zip";
-      sha1 = "434edd2ddc39d1ca083a5fa9721c0db8ab804737";
-    };
-  };
-  "21".google_apis."x86" = {
-    name = "system-image-21-google_apis-x86";
-    path = "system-images/android-21/google_apis/x86";
-    revision = "21-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r30.zip";
-      sha1 = "37548caae9e2897fb1d2b15f7fcf624c714cb610";
-    };
-  };
-  "21".google_apis."x86_64" = {
-    name = "system-image-21-google_apis-x86_64";
-    path = "system-images/android-21/google_apis/x86_64";
-    revision = "21-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r30.zip";
-      sha1 = "82d34fdaae2916bd4d48a4f144db51e4e5719aa4";
-    };
-  };
-  "21".google_apis."armeabi-v7a" = {
-    name = "system-image-21-google_apis-armeabi-v7a";
-    path = "system-images/android-21/google_apis/armeabi-v7a";
-    revision = "21-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r30.zip";
-      sha1 = "bbdbbb3c4387752a8f28718a3190d901c0378058";
-    };
-  };
-  "22".google_apis."x86" = {
-    name = "system-image-22-google_apis-x86";
-    path = "system-images/android-22/google_apis/x86";
-    revision = "22-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r24.zip";
-      sha1 = "e4cd95b1c0837fc12d6544742e82d8ef344c8758";
-    };
-  };
-  "22".google_apis."armeabi-v7a" = {
-    name = "system-image-22-google_apis-armeabi-v7a";
-    path = "system-images/android-22/google_apis/armeabi-v7a";
-    revision = "22-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r24.zip";
-      sha1 = "d2b7ca5f8259c6e4b3cfa5a0d77e4a088899cfb0";
-    };
-  };
-  "22".google_apis."x86_64" = {
-    name = "system-image-22-google_apis-x86_64";
-    path = "system-images/android-22/google_apis/x86_64";
-    revision = "22-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r24.zip";
-      sha1 = "cde738f9353606af69ad7b4e625c957a4d603f27";
-    };
-  };
-  "23".google_apis."x86" = {
-    name = "system-image-23-google_apis-x86";
-    path = "system-images/android-23/google_apis/x86";
-    revision = "23-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r31.zip";
-      sha1 = "877cf79f5198fa53351eab08ba9ce162dc84f7ba";
-    };
-  };
-  "23".google_apis."x86_64" = {
-    name = "system-image-23-google_apis-x86_64";
-    path = "system-images/android-23/google_apis/x86_64";
-    revision = "23-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r31.zip";
-      sha1 = "342c39df061804ee0d5bc671147e90dead3d6665";
-    };
-  };
-  "23".google_apis."armeabi-v7a" = {
-    name = "system-image-23-google_apis-armeabi-v7a";
-    path = "system-images/android-23/google_apis/armeabi-v7a";
-    revision = "23-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r31.zip";
-      sha1 = "da0a07800b4eec53fcdb2e5c3b69a9a5d7a6b8a6";
-    };
-  };
-  "24".google_apis."x86" = {
-    name = "system-image-24-google_apis-x86";
-    path = "system-images/android-24/google_apis/x86";
-    revision = "24-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r25.zip";
-      sha1 = "53dba25eed8359aba394a1be1c7ccb741a459ec0";
-    };
-  };
-  "24".google_apis."x86_64" = {
-    name = "system-image-24-google_apis-x86_64";
-    path = "system-images/android-24/google_apis/x86_64";
-    revision = "24-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r25.zip";
-      sha1 = "d757dd13ad9b0ba4dd872660e31b6506f60dcf32";
-    };
-  };
-  "24".google_apis."armeabi-v7a" = {
-    name = "system-image-24-google_apis-armeabi-v7a";
-    path = "system-images/android-24/google_apis/armeabi-v7a";
-    revision = "24-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r25.zip";
-      sha1 = "9a0ec5e9a239a7a6889364e44e9fa4fcd0052c6b";
-    };
-  };
-  "24".google_apis."arm64-v8a" = {
-    name = "system-image-24-google_apis-arm64-v8a";
-    path = "system-images/android-24/google_apis/arm64-v8a";
-    revision = "24-google_apis-arm64-v8a";
-    displayName = "Google APIs ARM 64 v8a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r25.zip";
-      sha1 = "5ff407d439e3c595ce9221f445a31dcc35df5a86";
-    };
-  };
-  "25".google_apis."x86" = {
-    name = "system-image-25-google_apis-x86";
-    path = "system-images/android-25/google_apis/x86";
-    revision = "25-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r16.zip";
-      sha1 = "562e3335c6334b8d1947bb9efb90f8d82f2d3e4d";
-    };
-  };
-  "25".google_apis."x86_64" = {
-    name = "system-image-25-google_apis-x86_64";
-    path = "system-images/android-25/google_apis/x86_64";
-    revision = "25-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r16.zip";
-      sha1 = "e08b94903631d58964467b0b310c93642d85df6c";
-    };
-  };
-  "25".google_apis."armeabi-v7a" = {
-    name = "system-image-25-google_apis-armeabi-v7a";
-    path = "system-images/android-25/google_apis/armeabi-v7a";
-    revision = "25-google_apis-armeabi-v7a";
-    displayName = "Google APIs ARM EABI v7a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r16.zip";
-      sha1 = "4c49e0edb845b0bf1f231cb0e8598b1a9f9aa9c8";
-    };
-  };
-  "25".google_apis."arm64-v8a" = {
-    name = "system-image-25-google_apis-arm64-v8a";
-    path = "system-images/android-25/google_apis/arm64-v8a";
-    revision = "25-google_apis-arm64-v8a";
-    displayName = "Google APIs ARM 64 v8a System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r16.zip";
-      sha1 = "33ffbd335d9a6dc8d9843469d0963091566b3167";
-    };
-  };
-  "26".google_apis."x86" = {
-    name = "system-image-26-google_apis-x86";
-    path = "system-images/android-26/google_apis/x86";
-    revision = "26-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r14.zip";
-      sha1 = "935da6794d5f64f7ae20a1f352929cb7e3b20cba";
-    };
-  };
-  "26".google_apis."x86_64" = {
-    name = "system-image-26-google_apis-x86_64";
-    path = "system-images/android-26/google_apis/x86_64";
-    revision = "26-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r14.zip";
-      sha1 = "965631f0554ca9027ac465ba147baa6a6a22fcce";
-    };
-  };
-  "27".google_apis."x86" = {
-    name = "system-image-27-google_apis-x86";
-    path = "system-images/android-27/google_apis/x86";
-    revision = "27-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r09.zip";
-      sha1 = "ab009fc1308ded01539af4f8233b252d411145bc";
-    };
-  };
-  "28".google_apis."x86" = {
-    name = "system-image-28-google_apis-x86";
-    path = "system-images/android-28/google_apis/x86";
-    revision = "28-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r09.zip";
-      sha1 = "7c84ba5cbc009132ce38df52830c17b9bffc54bb";
-    };
-  };
-  "28".google_apis."x86_64" = {
-    name = "system-image-28-google_apis-x86_64";
-    path = "system-images/android-28/google_apis/x86_64";
-    revision = "28-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r09.zip";
-      sha1 = "eeb066346d29194e5b9387a0c0dd0f9e2a570b70";
-    };
-  };
-  "29".google_apis."x86" = {
-    name = "system-image-29-google_apis-x86";
-    path = "system-images/android-29/google_apis/x86";
-    revision = "29-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r09.zip";
-      sha1 = "33d71d17138ea322dec2dea6d8198aebf4767ab3";
-    };
-  };
-  "29".google_apis."x86_64" = {
-    name = "system-image-29-google_apis-x86_64";
-    path = "system-images/android-29/google_apis/x86_64";
-    revision = "29-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r09.zip";
-      sha1 = "0aa76b20a7ad30f2e41bc21b897b848d82533d26";
-    };
-  };
-  "R".google_apis."x86" = {
-    name = "system-image-R-google_apis-x86";
-    path = "system-images/android-R/google_apis/x86";
-    revision = "R-google_apis-x86";
-    displayName = "Google APIs Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-R_r01.zip";
-      sha1 = "4e260bef94760eecba3224b68c1a4fed0fb89485";
-    };
-  };
-  "R".google_apis."x86_64" = {
-    name = "system-image-R-google_apis-x86_64";
-    path = "system-images/android-R/google_apis/x86_64";
-    revision = "R-google_apis-x86_64";
-    displayName = "Google APIs Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-R_r01.zip";
-      sha1 = "ae12e1c3e1b36043a299359850e9315f47262f81";
-    };
-  };
-}
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
deleted file mode 100644
index 554f4b2df99e..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{fetchurl}:
-
-{
-  "24".google_apis_playstore."x86" = {
-    name = "system-image-24-google_apis_playstore-x86";
-    path = "system-images/android-24/google_apis_playstore/x86";
-    revision = "24-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip";
-      sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22";
-    };
-  };
-  "25".google_apis_playstore."x86" = {
-    name = "system-image-25-google_apis_playstore-x86";
-    path = "system-images/android-25/google_apis_playstore/x86";
-    revision = "25-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip";
-      sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c";
-    };
-  };
-  "26".google_apis_playstore."x86" = {
-    name = "system-image-26-google_apis_playstore-x86";
-    path = "system-images/android-26/google_apis_playstore/x86";
-    revision = "26-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip";
-      sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19";
-    };
-  };
-  "27".google_apis_playstore."x86" = {
-    name = "system-image-27-google_apis_playstore-x86";
-    path = "system-images/android-27/google_apis_playstore/x86";
-    revision = "27-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip";
-      sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d";
-    };
-  };
-  "28".google_apis_playstore."x86" = {
-    name = "system-image-28-google_apis_playstore-x86";
-    path = "system-images/android-28/google_apis_playstore/x86";
-    revision = "28-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r08.zip";
-      sha1 = "5381f9d52a3bf1967c9c92a25b20012cd68764c8";
-    };
-  };
-  "28".google_apis_playstore."x86_64" = {
-    name = "system-image-28-google_apis_playstore-x86_64";
-    path = "system-images/android-28/google_apis_playstore/x86_64";
-    revision = "28-google_apis_playstore-x86_64";
-    displayName = "Google Play Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip";
-      sha1 = "a767da996fdea7a1f5632a9206fa5c009d6e580c";
-    };
-  };
-}
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/lldb.nix b/nixpkgs/pkgs/development/mobile/androidenv/lldb.nix
deleted file mode 100644
index e8a158c01ec7..000000000000
--- a/nixpkgs/pkgs/development/mobile/androidenv/lldb.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
-
-deployAndroidPackage {
-  inherit package os;
-  buildInputs = [ autoPatchelfHook ]
-    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl_1_0_2.out pkgs.ncurses5 ];
-  patchInstructions = lib.optionalString (os == "linux") ''
-    addAutoPatchelfSearchPath $packageBaseDir/lib
-    autoPatchelf $packageBaseDir/lib
-    autoPatchelf $packageBaseDir/bin
-  '';
-}
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb b/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb
new file mode 100644
index 000000000000..208a544c90f6
--- /dev/null
+++ b/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb
@@ -0,0 +1,321 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'nokogiri'
+require 'slop'
+
+# Returns a repo URL for a given package name.
+def repo_url value
+  if value && value.start_with?('http')
+    value
+  elsif value
+    "https://dl.google.com/android/repository/#{value}"
+  else
+    nil
+  end
+end
+
+# Returns a system image URL for a given system image name.
+def image_url value, dir
+  if value && value.start_with?('http')
+    value
+  elsif value
+    "https://dl.google.com/android/repository/sys-img/#{dir}/#{value}"
+  else
+    nil
+  end
+end
+
+# Returns a tuple of [type, revision, revision components] for a package node.
+def package_revision package
+  type_details = package.at_css('> type-details')
+  type = type_details.attributes['type']
+  type &&= type.value
+
+  revision = nil
+  components = nil
+
+  case type
+  when 'generic:genericDetailsType', 'addon:extraDetailsType', 'addon:mavenType'
+    major = text package.at_css('> revision > major')
+    minor = text package.at_css('> revision > minor')
+    micro = text package.at_css('> revision > micro')
+    preview = text package.at_css('> revision > preview')
+
+    revision = ''
+    components = []
+    unless empty?(major)
+      revision << major
+      components << major
+    end
+
+    unless empty?(minor)
+      revision << ".#{minor}"
+      components << minor
+    end
+
+    unless empty?(micro)
+      revision << ".#{micro}"
+      components << micro
+    end
+
+    unless empty?(preview)
+      revision << "-rc#{preview}"
+      components << preview
+    end
+  when 'sdk:platformDetailsType'
+    codename = text type_details.at_css('> codename')
+    api_level = text type_details.at_css('> api-level')
+    revision = empty?(codename) ? api_level : codename
+    components = [revision]
+  when 'sdk:sourceDetailsType'
+    api_level = text type_details.at_css('> api-level')
+    revision, components = api_level, [api_level]
+  when 'sys-img:sysImgDetailsType'
+    codename = text type_details.at_css('> codename')
+    api_level = text type_details.at_css('> api-level')
+    id = text type_details.at_css('> tag > id')
+    abi = text type_details.at_css('> abi')
+
+    revision = ''
+    components = []
+    if empty?(codename)
+      revision << api_level
+      components << api_level
+    else
+      revision << codename
+      components << codename
+    end
+
+    unless empty?(id)
+      revision << "-#{id}"
+      components << id
+    end
+
+    unless empty?(abi)
+      revision << "-#{abi}"
+      components << abi
+    end
+  when 'addon:addonDetailsType' then
+    api_level = text type_details.at_css('> api-level')
+    id = text type_details.at_css('> tag > id')
+    revision = api_level
+    components = [api_level, id]
+  end
+
+  [type, revision, components]
+end
+
+# Returns a hash of archives for the specified package node.
+def package_archives package
+  archives = {}
+  package.css('> archives > archive').each do |archive|
+    host_os = text archive.at_css('> host-os')
+    host_os = 'all' if empty?(host_os)
+    archives[host_os] = {
+      'size' => Integer(text(archive.at_css('> complete > size'))),
+      'sha1' => text(archive.at_css('> complete > checksum')),
+      'url' => yield(text(archive.at_css('> complete > url')))
+    }
+  end
+  archives
+end
+
+# Returns the text from a node, or nil.
+def text node
+  node ? node.text : nil
+end
+
+# Nil or empty helper.
+def empty? value
+  !value || value.empty?
+end
+
+# Fixes up returned hashes by sorting keys.
+# Will also convert archives (e.g. {'linux' => {'sha1' => ...}, 'macosx' => ...} to
+# [{'os' => 'linux', 'sha1' => ...}, {'os' => 'macosx', ...}, ...].
+def fixup value
+  Hash[value.map do |k, v|
+    if k == 'archives' && v.is_a?(Hash)
+      [k, v.map do |os, archive|
+        fixup({'os' => os}.merge(archive))
+      end]
+    elsif v.is_a?(Hash)
+      [k, fixup(v)]
+    else
+      [k, v]
+    end
+  end.sort {|(k1, v1), (k2, v2)| k1 <=> k2}]
+end
+
+# Normalize the specified license text.
+# See: https://brash-snapper.glitch.me/ for how the munging works.
+def normalize_license license
+  license = license.dup
+  license.gsub!(/([^\n])\n([^\n])/m, '\1 \2')
+  license.gsub!(/ +/, ' ')
+  license
+end
+
+# Gets all license texts, deduplicating them.
+def get_licenses doc
+  licenses = {}
+  doc.css('license[type="text"]').each do |license_node|
+    license_id = license_node['id']
+    if license_id
+      licenses[license_id] ||= []
+      licenses[license_id] |= [normalize_license(text(license_node))]
+    end
+  end
+  licenses
+end
+
+def parse_package_xml doc
+  licenses = get_licenses doc
+  packages = {}
+
+  doc.css('remotePackage').each do |package|
+    name, _, version = package['path'].partition(';')
+    next if version == 'latest'
+
+    type, revision, _ = package_revision(package)
+    next unless revision
+
+    path = package['path'].tr(';', '/')
+    display_name = text package.at_css('> display-name')
+    uses_license = package.at_css('> uses-license')
+    uses_license &&= uses_license['ref']
+    archives = package_archives(package) {|url| repo_url url}
+
+    target = (packages[name] ||= {})
+    target = (target[revision] ||= {})
+
+    target['name'] ||= name
+    target['path'] ||= path
+    target['revision'] ||= revision
+    target['displayName'] ||= display_name
+    target['license'] ||= uses_license if uses_license
+    target['archives'] ||= {}
+    merge target['archives'], archives
+  end
+
+  [licenses, packages]
+end
+
+def parse_image_xml doc
+  licenses = get_licenses doc
+  images = {}
+
+  doc.css('remotePackage[path^="system-images;"]').each do |package|
+    type, revision, components = package_revision(package)
+    next unless revision
+
+    path = package['path'].tr(';', '/')
+    display_name = text package.at_css('> display-name')
+    uses_license = package.at_css('> uses-license')
+    uses_license &&= uses_license['ref']
+    archives = package_archives(package) {|url| image_url url, components[-2]}
+
+    target = images
+    components.each do |component|
+      target = (target[component] ||= {})
+    end
+
+    target['name'] ||= "system-image-#{revision}"
+    target['path'] ||= path
+    target['revision'] ||= revision
+    target['displayName'] ||= display_name
+    target['license'] ||= uses_license if uses_license
+    target['archives'] ||= {}
+    merge target['archives'], archives
+  end
+
+  [licenses, images]
+end
+
+def parse_addon_xml doc
+  licenses = get_licenses doc
+  addons, extras = {}, {}
+
+  doc.css('remotePackage').each do |package|
+    type, revision, components = package_revision(package)
+    next unless revision
+
+    path = package['path'].tr(';', '/')
+    display_name = text package.at_css('> display-name')
+    uses_license = package.at_css('> uses-license')
+    uses_license &&= uses_license['ref']
+    archives = package_archives(package) {|url| repo_url url}
+
+    case type
+    when 'addon:addonDetailsType'
+      name = components.last
+      target = addons
+
+      # Hack for Google APIs 25 r1, which displays as 23 for some reason
+      archive_name = text package.at_css('> archives > archive > complete > url')
+      if archive_name == 'google_apis-25_r1.zip'
+        path = 'add-ons/addon-google_apis-google-25'
+        revision = '25'
+        components = [revision, components.last]
+      end
+    when 'addon:extraDetailsType', 'addon:mavenType'
+      name = package['path'].tr(';', '-')
+      components = [package['path']]
+      target = extras
+    end
+
+    components.each do |component|
+      target = (target[component] ||= {})
+    end
+
+    target['name'] ||= name
+    target['path'] ||= path
+    target['revision'] ||= revision
+    target['displayName'] ||= display_name
+    target['license'] ||= uses_license if uses_license
+    target['archives'] ||= {}
+    merge target['archives'], archives
+  end
+
+  [licenses, addons, extras]
+end
+
+def merge dest, src
+  dest.merge! src
+end
+
+opts = Slop.parse do |o|
+  o.array '-p', '--packages', 'packages repo XMLs to parse'
+  o.array '-i', '--images', 'system image repo XMLs to parse'
+  o.array '-a', '--addons', 'addon repo XMLs to parse'
+end
+
+result = {
+  licenses: {},
+  packages: {},
+  images: {},
+  addons: {},
+  extras: {}
+}
+
+opts[:packages].each do |filename|
+  licenses, packages = parse_package_xml(Nokogiri::XML(File.open(filename)))
+  merge result[:licenses], licenses
+  merge result[:packages], packages
+end
+
+opts[:images].each do |filename|
+  licenses, images = parse_image_xml(Nokogiri::XML(File.open(filename)))
+  merge result[:licenses], licenses
+  merge result[:images], images
+end
+
+opts[:addons].each do |filename|
+  licenses, addons, extras = parse_addon_xml(Nokogiri::XML(File.open(filename)))
+  merge result[:licenses], licenses
+  merge result[:addons], addons
+  merge result[:extras], extras
+end
+
+puts JSON.pretty_generate(fixup(result))
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.sh b/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.sh
new file mode 100755
index 000000000000..fd7e22457f02
--- /dev/null
+++ b/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p "ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ])"
+
+set -e
+
+pushd "$(dirname "$0")" &>/dev/null || exit 1
+
+echo "Writing repo.json" >&2
+ruby mkrepo.rb \
+    --packages ./xml/repository2-1.xml \
+    --images ./xml/android-sys-img2-1.xml \
+    --images ./xml/android-tv-sys-img2-1.xml \
+    --images ./xml/android-wear-cn-sys-img2-1.xml \
+    --images ./xml/android-wear-sys-img2-1.xml \
+    --images ./xml/google_apis-sys-img2-1.xml \
+    --images ./xml/google_apis_playstore-sys-img2-1.xml \
+    --addons ./xml/addon2-1.xml > repo.json
+
+popd &>/dev/null
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index ca305e0398d5..f74b949a7b3c 100644
--- a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -9,14 +9,14 @@ let
 in
 deployAndroidPackage {
   inherit package os;
-  buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ]
-    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ];
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+  buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ];
   patchInstructions = lib.optionalString (os == "linux") (''
     patchShebangs .
 
   '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) ''
     patch -p1 \
-      --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
+      --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true
     wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
   '' + ''
 
@@ -24,33 +24,35 @@ deployAndroidPackage {
     rm -rf docs tests
 
     # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
+    if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then
+        addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
+    fi
 
-    addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
-    find toolchains -type d -name bin | while read dir
-    do
+    if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64 ]; then
+        addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64
+    fi
+
+    find toolchains -type d -name bin -or -name lib64 | while read dir; do
         autoPatchelf "$dir"
     done
 
     # fix ineffective PROGDIR / MYNDKDIR determination
-    for i in ndk-build
-    do
-        sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i
+    for progname in ndk-build; do
+        sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $progname
     done
 
     # Patch executables
     autoPatchelf prebuilt/linux-x86_64
 
     # wrap
-    for i in ndk-build
-    do
-        wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+    for progname in ndk-build; do
+        wrapProgram "$(pwd)/$progname" --prefix PATH : "${runtime_paths}"
     done
 
     # make some executables available in PATH
     mkdir -p $out/bin
-    for i in ndk-build
-    do
-        ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
+    for progname in ndk-build; do
+        ln -sf ../libexec/android-sdk/ndk-bundle/$progname $out/bin/$progname
     done
   '');
   noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/querypackages.sh b/nixpkgs/pkgs/development/mobile/androidenv/querypackages.sh
index 0f31396b8766..4abf4f936405 100644..100755
--- a/nixpkgs/pkgs/development/mobile/androidenv/querypackages.sh
+++ b/nixpkgs/pkgs/development/mobile/androidenv/querypackages.sh
@@ -1,27 +1,23 @@
-#!/bin/sh -e
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p jq
 
-if [ "$1" = "" ]
-then
-    echo "Please select a package set: 'packages', 'addons', 'system-images'" >&2
+set -e
+
+pushd "$(dirname "$0")" &>/dev/null || exit 1
+
+if [ "$1" == '' ]; then
+    echo "Please select a group: 'packages', 'images', 'addons', 'extras', or 'licenses'" >&2
     exit 1
 fi
 
-if [ "$2" = "" ]
-then
-    echo "Please select a package group:" >&2
-    ( cat <<EOF
-builtins.attrNames (import ./generated/$1.nix {
-  fetchurl = null;
-})
-EOF
-) | nix-instantiate --eval-only -
+namespace="$1"
 
-    exit 1
+if [ "$namespace" == 'licenses' ]; then
+    jq -r '.licenses | keys | join("\n")' < repo.json
+else
+    jq -r --arg NAMESPACE "$namespace" \
+        '.[$NAMESPACE] | paths as $path | getpath($path) as $v | select($path[-1] == "displayName") | [[$NAMESPACE] + $path[:-1] | map("\"" + . + "\"") | join("."), $v] | join(": ")' \
+        < repo.json
 fi
 
-( cat <<EOF
-builtins.attrNames (import ./generated/$1.nix {
-  fetchurl = null;
-}).$2
-EOF
-) | nix-instantiate --eval-only -
+popd &>/dev/null
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/repo.json b/nixpkgs/pkgs/development/mobile/androidenv/repo.json
new file mode 100644
index 000000000000..f3606279c5a9
--- /dev/null
+++ b/nixpkgs/pkgs/development/mobile/androidenv/repo.json
@@ -0,0 +1,5343 @@
+{
+  "addons": {
+    "10": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "cc0711857c881fa7534f90cf8cc09b8fe985484d",
+            "size": 65781578,
+            "url": "https://dl.google.com/android/repository/google_apis-10_r02.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-10",
+        "revision": "10"
+      }
+    },
+    "11": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "5eab5e81addee9f3576d456d205208314b5146a5",
+            "size": 83477179,
+            "url": "https://dl.google.com/android/repository/google_apis-11_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-11",
+        "revision": "11"
+      }
+    },
+    "12": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "e9999f4fa978812174dfeceec0721c793a636e5d",
+            "size": 86099835,
+            "url": "https://dl.google.com/android/repository/google_apis-12_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-12",
+        "revision": "12"
+      },
+      "google_tv_addon": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "92128a12e7e8b0fb5bac59153d7779b717e7b840",
+            "size": 78266751,
+            "url": "https://dl.google.com/android/repository/google_tv-12_r02.zip"
+          }
+        ],
+        "displayName": "Google TV Addon",
+        "license": "android-googletv-license",
+        "name": "google_tv_addon",
+        "path": "add-ons/addon-google_tv_addon-google-12",
+        "revision": "12"
+      }
+    },
+    "13": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "3b153edd211c27dc736c893c658418a4f9041417",
+            "size": 88615525,
+            "url": "https://dl.google.com/android/repository/google_apis-13_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-13",
+        "revision": "13"
+      },
+      "google_tv_addon": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09",
+            "size": 87721879,
+            "url": "https://dl.google.com/android/repository/google_tv-13_r01.zip"
+          }
+        ],
+        "displayName": "Google TV Addon",
+        "license": "android-googletv-license",
+        "name": "google_tv_addon",
+        "path": "add-ons/addon-google_tv_addon-google-13",
+        "revision": "13"
+      }
+    },
+    "14": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39",
+            "size": 106533714,
+            "url": "https://dl.google.com/android/repository/google_apis-14_r02.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-14",
+        "revision": "14"
+      }
+    },
+    "15": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "d0d2bf26805eb271693570a1aaec33e7dc3f45e9",
+            "size": 106624396,
+            "url": "https://dl.google.com/android/repository/google_apis-15_r03.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-15",
+        "revision": "15"
+      }
+    },
+    "16": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "ee6acf1b01020bfa8a8e24725dbc4478bee5e792",
+            "size": 127341982,
+            "url": "https://dl.google.com/android/repository/google_apis-16_r04.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-16",
+        "revision": "16"
+      }
+    },
+    "17": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "a076be0677f38df8ca5536b44dfb411a0c808c4f",
+            "size": 137231243,
+            "url": "https://dl.google.com/android/repository/google_apis-17_r04.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-17",
+        "revision": "17"
+      }
+    },
+    "18": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "6109603409debdd40854d4d4a92eaf8481462c8b",
+            "size": 143195183,
+            "url": "https://dl.google.com/android/repository/google_apis-18_r04.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-18",
+        "revision": "18"
+      }
+    },
+    "19": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "5b933abe830b2f25b4c0f171d45e9e0651e56311",
+            "size": 147081,
+            "url": "https://dl.google.com/android/repository/google_apis-19_r20.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-19",
+        "revision": "19"
+      }
+    },
+    "21": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "66a754efb24e9bb07cc51648426443c7586c9d4a",
+            "size": 179499,
+            "url": "https://dl.google.com/android/repository/google_apis-21_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-21",
+        "revision": "21"
+      }
+    },
+    "22": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "5def0f42160cba8acff51b9c0c7e8be313de84f5",
+            "size": 179259,
+            "url": "https://dl.google.com/android/repository/google_apis-22_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-22",
+        "revision": "22"
+      }
+    },
+    "23": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "04c5cc1a7c88967250ebba9561d81e24104167db",
+            "size": 179900,
+            "url": "https://dl.google.com/android/repository/google_apis-23_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-23",
+        "revision": "23"
+      }
+    },
+    "24": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "31361c2868f27343ee917fbd259c1463821b6145",
+            "size": 154865,
+            "url": "https://dl.google.com/android/repository/google_apis-24_r1.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-24",
+        "revision": "24"
+      }
+    },
+    "25": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "550e83eea9513ab11c44919ac6da54b36084a9f3",
+            "size": 154871,
+            "url": "https://dl.google.com/android/repository/google_apis-25_r1.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-25",
+        "revision": "25"
+      }
+    },
+    "3": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "1f92abf3a76be66ae8032257fc7620acbd2b2e3a",
+            "size": 34908058,
+            "url": "https://dl.google.com/android/repository/google_apis-3-r03.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-3",
+        "revision": "3"
+      }
+    },
+    "4": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "9b6e86d8568558de4d606a7debc4f6049608dbd0",
+            "size": 42435735,
+            "url": "https://dl.google.com/android/repository/google_apis-4_r02.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-4",
+        "revision": "4"
+      }
+    },
+    "5": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "46eaeb56b645ee7ffa24ede8fa17f3df70db0503",
+            "size": 49123776,
+            "url": "https://dl.google.com/android/repository/google_apis-5_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-5",
+        "revision": "5"
+      }
+    },
+    "6": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "5ff545d96e031e09580a6cf55713015c7d4936b2",
+            "size": 53382941,
+            "url": "https://dl.google.com/android/repository/google_apis-6_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-6",
+        "revision": "6"
+      }
+    },
+    "7": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac",
+            "size": 53691339,
+            "url": "https://dl.google.com/android/repository/google_apis-7_r01.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-7",
+        "revision": "7"
+      }
+    },
+    "8": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "3079958e7ec87222cac1e6b27bc471b27bf2c352",
+            "size": 59505020,
+            "url": "https://dl.google.com/android/repository/google_apis-8_r02.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-8",
+        "revision": "8"
+      }
+    },
+    "9": {
+      "google_apis": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "78664645a1e9accea4430814f8694291a7f1ea5d",
+            "size": 63401546,
+            "url": "https://dl.google.com/android/repository/google_apis-9_r02.zip"
+          }
+        ],
+        "displayName": "Google APIs",
+        "license": "android-sdk-license",
+        "name": "google_apis",
+        "path": "add-ons/addon-google_apis-google-9",
+        "revision": "9"
+      }
+    }
+  },
+  "extras": {
+    "extras;android;m2repository": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "a0d22beacc106a6977321f2b07d692ce4979e96a",
+          "size": 355529608,
+          "url": "https://dl.google.com/android/repository/android_m2repository_r47.zip"
+        }
+      ],
+      "displayName": "Android Support Repository",
+      "license": "android-sdk-license",
+      "name": "extras-android-m2repository",
+      "path": "extras/android/m2repository",
+      "revision": "47.0.0"
+    },
+    "extras;google;Android_Emulator_Hypervisor_Driver": {
+      "archives": [
+        {
+          "os": "windows",
+          "sha1": "9b3479ce8f42fdcbd487aa843a2453d5950f5fc9",
+          "size": 164505,
+          "url": "https://dl.google.com/android/repository/gvm-windows_v1_6_0.zip"
+        }
+      ],
+      "displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer)",
+      "license": "android-sdk-license",
+      "name": "extras-google-Android_Emulator_Hypervisor_Driver",
+      "path": "extras/google/Android_Emulator_Hypervisor_Driver",
+      "revision": "1.6.0"
+    },
+    "extras;google;admob_ads_sdk": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82",
+          "size": 704512,
+          "url": "https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip"
+        }
+      ],
+      "displayName": "Google AdMob Ads SDK",
+      "license": "android-sdk-license",
+      "name": "extras-google-admob_ads_sdk",
+      "path": "extras/google/admob_ads_sdk",
+      "revision": "11"
+    },
+    "extras;google;analytics_sdk_v2": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "dc14026bf0ce78315cb5dd00552607de0894de83",
+          "size": 211432,
+          "url": "https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip"
+        }
+      ],
+      "displayName": "Google Analytics App Tracking SDK",
+      "license": "android-sdk-license",
+      "name": "extras-google-analytics_sdk_v2",
+      "path": "extras/google/analytics_sdk_v2",
+      "revision": "3"
+    },
+    "extras;google;auto": {
+      "archives": [
+        {
+          "os": "linux",
+          "sha1": "202a6e1b3009a0eb815f8c672d2d5b3717de6169",
+          "size": 1346009,
+          "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip"
+        },
+        {
+          "os": "macosx",
+          "sha1": "8179cbb3914493ebc5eb65b731cba061582f2e84",
+          "size": 2375533,
+          "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip"
+        },
+        {
+          "os": "windows",
+          "sha1": "99c4a7172d73673552119347bc24c58b47da177b",
+          "size": 2691901,
+          "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r01.1.zip"
+        }
+      ],
+      "displayName": "Android Auto Desktop Head Unit emulator",
+      "license": "android-sdk-license",
+      "name": "extras-google-auto",
+      "path": "extras/google/auto",
+      "revision": "1.1"
+    },
+    "extras;google;gcm": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf",
+          "size": 5901400,
+          "url": "https://dl.google.com/android/repository/gcm_r03.zip"
+        }
+      ],
+      "displayName": "Google Cloud Messaging for Android Library",
+      "license": "android-sdk-license",
+      "name": "extras-google-gcm",
+      "path": "extras/google/gcm",
+      "revision": "3"
+    },
+    "extras;google;google_play_services": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "f95bf19634e2ab0430923247fe2c50246432d2e9",
+          "size": 15456884,
+          "url": "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip"
+        }
+      ],
+      "displayName": "Google Play services",
+      "license": "android-sdk-license",
+      "name": "extras-google-google_play_services",
+      "path": "extras/google/google_play_services",
+      "revision": "49"
+    },
+    "extras;google;google_play_services_froyo": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "92558dbc380bba3d55d0ec181167fb05ce7c79d9",
+          "size": 5265389,
+          "url": "https://dl.google.com/android/repository/google_play_services_3265130_r12.zip"
+        }
+      ],
+      "displayName": "Google Play services for Froyo",
+      "license": "android-sdk-license",
+      "name": "extras-google-google_play_services_froyo",
+      "path": "extras/google/google_play_services_froyo",
+      "revision": "12"
+    },
+    "extras;google;instantapps": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20",
+          "size": 39524850,
+          "url": "https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip"
+        }
+      ],
+      "displayName": "Google Play Instant Development SDK",
+      "license": "android-sdk-license",
+      "name": "extras-google-instantapps",
+      "path": "extras/google/instantapps",
+      "revision": "1.9.0"
+    },
+    "extras;google;m2repository": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "05086add9e3a0eb1b67111108d7757a4337c3f10",
+          "size": 215426029,
+          "url": "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip"
+        }
+      ],
+      "displayName": "Google Repository",
+      "license": "android-sdk-license",
+      "name": "extras-google-m2repository",
+      "path": "extras/google/m2repository",
+      "revision": "58"
+    },
+    "extras;google;market_apk_expansion": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "5305399dc1a56814e86b8459ce24871916f78b8c",
+          "size": 110201,
+          "url": "https://dl.google.com/android/repository/market_apk_expansion-r03.zip"
+        }
+      ],
+      "displayName": "Google Play APK Expansion library",
+      "license": "android-sdk-license",
+      "name": "extras-google-market_apk_expansion",
+      "path": "extras/google/market_apk_expansion",
+      "revision": "1"
+    },
+    "extras;google;market_licensing": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "355e8dc304a92a5616db235af8ee7bd554356254",
+          "size": 75109,
+          "url": "https://dl.google.com/android/repository/market_licensing-r02.zip"
+        }
+      ],
+      "displayName": "Google Play Licensing Library",
+      "license": "android-sdk-license",
+      "name": "extras-google-market_licensing",
+      "path": "extras/google/market_licensing",
+      "revision": "1"
+    },
+    "extras;google;simulators": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "4fb5344e34e8faab4db18af07dace44c50db26a7",
+          "size": 2167286,
+          "url": "https://dl.google.com/android/repository/simulator_r01.zip"
+        }
+      ],
+      "displayName": "Android Auto API Simulators",
+      "license": "android-sdk-license",
+      "name": "extras-google-simulators",
+      "path": "extras/google/simulators",
+      "revision": "1"
+    },
+    "extras;google;usb_driver": {
+      "archives": [
+        {
+          "os": "windows",
+          "sha1": "08a48c39084e9443f6146c239cbd3be6f91e681b",
+          "size": 8682039,
+          "url": "https://dl.google.com/android/repository/usb_driver_r13-windows.zip"
+        }
+      ],
+      "displayName": "Google USB Driver",
+      "license": "android-sdk-license",
+      "name": "extras-google-usb_driver",
+      "path": "extras/google/usb_driver",
+      "revision": "13"
+    },
+    "extras;google;webdriver": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "13f3a3b2670a5fc04a7342861644be9a01b07e38",
+          "size": 4055193,
+          "url": "https://dl.google.com/android/repository/webdriver_r02.zip"
+        }
+      ],
+      "displayName": "Google Web Driver",
+      "license": "android-sdk-license",
+      "name": "extras-google-webdriver",
+      "path": "extras/google/webdriver",
+      "revision": "2"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "b621b9d5adf273bb0725948589863e60e96eeaf1",
+          "size": 91207,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.0",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "2aa2aceecc6ba172742d0af0b43f11d03924eeb8",
+          "size": 95406,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"
+        }
+      ],
+      "displayName": "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a",
+          "size": 97549,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.0-alpha8",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "042c25575e7650e96f0f5f5d1d3c54ed38eb821a",
+          "size": 104706,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.0-beta1",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "28492fd42b20ae1586591ff906556d459cfdaae8",
+          "size": 107335,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.0-beta2",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "268e763fa64bd217d8d830e59ce76be19aaba631",
+          "size": 107593,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.0-beta3",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "2213bf37e7a2869db2635895b8e90ca6841e79d2",
+          "size": 109361,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.0-beta4",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "3918cfef73e64048d0b3e048068e208b414e7e91",
+          "size": 92284,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.0-beta5",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "76f8823def9a6da8954a54737762a6820bc1d043",
+          "size": 91823,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.1",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "96d7ff669f0e808e9833b2c2e320702826ccc8be",
+          "size": 91961,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip"
+        }
+      ],
+      "displayName": "Solver for ConstraintLayout 1.0.2",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "70acf99689b933bc6735645d5c3d92b91954b6cb",
+          "size": 39153,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.0",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "645a9be1f0c1177301e71cd0ddccf1dd67c554fe",
+          "size": 15554,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"
+        }
+      ],
+      "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "7912ba03b04831f918f523648f118c4ee4da7604",
+          "size": 24797,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.0-alpha8",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "11f2f5cec4ff02986bad75435e5be77b704b4c64",
+          "size": 31750,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.0-beta1",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "623939865ede2e5c2c975dc55963e0d182bcce95",
+          "size": 31812,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.0-beta2",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b",
+          "size": 32622,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.0-beta3",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "dc60844aab93a09a54a3c107685a77b18d7c1c39",
+          "size": 32687,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.0-beta4",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "4660f6c7a576ea1364f0c3225db71c29ca660d9a",
+          "size": 39266,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.0-beta5",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "342b0894b8651fff37586f80f383733e97aba9f9",
+          "size": 39547,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.1",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1",
+      "revision": "1"
+    },
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2": {
+      "archives": [
+        {
+          "os": "all",
+          "sha1": "3d9688a50fe0ed7348275f85d1b02278f616d8a4",
+          "size": 39625,
+          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip"
+        }
+      ],
+      "displayName": "ConstraintLayout for Android 1.0.2",
+      "license": "android-sdk-license",
+      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2",
+      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2",
+      "revision": "1"
+    }
+  },
+  "images": {
+    "10": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "970abf3a2a9937a43576afd9bb56e4a8191947f8",
+              "size": 110706432,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-10-google_apis-armeabi-v7a",
+          "path": "system-images/android-10/google_apis/armeabi-v7a",
+          "revision": "10-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "070a9552e3d358d8e72e8b2042e539e2b7a1b035",
+              "size": 118634346,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-10-google_apis-x86",
+          "path": "system-images/android-10/google_apis/x86",
+          "revision": "10-google_apis-x86"
+        }
+      }
+    },
+    "14": {
+      "default": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "d8991b0c06b18d7d6ed4169d67460ee1add6661b",
+              "size": 99621822,
+              "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_armv7a-14_r02.zip"
+            }
+          ],
+          "displayName": "ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-14-default-armeabi-v7a",
+          "path": "system-images/android-14/default/armeabi-v7a",
+          "revision": "14-default-armeabi-v7a"
+        }
+      }
+    },
+    "15": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "6deb76cf34760a6037cb18d89772c9e986d07497",
+              "size": 148773442,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-15-google_apis-armeabi-v7a",
+          "path": "system-images/android-15/google_apis/armeabi-v7a",
+          "revision": "15-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "5ef2c5481f5bb8789c0b5224d46fb2e13602a450",
+              "size": 163325511,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r07.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-15-google_apis-x86",
+          "path": "system-images/android-15/google_apis/x86",
+          "revision": "15-google_apis-x86"
+        }
+      }
+    },
+    "16": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "5a5ff097680c6dae473c8719296ce6d7b70edb2d",
+              "size": 168845378,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-16-google_apis-armeabi-v7a",
+          "path": "system-images/android-16/google_apis/armeabi-v7a",
+          "revision": "16-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "246903c75f5aa3db7fb58cac877f2201fbbfd94a",
+              "size": 186372521,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r07.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-16-google_apis-x86",
+          "path": "system-images/android-16/google_apis/x86",
+          "revision": "16-google_apis-x86"
+        }
+      }
+    },
+    "17": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "a59f26cb5707da97e869a27d87b83477204ac594",
+              "size": 174631794,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-17-google_apis-armeabi-v7a",
+          "path": "system-images/android-17/google_apis/armeabi-v7a",
+          "revision": "17-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865",
+              "size": 194811128,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r07.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-17-google_apis-x86",
+          "path": "system-images/android-17/google_apis/x86",
+          "revision": "17-google_apis-x86"
+        }
+      }
+    },
+    "18": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "7faaccabbcc5f08e410436d3f63eea42521ea974",
+              "size": 179015960,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-18-google_apis-armeabi-v7a",
+          "path": "system-images/android-18/google_apis/armeabi-v7a",
+          "revision": "18-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "dd674d719cad61602702be4b3d98edccfbfea53e",
+              "size": 199963568,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-18-google_apis-x86",
+          "path": "system-images/android-18/google_apis/x86",
+          "revision": "18-google_apis-x86"
+        }
+      }
+    },
+    "19": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "053741c7ef72c7d41394b8a09a1b86238c59c741",
+              "size": 245902018,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r40.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-19-google_apis-armeabi-v7a",
+          "path": "system-images/android-19/google_apis/armeabi-v7a",
+          "revision": "19-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "67528907f6f4479112f63097f4657dad10783f5a",
+              "size": 297020632,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r40.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-19-google_apis-x86",
+          "path": "system-images/android-19/google_apis/x86",
+          "revision": "19-google_apis-x86"
+        }
+      }
+    },
+    "21": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "7aa0a1971365de1dc7989720c643121087026564",
+              "size": 290282953,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r32.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-21-google_apis-armeabi-v7a",
+          "path": "system-images/android-21/google_apis/armeabi-v7a",
+          "revision": "21-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "c6c1d774cec79e6e71c2a24c96d0c45c043d752c",
+              "size": 319430034,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r32.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-21-google_apis-x86",
+          "path": "system-images/android-21/google_apis/x86",
+          "revision": "21-google_apis-x86"
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "e98ba60a0fc88d9a81a768e62db5850b6610baa4",
+              "size": 415495987,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r32.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom_64 System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-21-google_apis-x86_64",
+          "path": "system-images/android-21/google_apis/x86_64",
+          "revision": "21-google_apis-x86_64"
+        }
+      }
+    },
+    "22": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "6a61dd66ec8ac8e678cc19c1331047dade07509f",
+              "size": 394864140,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r26.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-22-google_apis-armeabi-v7a",
+          "path": "system-images/android-22/google_apis/armeabi-v7a",
+          "revision": "22-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "859ca1d8dcdaaf931effda3f06af95a3740b60d9",
+              "size": 421293384,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r26.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-22-google_apis-x86",
+          "path": "system-images/android-22/google_apis/x86",
+          "revision": "22-google_apis-x86"
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "f99714383c5459d747ac7cdd8043419c6adafe60",
+              "size": 579197399,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r26.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom_64 System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-22-google_apis-x86_64",
+          "path": "system-images/android-22/google_apis/x86_64",
+          "revision": "22-google_apis-x86_64"
+        }
+      }
+    },
+    "23": {
+      "google_apis": {
+        "armeabi-v7a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "d03ac51742e9d7eea559cbef4f44d18d1fc9c92d",
+              "size": 468621931,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r33.zip"
+            }
+          ],
+          "displayName": "Google APIs ARM EABI v7a System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-23-google_apis-armeabi-v7a",
+          "path": "system-images/android-23/google_apis/armeabi-v7a",
+          "revision": "23-google_apis-armeabi-v7a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "c1d91dfcbaa9f1a6b9698893ce995b2771cd6a16",
+              "size": 499428151,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r33.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-23-google_apis-x86",
+          "path": "system-images/android-23/google_apis/x86",
+          "revision": "23-google_apis-x86"
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "4d80dd38edb565641b3b34e713fe0ec6d1d77698",
+              "size": 667471680,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r33.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86 Atom_64 System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-23-google_apis-x86_64",
+          "path": "system-images/android-23/google_apis/x86_64",
+          "revision": "23-google_apis-x86_64"
+        }
+      }
+    },
+    "24": {
+      "google_apis_playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "b52e9593ffdde65c1a0970256a32e8967c89cc22",
+              "size": 812724041,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-24-google_apis_playstore-x86",
+          "path": "system-images/android-24/google_apis_playstore/x86",
+          "revision": "24-google_apis_playstore-x86"
+        }
+      }
+    },
+    "25": {
+      "google_apis_playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "6f6668954f7fd52f896fe7528aa122028c9b026c",
+              "size": 972461719,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-25-google_apis_playstore-x86",
+          "path": "system-images/android-25/google_apis_playstore/x86",
+          "revision": "25-google_apis_playstore-x86"
+        }
+      }
+    },
+    "26": {
+      "google_apis_playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "2c8bee7b97a309f099941532e63c42a7d4a06e19",
+              "size": 769390078,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom System Image",
+          "license": "android-sdk-preview-license",
+          "name": "system-image-26-google_apis_playstore-x86",
+          "path": "system-images/android-26/google_apis_playstore/x86",
+          "revision": "26-google_apis_playstore-x86"
+        }
+      }
+    },
+    "27": {
+      "google_apis_playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "eb5a944ceb691ca0648d0a6f0d93893a47223b5d",
+              "size": 758636016,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-27-google_apis_playstore-x86",
+          "path": "system-images/android-27/google_apis_playstore/x86",
+          "revision": "27-google_apis_playstore-x86"
+        }
+      }
+    },
+    "28": {
+      "google_apis_playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "97d9d4f4a2afa8b0f5d52e90748e19c10406ca93",
+              "size": 918028186,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r09.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-28-google_apis_playstore-x86",
+          "path": "system-images/android-28/google_apis_playstore/x86",
+          "revision": "28-google_apis_playstore-x86"
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "a767da996fdea7a1f5632a9206fa5c009d6e580c",
+              "size": 1037659724,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom_64 System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-28-google_apis_playstore-x86_64",
+          "path": "system-images/android-28/google_apis_playstore/x86_64",
+          "revision": "28-google_apis_playstore-x86_64"
+        }
+      }
+    },
+    "29": {
+      "google_apis_playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "windows",
+              "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970",
+              "size": 1153916727,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-windows.zip"
+            },
+            {
+              "os": "macosx",
+              "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970",
+              "size": 1153916727,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-darwin.zip"
+            },
+            {
+              "os": "linux",
+              "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970",
+              "size": 1153916727,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-linux.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-29-google_apis_playstore-x86",
+          "path": "system-images/android-29/google_apis_playstore/x86",
+          "revision": "29-google_apis_playstore-x86"
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "windows",
+              "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a",
+              "size": 1322004798,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-windows.zip"
+            },
+            {
+              "os": "macosx",
+              "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a",
+              "size": 1322004798,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-darwin.zip"
+            },
+            {
+              "os": "linux",
+              "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a",
+              "size": 1322004798,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-linux.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom_64 System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-29-google_apis_playstore-x86_64",
+          "path": "system-images/android-29/google_apis_playstore/x86_64",
+          "revision": "29-google_apis_playstore-x86_64"
+        }
+      }
+    },
+    "30": {
+      "google_apis_playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "macosx",
+              "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75",
+              "size": 1207055010,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-darwin.zip"
+            },
+            {
+              "os": "linux",
+              "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75",
+              "size": 1207055010,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-linux.zip"
+            }
+          ],
+          "displayName": "Google Play ARM 64 v8a System Image",
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-30-google_apis_playstore-arm64-v8a",
+          "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
+          "revision": "30-google_apis_playstore-arm64-v8a"
+        },
+        "x86": {
+          "archives": [
+            {
+              "os": "windows",
+              "sha1": "13c100b62983d64db53cef3d70fea789d89f3232",
+              "size": 1229340756,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-windows.zip"
+            },
+            {
+              "os": "macosx",
+              "sha1": "13c100b62983d64db53cef3d70fea789d89f3232",
+              "size": 1229340756,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-darwin.zip"
+            },
+            {
+              "os": "linux",
+              "sha1": "13c100b62983d64db53cef3d70fea789d89f3232",
+              "size": 1229340756,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-linux.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom System Image",
+          "license": "android-sdk-license",
+          "name": "system-image-30-google_apis_playstore-x86",
+          "path": "system-images/android-30/google_apis_playstore/x86",
+          "revision": "30-google_apis_playstore-x86"
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "windows",
+              "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1",
+              "size": 1404149582,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-windows.zip"
+            },
+            {
+              "os": "macosx",
+              "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1",
+              "size": 1404149582,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-darwin.zip"
+            },
+            {
+              "os": "linux",
+              "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1",
+              "size": 1404149582,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-linux.zip"
+            }
+          ],
+          "displayName": "Google Play Intel x86 Atom_64 System Image",
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-30-google_apis_playstore-x86_64",
+          "path": "system-images/android-30/google_apis_playstore/x86_64",
+          "revision": "30-google_apis_playstore-x86_64"
+        }
+      }
+    }
+  },
+  "licenses": {
+    "android-googletv-license": [
+      "Terms and Conditions\n\nThis is the Google TV Add-on for the Android Software Development Kit License Agreement.\n\n1. Introduction\n\n1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the \"Google TV Add-on\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on.\n\n1.2 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting this License Agreement\n\n2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement.\n\n2.2 You can accept this License Agreement by:\n\n(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or\n\n(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards.\n\n2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on.\n\n2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity.\n\n3. Google TV Add-on License from Google\n\n3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform.\n\n3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on.\n\n3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.\n\n3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on.\n\n4. Use of the Google TV Add-on by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so.\n\n4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy.\n\n7. Third Party Applications for the Google TV Platform\n\n7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.\n\n8. Using Google TV APIs\n\n8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services\n\n8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must:\n\n(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application;\n\n(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or\n\n(c) not create any commercial audience measurement tool or service using the Google TV API Content\n\n9. Terminating this License Agreement\n\n9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials.\n\n9.3 Google may at any time, terminate this License Agreement with you if:\n\n(A) you have breached any provision of this License Agreement; or\n\n(B) Google is required to do so by law; or\n\n(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or\n\n(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on.\n\n14. General Legal Terms\n\n14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.\n\n14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nAugust 15, 2011"
+    ],
+    "android-sdk-arm-dbt-license": [
+      "Terms and Conditions\n\nThis is the Android Software Development Kit License Agreement\n\n1. Introduction\n\n1.1 The Android Software Development Kit (referred to in the License Agreement as the \"SDK\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.3 A \"compatible implementation\" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).\n\n1.4 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n\n2. Accepting the License Agreement\n\n2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.\n\n2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.\n\n2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.\n\n\n3. SDK License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.\n\n3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.\n\n3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.\n\n3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.\n\n3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.\n\n\n4. Use of the SDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n4.7 This software enables the execution of intellectual property owned by Arm Limited. You agree that your use of the software, that allows execution of ARM Instruction Set Architecture (“ISA”) compliant executables for application development and debug only on x86 desktop, laptop, customer on-premise servers, and customer-procured cloud-based environments.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.\n\n\n7. Third Party Applications\n\n7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.\n\n\n8. Using Android APIs\n\n8.1 Google Data APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. If you use the Android Recognition Service API, documented at the following URL: https://developer.android.com/reference/android/speech/RecognitionService, as updated from time to time, you acknowledge that the use of the API is subject to the Data Processing Addendum for Products where Google is a Data Processor, which is located at the following URL: https://privacy.google.com/businesses/gdprprocessorterms/, as updated from time to time. By clicking to accept, you hereby agree to the terms of the Data Processing Addendum for Products where Google is a Data Processor.\n\n\n9. Terminating the License Agreement\n\n9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or (D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.\n\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.\n\n\n14. General Legal Terms\n\n14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nJanuary 16, 2019"
+    ],
+    "android-sdk-license": [
+      "Terms and Conditions\n\nThis is the Android Software Development Kit License Agreement\n\n1. Introduction\n\n1.1 The Android Software Development Kit (referred to in the License Agreement as the \"SDK\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.3 A \"compatible implementation\" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).\n\n1.4 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n\n2. Accepting the License Agreement\n\n2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.\n\n2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.\n\n2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.\n\n\n3. SDK License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.\n\n3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.\n\n3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.\n\n3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.\n\n3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.\n\n\n4. Use of the SDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.\n\n\n7. Third Party Applications\n\n7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.\n\n\n8. Using Android APIs\n\n8.1 Google Data APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. If you use the Android Recognition Service API, documented at the following URL: https://developer.android.com/reference/android/speech/RecognitionService, as updated from time to time, you acknowledge that the use of the API is subject to the Data Processing Addendum for Products where Google is a Data Processor, which is located at the following URL: https://privacy.google.com/businesses/gdprprocessorterms/, as updated from time to time. By clicking to accept, you hereby agree to the terms of the Data Processing Addendum for Products where Google is a Data Processor.\n\n\n9. Terminating the License Agreement\n\n9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or (D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.\n\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.\n\n\n14. General Legal Terms\n\n14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nJanuary 16, 2019"
+    ],
+    "android-sdk-preview-license": [
+      "To get started with the Android SDK Preview, you must agree to the following terms and conditions. As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.\n\nThis is the Android SDK Preview License Agreement (the \"License Agreement\").\n\n1. Introduction\n\n1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.3 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting the License Agreement\n\n2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.\n\n2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.\n\n2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.\n\n3. Preview License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.\n\n3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.\n\n3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.\n\n3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.\n\n3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.\n\n4. Use of the Preview by You\n\n4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.\n\n7. Third Party Applications\n\n7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.\n\n8. Using Google APIs\n\n8.1 Google APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n9. Terminating the License Agreement\n\n9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.\n\n9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: (A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and (B) Google issues a final release version of the Android SDK.\n\n9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.\n\n10. DISCLAIMERS\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.\n\n14. General Legal Terms\n\n14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\nJune 2014."
+    ],
+    "google-gdk-license": [
+      "This is a Developer Preview of the GDK that is subject to change.\n\nTerms and Conditions\n\nThis is the Glass Development Kit License Agreement.\n\n1. Introduction\n\n1.1 The Glass Development Kit (referred to in this License Agreement as the \"GDK\" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK.\n\n1.2 \"Glass\" means Glass devices and the Glass software stack for use on Glass devices.\n\n\n1.3 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.4 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting this License Agreement\n\n2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement.\n\n2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.\n\n2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK.\n\n2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity.\n\n3. GDK License from Google\n\n3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices.\n\n3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK.\n\n3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK.\n\n3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.\n\n3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK.\n\n\n3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement.\n\n4. Use of the GDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n\n4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n\n6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy.\n\n7. Third Party Applications\n\n7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.\n\n8. Using Google APIs\n\n8.1 Google APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n9. Terminating this License Agreement\n\n9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate this License Agreement with you if: (A) you have breached any provision of this License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or (D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available.\n\n14. General Legal Terms\n\n14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.\n\n14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\nNovember 19, 2013"
+    ],
+    "intel-android-extra-license": [
+      "Intel (R) Hardware Accelerated Execution Manager End-User License Agreement\n\nCopyright (c) 2012 Intel Corporation. All rights reserved.\n\nRedistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met:\n\n1.Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n2.Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission.\n\n3.No reverse engineering, de-compilation, or disassembly of this software is permitted. Limited patent license. Intel Corporation grants a world-wide, royalty-free, non-exclusive license under patents it now or hereafter owns or controls to make, have made, use, import, offer to sell and sell (\"Utilize\") this software, but solely to the extent that any such patent is necessary to Utilize the software alone. The patent license shall not apply to any combinations which include this software. No hardware per se is licensed hereunder.\n\nDISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+    ],
+    "intel-android-sysimage-license": [
+      "Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK) This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.\n\nDefinitions. These terms shall have the following meanings:\n\n\"Intel\" or \"INTEL\" Intel Corporation With an Address of: 2200 Mission College Blvd. Santa Clara, CA 95052 Office of the General Counsel Mail Stop: RNB-4-51 Attn: Software and Services Group Legal\n\n\"Evaluation Software\" The x86 Android* emulator system images for Android Software Development Kit (SDK), as provided by Intel.\n\nINTERNAL EVALUATION LICENSE TERMS AND CONDITIONS\n\n1. DEFINITIONS.\n\n1.1 Additional Defined Terms. \"Agreement\", \"Evaluation Software\", \"Intel\", \"Non-disclosure Agreement\", \"Recipient\", and \"Effective Date\" shall have the meanings ascribed to them on the signature page(s) of this Agreement.\n\n1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.\n\n1.3 \"Open Source Software\" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.4 \"Pre-Release Materials\" means \"alpha\" or \"beta\" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.\n\n2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials. THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a \"Release\") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form. EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all \"click-to-accept\" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.\n\n10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS"
+    ],
+    "mips-android-sysimage-license": [
+      "MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.\n\nBy clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.\n\n1. DEFINITIONS. These terms shall have the following meanings:\n\n1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085\n\n1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.\n\n1.3 “Evaluation Materials\" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.\n\n1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.\n\n2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.\n\nTHE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.\n\n\nEXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.\n\n10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\nANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.\n"
+    ]
+  },
+  "packages": {
+    "build-tools": {
+      "17.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "2c2872bc3806aabf16a12e3959c2183ddc866e6d",
+            "size": 11696007,
+            "url": "https://dl.google.com/android/repository/build-tools_r17-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "602ee709be9dbb8f179b1e4075148a57f9419930",
+            "size": 12208114,
+            "url": "https://dl.google.com/android/repository/build-tools_r17-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "899897d327b0bad492d3a40d3db4d96119c15bc0",
+            "size": 11004914,
+            "url": "https://dl.google.com/android/repository/build-tools_r17-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 17",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/17.0.0",
+        "revision": "17.0.0"
+      },
+      "18.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "f11618492b0d2270c332325d45d752d3656a9640",
+            "size": 16627330,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d84f5692fb44d60fc53e5b2507cebf9f24626902",
+            "size": 16633121,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "a6c2afd0b6289d589351956d2f5212b37014ca7d",
+            "size": 15413527,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 18.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/18.0.1",
+        "revision": "18.0.1"
+      },
+      "18.1.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "f314a0599e51397f0886fe888b50dd98f2f050d8",
+            "size": 20229298,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "16ddb299b8b43063e5bb3387ec17147c5053dfd8",
+            "size": 20451524,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "3a9810fc8559ab03c09378f07531e8cae2f1db30",
+            "size": 19659547,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 18.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/18.1.0",
+        "revision": "18.1.0"
+      },
+      "18.1.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "68c9acbfc0cec2d51b19efaed39831a17055d998",
+            "size": 20229760,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "a9d9d37f6ddf859e57abc78802a77aaa166e48d4",
+            "size": 20452157,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c4605066e2f851387ea70bc1442b1968bd7b4a15",
+            "size": 19660000,
+            "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 18.1.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/18.1.1",
+        "revision": "18.1.1"
+      },
+      "19.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "55c1a6cf632e7d346f0002b275ec41fd3137fd83",
+            "size": 21339943,
+            "url": "https://dl.google.com/android/repository/build-tools_r19-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "86ec1c12db1bc446b7bcaefc5cc14eb361044e90",
+            "size": 21441270,
+            "url": "https://dl.google.com/android/repository/build-tools_r19-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6edf505c20f5ece9c48fa0aff9a90488f9654d52",
+            "size": 20611447,
+            "url": "https://dl.google.com/android/repository/build-tools_r19-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 19",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/19.0.0",
+        "revision": "19.0.0"
+      },
+      "19.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "18d2312dc4368858914213087f4e61445aca4517",
+            "size": 21229048,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "efaf50fb19a3edb8d03efbff76f89a249ad2920b",
+            "size": 21450597,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "5ef422bac5b28f4ced108319ed4a6bc7050a6234",
+            "size": 20500648,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 19.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/19.0.1",
+        "revision": "19.0.1"
+      },
+      "19.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd",
+            "size": 21352552,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "145bc43065d45f756d99d87329d899052b9a9288",
+            "size": 21453726,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "af664672d0d709c9ae30937b1062317d3ade7f95",
+            "size": 20621117,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 19.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/19.0.2",
+        "revision": "19.0.2"
+      },
+      "19.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "c2d6055478e9d2d4fba476ee85f99181ddd1160c",
+            "size": 21462150,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4",
+            "size": 21563992,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "cb46b433b67a0a6910ff00db84be8b527ea3102f",
+            "size": 20730715,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 19.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/19.0.3",
+        "revision": "19.0.3"
+      },
+      "19.1.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "1ff20ac15fa47a75d00346ec12f180d531b3ca89",
+            "size": 21490972,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "0d11aae3417de1efb4b9a0e0a7855904a61bcec1",
+            "size": 21590160,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "13b367fbdbff8132cb4356f716e8dc8a8df745c5",
+            "size": 20812533,
+            "url": "https://dl.google.com/android/repository/build-tools_r19.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 19.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/19.1.0",
+        "revision": "19.1.0"
+      },
+      "20.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b688905526a5584d1327a662d871a635ff502758",
+            "size": 21445463,
+            "url": "https://dl.google.com/android/repository/build-tools_r20-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "1240f629411c108a714c4ddd756937c7fab93f83",
+            "size": 21650508,
+            "url": "https://dl.google.com/android/repository/build-tools_r20-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "cf20720e452b642d5eb59dabe05c0c729b36ec75",
+            "size": 20828006,
+            "url": "https://dl.google.com/android/repository/build-tools_r20-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 20",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/20.0.0",
+        "revision": "20.0.0"
+      },
+      "21.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "4933328fdeecbd554a29528f254f4993468e1cf4",
+            "size": 22153145,
+            "url": "https://dl.google.com/android/repository/build-tools_r21-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "9bef7989b51436bd4e5114d8a0330359f077cbfa",
+            "size": 22668456,
+            "url": "https://dl.google.com/android/repository/build-tools_r21-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32",
+            "size": 22306371,
+            "url": "https://dl.google.com/android/repository/build-tools_r21-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 21",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/21.0.0",
+        "revision": "21.0.0"
+      },
+      "21.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "e573069eea3e5255e7a65bedeb767f4fd0a5f49a",
+            "size": 22153013,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "b60c8f9b810c980abafa04896706f3911be1ade7",
+            "size": 22668616,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df",
+            "size": 22306243,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 21.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/21.0.1",
+        "revision": "21.0.1"
+      },
+      "21.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "e1236ab8897b62b57414adcf04c132567b2612a5",
+            "size": 22153122,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "f17471c154058f3734729ef3cc363399b1cd3de1",
+            "size": 22668597,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "37496141b23cbe633167927b7abe6e22d9f1a1c1",
+            "size": 22306371,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 21.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/21.0.2",
+        "revision": "21.0.2"
+      },
+      "21.1.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b7455e543784d52a8925f960bc880493ed1478cb",
+            "size": 32642820,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "df619356c2359aa5eacdd48699d15b335d9bd246",
+            "size": 33158159,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c79d63ac6b713a1e326ad4dae43f2ee76708a2f4",
+            "size": 32797810,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 21.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/21.1.0",
+        "revision": "21.1.0"
+      },
+      "21.1.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d",
+            "size": 32642454,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "836a146eab0504aa9387a5132e986fe7c7381571",
+            "size": 33157676,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "53fc4201237f899d5cd92f0b76ad41fb89da188b",
+            "size": 32797356,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 21.1.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/21.1.1",
+        "revision": "21.1.1"
+      },
+      "21.1.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "5e35259843bf2926113a38368b08458735479658",
+            "size": 32637678,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "e7c906b4ba0eea93b32ba36c610dbd6b204bff48",
+            "size": 33152878,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "1d944759c47f60e634d2b8a1f3a4259be2f8d652",
+            "size": 32792587,
+            "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 21.1.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/21.1.2",
+        "revision": "21.1.2"
+      },
+      "22.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "a8a1619dd090e44fac957bce6842e62abf87965b",
+            "size": 33104280,
+            "url": "https://dl.google.com/android/repository/build-tools_r22-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "af95429b24088d704bc5db9bd606e34ac1b82c0d",
+            "size": 33646090,
+            "url": "https://dl.google.com/android/repository/build-tools_r22-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "08fcca41e81b172bd9f570963b90d3a84929e043",
+            "size": 33254114,
+            "url": "https://dl.google.com/android/repository/build-tools_r22-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 22",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/22.0.0",
+        "revision": "22.0.0"
+      },
+      "22.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "da8b9c5c3ede39298e6cf0283c000c2ee9029646",
+            "size": 33104577,
+            "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "53dad7f608e01d53b17176ba11165acbfccc5bbf",
+            "size": 33646102,
+            "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "61d8cbe069d9e0a57872a83e5e5abe164b7d52cf",
+            "size": 33254137,
+            "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 22.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/22.0.1",
+        "revision": "22.0.1"
+      },
+      "23.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "c1d6209212b01469f80fa804e0c1d39a06bc9060",
+            "size": 39080519,
+            "url": "https://dl.google.com/android/repository/build-tools_r23-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "90ba6e716f7703a236cd44b2e71c5ff430855a03",
+            "size": 38070540,
+            "url": "https://dl.google.com/android/repository/build-tools_r23-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "3874948f35f2f8946597679cc6e9151449f23b5d",
+            "size": 38570715,
+            "url": "https://dl.google.com/android/repository/build-tools_r23-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 23",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/23.0.0",
+        "revision": "23.0.0"
+      },
+      "23.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b6ba7c399d5fa487d95289d8832e4ad943aed556",
+            "size": 39069295,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d96ec1522721e9a179ae2c591c99f75d31d39718",
+            "size": 38059328,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "cc1d37231d228f7a6f130e1f8d8c940052f0f8ab",
+            "size": 38558889,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 23.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/23.0.1",
+        "revision": "23.0.1"
+      },
+      "23.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3",
+            "size": 39071201,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "482c4cbceef8ff58aefd92d8155a38610158fdaf",
+            "size": 38060914,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96",
+            "size": 38217626,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 23.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/23.0.2",
+        "revision": "23.0.2"
+      },
+      "23.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "368f2600feac7e9b511b82f53d1f2240ae4a91a3",
+            "size": 40733174,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "fbc98cd303fd15a31d472de6c03bd707829f00b0",
+            "size": 39679533,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c6d8266c6a3243c8f1e41b786c0e3cee4c781263",
+            "size": 39869945,
+            "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 23.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/23.0.3",
+        "revision": "23.0.3"
+      },
+      "24.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "c6271c4d78a5612ea6c7150688bcd5b7313de8d1",
+            "size": 48960919,
+            "url": "https://dl.google.com/android/repository/build-tools_r24-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "97fc4ed442f23989cc488d02c1d1de9bdde241de",
+            "size": 48747930,
+            "url": "https://dl.google.com/android/repository/build-tools_r24-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7",
+            "size": 49535326,
+            "url": "https://dl.google.com/android/repository/build-tools_r24-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 24",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/24.0.0",
+        "revision": "24.0.0"
+      },
+      "24.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "84f18c392919a074fcbb9b1d967984e6b2fef8b4",
+            "size": 48936286,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "5c6457fcdfa07724fb086d8ff4e8316fc0742848",
+            "size": 48726085,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ac4a7cea42c3ef74d7fbf1b992fad311c550034e",
+            "size": 49511883,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 24.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/24.0.1",
+        "revision": "24.0.1"
+      },
+      "24.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "f199a7a788c3fefbed102eea34d6007737b803cf",
+            "size": 48936295,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "8bb8fc575477491d5957de743089df412de55cda",
+            "size": 48726190,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "09586a1f1c39bcfa7db5205c9a07837247deb67e",
+            "size": 49512513,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 24.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/24.0.2",
+        "revision": "24.0.2"
+      },
+      "24.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304",
+            "size": 49779151,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "a01c15f1b105c34595681075e1895d58b3fff48c",
+            "size": 49568967,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "8b960d693fd4163caeb8dc5f5f5f80b10987089c",
+            "size": 50354788,
+            "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 24.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/24.0.3",
+        "revision": "24.0.3"
+      },
+      "25.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "f2bbda60403e75cabd0f238598c3b4dfca56ea44",
+            "size": 49872921,
+            "url": "https://dl.google.com/android/repository/build-tools_r25-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "273c5c29a65cbed00e44f3aa470bbd7dce556606",
+            "size": 49659466,
+            "url": "https://dl.google.com/android/repository/build-tools_r25-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "f9258f2308ff8b62cfc4513d40cb961612d07b6a",
+            "size": 50451378,
+            "url": "https://dl.google.com/android/repository/build-tools_r25-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 25",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/25.0.0",
+        "revision": "25.0.0"
+      },
+      "25.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "ff063d252ab750d339f5947d06ff782836f22bac",
+            "size": 49880178,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f",
+            "size": 49667353,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c6c61393565ccf46349e7f44511e5db7c1c6169d",
+            "size": 50458759,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 25.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/25.0.1",
+        "revision": "25.0.1"
+      },
+      "25.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "ff953c0177e317618fda40516f3e9d95fd43c7ae",
+            "size": 49880329,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "12a5204bb3b6e39437535469fde7ddf42da46b16",
+            "size": 49667185,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "2fee3c0704d6ecc480570450d8b8069b2c4a2dd4",
+            "size": 50458908,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 25.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/25.0.2",
+        "revision": "25.0.2"
+      },
+      "25.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "db95f3a0ae376534d4d69f4cdb6fad20649f3509",
+            "size": 50757258,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "160d2fefb5ce68e443427fc30a793a703b63e26e",
+            "size": 50545085,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "1edcb109ae5133aebfed573cf0bc84e0c353c28d",
+            "size": 51337442,
+            "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 25.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/25.0.3",
+        "revision": "25.0.3"
+      },
+      "26.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "1cbe72929876f8a872ab1f1b1040a9f720261f59",
+            "size": 53854197,
+            "url": "https://dl.google.com/android/repository/build-tools_r26-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d01a1aeca03747245f1f5936b3cb01759c66d086",
+            "size": 53010814,
+            "url": "https://dl.google.com/android/repository/build-tools_r26-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "896ebd31117c09db220f7a3116cc0e5121c78b9d",
+            "size": 54681641,
+            "url": "https://dl.google.com/android/repository/build-tools_r26-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 26",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/26.0.0",
+        "revision": "26.0.0"
+      },
+      "26.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "5378c2c78091b414d0eac40a6bd37f2faa31a365",
+            "size": 54113329,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "cbde59de198916b390777dd0227921bfa2120832",
+            "size": 53266653,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "02494c80ffbe65bfff0aaa7463c9692693327b7d",
+            "size": 54936185,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 26.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/26.0.1",
+        "revision": "26.0.1"
+      },
+      "26.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "5b2b7b66c7bf2151f2af183b5b50a17808850592",
+            "size": 54440678,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d9ed7c7f149ce38be5dc08979aea8acec1459ca0",
+            "size": 53830573,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "39ca02d3faa49859cd9d1bc0adc2f331017b699b",
+            "size": 55161474,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 26.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/26.0.2",
+        "revision": "26.0.2"
+      },
+      "26.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "8a2e6c1bcd845844523a68aa17e5442f0dce328c",
+            "size": 54449983,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "5bb90ed935d99e5bc90686f43b852e68c5ad40df",
+            "size": 53839758,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "460e511a9616b4661cc8dba0102d9d990ae60160",
+            "size": 55170919,
+            "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 26.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/26.0.3",
+        "revision": "26.0.3"
+      },
+      "27.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "28542332ba97cf4a08c3eddfcf5edd70e3cf1260",
+            "size": 54441725,
+            "url": "https://dl.google.com/android/repository/build-tools_r27-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "fb4e8d7e6b8d29a77090e34024077a80458d5ae1",
+            "size": 53831513,
+            "url": "https://dl.google.com/android/repository/build-tools_r27-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "4f1df22a6d99261d2160d624b81445da0a027dbe",
+            "size": 55163097,
+            "url": "https://dl.google.com/android/repository/build-tools_r27-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 27",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/27.0.0",
+        "revision": "27.0.0"
+      },
+      "27.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "7f4eedb1077ef948b848040dcd15de9e8a759f4a",
+            "size": 54450260,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "1edd07bfdbadd95652d093040e16d858f7489594",
+            "size": 53838762,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "18109db020c6d088d0157d1df201d31bc6970875",
+            "size": 55171114,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 27.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/27.0.1",
+        "revision": "27.0.1"
+      },
+      "27.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b687ddf6be84f11607871138aad32cf857d0b837",
+            "size": 54458153,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "6d5d9cf2a47877f273f4b742b19e712a051a31be",
+            "size": 53846615,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "b80466c13b75e3ebf3c546964f40775db5898b2a",
+            "size": 55173070,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 27.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/27.0.2",
+        "revision": "27.0.2"
+      },
+      "27.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "d85e7a6320eddffe7eeace3437605079dac938ca",
+            "size": 54478554,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d",
+            "size": 53867966,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "0df61e11713a2838d2cc9a911219dddf5e6a2749",
+            "size": 55194255,
+            "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 27.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/27.0.3",
+        "revision": "27.0.3"
+      },
+      "28.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "d9f8a754d833ccd334f56fcc6089c5925cd82abb",
+            "size": 37157769,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade",
+            "size": 36458977,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "d4b0638a877ed570e07876264e69fdbd86409610",
+            "size": 37718995,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 28",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/28.0.0",
+        "revision": "28.0.0"
+      },
+      "28.0.0-rc1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "1601977fae25fd478bcfaa0481ca5ea3c609d840",
+            "size": 38703535,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "2c77821967a2330b7b227072d0b1c02ef19fe2fc",
+            "size": 38004795,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "fbf46c33d1268f6532911707b2a05033fd5c5b41",
+            "size": 39273232,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 28-rc1",
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/28.0.0-rc1",
+        "revision": "28.0.0-rc1"
+      },
+      "28.0.0-rc2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "efe9c0dde0646a07544c864276390ca6e96b24dc",
+            "size": 37151124,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "0d0314b353589feb10e528b44c5a685b6658d797",
+            "size": 36449480,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "a94bfb52b4ec74b95c116236c3e382e923cad6c4",
+            "size": 37716459,
+            "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 28-rc2",
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/28.0.0-rc2",
+        "revision": "28.0.0-rc2"
+      },
+      "28.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "ee70dfa1fccb58b37cebc9544830511f36a137a0",
+            "size": 57610954,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "aeef42ad953f1630dd6f5d71eefdc0b825211462",
+            "size": 56913869,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "29c6342835734be25b9e458ab3fad5750ad6a355",
+            "size": 58173989,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 28.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/28.0.1",
+        "revision": "28.0.1"
+      },
+      "28.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b4492209810a3fd48deaa982f9852fef12433d55",
+            "size": 57754663,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9",
+            "size": 57057554,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e9c570c568a0c2a32e88ee3204279019ebefd949",
+            "size": 58317692,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 28.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/28.0.2",
+        "revision": "28.0.2"
+      },
+      "28.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165",
+            "size": 57830695,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "f8c333a2991b1ab05a671bc6248b78e00edcd83a",
+            "size": 57133581,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "05bd35bb48d11c848da2b393c6f864eb609aacba",
+            "size": 58393729,
+            "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 28.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/28.0.3",
+        "revision": "28.0.3"
+      },
+      "29.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "ad314caf1802209c4b00a5f3517af5ceb0d48eae",
+            "size": 58650449,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "35dc6bc7a53bd9d206847e72f02cab21cfdaa869",
+            "size": 57820193,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "1799f7f975416098e5a5bf280eb97c8f77cf7f79",
+            "size": 57098799,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 29",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/29.0.0",
+        "revision": "29.0.0"
+      },
+      "29.0.0-rc1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "1c897f5885ac5468613e40e1ea598c21c05d345d",
+            "size": 58516671,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034",
+            "size": 57704927,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "8887ee791a143f92694a0908130354142a903b17",
+            "size": 56933956,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 29-rc1",
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/29.0.0-rc1",
+        "revision": "29.0.0-rc1"
+      },
+      "29.0.0-rc2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b4b41d429c35b42db07b6c65d4aa998ba8c4093c",
+            "size": 58602830,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "7a960367999169ccac5dbc60817e5f1725c4c738",
+            "size": 57785717,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "2de2a3e290cae4ce35e82c8a5abed49b1cdd24e3",
+            "size": 57000706,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 29-rc2",
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/29.0.0-rc2",
+        "revision": "29.0.0-rc2"
+      },
+      "29.0.0-rc3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "8b7177f198e8b92da8f9537aaf859f6edf222b01",
+            "size": 58639871,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "643e8d76625f6e2cfcd5494e50bae5e14725ec0c",
+            "size": 57810162,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6abce2ebfecf3580afd3129520999f95691a03df",
+            "size": 57092256,
+            "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 29-rc3",
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/29.0.0-rc3",
+        "revision": "29.0.0-rc3"
+      },
+      "29.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "fc209e5d91ab2daeac24345a5cb17261940547e4",
+            "size": 41682816,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd",
+            "size": 40852521,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "1c44e10d5f74e58c3e05bfc6f1631a59616059bc",
+            "size": 40163897,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 29.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/29.0.1",
+        "revision": "29.0.1"
+      },
+      "29.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398",
+            "size": 41678888,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "f781d9e03d5c2debcf51fed3792ee7a9d066723f",
+            "size": 40848529,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "595dc1730c844d892516d5f0e7894e992d19f63d",
+            "size": 40159970,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 29.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/29.0.2",
+        "revision": "29.0.2"
+      },
+      "29.0.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "64efff52165cda5e31848acafa46a05e3f3b4651",
+            "size": 53797376,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "76520eb7712fb0bb4c023b55c6f65588ee268289",
+            "size": 52432183,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "813f8c35f016cef83e5b2b742229a3634d4658d3",
+            "size": 55201638,
+            "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 29.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/29.0.3",
+        "revision": "29.0.3"
+      },
+      "30.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "5bdda303b7aba4073dd2aeb8003b6b0b57098021",
+            "size": 68819159,
+            "url": "https://dl.google.com/android/repository/build-tools_r30-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "80b06ce5fa4af2ed14db343a8131af658dda79a8",
+            "size": 67373109,
+            "url": "https://dl.google.com/android/repository/build-tools_r30-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "5276f337e4eb4d8e5fb82f846045610f8b8e3650",
+            "size": 70027538,
+            "url": "https://dl.google.com/android/repository/build-tools_r30-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 30",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/30.0.0",
+        "revision": "30.0.0"
+      },
+      "30.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "dae27b63a53f3c71a23a2e9517d435f79ce7975b",
+            "size": 52664463,
+            "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "b62ccd6d6468a374b7c8e641c3751bc929a89397",
+            "size": 51227882,
+            "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "76197fec228ca9b69086d6dd8a16e4589982bdc6",
+            "size": 53783332,
+            "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 30.0.1",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/30.0.1",
+        "revision": "30.0.1"
+      },
+      "30.0.2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "6b0166d1f4b0b3d496c0dde660145dfa7898095f",
+            "size": 51227855,
+            "url": "https://dl.google.com/android/repository/5a6ceea22103d8dec989aefcef309949c0c42f1d.build-tools_r30.0.2-macosx.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "363632ff8f7a198bf9fa94e3b9e0db6927bf373d",
+            "size": 52664453,
+            "url": "https://dl.google.com/android/repository/build-tools_r30.0.2-linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "b42b77e02b82f242432cd7ffff5cbb92f6888ca7",
+            "size": 53783318,
+            "url": "https://dl.google.com/android/repository/efbaa277338195608aa4e3dbd43927e97f60218c.build-tools_r30.0.2-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 30.0.2",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/30.0.2",
+        "revision": "30.0.2"
+      },
+      "30.0.3": {
+        "archives": [
+          {
+            "os": "windows",
+            "sha1": "fc165c721b8d2da55e6fede467526c81f562be7b",
+            "size": 54254759,
+            "url": "https://dl.google.com/android/repository/91936d4ee3ccc839f0addd53c9ebf087b1e39251.build-tools_r30.0.3-windows.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "2076ea81b5a2fc298ef7bf85d666f496b928c7f1",
+            "size": 53134793,
+            "url": "https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "0807cd3f0dbc33c8be7f3d6faa263f6b14b502b7",
+            "size": 51698282,
+            "url": "https://dl.google.com/android/repository/f6d24b187cc6bd534c6c37604205171784ac5621.build-tools_r30.0.3-macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 30.0.3",
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/30.0.3",
+        "revision": "30.0.3"
+      }
+    },
+    "cmake": {
+      "3.10.2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "f227a85cb53dcb927ac52a5a717f647c4a29bf3b",
+            "size": 13447295,
+            "url": "https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "439e8799bf59f724f104bf62784b2985f1bfe561",
+            "size": 14275684,
+            "url": "https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "0a75b9c5bf558dc31caad7241a44515064656486",
+            "size": 11899659,
+            "url": "https://dl.google.com/android/repository/cmake-3.10.2-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "CMake 3.10.2.4988404",
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.10.2.4988404",
+        "revision": "3.10.2"
+      },
+      "3.18.1": {
+        "archives": [
+          {
+            "os": "windows",
+            "sha1": "80916762df6955f431743066e3568ae65b1b2b2f",
+            "size": 14677038,
+            "url": "https://dl.google.com/android/repository/7c386a739f915f5bd60051f2572c24782388e807.cmake-3.18.1-windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "1580deb8fb5d705aefb028413dad1a3a129891fe",
+            "size": 18505815,
+            "url": "https://dl.google.com/android/repository/ba34c321f92f6e6fd696c8354c262c122f56abf8.cmake-3.18.1-darwin.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "9435bbe2120763871c75c37a365451b48c007fed",
+            "size": 21005945,
+            "url": "https://dl.google.com/android/repository/cmake-3.18.1-linux.zip"
+          }
+        ],
+        "displayName": "CMake 3.18.1",
+        "license": "android-sdk-preview-license",
+        "name": "cmake",
+        "path": "cmake/3.18.1",
+        "revision": "3.18.1"
+      },
+      "3.6.4111459": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "c9b02d630079783c6d67cb91488b622cfcd9765c",
+            "size": 12295830,
+            "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "71c539b9c33f0943e9ad6251fea0b161c0b70782",
+            "size": 13980243,
+            "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "4c4730dc3f399b2fa9ab701112d2c439368a59a5",
+            "size": 10428915,
+            "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "CMake 3.6.4111459",
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.6.4111459",
+        "revision": "3.6.4111459"
+      }
+    },
+    "cmdline-tools": {
+      "1.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "6ffc5bd72db2c755f9b374ed829202262a6d8aaf",
+            "size": 81680508,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "23f803c07e392bb769507c88b23c2c7868cc7a6f",
+            "size": 81680498,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "a863da8763de2febeb7429e7894fb65a092609db",
+            "size": 81665410,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-6200805_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/1.0",
+        "revision": "1.0"
+      },
+      "2.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "14b2114c6eae9e10686a18138d2bb468c46f8e0c",
+            "size": 86521858,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "a69c4493c4c919698989484bf0ea684550ec5217",
+            "size": 86522172,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e11b418c1d2d28589e9194915be2561f1e1e7a95",
+            "size": 86506760,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-6514223_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/2.0",
+        "revision": "2.0"
+      },
+      "2.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "9172381ff070ee2a416723c1989770cf4b0d1076",
+            "size": 86532348,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "c0c6bb9f1970bfadeaac623dfabf22c3e56baaec",
+            "size": 86532338,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-6609375_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e2e19c2ff584efa87ef0cfdd1987f92881323208",
+            "size": 86517250,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-6609375_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/2.1",
+        "revision": "2.1"
+      },
+      "3.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "4f4417d53923c34891f1c05f302be2ed197d6844",
+            "size": 87259900,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "4846d2aede9db06361a5f0885d03997a6199229a",
+            "size": 87259890,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-6858069_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "f0bf21e0a13dfcc48e7b0166f44dcff49912d2ee",
+            "size": 87244802,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-6858069_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/3.0",
+        "revision": "3.0"
+      },
+      "4.0-rc01": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "98d3f2715f6bfbacef063d1376d7765fe5b93309",
+            "size": 99514756,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-6987402_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "573d312a3fdc7700d9c395d647292d90b193d4ee",
+            "size": 99514744,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-6987402_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "72fae22d41fb8aa4f22e408e18c9d00f06050f7b",
+            "size": 99496635,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-6987402_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "license": "android-sdk-preview-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/4.0-beta01",
+        "revision": "4.0-rc01"
+      },
+      "5.0-rc01": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "f06b1642396ef1e431b990dbe386d5f1e3deabcc",
+            "size": 102189958,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-7006259_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "0752424530724f76cb5a28de84d663e63739e6ee",
+            "size": 102189946,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-7006259_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6f8e359dba91af39c046a791ea32e3ca5149a078",
+            "size": 102171837,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-7006259_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "license": "android-sdk-preview-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/5.0-alpha01",
+        "revision": "5.0-rc01"
+      }
+    },
+    "emulator": {
+      "28.0.25": {
+        "archives": [
+          {
+            "os": "windows",
+            "sha1": "6004fd05db29f8088ec89ba85c273c0bf86ef0be",
+            "size": 372563893,
+            "url": "https://dl.google.com/android/repository/emulator-windows-5395263.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "28.0.25"
+      },
+      "30.2.6": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "60cc4cfe372b3189679e1e08c929ff2fb793f3f6",
+            "size": 292634405,
+            "url": "https://dl.google.com/android/repository/emulator-darwin-6962233.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "751044f953541b70a656d77343f6b0aac1153e24",
+            "size": 262303903,
+            "url": "https://dl.google.com/android/repository/emulator-linux-6962233.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "daa448bc56199b6beeaecf5f796d26c65e5a5fb8",
+            "size": 258566662,
+            "url": "https://dl.google.com/android/repository/emulator-windows-6962233.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "30.2.6"
+      },
+      "30.3.4": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "7c456b3946a89d8543a070d9f643f3fe87283d68",
+            "size": 295125219,
+            "url": "https://dl.google.com/android/repository/emulator-darwin-7020230.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "5285e71825453c83ad951b55a7a7d917a667221a",
+            "size": 265877671,
+            "url": "https://dl.google.com/android/repository/emulator-linux-7020230.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "918b6236a57d425b7a95495cd76a2cf1aaa98560",
+            "size": 320221036,
+            "url": "https://dl.google.com/android/repository/emulator-windows-7020230.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "30.3.4"
+      }
+    },
+    "extras": {
+      "1.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "18632007ecb843b4fc69babd521a9b061868534b",
+            "size": 1307393,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "ccb64105888ba61ab06f20ad1ba97c71d440a421",
+            "size": 2299061,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "f26d80a84020b40e24f8a99873dea6a9c7978f10",
+            "size": 2615480,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r01.1.zip"
+          }
+        ],
+        "displayName": "Android Auto Desktop Head Unit Emulator",
+        "license": "android-sdk-license",
+        "name": "extras",
+        "path": "extras/google/auto",
+        "revision": "1.1"
+      },
+      "2.0-rc1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b480489e604371301da10731a793b234b01b8f42",
+            "size": 4527281,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc1.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "3adaf99d06eaeeb31f7bdbb62ae841e740bfc156",
+            "size": 5592023,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc1.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e07788ed91d8e6dd3374f77da1cf78afb2664cc0",
+            "size": 5703857,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc1.zip"
+          }
+        ],
+        "displayName": "Android Auto Desktop Head Unit Emulator",
+        "license": "android-sdk-preview-license",
+        "name": "extras",
+        "path": "extras/google/auto",
+        "revision": "2.0-rc1"
+      }
+    },
+    "ndk": {
+      "16.1.4479499": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "e51e615449b98c716cf912057e2682e75d55e2de",
+            "size": 839630771,
+            "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "42aa43aae89a50d1c66c3f9fdecd676936da6128",
+            "size": 852525873,
+            "url": "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "f3f1909ed1052e98dda2c79d11c22f3da28daf25",
+            "size": 723301086,
+            "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 16.1.4479499",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/16.1.4479499",
+        "revision": "16.1.4479499"
+      },
+      "17.2.4988734": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c",
+            "size": 675091485,
+            "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "12cacc70c3fd2f40574015631c00f41fb8a39048",
+            "size": 709387703,
+            "url": "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "3e3b8d1650f9d297d130be2b342db956003f5992",
+            "size": 650626501,
+            "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 17.2.4988734",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/17.2.4988734",
+        "revision": "17.2.4988734"
+      },
+      "18.1.5063045": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440",
+            "size": 542911996,
+            "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "500679655da3a86aecf67007e8ab230ea9b4dd7b",
+            "size": 557038702,
+            "url": "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6b6d4138aaaad7166679fdfa4780e177f95cee6f",
+            "size": 522489470,
+            "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 18.1.5063045",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/18.1.5063045",
+        "revision": "18.1.5063045"
+      },
+      "19.0.5232133": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249",
+            "size": 807592927,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac",
+            "size": 823337344,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "37906e8e79a9dddf6805325f706a072055e4136c",
+            "size": 795986424,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 19.0.5232133",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/19.0.5232133",
+        "revision": "19.0.5232133"
+      },
+      "19.2.5345600": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25",
+            "size": 807630656,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "fd94d0be6017c6acbd193eb95e09cf4b6f61b834",
+            "size": 823376982,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3",
+            "size": 796051997,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 19.2.5345600",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/19.2.5345600",
+        "revision": "19.2.5345600"
+      },
+      "20.0.5392854-rc2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b",
+            "size": 840834121,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02",
+            "size": 857406412,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c89022bd9a2c32b42a1b94e98bbd88ab4c4e350e",
+            "size": 830099430,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 20.0.5392854",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/20.0.5392854",
+        "revision": "20.0.5392854-rc2"
+      },
+      "20.0.5471264-rc3": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24",
+            "size": 843617071,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "674d8fb0e0df8e8be1c31fa321eb176548a19ba3",
+            "size": 860198768,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "9375dc82cf576f4a255bf908dfc628d8ddee0d89",
+            "size": 832889871,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 20.0.5471264",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/20.0.5471264",
+        "revision": "20.0.5471264-rc3"
+      },
+      "20.0.5594570": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "96d5f1c50452596912d1982439c514194b5751e6",
+            "size": 843152912,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff",
+            "size": 859737910,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df",
+            "size": 832429986,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 20.0.5594570",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/20.0.5594570",
+        "revision": "20.0.5594570"
+      },
+      "20.1.5948944": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be",
+            "size": 843201217,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "d903fdf077039ad9331fb6c3bee78aa46d45527b",
+            "size": 859780564,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ead0846608040b8344ad2bc9bc721b88cf13fb8d",
+            "size": 832473103,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 20.1.5948944",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/20.1.5948944",
+        "revision": "20.1.5948944"
+      },
+      "21.0.6011959-rc2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "34a46c3867c9d87a80895c0b8a098256052536d2",
+            "size": 958791657,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "335f30302bee700a9a5fdfe3ae533a4963499c44",
+            "size": 1043467643,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e5902e4f6c5b6f0354a2572a85f42f19c1a7b9d8",
+            "size": 1057424857,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.0.6011959",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/21.0.6011959",
+        "revision": "21.0.6011959-rc2"
+      },
+      "21.0.6113669": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa",
+            "size": 958656601,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c",
+            "size": 1043332542,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c61631eacbd40c30273b716a4e589c6877b85419",
+            "size": 1057294207,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.0.6113669",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/21.0.6113669",
+        "revision": "21.0.6113669"
+      },
+      "21.1.6210238-rc1": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f",
+            "size": 987084422,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "cf06ed408663c11c8f4824f9370c7a900ec074dd",
+            "size": 1071756532,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "a920ca1ab75733b510180cef23f3797ded40dbb7",
+            "size": 1087478202,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.1.6210238",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/21.1.6210238",
+        "revision": "21.1.6210238-rc1"
+      },
+      "21.1.6273396-rc2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e",
+            "size": 987112894,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "b9a6463ab72ad183c89e5316f0c5493f64b54966",
+            "size": 1071784976,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "dc6dc614cbd94b345b66f85d3f867638593fb199",
+            "size": 1087508597,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.1.6273396",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/21.1.6273396",
+        "revision": "21.1.6273396-rc2"
+      },
+      "21.1.6352462": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f",
+            "size": 1014473187,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "50250fcba479de477b45801e2699cca47f7e1267",
+            "size": 1162377080,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6809fac4a6e829f4bac64628fa9835d57bbd61a8",
+            "size": 1079474640,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.1.6352462",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/21.1.6352462",
+        "revision": "21.1.6352462"
+      },
+      "21.1.6363665-rc3": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "767f722c14dd27a22b17903e09b768407131129e",
+            "size": 1042902819,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "29139085aa402d6b27d4394c30e797f814876d1e",
+            "size": 1190809917,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "8ecb03c728b8dc814db30c8152c4436cb1536c8d",
+            "size": 1109667800,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.1.6363665",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/21.1.6363665",
+        "revision": "21.1.6363665-rc3"
+      },
+      "21.2.6472646": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba",
+            "size": 1014322452,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "c81a5bcb4672a18d3647bf6898cd4dbcb978d0e8",
+            "size": 1162375023,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "93563a1297a60b5da49a48f62340dbf0c878a5f3",
+            "size": 1079490351,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.2.6472646",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/21.2.6472646",
+        "revision": "21.2.6472646"
+      },
+      "21.3.6528147": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12",
+            "size": 1042615469,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d",
+            "size": 1190667841,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "99175ce1210258f2280568cd340e0666c69955c7",
+            "size": 1109536102,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 21.3.6528147",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/21.3.6528147",
+        "revision": "21.3.6528147"
+      },
+      "22.0.6917172-rc1": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69",
+            "size": 1047697781,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "687f696f43b23e2623e7f7073bbd575d254f66f6",
+            "size": 1146575022,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ef38999c0e3c96124acffab6971ad2054a433b91",
+            "size": 1080588810,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 22.0.6917172",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/22.0.6917172",
+        "revision": "22.0.6917172-rc1"
+      },
+      "22.0.7026061": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13",
+            "size": 1047577432,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "82274313aba10da6177fd41868f56a0f9651dd81",
+            "size": 1146450986,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c03f761caf1c6f5efbeb5ccfa573ea922cb955b3",
+            "size": 1080471370,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 22.0.7026061",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/22.0.7026061",
+        "revision": "22.0.7026061"
+      }
+    },
+    "ndk-bundle": {
+      "16.1.4479499": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "e51e615449b98c716cf912057e2682e75d55e2de",
+            "size": 839630771,
+            "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "42aa43aae89a50d1c66c3f9fdecd676936da6128",
+            "size": 852525873,
+            "url": "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "f3f1909ed1052e98dda2c79d11c22f3da28daf25",
+            "size": 723301086,
+            "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "16.1.4479499"
+      },
+      "17.2.4988734": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c",
+            "size": 675091485,
+            "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "12cacc70c3fd2f40574015631c00f41fb8a39048",
+            "size": 709387703,
+            "url": "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "3e3b8d1650f9d297d130be2b342db956003f5992",
+            "size": 650626501,
+            "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "17.2.4988734"
+      },
+      "18.1.5063045": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440",
+            "size": 542911996,
+            "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "500679655da3a86aecf67007e8ab230ea9b4dd7b",
+            "size": 557038702,
+            "url": "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6b6d4138aaaad7166679fdfa4780e177f95cee6f",
+            "size": 522489470,
+            "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "18.1.5063045"
+      },
+      "19.0.5232133": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249",
+            "size": 807592927,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac",
+            "size": 823337344,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "37906e8e79a9dddf6805325f706a072055e4136c",
+            "size": 795986424,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "19.0.5232133"
+      },
+      "19.2.5345600": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25",
+            "size": 807630656,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "fd94d0be6017c6acbd193eb95e09cf4b6f61b834",
+            "size": 823376982,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3",
+            "size": 796051997,
+            "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "19.2.5345600"
+      },
+      "20.0.5392854-rc2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b",
+            "size": 840834121,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02",
+            "size": 857406412,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c89022bd9a2c32b42a1b94e98bbd88ab4c4e350e",
+            "size": 830099430,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "20.0.5392854-rc2"
+      },
+      "20.0.5471264-rc3": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24",
+            "size": 843617071,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "674d8fb0e0df8e8be1c31fa321eb176548a19ba3",
+            "size": 860198768,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "9375dc82cf576f4a255bf908dfc628d8ddee0d89",
+            "size": 832889871,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "20.0.5471264-rc3"
+      },
+      "20.0.5594570": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "96d5f1c50452596912d1982439c514194b5751e6",
+            "size": 843152912,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff",
+            "size": 859737910,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df",
+            "size": 832429986,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "20.0.5594570"
+      },
+      "20.1.5948944": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be",
+            "size": 843201217,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "d903fdf077039ad9331fb6c3bee78aa46d45527b",
+            "size": 859780564,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ead0846608040b8344ad2bc9bc721b88cf13fb8d",
+            "size": 832473103,
+            "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "20.1.5948944"
+      },
+      "21.0.6011959-rc2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "34a46c3867c9d87a80895c0b8a098256052536d2",
+            "size": 958791657,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "335f30302bee700a9a5fdfe3ae533a4963499c44",
+            "size": 1043467643,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e5902e4f6c5b6f0354a2572a85f42f19c1a7b9d8",
+            "size": 1057424857,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.0.6011959-rc2"
+      },
+      "21.0.6113669": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa",
+            "size": 958656601,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c",
+            "size": 1043332542,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c61631eacbd40c30273b716a4e589c6877b85419",
+            "size": 1057294207,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.0.6113669"
+      },
+      "21.1.6210238-rc1": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f",
+            "size": 987084422,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "cf06ed408663c11c8f4824f9370c7a900ec074dd",
+            "size": 1071756532,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "a920ca1ab75733b510180cef23f3797ded40dbb7",
+            "size": 1087478202,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.1.6210238-rc1"
+      },
+      "21.1.6273396-rc2": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e",
+            "size": 987112894,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "b9a6463ab72ad183c89e5316f0c5493f64b54966",
+            "size": 1071784976,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "dc6dc614cbd94b345b66f85d3f867638593fb199",
+            "size": 1087508597,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.1.6273396-rc2"
+      },
+      "21.1.6352462": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f",
+            "size": 1014473187,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "50250fcba479de477b45801e2699cca47f7e1267",
+            "size": 1162377080,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6809fac4a6e829f4bac64628fa9835d57bbd61a8",
+            "size": 1079474640,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.1.6352462"
+      },
+      "21.1.6363665-rc3": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "767f722c14dd27a22b17903e09b768407131129e",
+            "size": 1042902819,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "29139085aa402d6b27d4394c30e797f814876d1e",
+            "size": 1190809917,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "8ecb03c728b8dc814db30c8152c4436cb1536c8d",
+            "size": 1109667800,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.1.6363665-rc3"
+      },
+      "21.2.6472646": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba",
+            "size": 1014322452,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "c81a5bcb4672a18d3647bf6898cd4dbcb978d0e8",
+            "size": 1162375023,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "93563a1297a60b5da49a48f62340dbf0c878a5f3",
+            "size": 1079490351,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.2.6472646"
+      },
+      "21.3.6528147": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12",
+            "size": 1042615469,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d",
+            "size": 1190667841,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "99175ce1210258f2280568cd340e0666c69955c7",
+            "size": 1109536102,
+            "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "21.3.6528147"
+      },
+      "22.0.6917172-rc1": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69",
+            "size": 1047697781,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "687f696f43b23e2623e7f7073bbd575d254f66f6",
+            "size": 1146575022,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ef38999c0e3c96124acffab6971ad2054a433b91",
+            "size": 1080588810,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "22.0.6917172-rc1"
+      },
+      "22.0.7026061": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13",
+            "size": 1047577432,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "82274313aba10da6177fd41868f56a0f9651dd81",
+            "size": 1146450986,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c03f761caf1c6f5efbeb5ccfa573ea922cb955b3",
+            "size": 1080471370,
+            "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "22.0.7026061"
+      }
+    },
+    "patcher": {
+      "1": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "046699c5e2716ae11d77e0bad814f7f33fab261e",
+            "size": 1827327,
+            "url": "https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip"
+          }
+        ],
+        "displayName": "SDK Patch Applier v4",
+        "license": "android-sdk-license",
+        "name": "patcher",
+        "path": "patcher/v4",
+        "revision": "1"
+      }
+    },
+    "platform-tools": {
+      "30.0.5": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "6f77800c35f27dc8e014a214e656aae17c7ea2d0",
+            "size": 13311295,
+            "url": "https://dl.google.com/android/repository/eabcd8b4b7ab518c6af9c941af8494072f17ec4b.platform-tools_r30.0.5-darwin.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "ba07433b8e34c2a51c250033abcd1442a28d0863",
+            "size": 13338136,
+            "url": "https://dl.google.com/android/repository/platform-tools_r30.0.5-linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e66c951841f78f225e36cfae74e81712a704a37a",
+            "size": 12328924,
+            "url": "https://dl.google.com/android/repository/platform-tools_r30.0.5-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform-Tools",
+        "license": "android-sdk-license",
+        "name": "platform-tools",
+        "path": "platform-tools",
+        "revision": "30.0.5"
+      }
+    },
+    "platforms": {
+      "10": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "887e37783ec32f541ea33c2c649dda648e8e6fb3",
+            "size": 85470907,
+            "url": "https://dl.google.com/android/repository/android-2.3.3_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 10",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-10",
+        "revision": "10"
+      },
+      "11": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "2c7d4bd13f276e76f6bbd87315fe27aba351dd37",
+            "size": 104513908,
+            "url": "https://dl.google.com/android/repository/android-3.0_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 11",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-11",
+        "revision": "11"
+      },
+      "12": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf",
+            "size": 106472351,
+            "url": "https://dl.google.com/android/repository/android-3.1_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 12",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-12",
+        "revision": "12"
+      },
+      "13": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "6189a500a8c44ae73a439604363de93591163cd9",
+            "size": 108426536,
+            "url": "https://dl.google.com/android/repository/android-3.2_r01.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 13",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-13",
+        "revision": "13"
+      },
+      "14": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c",
+            "size": 46038082,
+            "url": "https://dl.google.com/android/repository/android-14_r04.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 14",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-14",
+        "revision": "14"
+      },
+      "15": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "69ab4c443b37184b2883af1fd38cc20cbeffd0f3",
+            "size": 44533475,
+            "url": "https://dl.google.com/android/repository/android-15_r05.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 15",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-15",
+        "revision": "15"
+      },
+      "16": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "12a5ce6235a76bc30f62c26bda1b680e336abd07",
+            "size": 48128695,
+            "url": "https://dl.google.com/android/repository/android-16_r05.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 16",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-16",
+        "revision": "16"
+      },
+      "17": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "dbe14101c06e6cdb34e300393e64e64f8c92168a",
+            "size": 57030216,
+            "url": "https://dl.google.com/android/repository/android-17_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 17",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-17",
+        "revision": "17"
+      },
+      "18": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "e6b09b3505754cbbeb4a5622008b907262ee91cb",
+            "size": 57771739,
+            "url": "https://dl.google.com/android/repository/android-18_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 18",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-18",
+        "revision": "18"
+      },
+      "19": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "2ff20d89e68f2f5390981342e009db5a2d456aaa",
+            "size": 63871092,
+            "url": "https://dl.google.com/android/repository/android-19_r04.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 19",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-19",
+        "revision": "19"
+      },
+      "2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "c054d25c9b4c6251fa49c2f9c54336998679d3fe",
+            "size": 45476658,
+            "url": "https://dl.google.com/android/repository/android-1.1_r1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "e21dbcff45b7356657449ebb3c7e941be2bb5ebe",
+            "size": 45584305,
+            "url": "https://dl.google.com/android/repository/android-1.1_r1-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "a4060f29ed39fc929c302836d488998c53c3002e",
+            "size": 46828615,
+            "url": "https://dl.google.com/android/repository/android-1.1_r1-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 2",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-2",
+        "revision": "2"
+      },
+      "20": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "a9251f8a3f313ab05834a07a963000927637e01d",
+            "size": 63567784,
+            "url": "https://dl.google.com/android/repository/android-20_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 20",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-20",
+        "revision": "20"
+      },
+      "21": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "53536556059bb29ae82f414fd2e14bc335a4eb4c",
+            "size": 65897960,
+            "url": "https://dl.google.com/android/repository/android-21_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 21",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-21",
+        "revision": "21"
+      },
+      "22": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "5d1bd10fea962b216a0dece1247070164760a9fc",
+            "size": 66852371,
+            "url": "https://dl.google.com/android/repository/android-22_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 22",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-22",
+        "revision": "22"
+      },
+      "23": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "027fede3de6aa1649115bbd0bffff30ccd51c9a0",
+            "size": 70433421,
+            "url": "https://dl.google.com/android/repository/platform-23_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 23",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-23",
+        "revision": "23"
+      },
+      "24": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee",
+            "size": 82648154,
+            "url": "https://dl.google.com/android/repository/platform-24_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 24",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-24",
+        "revision": "24"
+      },
+      "25": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8",
+            "size": 85424763,
+            "url": "https://dl.google.com/android/repository/platform-25_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 25",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-25",
+        "revision": "25"
+      },
+      "26": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "e4ae5d7aa557a3c827135838ee400da8443ac4ef",
+            "size": 63623734,
+            "url": "https://dl.google.com/android/repository/platform-26_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 26",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-26",
+        "revision": "26"
+      },
+      "27": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "35f747e7e70b2d16e0e4246876be28d15ea1c353",
+            "size": 65635348,
+            "url": "https://dl.google.com/android/repository/platform-27_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 27",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-27",
+        "revision": "27"
+      },
+      "28": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "9a4e52b1d55bd2e24216b150aafae2503d3efba6",
+            "size": 75565084,
+            "url": "https://dl.google.com/android/repository/platform-28_r06.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 28",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-28",
+        "revision": "28"
+      },
+      "29": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "9d8a7e0ffa5168dbca6c60355b9129c6c7572aff",
+            "size": 78293913,
+            "url": "https://dl.google.com/android/repository/platform-29_r05.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 29",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-29",
+        "revision": "29"
+      },
+      "3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c",
+            "size": 53348669,
+            "url": "https://dl.google.com/android/repository/android-1.5_r04-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d3a67c2369afa48b6c3c7624de5031c262018d1e",
+            "size": 52440607,
+            "url": "https://dl.google.com/android/repository/android-1.5_r04-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "5bb106d2e40d481edd337b0833093843e15fe49a",
+            "size": 54624370,
+            "url": "https://dl.google.com/android/repository/android-1.5_r04-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 3",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-3",
+        "revision": "3"
+      },
+      "30": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "e7c6280901dcfa511af098d67dd88c4dfcbc6ea2",
+            "size": 52328361,
+            "url": "https://dl.google.com/android/repository/platform-30_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 30",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-30",
+        "revision": "30"
+      },
+      "4": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "483ed088e45bbdf3444baaf9250c8b02e5383cb0",
+            "size": 63454485,
+            "url": "https://dl.google.com/android/repository/android-1.6_r03-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "bdafad44f5df9f127979bdb21a1fdd87ee3cd625",
+            "size": 62418496,
+            "url": "https://dl.google.com/android/repository/android-1.6_r03-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22",
+            "size": 64654625,
+            "url": "https://dl.google.com/android/repository/android-1.6_r03-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 4",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-4",
+        "revision": "4"
+      },
+      "5": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d",
+            "size": 75095268,
+            "url": "https://dl.google.com/android/repository/android-2.0_r01-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "2a866d0870dbba18e0503cd41e5fae988a21b314",
+            "size": 74956356,
+            "url": "https://dl.google.com/android/repository/android-2.0_r01-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "aeb623217ff88b87216d6eb7dbc846ed53f68f57",
+            "size": 76288040,
+            "url": "https://dl.google.com/android/repository/android-2.0_r01-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 5",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-5",
+        "revision": "5"
+      },
+      "6": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "ce2c971dce352aa28af06bda92a070116aa5ae1a",
+            "size": 79192618,
+            "url": "https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0",
+            "size": 79035527,
+            "url": "https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "255781ebe4509d9707d0e77edda2815e2bc216e6",
+            "size": 80385601,
+            "url": "https://dl.google.com/android/repository/android-2.0.1_r01-windows.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 6",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-6",
+        "revision": "6"
+      },
+      "7": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "5ce51b023ac19f8738500b1007a1da5de2349a1e",
+            "size": 70142829,
+            "url": "https://dl.google.com/android/repository/android-2.1_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 7",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-7",
+        "revision": "7"
+      },
+      "8": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "231262c63eefdff8fd0386e9ccfefeb27a8f9202",
+            "size": 74652366,
+            "url": "https://dl.google.com/android/repository/android-2.2_r03.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 8",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-8",
+        "revision": "8"
+      },
+      "9": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "209f8a7a8b2cb093fce858b8b55fed3ba5206773",
+            "size": 78732563,
+            "url": "https://dl.google.com/android/repository/android-2.3.1_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 9",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-9",
+        "revision": "9"
+      }
+    },
+    "skiaparser": {
+      "5": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b4ac0f553c2b582fd4e1896f46e2021b9da9d19b",
+            "size": 6234850,
+            "url": "https://dl.google.com/android/repository/skiaparser-6923996-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "6d4bafe363b8536c9c3da51fac6f4b16c5685359",
+            "size": 6297430,
+            "url": "https://dl.google.com/android/repository/skiaparser-6923996-mac.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "2aafef23d600d05467e645cd1420e8c7e5a5dad3",
+            "size": 6008442,
+            "url": "https://dl.google.com/android/repository/skiaparser-6923996-win.zip"
+          }
+        ],
+        "displayName": "Layout Inspector image server for API 29-30",
+        "license": "android-sdk-license",
+        "name": "skiaparser",
+        "path": "skiaparser/1",
+        "revision": "5"
+      }
+    },
+    "sources": {
+      "14": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555",
+            "size": 16152383,
+            "url": "https://dl.google.com/android/repository/sources-14_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 14",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-14",
+        "revision": "14"
+      },
+      "15": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "e5992a5747c9590783fbbdd700337bf0c9f6b1fa",
+            "size": 16468746,
+            "url": "https://dl.google.com/android/repository/sources-15_r02.zip"
+          }
+        ],
+        "displayName": "Sources for Android 15",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-15",
+        "revision": "15"
+      },
+      "16": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "0f83c14ed333c45d962279ab5d6bc98a0269ef84",
+            "size": 17876720,
+            "url": "https://dl.google.com/android/repository/sources-16_r02.zip"
+          }
+        ],
+        "displayName": "Sources for Android 16",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-16",
+        "revision": "16"
+      },
+      "17": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "6f1f18cd2d2b1852d7f6892df9cee3823349d43a",
+            "size": 18976816,
+            "url": "https://dl.google.com/android/repository/sources-17_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 17",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-17",
+        "revision": "17"
+      },
+      "18": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78",
+            "size": 20226735,
+            "url": "https://dl.google.com/android/repository/sources-18_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 18",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-18",
+        "revision": "18"
+      },
+      "19": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "433a1d043ef77561571250e94cb7a0ef24a202e7",
+            "size": 21819439,
+            "url": "https://dl.google.com/android/repository/sources-19_r02.zip"
+          }
+        ],
+        "displayName": "Sources for Android 19",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-19",
+        "revision": "19"
+      },
+      "20": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "8da3e40f2625f9f7ef38b7e403f49f67226c0d76",
+            "size": 23367603,
+            "url": "https://dl.google.com/android/repository/sources-20_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 20",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-20",
+        "revision": "20"
+      },
+      "21": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "137a5044915d32bea297a8c1552684802bbc2e25",
+            "size": 28274751,
+            "url": "https://dl.google.com/android/repository/sources-21_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 21",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-21",
+        "revision": "21"
+      },
+      "22": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "98320e13976d11597a4a730a8d203ac9a03ed5a6",
+            "size": 28861236,
+            "url": "https://dl.google.com/android/repository/sources-22_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 22",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-22",
+        "revision": "22"
+      },
+      "23": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "b0f15da2762b42f543c5e364c2b15b198cc99cc2",
+            "size": 31771965,
+            "url": "https://dl.google.com/android/repository/sources-23_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 23",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-23",
+        "revision": "23"
+      },
+      "24": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "6b96115830a83d654479f32ce4b724ca9011148b",
+            "size": 30270410,
+            "url": "https://dl.google.com/android/repository/sources-24_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 24",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-24",
+        "revision": "24"
+      },
+      "25": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "bbc72efd1a9bad87cc507e308f0d29aad438c52c",
+            "size": 30822685,
+            "url": "https://dl.google.com/android/repository/sources-25_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 25",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-25",
+        "revision": "25"
+      },
+      "26": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "2af701ee3223d580409288540b1d06932fd8f9b9",
+            "size": 35138547,
+            "url": "https://dl.google.com/android/repository/sources-26_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 26",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-26",
+        "revision": "26"
+      },
+      "27": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "7b714670561d08f54751af42aca929867b806596",
+            "size": 36997618,
+            "url": "https://dl.google.com/android/repository/sources-27_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 27",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-27",
+        "revision": "27"
+      },
+      "28": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "5610e0c24235ee3fa343c899ddd551be30315255",
+            "size": 42552241,
+            "url": "https://dl.google.com/android/repository/sources-28_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 28",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-28",
+        "revision": "28"
+      },
+      "29": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "d0ad249e152b3a8fe3cb7c4a329453a048be29e4",
+            "size": 39477018,
+            "url": "https://dl.google.com/android/repository/sources-29_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 29",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-29",
+        "revision": "29"
+      },
+      "30": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "e4c000fb3afb32380609ddcad91f5d6495eeccb1",
+            "size": 43263073,
+            "url": "https://dl.google.com/android/repository/sources-30_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 30",
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-30",
+        "revision": "30"
+      }
+    },
+    "tools": {
+      "26.1.1": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "ed85ea7b59bc3483ce0af4c198523ba044e083ad",
+            "size": 103022432,
+            "url": "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "8c7c28554a32318461802c1291d76fccfafde054",
+            "size": 154582459,
+            "url": "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "aa298b5346ee0d63940d13609fe6bec621384510",
+            "size": 156136858,
+            "url": "https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip"
+          }
+        ],
+        "displayName": "Android SDK Tools",
+        "license": "android-sdk-license",
+        "name": "tools",
+        "path": "tools",
+        "revision": "26.1.1"
+      }
+    }
+  }
+}
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 9067f2cec43e..195f0901a19c 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -371,4 +371,4 @@
     };
     version = "1.19.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
index 3641186186e8..732d2a2cdd8d 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
@@ -349,4 +349,4 @@
     };
     version = "1.19.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/mobile/flashtool/default.nix b/nixpkgs/pkgs/development/mobile/flashtool/default.nix
index 84c42c895ce1..e00ff3acce02 100644
--- a/nixpkgs/pkgs/development/mobile/flashtool/default.nix
+++ b/nixpkgs/pkgs/development/mobile/flashtool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
+{ stdenv, lib, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
 
 # TODO:
 #
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     sed -i \
       -e 's|$(uname -m)|i686|' \
       -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
-      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
+      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
       FlashTool FlashToolConsole
   '';
 
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
     mv * $out/
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "http://www.flashtool.net/";
     description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributableFirmware;
     platforms = [ "i686-linux" ];
-    hydraPlatforms = stdenv.lib.platforms.none;
+    hydraPlatforms = platforms.none;
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/nixpkgs/pkgs/development/mobile/genymotion/default.nix
index 72a376d39a81..b44315065155 100644
--- a/nixpkgs/pkgs/development/mobile/genymotion/default.nix
+++ b/nixpkgs/pkgs/development/mobile/genymotion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
+{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
 , xdg_utils
 # For glewinfo
 , libXmu, libXi, libXext }:
@@ -7,7 +7,7 @@ let
   packages = [
     stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL
   ];
-  libPath = stdenv.lib.makeLibraryPath packages;
+  libPath = lib.makeLibraryPath packages;
 in
 stdenv.mkDerivation rec {
   pname = "genymotion";
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     rm $out/libexec/genymotion/libxkbcommon*
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Fast and easy Android emulation";
     longDescription = ''
       Genymotion is a relatively fast Android emulator which comes with
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
       suitable for application testing.
      '';
     homepage = "https://www.genymotion.com/";
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
     platforms = ["x86_64-linux"];
-    maintainers = [ stdenv.lib.maintainers.puffnfresh ];
+    maintainers = [ maintainers.puffnfresh ];
   };
 }
diff --git a/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix b/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
index fd14a73e2ce7..c45e4973f564 100644
--- a/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
+++ b/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, bzip2, openssl, zlib }:
+{ lib, stdenv, fetchzip, bzip2, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "imgpatchtools";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   installPhase = "install -Dt $out/bin bin/*";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools to manipulate Android OTA archives";
     longDescription = ''
       This package is useful for Android development. In particular, it can be
diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix
index a7e158bd3bb1..82a264e702de 100644
--- a/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,4 +1,4 @@
-{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
+{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
 { name, src, preBuild ? "", target, tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
 , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false
@@ -34,14 +34,14 @@ let
   extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
 in
 stdenv.mkDerivation ({
-  name = stdenv.lib.replaceChars [" "] [""] name;
+  name = lib.replaceChars [" "] [""] name;
 
   buildInputs = [ nodejs titanium alloy python which file jdk ];
 
   buildPhase = ''
     ${preBuild}
 
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error.
       alloy=$(dirname $(type -p alloy))/..
       cp -rv $alloy/* alloy
@@ -51,7 +51,7 @@ stdenv.mkDerivation ({
 
     export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
 
-    ${stdenv.lib.optionalString (tiVersion != null) ''
+    ${lib.optionalString (tiVersion != null) ''
       # Replace titanium version by the provided one
       sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
     ''}
@@ -76,7 +76,7 @@ stdenv.mkDerivation ({
       export GRADLE_USER_HOME=$TMPDIR/gradle
 
       ${if release then ''
-        ${stdenv.lib.optionalString stdenv.isDarwin ''
+        ${lib.optionalString stdenv.isDarwin ''
           # Signing the app does not work with OpenJDK on macOS, use host SDK instead
           export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
         ''}
@@ -171,7 +171,7 @@ stdenv.mkDerivation ({
         mkdir -p $out/nix-support
         echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
 
-        ${stdenv.lib.optionalString enableWirelessDistribution ''
+        ${lib.optionalString enableWirelessDistribution ''
           appname="$(basename $out/*.ipa .ipa)"
           bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
           version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
@@ -184,5 +184,5 @@ stdenv.mkDerivation ({
     else throw "Target: ${target} is not supported!"}
   '';
 
-  failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
+  failureHook = lib.optionalString (release && target == "iphone") deleteKeychain;
 } // extraArgs)
diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix
index 44ec91d7e596..151502a5d160 100644
--- a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix
@@ -8,11 +8,11 @@ rec {
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
-      inherit (pkgs) stdenv fetchurl unzip makeWrapper;
+      inherit (pkgs) stdenv lib fetchurl unzip makeWrapper;
     };
 
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv python which file jdk nodejs;
+    inherit (pkgs) stdenv lib python which file jdk nodejs;
     inherit (pkgs.nodePackages) alloy titanium;
     inherit (androidenv) composeAndroidPackages;
     inherit (xcodeenv) composeXcodeWrapper;
diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index 2af53a63b58d..0742247893c3 100644
--- a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper}:
+{stdenv, lib, fetchurl, unzip, makeWrapper}:
 
 let
   # Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
     sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
 
-    ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
       # Patch the strip frameworks script in the iPhone build template to not let
       # it skip the strip phase. This is caused by an assumption on the file
       # permissions in which Nix deviates from the standard.
diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
index b995a566f529..965a385ac56c 100644
--- a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper}:
+{stdenv, lib, fetchurl, unzip, makeWrapper}:
 
 let
   # Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
     sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
 
-    ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
       # Patch the strip frameworks script in the iPhone build template to not let
       # it skip the strip phase. This is caused by an assumption on the file
       # permissions in which Nix deviates from the standard.
diff --git a/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix b/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
index cd58ea4e20cf..0f73646c7691 100644
--- a/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "cmake-modules-webos";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   setupHook = ./cmake-setup-hook.sh;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CMake modules needed to build Open WebOS components";
     license = licenses.asl20;
     maintainers = with maintainers; [ dtzWill ];
diff --git a/nixpkgs/pkgs/development/mobile/webos/novacom.nix b/nixpkgs/pkgs/development/mobile/webos/novacom.nix
index e7afdb32137b..eca29dd2fabd 100644
--- a/nixpkgs/pkgs/development/mobile/webos/novacom.nix
+++ b/nixpkgs/pkgs/development/mobile/webos/novacom.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, webos, cmake, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, webos, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "novacom";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "12s6g7l20kakyjlhqpli496miv2kfsdp17lcwhdrzdxvxl6hnf4n";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ];
+  nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ];
 
   postInstall = ''
     install -Dm755 -t $out/bin ../scripts/novaterm
     substituteInPlace $out/bin/novaterm --replace "exec novacom" "exec $out/bin/novacom"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility for communicating with WebOS devices";
     license = licenses.asl20;
     maintainers = with maintainers; [ dtzWill ];
diff --git a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix
index 932ec0e59d64..dc330ce6d4e9 100644
--- a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix
+++ b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix
@@ -1,6 +1,6 @@
-{ stdenv,
+{ lib, stdenv,
 fetchFromGitHub, fetchpatch,
-webos, cmake, pkgconfig,
+webos, cmake, pkg-config,
 libusb-compat-0_1 }:
 
 stdenv.mkDerivation rec {
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ];
+  nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ];
 
   buildInputs = [ libusb-compat-0_1 ];
 
   cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Daemon for communicating with WebOS devices";
     license = licenses.asl20;
     maintainers = with maintainers; [ dtzWill ];
diff --git a/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix
index fa108c8e4706..ae8416c8d769 100644
--- a/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -1,4 +1,4 @@
-{stdenv, composeXcodeWrapper}:
+{stdenv, lib, composeXcodeWrapper}:
 { name
 , src
 , sdkVersion ? "13.1"
@@ -53,13 +53,13 @@ let
   extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs);
 in
 stdenv.mkDerivation ({
-  name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
+  name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
   buildPhase = ''
     # Be sure that the Xcode wrapper has priority over everything else.
     # When using buildInputs this does not seem to be the case.
     export PATH=${xcodewrapper}/bin:$PATH
-    
-    ${stdenv.lib.optionalString release ''
+
+    ${lib.optionalString release ''
       export HOME=/Users/$(whoami)
       keychainName="$(basename $out)"
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation ({
       security unlock-keychain -p "" $keychainName
 
       # Import the certificate into the keychain
-      security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A 
+      security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
 
       # Grant the codesign utility permissions to read from the keychain
       security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
@@ -91,10 +91,10 @@ stdenv.mkDerivation ({
     # Do the building
     export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works
 
-    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags}
+    xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags}
 
-    ${stdenv.lib.optionalString release ''
-      ${stdenv.lib.optionalString generateIPA ''
+    ${lib.optionalString release ''
+      ${lib.optionalString generateIPA ''
         # Create export plist file
         cat > "${name}.plist" <<EOF
         <?xml version="1.0" encoding="UTF-8"?>
@@ -112,7 +112,7 @@ stdenv.mkDerivation ({
             <string>manual</string>
             <key>method</key>
             <string>${signMethod}</string>
-            ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") ''
+            ${lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") ''
               <key>compileBitcode</key>
               <false/>
             ''}
@@ -127,14 +127,14 @@ stdenv.mkDerivation ({
         mkdir -p $out/nix-support
         echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
 
-        ${stdenv.lib.optionalString enableWirelessDistribution ''
+        ${lib.optionalString enableWirelessDistribution ''
           # Add another hacky build product that enables wireless adhoc installations
           appname="$(basename "$(echo $out/*.ipa)" .ipa)"
           sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&amp;version=${appVersion}\&amp;title=$appname|" ${./install.html.template} > $out/''${appname}.html
           echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products
         ''}
       ''}
-      ${stdenv.lib.optionalString generateXCArchive ''
+      ${lib.optionalString generateXCArchive ''
         mkdir -p $out
         mv "${name}.xcarchive" $out
       ''}
@@ -144,7 +144,7 @@ stdenv.mkDerivation ({
     ''}
   '';
 
-  failureHook = stdenv.lib.optionalString release deleteKeychain;
+  failureHook = lib.optionalString release deleteKeychain;
 
   installPhase = "true";
 } // extraArgs)
diff --git a/nixpkgs/pkgs/development/mobile/xcodeenv/default.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/default.nix
index 47686e6d69e9..90642ca7d9ac 100644
--- a/nixpkgs/pkgs/development/mobile/xcodeenv/default.nix
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,4 +1,4 @@
-{stdenv}:
+{ stdenv, lib }:
 
 rec {
   composeXcodeWrapper = import ./compose-xcodewrapper.nix {
@@ -6,10 +6,10 @@ rec {
   };
 
   buildApp = import ./build-app.nix {
-    inherit stdenv composeXcodeWrapper;
+    inherit stdenv lib composeXcodeWrapper;
   };
 
   simulateApp = import ./simulate-app.nix {
-    inherit stdenv composeXcodeWrapper;
+    inherit stdenv lib composeXcodeWrapper;
   };
 }
diff --git a/nixpkgs/pkgs/development/mobile/xcodeenv/simulate-app.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 1a55f8366a3b..ea0502eb9818 100644
--- a/nixpkgs/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -1,4 +1,4 @@
-{stdenv, composeXcodeWrapper}:
+{stdenv, lib, composeXcodeWrapper}:
 {name, app ? null, bundleId ? null, ...}@args:
 
 assert app != null -> bundleId != null;
@@ -9,7 +9,7 @@ let
   xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
 in
 stdenv.mkDerivation {
-  name = stdenv.lib.replaceChars [" "] [""] name;
+  name = lib.replaceChars [" "] [""] name;
   buildCommand = ''
     mkdir -p $out/bin
     cat > $out/bin/run-test-simulator << "EOF"
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     # Open the simulator instance
     open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid
 
-    ${stdenv.lib.optionalString (app != null) ''
+    ${lib.optionalString (app != null) ''
       # Copy the app and restore the write permissions
       appTmpDir=$(mktemp -d -t appTmpDir)
       cp -r "$(echo ${app}/*.app)" "$appTmpDir"
diff --git a/nixpkgs/pkgs/development/mobile/xpwn/default.nix b/nixpkgs/pkgs/development/mobile/xpwn/default.nix
index 0c49a29b3222..075a247f12c9 100644
--- a/nixpkgs/pkgs/development/mobile/xpwn/default.nix
+++ b/nixpkgs/pkgs/development/mobile/xpwn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "xpwn";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
     description = "Custom NOR firmware loader/IPSW generator for the iPhone";
     license     = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/node-packages/default.nix b/nixpkgs/pkgs/development/node-packages/default.nix
index 928ce0712520..175cde7bed55 100644
--- a/nixpkgs/pkgs/development/node-packages/default.nix
+++ b/nixpkgs/pkgs/development/node-packages/default.nix
@@ -234,7 +234,7 @@ let
     };
 
     vega-cli = super.vega-cli.override {
-      nativeBuildInputs = [ pkgs.pkgconfig ];
+      nativeBuildInputs = [ pkgs.pkg-config ];
       buildInputs = with pkgs; [
         super.node-pre-gyp
         pixman
@@ -282,5 +282,13 @@ let
         echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
       '';
     };
+
+    yaml-language-server = super.yaml-language-server.override {
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      postInstall = ''
+        wrapProgram "$out/bin/yaml-language-server" \
+        --prefix NODE_PATH : ${self.prettier}/lib/node_modules
+      '';
+    };
   };
 in self
diff --git a/nixpkgs/pkgs/development/node-packages/node-env.nix b/nixpkgs/pkgs/development/node-packages/node-env.nix
index 04e3ee097fae..f65cb65cf8da 100644
--- a/nixpkgs/pkgs/development/node-packages/node-env.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-env.nix
@@ -388,10 +388,11 @@ let
     , dontStrip ? true
     , unpackPhase ? "true"
     , buildPhase ? "true"
+    , meta ? {}
     , ... }@args:
 
     let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
     in
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
@@ -443,6 +444,11 @@ let
         # Run post install hook, if provided
         runHook postInstall
       '';
+
+      meta = {
+        # default to Node.js' platforms
+        platforms = nodejs.meta.platforms;
+      } // meta;
     } // extraArgs);
 
   # Builds a development shell
diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix
index 8f5c140d9254..94c0b38fc76f 100644
--- a/nixpkgs/pkgs/development/node-packages/node-packages.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix
@@ -3550,13 +3550,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-8.0.0" = {
+    "@netlify/build-8.0.1" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "8.0.0";
+      version = "8.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-8.0.0.tgz";
-        sha512 = "yF9kmeMEn5qPc6D62AyuzaFD/L+TDvZH5+0zw5NpXs5caUysBDolV/rxQa4KTVCaPBBqx044/J69byMuoH5zpQ==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-8.0.1.tgz";
+        sha512 = "DOBUR4x0GEmi4hD8LagJfPCtxnaAtjRTJgZdTx9lFngC2OHY+xIwGZ3Ilct1b3vbAcl0SzHA+HZ4xrG2V/EWdw==";
       };
     };
     "@netlify/cache-utils-1.0.6" = {
@@ -3577,22 +3577,22 @@ let
         sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw==";
       };
     };
-    "@netlify/config-2.4.2" = {
+    "@netlify/config-2.4.3" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "2.4.2";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.2.tgz";
-        sha512 = "EODBhSJHBpN4IhL68881uF0jutc5xkodgRP1mq3bPpNidLJjfcxltFSnT3TjtZmRxcCwFdl+XMqJzvcI3UKf4A==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.3.tgz";
+        sha512 = "Uz7Oo3tJP2VTgNgsJtRlwAhO5jTozkpNMCKALb814ssJKx7nE/4QvNxJPCQNBDXY9BSeXVIPfy0vMfshxatL+g==";
       };
     };
-    "@netlify/functions-utils-1.3.3" = {
+    "@netlify/functions-utils-1.3.4" = {
       name = "_at_netlify_slash_functions-utils";
       packageName = "@netlify/functions-utils";
-      version = "1.3.3";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.3.tgz";
-        sha512 = "cZhdSzyQkd6ZVUxL7mcOlLq2u2+JUzKfxmAjwMLwFAZKqc0YL8dWXP2C4Fe1I0g9u7fe6yAgDGigAkMnIgAYtw==";
+        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.4.tgz";
+        sha512 = "AkVd03D6K7Uwli+t5xTMm5c1jn1HRFY3YgslLV91huHI++3CjOsGpsnDfhoN2kj1aN8OLqliTOvs4PQHC2dKpw==";
       };
     };
     "@netlify/git-utils-1.0.6" = {
@@ -3694,6 +3694,15 @@ let
         sha512 = "7Fatc5OoRZ7V2tusx1CBWIdk9hXrr0JWoW547wsmopCkCl5O4TaLxw12CgfW6EQsjaufSnuQddzvnx5y1b5gGQ==";
       };
     };
+    "@netlify/zip-it-and-ship-it-2.0.0" = {
+      name = "_at_netlify_slash_zip-it-and-ship-it";
+      packageName = "@netlify/zip-it-and-ship-it";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.0.tgz";
+        sha512 = "DQQldFTRmEPHpvvKxAKLNk/RqVIfzZGsBcbmruy3zupPG2W+pGHnQUSMNXrUZmMkqekDh0nCHf8MfG0EakRqGg==";
+      };
+    };
     "@node-red/editor-api-1.2.6" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
@@ -4756,22 +4765,22 @@ let
         sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA==";
       };
     };
-    "@rollup/plugin-commonjs-13.0.2" = {
+    "@rollup/plugin-commonjs-15.1.0" = {
       name = "_at_rollup_slash_plugin-commonjs";
       packageName = "@rollup/plugin-commonjs";
-      version = "13.0.2";
+      version = "15.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.2.tgz";
-        sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ==";
+        url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz";
+        sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==";
       };
     };
-    "@rollup/plugin-commonjs-15.1.0" = {
+    "@rollup/plugin-commonjs-17.0.0" = {
       name = "_at_rollup_slash_plugin-commonjs";
       packageName = "@rollup/plugin-commonjs";
-      version = "15.1.0";
+      version = "17.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz";
-        sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==";
+        url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.0.0.tgz";
+        sha512 = "/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA==";
       };
     };
     "@rollup/plugin-inject-4.0.2" = {
@@ -4792,13 +4801,13 @@ let
         sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==";
       };
     };
-    "@rollup/plugin-node-resolve-8.4.0" = {
+    "@rollup/plugin-node-resolve-11.0.1" = {
       name = "_at_rollup_slash_plugin-node-resolve";
       packageName = "@rollup/plugin-node-resolve";
-      version = "8.4.0";
+      version = "11.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz";
-        sha512 = "LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ==";
+        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz";
+        sha512 = "ltlsj/4Bhwwhb+Nb5xCz/6vieuEj2/BAkkqVIKmZwC7pIdl8srmgmglE4S0jFlZa32K4qvdQ6NHdmpRKD/LwoQ==";
       };
     };
     "@rollup/plugin-node-resolve-9.0.0" = {
@@ -4972,13 +4981,13 @@ let
         sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA==";
       };
     };
-    "@serverless/utils-2.1.0" = {
+    "@serverless/utils-2.2.0" = {
       name = "_at_serverless_slash_utils";
       packageName = "@serverless/utils";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/utils/-/utils-2.1.0.tgz";
-        sha512 = "3DJqUrBaFPam8XT2GZIErjJzKC4sm4XEmjiAxur7B2oAwSvH2rqSwBXUuG1O7azcVueQFcKzmSJTfNhsmaFguA==";
+        url = "https://registry.npmjs.org/@serverless/utils/-/utils-2.2.0.tgz";
+        sha512 = "0TqmLwH9r2GAewvz9mhZ+TSyQBoE9ANuB4nNhn6lJvVUgzlzji3aqeFbAuDt+Z60ZkaIDNipU/J5Vf2Lo/QTQQ==";
       };
     };
     "@serverless/utils-china-1.0.12" = {
@@ -6214,6 +6223,15 @@ let
         sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==";
       };
     };
+    "@types/mocha-8.2.0" = {
+      name = "_at_types_slash_mocha";
+      packageName = "@types/mocha";
+      version = "8.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.0.tgz";
+        sha512 = "/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==";
+      };
+    };
     "@types/multer-1.4.4" = {
       name = "_at_types_slash_multer";
       packageName = "@types/multer";
@@ -6250,31 +6268,31 @@ let
         sha512 = "vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA==";
       };
     };
-    "@types/node-12.19.11" = {
+    "@types/node-12.12.70" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.19.11";
+      version = "12.12.70";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.19.11.tgz";
-        sha512 = "bwVfNTFZOrGXyiQ6t4B9sZerMSShWNsGRw8tC5DY1qImUNczS9SjT4G6PnzjCnxsu5Ubj6xjL2lgwddkxtQl5w==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.12.70.tgz";
+        sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ==";
       };
     };
-    "@types/node-12.7.12" = {
+    "@types/node-12.19.12" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.7.12";
+      version = "12.19.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz";
-        sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz";
+        sha512 = "UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==";
       };
     };
-    "@types/node-13.13.38" = {
+    "@types/node-13.13.39" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.38";
+      version = "13.13.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.38.tgz";
-        sha512 = "oxo8j9doh7ab9NwDA9bCeFfjHRF/uzk+fTljCy8lMjZ3YzZGAXNDKhTE3Byso/oy32UTUQIXB3HCVHu3d2T3xg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.39.tgz";
+        sha512 = "wct+WgRTTkBm2R3vbrFOqyZM5w0g+D8KnhstG9463CJBVC3UVZHMToge7iMBR1vDl/I+NWFHUeK9X+JcF0rWKw==";
       };
     };
     "@types/node-14.11.1" = {
@@ -6286,13 +6304,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.19" = {
+    "@types/node-14.14.20" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.19";
+      version = "14.14.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.19.tgz";
-        sha512 = "4nhBPStMK04rruRVtVc6cDqhu7S9GZai0fpXgPXrFpcPX6Xul8xnrjSdGB4KPBVYG/R5+fXWdCM8qBoiULWGPQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz";
+        sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==";
       };
     };
     "@types/node-6.14.13" = {
@@ -6745,13 +6763,13 @@ let
         sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==";
       };
     };
-    "@typescript-eslint/eslint-plugin-3.10.1" = {
+    "@typescript-eslint/eslint-plugin-4.12.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "3.10.1";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz";
-        sha512 = "PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz";
+        sha512 = "wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q==";
       };
     };
     "@typescript-eslint/experimental-utils-3.10.1" = {
@@ -6763,6 +6781,15 @@ let
         sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
       };
     };
+    "@typescript-eslint/experimental-utils-4.12.0" = {
+      name = "_at_typescript-eslint_slash_experimental-utils";
+      packageName = "@typescript-eslint/experimental-utils";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz";
+        sha512 = "MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA==";
+      };
+    };
     "@typescript-eslint/parser-3.10.1" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
@@ -6772,6 +6799,24 @@ let
         sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
       };
     };
+    "@typescript-eslint/parser-4.12.0" = {
+      name = "_at_typescript-eslint_slash_parser";
+      packageName = "@typescript-eslint/parser";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.12.0.tgz";
+        sha512 = "9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ==";
+      };
+    };
+    "@typescript-eslint/scope-manager-4.12.0" = {
+      name = "_at_typescript-eslint_slash_scope-manager";
+      packageName = "@typescript-eslint/scope-manager";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz";
+        sha512 = "QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg==";
+      };
+    };
     "@typescript-eslint/types-3.10.1" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
@@ -6781,6 +6826,15 @@ let
         sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
       };
     };
+    "@typescript-eslint/types-4.12.0" = {
+      name = "_at_typescript-eslint_slash_types";
+      packageName = "@typescript-eslint/types";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.12.0.tgz";
+        sha512 = "N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g==";
+      };
+    };
     "@typescript-eslint/typescript-estree-2.34.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
@@ -6799,6 +6853,15 @@ let
         sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
       };
     };
+    "@typescript-eslint/typescript-estree-4.12.0" = {
+      name = "_at_typescript-eslint_slash_typescript-estree";
+      packageName = "@typescript-eslint/typescript-estree";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz";
+        sha512 = "gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w==";
+      };
+    };
     "@typescript-eslint/visitor-keys-3.10.1" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
@@ -6808,6 +6871,15 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
+    "@typescript-eslint/visitor-keys-4.12.0" = {
+      name = "_at_typescript-eslint_slash_visitor-keys";
+      packageName = "@typescript-eslint/visitor-keys";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz";
+        sha512 = "hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw==";
+      };
+    };
     "@uifabric/foundation-7.9.20" = {
       name = "_at_uifabric_slash_foundation";
       packageName = "@uifabric/foundation";
@@ -10084,13 +10156,13 @@ let
         sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==";
       };
     };
-    "async-lock-1.2.6" = {
+    "async-lock-1.2.8" = {
       name = "async-lock";
       packageName = "async-lock";
-      version = "1.2.6";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-lock/-/async-lock-1.2.6.tgz";
-        sha512 = "gobUp/bRWL/uJsxi4ZK7NM770s5d2Tx5Hl7uxFIcN6yTz1Kvy2RCSKEvzhLsjAAnYaNa8lDvcjy9ybM6lXFjIg==";
+        url = "https://registry.npmjs.org/async-lock/-/async-lock-1.2.8.tgz";
+        sha512 = "G+26B2jc0Gw0EG/WN2M6IczuGepBsfR1+DtqLnyFSH4p2C668qkOCtEkGNVEaaNAVlYwEMazy1+/jnLxltBkIQ==";
       };
     };
     "async-mutex-0.1.4" = {
@@ -10327,13 +10399,13 @@ let
         sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
       };
     };
-    "aws-sdk-2.820.0" = {
+    "aws-sdk-2.821.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.820.0";
+      version = "2.821.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.820.0.tgz";
-        sha512 = "OwGHxprG4KX5QC+vc77Xl7RCkJdwwKYPB7Gw3odNlMfdljedw7ICBylsMSBEwi/YjwaPryKPevHdOJAHbTKvQg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.821.0.tgz";
+        sha512 = "UtUlURMzmns1Wq8uAdJcyKsm/nW7iRYgTQEONQIpud0xwtjpPPR1pBFB0RSNZuYnZxcWboo807+jxq+LjaBEKA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -12865,13 +12937,13 @@ let
         sha1 = "69fdf13ad9d91222baee109945faadc431534f86";
       };
     };
-    "bufferutil-4.0.2" = {
+    "bufferutil-4.0.3" = {
       name = "bufferutil";
       packageName = "bufferutil";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.2.tgz";
-        sha512 = "AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA==";
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.3.tgz";
+        sha512 = "yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw==";
       };
     };
     "bufferview-1.0.1" = {
@@ -13441,13 +13513,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001171" = {
+    "caniuse-lite-1.0.30001173" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001171";
+      version = "1.0.30001173";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001171.tgz";
-        sha512 = "5Alrh8TTYPG9IH4UkRqEBZoEToWRLvPbSQokvzSz0lii8/FOWKG4keO1HoYfPWs8IF/NH/dyNPg1cmJGvV3Zlg==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz";
+        sha512 = "R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==";
       };
     };
     "canvas-2.6.1" = {
@@ -16024,13 +16096,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-3.2.90" = {
+    "constructs-3.2.94" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.2.90";
+      version = "3.2.94";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.2.90.tgz";
-        sha512 = "Hi0MN1NQOrqVUXE2YGQ0GL6LLPW7R9WP1QYOXvI2OW0wX43zd5sDT0D8PE116EKF8nRAFQenUPlD2EdgxoHPDg==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.2.94.tgz";
+        sha512 = "yK4FKT+hONiC0ebCM0Ln3xuLPF4WPyZSQ8Sl/ZOTTFUI+/csBBxGy7TkY2ZVTbOi7MCHUatZgW2ANsYRaaxoOQ==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -16511,22 +16583,22 @@ let
         sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==";
       };
     };
-    "core-js-3.8.1" = {
+    "core-js-3.8.2" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.8.1";
+      version = "3.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.8.1.tgz";
-        sha512 = "9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz";
+        sha512 = "FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==";
       };
     };
-    "core-js-compat-3.8.1" = {
+    "core-js-compat-3.8.2" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.8.1";
+      version = "3.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.1.tgz";
-        sha512 = "a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz";
+        sha512 = "LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -18203,22 +18275,22 @@ let
         sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==";
       };
     };
-    "dayjs-1.8.36" = {
+    "dayjs-1.10.1" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.8.36";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz";
-        sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.1.tgz";
+        sha512 = "2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ==";
       };
     };
-    "dayjs-1.9.8" = {
+    "dayjs-1.8.36" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.9.8";
+      version = "1.8.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.8.tgz";
-        sha512 = "F42qBtJRa30FKF7XDnOQyNUTsaxDkuaZRj/i7BejSHC34LlLfPoIU4aeopvWfM+m1dJ6/DHKAWLg2ur+pLgq1w==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz";
+        sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==";
       };
     };
     "deasync-0.1.20" = {
@@ -19013,6 +19085,15 @@ let
         sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==";
       };
     };
+    "denque-1.5.0" = {
+      name = "denque";
+      packageName = "denque";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz";
+        sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==";
+      };
+    };
     "dep-graph-1.1.0" = {
       name = "dep-graph";
       packageName = "dep-graph";
@@ -20417,13 +20498,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.633" = {
+    "electron-to-chromium-1.3.634" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.633";
+      version = "1.3.634";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.633.tgz";
-        sha512 = "bsVCsONiVX1abkWdH7KtpuDAhsQ3N3bjPYhROSAXE78roJKet0Y5wznA14JE9pzbwSZmSMAW6KiKYf1RvbTJkA==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz";
+        sha512 = "QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -20743,13 +20824,22 @@ let
         sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==";
       };
     };
-    "engine.io-4.0.5" = {
+    "engine.io-3.5.0" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "4.0.5";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.5.tgz";
-        sha512 = "Ri+whTNr2PKklxQkfbGjwEo+kCBUM4Qxk4wtLqLrhH+b1up2NFL9g9pjYWiCV/oazwB0rArnvF/ZmZN2ab5Hpg==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz";
+        sha512 = "21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==";
+      };
+    };
+    "engine.io-4.0.6" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "4.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz";
+        sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA==";
       };
     };
     "engine.io-client-1.3.1" = {
@@ -20770,6 +20860,15 @@ let
         sha512 = "iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==";
       };
     };
+    "engine.io-client-3.5.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.0.tgz";
+        sha512 = "12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==";
+      };
+    };
     "engine.io-parser-1.0.6" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
@@ -21463,13 +21562,13 @@ let
         sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";
       };
     };
-    "eslint-plugin-vue-7.4.0" = {
+    "eslint-plugin-vue-7.4.1" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
-      version = "7.4.0";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.0.tgz";
-        sha512 = "bYJV3nHSGV5IL40Ti1231vlY8I2DzjDHYyDjRv9Z1koEI7qyV2RR3+uKMafHdOioXYH9W3e1+iwe4wy7FIBNCQ==";
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz";
+        sha512 = "W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw==";
       };
     };
     "eslint-scope-3.7.3" = {
@@ -24533,6 +24632,15 @@ let
         sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==";
       };
     };
+    "fsevents-2.3.1" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz";
+        sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==";
+      };
+    };
     "fstream-0.1.31" = {
       name = "fstream";
       packageName = "fstream";
@@ -31015,6 +31123,15 @@ let
         sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
       };
     };
+    "js-yaml-4.0.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz";
+        sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==";
+      };
+    };
     "js2xmlparser-4.0.1" = {
       name = "js2xmlparser";
       packageName = "js2xmlparser";
@@ -31168,13 +31285,13 @@ let
         sha512 = "1FFGV+JmwyljCNjc9bkW40MIQXvPgNxq+V3zx8/0+FM51S/0O5EvTa/413LX8fzB8sWH0G42NqFa+8k3k9s2hw==";
       };
     };
-    "jsii-srcmak-0.1.176" = {
+    "jsii-srcmak-0.1.180" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.176";
+      version = "0.1.180";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.176.tgz";
-        sha512 = "lX2NuqUceoVVjr0Grm5DRYRyFIDv3cLK6zpAghCu4ZBUlQj8m1ZiOOTu7MUj0yAHi+6WMqP6DP7Q6aT34vo0dw==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.180.tgz";
+        sha512 = "U9CmoEM6A7ZhIT66N8r9flPKUsNnkCu5iWkzH9k6sdNwbiEC5KT4MdJUfJ42L1AbX1BXwhmQtFyj7QvKdGI44g==";
       };
     };
     "json-bigint-0.2.3" = {
@@ -31456,13 +31573,13 @@ let
         sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==";
       };
     };
-    "json2jsii-0.1.168" = {
+    "json2jsii-0.1.172" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.1.168";
+      version = "0.1.172";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.168.tgz";
-        sha512 = "ny9avMgMo4zNUnMagHhP2gp+1QTQjQuryO31s0579BwWrlXVTLlmxl/1A9+Bem6QNXqM6VFDEl4iesyD10ypoQ==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.172.tgz";
+        sha512 = "X78nchCnnN0M3x6byBMhR9X5fz5BETDxFmAE149WUpMn0Dh6Dg3c7H9FbQkRV1MVaqC0sLJHGIeO++hfgYpa7w==";
       };
     };
     "json3-3.2.6" = {
@@ -37586,13 +37703,13 @@ let
         sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g==";
       };
     };
-    "muxrpc-6.5.1" = {
+    "muxrpc-6.5.2" = {
       name = "muxrpc";
       packageName = "muxrpc";
-      version = "6.5.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.1.tgz";
-        sha512 = "QTHNncZlsEcBOOYqpCx/QeVLJYaov6Y1LCEDun0xu81zAJGKymiMd5TB/qzA+dm9o1K3axwdGOqPR3fzrDyGRw==";
+        url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.2.tgz";
+        sha512 = "fgYhBfzevyUbwsB8YBlrnmzZOGxWv6OiAUNKQYwPLqbophsZ+GT8STKrCVHCYNjUx6btxFA5+BJPUCFMecyaSA==";
       };
     };
     "muxrpc-usage-2.1.0" = {
@@ -38163,22 +38280,13 @@ let
         sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug==";
       };
     };
-    "netlify-5.0.2" = {
+    "netlify-6.0.9" = {
       name = "netlify";
       packageName = "netlify";
-      version = "5.0.2";
+      version = "6.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify/-/netlify-5.0.2.tgz";
-        sha512 = "xAbxN/7D3l8vp0KT2FpVqSm72LAukRaJpM2liKylJl1La54s8uLgILL6eUUCKsWrEGTiI1o8w/ApqKrIQdeNOg==";
-      };
-    };
-    "netlify-6.0.7" = {
-      name = "netlify";
-      packageName = "netlify";
-      version = "6.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/netlify/-/netlify-6.0.7.tgz";
-        sha512 = "FvCOaS3HLSeE+AwQvJVQd16UeZn6PYSnbCqEA94vhqIkFyjSOs3oyO0/C0zK8FgKGGZQxO98BTbj4/NKpPdAPg==";
+        url = "https://registry.npmjs.org/netlify/-/netlify-6.0.9.tgz";
+        sha512 = "izoELW+kE5ClHX85f5EExRo42H3hXESwSr69EJdCuDQlTP3JR09xQgZcWL5t7FNdkfBj7Kdhf62tk02TN4+YzA==";
       };
     };
     "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = {
@@ -38830,13 +38938,13 @@ let
         sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.67" = {
+    "node-releases-1.1.69" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.67";
+      version = "1.1.69";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
-        sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz";
+        sha512 = "DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==";
       };
     };
     "node-source-walk-4.2.0" = {
@@ -41342,13 +41450,13 @@ let
         sha512 = "+4S+qBUdqD57ka5MDd6nAYGBPril5eyLpbga2y0kPyYhrKvjb8CYTP9r40WLbSxgT/qEGmvgWOrvQe+FYtCI7w==";
       };
     };
-    "packet-stream-codec-1.1.2" = {
+    "packet-stream-codec-1.1.3" = {
       name = "packet-stream-codec";
       packageName = "packet-stream-codec";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.2.tgz";
-        sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7";
+        url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.3.tgz";
+        sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA==";
       };
     };
     "pacote-11.1.0" = {
@@ -42359,13 +42467,13 @@ let
         sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==";
       };
     };
-    "peek-readable-3.1.0" = {
+    "peek-readable-3.1.1" = {
       name = "peek-readable";
       packageName = "peek-readable";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz";
-        sha512 = "KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA==";
+        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.1.tgz";
+        sha512 = "QHJag0oYYPVkx6rVPEgCLEUMo6VRYbV3GUrqy00lxXJBEIw9LhPCP5MQI6mEfahJO9KYUP8W8qD8kC0V9RyZFQ==";
       };
     };
     "peek-stream-1.1.3" = {
@@ -47904,13 +48012,13 @@ let
         sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
-    "rollup-2.35.1" = {
+    "rollup-2.36.0" = {
       name = "rollup";
       packageName = "rollup";
-      version = "2.35.1";
+      version = "2.36.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-2.35.1.tgz";
-        sha512 = "q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz";
+        sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==";
       };
     };
     "rollup-plugin-babel-4.4.0" = {
@@ -48534,13 +48642,13 @@ let
         sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA==";
       };
     };
-    "secret-stack-6.3.1" = {
+    "secret-stack-6.3.2" = {
       name = "secret-stack";
       packageName = "secret-stack";
-      version = "6.3.1";
+      version = "6.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.1.tgz";
-        sha512 = "SyYRGgjxq8lbQyqdIbaNfteZ77B3Bd2TH+k5WpI6gHjTCOKZZmD8aiat+bUfhjsiqf0LMQauRH3KD6vIMdDPLg==";
+        url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.2.tgz";
+        sha512 = "D46+4LWwsM1LnO4dg6FM/MfGmMk9uYsIcDElqyNeImBnyUueKi2xz10CHF9iSAtSUGReQDV4SCVUiVrPnaKnsA==";
       };
     };
     "secure-compare-3.0.1" = {
@@ -50109,13 +50217,22 @@ let
         sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
       };
     };
-    "socket.io-3.0.4" = {
+    "socket.io-2.4.0" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "3.0.4";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz";
+        sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ==";
+      };
+    };
+    "socket.io-3.0.5" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.4.tgz";
-        sha512 = "Vj1jUoO75WGc9txWd311ZJJqS9Dr8QtNJJ7gk2r7dcM/yGe9sit7qOijQl3GAwhpBOz/W8CwkD7R6yob07nLbA==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz";
+        sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
       };
     };
     "socket.io-adapter-0.2.0" = {
@@ -50163,13 +50280,13 @@ let
         sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==";
       };
     };
-    "socket.io-client-2.3.1" = {
+    "socket.io-client-2.4.0" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
-      version = "2.3.1";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.1.tgz";
-        sha512 = "YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ==";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz";
+        sha512 = "M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==";
       };
     };
     "socket.io-parser-2.1.2" = {
@@ -50208,13 +50325,13 @@ let
         sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==";
       };
     };
-    "socket.io-parser-4.0.2" = {
+    "socket.io-parser-4.0.3" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.2.tgz";
-        sha512 = "Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz";
+        sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw==";
       };
     };
     "sockjs-0.3.20" = {
@@ -51261,13 +51378,13 @@ let
         sha512 = "/QX6+DJkghqq1ZTbgYpOvaI+gx2O7ee1TRUM9yiOlVjh1XAQBevcBj0zO+W3TsNllX86urqBrySd/AEfFfUpIw==";
       };
     };
-    "ssb-ref-2.14.2" = {
+    "ssb-ref-2.14.3" = {
       name = "ssb-ref";
       packageName = "ssb-ref";
-      version = "2.14.2";
+      version = "2.14.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.2.tgz";
-        sha512 = "pPkwNX/Rrr0bV/8d8dC/f+T/LcKA9ZF1SGHrUuVpoqo8iE3gLMu0Zz5TRoUReXKW6+ehNzUzIjcpYTw+wWeZkA==";
+        url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.3.tgz";
+        sha512 = "XhzVmezsUJLlKxTfWlicxhiPRTEYHfJLskYQNRSnw4USqgo9LVx53+MJAhdZOYpZTW2jINR0TeetWs9M27gcbA==";
       };
     };
     "ssb-replicate-1.3.2" = {
@@ -52566,13 +52683,13 @@ let
         sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
       };
     };
-    "strtok3-6.0.4" = {
+    "strtok3-6.0.6" = {
       name = "strtok3";
       packageName = "strtok3";
-      version = "6.0.4";
+      version = "6.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz";
-        sha512 = "rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ==";
+        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.6.tgz";
+        sha512 = "fVxvAEKDwHFfbQO1yKxKBPfkWZyBr0Zf20UQ/mblbkAQe5h0Xdd2jDb3Mh7yRZd7LSItJ9JWgQWelpEmVoBe2g==";
       };
     };
     "structured-source-3.0.2" = {
@@ -53151,13 +53268,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.33.5" = {
+    "systeminformation-4.34.2" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.33.5";
+      version = "4.34.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.33.5.tgz";
-        sha512 = "LxsyvCB4uYqzjEQUH5cNt8TCNZsEc5oHV5LfT96huYAj3w9U0TGQtg7CiTWYzU4aBnBAejXWct6O0nlZhzzaqQ==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.2.tgz";
+        sha512 = "1LynQMla38gIjzyupKBnBLIo4B0TQf3vdhs2bjKPtN02EymuSWpoAM1KX/6+gtFLVmn91MfllE3wSVGQcVTHDw==";
       };
     };
     "table-3.8.3" = {
@@ -53196,13 +53313,13 @@ let
         sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
       };
     };
-    "table-6.0.6" = {
+    "table-6.0.7" = {
       name = "table";
       packageName = "table";
-      version = "6.0.6";
+      version = "6.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-6.0.6.tgz";
-        sha512 = "OInCtPmDNieVBkVFi6C8RwU2S2H0h8mF3e3TQK4nreaUNCpooQUkI+A/KuEkm5FawfhWIfNqG+qfelVVR+V00g==";
+        url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz";
+        sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==";
       };
     };
     "table-layout-0.4.5" = {
@@ -55069,13 +55186,13 @@ let
         sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
       };
     };
-    "tsutils-3.17.1" = {
+    "tsutils-3.18.0" = {
       name = "tsutils";
       packageName = "tsutils";
-      version = "3.17.1";
+      version = "3.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz";
-        sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==";
+        url = "https://registry.npmjs.org/tsutils/-/tsutils-3.18.0.tgz";
+        sha512 = "D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA==";
       };
     };
     "ttf2woff-2.0.2" = {
@@ -56960,13 +57077,13 @@ let
         sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb";
       };
     };
-    "utf-8-validate-5.0.3" = {
+    "utf-8-validate-5.0.4" = {
       name = "utf-8-validate";
       packageName = "utf-8-validate";
-      version = "5.0.3";
+      version = "5.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.3.tgz";
-        sha512 = "jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A==";
+        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.4.tgz";
+        sha512 = "MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q==";
       };
     };
     "utf7-1.0.2" = {
@@ -58247,15 +58364,6 @@ let
         sha512 = "dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==";
       };
     };
-    "vscode-jsonrpc-6.0.0-next.7" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "6.0.0-next.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz";
-        sha512 = "1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug==";
-      };
-    };
     "vscode-languageclient-4.0.1" = {
       name = "vscode-languageclient";
       packageName = "vscode-languageclient";
@@ -58265,13 +58373,13 @@ let
         sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA==";
       };
     };
-    "vscode-languageclient-7.0.0-next.12" = {
+    "vscode-languageclient-7.0.0" = {
       name = "vscode-languageclient";
       packageName = "vscode-languageclient";
-      version = "7.0.0-next.12";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz";
-        sha512 = "OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg==";
+        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz";
+        sha512 = "P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==";
       };
     };
     "vscode-languageserver-3.5.1" = {
@@ -58382,15 +58490,6 @@ let
         sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==";
       };
     };
-    "vscode-languageserver-protocol-3.16.0-next.10" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.16.0-next.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz";
-        sha512 = "YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A==";
-      };
-    };
     "vscode-languageserver-protocol-3.16.0-next.2" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -58490,15 +58589,6 @@ let
         sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==";
       };
     };
-    "vscode-languageserver-types-3.16.0-next.4" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.16.0-next.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz";
-        sha512 = "NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA==";
-      };
-    };
     "vscode-languageserver-types-3.5.0" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -58598,13 +58688,13 @@ let
         sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==";
       };
     };
-    "vscode-uri-3.0.1" = {
+    "vscode-uri-3.0.2" = {
       name = "vscode-uri";
       packageName = "vscode-uri";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.1.tgz";
-        sha512 = "LnMgm97uZM2JDjX/vKbbCk+phm++Ih31e5Ao3lqokawhDRocp2ZAVMRiIhPZx6fS5Sqnquyhxh8ABn9TWCvHoA==";
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz";
+        sha512 = "jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==";
       };
     };
     "vstream-0.1.0" = {
@@ -60507,13 +60597,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-3.2.1" = {
+    "y18n-3.2.2" = {
       name = "y18n";
       packageName = "y18n";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz";
+        sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==";
       };
     };
     "y18n-4.0.1" = {
@@ -61515,7 +61605,7 @@ in
       sources."append-buffer-1.0.2"
       sources."argparse-1.0.10"
       sources."asciidoctor.js-1.5.9"
-      sources."async-lock-1.2.6"
+      sources."async-lock-1.2.8"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.2"
       sources."bl-4.0.3"
@@ -62007,7 +62097,7 @@ in
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -62058,7 +62148,7 @@ in
       sources."browserslist-4.16.0"
       sources."buffer-from-1.1.1"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.4.3"
@@ -62079,7 +62169,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
@@ -62180,7 +62270,7 @@ in
       sources."mute-stream-0.0.8"
       sources."neo-async-2.6.2"
       sources."node-emoji-1.10.0"
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
@@ -62674,7 +62764,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -62924,7 +63014,7 @@ in
         ];
       })
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       (sources."capital-case-1.0.4" // {
         dependencies = [
           sources."tslib-2.0.3"
@@ -63055,8 +63145,8 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.1"
-      (sources."core-js-compat-3.8.1" // {
+      sources."core-js-3.8.2"
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -63152,7 +63242,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -63655,7 +63745,7 @@ in
           sources."is-wsl-2.2.0"
         ];
       })
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -64477,10 +64567,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.15.3";
+    version = "1.15.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.15.3.tgz";
-      sha512 = "RYp9vX+/ojXMCpxMOsZu9e4X5+k3Nlq3vW4gdMkIVXIlk7hfvNcBfAYMeq3ao68cyYQFLJWVkFY0DlQfn0hQhQ==";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.15.4.tgz";
+      sha512 = "bBFO/imgikyrGd6urHfiZDmceZzAMfWeAmt5Fd9du5B+rv6IIJsDZMrTcalKUhwL6NdM0mBwkFcLmQvjm8UMOw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -64616,7 +64706,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -65635,7 +65725,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.38"
+      sources."@types/node-13.13.39"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -66068,7 +66158,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.2.90"
+      sources."constructs-3.2.94"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-4.0.0"
@@ -66144,13 +66234,13 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.176" // {
+      (sources."jsii-srcmak-0.1.180" // {
         dependencies = [
           sources."fs-extra-9.0.1"
         ];
       })
       sources."json-schema-0.2.5"
-      sources."json2jsii-0.1.168"
+      sources."json2jsii-0.1.172"
       (sources."jsonfile-6.1.0" // {
         dependencies = [
           sources."universalify-2.0.0"
@@ -66250,7 +66340,7 @@ in
     };
     dependencies = [
       sources."@jsii/spec-1.16.0"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/readline-sync-1.4.3"
       sources."@types/uuid-8.3.0"
       sources."@types/yoga-layout-1.9.2"
@@ -66285,7 +66375,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.2.90"
+      sources."constructs-3.2.94"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-1.2.0"
@@ -66404,7 +66494,7 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.176" // {
+      (sources."jsii-srcmak-0.1.180" // {
         dependencies = [
           sources."fs-extra-9.0.1"
           (sources."jsonfile-6.1.0" // {
@@ -66724,14 +66814,15 @@ in
   coc-eslint = nodeEnv.buildNodePackage {
     name = "coc-eslint";
     packageName = "coc-eslint";
-    version = "1.3.2";
+    version = "1.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.2.tgz";
-      sha512 = "4eKNFSYkwo2elYrtxRdQbe9HuSLVBYk5uBVHt7VPvEjysAGAZZJ8sUha8gl32mWbSrbbbrbIP1SfOomVJPQeNQ==";
+      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.1.tgz";
+      sha512 = "dqzn4vqmEqIlzwpFxG6AnhXUwDSTMLsg2d4RDwHDhh1yioukSFR+turQxsq9fssuWeV208y54kb/AzmOIji9jA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
-      description = "eslint extension for coc";
+      description = "Eslint extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-eslint#readme";
       license = "MIT";
     };
     production = true;
@@ -66769,7 +66860,7 @@ in
       sources."node-fetch-2.6.1"
       sources."tslib-2.0.3"
       sources."vscode-languageserver-textdocument-1.0.1"
-      sources."vscode-uri-3.0.1"
+      sources."vscode-uri-3.0.2"
       sources."which-2.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -67206,7 +67297,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
@@ -67263,7 +67354,7 @@ in
         ];
       })
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.1"
+      sources."core-js-3.8.2"
       sources."cosmiconfig-3.1.0"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-6.0.5" // {
@@ -67303,7 +67394,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -67992,7 +68083,7 @@ in
           sources."tsutils-2.29.0"
         ];
       })
-      sources."tsutils-3.17.1"
+      sources."tsutils-3.18.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."typescript-3.9.7"
@@ -68057,7 +68148,7 @@ in
       sources."x-is-string-0.1.0"
       sources."xdg-basedir-3.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yallist-4.0.0"
       (sources."yargs-11.1.1" // {
         dependencies = [
@@ -68144,10 +68235,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.25.0";
+    version = "0.26.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.25.0.tgz";
-      sha512 = "+Diufwhz7JMJlbdNuwkcfcWnGXS5neoJlSW897kI0zfYL9H0R+fJXwiEYy0/f2UWn2eO1pjy0svqyXlacyvAoQ==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.26.0.tgz";
+      sha512 = "Wn0m/IImB9BryAUhH5WTSqrkWh2tamuMVyMzxUmH1EW71TJKOavfV2DAmSNYSkGCD/H9icUbMIiSwyMI9JVYOw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68268,7 +68359,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -68306,7 +68397,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -68401,7 +68492,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       (sources."normalize-package-data-3.0.0" // {
         dependencies = [
           sources."semver-7.3.4"
@@ -68500,7 +68591,7 @@ in
       sources."sugarss-2.0.0"
       sources."supports-color-5.5.0"
       sources."svg-tags-1.0.0"
-      sources."table-6.0.6"
+      sources."table-6.0.7"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
       sources."trim-newlines-3.0.0"
@@ -68728,7 +68819,7 @@ in
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
       sources."eslint-7.17.0"
-      sources."eslint-plugin-vue-7.4.0"
+      sources."eslint-plugin-vue-7.4.1"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -68820,7 +68911,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-3.1.1"
       sources."supports-color-5.5.0"
-      (sources."table-6.0.6" // {
+      (sources."table-6.0.7" // {
         dependencies = [
           sources."ajv-7.0.3"
           sources."json-schema-traverse-1.0.0"
@@ -69558,7 +69649,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.33.5"
+      sources."systeminformation-4.34.2"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -69645,7 +69736,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -70016,7 +70107,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -71096,7 +71187,7 @@ in
     dependencies = [
       sources."@fast-csv/format-4.3.5"
       sources."@fast-csv/parse-4.3.6"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."JSONStream-1.3.5"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
@@ -71291,7 +71382,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -73204,7 +73295,7 @@ in
       sources."ws-7.4.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yallist-4.0.0"
       (sources."yargs-7.1.1" // {
         dependencies = [
@@ -73374,7 +73465,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-3.1.1"
       sources."supports-color-5.5.0"
-      (sources."table-6.0.6" // {
+      (sources."table-6.0.7" // {
         dependencies = [
           sources."ajv-7.0.3"
           sources."json-schema-traverse-1.0.0"
@@ -73533,7 +73624,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-3.1.1"
       sources."supports-color-5.5.0"
-      (sources."table-6.0.6" // {
+      (sources."table-6.0.7" // {
         dependencies = [
           sources."ajv-7.0.3"
           sources."json-schema-traverse-1.0.0"
@@ -74256,7 +74347,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -74385,8 +74476,8 @@ in
           sources."slash-3.0.0"
         ];
       })
-      sources."core-js-3.8.1"
-      (sources."core-js-compat-3.8.1" // {
+      sources."core-js-3.8.2"
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -74448,7 +74539,7 @@ in
       sources."dag-map-1.0.2"
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
-      sources."dayjs-1.9.8"
+      sources."dayjs-1.10.1"
       sources."debug-4.3.2"
       sources."debuglog-1.0.1"
       sources."decache-4.4.0"
@@ -74533,7 +74624,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -75167,7 +75258,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
@@ -77061,7 +77152,7 @@ in
       (sources."@grpc/grpc-js-1.1.8" // {
         dependencies = [
           sources."@grpc/proto-loader-0.6.0-pre9"
-          sources."@types/node-12.19.11"
+          sources."@types/node-12.19.12"
           sources."semver-6.3.0"
         ];
       })
@@ -77091,7 +77182,7 @@ in
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/duplexify-3.6.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."abort-controller-3.0.0"
@@ -77653,7 +77744,7 @@ in
       sources."promise-breaker-5.0.0"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.38"
+          sources."@types/node-13.13.39"
         ];
       })
       sources."proxy-addr-2.0.6"
@@ -77881,10 +77972,10 @@ in
   fixjson = nodeEnv.buildNodePackage {
     name = "fixjson";
     packageName = "fixjson";
-    version = "1.1.1";
+    version = "1.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fixjson/-/fixjson-1.1.1.tgz";
-      sha512 = "cKclzjy4yv7Byu/v7hW4a4hwNgrINI/g2K/d3dtcMScdtY8BwBApb1gGBTLppuRaQpfdM/z0xj+5l8xcVKCm8w==";
+      url = "https://registry.npmjs.org/fixjson/-/fixjson-1.1.2.tgz";
+      sha512 = "NptKAXT3UrePy8JfK6ww/yiwqjVipouoEYUucKVpLNOiOWsrZ7XtcG3iUWpb3yGUoaN7OEafsd3cEGFMIjoXUQ==";
     };
     dependencies = [
       sources."ansi-regex-5.0.0"
@@ -78538,7 +78629,7 @@ in
       sources."wordwrap-0.0.3"
       sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yargs-3.32.0"
     ];
     buildInputs = globalBuildInputs;
@@ -78701,7 +78792,7 @@ in
       sources."multiserver-3.7.0"
       sources."multiserver-address-1.0.1"
       sources."multiserver-scopes-1.0.0"
-      sources."muxrpc-6.5.1"
+      sources."muxrpc-6.5.2"
       sources."nearley-2.20.1"
       sources."node-gyp-build-4.2.3"
       sources."node-polyglot-1.0.0"
@@ -78709,7 +78800,7 @@ in
       sources."options-0.0.6"
       sources."os-homedir-1.0.2"
       sources."packet-stream-2.0.5"
-      sources."packet-stream-codec-1.1.2"
+      sources."packet-stream-codec-1.1.3"
       sources."pako-1.0.11"
       sources."private-box-0.3.1"
       sources."progress-1.1.8"
@@ -78805,7 +78896,7 @@ in
       })
       sources."ssb-msgs-5.2.0"
       sources."ssb-pull-requests-1.0.0"
-      sources."ssb-ref-2.14.2"
+      sources."ssb-ref-2.14.3"
       (sources."stream-to-pull-stream-1.7.3" // {
         dependencies = [
           sources."looper-3.0.0"
@@ -79215,7 +79306,7 @@ in
       sources."@nodelib/fs.walk-1.2.6"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -80106,7 +80197,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.33.5"
+      sources."systeminformation-4.34.2"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -80579,7 +80670,7 @@ in
       sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yargs-7.1.1"
       sources."yargs-parser-5.0.0-security.0"
     ];
@@ -80933,7 +81024,7 @@ in
       sources."which-1.3.1"
       sources."which-module-1.0.0"
       sources."wrap-ansi-2.1.0"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yargs-7.1.1"
       sources."yargs-parser-5.0.0-security.0"
     ];
@@ -82454,7 +82545,7 @@ in
       sources."wrappy-1.0.2"
       sources."xmldom-0.4.0"
       sources."xpath-0.0.32"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yallist-4.0.0"
       sources."yargs-6.6.0"
       sources."yargs-parser-4.2.1"
@@ -82647,7 +82738,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.820.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -83371,20 +83462,18 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.14.1";
+    version = "4.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-      sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz";
+      sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==";
     };
     dependencies = [
-      sources."argparse-1.0.10"
-      sources."esprima-4.0.1"
-      sources."sprintf-js-1.0.3"
+      sources."argparse-2.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "YAML 1.2 parser and serializer";
-      homepage = https://github.com/nodeca/js-yaml;
+      homepage = "https://github.com/nodeca/js-yaml#readme";
       license = "MIT";
     };
     production = true;
@@ -83870,19 +83959,16 @@ in
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
       sources."arraybuffer.slice-0.0.7"
-      sources."async-limiter-1.0.1"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
-      sources."better-assert-1.0.2"
       sources."binary-extensions-2.1.0"
       sources."blob-0.0.5"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."bytes-3.1.0"
-      sources."callsite-1.0.0"
       sources."camelcase-5.3.1"
       sources."chokidar-3.4.3"
       sources."cliui-6.0.0"
@@ -83890,12 +83976,12 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
+      sources."component-emitter-1.3.0"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
       sources."connect-3.7.0"
       sources."content-type-1.0.4"
-      sources."cookie-0.3.1"
+      sources."cookie-0.4.1"
       sources."custom-event-1.0.1"
       sources."date-format-3.0.0"
       sources."debug-2.6.9"
@@ -83906,19 +83992,15 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.4.2" // {
+      (sources."engine.io-3.5.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
-      (sources."engine.io-client-3.4.4" // {
+      (sources."engine.io-client-3.5.0" // {
         dependencies = [
-          sources."component-emitter-1.3.0"
           sources."debug-3.1.0"
-          sources."parseqs-0.0.6"
-          sources."parseuri-0.0.6"
-          sources."ws-6.1.4"
         ];
       })
       sources."engine.io-parser-2.2.1"
@@ -83970,14 +84052,13 @@ in
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
       sources."normalize-path-3.0.0"
-      sources."object-component-0.0.3"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
-      sources."parseqs-0.0.5"
-      sources."parseuri-0.0.5"
+      sources."parseqs-0.0.6"
+      sources."parseuri-0.0.6"
       sources."parseurl-1.3.3"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
@@ -83995,29 +84076,22 @@ in
       sources."safer-buffer-2.1.2"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.1"
-      (sources."socket.io-2.3.0" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
       sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.3.0" // {
+      (sources."socket.io-client-2.4.0" // {
         dependencies = [
-          sources."base64-arraybuffer-0.1.5"
-          sources."debug-4.1.1"
-          sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.1" // {
-            dependencies = [
-              sources."component-emitter-1.3.0"
-              sources."debug-3.1.0"
-              sources."ms-2.0.0"
-            ];
-          })
+          sources."debug-3.1.0"
+          sources."socket.io-parser-3.3.1"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
         dependencies = [
+          sources."component-emitter-1.2.1"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
@@ -84388,7 +84462,7 @@ in
       sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."xml-name-validator-2.0.1"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       (sources."yargs-12.0.4" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -84560,7 +84634,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -85869,7 +85943,6 @@ in
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.3"
-      sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
@@ -85884,7 +85957,6 @@ in
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."better-assert-1.0.2"
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
       sources."blob-0.0.5"
@@ -85896,7 +85968,6 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."callsite-1.0.0"
       sources."caseless-0.12.0"
       sources."chokidar-1.7.0"
       (sources."class-utils-0.3.6" // {
@@ -85943,19 +86014,16 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-6.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.4.2" // {
+      (sources."engine.io-3.5.0" // {
         dependencies = [
-          sources."cookie-0.3.1"
+          sources."cookie-0.4.1"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
-      (sources."engine.io-client-3.4.4" // {
+      (sources."engine.io-client-3.5.0" // {
         dependencies = [
           sources."debug-3.1.0"
-          sources."parseqs-0.0.6"
-          sources."parseuri-0.0.6"
-          sources."ws-6.1.4"
         ];
       })
       sources."engine.io-parser-2.2.1"
@@ -86100,7 +86168,6 @@ in
       sources."negotiator-0.6.2"
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.9.0"
-      sources."object-component-0.0.3"
       (sources."object-copy-0.1.0" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -86127,8 +86194,8 @@ in
       sources."on-finished-2.3.0"
       sources."opn-5.5.0"
       sources."parse-glob-3.0.4"
-      sources."parseqs-0.0.5"
-      sources."parseuri-0.0.5"
+      sources."parseqs-0.0.6"
+      sources."parseuri-0.0.6"
       sources."parseurl-1.3.3"
       sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
@@ -86253,27 +86320,18 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.3.0" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
       sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.3.0" // {
+      (sources."socket.io-client-2.4.0" // {
         dependencies = [
-          sources."base64-arraybuffer-0.1.5"
-          sources."component-emitter-1.2.1"
-          sources."debug-4.1.1"
+          sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.1" // {
-            dependencies = [
-              sources."component-emitter-1.3.0"
-              sources."debug-3.1.0"
-              sources."ms-2.0.0"
-            ];
-          })
+          sources."socket.io-parser-3.3.1"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
@@ -86486,7 +86544,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.12"
@@ -86656,7 +86714,7 @@ in
       sources."cached-path-relative-1.0.2"
       sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -86729,7 +86787,7 @@ in
       })
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.1" // {
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -86780,7 +86838,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -86875,7 +86933,7 @@ in
       sources."fs-constants-1.0.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.2.1"
+      sources."fsevents-2.3.1"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
       sources."get-assigned-identifiers-1.2.0"
@@ -87090,7 +87148,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
@@ -87979,7 +88037,7 @@ in
     };
     dependencies = [
       sources."@braintree/sanitize-url-3.1.0"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -88659,10 +88717,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.69.11";
+    version = "2.70.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.69.11.tgz";
-      sha512 = "d6yj11oi+4lzS2dkXYGmhzYlU90S+2utjnrkwD2DdIPGuLLax0XISZ7TMdTPdPuhRF7o0Z9U0GcMMd/0VH3ukQ==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.70.0.tgz";
+      sha512 = "VET5LUeZP2TX+xBXYQdiKkVyQfeW+HkeL7pRE2fGOi14fLE3BYSjjdmnCHDX83hgYniHIxKJBH/52zkyQ+m+2Q==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -88779,22 +88837,27 @@ in
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-8.0.0" // {
+      (sources."@netlify/build-8.0.1" // {
         dependencies = [
+          sources."@netlify/zip-it-and-ship-it-2.0.0"
           sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
           sources."resolve-2.0.0-next.2"
         ];
       })
       sources."@netlify/cache-utils-1.0.6"
-      (sources."@netlify/config-2.4.2" // {
+      (sources."@netlify/config-2.4.3" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
-          sources."netlify-5.0.2"
         ];
       })
-      sources."@netlify/functions-utils-1.3.3"
+      (sources."@netlify/functions-utils-1.3.4" // {
+        dependencies = [
+          sources."@netlify/zip-it-and-ship-it-2.0.0"
+          sources."resolve-2.0.0-next.2"
+        ];
+      })
       (sources."@netlify/git-utils-1.0.6" // {
         dependencies = [
           sources."braces-3.0.2"
@@ -88804,7 +88867,7 @@ in
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."@netlify/open-api-0.18.1"
+      sources."@netlify/open-api-1.0.0"
       sources."@netlify/plugin-edge-handlers-1.10.0"
       sources."@netlify/plugins-list-2.2.0"
       sources."@netlify/run-utils-1.0.5"
@@ -88837,9 +88900,13 @@ in
           })
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
+          sources."has-flag-4.0.0"
           sources."strip-ansi-5.2.0"
-          sources."supports-color-5.5.0"
+          (sources."supports-color-5.5.0" // {
+            dependencies = [
+              sources."has-flag-3.0.0"
+            ];
+          })
         ];
       })
       (sources."@oclif/command-1.8.0" // {
@@ -88913,7 +88980,6 @@ in
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
           sources."fs-extra-7.0.1"
-          sources."has-flag-3.0.0"
           sources."indent-string-3.2.0"
           sources."is-wsl-1.1.0"
           sources."semver-5.7.1"
@@ -89001,7 +89067,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
@@ -89043,10 +89109,9 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
-      sources."argparse-1.0.10"
+      sources."argparse-2.0.1"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -89069,7 +89134,7 @@ in
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.820.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -89088,18 +89153,11 @@ in
       sources."base64-js-1.5.1"
       sources."before-after-hook-2.1.0"
       sources."binary-extensions-2.1.0"
-      (sources."bl-0.8.2" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.0.34"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."bl-4.0.3"
       sources."bn.js-5.1.3"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."qs-6.7.0"
           sources."raw-body-2.4.0"
         ];
       })
@@ -89146,7 +89204,7 @@ in
       sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
       sources."ccount-1.1.0"
@@ -89156,7 +89214,6 @@ in
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
           sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
           sources."supports-color-5.5.0"
         ];
       })
@@ -89201,9 +89258,12 @@ in
         dependencies = [
           sources."ansi-escapes-4.3.1"
           sources."ansi-styles-4.3.0"
+          sources."argparse-1.0.10"
           sources."chalk-4.1.0"
           sources."clean-stack-3.0.1"
           sources."extract-stack-2.0.0"
+          sources."has-flag-4.0.0"
+          sources."js-yaml-3.14.1"
           sources."supports-hyperlinks-2.1.0"
           sources."tslib-2.0.3"
           sources."type-fest-0.11.0"
@@ -89236,7 +89296,6 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       sources."concat-map-0.0.1"
@@ -89244,7 +89303,6 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       (sources."concordance-4.0.0" // {
@@ -89253,12 +89311,7 @@ in
         ];
       })
       sources."config-chain-1.1.12"
-      (sources."configstore-5.0.1" // {
-        dependencies = [
-          sources."crypto-random-string-2.0.0"
-          sources."unique-string-2.0.0"
-        ];
-      })
+      sources."configstore-5.0.1"
       (sources."content-disposition-0.5.3" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -89279,10 +89332,9 @@ in
           sources."readable-stream-2.3.7"
           sources."readdirp-2.2.1"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
-      (sources."core-js-compat-3.8.1" // {
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -89310,7 +89362,7 @@ in
         ];
       })
       sources."crypto-browserify-3.12.0"
-      sources."crypto-random-string-1.0.0"
+      sources."crypto-random-string-2.0.0"
       sources."cyclist-1.0.1"
       sources."date-time-2.1.0"
       (sources."debug-4.3.2" // {
@@ -89337,7 +89389,6 @@ in
           sources."file-type-5.2.0"
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
           sources."tar-stream-1.6.2"
         ];
       })
@@ -89423,7 +89474,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       sources."elf-cam-0.1.1"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -89490,7 +89541,6 @@ in
         dependencies = [
           sources."cookie-0.4.0"
           sources."debug-2.6.9"
-          sources."qs-6.7.0"
           sources."safe-buffer-5.1.2"
         ];
       })
@@ -89560,7 +89610,6 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       sources."from2-array-0.0.4"
@@ -89636,7 +89685,7 @@ in
           sources."ansi-regex-0.2.1"
         ];
       })
-      sources."has-flag-4.0.0"
+      sources."has-flag-3.0.0"
       (sources."has-glob-1.0.0" // {
         dependencies = [
           sources."is-glob-3.1.0"
@@ -89787,7 +89836,7 @@ in
       sources."jmespath-0.15.0"
       sources."js-string-escape-1.0.1"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-4.0.0"
       sources."jsesc-2.5.2"
       sources."json-buffer-3.0.0"
       sources."json-parse-better-errors-1.0.2"
@@ -89810,7 +89859,6 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       (sources."level-blobs-0.1.7" // {
@@ -89846,6 +89894,7 @@ in
       })
       (sources."levelup-0.18.6" // {
         dependencies = [
+          sources."bl-0.8.2"
           sources."isarray-0.0.1"
           sources."prr-0.0.0"
           sources."readable-stream-1.0.34"
@@ -89972,24 +90021,30 @@ in
       sources."natural-orderby-2.0.3"
       sources."negotiator-0.6.2"
       sources."nested-error-stacks-2.1.0"
-      (sources."netlify-6.0.7" // {
+      (sources."netlify-6.0.9" // {
         dependencies = [
-          sources."@netlify/open-api-1.0.0"
+          sources."@netlify/zip-it-and-ship-it-2.0.0"
+          sources."qs-6.9.4"
+          sources."resolve-2.0.0-next.2"
         ];
       })
       sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16"
       (sources."netlify-redirect-parser-2.5.0" // {
         dependencies = [
           sources."@netlify/config-0.11.11"
+          sources."@netlify/open-api-0.18.1"
           sources."ansi-styles-4.3.0"
+          sources."argparse-1.0.10"
           sources."chalk-3.0.0"
+          sources."js-yaml-3.14.1"
           sources."netlify-4.9.0"
+          sources."qs-6.9.4"
         ];
       })
       sources."netlify-redirector-0.2.1"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       sources."node-source-walk-4.2.0"
       sources."noop2-2.0.0"
       (sources."normalize-package-data-2.5.0" // {
@@ -90084,7 +90139,6 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       sources."parse-asn1-5.1.6"
@@ -90114,7 +90168,6 @@ in
       sources."posix-character-classes-0.1.1"
       (sources."postcss-7.0.35" // {
         dependencies = [
-          sources."has-flag-3.0.0"
           sources."source-map-0.6.1"
           sources."supports-color-6.1.0"
         ];
@@ -90147,7 +90200,7 @@ in
       sources."pump-3.0.0"
       sources."punycode-1.3.2"
       sources."pupa-2.1.1"
-      sources."qs-6.9.4"
+      sources."qs-6.7.0"
       sources."query-string-5.1.1"
       sources."querystring-0.2.0"
       sources."random-bytes-1.0.0"
@@ -90207,7 +90260,7 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."ripemd160-2.0.2"
-      sources."rollup-2.35.1"
+      sources."rollup-2.36.0"
       sources."rollup-plugin-node-builtins-2.1.2"
       sources."rollup-plugin-terser-7.0.2"
       sources."run-async-2.4.1"
@@ -90342,7 +90395,11 @@ in
       sources."strict-uri-encode-1.1.0"
       sources."string-range-1.2.2"
       sources."string-width-4.2.0"
-      sources."string_decoder-1.3.0"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."stringify-entities-3.1.0"
       (sources."strip-ansi-6.0.0" // {
         dependencies = [
@@ -90360,7 +90417,11 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      sources."supports-color-7.2.0"
+      (sources."supports-color-7.2.0" // {
+        dependencies = [
+          sources."has-flag-4.0.0"
+        ];
+      })
       (sources."supports-hyperlinks-1.0.1" // {
         dependencies = [
           sources."has-flag-2.0.0"
@@ -90371,15 +90432,13 @@ in
           })
         ];
       })
-      (sources."tar-stream-2.2.0" // {
-        dependencies = [
-          sources."bl-4.0.3"
-        ];
-      })
+      sources."tar-stream-2.2.0"
       sources."temp-dir-1.0.0"
       (sources."tempy-0.3.0" // {
         dependencies = [
+          sources."crypto-random-string-1.0.0"
           sources."type-fest-0.3.1"
+          sources."unique-string-1.0.0"
         ];
       })
       sources."term-size-2.2.1"
@@ -90394,7 +90453,6 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       sources."through2-filter-3.0.0"
@@ -90425,7 +90483,7 @@ in
       sources."triple-beam-1.3.0"
       sources."trough-1.0.5"
       sources."tslib-1.14.1"
-      sources."tsutils-3.17.1"
+      sources."tsutils-3.18.0"
       sources."tunnel-agent-0.6.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
@@ -90446,7 +90504,7 @@ in
       })
       sources."union-value-1.0.1"
       sources."uniq-1.0.1"
-      sources."unique-string-1.0.0"
+      sources."unique-string-2.0.0"
       sources."unist-util-is-4.0.4"
       sources."unist-util-stringify-position-2.0.3"
       sources."unist-util-visit-2.0.3"
@@ -90519,7 +90577,6 @@ in
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       sources."word-wrap-1.2.3"
@@ -90998,7 +91055,7 @@ in
       })
       sources."xmldom-0.1.31"
       sources."xtend-4.0.2"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yargs-3.32.0"
     ];
     buildInputs = globalBuildInputs;
@@ -91998,7 +92055,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/responselike-1.0.0"
@@ -93294,7 +93351,7 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -93321,7 +93378,7 @@ in
       sources."convert-source-map-1.7.0"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.1" // {
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -93429,7 +93486,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -93684,7 +93741,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
       sources."nth-check-1.0.2"
@@ -94941,7 +94998,6 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
-      sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
@@ -94953,7 +95009,6 @@ in
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-0.7.0"
-      sources."better-assert-1.0.2"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
       (sources."bittorrent-tracker-7.7.0" // {
@@ -94978,7 +95033,6 @@ in
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."bytes-3.1.0"
-      sources."callsite-1.0.0"
       sources."caseless-0.12.0"
       sources."chrome-dgram-3.0.6"
       sources."chrome-dns-1.0.1"
@@ -94986,7 +95040,7 @@ in
       sources."combined-stream-1.0.8"
       sources."compact2string-1.4.1"
       sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
+      sources."component-emitter-1.3.0"
       sources."component-inherit-0.0.3"
       (sources."compress-commons-2.1.1" // {
         dependencies = [
@@ -95017,20 +95071,16 @@ in
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."engine.io-3.4.2" // {
+      (sources."engine.io-3.5.0" // {
         dependencies = [
-          sources."cookie-0.3.1"
+          sources."cookie-0.4.1"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
-      (sources."engine.io-client-3.4.4" // {
+      (sources."engine.io-client-3.5.0" // {
         dependencies = [
-          sources."component-emitter-1.3.0"
           sources."debug-3.1.0"
-          sources."parseqs-0.0.6"
-          sources."parseuri-0.0.6"
-          sources."ws-6.1.4"
         ];
       })
       sources."engine.io-parser-2.2.1"
@@ -95140,7 +95190,6 @@ in
       sources."negotiator-0.6.2"
       sources."normalize-path-3.0.0"
       sources."oauth-sign-0.9.0"
-      sources."object-component-0.0.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -95151,8 +95200,8 @@ in
         ];
       })
       sources."parse-torrent-file-2.1.4"
-      sources."parseqs-0.0.5"
-      sources."parseuri-0.0.5"
+      sources."parseqs-0.0.6"
+      sources."parseuri-0.0.6"
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
@@ -95215,30 +95264,23 @@ in
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-2.3.0" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
       sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.3.0" // {
+      (sources."socket.io-client-2.4.0" // {
         dependencies = [
-          sources."base64-arraybuffer-0.1.5"
-          sources."debug-4.1.1"
+          sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.1" // {
-            dependencies = [
-              sources."component-emitter-1.3.0"
-              sources."debug-3.1.0"
-              sources."ms-2.0.0"
-            ];
-          })
+          sources."socket.io-parser-3.3.1"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
         dependencies = [
+          sources."component-emitter-1.2.1"
           sources."debug-4.1.1"
           sources."isarray-2.0.1"
           sources."ms-2.1.3"
@@ -95557,7 +95599,7 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.33.5"
+      sources."systeminformation-4.34.2"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
@@ -95592,10 +95634,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "5.14.1";
+    version = "5.14.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.14.1.tgz";
-      sha512 = "zxdmGEMcvJq5JU4lb3s48xbDnT9C7PHk/aOO7kefgA2LklOuEakRx2sKyGyWRykyQMtOS7h1rD4kdCWsOrh6Hg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.14.3.tgz";
+      sha512 = "PFjHFWCsHgaNCpOwOAgN6H71PA8td8PnwSE1ArXz//OyfdfIwws1s23XLmokhHcnE3JsBSiIR3NOW8JZ5QcxlQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -96147,10 +96189,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.98";
+    version = "1.1.99";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.98.tgz";
-      sha512 = "zDynNde59nDGs58/FpOSndAAxbFTq0x3/RUHng+rN2Ir3Y9CUnYg1vH29q4RnMlwCT/ERrQbmOTxBeD9edUBvQ==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.99.tgz";
+      sha512 = "DAfK8uVLGF1nuBeFvEXhvApCecuHEpe8ncjnFW/WsBBIQ5JOsjjpwlUDvTutNjkoH9QCTqvg72g6ip9PdWFL/w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -96710,7 +96752,7 @@ in
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@redocly/react-dropdown-aria-2.0.11"
-      sources."@types/node-13.13.38"
+      sources."@types/node-13.13.39"
       sources."ajv-5.5.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -96768,7 +96810,7 @@ in
       sources."color-name-1.1.3"
       sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
-      sources."core-js-3.8.1"
+      sources."core-js-3.8.2"
       sources."core-util-is-1.0.2"
       (sources."create-ecdh-4.0.4" // {
         dependencies = [
@@ -97039,10 +97081,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "2.35.1";
+    version = "2.36.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-2.35.1.tgz";
-      sha512 = "q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz";
+      sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==";
     };
     dependencies = [
       sources."fsevents-2.1.3"
@@ -97070,34 +97112,37 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.2.2"
-      sources."@rollup/plugin-commonjs-13.0.2"
-      sources."@rollup/plugin-node-resolve-8.4.0"
-      sources."@rollup/pluginutils-3.1.0"
-      sources."@types/eslint-visitor-keys-1.0.0"
+      (sources."@eslint/eslintrc-0.2.2" // {
+        dependencies = [
+          sources."ignore-4.0.6"
+        ];
+      })
+      sources."@nodelib/fs.scandir-2.1.4"
+      sources."@nodelib/fs.stat-2.0.4"
+      sources."@nodelib/fs.walk-1.2.6"
+      sources."@rollup/plugin-commonjs-17.0.0"
+      sources."@rollup/plugin-node-resolve-11.0.1"
+      (sources."@rollup/pluginutils-3.1.0" // {
+        dependencies = [
+          sources."estree-walker-1.0.1"
+        ];
+      })
       sources."@types/estree-0.0.39"
       sources."@types/glob-7.1.3"
       sources."@types/json-schema-7.0.6"
       sources."@types/minimatch-3.0.3"
-      sources."@types/mocha-7.0.2"
-      sources."@types/node-12.7.12"
+      sources."@types/mocha-8.2.0"
+      sources."@types/node-12.12.70"
       sources."@types/node-fetch-2.5.7"
       sources."@types/resolve-1.17.1"
       sources."@types/vscode-1.52.0"
-      (sources."@typescript-eslint/eslint-plugin-3.10.1" // {
-        dependencies = [
-          sources."semver-7.3.4"
-        ];
-      })
-      sources."@typescript-eslint/experimental-utils-3.10.1"
-      sources."@typescript-eslint/parser-3.10.1"
-      sources."@typescript-eslint/types-3.10.1"
-      (sources."@typescript-eslint/typescript-estree-3.10.1" // {
-        dependencies = [
-          sources."semver-7.3.4"
-        ];
-      })
-      sources."@typescript-eslint/visitor-keys-3.10.1"
+      sources."@typescript-eslint/eslint-plugin-4.12.0"
+      sources."@typescript-eslint/experimental-utils-4.12.0"
+      sources."@typescript-eslint/parser-4.12.0"
+      sources."@typescript-eslint/scope-manager-4.12.0"
+      sources."@typescript-eslint/types-4.12.0"
+      sources."@typescript-eslint/typescript-estree-4.12.0"
+      sources."@typescript-eslint/visitor-keys-4.12.0"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
@@ -97108,6 +97153,7 @@ in
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
+      sources."array-union-2.1.0"
       sources."astral-regex-2.0.0"
       sources."asynckit-0.4.0"
       sources."azure-devops-node-api-7.2.0"
@@ -97154,12 +97200,12 @@ in
       sources."css-what-4.0.0"
       sources."debug-4.3.2"
       sources."decamelize-1.2.0"
-      sources."deep-freeze-0.0.1"
       sources."deep-is-0.1.3"
       sources."deepmerge-4.2.2"
       sources."delayed-stream-1.0.0"
       sources."denodeify-1.2.1"
       sources."diff-4.0.2"
+      sources."dir-glob-3.0.1"
       sources."doctrine-3.0.0"
       sources."dom-serializer-1.2.0"
       sources."domelementtype-2.1.0"
@@ -97180,14 +97226,21 @@ in
       sources."escape-string-regexp-1.0.5"
       (sources."eslint-7.17.0" // {
         dependencies = [
-          sources."eslint-visitor-keys-2.0.0"
-          sources."semver-7.3.4"
+          sources."ignore-4.0.6"
         ];
       })
       sources."eslint-scope-5.1.1"
-      sources."eslint-utils-2.1.0"
-      sources."eslint-visitor-keys-1.3.0"
-      sources."espree-7.3.1"
+      (sources."eslint-utils-2.1.0" // {
+        dependencies = [
+          sources."eslint-visitor-keys-1.3.0"
+        ];
+      })
+      sources."eslint-visitor-keys-2.0.0"
+      (sources."espree-7.3.1" // {
+        dependencies = [
+          sources."eslint-visitor-keys-1.3.0"
+        ];
+      })
       sources."esprima-4.0.1"
       (sources."esquery-1.3.1" // {
         dependencies = [
@@ -97200,11 +97253,13 @@ in
         ];
       })
       sources."estraverse-4.3.0"
-      sources."estree-walker-1.0.1"
+      sources."estree-walker-2.0.2"
       sources."esutils-2.0.3"
       sources."fast-deep-equal-3.1.3"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
+      sources."fastq-1.10.0"
       sources."fd-slicer-1.1.0"
       sources."file-entry-cache-6.0.0"
       sources."fill-range-7.0.1"
@@ -97221,6 +97276,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."globals-12.4.0"
+      sources."globby-11.0.1"
       sources."growl-1.10.5"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -97237,7 +97293,7 @@ in
           sources."debug-3.2.7"
         ];
       })
-      sources."ignore-4.0.6"
+      sources."ignore-5.1.8"
       sources."import-fresh-3.3.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -97270,6 +97326,8 @@ in
         ];
       })
       sources."mdurl-1.0.1"
+      sources."merge2-1.4.1"
+      sources."micromatch-4.0.2"
       sources."mime-1.6.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
@@ -97311,6 +97369,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
+      sources."path-type-4.0.0"
       sources."pend-1.2.0"
       sources."picomatch-2.2.2"
       sources."prelude-ls-1.2.1"
@@ -97326,15 +97385,18 @@ in
       sources."require-main-filename-2.0.0"
       sources."resolve-1.19.0"
       sources."resolve-from-4.0.0"
+      sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."rollup-2.35.1"
+      sources."rollup-2.36.0"
+      sources."run-parallel-1.1.10"
       sources."safe-buffer-5.2.1"
-      sources."semver-6.3.0"
+      sources."semver-7.3.4"
       sources."serialize-javascript-5.0.1"
       sources."set-blocking-2.0.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."sigmund-1.0.1"
+      sources."slash-3.0.0"
       (sources."slice-ansi-4.0.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -97348,7 +97410,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-3.1.1"
       sources."supports-color-5.5.0"
-      (sources."table-6.0.6" // {
+      (sources."table-6.0.7" // {
         dependencies = [
           sources."ajv-7.0.3"
           sources."json-schema-traverse-1.0.0"
@@ -97358,7 +97420,7 @@ in
       sources."tmp-0.0.29"
       sources."to-regex-range-5.0.1"
       sources."tslib-2.0.3"
-      (sources."tsutils-3.17.1" // {
+      (sources."tsutils-3.18.0" // {
         dependencies = [
           sources."tslib-1.14.1"
         ];
@@ -97367,7 +97429,7 @@ in
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
       sources."typed-rest-client-1.2.0"
-      sources."typescript-3.9.7"
+      sources."typescript-4.1.3"
       sources."typescript-formatter-7.2.2"
       sources."uc.micro-1.0.6"
       sources."underscore-1.8.3"
@@ -97381,10 +97443,10 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."vscode-jsonrpc-6.0.0-next.7"
-      sources."vscode-languageclient-7.0.0-next.12"
-      sources."vscode-languageserver-protocol-3.16.0-next.10"
-      sources."vscode-languageserver-types-3.16.0-next.4"
+      sources."vscode-jsonrpc-6.0.0"
+      sources."vscode-languageclient-7.0.0"
+      sources."vscode-languageserver-protocol-3.16.0"
+      sources."vscode-languageserver-types-3.16.0"
       (sources."vscode-test-1.4.1" // {
         dependencies = [
           sources."rimraf-2.7.1"
@@ -97809,8 +97871,10 @@ in
         ];
       })
       sources."@serverless/template-1.1.4"
-      (sources."@serverless/utils-2.1.0" // {
+      (sources."@serverless/utils-2.2.0" // {
         dependencies = [
+          sources."argparse-2.0.1"
+          sources."js-yaml-4.0.0"
           sources."write-file-atomic-3.0.3"
         ];
       })
@@ -97824,7 +97888,7 @@ in
       sources."@types/keyv-3.1.1"
       sources."@types/lodash-4.14.167"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -97881,7 +97945,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.820.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -98014,7 +98078,7 @@ in
         ];
       })
       sources."dashdash-1.14.1"
-      sources."dayjs-1.9.8"
+      sources."dayjs-1.10.1"
       sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-4.2.1"
@@ -98037,7 +98101,7 @@ in
       sources."deferred-0.7.11"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."denque-1.4.1"
+      sources."denque-1.5.0"
       sources."detect-libc-1.0.3"
       sources."diagnostics-1.1.1"
       sources."dijkstrajs-1.0.1"
@@ -98077,11 +98141,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."enabled-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."engine.io-client-3.4.4" // {
-        dependencies = [
-          sources."ws-6.1.4"
-        ];
-      })
+      sources."engine.io-client-3.5.0"
       sources."engine.io-parser-2.2.1"
       sources."env-variable-0.0.6"
       sources."es5-ext-0.10.53"
@@ -98396,7 +98456,7 @@ in
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.38"
+          sources."@types/node-13.13.39"
           sources."long-4.0.0"
         ];
       })
@@ -98455,7 +98515,7 @@ in
       sources."simple-swizzle-0.2.2"
       sources."slash-3.0.0"
       sources."snappy-6.3.5"
-      sources."socket.io-client-2.3.1"
+      sources."socket.io-client-2.4.0"
       (sources."socket.io-parser-3.3.1" // {
         dependencies = [
           sources."isarray-2.0.1"
@@ -99294,7 +99354,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -99874,32 +99934,32 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "3.0.4";
+    version = "3.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.4.tgz";
-      sha512 = "Vj1jUoO75WGc9txWd311ZJJqS9Dr8QtNJJ7gk2r7dcM/yGe9sit7qOijQl3GAwhpBOz/W8CwkD7R6yob07nLbA==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz";
+      sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
     };
     dependencies = [
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."accepts-1.3.7"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
       sources."component-emitter-1.3.0"
       sources."cookie-0.4.1"
       sources."cors-2.8.5"
-      sources."debug-4.1.1"
-      sources."engine.io-4.0.5"
+      sources."debug-4.3.2"
+      sources."engine.io-4.0.6"
       sources."engine.io-parser-4.0.2"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
-      sources."ms-2.1.3"
+      sources."ms-2.1.2"
       sources."negotiator-0.6.2"
       sources."object-assign-4.1.1"
       sources."socket.io-adapter-2.0.3"
-      sources."socket.io-parser-4.0.2"
+      sources."socket.io-parser-4.0.3"
       sources."vary-1.1.2"
       sources."ws-7.4.2"
     ];
@@ -100461,7 +100521,7 @@ in
       sources."multiserver-address-1.0.1"
       sources."multiserver-scopes-1.0.0"
       sources."mutexify-1.3.1"
-      sources."muxrpc-6.5.1"
+      sources."muxrpc-6.5.2"
       sources."muxrpc-usage-2.1.0"
       sources."muxrpc-validation-3.0.2"
       sources."muxrpcli-3.1.2"
@@ -100530,7 +100590,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."packet-stream-2.0.5"
-      sources."packet-stream-codec-1.1.2"
+      sources."packet-stream-codec-1.1.3"
       sources."parse-entities-1.2.2"
       sources."parse-glob-3.0.4"
       sources."pascalcase-0.1.1"
@@ -100696,7 +100756,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."secret-handshake-1.1.20"
-      sources."secret-stack-6.3.1"
+      sources."secret-stack-6.3.2"
       sources."semver-5.7.1"
       sources."separator-escape-0.0.1"
       (sources."set-value-2.0.1" // {
@@ -100783,7 +100843,7 @@ in
       })
       sources."ssb-plugins-1.0.0"
       sources."ssb-query-2.4.5"
-      sources."ssb-ref-2.14.2"
+      sources."ssb-ref-2.14.3"
       sources."ssb-replicate-1.3.2"
       sources."ssb-unix-socket-1.0.0"
       sources."ssb-validate-4.1.3"
@@ -100994,7 +101054,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.820.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -101018,7 +101078,6 @@ in
       sources."base64url-3.0.1"
       sources."basic-auth-1.1.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."better-assert-1.0.2"
       sources."bindings-1.2.1"
       sources."blob-0.0.5"
       sources."bluebird-2.11.0"
@@ -101039,7 +101098,6 @@ in
       sources."busboy-0.2.14"
       sources."bytebuffer-3.5.5"
       sources."bytes-3.1.0"
-      sources."callsite-1.0.0"
       sources."camelcase-1.2.1"
       sources."caseless-0.11.0"
       sources."center-align-0.1.3"
@@ -101054,7 +101112,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commander-2.20.3"
       sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
+      sources."component-emitter-1.3.0"
       sources."component-inherit-0.0.3"
       sources."compressible-2.0.18"
       (sources."compression-1.7.4" // {
@@ -101130,21 +101188,18 @@ in
       sources."ejs-0.8.8"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."engine.io-3.4.2" // {
+      (sources."engine.io-3.5.0" // {
         dependencies = [
-          sources."cookie-0.3.1"
+          sources."cookie-0.4.1"
           sources."debug-4.1.1"
           sources."ws-7.4.2"
         ];
       })
-      (sources."engine.io-client-3.4.4" // {
+      (sources."engine.io-client-3.5.0" // {
         dependencies = [
-          sources."component-emitter-1.3.0"
           sources."debug-3.1.0"
           sources."ms-2.0.0"
-          sources."parseqs-0.0.6"
-          sources."parseuri-0.0.6"
-          sources."ws-6.1.4"
+          sources."ws-7.4.2"
         ];
       })
       sources."engine.io-parser-2.2.1"
@@ -101381,7 +101436,6 @@ in
       sources."oauth-0.9.15"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
-      sources."object-component-0.0.3"
       sources."object-hash-0.3.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
@@ -101397,8 +101451,8 @@ in
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."parse-json-2.2.0"
-      sources."parseqs-0.0.5"
-      sources."parseuri-0.0.5"
+      sources."parseqs-0.0.6"
+      sources."parseuri-0.0.6"
       sources."parseurl-1.3.3"
       sources."passport-0.3.2"
       sources."passport-oauth2-1.5.0"
@@ -101526,28 +101580,23 @@ in
       sources."signal-exit-3.0.3"
       sources."slash-1.0.0"
       sources."sntp-1.0.9"
-      (sources."socket.io-2.3.0" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
       })
       sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.3.0" // {
+      (sources."socket.io-client-2.4.0" // {
         dependencies = [
-          sources."base64-arraybuffer-0.1.5"
-          sources."debug-4.1.1"
+          sources."debug-3.1.0"
           sources."isarray-2.0.1"
           sources."ms-2.0.0"
-          (sources."socket.io-parser-3.3.1" // {
-            dependencies = [
-              sources."component-emitter-1.3.0"
-              sources."debug-3.1.0"
-            ];
-          })
+          sources."socket.io-parser-3.3.1"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
         dependencies = [
+          sources."component-emitter-1.2.1"
           sources."debug-4.1.1"
           sources."isarray-2.0.1"
         ];
@@ -101736,7 +101785,7 @@ in
           sources."os-locale-1.4.0"
           sources."string-width-1.0.2"
           sources."which-module-1.0.0"
-          sources."y18n-3.2.1"
+          sources."y18n-3.2.2"
           sources."yargs-parser-4.2.1"
         ];
       })
@@ -101825,7 +101874,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -101863,7 +101912,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -101957,7 +102006,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       (sources."normalize-package-data-3.0.0" // {
         dependencies = [
           sources."semver-7.3.4"
@@ -102054,7 +102103,7 @@ in
       sources."sugarss-2.0.0"
       sources."supports-color-5.5.0"
       sources."svg-tags-1.0.0"
-      sources."table-6.0.6"
+      sources."table-6.0.7"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
       sources."trim-newlines-3.0.0"
@@ -103909,10 +103958,10 @@ in
   textlint-rule-stop-words = nodeEnv.buildNodePackage {
     name = "textlint-rule-stop-words";
     packageName = "textlint-rule-stop-words";
-    version = "2.0.7";
+    version = "2.0.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.7.tgz";
-      sha512 = "wBG1K2HfmQaHEjxMddRB9canjBbX6xaztVB5d0cgOBVj9NTvPVWf4z9OuTfYUEmIt84wAvQ6XxsIA9YTJ+N5Fg==";
+      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.8.tgz";
+      sha512 = "D945uyFkeMo6KJhMJaFTEHudP+Jkl00rLOQKRibV1zl933muR6NXqz+uXAvitPAEWH20kwQA40E0Cd1t8nJQ1w==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.3.5"
@@ -104066,7 +104115,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -104142,7 +104191,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.8.1"
+      sources."core-js-3.8.2"
       sources."core-util-is-1.0.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
@@ -104365,7 +104414,7 @@ in
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
-      sources."peek-readable-3.1.0"
+      sources."peek-readable-3.1.1"
       sources."performance-now-2.1.0"
       sources."pify-4.0.1"
       sources."precond-0.2.3"
@@ -104450,7 +104499,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
-      sources."strtok3-6.0.4"
+      sources."strtok3-6.0.6"
       sources."supports-color-7.2.0"
       sources."tar-4.4.13"
       sources."tlds-1.208.0"
@@ -105035,7 +105084,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ansi-regex-5.0.0"
@@ -105095,11 +105144,11 @@ in
       sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."engine.io-4.0.5" // {
+      (sources."engine.io-4.0.6" // {
         dependencies = [
           sources."cookie-0.4.1"
-          sources."debug-4.1.1"
-          sources."ms-2.1.3"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       sources."engine.io-parser-4.0.2"
@@ -105240,17 +105289,17 @@ in
       sources."signals-1.0.0"
       sources."simple-swizzle-0.2.2"
       sources."snapsvg-0.5.1"
-      (sources."socket.io-3.0.4" // {
+      (sources."socket.io-3.0.5" // {
         dependencies = [
-          sources."debug-4.1.1"
-          sources."ms-2.1.3"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-2.0.3"
-      (sources."socket.io-parser-4.0.2" // {
+      (sources."socket.io-parser-4.0.3" // {
         dependencies = [
-          sources."debug-4.1.1"
-          sources."ms-2.1.3"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       sources."stack-trace-0.0.10"
@@ -106836,7 +106885,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -107111,7 +107160,7 @@ in
       sources."format-0.2.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.2.1"
+      sources."fsevents-2.3.1"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
@@ -107725,7 +107774,7 @@ in
       sources."x-is-string-0.1.0"
       sources."xdg-basedir-3.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-3.2.1"
+      sources."y18n-3.2.2"
       sources."yallist-2.1.2"
       (sources."yargs-11.1.1" // {
         dependencies = [
@@ -107782,7 +107831,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/yauzl-2.9.1"
       sources."JSONSelect-0.2.1"
       sources."acorn-7.4.1"
@@ -108698,7 +108747,7 @@ in
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@webassemblyjs/ast-1.9.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
       sources."@webassemblyjs/helper-api-error-1.9.1"
@@ -108724,11 +108773,11 @@ in
       sources."ajv-keywords-3.5.2"
       sources."browserslist-4.16.0"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001171"
+      sources."caniuse-lite-1.0.30001173"
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.633"
+      sources."electron-to-chromium-1.3.634"
       sources."enhanced-resolve-5.4.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
@@ -108754,7 +108803,7 @@ in
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."neo-async-2.6.2"
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.69"
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."path-exists-4.0.0"
@@ -108867,7 +108916,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -109528,7 +109577,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.38"
+      sources."@types/node-13.13.39"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -109576,7 +109625,7 @@ in
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
-      sources."bufferutil-4.0.2"
+      sources."bufferutil-4.0.3"
       (sources."castv2-0.1.10" // {
         dependencies = [
           sources."debug-4.3.2"
@@ -109791,7 +109840,7 @@ in
         ];
       })
       sources."ut_pex-2.0.1"
-      sources."utf-8-validate-5.0.3"
+      sources."utf-8-validate-5.0.4"
       sources."util-deprecate-1.0.2"
       sources."utp-native-2.2.2"
       sources."videostream-3.2.2"
@@ -109961,7 +110010,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.19"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -110087,7 +110136,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-3.1.5"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.1"
+      sources."core-js-3.8.2"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-6.0.5"
@@ -110920,4 +110969,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix b/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix
index 5ac352e0762c..5625cd95764f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, opaline }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, opaline }:
 
 stdenv.mkDerivation rec {
   pname = "afl-persistent";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "./_build/test && ./_build/test2";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/stedolan/ocaml-afl-persistent";
     description = "persistent-mode afl-fuzz for ocaml";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix
index 60e774918d5d..8c9f97f81abc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }:
+{ lib, fetchFromGitHub, buildDunePackage, angstrom, async }:
 
 buildDunePackage rec {
   pname = "angstrom-async";
@@ -14,6 +14,6 @@ buildDunePackage rec {
   meta = {
     inherit (angstrom.meta) homepage license;
     description = "Async support for Angstrom";
-    maintainers = with stdenv.lib.maintainers; [ romildo ];
+    maintainers = with lib.maintainers; [ romildo ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
index eb4de44d7a6e..1bb8833cf079 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:
+{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:
 
 buildDunePackage rec {
   pname = "angstrom-lwt-unix";
@@ -14,6 +14,6 @@ buildDunePackage rec {
   meta = {
     inherit (angstrom.meta) homepage license;
     description = "Lwt_unix support for Angstrom";
-    maintainers = with stdenv.lib.maintainers; [ romildo ];
+    maintainers = with lib.maintainers; [ romildo ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix
index 134c161d266f..af72c7f8d2d9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }:
+{ lib, fetchFromGitHub, buildDunePackage, angstrom }:
 
 buildDunePackage rec {
   pname = "angstrom-unix";
@@ -14,6 +14,6 @@ buildDunePackage rec {
   meta = {
     inherit (angstrom.meta) homepage license;
     description = "Unix support for Angstrom";
-    maintainers = with stdenv.lib.maintainers; [ romildo ];
+    maintainers = with lib.maintainers; [ romildo ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ansiterminal/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ansiterminal/default.nix
index 7b9f01751517..53b02a453a0e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ansiterminal/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ansiterminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation rec {
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Chris00/ANSITerminal";
     description = "A module allowing to use the colors and cursor movements on ANSI terminals";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix
index 79c4d8a50024..959a7203dfa9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }:
+{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-apron-${version}";
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     homepage = "http://apron.cri.ensmp.fr/library/";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
     description = "Numerical abstract domain library";
     inherit (ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix
index f790a87e22c5..ba8cd98327fa 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 
 let
   # Use astring 0.8.3 for OCaml < 4.05
   param =
-    if stdenv.lib.versionAtLeast ocaml.version "4.05"
+    if lib.versionAtLeast ocaml.version "4.05"
     then {
       version = "0.8.5";
       sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       adds a few missing functions and fully exploits OCaml's newfound string
       immutability.
     '';
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ sternenseemann ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
index 84b137ada7c3..e4edac5fdc10 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, menhir, easy-format, fetchFromGitHub, buildDunePackage, which, biniou, yojson }:
+{ lib, menhir, easy-format, fetchFromGitHub, buildDunePackage, which, biniou, yojson }:
 
 buildDunePackage rec {
   pname = "atd";
@@ -18,7 +18,7 @@ buildDunePackage rec {
   buildInputs = [ which menhir ];
   propagatedBuildInputs = [ easy-format biniou yojson ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mjambon/atd";
     description = "Syntax for cross-language type definitions";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix
new file mode 100644
index 000000000000..49d614cda884
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix
@@ -0,0 +1,38 @@
+{ lib, buildDunePackage, fetchurl
+, ppx_sexp_conv, ppx_cstruct
+, mirage-crypto, mirage-crypto-rng, mirage-crypto-pk
+, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib
+, rresult, mtime, logs, fmt, cmdliner, base64, hacl_x25519
+, zarith
+}:
+
+buildDunePackage rec {
+  pname = "awa";
+  version = "0.0.1";
+
+  minimumOCamlVersion = "4.07";
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz";
+    sha256 = "c1d604645517b191184a5800f5c48a6a9a3e5a2fce4a0e2ecfeee74586301400";
+  };
+
+  nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ];
+
+  propagatedBuildInputs = [
+    mirage-crypto mirage-crypto-rng mirage-crypto-pk x509
+    cstruct cstruct-sexp sexplib rresult mtime
+    logs base64 hacl_x25519 zarith
+  ];
+
+  doCheck = true;
+  checkInputs = [ cstruct-unix cmdliner fmt ];
+
+  meta = with lib; {
+    description = "SSH implementation in OCaml";
+    license = licenses.isc;
+    homepage = "https://github.com/mirage/awa-ssh";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix
new file mode 100644
index 000000000000..00be799ddff2
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix
@@ -0,0 +1,15 @@
+{ buildDunePackage, awa
+, cstruct, mtime, lwt, cstruct-unix, mirage-crypto-rng
+}:
+
+buildDunePackage {
+  pname = "awa-lwt";
+
+  inherit (awa) version src useDune2;
+
+  propagatedBuildInputs = [
+    awa cstruct mtime lwt cstruct-unix mirage-crypto-rng
+  ];
+
+  inherit (awa) meta;
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix
new file mode 100644
index 000000000000..4f9b425f8a01
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix
@@ -0,0 +1,15 @@
+{ buildDunePackage, awa
+, cstruct, mtime, lwt, mirage-flow, mirage-clock, logs
+}:
+
+buildDunePackage {
+  pname = "awa-mirage";
+
+  inherit (awa) version src useDune2;
+
+  propagatedBuildInputs = [
+    awa cstruct mtime lwt mirage-flow mirage-clock logs
+  ];
+
+  inherit (awa) meta;
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bap/dont-add-curses.patch b/nixpkgs/pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch
index 438a1bfc6dc0..0b012848601f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bap/dont-add-curses.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch
@@ -23,7 +23,7 @@ index 966c407..fba3fb4 100644
                   Bap_llvm_ogre_types
    CCOpt:         $cc_optimization
 -  CCLib:         $llvm_lib $cxxlibs $llvm_ldflags -lcurses
-+  CCLib:         $llvm_lib $cxxlibs $llvm_ldflags
++  CCLib:         $llvm_lib $cxxlibs $llvm_ldflags -lncurses
    CSources:      llvm_disasm.h,
                   llvm_disasm.c,
                   llvm_stubs.c,
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
index 66b1dd67a9f2..9284bbaf9c62 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, fetchurl
-, ocaml, findlib, ocamlbuild, ocaml_oasis,
- bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp,
- utop, libxml2,
- ppx_tools_versioned,
- which, makeWrapper, writeText
+{ lib, stdenv, fetchFromGitHub, fetchurl
+, ocaml, findlib, ocamlbuild, ocaml_oasis
+, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp
+, utop, libxml2, ncurses
+, ppx_bitstring
+, ppx_tools_versioned
+, which, makeWrapper, writeText
 , z3
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.07"
+if !lib.versionAtLeast ocaml.version "4.07"
 then throw "BAP is not available for OCaml ${ocaml.version}"
 else
 
-if stdenv.lib.versionAtLeast core_kernel.version "0.13"
+if lib.versionAtLeast core_kernel.version "0.13"
 then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)"
 else
 
@@ -40,9 +41,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ which makeWrapper ];
 
   buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
-                  llvm ppx_tools_versioned
+                  llvm ppx_bitstring ppx_tools_versioned
                   z3
-                  utop libxml2 ];
+                  utop libxml2 ncurses ];
 
   propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
                             piqi-ocaml uuidm frontc ounit ];
@@ -61,13 +62,15 @@ stdenv.mkDerivation rec {
 
   disableIda = "--disable-ida";
 
-  patches = [ ./dont-add-curses.patch ];
+  patches = [ ./curses_is_ncurses.patch ];
 
-  configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
+  preConfigure = ''
+    substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring
+  '';
 
-  BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";
+  configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages.";
     homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
     maintainers = [ maintainers.maurer ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix
index 87622ab0fbf0..d4b7f3ff9a12 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
 
 let version = "3.2.0"; in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   checkInputs = [ qtest ];
   propagatedBuildInputs = [ num ];
 
-  doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64;
+  doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64;
   checkTarget = "test";
 
   createFindlibDestdir = true;
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
       and comprehensive development platform for the OCaml programming
       language.
     '';
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix b/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix
index 518a8756158b..07432dd7c6e7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }:
 
 let version = "1.4"; in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     homepage = "http://ocaml-benchmark.forge.ocamlcore.org/";
     platforms = ocaml.meta.platforms or [];
     description = "Benchmark running times of code";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ volth ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ volth ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix
new file mode 100644
index 000000000000..49e5c336d90b
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchurl, stdlib-shims }:
+
+buildDunePackage rec {
+  pname = "bheap";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/backtracking/${pname}/releases/download/${version}/${pname}-${version}.tbz";
+    sha256 = "0dpnpla20lgiicrxl2432m2fcr6y68msw3pnjxqb11xw6yrdfhsz";
+  };
+
+  useDune2 = true;
+
+  doCheck = true;
+  checkInputs = [
+    stdlib-shims
+  ];
+
+  meta = with lib; {
+    description = "OCaml binary heap implementation by Jean-Christophe Filliatre";
+    license = licenses.lgpl21Only;
+    maintainers = [ maintainers.sternenseemann ];
+    homepage = "https://github.com/backtracking/bheap";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bin_prot/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bin_prot/default.nix
index 0dddb653e09e..50ef935aff6b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bin_prot/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bin_prot/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, type_conv }:
+{ lib, buildOcaml, fetchurl, ocaml, type_conv }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "bin_prot-112.24.00 is not available for OCaml ${ocaml.version}"
 else
 
@@ -19,7 +19,7 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/bin_prot";
     description = "Binary protocol generator ";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix b/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix
index ed216d8236aa..795e63401290 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, ocaml, findlib, easy-format}:
+{lib, stdenv, fetchurl, ocaml, findlib, easy-format}:
 let
   pname = "biniou";
   version = "1.0.9";
   webpage = "http://mjambon.com/${pname}.html";
 in
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+assert lib.versionAtLeast (lib.getVersion ocaml) "3.11";
 
 stdenv.mkDerivation rec {
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     mkdir $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
     homepage = webpage;
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix b/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
index b97c78a399bf..8e0780ae6c5c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, easy-format }:
+{ lib, fetchFromGitHub, buildDunePackage, easy-format }:
 
 buildDunePackage rec {
   pname = "biniou";
@@ -20,7 +20,7 @@ buildDunePackage rec {
   meta = {
     inherit (src.meta) homepage;
     description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.vbgl ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
index c85886c73de4..596ed6161d7b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, fetchpatch
+{ lib, buildDunePackage, fetchFromGitHub, fetchpatch
 , ounit, async, base64, camlzip, cfstream
 , core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }:
 
@@ -21,7 +21,7 @@ buildDunePackage rec {
   checkInputs = [ ounit ];
   propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bioinformatics library for Ocaml";
     homepage = "http://${pname}.org";
     maintainers = [ maintainers.bcdarwin ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
deleted file mode 100644
index 6a98267d89a5..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ buildDunePackage, bisect_ppx, ocamlbuild }:
-
-buildDunePackage {
-  minimumOCamlVersion = "4.02";
-  inherit (bisect_ppx) version src meta;
-  pname = "bisect_ppx-ocamlbuild";
-  propagatedBuildInputs = [ ocamlbuild ];
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index ce52c427cd07..eba010819949 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree, ppx_tools_versioned }:
+{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ocaml-migrate-parsetree, ppx_tools_versioned }:
 
 buildDunePackage rec {
   pname = "bisect_ppx";
-  version = "1.4.0";
+  version = "2.5.0";
+
+  useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "aantron";
     repo = "bisect_ppx";
     rev = version;
-    sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h";
+    sha256 = "0w2qd1myvh333jvkf8hgrqzl8ns4xgfggk4frf1ij3jyc7qc0868";
   };
 
   buildInputs = [
+    cmdliner
     ocaml-migrate-parsetree
     ppx_tools_versioned
   ];
 
   meta = {
     description = "Code coverage for OCaml";
-    license = stdenv.lib.licenses.mpl20;
+    license = lib.licenses.mit;
     homepage = "https://github.com/aantron/bisect_ppx";
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
index 386503039e05..583017d9ddec 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, ppx_tools_versioned, ounit }:
+{ lib, fetchFromGitHub, buildDunePackage, stdlib-shims }:
 
 buildDunePackage rec {
   pname = "bitstring";
-  version = "3.1.1";
+  version = "4.0.1";
+
+  useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "xguerin";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ys8xx174jf8v5sm0lbxvzhdlcs5p0fhy1gvf58gad2g4gvgpvxc";
+    sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm";
   };
 
-  buildInputs = [ ppx_tools_versioned ounit ];
-  doCheck = true;
+  propagatedBuildInputs = [ stdlib-shims ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
     homepage = "https://github.com/xguerin/bitstring";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix
new file mode 100644
index 000000000000..ee0a8c51f732
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix
@@ -0,0 +1,18 @@
+{ lib, buildDunePackage, ocaml
+, bitstring, ppxlib
+, ounit
+}:
+
+buildDunePackage rec {
+  pname = "ppx_bitstring";
+  inherit (bitstring) version useDune2 src;
+
+  buildInputs = [ bitstring ppxlib ];
+
+  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  checkInputs = [ ounit ];
+
+  meta = bitstring.meta // {
+    description = "Bitstrings and bitstring matching for OCaml - PPX extension";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix
index 359d83b4762a..23e8d145a308 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, autoreconfHook, which, ocaml, findlib }:
+{ stdenv, lib, fetchzip, autoreconfHook, which, ocaml, findlib }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "bitv is not available for OCaml ${ocaml.version}"
 else
 
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A bit vector library for OCaml";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     homepage = "https://github.com/backtracking/bitv";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix
index f5dc099b1403..54bc28697ec4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }:
+{ lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }:
 
-let inherit (stdenv.lib) getVersion versionAtLeast; in
+let inherit (lib) getVersion versionAtLeast; in
 
 assert versionAtLeast (getVersion ocaml) "4.00.0";
 assert versionAtLeast (getVersion findlib) "1.3.3";
@@ -50,7 +50,7 @@ EOF
   doCheck = true;
   checkTarget = "tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://bolt.x9c.fr";
     description = "A logging tool for the OCaml language";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix
index ca6c362b6fa5..62438526d703 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
 , astring, fmt, fpath, logs, rresult
 }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-bos-${version}";
-	version = "0.2.0";
-	src = fetchurl {
-		url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
-		sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
-	};
+  name = "ocaml${ocaml.version}-bos-${version}";
+  version = "0.2.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
+    sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
+  };
 
-	nativeBuildInputs = [ ocaml findlib ocamlbuild ];
-	buildInputs = [ findlib topkg ];
-	propagatedBuildInputs = [ astring fmt fpath logs rresult ];
+  nativeBuildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ findlib topkg ];
+  propagatedBuildInputs = [ astring fmt fpath logs rresult ];
 
-	inherit (topkg) buildPhase installPhase;
+  inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		description = "Basic OS interaction for OCaml";
-		homepage = "https://erratique.ch/software/bos";
-		license = stdenv.lib.licenses.isc;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "Basic OS interaction for OCaml";
+    homepage = "https://erratique.ch/software/bos";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix
index bf129c7bc442..93de77fb322b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, buildDunePackage, ocaml
-, pkgconfig, cairo
+, pkg-config, cairo
 }:
 
 buildDunePackage rec {
@@ -11,7 +11,7 @@ buildDunePackage rec {
     sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ cairo ];
 
   doCheck = !(stdenv.isDarwin
diff --git a/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix b/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix
index f23081a5f195..1210ed41dc2b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, lib, fetchurl, ocaml, findlib}:
 
 stdenv.mkDerivation {
   name = "ocaml-calendar-2.5";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     license = "LGPL";
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+      lib.maintainers.gal_bolle
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix
index e62acc3cd63f..26735b1c5d7f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+{ lib, stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
 
 let
   pname = "camlimages";
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     omake install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "4.0";
     homepage = "https://bitbucket.org/camlspotter/camlimages";
     description = "OCaml image processing library";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix
index 7e231001f24f..18683d5f1709 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, which, ocaml, findlib }:
+{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "camlpdf is not available for OCaml ${ocaml.version}"
 else
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml library for reading, writing and modifying PDF files";
     homepage = "https://github.com/johnwhitington/camlpdf";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix
index 1e6e0e8f8faa..c2c2e98b2e06 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, zlib, ocaml, findlib}:
+{lib, stdenv, fetchurl, zlib, ocaml, findlib}:
 
 let
   param =
-    if stdenv.lib.versionAtLeast ocaml.version "4.02"
+    if lib.versionAtLeast ocaml.version "4.02"
     then {
       version = "1.10";
       url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz";
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cristal.inria.fr/~xleroy/software.html#camlzip";
     description = "A library for handling ZIP and GZIP files in OCaml";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index 6b18220dc8a9..79c7a46e6e99 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4}:
+{stdenv, lib, fetchurl, ocaml, findlib, camlp4}:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.05"
+if lib.versionAtLeast ocaml.version "4.05"
 then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}"
 else
 
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://camomile.sourceforge.net/";
     description = "A comprehensive Unicode library for OCaml";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     branch = "0.8.2";
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index b975482ecf3e..67bd8b8c755d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
+{stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
 
 stdenv.mkDerivation {
   pname = "camomile";
@@ -21,10 +21,10 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile";
     description = "A comprehensive Unicode library for OCaml";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
index ff0cb4aa3fe0..6bae728cafac 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo }:
+{ lib, fetchFromGitHub, buildDunePackage, cppo }:
 
 buildDunePackage rec {
   pname = "camomile";
-	version = "1.0.2";
+  version = "1.0.2";
 
-	src = fetchFromGitHub {
-		owner = "yoriyuki";
-		repo = pname;
-		rev = version;
-		sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
-	};
+  src = fetchFromGitHub {
+    owner = "yoriyuki";
+    repo = pname;
+    rev = version;
+    sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
+  };
 
-	buildInputs = [ cppo ];
+  buildInputs = [ cppo ];
 
-	configurePhase = "ocaml configure.ml --share $out/share/camomile";
+  configurePhase = "ocaml configure.ml --share $out/share/camomile";
 
-	meta = {
-		inherit (src.meta) homepage;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		license = stdenv.lib.licenses.lgpl21;
-		description = "A Unicode library for OCaml";
-	};
+  meta = {
+    inherit (src.meta) homepage;
+    maintainers = [ lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21;
+    description = "A Unicode library for OCaml";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
index d0fcf5be83cc..303fdc01011d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }:
+{ lib, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }:
 
 buildDunePackage rec {
   pname = "cfstream";
@@ -23,7 +23,7 @@ buildDunePackage rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Simple Core-inspired wrapper for standard library Stream module";
     maintainers = [ maintainers.bcdarwin ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/charInfo_width/default.nix b/nixpkgs/pkgs/development/ocaml-modules/charInfo_width/default.nix
index 7a78573412fe..5b9814cea69a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/charInfo_width/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/charInfo_width/default.nix
@@ -3,6 +3,7 @@
 buildDunePackage rec {
   pname = "charInfo_width";
   version = "1.1.0";
+  useDune2 = true;
   src = fetchzip {
     url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2";
     sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix
index 9903c237e632..3aefe2eb874c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "cil is not available for OCaml ${ocaml.version}"
 else
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   '';
   prefixKey = "-prefix=";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://kerneis.github.io/cil/";
     description = "A front-end for the C programming language that facilitates program analysis and transformation";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
index 7c94dcf54356..7e49679406ab 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
 
 let
   pname = "cmdliner";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
+assert lib.versionAtLeast ocaml.version "4.01.0";
 
 let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
+  if lib.versionAtLeast ocaml.version "4.03" then {
     version = "1.0.4";
     sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
   } else {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://erratique.ch/software/cmdliner";
     description = "An OCaml module for the declarative definition of command line interfaces";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix
index 246397b60810..21e22533f1b2 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix
@@ -1,22 +1,22 @@
-{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv
+{ lib, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv
 , logs, magic-mime }:
 
-if !stdenv.lib.versionAtLeast cohttp.version "0.99" then
-	cohttp
-else if !stdenv.lib.versionAtLeast async.version "0.13" then
-	throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
+if !lib.versionAtLeast cohttp.version "0.99" then
+  cohttp
+else if !lib.versionAtLeast async.version "0.13" then
+  throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
 else
 
-	buildDunePackage {
-		pname = "cohttp-async";
-		useDune2 = true;
-		inherit (cohttp) version src;
+  buildDunePackage {
+    pname = "cohttp-async";
+    useDune2 = true;
+    inherit (cohttp) version src;
 
-		buildInputs = [ ppx_sexp_conv ];
+    buildInputs = [ ppx_sexp_conv ];
 
-		propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
+    propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
 
-		meta = cohttp.meta // {
-			description = "CoHTTP implementation for the Async concurrency library";
-		};
-	}
+    meta = cohttp.meta // {
+      description = "CoHTTP implementation for the Async concurrency library";
+    };
+  }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
index 3fed7c55d452..e664d17f215e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -4,26 +4,26 @@
 }:
 
 buildDunePackage rec {
-	pname = "cohttp";
-	version = "2.5.4";
+  pname = "cohttp";
+  version = "2.5.4";
 
-	useDune2 = true;
+  useDune2 = true;
 
-	minimumOCamlVersion = "4.04.1";
+  minimumOCamlVersion = "4.04.1";
 
-	src = fetchurl {
-		url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
-		sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
-	};
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
+    sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
+  };
 
-	buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
+  buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
+  propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
 
-	meta = {
-		description = "HTTP(S) library for Lwt, Async and Mirage";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/mirage/ocaml-cohttp";
-	};
+  meta = {
+    description = "HTTP(S) library for Lwt, Async and Mirage";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/mirage/ocaml-cohttp";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index 3a99ed9536f0..845df2a3f542 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -1,19 +1,19 @@
-{ stdenv, buildDunePackage, cohttp-lwt
+{ lib, buildDunePackage, cohttp-lwt
 , conduit-lwt-unix, ppx_sexp_conv
 , cmdliner, fmt, magic-mime
 }:
 
-if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99"
+if !lib.versionAtLeast cohttp-lwt.version "0.99"
 then cohttp-lwt
 else
 
 buildDunePackage {
-	pname = "cohttp-lwt-unix";
-	inherit (cohttp-lwt) version src meta;
+  pname = "cohttp-lwt-unix";
+  inherit (cohttp-lwt) version src meta;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	buildInputs = [ cmdliner ppx_sexp_conv ];
+  buildInputs = [ cmdliner ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
+  propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 8357d748ce8f..36831d946132 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -1,16 +1,16 @@
-{ stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }:
+{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }:
 
-if !stdenv.lib.versionAtLeast cohttp.version "0.99"
+if !lib.versionAtLeast cohttp.version "0.99"
 then cohttp
-else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13"
+else if !lib.versionAtLeast ppx_sexp_conv.version "0.13"
 then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}"
 else
 
 buildDunePackage {
-	pname = "cohttp-lwt";
-	inherit (cohttp) version src useDune2 meta;
+  pname = "cohttp-lwt";
+  inherit (cohttp) version src useDune2 meta;
 
-	buildInputs = [ uri ppx_sexp_conv ];
+  buildInputs = [ uri ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
+  propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix
new file mode 100644
index 000000000000..e7b172349cb9
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix
@@ -0,0 +1,20 @@
+{ buildDunePackage, cohttp, cohttp-lwt
+, mirage-flow, mirage-channel, mirage-kv
+, conduit, conduit-mirage, lwt
+, astring, magic-mime
+}:
+
+buildDunePackage {
+  pname = "cohttp-mirage";
+
+  inherit (cohttp) version src minimumOCamlVersion useDune2;
+
+  propagatedBuildInputs = [
+    mirage-flow mirage-channel conduit conduit-mirage mirage-kv
+    lwt cohttp cohttp-lwt astring magic-mime
+  ];
+
+  meta = cohttp.meta // {
+    description = "CoHTTP implementation for the MirageOS unikernel";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix
index 55787e123923..addba7a4b349 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type_conv}:
+{lib, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "comparelib";
@@ -13,7 +13,7 @@ buildOcaml rec {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/comparelib";
     description = "Syntax extension for deriving \"compare\" functions automatically";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix
index f16819ed8aef..c15ad0520fb2 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix
@@ -1,19 +1,19 @@
-{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }:
+{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }:
 
-if !stdenv.lib.versionAtLeast conduit.version "1.0"
+if !lib.versionAtLeast conduit.version "1.0"
 then conduit
 else
 
 buildDunePackage {
-	pname = "conduit-async";
-	useDune2 = true;
-	inherit (conduit) version src;
+  pname = "conduit-async";
+  useDune2 = true;
+  inherit (conduit) version src;
 
-	buildInputs = [ ppx_sexp_conv ];
+  buildInputs = [ ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ async async_ssl conduit ];
+  propagatedBuildInputs = [ async async_ssl conduit ];
 
-	meta = conduit.meta // {
-		description = "A network connection establishment library for Async";
-	};
+  meta = conduit.meta // {
+    description = "A network connection establishment library for Async";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix
index b800d6b7ba4a..8c9b757f87c3 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage
+{ lib, fetchurl, buildDunePackage
 , ppx_sexp_conv, sexplib, astring, uri, logs
 , ipaddr, ipaddr-sexp
 }:
@@ -20,8 +20,8 @@ buildDunePackage rec {
 
   meta = {
     description = "A network connection establishment library";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ alexfmpe vbgl ];
     homepage = "https://github.com/mirage/ocaml-conduit";
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index b3c7e7fa86f9..ab6449b50a17 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -1,20 +1,20 @@
-{ stdenv, buildDunePackage
+{ buildDunePackage
 , conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp
 , lwt_ssl, tls
 }:
 
 buildDunePackage {
-	pname = "conduit-lwt-unix";
-	inherit (conduit-lwt) version src minimumOCamlVersion;
+  pname = "conduit-lwt-unix";
+  inherit (conduit-lwt) version src minimumOCamlVersion;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	buildInputs = [ ppx_sexp_conv ];
+  buildInputs = [ ppx_sexp_conv ];
 
-	propagatedBuildInputs =
-		[ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
+  propagatedBuildInputs =
+    [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
 
-	meta = conduit-lwt.meta // {
-		description = "A network connection establishment library for Lwt_unix";
-	};
+  meta = conduit-lwt.meta // {
+    description = "A network connection establishment library for Lwt_unix";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix
index 6514586f9d93..2f18027a67b0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
+{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
 
 buildDunePackage {
-	pname = "conduit-lwt";
-	inherit (conduit) version src useDune2 minimumOCamlVersion;
+  pname = "conduit-lwt";
+  inherit (conduit) version src useDune2 minimumOCamlVersion;
 
-	buildInputs = [ ppx_sexp_conv ];
+  buildInputs = [ ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
+  propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
 
-	meta = conduit.meta // {
-		description = "A network connection establishment library for Lwt";
-	};
+  meta = conduit.meta // {
+    description = "A network connection establishment library for Lwt";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix
new file mode 100644
index 000000000000..6100908f785b
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix
@@ -0,0 +1,24 @@
+{ buildDunePackage, conduit-lwt
+, ppx_sexp_conv, sexplib, cstruct, mirage-stack, mirage-flow
+, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
+, dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
+}:
+
+buildDunePackage {
+  pname = "conduit-mirage";
+
+  inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
+
+  nativeBuildInputs = [ ppx_sexp_conv ];
+
+  propagatedBuildInputs = [
+    sexplib cstruct mirage-stack mirage-clock mirage-flow
+    mirage-flow-combinators mirage-random mirage-time
+    dns-client conduit-lwt vchan xenstore tls tls-mirage
+    ipaddr ipaddr-sexp
+  ];
+
+  meta = conduit-lwt.meta // {
+    description = "A network connection establishment library for MirageOS";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix b/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix
index 724c5b1e2d6a..29c7cd61c3f5 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, camlp4 }:
+{ stdenv, lib, fetchurl, ocaml, findlib, camlp4 }:
 
 stdenv.mkDerivation {
   name = "ocaml-config-file-1.2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     homepage = "http://config-file.forge.ocamlcore.org/";
     platforms = ocaml.meta.platforms or [];
     description = "An OCaml library used to manage the configuration file(s) of an application";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.lgpl2Plus;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix
index e40f6531e1fd..cc2aad52d3d6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:
 
 let version = "2.3.1"; in
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     cp cpdfmanual.pdf $out/share/doc/cpdf/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.coherentpdf.com/";
     platforms = ocaml.meta.platforms or [];
     description = "PDF Command Line Tools";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix
index 716e40e16e9f..083f00d5d5f1 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, autoconf }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, autoconf }:
 
 buildDunePackage rec {
   pname = "cpu";
@@ -18,9 +18,9 @@ buildDunePackage rec {
 
   buildInputs = [ autoconf ];
 
-  hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
+  hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Core pinning library";
     maintainers = [ maintainers.bcdarwin ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix b/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix
index 0189026e346b..d05d15286bf7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, ocplib-endian, cmdliner, afl-persistent
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocplib-endian, cmdliner, afl-persistent
 , calendar, fpath, pprint, uutf, uunf, uucp }:
 
 buildDunePackage rec {
@@ -22,7 +22,7 @@ buildDunePackage rec {
   # uunf is broken on aarch64
   doCheck = !stdenv.isAarch64;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Property fuzzing for OCaml";
     homepage = "https://github.com/stedolan/crowbar";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
index 2d9ac2a7b193..6011c6953baa 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, lib, fetchurl, ocaml, findlib}:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "cryptgps is not available for OCaml ${ocaml.version}"
 else
 
@@ -28,10 +28,10 @@ stdenv.mkDerivation {
       i.e. this is not a binding to some C library, but the implementation
       itself.
     '';
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix
index 0ca094382228..26c064d6ff51 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "csexp";
   version = "1.3.2";
 
+  useDune2 = true;
+
   minimumOCamlVersion = "4.02.3";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
index 1cea58abee20..750a153c1c48 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
+{ lib, stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
 , async ? null, lwt ? null
 }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.01";
+assert lib.versionAtLeast ocaml.version "4.01";
 
 let version = "1.9.0"; in
 
@@ -26,10 +26,10 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mirage/ocaml-cstruct";
     description = "Map OCaml arrays onto C-like structs";
-    license = stdenv.lib.licenses.isc;
+    license = lib.licenses.isc;
     maintainers = [ maintainers.vbgl maintainers.ericbmerritt ];
     platforms = ocaml.meta.platforms or [];
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix
index f340bfcda25e..113df1e89b5c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix
@@ -5,10 +5,10 @@ then cstruct
 else
 
 buildDunePackage {
-	pname = "cstruct-lwt";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "cstruct-lwt";
+  inherit (cstruct) version src useDune2 meta;
 
   minimumOCamlVersion = "4.02";
 
-	propagatedBuildInputs = [ cstruct lwt ];
+  propagatedBuildInputs = [ cstruct lwt ];
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix
index feb8feac6b68..44343812090d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -5,10 +5,10 @@ then cstruct
 else
 
 buildDunePackage {
-	pname = "ppx_cstruct";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "ppx_cstruct";
+  inherit (cstruct) version src useDune2 meta;
 
-	minimumOCamlVersion = "4.03";
+  minimumOCamlVersion = "4.03";
 
-	propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
+  propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix
index 04bb10d6f75e..742cb6522ebf 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix
@@ -5,12 +5,11 @@ then cstruct
 else
 
 buildDunePackage rec {
-	pname = "cstruct-sexp";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "cstruct-sexp";
+  inherit (cstruct) version src useDune2 meta;
 
-	doCheck = lib.versionAtLeast ocaml.version "4.03";
-	checkInputs = lib.optional doCheck alcotest;
+  doCheck = lib.versionAtLeast ocaml.version "4.03";
+  checkInputs = lib.optional doCheck alcotest;
 
-	propagatedBuildInputs = [ cstruct sexplib ];
+  propagatedBuildInputs = [ cstruct sexplib ];
 }
-
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix
index b7e0df0185c1..1ea27bb04de4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix
@@ -5,10 +5,10 @@ then cstruct
 else
 
 buildDunePackage {
-	pname = "cstruct-unix";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "cstruct-unix";
+  inherit (cstruct) version src useDune2 meta;
 
-	minimumOCamlVersion = "4.06";
+  minimumOCamlVersion = "4.06";
 
-	propagatedBuildInputs = [ cstruct ];
+  propagatedBuildInputs = [ cstruct ];
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix b/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix
index 9b6152692631..6fdf20308611 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation {
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   installPhase = "ocaml setup.ml -install";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure OCaml library to read and write CSV files";
     homepage = "https://github.com/Chris00/ocaml-csv";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/csv/default.nix b/nixpkgs/pkgs/development/ocaml-modules/csv/default.nix
index 60496ad28dac..595624531759 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/csv/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/csv/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, buildDunePackage }:
+{ lib, fetchurl, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "csv";
-	version = "2.4";
+  version = "2.4";
 
-	useDune2 = true;
+  useDune2 = true;
 
-	src = fetchurl {
-		url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
-		sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
-	};
+  src = fetchurl {
+    url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
+    sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
+  };
 
-	meta = {
-		description = "A pure OCaml library to read and write CSV files";
-		license = stdenv.lib.licenses.lgpl21;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		homepage = "https://github.com/Chris00/ocaml-csv";
-	};
+  meta = {
+    description = "A pure OCaml library to read and write CSV files";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/Chris00/ocaml-csv";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix
index 8a16dcec343b..9cb3a3d4cb87 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }:
+{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "ctypes is not available for OCaml ${ocaml.version}"
 else
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ocaml findlib ncurses ];
   propagatedBuildInputs = [ integers libffi ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     make install XEN=false
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ocamllabs/ocaml-ctypes";
     description = "Library for binding to C libraries using pure OCaml";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix
index 236b9c19c928..491b2844ef1d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchurl, ocaml
+{ stdenv, lib, buildDunePackage, fetchurl, ocaml
 , result, alcotest, cohttp-lwt-unix, odoc, curl }:
 
 buildDunePackage rec {
@@ -17,7 +17,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ result ];
   checkInputs = [ alcotest cohttp-lwt-unix ];
   # test dependencies are only available for >= 4.08
-  doCheck = stdenv.lib.versionAtLeast ocaml.version "4.08"
+  doCheck = lib.versionAtLeast ocaml.version "4.08"
     # Some test fails in macOS sandbox
     # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "")
     && !stdenv.isDarwin;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix b/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix
index 2c989caa3e8d..f1211ad9cdc6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ncurses }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "ocaml-curses";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = "make all opt";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OCaml Bindings to curses/ncurses";
     homepage = "https://opam.ocaml.org/packages/curses/curses.1.0.4/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix b/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
index a3bf3456ed0d..067fac33d455 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
@@ -4,25 +4,25 @@
 }:
 
 buildDunePackage rec {
-	version = "0.9.0";
-	pname = "decompress";
+  version = "0.9.0";
+  pname = "decompress";
 
-	useDune2 = true;
+  useDune2 = true;
 
-	src = fetchurl {
-		url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
-		sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
-	};
+  src = fetchurl {
+    url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
+    sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
+  };
 
-	buildInputs = [ cmdliner ];
-	propagatedBuildInputs = [ checkseum ];
-	checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
-	doCheck = true;
+  buildInputs = [ cmdliner ];
+  propagatedBuildInputs = [ checkseum ];
+  checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
+  doCheck = true;
 
-	meta = {
-		description = "Pure OCaml implementation of Zlib";
-		license = lib.licenses.mit;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/mirage/decompress";
-	};
+  meta = {
+    description = "Pure OCaml implementation of Zlib";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/mirage/decompress";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix
index 21d9d02da4b8..4f0b95da6cb3 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix
@@ -4,14 +4,14 @@
 
 buildDunePackage rec {
   pname = "dns";
-  version = "4.6.2";
+  version = "4.6.3";
 
   useDune2 = true;
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
-    sha256 = "0prypr5c589vay4alri78g0sarh06z35did26wn3s3di17d5761q";
+    sha256 = "0g7xw43jm5hv0w9lsnhhi0w3243mxl615cdsvz29yh39fcqvqsdy";
   };
 
   propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix
index 824da3030685..a1a73bfe2188 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix
@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-dolmen-${version}";
-	version = "0.2";
-	src = fetchFromGitHub {
-		owner = "Gbury";
-		repo = "dolmen";
-		rev = "v${version}";
-		sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
-	};
+  name = "ocaml${ocaml.version}-dolmen-${version}";
+  version = "0.2";
+  src = fetchFromGitHub {
+    owner = "Gbury";
+    repo = "dolmen";
+    rev = "v${version}";
+    sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild ];
-	propagatedBuildInputs = [ menhir ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
+  propagatedBuildInputs = [ menhir ];
 
-	makeFlags = [ "-C" "src" ];
+  makeFlags = [ "-C" "src" ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "An OCaml library providing clean and flexible parsers for input languages";
-		license = stdenv.lib.licenses.bsd2;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "An OCaml library providing clean and flexible parsers for input languages";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix
index f9eef4774f5f..690823c5358a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
 
 let version = "3.0"; in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/UnixJunkie/dolog";
     description = "Minimalistic lazy logger in OCaml";
     platforms = ocaml.meta.platforms or [];
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix
index b26cbec25edb..62fa7cd08c8b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage }:
+{ stdenv, lib, fetchurl, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "dtoa";
@@ -11,9 +11,9 @@ buildDunePackage rec {
     sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn";
   };
 
-  hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
+  hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/flowtype/ocaml-dtoa";
     description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm.";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix
index 844d06e30389..d8aa1f371f3b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib
 , easy-format
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mjambon/dum";
     description = "Inspect the runtime representation of arbitrary OCaml values";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix
index ead672fa15ca..5b5b107b694b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, lib, fetchurl, ocaml, findlib}:
 
 let
   pname = "dypgen";
 in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "${pname} is not available for OCaml ${ocaml.version}"
 else
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://dypgen.free.fr";
     description = "Dypgen GLR self extensible parser generator";
-    license = stdenv.lib.licenses.cecill-b;
+    license = lib.licenses.cecill-b;
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix
index 5c1155a723bd..6a3566fda2b6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib }:
+{ lib, stdenv, fetchzip, ocaml, findlib }:
 let
   pname = "easy-format";
   version = "1.2.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high-level and functional interface to the Format module of the OCaml standard library";
     homepage = "https://github.com/ocaml-community/${pname}";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix
index dacd3a758623..c86b7cba0103 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, ctypes, libcxx }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, ctypes, libcxx }:
 
 buildDunePackage rec {
   pname = "eigen";
@@ -15,11 +15,11 @@ buildDunePackage rec {
 
   minimumOCamlVersion = "4.02";
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   propagatedBuildInputs = [ ctypes ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Minimal/incomplete Ocaml interface to Eigen3, mostly for Owl";
     platforms = platforms.x86_64;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/either/default.nix b/nixpkgs/pkgs/development/ocaml-modules/either/default.nix
new file mode 100644
index 000000000000..71d16c9674c9
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/either/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildDunePackage, fetchurl }:
+
+buildDunePackage rec {
+  pname = "either";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/either/releases/download/${version}/either-${version}.tbz";
+    sha256 = "bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884";
+  };
+
+  useDune2 = true;
+
+  meta = with lib; {
+    description = "Compatibility Either module";
+    license = licenses.mit;
+    homepage = "https://github.com/mirage/either";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix
index b41743f542d8..4eff6c2957de 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }:
+{ stdenv, lib, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }:
 
 stdenv.mkDerivation rec {
   version = "1.1";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "--use-opam"
     "--apron-prefix" apron
   ]
-  ++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs"
+  ++ lib.optional stdenv.isDarwin "--absolute-dylibs"
   ;
 
   createFindlibDestdir = true;
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ETH LIbrary for Numerical Analysis";
     homepage = "http://elina.ethz.ch/";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl3;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
index de2955e57c92..4c845273d714 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchzip, which, ocsigen_server, ocaml,
+{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml,
   lwt_react,
   opaline, ppx_deriving, findlib
+, ppx_tools_versioned
 , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
 , js_of_ocaml-lwt
 , js_of_ocaml-tyxml
 , lwt_ppx
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.07"
+if !lib.versionAtLeast ocaml.version "4.07"
 then throw "eliom is not available for OCaml ${ocaml.version}"
 else
 
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec
   };
 
   buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline
+    ppx_tools_versioned
   ];
 
   propagatedBuildInputs = [
@@ -52,8 +54,8 @@ stdenv.mkDerivation rec
     distinguish both parts and the client side is compiled to JS using
     Ocsigen Js_of_ocaml.'';
 
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
 
-    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+    maintainers = [ lib.maintainers.gal_bolle ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
index 865c5448c5bd..6f0d355fed5b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
@@ -1,15 +1,19 @@
-{ lib, fetchzip, buildDunePackage, camlp5
+{ stdenv, lib, fetchzip, buildDunePackage, camlp5
 , ppxlib, ppx_deriving, re, perl, ncurses
+, version ? "1.12.0"
 }:
-
+with lib;
+let fetched = import ../../../build-support/coq/meta-fetch/default.nix
+  {inherit stdenv fetchzip; } ({
+    release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is";
+    release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5";
+    releaseRev = v: "v${v}";
+    location = { domain = "github.com"; owner = "LPCIC"; repo = "elpi"; };
+  }) version;
+in
 buildDunePackage rec {
   pname = "elpi";
-  version = "1.11.4";
-
-   src = fetchzip {
-     url = "https://github.com/LPCIC/elpi/releases/download/v${version}/elpi-v${version}.tbz";
-     sha256 = "1hmjp2z52j17vwhhdkj45n9jx11jxkdg2dwa0n04yyw0qqy4m7c1";
-   };
+  inherit (fetched) version src;
 
   minimumOCamlVersion = "4.04";
 
@@ -19,8 +23,8 @@ buildDunePackage rec {
 
   meta = {
     description = "Embeddable λProlog Interpreter";
-    license = lib.licenses.lgpl21Plus;
-    maintainers = [ lib.maintainers.vbgl ];
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.vbgl ];
     homepage = "https://github.com/LPCIC/elpi";
   };
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix
new file mode 100644
index 000000000000..d296e3de967b
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildDunePackage, fetchurl, ocaml
+, angstrom, ipaddr, base64, pecu, uutf
+, alcotest, cmdliner
+}:
+
+buildDunePackage rec {
+  pname = "emile";
+  version = "1.1";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz";
+    sha256 = "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p";
+  };
+
+  buildInputs = [ cmdliner ];
+
+  propagatedBuildInputs = [
+    angstrom
+    ipaddr
+    base64
+    pecu
+    uutf
+  ];
+
+  # technically emile is available for ocaml >= 4.03, but alcotest
+  # and angstrom (fmt) are only available for >= 4.05. Disabling
+  # tests for < 4.05 at least improves the error message
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  checkInputs = [ alcotest ];
+
+  meta = with lib; {
+    description = "Parser of email address according RFC822";
+    license = licenses.mit;
+    homepage = "https://github.com/dinosaure/emile";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix b/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix
index 22a6d12792c7..eb0495be797f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
+assert lib.versionAtLeast (lib.getVersion ocaml) "4.00";
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "enumerate-111.08.00 is not available for OCaml ${ocaml.version}"
 else
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://ocaml.janestreet.com/";
     description = "Quotation expanders for enumerating finite types";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix
index ebfcbc90a504..56b5c9295708 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "erm_xml is not available for OCaml ${ocaml.version}"
 else
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/hannesm/xml";
     description = "XML Parser for discrete data";
     platforms = ocaml.meta.platforms or [];
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix
index c3534d146f8a..cff155f47098 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild
 , erm_xml, mirage-crypto, mirage-crypto-rng, base64
 }:
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/hannesm/xmpp";
     description = "OCaml based XMPP implementation (fork)";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sternenseemann ];
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/estring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/estring/default.nix
index 4cd27f272b3c..7424d14220dc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/estring/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/estring/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildOcaml, ocaml, fetchurl }:
+{ lib, buildOcaml, ocaml, fetchurl }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "estring is not available for OCaml ${ocaml.version}"
 else
 
@@ -13,7 +13,7 @@ buildOcaml rec {
     sha256 = "0b6znz5igm8pp28w4b7sgy82rpd9m5aw6ss933rfbw1mrh05gvcg";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://estring.forge.ocamlcore.org/";
     description = "Extension for string literals";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
index 886f346012c1..219b8164e7c9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ounit, expat}:
+{stdenv, lib, fetchurl, ocaml, findlib, ounit, expat}:
 
 let
   pname = "ocaml-expat";
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/";
     description = "An ocaml wrapper for the Expat XML parsing library";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.roconnor ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix
index 6058c87e7bd5..1812473e78bf 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix
@@ -1,32 +1,32 @@
-{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }:
+{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-expat-${version}";
-	version = "1.1.0";
+  name = "ocaml${ocaml.version}-expat-${version}";
+  version = "1.1.0";
 
-	src = fetchFromGitHub {
-		owner = "whitequark";
-		repo = "ocaml-expat";
-		rev = "v${version}";
-		sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q";
-	};
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "ocaml-expat";
+    rev = "v${version}";
+    sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q";
+  };
 
-	prePatch = ''
-		substituteInPlace Makefile --replace "gcc" "\$(CC)"
-	'';
+  prePatch = ''
+    substituteInPlace Makefile --replace "gcc" "\$(CC)"
+  '';
 
-	buildInputs = [ ocaml findlib expat ounit ];
+  buildInputs = [ ocaml findlib expat ounit ];
 
-	doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06";
-	checkTarget = "testall";
+  doCheck = !lib.versionAtLeast ocaml.version "4.06";
+  checkTarget = "testall";
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "OCaml wrapper for the Expat XML parsing library";
-		license = stdenv.lib.licenses.mit;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "OCaml wrapper for the Expat XML parsing library";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
index 5e04c73c3025..a8b1810e51f1 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }:
+{ stdenv, lib, fetchurl, ocaml, findlib, cppo, minimal ? true }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+assert lib.versionAtLeast (lib.getVersion ocaml) "3.11";
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-extlib-1.7.7";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/ygrek/ocaml-extlib";
     description = "Enhancements to the OCaml Standard Library modules";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix
index 269288ef3cd9..fd3187055126 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }:
+{ lib, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }:
 
 buildDunePackage rec {
   pname = "ezjsonm";
@@ -16,7 +16,7 @@ buildDunePackage rec {
   meta = {
     description = "An easy interface on top of the Jsonm library";
     homepage = "https://github.com/mirage/ezjsonm";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ezxmlm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ezxmlm/default.nix
index 1740bd77fdb2..6d5fe28a8c02 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ezxmlm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ezxmlm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, xmlm }:
+{ lib, fetchFromGitHub, buildDunePackage, xmlm }:
 
 buildDunePackage rec {
   pname = "ezxmlm";
@@ -13,7 +13,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ xmlm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Combinators to use with xmlm for parsing and selection";
     longDescription = ''
       An "easy" interface on top of the xmlm library. This version provides
diff --git a/nixpkgs/pkgs/development/ocaml-modules/faillib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/faillib/default.nix
index 2a4d03e87aea..63040fadda5d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/faillib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/faillib/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, herelib, camlp4 }:
+{ lib, buildOcaml, fetchurl, ocaml, herelib, camlp4 }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "faillib-111.17.00 is not available for OCaml ${ocaml.version}"
 else
 
@@ -11,7 +11,7 @@ buildOcaml rec {
 
   src = fetchurl {
     url = "https://github.com/janestreet/faillib/archive/${version}.tar.gz";
-    sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; 
+    sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v";
   };
 
   propagatedBuildInputs = [ camlp4 herelib ];
@@ -19,7 +19,7 @@ buildOcaml rec {
   doCheck = true;
   checkPhase = "make test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ocaml.janestreet.com/";
     description = "Library for dealing with failure in OCaml";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix
index 96423a213a19..77eef7f29a98 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
 , faraday
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.3"
+if !lib.versionAtLeast ocaml.version "4.3"
 then throw "farfadet is not available for OCaml ${ocaml.version}"
 else
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A printf-like for Faraday library";
     homepage = "https://github.com/oklm-wsh/Farfadet";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/fieldslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fieldslib/default.nix
index 90b75faa54c2..4adddbfe54d2 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/fieldslib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fieldslib/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }:
 
-assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml);
+assert lib.versionOlder "4.00" (lib.getVersion ocaml);
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "fieldslib-109.20.03 is not available for OCaml ${ocaml.version}"
 else
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ocaml.janestreet.com/";
     description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix
index 031680b1e337..39c41e8eba04 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-fileutils-0.5.3";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/";
     platforms = ocaml.meta.platforms or [];
     description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix
index d1a2b93cee16..d4ce484653b9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
 
 stdenv.mkDerivation {
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gallium.inria.fr/~fpottier/fix/";
     description = "A simple OCaml module for computing the least solution of a system of monotone equations";
     license = licenses.cecill-c;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix
index 6b457a9d6dc2..a66976b4a2b5 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.05"
+if !lib.versionAtLeast ocaml.version "4.05"
 then throw "fmt is not available for OCaml ${ocaml.version}"
 else
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://erratique.ch/software/fmt";
     license = licenses.isc;
     description = "OCaml Format pretty-printer combinators";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix
index ce17cc60ebf8..55e8e9418955 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, fontconfig, ocaml }:
+{ stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }:
 
 stdenv.mkDerivation {
   name = "ocaml-fontconfig-20131103";
@@ -9,17 +9,17 @@ stdenv.mkDerivation {
     sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ocaml fontconfig ];
   makeFlags = [
-    "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/"
+    "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/"
     "OCAML_HAVE_OCAMLOPT=yes"
   ];
 
   meta = {
     description = "Fontconfig bindings for OCaml";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix
index 4694e3ac6377..785a71e13a7f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "fpath is not available for OCaml ${ocaml.version}"
 else
 
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
   meta = {
     description = "An OCaml module for handling file system paths with POSIX and Windows conventions";
     homepage = "https://erratique.ch/software/fpath";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix b/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix
index 934a88254e27..2f11001874f1 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, ocaml, findlib }:
+{ lib, stdenv, fetchurl, ocaml, findlib }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+assert lib.versionAtLeast (lib.getVersion ocaml) "3.11";
 
 let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
+  if lib.versionAtLeast ocaml.version "4.02" then {
     version = "0.6";
     sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y";
   } else {
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.lri.fr/~filliatr/functory/";
     description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix
index 9e37d9b9a2d4..04d1a0816606 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
 
 let version = "0.5"; in
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/c-cube/gen";
     description = "Simple, efficient iterators for OCaml";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix
index d4c28be2f798..58e2b67eacc6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast;
+  inherit (lib) getVersion versionAtLeast;
 
   pname = "gg";
   version = "0.9.1";
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Basic types for computer graphics in OCaml";
     longDescription = ''
       Gg is an OCaml module providing basic types for computer graphics. It
diff --git a/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix
index 3b127c650063..54bd5c2da233 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,15 +1,15 @@
 { buildDunePackage, git, cohttp, cohttp-lwt }:
 
 buildDunePackage {
-	pname = "git-http";
-	inherit (git) version src minimumOCamlVersion;
+  pname = "git-http";
+  inherit (git) version src minimumOCamlVersion;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	propagatedBuildInputs = [ git cohttp cohttp-lwt ];
+  propagatedBuildInputs = [ git cohttp cohttp-lwt ];
 
-	meta = {
-		description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
-		inherit (git.meta) homepage license maintainers;
-	};
+  meta = {
+    description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
+    inherit (git.meta) homepage license maintainers;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix
index 0633b8af8f05..6ee6ef21c15e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -4,17 +4,17 @@
 }:
 
 buildDunePackage {
-	pname = "git-unix";
-	inherit (git-http) version src minimumOCamlVersion;
+  pname = "git-unix";
+  inherit (git-http) version src minimumOCamlVersion;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
-	checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
-	doCheck = !stdenv.isAarch64;
+  propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
+  checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
+  doCheck = !stdenv.isAarch64;
 
-	meta = {
-		description = "Unix backend for the Git protocol(s)";
-		inherit (git-http.meta) homepage license maintainers;
-	};
+  meta = {
+    description = "Unix backend for the Git protocol(s)";
+    inherit (git-http.meta) homepage license maintainers;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
index d28e8ef2e7b4..f5cb452f1a91 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage
+{ stdenv, lib, fetchurl, buildDunePackage
 , alcotest, mtime, mirage-crypto-rng, tls, git-binary
 , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
 , fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult
@@ -6,28 +6,28 @@
 }:
 
 buildDunePackage rec {
-	pname = "git";
-	version = "2.1.3";
+  pname = "git";
+  version = "2.1.3";
 
-	minimumOCamlVersion = "4.07";
-	useDune2 = true;
+  minimumOCamlVersion = "4.07";
+  useDune2 = true;
 
-	src = fetchurl {
-		url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
-		sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
-	};
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
+    sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
+  };
 
-	propagatedBuildInputs = [
-		angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
-		hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
-	];
-	checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
-	doCheck = !stdenv.isAarch64;
+  propagatedBuildInputs = [
+    angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
+    hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
+  ];
+  checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
+  doCheck = !stdenv.isAarch64;
 
-	meta = with stdenv; {
-		description = "Git format and protocol in pure OCaml";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/mirage/ocaml-git";
-	};
+  meta = {
+    description = "Git format and protocol in pure OCaml";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/mirage/ocaml-git";
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix
index f01f3e8cad53..29df5ce8f4e4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}:
+{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}:
 
 let
   pname = "gmetadom";
@@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
   '';
 
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ocaml findlib gdome2 libxslt];
   propagatedBuildInputs = [gdome2];
 
   meta = {
     homepage = "http://gmetadom.sourceforge.net/";
     description = "A collection of librares, each library providing a DOM implementation";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.roconnor ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix
index aebdf4adb27f..046c92afca0a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
+{ lib, stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
 
 buildDunePackage rec {
   pname = "gsl";
@@ -12,9 +12,9 @@ buildDunePackage rec {
   };
 
   buildInputs = [ dune-configurator gsl pkg-config ];
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://mmottl.github.io/gsl-ocaml/";
     description = "OCaml bindings to the GNU Scientific Library";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix
index b0e17a28e51e..e1afefc6a79f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }:
+{ stdenv, lib, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }:
 
 let pname = "gtktop-2.0"; in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "${pname} is not available for OCaml ${ocaml.version}"
 else
 
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://zoggy.github.io/gtktop/";
     description = "A small OCaml library to ease the creation of graphical toplevels";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ vbgl ];
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix
index a99b6cb711e4..c5223637a158 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl}:
+{lib, buildOcaml, fetchurl}:
 
 buildOcaml rec {
   version = "112.35.00";
@@ -11,10 +11,10 @@ buildOcaml rec {
     sha256 = "03rrlpjmnd8d1rzzmd112355m7a5bwn3vf90xkbc6gkxlad9cxbs";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/herelib";
     description = "Syntax extension for inserting the current location";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     maintainers = [ maintainers.ericbmerritt ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix
index 526989734abd..4a6123ebd3a6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage, bigarray-compat, cstruct }:
+{ lib, fetchurl, buildDunePackage, bigarray-compat, cstruct }:
 
 buildDunePackage rec {
   pname = "hex";
@@ -19,7 +19,7 @@ buildDunePackage rec {
   meta = {
     description = "Mininal OCaml library providing hexadecimal converters";
     homepage = "https://github.com/mirage/ocaml-hex";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix
index ecda6338beed..3c4b7a37f99e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }:
 
 stdenv.mkDerivation rec {
   pname = "higlo";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   patches = ./install.patch;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OCaml library for syntax highlighting";
     homepage = "https://zoggy.github.io/higlo/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix
index 563d39909c8c..67622a8ef6a0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix
@@ -13,7 +13,7 @@ in
 assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
 
 stdenv.mkDerivation rec {
-	pname = "hmap";
+  pname = "hmap";
   version = "0.8.1";
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a";
   };
 
-	buildInputs = [ ocaml ocamlbuild findlib topkg ];
+  buildInputs = [ ocaml ocamlbuild findlib topkg ];
 
   inherit (topkg) installPhase;
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
   checkPhase = "${topkg.run} test";
 
   meta = {
-		description = "Heterogeneous value maps for OCaml";
+    description = "Heterogeneous value maps for OCaml";
     homepage = "https://erratique.ch/software/hmap";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.pmahoney ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.pmahoney ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/http/default.nix b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
index 3936eb13c2fb..f762e9c7b238 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
+{lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "ocaml-http is not available for OCaml ${ocaml.version}"
 else
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     make all opt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://ocaml-http.forge.ocamlcore.org/";
     platforms = ocaml.meta.platforms or [];
     description = "Do it yourself (OCaml) HTTP daemon";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix
new file mode 100644
index 000000000000..1d677ac1a2ef
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix
@@ -0,0 +1,41 @@
+{ lib, buildDunePackage, fetchurl
+, dune-configurator, cmdliner, angstrom
+, rresult, stdlib-shims, fmt, fpath
+}:
+
+buildDunePackage rec {
+  pname = "hxd";
+  version = "0.2.0";
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.06";
+
+  src = fetchurl {
+    url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
+    sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
+  };
+
+  nativeBuildInputs = [
+    dune-configurator
+  ];
+
+  buildInputs = [
+    cmdliner
+    angstrom
+    rresult
+    fmt
+    fpath
+  ];
+
+  propagatedBuildInputs = [
+    stdlib-shims
+  ];
+
+  meta = with lib; {
+    description = "Hexdump in OCaml";
+    homepage = "https://github.com/dinosaure/hxd";
+    license = licenses.mit;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix
index eeeaab8092fc..ad9bd3e2dc71 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix
@@ -1,28 +1,28 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }:
+{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }:
 
 stdenv.mkDerivation {
-	name = "ocaml${ocaml.version}-inifiles-1.2";
+  name = "ocaml${ocaml.version}-inifiles-1.2";
 
-	src = fetchurl {
-		url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
-		sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
-	};
+  src = fetchurl {
+    url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
+    sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
+  };
 
-	patches = [ (fetchpatch {
-		url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff";
-		sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
-	})];
+  patches = [ (fetchpatch {
+    url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff";
+    sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
+  })];
 
-	buildInputs = [ ocaml findlib ];
-	propagatedBuildInputs = [ ocaml_pcre ];
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ ocaml_pcre ];
 
-	buildFlags = [ "all" "opt" ];
+  buildFlags = [ "all" "opt" ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "A small OCaml library to read and write .ini files";
-		license = stdenv.lib.licenses.lgpl21Plus;
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "A small OCaml library to read and write .ini files";
+    license = lib.licenses.lgpl21Plus;
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix
index 44b34beb79d6..8910b720a847 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix
@@ -1,44 +1,44 @@
-{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild
+{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild
 , ocaml_lwt # optional lwt support
 , ounit, fileutils # only for tests
 }:
 
 stdenv.mkDerivation rec {
-	version = "2.3";
-	name = "ocaml${ocaml.version}-inotify-${version}";
-
-	src = fetchFromGitHub {
-		owner = "whitequark";
-		repo = "ocaml-inotify";
-		rev = "v${version}";
-		sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
-	};
-
-	patches = [ (fetchpatch {
-		url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
-		sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
-	}) ];
-
-	buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ];
-	checkInputs = [ ounit fileutils ];
-
-	configureFlags = [ "--enable-lwt"
-	  (stdenv.lib.optionalString doCheck "--enable-tests") ];
-
-	postConfigure = stdenv.lib.optionalString doCheck ''
-	  echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
-	'';
-
-	doCheck = true;
-	checkTarget = "test";
-
-	createFindlibDestdir = true;
-
-	meta = {
-		description = "Bindings for Linux’s filesystem monitoring interface, inotify";
-		license = stdenv.lib.licenses.lgpl21;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-		platforms = stdenv.lib.platforms.linux;
-	};
+  version = "2.3";
+  name = "ocaml${ocaml.version}-inotify-${version}";
+
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "ocaml-inotify";
+    rev = "v${version}";
+    sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
+  };
+
+  patches = [ (fetchpatch {
+    url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
+    sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
+  }) ];
+
+  buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ];
+  checkInputs = [ ounit fileutils ];
+
+  configureFlags = [ "--enable-lwt"
+    (lib.optionalString doCheck "--enable-tests") ];
+
+  postConfigure = lib.optionalString doCheck ''
+    echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
+  '';
+
+  doCheck = true;
+  checkTarget = "test";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Bindings for Linux’s filesystem monitoring interface, inotify";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    platforms = lib.platforms.linux;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
index ca14c3ca8739..ad6f1f9f813d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
@@ -1,18 +1,18 @@
 { lib, fetchzip, buildDunePackage }:
 
 buildDunePackage rec {
-	pname = "integers";
-	version = "0.4.0";
+  pname = "integers";
+  version = "0.4.0";
 
-	src = fetchzip {
-		url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
-		sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
-	};
+  src = fetchzip {
+    url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
+    sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
+  };
 
-	meta = {
-		description = "Various signed and unsigned integer types for OCaml";
-		license = lib.licenses.mit;
-		homepage = "https://github.com/ocamllabs/ocaml-integers";
-		maintainers = [ lib.maintainers.vbgl ];
-	};
+  meta = {
+    description = "Various signed and unsigned integer types for OCaml";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/ocamllabs/ocaml-integers";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix b/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix
index 46908369e571..9685e27d0b8a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }:
+{ lib, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }:
 
 buildDunePackage rec {
   pname = "io-page";
@@ -18,8 +18,8 @@ buildDunePackage rec {
 
   meta = {
     homepage = "https://github.com/mirage/io-page";
-    license = stdenv.lib.licenses.isc;
+    license = lib.licenses.isc;
     description = "IO memory page library for Mirage backends";
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix
index 15f3a5613b55..0845e4c1841e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitLab, ocaml, findlib
+{ stdenv, lib, fetchFromGitLab, ocaml, findlib
 , sedlex, uunf, uutf
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "iri is not available for OCaml ${ocaml.version}"
 else
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "IRI (RFC3987) native OCaml implementation";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl3;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
     inherit (ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix
index 2a2953673f93..d1b55609bc4a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
 
 let version = "0.2.4"; in
 
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://ocaml-community.github.io/ISO8601.ml/";
     description = "ISO 8601 and RFC 3999 date parsing for OCaml";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
index 70780ee385fa..15f391342bdb 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, async_kernel, bin_prot, core_kernel,
+{lib, buildOcamlJane, async_kernel, bin_prot, core_kernel,
  fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test,
  ppx_jane, sexplib, typerep, variantslib}:
 
@@ -9,7 +9,7 @@ buildOcamlJane {
     ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane
     sexplib typerep variantslib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/async_rpc_kernel";
     description = "Platform-independent core of Async RPC library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
index 1eb6b6a95f86..5f3c2ab83ff4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   name = "bin_prot";
@@ -8,7 +8,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/bin_prot";
     description = "Binary protocol generator ";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix
index 1956a7f3b705..52a9350eeeac 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildOcamlJane
 , core
 , core_extended
@@ -11,7 +11,7 @@ buildOcamlJane {
   propagatedBuildInputs =
     [ core core_extended textutils ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/core_bench";
     description = "Micro-benchmarking library for OCaml";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
index 39aeb7047177..6ed34f2a28c6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
@@ -1,4 +1,4 @@
-{ stdenv, type_conv, buildOcamlJane }:
+{ lib, type_conv, buildOcamlJane }:
 
 buildOcamlJane {
   name = "fieldslib";
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ocaml.janestreet.com/";
     description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index b3ffecb38ce9..0dd0dde6ec9e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }:
+{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }:
 
 { pname, version ? defaultVersion, hash, ...}@args:
 
@@ -14,6 +14,6 @@ buildDunePackage (args // {
     sha256 = hash;
   };
 
-  meta.license = stdenv.lib.licenses.asl20;
+  meta.license = lib.licenses.asl20;
   meta.homepage = "https://github.com/janestreet/${pname}";
 })
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
index f77b793bcaab..ff03c209190d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opaline }:
+{ lib, buildOcaml, fetchurl, ocaml_oasis, opaline }:
 
 buildOcaml rec {
   name = "js-build-tools";
@@ -21,7 +21,7 @@ buildOcaml rec {
 
   patches = [ ./js-build-tools-darwin.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jane Street Build Tools";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
index 3ed7106e7b65..8f4eb7e41510 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}:
 
 buildOcamlJane {
@@ -8,7 +8,7 @@ buildOcamlJane {
     [ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools
       ppx_type_conv sexplib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assert-like extension nodes that raise useful errors on failure";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
index 9e5df431e04c..2aa1b208d503 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver, ppx_inline_test, ppx_tools}:
 
 buildOcamlJane {
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_inline_test ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Syntax extension for writing in-line benchmarks in ocaml code";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
index d7f333d4cf4c..2dc64497ca23 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, bin_prot}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of bin_prot readers and writers from types";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
index 0bfdd7bd540c..103f17c455ea 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver, ppx_tools, ppx_type_conv}:
 
 buildOcamlJane {
@@ -7,7 +7,7 @@ buildOcamlJane {
   propagatedBuildInputs =
     [ppx_core ppx_driver ppx_tools ppx_type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of fast comparison functions from type expressions and definitions";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
index c652afa5fbfc..785cdbc31c07 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}:
 
 buildOcamlJane {
@@ -7,7 +7,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extensions to printf-style format-strings for user-defined string conversion";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
index 2fdfede0f23d..edb73814704f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate a list containing all values of a finite type";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
index f78f93ee1202..7506e09e30e0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_assert, ppx_compare, ppx_core, ppx_custom_printf, ppx_driver,
  ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools,
  ppx_variants_conv, re, sexplib, variantslib, fieldslib}:
@@ -11,7 +11,7 @@ buildOcamlJane {
       ppx_fields_conv ppx_here ppx_inline_test ppx_sexp_conv ppx_tools
       ppx_variants_conv re sexplib variantslib fieldslib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cram-like framework for OCaml";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
index 551738573b36..857e85f8f03a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of accessor and iteration functions for ocaml records";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
index ea3ac5e8e5ae..d9c7de65347e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw";
   propagatedBuildInputs = [ ppx_core ppx_driver ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter that defines an extension node whose value is its source position";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
index d0e4c84158c7..0b9bb9838947 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Syntax extension for writing in-line tests in ocaml code";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
index 1086059b19f3..e6c51bebd52c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_assert,
  ppx_bench, ppx_bin_prot, ppx_compare, ppx_custom_printf, ppx_driver,
  ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_here,
@@ -14,7 +14,7 @@ buildOcamlJane {
       ppx_here ppx_inline_test ppx_let ppx_pipebang ppx_sexp_conv
       ppx_sexp_message ppx_sexp_value ppx_typerep_conv ppx_variants_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx_driver including all standard ppx rewriters";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
index 8c8b87d7112e..49333fb0e865 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467";
   propagatedBuildInputs = [ ppx_core ppx_driver ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter for monadic and applicative let bindings and match statements";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
index 61fa66b77cc5..1ee00ecfa70f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_tools}:
 
 buildOcamlJane {
@@ -7,7 +7,7 @@ buildOcamlJane {
   propagatedBuildInputs =
     [ ppx_core ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, etc.";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
index 209638f97b74..9afc27e8a5dd 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter that inlines reverse application operators |> and |!";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
index 00361ee81ebe..537a5941a9fd 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, sexplib}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PPX syntax extension that generates code for converting OCaml types to and from s-expressions, as defined in the sexplib library";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
index 2a8bf44bfab2..714c3356ea0c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy construction of S-Expressions";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
index 64fbe4bd9bb9..5bfbd185cee9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter that simplifies building S-Expression from OCaml Values";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
index 472ec19b5588..842e90276b73 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, typerep}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatic generation of runtime types from type definitions";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
index 1d01b0bc321d..a2c8de8a8deb 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of accessor and iteration functions for ocaml variant types";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix
index 1bb9d489b148..b0b2ce3a451e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   minimumSupportedOcamlVersion = "4.02";
@@ -9,7 +9,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ocaml.janestreet.com/";
     description = "Library for serializing OCaml values to and from S-expressions";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix
index 9ed037e52110..41e845b362ea 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   name = "typerep";
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/typerep";
     description = "Runtime types for OCaml (beta version)";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix
index 02e63291add2..3fd7877d2bb4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, stdenv, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   name = "variantslib";
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/variantslib";
     description = "OCaml variants as first class values";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix
index f7978cf4805e..d158e4216ab4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchzip, which, ocaml, findlib
+{ lib, stdenv, fetchzip, which, ocaml, findlib
 , camlzip, extlib
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.04"
+if !lib.versionAtLeast ocaml.version "4.04"
 then throw "javalib is not available for OCaml ${ocaml.version}"
 else
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ camlzip extlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that parses Java .class files into OCaml data structures";
     homepage = "https://javalib-team.github.io/javalib/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix
index e1f09f5a4a24..78a081619b27 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:
 
 let version = "1.0.1"; in
 
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format";
     homepage = "https://erratique.ch/software/jsonm";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vbgl ];
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix b/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix
index 0176daeaf6c5..d1ebe95be89d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt,
+{ lib, stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt,
   rdkafka, zlib }:
 
 buildDunePackage rec {
@@ -16,7 +16,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ rdkafka zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/didier-wenzek/ocaml-kafka";
     description = "OCaml bindings for Kafka";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix
index 2172135e8d4c..3d57c4e40ed6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU, libGL, freeglut, camlp4 } :
+{lib, stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU, libGL, freeglut, camlp4 } :
 
 let
   pname = "lablgl";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "1.05";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz";
     sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
   };
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
     description = "OpenGL bindings for ocaml";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
index 1dfc4305022c..70cc88d21166 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
+{ stdenv, lib, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
 
 stdenv.mkDerivation {
   name = "ocaml-lablgtk-extras-1.4";
@@ -14,10 +14,10 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
     homepage = "http://gtk-extras.forge.ocamlcore.org/";
     description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     branch = "1.4";
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
index de1c1e6ea944..3cd13b2c4d6c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02";
+assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
 
 stdenv.mkDerivation rec {
   version = "1.6";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
     homepage = "http://gtk-extras.forge.ocamlcore.org/";
     description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
index eae356462b32..232621ad83ba 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
+{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.04"
+if lib.versionAtLeast ocaml.version "4.04"
 then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else
 
 let
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
     sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
 
   configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
@@ -31,11 +31,11 @@ stdenv.mkDerivation (rec {
     branch = "2.14";
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
-      stdenv.lib.maintainers.roconnor
+      lib.maintainers.maggesi
+      lib.maintainers.roconnor
     ];
     homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html";
     description = "LablGTK is is an Objective Caml interface to GTK";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
   };
 })
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix
index 2b6c3028fd6c..09487ac9dad7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }:
+{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }:
 
 let param =
-  let check = stdenv.lib.versionAtLeast ocaml.version; in
+  let check = lib.versionAtLeast ocaml.version; in
   if check "4.06" then rec {
     version = "2.18.10";
     src = fetchFromGitHub {
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   pname = "lablgtk";
   inherit (param) version src;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ];
 
   configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [
       maggesi roconnor vbgl
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 767e087a7f06..1f6b0ad76b9a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }:
+{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }:
 
 buildDunePackage rec {
   version = "3.1.1";
@@ -11,7 +11,7 @@ buildDunePackage rec {
     sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ gtk3 cairo2 ];
 
   meta = {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
index 1c8edea66fb7..65ea4d4b82ec 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }:
+{ stdenv, lib, fetchurl, fetchzip, ocaml, findlib, tcl, tk }:
 
-let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in
+let OCamlVersionAtLeast = lib.versionAtLeast ocaml.version; in
 
 if !OCamlVersionAtLeast "4.04"
 then throw "labltk is not available for OCaml ${ocaml.version}"
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser";
     homepage = "http://labltk.forge.ocamlcore.org/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     inherit (ocaml.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
index b7f5cb44818b..fc2327b736e9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, darwin, buildDunePackage, dune-configurator
+{ lib, stdenv, fetchurl, darwin, buildDunePackage, dune-configurator
 , lapack, blas
 }:
 
@@ -19,10 +19,10 @@ buildDunePackage rec {
 
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ lapack blas ] ++
-    stdenv.lib.optionals stdenv.isDarwin
+    lib.optionals stdenv.isDarwin
       [ darwin.apple_sdk.frameworks.Accelerate ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://mmottl.github.io/lacaml";
     description = "OCaml bindings for BLAS and LAPACK";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix
index f02ff4d29962..0d5babad0428 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, libev, buildDunePackage, zed, lwt_log, lwt_react }:
+{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }:
 
 buildDunePackage rec {
   pname = "lambda-term";
-  version = "2.0.3";
+  version = "3.1.0";
 
-  src = fetchurl {
-    url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz";
-    sha256 = "1n1b3ffj41a1lm2315hh870yj9h8gg8g9jcxha6dr3xx8r84np3v";
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "ocaml-community";
+    repo = pname;
+    rev = version;
+    sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg";
   };
 
-  buildInputs = [ libev ];
-  propagatedBuildInputs = [ zed lwt_log lwt_react ];
+  propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ];
 
   meta = { description = "Terminal manipulation library for OCaml";
     longDescription = ''
@@ -28,10 +31,10 @@ buildDunePackage rec {
     console applications.
     '';
 
-    homepage = "https://github.com/diml/lambda-term";
-    license = stdenv.lib.licenses.bsd3;
+    inherit (src.meta) homepage;
+    license = lib.licenses.bsd3;
     maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+      lib.maintainers.gal_bolle
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix
index c26b3dbe7374..73548021688b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix
@@ -1,21 +1,22 @@
-{ lib, ocaml, fetchzip, ppx_deriving, ppxfind, buildDunePackage }:
-
-if lib.versionAtLeast ocaml.version "4.10"
-then throw "lens is not available for OCaml ${ocaml.version}"
-else
+{ lib, fetchzip, ppx_deriving, ppxfind, buildDunePackage, ounit }:
 
 buildDunePackage rec {
   pname = "lens";
-  version = "1.2.3";
+  version = "1.2.4";
+
+  useDune2 = true;
 
   src = fetchzip {
     url = "https://github.com/pdonadeo/ocaml-lens/archive/v${version}.tar.gz";
-    sha256 = "09k2vhzysx91syjhgv6w1shc9mgzi0l4bhwpx1g5pi4r4ghjp07y";
+    sha256 = "18mv7n5rcix3545mc2qa2f9xngks4g4kqj2g878qj7r3cy96kklv";
   };
 
-  minimumOCamlVersion = "4.04.1";
+  minimumOCamlVersion = "4.10";
   buildInputs = [ ppx_deriving ppxfind ];
 
+  doCheck = true;
+  checkInputs = [ ounit ];
+
   meta = with lib; {
     homepage = "https://github.com/pdonadeo/ocaml-lens";
     description = "Functional lenses";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix b/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
index 0ad277f4a07f..dd5504dda5ca 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, result }:
+{ lib, fetchFromGitHub, buildDunePackage, result }:
 
 buildDunePackage rec {
   pname = "linenoise";
@@ -17,8 +17,8 @@ buildDunePackage rec {
 
   meta = {
     description = "OCaml bindings to linenoise";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix
index 24fde437d5c3..34fe75a2943f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }:
+{ stdenv, lib, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }:
 
-let version = stdenv.lib.getVersion llvm; in
+let version = lib.getVersion llvm; in
 
 stdenv.mkDerivation {
   pname = "ocaml-llvm";
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
 
   inherit (llvm) src;
 
-  buildInputs = [ python cmake ocaml findlib ctypes ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ python ocaml findlib ctypes ];
   propagatedBuildInputs = [ llvm ];
 
   patches = [ (fetchpatch {
@@ -19,7 +20,7 @@ stdenv.mkDerivation {
   cmakeFlags = [
     "-DLLVM_OCAML_OUT_OF_TREE=TRUE"
     "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml"
-    "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib"
+    "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib llvm}/lib"
   ];
 
   buildFlags = [ "ocaml_all" ];
@@ -40,7 +41,7 @@ stdenv.mkDerivation {
     inherit (llvm.meta) license homepage;
     platforms = ocaml.meta.platforms or [];
     description = "OCaml bindings distributed with LLVM";
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix
index 50d68520fab0..fedfb1c7637f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild
 , topkg, result, lwt, cmdliner, fmt }:
 let
   pname = "logs";
   webpage = "https://erratique.ch/software/${pname}";
 in
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "logs is not available for OCaml ${ocaml.version}"
 else
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   inherit (topkg) installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Logging infrastructure for OCaml";
     homepage = webpage;
     inherit (ocaml.meta) platforms;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix
index 38ccaea65eba..8a4f58ccbbd7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.07"
+if !lib.versionAtLeast ocaml.version "4.07"
 then throw "lua-ml is not available for OCaml ${ocaml.version}"
 else
 
@@ -16,17 +16,20 @@ stdenv.mkDerivation rec {
     sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044";
   };
 
+  nativeBuildInputs = [ opaline ];
   buildInputs = [ ocaml findlib ocamlbuild ];
 
   buildFlags = [ "lib" ];
 
-  inherit (dune) installPhase;
+  installPhase = ''
+    opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
+  '';
 
   meta = {
     description = "An embeddable Lua 2.5 interpreter implemented in OCaml";
     inherit (src.meta) homepage;
     inherit (ocaml.meta) platforms;
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix
index 759f0deedf1f..83146ef9104b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
+{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml
 , cppo, ocaml-migrate-parsetree, ocplib-endian, result
 , mmap, seq
 }:
@@ -14,7 +14,7 @@ buildDunePackage rec {
     sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ cppo ocaml-migrate-parsetree ]
    ++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
   propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix
index f2707064f2af..2df17844d1a0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix
@@ -1,8 +1,12 @@
-{ fetchzip, buildDunePackage, lwt, ppx_tools_versioned }:
+{ fetchzip, buildDunePackage, lwt, ppxlib }:
 
 buildDunePackage {
   pname = "lwt_ppx";
-  version = "2.0.1";
+  version = "2.0.2";
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.04";
 
   src = fetchzip {
     # `lwt_ppx` has a different release cycle than Lwt, but it's included in
@@ -12,12 +16,11 @@ buildDunePackage {
     #
     # This is particularly useful for overriding Lwt without breaking `lwt_ppx`,
     # as new Lwt releases may contain broken `lwt_ppx` code.
-    url = "https://github.com/ocsigen/lwt/archive/5.2.0.tar.gz";
-    sha256 = "1znw8ckwdmqsnrcgar4g33zgr659l4l904bllrz69bbwdnfmz2x3";
+    url = "https://github.com/ocsigen/lwt/archive/5.4.0.tar.gz";
+    sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d";
   };
 
-
-  propagatedBuildInputs = [ lwt ppx_tools_versioned ];
+  propagatedBuildInputs = [ lwt ppxlib ];
 
   meta = {
     description = "Ppx syntax extension for Lwt";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix
index 8286ee16619d..05a5a28dcd7b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, lwt }:
+{ lib, fetchFromGitHub, buildDunePackage, lwt }:
 
 buildDunePackage rec {
   pname = "lwt_log";
@@ -18,7 +18,7 @@ buildDunePackage rec {
   meta = {
     description = "Lwt logging library (deprecated)";
     homepage = "https://github.com/aantron/lwt_log";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix
index 4d82db043e8d..5513935133e8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }:
 
 stdenv.mkDerivation rec {
-	version = "1.0.1";
-	name = "ocaml${ocaml.version}-lwt_react-${version}";
-	src = fetchzip {
-		url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
-		sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
-	};
+  version = "1.0.1";
+  name = "ocaml${ocaml.version}-lwt_react-${version}";
+  src = fetchzip {
+    url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
+    sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
 
-	propagatedBuildInputs = [ lwt react ];
+  propagatedBuildInputs = [ lwt react ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "Helpers for using React with Lwt";
-		inherit (lwt.meta) homepage license maintainers;
+  meta = {
+    description = "Helpers for using React with Lwt";
+    inherit (lwt.meta) homepage license maintainers;
     inherit (ocaml.meta) platforms;
-	};
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix
index ade51b7da75f..e74a743e6b18 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, buildDunePackage, ssl, lwt }:
+{ lib, fetchzip, buildDunePackage, ssl, lwt }:
 
 buildDunePackage rec {
   pname = "lwt_ssl";
@@ -16,7 +16,7 @@ buildDunePackage rec {
   meta = {
     homepage = "https://github.com/aantron/lwt_ssl";
     description = "OpenSSL binding with concurrent I/O";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
index 32acccd54f28..61ee7ebfe9c5 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }:
+{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }:
 
 stdenv.mkDerivation {
   name = "ocaml-macaque-0.7.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Macros for Caml Queries";
     homepage = "https://github.com/ocsigen/macaque";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix
index 4f3d21be71ae..2a5ff08c018e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
 
 let version = "1.0.0"; in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/mirage/ocaml-magic-mime";
     description = "Convert file extensions to MIME types";
     platforms = ocaml.meta.platforms or [];
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix b/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix
index 349cbea56071..016c059573b0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }:
+{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "magick is not available for OCaml ${ocaml.version}"
 else
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q";
   };
 
-  nativeBuildInputs = [ which pkgconfig ];
+  nativeBuildInputs = [ which pkg-config ];
   buildInputs = [ ocaml findlib imagemagick ];
 
   createFindlibDestdir = true;
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/";
     description = "ImageMagick Binding for OCaml";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = imagemagick.meta.platforms;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
index f384704a1c4a..4418c50568c8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
@@ -4,12 +4,12 @@
 
 buildDunePackage rec {
   pname = "mdx";
-  version = "1.7.0";
+  version = "1.8.0";
   useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
-    sha256 = "0vpc30sngl3vpychrfvjwyi93mk311x3f2azlkxasgcj69fq03i7";
+    sha256 = "1p2ip73da271as0x1gfbajik3mf1bkc8l54276vgacn1ja3saj52";
   };
 
   nativeBuildInputs = [ cppo ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix
index 23e31e75779d..cbb759205e03 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20190626" else "20140422"
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild
+, version ? if lib.versionAtLeast (lib.getVersion ocaml) "4.02" then "20190626" else "20140422"
 }@args:
 
 let
diff --git a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix
index 71561e96cd47..a917d634a19c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -1,4 +1,4 @@
-{ version, src, stdenv, ocaml, findlib, ocamlbuild, ... }:
+{ version, src, lib, stdenv, ocaml, findlib, ocamlbuild, ... }:
 
 stdenv.mkDerivation {
   pname = "menhir";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     export PREFIX=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pauillac.inria.fr/~fpottier/menhir/";
     description = "A LR(1) parser generator for OCaml";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mew/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mew/default.nix
new file mode 100644
index 000000000000..819bb020050c
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/mew/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, fetchFromGitHub
+, result, trie
+}:
+
+buildDunePackage rec {
+  pname = "mew";
+  version = "0.1.0";
+
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "kandu";
+    repo = pname;
+    rev = version;
+    sha256 = "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2";
+  };
+
+  propagatedBuildInputs = [ result trie ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    license = lib.licenses.mit;
+    description = "Modal Editing Witch";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mew_vi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mew_vi/default.nix
new file mode 100644
index 000000000000..39228585fe3c
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/mew_vi/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, fetchFromGitHub
+, mew, react
+}:
+
+buildDunePackage rec {
+  pname = "mew_vi";
+  version = "0.5.0";
+
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "kandu";
+    repo = pname;
+    rev = version;
+    sha256 = "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8";
+  };
+
+  propagatedBuildInputs = [ mew react ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    license = lib.licenses.mit;
+    description = "Modal Editing Witch, VI interpreter";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix
new file mode 100644
index 000000000000..01b2c813f2f8
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix
@@ -0,0 +1,47 @@
+{ lib, buildDunePackage, fetchurl
+, fmt, mirage-flow, result, rresult, cstruct, logs, ke
+, alcotest, alcotest-lwt, bigstringaf, bigarray-compat
+}:
+
+buildDunePackage rec {
+  pname = "mimic";
+  version = "0.0.1";
+
+  minimumOCamlVersion = "4.08";
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
+    sha256 = "0j4l99sgm5mdmv67vakkz2pw45l6i89bpza88xqkgmskfk50c5pk";
+  };
+
+  # don't install changelogs for other packages
+  postPatch = ''
+    rm -f CHANGES.md CHANGES.carton.md
+  '';
+
+  propagatedBuildInputs = [
+    fmt
+    mirage-flow
+    result
+    rresult
+    cstruct
+    logs
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    alcotest-lwt
+    bigstringaf
+    bigarray-compat
+    ke
+  ];
+
+  meta = with lib; {
+    description = "A simple protocol dispatcher";
+    license = licenses.isc;
+    homepage = "https://github.com/mirage/ocaml-git";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index f963e8e15d08..ab48e01950e6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -4,11 +4,11 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.08";
 
   pname = "mirage-crypto";
-  version = "0.8.7";
+  version = "0.8.10";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
-    sha256 = "1gx86h6kk39zq3kvl854jc2ap2755paalp1f7iv8r9js2xnbxfxy";
+    sha256 = "8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc";
   };
 
   useDune2 = true;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix
new file mode 100644
index 000000000000..e8c8dd06eab5
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage
+, mirage-crypto, mirage-crypto-rng
+, dune-configurator, async, logs
+}:
+
+buildDunePackage {
+  pname = "mirage-crypto-rng-async";
+
+  inherit (mirage-crypto) useDune2 version minimumOCamlVersion src;
+
+  nativeBuildInputs = [
+    dune-configurator
+  ];
+
+  propagatedBuildInputs = [
+    async
+    logs
+    mirage-crypto
+    mirage-crypto-rng
+  ];
+
+  meta = mirage-crypto.meta // {
+    description = "Feed the entropy source in an Async-friendly way";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
index 473704d7ea22..5152d3c8ecde 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
@@ -1,5 +1,7 @@
 { buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime
-, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix }:
+, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix
+, logs, lwt
+}:
 
 buildDunePackage {
   pname = "mirage-crypto-rng-mirage";
@@ -10,7 +12,7 @@ buildDunePackage {
   checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];
 
   propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime
-                            mirage-time mirage-clock ];
+                            mirage-time mirage-clock logs lwt ];
 
   meta = mirage-crypto-rng.meta // {
     description = "Entropy collection for a cryptographically secure PRNG";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix
index c37c5bd78114..ffd78150689a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }:
+{stdenv, lib, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.03"
+if lib.versionAtLeast ocaml.version "4.03"
 then throw "mlgmp is not available for OCaml ${ocaml.version}" else
 
 let
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24";
   };
 
-  makeFlags = [ 
+  makeFlags = [
     "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp"
   ];
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix
index 66672f8ea1a6..a0026e3a8ca8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }:
+{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-mlgmpidl-${version}";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "OCaml interface to the GMP library";
     homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     inherit (ocaml.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
index 786cc1e27ac8..90c24718dd15 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-mparser-1.2.3";
@@ -17,9 +17,9 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A simple monadic parser combinator OCaml library";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     homepage = "https://github.com/cakeplus/mparser";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix
index 2f8545988d8b..9fa302947e92 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild ];
   buildInputs = [ findlib topkg ]
-  ++ stdenv.lib.optional jsooSupport js_of_ocaml;
+  ++ optional jsooSupport js_of_ocaml;
 
   buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}";
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix
index f9ebb36f40e8..6ccdfa9cf81c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
+{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2";
   };
 
-  configureFlags = [ 
-     "--prefix=$out" 
+  configureFlags = [
+     "--prefix=$out"
      "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql"
   ];
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://ocaml-mysql.forge.ocamlcore.org";
     description = "Bindings for interacting with MySQL databases from ocaml";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.roconnor ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix
index 263fdc0bbda5..ae52ed478e06 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
+{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
 , cpuid, ocb-stubblr, sexplib
 , cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin
 , cstruct-lwt ? null
 }:
 
-with stdenv.lib;
+with lib;
 let
   withLwt = cstruct-lwt != null;
   # the build system will call 'cc' with no way to override
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/mirleft/ocaml-nocrypto";
     description = "Simplest possible crypto to support TLS";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix
index 150edb3174c4..a584f7bc9ed1 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromBitbucket, buildDunePackage }:
+{ lib, fetchzip, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "nonstd";
@@ -6,10 +6,8 @@ buildDunePackage rec {
 
   minimumOCamlVersion = "4.02";
 
-  src = fetchFromBitbucket {
-    owner = "smondet";
-    repo = pname;
-    rev = "${pname}.${version}";
+  src = fetchzip {
+    url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz";
     sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
   };
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix b/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix
index 420e632b99e5..8e1c5f38cb5d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr
 , result, uucp, uuseg, uutf
 , lwt     ? null }:
 
-with stdenv.lib;
+with lib;
 
 if !versionAtLeast ocaml.version "4.05"
 then throw "notty is not available for OCaml ${ocaml.version}"
diff --git a/nixpkgs/pkgs/development/ocaml-modules/num/default.nix b/nixpkgs/pkgs/development/ocaml-modules/num/default.nix
index 022b7af9629d..e2c7b439c69e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/num/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/num/default.nix
@@ -1,31 +1,31 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }:
 
 stdenv.mkDerivation rec {
-	version = "1.1";
-	name = "ocaml${ocaml.version}-num-${version}";
-	src = fetchFromGitHub {
-		owner = "ocaml";
-		repo = "num";
-		rev = "v${version}";
-		sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
-	};
+  version = "1.1";
+  name = "ocaml${ocaml.version}-num-${version}";
+  src = fetchFromGitHub {
+    owner = "ocaml";
+    repo = "num";
+    rev = "v${version}";
+    sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
+  };
 
-	patches = [ (fetchpatch {
-			url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
-			sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
-		})
-	] ++ lib.optional withStatic ./enable-static.patch;
+  patches = [ (fetchpatch {
+      url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
+      sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
+    })
+  ] ++ lib.optional withStatic ./enable-static.patch;
 
-	nativeBuildInputs = [ ocaml findlib ];
+  nativeBuildInputs = [ ocaml findlib ];
   buildInputs = [ ocaml findlib ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
 
-	meta = {
-		description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
-		license = stdenv.lib.licenses.lgpl21;
-		inherit (ocaml.meta) platforms;
-		inherit (src.meta) homepage;
-	};
+  meta = {
+    description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
+    license = lib.licenses.lgpl21;
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index fdb225ba8e8d..49c8fe5470b6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
+{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkg-config, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
 
 let
   pname = "ocaml-cairo";
 in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "${pname} is not available for OCaml ${ocaml.version}"
 else
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./META.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ocaml automake gnum4 autoconf unzip
                   findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://cairographics.org/cairo-ocaml";
     description = "ocaml bindings for cairo library";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index dc6cef0bbba1..63056481199f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:
+{ lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:
 
 stdenv.mkDerivation rec {
   pname = "ocaml-libvirt";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   installPhase = "make install-opt";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OCaml bindings for libvirt";
     homepage = "https://libvirt.org/ocaml/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix
index 706dc913e1e6..374efd8b2b97 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchurl }:
+{ lib, buildDunePackage, fetchurl }:
 
 buildDunePackage rec {
   minimumOCamlVersion = "4.02.3";
@@ -15,7 +15,7 @@ buildDunePackage rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims";
     description = "Backport new syntax to older OCaml versions";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix
index 1dc98c9fdd24..e5dc3dd54d34 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }:
+{ stdenv, lib, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "ocaml-text";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://ocaml-text.forge.ocamlcore.org/";
     description = "A library for convenient text manipulation";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index dabe7ae52a3e..c2ca6a2cc8aa 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, camlidl, fuse }:
+{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse }:
 
 buildDunePackage {
   pname = "ocamlfuse";
@@ -16,8 +16,8 @@ buildDunePackage {
   meta = {
     homepage = "https://sourceforge.net/projects/ocamlfuse";
     description = "OCaml bindings for FUSE";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bennofs ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index df684f166e17..5ae4f6ad3fa7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib
+{ stdenv, lib, fetchurl, ocaml, findlib
 , gtkSupport ? true
 , lablgtk
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ocaml findlib ]
-  ++ stdenv.lib.optional gtkSupport lablgtk
+  ++ lib.optional gtkSupport lablgtk
   ;
 
   createFindlibDestdir = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildFlags =  [ "all" ];
   installTargets = [ "install-findlib" ];
 
-  postInstall = stdenv.lib.optionalString gtkSupport ''
+  postInstall = lib.optionalString gtkSupport ''
     mkdir -p $out/bin
     cp dgraph/dgraph.opt $out/bin/graph-viewer
     cp editor/editor.opt $out/bin/graph-editor
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://ocamlgraph.lri.fr/";
     description = "Graph library for Objective Caml";
-    license = stdenv.lib.licenses.gpl2Oss;
+    license = lib.licenses.gpl2Oss;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.kkallio
+      lib.maintainers.kkallio
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix
index b4ee828fcc42..a2071a9dfaad 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, lib, fetchurl}:
 
 let
 
@@ -25,6 +25,6 @@ in stdenv.mkDerivation {
     homepage = "http://www.ocaml.info/home/ocaml_sources.html";
     description = "Generic OCaml Makefile for GNU Make";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix
index e98dc62478e0..f8d20b7124bc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "OCaml native toplevel";
     homepage = "http://benediktmeurer.de/ocamlnat/";
-    license = stdenv.lib.licenses.qpl;
+    license = lib.licenses.qpl;
     longDescription = ''
       The ocamlnat project provides a new native code OCaml toplevel
       ocamlnat, which is mostly compatible to the byte code toplevel ocaml,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     '';
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 5b6e0dde8b75..1da80a2202d7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
+{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip
 , gnutls, nettle
 }:
 
-if stdenv.lib.versionOlder ocaml.version "4.02"
+if lib.versionOlder ocaml.version "4.02"
 then throw "ocamlnet is not available for OCaml ${ocaml.version}"
 else
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ];
 
   createFindlibDestdir = true;
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix
index 693c4d59fef9..7c782b5268fd 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: 
+{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
 
 let
   pname = "ocamlsdl";
 in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "${pname} is not available for OCaml ${ocaml.version}"
 else
 
@@ -12,20 +12,20 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "0.9.1";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
     sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl];
 
-  propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ];
+  propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ];
   createFindlibDestdir = true;
 
   meta = {
     homepage = "http://ocamlsdl.sourceforge.net/";
     description = "OCaml bindings for SDL 1.2";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
index 3f551903efac..d8d19f5e3651 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0";
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     description = "OCamlbuild plugin for C stubs";
     homepage = "https://github.com/pqwy/ocb-stubblr";
-    license = stdenv.lib.licenses.isc;
+    license = lib.licenses.isc;
     inherit (ocaml.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix
index 7cff7b625b58..ee14a83d57ce 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }:
 
-if stdenv.lib.versionOlder ocaml.version "4.03"
-|| stdenv.lib.versionAtLeast ocaml.version "4.08"
+if lib.versionOlder ocaml.version "4.03"
+|| lib.versionAtLeast ocaml.version "4.08"
 then throw "ocf not supported for ocaml ${ocaml.version}"
 else
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OCaml library to read and write configuration options in JSON syntax";
     homepage = "https://zoggy.github.io/ocf/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
index 07b6f72e38de..be217812834f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
@@ -1,30 +1,30 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, astring, pprint }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, astring, pprint }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
-	version = "0.4";
-	src = fetchFromGitHub {
-		owner = "OCamlPro";
-		repo = "ocp-ocamlres";
-		rev = "v${version}";
-		sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
-	};
+  name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
+  version = "0.4";
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-ocamlres";
+    rev = "v${version}";
+    sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
+  };
 
-	buildInputs = [ ocaml findlib astring pprint ];
-	createFindlibDestdir = true;
+  buildInputs = [ ocaml findlib astring pprint ];
+  createFindlibDestdir = true;
 
-	installFlags = [ "BINDIR=$(out)/bin" ];
-	preInstall = "mkdir -p $out/bin";
+  installFlags = [ "BINDIR=$(out)/bin" ];
+  preInstall = "mkdir -p $out/bin";
 
-	meta = {
-		description = "A simple tool and library to embed files and directories inside OCaml executables";
-		license = stdenv.lib.licenses.lgpl3Plus;
-		homepage = "https://www.typerex.org/ocp-ocamlres.html";
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "A simple tool and library to embed files and directories inside OCaml executables";
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://www.typerex.org/ocp-ocamlres.html";
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-endian/default.nix
index 719252dbea89..553ad9562cc8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocplib-endian/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-endian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cppo }:
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, cppo }:
 
 let version = "1.0"; in
 
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Optimised functions to read and write int16/32/64";
     homepage = "https://github.com/OCamlPro/ocplib-endian";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
index 6a3de6292d8c..75554d25bf28 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
@@ -1,22 +1,22 @@
 { lib, buildDunePackage, fetchFromGitHub, uri }:
 
 buildDunePackage rec {
-	pname = "ocplib-json-typed";
-	version = "0.7.1";
-	useDune2 = true;
-	src = fetchFromGitHub {
-		owner = "OCamlPro";
-		repo = "ocplib-json-typed";
-		rev = "v${version}";
-		sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
-	};
+  pname = "ocplib-json-typed";
+  version = "0.7.1";
+  useDune2 = true;
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocplib-json-typed";
+    rev = "v${version}";
+    sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
+  };
 
-	propagatedBuildInputs = [ uri ];
+  propagatedBuildInputs = [ uri ];
 
-	meta = {
-		description = "A collection of type-aware JSON utilities for OCaml";
-		license = lib.licenses.lgpl21;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-	};
+  meta = {
+    description = "A collection of type-aware JSON utilities for OCaml";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
index 2cf4b6ddffb9..8435d1c5e516 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib }:
 
 let
   pname = "ocplib-simplex";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities";
     homepage = "https://github.com/OCamlPro-Iguernlala/ocplib-simplex";
     inherit (ocaml.meta) platforms;
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index 84bc3ce678b1..1feb3ecae714 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4
 , num
 }:
 
 let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.03"
+  if lib.versionAtLeast ocaml.version "4.03"
   then {
     version = "0.8.1";
     sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9";
@@ -32,9 +32,9 @@ stdenv.mkDerivation {
   meta =  {
     homepage = "https://github.com/ocsigen/deriving";
     description = "Extension to OCaml for deriving functions from type declarations";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [
+    maintainers = with lib.maintainers; [
       gal_bolle vbgl
     ];
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 30ddd005b79b..b4842da12dd7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl
+{ stdenv, lib, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl
 , lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr
 , pgocaml, camlzip, ocaml_sqlite3
 , makeWrapper, fetchpatch
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.06.1"
+if !lib.versionAtLeast ocaml.version "4.06.1"
 then throw "ocsigenserver is not available for OCaml ${ocaml.version}"
 else
 
@@ -58,9 +58,9 @@ stdenv.mkDerivation rec {
     longDescription =''
       A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
       '';
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];
-    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+    maintainers = [ lib.maintainers.gal_bolle ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 5939e6164536..26d5d10acbbf 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
 , cohttp-lwt-unix
 , resource-pooling
 }:
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
     longDescription =''
      An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
       '';
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     inherit (ocaml.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+    maintainers = [ lib.maintainers.gal_bolle ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index a0f3136de22b..eccdcf80d7cc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, opaline
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, opaline
 , calendar, eliom, js_of_ocaml-ppx_deriving_json
 }:
 
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://ocsigen.org/ocsigen-toolkit/";
     description = " User interface widgets for Ocsigen applications";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.gal_bolle ];
     inherit (ocaml.meta) platforms;
   };
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/octavius/default.nix b/nixpkgs/pkgs/development/ocaml-modules/octavius/default.nix
index e0189c90181e..c71c8f35f4ba 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/octavius/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "octavius is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation {
-	name = "ocaml${ocaml.version}-octavius-0.2.0";
-	src = fetchurl {
-		url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
-		sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
-	};
+  name = "ocaml${ocaml.version}-octavius-0.2.0";
+  src = fetchurl {
+    url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
+    sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
-	inherit (topkg) buildPhase installPhase;
+  inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		description = "Ocamldoc comment syntax parser";
-		homepage = "https://github.com/ocaml-doc/octavius";
-		license = stdenv.lib.licenses.isc;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "Ocamldoc comment syntax parser";
+    homepage = "https://github.com/ocaml-doc/octavius";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix
index 4c2e4ee6a301..83668b30cecd 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:
+{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }:
 
-if stdenv.lib.versionOlder ocaml.version "4.02"
+if lib.versionOlder ocaml.version "4.02"
 then throw "ocurl is not available for OCaml ${ocaml.version}"
 else
 
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6";
   };
 
-  buildInputs = [ pkgconfig ocaml findlib ncurses ];
-  propagatedBuildInputs = [ curl ];
+  buildInputs = [ pkg-config ocaml findlib ncurses ];
+  propagatedBuildInputs = [ curl lwt ];
   createFindlibDestdir = true;
   meta = {
     description = "OCaml bindings to libcurl";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     homepage = "http://ygrek.org.ua/p/ocurl/";
-    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    maintainers = with lib.maintainers; [ bennofs ];
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix b/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix
index c9e5308f8af4..edf7d8649551 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "ocaml-data-notation is not available for OCaml ${ocaml.version}"
 else
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Store data using OCaml notation";
     homepage = "https://forge.ocamlcore.org/projects/odn/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix
index cf4abeb7ea6d..8e5b4a23ce32 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-omd-1.3.1";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Extensible Markdown library and tool in OCaml";
     homepage = "https://github.com/ocaml/omd";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix
index 0ca332a2a06e..04079fcb4761 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix
@@ -1,26 +1,34 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ stdenv, lib, fetchpatch, fetchFromGitHub, ocaml, findlib }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.1.2";
   name = "ocaml${ocaml.version}-opam-file-format-${version}";
 
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "opam-file-format";
     rev = version;
-    sha256 = "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv";
+    sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2";
   };
 
   buildInputs = [ ocaml findlib ];
 
   installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
 
-  patches = [ ./optional-static.patch ];
+  patches = [
+    ./optional-static.patch
+    # fix no implementation error for OpamParserTypes
+    # can be removed at next release presumably
+    (fetchpatch {
+      url = "https://github.com/ocaml/opam-file-format/pull/41/commits/2a9a92ec334e0bf2adf8d2b4c1b83f1f9f68df8f.patch";
+      sha256 = "090nl7yciyyidmbjfryw3wyx7srh6flnrr4zgyhv4kvjsvq944y2";
+    })
+  ];
 
   meta = {
     description = "Parser and printer for the opam file syntax";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
     inherit (ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix
index 2681cc609d00..5db3d1b4a241 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix
@@ -14,19 +14,19 @@
 }:
 
 buildDunePackage {
-	pname = "opium";
-	inherit (opium_kernel) version src meta minimumOCamlVersion;
+  pname = "opium";
+  inherit (opium_kernel) version src meta minimumOCamlVersion;
 
   useDune2 = true;
 
   doCheck = true;
 
-	buildInputs = [
+  buildInputs = [
     ppx_sexp_conv ppx_fields_conv
     alcotest
   ];
 
-	propagatedBuildInputs = [
+  propagatedBuildInputs = [
     opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext
   ];
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/optcomp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/optcomp/default.nix
index c177ef52e151..b78d070962e7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/optcomp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/optcomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:
+{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:
 
 stdenv.mkDerivation {
   name = "ocaml-optcomp-1.6";
@@ -8,13 +8,13 @@ stdenv.mkDerivation {
   };
 
   patches =
-    let inherit (stdenv.lib) optional versionAtLeast; in
+    let inherit (lib) optional versionAtLeast; in
     optional (versionAtLeast ocaml.version "4.02") (fetchpatch {
       url = "https://github.com/diml/optcomp/commit/b7f809360c9794b383a4bc0492f6df381276b429.patch";
       sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y";
     })
   ;
-  
+
   createFindlibDestdir = true;
 
   buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
@@ -37,10 +37,10 @@ stdenv.mkDerivation {
   meta =  {
     homepage = "https://github.com/diml/optcomp";
     description = "Optional compilation for OCaml with cpp-like directives";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+      lib.maintainers.gal_bolle
     ];
   };
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix
index 82e2378869f6..9638e8e0d4ef 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage }:
+{ lib, fetchurl, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "opti";
@@ -11,7 +11,7 @@ buildDunePackage rec {
     sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DSL to generate fast incremental C code from declarative specifications";
     license = licenses.bsd3;
     maintainers = [ maintainers.jmagnusj ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix b/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
index 508bbfba6055..18e4bd1ae864 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
@@ -2,11 +2,11 @@
 
 buildDunePackage rec {
   minimumOCamlVersion = "4.03";
-  version = "0.0.3";
+  version = "0.0.4";
   pname = "optint";
   src = fetchurl {
     url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";
-    sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj";
+    sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a";
   };
 
   meta = {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix
index 8d5bf290c6e0..0642b30699c2 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }:
 
 let
   pname = "otfm";
@@ -6,7 +6,7 @@ let
   webpage = "https://erratique.ch/software/${pname}";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
+assert lib.versionAtLeast ocaml.version "4.01.0";
 
 stdenv.mkDerivation {
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenType font decoder for OCaml";
     longDescription = ''
       Otfm is an in-memory decoder for the OpenType font data format. It
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix
index 1027d0fc21ab..e5f9ac52067d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}:
+{lib, buildOcaml, fetchurl, type_conv, pa_ounit}:
 
 buildOcaml rec {
   name = "pa_bench";
@@ -14,10 +14,10 @@ buildOcaml rec {
   buildInputs = [ pa_ounit ];
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/pa_bench";
     description = "Syntax extension for inline benchmarks";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     maintainers = [ maintainers.ericbmerritt ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pa_ounit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pa_ounit/default.nix
index 3bd8baac4b76..26d000042227 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pa_ounit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pa_ounit/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildOcaml, ocaml, fetchurl, ounit }:
+{ lib, buildOcaml, ocaml, fetchurl, ounit }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "pa_ounit is not available for OCaml ${ocaml.version}"
 else
 
@@ -15,7 +15,7 @@ buildOcaml rec {
 
   propagatedBuildInputs = [ ounit ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/pa_ounit";
     description = "OCaml inline testing";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
index 0a4fc9ecea45..34e14959e327 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }:
 
 buildDunePackage rec {
   pname = "parany";
@@ -13,7 +13,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ ocamlnet cpu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Generalized map/reduce for multicore computing";
     maintainers = [ maintainers.bcdarwin ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
index 94af6fce2602..210b7d58857c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-pcre-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   dontConfigure = true;	# Skip configure phase
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/mmottl/pcre-ocaml";
     description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix
new file mode 100644
index 000000000000..0059bbdec3ce
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }:
+
+buildDunePackage rec {
+  pname = "pecu";
+  version = "0.5";
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.03";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz";
+    sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7";
+  };
+
+  # fmt availability
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  checkInputs = [ fmt alcotest ];
+
+  meta = with lib; {
+    description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)";
+    license = licenses.mit;
+    homepage = "https://github.com/mirage/pecu";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
index 27b6ed3f986b..d3d6097b4462 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
 , alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }:
 
 buildDunePackage rec {
@@ -22,7 +22,7 @@ buildDunePackage rec {
 
   doCheck = false;  # many tests require bppsuite
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Bioinformatics library for Ocaml";
     maintainers = [ maintainers.bcdarwin ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix
index f62978c0a9cd..36eb3fe54bbe 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl}:
+{lib, buildOcaml, fetchurl}:
 
 buildOcaml rec {
   name = "pipebang";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "0acm2y8wxvnapa248lkgm0vcc44hlwhrjxqkx1awjxzcmarnxhfk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/pipebang";
     description = "Syntax extension to transform x |! f into f x";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 39201d0570b3..7203f3702850 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }:
 
 stdenv.mkDerivation rec {
   version = "0.7.7";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   installPhase = "DESTDIR=$out make install";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://piqi.org";
     description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix
index f3c489723b2f..d7bc4b55b452 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }:
 
 stdenv.mkDerivation rec {
   version = "0.6.15";
   pname = "piqi";
   name = "ocaml${ocaml.version}-${pname}-${version}";
- 
+
   src = fetchFromGitHub {
     owner = "alavrik";
     repo = pname;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     make ocaml-install;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://piqi.org";
     description = "Universal schema language and a collection of tools built around it";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix
index 0e4f9fea7d92..0cdde114709c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
 
 let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02"
+  if lib.versionAtLeast ocaml.version "4.02"
   then {
     version = "20171003";
     sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   dontBuild = true;
   installFlags = [ "-C" "src" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gallium.inria.fr/~fpottier/pprint/";
     description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer";
     license = licenses.cecill-c;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index 20b78870f93b..3d4675ed90b9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub, buildDunePackage }:
+{ lib, fetchFromGitHub, buildDunePackage }:
 
 buildDunePackage rec {
-	pname = "ppx_derivers";
-	version = "1.2.1";
+  pname = "ppx_derivers";
+  version = "1.2.1";
 
   minimumOCamlVersion = "4.02";
 
-	src = fetchFromGitHub {
-		owner = "diml";
-		repo = pname;
-		rev = version;
-		sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
-	};
+  src = fetchFromGitHub {
+    owner = "diml";
+    repo = pname;
+    rev = version;
+    sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
+  };
 
-	meta = {
-		description = "Shared [@@deriving] plugin registry";
-		license = stdenv.lib.licenses.bsd3;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-	};
+  meta = {
+    description = "Shared [@@deriving] plugin registry";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
index 32865bed6316..87ccd85a07df 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, buildDunePackage, ocaml-migrate-parsetree }:
+{ lib, fetchurl, buildDunePackage, ocaml-migrate-parsetree }:
 
 buildDunePackage rec {
   pname = "ppx_gen_rec";
   version = "1.1.0";
 
-  minimumOCamlVersion = "4.01";
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
@@ -13,7 +13,7 @@ buildDunePackage rec {
 
   buildInputs = [ ocaml-migrate-parsetree ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec";
     description = "ocaml preprocessor that generates a recursive module";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
index f4977992759d..b5651a8cec2a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,24 +1,27 @@
 { lib, fetchurl, buildDunePackage, ocaml
 , ounit, ppx_deriving, ppx_tools_versioned
+, ppxlib, ocaml-migrate-parsetree
 }:
 
-if !lib.versionAtLeast ocaml.version "4.04"
-then throw "ppx_import is not available for OCaml ${ocaml.version}"
-else
-
 buildDunePackage rec {
   pname = "ppx_import";
   version = "1.7.1";
 
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.04";
+
   src = fetchurl {
     url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz";
     sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v";
   };
 
-  buildInputs = [ ounit ppx_deriving ];
-  propagatedBuildInputs = [ ppx_tools_versioned ];
+  propagatedBuildInputs = [
+    ppxlib ppx_tools_versioned ocaml-migrate-parsetree
+  ];
 
   doCheck = true;
+  checkInputs = [ ounit ppx_deriving ];
 
   meta = {
     description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 5f3f0916178a..3e06af881c56 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }:
+{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
 
 let param =
-  let v6_2 = {
-    version = "6.2";
-    sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5";
+  let v6_3 = {
+    version = "6.3";
+    sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6";
+    useDune2 = lib.versionAtLeast ocaml.version "4.12";
+    buildInputs = [cppo];
   }; in
 {
   "4.02" = {
@@ -25,10 +27,11 @@ let param =
   "4.07" = {
     version = "5.1+4.06.0";
     sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
-  "4.08" = v6_2;
-  "4.09" = v6_2;
-  "4.10" = v6_2;
-  "4.11" = v6_2;
+  "4.08" = v6_3;
+  "4.09" = v6_3;
+  "4.10" = v6_3;
+  "4.11" = v6_3;
+  "4.12" = v6_3;
 }.${ocaml.meta.branch};
 in
 
@@ -39,18 +42,18 @@ let src = fetchFromGitHub {
       inherit (param) sha256;
     };
     pname = "ppx_tools";
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Tools for authors of ppx rewriters";
       homepage = "https://www.lexifi.com/ppx_tools";
       license = licenses.mit;
       maintainers = with maintainers; [ vbgl ];
     };
 in
-if stdenv.lib.versionAtLeast param.version "6.0"
+if lib.versionAtLeast param.version "6.0"
 then
   buildDunePackage {
     inherit pname src meta;
-    inherit (param) version;
+    inherit (param) version useDune2 buildInputs;
   }
 else
   stdenv.mkDerivation {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 958c088cd6a2..5200c13d89fd 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "ppx_tools_versioned";
   version = "5.4.0";
 
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix
index 1008dfe62a9a..4e135c1b115e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix
@@ -1,27 +1,27 @@
 { stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:
 
 buildDunePackage (rec {
-	pname = "ppxfind";
-	version = "1.4";
-	src = fetchurl {
-		url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
-		sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
-	};
+  pname = "ppxfind";
+  version = "1.4";
+  src = fetchurl {
+    url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
+    sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
+  };
 
-	minimumOCamlVersion = "4.03";
-	useDune2 = true;
+  minimumOCamlVersion = "4.03";
+  useDune2 = true;
 
-	buildInputs = [ ocaml-migrate-parsetree ];
+  buildInputs = [ ocaml-migrate-parsetree ];
 
   # Don't run the native `strip' when cross-compiling.
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
-	meta = {
-		homepage = "https://github.com/diml/ppxfind";
-		description = "ocamlfind ppx tool";
-		license = lib.licenses.bsd3;
-		maintainers = [ lib.maintainers.vbgl ];
-	};
+  meta = {
+    homepage = "https://github.com/diml/ppxfind";
+    description = "ocamlfind ppx tool";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
 } // (
 if lib.versions.majorMinor ocaml.version == "4.04" then {
   dontStrip = true;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
index d5b09b1ddc21..03085a13cdf0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,21 +1,29 @@
 { lib, fetchFromGitHub, buildDunePackage, ocaml
 , version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
 , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
-, stdlib-shims
+, stdlib-shims, ocaml-migrate-parsetree-2-1
 }:
 
 let param = {
   "0.8.1" = {
     sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
     max_version = "4.10";
+    useDune2 = false;
+    useOMP2 = false;
   };
   "0.13.0" = {
     sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
+    useDune2 = false;
+    useOMP2 = false;
   };
   "0.15.0" = {
     sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
     min_version = "4.07";
-    useDune2 = true;
+    useOMP2 = false;
+  };
+  "0.18.0" = {
+    sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
+    min_version = "4.07";
   };
 }."${version}"; in
 
@@ -28,7 +36,7 @@ buildDunePackage rec {
   pname = "ppxlib";
   inherit version;
 
-  useDune2 = param.useDune2 or false;
+  useDune2 = param.useDune2 or true;
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
@@ -38,7 +46,12 @@ buildDunePackage rec {
   };
 
   propagatedBuildInputs = [
-    ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
+    ocaml-compiler-libs
+    (if param.useOMP2 or true
+     then ocaml-migrate-parsetree-2-1
+     else ocaml-migrate-parsetree)
+    ppx_derivers
+    stdio
     stdlib-shims
   ];
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/process/default.nix b/nixpkgs/pkgs/development/ocaml-modules/process/default.nix
index 92fb18378037..34ca51f07392 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/process/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/process/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-process-${version}";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Easy process control in OCaml";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
     inherit (ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
index 485620514e45..30fb5de7cb8e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "psmt2-frontend is not available for OCaml ${ocaml.version}"
 else
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
     inherit (ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix
index e60a8d5a86d8..50ad5ea94eb9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }:
 
 stdenv.mkDerivation rec {
   version = "0.8.5";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
       Ptime is not a calendar library.
     '';
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ sternenseemann ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix
index 02bba95405d5..7ae3e8e66f33 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }:
+{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }:
 
 stdenv.mkDerivation {
   name = "ocaml-react-1.2.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://erratique.ch/software/react";
     description = "Applicative events and signals for OCaml";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix
index 667c97276045..899547a937be 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.04"
+if !lib.versionAtLeast ocaml.version "4.04"
 then throw "reactiveData is not available for OCaml ${ocaml.version}"
 else
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml module for functional reactive programming (FRP) based on React";
     homepage = "https://github.com/ocsigen/reactiveData";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/repr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/repr/default.nix
new file mode 100644
index 000000000000..de6877ddd68e
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/repr/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchurl, fmt, uutf, jsonm, base64, either }:
+
+buildDunePackage rec {
+  pname = "repr";
+  version = "0.2.1";
+
+  minimumOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz";
+    sha256 = "1cbzbawbn71mmpw8y84s1p2pbhc055w1znz64jvr00c7fdr9p8hc";
+  };
+
+  useDune2 = true;
+
+  propagatedBuildInputs = [
+    fmt
+    uutf
+    jsonm
+    base64
+    either
+  ];
+
+  meta = with lib; {
+    description = "Dynamic type representations. Provides no stability guarantee";
+    homepage = "https://github.com/mirage/repr";
+    license = licenses.isc;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix
new file mode 100644
index 000000000000..a1112ef9ac74
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix
@@ -0,0 +1,23 @@
+{ buildDunePackage, repr, ppxlib, ppx_deriving, alcotest, hex }:
+
+buildDunePackage {
+  pname = "ppx_repr";
+
+  inherit (repr) src version useDune2;
+
+  propagatedBuildInputs = [
+    repr
+    ppxlib
+    ppx_deriving
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    hex
+  ];
+
+  meta = repr.meta // {
+    description = "PPX deriver for type representations";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
index 41d2d258b97a..481342e98c7a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }:
 
 let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.03"
+  if lib.versionAtLeast ocaml.version "4.03"
   then rec {
     version = "0.6.2";
     url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz";
@@ -9,7 +9,9 @@ let param =
     buildInputs = [ dune ];
     extra = {
       buildPhase = "dune build -p rope";
-      inherit (dune) installPhase;
+      installPhase = ''
+        dune install --prefix $out --libdir $OCAMLFIND_DESTDIR rope
+      '';
     };
   } else {
     version = "0.5";
@@ -33,7 +35,7 @@ stdenv.mkDerivation ({
     homepage = "http://rope.forge.ocamlcore.org/";
     platforms = ocaml.meta.platforms or [];
     description = ''Ropes ("heavyweight strings") in OCaml'';
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ volth ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ volth ];
   };
 } // param.extra)
diff --git a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix
index cdaa7857398f..04631cc3b4bc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-rresult-${version}";
-	version = "0.6.0";
-	src = fetchurl {
-		url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
-		sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
-	};
+  name = "ocaml${ocaml.version}-rresult-${version}";
+  version = "0.6.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
+    sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ result ];
-  
-	inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		license = stdenv.lib.licenses.isc;
-		homepage = "https://erratique.ch/software/rresult";
-		description = "Result value combinators for OCaml";
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    license = lib.licenses.isc;
+    homepage = "https://erratique.ch/software/rresult";
+    description = "Result value combinators for OCaml";
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix
index c6cda7d05736..68a8731201d6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, perl, ocaml, findlib, javalib }:
+{ lib, stdenv, fetchFromGitHub, which, perl, ocaml, findlib, javalib }:
 
 let
   pname = "sawja";
@@ -6,7 +6,7 @@ let
   webpage = "http://sawja.inria.fr/";
 in
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.07"
+if !lib.versionAtLeast ocaml.version "4.07"
 then throw "${pname} is not available for OCaml ${ocaml.version}"
 else
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ javalib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
     homepage = webpage;
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix
index aab98a9cc6b3..7ad18fba81c6 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, base, stdio, dune-configurator, secp256k1 }:
+{ lib, fetchFromGitHub, buildDunePackage, base, stdio, dune-configurator, secp256k1 }:
 
 buildDunePackage rec {
   pname = "secp256k1";
@@ -15,7 +15,7 @@ buildDunePackage rec {
 
   buildInputs = [ base stdio dune-configurator secp256k1 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dakk/secp256k1-ml";
     description = "Elliptic curve library secp256k1 wrapper for Ocaml";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix
index d34b18bf059e..3a9f87bd93ab 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }:
+{ stdenv, lib, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "sedlex is not available for OCaml ${ocaml.version}"
 else
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/ocaml-community/sedlex";
     description = "An OCaml lexer generator for Unicode";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     inherit (ocaml.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
index 7a50d1517db8..aa0546dd390b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation ({
   version = "0.1";
   name = "ocaml${ocaml.version}-seq-0.1";
 
   meta = {
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
     homepage = "https://github.com/c-cube/seq";
     inherit (ocaml.meta) platforms;
   };
 
-} // (if stdenv.lib.versionOlder ocaml.version "4.07" then {
+} // (if lib.versionOlder ocaml.version "4.07" then {
 
   src = fetchFromGitHub {
     owner = "c-cube";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix
index 5d8154565806..d0c203689e32 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.10"
+if lib.versionAtLeast ocaml.version "4.10"
 then throw "sodium is not available for OCaml ${ocaml.version}"
 else
 
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
+  hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dsheets/ocaml-sodium";
     description = "Binding to libsodium 1.0.9+";
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix
index 660282ad131a..1b8f9d629e39 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }:
+{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "sqlite3";
@@ -10,7 +10,7 @@ buildDunePackage rec {
     sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ sqlite ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
index a3e26a31a8f9..b6a5dc5ecaad 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "sqlite3EZ is not available for OCaml ${ocaml.version}"
 else
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mlin/ocaml-sqlite3EZ";
     description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix b/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix
index bd0187dc5f4f..ae797815aed5 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck
+{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck
 # Optionally enable tests; test script use OCaml-4.01+ features
-, doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"
+, doCheck ? lib.versionAtLeast (lib.getVersion ocaml) "4.01"
 }:
 
 let version = "1.4.3"; in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ];
 
   configurePhase = "ocaml setup.ml -configure --prefix $out"
-  + stdenv.lib.optionalString doCheck " --enable-tests";
+  + lib.optionalString doCheck " --enable-tests";
   buildPhase = "ocaml setup.ml -build";
   inherit doCheck;
   checkPhase = "ocaml setup.ml -test";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/rgrinberg/stringext";
     platforms = ocaml.meta.platforms or [];
     description = "Extra string functions for OCaml";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix
index 2fa032225e7e..c97f1225663e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.03.0";
+assert lib.versionAtLeast (lib.getVersion ocaml) "4.03.0";
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-syslog";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rixed/ocaml-syslog";
     description = "Simple wrapper to access the system logger from OCaml";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix
new file mode 100644
index 000000000000..ad81c03c35d0
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix
@@ -0,0 +1,29 @@
+{ buildDunePackage, tls
+, x509, lwt, fmt, mirage-flow, mirage-kv, mirage-clock, ptime
+, mirage-crypto, mirage-crypto-pk, hacl_x25519, fiat-p256
+}:
+
+buildDunePackage {
+  pname = "tls-mirage";
+
+  inherit (tls) version src useDune2 minimumOCamlVersion;
+
+  propagatedBuildInputs = [
+    tls
+    x509
+    lwt
+    fmt
+    mirage-flow
+    mirage-kv
+    mirage-clock
+    ptime
+    mirage-crypto
+    mirage-crypto-pk
+    hacl_x25519
+    fiat-p256
+  ];
+
+  meta = tls.meta // {
+    description = "Transport Layer Security purely in OCaml, MirageOS layer";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix
index 0e25d9bc6b65..6980a148e105 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix
@@ -4,12 +4,15 @@
 
 buildDunePackage rec {
   pname = "toml";
-  version = "5.0.0";
+  version = "6.0.0";
+
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "ocaml-toml";
     repo = "to.ml";
-    rev = "v${version}";
-    sha256 = "1505kwcwklcfaxw8wckajm8kc6yrlikmxyhi8f8cpvhlw9ys90nj";
+    rev = version;
+    sha256 = "08ywzqckllvwawl1wpgg7qzvx6jhq7d6vysa0d5hj7qdwq213ggm";
   };
 
   buildInputs = [ menhir ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix
index 1bd926b1ddbf..97052115da6b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix
@@ -5,11 +5,11 @@ The `buildPhase` and `installPhase` attributes can be reused directly
 in many cases. When more fine-grained control on how to run the “topkg”
 build system is required, the attribute `run` can be used.
 */
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }:
 
 let
   param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
+  if lib.versionAtLeast ocaml.version "4.03" then {
     version = "1.0.3";
     sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6";
   } else {
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://erratique.ch/software/topkg";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
     description = "A packager for distributing OCaml software";
     inherit (ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix b/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
index ebb5b9b9c25d..d90a80c5648c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
@@ -46,7 +46,7 @@ buildDunePackage rec {
     stdio
   ];
 
-  preBuild = ''export LIBTORCH=${pytorch.dev}/'';
+  preBuild = "export LIBTORCH=${pytorch.dev}/";
 
   doCheck = !stdenv.isAarch64;
   checkPhase = "dune runtest";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/trie/default.nix b/nixpkgs/pkgs/development/ocaml-modules/trie/default.nix
new file mode 100644
index 000000000000..935f71a5e224
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/trie/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, fetchFromGitHub }:
+
+buildDunePackage rec {
+  pname = "trie";
+  version = "1.0.0";
+
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "kandu";
+    repo = pname;
+    rev = version;
+    sha256 = "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g";
+  };
+
+  meta = {
+    inherit (src.meta) homepage;
+    license = lib.licenses.mit;
+    description = "Strict impure trie tree";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
index f614c476140e..7c09e8cd9d7a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "tsdl is not available for OCaml ${ocaml.version}"
 else
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ocaml findlib ocamlbuild topkg ];
   propagatedBuildInputs = [ SDL2 ctypes ];
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = webpage;
     description = "Thin bindings to the cross-platform SDL library";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix
index 235d04ba99bd..77635e8848e0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib }:
+{ lib, stdenv, fetchzip, ocaml, findlib }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-twt-0.94.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
     description = "“The Whitespace Thing” for OCaml";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
index 69439c1c265f..72e4fcbb35f1 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4}:
+{lib, stdenv, fetchurl, ocaml, findlib, camlp4}:
 
-if !stdenv.lib.versionAtLeast ocaml.version "3.12"
-|| stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "3.12"
+|| lib.versionAtLeast ocaml.version "4.03"
 then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ocaml.janestreet.com/";
     description = "Support library for OCaml preprocessor type conversions";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index a970091df51d..e41e9b188fc8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4}:
+{stdenv, lib, fetchurl, ocaml, findlib, camlp4}:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.00"
-|| stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.00"
+|| lib.versionAtLeast ocaml.version "4.03"
 then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation {
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://forge.ocamlcore.org/projects/type-conv/";
     description = "Support library for OCaml preprocessor type conversions";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ maggesi ];
+    maintainers = with lib.maintainers; [ maggesi ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
index ee0ce0ae0be1..3fa9042b0351 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, buildOcaml}:
+{ lib, fetchurl, buildOcaml}:
 
 buildOcaml rec {
   minimumSupportedOcamlVersion = "4.02";
@@ -14,7 +14,7 @@ buildOcaml rec {
   meta = {
     homepage = "https://github.com/janestreet/type_conv/";
     description = "Support library for preprocessor type conversions";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ maggesi ericbmerritt ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ maggesi ericbmerritt ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/typerep/default.nix b/nixpkgs/pkgs/development/ocaml-modules/typerep/default.nix
index 859bd21b0a7c..c851f22aa5b8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/typerep/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/typerep/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type_conv}:
+{lib, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "typerep";
@@ -13,7 +13,7 @@ buildOcaml rec {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/typerep";
     description = "Runtime types for OCaml (beta version)";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix
index fb56cca0f0a7..7eec01547150 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Compatibility library for OCaml’s Uchar module";
     inherit (ocaml.meta) platforms license;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix
index d32fcf07b6cc..f1ada5d09981 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }:
 
 let
   pname = "ulex";
   param =
-    if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
+    if lib.versionAtLeast ocaml.version "4.02" then {
       version = "1.2";
       sha256 = "08yf2x9a52l2y4savjqfjd2xy4pjd1rpla2ylrr9qrz1drpfw4ic";
     } else {
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit (src.meta) homepage;
     description = "A lexer generator for Unicode and OCaml";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = ocaml.meta.platforms or [];
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    maintainers = [ lib.maintainers.roconnor ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
index 355b177b204f..f5d932336150 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, xmlm, topkg }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, xmlm, topkg }:
 
 let
   pname = "uucd";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xmlm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml module to decode the data of the Unicode character database from its XML representation";
     homepage = webpage;
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
index d657a6f02053..020b256c72f5 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }:
 
 let
   pname = "uucp";
@@ -6,7 +6,7 @@ let
   webpage = "https://erratique.ch/software/${pname}";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.01";
+assert lib.versionAtLeast ocaml.version "4.01";
 
 stdenv.mkDerivation {
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   inherit (topkg) installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database";
     homepage = webpage;
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix
index 399f147bd0d1..b260a05505bc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }:
 
 stdenv.mkDerivation rec {
   version = "0.9.7";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
     homepage = "https://erratique.ch/software/uuidm";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
index 1d0e5b2bcd94..cb95839d16c0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }:
+{ lib, stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }:
 let
   pname = "uunf";
   webpage = "https://erratique.ch/software/${pname}";
@@ -21,7 +21,7 @@ let
   };
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.03";
+assert lib.versionAtLeast ocaml.version "4.03";
 
 stdenv.mkDerivation {
   name = "ocaml-${pname}-${version}";
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml module for normalizing Unicode text";
     homepage = webpage;
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix
index 8fb9d207576d..c083f5b68f65 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }:
 
 let
   pname = "uuseg";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml library for segmenting Unicode text";
     homepage = webpage;
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix
index f289781b422c..e8179e369afa 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }:
 let
   pname = "uutf";
   webpage = "https://erratique.ch/software/${pname}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Non-blocking streaming Unicode codec for OCaml";
     homepage = webpage;
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/variantslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/variantslib/default.nix
index ebb0857e9186..f39336a84231 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/variantslib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/variantslib/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildOcaml, ocaml, fetchurl, type_conv }:
+{ lib, buildOcaml, ocaml, fetchurl, type_conv }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "variantslib-109.15.03 is not available for OCaml ${ocaml.version}"
 else
 
@@ -17,7 +17,7 @@ buildOcaml rec {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/variantslib";
     description = "OCaml variants as first class values";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix b/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix
new file mode 100644
index 000000000000..54bf4e65004b
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix
@@ -0,0 +1,47 @@
+{ lib, buildDunePackage, fetchurl
+, ppx_cstruct, ppx_sexp_conv, ounit, io-page-unix
+, lwt, cstruct, io-page, mirage-flow, xenstore, xenstore_transport
+, sexplib, cmdliner
+}:
+
+buildDunePackage rec {
+  pname = "vchan";
+  version = "6.0.0";
+
+  useDune2 = true;
+  minimumOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-v${version}.tbz";
+    sha256 = "7a6cc89ff8ba7144d6cef3f36722f40deedb3cefff0f7be1b2f3b7b2a2b41747";
+  };
+
+  nativeBuildInputs = [
+    ppx_cstruct
+  ];
+
+  propagatedBuildInputs = [
+    ppx_sexp_conv
+    lwt
+    cstruct
+    io-page
+    mirage-flow
+    xenstore
+    xenstore_transport
+    sexplib
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    cmdliner
+    io-page-unix
+    ounit
+  ];
+
+  meta = with lib; {
+    description = "Xen Vchan implementation";
+    homepage = "https://github.com/mirage/ocaml-vchan";
+    license = licenses.isc;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix
index d33f03a0d347..a9a4c0d3d6b4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix
@@ -8,7 +8,7 @@
 with lib;
 
 let
-  inherit (stdenv.lib) optionals versionAtLeast;
+  inherit (lib) optionals versionAtLeast;
 
   pname = "vg";
   version = "0.9.4";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
index 06c84531482e..c89449264889 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "wasm is not available for OCaml ${ocaml.version}"
 else
 
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.vbgl ];
     homepage = "https://github.com/WebAssembly/spec/tree/master/interpreter";
     inherit (ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix b/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix
index 463bfbc79f9d..ebc5472ce53b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
 , astring, bos, cmdliner, rresult
 }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-webbrowser-${version}";
-	version = "0.6.1";
-	src = fetchurl {
-		url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
-		sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
-	};
+  name = "ocaml${ocaml.version}-webbrowser-${version}";
+  version = "0.6.1";
+  src = fetchurl {
+    url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
+    sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
+  };
 
-	nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
-	buildInputs = [];
-	propagatedBuildInputs = [ astring bos cmdliner rresult ];
+  nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
+  buildInputs = [];
+  propagatedBuildInputs = [ astring bos cmdliner rresult ];
 
-	inherit (topkg) buildPhase installPhase;
+  inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		description = "Open and reload URIs in browsers from OCaml";
-		homepage = "https://erratique.ch/software/webbrowser";
-		license = stdenv.lib.licenses.isc;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "Open and reload URIs in browsers from OCaml";
+    homepage = "https://erratique.ch/software/webbrowser";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/wodan/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wodan/default.nix
new file mode 100644
index 000000000000..64ca29f20308
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/wodan/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint
+, checkseum, diet, bitv, nocrypto, logs, lru, io-page, mirage-block }:
+
+buildDunePackage rec {
+  pname = "wodan";
+  version = "unstable-2020-11-20";
+
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "mirage";
+    repo = pname;
+    rev = "cc08fe25888051c207f1009bcd2d39f8c514484f";
+    sha256 = "0186vlhnl8wcz2hmpn327n9a0bibnypmjy3w4nxq3yyglh6vj1im";
+    fetchSubmodules = true;
+  };
+
+  minimumOCamlVersion = "4.08";
+
+  propagatedBuildInputs = [
+    lwt_ppx
+    ppx_cstruct
+    optint
+    checkseum
+    diet
+    bitv
+    nocrypto
+    logs
+    lru
+    io-page
+    mirage-block
+  ];
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "A flash-friendly, safe and flexible filesystem library";
+    license = licenses.isc;
+    maintainers = with maintainers; [ ehmry ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix b/nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix
new file mode 100644
index 000000000000..a42259af9e6b
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix
@@ -0,0 +1,20 @@
+{ lib, buildDunePackage, io-page-unix, irmin-chunk, irmin-git, irmin-unix
+, mirage-block-ramdisk, mirage-block-unix, wodan }:
+
+buildDunePackage rec {
+  pname = "wodan-irmin";
+  inherit (wodan) version src useDune2;
+
+  propagatedBuildInputs = [
+    io-page-unix
+    irmin-chunk
+    irmin-git
+    irmin-unix
+    mirage-block-ramdisk
+    mirage-block-unix
+    wodan
+  ];
+
+  meta = wodan.meta // { description = "Wodan as an Irmin store"; };
+
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/wodan/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/wodan/unix.nix
new file mode 100644
index 000000000000..64a18b6b83d7
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/wodan/unix.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent
+, io-page-unix, mirage-block-ramdisk, mirage-block-unix }:
+
+buildDunePackage rec {
+  outputs = [ "bin" "out" ];
+  pname = "wodan-unix";
+  inherit (wodan) version src useDune2;
+
+  propagatedBuildInputs = [
+    afl-persistent
+    base64
+    benchmark
+    cmdliner
+    csv
+    io-page-unix
+    mirage-block-ramdisk
+    mirage-block-unix
+    wodan
+  ];
+
+  postInstall = ''
+    moveToOutput bin "''${!outputBin}"
+  '';
+
+  meta = wodan.meta // { description = "Wodan clients with Unix integration"; };
+
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
index ea09b326d393..b46386b1666f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildDunePackage }:
+{ lib, stdenv, fetchurl, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "wtf8";
@@ -11,7 +11,7 @@ buildDunePackage rec {
     sha256 = "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/flowtype/ocaml-wtf8";
     description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
index 289a3891c783..23efd4bb9fcf 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildDunePackage
+{ lib, fetchurl, buildDunePackage, fetchpatch
 , alcotest, cstruct-unix
 , asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk
 , logs, base64
@@ -15,6 +15,14 @@ buildDunePackage rec {
     sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22";
   };
 
+  patches = [
+    # fix tests for mirage-crypto >= 0.8.9, can be removed at next release
+    (fetchpatch {
+      url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch";
+      sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr";
+    })
+  ];
+
   useDune2 = true;
 
   buildInputs = [ alcotest cstruct-unix ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix
new file mode 100644
index 000000000000..34f32e4f117c
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix
@@ -0,0 +1,13 @@
+{ buildDunePackage, xenstore_transport, xenstore, lwt }:
+
+buildDunePackage {
+  pname = "xenstore-tool";
+
+  inherit (xenstore_transport) src version useDune2 minimumOCamlVersion;
+
+  buildInputs = [ xenstore_transport xenstore lwt ];
+
+  meta = xenstore_transport.meta // {
+    description = "Command line tool for interfacing with xenstore";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix
new file mode 100644
index 000000000000..666106fdb17a
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchurl
+, cstruct, ppx_cstruct, lwt, ounit
+}:
+
+buildDunePackage rec {
+  pname = "xenstore";
+  version = "2.1.1";
+
+  minimumOCamlVersion = "4.04";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-xenstore/releases/download/${version}/xenstore-${version}.tbz";
+    sha256 = "283814ea21adc345c4d59cfcb17b2f7c1185004ecaecc3871557c961874c84f5";
+  };
+
+  nativeBuildInputs = [ ppx_cstruct ];
+  propagatedBuildInputs = [ cstruct lwt ];
+
+  doCheck = true;
+  checkInputs = [ ounit ];
+
+  meta = with lib; {
+    description = "Xenstore protocol in pure OCaml";
+    license = licenses.lgpl21Only;
+    maintainers = [ maintainers.sternenseemann ];
+    homepage = "https://github.com/mirage/ocaml-xenstore";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix
new file mode 100644
index 000000000000..f0bb908e5dba
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, fetchFromGitHub, xenstore, lwt }:
+
+buildDunePackage rec {
+  pname = "xenstore_transport";
+  version = "1.3.0";
+
+  minimumOCamlVersion = "4.04";
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "xapi-project";
+    repo = "ocaml-xenstore-clients";
+    rev = "v${version}";
+    sha256 = "1kxxd9i4qiq98r7sgvl59iq2ni7y6drnv48qj580q5cyiyyc85q3";
+  };
+
+  propagatedBuildInputs = [ xenstore lwt ];
+
+  # requires a mounted xenfs and xen server
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Low-level libraries for connecting to a xenstore service on a xen host";
+    license = licenses.lgpl21Only;
+    homepage = "http://github.com/xapi-project/ocaml-xenstore-clients";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix
index 82f635afb684..a6db0dc78705 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, lib, fetchurl, ocaml, findlib}:
 let
   pname = "xml-light";
   version = "2.4";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     make all
     make opt
   '';
-  
+
   installPhase = ''
     make install_ocamlfind
     mkdir -p $out/share
@@ -36,8 +36,8 @@ stdenv.mkDerivation {
       library.
     '';
     homepage = "http://tech.motion-twin.com/xmllight.html";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.romildo ];
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix
index bb05b89d7bef..43b0bf5faa7e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 let
   pname = "xmlm";
   webpage = "https://erratique.ch/software/${pname}";
 in
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "xmlm is not available for OCaml ${ocaml.version}"
 else
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   inherit (topkg) buildPhase installPhase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OCaml streaming codec to decode and encode the XML data format";
     homepage = webpage;
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix
index 31c671538a58..f1c1f15dc72d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml
+{ lib, stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml
 , js_of_ocaml-ppx, re }:
 
-if stdenv.lib.versionOlder ocaml.version "4.03"
-|| stdenv.lib.versionAtLeast ocaml.version "4.11"
+if lib.versionOlder ocaml.version "4.03"
+|| lib.versionAtLeast ocaml.version "4.11"
 then throw "xtmpl not supported for ocaml ${ocaml.version}"
 else
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XML templating library for OCaml";
     homepage = "https://www.good-eris.net/xtmpl/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
index dca97a53cbfb..c9bf285b7bda 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
@@ -1,13 +1,17 @@
-{ stdenv, fetchzip, ocaml, findlib, dune, cppo, easy-format, biniou }:
+{ lib, stdenv, fetchzip, ocaml, findlib, dune, cppo, easy-format, biniou }:
 let
   pname = "yojson";
   param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02" then rec {
+  if lib.versionAtLeast ocaml.version "4.02" then rec {
     version = "1.7.0";
     url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
     sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd";
     nativeBuildInputs = [ dune ];
-    extra = { inherit (dune) installPhase; };
+    extra = {
+      installPhase = ''
+        dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
+      '';
+    };
   } else rec {
     version = "1.2.3";
     url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz";
@@ -34,7 +38,7 @@ stdenv.mkDerivation ({
   propagatedBuildInputs = [ easy-format biniou ];
   configurePlatforms = [];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An optimized parsing and printing library for the JSON format";
     homepage = "https://github.com/ocaml-community/${pname}";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix
index 175004c71bba..bddf2a2448fd 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl
-, ocaml, findlib, pkgconfig, perl
+{ lib, stdenv, fetchurl
+, ocaml, findlib, pkg-config, perl
 , gmp
 }:
 
 let source =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02"
+  if lib.versionAtLeast ocaml.version "4.02"
   then {
     version = "1.11";
     url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   inherit (source) version;
   src = fetchurl { inherit (source) url sha256; };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ocaml findlib perl ];
   propagatedBuildInputs = [ gmp ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast, arbitrary precision OCaml integers";
     homepage    = "http://forge.ocamlcore.org/projects/zarith";
     license     = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix
index 847951783ee0..a7889523bcca 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix
@@ -1,36 +1,19 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }:
+{ lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }:
 
-let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02" then
-  {
-    version = "3.1.0";
-    sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";
-    buildInputs = [ dune ];
-    propagatedBuildInputs = [ charInfo_width ];
-    extra = {
-     buildPhase = "dune build -p zed";
-     inherit (dune) installPhase; };
-  } else {
-    version = "1.4";
-    sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
-    buildInputs = [ ocamlbuild ];
-    propagatedBuildInputs = [ camomile ];
-    extra = { createFindlibDestdir = true; };
-  }
-; in
+buildDunePackage rec {
+  pname = "zed";
+  version = "3.1.0";
 
-stdenv.mkDerivation (rec {
-  inherit (param) version;
-  name = "ocaml-zed-${version}";
+  useDune2 = true;
 
-  src = fetchzip {
-    url = "https://github.com/diml/zed/archive/${version}.tar.gz";
-    inherit (param) sha256;
+  src = fetchFromGitHub {
+    owner = "ocaml-community";
+    repo = pname;
+    rev = version;
+    sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";
   };
 
-  buildInputs = [ ocaml findlib ] ++ param.buildInputs;
-
-  propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs;
+  propagatedBuildInputs = [ charInfo_width react ];
 
   meta = {
     description = "Abstract engine for text edition in OCaml";
@@ -41,11 +24,10 @@ stdenv.mkDerivation (rec {
 
     To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.
     '';
-    homepage = "https://github.com/diml/zed";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = ocaml.meta.platforms or [];
+    inherit (src.meta) homepage;
+    license = lib.licenses.bsd3;
     maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+      lib.maintainers.gal_bolle
     ];
   };
-} // param.extra)
+}
diff --git a/nixpkgs/pkgs/development/perl-modules/MNI/default.nix b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
index 7057883e6373..c0fc8f281085 100644
--- a/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, buildPerlPackage, stdenv }:
+{ fetchFromGitHub, buildPerlPackage, lib, stdenv }:
 
 buildPerlPackage {
   pname = "MNI-Perllib";
@@ -15,7 +15,7 @@ buildPerlPackage {
 
   doCheck = false;  # TODO: almost all tests fail ... is this a real problem?
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BIC-MNI/mni-perllib";
     license = with licenses; [ artistic1 gpl1Plus ];
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index b2c5437e3805..3c555ca37ab5 100644
--- a/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang
+{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang
 , DBDmysql, DBI, IOSocketSSL, TermReadKey
 }:
 
@@ -23,8 +23,8 @@ buildPerlPackage rec {
     shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*)
   '';
 
-  meta = with stdenv.lib; {
-    description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.'';
+  meta = with lib; {
+    description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks.";
     homepage = "https://www.percona.com/software/database-tools/percona-toolkit";
     license = with licenses; [ gpl2 ];
     maintainers = with maintainers; [ izorkin ];
diff --git a/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index ccc59980dd1d..17ec8ab48b59 100644
--- a/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }:
+{ stdenv, lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }:
 
 buildPerlPackage rec {
   pname = "WWW-YoutubeViewer";
@@ -11,21 +11,21 @@ buildPerlPackage rec {
     sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18";
   };
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+  nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
   propagatedBuildInputs = [
     LWP
     LWPProtocolHttps
     DataDump
     JSON
   ];
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     shortenPerlShebang $out/bin/youtube-viewer
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A lightweight application for searching and streaming videos from YouTube";
     homepage = "https://github.com/trizen/youtube-viewer";
-    maintainers = with stdenv.lib.maintainers; [ woffs ];
-    license = with stdenv.lib.licenses; [ artistic2 ];
+    maintainers = with maintainers; [ woffs ];
+    license = with licenses; [ artistic2 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
index e0a1a45cd442..29bcc9bab25f 100644
--- a/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
@@ -1,4 +1,4 @@
-{buildPerlPackage, stdenv, fetchurl, DBDmysql}:
+{buildPerlPackage, lib, stdenv, fetchurl, DBDmysql}:
 
 buildPerlPackage {
   pname = "maatkit";
@@ -27,7 +27,7 @@ buildPerlPackage {
     done
   '' ;
 
-  meta = {
+  meta = with lib; {
     description = "Database toolkit";
     longDescription = ''
       You can use Maatkit to prove replication is working correctly, fix
@@ -37,7 +37,7 @@ buildPerlPackage {
       In addition to MySQL, there is support for PostgreSQL, Memcached, and a
       growing variety of other databases and technologies.
     '';
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     homepage = "http://www.maatkit.org/";
   };
 }
diff --git a/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix
index 3557ed68cec6..20463ed24250 100644
--- a/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }:
+{ lib, stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }:
 
 buildPerlPackage rec {
   pname = "strip-nondeterminism";
@@ -17,7 +17,7 @@ buildPerlPackage rec {
   # stray test failure
   doCheck = false;
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
+  nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
   buildInputs = [ ArchiveZip ArchiveCpio file ];
 
   perlPostHook = ''
@@ -26,11 +26,11 @@ buildPerlPackage rec {
     rm $out/share/man/man1/dh_strip_nondeterminism.1.gz
   '';
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     shortenPerlShebang $out/bin/strip-nondeterminism
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Perl module for stripping bits of non-deterministic information";
     homepage = "https://reproducible-builds.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/pharo/launcher/default.nix b/nixpkgs/pkgs/development/pharo/launcher/default.nix
index 1737fb90c7ac..45531b551761 100644
--- a/nixpkgs/pkgs/development/pharo/launcher/default.nix
+++ b/nixpkgs/pkgs/development/pharo/launcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }:
+{ lib, stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   version = "2017.02.28";
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
      test "$?" == 124 && echo "ok")
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Launcher for Pharo distributions";
     homepage = "https://pharo.org";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix b/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix
index 13db30eae909..bd5d1e91602d 100644
--- a/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , bash
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   inherit name src;
 
-  pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
+  pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
 
   hardeningDisable = [ "format" "pic" ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash glibc openssl libGLU libGL freetype
                   xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
 
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath
+  LD_LIBRARY_PATH = lib.makeLibraryPath
     [ cairo libGLU libGL freetype openssl libuuid alsaLib
       xorg.libICE xorg.libSM ];
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Clean and innovative Smalltalk-inspired environment";
     homepage = "https://pharo.org";
     longDescription = ''
@@ -89,9 +89,9 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = [ maintainers.lukego ];
     # Pharo VM sources are packaged separately for darwin (OS X)
-    platforms = stdenv.lib.filter
-      (system: with stdenv.lib.systems.elaborate { inherit system; };
+    platforms = lib.filter
+      (system: with lib.systems.elaborate { inherit system; };
          isUnix && !isDarwin)
-      stdenv.lib.platforms.mesaPlatforms;
+      lib.platforms.mesaPlatforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/pharo/vm/build-vm.nix b/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
index d5469233f387..5427e36746ca 100644
--- a/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , bash
 , unzip
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported.";
 
   # Shared data (for the sources file)
-  pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
+  pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
 
   # Note: -fPIC causes the VM to segfault.
   hardeningDisable = [ "format" "pic"
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
 
     # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc.
-    libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs}
+    libs=$out:$(patchelf --print-rpath "$out/pharo"):${lib.makeLibraryPath libs}
 
     # Create the script
     cat > "$out/bin/${cmd}" <<EOF
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
     ln -s ${libgit2}/lib/libgit2.so* "$out/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Clean and innovative Smalltalk-inspired environment";
     homepage = "https://pharo.org";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/pharo/vm/share.nix b/nixpkgs/pkgs/development/pharo/vm/share.nix
index 2c8c376b7c12..720f2e39a7d3 100644
--- a/nixpkgs/pkgs/development/pharo/vm/share.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/share.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   version = "1.0";
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Shared files for Pharo";
     homepage = "https://pharo.org";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pharo/vm/vms.nix b/nixpkgs/pkgs/development/pharo/vm/vms.nix
index 7b96b5a91398..77bc5b0682fb 100644
--- a/nixpkgs/pkgs/development/pharo/vm/vms.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/vms.nix
@@ -1,4 +1,5 @@
 { cmake
+, lib
 , stdenv
 , fetchurl
 , bash
diff --git a/nixpkgs/pkgs/development/pharo/wrapper/default.nix b/nixpkgs/pkgs/development/pharo/wrapper/default.nix
index b9b147bf4183..1f0892950723 100644
--- a/nixpkgs/pkgs/development/pharo/wrapper/default.nix
+++ b/nixpkgs/pkgs/development/pharo/wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
+{ lib, stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
 
 stdenv.mkDerivation rec {
   name = "pharo";
@@ -50,13 +50,13 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://pharo.org";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.lukego ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.lukego ];
     # Pharo VM sources are packaged separately for darwin (OS X)
-    platforms = stdenv.lib.filter
-      (system: with stdenv.lib.systems.elaborate { inherit system; };
+    platforms = lib.filter
+      (system: with lib.systems.elaborate { inherit system; };
          isUnix && !isDarwin)
-      stdenv.lib.platforms.mesaPlatforms;
+      lib.platforms.mesaPlatforms;
   };
 }
 
diff --git a/nixpkgs/pkgs/development/php-packages/event/default.nix b/nixpkgs/pkgs/development/php-packages/event/default.nix
index 781b5abbc383..940150ac9867 100644
--- a/nixpkgs/pkgs/development/php-packages/event/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/event/default.nix
@@ -18,7 +18,7 @@ buildPecl {
       ':'
   '';
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
   buildInputs = with pkgs; [ openssl libevent ];
   internalDeps = [ php.extensions.sockets ];
 
diff --git a/nixpkgs/pkgs/development/php-packages/igbinary/default.nix b/nixpkgs/pkgs/development/php-packages/igbinary/default.nix
index 442311a5281b..7a321cc90b4e 100644
--- a/nixpkgs/pkgs/development/php-packages/igbinary/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/igbinary/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "igbinary";
 
-  version = "3.1.6";
-  sha256 = "1spx6581ly2r8pn9b632bi8429sy762v04ramrlnf7469pf8ggxr";
+  version = "3.2.1";
+  sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s=";
 
   configureFlags = [ "--enable-igbinary" ];
   makeFlags = [ "phpincludedir=$(dev)/include" ];
diff --git a/nixpkgs/pkgs/development/php-packages/imagick/default.nix b/nixpkgs/pkgs/development/php-packages/imagick/default.nix
index 8f9eed0c1c30..f697b44affd6 100644
--- a/nixpkgs/pkgs/development/php-packages/imagick/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/imagick/default.nix
@@ -20,7 +20,7 @@ buildPecl {
   ];
 
   configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ];
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
   buildInputs = [ pcre' ];
 
   meta.maintainers = lib.teams.php.members;
diff --git a/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix b/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix
index 9244bcbc1096..2533a6ef06db 100644
--- a/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix
@@ -1,7 +1,7 @@
 { buildPecl, lib, pkgs }:
 let
   pname = "maxminddb";
-  version = "1.8.0";
+  version = "1.9.0";
 in
 buildPecl {
   inherit pname version;
@@ -10,7 +10,7 @@ buildPecl {
     owner = "maxmind";
     repo = "MaxMind-DB-Reader-php";
     rev = "v${version}";
-    sha256 = "0cpd8d1xnkxsrf28z25xzgkkf3wc13ia99v8f7hbl7csvnggs7nn";
+    sha256 = "sha256-sNG2FhnxzbHA4Lmzj97al1WFwSU70Mr1R2i5ygF1L6Y=";
   };
 
   buildInputs = [ pkgs.libmaxminddb ];
diff --git a/nixpkgs/pkgs/development/php-packages/memcached/default.nix b/nixpkgs/pkgs/development/php-packages/memcached/default.nix
index b2d9333f2949..3eb1da463b9f 100644
--- a/nixpkgs/pkgs/development/php-packages/memcached/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/memcached/default.nix
@@ -23,7 +23,7 @@ buildPecl {
     "--with-libmemcached-dir=${pkgs.libmemcached}"
   ];
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
   buildInputs = with pkgs; [ cyrus_sasl zlib ];
 
   meta.maintainers = lib.teams.php.members;
diff --git a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix
index 2ebdaa2f577c..18bb515d15e1 100644
--- a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix
@@ -6,7 +6,7 @@ buildPecl {
   version = "1.9.0";
   sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
   buildInputs = with pkgs; [
     cyrus_sasl
     icu64
diff --git a/nixpkgs/pkgs/development/php-packages/oci8/default.nix b/nixpkgs/pkgs/development/php-packages/oci8/default.nix
index ea699c2034e8..697ad6740200 100644
--- a/nixpkgs/pkgs/development/php-packages/oci8/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/oci8/default.nix
@@ -1,10 +1,8 @@
-{ buildPecl, lib, pkgs }:
-
+{ buildPecl, lib, pkgs, version, sha256 }:
 buildPecl {
   pname = "oci8";
 
-  version = "2.2.0";
-  sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd";
+  inherit version sha256;
 
   buildInputs = [ pkgs.oracle-instantclient ];
   configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
diff --git a/nixpkgs/pkgs/development/php-packages/pdlib/default.nix b/nixpkgs/pkgs/development/php-packages/pdlib/default.nix
new file mode 100644
index 000000000000..830519467017
--- /dev/null
+++ b/nixpkgs/pkgs/development/php-packages/pdlib/default.nix
@@ -0,0 +1,24 @@
+{ buildPecl, lib, pkgs }:
+let
+  pname = "pdlib";
+  version = "1.0.2";
+in
+buildPecl {
+  inherit pname version;
+
+  src = pkgs.fetchFromGitHub {
+    owner = "goodspb";
+    repo = "pdlib";
+    rev = "v${version}";
+    sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i";
+  };
+
+  nativeBuildInputs = [ pkgs.pkg-config ];
+  buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ];
+
+  meta = with lib; {
+    description = "A PHP extension for Dlib";
+    license = with licenses; [ mit ];
+    maintainers = lib.teams.php.members;
+  };
+}
diff --git a/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
index 76465a77fd40..1ed33e7bb5e8 100644
--- a/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "php-cs-fixer";
-  version = "2.17.0";
+  version = "2.18.0";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-    sha256 = "163wz5y5ik7g1p7n0v3ckyawqjhg8d18cwx8a5c6fr1fkwb4mb12";
+    sha256 = "sha256-euvk/Rs6fZIJVWprzKiTVNPlGOsCN6t58DzvwYh3wDA=";
   };
 
   phases = [ "installPhase" ];
diff --git a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
index 6bd3fb00c4e5..c363150babcf 100644
--- a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "phpstan";
-  version = "0.12.59";
+  version = "0.12.68";
 in
 mkDerivation {
   inherit pname version;
 
   src = pkgs.fetchurl {
     url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-    sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa";
+    sha256 = "sha256-qplQi12ecZjtaM8XawiO+qSwEdTXByrxWZLf3N7gfNc=";
   };
 
   phases = [ "installPhase" ];
diff --git a/nixpkgs/pkgs/development/php-packages/protobuf/default.nix b/nixpkgs/pkgs/development/php-packages/protobuf/default.nix
index 10b045897373..e2ef068120d7 100644
--- a/nixpkgs/pkgs/development/php-packages/protobuf/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/protobuf/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pcre' }:
+{ buildPecl, lib, pcre', fetchpatch }:
 
 buildPecl {
   pname = "protobuf";
@@ -8,6 +8,23 @@ buildPecl {
 
   buildInputs = [ pcre' ];
 
+  patches = [
+    # TODO: remove with next update
+    (fetchpatch {
+      url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch";
+      sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s=";
+      stripLen = 4;
+      includes = [
+        "array.c"
+        "def.c"
+        "map.c"
+        "message.c"
+        "protobuf.h"
+        "wkt.inc"
+      ];
+    })
+  ];
+
   meta = with lib; {
     description = ''
       Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.
diff --git a/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/nixpkgs/pkgs/development/php-packages/psalm/default.nix
index 473b035d23aa..1de01d1d09d1 100644
--- a/nixpkgs/pkgs/development/php-packages/psalm/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/psalm/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "psalm";
-  version = "4.3.1";
+  version = "4.4.1";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-    sha256 = "1hv9r5m1mdywm7qi9rs9054jp77cpip3jyw048iq3l7s0vpslkc5";
+    sha256 = "sha256-4hqgAPflzNmeQQaxQATpWYBB5Pz7jKu8Vlw3BiMyhtw=";
   };
 
   phases = [ "installPhase" ];
diff --git a/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
index 64a2b8028c0d..e5bdc2a22984 100644
--- a/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "rdkafka";
 
-  version = "4.1.1";
-  sha256 = "0s6cqd71z5jpqb98myk4askmbqphzzslf0d4vqlg2rig9q6fyv7x";
+  version = "5.0.0";
+  sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs=";
 
   buildInputs = [ pkgs.rdkafka pcre' ];
 
diff --git a/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/nixpkgs/pkgs/development/php-packages/xdebug/default.nix
index b4052250aabd..780bb8c9086b 100644
--- a/nixpkgs/pkgs/development/php-packages/xdebug/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/xdebug/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "xdebug";
 
-  version = "3.0.1";
-  sha256 = "1da983crnk7ci3hfvqrb4gn9w364zzyi147wl4yly9d2adqk358b";
+  version = "3.0.2";
+  sha256 = "05sfgkw55ym7mg0b54l9x3i9598kf2bkp4z3sdl1hd31q3g4cv89";
 
   doCheck = true;
   checkTarget = "test";
diff --git a/nixpkgs/pkgs/development/php-packages/yaml/default.nix b/nixpkgs/pkgs/development/php-packages/yaml/default.nix
index 6ad3b778f827..40e5a859f9e4 100644
--- a/nixpkgs/pkgs/development/php-packages/yaml/default.nix
+++ b/nixpkgs/pkgs/development/php-packages/yaml/default.nix
@@ -3,12 +3,12 @@
 buildPecl {
   pname = "yaml";
 
-  version = "2.2.0";
-  sha256 = "1d65cf5vnr7brhxmy1pi2axjiyvdhmpcnq0qlx5spwlgkv6hnyml";
+  version = "2.2.1";
+  sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk=";
 
   configureFlags = [ "--with-yaml=${pkgs.libyaml}" ];
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
 
   meta.maintainers = lib.teams.php.members;
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/audio/default.nix b/nixpkgs/pkgs/development/pure-modules/audio/default.nix
index e99c87ec7065..34d405d6a396 100644
--- a/nixpkgs/pkgs/development/pure-modules/audio/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/audio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }:
+{ lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
 
 stdenv.mkDerivation rec {
   baseName = "audio";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A digital audio interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-audio.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/avahi/default.nix b/nixpkgs/pkgs/development/pure-modules/avahi/default.nix
index 4745593cb7f8..7b8cc1b00ac3 100644
--- a/nixpkgs/pkgs/development/pure-modules/avahi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/avahi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, avahi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, avahi }:
 
 stdenv.mkDerivation rec {
   baseName = "avahi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure avahi ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A digital audio interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-avahi.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/csv/default.nix b/nixpkgs/pkgs/development/pure-modules/csv/default.nix
index 501271df8c09..f51739f03395 100644
--- a/nixpkgs/pkgs/development/pure-modules/csv/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/csv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "csv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Comma Separated Value Interface for the Pure Programming Language";
     homepage = "http://puredocs.bitbucket.org/pure-csv.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/doc/default.nix b/nixpkgs/pkgs/development/pure-modules/doc/default.nix
index c009b23f4eef..aa678cb21a4f 100644
--- a/nixpkgs/pkgs/development/pure-modules/doc/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/doc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "doc";
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
 
   meta = {
     description = "A simple utility for literate programming and documenting source code written in the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-doc.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix b/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix
index 622ea140f66c..04ea1dde589b 100644
--- a/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, fcgi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, fcgi }:
 
 stdenv.mkDerivation rec {
   baseName = "fastcgi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure fcgi ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache";
     homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/faust/default.nix b/nixpkgs/pkgs/development/pure-modules/faust/default.nix
index 1f5b443fe388..4a3b12ea7fae 100644
--- a/nixpkgs/pkgs/development/pure-modules/faust/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/faust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }:
+{ lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }:
 
 stdenv.mkDerivation rec {
   baseName = "faust";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure faust libtool ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lets you load and run Faust-generated signal processing modules in Pure";
     homepage = "http://puredocs.bitbucket.org/pure-faust.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/ffi/default.nix b/nixpkgs/pkgs/development/pure-modules/ffi/default.nix
index 8518c2cb01f3..3b076a4f38c2 100644
--- a/nixpkgs/pkgs/development/pure-modules/ffi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/ffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, libffi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, libffi }:
 
 stdenv.mkDerivation rec {
   baseName = "ffi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure libffi ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa";
     homepage = "http://puredocs.bitbucket.org/pure-ffi.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/gen/default.nix b/nixpkgs/pkgs/development/pure-modules/gen/default.nix
index 9956c142dafa..278c782da327 100644
--- a/nixpkgs/pkgs/development/pure-modules/gen/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gen/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl,
-  pkgconfig, pure, haskellPackages }:
+{ lib, stdenv, fetchurl,
+  pkg-config, pure, haskellPackages }:
 
 stdenv.mkDerivation rec {
   baseName = "gen";
@@ -12,16 +12,16 @@ stdenv.mkDerivation rec {
   };
 
   hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]);
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ hsEnv pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
 
   meta = {
     description = "Pure interface generator";
     homepage = "http://puredocs.bitbucket.org/pure-gen.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
     hydraPlatforms = [];
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/gl/default.nix b/nixpkgs/pkgs/development/pure-modules/gl/default.nix
index 77173870bca6..952d583bfd88 100644
--- a/nixpkgs/pkgs/development/pure-modules/gl/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU, libGL, xlibsWrapper }:
+{ lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   baseName = "gl";
@@ -10,19 +10,19 @@ stdenv.mkDerivation rec {
     sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ];
   makeFlags = [
-    "libdir=${placeholder ''out''}/lib"
-    "prefix=${placeholder ''out''}/"
+    "libdir=${placeholder "out"}/lib"
+    "prefix=${placeholder "out"}/"
   ];
   setupHook = ../generic-setup-hook.sh;
 
   meta = {
     description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure";
     homepage = "http://puredocs.bitbucket.org/pure-gl.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/glpk/default.nix b/nixpkgs/pkgs/development/pure-modules/glpk/default.nix
index a70dbbd047a2..7b8c46ef47f4 100644
--- a/nixpkgs/pkgs/development/pure-modules/glpk/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/glpk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl,
-  pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
+  pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "glpk";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
                        "--with-gmp=yes" ];
   });
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure glpkWithExtras ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GLPK interface for the Pure Programming Language";
     homepage = "http://puredocs.bitbucket.org/pure-glpk.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/gplot/default.nix b/nixpkgs/pkgs/development/pure-modules/gplot/default.nix
index 998c8f1972ac..ddae95c43f06 100644
--- a/nixpkgs/pkgs/development/pure-modules/gplot/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, gnuplot }:
+{ lib, stdenv, fetchurl, pkg-config, pure, gnuplot }:
 
 stdenv.mkDerivation rec {
   baseName = "gplot";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure gnuplot ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A pure binding to gnuplot";
     homepage = "http://puredocs.bitbucket.org/pure-gplot.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/gsl/default.nix b/nixpkgs/pkgs/development/pure-modules/gsl/default.nix
index 6c6a381f285b..204aeb6bb741 100644
--- a/nixpkgs/pkgs/development/pure-modules/gsl/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gsl/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pure, pkgconfig, gsl }:
+{ lib, stdenv, fetchurl, pure, pkg-config, gsl }:
 
 stdenv.mkDerivation rec {
   baseName = "gsl";
   version = "0.12";
   name = "pure-${baseName}-${version}";
-  
+
   src = fetchurl {
     url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
     sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure gsl ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GNU Scientific Library interface for Pure";
     homepage = "http://puredocs.bitbucket.org/pure-gsl.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/gtk/default.nix b/nixpkgs/pkgs/development/pure-modules/gtk/default.nix
index ff619226a81f..8cc3781e825e 100644
--- a/nixpkgs/pkgs/development/pure-modules/gtk/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
 
 stdenv.mkDerivation rec {
   baseName = "gtk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure pure-ffi gtk2 ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure";
     homepage = "http://puredocs.bitbucket.org/pure-gtk.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/liblo/default.nix b/nixpkgs/pkgs/development/pure-modules/liblo/default.nix
index a633ad7c1d77..40502bbc140a 100644
--- a/nixpkgs/pkgs/development/pure-modules/liblo/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/liblo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, liblo }:
+{ lib, stdenv, fetchurl, pkg-config, pure, liblo }:
 
 stdenv.mkDerivation rec {
   baseName = "liblo";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure liblo ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol";
     homepage = "http://puredocs.bitbucket.org/pure-liblo.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/lilv/default.nix b/nixpkgs/pkgs/development/pure-modules/lilv/default.nix
index 85a504c90823..577170118bb1 100644
--- a/nixpkgs/pkgs/development/pure-modules/lilv/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/lilv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }:
+{ lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
   baseName = "lilv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ];
   makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers";
     homepage = "http://puredocs.bitbucket.org/pure-lilv.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/lv2/default.nix b/nixpkgs/pkgs/development/pure-modules/lv2/default.nix
index 6e8f38cf2a9c..800c39684318 100644
--- a/nixpkgs/pkgs/development/pure-modules/lv2/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, lv2 }:
+{ lib, stdenv, fetchurl, pkg-config, pure, lv2 }:
 
 stdenv.mkDerivation rec {
   baseName = "lv2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure lv2 ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules";
     homepage = "http://puredocs.bitbucket.org/pure-lv2.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/midi/default.nix b/nixpkgs/pkgs/development/pure-modules/midi/default.nix
index 3e2a3993fc1a..bbca0b080892 100644
--- a/nixpkgs/pkgs/development/pure-modules/midi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/midi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, portmidi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, portmidi }:
 
 stdenv.mkDerivation rec {
   baseName = "midi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure portmidi ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A MIDI interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-midi.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix b/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix
index 13c9eee1bd9f..8afb74027d73 100644
--- a/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "mpfr";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "This module makes the MPFR multiprecision floats available in Pure";
     homepage = "http://puredocs.bitbucket.org/pure-mpfr.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/octave/default.nix b/nixpkgs/pkgs/development/pure-modules/octave/default.nix
index d064eeb0d41f..591555f39c8e 100644
--- a/nixpkgs/pkgs/development/pure-modules/octave/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/octave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, octave }:
+{ lib, stdenv, fetchurl, pkg-config, pure, octave }:
 
 stdenv.mkDerivation rec {
   baseName = "octave";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure octave ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An Octave module for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-octave.html";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     # This is set to none for now because it does not work with the
     # current stable version of Octave.
-    platforms = stdenv.lib.platforms.none;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    platforms = lib.platforms.none;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/odbc/default.nix b/nixpkgs/pkgs/development/pure-modules/odbc/default.nix
index e95e1c3d1c19..272c88a697cd 100644
--- a/nixpkgs/pkgs/development/pure-modules/odbc/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/odbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, libiodbc }:
+{ lib, stdenv, fetchurl, pkg-config, pure, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "odbc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure libiodbc ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple ODBC interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-odbc.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix b/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix
index fc615690df1c..bbf22e9c6fbe 100644
--- a/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }:
+{ lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
 
 stdenv.mkDerivation rec {
   baseName = "pandoc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ pure ];
   propagatedBuildInputs = [ pandoc gawk getopt ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc";
     homepage = "http://puredocs.bitbucket.org/pure-pandoc.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/rational/default.nix b/nixpkgs/pkgs/development/pure-modules/rational/default.nix
index be230141a4a5..99cefc9682a9 100644
--- a/nixpkgs/pkgs/development/pure-modules/rational/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/rational/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "rational";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure";
     homepage = "http://puredocs.bitbucket.org/pure-rational.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/readline/default.nix b/nixpkgs/pkgs/development/pure-modules/readline/default.nix
index 24f64d944704..f3015e275355 100644
--- a/nixpkgs/pkgs/development/pure-modules/readline/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/readline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, readline }:
+{ lib, stdenv, fetchurl, pkg-config, pure, readline }:
 
 stdenv.mkDerivation rec {
   baseName = "readline";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure readline ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface";
     homepage = "http://puredocs.bitbucket.org/pure-readline.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/sockets/default.nix b/nixpkgs/pkgs/development/pure-modules/sockets/default.nix
index e80d66f3ab84..5e1a01bc624e 100644
--- a/nixpkgs/pkgs/development/pure-modules/sockets/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/sockets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "sockets";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Pure interface to the Berkeley socket functions";
     homepage = "http://puredocs.bitbucket.org/pure-sockets.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/sql3/default.nix b/nixpkgs/pkgs/development/pure-modules/sql3/default.nix
index c658ee0c5562..009b367c6915 100644
--- a/nixpkgs/pkgs/development/pure-modules/sql3/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/sql3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, sqlite }:
+{ lib, stdenv, fetchurl, pkg-config, pure, sqlite }:
 
 stdenv.mkDerivation rec {
   baseName = "sql3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure sqlite ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A SQLite module for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-sql3.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/stldict/default.nix b/nixpkgs/pkgs/development/pure-modules/stldict/default.nix
index ae28055a2f92..46b711d9fa63 100644
--- a/nixpkgs/pkgs/development/pure-modules/stldict/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/stldict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "stldict";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Pure interface to the C++ dictionary containers map and unordered_map";
     homepage = "http://puredocs.bitbucket.org/pure-stldict.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/stllib/default.nix b/nixpkgs/pkgs/development/pure-modules/stllib/default.nix
index 9d35794b1900..009543ee71cb 100644
--- a/nixpkgs/pkgs/development/pure-modules/stllib/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/stllib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "stllib";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap";
     homepage = "http://puredocs.bitbucket.org/pure-stllib.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/tk/default.nix b/nixpkgs/pkgs/development/pure-modules/tk/default.nix
index 496da2a20ea6..4a2c86783c1a 100644
--- a/nixpkgs/pkgs/development/pure-modules/tk/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/tk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }:
+{ lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   baseName = "tk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure tcl tk xlibsWrapper ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A basic interface between Pure and Tcl/Tk";
     homepage = "http://puredocs.bitbucket.org/pure-tk.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/pure-modules/xml/default.nix b/nixpkgs/pkgs/development/pure-modules/xml/default.nix
index ac4f1f0e6b07..e9d35c4d1fb5 100644
--- a/nixpkgs/pkgs/development/pure-modules/xml/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/xml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }:
+{ lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
   baseName = "xml";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure libxml2 libxslt ];
   makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
   setupHook = ../generic-setup-hook.sh;
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure";
     homepage = "http://puredocs.bitbucket.org/pure-xml.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
index 21b8d509646d..d1ac191489ad 100644
--- a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.6.3";
+  version = "3.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3bb5229eed6fbbdafc13ce962712ae66e175aa214c69bed35a06bffcf0c5e244";
+    sha256 = "1cab7f2521e107d07127b042155b632b7a1cd5e02c34be5a28ff62f77c900c6a";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/nixpkgs/pkgs/development/python-modules/Cython/default.nix
index 84f54fd7af62..64f5bb3ab656 100644
--- a/nixpkgs/pkgs/development/python-modules/Cython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Cython/default.nix
@@ -16,12 +16,12 @@ let
     ++ [ "reimport_from_subinterpreter" ]
     # cython's testsuite is not working very well with libc++
     # We are however optimistic about things outside of testsuite still working
-    ++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
+    ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
     # Some tests in the test suite isn't working on aarch64. Disable them for
     # now until upstream finds a workaround.
     # Upstream issue here: https://github.com/cython/cython/issues/2308
-    ++ stdenv.lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ]
-    ++ stdenv.lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ]
+    ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ]
+    ++ lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ]
   ;
 
 in buildPythonPackage rec {
@@ -55,7 +55,7 @@ in buildPythonPackage rec {
     export HOME="$NIX_BUILD_TOP"
     ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \
       --no-code-style \
-      ${stdenv.lib.optionalString (builtins.length excludedTests != 0)
+      ${lib.optionalString (builtins.length excludedTests != 0)
         ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
   '';
 
diff --git a/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix b/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
index d91bef07d2ae..2b06fcdce7d2 100644
--- a/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }:
 
 buildPythonPackage rec {
   pname = "FormEncode";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "FormEncode validates and converts nested structures";
     homepage = "http://formencode.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix b/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
index 83263f734bd4..be4bb9e31d32 100644
--- a/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }:
 buildPythonPackage rec {
   version = "0.12.4";
   pname = "HTSeq";
@@ -13,13 +13,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [ cython ];
   propagatedBuildInputs = [ numpy pysam matplotlib ];
 
-  checkPhase = stdenv.lib.optionalString isPy27 ''
+  checkPhase = lib.optionalString isPy27 ''
     ${python.interpreter} python2/test/test_general.py
-  '' + stdenv.lib.optionalString isPy3k ''
+  '' + lib.optionalString isPy3k ''
     ${python.interpreter} python3/test/test_general.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://htseq.readthedocs.io/";
     description = "A framework to work with high-throughput sequencing data";
     maintainers = with maintainers; [ unode ];
diff --git a/nixpkgs/pkgs/development/python-modules/IPy/default.nix b/nixpkgs/pkgs/development/python-modules/IPy/default.nix
index 332ee0fc0c13..f142c2459223 100644
--- a/nixpkgs/pkgs/development/python-modules/IPy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/IPy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "IPy";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     nosetests -e fuzz
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Class and tools for handling of IPv4 and IPv6 addresses and networks";
     homepage = "https://github.com/autocracy/python-ipy";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
index 1a58562ab06d..d7c199f71467 100644
--- a/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "JPype1";
-  version = "1.2.0";
+  version = "1.2.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "62ca03e7f7963ba4ac1065ee48ff661f752b3db3c23549ed8933ab40196a3157";
+    sha256 = "f210646127d24be73cfc6d807e2cda1c6b2ab39b7a293008e8b46367af6f2204";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
diff --git a/nixpkgs/pkgs/development/python-modules/MechanicalSoup/default.nix b/nixpkgs/pkgs/development/python-modules/MechanicalSoup/default.nix
index 07330ebbca9d..e4ce48158f64 100644
--- a/nixpkgs/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/MechanicalSoup/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "MechanicalSoup";
-  version = "0.12.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1g976rk79apz6rc338zq3ml2yps8hb88nyw3a698d0brm4khd9ir";
+    sha256 = "37d3b15c1957917d3ae171561e77f4dd4c08c35eb4500b8781f6e7e1bb6c4d07";
   };
 
   checkInputs = [ pytest pytestrunner requests-mock pytestcov ];
diff --git a/nixpkgs/pkgs/development/python-modules/PyLD/default.nix b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix
index 1c7bc2ff93fb..247b7f0332f5 100644
--- a/nixpkgs/pkgs/development/python-modules/PyLD/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }:
 
 let
 
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     ${python.interpreter} tests/runtests.py -d ${normalization}/tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python implementation of the JSON-LD API";
     homepage = "https://github.com/digitalbazaar/pyld";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix
index c3c67194ebb7..ebedb3c69693 100644
--- a/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , capstone}:
 
 buildPythonPackage rec {
   pname = "ROPGadget";
-  version = "6.3";
+  version = "6.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9";
+    sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c";
   };
 
   propagatedBuildInputs = [ capstone ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to search for gadgets in binaries to facilitate ROP exploitation";
     homepage = "http://shell-storm.org/project/ROPgadget/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/Rtree/default.nix b/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
index 9adfbb67e62d..82c8ced9704b 100644
--- a/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }:
 
 buildPythonPackage rec {
   pname = "Rtree";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false;
   checkInputs = [ numpy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "R-Tree spatial index for Python GIS";
     homepage = "https://toblerity.org/rtree/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/Theano/default.nix b/nixpkgs/pkgs/development/python-modules/Theano/default.nix
index ce32e42e4716..e279100e9cc6 100644
--- a/nixpkgs/pkgs/development/python-modules/Theano/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Theano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , runCommandCC
 , fetchPypi
 , buildPythonPackage
@@ -40,8 +40,8 @@ let
     if stdenv.cc.isClang then "clang++" else
     throw "Unknown C++ compiler";
   cxx_compiler = wrapped cxx_compiler_name "\\$HOME/.theano"
-    (    stdenv.lib.optional cudaSupport libgpuarray_
-      ++ stdenv.lib.optional cudnnSupport cudnn );
+    (    lib.optional cudaSupport libgpuarray_
+      ++ lib.optional cudnnSupport cudnn );
 
   libgpuarray_ = libgpuarray.override { inherit cudaSupport cudatoolkit; };
 
@@ -60,10 +60,10 @@ in buildPythonPackage rec {
     substituteInPlace theano/configdefaults.py \
       --replace 'StrParam(param, is_valid=warn_cxx)' 'StrParam('\'''${cxx_compiler}'\''', is_valid=warn_cxx)' \
       --replace 'rc == 0 and config.cxx != ""' 'config.cxx != ""'
-  '' + stdenv.lib.optionalString cudaSupport ''
+  '' + lib.optionalString cudaSupport ''
     substituteInPlace theano/configdefaults.py \
       --replace 'StrParam(get_cuda_root)' 'StrParam('\'''${cudatoolkit}'\''')'
-  '' + stdenv.lib.optionalString cudnnSupport ''
+  '' + lib.optionalString cudnnSupport ''
     substituteInPlace theano/configdefaults.py \
       --replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')'
   '';
@@ -85,7 +85,7 @@ in buildPythonPackage rec {
 
   pythonImportsCheck = [ "theano" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://deeplearning.net/software/theano/";
     description = "A Python library for large-scale array computation";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/nixpkgs/pkgs/development/python-modules/Wand/default.nix
index c897b04e880c..d7ad28c01336 100644
--- a/nixpkgs/pkgs/development/python-modules/Wand/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Wand/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , imagemagick7Big
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   passthru.imagemagick = imagemagick7Big;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ctypes-based simple MagickWand API binding for Python";
     homepage = "http://wand-py.org/";
     license = [ licenses.mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix
index 02519e9dc66b..28515e6f6028 100644
--- a/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # there are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Calculate actual route time and distance with Waze API";
     homepage = "https://github.com/kovacsbalu/WazeRouteCalculator";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/aadict/default.nix b/nixpkgs/pkgs/development/python-modules/aadict/default.nix
index 2587260748f0..cf6976fa6c1e 100644
--- a/nixpkgs/pkgs/development/python-modules/aadict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aadict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six ];
   checkInputs = [ nose coverage ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/metagriffin/aadict";
     description = "An auto-attribute dict (and a couple of other useful dict functions).";
     maintainers = with maintainers; [ glittershark ];
diff --git a/nixpkgs/pkgs/development/python-modules/aafigure/default.nix b/nixpkgs/pkgs/development/python-modules/aafigure/default.nix
index ed07a60e0a89..5350443eeaab 100644
--- a/nixpkgs/pkgs/development/python-modules/aafigure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aafigure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pillow }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }:
 
 buildPythonPackage rec {
   pname = "aafigure";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ASCII art to image converter";
     homepage = "https://launchpad.net/aafigure/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/acebinf/default.nix b/nixpkgs/pkgs/development/python-modules/acebinf/default.nix
index 78810de1740d..f8134aaf5b31 100644
--- a/nixpkgs/pkgs/development/python-modules/acebinf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/acebinf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyvcf
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "acebinf" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ACEnglish/acebinf";
     description = "Collection of simple utilities used when building bioinformatics tools";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
index b9bc11a34c72..75408244e66a 100644
--- a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse
 , openssl }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   doCheck = false; # seems to hang, not sure
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
     homepage = "https://github.com/diafygi/acme-tiny";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
index 84aef2dfb03d..ca47018f56f4 100644
--- a/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , nose, docutils, blockdiag, reportlab }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose reportlab ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
     homepage = "http://blockdiag.com/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
new file mode 100644
index 000000000000..f03d3fd64e7b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "Adafruit-PlatformDetect";
+  version = "2.27.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rnmy74rjjcyni5sr8h1djffpj7wngn2wqckl5vknp2smaihp34l";
+  };
+
+  nativeBuildInputs = [ setuptools-scm ];
+
+  # Project has not published tests yet
+  doCheck = false;
+  pythonImportsCheck = [ "adafruit_platformdetect" ];
+
+  meta = with lib; {
+    description = "Platform detection for use by Adafruit libraries";
+    homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix
new file mode 100644
index 000000000000..36bafb0f7a07
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "Adafruit-PureIO";
+  version = "1.1.8";
+
+  src = fetchPypi {
+    pname = "Adafruit_PureIO";
+    inherit version;
+    sha256 = "1mfa6sfz7qwgajz3lqw0s69ivvwbwvblwkjzbrwdrxjbma4jaw66";
+  };
+
+  nativeBuildInputs = [ setuptools-scm ];
+
+  # Physical SMBus is not present
+  doCheck = false;
+  pythonImportsCheck = [ "Adafruit_PureIO" ];
+
+  meta = with lib; {
+    description = "Python interface to Linux IO including I2C and SPI";
+    homepage = "https://github.com/adafruit/Adafruit_Python_PureIO";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/adal/default.nix b/nixpkgs/pkgs/development/python-modules/adal/default.nix
index 0df7247986d0..f7e973c8f693 100644
--- a/nixpkgs/pkgs/development/python-modules/adal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/adal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , requests, pyjwt, dateutil }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =  [ requests pyjwt dateutil ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
     homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/adext/default.nix b/nixpkgs/pkgs/development/python-modules/adext/default.nix
new file mode 100644
index 000000000000..f3818c93188b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/adext/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, alarmdecoder
+}:
+
+buildPythonPackage rec {
+  pname = "adext";
+  version = "0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "184qxw6i5ixnhgkjnby4zwn4jg90mxb8xy9vbg80x5w331p4z50f";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "alarmdecoder==1.13.2" "alarmdecoder>=1.13.2"
+  '';
+
+  propagatedBuildInputs = [ alarmdecoder ];
+
+  # Tests are not published yet
+  doCheck = false;
+  pythonImportsCheck = [ "adext" ];
+
+  meta = with lib; {
+    description = "Python extension for AlarmDecoder";
+    homepage = "https://github.com/ajschmidt8/adext";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix b/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix
new file mode 100644
index 000000000000..4d6d91c5716d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix
@@ -0,0 +1,26 @@
+{ aiohttp, buildPythonPackage, fetchPypi, lib, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "advantage_air";
+  version = "0.2.2";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "04q2sjw9r50c00m4sfv98w9cwmmr970830c97m32p5j8ijb10j5x";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  # No tests
+  doCheck = false;
+  pythonImportsCheck = [ "advantage_air" ];
+
+  meta = with lib; {
+    description = "API helper for Advantage Air's MyAir and e-zone API";
+    homepage = "https://github.com/Bre77/advantage_air";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jamiemagee ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/nixpkgs/pkgs/development/python-modules/aenum/default.nix
index 32b26a5e0355..f21d8f4195a4 100644
--- a/nixpkgs/pkgs/development/python-modules/aenum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aenum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "aenum";
@@ -22,10 +22,10 @@ buildPythonPackage rec {
   runHook postCheck
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
-    maintainers = with stdenv.lib.maintainers; [ vrthra ];
-    license = with stdenv.lib.licenses; [ bsd3 ];
+    maintainers = with maintainers; [ vrthra ];
+    license = licenses.bsd3;
     homepage = "https://github.com/ethanfurman/aenum";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/nixpkgs/pkgs/development/python-modules/afdko/default.nix
index 6371fa804bb0..4df6c5f6c493 100644
--- a/nixpkgs/pkgs/development/python-modules/afdko/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/afdko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python
 , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens
 , brotli, fontmath, mutatormath, booleanoperations
 , ufoprocessor, ufonormalizer, psautohint, tqdm
@@ -65,7 +65,7 @@ buildPythonPackage rec {
     "test_options"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Adobe Font Development Kit for OpenType";
     homepage = "https://adobe-type-tools.github.io/afdko/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix
index 09556ea891b3..099fb1701cb4 100644
--- a/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
 
 buildPythonPackage rec {
     pname = "agate-dbf";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
       sha256 = "589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Adds read support for dbf files to agate";
       homepage    = "https://github.com/wireservice/agate-dbf";
       license     = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
index 08516d05f002..566951ea71d1 100644
--- a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
 
 buildPythonPackage rec {
     pname = "agate-sql";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
     propagatedBuildInputs = [ agate sqlalchemy crate ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Adds SQL read/write support to agate.";
       homepage    = "https://github.com/wireservice/agate-sql";
       license     = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/agent-py/default.nix b/nixpkgs/pkgs/development/python-modules/agent-py/default.nix
new file mode 100644
index 000000000000..2a9e358cf043
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/agent-py/default.nix
@@ -0,0 +1,26 @@
+{ aiohttp, buildPythonPackage, fetchPypi, isPy3k, lib, python, requests }:
+
+buildPythonPackage rec {
+  pname = "agent-py";
+  version = "0.0.23";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz";
+  };
+
+  propagatedBuildInputs = [ requests aiohttp ];
+
+  checkPhase = ''
+    ${python.interpreter} tests/test_agent.py
+  '';
+
+  meta = with lib; {
+    description = "A python wrapper around the Agent REST API.";
+    homepage = "https://github.com/ispysoftware/agent-py";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jamiemagee ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aiodns/default.nix b/nixpkgs/pkgs/development/python-modules/aiodns/default.nix
index 694f92577cbb..4ba4bd59af27 100644
--- a/nixpkgs/pkgs/development/python-modules/aiodns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiodns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , isPy27, isPyPy, python, pycares, typing, trollius }:
 
 buildPythonPackage rec {
@@ -10,9 +10,9 @@ buildPythonPackage rec {
     sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d";
   };
 
-  propagatedBuildInputs = with stdenv.lib; [ pycares ]
-    ++ optional (pythonOlder "3.7") typing
-    ++ optional (isPy27 || isPyPy) trollius;
+  propagatedBuildInputs = [ pycares ]
+    ++ lib.optional (pythonOlder "3.7") typing
+    ++ lib.optional (isPy27 || isPyPy) trollius;
 
   checkPhase = ''
     ${python.interpreter} tests.py
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # 'Could not contact DNS servers'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/saghul/aiodns";
     license = licenses.mit;
     description = "Simple DNS resolver for asyncio";
diff --git a/nixpkgs/pkgs/development/python-modules/aioeafm/default.nix b/nixpkgs/pkgs/development/python-modules/aioeafm/default.nix
new file mode 100644
index 000000000000..be91e0e95575
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aioeafm/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, aiohttp
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, pytest-aiohttp
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aioeafm";
+  version = "1.0.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "Jc2k";
+    repo = pname;
+    rev = version;
+    sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [
+    pytest-aiohttp
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aioeafm" ];
+
+  meta = with lib; {
+    description = "Python client for access the Real Time flood monitoring API";
+    homepage = "https://github.com/Jc2k/aioeafm";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
index 6a128eb5239b..03f1ed91cfd8 100644
--- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -1,16 +1,14 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, attrs, protobuf, zeroconf }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }:
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "2.6.3";
+  version = "2.6.4";
 
   disabled = !isPy3k;
 
-  src = fetchFromGitHub {
-    owner = "esphome";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1lbjxqdx63fc7qxx7xwq4b9dafmdafj7p1ggs48hyhbqfwkrv9p7";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d8def7a909c0471479e1d8b0965de6bb7644b8de315d6e578f9d848b8a6812d0";
   };
 
   propagatedBuildInputs = [ attrs protobuf zeroconf ];
diff --git a/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix b/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix
index 0582a59eae87..4bdd2b1327cd 100644
--- a/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , eventlet
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ${python.interpreter} runtests.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes";
     homepage = "https://pypi.org/project/aioeventlet/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/aioflo/default.nix b/nixpkgs/pkgs/development/python-modules/aioflo/default.nix
new file mode 100644
index 000000000000..60288178def5
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aioflo/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, aiohttp
+, aresponses
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-aiohttp
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aioflo";
+  version = "0.4.2";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "bachya";
+    repo = pname;
+    rev = version;
+    sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz";
+  };
+
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [
+    aresponses
+    pytest-aiohttp
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aioflo" ];
+
+  meta = with lib; {
+    description = "Python library for Flo by Moen Smart Water Detectors";
+    homepage = "https://github.com/bachya/aioflo";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
new file mode 100644
index 000000000000..f6822ede08cd
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, aiohttp
+, async-timeout
+, asyncio-dgram
+, asynctest
+, buildPythonPackage
+, cryptography
+, fetchFromGitHub
+, poetry
+, pytest-aiohttp
+, pytest-asyncio
+, pytestCheckHook
+, pythonAtLeast
+, voluptuous
+}:
+
+buildPythonPackage rec {
+  pname = "aioguardian";
+  version = "1.0.4";
+  disabled = pythonAtLeast "3.9";
+
+  src = fetchFromGitHub {
+    owner = "bachya";
+    repo = pname;
+    rev = version;
+    sha256 = "1cbxcsxh9c8r2zx3lsjdns26sm2qmlwnqgah2sfzbgp1lay23vvq";
+  };
+
+  format = "pyproject";
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+    asyncio-dgram
+    voluptuous
+  ];
+
+  checkInputs = [
+    asyncio-dgram
+    asynctest
+    pytest-aiohttp
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # Ignore the examples as they are prefixed with test_
+  pytestFlagsArray = [ "--ignore examples/" ];
+  pythonImportsCheck = [ "aioguardian" ];
+
+  meta = with lib; {
+    description = " Python library to interact with Elexa Guardian devices";
+    longDescription = ''
+      aioguardian is a Pytho3, asyncio-focused library for interacting with the
+      Guardian line of water valves and sensors from Elexa.
+    '';
+    homepage = "https://github.com/bachya/aioguardian";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aioh2/default.nix b/nixpkgs/pkgs/development/python-modules/aioh2/default.nix
index 6af4c4230b0e..1ae997c60e8c 100644
--- a/nixpkgs/pkgs/development/python-modules/aioh2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioh2/default.nix
@@ -19,5 +19,6 @@ buildPythonPackage rec {
     description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio";
     license = licenses.bsd3;
     maintainers = [ maintainers.qyliss ];
+    broken = true; # requires h2<4
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix
new file mode 100644
index 000000000000..5a51f66b16a0
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, cryptography
+, fetchFromGitHub
+, poetry
+, pytest-aiohttp
+, pytestCheckHook
+, pythonAtLeast
+, zeroconf
+}:
+
+buildPythonPackage rec {
+  pname = "aiohomekit";
+  version = "0.2.60";
+  format = "pyproject";
+  disabled = pythonAtLeast "3.9";
+
+  src = fetchFromGitHub {
+    owner = "Jc2k";
+    repo = pname;
+    rev = version;
+    sha256 = "03llk5i22hq163x568kz0qar5h0sda8f8cxbmgya6z2dcxv0a83p";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [
+    cryptography
+    zeroconf
+  ];
+
+  checkInputs = [
+    pytest-aiohttp
+    pytestCheckHook
+  ];
+
+  # Some test requires network access
+  disabledTests = [
+    "test_remove_pairing"
+    "test_pair"
+    "test_add_and_remove_pairings"
+  ];
+
+  pythonImportsCheck = [ "aiohomekit" ];
+
+  meta = with lib; {
+    description = "Python module that implements the HomeKit protocol";
+    longDescription = ''
+      This Python library implements the HomeKit protocol for controlling
+      Homekit accessories.
+    '';
+    homepage = "https://github.com/Jc2k/aiohomekit";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
index 861dbb9bf071..8a8f7c4b3132 100644
--- a/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
@@ -4,20 +4,13 @@
 
 buildPythonPackage rec {
   pname = "aiohttp_remotes";
-  version = "0.1.2";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc";
+    sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch";
-      sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs";
-    })
-  ];
-
   propagatedBuildInputs = [ aiohttp ];
 
   checkInputs = [ pytest pytestcov pytest-aiohttp ];
diff --git a/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix b/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix
index e3f046e10fc8..6345755bffc7 100644
--- a/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix
@@ -1,24 +1,45 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder, isPy36
-, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }:
+{ lib
+, asynctest
+, buildPythonPackage
+, docutils
+, fetchFromGitHub
+, imaplib2
+, mock
+, nose
+, pyopenssl
+, pytestCheckHook
+, pythonOlder
+, pytz
+, tzlocal
+}:
 
 buildPythonPackage rec {
   pname = "aioimaplib";
-  version = "0.7.15";
+  version = "0.7.18";
 
-  # PyPI tarball doesn't ship tests
   src = fetchFromGitHub {
     owner = "bamthomas";
     repo = pname;
     rev = version;
-    sha256 = "15nny3y8pwaizq1zmkg43ym5jszk2hs010z12yn2d0j1fibymwbj";
+    sha256 = "037fxwmkdfb95cqcykrhn37p138wg9pvlsgdf45vyn1mhz5crky5";
   };
 
-  disabled = !(isPy3k && pythonOlder "3.7");
+  checkInputs = [
+    asynctest
+    docutils
+    imaplib2
+    mock
+    nose
+    pyopenssl
+    pytestCheckHook
+    pytz
+    tzlocal
+  ];
 
-  checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ];
-
-  # https://github.com/bamthomas/aioimaplib/issues/35
-  doCheck = !isPy36;
+  # Project is using asynctest with doesn't work with Python 3.8 and above
+  # https://github.com/bamthomas/aioimaplib/issues/54
+  doCheck = pythonOlder "3.8";
+  pythonImportsCheck = [ "aioimaplib" ];
 
   meta = with lib; {
     description = "Python asyncio IMAP4rev1 client library";
diff --git a/nixpkgs/pkgs/development/python-modules/aiokef/default.nix b/nixpkgs/pkgs/development/python-modules/aiokef/default.nix
new file mode 100644
index 000000000000..c153ff37d8c2
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aiokef/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-cov
+, pytestCheckHook
+, pytest-mypy
+, pythonOlder
+, tenacity
+}:
+
+buildPythonPackage rec {
+  pname = "aiokef";
+  version = "0.2.17";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "basnijholt";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
+  };
+
+  propagatedBuildInputs = [
+    async-timeout
+    tenacity
+  ];
+
+  checkInputs = [
+    pytest-cov
+    pytest-mypy
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "tests" ];
+  pythonImportsCheck = [ "aiokef" ];
+
+  meta = with lib; {
+    description = "Python API for KEF speakers";
+    homepage = "https://github.com/basnijholt/aiokef";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
index 7b33b1c508f8..748ed242ae9a 100644
--- a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "aiolifx";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e";
+    sha256 = "0c28e9c058ee504a07eec11cb333bc6496d233da100dcab9c33549e9eb4985c0";
   };
 
   # tests are not implemented
diff --git a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix
index a199878fc216..94f503fe2cc3 100644
--- a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pkgs, async-timeout, hiredis, isPyPy, isPy27
 }:
 
@@ -15,12 +15,12 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     async-timeout
-  ] ++ stdenv.lib.optional (!isPyPy) hiredis;
+  ] ++ lib.optional (!isPyPy) hiredis;
 
   # Wants to run redis-server, hardcoded FHS paths, too much trouble.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Asyncio (PEP 3156) Redis client library";
     homepage = "https://github.com/aio-libs/aioredis";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix
new file mode 100644
index 000000000000..f53877e03a3c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, netifaces
+}:
+
+buildPythonPackage rec {
+  pname = "aioshelly";
+  version = "0.5.4";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-EjzWx3wcmTfB3OmN0OB37K6wYKVO3HzGEIf+uihas8k=";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    netifaces
+  ];
+
+  # Project has no test
+  doCheck = false;
+  pythonImportsCheck = [ "aioshelly" ];
+
+  meta = with lib; {
+    description = "Python library to control Shelly";
+    homepage = "https://github.com/home-assistant-libs/aioshelly";
+    changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix b/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
index e616a5363477..44cae12cba52 100644
--- a/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
@@ -1,32 +1,31 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
-, setuptools
 , aiounittest
+, buildPythonPackage
+, fetchPypi
 , isPy27
-, pytest
+, pytestCheckHook
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "aiosqlite";
-  version = "0.12.0";
+  version = "0.16.0";
   disabled = isPy27;
 
-  src = fetchFromGitHub {
-    owner = "jreese";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "090vdv210zfry0bms5b3lmm06yhiyjb8ga96996cqs611l7c2a2j";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1a0fjmlvadyzsml10g5p1qif7192k0swy5zwjp8v48y5zc3yy56h";
   };
 
-  buildInputs = [
-    setuptools
-  ];
-
   checkInputs = [
     aiounittest
+    pytestCheckHook
+    typing-extensions
   ];
 
+  # tests are not pick-up automatically by the hook
+  pytestFlagsArray = [ "aiosqlite/tests/*.py" ];
+
   meta = with lib; {
     description = "Asyncio bridge to the standard sqlite3 module";
     homepage = "https://github.com/jreese/aiosqlite";
diff --git a/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/nixpkgs/pkgs/development/python-modules/aiostream/default.nix
new file mode 100644
index 000000000000..a48e2ae02401
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aiostream/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, pytestcov
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "aiostream";
+  version = "0.4.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "vxgmichel";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1wwnjrzkd61k3arxzk7yhg7cc1099bcwr5kz5n91ai6ma5ln139s";
+  };
+
+  checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ];
+
+  meta = with lib; {
+    description = "Generator-based operators for asynchronous iteration";
+    homepage = "https://aiostream.readthedocs.io";
+    license = licenses.gpl3Only;
+    maintainers = [ maintainers.rmcgibbo ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix
new file mode 100644
index 000000000000..115da7dfca40
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, aiohttp
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, pytest-aiohttp
+, pytest-asyncio
+, pytest-sugar
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aioswitcher";
+  version = "1.2.2";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "TomerFi";
+    repo = pname;
+    rev = version;
+    sha256 = "0wvca1jbyj4bwrpkpklbxnkvdp9zs7mrvg5b9vkx2hpyr81vyxam";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [
+    asynctest
+    pytest-aiohttp
+    pytest-asyncio
+    pytest-sugar
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aioswitcher" ];
+
+  meta = with lib; {
+    description = "Python module to interact with Switcher water heater";
+    homepage = "https://github.com/TomerFi/aioswitcher";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix b/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix
new file mode 100644
index 000000000000..3b02916d229f
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aiowinreg";
+  version = "0.0.4";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "956278a90ef6958f9e2392891b2a305273f695b15b14489cd2097197d6cbe155";
+  };
+
+  # Project doesn't have tests
+  doCheck = false;
+  pythonImportsCheck = [ "aiowinreg" ];
+
+  meta = with lib; {
+    description = "Python module to parse the registry hive";
+    homepage = "https://github.com/skelsec/aiowinreg";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix
index b89ba73b0d64..d73ae2b35dfb 100644
--- a/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , netifaces
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ netifaces ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure python implementation of multicast DNS service discovery";
     homepage = "https://github.com/jstasiak/python-zeroconf";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/airly/default.nix b/nixpkgs/pkgs/development/python-modules/airly/default.nix
new file mode 100644
index 000000000000..e75653fb684a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/airly/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "airly";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ak-ambi";
+    repo = "python-airly";
+    rev = "v${version}";
+    sha256 = "0an6nbl0i5pahxm6x4z03s9apzgqrw9zf7srjcs0r3y1ppicb4s6";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    "InstallationsLoaderTestCase"
+    "MeasurementsSessionTestCase"
+  ];
+  pythonImportsCheck = [ "airly" ];
+
+  meta = with lib; {
+    description = "Python module for getting air quality data from Airly sensors";
+    homepage = "https://github.com/ak-ambi/python-airly";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/ajpy/default.nix b/nixpkgs/pkgs/development/python-modules/ajpy/default.nix
index 5f42646dd998..0dd135e139fd 100644
--- a/nixpkgs/pkgs/development/python-modules/ajpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ajpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ajpy";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # ajpy doesn't have tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AJP package crafting library";
     homepage = "https://github.com/hypn0s/AJPy/";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/alabaster/default.nix b/nixpkgs/pkgs/development/python-modules/alabaster/default.nix
index d54741b63ea2..b4cc69e555bc 100644
--- a/nixpkgs/pkgs/development/python-modules/alabaster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alabaster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pygments }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bitprophet/alabaster";
     description = "A Sphinx theme";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix b/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix
index ef8b74bb9d71..b563a80447f2 100644
--- a/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb
 , pyopenssl, nose, isPy3k, pythonOlder, mock }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   checkInputs = [ nose mock ];
   pythonImportsCheck = [ "alarmdecoder" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nutechsoftware/alarmdecoder";
     description =
       "Python interface for the Alarm Decoder (AD2) family of alarm devices. (AD2USB, AD2SERIAL and AD2PI)";
diff --git a/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/nixpkgs/pkgs/development/python-modules/alembic/default.nix
index 4061dca8aa28..142c6d1c416c 100644
--- a/nixpkgs/pkgs/development/python-modules/alembic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alembic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, mock, coverage, setuptools
 , Mako, sqlalchemy, python-editor, dateutil
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # no traditional test suite
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/zzzeek/alembic";
     description = "A database migration tool for SQLAlchemy";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
index f8a3b9684805..dd2d82578ea2 100644
--- a/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk
 }:
 
 buildPythonPackage rec {
   pname = "alerta-server";
-  version = "8.1.0";
+  version = "8.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32a97eee95aea5527f6efa844c18b727fe4a6d61356ea3c0769a29a163ddcb7e";
+    sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97";
   };
 
   propagatedBuildInputs = [
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://alerta.io";
     description = "Alerta Monitoring System server";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/nixpkgs/pkgs/development/python-modules/alerta/default.nix
index c8007566328a..19dd17ee3f02 100644
--- a/nixpkgs/pkgs/development/python-modules/alerta/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alerta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , six, click, requests, requests-hawk, pytz, tabulate, pythonOlder
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://alerta.io";
     description = "Alerta Monitoring System command-line interface";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/alot/default.nix b/nixpkgs/pkgs/development/python-modules/alot/default.nix
index c3b624a7bced..21c6aaff2fbc 100644
--- a/nixpkgs/pkgs/development/python-modules/alot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alot/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
     sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pazz/alot";
     description = "Terminal MUA using notmuch mail";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix
index f5076953bf20..a3b515ebeca8 100644
--- a/nixpkgs/pkgs/development/python-modules/altair/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
 , entrypoints
 , glibcLocales
 , ipython
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     pandas
     six
     toolz
-  ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+  ] ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkInputs = [
     glibcLocales
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     pytest --doctest-modules altair
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A declarative statistical visualization library for Python.";
     homepage = "https://github.com/altair-viz/altair";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix b/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
index bfce45ae206c..ed266c0db788 100644
--- a/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }:
 
 buildPythonPackage rec {
   pname = "amazon_kclpy";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Amazon Kinesis Client Library for Python";
     homepage = "https://github.com/awslabs/amazon-kinesis-client-python";
     license = licenses.amazonsl;
diff --git a/nixpkgs/pkgs/development/python-modules/amcrest/default.nix b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix
new file mode 100644
index 000000000000..772b8fbaa046
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, argcomplete
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+, requests
+, responses
+, urllib3
+}:
+
+buildPythonPackage rec {
+  pname = "amcrest";
+  version = "1.7.2";
+
+  src = fetchFromGitHub {
+    owner = "tchellomello";
+    repo = "python-amcrest";
+    rev = version;
+    sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy";
+  };
+
+  propagatedBuildInputs = [
+    argcomplete
+    requests
+    urllib3
+  ];
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+    responses
+  ];
+
+  pythonImportsCheck = [ "amcrest" ];
+
+  meta = with lib; {
+    description = "Python module for Amcrest and Dahua Cameras";
+    homepage = "https://github.com/tchellomello/python-amcrest";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/amply/default.nix b/nixpkgs/pkgs/development/python-modules/amply/default.nix
index 1962d004f41b..32bcbb4589ab 100644
--- a/nixpkgs/pkgs/development/python-modules/amply/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/amply/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , setuptools_scm
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "amply" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/willu47/amply";
     description = ''
       Allows you to load and manipulate AMPL/GLPK data as Python data structures
diff --git a/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/nixpkgs/pkgs/development/python-modules/amqp/default.nix
index 12dc1eca2a31..b614ae453d25 100644
--- a/nixpkgs/pkgs/development/python-modules/amqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/amqp/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }:
 
 buildPythonPackage rec {
   pname = "amqp";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fcd5b3baeeb7fc19b3486ff6d10543099d40ae1f5c9196eae695d1cde1b2f784";
+    sha256 = "1733ebf713050504fd9d2ebc661f1fc95b3588f99ee87d2e39c84c27bfd815dc";
   };
 
   propagatedBuildInputs = [ vine ];
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     "test_rmq.py" # requires network access
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/celery/py-amqp";
     description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/amqplib/default.nix b/nixpkgs/pkgs/development/python-modules/amqplib/default.nix
index a3e11271ade2..c7b4dc865bb8 100644
--- a/nixpkgs/pkgs/development/python-modules/amqplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/amqplib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, python }:
 
 buildPythonPackage rec {
   pname = "amqplib";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     ${python.interpreter} tests/client_0_8/run_all.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/barryp/py-amqplib";
     description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
index 97e79e4e8eb7..804402a4ca67 100644
--- a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , dateutil, mock, isPy3k }:
 
 buildPythonPackage rec {
   pname = "aniso8601";
   version = "8.1.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parses ISO 8601 strings.";
     homepage    = "https://bitbucket.org/nielsenb/aniso8601";
     license     = licenses.bsd3;
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ dateutil ];
 
-  checkInputs = stdenv.lib.optional (!isPy3k) mock;
+  checkInputs = lib.optional (!isPy3k) mock;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/nixpkgs/pkgs/development/python-modules/annoy/default.nix b/nixpkgs/pkgs/development/python-modules/annoy/default.nix
index 138c70a38483..0bd060843809 100644
--- a/nixpkgs/pkgs/development/python-modules/annoy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/annoy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , h5py
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     nose
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk";
     homepage = "https://github.com/spotify/annoy";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/anonip/default.nix b/nixpkgs/pkgs/development/python-modules/anonip/default.nix
index de9048bde343..9c1b3abf9800 100644
--- a/nixpkgs/pkgs/development/python-modules/anonip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/anonip/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkPhase = "python tests.py";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/DigitaleGesellschaft/Anonip";
     description = "A tool to anonymize IP-addresses in log-files";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/ansi/default.nix b/nixpkgs/pkgs/development/python-modules/ansi/default.nix
index 65f51c17d7d4..d198fde80bb8 100644
--- a/nixpkgs/pkgs/development/python-modules/ansi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansi/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ansi";
-  version = "0.1.5";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02sknsbx55r6nylznslmmzzkfi3rsw7akpyzi6f1bqvr2ila8p0f";
+    sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80";
   };
 
   checkPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix b/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix
index f9d589e43696..3d96061362e9 100644
--- a/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ansicolor";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/numerodix/ansicolor/";
     description = "A library to produce ansi color output and colored highlighting and diffing";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix b/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix
index 3ea77384c797..7d6dd2127e67 100644
--- a/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "ansicolors";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/verigak/colors/";
     description = "ANSI colors for Python";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix b/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix
index d2de4837e07a..6a3571960d03 100644
--- a/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
 
 buildPythonPackage rec {
   pname = "ansiconv";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A module for converting ANSI coded text and converts it to either plain text or HTML";
     homepage = "https://github.com/ansible/ansiconv";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
index 22bddb252c8e..604c37b42ba1 100644
--- a/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, setuptools_scm, isPy3k }:
 
 buildPythonPackage rec {
@@ -22,18 +22,18 @@ buildPythonPackage rec {
   # Failing tests on Python 3
   # https://github.com/pytest-dev/apipkg/issues/17
   checkPhase = let
-    disabledTests = stdenv.lib.optionals isPy3k [
+    disabledTests = lib.optionals isPy3k [
       "test_error_loading_one_element"
       "test_aliasmodule_proxy_methods"
       "test_eagerload_on_bython"
     ];
-    testExpression = stdenv.lib.optionalString (disabledTests != [])
-    "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'";
+    testExpression = lib.optionalString (disabledTests != [])
+    "-k 'not ${lib.concatStringsSep " and not " disabledTests}'";
   in ''
     py.test ${testExpression}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Namespace control and lazy-import mechanism";
     homepage = "https://github.com/pytest-dev/apipkg";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix
index 5c260692887a..c3f318503884 100644
--- a/nixpkgs/pkgs/development/python-modules/apprise/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix
@@ -1,27 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, installShellFiles
 , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml
-, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox, gntp, sleekxmpp
+, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp
 }:
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "0.8.9";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "024db00c6a80dbc8c9038b2de211c9fd32963046612882f3f54ad78930f3e0f7";
+    sha256 = "bab3563bc1e0c64938c4c7700112797bd99f20eb5d4a3e6038338bc8f060e153";
   };
 
-  nativeBuildInputs = [ Babel ];
+  nativeBuildInputs = [ Babel installShellFiles ];
 
   propagatedBuildInputs = [
     requests requests_oauthlib six click markdown pyyaml
   ];
 
   checkInputs = [
-    pytestrunner coverage flake8 mock pytest pytestcov tox gntp sleekxmpp
+    pytestrunner coverage flake8 mock pytestCheckHook pytestcov tox gntp sleekxmpp
   ];
 
+  disabledTests = [ "test_apprise_cli_nux_env"  ];
+
+  postInstall = ''
+    installManPage packaging/man/apprise.1
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/caronc/apprise";
     description = "Push Notifications that work with just about every platform!";
diff --git a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
index a7b0b51d8f1c..bc47de371288 100644
--- a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }:
 
 buildPythonPackage rec {
   version = "0.2.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
       --replace "pyperclip==1.5.27" "pyperclip>=1.5.27"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assertion/verification library to aid testing";
     homepage = "https://github.com/approvals/ApprovalTests.Python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/nixpkgs/pkgs/development/python-modules/apptools/default.nix
index 47144fc07aa0..a03b051b11d2 100644
--- a/nixpkgs/pkgs/development/python-modules/apptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apptools/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   ];
 
   doCheck = true;
-  checkPhase = ''HOME=$TMP nosetests'';
+  checkPhase = "HOME=$TMP nosetests";
 
   meta = with lib; {
     description = "Set of packages that Enthought has found useful in creating a number of applications.";
diff --git a/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/nixpkgs/pkgs/development/python-modules/apsw/default.nix
index 1f314dc7408a..de74480765a0 100644
--- a/nixpkgs/pkgs/development/python-modules/apsw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apsw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
 , sqlite, isPyPy }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   buildInputs = [ sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python wrapper for the SQLite embedded relational database engine";
     homepage = "https://github.com/rogerbinns/apsw";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
new file mode 100644
index 000000000000..4506f422f928
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "archinfo";
+  version = "9.0.5327";
+
+  src = fetchFromGitHub {
+    owner = "angr";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0r7nj2hf51c954ihfxyhpbz1sd9lrc6i9zfkz11s22wpggvp06mz";
+  };
+
+  checkInputs = [
+    nose
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "archinfo" ];
+
+  meta = with lib; {
+    description = "Classes with architecture-specific information";
+    homepage = "https://github.com/angr/archinfo";
+    license = with licenses; [ bsd2 ];
+    maintainers = [ maintainers.fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/aresponses/default.nix b/nixpkgs/pkgs/development/python-modules/aresponses/default.nix
index 56093192d6c7..53353a137886 100644
--- a/nixpkgs/pkgs/development/python-modules/aresponses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aresponses/default.nix
@@ -1,23 +1,25 @@
 { lib
-, buildPythonPackage
-, fetchPypi
-# propagatedBuildInputs
 , aiohttp
-# buildInputs
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
 , pytest
 , pytest-asyncio
-, isPy3k
+, pytest-cov
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "aresponses";
-  version = "2.0.0";
+  version = "2.1.2";
 
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "58693a6b715edfa830a20903ee1d1b2a791251923f311b3bebf113e8ff07bb35";
+  src = fetchFromGitHub {
+    owner = "CircleUp";
+    repo = pname;
+    rev = version;
+    sha256 = "007wrk4wdy97a81imgzxd6sm5dly9v7abmxh9fyfi0vp1p7s75bw";
   };
 
   propagatedBuildInputs = [
@@ -29,13 +31,27 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
-  # tests only distributed via git repository, not pypi
-  doCheck = false;
+  checkInputs = [
+    aiohttp
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  # Disable tests which requires network access
+  disabledTests = [
+    "test_foo"
+    "test_passthrough"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [ "aresponses" ];
 
   meta = with lib; {
     description = "Asyncio testing server";
     homepage = "https://github.com/circleup/aresponses";
     license = licenses.mit;
-    maintainers = [ maintainers.makefu ];
+    maintainers = with maintainers; [ makefu ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/argh/default.nix b/nixpkgs/pkgs/development/python-modules/argh/default.nix
index 544a66c05821..0e2beb6a31eb 100644
--- a/nixpkgs/pkgs/development/python-modules/argh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/argh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/neithere/argh/";
     description = "An unobtrusive argparse wrapper with natural syntax";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/args/default.nix b/nixpkgs/pkgs/development/python-modules/args/default.nix
index ae66713361c2..cb349484f276 100644
--- a/nixpkgs/pkgs/development/python-modules/args/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/args/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "args";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command Arguments for Humans";
     homepage = "https://github.com/kennethreitz/args";
   };
diff --git a/nixpkgs/pkgs/development/python-modules/aria2p/default.nix b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
index a7d8221d78ef..076fec8c56ba 100644
--- a/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
 , aria2, poetry, pytest, pytestcov, pytest_xdist, responses
 , asciimatics, loguru, requests, setuptools, websocket_client
 }:
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pawamoy/aria2p";
     description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/asana/default.nix b/nixpkgs/pkgs/development/python-modules/asana/default.nix
index 71c003ef9b0a..ed5e441df970 100644
--- a/nixpkgs/pkgs/development/python-modules/asana/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asana/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six
-, fetchFromGitHub, responses, stdenv
+, fetchFromGitHub, responses, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client library for Asana";
     homepage = "https://github.com/asana/python-asana";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix b/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix
index e838ec787c31..4988a04e8e44 100644
--- a/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix
@@ -1,8 +1,17 @@
-{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart
-, pytestCheckHook, starlette, httpx, pytest-asyncio }:
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchFromGitHub
+, itsdangerous
+, python-multipart
+, pytestCheckHook
+, starlette
+, httpx
+, pytest-asyncio
+}:
 
 buildPythonPackage rec {
-  version = "0.7.1";
+  version = "0.8";
   pname = "asgi-csrf";
   disabled = isPy27;
 
@@ -11,7 +20,7 @@ buildPythonPackage rec {
     owner = "simonw";
     repo = pname;
     rev = version;
-    sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf";
+    sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw=";
   };
 
   propagatedBuildInputs = [
@@ -26,14 +35,11 @@ buildPythonPackage rec {
     starlette
   ];
 
-  # tests fail while importing a private module from httpx
-  #  E   ModuleNotFoundError: No module named 'httpx._content_streams'
-  # https://github.com/simonw/asgi-csrf/issues/18
-  doCheck = false;
+  doCheck = false; # asgi-lifespan missing
 
   pythonImportsCheck = [ "asgi_csrf" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ASGI middleware for protecting against CSRF attacks";
     license = licenses.asl20;
     homepage = "https://github.com/simonw/asgi-csrf";
diff --git a/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
index dc7b160b9432..ec630c40d034 100644
--- a/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
@@ -5,6 +5,7 @@
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
+, lib
 }:
 
 buildPythonPackage rec {
@@ -27,7 +28,11 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
-  meta = with stdenv.lib; {
+  disabledTests = lib.optionals stdenv.isDarwin [
+    "test_multiprocessing"
+  ];
+
+  meta = with lib; {
     description = "Reference ASGI adapters and channel layers";
     license = licenses.bsd3;
     homepage = "https://github.com/django/asgiref";
diff --git a/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix b/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix
index 6af5b3da8808..2735bbf2f70f 100644
--- a/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }:
 
 buildPythonPackage rec {
   pname = "asn1ate";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyparsing ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for translating ASN.1 into other forms";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/python-modules/astral/default.nix b/nixpkgs/pkgs/development/python-modules/astral/default.nix
index 6c4afec6352e..4ea53e17eb0e 100644
--- a/nixpkgs/pkgs/development/python-modules/astral/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astral/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }:
 
 buildPythonPackage rec {
   pname = "astral";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     py.test -m "not webtest"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Calculations for the position of the sun and the moon";
     homepage = "https://github.com/sffjunkie/astral/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/astunparse/default.nix b/nixpkgs/pkgs/development/python-modules/astunparse/default.nix
index 0947b3877b5e..c9001da5c70f 100644
--- a/nixpkgs/pkgs/development/python-modules/astunparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astunparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , six
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # tests not included with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This is a factored out version of unparse found in the Python source distribution";
     homepage = "https://github.com/simonpercivall/astunparse";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix
new file mode 100644
index 000000000000..14c800f568b0
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "asyncio-dgram";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "jsbronder";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm";
+  };
+
+  # OSError: AF_UNIX path too long
+  doCheck = !stdenv.isDarwin;
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-asyncio
+  ];
+
+  disabledTests = [ "test_protocol_pause_resume" ];
+  pythonImportsCheck = [ "asyncio_dgram" ];
+
+  meta = with lib; {
+    description = "Python support for higher level Datagram";
+    homepage = "https://github.com/jsbronder/asyncio-dgram";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
index dc990325bfe6..d3684ea57200 100644
--- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , cryptography
 , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
 , openssl, openssh, pytestCheckHook }:
@@ -46,7 +46,7 @@ buildPythonPackage rec {
 
   disabledTests = [ "test_expired_root" "test_confirm" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
     homepage = "https://asyncssh.readthedocs.io/en/latest";
     license = licenses.epl20;
diff --git a/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
index ba8f212d2f34..077c5078caae 100644
--- a/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "asyncwhois";
-  version = "0.2.0";
+  version = "0.2.3";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rdmg59jzzfz59b3ckg5187lc0wk9r0pzp9x09nq3xs21mcwqjxz";
+    sha256 = "95df90d5be581e3c69398abc6a3ec69a4e568852d9d6df4582bfcc0e22ffb3bb";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/asysocks/default.nix b/nixpkgs/pkgs/development/python-modules/asysocks/default.nix
new file mode 100644
index 000000000000..66c66535a127
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/asysocks/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "asysocks";
+  version = "0.0.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11ygrhkqm524i4qp2myjvpsmg1lsn32nsqxqla96sbj84qfnhv0q";
+  };
+
+  # Upstream hasn't release the tests yet
+  doCheck = false;
+  pythonImportsCheck = [ "asysocks" ];
+
+  meta = with lib; {
+    description = "Python Socks4/5 client and server library";
+    homepage = "https://github.com/skelsec/asysocks";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix b/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix
new file mode 100644
index 000000000000..c8307608204a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pysnmp
+}:
+
+buildPythonPackage rec {
+  pname = "atenpdu";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1np9p3d180c26p54nw33alb003lhx6fprr21h45dd8gqk3slm13c";
+  };
+
+  propagatedBuildInputs = [ pysnmp ];
+
+  # Project has no test
+  doCheck = false;
+  pythonImportsCheck = [ "atenpdu" ];
+
+  meta = with lib; {
+    description = "Python interface to control ATEN PE PDUs";
+    homepage = "https://github.com/mtdcr/pductl";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix b/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix
index 670361b9a9ef..7bcb36d548d8 100644
--- a/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, cffi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, cffi }:
 
 buildPythonPackage rec {
   pname = "atomiclong";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   buildInputs = [ pytest ];
   propagatedBuildInputs = [ cffi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Long data type with atomic operations using CFFI";
     homepage = "https://github.com/dreid/atomiclong";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix b/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix
index 03401f226a2e..e958b0f16d62 100644
--- a/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "atomicwrites";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   doCheck = false;
   checkInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Atomic file writes on POSIX";
     homepage = "https://pypi.python.org/pypi/atomicwrites";
     maintainers = with maintainers; [ matthiasbeyer ];
diff --git a/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/nixpkgs/pkgs/development/python-modules/atomman/default.nix
index 9e5eb34da3b1..147d2e77debc 100644
--- a/nixpkgs/pkgs/development/python-modules/atomman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atomman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , cython
 , datamodeldict
 , matplotlib
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     py.test tests -k 'not test_atomic'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/usnistgov/atomman/";
     description = "Atomistic Manipulation Toolkit";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
index 8369a49b7db8..6b8b8dccef81 100644
--- a/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , configparser
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mjdrushton/atsim-potentials";
     description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/attrdict/default.nix b/nixpkgs/pkgs/development/python-modules/attrdict/default.nix
index 1dfbf32c995b..5c7514f9da63 100644
--- a/nixpkgs/pkgs/development/python-modules/attrdict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/attrdict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }:
 
 buildPythonPackage rec {
   pname = "attrdict";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ coverage nose six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A dict with attribute-style access";
     homepage = "https://github.com/bcj/AttrDict";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix
index 1adee4403b9b..fc3adf2534e7 100644
--- a/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi
 , attrs
 , bidict
 , bitstruct
@@ -18,9 +18,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "bidict>=0.17,<0.18" "bidict" \
-      --replace "more-itertools>=4.0,<8.0" "more-itertools" \
-      --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0"
+      --replace "'attrs>=18.2,<19.4'" "'attrs'"
   '';
 
   propagatedBuildInputs = [
@@ -35,8 +33,6 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  disabled = pythonOlder "3.6";
-
   meta = with lib; {
     homepage = "https://github.com/thebigmunch/audio-metadata";
     description = "A library for reading and, in the future, writing metadata from audio files";
diff --git a/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/nixpkgs/pkgs/development/python-modules/authlib/default.nix
index e3d8c99e0ea1..3e6faae9af09 100644
--- a/nixpkgs/pkgs/development/python-modules/authlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/authlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
@@ -8,14 +8,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.15.2";
+  version = "0.15.3";
   pname = "authlib";
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "authlib";
     rev = "v${version}";
-    sha256 = "0jsqh2nirx3xifsakqdpd3wpdig6czavv3yj4lyqz3wh9xjpvswg";
+    sha256 = "1lqicv8awyygqh1z8vhwvx38dw619kgbirdn8c9sc3qilagq1rdx";
   };
 
   propagatedBuildInputs = [ cryptography requests ];
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     PYTHONPATH=$PWD:$PYTHONPATH pytest tests/{core,files}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lepture/authlib";
     description = "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included.";
     maintainers = with maintainers; [ flokli ];
diff --git a/nixpkgs/pkgs/development/python-modules/authres/default.nix b/nixpkgs/pkgs/development/python-modules/authres/default.nix
index 372fb03a9472..c3d0402d48d1 100644
--- a/nixpkgs/pkgs/development/python-modules/authres/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/authres/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, python }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, python }:
 
 buildPythonPackage rec {
   pname = "authres";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m authres
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Email Authentication-Results Headers generation and parsing for Python/Python3";
     longDescription = ''
       Python module that implements various internet RFC's: 5451/7001/7601
diff --git a/nixpkgs/pkgs/development/python-modules/autograd/default.nix b/nixpkgs/pkgs/development/python-modules/autograd/default.nix
index 6d56775d90c3..fef97a7a6f48 100644
--- a/nixpkgs/pkgs/development/python-modules/autograd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/autograd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, future }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, future }:
 
 buildPythonPackage rec {
   pname = "autograd";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/HIPS/autograd";
     description = "Compute derivatives of NumPy code efficiently";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/autologging/default.nix b/nixpkgs/pkgs/development/python-modules/autologging/default.nix
index 7a3b36c35141..7cd66dc2c3fe 100644
--- a/nixpkgs/pkgs/development/python-modules/autologging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/autologging/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "Autologging";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://ninthtest.info/python-autologging/";
     description = "Easier logging and tracing for Python classes";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/automat/default.nix b/nixpkgs/pkgs/development/python-modules/automat/default.nix
index 78a3259a2878..fa395f119ee5 100644
--- a/nixpkgs/pkgs/development/python-modules/automat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/automat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   m2r, setuptools_scm, six, attrs }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # this creates a circular dependency.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/glyph/Automat";
     description = "Self-service finite-state machines for the programmer on the go";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
index 1b40aa9c1408..afeaef406611 100644
--- a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales
+{ lib, stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales
 , toml
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
     homepage = "https://pypi.python.org/pypi/autopep8/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/av/default.nix b/nixpkgs/pkgs/development/python-modules/av/default.nix
index 594ac42018b2..c2edbdcf6a38 100644
--- a/nixpkgs/pkgs/development/python-modules/av/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/av/default.nix
@@ -4,7 +4,7 @@
 , isPy27
 , numpy
 , ffmpeg
-, pkgconfig
+, pkg-config
 }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   checkInputs = [ numpy ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ffmpeg ];
 
   # Tests require downloading files from internet
diff --git a/nixpkgs/pkgs/development/python-modules/avea/default.nix b/nixpkgs/pkgs/development/python-modules/avea/default.nix
new file mode 100644
index 000000000000..64e0dc286330
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/avea/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, bluepy
+}:
+
+buildPythonPackage rec {
+  pname = "avea";
+  version = "1.5.2";
+
+  src = fetchFromGitHub {
+    owner = "k0rventen";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v";
+  };
+
+  propagatedBuildInputs = [
+    bluepy
+  ];
+
+  # no tests are present
+  doCheck = false;
+  pythonImportsCheck = [ "avea" ];
+
+  meta = with lib; {
+    description = "Python module for interacting with Elgato's Avea bulb";
+    homepage = "https://github.com/k0rventen/avea";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/avro/default.nix b/nixpkgs/pkgs/development/python-modules/avro/default.nix
index d9f57686845d..35cab724a862 100644
--- a/nixpkgs/pkgs/development/python-modules/avro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/avro/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }:
 
 buildPythonPackage rec {
   pname = "avro";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bbf9f89fd20b4cf3156f10ec9fbce83579ece3e0403546c305957f9dac0d2f03";
+    sha256 = "b3a405df5aa8654b992d2aca7b80482b858a1919a44dc0b10a682162e8ee340a";
   };
 
   patchPhase = ''
     # this test requires network access
     sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py
-  '' + (stdenv.lib.optionalString isPy3k ''
+  '' + (lib.optionalString isPy3k ''
     # these files require twisted, which is not python3 compatible
     rm avro/txipc.py
     rm avro/test/txsample*
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pycodestyle ];
   propagatedBuildInputs = [ isort ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A serialization and RPC framework";
     homepage = "https://pypi.python.org/pypi/avro/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/avro3k/default.nix b/nixpkgs/pkgs/development/python-modules/avro3k/default.nix
index 59d09b3f25f0..b600bc75c7a3 100644
--- a/nixpkgs/pkgs/development/python-modules/avro3k/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/avro3k/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "avro3k";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   doCheck = false;        # No such file or directory: './run_tests.py
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A serialization and RPC framework";
     homepage = "https://pypi.python.org/pypi/avro3k/";
   };
diff --git a/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix
index 945c941dec4e..00882cb08279 100644
--- a/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }:
 
 buildPythonPackage rec {
   pname = "awesome-slugify";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
       ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dimka665/awesome-slugify";
     description = "Python flexible slugify function";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix
new file mode 100644
index 000000000000..2c00baf39a8b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "awesomeversion";
+  version = "21.1.3";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "ludeeus";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-D31wmBrYFCArHddAINWjfTPow4K2TD+wGfmRUuIaBdA=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "main" ${version}
+  '';
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "awesomeversion" ];
+
+  meta = with lib; {
+    description = "Python module to deal with versions";
+    homepage = "https://github.com/ludeeus/awesomeversion";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix
index 9b9ca52b947b..298074f300d9 100644
--- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d856b4a166ae054363368aed2e4a44338fec069baa4242e7d567c8323ebcc1eb";
+    sha256 = "3468cb80cab51252a1936e5e593c7df4588ea0e18dcb6fb31e3d2913ba883928";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/python-modules/awkward0/default.nix b/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
index 4441d131e637..c248c81da751 100644
--- a/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "awkward0";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "awkward-0.x";
     rev = version;
-    sha256 = "17zrw25h6g5m4ik1c5piqb7q2bxrshfm4hm3lzfz4s8gi0xjm5gz";
+    sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU=";
   };
 
   nativeBuildInputs = [ pytestrunner ];
diff --git a/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix
new file mode 100644
index 000000000000..68b44ea5a5d5
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "AWSIoTPythonSDK";
+  version = "1.4.9";
+
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = "aws-iot-device-sdk-python";
+    rev = "v${version}";
+    sha256 = "0mbppz1lnia4br5vjz1l4z4vw47y3bzcfpckzhs9lxhj4vq6d001";
+  };
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "AWSIoTPythonSDK" ];
+
+  meta = with lib; {
+    description = "Python SDK for connecting to AWS IoT";
+    homepage = "https://github.com/aws/aws-iot-device-sdk-python";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/axis/default.nix b/nixpkgs/pkgs/development/python-modules/axis/default.nix
new file mode 100644
index 000000000000..707d958bab53
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/axis/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, httpx
+, packaging
+, xmltodict
+}:
+
+buildPythonPackage rec {
+  pname = "axis";
+  version = "43";
+
+  src = fetchFromGitHub {
+    owner = "Kane610";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1p9yfixsrkw7rxbvgybcb653rbqv0x18wzqkh620g193snm9sgm2";
+  };
+
+  propagatedBuildInputs = [
+    attrs
+    httpx
+    packaging
+    xmltodict
+  ];
+
+  # Tests requires a server on localhost
+  doCheck = false;
+  pythonImportsCheck = [ "axis" ];
+
+  meta = with lib; {
+    description = "Python library for communicating with devices from Axis Communications";
+    homepage = "https://github.com/Kane610/axis";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
index 0ad45dceb2bb..e91a0fb07493 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
@@ -14,14 +14,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.9.0";
+  version = "1.10.0";
   pname = "azure-core";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "ef8ae93a2ce8b595f231395579be11aadc1838168cbc2582e2d0bbd8b15c461f";
+    sha256 = "b9cddf3eb239e32b14cf44750b21d7bc8d78b82aa53d57628523598dcd006803";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix b/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
index 29392699ce2b..9781fcecaaf2 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -24,6 +24,7 @@ buildPythonPackage rec {
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.eventgrid" ];
 
   meta = with lib; {
     description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
index e7d2d5c83ac0..a0120ae35060 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
@@ -18,7 +18,6 @@
 buildPythonPackage rec {
   pname = "azure-identity";
   version = "1.5.0";
-  disabled = isPy38;
 
   src = fetchPypi {
     inherit pname version;
@@ -38,11 +37,6 @@ buildPythonPackage rec {
     msrestazure
   ];
 
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace msal-extensions~=0.1.3 msal-extensions
-  '';
-
   pythonImportsCheck = [ "azure.identity" ];
 
   # Requires checkout from mono-repo and a mock account:
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
index a04f28f2a513..81afa6ff7ed0 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
@@ -5,23 +5,25 @@
 , msrestazure
 , azure-common
 , isPy3k
+, azure-mgmt-core
 , azure-mgmt-nspkg
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-advisor";
-  version = "4.0.0";
+  version = "9.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054";
+    sha256 = "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
index 759467aa9024..4432595a12e7 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
@@ -1,21 +1,27 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
 , azure-common
+, azure-mgmt-core
 , msrest
 , msrestazure
 }:
 
 buildPythonPackage rec {
-  version = "0.2.0";
+  version = "1.0.0";
   pname = "azure-mgmt-apimanagement";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72";
+    sha256 = "3ad7e2c3d20dd0141f9e2c0ae923121f7cbe7333bb314850e6f8b606636e3589";
     extension = "zip";
   };
 
-  propagatedBuildInputs = [ azure-common msrest msrestazure ];
+  propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
+    msrest
+    msrestazure
+  ];
 
   # no tests included
   doCheck = false;
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index aa188e87efa1..033ef0cccea4 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
@@ -4,24 +4,26 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-batch";
-  version = "9.0.0";
+  version = "14.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe";
+    sha256 = "1d3b2c9ebd57c8874e11d29e7dd05a1f078d2156fc9683e2f2ad41024e448bf6";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index c138dde95d01..09800f9cef36 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -2,23 +2,25 @@
 , buildPythonPackage
 , fetchPypi
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , msrestazure
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cognitiveservices";
-  version = "6.3.0";
+  version = "11.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1d029d5140152a36cc32f340e09f2b185ede2f54e577a44f3821878efb823415";
+    sha256 = "71414e3cd7445e44fc18f217f2d22df05c36877e1233328b2297d07ddf27e82a";
   };
 
   propagatedBuildInputs = [
     msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-nspkg
   ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index 1460cdb9ca37..32e6cebd1f59 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , python
 , isPy3k
@@ -10,17 +11,18 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-commerce";
-  version = "1.0.1";
+  version = "6.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1hw4crkgb72ps85m2kz9kf8p2wg9qmaagk3z5nydva9g6bnq93n4";
+    sha256 = "6f5447395503b2318f451d24f8021ee08db1cac44f1c3337ea690700419626b6";
   };
 
   propagatedBuildInputs = [
     msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-nspkg
   ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 2aca8fdbd7d0..e8a45ebf5aa4 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -8,13 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "18.0.0";
+  version = "18.1.0";
   pname = "azure-mgmt-compute";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
+    sha256 = "02de691c5ce7237993e65b0ae6154b3bf8ec32bcb15f13ade72bc7f3cb3183d4";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
index 175dd9de6e87..be22e14b574b 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
@@ -5,22 +5,24 @@
 , isPy3k
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-consumption";
-  version = "3.0.0";
+  version = "8.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0nqgywknpj2a69an5yrn0c32fk01v5gi05za7dlf4ivwr9s4np83";
+    sha256 = "b4cc167648634f864394066d5621afc137c1be795ee76f7539125f9538a2bf37";
   };
 
   propagatedBuildInputs = [
     msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-nspkg
   ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index a186017a4d3c..91f420f11ae8 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -4,24 +4,26 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datafactory";
-  version = "0.15.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "750a891005c86977c0978cd7231449aad12106d76897075fcdc95ef2e6258b00";
+    sha256 = "d4f3984eca74b1e3691467aadc09626e578ed1fc5ef410872d474f3e7653916a";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
index b149584b6a99..fc5d8ba6f018 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
@@ -7,21 +7,23 @@
 , msrestazure
 , azure-common
 , azure-mgmt-datalake-nspkg
+, azure-mgmt-core
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datalake-store";
-  version = "0.5.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c";
+    sha256 = "sha256-GrmVK97M+iojevPLVTuLmfQRLxvrHtr9DRHymJvLYHE=";
   };
 
   propagatedBuildInputs = [
     msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-datalake-nspkg
   ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index 7c5e6a1d7bab..820f737c5489 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
@@ -6,23 +6,25 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-devtestlabs";
-  version = "4.0.0";
+  version = "9.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
+    sha256 = "d8160d93fd3d947e5613c6919176b0edf72c94ac69679ea3b92cf27ff7398e64";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
index df48be1281ce..1b244818f913 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
@@ -4,23 +4,25 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-eventgrid";
-  version = "2.2.0";
+  version = "8.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1hqwcl33r98lriz3fp6h8ir36bv9danx27290idv63fj7s95h866";
+    sha256 = "a8a6e1bb105a14f1d3545ecb07c190370f21a145f8ba51599ed169f1dc8d5dcc";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
+    azure-mgmt-core
     azure-common
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
@@ -28,6 +30,7 @@ buildPythonPackage rec {
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.eventgrid" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure EventGrid Management Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
index 08915244fc4b..5547eb032d0e 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
@@ -1,21 +1,27 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
 , azure-common
+, azure-mgmt-core
 , msrest
 , msrestazure
 }:
 
 buildPythonPackage rec {
-  version = "2.1.0";
+  version = "7.0.0";
   pname = "azure-mgmt-hdinsight";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed55df52d35fc03a9c7ca060af1ec0faf7b5510381d2a5e74b73f59ac0d79028";
+    sha256 = "d0070817ee2be611d45af91eabc5665dd53f024eaa7a55e490ace4f71a55c733";
     extension = "zip";
   };
 
-  propagatedBuildInputs = [ azure-common msrest msrestazure ];
+  propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
+    msrest
+    msrestazure
+  ];
 
   # no tests included
   doCheck = false;
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index b514488ff4a4..2f368b826491 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -4,24 +4,26 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-iotcentral";
-  version = "3.1.0";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "c175f6642be514ad0efd3dc03d09e50d923596fd9e634381793dcc46bb8a57c7";
+    sha256 = "ab793fde2b5eeb73ab37434013d4b5ba7750031220013edb3c1758c45a00a91a";
   };
 
   propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
     msrest
     msrestazure
-    azure-common
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index e36e30fc16e1..c51d43ec4447 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -4,24 +4,26 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-iothub";
-  version = "0.12.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0";
+    sha256 = "7acf24088395a299974dd26406db2686d8d59a3fffbe47c24617b36d445f2de8";
   };
 
   propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
     msrest
     msrestazure
-    azure-common
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index e6fd01f73478..9eb1d2afc149 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-loganalytics";
-  version = "7.0.0";
+  version = "8.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "e603f9fc61b8d2f93d8814bcca012a8b425cf0c0320ddf1e84462929cf34d1af";
+    sha256 = "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
index 8c2b3c8fd8db..bc63084410ce 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
@@ -4,28 +4,31 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-logic";
-  version = "3.0.0";
+  version = "9.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "d163dfc32e3cfa84f3f8131a75d9e94f5c4595907332cc001e45bf7e4efd5add";
+    sha256 = "d3a780d299c4db59134bd984c4c9281b9b6ae5d4ba185bcbae43f6c3af04f85a";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-nspkg
   ];
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.logic" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure Logic Apps Management Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index a8a138d27bde..9538ed2a2345 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
@@ -6,22 +6,24 @@
 , azure-common
 , azure-mgmt-nspkg
 , isPy3k
+, azure-mgmt-core
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-marketplaceordering";
-  version = "0.2.1";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "dc765cde7ec03efe456438c85c6207c2f77775a8ce8a7adb19b0df5c5dc513c2";
+    sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 742556ef34f6..db4aa3fb77cf 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-monitor";
-  version = "1.0.1";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "04bd89d74fe47f966b09e3256ffefcfa5c1a51057a6b33c092afe5ae17a1a7b7";
+    sha256 = "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index a57bbe07f563..a89d94f3d706 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -1,21 +1,27 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
 , azure-common
+, azure-mgmt-core
 , msrest
 , msrestazure
 }:
 
 buildPythonPackage rec {
-  version = "0.14.0";
+  version = "0.15.0";
   pname = "azure-mgmt-netapp";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6fd915e68d314bec8b56c6ece194005d2c4fc97478fc1f797639d4a6913c1539";
+    sha256 = "5e98c360609a77b443b2fe431e0337e5cb705b4f02d0204791f9985f7ce68836";
     extension = "zip";
   };
 
-  propagatedBuildInputs = [ azure-common msrest msrestazure ];
+  propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
+    msrest
+    msrestazure
+  ];
 
   # no tests included
   doCheck = false;
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
index 7b4985c53331..bf9d9bab576b 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
@@ -4,23 +4,25 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-notificationhubs";
-  version = "2.1.0";
+  version = "7.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "10w53ida2nlx73vd1pczh4mkpg0lag1h19yyklx3yvgsyvahj25h";
+    sha256 = "92ffed71a2999ff5db41afd66c6ba5cfef9d467f732c7bb45b7c41db371c6e4a";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-nspkg
   ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index 6522b3c8c435..30fce3885453 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
@@ -4,30 +4,33 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-policyinsights";
-  version = "0.6.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "2c64533f6eab08dc16450fc5d7c7651557fc0edc8ef1278dda336333d648a7c4";
+    sha256 = "75103fb4541aeae30bb687dee1fedd9ca65530e6b97b2d9ea87f74816905202a";
   };
 
   propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
     msrest
     msrestazure
-    azure-common
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.policyinsights" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure Policy Insights Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index 0e96647f4925..c7cb274d68b6 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -4,30 +4,33 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-rdbms";
-  version = "2.2.0";
+  version = "8.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr";
+    sha256 = "8b018543048fc4fddb4155d9f22246ad0c4be2fb582a29dbb21ec4022724a119";
   };
 
   propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
     msrest
     msrestazure
-    azure-common
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.rdbms" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure RDBMS Management Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index a0ee8f3ce9cd..d1f49355f8b9 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -4,30 +4,33 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservices";
-  version = "0.6.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "203ebbd6b698a99975092a72d6d47285646a0264b9085fecef1e7b7c98c5d52e";
+    sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22";
   };
 
   propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
     msrest
     msrestazure
-    azure-common
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.recoveryservices" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure Recovery Services Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 229cf58cea9d..4ce18c4ae3b0 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservicesbackup";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "2debf30be50d5bb85acf4f73a2e57e11c814ead04e58f52279e5ef0a2df71d4f";
+    sha256 = "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index 46db2d3528cf..9b7444a6ecb1 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
@@ -5,22 +5,24 @@
 , isPy3k
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-relay";
-  version = "0.2.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0s5z4cil750wn770m0hdzcrpshj4bj1bglkkvxdx9l9054dk9s57";
+    sha256 = "38f6dd9d122a316efa921e72933e01ec4d76ed39d4682655b17a997079e8b20a";
   };
 
   propagatedBuildInputs = [
     msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-nspkg
   ];
 
@@ -28,6 +30,7 @@ buildPythonPackage rec {
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.relay" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure Relay Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
index c6c525176c77..e4cb5b234742 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -4,28 +4,31 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-search";
-  version = "3.0.0";
+  version = "8.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "d4c78b14b48edd2e27e2068c9a448acfc84a18595be77fe483afe7bb447e1eb6";
+    sha256 = "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e";
   };
 
   propagatedBuildInputs = [
-    msrest
-    msrestazure
     azure-common
+    azure-mgmt-core
     azure-mgmt-nspkg
+    msrest
+    msrestazure
   ];
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.search" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure Search Management Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
index 9de17636b234..a947e84f9aef 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
@@ -1,21 +1,27 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
 , azure-common
+, azure-mgmt-core
 , msrest
 , msrestazure
 }:
 
 buildPythonPackage rec {
-  version = "0.6.0";
+  version = "1.0.0";
   pname = "azure-mgmt-security";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
+    sha256 = "ae1cff598dfe80e93406e524c55c3f2cbffced9f9b7a5577e3375008a4c3bcad";
     extension = "zip";
   };
 
-  propagatedBuildInputs = [ azure-common msrest msrestazure ];
+  propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
+    msrest
+    msrestazure
+  ];
 
   # no tests included
   doCheck = false;
diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index d0a5845d9055..d4238cc8204f 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
@@ -4,30 +4,33 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-subscription";
-  version = "0.7.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "37f570b8872ae65dce312da116588ab8407a5c8a10d959597e61d19b21799f77";
+    sha256 = "22f606f298419f466a8149811fc762686c93da00a7dc15d3b7cdbf22b96cf5db";
   };
 
   propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
     msrest
     msrestazure
-    azure-common
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
 
   # has no tests
   doCheck = false;
+  pythonImportsCheck = [ "azure.mgmt.subscription" ];
 
   meta = with lib; {
     description = "This is the Microsoft Azure Subscription Management Client Library";
diff --git a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
index 2f61a2d9bad9..356de52212d0 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -11,15 +11,15 @@
 
 buildPythonPackage rec {
   pname = "azure-servicebus";
-  version = "7.0.0";
+  version = "7.0.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "875527251c1fed99fcb90597c6abb7daa4bc0ed88e080b4c36f897b704668450";
+    sha256 = "46d1e7b9da537da831c3184d42d3e2bc3c7ab9234e204a9d4c2e5dc54010721b";
   };
 
-  buildInputs = [
+  propagatedBuildInputs = [
     uamqp
     azure-common
     azure-core
diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
index 9ded3d5c7613..cd42be98f9ff 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-blob";
-  version = "12.6.0";
+  version = "12.7.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "dc7832d48ae3f5b31a0b24191084ce6ef7d8dfbf73e553dfe34eaddcb6813be3";
+    sha256 = "c6249f211684929ea6c9d34b5151b06d039775344f0d48fcf479736ed4c11b9e";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
index ad2280464497..c6413f191fce 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-file-share";
-  version = "12.3.0";
+  version = "12.4.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "9f24a0ab51fd7ad294353594660b21081233f68ed8ee7483cdca26a70ce0ccbc";
+    sha256 = "7503d05882970abc977529ff5a4b81e79f62fd51b238fe306f72e13f57a522ca";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index f33df1fdbe8d..5a414388c4c8 100644
--- a/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "azure.synapse.artifacts" ];
 
   meta = with lib; {
-    description = "CHANGE";
-    homepage = "https://github.com/CHANGE/azure-synapse-artifacts/";
+    description = "Microsoft Azure Synapse Artifacts Client Library for Python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
     maintainers = with maintainers; [ jonringer ];
   };
diff --git a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
index f807c0353990..da43f6e5690e 100644
--- a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook
 , requests, arrow, logfury, tqdm }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # requires unpackaged dependencies like liccheck
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client library and utilities for access to B2 Cloud Storage (backblaze).";
     homepage = "https://github.com/Backblaze/b2-sdk-python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/babelfish/default.nix b/nixpkgs/pkgs/development/python-modules/babelfish/default.nix
index 87769aa3ea91..5ac044292156 100644
--- a/nixpkgs/pkgs/development/python-modules/babelfish/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/babelfish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "babelfish";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/babelfish";
     description = "A module to work with countries and languages";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
new file mode 100644
index 000000000000..7db161b86110
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "backports-datetime-fromisoformat";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0p0gyhfqq6gssf3prsy0pcfq5w0wx2w3pcjqbwx3imvc92ls4xwm";
+  };
+
+  # no tests in pypi package
+  doCheck = false;
+
+  pythonImportsCheck = [ "backports.datetime_fromisoformat" ];
+
+  meta = with lib; {
+    description = "Backport of Python 3.7's datetime.fromisoformat";
+    homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix
index 656842f4434d..5fe922b90462 100644
--- a/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   pname = "backports.shutil_which";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     py.test test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Backport of shutil.which from Python 3.3";
     homepage = "https://github.com/minrk/backports.shutil_which";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix
index e2fae4897f62..5216149ddc2c 100644
--- a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, future }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, future }:
 
 buildPythonPackage rec {
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ future ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Backport of Python 3 csv module";
     homepage = "https://github.com/ryanhiebert";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/backports_os/default.nix b/nixpkgs/pkgs/development/python-modules/backports_os/default.nix
index dc969cbb4b94..b3e231bcd05d 100644
--- a/nixpkgs/pkgs/development/python-modules/backports_os/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_os/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pjdelport/backports.os";
     description = "Backport of new features in Python's os module";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix b/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
index b85c642787e6..08f98de79f27 100644
--- a/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }:
 
 buildPythonPackage rec {
   pname = "backports.unittest_mock";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "backports.unittest_mock" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a function install() which makes the mock module";
     homepage = "https://github.com/jaraco/backports.unittest_mock";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix b/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix
index 8b818398ec9e..9770fb45981d 100644
--- a/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Backports of new features in Python’s weakref module";
     license = licenses.psfl;
     maintainers = with maintainers; [ jyp ];
diff --git a/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix b/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix
index 3999efd12b67..59542e61c56b 100644
--- a/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub
 , wheel, pytestCheckHook, pytestrunner }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     "test_recurring_task_5"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/JoelBender/bacpypes";
     description = "BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces.";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bap/default.nix b/nixpkgs/pkgs/development/python-modules/bap/default.nix
index fd63294302c3..d2575afb77d2 100644
--- a/nixpkgs/pkgs/development/python-modules/bap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bap/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
+{lib, stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
 
 buildPythonPackage rec {
   pname = "bap";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages.";
     homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
     maintainers = [ maintainers.maurer ];
diff --git a/nixpkgs/pkgs/development/python-modules/base36/default.nix b/nixpkgs/pkgs/development/python-modules/base36/default.nix
new file mode 100644
index 000000000000..348422e31fa7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/base36/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "base36";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "tonyseek";
+    repo = "python-base36";
+    rev = "v${version}";
+    sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "[pytest]" "[tool:pytest]" \
+      --replace "--pep8 --cov" ""
+  '';
+
+  checkInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "test_base36.py" ];
+  pythonImportsCheck = [ "base36" ];
+
+  meta = with lib; {
+    description = "Python implementation for the positional numeral system using 36 as the radix";
+    homepage = "https://github.com/tonyseek/python-base36";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/base58/default.nix b/nixpkgs/pkgs/development/python-modules/base58/default.nix
index 42f848aa846b..a36727429ca7 100644
--- a/nixpkgs/pkgs/development/python-modules/base58/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/base58/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }:
 
 buildPythonPackage rec {
   pname = "base58";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Base58 and Base58Check implementation";
     homepage = "https://github.com/keis/base58";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/basemap/default.nix b/nixpkgs/pkgs/development/python-modules/basemap/default.nix
index a06bcebc8e6c..c97548bdee88 100644
--- a/nixpkgs/pkgs/development/python-modules/basemap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/basemap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , numpy
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://matplotlib.org/basemap/";
     description = "Plot data on map projections with matplotlib";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix b/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix
index 9ac72a21fa7d..ba4672a17746 100644
--- a/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "bash_kernel";
-  version = "0.7.1";
+  version = "0.7.2";
   format = "flit";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s2kc7m52kq28b4j1q3456g5ani6nmq4n0rpbqi3yvh7ks0rby19";
+    sha256 = "0w0nbr3iqqsgpk83rgd0f5b02462bkyj2n0h6i9dwyc1vpnq9350";
   };
 
   patches = [
diff --git a/nixpkgs/pkgs/development/python-modules/batinfo/default.nix b/nixpkgs/pkgs/development/python-modules/batinfo/default.nix
index e8516aecdc65..0ed3486272d3 100644
--- a/nixpkgs/pkgs/development/python-modules/batinfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/batinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "batinfo";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nicolargo/batinfo";
     description = "A simple Python lib to retrieve battery information";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
index ef3dfa095184..b470d21b1bea 100644
--- a/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , pytest, nose, glibcLocales
 , numpy, scipy, matplotlib, h5py }:
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     LC_ALL=en_US.utf-8 pytest -k 'not test_message_to_parents'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.bayespy.org";
     description = "Variational Bayesian inference tools for Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix b/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix
new file mode 100644
index 000000000000..34eab21bf5d0
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix
@@ -0,0 +1,49 @@
+{ lib, buildPythonPackage, fetchPypi, nose }:
+
+let
+  lark-parser = buildPythonPackage rec {
+    pname = "lark-parser";
+    version = "0.7.8";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "JiFeuxV+b7LudDGapERbnzt+RW4mviFc4Z/aqpAcIKQ=";
+    };
+
+    doCheck = true;
+  };
+in
+buildPythonPackage rec {
+  pname = "bc-python-hcl2";
+  version = "0.3.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "VZhI1oJ2EDZGyz3iI6/KYvJq4BGafzR+rcSgHqlUDrA=";
+  };
+
+  # Nose is required during build process, so can not use `checkInputs`.
+  buildInputs = [
+    nose
+  ];
+
+  propagatedBuildInputs = [
+    lark-parser
+  ];
+
+  pythonImportsCheck = [ "hcl2" ];
+
+  meta = with lib; {
+    description = "A parser for HCL2 written in Python using Lark";
+    longDescription = ''
+    A parser for HCL2 written in Python using Lark.
+    This parser only supports HCL2 and isn't backwards compatible with HCL v1.
+    It can be used to parse any HCL2 config file such as Terraform.
+    '';
+    # Although this is the main homepage from PyPi but it is also a homepage
+    # of another PyPi package (python-hcl2). But these two are different.
+    homepage = "https://github.com/amplify-education/python-hcl2";
+    license = licenses.mit;
+    maintainers = [ maintainers.anhdle14 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix b/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix
index b8cbf8537dc6..185fcb86b0b7 100644
--- a/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, docutils, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, six }:
 
 buildPythonPackage rec {
   pname = "bcdoc";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # Tests fail due to nix file timestamp normalization.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/boto/bcdoc";
     license = licenses.asl20;
     description = "ReST document generation tools for botocore";
diff --git a/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix b/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix
index dc50c56018e0..e74b0934b308 100644
--- a/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder
 , cffi, pycparser, mock, pytest, py, six }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   version = "3.2.0";
   pname = "bcrypt";
@@ -12,10 +10,12 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29";
   };
+
   buildInputs = [ pycparser mock pytest py ];
-  propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
 
-  meta = {
+  propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi;
+
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar ];
     description = "Modern password hashing for your software and your servers";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/nixpkgs/pkgs/development/python-modules/beancount/default.nix
index f1dc7a5349d9..fa97c7c97a94 100644
--- a/nixpkgs/pkgs/development/python-modules/beancount/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/beancount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , beautifulsoup4, bottle, chardet, dateutil
 , google_api_python_client, lxml, oauth2client
 , ply, python_magic, pytest, requests }:
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     pytest
   ];
 
-  meta = {
+  meta = with lib; {
     homepage = "http://furius.ca/beancount/";
     description = "Double-entry bookkeeping computer language";
     longDescription = ''
@@ -41,8 +41,8 @@ buildPythonPackage rec {
         financial transaction records in a text file, read them in memory,
         generate a variety of reports from them, and provides a web interface.
     '';
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
   };
 }
 
diff --git a/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix b/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix
index c24e9a03d158..a74f6c6f8f28 100644
--- a/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "beanstalkc";
@@ -13,10 +13,10 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "A simple beanstalkd client library for Python";
-    maintainers = with stdenv.lib.maintainers; [ aanderse ];
-    license = with stdenv.lib.licenses; [ asl20 ];
+    maintainers = with maintainers; [ aanderse ];
+    license = licenses.asl20;
     homepage = "https://github.com/earl/beanstalkc";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
index a0afd0c4f4c4..555669da243e 100644
--- a/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }:
 
 buildPythonPackage rec {
   pname = "beautifulsoup4";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ soupsieve ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://crummy.com/software/BeautifulSoup/bs4/";
     description = "HTML and XML parser";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bedup/default.nix b/nixpkgs/pkgs/development/python-modules/bedup/default.nix
index 6c0c3c44d2d4..f38d4263c248 100644
--- a/nixpkgs/pkgs/development/python-modules/bedup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bedup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , btrfs-progs
@@ -25,9 +25,9 @@ buildPythonPackage rec {
 
   buildInputs = [ btrfs-progs ];
   propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ]
-    ++ stdenv.lib.optionals (!isPyPy) [ cffi ];
+    ++ lib.optionals (!isPyPy) [ cffi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Deduplication for Btrfs";
     longDescription = ''
       Deduplication for Btrfs. bedup looks for new and changed files,
diff --git a/nixpkgs/pkgs/development/python-modules/behave/default.nix b/nixpkgs/pkgs/development/python-modules/behave/default.nix
index 26cd6441ba5a..43c74fc95716 100644
--- a/nixpkgs/pkgs/development/python-modules/behave/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/behave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , buildPythonApplication, python
 , pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html
 , glibcLocales
@@ -26,7 +26,7 @@ buildPythonApplication rec {
 
   # timing-based test flaky on Darwin
   # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ];
 
   postCheck = ''
     export LANG="en_US.UTF-8"
@@ -37,7 +37,7 @@ buildPythonApplication rec {
     ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/behave/behave";
     description = "behaviour-driven development, Python style";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/nixpkgs/pkgs/development/python-modules/bellows/default.nix
index ab50a1acd8ef..6ee8b6499b58 100644
--- a/nixpkgs/pkgs/development/python-modules/bellows/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bellows/default.nix
@@ -1,26 +1,27 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , click, click-log, pure-pcapy3
-, pyserial, pyserial-asyncio, voluptuous, zigpy
-, asynctest, pytest, pytest-asyncio }:
+, pyserial-asyncio, voluptuous, zigpy
+, asynctest, pytestCheckHook, pytest-asyncio }:
 
-let
+buildPythonPackage rec {
   pname = "bellows";
   version = "0.21.0";
 
-in buildPythonPackage rec {
-  inherit pname version;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f";
+  src = fetchFromGitHub {
+    owner = "zigpy";
+    repo = "bellows";
+    rev = version;
+    sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a";
   };
 
   propagatedBuildInputs = [
-    click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy
+    click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy
   ];
 
   checkInputs = [
-    asynctest pytest pytest-asyncio
+    asynctest
+    pytestCheckHook
+    pytest-asyncio
   ];
 
   prePatch = ''
@@ -28,7 +29,7 @@ in buildPythonPackage rec {
       --replace "click-log==0.2.0" "click-log>=0.2.0"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python 3 project to implement EZSP for EmberZNet devices";
     homepage = "https://github.com/zigpy/bellows";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/bespon/default.nix b/nixpkgs/pkgs/development/python-modules/bespon/default.nix
index 51e29e55d07f..555a0a487581 100644
--- a/nixpkgs/pkgs/development/python-modules/bespon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bespon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   pythonImportsCheck = [ "bespon" ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Encodes and decodes data in the BespON format.";
     homepage = "https://github.com/gpoore/bespon_py";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/betacode/default.nix b/nixpkgs/pkgs/development/python-modules/betacode/default.nix
index 8bd78fb49d2b..79136e479d26 100644
--- a/nixpkgs/pkgs/development/python-modules/betacode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/betacode/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5";
   };
-  preBuild = ''echo > README.rst'';
+  preBuild = "echo > README.rst";
   # setup.py uses a python3 os.path.join
   disabled = !isPy3k;
   propagatedBuildInputs = [ pygtrie ];
diff --git a/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix b/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
index e95a34d15424..424b8ef4ef36 100644
--- a/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , betamax, requests_toolbelt }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   buildInputs = [ betamax requests_toolbelt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sigmavirus24/betamax_matchers";
     description = "A group of experimental matchers for Betamax";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix b/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix
index 60a79a51d499..3d3cad4d95b5 100644
--- a/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , betamax, pyyaml }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   buildInputs = [ betamax pyyaml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.com/betamax/serializers";
     description = "A set of third-party serializers for Betamax";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/betamax/default.nix b/nixpkgs/pkgs/development/python-modules/betamax/default.nix
index 7339fcbf6485..5e1469bfc52d 100644
--- a/nixpkgs/pkgs/development/python-modules/betamax/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/betamax/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "betamax";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://betamax.readthedocs.org/en/latest/";
     description = "A VCR imitation for requests";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/nixpkgs/pkgs/development/python-modules/bidict/default.nix
index 34b9f4cf5ff0..dcb684a55e0d 100644
--- a/nixpkgs/pkgs/development/python-modules/bidict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bidict/default.nix
@@ -3,7 +3,7 @@
 , sphinx
 , hypothesis
 , py
-, pytest
+, pytestCheckHook
 , pytest-benchmark
 , sortedcollections
 , sortedcontainers
@@ -23,23 +23,14 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ sphinx ];
 
-  # this can be removed >0.19.0
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "setuptools_scm < 4" "setuptools_scm"
-  '';
-
   checkInputs = [
     hypothesis
     py
-    pytest
+    pytestCheckHook
     pytest-benchmark
     sortedcollections
     sortedcontainers
   ];
-  checkPhase = ''
-    pytest tests
-  '';
 
   meta = with lib; {
     homepage = "https://github.com/jab/bidict";
diff --git a/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/nixpkgs/pkgs/development/python-modules/billiard/default.nix
index ff87ba2e6691..4f8aa3565da2 100644
--- a/nixpkgs/pkgs/development/python-modules/billiard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/billiard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }:
 
 buildPythonPackage rec {
   pname = "billiard";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook case psutil ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/celery/billiard";
     description = "Python multiprocessing fork with improvements and bugfixes";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/binho-host-adapter/default.nix b/nixpkgs/pkgs/development/python-modules/binho-host-adapter/default.nix
new file mode 100644
index 000000000000..2249a28a5547
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/binho-host-adapter/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyserial
+}:
+
+buildPythonPackage rec {
+  pname = "binho-host-adapter";
+  version = "0.1.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0mp8xa1qwaww2k5g2nqg7mcivzsbfw2ny1l9yjsi73109slafv8y";
+  };
+
+  propagatedBuildInputs = [ pyserial ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "binhoHostAdapter" ];
+
+  meta = with lib; {
+    description = "Python library for Binho Multi-Protocol USB Host Adapters";
+    homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
index c6fbbc13c43d..c2f059dd93dc 100644
--- a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , zlib
@@ -35,7 +35,7 @@ buildPythonPackage {
   };
 
   propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ]
-  ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
+  ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
 
   # setup.py only installs version.py during install, not test
   postPatch = ''
@@ -49,7 +49,7 @@ buildPythonPackage {
 
   checkInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ReFirmLabs/binwalk";
     description = "A tool for searching a given binary image for embedded files";
     maintainers = [ maintainers.koral ];
diff --git a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index 08e81476ba6f..2f98f3917b84 100644
--- a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "1.6.1";
+  version = "1.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599";
+    sha256 = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix b/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix
new file mode 100644
index 000000000000..ce62fd6dce04
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, base58, ecdsa, hidapi, noiseprotocol, protobuf, semver, typing-extensions }:
+
+buildPythonPackage rec {
+  pname = "bitbox02";
+  version = "5.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "52b0b617660601939b30c8b588c28910946448b1b6d69ca231d5e3e47a322b71";
+  };
+
+  propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ];
+
+  # does not contain tests
+  doCheck = false;
+  pythonImportsCheck = [ "bitbox02" ];
+
+  meta = with lib; {
+    description = "Firmware code of the BitBox02 hardware wallet";
+    homepage = "https://github.com/digitalbitbox/bitbox02-firmware/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix b/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix
index 82b49a267574..559661bbb4f3 100644
--- a/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , requests_oauthlib, nose, sh }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Sheeprider/BitBucket-api";
     description = "Python library to interact with BitBucket REST API";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix b/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix
index 5e5d5662ba32..50075fe70fce 100644
--- a/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }:
 
 buildPythonPackage rec {
   pname = "bitbucket-cli";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bitbucket command line interface";
     homepage = "https://bitbucket.org/zhemao/bitbucket-cli";
     maintainers = with maintainers; [ refnil ];
diff --git a/nixpkgs/pkgs/development/python-modules/bitmath/default.nix b/nixpkgs/pkgs/development/python-modules/bitmath/default.nix
index 55194b02db3a..49992c561f73 100644
--- a/nixpkgs/pkgs/development/python-modules/bitmath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitmath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }:
 
 buildPythonPackage rec {
   pname = "bitmath";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Module for representing and manipulating file sizes with different prefix";
     homepage = "https://github.com/tbielawa/bitmath";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bitstring/default.nix b/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
index a2ba5b10268c..d6eaf31056ff 100644
--- a/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "bitstring";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Module for binary data manipulation";
     homepage = "https://github.com/scott-griffiths/bitstring";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bjoern/default.nix b/nixpkgs/pkgs/development/python-modules/bjoern/default.nix
index c2f60fce9dc5..2949ecbf6f92 100644
--- a/nixpkgs/pkgs/development/python-modules/bjoern/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bjoern/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, libev, python }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, libev, python }:
 
 buildPythonPackage rec {
   pname = "bjoern";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     ${python.interpreter} tests/test_wsgi_compliance.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jonashaag/bjoern";
     description = "A screamingly fast Python 2/3 WSGI server written in C";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix b/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix
index 130d07d61ff4..536ad1f14b66 100644
--- a/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix
@@ -1,4 +1,4 @@
-{ stdenv,
+{ lib, stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "black" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This is a small utility built on top of the black Python code formatter to enable formatting of partial files";
     homepage    = "https://github.com/wbolster/black-macchiato";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/nixpkgs/pkgs/development/python-modules/bleak/default.nix
index 91d94fcd72d9..06dc3217dc87 100644
--- a/nixpkgs/pkgs/development/python-modules/bleak/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bleak/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
 
 buildPythonPackage rec {
   pname = "bleak";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   checkPhase = "AGENT_OS=linux py.test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bluetooth Low Energy platform Agnostic Klient for Python";
     homepage = "https://github.com/hbldh/bleak";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/blessed/default.nix b/nixpkgs/pkgs/development/python-modules/blessed/default.nix
index 7f1a24b48508..7adacecc647a 100644
--- a/nixpkgs/pkgs/development/python-modules/blessed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blessed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six
 , wcwidth, pytest, mock, glibcLocales
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ wcwidth six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jquast/blessed";
     description = "A thin, practical wrapper around terminal capabilities in Python.";
     maintainers = with maintainers; [ eqyiel ];
diff --git a/nixpkgs/pkgs/development/python-modules/blessings/default.nix b/nixpkgs/pkgs/development/python-modules/blessings/default.nix
index c285b3a7d003..5263a92ec3d9 100644
--- a/nixpkgs/pkgs/development/python-modules/blessings/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blessings/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/erikrose/blessings";
     description = "A thin, practical wrapper around terminal coloring, styling, and positioning";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/nixpkgs/pkgs/development/python-modules/blinker/default.nix
index 5c76efb029fd..e33ad1626318 100644
--- a/nixpkgs/pkgs/development/python-modules/blinker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blinker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "blinker";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pythonhosted.org/blinker/";
     description = "Fast, simple object-to-object and broadcast signaling";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/blis/default.nix b/nixpkgs/pkgs/development/python-modules/blis/default.nix
index 0042bcaf9293..eeb62e8fed32 100644
--- a/nixpkgs/pkgs/development/python-modules/blis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cython
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     pytest
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "BLAS-like linear algebra library";
     homepage = "https://github.com/explosion/cython-blis";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/blist/default.nix b/nixpkgs/pkgs/development/python-modules/blist/default.nix
index 52687bf2506d..505f01af5fe4 100644
--- a/nixpkgs/pkgs/development/python-modules/blist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchpatch
 , fetchPypi
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://stutzbachenterprises.com/blist/";
     description = "A list-like type with better asymptotic performance and similar performance on small lists";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/blivet/default.nix b/nixpkgs/pkgs/development/python-modules/blivet/default.nix
index d224f2bc22e1..94abc39fd285 100644
--- a/nixpkgs/pkgs/development/python-modules/blivet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blivet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
 , pyudev, six, libselinux, multipath-tools, lsof, util-linux
 }:
 
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fedoraproject.org/wiki/Blivet";
     description = "Module for management of a system's storage configuration";
     license = with licenses; [ gpl2Plus lgpl21Plus ];
diff --git a/nixpkgs/pkgs/development/python-modules/block-io/default.nix b/nixpkgs/pkgs/development/python-modules/block-io/default.nix
index 24ddd429cd93..3a9704d71bc5 100644
--- a/nixpkgs/pkgs/development/python-modules/block-io/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/block-io/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }:
 
 buildPythonPackage rec {
   pname = "block-io";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "block_io" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io";
     homepage = "https://github.com/BlockIo/block_io-python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
index ff53884ef376..5adc854d0263 100644
--- a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , setuptools, funcparserlib, pillow, webcolors, reportlab, docutils
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # require network and fail
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate block-diagram image from spec-text file (similar to Graphviz)";
     homepage = "http://blockdiag.com/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/bluepy/default.nix b/nixpkgs/pkgs/development/python-modules/bluepy/default.nix
index 8d247b41d277..d833d20934d6 100644
--- a/nixpkgs/pkgs/development/python-modules/bluepy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bluepy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkg-config
@@ -25,11 +25,11 @@ buildPythonPackage rec {
   '';
   pythonImportsCheck = [ "bluepy" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python interface to Bluetooth LE on Linux";
     homepage = "https://github.com/IanHarvey/bluepy";
     maintainers = with maintainers; [ georgewhewell ];
+    platforms = platforms.linux;
     license = licenses.gpl2;
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/boltons/default.nix b/nixpkgs/pkgs/development/python-modules/boltons/default.nix
index 080165f70712..13e264340da1 100644
--- a/nixpkgs/pkgs/development/python-modules/boltons/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boltons/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
 
 buildPythonPackage rec {
   pname = "boltons";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
   checkPhase = "pytest tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mahmoud/boltons";
     description = "220+ constructs, recipes, and snippets extending (and relying on nothing but) the Python standard library";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix
index 48fc3bf69983..48bc53bbeeda 100644
--- a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , spglib
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.boltztrap.org/";
     description = "Band-structure interpolator and transport coefficient calculator";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 9679edd95127..5a6333d656af 100644
--- a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook
+{ lib, stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook
 , pipInstallHook
 , setuptoolsBuildHook
 , wheel, pip, setuptools
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ":";
 
-  installPhase = stdenv.lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
+  installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
     export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
   '' + ''
     # Give folders a known name
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     mv wheel* wheel
     # Set up PYTHONPATH. The above folders need to be on PYTHONPATH
     # $out is where we are installing to and takes precedence
-    export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel"
+    export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH"
 
     echo "Building setuptools wheel..."
     pushd setuptools
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Version of pip used for bootstrapping";
-    license = stdenv.lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license);
+    license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license);
     homepage = pip.meta.homepage;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index 597f512b51d0..92972470f1c0 100644
--- a/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.16.47"; # N.B: if you change this, change botocore too
+  version = "1.16.57"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-BXlrpsZfeSFOphvsrlEm1ckk7tihGHS8VTbWEd6rvkc=";
+    sha256 = "sha256-SkmcwvU91VeojG22pVJ0iiq9g//tpwzrcdyNs5oCcxQ=";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index 5f2d15e97a8a..a17e6c728cf7 100644
--- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.19.47"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.19.57"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-FVhKhtbLH5TqeF6NPJj67/jd0BBTVuHBBhGNmsEvqJE=";
+    sha256 = "sha256-x1bWX/qYnFwOkheBdeQav3sYrRmy/i6C4ZLwheJk4Do=";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/bottle/default.nix b/nixpkgs/pkgs/development/python-modules/bottle/default.nix
index 52d97582ef31..213d69dd9890 100644
--- a/nixpkgs/pkgs/development/python-modules/bottle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bottle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "bottle";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://bottlepy.org";
     description = "A fast and simple micro-framework for small web-applications";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/box2d/default.nix b/nixpkgs/pkgs/development/python-modules/box2d/default.nix
index 1b372f90a90f..92ac90ab6d4d 100644
--- a/nixpkgs/pkgs/development/python-modules/box2d/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/box2d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , swig2
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # tests not included with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pybox2d/pybox2d";
     description = ''
       A 2D game physics library for Python under
diff --git a/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/nixpkgs/pkgs/development/python-modules/bpython/default.nix
index 7dfe8053ca24..108d8ec0c66b 100644
--- a/nixpkgs/pkgs/development/python-modules/bpython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bpython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , curtsies
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   # tests fail: https://github.com/bpython/bpython/issues/712
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fancy curses interface to the Python interactive interpreter";
     homepage = "https://bpython-interpreter.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix b/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix
index 55a12009a15c..8c65cca07b2e 100644
--- a/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     pytest-benchmark
   ];
 
-  checkPhase = ''pytest --benchmark-skip'';
+  checkPhase = "pytest --benchmark-skip";
 
   propagatedBuildInputs = [
     python-dateutil
diff --git a/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/nixpkgs/pkgs/development/python-modules/breathe/default.nix
index e283c9ee6bed..29de26ac495e 100644
--- a/nixpkgs/pkgs/development/python-modules/breathe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
 
 buildPythonPackage rec {
-  version = "4.25.1";
+  version = "4.26.1";
   pname = "breathe";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bf81658ed31f8f586247d203923479fcde6c3797d376c804bdafa7e56ffd43b5";
+    sha256 = "f59ecadebbb76e3b4710e8c9d2f8f98d51e54701930a38ddf732930653dcf6b5";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix b/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
index ad8fe1c8a077..7b579a84ba18 100644
--- a/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "browser-cookie3";
-  version = "0.11.4";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c";
+    sha256 = "5f26422091ad0e97375d565f8fbacfaf314d0722db35c921635eab23686e4fc4";
   };
 
   disabled = !isPy3k;
diff --git a/nixpkgs/pkgs/development/python-modules/bsblan/default.nix b/nixpkgs/pkgs/development/python-modules/bsblan/default.nix
new file mode 100644
index 000000000000..f670bebc8ed3
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/bsblan/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, aresponses
+, coverage
+, mypy
+, pytest-asyncio
+, pytest-cov
+, pytest-mock
+, aiohttp
+, attrs
+, cattrs
+, yarl
+}:
+
+buildPythonPackage rec {
+  pname = "bsblan";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "liudger";
+    repo = "python-bsblan";
+    rev = "v.${version}";
+    sha256 = "0vyg9vsrs34jahlav83qp2djv81p3ks31qz4qh46zdij2nx7l1fv";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    attrs
+    cattrs
+    yarl
+  ];
+
+  checkInputs = [
+    aresponses
+    coverage
+    mypy
+    pytest-asyncio
+    pytest-cov
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "bsblan" ];
+
+  meta = with lib; {
+    description = "Python client for BSB-Lan";
+    homepage = "https://github.com/liudger/python-bsblan";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
index 0989b61b6cfa..9877a03a087e 100644
--- a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     export BERKELEYDB_DIR=${pkgs.db.dev};
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for Oracle Berkeley DB";
     homepage = "https://www.jcea.es/programacion/pybsddb.htm";
     license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
diff --git a/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix b/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix
index aabcd4de9343..f70f71c1a699 100644
--- a/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , aflplusplus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     python -c 'import bsdiff4; bsdiff4.test()'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "binary diff and patch using the BSDIFF4-format";
     homepage = "https://github.com/ilanschnell/bsdiff4";
     license = licenses.bsdProtection;
diff --git a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix
index 17f384062482..209565fa21b7 100644
--- a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , pybluez }:
 
 buildPythonPackage {
@@ -18,7 +18,7 @@ buildPythonPackage {
   # there are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bluetooth Proximity Detection using Python";
     homepage = "https://github.com/FrederikBolding/bluetooth-proximity";
     maintainers = with maintainers; [ peterhoeg ];
diff --git a/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/nixpkgs/pkgs/development/python-modules/btchip/default.nix
index c84ee0f0be7f..ebb14a77b564 100644
--- a/nixpkgs/pkgs/development/python-modules/btchip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/btchip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }:
 
 buildPythonPackage rec {
   pname = "btchip-python";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # tests requires hardware
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python communication library for Ledger Hardware Wallet products";
     homepage = "https://github.com/LedgerHQ/btchip-python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/btrees/default.nix b/nixpkgs/pkgs/development/python-modules/btrees/default.nix
index 08f2c1eeb2ff..471ba54215de 100644
--- a/nixpkgs/pkgs/development/python-modules/btrees/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/btrees/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , persistent
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     sha256 = "7ce4a5eb5c135bcb5c06b5bd1ca6fd7fd39d8631306182307ed8bc30d3033846";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scalable persistent components";
     homepage = "http://packages.python.org/BTrees";
     license = licenses.zpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/btrfs/default.nix b/nixpkgs/pkgs/development/python-modules/btrfs/default.nix
index 225b26b4d650..8ea93fe005e7 100644
--- a/nixpkgs/pkgs/development/python-modules/btrfs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/btrfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Inspect btrfs filesystems";
     homepage = "https://github.com/knorrie/python-btrfs";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix
index 603e6f42e450..5e3b0b4e89f7 100644
--- a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatic error monitoring for django, flask, etc.";
     homepage = "https://www.bugsnag.com";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
index 25de097f1a96..3d27384efe18 100644
--- a/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools
 , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six
 , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # for the moment oauth2client <4.0.0 and megaplan>=1.4 are missing for running the test suite.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ralphbean/bugwarrior";
     description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/bugz/default.nix b/nixpkgs/pkgs/development/python-modules/bugz/default.nix
index abfde52ef5f7..5324a43e1b0c 100644
--- a/nixpkgs/pkgs/development/python-modules/bugz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bugz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -16,7 +16,7 @@ buildPythonPackage {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/williamh/pybugz";
     description = "Command line interface for Bugzilla";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix b/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix
index f40488511093..fc122ecd233c 100644
--- a/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pep8, coverage, logilab_common, requests }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     export HOME=$(pwd)/check-phase
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/python-bugzilla/python-bugzilla";
     description = "Bugzilla XMLRPC access module";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/build/default.nix b/nixpkgs/pkgs/development/python-modules/build/default.nix
index 97a7f9a201bf..46c3bea0b8c5 100644
--- a/nixpkgs/pkgs/development/python-modules/build/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/build/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "build";
-  version = "0.0.3.1";
+  version = "0.1.0";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "757b5542168326b6f1898a1ce1131bb2cf306ee4c7e54e39c815c5be217ff87d";
+    sha256 = "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8";
   };
 
   nativeBuildInputs = [
@@ -39,8 +39,14 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
-    description = "A simple, correct PEP517 package builder";
-    license = lib.licenses.mit;
+  meta = with lib; {
+    description = "Simple, correct PEP517 package builder";
+    longDescription = ''
+      build will invoke the PEP 517 hooks to build a distribution package. It
+      is a simple build tool and does not perform any dependency management.
+    '';
+    homepage = "https://github.com/pypa/build";
+    maintainers = with maintainers; [ fab ];
+    license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix b/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix
index cf8b13823015..7f7afd67e7e0 100644
--- a/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix
@@ -1,4 +1,4 @@
-{ fetchPypi, stdenv, buildPythonPackage }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "zc.buildout";
@@ -13,10 +13,10 @@ buildPythonPackage rec {
 
   postInstall = "mv $out/bin/buildout{,-nix}";
 
-  meta = {
+  meta = with lib; {
     homepage = "http://www.buildout.org";
     description = "A software build and configuration system";
-    license = stdenv.lib.licenses.zpl21;
-    maintainers = [ stdenv.lib.maintainers.goibhniu ];
+    license = licenses.zpl21;
+    maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/buildout/default.nix b/nixpkgs/pkgs/development/python-modules/buildout/default.nix
index 20731e76c814..0751b284a786 100644
--- a/nixpkgs/pkgs/development/python-modules/buildout/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildout/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "zc.buildout";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.buildout.org";
     description = "A software build and configuration system";
     license = licenses.zpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/bumps/default.nix b/nixpkgs/pkgs/development/python-modules/bumps/default.nix
index e2938e0f32e2..05f082c747bd 100644
--- a/nixpkgs/pkgs/development/python-modules/bumps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bumps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six}:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six}:
 
 buildPythonPackage rec {
   pname = "bumps";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "9f92c05effd8175763799d19ca55592e89b053318f611148a6725159aea41d67";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.reflectometry.org/danse/software.html";
     description = "Data fitting with bayesian uncertainty analysis";
     maintainers = with maintainers; [ rprospero ];
diff --git a/nixpkgs/pkgs/development/python-modules/bunch/default.nix b/nixpkgs/pkgs/development/python-modules/bunch/default.nix
index 42918f023398..ce77085e4f7f 100644
--- a/nixpkgs/pkgs/development/python-modules/bunch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bunch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "bunch";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/bwapy/default.nix b/nixpkgs/pkgs/development/python-modules/bwapy/default.nix
index 31884074defd..c736eb577d44 100644
--- a/nixpkgs/pkgs/development/python-modules/bwapy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bwapy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "bwapy" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ACEnglish/acebinf";
     description = "Python bindings to bwa mem aligner";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix
index e5a7584234ca..53b13ddb5685 100644
--- a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     pytest tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ionrock/cachecontrol";
     description = "Httplib2 caching for requests";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/cachelib/default.nix b/nixpkgs/pkgs/development/python-modules/cachelib/default.nix
index e73bbaa28a69..503b546116ef 100644
--- a/nixpkgs/pkgs/development/python-modules/cachelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cachelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cachelib";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "47e95a67d68c729cbad63285a790a06f0e0d27d71624c6e44c1ec3456bb4476f";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pallets/cachelib";
     description = "Collection of cache libraries in the same API interface";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cachetools/default.nix b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix
index 6cc6c45137f5..6fd3f637875d 100644
--- a/nixpkgs/pkgs/development/python-modules/cachetools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
 
 buildPythonPackage rec {
   pname = "cachetools";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extensible memoizing collections and decorators";
     homepage = "https://github.com/tkem/cachetools";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/cadquery/default.nix b/nixpkgs/pkgs/development/python-modules/cadquery/default.nix
index e1566baff6b6..72334390bc3e 100644
--- a/nixpkgs/pkgs/development/python-modules/cadquery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cadquery/default.nix
@@ -48,7 +48,7 @@ let
       libGL
       libGLU
       libX11
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+    ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
     propagatedBuildInputs = [
       six
diff --git a/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix
index b98fbbf91e86..bb5629cf4e51 100644
--- a/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig
 , cssselect2, defusedxml, pillow, tinycss2 }:
 
 # CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   #   FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf nosetests .
   # '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cairosvg.org";
     license = licenses.lgpl3;
     description = "SVG converter based on Cairo";
diff --git a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
index da3e84b725dd..9d1c54651c20 100644
--- a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
 , cairocffi, cssselect2, defusedxml, pillow, tinycss2
 , pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cairosvg.org";
     license = licenses.lgpl3;
     description = "SVG converter based on Cairo";
diff --git a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
index 31daad18bdc8..96af6f4bf78f 100644
--- a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , frozendict, simplejson, six, isPy27
 }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     frozendict simplejson six
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/matrix-org/python-canonicaljson";
     description = "Encodes objects and arrays as RFC 7159 JSON.";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/nixpkgs/pkgs/development/python-modules/capstone/default.nix
index 7fc0b16522ed..d7df0bee5ca9 100644
--- a/nixpkgs/pkgs/development/python-modules/capstone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/capstone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "capstone";
-  version = stdenv.lib.getVersion capstone;
+  version = lib.getVersion capstone;
 
   src = capstone.src;
   sourceRoot = "${capstone.name}/bindings/python";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     make check
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.capstone-engine.org/";
     license = licenses.bsdOriginal;
     description = "Python bindings for Capstone disassembly engine";
diff --git a/nixpkgs/pkgs/development/python-modules/carbon/default.nix b/nixpkgs/pkgs/development/python-modules/carbon/default.nix
index 71a7174fb23f..e0a31829b05f 100644
--- a/nixpkgs/pkgs/development/python-modules/carbon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/carbon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , twisted, whisper, txamqp, cachetools, urllib3
 }:
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://graphiteapp.org/";
     description = "Backend data caching and persistence daemon for Graphite";
     maintainers = with maintainers; [ offline basvandijk ];
diff --git a/nixpkgs/pkgs/development/python-modules/carrot/default.nix b/nixpkgs/pkgs/development/python-modules/carrot/default.nix
index 9a5ffe578565..c2262decd314 100644
--- a/nixpkgs/pkgs/development/python-modules/carrot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/carrot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , nose, amqplib, anyjson }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   doCheck = false; # depends on the network
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/carrot";
     description = "AMQP Messaging Framework for Python";
   };
diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index 6633657d1863..d1b795a9ef43 100644
--- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "casbin";
-  version = "0.15.0";
+  version = "0.16.0";
 
   disabled = isPy27;
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "pycasbin";
     rev = "v${version}";
-    sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b";
+    sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/case/default.nix b/nixpkgs/pkgs/development/python-modules/case/default.nix
index 771a349be1f7..5d1a7696516a 100644
--- a/nixpkgs/pkgs/development/python-modules/case/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/case/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , six, nose, unittest2, mock }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six nose unittest2 mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/celery/case";
     description = "unittests utilities";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/casttube/default.nix b/nixpkgs/pkgs/development/python-modules/casttube/default.nix
index ff8e5614ceb6..85b1147c13a5 100644
--- a/nixpkgs/pkgs/development/python-modules/casttube/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/casttube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "casttube";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interact with the Youtube Chromecast api";
     homepage = "https://github.com/ur1katz/casttube";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
index 1624cbcf36ce..c4cd89cab68a 100644
--- a/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tiny library for adding function or object registries";
     homepage = "https://github.com/explosion/catalogue";
     changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/python-modules/catboost/default.nix b/nixpkgs/pkgs/development/python-modules/catboost/default.nix
new file mode 100644
index 000000000000..8c5184240f62
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/catboost/default.nix
@@ -0,0 +1,56 @@
+{ buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder
+, clang_7, python2
+, graphviz, matplotlib, numpy, pandas, plotly, scipy, six
+, withCuda ? false, cudatoolkit }:
+
+buildPythonPackage rec {
+  pname = "catboost";
+  version = "0.24.4";
+
+  disabled = pythonOlder "3.4";
+
+  src = fetchFromGitHub {
+    owner = "catboost";
+    repo = "catboost";
+    rev = "v${version}";
+    sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8=";
+  };
+
+  nativeBuildInputs = [ clang_7 python2 ];
+
+  propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ]
+    ++ lib.optional withCuda [ cudatoolkit ];
+
+  patches = [
+    ./nix-support.patch
+    (fetchpatch {
+      name = "format.patch";
+      url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch";
+      sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo=";
+    })
+  ];
+
+  preBuild = ''
+    cd catboost/python-package
+    '';
+  setupPyBuildFlags = [ "--with-ymake=no" ];
+  CUDA_ROOT = lib.optional withCuda cudatoolkit;
+  enableParallelBuilding = true;
+
+  # Tests use custom "ya" tool, not yet supported.
+  dontUseSetuptoolsCheck = true;
+  pythonImportsCheck = [ "catboost" ];
+
+  meta = with lib; {
+    description = "High-performance library for gradient boosting on decision trees.";
+    longDescription = ''
+      A fast, scalable, high performance Gradient Boosting on Decision Trees
+      library, used for ranking, classification, regression and other machine
+      learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU.
+    '';
+    license = licenses.asl20;
+    platforms = [ "x86_64-linux" ];
+    homepage = "https://catboost.ai";
+    maintainers = with maintainers; [ PlushBeaver ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/catboost/nix-support.patch b/nixpkgs/pkgs/development/python-modules/catboost/nix-support.patch
new file mode 100644
index 000000000000..feaf97d57070
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/catboost/nix-support.patch
@@ -0,0 +1,181 @@
+diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py
+index 17f1d8ff14..07da618cd1 100644
+--- a/catboost/python-package/setup.py
++++ b/catboost/python-package/setup.py
+@@ -80,7 +80,7 @@ class Helper(object):
+         self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None
+         self.os_sdk = 'local'
+         self.with_ymake = True
+-        self.parallel = None
++        self.parallel = os.environ.get('NIX_BUILD_CORES') or None
+ 
+     def finalize_options(self):
+         if os.path.exists(str(self.with_cuda)):
+@@ -222,11 +222,12 @@ class build_ext(_build_ext):
+ 
+     def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run):
+         logging.info('Buildling {} with gnu make'.format(catboost_ext))
+-        makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
++        makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
+         make_cmd = [
+             'make', '-f', '../../make/' + makefile,
+-            'CC=clang-5.0',
+-            'CXX=clang++-5.0',
++            'CC=clang',
++            'CXX=clang++',
++            'PYTHON=python2',
+             'BUILD_ROOT=' + build_dir,
+             'SOURCE_ROOT=' + topsrc_dir,
+         ]
+diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile
+index e54b7078e8..fb7b208af9 100644
+--- a/make/python2.CLANG7-LINUX-X86_64.makefile
++++ b/make/python2.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
+diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
+index 2a22a79b25..522fb54a7c 100644
+--- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
++++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
+diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile
+index fee6750bcb..dc55908371 100644
+--- a/make/python3.CLANG7-LINUX-X86_64.makefile
++++ b/make/python3.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
+diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
+index 5146830476..ff8535b03e 100644
+--- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
++++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
diff --git a/nixpkgs/pkgs/development/python-modules/cattrs/default.nix b/nixpkgs/pkgs/development/python-modules/cattrs/default.nix
new file mode 100644
index 000000000000..a48e29b827b7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/cattrs/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, hypothesis
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "cattrs";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "Tinche";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "083d5mi6x7qcl26wlvwwn7gsp5chxlxkh4rp3a41w8cfwwr3h6l8";
+  };
+
+  propagatedBuildInputs = [ attrs ];
+
+  checkInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "cattr" ];
+
+  meta = with lib; {
+    description = "Python custom class converters for attrs";
+    homepage = "https://github.com/Tinche/cattrs";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/cbor/default.nix b/nixpkgs/pkgs/development/python-modules/cbor/default.nix
index 3ebf5f26b821..f081511265fd 100644
--- a/nixpkgs/pkgs/development/python-modules/cbor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cbor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cbor";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # https://github.com/brianolson/cbor_py/issues/6
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/bodhisnarkva/cbor";
     description = "Concise Binary Object Representation (CBOR) library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
index 08503297d1f7..f793ecfae372 100644
--- a/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
@@ -1,4 +1,10 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, setuptools_scm }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pytest-cov
+, setuptools_scm
+}:
 
 buildPythonPackage rec {
   pname = "cbor2";
@@ -10,12 +16,16 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ setuptools_scm ];
-  checkInputs = [ pytest pytestcov ];
 
-  checkPhase = "pytest";
+  checkInputs = [
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "cbor2" ];
 
   meta = with lib; {
-    description = "Pure Python CBOR (de)serializer with extensive tag support";
+    description = "Python CBOR (de)serializer with extensive tag support";
     homepage = "https://github.com/agronholm/cbor2";
     license = licenses.mit;
     maintainers = with maintainers; [ taneb ];
diff --git a/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix b/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix
index 5f5e396a02e2..96e75405ee3c 100644
--- a/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }:
 
 buildPythonPackage rec {
   pname = "CCColUtils";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = isPy3k; # needs unpackaged module to run tests on python2
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Kerberos 5 Credential Cache Collection Utilities";
     homepage = "https://pagure.io/cccolutils";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/cddb/default.nix b/nixpkgs/pkgs/development/python-modules/cddb/default.nix
index 5c27b48d62f3..55d659376c61 100644
--- a/nixpkgs/pkgs/development/python-modules/cddb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cddb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pkgs
 , isPy3k
@@ -9,14 +9,14 @@ buildPythonPackage rec {
   version = "1.4";
   disabled = isPy3k;
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
+  buildInputs = lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
 
   src = pkgs.fetchurl {
     url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz";
     sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cddb-py.sourceforge.net/";
     description = "CDDB and FreeDB audio CD track info access";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/cdecimal/default.nix b/nixpkgs/pkgs/development/python-modules/cdecimal/default.nix
index 3508b392203d..cf8890505904 100644
--- a/nixpkgs/pkgs/development/python-modules/cdecimal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cdecimal/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
-
-with stdenv.lib;
+{ lib, buildPythonPackage, fetchurl, isPy3k }:
 
 buildPythonPackage rec {
   pname = "cdecimal";
@@ -16,7 +14,7 @@ buildPythonPackage rec {
   # Upstream tests are not included s. a. http://www.bytereef.org/mpdecimal/testing.html
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast drop-in replacement for decimal.py";
     homepage    = "http://www.bytereef.org/mpdecimal/";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/cement/default.nix b/nixpkgs/pkgs/development/python-modules/cement/default.nix
index 9117908f399a..9133389f0ce9 100644
--- a/nixpkgs/pkgs/development/python-modules/cement/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cement/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "cement";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://builtoncement.com/";
     description = "A CLI Application Framework for Python.";
     maintainers = with maintainers; [ eqyiel ];
diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix
new file mode 100644
index 000000000000..561d9651fed8
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, backoff
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, requests
+, pytestcov
+, requests-mock
+, parameterized
+}:
+
+buildPythonPackage rec {
+  pname = "censys";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "censys";
+    repo = "censys-python";
+    rev = "v${version}";
+    sha256 = "0vvd13g48i4alnqil98zc09zi5kv6l2s3kdfyg5syjxvq4lfd476";
+  };
+
+  propagatedBuildInputs = [
+    backoff
+    requests
+  ];
+
+  checkInputs = [
+    pytestcov
+    pytestCheckHook
+    requests-mock
+    parameterized
+  ];
+
+  # The tests want to write a configuration file
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    mkdir -p $HOME
+    '';
+  # All other tests require an API key
+  pytestFlagsArray = [ "tests/test_config.py" ];
+  pythonImportsCheck = [ "censys" ];
+
+  meta = with lib; {
+    description = "Python API wrapper for the Censys Search Engine (censys.io)";
+    homepage = "https://github.com/censys/censys-python";
+    license = with licenses; [ asl20 ];
+    maintainers = [ maintainers.fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix
index b0c35204d6e7..08b7527c54c1 100644
--- a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }:
 
 buildPythonPackage rec {
   pname = "Cerberus";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     pytest -k 'not nested_oneofs'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://python-cerberus.org/";
     description = "Lightweight, extensible schema and data validation tool for Python dictionaries";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix b/nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix
new file mode 100644
index 000000000000..eea43d5c7393
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pytestCheckHook
+, pytest-mock
+, cryptography
+}:
+
+buildPythonPackage rec {
+  pname = "cert-chain-resolver";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "rkoopmans";
+    repo = "python-certificate-chain-resolver";
+    rev = version;
+    sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l";
+  };
+
+  propagatedBuildInputs = [ cryptography ];
+
+  checkInputs = [ pytestCheckHook pytest-mock ];
+
+  # online tests
+  disabledTests = [
+    "test_cert_returns_completed_chain"
+    "test_display_flag_is_properly_formatted"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver";
+    description = "Resolve / obtain the certificate intermediates of a x509 certificate";
+    license = licenses.mit;
+    maintainers = with maintainers; [ veehaitch ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/nixpkgs/pkgs/development/python-modules/certbot/default.nix
index d7e74f5eff82..cb842f1455f1 100644
--- a/nixpkgs/pkgs/development/python-modules/certbot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/certbot/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "035cdw2h3f511drc0q1j65j911m1pj6c5ghywavkhib0chim044c";
+    sha256 = "sha256-IGXiIOLP/Uq6HdXAschp1jFYq52ohRK4VLtkjF4Tb44=";
   };
 
   sourceRoot = "source/${pname}";
diff --git a/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/nixpkgs/pkgs/development/python-modules/certifi/default.nix
index e86ad90caeb0..eac32816caca 100644
--- a/nixpkgs/pkgs/development/python-modules/certifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/certifi/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2020.11.8";
+  version = "2020.12.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4";
+    sha256 = "177mdbw0livdjvp17sz6wsfrc32838m9y59v871gpgv2888raj8s";
   };
 
   pythonImportsCheck = [ "certifi" ];
diff --git a/nixpkgs/pkgs/development/python-modules/certipy/default.nix b/nixpkgs/pkgs/development/python-modules/certipy/default.nix
index 5d34eede3110..049e3ffdb5d9 100644
--- a/nixpkgs/pkgs/development/python-modules/certipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/certipy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyopenssl
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = false; #no tests were included
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/LLNL/certipy";
     description = "wrapper for pyOpenSSL";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cffi/default.nix
index 07492240ffe9..3dcd6a996cb9 100644
--- a/nixpkgs/pkgs/development/python-modules/cffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
@@ -17,7 +17,7 @@ if isPyPy then null else buildPythonPackage rec {
   # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global
   # impure search path. It's obnoxious how much repetition there is, and how difficult
   # it is to get it to search somewhere else (since we do actually have a libm symlink in libSystem)
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace testing/cffi0/test_parsing.py \
       --replace 'lib_m = "m"' 'lib_m = "System"' \
       --replace '"libm" in name' '"libSystem" in name'
@@ -29,7 +29,7 @@ if isPyPy then null else buildPythonPackage rec {
   '';
 
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
     "-Wno-unused-command-line-argument -Wno-unreachable-code";
 
   doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
@@ -37,10 +37,10 @@ if isPyPy then null else buildPythonPackage rec {
     py.test -k "not test_char_pointer_conversion"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar lnl7 ];
     homepage = "https://cffi.readthedocs.org/";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     description = "Foreign Function Interface for Python calling C code";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
index 0a27f8222c0f..f55042c58d23 100644
--- a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
@@ -59,6 +59,12 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
+    # These tests depend on the current date, for example because of issues like this.
+    # This makes it possible for them to succeed on hydra and then begin to fail without
+    # any code changes.
+    # https://github.com/aws-cloudformation/cfn-python-lint/issues/1705
+    # See also: https://github.com/NixOS/nixpkgs/issues/108076
+    "TestQuickStartTemplates"
     # requires git directory
     "test_update_docs"
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/nixpkgs/pkgs/development/python-modules/cftime/default.nix
index 0235c611c610..78dcecfb6a93 100644
--- a/nixpkgs/pkgs/development/python-modules/cftime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cftime/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8d6a1144f43b9d7a180d7ceb3aa8015b7133c615fbac231bed184a91129f0207";
+    sha256 = "77fd86e69b234d41fa8634d627e9e9ee0501c2a8a95268c2b524d38e0a33f090";
   };
 
   checkInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix
index a94b4439250e..2000a4e0a3bc 100644
--- a/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }:
 
 buildPythonPackage rec {
   version = "0.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility tools for control groups of Linux";
     maintainers = with maintainers; [ layus ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/python-modules/chai/default.nix b/nixpkgs/pkgs/development/python-modules/chai/default.nix
index 16166d2db80e..3400b33635a8 100644
--- a/nixpkgs/pkgs/development/python-modules/chai/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "chai";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mocking, stubbing and spying framework for python";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/chainmap/default.nix b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix
index 17a51f17763a..3858fc44f234 100644
--- a/nixpkgs/pkgs/development/python-modules/chainmap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "chainmap";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # Requires tox
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Backport/clone of ChainMap";
     homepage = "https://bitbucket.org/jeunice/chainmap";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/nixpkgs/pkgs/development/python-modules/chalice/default.nix
index 224ff33d5f05..5445157b8530 100644
--- a/nixpkgs/pkgs/development/python-modules/chalice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chalice/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonPackage rec {
   pname = "chalice";
-  version = "1.21.7";
+  version = "1.21.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "22512bccb9b881b8d5a33bd45c7ad539dee60f2f8685a5ed8afd5000a962b0f8";
+    sha256 = "312f88838c8ea4b4ac79dce0e5b4ba3125130ca66ea99a4694f535501dca95e3";
   };
 
   checkInputs = [ watchdog pytest hypothesis mock ];
diff --git a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix
index 0af3d18824af..a2ffcb9a0236 100644
--- a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "chameleon" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://chameleon.readthedocs.io/";
     description = "Fast HTML/XML Template Compiler";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix
index a43a8ce7d0a8..3f341f5527ae 100644
--- a/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , aioredis
 , asgiref
 , buildPythonPackage
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "channels_redis" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/django/channels_redis/";
     description = "Redis-backed ASGI channel layer implementation";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/channels/default.nix b/nixpkgs/pkgs/development/python-modules/channels/default.nix
index 20e470d8c703..c2836ef4faa0 100644
--- a/nixpkgs/pkgs/development/python-modules/channels/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/channels/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   asgiref, django, daphne
 }:
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ asgiref django daphne ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Brings event-driven capabilities to Django with a channel system";
     license = licenses.bsd3;
     homepage = "https://github.com/django/channels";
diff --git a/nixpkgs/pkgs/development/python-modules/chardet/default.nix b/nixpkgs/pkgs/development/python-modules/chardet/default.nix
index 1a8b1f36e998..bbc41df0cd82 100644
--- a/nixpkgs/pkgs/development/python-modules/chardet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chardet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch
 , pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestrunner hypothesis ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/chardet/chardet";
     description = "Universal encoding detector";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
index 6368ebf4b737..8a2c74882066 100644
--- a/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
 
 buildPythonPackage rec {
   pname = "check-manifest";
-  version = "0.45";
+  version = "0.46";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "636b65a3b685374ad429ff22fe213966765b145f08bc560c8d033b604c7bee4c";
+    sha256 = "5895e42a012989bdc51854a02c82c8d6898112a4ab11f2d7878200520b49d428";
   };
 
   # Test requires filesystem access
@@ -14,11 +14,11 @@ buildPythonPackage rec {
     substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist"
   '';
 
-  propagatedBuildInputs = [ pep517 toml ];
+  propagatedBuildInputs = [ build pep517 toml ];
 
   checkInputs = [ mock breezy git ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mgedmin/check-manifest";
     description = "Check MANIFEST.in in a Python source package for completeness";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix b/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix
index e4fd549445ad..a705bffa810a 100644
--- a/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, stdenv }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "Cheetah3";
@@ -11,10 +11,10 @@ buildPythonPackage rec {
 
   doCheck = false; # Circular dependency
 
-  meta = {
+  meta = with lib; {
     homepage = "http://www.cheetahtemplate.org/";
     description = "A template engine and code generation tool";
-    license = lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ pjjw ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ pjjw ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
index 5e5541b26e27..2ee8eb3bd0ca 100644
--- a/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
+++ b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , setuptools_scm
 , cheroot, contextlib2, portend, routes, six, zc_lockfile
 , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt
@@ -25,10 +25,10 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"}
+    pytest ${lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.cherrypy.org";
     description = "A pythonic, object-oriented HTTP framework";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
index f23d06001922..8a915d520e5c 100644
--- a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , setuptools_scm
 , cheroot, portend, more-itertools, zc_lockfile, routes
 , jaraco_collections
@@ -41,11 +41,13 @@ buildPythonPackage rec {
       -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \
       --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
       --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
-      ${stdenv.lib.optionalString stdenv.isDarwin
+      ${lib.optionalString stdenv.isDarwin
         "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
   '';
 
-  meta = with stdenv.lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
     homepage = "https://www.cherrypy.org";
     description = "A pythonic, object-oriented HTTP framework";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/nixpkgs/pkgs/development/python-modules/cirq/default.nix
index 537ffdbaf958..ebc0eb51df43 100644
--- a/nixpkgs/pkgs/development/python-modules/cirq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cirq/default.nix
@@ -5,7 +5,7 @@
 , fetchFromGitHub
 , fetchpatch
 , freezegun
-, google_api_core
+, google-api-core
 , matplotlib
 , networkx
 , numpy
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     freezegun
-    google_api_core
+    google-api-core
     numpy
     matplotlib
     networkx
diff --git a/nixpkgs/pkgs/development/python-modules/cjson/default.nix b/nixpkgs/pkgs/development/python-modules/cjson/default.nix
index 1ecd43fccdee..ce70a2f459da 100644
--- a/nixpkgs/pkgs/development/python-modules/cjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }:
 
 buildPythonPackage rec {
   pname = "python-cjson";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "3006c2c218297be3448dc793218e0b15d20fe9839775521bfc294fc6aa24972b";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A very fast JSON encoder/decoder for Python";
     homepage = "https://ag-projects.com/";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
index 7f5311f45b00..dd72f5705e70 100644
--- a/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Communicate with your Coldcard using Python";
     homepage = "https://github.com/Coldcard/ckcc-protocol";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix
index 7775fee5ba0d..fc5a6b0e54bc 100644
--- a/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }:
 
 buildPythonPackage rec {
   pname = "cld2-cffi";
@@ -13,11 +13,11 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
 
   # gcc doesn't approve of this code, so disable -Werror
-  NIX_CFLAGS_COMPILE = "-w" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing";
+  NIX_CFLAGS_COMPILE = "-w" + lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing";
 
   checkPhase = "nosetests -v";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CFFI bindings around Google Chromium's embedded compact language detection library (CLD2)";
     homepage = "https://github.com/GregBowyer/cld2-cffi";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/clf/default.nix b/nixpkgs/pkgs/development/python-modules/clf/default.nix
index d3741ef38a93..f4168d689d44 100644
--- a/nixpkgs/pkgs/development/python-modules/clf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , docopt, requests, pygments }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # No local packages or download links found for requests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ncrocfer/clf";
     description = "Command line tool to search snippets on Commandlinefu.com";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/cliapp/default.nix b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
index 497306c293a4..4b7611c092e2 100644
--- a/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , sphinx
@@ -21,7 +21,7 @@ buildPythonPackage {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://liw.fi/cliapp/";
     description = "Python framework for Unix command line programs";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/click-completion/default.nix b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix
index 3fd41f54f66c..61a154286325 100644
--- a/nixpkgs/pkgs/development/python-modules/click-completion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k,
   click, jinja2, shellingham, six
 }:
 
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ click jinja2 shellingham six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Add or enhance bash, fish, zsh and powershell completion in Click";
     homepage = "https://github.com/click-contrib/click-completion";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix b/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix
index 58d7da4fd391..8d3c3ba3e240 100644
--- a/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   click
 }:
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ click ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Enable git-like did-you-mean feature in click";
     homepage = "https://github.com/click-contrib/click-didyoumean";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix b/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix
index e66f23d09b21..dbe4e33ca84c 100644
--- a/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , click, pytest
 }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "click_help_colors" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Colorization of help messages in Click";
     homepage    = "https://github.com/r-m-n/click-help-colors";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/click-log/default.nix b/nixpkgs/pkgs/development/python-modules/click-log/default.nix
index dd2b4b158ed5..4aa63dd45378 100644
--- a/nixpkgs/pkgs/development/python-modules/click-log/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-log/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, click }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, click }:
 
 buildPythonPackage rec {
   pname = "click-log";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ click ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/click-contrib/click-log/";
     description = "Logging integration for Click";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix
index a8c1d7a489ff..c2b25341e17c 100644
--- a/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   click, pytest
 }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     pytest
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An extension module for click to enable registering CLI commands";
     homepage = "https://github.com/click-contrib/click-plugins";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/click-repl/default.nix b/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
index 03c9520014c4..23adb12da658 100644
--- a/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }:
 
 buildPythonPackage rec {
   pname = "click-repl";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ click prompt_toolkit ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/click-contrib/click-repl";
     description = "Subcommand REPL for click apps";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
index b2e23dc55bdb..e211b955ac84 100644
--- a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     "test_choice_default"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Click command line utilities";
     homepage = "https://github.com/hjacobs/python-clickclick/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/nixpkgs/pkgs/development/python-modules/cliff/default.nix
index f25170cc6ae7..33a129d287ef 100644
--- a/nixpkgs/pkgs/development/python-modules/cliff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cliff/default.nix
@@ -7,21 +7,20 @@
 , six
 , stevedore
 , pyyaml
-, unicodecsv
 , cmd2
-, pytest
-, mock
+, pytestCheckHook
 , testtools
 , fixtures
+, which
 }:
 
 buildPythonPackage rec {
   pname = "cliff";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5bfb684b5fcdff0afaaccd1298a376c0e62e644c46b7e9abc034595b41fe1759";
+    sha256 = "a3f4fa67eeafbcfa7cf9fe4b1755d410876528e1d0d115740db00b50a1250272";
   };
 
   propagatedBuildInputs = [
@@ -32,20 +31,21 @@ buildPythonPackage rec {
     stevedore
     pyyaml
     cmd2
-    unicodecsv
   ];
 
-  # remove version constraints
   postPatch = ''
-    sed -i '/cmd2/c\cmd2' requirements.txt
+    sed -i -e '/cmd2/c\cmd2' -e '/PrettyTable/c\PrettyTable' requirements.txt
   '';
 
-  checkInputs = [ fixtures mock pytest testtools ];
+  checkInputs = [ fixtures pytestCheckHook testtools which ];
   # add some tests
-  checkPhase = ''
-    pytest cliff/tests/test_{utils,app,command,help,lister}.py \
-      -k 'not interactive_mode'
-  '';
+  pytestFlagsArray = [
+    "cliff/tests/test_utils.py"
+    "cliff/tests/test_app.py"
+    "cliff/tests/test_command.py"
+    "cliff/tests/test_help.py"
+    "cliff/tests/test_lister.py"
+  ];
 
   meta = with lib; {
     description = "Command Line Interface Formulation Framework";
diff --git a/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/nixpkgs/pkgs/development/python-modules/clifford/default.nix
index 68ac9e45bb4b..85ed160413e7 100644
--- a/nixpkgs/pkgs/development/python-modules/clifford/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clifford/default.nix
@@ -22,12 +22,15 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c";
   };
-  patches = [ (fetchpatch {
-    # Compatibility with h5py 3.
-    # Will be included in the next releasse after 1.3.1
-    url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
-    sha256 = "00m8ias58xycn5n78sy9wywf4wck1v0gb8gzmg40inzdiha93jyz";
-  }) ];
+
+  patches = [
+    (fetchpatch {
+      # Compatibility with h5py 3.
+      # Will be included in the next releasse after 1.3.1
+      url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
+      sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1";
+    })
+  ];
 
   propagatedBuildInputs = [
     future
@@ -53,10 +56,11 @@ buildPythonPackage rec {
     cd clifford/test
   '';
 
-  pytestFlagsArray = [
-    "-m \"not veryslow\""
-    "--ignore=test_algebra_initialisation.py" # fails without JIT
-    "--ignore=test_cga.py"
+  disabledTests = [
+    "veryslow"
+    "test_algebra_initialisation"
+    "test_cga"
+    "test_estimate_rotor_sequential[random_sphere]"
   ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/cligj/default.nix b/nixpkgs/pkgs/development/python-modules/cligj/default.nix
index 91124cd21f4b..f9d953d8536e 100644
--- a/nixpkgs/pkgs/development/python-modules/cligj/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cligj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , click, pytest, glibcLocales
 }:
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     LC_ALL=en_US.utf-8 pytest tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Click params for commmand line interfaces to GeoJSON";
     homepage = "https://github.com/mapbox/cligj";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/clint/default.nix b/nixpkgs/pkgs/development/python-modules/clint/default.nix
index 329cf4f07ccf..133fc0de55c6 100644
--- a/nixpkgs/pkgs/development/python-modules/clint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ];
   propagatedBuildInputs = [ pillow blessings args ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kennethreitz/clint";
     description = "Python Command Line Interface Tools";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/clize/default.nix b/nixpkgs/pkgs/development/python-modules/clize/default.nix
index e2ef3ea5bb1c..c9c3f5c905ce 100644
--- a/nixpkgs/pkgs/development/python-modules/clize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , dateutil
@@ -45,7 +45,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "clize" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line argument parsing for Python";
     homepage = "https://github.com/epsy/clize";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix
index b814455da3ff..75f5ba0b449e 100644
--- a/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , isPy3k
@@ -24,7 +24,7 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ gflags ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Checks JavaScript files against Google's style guide.";
     homepage = "https://developers.google.com/closure/utilities/";
     license = with licenses; [ asl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
index cd21e125ccef..e5b4a63a564e 100644
--- a/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "cloudpickle";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # TypeError: cannot serialize '_io.FileIO' object
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extended pickling support for Python objects";
     homepage = "https://github.com/cloudpipe/cloudpickle";
     license = with licenses; [ bsd3 ];
diff --git a/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix b/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix
new file mode 100644
index 000000000000..faa1affcd060
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, requests
+, requests-toolbelt
+, pyparsing
+}:
+
+buildPythonPackage rec {
+  pname = "cloudscraper";
+  version = "1.2.52";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07j2nhzimzhcskj2wpxpvpb3dhpci19daw02r2ckkjiq3zifhm6v";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    requests-toolbelt
+    pyparsing
+  ];
+
+  # The tests require several other dependencies, some of which aren't in
+  # nixpkgs yet, and also aren't included in the PyPI bundle.  TODO.
+  doCheck = false;
+
+  pythonImportsCheck = [ "cloudscraper" ];
+
+  meta = with lib; {
+    description = "A Python module to bypass Cloudflare's anti-bot page";
+    homepage = https://github.com/venomous/cloudscraper;
+    license = licenses.mit;
+    maintainers = with maintainers; [ kini ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix
index 86d44aed532c..a0e744f9919d 100644
--- a/nixpkgs/pkgs/development/python-modules/clustershell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh
+{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh
 , nose, bc, hostname, coreutils, bash, gnused
 }:
 
@@ -80,7 +80,7 @@ buildPythonPackage rec {
     tests/*.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scalable Python framework for cluster administration";
     homepage = "https://cea-hpc.github.io/clustershell";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
index 889ef3fba15c..bafdb9cb95da 100644
--- a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
+{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
 , pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs
 , contextlib2 ? null, typing ? null, setuptools_scm
 , pytest, mock ? null, pytest-mock
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   LC_ALL="en_US.UTF-8";
 
-  postPatch = stdenv.lib.optional stdenv.isDarwin ''
+  postPatch = lib.optional stdenv.isDarwin ''
     # Fake the impure dependencies pbpaste and pbcopy
     mkdir bin
     echo '#!${stdenv.shell}' > bin/pbpaste
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     wcwidth
     attrs
   ]
-  ++ stdenv.lib.optionals (pythonOlder "3.5") [contextlib2 typing]
+  ++ lib.optionals (pythonOlder "3.5") [contextlib2 typing]
   ;
 
 
@@ -46,13 +46,13 @@ buildPythonPackage rec {
   # pytest-cov
   # argcomplete  will generate errors
   checkInputs= [ pytest mock which vim glibcLocales pytest-mock ]
-        ++ stdenv.lib.optional (pythonOlder "3.6") [ mock ];
+        ++ lib.optional (pythonOlder "3.6") [ mock ];
   checkPhase = ''
     # test_path_completion_user_expansion might be fixed in the next release
     py.test -k 'not test_path_completion_user_expansion'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Enhancements for standard library's cmd module";
     homepage = "https://github.com/python-cmd2/cmd2";
     maintainers = with maintainers; [ teto ];
diff --git a/nixpkgs/pkgs/development/python-modules/cmdline/default.nix b/nixpkgs/pkgs/development/python-modules/cmdline/default.nix
index 39f1f9de0c67..4249ed7164b9 100644
--- a/nixpkgs/pkgs/development/python-modules/cmdline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmdline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyyaml }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }:
 
 buildPythonPackage rec {
   pname = "cmdline";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   doCheck = false;
   propagatedBuildInputs = [ pyyaml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities for consistent command line tools";
     homepage = "https://github.com/rca/cmdline";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix b/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
index 5c53cafdb4e1..5bb4ef79a20c 100644
--- a/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , cliapp
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # TODO: cmdtest tests must be run before the buildPhase
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://liw.fi/cmdtest/";
     description = "Black box tests Unix command line tools";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/cntk/default.nix b/nixpkgs/pkgs/development/python-modules/cntk/default.nix
index ce388bb1d5d2..b1bba8cf1e0f 100644
--- a/nixpkgs/pkgs/development/python-modules/cntk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cntk/default.nix
@@ -3,7 +3,7 @@
 , pkgs
 , numpy
 , scipy
-, openmpi
+, mpi
 , enum34
 , protobuf
 , pip
@@ -17,8 +17,8 @@ in
 buildPythonPackage {
   inherit (cntk) name version src;
 
-  nativeBuildInputs = [ swig openmpi ];
-  buildInputs = [ cntk openmpi ];
+  nativeBuildInputs = [ swig mpi ];
+  buildInputs = [ cntk mpi ];
   propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
 
   CNTK_LIB_PATH = "${cntk}/lib";
@@ -28,7 +28,7 @@ buildPythonPackage {
 
   postPatch = ''
     cd bindings/python
-    sed -i 's,"libmpi.so.12","${openmpi}/lib/libmpi.so",g' cntk/train/distributed.py
+    sed -i 's,"libmpi.so.12","${mpi}/lib/libmpi.so",g' cntk/train/distributed.py
 
     # Remove distro and libs checks; they aren't compatible with NixOS and besides we guarantee
     # compatibility by providing a package.
diff --git a/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
index 9e6ebbe260e4..e95900d17b52 100644
--- a/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:
 
 buildPythonPackage rec {
   pname = "cocotb";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     make test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
     homepage = "https://github.com/cocotb/cocotb";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/codecov/default.nix b/nixpkgs/pkgs/development/python-modules/codecov/default.nix
index 455888c447da..924422bf7d4f 100644
--- a/nixpkgs/pkgs/development/python-modules/codecov/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/codecov/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }:
+{ lib, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }:
 
 buildPythonPackage rec {
   pname = "codecov";
@@ -20,9 +20,9 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Python report uploader for Codecov";
     homepage = "https://codecov.io/";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cogapp/default.nix b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
index 2962e65a7fb6..019faeaebc30 100644
--- a/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cogapp";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # there are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A code generator for executing Python snippets in source files";
     homepage = "http://nedbatchelder.com/code/cog";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/coilmq/default.nix b/nixpkgs/pkgs/development/python-modules/coilmq/default.nix
index 8b103b55171d..bc0b6af146af 100644
--- a/nixpkgs/pkgs/development/python-modules/coilmq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coilmq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , stompclient, python-daemon, redis, pid, pytest, six, click, coverage
 , sqlalchemy }:
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # The teste data is not included in the distribution
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple, lightweight, and easily extensible STOMP message broker";
     homepage = "https://github.com/hozn/coilmq/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
index aba5ebf609b8..a5b29af1c31a 100644
--- a/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , unittest2
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Tests are not included in Pypi
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Autogenerate Colander schemas based on SQLAlchemy models";
     homepage = "https://github.com/stefanofontanelli/ColanderAlchemy";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/colorama/default.nix b/nixpkgs/pkgs/development/python-modules/colorama/default.nix
index 063491845827..6778c6acadb8 100644
--- a/nixpkgs/pkgs/development/python-modules/colorama/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorama/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "colorama";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tartley/colorama";
     license = licenses.bsd3;
     description = "Cross-platform colored terminal text";
diff --git a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
index a80895de3d15..303d244fff33 100644
--- a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , param
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "colorcet";
-  version = "2.0.2";
+  version = "2.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i";
+    sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433";
   };
 
   propagatedBuildInputs = [
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     pytest colorcet -k 'not matplotlib_default_colormap_plot'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of perceptually uniform colormaps";
     homepage = "https://colorcet.pyviz.org";
     license = licenses.cc-by-40;
diff --git a/nixpkgs/pkgs/development/python-modules/colorclass/default.nix b/nixpkgs/pkgs/development/python-modules/colorclass/default.nix
index 4a627cab5451..08da356e222e 100644
--- a/nixpkgs/pkgs/development/python-modules/colorclass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorclass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "colorclass";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Robpol86/colorclass";
     license = licenses.mit;
     description = "Automatic support for console colors";
diff --git a/nixpkgs/pkgs/development/python-modules/colored/default.nix b/nixpkgs/pkgs/development/python-modules/colored/default.nix
index 2d2cac3da1b9..5caa0cad2f6f 100644
--- a/nixpkgs/pkgs/development/python-modules/colored/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colored/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No proper test suite
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.com/dslackw/colored";
     description = "Simple library for color and formatting to terminal";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
index 3005429658b9..48d13ab49dd2 100644
--- a/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , humanfriendly
@@ -7,6 +8,7 @@
 , pytest
 , mock
 , util-linux
+, isPy38
 }:
 
 buildPythonPackage rec {
@@ -20,13 +22,18 @@ buildPythonPackage rec {
     sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x";
   };
 
+  # capturer is broken on darwin / py38, so we skip the test until a fix for
+  # https://github.com/xolox/python-capturer/issues/10 is released.
+  doCheck = !(isPy38 && stdenv.isDarwin);
   checkPhase = ''
     PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
                                      and not test_auto_install"
   '';
-  checkInputs = [ pytest mock util-linux ];
+  checkInputs = [ pytest mock util-linux verboselogs capturer ];
 
-  propagatedBuildInputs = [ humanfriendly verboselogs capturer ];
+  pythonImportsCheck = [ "coloredlogs" ];
+
+  propagatedBuildInputs = [ humanfriendly ];
 
   meta = with lib; {
     description = "Colored stream handler for Python's logging module";
diff --git a/nixpkgs/pkgs/development/python-modules/colorlog/default.nix b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
index 0b40284fd5eb..0740ee33b5f1 100644
--- a/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "colorlog";
-  version = "4.6.2";
+  version = "4.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4";
+    sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q";
   };
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytestCheckHook ];
 
-  # tests are no longer packaged in pypi
-  doCheck = false;
-  checkPhase = ''
-    py.test -p no:logging
-  '';
+  pythonImportsCheck = [ "colorlog" ];
 
-  pythonImportsCheck =  [ "colorlog" ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Log formatting with colors";
     homepage = "https://github.com/borntyping/python-colorlog";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/colorlover/default.nix b/nixpkgs/pkgs/development/python-modules/colorlover/default.nix
index 6aea26e89366..70dd66e8f813 100644
--- a/nixpkgs/pkgs/development/python-modules/colorlover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorlover/default.nix
@@ -1,4 +1,6 @@
-{ buildPythonPackage, fetchPypi, stdenv
+{ lib
+, buildPythonPackage
+, fetchPypi
 }:
 
 buildPythonPackage rec {
@@ -13,10 +15,10 @@ buildPythonPackage rec {
   # no tests included in distributed archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/jackparmer/colorlover";
     description = "Color scales in Python for humans";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ globin ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ globin ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/colour/default.nix b/nixpkgs/pkgs/development/python-modules/colour/default.nix
index d0f802072a38..6a6ad9d4946a 100644
--- a/nixpkgs/pkgs/development/python-modules/colour/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colour/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, d2to1 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, d2to1 }:
 
 buildPythonPackage rec {
   pname = "colour";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   buildInputs = [ d2to1 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Converts and manipulates common color representation (RGB, HSV, web, ...)";
     homepage = "https://github.com/vaab/colour";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/commandparse/default.nix b/nixpkgs/pkgs/development/python-modules/commandparse/default.nix
new file mode 100644
index 000000000000..68da870f4e2d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/commandparse/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "commandparse";
+  version = "1.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53";
+  };
+
+  # tests only distributed upstream source, not PyPi
+  doCheck = false;
+  pythonImportsCheck = [ "commandparse" ];
+
+  meta = with lib; {
+    description = "Python module to parse command based CLI application";
+    homepage = "https://github.com/flgy/commandparse";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/configobj/default.nix b/nixpkgs/pkgs/development/python-modules/configobj/default.nix
index 82ca70c46795..d0988689275e 100644
--- a/nixpkgs/pkgs/development/python-modules/configobj/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/configobj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage
+{ lib, stdenv, buildPythonPackage
 , fetchFromGitHub
 , six
 , mock, pytest
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   checkInputs = [ mock pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Config file reading, writing and validation";
     homepage = "https://pypi.python.org/pypi/configobj";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/configparser/4.nix b/nixpkgs/pkgs/development/python-modules/configparser/4.nix
index 9c6c631d9c27..cbef6fd2ce7f 100644
--- a/nixpkgs/pkgs/development/python-modules/configparser/4.nix
+++ b/nixpkgs/pkgs/development/python-modules/configparser/4.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "configparser";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Updated configparser from Python 3.7 for Python 2.6+.";
     license = licenses.mit;
     homepage = "https://github.com/jaraco/configparser";
diff --git a/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/nixpkgs/pkgs/development/python-modules/configparser/default.nix
index ad9a13c28bf0..e8610f053da6 100644
--- a/nixpkgs/pkgs/development/python-modules/configparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/configparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm
 , toml
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Updated configparser from Python 3.7 for Python 2.6+.";
     license = licenses.mit;
     homepage = "https://github.com/jaraco/configparser";
diff --git a/nixpkgs/pkgs/development/python-modules/configshell/default.nix b/nixpkgs/pkgs/development/python-modules/configshell/default.nix
index 6a21c1074ea7..ba3700962bf6 100644
--- a/nixpkgs/pkgs/development/python-modules/configshell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/configshell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }:
 
 buildPythonPackage rec {
   pname = "configshell";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyparsing six urwid ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python library for building configuration shells";
     homepage = "https://github.com/open-iscsi/configshell-fb";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix
index 8048d6f78a27..f3e8b1c943b1 100644
--- a/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
 
 buildPythonPackage rec {
   version = "1.5.0";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # No tests in PyPi Tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Confluent's Apache Kafka client for Python";
     homepage = "https://github.com/confluentinc/confluent-kafka-python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/constantly/default.nix b/nixpkgs/pkgs/development/python-modules/constantly/default.nix
index 9b7222b7bbc6..189573699b91 100644
--- a/nixpkgs/pkgs/development/python-modules/constantly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/constantly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 }:
 buildPythonPackage rec {
   pname = "constantly";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/twisted/constantly";
     description = "symbolic constant support";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/construct/default.nix b/nixpkgs/pkgs/development/python-modules/construct/default.nix
index cf9ab42f3259..8d0c83ca9e8e 100644
--- a/nixpkgs/pkgs/development/python-modules/construct/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/construct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
 , six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml
 }:
 
@@ -18,11 +18,11 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ];
 
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
 
   pytestFlagsArray = [ "--benchmark-disable" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Powerful declarative parser (and builder) for binary data";
     homepage = "https://construct.readthedocs.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/consul/default.nix b/nixpkgs/pkgs/development/python-modules/consul/default.nix
index 589076481c90..3978b14484ac 100644
--- a/nixpkgs/pkgs/development/python-modules/consul/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/consul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , requests, six, pytest }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests distributed. https://github.com/cablehead/python-consul/issues/133
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client for Consul (https://www.consul.io/)";
     homepage = "https://github.com/cablehead/python-consul";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/contexter/default.nix b/nixpkgs/pkgs/development/python-modules/contexter/default.nix
index 0fa72dfa687d..d8b74d4fedba 100644
--- a/nixpkgs/pkgs/development/python-modules/contexter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/contexter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "contexter";
@@ -9,6 +9,6 @@ buildPythonPackage rec {
     sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/convertdate/default.nix b/nixpkgs/pkgs/development/python-modules/convertdate/default.nix
index c60d4778012c..f28923002f70 100644
--- a/nixpkgs/pkgs/development/python-modules/convertdate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/convertdate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }:
 
 buildPythonPackage rec {
   pname = "convertdate";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pymeeus pytz ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fitnr/convertdate";
     description = "Utils for converting between date formats and calculating holidays";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
index 23bc8bcec524..f9a4fe982082 100644
--- a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy
 , pytest, pytestcov, pytest-mock, freezegun
 , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests
 , python-slugify }:
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/audreyr/cookiecutter";
     description = "A command-line utility that creates projects from project templates";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cookies/default.nix b/nixpkgs/pkgs/development/python-modules/cookies/default.nix
index 7ae110fef3c2..59d2214f758e 100644
--- a/nixpkgs/pkgs/development/python-modules/cookies/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cookies/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cookies";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Friendlier RFC 6265-compliant cookie parser/renderer";
     homepage = "https://github.com/sashahart/cookies";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/coreapi/default.nix b/nixpkgs/pkgs/development/python-modules/coreapi/default.nix
index 521b06755cec..8ac69a457396 100644
--- a/nixpkgs/pkgs/development/python-modules/coreapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coreapi/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   fetchFromGitHub,
   buildPythonPackage,
   django,
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client library for Core API";
     homepage = "https://github.com/core-api/python-client";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/coreschema/default.nix b/nixpkgs/pkgs/development/python-modules/coreschema/default.nix
index 5b5ca3f5044e..73167dea8a7d 100644
--- a/nixpkgs/pkgs/development/python-modules/coreschema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coreschema/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   fetchFromGitHub,
   buildPythonPackage,
   jinja2,
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client library for Core Schema";
     homepage = "https://github.com/ivegotasthma/python-coreschema";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/nixpkgs/pkgs/development/python-modules/cornice/default.nix
index d09cffb31d64..10c559201931 100644
--- a/nixpkgs/pkgs/development/python-modules/cornice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cornice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyramid
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # tests not packaged with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mozilla-services/cornice";
     description = "Build Web Services with Pyramid";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/coronavirus/default.nix b/nixpkgs/pkgs/development/python-modules/coronavirus/default.nix
new file mode 100644
index 000000000000..ddf87816b8f7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/coronavirus/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+}:
+
+buildPythonPackage rec {
+  pname = "coronavirus";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "nabucasa";
+    repo = pname;
+    rev = version;
+    sha256 = "0mx6ifp8irj3669c67hs9r79k8gar6j4aq7d4ji21pllyhyahdwm";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  # no tests are present
+  doCheck = false;
+  pythonImportsCheck = [ "coronavirus" ];
+
+  meta = with lib; {
+    description = "Python client for getting Corona virus info";
+    homepage = "https://github.com/nabucasa/coronavirus";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/cot/default.nix b/nixpkgs/pkgs/development/python-modules/cot/default.nix
index 8952d79634d7..a6de8321dc0c 100644
--- a/nixpkgs/pkgs/development/python-modules/cot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k
 , argcomplete, colorlog, pyvmomi, requests, verboselogs
 , psutil, pyopenssl, setuptools
 , mock, pytest, pytest-mock, pytestCheckHook, qemu
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ]
-  ++ stdenv.lib.optional (pythonOlder "3.3") psutil;
+  ++ lib.optional (pythonOlder "3.3") psutil;
 
   checkInputs = [ mock pytestCheckHook pytest-mock qemu ];
 
@@ -35,15 +35,16 @@ buildPythonPackage rec {
     "TestQCOW2"
     "TestRAW"
     "TestVMDKConversion"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "test_serial_fixup_invalid_host"
   ];
 
-
   # argparse is part of the standardlib
   prePatch = ''
     substituteInPlace setup.py --replace "'argparse'," ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common OVF Tool";
     longDescription = ''
       COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances,
diff --git a/nixpkgs/pkgs/development/python-modules/cov-core/default.nix b/nixpkgs/pkgs/development/python-modules/cov-core/default.nix
index ad85218709e8..44461a8ca9fb 100644
--- a/nixpkgs/pkgs/development/python-modules/cov-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cov-core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, coverage }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, coverage }:
 
 buildPythonPackage rec {
   pname = "cov-core";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ coverage ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix b/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix
index 688d394198f4..b51499de449c 100644
--- a/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage
 , fetchPypi
 , ply
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "CppHeaderParser" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parse C++ header files using ply.lex to generate navigable class tree representing the class structure";
     homepage = "https://sourceforge.net/projects/cppheaderparser/";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/crate/default.nix b/nixpkgs/pkgs/development/python-modules/crate/default.nix
index 1cae57c6faf7..37e49210009a 100644
--- a/nixpkgs/pkgs/development/python-modules/crate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , urllib3
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/crate/crate-python";
     description = "A Python client library for CrateDB";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/crayons/default.nix b/nixpkgs/pkgs/development/python-modules/crayons/default.nix
index f262d289af71..c93bf71687fb 100644
--- a/nixpkgs/pkgs/development/python-modules/crayons/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crayons/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, colorama }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, colorama }:
 
 buildPythonPackage rec {
   pname = "crayons";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ colorama ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "TextUI colors for Python";
     homepage = "https://github.com/kennethreitz/crayons";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/crc16/default.nix b/nixpkgs/pkgs/development/python-modules/crc16/default.nix
index 01f5bb8a7e53..1e3c9cbbf4ff 100644
--- a/nixpkgs/pkgs/development/python-modules/crc16/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crc16/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "crc16";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "15nkx0pa4lskwin84flpk8fsw3jqg6wic6v3s83syjqg76h6my61";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.google.com/archive/p/pycrc16/";
     description = "Python library for calculating CRC16";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/crccheck/default.nix b/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
index 92a4cc8a8415..8dc038012852 100644
--- a/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , nose }:
 
-buildPythonPackage rec {
+let
   pname = "crccheck";
-  version = "0.6";
+  version = "1.0";
+in buildPythonPackage {
+  inherit pname version;
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ckymm6s5kw08i1j35fy2cfha1hyq94pq1kc66brb552qgjs91jn";
-    extension = "zip";
+    sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p";
   };
 
-  meta = with stdenv.lib; {
+  disabled = !isPy3k;
+
+  meta = with lib; {
     description = "Python library for CRCs and checksums";
-    homepage = "https://bitbucket.org/martin_scharrer/crccheck";
+    homepage = "https://sourceforge.net/projects/crccheck/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ etu ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/python-modules/crcmod/default.nix b/nixpkgs/pkgs/development/python-modules/crcmod/default.nix
index 47e1b4097d3d..488b723d89fd 100644
--- a/nixpkgs/pkgs/development/python-modules/crcmod/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crcmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "crcmod";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)";
     homepage = "http://crcmod.sourceforge.net/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/credstash/default.nix b/nixpkgs/pkgs/development/python-modules/credstash/default.nix
index 1f9b4b28f294..ca5e1fe334a0 100644
--- a/nixpkgs/pkgs/development/python-modules/credstash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/credstash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
 
 buildPythonPackage rec {
   pname = "credstash";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB";
     homepage = "https://github.com/LuminalOSS/credstash";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/nixpkgs/pkgs/development/python-modules/croniter/default.nix
index a8ae75746880..308070355790 100644
--- a/nixpkgs/pkgs/development/python-modules/croniter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/croniter/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "croniter";
-  version = "0.3.36";
+  version = "0.3.37";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c";
+    sha256 = "12ced475dfc107bf7c6c1440af031f34be14cd97bbbfaf0f62221a9c11e86404";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix
index 5ec1ccacae99..dc97e96e4f5d 100644
--- a/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
 , coverage, nose, pbkdf2 }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # https://bitbucket.org/dholth/cryptacular/issues/11
   disabled = isPy27 || pythonAtLeast "3.6";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix b/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix
index a76e62dd4ddb..b6972e6d56bb 100644
--- a/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -33,18 +33,18 @@ buildPythonPackage rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [
+  nativeBuildInputs = lib.optionals (!isPyPy) [
     cffi
   ];
 
   buildInputs = [ openssl ]
-             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+             ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   propagatedBuildInputs = [
     packaging
     six
-  ] ++ stdenv.lib.optionals (!isPyPy) [
+  ] ++ lib.optionals (!isPyPy) [
     cffi
-  ] ++ stdenv.lib.optionals isPy27 [
+  ] ++ lib.optionals isPy27 [
     ipaddress enum34
   ];
 
@@ -65,7 +65,7 @@ buildPythonPackage rec {
   # can do until nix 1.11's release
   __impureHostDeps = [ "/usr/lib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package which provides cryptographic recipes and primitives";
     longDescription = ''
       Cryptography includes both high level recipes and low level interfaces to
diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index 0bee19c3f4f3..ad402efd7593 100644
--- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -31,18 +31,18 @@ buildPythonPackage rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [
+  nativeBuildInputs = lib.optionals (!isPyPy) [
     cffi
   ];
 
   buildInputs = [ openssl ]
-             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+             ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   propagatedBuildInputs = [
     packaging
     six
-  ] ++ stdenv.lib.optionals (!isPyPy) [
+  ] ++ lib.optionals (!isPyPy) [
     cffi
-  ] ++ stdenv.lib.optionals isPy27 [
+  ] ++ lib.optionals isPy27 [
     ipaddress enum34
   ];
 
@@ -63,7 +63,7 @@ buildPythonPackage rec {
   # can do until nix 1.11's release
   __impureHostDeps = [ "/usr/lib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package which provides cryptographic recipes and primitives";
     longDescription = ''
       Cryptography includes both high level recipes and low level interfaces to
diff --git a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix
index b9345e78eab0..936db1081b6a 100644
--- a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "crytic-compile";
-  version = "0.1.9";
+  version = "0.1.12";
 
   disabled = pythonOlder "3.6";
 
@@ -10,12 +10,13 @@ buildPythonPackage rec {
     owner = "crytic";
     repo = "crytic-compile";
     rev = version;
-    sha256 = "01mis7bqsh0l5vjl6jwibzy99djza35fxmywy56q8k4jbxwmdcna";
+    sha256 = "1q75n84yxv2cb6x7gqyk3vcwkxpq7pni30wgz3d1bk6pmi2pqgw6";
   };
 
   propagatedBuildInputs = [ pysha3 setuptools ];
 
   doCheck = false;
+  pythonImportsCheck = [ "crytic_compile" ];
 
   meta = with lib; {
     description = "Abstraction layer for smart contract build systems";
diff --git a/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix b/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix
index a7256a54e3be..b3d08c12e62f 100644
--- a/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
+
 buildPythonPackage rec {
   pname = "csscompressor";
   version = "0.9.5";
@@ -10,10 +11,10 @@ buildPythonPackage rec {
 
   doCheck = false; # No tests
 
-  meta = {
+  meta = with lib; {
     description = "A python port of YUI CSS Compressor";
     homepage = "https://pypi.python.org/pypi/csscompressor";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     maintainers = [];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cssmin/default.nix b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix
index deace3233b24..a6f6f3c956ae 100644
--- a/nixpkgs/pkgs/development/python-modules/cssmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cssmin";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python port of the YUI CSS compression algorithm";
     homepage = "https://github.com/zacharyvoase/cssmin";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cssselect/default.nix b/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
index 00e6c0f7a627..fe13fa9582ea 100644
--- a/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cssselect";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
   # AttributeError: 'module' object has no attribute 'tests'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix
index 1db154ac1b8c..ea3ac6236e90 100644
--- a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, mock }:
 
 buildPythonPackage rec {
   pname = "cssutils";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # couple of failing tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python package to parse and build CSS";
     homepage = "http://cthedot.de/cssutils/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/nixpkgs/pkgs/development/python-modules/csvw/default.nix
index 70e817dc2991..410248b0193b 100644
--- a/nixpkgs/pkgs/development/python-modules/csvw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/csvw/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "csvw";
-  version = "1.8.1";
+  version = "1.10.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "cldf";
     repo = "csvw";
     rev = "v${version}";
-    sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w";
+    sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis";
   };
 
   patchPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/nixpkgs/pkgs/development/python-modules/cupy/default.nix
index 91fd7ba11d4f..09685d392d6a 100644
--- a/nixpkgs/pkgs/development/python-modules/cupy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cupy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage
+{ lib, stdenv, buildPythonPackage
 , fetchPypi, isPy3k, linuxPackages
 , fastrlock, numpy, six, wheel, pytest, mock, setuptools
 , cudatoolkit, cudnn, nccl
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "8.2.0";
+  version = "8.3.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e4bc8428fb14309d73194e19bc4b47e1d6a330678a200e36d9d4b932f1be2e8";
+    sha256 = "db699fddfde7806445908cf6454c6f4985e7a9563b40405ddf97845d808c5f12";
   };
 
   checkInputs = [
@@ -40,7 +40,7 @@ buildPythonPackage rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A NumPy-compatible matrix library accelerated by CUDA";
     homepage = "https://cupy.chainer.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
index 9f45c2fd2ba6..4c4c7dbe231a 100644
--- a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
 
 buildPythonPackage rec {
   pname = "curtsies";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [ blessings wcwidth ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+    ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkInputs = [ mock pyte nose ];
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     nosetests tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Curses-like terminal wrapper, with colored strings!";
     homepage = "https://github.com/bpython/curtsies";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix b/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix
index 1672557f1b95..e42f4021a6f2 100644
--- a/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "curve25519-donna";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1w0vkjyh4ki9n98lr2hg09f1lr1g3pz48kshrlic01ba6pasj60q";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper for the portable curve25519-donna implementation";
     homepage = "http://code.google.com/p/curve25519-donna/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
index e4350bada331..14a585617c64 100644
--- a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }:
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }:
 
 buildPythonPackage rec {
   pname = "cx_Freeze";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # fails to find Console even though it exists on python 3.x
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of scripts and modules for freezing Python scripts into executables";
     homepage = "http://cx-freeze.sourceforge.net/";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
index 440e43cf81c8..89946964544e 100644
--- a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchPypi, odpic }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, odpic }:
 
 buildPythonPackage rec {
   pname = "cx_Oracle";
-  version = "8.0.1";
+  version = "8.1.0";
 
   buildInputs = [ odpic ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f10ada7f821a325c6befdd6fef1cac44ebc830736d0b75dda7b8ac9f851087b2";
+    sha256 = "e1698c5522ee1355e552b30bfa0a58e6e772475b882c5d69d158bd7e6aed45de";
   };
 
   preConfigure = ''
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # Check need an Oracle database to run
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python interface to Oracle";
     homepage = "https://oracle.github.io/python-cx_Oracle";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/nixpkgs/pkgs/development/python-modules/cymem/default.nix
index e563e6615fe8..d805ba5de1f9 100644
--- a/nixpkgs/pkgs/development/python-modules/cymem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cymem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , cython
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover -p "*test*"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cython memory pool for RAII-style memory management";
     homepage = "https://github.com/explosion/cymem";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
index ee2c9ded18df..8a0adb3d6c96 100644
--- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , python
 , fetchPypi
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     make check
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cython bindings for PARI";
     license = licenses.gpl2;
     maintainers = teams.sage.members;
diff --git a/nixpkgs/pkgs/development/python-modules/daemonize/default.nix b/nixpkgs/pkgs/development/python-modules/daemonize/default.nix
index 9db823806843..30d4f1bd7146 100644
--- a/nixpkgs/pkgs/development/python-modules/daemonize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/daemonize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1hwbl3gf9fdds9sc14zgjyjisjvxidrvqc11xlbb0b6jz17nw0nx";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to enable your code run as a daemon process on Unix-like systems";
     homepage = "https://github.com/thesharp/daemonize";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/nixpkgs/pkgs/development/python-modules/daphne/default.nix
index cbd80333b2f0..fc48f9150124 100644
--- a/nixpkgs/pkgs/development/python-modules/daphne/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/daphne/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub
 , asgiref, autobahn, twisted, pytestrunner
 , hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl
 }:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django ASGI (HTTP/WebSocket) server";
     license = licenses.bsd3;
     homepage = "https://github.com/django/daphne";
diff --git a/nixpkgs/pkgs/development/python-modules/darcsver/default.nix b/nixpkgs/pkgs/development/python-modules/darcsver/default.nix
index 33c7eb2d1168..6484d84253b5 100644
--- a/nixpkgs/pkgs/development/python-modules/darcsver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/darcsver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }:
 
 buildPythonPackage rec {
   pname = "darcsver";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # AttributeError: 'module' object has no attribute 'test_darcsver'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Darcsver, generate a version number from Darcs history";
     homepage = "https://pypi.python.org/pypi/darcsver";
     license = "BSD-style";
diff --git a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
index 0a88323fafd8..1db03b66ffb0 100644
--- a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cloudpickle
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     py.test dask_glm
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dask/dask-glm/";
     description = "Generalized Linear Models with Dask";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
index 453cb715b12b..eac503c2f855 100644
--- a/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     pytest --ignore=tests/test_dask_image/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dask/dask-image";
     description = "Distributed image processing";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
index 52e22a093311..be27399b71f6 100644
--- a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , dask
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     py.test dask_jobqueue/tests/test_jobqueue_core.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dask/dask-jobqueue";
     description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
index 441c698c2ad0..4d3aa8e79a05 100644
--- a/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     "dask_ml.utils"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dask/dask-ml";
     description = "Scalable Machine Learn with Dask";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
index 2794bcba7aed..f2d8737b38e9 100644
--- a/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , dask
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # hardcoded mpirun path in tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dask/dask-mpi";
     description = "Deploy Dask using mpi4py";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix
index 9730ca8a2feb..c60f628d72eb 100644
--- a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , xgboost
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dask/dask-xgboost";
     description = "Interactions between Dask and XGBoost";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix
index 2fb393035834..721463421440 100644
--- a/nixpkgs/pkgs/development/python-modules/dask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2.25.0";
+  version = "2021.01.0";
 
   disabled = pythonOlder "3.5";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = pname;
     rev = version;
-    sha256 = "1irp6s577yyjvrvkg00hh1wnl8vrv7pbnbr09mk67z9y7s6xhiw3";
+    sha256 = "V2cEOzV/L1zjyQ76zlGyN9CIkq6W8y8Yab4NQi3/Ju4=";
   };
 
   checkInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
index 2184a7e41940..30001b781d28 100644
--- a/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , click
 , requests
 , tabulate
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     configparser
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/databricks/databricks-cli";
     description = "A command line interface for Databricks";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
index 1c4261c92bf7..299fa8240340 100644
--- a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "databricks-connect";
-  version = "7.3.5";
+  version = "7.3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c720298b05648f5de8f17de03f93d60ffb30c2d55ce2750e63c17c341a8de5e4";
+    sha256 = "35ead50a0550e65a7d6fd78e2c8e54095b53514fba85180768a2dbcdd3f2cf0b";
   };
 
   sourceRoot = ".";
diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
index 5cfaf237059d..a88995937d83 100644
--- a/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy36 }:
 
 buildPythonPackage rec {
   pname = "dataclasses";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of PEP 557: Data Classes";
     homepage = "https://github.com/ericvsmith/dataclasses";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix
index 0c30f2f84689..680462352275 100644
--- a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DataDiff";
     homepage = "https://sourceforge.net/projects/datadiff/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix
index e4c10d8c22c7..f3eab1d1d4e2 100644
--- a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , xmltodict
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/usnistgov/DataModelDict/";
     description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/dateutil/default.nix b/nixpkgs/pkgs/development/python-modules/dateutil/default.nix
index 88024265d948..a6aca68ef293 100644
--- a/nixpkgs/pkgs/development/python-modules/dateutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dateutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }:
 buildPythonPackage rec {
   pname = "python-dateutil";
   version = "2.8.1";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Requires fixing
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Powerful extensions to the standard datetime module";
     homepage = "https://pypi.python.org/pypi/python-dateutil";
     license = "BSD-style";
diff --git a/nixpkgs/pkgs/development/python-modules/datrie/default.nix b/nixpkgs/pkgs/development/python-modules/datrie/default.nix
index 7cb30937e0db..c7f74730c161 100644
--- a/nixpkgs/pkgs/development/python-modules/datrie/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datrie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch
 , cython, pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     ./update_c.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Super-fast, efficiently stored Trie for Python";
     homepage = "https://github.com/kmike/datrie";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/dbf/default.nix b/nixpkgs/pkgs/development/python-modules/dbf/default.nix
index 9eb6e4f89a26..b9c264a20150 100644
--- a/nixpkgs/pkgs/development/python-modules/dbf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }:
 
 buildPythonPackage rec {
     pname = "dbf";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
       sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a";
     };
 
-    propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+    propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34;
 
     doCheck = !isPy3k;
     # tests are not yet ported.
@@ -19,7 +19,7 @@ buildPythonPackage rec {
       ${python.interpreter} dbf/test.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
       homepage    = "https://pypi.python.org/pypi/dbf";
       license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/dbfread/default.nix b/nixpkgs/pkgs/development/python-modules/dbfread/default.nix
index 9dda98e03acf..9f78f3fdde1b 100644
--- a/nixpkgs/pkgs/development/python-modules/dbfread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbfread/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
     pname = "dbfread";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
       sha256 = "07c8a9af06ffad3f6f03e8fe91ad7d2733e31a26d2b72c4dd4cfbae07ee3b73d";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Read DBF Files with Python";
       homepage    = "https://dbfread.readthedocs.org/";
       license     = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
index bbca0df8d8e9..76385ac8023a 100644
--- a/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , python
@@ -32,7 +32,7 @@ buildPythonPackage rec {
       -k "not test_peer_interface"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/altdesktop/python-dbus-next";
     description = "A zero-dependency DBus library for Python with asyncio support";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/dbus/default.nix b/nixpkgs/pkgs/development/python-modules/dbus/default.nix
index aadf53e99255..a6e2e28c6f59 100644
--- a/nixpkgs/pkgs/development/python-modules/dbus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbus/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
+{ lib, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy
 , ncurses, pygobject3, isPy3k }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   disabled = isPyPy;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus dbus-glib ]
     # My guess why it's sometimes trying to -lncurses.
     # It seems not to retain the dependency anyway.
diff --git a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix
index ec57e8ada051..42ae779e0d21 100644
--- a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
 
 buildPythonPackage rec {
   version = "2.0";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database connections for multi-threaded environments";
     homepage = "https://webwareforpython.github.io/DBUtils/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix b/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix
index f06e361dc716..a6669d0e30df 100644
--- a/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pythonAtLeast
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/moloney/dcmstack";
     description = "DICOM to Nifti conversion preserving metadata";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/deap/default.nix b/nixpkgs/pkgs/development/python-modules/deap/default.nix
index 5a09c42a9bbf..21dc9d3832c8 100644
--- a/nixpkgs/pkgs/development/python-modules/deap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }:
 
 buildPythonPackage rec {
   pname = "deap";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py nosetests --verbosity=3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DEAP is a novel evolutionary computation framework for rapid prototyping and testing of ideas.";
     homepage = "https://github.com/DEAP/deap";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/debian/default.nix b/nixpkgs/pkgs/development/python-modules/debian/default.nix
index 9f5cb744e55f..e97c3420f454 100644
--- a/nixpkgs/pkgs/development/python-modules/debian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/debian/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "python-debian";
-  version = "0.1.38";
+  version = "0.1.39";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a352bb5f9ef19b0272078f516ee0ec42b05e90ac85651d87c10e7041550dcc1d";
+    sha256 = "6cca96239b5981f5203216d2113fea522477628607ed0a8427e15094a792541c";
   };
 
   propagatedBuildInputs = [ chardet six ];
diff --git a/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix b/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix
new file mode 100644
index 000000000000..533bc6aa3477
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, nose }:
+
+buildPythonPackage rec {
+  pname = "deep_merge";
+  version = "0.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "tUQV+Qk0xC4zQRTihky01OczWzStOW41rYYQyWBlpH4=";
+  };
+
+  checkInputs = [
+    nose
+  ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "This library contains a simple utility for deep-merging dictionaries and the data structures they contain";
+    homepage = "https://github.com/halfak/deep_merge";
+    license = licenses.mit;
+    maintainers = [ maintainers.anhdle14 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix b/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix
index 8a2bdee1d922..a271371e22fc 100644
--- a/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "deluge-client";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # it will try to connect to a running instance
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight pure-python rpc client for deluge";
     homepage = "https://github.com/JohnDoee/deluge-client";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/demjson/default.nix b/nixpkgs/pkgs/development/python-modules/demjson/default.nix
index 58f2012aea71..fc70562938ef 100644
--- a/nixpkgs/pkgs/development/python-modules/demjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/demjson/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, stdenv, python, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "demjson";
   version = "2.2.4";
-  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
   };
 
-  meta = with stdenv.lib; {
+  checkPhase = lib.optionalString isPy3k ''
+    ${python.interpreter} -m lib2to3 -w test/test_demjson.py
+  '' + ''
+    ${python.interpreter} test/test_demjson.py
+  '';
+
+  meta = with lib; {
     description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
     homepage = "https://github.com/dmeranda/demjson";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
index a9c0b517a134..0c2e2055ff9f 100644
--- a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }:
 
 let
   testPath =
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     unit2 discover -s tests/unit -p "${testPath}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Dependency injection microframework for Python";
     homepage = "https://github.com/ets-labs/python-dependency-injector";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
index d6e5acdeaf8c..a64ed0b9d992 100644
--- a/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchPypi, buildPythonPackage,
-	wrapt, pytest, tox }:
+{ lib, stdenv, fetchPypi, buildPythonPackage,
+  wrapt, pytest, tox }:
 
 buildPythonPackage rec {
   pname = "Deprecated";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ wrapt ];
   checkInputs = [ pytest ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tantale/deprecated";
     description = "Python @deprecated decorator to deprecate old python classes, functions or methods";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/python-modules/derpconf/default.nix b/nixpkgs/pkgs/development/python-modules/derpconf/default.nix
index 9138ef28530a..f9b8f5dec7c0 100644
--- a/nixpkgs/pkgs/development/python-modules/derpconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/derpconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "derpconf";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "derpconf abstracts loading configuration files for your app";
     homepage = "https://github.com/globocom/derpconf";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/descartes/default.nix b/nixpkgs/pkgs/development/python-modules/descartes/default.nix
index c726492f69d4..5280ff2417aa 100644
--- a/nixpkgs/pkgs/development/python-modules/descartes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/descartes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   matplotlib, shapely
 }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     shapely
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library to use Shapely or GeoJSON objects as matplotlib paths";
     homepage = "https://bitbucket.org/sgillies/descartes/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/deskcon/default.nix b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix
index 7beaa838a825..01918445b342 100644
--- a/nixpkgs/pkgs/development/python-modules/deskcon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pyopenssl
 , pkgs
@@ -33,7 +33,7 @@ buildPythonPackage {
     wrapPythonProgramsIn $out/bin "$out $pythonPath"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Integrates an Android device into a desktop";
     homepage = "https://github.com/screenfreeze/deskcon-desktop";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix b/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix
new file mode 100644
index 000000000000..1e388fd3a117
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pytest-cov
+, pytest-mock
+, requests
+, zeroconf
+, websocket_client
+, pytest-runner
+}:
+
+buildPythonPackage rec {
+  pname = "devolo-home-control-api";
+  version = "0.16.0";
+
+  src = fetchFromGitHub {
+    owner = "2Fake";
+    repo = "devolo_home_control_api";
+    rev = "v${version}";
+    sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb";
+  };
+
+  nativeBuildInputs = [ pytest-runner ];
+
+  propagatedBuildInputs = [
+    requests
+    zeroconf
+    websocket_client
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-cov
+    pytest-mock
+  ];
+
+  # Disable test that requires network access
+  disabledTests = [ "test__on_pong" ];
+  pythonImportsCheck = [ "devolo_home_control_api" ];
+
+  meta = with lib; {
+    description = "Python library to work with devolo Home Control";
+    homepage = "https://github.com/2Fake/devolo_home_control_api";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix b/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix
index ab9d9493fd60..9672cca46b05 100644
--- a/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , inflect
 , jinja2
 , jinja2_pluralize
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     pytest -k 'not added_file_pylint_console and not file_does_not_exist'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatically find diff lines that need test coverage";
     homepage = "https://github.com/Bachmann1234/diff-cover";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix b/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix
index 32d8c47a9801..ad653c6313c6 100644
--- a/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Upstream doesn't contain unit tests, only functional tests which require specific hardware
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library to interact with Digi International's XBee radio frequency modules";
     homepage = "https://github.com/digidotcom/xbee-python";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix b/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix
index 404331a49577..7ba0d106e25b 100644
--- a/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchFromGitHub
 , fetchPypi
 , isPy3k
@@ -8,18 +9,17 @@
 , pytestCheckHook
 , requests
 , responses
-, stdenv
 }:
 
 buildPythonPackage rec {
   pname = "python-digitalocean";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "koalalorenzo";
-    repo = "python-digitalocean";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1pz15mh72i992p63grwzqn2bbp6sm37zcp4f0fy1z7rsargwsbcz";
+    sha256 = "16fxlfpisj4rcj9dvlifs6bpx42a0sn9b07bnyzwrbhi6nfvkd2g";
   };
 
   propagatedBuildInputs = [
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     pytest
     pytestCheckHook
     responses
-  ] ++ stdenv.lib.optionals (!isPy3k) [
+  ] ++ lib.optionals (!isPy3k) [
     mock
   ];
 
@@ -41,13 +41,12 @@ buildPythonPackage rec {
     cd digitalocean
   '';
 
-  meta = with stdenv.lib; {
-    description = "digitalocean.com API to manage Droplets and Images";
-    homepage = "https://pypi.python.org/pypi/python-digitalocean";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [
-      kiwi
-      teh
-    ];
+  pythonImportsCheck = [ "digitalocean" ];
+
+  meta = with lib; {
+    description = "Python API to manage Digital Ocean Droplets and Images";
+    homepage = "https://github.com/koalalorenzo/python-digitalocean";
+    license = with licenses; [ lgpl3Only ];
+    maintainers = with maintainers; [ kiwi teh ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/discid/default.nix b/nixpkgs/pkgs/development/python-modules/discid/default.nix
index 2684d4a06a91..1c24402926f3 100644
--- a/nixpkgs/pkgs/development/python-modules/discid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/discid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libdiscid, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, libdiscid, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "discid";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
                   "_open_library('${libdiscid}/lib/libdiscid${extension}')"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python binding of libdiscid";
     homepage    = "https://python-discid.readthedocs.org/";
     license     = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix b/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix
index 8d8fb12d4d9b..5e3ac1e1fcde 100644
--- a/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }:
 
 buildPythonPackage rec {
   pname = "discogs-client";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests oauthlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official Python API client for Discogs";
     license = licenses.bsd2;
     homepage = "https://github.com/discogs/discogs_client";
diff --git a/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
index 4f784642537f..9c30606f75d9 100644
--- a/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "discord.py";
-  version = "1.5.1";
+  version = "1.6.0";
   disabled = pythonOlder "3.5.3";
 
   # only distributes wheels on pypi now
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Rapptz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1bidyclwv20p1kfphj21r5gm3kr2vxx0zd151wg7fcngbbx7gmza";
+    sha256 = "036prc4iw91qx31zz48hy3b30kn2qnlg68lgrvv2mcvsjxf2gd1l";
   };
 
   propagatedBuildInputs = [ aiohttp websockets ];
diff --git a/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
index 793b0edd6974..8b968c3272fb 100644
--- a/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
@@ -1,7 +1,8 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchFromGitHub
-, pytest
+, pytestCheckHook
 , pytestcov
 , pytest_xdist
 , pytest-django
@@ -11,28 +12,25 @@
 
 buildPythonPackage rec {
   pname = "diskcache";
-  version = "4.1.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "python-diskcache";
     rev = "v${version}";
-    sha256 = "0xy2vpk4hixb4gg871d9sx9wxdz8pi0pmnfdwg4bf8jqfjg022w8";
+    sha256 = "0xwqw60dbn1x2294galcs08vm6ydcr677lr8slqz8a3ry6sgkhn9";
   };
 
   checkInputs = [
-    pytest
+    pytestCheckHook
     pytestcov
     pytest_xdist
     pytest-django
     mock
   ];
 
-  disabled = lib.versionAtLeast django.version "2.0";
-
-  checkPhase = ''
-    pytest
-  '';
+  # Darwin sandbox causes most tests to fail.
+  doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
     description = "Disk and file backed persistent cache";
diff --git a/nixpkgs/pkgs/development/python-modules/distlib/default.nix b/nixpkgs/pkgs/development/python-modules/distlib/default.nix
index af9b82e42dc3..403834a3731c 100644
--- a/nixpkgs/pkgs/development/python-modules/distlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "distlib";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # Tests use pypi.org.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Low-level components of distutils2/packaging";
     homepage = "https://distlib.readthedocs.io";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/distorm3/default.nix b/nixpkgs/pkgs/development/python-modules/distorm3/default.nix
index 29524240a8a7..e9b8e66d4c99 100644
--- a/nixpkgs/pkgs/development/python-modules/distorm3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distorm3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "distorm3";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # no tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Powerful Disassembler Library For x86/AMD64";
     homepage = "https://github.com/gdabah/distorm";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/distro/default.nix b/nixpkgs/pkgs/development/python-modules/distro/default.nix
index baaf54dd061d..81bcccd8bd6c 100644
--- a/nixpkgs/pkgs/development/python-modules/distro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "distro";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "distro" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nir0s/distro";
     description = "Linux Distribution - a Linux OS platform information API.";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix b/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix
index 1e66f04374be..882a39957993 100644
--- a/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/python-distutils-extra";
     description = "Enhancements to Python's distutils";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix
index 711eee059caa..f8dd9dca202c 100644
--- a/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # tests not included with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/migonzalvar/dj-email-url";
     description = "Use an URL to configure email backend settings in your Django Application";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix
index f86f08ae60b9..321bec8149d1 100644
--- a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "424d1a5852500b3c118abfdd0e30b3e0016fe68e7ed27b8553a67afa20d4fb40";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dstufft/dj-search-url";
     description = "Use Search URLs in your Django Haystack Application";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix
index a91bd6cadc3e..fafd7ab9a63f 100644
--- a/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
 , django, python3-openid, mock, coverage }:
 
 buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     coverage run manage.py test allauth
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication";
     homepage = "https://www.intenct.nl/projects/django-allauth";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix b/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix
index 32fb40341941..892cf179c370 100644
--- a/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix
@@ -1,5 +1,5 @@
 {
-    stdenv,
+    lib, stdenv,
     buildPythonPackage,
     fetchFromGitHub,
     six,
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   # this package allows multiple email backends
   # sparkpost is missing because it's not packaged yet
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django email backends and webhooks for Mailgun";
     homepage = "https://github.com/anymail/django-anymail";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix
index 84b9df28bce6..d0dacd659a15 100644
--- a/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi, isPy27
 , ldap , django
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django authentication backend that authenticates against an LDAP service";
     homepage = "https://github.com/django-auth-ldap/django-auth-ldap";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix
index 6abe92c43f76..103bfb29578d 100644
--- a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # tests not included with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ghickman/django-cache-url";
     description = "Use Cache URLs in your Django application";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix
index 66d202304ee7..39f65275feed 100644
--- a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, django
+{ lib, stdenv, buildPythonPackage, fetchPypi, django
 , redis, async-timeout, hiredis
 }:
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   checkInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion";
     homepage = "https://github.com/un1t/django-cleanup";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-compat/default.nix b/nixpkgs/pkgs/development/python-modules/django-compat/default.nix
index 57426181b735..ef18bfe77ec9 100644
--- a/nixpkgs/pkgs/development/python-modules/django-compat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-compat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python,
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python,
   django, six
 }:
 
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11";
     homepage = "https://github.com/arteria/django-compat";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
index 5b813977493e..bf1835071f88 100644
--- a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django-discover-runner
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://django-configurations.readthedocs.io/";
     description = "A helper for organizing Django settings";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/django-csp/default.nix b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix
index 1eed9578a8a2..d87e39b8e3f7 100644
--- a/nixpkgs/pkgs/development/python-modules/django-csp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, django }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, django }:
 
 buildPythonPackage rec {
   pname = "django-csp";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Adds Content-Security-Policy headers to Django";
     homepage = "https://github.com/mozilla/django-csp";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix
index 43ae9a7c83a5..63d51d41fc93 100644
--- a/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # tests not included with release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jezdez/django-discover-runner";
     description = "A Django test runner based on unittest2's test discovery";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix
index de3424c9fec5..7288896c4fea 100644
--- a/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , django, persisting-theory, six
 }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/EliotBerriot/django-dynamic-preferences";
     description = "Dynamic global and instance settings for your django project";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django-filter/default.nix b/nixpkgs/pkgs/development/python-modules/django-filter/default.nix
index 93f3f20f3051..e4ca546bbc28 100644
--- a/nixpkgs/pkgs/development/python-modules/django-filter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-filter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reusable Django application for allowing users to filter querysets dynamically";
     homepage = "https://pypi.org/project/django-filter/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix b/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix
index 4ea3b7e7ee58..083126066039 100644
--- a/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "django-gravatar2";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Essential Gravatar support for Django";
     homepage = "https://github.com/twaddington/django-gravatar";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix
index e30fc88079ca..54056547f48a 100644
--- a/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python,
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python,
   django_hijack, django_nose }:
 buildPythonPackage rec {
   pname = "django-hijack-admin";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Admin integration for django-hijack";
     homepage = "https://github.com/arteria/django-hijack-admin";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix
index d736e69ae6ef..bd6f870de66e 100644
--- a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python,
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python,
   django, django_compat, django_nose
 }:
 buildPythonPackage rec {
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows superusers to hijack (=login as) and work on behalf of another user";
     homepage = "https://github.com/arteria/django-hijack";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix
index d9734ff4a220..59e9782f0501 100644
--- a/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }:
 
 buildPythonPackage rec {
   pname = "django-logentry-admin";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Show all LogEntry objects in the Django admin site";
     homepage = "https://github.com/yprez/django-logentry-admin";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
index 0ae3c422997c..92765c687ae6 100644
--- a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , django-gravatar2, django_compressor, django-allauth, mailmanclient
 , django, mock
 }:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django library for Mailman UIs";
     homepage = "https://gitlab.com/mailman/django-mailman3";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix
index 2e433aa5d459..c599e28d2062 100644
--- a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }:
 
 buildPythonPackage rec {
   pname = "django-maintenance-mode";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shows a 503 error page when maintenance-mode is on";
     homepage = "https://github.com/fabiocaccamo/django-maintenance-mode";
     maintainers = with maintainers; [ mrmebelman ];
diff --git a/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 83f1049a2e56..6e16af5bc8f9 100644
--- a/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , django, requests, oauthlib
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OAuth2 goodies for the Djangonauts";
     homepage = "https://github.com/jazzband/django-oauth-toolkit";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix
index b2c755907c15..4fed9bf470b2 100644
--- a/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib
 , django, python3-openid }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django app that integrates jQuery ColorPicker with the Django admin";
     homepage = "https://github.com/gsiegman/django-paintstore";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix
index c08facd3650e..b3b71231b75b 100644
--- a/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
@@ -19,9 +19,9 @@ buildPythonPackage rec {
     ${python.interpreter} runtests.py
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/django-polymorphic/django-polymorphic";
     description = "Improved Django model inheritance with automatic downcasting";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 73c15850d33c..f2bd574919aa 100644
--- a/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , django
 , netaddr
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     six
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django PostgreSQL netfields implementation";
     homepage = "https://github.com/jimfunk/django-postgresql-netfields";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/nixpkgs/pkgs/development/python-modules/django-q/default.nix
index 0755c5055a1e..2eb3b19f554b 100644
--- a/nixpkgs/pkgs/development/python-modules/django-q/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-q/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow
+{ lib, stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow
 , blessed, django, future }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multiprocessing distributed task queue for Django";
     homepage = "https://django-q.readthedocs.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix b/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix
index 29b2baf89cdc..d517563590fb 100644
--- a/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchPypi, buildPythonPackage, django }:
+{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, django }:
 
 buildPythonPackage rec {
   pname = "django-ranged-response";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modified FileResponse that returns `Content-Range` headers with the HTTP response, so browsers (read Safari 9+) that request the file, can stream the response properly";
     homepage = "https://github.com/wearespindle/django-ranged-fileresponse";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-raster/default.nix b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix
index 056f8dffdcfc..173452ebe484 100644
--- a/nixpkgs/pkgs/development/python-modules/django-raster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k,
   numpy, django_colorful, pillow, psycopg2,
   pyparsing, django, celery, boto3, importlib-metadata
 }:
-if stdenv.lib.versionOlder django.version "2.0"
+if lib.versionOlder django.version "2.0"
 then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2."
 else
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ numpy django_colorful pillow psycopg2
                             pyparsing django celery boto3 importlib-metadata ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Basic raster data integration for Django";
     homepage = "https://github.com/geodesign/django-raster";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
index bdf7c21514c2..869c3bf74eef 100644
--- a/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , django
 }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of custom storage backends for Django";
     homepage = "https://django-storages.readthedocs.io";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
index de5854192d20..39912f474204 100644
--- a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # tests not included with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Replaces django's ImageField with a more flexible interface";
     homepage = "https://github.com/respondcreate/django-versatileimagefield/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix
index 99e3abda890a..8529df09bb76 100644
--- a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchFromGitHub, python, stdenv, django }:
+{ buildPythonPackage, fetchFromGitHub, python, lib, stdenv, django }:
 
 buildPythonPackage rec {
   pname = "django-widget-tweaks";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   checkPhase = "${python.interpreter} runtests.py";
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
       description = "Tweak the form field rendering in templates, not in python-level form definitions.";
       homepage = "https://github.com/jazzband/django-widget-tweaks";
       license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django/2.nix b/nixpkgs/pkgs/development/python-modules/django/2.nix
index 64897890759e..eac48593de20 100644
--- a/nixpkgs/pkgs/development/python-modules/django/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/django/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, substituteAll,
+{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll,
   isPy3k,
   geos, gdal, pytz, sqlparse,
   withGdal ? false
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861";
   };
 
-  patches = stdenv.lib.optional withGdal
+  patches = lib.optional withGdal
     (substituteAll {
       src = ./1.10-gis-libs.template.patch;
       geos = geos;
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   # too complicated to setup
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high-level Python Web framework";
     homepage = "https://www.djangoproject.com/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django/3.nix b/nixpkgs/pkgs/development/python-modules/django/3.nix
index c3644d6946fd..2444146e8374 100644
--- a/nixpkgs/pkgs/development/python-modules/django/3.nix
+++ b/nixpkgs/pkgs/development/python-modules/django/3.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , substituteAll
@@ -13,16 +13,16 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "3.1.4";
+  version = "3.1.5";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "edb10b5c45e7e9c0fb1dc00b76ec7449aca258a39ffd613dbd078c51d19c9f03";
+    sha256 = "2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7";
   };
 
-  patches = stdenv.lib.optional withGdal
+  patches = lib.optional withGdal
     (substituteAll {
       src = ./django_3_set_geos_gdal_lib.patch;
       geos = geos;
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   # too complicated to setup
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high-level Python Web framework";
     homepage = "https://www.djangoproject.com/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix
index 45116ddd5548..c9c9913d7644 100644
--- a/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }:
 buildPythonPackage rec {
   pname = "django-appconf";
   version = "1.0.3";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     python -m django test --settings="tests.test_settings"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A helper class for handling configuration defaults of packaged apps gracefully";
     homepage = "https://django-appconf.readthedocs.org/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix b/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix
index 102e2e7cf935..e0a297e53c0c 100644
--- a/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # pypi version doesn't include runtest.py, needed to run tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Class based template tags for Django";
     homepage = "https://github.com/divio/django-classy-tags";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix b/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix
index 10068f87b079..468327139e64 100644
--- a/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # Requires Django >= 1.8
   buildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django extension that provides database and form color fields";
     homepage = "https://github.com/charettes/django-colorful";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix b/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
index 1408032d0c27..f00804364899 100644
--- a/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   rcssmin, rjsmin, django_appconf }:
 buildPythonPackage rec {
     pname = "django_compressor";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
     propagatedBuildInputs = [ rcssmin rjsmin django_appconf ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Compresses linked and inline JavaScript or CSS into single cached files";
       homepage = "https://django-compressor.readthedocs.org/en/latest/";
       license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix b/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
index 3f5371e397af..a8872967df4d 100644
--- a/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/django/django-contrib-comments";
     description = "The code formerly known as django.contrib.comments";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix
index e4ec7505c831..fa2618fa1a71 100644
--- a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
   propagatedBuildInputs = [ django six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilize environment variables to configure your Django application";
     homepage = "https://github.com/joke2k/django-environ/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix b/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
index e3b7be798775..dba92efb2d94 100644
--- a/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A database schema evolution tool for the Django web framework";
     homepage = "https://github.com/beanbaginc/django-evolution";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
index 364a5e12f52f..60023660ea56 100644
--- a/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , django_environ, mock, django
 , pytest, pytestrunner, pytest-django
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest pytestrunner pytest-django django_environ mock ];
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Per object permissions for Django";
     homepage = "https://github.com/django-guardian/django-guardian";
     license = [ licenses.mit licenses.bsd2 ];
diff --git a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
index e41b455cd4b5..500fe2e2fbce 100644
--- a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytz
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytz six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";
     homepage = "https://github.com/torchbox/django-modelcluster/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/django_nose/default.nix b/nixpkgs/pkgs/development/python-modules/django_nose/default.nix
index 66a4ad7857b9..7f2f9efcfc5b 100644
--- a/nixpkgs/pkgs/development/python-modules/django_nose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_nose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides all the goodness of nose in your Django tests";
     homepage = "https://github.com/django-nose/django-nose";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django_redis/default.nix b/nixpkgs/pkgs/development/python-modules/django_redis/default.nix
index 114962477fd6..434dea7f0f21 100644
--- a/nixpkgs/pkgs/development/python-modules/django_redis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage,
+{ lib, stdenv, fetchPypi, buildPythonPackage,
   mock, django, redis, msgpack }:
 buildPythonPackage rec {
   pname = "django-redis";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     msgpack
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Full featured redis cache backend for Django";
     homepage = "https://github.com/niwibe/django-redis";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
index 9d307734367c..16574770ff9e 100644
--- a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An extension to the Django web framework that provides comprehensive version control facilities";
     homepage = "https://github.com/etianen/django-reversion";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix
index 8efd62d7d181..66475b35d2a3 100644
--- a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , python
 , fetchFromGitHub
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     DB=sqlite3 DB_NAME=db.sqlite3 ${python.interpreter} manage.py test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Silky smooth profiling for the Django Framework";
     homepage = "https://github.com/jazzband/django-silk";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix
index 80ee899b1832..e715dde7c41e 100644
--- a/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , python
 , fetchPypi
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m django test --settings=tests.settings
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "django-taggit is a reusable Django application for simple tagging";
     homepage = "https://github.com/alex/django-taggit/tree/master/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix b/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix
index 060867d837f9..e734a5f7ae8e 100644
--- a/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "django-treebeard";
-  version = "4.3.1";
+  version = "4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "83aebc34a9f06de7daaec330d858d1c47887e81be3da77e3541fe7368196dd8a";
+    sha256 = "f50e4eea146f7af6702decf7ef198ac1eee1fb9bb4af2c5dba276c3c48f76623";
   };
 
   buildInputs = [ pytest ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # tests fail  "AppRegistryNotReady("Apps aren't loaded yet.")"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Efficient tree implementations for Django 1.6+";
     homepage = "https://tabo.pe/projects/django-treebeard/";
     maintainers = with maintainers; [ desiderius ];
diff --git a/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
index ec39f0739aeb..ef9e6be1d3c4 100644
--- a/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "djangoql";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "91fd65d9ee4b09092602ff05aca8a21c5a18062faf56f269a011b8e8e41483c6";
+    sha256 = "d1b1344cb1e037f094c04ccc67b809e8df80dea1e88cfb919078426131737018";
   };
 
   propagatedBuildInputs = [ ply ];
diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
index 8d1055029b7a..ce92fab3e965 100644
--- a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, django, isPy27 }:
 
 buildPythonPackage rec {
-  version = "3.11.2";
+  version = "3.12.2";
   pname = "djangorestframework";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a5967b68a04e0d97d10f4df228e30f5a2d82ba63b9d03e1759f84993b7bf1b53";
+  src = fetchFromGitHub {
+    owner = "encode";
+    repo = "django-rest-framework";
+    rev = version;
+    sha256 = "y/dw6qIOc6NaNpBWJXDwHX9aFodgKv9rGKWQKS6STlk=";
   };
 
   # Test settings are missing
@@ -15,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Web APIs for Django, made easy";
     homepage = "https://www.django-rest-framework.org/";
     maintainers = with maintainers; [ desiderius ];
diff --git a/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix
index aaecda77780c..e7a80d91d24c 100644
--- a/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, openssl, buildPythonPackage
+{ lib, stdenv, fetchPypi, openssl, buildPythonPackage
 , pytest, dnspython, pynacl, authres, python }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     ${python.interpreter} ./test.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DKIM + ARC email signing/verification tools + Python module";
     longDescription = ''
       Python module that implements DKIM (DomainKeys Identified Mail) email
diff --git a/nixpkgs/pkgs/development/python-modules/dlib/default.nix b/nixpkgs/pkgs/development/python-modules/dlib/default.nix
index 027500ff2abf..204c1a985425 100644
--- a/nixpkgs/pkgs/development/python-modules/dlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dlib/default.nix
@@ -24,6 +24,5 @@ buildPythonPackage {
 
   checkInputs = [ pytest more-itertools ];
 
-  enableParallelBuilding = true;
   dontUseCmakeConfigure = true;
 }
diff --git a/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix b/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix
index 465f1bb5b4d7..50ba05aca6f3 100644
--- a/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix
@@ -1,21 +1,27 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , biopython
 , docopt
 , flametree
 , numpy
 , proglog
+, pytestCheckHook
 , python-codon-tables
- }:
+, primer3
+, genome-collector
+, matplotlib
+}:
 
 buildPythonPackage rec {
   pname = "dnachisel";
-  version = "3.2.5";
+  version = "3.2.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "35301c5eda0baca5902403504e0b5a22eb65da92c2bbd23199d95c4a6bf0ef37";
+  src = fetchFromGitHub {
+    owner = "Edinburgh-Genome-Foundry";
+    repo = "DnaChisel";
+    rev = "v${version}";
+    sha256 = "0m88biw7sycjwsmncdybj9n3yf4n9cyvifv9zv7irm8ha3scchji";
   };
 
   propagatedBuildInputs = [
@@ -27,9 +33,24 @@ buildPythonPackage rec {
     python-codon-tables
   ];
 
-  # no tests in tarball
-  doCheck = false;
+  checkInputs = [
+    primer3
+    genome-collector
+    matplotlib
+    pytestCheckHook
+  ];
 
+  # Disable tests which requires network access
+  disabledTests = [
+    "test_circular_sequence_optimize_with_report"
+    "test_constraints_reports"
+    "test_optimize_with_report"
+    "test_optimize_with_report_no_solution"
+    "test_avoid_blast_matches_with_list"
+    "test_avoid_phage_blast_matches"
+    "test_avoid_matches_with_list"
+    "test_avoid_matches_with_phage"
+   ];
   pythonImportsCheck = [ "dnachisel" ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix b/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix
index a75278d45d43..543f4994020c 100644
--- a/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "docker-pycreds";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for the docker credentials store API.";
     homepage = "https://github.com/shin-/dockerpy-creds";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/docker/default.nix b/nixpkgs/pkgs/development/python-modules/docker/default.nix
index 7a23d17aca2a..5b148a9d62af 100644
--- a/nixpkgs/pkgs/development/python-modules/docker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docker/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "docker";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071";
+    sha256 = "sha256-BgSnRxnV0t5Dh1OTS3Vb/NpvYvSbjkswlppLCiqKEiA=";
   };
 
   nativeBuildInputs = lib.optional isPy27 mock;
diff --git a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
index e3a998126e9c..74e363d18b97 100644
--- a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
 
 buildPythonPackage rec {
   version = "1.1.0";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestcov pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for parsing Dockerfile files";
     homepage = "https://github.com/DBuildService/dockerfile-parse";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix b/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix
index fd9d7b4b88da..b6267b87c1bd 100644
--- a/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "dockerpty";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container";
     homepage = "https://github.com/d11wtq/dockerpty";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/docopt/default.nix b/nixpkgs/pkgs/development/python-modules/docopt/default.nix
index 135bedfc43e8..2dc4bb38cf14 100644
--- a/nixpkgs/pkgs/development/python-modules/docopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "docopt";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "14f4hn6d1j4b99svwbaji8n2zj58qicyz19mm0x6pmhb50jsics9";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pythonic argument parser, that will make you smile";
     homepage = "http://docopt.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
index 0241fd15ad48..12d15799ecc6 100644
--- a/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "doctest-ignore-unicode";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Add flag to ignore unicode literal prefixes in doctests";
     license = with licenses; [ asl20 ];
     homepage = "https://github.com/gnublade/doctest-ignore-unicode";
diff --git a/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix b/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
index f36e1347be9f..5dba1b91bc17 100644
--- a/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ decorator stevedore ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A caching front-end based on the Dogpile lock";
     homepage = "https://bitbucket.org/zzzeek/dogpile.cache";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix b/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix
index 41340cda26ee..f6eabc378b3b 100644
--- a/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "dogpile.core";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 'dogpile' lock, typically used as a component of a larger caching solution";
     homepage = "https://bitbucket.org/zzzeek/dogpile.core";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/doit/default.nix b/nixpkgs/pkgs/development/python-modules/doit/default.nix
new file mode 100644
index 000000000000..36cd0b0ee185
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/doit/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, mock
+, pytestCheckHook
+, cloudpickle
+, pyinotify
+, macfsevents
+}:
+
+buildPythonPackage rec {
+  pname = "doit";
+  version = "0.33.1";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "37c3b35c2151647b968b2af24481112b2f813c30f695366db0639d529190a143";
+  };
+
+  propagatedBuildInputs = [ cloudpickle ]
+    ++ lib.optional stdenv.isLinux pyinotify
+    ++ lib.optional stdenv.isDarwin macfsevents;
+
+  checkInputs = [ mock pytestCheckHook ];
+
+  disabledTests = [
+    # depends on doit-py, which has a circular dependency on doit
+    "test___main__.py"
+  ];
+
+  meta = with lib; {
+    homepage = "https://pydoit.org/";
+    description = "A task management & automation tool";
+    license = licenses.mit;
+    longDescription = ''
+      doit is a modern open-source build-tool written in python
+      designed to be simple to use and flexible to deal with complex
+      work-flows. It is specially suitable for building and managing
+      custom work-flows where there is no out-of-the-box solution
+      available.
+    '';
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix
index 03445f79117f..2626f420676a 100644
--- a/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python
 , buildPythonPackage
 , fetchPypi
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     ${python.interpreter} tests/test_dot2tex.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convert graphs generated by Graphviz to LaTeX friendly formats";
     homepage = "https://github.com/kjellmf/dot2tex";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix b/nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix
new file mode 100644
index 000000000000..22d469b96693
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+  pname = "dotty_dict";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-6wA1o2KezYQ5emjx9C8elKvRw0V3oZzT6srTMe58uvA=";
+  };
+
+  nativeBuildInputs = [ setuptools_scm ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Dictionary wrapper for quick access to deeply nested keys";
+    homepage = "https://dotty-dict.readthedocs.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/dpath/default.nix b/nixpkgs/pkgs/development/python-modules/dpath/default.nix
index 548bd5168385..505bd7bb456c 100644
--- a/nixpkgs/pkgs/development/python-modules/dpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dpath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy27
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27
 , mock, pytestCheckHook, nose, hypothesis
 }:
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # use pytest as nosetests hangs
   checkInputs = [ mock nose pytestCheckHook hypothesis ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/akesterson/dpath-python";
     license = [ licenses.mit ];
     description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath";
diff --git a/nixpkgs/pkgs/development/python-modules/dpkt/default.nix b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
index 4dd0de3b2d8c..177b260e8044 100644
--- a/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "dpkt";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "f4e579cbaf6e2285ebf3a9e84019459b4367636bac079ba169527e582fca48b4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
     homepage = "https://github.com/kbandla/dpkt";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
index 1488d9382289..dd92d51d6c6b 100644
--- a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   buildPythonPackage,
   fetchPypi,
   inflection,
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     djangorestframework
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of Swagger/OpenAPI schemas for Django REST Framework";
     homepage = "https://github.com/axnsan12/drf-yasg";
     maintainers = with maintainers; [ ivegotasthma ];
diff --git a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
index b58d24e3fecf..22e66d0a4a43 100644
--- a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytestrunner, requests, urllib3, mock, setuptools }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   buildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ requests urllib3 mock setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
     homepage = "https://www.dropbox.com/developers/core/docs";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ds-store/default.nix b/nixpkgs/pkgs/development/python-modules/ds-store/default.nix
new file mode 100644
index 000000000000..00d10e749496
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/ds-store/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mac_alias
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "ds_store";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "al45tair";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1zmhnz110dvisydp5h6s0ry2v9qf4rgr60xhhlak0c66zpvlkkl0";
+  };
+
+  propagatedBuildInputs = [ mac_alias ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "ds_store" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/al45tair/ds_store";
+    description = "Manipulate Finder .DS_Store files from Python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ prusnak ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/dtopt/default.nix b/nixpkgs/pkgs/development/python-modules/dtopt/default.nix
index 4b649cad9668..84631c217089 100644
--- a/nixpkgs/pkgs/development/python-modules/dtopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dtopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Add options to doctest examples while they are running";
     homepage = "https://pypi.python.org/pypi/dtopt";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/dufte/default.nix b/nixpkgs/pkgs/development/python-modules/dufte/default.nix
index 8fe202592359..d8435afa3f97 100644
--- a/nixpkgs/pkgs/development/python-modules/dufte/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dufte/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     matplotlib
     numpy
-  ] ++ stdenv.lib.optionals (pythonOlder "3.8") [
+  ] ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
   ];
 
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   checkInputs = [ pytestCheckHook ];
   pythonImportsCheck = [ "dufte" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Clean matplotlib plots";
     homepage = "https://github.com/nschloe/dufte";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix b/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix
index 82b9bed492cc..f0d3bad7a04f 100644
--- a/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix
+++ b/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , urllib3, certifi
 , gevent, geventhttpclient, mock, fastimport
 , git, glibcLocales }:
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple Python implementation of the Git file formats and protocols";
     homepage = "https://samba.org/~jelmer/dulwich/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index fb29133da0ef..5d4ac94f7fa0 100644
--- a/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , urllib3, certifi
 , gevent, geventhttpclient, mock, fastimport
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.20.14";
+  version = "0.20.15";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d";
+    sha256 = "1248942fr12av2rkzpm2fq0qn6rajvv2lcgq65h8kby27qvp65zv";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -21,10 +21,15 @@ buildPythonPackage rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple Python implementation of the Git file formats and protocols";
-    homepage = "https://samba.org/~jelmer/dulwich/";
-    license = licenses.gpl2Plus;
+    longDescription = ''
+      Dulwich is a Python implementation of the Git file formats and protocols, which
+      does not depend on Git itself. All functionality is available in pure Python.
+    '';
+    homepage = "https://www.dulwich.io/";
+    changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS";
+    license = with licenses; [ asl20 gpl2Plus];
     maintainers = with maintainers; [ koral ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/nixpkgs/pkgs/development/python-modules/dyn/default.nix
index cc7a330e97cf..b5fa28f2de6b 100644
--- a/nixpkgs/pkgs/development/python-modules/dyn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
 , pytest_xdist, covCore, glibcLocales }:
 
 buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   LC_ALL="en_US.UTF-8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Dynect dns lib";
     homepage = "https://dyn.readthedocs.org/en/latest/intro.html";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/dynd/default.nix b/nixpkgs/pkgs/development/python-modules/dynd/default.nix
index 9150a6746a2b..f23d19510ee7 100644
--- a/nixpkgs/pkgs/development/python-modules/dynd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dynd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPyPy
 , isPy3k
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   buildInputs = [ pkgs.libdynd.dev cython ];
   propagatedBuildInputs = [ numpy pkgs.libdynd ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libdynd.org";
     license = licenses.bsd2;
     description = "Python exposure of dynd";
diff --git a/nixpkgs/pkgs/development/python-modules/easydict/default.nix b/nixpkgs/pkgs/development/python-modules/easydict/default.nix
index d8dbb045ddca..e1898d3fc9e4 100644
--- a/nixpkgs/pkgs/development/python-modules/easydict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easydict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "easydict";
@@ -11,9 +11,9 @@ buildPythonPackage rec {
 
   docheck = false; # No tests in archive
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/makinacorpus/easydict";
-    license = with stdenv.lib; licenses.lgpl3;
+    license = licenses.lgpl3;
     description = "Access dict values as attributes (works recursively)";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/easygui/default.nix b/nixpkgs/pkgs/development/python-modules/easygui/default.nix
index 30c03ae6e2c5..441d839d36f6 100644
--- a/nixpkgs/pkgs/development/python-modules/easygui/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easygui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "easygui";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false; # No tests available
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Very simple, very easy GUI programming in Python";
     homepage = "https://github.com/robertlugg/easygui";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix
index 3dda2c914556..fc86edf5d4d0 100644
--- a/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "EasyProcess";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy to use python subprocess interface";
     homepage = "https://github.com/ponty/EasyProcess";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix b/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
index 1d2a780bbbbd..2a17f84bb3b4 100644
--- a/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Only needed for tests
   checkInputs = [ pkgs.openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ECDSA cryptographic signature library";
     homepage = "https://github.com/warner/python-ecdsa";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ed25519/default.nix b/nixpkgs/pkgs/development/python-modules/ed25519/default.nix
index 27ebc6a0ff27..183d7cc3ca55 100644
--- a/nixpkgs/pkgs/development/python-modules/ed25519/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ed25519/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "ed25519";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ed25519 public-key signatures";
     homepage = "https://github.com/warner/python-ed25519";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix
index ac3845bb6671..727c3003db5c 100644
--- a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , cmake
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     ctest -E "utf_8_char" .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://editorconfig.org";
     description = "EditorConfig File Locator and Interpreter for Python";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/edward/default.nix b/nixpkgs/pkgs/development/python-modules/edward/default.nix
index 0f42ddcc799b..c1171043356a 100644
--- a/nixpkgs/pkgs/development/python-modules/edward/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/edward/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
 , Keras, numpy, scipy, six, tensorflow }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ Keras numpy scipy six tensorflow ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Probabilistic programming language using Tensorflow";
     homepage = "https://github.com/blei-lab/edward";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix b/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix
index 8c7d7679005e..ae339368ff5d 100644
--- a/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_interface
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # tests fail, see https://hydra.nixos.org/build/4316603/log/raw
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool which computes a dependency graph between active Python eggs";
     homepage = "http://thomas-lotze.de/en/software/eggdeps/";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 06c4e4045ce1..67e277b57ac4 100644
--- a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,13 +18,13 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ elasticsearch python-dateutil six ]
-                          ++ stdenv.lib.optional (!isPy3k) ipaddress;
+                          ++ lib.optional (!isPy3k) ipaddress;
 
   # ImportError: No module named test_elasticsearch_dsl
   # Tests require a local instance of elasticsearch
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High level Python client for Elasticsearch";
     longDescription = ''
       Elasticsearch DSL is a high-level library whose aim is to help with
diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
index 8f403469e193..4929d1f51a48 100644
--- a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
@@ -2,7 +2,7 @@
 , fetchPypi
 , urllib3, requests
 , nosexcover, mock
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage (rec {
@@ -20,7 +20,7 @@ buildPythonPackage (rec {
   propagatedBuildInputs = [ urllib3 requests ];
   buildInputs = [ nosexcover mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official low-level client for Elasticsearch";
     homepage = "https://github.com/elasticsearch/elasticsearch-py";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
index 9b9597c98bef..bbab0bfe6e4f 100644
--- a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
 
 buildPythonPackage rec {
-  version = "2.0.4";
+  version = "2.1.1";
   pname = "elementpath";
   disabled = isPy27; # uses incompatible class syntax
 
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "v${version}";
-    sha256 = "0812il5xn7cq0qa0vmkszrvprakfpyxmilk7s918l9kavdy4al8x";
+    sha256 = "1h910v8f0648nqnk40bxgdim3623m07yg4xdfwcips2h55d19rk2";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this
diff --git a/nixpkgs/pkgs/development/python-modules/eliot/default.nix b/nixpkgs/pkgs/development/python-modules/eliot/default.nix
index 557be014f86c..472834c5c725 100644
--- a/nixpkgs/pkgs/development/python-modules/eliot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eliot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "eliot";
-  version = "1.12.0";
+  version = "1.13.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wabv7hk63l12881f4zw02mmj06583qsx2im0yywdjlj8f56vqdn";
+    sha256 = "5760194b308a7ab35514ae1b942d88e9f2359071556d82580383f09ca586fff7";
   };
 
   checkInputs = [
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     pytest -k 'not test_parse_stream'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://eliot.readthedocs.io";
     description = "Logging library that tells you why it happened";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/emcee/default.nix b/nixpkgs/pkgs/development/python-modules/emcee/default.nix
index ed513579457f..12974a9422d6 100644
--- a/nixpkgs/pkgs/development/python-modules/emcee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/emcee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , numpy }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ numpy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Kick ass affine-invariant ensemble MCMC sampling";
     homepage = "https://emcee.readthedocs.io/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix
index aabebe1c5210..d15185e14479 100644
--- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
-  checkPhase = ''nosetests'';
+  checkPhase = "nosetests";
 
   meta = with lib; {
     description = "Emoji for Python";
diff --git a/nixpkgs/pkgs/development/python-modules/emv/default.nix b/nixpkgs/pkgs/development/python-modules/emv/default.nix
index 6dfe39f8b6b1..26d40d8d2052 100644
--- a/nixpkgs/pkgs/development/python-modules/emv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/emv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , click, enum-compat, pyscard, pycountry, terminaltables
 , pytestCheckHook, pythonOlder
 }:
@@ -30,7 +30,7 @@ buildPythonPackage rec {
       --replace '"argparse==1.4.0",' ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/russss/python-emv";
     description = "Implementation of the EMV chip-and-pin smartcard protocol";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/enum/default.nix b/nixpkgs/pkgs/development/python-modules/enum/default.nix
index 92d3faa59891..ad266623c78b 100644
--- a/nixpkgs/pkgs/development/python-modules/enum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/enum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = !isPyPy;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/enum/";
     description = "Robust enumerated type support in Python";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/enum34/default.nix b/nixpkgs/pkgs/development/python-modules/enum34/default.nix
index 1f0d10942766..5e26853098fb 100644
--- a/nixpkgs/pkgs/development/python-modules/enum34/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/enum34/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
@@ -18,7 +18,7 @@ if pythonAtLeast "3.4" then null else buildPythonPackage rec {
     ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/enum34";
     description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/enzyme/default.nix b/nixpkgs/pkgs/development/python-modules/enzyme/default.nix
index 110575464cb6..ee547ad9b7bc 100644
--- a/nixpkgs/pkgs/development/python-modules/enzyme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/enzyme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "enzyme";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
     sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/Diaoul/enzyme";
-    license = with stdenv.lib; licenses.asl20;
+    license = licenses.asl20;
     description = "Python video metadata parser";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/epc/default.nix b/nixpkgs/pkgs/development/python-modules/epc/default.nix
index fe3cc4420c48..d74595431639 100644
--- a/nixpkgs/pkgs/development/python-modules/epc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/epc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , sexpdata
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ sexpdata ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "EPC (RPC stack for Emacs Lisp) implementation in Python";
     homepage = "https://github.com/tkf/python-epc";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/nixpkgs/pkgs/development/python-modules/ephem/default.nix
index 32fe91cb72d5..4d6e59409266 100644
--- a/nixpkgs/pkgs/development/python-modules/ephem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ephem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , glibcLocales, pytest }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     LC_ALL="en_US.UTF-8" py.test --pyargs ephem.tests -k "not JPLTest"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compute positions of the planets and stars";
     homepage = "https://pypi.python.org/pypi/ephem/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix b/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix
index 09475329c1bb..5ba9490d945a 100644
--- a/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , lxml
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     py.test $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of lxml.xmlfile for the standard library";
     longDescription = ''
       et_xmlfile is a low memory library for creating large XML files.
diff --git a/nixpkgs/pkgs/development/python-modules/etcd/default.nix b/nixpkgs/pkgs/development/python-modules/etcd/default.nix
index 7a122f1b616e..338992259a14 100644
--- a/nixpkgs/pkgs/development/python-modules/etcd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/etcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , simplejson
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # No proper tests are available
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python etcd client that just works";
     homepage = "https://github.com/dsoprea/PythonEtcdClient";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/etebase/default.nix b/nixpkgs/pkgs/development/python-modules/etebase/default.nix
index 366c447ed942..7832f6b4787a 100644
--- a/nixpkgs/pkgs/development/python-modules/etebase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/etebase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , wheel
 , rustPlatform
 , pipInstallHook
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     wheel
   ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   propagatedBuildInputs = [
     python
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
     pipInstallPhase
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.etebase.com/";
     description = "A Python client library for Etebase";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix b/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix
index 25f2ebd55412..9c67f0816e37 100644
--- a/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix
@@ -1,9 +1,9 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pytest, eth-hash, eth-typing,
+{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, eth-hash, eth-typing,
   cytoolz, hypothesis }:
 
 buildPythonPackage rec {
   pname = "eth-utils";
-  version = "1.8.4";
+  version = "1.9.5";
 
   # Tests are missing from the PyPI source tarball so let's use GitHub
   # https://github.com/ethereum/eth-utils/issues/130
@@ -11,20 +11,13 @@ buildPythonPackage rec {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hfzb3xz3j50dgp51nx2jssh9j07np24fqmpnyr2ycsll90g1j6q";
+    sha256 = "1h3xlw74zdf6cfvqf9193lx05bpdm05pmy9ap1g7q2kx0j2b6352";
   };
 
-  checkInputs = [ pytest hypothesis ];
+  checkInputs = [ pytestCheckHook hypothesis ];
   propagatedBuildInputs = [ eth-hash eth-typing cytoolz ];
 
-  # setuptools-markdown uses pypandoc which is broken at the moment
-  preConfigure = ''
-    substituteInPlace setup.py --replace \'setuptools-markdown\' ""
-  '';
-
-  checkPhase = ''
-    pytest .
-  '';
+  pythonImportsCheck = [ "eth_utils" ];
 
   meta = {
     description = "Common utility functions for codebases which interact with ethereum";
diff --git a/nixpkgs/pkgs/development/python-modules/evdev/default.nix b/nixpkgs/pkgs/development/python-modules/evdev/default.nix
index 305ada89552c..1a3f2a0e642e 100644
--- a/nixpkgs/pkgs/development/python-modules/evdev/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/evdev/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "evdev";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi";
+    sha256 = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1";
   };
 
   buildInputs = [ linuxHeaders ];
diff --git a/nixpkgs/pkgs/development/python-modules/eve/default.nix b/nixpkgs/pkgs/development/python-modules/eve/default.nix
index c50cc2aeb827..b931db188e3e 100644
--- a/nixpkgs/pkgs/development/python-modules/eve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , flask
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   # tests call a running mongodb instance
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://python-eve.org/";
     description = "Open source Python REST API framework designed for human beings";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
index 5eb3efe6009a..93b058859858 100644
--- a/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "eventlet";
-  version = "0.29.1";
+  version = "0.30.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9faff63631b01277c463ae91cd4ab3f25a2f0f5abe3219d43a386ef1daa6159a";
+    sha256 = "19d6f3aa9525221ba60d0ec31b570508021af7ad5497fb77f77501fe9a7c34d3";
   };
 
   propagatedBuildInputs = [ dnspython greenlet monotonic six ]
diff --git a/nixpkgs/pkgs/development/python-modules/eventlib/default.nix b/nixpkgs/pkgs/development/python-modules/eventlib/default.nix
index 4f684612f184..1b2b44d65f70 100644
--- a/nixpkgs/pkgs/development/python-modules/eventlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eventlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchdarcs
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Eventlib bindings for python";
     homepage    = "https://ag-projects.com/";
     license     = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/evernote/default.nix b/nixpkgs/pkgs/development/python-modules/evernote/default.nix
index b245ff117474..70c7fad963af 100644
--- a/nixpkgs/pkgs/development/python-modules/evernote/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/evernote/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
    propagatedBuildInputs = [ oauth2 ];
 
-   meta = with stdenv.lib; {
+   meta = with lib; {
     description = "Evernote SDK for Python";
     homepage = "https://dev.evernote.com";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix
index 0635f8f027cc..e380ca613cfd 100644
--- a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage,
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage,
   pythonOlder,
   lxml, tzlocal, python-dateutil, pygments, requests-kerberos,
   defusedxml, cached-property, isodate, requests_ntlm, dnspython,
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     oauthlib requests_oauthlib
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client for Microsoft Exchange Web Services (EWS)";
     homepage    = "https://github.com/ecederstrand/exchangelib";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/nixpkgs/pkgs/development/python-modules/execnet/default.nix
index bc7b67f52d42..0a22ab4b0516 100644
--- a/nixpkgs/pkgs/development/python-modules/execnet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/execnet/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Rapid multi-Python deployment";
     license = licenses.gpl2;
     homepage = "https://execnet.readthedocs.io/";
diff --git a/nixpkgs/pkgs/development/python-modules/exifread/default.nix b/nixpkgs/pkgs/development/python-modules/exifread/default.nix
index 3c7b814a3c83..e86a681a8e39 100644
--- a/nixpkgs/pkgs/development/python-modules/exifread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/exifread/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files";
     homepage    = "https://github.com/ianare/exif-py";
     license     = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
index d8ccb299fccb..08faf5c2ba84 100644
--- a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python module and command line program for processing ID3 tags";
     homepage    = "https://eyed3.nicfit.net/";
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix
index a745566a6451..6dfefe092040 100644
--- a/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
 
 buildPythonPackage rec {
   version = "0.12";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyparsing ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python package to read and write DXF drawings (interface to the DXF file format)";
     homepage = "https://github.com/mozman/ezdxf/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/face/default.nix b/nixpkgs/pkgs/development/python-modules/face/default.nix
index 71fbca916104..89e7156fa524 100644
--- a/nixpkgs/pkgs/development/python-modules/face/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/face/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, boltons, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, boltons, pytest }:
 
 buildPythonPackage rec {
   pname = "face";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # reporting
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mahmoud/face";
     description = "A command-line interface parser and framework";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix
index 2b26fa735e6d..1896bdfac592 100644
--- a/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy
-, face_recognition_models, stdenv, flake8, pytest, glibcLocales
+, face_recognition_models, lib, stdenv, flake8, pytest, glibcLocales
 }:
 
 buildPythonPackage rec {
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     LC_ALL="en_US.UTF-8" py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://github.com/ageitgey/face_recognition";
     maintainers = with maintainers; [ ma27 ];
diff --git a/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix b/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix
index 427ad364dde6..d5838438b7d9 100644
--- a/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, stdenv, fetchPypi, setuptools }:
+{ buildPythonPackage, lib, stdenv, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "face_recognition_models";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ageitgey/face_recognition_models";
     license = licenses.cc0;
     maintainers = with maintainers; [ ma27 ];
diff --git a/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix b/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix
index fb85408dd3d2..be26ab98af62 100644
--- a/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, six, pytest }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, six, pytest }:
 
 buildPythonPackage rec {
   pname = "fake-useragent";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Up to date simple useragent faker with real world database";
     homepage = "https://github.com/hellysmile/fake-useragent";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix
index ab947756fa98..82af8d04e077 100644
--- a/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest faker.tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python package that generates fake data for you";
     homepage    = "https://pypi.python.org/pypi/fake-factory";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/faker/default.nix b/nixpkgs/pkgs/development/python-modules/faker/default.nix
index abdb0f583941..990908efe034 100644
--- a/nixpkgs/pkgs/development/python-modules/faker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/faker/default.nix
@@ -1,59 +1,45 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder,
-# Build inputs
-dateutil, six, text-unidecode, ipaddress ? null
-# Test inputs
-, email_validator
+{ lib
+, buildPythonPackage
+, fetchPypi
+, dateutil
+, text-unidecode
 , freezegun
-, mock
-, more-itertools
 , pytestCheckHook
-, pytestrunner
 , ukpostcodeparser
 , validators
 }:
 
-assert pythonOlder "3.3" -> ipaddress != null;
-
 buildPythonPackage rec {
   pname = "Faker";
-  version = "4.18.0";
+  version = "5.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0raxw6mgvf9523v7917zqw76vqnpp0d6v3i310qnjnhpxmm78yb2";
+    sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19";
   };
 
-  nativeBuildInputs = [ pytestrunner ];
+  propagatedBuildInputs = [
+    dateutil
+    text-unidecode
+  ];
+
   checkInputs = [
-    email_validator
     freezegun
     pytestCheckHook
     ukpostcodeparser
     validators
-  ]
-  ++ lib.optionals (pythonOlder "3.3") [ mock ]
-  ++ lib.optionals (pythonOlder "3.0") [ more-itertools ];
+  ];
 
   # avoid tests which import random2, an abandoned library
   pytestFlagsArray = [
     "--ignore=tests/providers/test_ssn.py"
   ];
-
-  propagatedBuildInputs = [
-    dateutil
-    six
-    text-unidecode
-  ];
-
-  postPatch = ''
-    substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest"
-  '';
+  pythonImportsCheck = [ "faker" ];
 
   meta = with lib; {
-    description = "A Python library for generating fake user data";
-    homepage    = "http://faker.rtfd.org";
-    license     = licenses.mit;
+    description = "Python library for generating fake user data";
+    homepage = "http://faker.rtfd.org";
+    license = licenses.mit;
     maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/falcon/default.nix b/nixpkgs/pkgs/development/python-modules/falcon/default.nix
index 20a767774138..8d1aa02026c1 100644
--- a/nixpkgs/pkgs/development/python-modules/falcon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/falcon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , coverage
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # OSError: [Errno 98] Address already in use
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An unladen web framework for building APIs and app backends";
     homepage = "https://falconframework.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
index 32ebd6a0307d..dadfc41c68bc 100644
--- a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
@@ -1,61 +1,58 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, uvicorn
-, starlette
 , pydantic
-, isPy3k
-, pytest
-, pytestcov
-, pyjwt
-, passlib
+, starlette
+, pytestCheckHook
+, pytest-asyncio
 , aiosqlite
-, peewee
+, databases
 , flask
+, httpx
+, passlib
+, peewee
+, python-jose
+, sqlalchemy
 }:
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.55.1";
+  version = "0.63.0";
   format = "flit";
-  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "fastapi";
     rev = version;
-    sha256 = "1515nhwari48v0angyl5z3cfpvwn4al2nvqh0cjd9xgxzvm310s8";
+    sha256 = "0l3imrcs42pqf9d6k8c1q15k5sqcnapl5zk71xl52mrxhz49lgpi";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "starlette ==0.13.2" "starlette"
+      --replace "starlette ==0.13.6" "starlette"
   '';
 
   propagatedBuildInputs = [
-    uvicorn
     starlette
     pydantic
   ];
 
   checkInputs = [
-    pytest
-    pytestcov
-    pyjwt
-    passlib
     aiosqlite
-    peewee
+    databases
     flask
+    httpx
+    passlib
+    peewee
+    python-jose
+    pytestCheckHook
+    pytest-asyncio
+    sqlalchemy
   ];
 
-  # test_default_response_class.py: requires orjson, which requires rust toolchain
-  # test_custom_response/test_tutorial001b.py: requires orjson
-  # tests/test_tutorial/test_sql_databases/test_testing_databases.py: just broken, don't know why
-  checkPhase = ''
-    pytest --ignore=tests/test_default_response_class.py \
-           --ignore=tests/test_tutorial/test_custom_response/test_tutorial001b.py \
-           --ignore=tests/test_tutorial/test_sql_databases/test_testing_databases.py
-  '';
+  # disabled tests require orjson which requires rust nightly
+  pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" ];
+  disabledTests = [ "test_get_custom_response" ];
 
   meta = with lib; {
     homepage = "https://github.com/tiangolo/fastapi";
diff --git a/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix b/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix
new file mode 100644
index 000000000000..b3e27d7a5e81
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-benchmark, wasmer }:
+
+buildPythonPackage rec {
+  pname = "fastdiff";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ai95vjchl4396zjl1b69xfqvn9kn1y7c40d9l0qxdss0pcx6fk2";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'pytest-runner' ""
+  '';
+
+  propagatedBuildInputs = [ wasmer ];
+
+  checkInputs = [ pytestCheckHook pytest-benchmark ];
+
+  pythonImportsCheck = [ "fastdiff" ];
+  disabledTests = [ "test_native" ];
+
+  meta = with lib; {
+    description = "A fast native implementation of diff algorithm with a pure Python fallback";
+    homepage = "https://github.com/syrusakbary/fastdiff";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/fasteners/default.nix b/nixpkgs/pkgs/development/python-modules/fasteners/default.nix
index 75719a78fb21..57ad69c0be41 100644
--- a/nixpkgs/pkgs/development/python-modules/fasteners/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fasteners/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -20,13 +20,13 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six monotonic ];
 
-  checkInputs = [ testtools nose ] ++ stdenv.lib.optionals (!isPy3k) [ futures ];
+  checkInputs = [ testtools nose ] ++ lib.optionals (!isPy3k) [ futures ];
 
   checkPhase = ''
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python package that provides useful locks";
     homepage = "https://github.com/harlowja/fasteners";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix
index 08e2e384ff92..eb86784ddc7b 100644
--- a/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "fastentrypoints";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "02s1j8i2dzbpbwgq2a3fiqwm3cnmhii2qzc0k42l0rdxd4a4ya7z";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Makes entry_points specified in setup.py load more quickly";
     homepage = "https://github.com/ninjaaron/fast-entry_points";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix
index c1fab50c06e1..55aad9d71ea5 100644
--- a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, python, fetchPypi}:
+{ lib, stdenv, buildPythonPackage, python, fetchPypi}:
 
 buildPythonPackage rec {
   pname = "fastimport";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/python-fastimport";
     description = "VCS fastimport/fastexport parser";
     maintainers = with maintainers; [ koral ];
diff --git a/nixpkgs/pkgs/development/python-modules/fastpair/default.nix b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
index edb45eb06877..82964070d03b 100644
--- a/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }:
 
 buildPythonPackage {
   pname = "fastpair";
@@ -26,7 +26,7 @@ buildPythonPackage {
     pytest fastpair
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/carsonfarmer/fastpair";
     description = "Data-structure for the dynamic closest-pair problem";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix b/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix
index 568d894805fd..e033dc42d457 100644
--- a/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage
 , openssl, pytest, cffi, six }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ cffi six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Ayrx/python-fastpbkdf2";
     description = "Python bindings for fastpbkdf2";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix b/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix
index a542b5805653..25cc2b8792f7 100644
--- a/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "fastprogress" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fastai/fastprogress";
     description = "Simple and flexible progress bar for Jupyter Notebook and console";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix
index e44639942a0d..7aedbbdd8f7c 100644
--- a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "fastrlock";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "9ae1a31f6e069b5f0f28ba63c594d0c952065de0a375f7b491d21ebaccc5166f";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/scoder/fastrlock";
     description = "A fast RLock implementation for CPython";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/fasttext/default.nix b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix
index 42e6446e8643..bf3bd987564a 100644
--- a/nixpkgs/pkgs/development/python-modules/fasttext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }:
+{lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }:
 
 buildPythonPackage rec {
   inherit (pkgs.fasttext) pname version src;
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     HOME=$TMPDIR
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python module for text classification and representation learning";
     homepage = "https://fasttext.cc/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/fdint/default.nix b/nixpkgs/pkgs/development/python-modules/fdint/default.nix
index 68c3b039a47f..4de0d18ca8b7 100644
--- a/nixpkgs/pkgs/development/python-modules/fdint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fdint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cython
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m fdint.tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/scott-maddox/fdint";
     description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/feedgen/default.nix b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix
index dbc303f43026..509ffaed9d71 100644
--- a/nixpkgs/pkgs/development/python-modules/feedgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }:
 
 buildPythonPackage rec {
   pname = "feedgen";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python module to generate ATOM feeds, RSS feeds and Podcasts.";
     downloadPage = "https://github.com/lkiesow/python-feedgen/releases";
     homepage = "https://github.com/lkiesow/python-feedgen";
diff --git a/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix b/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix
index c0ccb7d345a9..8508cc637f22 100644
--- a/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }:
+{ lib, stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }:
 
 buildPythonPackage rec {
   pname = "feedgenerator";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six pytz ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standalone version of django.utils.feedgenerator, compatible with Py3k";
     homepage = "https://github.com/dmdm/feedgenerator-py3k.git";
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/python-modules/feedparser/5.nix b/nixpkgs/pkgs/development/python-modules/feedparser/5.nix
index 31fc61053b92..a79048c55254 100644
--- a/nixpkgs/pkgs/development/python-modules/feedparser/5.nix
+++ b/nixpkgs/pkgs/development/python-modules/feedparser/5.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # lots of networking failures
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kurtmckee/feedparser";
     description = "Universal feed parser";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/feedparser/default.nix b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
index aeeb9b3e4960..7b48fe6f73e5 100644
--- a/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     python -Wd tests/runtests.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kurtmckee/feedparser";
     description = "Universal feed parser";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix b/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix
index 014e3b9810a9..df132211d4f9 100644
--- a/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # There is no test embedded
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A snapshot of django-filebrowser for the Mezzanine CMS";
     longDescription = ''
       filebrowser_safe was created to provide a snapshot of the
diff --git a/nixpkgs/pkgs/development/python-modules/filebytes/default.nix b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix
index 7404620896c9..bfac6a0e6b23 100644
--- a/nixpkgs/pkgs/development/python-modules/filebytes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0h97i6h525hg401dvvaa5krxi184qpvldbdn0izmirvr9pvh4hkn";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://scoding.de/filebytes-introduction";
     license = licenses.gpl2;
     description = "Scripts to parse ELF, PE, Mach-O and OAT (Android Runtime)";
diff --git a/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/nixpkgs/pkgs/development/python-modules/filelock/default.nix
index 9729c1543cb4..77ddec306fc2 100644
--- a/nixpkgs/pkgs/development/python-modules/filelock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filelock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "filelock";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/benediktschmitt/py-filelock";
     description = "A platform independent file lock for Python";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/python-modules/filterpy/default.nix b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix
index bae362d3a4a4..53059ce43d05 100644
--- a/nixpkgs/pkgs/development/python-modules/filterpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     pytest --ignore=filterpy/common/tests/test_discretization.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rlabbe/filterpy";
     description = "Kalman filtering and optimal estimation library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/fints/default.nix b/nixpkgs/pkgs/development/python-modules/fints/default.nix
index 10915e766ac2..8e02dac58508 100644
--- a/nixpkgs/pkgs/development/python-modules/fints/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fints/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , bleach
 , mt-940
 , pytest
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     pytest . --ignore=tests/test_client.py -k 'not robust_mode'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/raphaelm/python-fints/";
     description = "Pure-python FinTS (formerly known as HBCI) implementation";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/fire/default.nix b/nixpkgs/pkgs/development/python-modules/fire/default.nix
index 6c81a708d57d..6a2cc594360d 100644
--- a/nixpkgs/pkgs/development/python-modules/fire/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fire/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock
 , python-Levenshtein, pytest, termcolor, isPy27, enum34 }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc";
   };
 
-  propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34;
+  propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34;
 
   checkInputs = [ hypothesis mock python-Levenshtein pytest ];
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     py.test -k 'not testInitRequiresFlag'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for automatically generating command line interfaces";
     longDescription = ''
       Python Fire is a library for automatically generating command line
diff --git a/nixpkgs/pkgs/development/python-modules/first/default.nix b/nixpkgs/pkgs/development/python-modules/first/default.nix
index 6956addb29f3..a5bdf847eff2 100644
--- a/nixpkgs/pkgs/development/python-modules/first/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/first/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "first";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false; # no tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The function you always missed in Python";
     homepage = "https://github.com/hynek/first/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/fixerio/default.nix b/nixpkgs/pkgs/development/python-modules/fixerio/default.nix
new file mode 100644
index 000000000000..786681df1c83
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/fixerio/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, pytestCheckHook
+, httpretty
+}:
+
+buildPythonPackage rec {
+  pname = "fixerio";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "amatellanes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1k9ss5jc7sbpkjd2774vbmvljny0wm2lrc8155ha8yk2048jsaxk";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "requests==2.10.0" "requests"
+  '';
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  checkInputs = [
+    httpretty
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "fixerio" ];
+
+  meta = with lib; {
+    description = "Python client for Fixer.io";
+    longDescription = ''
+      Fixer.io is a free JSON API for current and historical foreign
+      exchange rates published by the European Central Bank.
+    '';
+    homepage = "https://github.com/amatellanes/fixerio";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/flake8-blind-except/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-blind-except/default.nix
index 1c2dbe5f52c2..c3974d0e007b 100644
--- a/nixpkgs/pkgs/development/python-modules/flake8-blind-except/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -2,10 +2,10 @@
 
 buildPythonPackage rec {
   pname = "flake8-blind-except";
-  version = "0.1.1";
+  version = "0.2.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc";
+    sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5";
   };
   meta = {
     homepage = "https://github.com/elijahandrews/flake8-blind-except";
diff --git a/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/nixpkgs/pkgs/development/python-modules/flake8/default.nix
index a369919b98fb..9e53ed28ff34 100644
--- a/nixpkgs/pkgs/development/python-modules/flake8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , mock, pytest, pytestrunner
 , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata
 }:
@@ -14,17 +14,17 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest mock pytestrunner ];
   propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]
-    ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
-    ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]
-    ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+    ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
+    ++ lib.optionals (pythonOlder "3.4") [ enum34 ]
+    ++ lib.optionals (pythonOlder "3.5") [ typing ]
+    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # fixtures fail to initialize correctly
   checkPhase = ''
     py.test tests --ignore=tests/integration/test_checker.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code checking using pep8 and pyflakes";
     homepage = "https://pypi.python.org/pypi/flake8";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/flaky/default.nix b/nixpkgs/pkgs/development/python-modules/flaky/default.nix
index 9bf20e6cc3b5..02b0641a34e2 100644
--- a/nixpkgs/pkgs/development/python-modules/flaky/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flaky/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pytest --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/box/flaky";
     description = "Plugin for nose or py.test that automatically reruns flaky tests";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
index 0eb9f61d697f..da6176e6781f 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , python
 , fetchPypi
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover -s tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Adds i18n/l10n support to Flask applications";
     longDescription = ''
       Implements i18n and l10n support for Flask.
diff --git a/nixpkgs/pkgs/development/python-modules/flask-common/default.nix b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix
index 40c7903aee3d..7dbf507f2205 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-common/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ crayons flask flask-caching gunicorn maya meinheld whitenoise ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flask extension with lots of common time-savers";
     homepage = "https://github.com/kennethreitz/flask-common";
     license = licenses.asl20; # XXX: setup.py lists BSD but git repo has Apache 2.0 LICENSE
diff --git a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
index fe55705bb521..9491ca8be779 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, flask
+{ lib, stdenv, fetchPypi, buildPythonPackage, flask
 , brotli
 }:
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask brotli ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compress responses in your Flask app with gzip";
     homepage = "https://libwilliam.github.io/flask-compress/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix b/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
index da61365e3ae8..731e8b106ab7 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , nose, flask, six, packaging }:
 
 buildPythonPackage rec {
   pname = "Flask-Cors";
-  version = "3.0.9";
+  version = "3.0.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
+    sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de";
   };
 
   checkInputs = [ nose packaging ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     nosetests --exclude test_acl_uncaught_exception_500
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Flask extension adding a decorator for CORS support";
     homepage = "https://github.com/corydolphin/flask-cors";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix b/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix
index 9f8e27ea20f9..6986cd75be69 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , flask, elasticsearch }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ flask elasticsearch ];
   doCheck = false; # no tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Integrates official client for Elasticsearch into Flask";
     license = licenses.bsd3;
     maintainers = [ maintainers.mic92 ];
diff --git a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
index 4d45343c2658..cf8a70b05330 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-JWT-Extended";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pytest tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JWT extension for Flask";
     homepage = "https://flask-jwt-extended.readthedocs.io/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix b/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix
index 2573f5497408..1673ca24e6e0 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
 , flask, flask_wtf, flask_testing, ldap
 , mock, nose }:
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   checkPhase = "nosetests -d";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ContinuumIO/flask-ldap-login";
     description = "User session management for Flask";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
index 1f24919b73c0..38d42da1c8a7 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, flask, limits }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, flask, limits }:
 
 buildPythonPackage rec {
   pname = "Flask-Limiter";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask limits ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Rate limiting for flask applications";
     homepage = "https://flask-limiter.readthedocs.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-login/default.nix b/nixpkgs/pkgs/development/python-modules/flask-login/default.nix
index a4cd86ee69d4..919e353eb8e0 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-login/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-login/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
 , flask, blinker, nose, mock, semantic-version }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = pythonAtLeast "3.3";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/maxcountryman/flask-login";
     description = "User session management for Flask";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
index 24ed04437a03..4d50ade30e1c 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }:
-
-with stdenv.lib;
+{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }:
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
@@ -11,15 +9,15 @@ buildPythonPackage rec {
     sha256 = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee";
   };
 
-  checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales;
+  checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales;
   propagatedBuildInputs = [ flask flask_sqlalchemy alembic ];
 
   # tests invoke the flask cli which uses click and therefore has py3k encoding troubles
-  preCheck = optionalString isPy3k ''
+  preCheck = lib.optionalString isPy3k ''
     export LANG="en_US.UTF-8"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "SQLAlchemy database migrations for Flask applications using Alembic";
     license = licenses.mit;
     homepage = "https://github.com/miguelgrinberg/Flask-Migrate";
diff --git a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
index f8001bc2aff5..550f6520e7db 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     werkzeug
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Flask middleware for applications running under a reverse proxy";
     maintainers = with maintainers; [ matthiasbeyer ];
     homepage = "https://github.com/antarctica/flask-reverse-proxy-fix";
diff --git a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
index fc8c57be99a4..92d2f90848cb 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , flask
@@ -21,7 +21,7 @@ buildPythonPackage {
     flask
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Adds silk icons to your Flask application or module, or extension";
     license = licenses.bsd3;
     maintainers = teams.sage.members;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix
index 80f6edb79d35..496676600fc9 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix
@@ -1,18 +1,21 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, coverage
+, fetchFromGitHub
 , flask
+, pytestCheckHook
 , python-socketio
-, coverage
 }:
 
 buildPythonPackage rec {
   pname = "Flask-SocketIO";
-  version = "4.3.2";
+  version = "5.0.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "37001b3507f2fa5d1c8d9c8e211dd88da6c5286ff0ebce16f27cb1b467d25d68";
+  src = fetchFromGitHub {
+    owner = "miguelgrinberg";
+    repo = "Flask-SocketIO";
+    rev = "v${version}";
+    sha256 = "01zf6cy95pgc4flgn0740z2my90l7rxwliahp6rb2xbp7rh32cng";
   };
 
   propagatedBuildInputs = [
@@ -20,9 +23,12 @@ buildPythonPackage rec {
     python-socketio
   ];
 
-  checkInputs = [ coverage ];
-  # tests only on github, but lates release there is not tagged
-  doCheck = false;
+  checkInputs = [
+    coverage
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "flask_socketio" ];
 
   meta = with lib; {
     description = "Socket.IO integration for Flask applications";
diff --git a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index c811ce24157e..16b8c9c7fc79 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-SQLAlchemy";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SQLAlchemy extension for Flask";
     homepage = "http://flask-sqlalchemy.pocoo.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix b/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
index cc4b4e06bfcc..79650e7c1755 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, flask }:
 
 buildPythonPackage rec {
   pname = "flask-swagger-ui";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     flask
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sveint/flask-swagger-ui";
     license = licenses.mit;
     description = "Swagger UI blueprint for Flask";
diff --git a/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix b/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix
index c690e4e64ae5..20624c318620 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , flask, pyyaml }:
 
 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gangverk/flask-swagger";
     license = licenses.mit;
     description = "Extract swagger specs from your flask project";
diff --git a/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix b/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
index 24e2e6343a20..6cfcffdb7be8 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }:
 
 buildPythonPackage rec {
   pname = "Flask-Testing";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask ];
 
-  checkInputs = [ blinker ] ++ stdenv.lib.optionals (!isPy3k) [ twill ];
+  checkInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ twill ];
 
   # twill integration is outdated in Python 2, hence it the tests fails.
   # Some of the tests use localhost networking on darwin.
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "flask_testing" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flask unittest integration.";
     homepage = "https://pythonhosted.org/Flask-Testing/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix
index 3bd5ef98b322..15e7b2c1875d 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, flask }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flask }:
 
 buildPythonPackage rec {
   pname = "Flask-Versioned";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flask plugin to rewrite file paths to add version info";
     homepage = "https://github.com/pilt/flask-versioned";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix b/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix
index 060f592b2cff..eadc7842a013 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }:
 
 buildPythonPackage rec {
   pname = "Flask-WTF";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false; # requires external service
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple integration of Flask and WTForms.";
     license = licenses.bsd3;
     maintainers = [ maintainers.mic92 ];
diff --git a/nixpkgs/pkgs/development/python-modules/flask/default.nix b/nixpkgs/pkgs/development/python-modules/flask/default.nix
index bbac89406fc3..d121b4e32c8b 100644
--- a/nixpkgs/pkgs/development/python-modules/flask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , itsdangerous, click, werkzeug, jinja2, pytest }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Tests require extra dependencies
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://flask.pocoo.org/";
     description = "A microframework based on Werkzeug, Jinja 2, and good intentions";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix b/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
index 2956e2036c9d..eef31359f504 100644
--- a/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , flask
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Adds i18n/l10n support to Flask applications";
     homepage = "https://github.com/mitsuhiko/flask-babel";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix b/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix
index 065808dfe6ef..f697f7b8ae09 100644
--- a/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , flatbuffers
 }:
@@ -8,10 +8,14 @@ buildPythonPackage rec {
 
   sourceRoot = "source/python";
 
+  # flatbuffers needs VERSION environment variable for setting the correct
+  # version, otherwise it uses the current date.
+  VERSION = "${version}";
+
   pythonImportsCheck = [ "flatbuffers" ];
 
   meta = flatbuffers.meta // {
     description = "Python runtime library for use with the Flatbuffers serialization format";
-    maintainers = with stdenv.lib.maintainers; [ wulfsta ];
+    maintainers = with lib.maintainers; [ wulfsta ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
index 717e3a3291b6..1a6591040a2e 100644
--- a/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ botocore boto3 docutils ];
   buildInputs = [ unittest2 mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier";
     homepage = "https://github.com/obsrvbl/flowlogs-reader";
     maintainers = with maintainers; [ cransom ];
diff --git a/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix b/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix
index b980449661ee..8b0c98635507 100644
--- a/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix
+++ b/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "flufl.i18n";
-  version = "3.1.3";
+  version = "3.1.4";
 
   propagatedBuildInputs = [ atpublic ];
 
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dcca738be27f2c43ddf6f9307667a17478353190071f38a9f92c9af8d2252ba4";
+    sha256 = "e19036292a825a69f0e0a87566d1628830c69eecd3b0295d22f582039477a6bb";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/flup/default.nix b/nixpkgs/pkgs/development/python-modules/flup/default.nix
index a6ef4d421df3..52ac5da27aa1 100644
--- a/nixpkgs/pkgs/development/python-modules/flup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.saddi.com/software/flup/";
     description = "FastCGI Python module set";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix
index 1cbfca78462f..ddec811e21ce 100644
--- a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , aiohttp, zigpy
 , pytest, isPy27 }:
 
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "1zgajlkhclyrqhkmivna4ha2lyvfpk5929s042gy59p7mzpkvjx7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python library to communicate with the flux_led smart bulbs";
     homepage = "https://github.com/Danielhiversen/flux_led";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/fnvhash/default.nix b/nixpkgs/pkgs/development/python-modules/fnvhash/default.nix
new file mode 100644
index 000000000000..d506b51a92cf
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/fnvhash/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "fnvhash";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "znerol";
+    repo = "py-fnvhash";
+    rev = "v${version}";
+    sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "fnvhash" ];
+
+  meta = with lib; {
+    description = "Python FNV hash implementation";
+    homepage = "https://github.com/znerol/py-fnvhash";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/folium/default.nix b/nixpkgs/pkgs/development/python-modules/folium/default.nix
index 800ece5261da..c0adaeaa5589 100644
--- a/nixpkgs/pkgs/development/python-modules/folium/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/folium/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "540789abc21872469e52c59ac3962c61259a8df557feadd6514eb23eb0a64ca7";
+    sha256 = "d45ace0a813ae65f202ce0356eb29c40a5e8fde071e4d6b5be0a89587ebaeab2";
   };
 
   disabled = pythonOlder "3.5";
diff --git a/nixpkgs/pkgs/development/python-modules/foolscap/default.nix b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix
index 0c5a0fff79d2..396bef6d009e 100644
--- a/nixpkgs/pkgs/development/python-modules/foolscap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     # trial foolscap
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://foolscap.lothar.com/";
     description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix b/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
index 75b4fdef3378..64713d96adea 100644
--- a/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Patch python built-in objects";
     homepage = "https://pypi.python.org/pypi/forbiddenfruit";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/fortiosapi/default.nix b/nixpkgs/pkgs/development/python-modules/fortiosapi/default.nix
new file mode 100644
index 000000000000..8b0425c38817
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/fortiosapi/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, oyaml
+, packaging
+, paramiko
+, pexpect
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "fortiosapi";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "fortinet-solutions-cse";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k";
+  };
+
+  propagatedBuildInputs = [
+    pexpect
+    requests
+    paramiko
+    packaging
+    oyaml
+  ];
+
+  # Tests require a local VM
+  doCheck = false;
+  pythonImportsCheck = [ "fortiosapi" ];
+
+  meta = with lib; {
+    description = "Python module to work with Fortigate/Fortios devices";
+    homepage = "https://github.com/fortinet-solutions-cse/fortiosapi";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix
index cc9ad87052b0..d60c1e89900a 100644
--- a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }:
 
 buildPythonPackage rec {
   pname = "FoxDot";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # Requires a running SuperCollider instance
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Live coding music with SuperCollider";
     homepage = "https://foxdot.org/";
     license = licenses.cc-by-sa-40;
diff --git a/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix b/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix
index 219fc180b225..9dc88596f267 100644
--- a/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix
+++ b/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # contains python3 specific code
   doCheck = !isPy27;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "FreezeGun: Let your Python tests travel through time";
     homepage = "https://github.com/spulec/freezegun";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
index 743b041775f0..f1b1d9738d72 100644
--- a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # contains python3 specific code
   doCheck = !isPy27;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "FreezeGun: Let your Python tests travel through time";
     homepage = "https://github.com/spulec/freezegun";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
index d55941bd5b47..571fba1a8acd 100644
--- a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
@@ -1,37 +1,26 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }:
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }:
 
 buildPythonPackage rec {
   pname = "fritzconnection";
-  version = "1.2.1";
+  version = "1.4.0";
 
+  # no tests on PyPI
   src = fetchFromGitHub {
     owner = "kbr";
     repo = pname;
     rev = version;
-    sha256 = "17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x";
+    sha256 = "1p8dqcc75xfhyvc9izjzz8c7qfrdkjkrkj36j7ms5fimn5bwk70q";
   };
 
-  disabled = pythonOlder "3.5";
-
-  # Exclude test files from build, which cause ImportMismtachErrors and
-  # otherwise missing resources during tests. This patch can be dropped once
-  # https://github.com/kbr/fritzconnection/pull/39 is merged.
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace 'find_packages()' 'find_packages(exclude=["*.tests"])'
-  '';
+  disabled = pythonOlder "3.6";
 
   propagatedBuildInputs = [ requests ];
 
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    pytest
-  '';
+  checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol";
-    homepage = "https://bitbucket.org/kbr/fritzconnection";
+    homepage = "https://github.com/kbr/fritzconnection";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda valodim ];
   };
diff --git a/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
index 583dad1b014d..dd0c99298265 100644
--- a/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "frozendict";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # frozendict does not come with tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/slezica/python-frozendict";
     description = "An immutable dictionary";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ftfy/default.nix b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
index a781230a9193..63342c7045d0 100644
--- a/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     PATH=$out/bin:$PATH pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Given Unicode text, make its representation consistent and possibly less broken";
     homepage = "https://github.com/LuminosoInsight/python-ftfy";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
index f38f5d740971..883ff69c6d68 100644
--- a/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
           and not test_conditional_upload and not test_conditional_download_with_older_target \
   ''
   # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed
-  + lib.optionalString stdenv.isDarwin ''and not test_error_message_reuse''
+  + lib.optionalString stdenv.isDarwin "and not test_error_message_reuse"
   + ''"'';
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/fudge/default.nix b/nixpkgs/pkgs/development/python-modules/fudge/default.nix
index 16656fb19a74..3f53b66d1efa 100644
--- a/nixpkgs/pkgs/development/python-modules/fudge/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fudge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     nosetests -v
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fudge-py/fudge";
     description = "Replace real objects with fakes (mocks, stubs, etc) while testing";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix b/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
index 3a9503419ecd..773ed1dccd67 100644
--- a/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # Tests are Python 2.x only judging from SyntaxError
   doCheck = !(isPy3k);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Recursive descent parsing library based on functional combinators";
     homepage = "https://github.com/vlasovskikh/funcparserlib";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix b/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix
index 1febf9d356eb..1464baa57df2 100644
--- a/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , isPyPy, isPy3k, unittest2
 }:
 
@@ -14,9 +14,9 @@ buildPythonPackage rec {
   buildInputs = [ unittest2 ];
 
   # https://github.com/testing-cabal/funcsigs/issues/10
-  patches = stdenv.lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ];
+  patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
     homepage = "https://github.com/aliles/funcsigs";
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/python-modules/functools32/default.nix b/nixpkgs/pkgs/development/python-modules/functools32/default.nix
index fea79db3d05b..cec9da423958 100644
--- a/nixpkgs/pkgs/development/python-modules/functools32/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/functools32/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -13,7 +13,7 @@ if isPy3k then null else buildPythonPackage rec {
     sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This is a backport of the functools standard library module from";
     homepage = "https://github.com/MiCHiLU/python-functools32";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/nixpkgs/pkgs/development/python-modules/funcy/default.nix
index 96b12e631abf..3db08cf22bbd 100644
--- a/nixpkgs/pkgs/development/python-modules/funcy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/funcy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of fancy functional tools focused on practicality";
     homepage = "https://funcy.readthedocs.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/furl/default.nix b/nixpkgs/pkgs/development/python-modules/furl/default.nix
index 5893e5a6b941..b7592885007e 100644
--- a/nixpkgs/pkgs/development/python-modules/furl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/furl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }:
 
 buildPythonPackage rec {
   pname = "furl";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     pytest -k 'not join'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "furl is a small Python library that makes parsing and manipulating URLs easy";
     homepage = "https://github.com/gruns/furl";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix
index ab87f57be395..a130fab0d7eb 100644
--- a/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }:
 
 buildPythonPackage rec {
   pname = "fuse-python";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbaa21c8f0a440302d1ba9fd57a80cf9ff227e5a3820708a8ba8450db883cc05";
+    sha256 = "da42d4f596a2e91602bcdf46cc51747df31c074a3ceb78bccc253c483a8a75fb";
   };
 
   buildInputs = [ fuse ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
-  # no tests in the Pypi archive
+  # no tests implemented
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [ "fuse" ];
+
+  meta = with lib; {
     description = "Python bindings for FUSE";
     homepage = "https://github.com/libfuse/python-fuse";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/fusepy/default.nix b/nixpkgs/pkgs/development/python-modules/fusepy/default.nix
index 57355126dde2..858d3e13ea0c 100644
--- a/nixpkgs/pkgs/development/python-modules/fusepy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fusepy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -23,7 +23,7 @@ buildPythonPackage rec {
       "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple ctypes bindings for FUSE";
     longDescription = ''
       Python module that provides a simple interface to FUSE and MacFUSE.
diff --git a/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix b/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix
index 8baec8c1089a..c2d16a559842 100644
--- a/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }:
 
 buildPythonPackage rec {
   pname = "fuzzywuzzy";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ python-Levenshtein ];
   checkInputs = [ pycodestyle hypothesis pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fuzzy string matching for Python";
     homepage = "https://github.com/seatgeek/fuzzywuzzy";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/gast/default.nix b/nixpkgs/pkgs/development/python-modules/gast/default.nix
index 49687ebe3184..e4dbe43ef8d7 100644
--- a/nixpkgs/pkgs/development/python-modules/gast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gast/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, astunparse }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, astunparse }:
 
 buildPythonPackage rec {
   pname = "gast";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
     sha256 = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1";
   };
   checkInputs = [ astunparse ] ;
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.";
     license = licenses.bsd3;
     maintainers = with maintainers; [ jyp ];
diff --git a/nixpkgs/pkgs/development/python-modules/gateone/default.nix b/nixpkgs/pkgs/development/python-modules/gateone/default.nix
index 372cdae8c233..981cbbb7e8c3 100644
--- a/nixpkgs/pkgs/development/python-modules/gateone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gateone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , tornado
 , futures
@@ -25,7 +25,7 @@ buildPythonPackage {
     cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://liftoffsoftware.com/";
     description = "GateOne is a web-based terminal emulator and SSH client";
     maintainers = with maintainers; [ tomberek ];
diff --git a/nixpkgs/pkgs/development/python-modules/gcovr/default.nix b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix
index 774b2087d8fd..bedb7f3a3755 100644
--- a/nixpkgs/pkgs/development/python-modules/gcovr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , jinja2
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     "gcovr.configuration"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python script for summarizing gcov data";
     license = licenses.bsd0;
     homepage = "https://www.gcovr.com/";
diff --git a/nixpkgs/pkgs/development/python-modules/gdata/default.nix b/nixpkgs/pkgs/development/python-modules/gdata/default.nix
index 182fdc402a64..bf9c01c250ab 100644
--- a/nixpkgs/pkgs/development/python-modules/gdata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Fails with "error: invalid command 'test'"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/gdata-python-client";
     description = "Python client library for Google data APIs";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
index 24b788f2c6d7..aab5efea97de 100644
--- a/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPy3k
@@ -29,7 +29,7 @@ buildPythonPackage rec {
       --replace "==" ">="
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mount Google Drive as a local file system";
     longDescription = ''
       GDriveFS is a FUSE wrapper for Google Drive developed. Design goals:
diff --git a/nixpkgs/pkgs/development/python-modules/geeknote/default.nix b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix
index cacc832486e2..4eb209a8af7f 100644
--- a/nixpkgs/pkgs/development/python-modules/geeknote/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -28,7 +28,7 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ thrift beautifulsoup4 markdown2 sqlalchemy html2text evernote ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Work with Evernote from command line";
     homepage = "http://www.geeknote.me";
     license = licenses.gpl1;
diff --git a/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/nixpkgs/pkgs/development/python-modules/genanki/default.nix
index bda80fe9e752..f43fdabf09e5 100644
--- a/nixpkgs/pkgs/development/python-modules/genanki/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genanki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner
 }:
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kerrickstaley/genanki";
     description = "Generate Anki decks programmatically";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/genome-collector/default.nix b/nixpkgs/pkgs/development/python-modules/genome-collector/default.nix
new file mode 100644
index 000000000000..70589912520a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/genome-collector/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, appdirs
+, biopython
+, fetchPypi
+, proglog
+}:
+
+buildPythonPackage rec {
+  pname = "genome_collector";
+  version = "0.1.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0023ihrz0waxbhq28xh1ymvk51ih882y9psg4glm6s9d1zmqvdph";
+  };
+
+  propagatedBuildInputs = [
+    appdirs
+    biopython
+    proglog
+  ];
+
+  # Project hasn't released the tests yet
+  doCheck = false;
+  pythonImportsCheck = [ "genome_collector" ];
+
+  meta = with lib; {
+    description = "Genomes and build BLAST/Bowtie indexes in Python";
+    homepage = "https://github.com/Edinburgh-Genome-Foundry/genome_collector";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/genpy/default.nix b/nixpkgs/pkgs/development/python-modules/genpy/default.nix
index 64e253b32019..d5e82332c30b 100644
--- a/nixpkgs/pkgs/development/python-modules/genpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genpy/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "genpy";
-  version = "2016.1.3";
+  version = "2021.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c11726f1e8ace8bbdfc87816403c9a59f53a8c3d45c99187ae17c9725d87a91";
+    sha256 = "9bc062fa98c5c466ff464d8974be81a6bf67af9247b5e5176215ad1e81a6cdac";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/genshi/default.nix b/nixpkgs/pkgs/development/python-modules/genshi/default.nix
index 9e6bab6e1690..9a6e4508e30e 100644
--- a/nixpkgs/pkgs/development/python-modules/genshi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genshi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     setuptools six
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python components for parsing HTML, XML and other textual content";
     longDescription = ''
       Python library that provides an integrated set of components for
diff --git a/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix b/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix
index 5917d71c4408..8f486cc29efb 100644
--- a/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatically generated zsh completion function for Python's option parser modules";
     homepage = "https://bitbucket.org/hhatto/genzshcomp/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
index e96c67b044db..56f9346668f6 100644
--- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , sqlalchemy
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage =  "http://geoalchemy.org/";
     license = licenses.mit;
     description = "Toolkit for working with spatial databases";
diff --git a/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix b/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix
index 0c275b672abd..98c1ee417e43 100644
--- a/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0cn6ap5fkh3mkfa57l5b44z3gvz7j6lpmc9rl4g2jny2gvp4dg8j";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://geographiclib.sourceforge.io";
     description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix b/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix
new file mode 100644
index 000000000000..7e683e204834
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, geojson
+, haversine
+, pytz
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "geojson-client";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "exxamalte";
+    repo = "python-geojson-client";
+    rev = "v${version}";
+    sha256 = "1cc6ymbn45dv7xdl1r8bbizlmsdbxjmsfza442yxmmm19nxnnqjv";
+  };
+
+  propagatedBuildInputs = [
+    geojson
+    haversine
+    pytz
+    requests
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "geojson_client" ];
+
+  meta = with lib; {
+    description = "Python module for convenient access to GeoJSON feeds";
+    homepage = "https://github.com/exxamalte/python-geojson-client";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix
index bd38d2663bc2..70963a85d41d 100644
--- a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , pandas, shapely, fiona, descartes, pyproj
 , pytestCheckHook, Rtree, fetchpatch }:
 
@@ -29,10 +29,6 @@ buildPythonPackage rec {
     })
   ];
 
-  checkInputs = [ pytestCheckHook Rtree ];
-  disabledTests = [ "web" ];
-  pytestFlagsArray = [ "geopandas" ];
-
   propagatedBuildInputs = [
     pandas
     shapely
@@ -41,7 +37,12 @@ buildPythonPackage rec {
     pyproj
   ];
 
-  meta = with stdenv.lib; {
+  doCheck = !stdenv.isDarwin;
+  checkInputs = [ pytestCheckHook Rtree ];
+  disabledTests = [ "web" ];
+  pytestFlagsArray = [ "geopandas" ];
+
+  meta = with lib; {
     description = "Python geospatial data analysis framework";
     homepage = "https://geopandas.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/geopy/2.nix b/nixpkgs/pkgs/development/python-modules/geopy/2.nix
index 2863d30f4684..ae4e07e25479 100644
--- a/nixpkgs/pkgs/development/python-modules/geopy/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/geopy/2.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "0jypkaqlbyr8icqypwm23lzsvq7flakp3a3nqr8ib5fmd0fzsq7q";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/geopy/geopy";
     description = "Python Geocoding Toolbox";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/geopy/default.nix b/nixpkgs/pkgs/development/python-modules/geopy/default.nix
index 817c1e38418e..693a4221ee09 100644
--- a/nixpkgs/pkgs/development/python-modules/geopy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geopy/default.nix
@@ -1,30 +1,42 @@
-{ stdenv
+{ lib
+, async_generator
 , buildPythonPackage
 , fetchFromGitHub
-, isPy3k
 , geographiclib
+, isPy3k
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  pname = "geopy-unstable";
-  version = "2019-11-10";
-
+  pname = "geopy";
+  version = "2.1.0";
   disabled = !isPy3k; # only Python 3
-  doCheck = false; # Needs network access
-
-  propagatedBuildInputs = [ geographiclib ];
 
   src = fetchFromGitHub {
-    owner = "geopy";
-    repo = "geopy";
-    rev = "531b7de6126838a3e69370227aa7f2086ba52b89";
-    sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39";
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9";
   };
 
-  meta = with stdenv.lib; {
+  propagatedBuildInputs = [ geographiclib ];
+
+  checkInputs = [
+    async_generator
+    pytestCheckHook
+  ];
+
+  # Exclude tests which perform API calls
+  pytestFlagsArray = [ "--ignore test/geocoders/" ];
+  pythonImportsCheck = [ "geopy" ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
     homepage = "https://github.com/geopy/geopy";
     description = "Python Geocoding Toolbox";
-    license = licenses.mit;
-    maintainers = with maintainers; [GuillaumeDesforges];
+    changelog = "https://github.com/geopy/geopy/releases/tag/${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ GuillaumeDesforges ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
index 2b847275bed0..88d1089d5a31 100644
--- a/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , versiontools
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   buildInputs = [ versiontools gevent-websocket mock pytest ];
   propagatedBuildInputs = [ gevent ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/abourget/gevent-socketio";
     description = "SocketIO server based on the Gevent pywsgi server, a Python network library";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix
index adc13738d5ea..431a0c09a30c 100644
--- a/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ gevent gunicorn ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gitlab.com/noppo/gevent-websocket";
     description = "Websocket handler for the gevent pywsgi server, a Python network library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/nixpkgs/pkgs/development/python-modules/gevent/default.nix
index bf066f519065..0fcf6cdfaaa9 100644
--- a/nixpkgs/pkgs/development/python-modules/gevent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet
 , zope_interface
 }:
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   buildInputs = [ libev ];
   propagatedBuildInputs = [
     zope_interface
-  ] ++ stdenv.lib.optionals (!isPyPy) [ greenlet ];
+  ] ++ lib.optionals (!isPyPy) [ greenlet ];
 
   checkPhase = ''
     cd greentest
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # Bunch of failures.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Coroutine-based networking library";
     homepage = "http://www.gevent.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
index 55ef8c39981a..fafbef12bd3a 100644
--- a/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     py.test $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gwik/geventhttpclient";
     description = "HTTP client library for gevent";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix b/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix
index c58d63a08375..a9582648117a 100644
--- a/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , zope_testrunner, six, chardet}:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   checkInputs = [ zope_testrunner ];
   propagatedBuildInputs = [ six chardet ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage =  "https://github.com/kilink/ghdiff";
     license = licenses.mit;
     description = "Generate Github-style HTML for unified diffs.";
diff --git a/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/nixpkgs/pkgs/development/python-modules/gipc/default.nix
index 04dc8b0c068d..a48547f29099 100644
--- a/nixpkgs/pkgs/development/python-modules/gipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gipc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , gevent
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ gevent ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "gevent-cooperative child processes and IPC";
     longDescription = ''
       Usage of Python's multiprocessing package in a gevent-powered
diff --git a/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
index e5d9910024a5..5922377ab3a1 100644
--- a/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll
 , python, util-linux, pygit2, gitMinimal, git-annex, cacert
 }:
 
@@ -17,6 +17,11 @@ buildPythonPackage rec {
   };
 
   patches = [
+    # fix tests with recent versions of git-annex
+    (fetchpatch {
+      url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch";
+      sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi";
+    })
     (substituteAll {
       src = ./git-annex-path.patch;
       gitAnnex = "${git-annex}/bin/git-annex";
@@ -35,7 +40,7 @@ buildPythonPackage rec {
   '';
   pythonImportsCheck = [ "git_annex_adapter" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/alpernebbi/git-annex-adapter";
     description = "Call git-annex commands from Python";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix b/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix
index aa2a223c7774..adb9de4dbc0d 100644
--- a/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , GitPython
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ GitPython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command-line tool that helps you clean up Git branches";
     homepage = "https://github.com/arc90/git-sweep";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/glances-api/default.nix b/nixpkgs/pkgs/development/python-modules/glances-api/default.nix
new file mode 100644
index 000000000000..2f5a1416e41c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/glances-api/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, async-timeout
+}:
+
+buildPythonPackage rec {
+  pname = "glances-api";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-ecosystem";
+    repo = "python-glances-api";
+    rev = version;
+    sha256 = "0rgv77n0lvr7d3vk4qc8svipxafmm6s4lfxrl976hsygrhaqidch";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
+
+  # no tests are present
+  doCheck = false;
+  pythonImportsCheck = [ "glances_api" ];
+
+  meta = with lib; {
+    description = "Python API for interacting with Glances";
+    homepage = "https://github.com/home-assistant-ecosystem/python-glances-api";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/globre/default.nix b/nixpkgs/pkgs/development/python-modules/globre/default.nix
index ff2302f54678..21d2983ab015 100644
--- a/nixpkgs/pkgs/development/python-modules/globre/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/globre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , pythonAtLeast
 , buildPythonPackage
 , fetchPypi
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose coverage ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/metagriffin/globre";
     description = "A python glob-like regular expression generation library.";
     maintainers = with maintainers; [ glittershark ];
diff --git a/nixpkgs/pkgs/development/python-modules/glom/default.nix b/nixpkgs/pkgs/development/python-modules/glom/default.nix
index cae43e59c288..2acc87a17ac4 100644
--- a/nixpkgs/pkgs/development/python-modules/glom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , boltons
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # test_cli.py checks the output of running "glom"
   checkPhase = "PATH=$out/bin:$PATH pytest glom/test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mahmoud/glom";
     description = "Restructuring data, the Python way";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/nixpkgs/pkgs/development/python-modules/glymur/default.nix
index d2721951ad78..50ed257f57e0 100644
--- a/nixpkgs/pkgs/development/python-modules/glymur/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glymur/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , numpy
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     numpy
-  ] ++ stdenv.lib.optional isPy27 [ contextlib2 mock importlib-resources ];
+  ] ++ lib.optional isPy27 [ contextlib2 mock importlib-resources ];
 
   checkInputs = [
     scikitimage
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for accessing JPEG2000 files";
     homepage = "https://github.com/quintusdias/glymur";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix b/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
index cfc481a90afb..808b918681bb 100644
--- a/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
@@ -27,7 +27,7 @@ buildPythonPackage {
 
   buildInputs = [ gmp mpfr libmpc ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
     homepage = "https://github.com/aleaxit/gmpy/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
index deae0037bb2d..821e0ba0afa9 100644
--- a/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , validictory
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An unofficial API for Google Play Music";
     homepage = "https://pypi.python.org/pypi/gmusicapi/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix
index 3b9263258584..71116c37041b 100644
--- a/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The standard Python readline extension statically linked against the GNU readline library";
     homepage = "https://github.com/ludwigschwardt/python-gnureadline";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/gnutls/default.nix b/nixpkgs/pkgs/development/python-modules/gnutls/default.nix
index f26791fdbe96..addbee81bd3f 100644
--- a/nixpkgs/pkgs/development/python-modules/gnutls/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gnutls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper for the GnuTLS library";
     homepage = "https://github.com/AGProjects/python-gnutls";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/goobook/default.nix b/nixpkgs/pkgs/development/python-modules/goobook/default.nix
index a3d327275157..c587c928e7e7 100644
--- a/nixpkgs/pkgs/development/python-modules/goobook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/goobook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , docutils, installShellFiles
 , google_api_python_client, simplejson, oauth2client, setuptools, xdg
 }:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "goobook" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Access your Google contacts from the command line";
     longDescription = ''
       The purpose of GooBook is to make it possible to use your Google Contacts
diff --git a/nixpkgs/pkgs/development/python-modules/goocalendar/default.nix b/nixpkgs/pkgs/development/python-modules/goocalendar/default.nix
index 441fdc85bac2..b0eea600384e 100644
--- a/nixpkgs/pkgs/development/python-modules/goocalendar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/goocalendar/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
-, pkgconfig
+, pkg-config
 , gtk3
 , gobject-introspection
 , pygtk
@@ -10,8 +10,6 @@
 , isPy3k
  }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   pname = "GooCalendar";
   version = "0.7.1";
@@ -24,7 +22,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     gobject-introspection
   ];
 
@@ -40,7 +38,7 @@ buildPythonPackage rec {
   # No upstream tests available
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A calendar widget for GTK using PyGoocanvas.";
     homepage = "https://goocalendar.tryton.org/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
index efe74d478848..6715590dc329 100644
--- a/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
@@ -1,27 +1,44 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf
-, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, google-auth
+, googleapis_common_protos
+, grpcio
+, protobuf
+, pytz
+, requests
+, mock
+, pytest
+, pytest-asyncio
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.23.0";
-  disabled = pythonOlder "3.5";
+  version = "1.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bb3c485c38eacded8d685b1759968f6cf47dd9432922d34edb90359eaa391e2";
+    sha256 = "0sflnpgsvk2h1cr1m3mgxx6pzz55xw7sk4y4qdimhs5jdm2fw78g";
   };
 
-  propagatedBuildInputs =
-    [ googleapis_common_protos protobuf google_auth requests grpcio ];
+  propagatedBuildInputs = [
+    googleapis_common_protos
+    google-auth
+    grpcio
+    protobuf
+    pytz
+    requests
+  ];
 
-  checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ];
+  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
 
   # prevent google directory from shadowing google imports
   preCheck = ''
     rm -r google
   '';
 
-  pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ];
+  pythonImportsCheck = [ "google.api_core" ];
 
   meta = with lib; {
     description = "Core Library for Google Client Libraries";
@@ -33,6 +50,6 @@ buildPythonPackage rec {
     changelog =
       "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
index b14276b0a1a2..854ec37a1e4a 100644
--- a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi
-, google_auth, google-auth-httplib2, google_api_core
-, httplib2, six, uritemplate, oauth2client }:
+, google-auth, google-auth-httplib2, google-api-core
+, httplib2, six, uritemplate, oauth2client, setuptools }:
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
@@ -15,8 +15,12 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [
-    google_auth google-auth-httplib2 google_api_core
-    httplib2 six uritemplate oauth2client
+    google-auth google-auth-httplib2 google-api-core
+    httplib2 six uritemplate oauth2client setuptools
+  ];
+
+  pythonImportsCheck = [
+    "googleapiclient"
   ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/google_apputils/default.nix b/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix
index c7b386623ef8..7cc7f4858826 100644
--- a/nixpkgs/pkgs/development/python-modules/google_apputils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix
@@ -1,6 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 , pytz
 , gflags
 , dateutil
@@ -11,10 +12,11 @@
 buildPythonPackage rec {
   pname = "google-apputils";
   version = "0.4.2";
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "47959d0651c32102c10ad919b8a0ffe0ae85f44b8457ddcf2bdc0358fb03dc29";
+    sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7";
   };
 
   preConfigure = ''
@@ -30,10 +32,10 @@ buildPythonPackage rec {
   # ERROR:root:Trying to access flag test_tmpdir before flags were parsed.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google Application Utilities for Python";
     homepage = "https://github.com/google/google-apputils";
     license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix
index ff5aa3b2bac7..bb7836ef85d1 100644
--- a/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix
@@ -3,13 +3,11 @@
 , buildPythonPackage
 , fetchPypi
 , flask
+, google-auth
+, httplib2
 , mock
-, six
-, pytest
+, pytestCheckHook
 , pytest-localserver
-, google_auth
-, httplib2
-
 }:
 
 buildPythonPackage rec {
@@ -18,28 +16,25 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8d092cc60fb16517b12057ec0bba9185a96e3b7169d86ae12eae98e645b7bc39";
+    sha256 = "0fdwnx2yd65f5vhnmn39f4xnxac5j6x0pv2p42qifrdi1z32q2cd";
   };
 
-  checkInputs = [
-    flask mock six pytest pytest-localserver
-  ];
-
   propagatedBuildInputs = [
-    google_auth httplib2
+    google-auth
+    httplib2
   ];
 
-  checkPhase = ''
-    py.test
-  '';
-
-  # ImportError: No module named google.auth
-  doCheck = isPy3k;
+  checkInputs = [
+    flask
+    mock
+    pytestCheckHook
+    pytest-localserver
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "Google Authentication Library: httplib2 transport";
     homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2";
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index bdea58de8999..7fa7200fbbe5 100644
--- a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -1,44 +1,37 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pythonOlder
-, isPy3k
 , click
 , mock
-, pytest
-, futures
-, google_auth
+, pytestCheckHook
+, google-auth
 , requests_oauthlib
 }:
 
 buildPythonPackage rec {
   pname = "google-auth-oauthlib";
   version = "0.4.2";
-  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "65b65bc39ad8cab15039b35e5898455d3d66296d0584d96fe0e79d67d04c51d9";
+    sha256 = "1nai9k86g7g7w1pxk105dllncgax8nc5hpmk758b3jnqkb1mpdk5";
   };
 
-  checkInputs = [
-    click mock pytest
-  ] ++ lib.optionals (!isPy3k) [ futures ];
-
   propagatedBuildInputs = [
-    google_auth requests_oauthlib
+    google-auth
+    requests_oauthlib
   ];
 
-  doCheck = isPy3k;
-  checkPhase = ''
-    rm -fr tests/__pycache__/ google
-    py.test
-  '';
+  checkInputs = [
+    click
+    mock
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Google Authentication Library: oauthlib integration";
     homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib";
     license = licenses.asl20;
-    maintainers = with maintainers; [ terlar ];
+    maintainers = with maintainers; [ SuperSandro2000 terlar ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
new file mode 100644
index 000000000000..9120f93a3bdd
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
@@ -0,0 +1,54 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchpatch
+, fetchPypi
+, pytestCheckHook
+, cachetools
+, flask
+, freezegun
+, mock
+, oauth2client
+, pyasn1-modules
+, pytest-localserver
+, responses
+, rsa
+}:
+
+buildPythonPackage rec {
+  pname = "google-auth";
+  version = "1.24.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb";
+  };
+
+  propagatedBuildInputs = [ pyasn1-modules cachetools rsa ];
+
+  checkInputs = [
+    flask
+    freezegun
+    mock
+    oauth2client
+    pytestCheckHook
+    pytest-localserver
+    responses
+  ];
+
+  pythonImportsCheck = [
+    "google.auth"
+    "google.oauth2"
+  ];
+
+  meta = with lib; {
+    description = "Google Auth Python Library";
+    longDescription = ''
+      This library simplifies using Google’s various server-to-server
+      authentication mechanisms to access Google APIs.
+    '';
+    homepage = "https://github.com/googleapis/google-auth-library-python";
+    changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
index 01f7bc9ce33e..3f614258a8fb 100644
--- a/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }:
 
 buildPythonPackage rec {
   pname = "google-cloud-access-context-manager";
@@ -9,19 +9,19 @@ buildPythonPackage rec {
     sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b";
   };
 
-  disabled = pythonOlder "3.5";
-
-  propagatedBuildInputs = [ google_api_core ];
+  propagatedBuildInputs = [ google-api-core ];
 
   # No tests in repo
   doCheck = false;
 
-  pythonImportsCheck = [ "google.identity.accesscontextmanager" ];
+  pythonImportsCheck = [
+    "google.identity.accesscontextmanager"
+  ];
 
   meta = with lib; {
     description = "Protobufs for Google Access Context Manager.";
     homepage = "https://github.com/googleapis/python-access-context-manager";
     license = licenses.asl20;
-    maintainers = with maintainers; [ austinbutler ];
+    maintainers = with maintainers; [ austinbutler SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix
new file mode 100644
index 000000000000..8f04fb7451d2
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -0,0 +1,54 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, grpc_google_iam_v1
+, google-api-core
+, google-cloud-access-context-manager
+, google-cloud-org-policy
+, google-cloud-os-config
+, google-cloud-testutils
+, libcst
+, proto-plus
+, pytest
+, pytest-asyncio
+, pytestCheckHook
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-asset";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05q0yaw6b553qmzylr45zin17h8mvi8yyyxhbv3cxa7f0ahviw8w";
+  };
+
+  propagatedBuildInputs = [
+    grpc_google_iam_v1
+    google-api-core
+    google-cloud-access-context-manager
+    google-cloud-org-policy
+    google-cloud-os-config
+    libcst
+    proto-plus
+  ];
+
+  checkInputs = [ google-cloud-testutils mock pytest-asyncio pytestCheckHook ];
+
+  pythonImportsCheck = [
+    "google.cloud.asset"
+    "google.cloud.asset_v1"
+    "google.cloud.asset_v1p1beta1"
+    "google.cloud.asset_v1p2beta1"
+    "google.cloud.asset_v1p4beta1"
+    "google.cloud.asset_v1p5beta1"
+  ];
+
+  meta = with lib; {
+    description = "Python Client for Google Cloud Asset API";
+    homepage = "https://github.com/googleapis/python-asset";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix
new file mode 100644
index 000000000000..302ce8ceaed3
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, libcst
+, google-api-core
+, google-cloud-storage
+, google-cloud-testutils
+, pandas
+, proto-plus
+, pytest-asyncio
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-automl";
+  version = "2.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
+  checkInputs = [
+    google-cloud-storage
+    google-cloud-testutils
+    mock
+    pandas
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    # do not shadow imports
+    rm -r google
+    # requires credentials
+    rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py
+  '';
+
+  disabledTests = [
+    # requires credentials
+    "test_prediction_client_client_info"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.automl"
+    "google.cloud.automl_v1"
+    "google.cloud.automl_v1beta1"
+  ];
+
+  meta = with lib; {
+    description = "Cloud AutoML API client library";
+    homepage = "https://github.com/googleapis/python-automl";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
new file mode 100644
index 000000000000..4ec12a8fa2fb
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, libcst
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-bigquery-datatransfer";
+  version = "3.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  pythonImportsCheck = [
+    "google.cloud.bigquery_datatransfer"
+    "google.cloud.bigquery_datatransfer_v1"
+  ];
+
+  meta = with lib; {
+    description = "BigQuery Data Transfer API client library";
+    homepage = "https://github.com/googleapis/python-bigquery-datatransfer";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
new file mode 100644
index 000000000000..5eab2c730f7d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -0,0 +1,58 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, freezegun
+, google-cloud-core
+, google-cloud-testutils
+, google-resumable-media
+, grpcio
+, ipython
+, mock
+, pandas
+, proto-plus
+, pyarrow
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-bigquery";
+  version = "2.6.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1c940bf190a681d80b6f6cd7541924ad411de5f0585b2c8c5e420ab750e2024d";
+  };
+
+  propagatedBuildInputs = [
+    google-resumable-media
+    google-cloud-core
+    proto-plus
+    pyarrow
+  ];
+
+  checkInputs = [
+    freezegun
+    google-cloud-testutils
+    ipython
+    mock
+    pandas
+    pytestCheckHook
+  ];
+
+  # prevent google directory from shadowing google imports
+  preCheck = ''
+    rm -r google
+  '';
+
+  pythonImportsCheck = [
+    "google.cloud.bigquery"
+    "google.cloud.bigquery_v2"
+  ];
+
+  meta = with lib; {
+    description = "Google BigQuery API client library";
+    homepage = "https://github.com/googleapis/python-bigquery";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index bd12aa592d50..9632dc902d15 100644
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -1,9 +1,9 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
-, google_api_core
-, google_cloud_core
+, google-api-core
+, google-cloud-core
 , pytest
 , mock
 }:
@@ -18,14 +18,14 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ];
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ];
 
   checkPhase = ''
     rm -r google
     pytest tests/unit -k 'not policy'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google Cloud Bigtable API client library";
     homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
new file mode 100644
index 000000000000..6d91bed83ae7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, grpc_google_iam_v1
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-container";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04f9mx1wxy3l9dvzvvr579fnjp1fdqhgplv5y2gl7h2mvn281k8d";
+  };
+
+  propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # requires credentials
+    "test_list_clusters"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.container"
+    "google.cloud.container_v1"
+    "google.cloud.container_v1beta1"
+  ];
+
+  meta = with lib; {
+    description = "Google Container Engine API client library";
+    homepage = "https://github.com/googleapis/python-container";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix
index 1ad08ea05af4..72709c62ceca 100644
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix
@@ -1,31 +1,38 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python
-, google_api_core, grpcio, mock }:
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytestCheckHook
+, python
+, google-api-core
+, grpcio
+, mock
+}:
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80";
+    sha256 = "01liq4nrd2g3ingg8v0ly4c86db8agnr9h1fiz219c7fz0as0xqj";
   };
 
-  disabled = pythonOlder "3.5";
+  propagatedBuildInputs = [ google-api-core ];
 
-  propagatedBuildInputs = [ google_api_core grpcio ];
-  checkInputs = [ google_api_core mock pytestCheckHook ];
-
-  pythonImportsCheck = [ "google.cloud" ];
+  checkInputs = [ mock pytestCheckHook ];
 
   # prevent google directory from shadowing google imports
   preCheck = ''
     rm -r google
   '';
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [ "google.cloud" ];
+
+  meta = with lib; {
     description = "API Client library for Google Cloud: Core Helpers";
     homepage = "https://github.com/googleapis/python-cloud-core";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix
new file mode 100644
index 000000000000..1b7a570fed21
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, mock
+, libcst
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-dataproc";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # requires credentials
+    "test_list_clusters"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.dataproc"
+    "google.cloud.dataproc_v1"
+    "google.cloud.dataproc_v1beta2"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Dataproc API client library";
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix
new file mode 100644
index 000000000000..84f98550b9a3
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -0,0 +1,46 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, google-cloud-core
+, libcst
+, proto-plus
+, mock
+, pytestCheckHook
+, pytest-asyncio
+, google-cloud-testutils
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-datastore";
+  version = "2.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i";
+  };
+
+  propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  preCheck = ''
+    # directory shadows imports
+    rm -r google
+    # requires credentials
+    rm tests/system/test_system.py
+  '';
+
+  pythonImportsCheck = [
+    "google.cloud.datastore"
+    "google.cloud.datastore_admin_v1"
+    "google.cloud.datastore_v1"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Datastore API client library";
+    homepage = "https://github.com/googleapis/python-datastore";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix
new file mode 100644
index 000000000000..9076c1298040
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, google-cloud-testutils
+, libcst
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-dlp";
+  version = "3.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09rnzpdlycr1wv8agcfx05v1prn35ylphsbr07486zqdkh5wjk8p";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # requires credentials
+    "test_inspect_content"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.dlp"
+    "google.cloud.dlp_v2"
+  ];
+
+  meta = with lib; {
+    description = "Cloud Data Loss Prevention (DLP) API API client library";
+    homepage = "https://github.com/googleapis/python-dlp";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix
new file mode 100644
index 000000000000..0636da60e9af
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, google-cloud-core
+, pytestCheckHook
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-dns";
+  version = "0.32.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01l6pvfic0vxcvd97ckbxyc7ccr9vb9ln4lyhpp3amdmcy0far3j";
+  };
+
+  propagatedBuildInputs = [ google-api-core google-cloud-core ];
+
+  checkInputs = [ mock pytestCheckHook ];
+
+  preCheck = ''
+    # don#t shadow python imports
+    rm -r google
+  '';
+
+  disabledTests = [
+    # requires credentials
+    "test_quota"
+  ];
+
+  pythonImportsCheck = [ "google.cloud.dns" ];
+
+  meta = with lib; {
+    description = "Google Cloud DNS API client library";
+    homepage = "https://github.com/googleapis/python-dns";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 19f90275ae99..b3181f8fcded 100644
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -1,6 +1,14 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_cloud_logging, google_cloud_testutils, libcst, mock, proto-plus
-, pytest-asyncio }:
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, google-cloud-logging
+, google-cloud-testutils
+, libcst
+, mock
+, proto-plus
+, pytest-asyncio
+}:
 
 buildPythonPackage rec {
   pname = "google-cloud-error-reporting";
@@ -11,22 +19,25 @@ buildPythonPackage rec {
     sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4";
   };
 
-  disabled = pythonOlder "3.6";
+  propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
-  propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # require credentials
+    "test_report_error_event"
+    "test_report_exception"
+  ];
 
-  # Disable tests that require credentials
-  disabledTests = [ "test_report_error_event" "test_report_exception" ];
   # prevent google directory from shadowing google imports
   preCheck = ''
     rm -r google
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Stackdriver Error Reporting API client library";
     homepage = "https://github.com/googleapis/python-error-reporting";
     license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix
new file mode 100644
index 000000000000..f0c235ca0c98
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -0,0 +1,64 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, aiounittest
+, google-api-core
+, google-cloud-testutils
+, google-cloud-core
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-firestore";
+  version = "2.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q5s2gpkibnjxal9zrz02jfnazf7rxk0bi0ln5a3di6i47kjnga9";
+  };
+
+  propagatedBuildInputs = [
+    google-api-core
+    google-cloud-core
+    proto-plus
+  ];
+
+  checkInputs = [
+    aiounittest
+    google-cloud-testutils
+    mock
+    pytestCheckHook
+    pytest-asyncio
+  ];
+
+  preCheck = ''
+    # do not shadow imports
+    rm -r google
+  '';
+
+  pytestFlagsArray = [
+    # tests are broken
+    "--ignore=tests/system/test_system.py"
+    "--ignore=tests/system/test_system_async.py"
+  ];
+
+  disabledTests = [
+    # requires credentials
+    "test_collections"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.firestore_v1"
+    "google.cloud.firestore_admin_v1"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Firestore API client library";
+    homepage = "https://github.com/googleapis/python-firestore";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
index 9d6120629380..f96940f4e67f 100644
--- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -1,5 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_api_core, libcst, mock, proto-plus, pytest-asyncio }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytest-asyncio
+}:
 
 buildPythonPackage rec {
   pname = "google-cloud-iam";
@@ -10,13 +19,19 @@ buildPythonPackage rec {
     sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
+  pythonImportsCheck = [
+    "google.cloud.iam_credentials"
+    "google.cloud.iam_credentials_v1"
+  ];
+
   meta = with lib; {
-    description = "Google Cloud IAM API client library";
+    description = "IAM Service Account Credentials API client library";
     homepage = "https://github.com/googleapis/python-iam";
     license = licenses.asl20;
-    maintainers = with maintainers; [ austinbutler ];
+    maintainers = with maintainers; [ austinbutler SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix
new file mode 100644
index 000000000000..2b28f84a3158
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, grpc_google_iam_v1
+, google-api-core
+, libcst
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-iot";
+  version = "2.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla";
+  };
+
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # requires credentials
+    "test_list_device_registries"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.iot"
+    "google.cloud.iot_v1"
+  ];
+
+  meta = with lib; {
+    description = "Cloud IoT API API client library";
+    homepage = "https://github.com/googleapis/python-iot";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix
index a4d2439fb49c..6675767a2445 100644
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -1,5 +1,13 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, grpc_google_iam_v1, google_api_core, libcst, mock, proto-plus, pytest-asyncio
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, grpc_google_iam_v1
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytest-asyncio
 }:
 
 buildPythonPackage rec {
@@ -11,19 +19,22 @@ buildPythonPackage rec {
     sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga";
   };
 
-  disabled = pythonOlder "3.6";
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
-  propagatedBuildInputs =
-    [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
 
   # Disable tests that need credentials
   disabledTests = [ "test_list_global_key_rings" ];
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [
+    "google.cloud.kms"
+    "google.cloud.kms_v1"
+  ];
+
+  meta = with lib; {
     description = "Cloud Key Management Service (KMS) API API client library";
     homepage = "https://github.com/googleapis/python-kms";
     license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix
new file mode 100644
index 000000000000..7186ecd6f355
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-language";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "123vqfrn7pyn3ia7cmhx8bgafd4gxxlmhf33s3vgspyjck6sprxb";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  pythonImportsCheck = [
+    "google.cloud.language"
+    "google.cloud.language_v1"
+    "google.cloud.language_v1beta2"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Natural Language API client library";
+    homepage = "https://github.com/googleapis/python-language";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix
new file mode 100644
index 000000000000..58d03f206fc7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+, flask
+, google-api-core
+, google-cloud-core
+, google-cloud-testutils
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+, webapp2
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-logging";
+  version = "2.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0s09vs4rnq4637j8zw7grv3f4j7njqprm744b1knzldj91rg0vmi";
+  };
+
+  propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
+
+  checkInputs = [
+    django
+    flask
+    google-cloud-testutils
+    mock
+    pytestCheckHook
+    pytest-asyncio
+  ];
+
+  disabledTests = [
+    # requires credentials
+    "test_write_log_entries"
+  ];
+
+  preCheck = ''
+    # prevent google directory from shadowing google imports
+    rm -r google
+    # requires credentials
+    rm tests/system/test_system.py tests/unit/test__gapic.py
+  '';
+
+  pythonImortsCheck = [
+    "google.cloud.logging"
+    "google.cloud.logging_v2"
+  ];
+
+  meta = with lib; {
+    description = "Stackdriver Logging API client library";
+    homepage = "https://github.com/googleapis/python-logging";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
new file mode 100644
index 000000000000..8dc665fe2103
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, google-cloud-testutils
+, libcst
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-monitoring";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07r0y995fin6cbnqlhmd38fv3pfhhqyw04l7nr38sldrd82gmsqx";
+  };
+
+  propagatedBuildInputs = [ libcst google-api-core proto-plus ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # requires credentials
+    "test_list_monitored_resource_descriptors"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.monitoring"
+    "google.cloud.monitoring_v3"
+  ];
+
+  meta = with lib; {
+    description = "Stackdriver Monitoring API client library";
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix
index 39cc0dc9c24b..10ee559b8f0b 100644
--- a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }:
 
 buildPythonPackage rec {
   pname = "google-cloud-org-policy";
@@ -9,9 +9,7 @@ buildPythonPackage rec {
     sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh";
   };
 
-  disabled = pythonOlder "3.5";
-
-  propagatedBuildInputs = [ google_api_core ];
+  propagatedBuildInputs = [ google-api-core ];
 
   # No tests in repo
   doCheck = false;
@@ -22,6 +20,6 @@ buildPythonPackage rec {
     description = "Protobufs for Google Cloud Organization Policy.";
     homepage = "https://github.com/googleapis/python-org-policy";
     license = licenses.asl20;
-    maintainers = with maintainers; [ austinbutler ];
+    maintainers = with maintainers; [ austinbutler SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix
new file mode 100644
index 000000000000..94d8d4738f5c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchPypi, google-api-core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }:
+
+buildPythonPackage rec {
+  pname = "google-cloud-os-config";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  pythonImportsCheck = [ "google.cloud.osconfig" ];
+
+  disabledTests = [
+    "test_patch_deployment"
+    "test_patch_job"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud OS Config API client library";
+    homepage = "https://github.com/googleapis/python-os-config";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
new file mode 100644
index 000000000000..46a28b1ffd1d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, google-api-core
+, google-cloud-testutils
+, grpc_google_iam_v1
+, libcst
+, mock
+, proto-plus
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-pubsub";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w";
+  };
+
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  preCheck = ''
+    # prevent google directory from shadowing google imports
+    rm -r google
+    # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com
+    rm -r tests/unit/pubsub_v1
+  '';
+
+  pythonImportsCheck = [ "google.cloud.pubsub" ];
+
+  meta = with lib; {
+    description = "Google Cloud Pub/Sub API client library";
+    homepage = "https://pypi.org/project/google-cloud-pubsub";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix
new file mode 100644
index 000000000000..4dcf7fd3d318
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-redis";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  pythonImportsCheck = [
+    "google.cloud.redis"
+    "google.cloud.redis_v1"
+    "google.cloud.redis_v1beta1"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Memorystore for Redis API client library";
+    homepage = "https://github.com/googleapis/python-redis";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
new file mode 100644
index 000000000000..11baf3d73f3d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, google-cloud-core
+, google-api-core
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-resource-manager";
+  version = "0.30.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm";
+  };
+
+  propagatedBuildInputs = [ google-api-core google-cloud-core ];
+
+  checkInputs = [ mock pytestCheckHook ];
+
+  # prevent google directory from shadowing google imports
+  preCheck = ''
+    rm -r google
+  '';
+
+  pythonImportsCheck = [ "google.cloud.resource_manager" ];
+
+  meta = with lib; {
+    description = "Google Cloud Resource Manager API client library";
+    homepage = "https://github.com/googleapis/python-resource-manager";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
new file mode 100644
index 000000000000..81fa97f152bb
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, google-cloud-core
+, mock
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-runtimeconfig";
+  version = "0.32.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p";
+  };
+
+  propagatedBuildInputs = [ google-api-core google-cloud-core ];
+
+  checkInputs = [ mock pytestCheckHook ];
+
+  # Client tests require credentials
+  disabledTests = [ "client_options" ];
+
+  # prevent google directory from shadowing google imports
+  preCheck = ''
+    rm -r google
+  '';
+
+  pythonImportsCheck = [ "google.cloud.runtimeconfig" ];
+
+  meta = with lib; {
+    description = "Google Cloud RuntimeConfig API client library";
+    homepage = "https://pypi.org/project/google-cloud-runtimeconfig";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
new file mode 100644
index 000000000000..a143a418c222
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, grpc_google_iam_v1
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-secret-manager";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "97a46d2318f00c1c6ae1a4ab587e338677c5cc1651d7c6304982d74fa364dd9d";
+  };
+
+  propagatedBuildInputs = [
+    google-api-core
+    grpc_google_iam_v1
+    libcst
+    proto-plus
+  ];
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+    pytest-asyncio
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.secretmanager"
+    "google.cloud.secretmanager_v1"
+    "google.cloud.secretmanager_v1beta1"
+  ];
+
+  meta = with lib; {
+    description = "Secret Manager API API client library";
+    homepage = "https://github.com/googleapis/python-secret-manager";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ siriobalmelli SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
new file mode 100644
index 000000000000..242198a21971
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, grpc_google_iam_v1
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-securitycenter";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i";
+  };
+
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  pythonImportsCheck = [
+    "google.cloud.securitycenter"
+    "google.cloud.securitycenter_v1"
+    "google.cloud.securitycenter_v1beta1"
+    "google.cloud.securitycenter_v1p1beta1"
+  ];
+
+  meta = with lib; {
+    description = "Cloud Security Command Center API API client library";
+    homepage = "https://github.com/googleapis/python-securitycenter";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix
new file mode 100644
index 000000000000..382476af0ca3
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -0,0 +1,54 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, grpc_google_iam_v1
+, google-cloud-core
+, google-cloud-testutils
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+, sqlparse
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-spanner";
+  version = "3.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "060c53bc6f541660a2fe868fd83a695207d4e7b050e04fe103d1e77634b813c7";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"proto-plus == 1.11.0"' '"proto-plus"'
+  '';
+
+  propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  preCheck = ''
+    # prevent google directory from shadowing google imports
+    rm -r google
+    # disable tests which require credentials
+    rm tests/system/test_{system,system_dbapi}.py
+    rm tests/unit/spanner_dbapi/test_{connect,connection,cursor}.py
+  '';
+
+  pythonImportsCheck = [
+    "google.cloud.spanner_admin_database_v1"
+    "google.cloud.spanner_admin_instance_v1"
+    "google.cloud.spanner_dbapi"
+    "google.cloud.spanner_v1"
+  ];
+
+  meta = with lib; {
+    description = "Cloud Spanner API client library";
+    homepage = "https://github.com/googleapis/python-spanner";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
new file mode 100644
index 000000000000..3359cfdd743a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-speech";
+  version = "2.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ch85h5xrb15fcml5v0f30s0niw02k4v8gi7i8a40161yj882hm7";
+  };
+
+  propagatedBuildInputs = [ libcst google-api-core proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  pytestFlagsArray = [
+    # requrire credentials
+    "--ignore=tests/system/gapic/v1/test_system_speech_v1.py"
+    "--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.speech"
+    "google.cloud.speech_v1"
+    "google.cloud.speech_v1p1beta1"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Speech API client library";
+    homepage = "https://github.com/googleapis/python-speech";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix
new file mode 100644
index 000000000000..cf869d5c8eff
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, google-auth
+, google-cloud-iam
+, google-cloud-core
+, google-cloud-kms
+, google-cloud-testutils
+, google-resumable-media
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-storage";
+  version = "1.35.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17kal75wmyjpva7g04cb9yg7qbyrgwfn575z4gqijd4gz2r0sp2m";
+  };
+
+  propagatedBuildInputs = [
+    google-auth
+    google-cloud-core
+    google-resumable-media
+  ];
+
+  checkInputs = [
+    google-cloud-iam
+    google-cloud-kms
+    google-cloud-testutils
+    mock
+    pytestCheckHook
+  ];
+
+  # disable tests which require credentials and network access
+  disabledTests = [
+    "create"
+    "download"
+    "get"
+    "post"
+    "test_build_api_url"
+  ];
+
+  pytestFlagsArray = [
+    "--ignore=tests/unit/test_bucket.py"
+    "--ignore=tests/system/test_system.py"
+  ];
+
+  # prevent google directory from shadowing google imports
+  preCheck = ''
+    rm -r google
+  '';
+
+  pythonImportsCheck = [ "google.cloud.storage" ];
+
+  meta = with lib; {
+    description = "Google Cloud Storage API client library";
+    homepage = "https://github.com/googleapis/python-storage";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
new file mode 100644
index 000000000000..e30986af6106
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, grpc_google_iam_v1
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-tasks";
+  version = "2.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1jsf7y88lvln9r08pmx673ibmgw397qmir5drrcfvlmgqvszp7qx";
+  };
+
+  propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # requires credentials
+    "test_list_queues"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.tasks"
+    "google.cloud.tasks_v2"
+    "google.cloud.tasks_v2beta2"
+    "google.cloud.tasks_v2beta3"
+  ];
+
+  meta = with lib; {
+    description = "Cloud Tasks API API client library";
+    homepage = "https://github.com/googleapis/python-tasks";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix
index dfd6354dcc4b..3f6792fa77b7 100644
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, google_auth, pytest, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, google-auth, six }:
 
 buildPythonPackage rec {
   pname = "google-cloud-testutils";
@@ -9,15 +9,17 @@ buildPythonPackage rec {
     sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k";
   };
 
-  propagatedBuildInputs = [ google_auth six ];
+  propagatedBuildInputs = [ google-auth six ];
 
-  # There are no tests
+  # does not contain tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [ "test_utils" ];
+
+  meta = with lib; {
     description = "System test utilities for google-cloud-python";
     homepage = "https://github.com/googleapis/python-test-utils";
     license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
new file mode 100644
index 000000000000..a7228a42999b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-texttospeech";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17igfwh34369gkvsbrm46j1ii61i6268wg2g2dl9c65nf9z3kgfb";
+  };
+
+  propagatedBuildInputs = [ libcst google-api-core proto-plus ];
+
+  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+
+  disabledTests = [
+    # Disable tests that require credentials
+    "test_list_voices"
+    "test_synthesize_speech"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.texttospeech"
+    "google.cloud.texttospeech_v1"
+    "google.cloud.texttospeech_v1beta1"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Text-to-Speech API client library";
+    homepage = "https://github.com/googleapis/python-texttospeech";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix
new file mode 100644
index 000000000000..1252c99bf486
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, google-cloud-core
+, google-cloud-testutils
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-trace";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v";
+  };
+
+  propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # require credentials
+    "test_batch_write_spans"
+    "test_list_traces"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.trace"
+    "google.cloud.trace_v1"
+    "google.cloud.trace_v2"
+  ];
+
+  meta = with lib; {
+    description = "Cloud Trace API client library";
+    homepage = "https://github.com/googleapis/python-trace";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix
new file mode 100644
index 000000000000..32d402e1cf03
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -0,0 +1,46 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, google-api-core
+, google-cloud-core
+, google-cloud-testutils
+, grpcio
+, libcst
+, mock
+, proto-plus
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-translate";
+  version = "3.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1s2gvlzfqd2gsrzaz7yl9q8s1k03dlsjahgg95s017vlcn21d0v1";
+  };
+
+  propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  preCheck = ''
+    # prevent shadowing imports
+    rm -r google
+  '';
+
+  pythonImportsCheck = [
+    "google.cloud.translate"
+    "google.cloud.translate_v2"
+    "google.cloud.translate_v3"
+    "google.cloud.translate_v3beta1"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Translation API client library";
+    homepage = "https://github.com/googleapis/python-translate";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
new file mode 100644
index 000000000000..43fed1fe27fa
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -0,0 +1,45 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, google-api-core
+, google-cloud-testutils
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-videointelligence";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yhmizig41ymr2dz0i6ccrwszp0ivyykmq11vqxp82l9ncjima82";
+  };
+
+  propagatedBuildInputs = [ google-api-core proto-plus ];
+
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  disabledTests = [
+    # require credentials
+    "test_annotate_video"
+  ];
+
+  pythonImportsCheck = [
+    "google.cloud.videointelligence"
+    "google.cloud.videointelligence_v1"
+    "google.cloud.videointelligence_v1beta2"
+    "google.cloud.videointelligence_v1p1beta1"
+    "google.cloud.videointelligence_v1p2beta1"
+    "google.cloud.videointelligence_v1p3beta1"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Video Intelligence API client library";
+    homepage = "https://github.com/googleapis/python-videointelligence";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix
new file mode 100644
index 000000000000..57a51f96e65e
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-vision";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka";
+  };
+
+  propagatedBuildInputs = [ libcst google-api-core proto-plus];
+
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  pythonImportsCheck = [
+    "google.cloud.vision"
+    "google.cloud.vision_helpers"
+    "google.cloud.vision_v1"
+    "google.cloud.vision_v1p1beta1"
+    "google.cloud.vision_v1p2beta1"
+    "google.cloud.vision_v1p3beta1"
+    "google.cloud.vision_v1p4beta1"
+  ];
+
+  meta = with lib; {
+    description = "Cloud Vision API API client library";
+    homepage = "https://github.com/googleapis/python-vision";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
new file mode 100644
index 000000000000..20614f5b5d86
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, google-api-core
+, libcst
+, mock
+, proto-plus
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "google-cloud-websecurityscanner";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14sky9bkl00n65ksig3f6psm31pkmkvlcprlk6s9if470j40zrhx";
+  };
+
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+
+  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+
+  pythonImportsCheck = [
+    "google.cloud.websecurityscanner_v1alpha"
+    "google.cloud.websecurityscanner_v1beta"
+  ];
+
+  meta = with lib; {
+    description = "Google Cloud Web Security Scanner API client library";
+    homepage = "https://github.com/googleapis/python-websecurityscanner";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix
index fbed406cebce..b36635654a9d 100644
--- a/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix
@@ -1,31 +1,31 @@
-{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, cffi, crc32c, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "google-crc32c";
-  version = "1.0.0";
-
-  disabled = !isPy3k;
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-crc32c";
     rev = "v${version}";
-    sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl";
+    sha256 = "058g69yp7x41mv0d84yp31jv64fpm4r25b86rvvqgc6n74w6jj7k";
   };
 
-  buildInputs = [ crc32c  ];
+  buildInputs = [ crc32c ];
+
   propagatedBuildInputs = [ cffi ];
 
   LDFLAGS = "-L${crc32c}/lib";
   CFLAGS = "-I${crc32c}/include";
 
   checkInputs = [ pytestCheckHook crc32c ];
+
   pythonImportsCheck = [ "google_crc32c" ];
 
   meta = with lib; {
     homepage = "https://github.com/googleapis/python-crc32c";
     description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm";
     license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ freezeboy ];
+    maintainers = with maintainers; [ freezeboy SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix
index 56a77258c8aa..590962590e5f 100644
--- a/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, requests, pytest, pytestcov, mock }:
+{ buildPythonPackage, fetchPypi, lib, requests, pytestCheckHook, mock }:
 
 buildPythonPackage rec {
   pname = "google-i18n-address";
@@ -11,12 +11,12 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
-  checkInputs = [ pytest pytestcov mock ];
+  checkInputs = [ pytestCheckHook mock ];
 
   meta = with lib; {
     description = "Google's i18n address data packaged for Python";
     homepage = "https://pypi.org/project/google-i18n-address/";
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
     license = licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix b/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix
index 16363192c81b..a883f707bdf1 100644
--- a/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix
@@ -1,4 +1,7 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
 , attrs
 , audio-metadata
 , importlib-metadata
@@ -10,7 +13,6 @@
 buildPythonPackage rec {
   pname = "google-music-proto";
   version = "2.10.0";
-  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
@@ -20,7 +22,7 @@ buildPythonPackage rec {
   postPatch = ''
     sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py
     substituteInPlace setup.py \
-      --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0"
+      --replace "'attrs>=18.2,<19.4'" "'attrs'"
   '';
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix b/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix
index b7fd2738e048..801b4b78a178 100644
--- a/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix
@@ -1,30 +1,35 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, audio-metadata, multidict, wrapt
-, pytest
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, audio-metadata
+, multidict
+, poetry
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "google-music-utils";
-  version = "2.1.0";
+  version = "2.5.0";
 
   # Pypi tarball doesn't contain tests
   src = fetchFromGitHub {
     owner = "thebigmunch";
     repo = "google-music-utils";
     rev = version;
-    sha256 = "0fn4zp0gf1wx2x06dbc840qcq21j4p3ajghxp7646w2n6n9gxhh7";
+    sha256 = "0vwbrgakk23fypjspmscz4gllnb3dksv2njy4j4bm8vyr6fwbi5f";
   };
+  format = "pyproject";
 
-  propagatedBuildInputs = [
-    audio-metadata multidict wrapt
-  ];
-
-  checkInputs = [ pytest ];
-  checkPhase = ''
-    pytest
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'multidict = "^4.0"' 'multidict = ">4.0"'
   '';
 
-  disabled = pythonOlder "3.6";
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ audio-metadata multidict ];
+
+  checkInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     homepage = "https://github.com/thebigmunch/google-music-utils";
diff --git a/nixpkgs/pkgs/development/python-modules/google-music/default.nix b/nixpkgs/pkgs/development/python-modules/google-music/default.nix
index 9d2f0def99b2..90978ad2cba7 100644
--- a/nixpkgs/pkgs/development/python-modules/google-music/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-music/default.nix
@@ -1,4 +1,6 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib
+, buildPythonPackage
+, fetchPypi
 , appdirs
 , audio-metadata
 , google-music-proto
@@ -14,14 +16,9 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b79956cc0df86345c74436ae6213b700345403c91d51947288806b174322573b";
+    sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "audio-metadata>=0.8,<0.9" "audio-metadata"
-  '';
-
   propagatedBuildInputs = [
     appdirs
     audio-metadata
@@ -35,8 +32,6 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  disabled = pythonOlder "3.6";
-
   meta = with lib; {
     homepage = "https://github.com/thebigmunch/google-music";
     description = "A Google Music API wrapper";
diff --git a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix
new file mode 100644
index 000000000000..531dc1a28603
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, google-auth
+, google-cloud-testutils
+, google-crc32c
+, mock
+, pytestCheckHook
+, pytest-asyncio
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "google-resumable-media";
+  version = "1.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hwxdgsqh6933kp4jkv6hwwdcqs7bgjn9j08ga399njv3s9b367f";
+  };
+
+  propagatedBuildInputs = [ google-auth google-crc32c requests ];
+
+  checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
+
+  preCheck = ''
+    # prevent shadowing imports
+    rm -r google
+    # fixture 'authorized_transport' not found
+    rm tests/system/requests/test_upload.py
+    # requires network
+    rm tests/system/requests/test_download.py
+  '';
+
+  pythonImportsCheck = [
+    "google._async_resumable_media"
+    "google.resumable_media"
+  ];
+
+  meta = with lib; {
+    description = "Utilities for Google Media Downloads and Resumable Uploads";
+    homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
deleted file mode 100644
index 3f47a366fba8..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
-, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client
-, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa
-, setuptools, six, urllib3 }:
-
-buildPythonPackage rec {
-  pname = "google-auth";
-  version = "1.23.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5176db85f1e7e837a646cd9cede72c3c404ccf2e3373d9ee14b2db88febad440";
-  };
-
-  disabled = pythonOlder "3.5";
-
-  propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
-
-  checkInputs = [
-    flask
-    freezegun
-    mock
-    oauth2client
-    pytestCheckHook
-    pytest-localserver
-    requests
-    responses
-    urllib3
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Google Auth Python Library";
-    longDescription = ''
-      This library simplifies using Google’s various server-to-server
-      authentication mechanisms to access Google APIs.
-    '';
-    homepage = "https://github.com/googleapis/google-auth-library-python";
-    changelog =
-      "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
-    # Documentation: https://googleapis.dev/python/google-auth/latest/index.html
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix
deleted file mode 100644
index 87b1fdf8fc9d..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, grpc_google_iam_v1
-, google_api_core, google-cloud-access-context-manager, google-cloud-org-policy
-, libcst, proto-plus, pytest, pytest-asyncio, pytestCheckHook, mock }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-asset";
-  version = "2.2.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1cf1b8a102eea8cec65eb07bef51dc15c1136cfc8564ea7fc5a39465b8f20017";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
-  disabledTests = [ "asset_service_transport_auth_adc" ];
-  propagatedBuildInputs = [
-    grpc_google_iam_v1
-    google_api_core
-    google-cloud-access-context-manager
-    google-cloud-org-policy
-    libcst
-    proto-plus
-  ];
-
-  # Remove tests intended to be run in VPC
-  preCheck = ''
-    rm -rf tests/system
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Python Client for Google Cloud Asset API";
-    homepage = "https://github.com/googleapis/python-asset";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix
deleted file mode 100644
index 3ad8dcb12fb3..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst
-, google_api_core, google_cloud_storage, google_cloud_testutils, pandas
-, proto-plus, pytest-asyncio, mock }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-automl";
-  version = "2.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  checkInputs = [
-    google_cloud_storage
-    google_cloud_testutils
-    mock
-    pandas
-    pytest-asyncio
-    pytestCheckHook
-  ];
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
-
-  # ignore tests which need credentials
-  disabledTests = [ "test_prediction_client_client_info" ];
-  preCheck = ''
-    rm -r google
-    rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud AutoML API client library";
-    homepage = "https://github.com/googleapis/python-automl";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
deleted file mode 100644
index 3255475fbf51..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, freezegun
-, google_api_core, google_cloud_core, google_cloud_testutils
-, google_resumable_media, grpcio, ipython, mock, pandas, proto-plus, pyarrow }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-bigquery";
-  version = "2.6.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1f99fd0c0c5bde999e056a1be666e5d5bbf392f62c9e730dfcbaf6e8408d44ef";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  checkInputs =
-    [ freezegun google_cloud_testutils ipython mock pytestCheckHook ];
-  propagatedBuildInputs = [
-    google_resumable_media
-    google_api_core
-    google_cloud_core
-    pandas
-    proto-plus
-    pyarrow
-  ];
-
-  # prevent google directory from shadowing google imports
-  # test_magics requires modifying sys.path
-  preCheck = ''
-    rm -r google
-    rm tests/unit/test_magics.py
-  '';
-
-  # call_api_applying_custom_retry_on_timeout requires credentials
-  # to_dataframe_timestamp_out_of_pyarrow_bounds has inconsistent results
-  disabledTests = [
-    "call_api_applying_custom_retry_on_timeout"
-    "to_dataframe_timestamp_out_of_pyarrow_bounds"
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Google BigQuery API client library";
-    homepage = "https://pypi.org/project/google-cloud-bigquery";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
deleted file mode 100644
index 8c71ac92c994..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-bigquery-datatransfer";
-  version = "2.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0cca79f6ee312159ec3f3b7fea218c3dd51408d39c429ecbea037982e91cc827";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "BigQuery Data Transfer API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
deleted file mode 100644
index c5415b84ba1f..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core
-, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-container";
-  version = "2.3.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0dcd8084dd55c0439ff065d3fb206e2e5c695d3a25effd774b74f8ce43afc911";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  checkInputs = [ mock pytest pytest-asyncio ];
-  propagatedBuildInputs =
-    [ google_api_core grpc_google_iam_v1 libcst proto-plus ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Container Engine API client library";
-    homepage = "https://github.com/googleapis/python-container";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix
deleted file mode 100644
index b0067d4316da..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pytest
-, mock
-, libcst
-, proto-plus
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-dataproc";
-  version = "2.2.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "81c44ac114c94df8f5b21245e5e7fc4eabce66b25fc432c3696b62b5de143b1f";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Dataproc API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix
deleted file mode 100644
index 07c6cd87237f..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-datastore";
-  version = "2.0.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ebf3b0bcb483e066dfe73679e019e2d7b8c1652e26984702cf5e3f020592f6a";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
-
-  checkPhase = ''
-    rm -r google
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Datastore API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix
deleted file mode 100644
index a5a602dbeadb..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-dlp";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "112c8a46979eebd60c3651037e62572fed413977ff2811901aa925c7b7ab9a5a";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 google_api_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud Data Loss Prevention (DLP) API API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix
deleted file mode 100644
index d488b7ad5632..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-dns";
-  version = "0.32.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7264e58067b55535ee859e124bd3da29337698ef6bb293da667d0316ddbe8606";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
-
-  checkPhase = ''
-    rm -r google
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud DNS API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix
deleted file mode 100644
index 4f819bbf9bfa..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-firestore";
-  version = "2.0.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ae1f58d9174a6fb2c9fd2758c6d4fd237fb4f0decc632b80c217bfbceda38eb6";
-  };
-
-  checkInputs = [ pytest ];
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
-
-  # tests were not included with release
-  # See issue https://github.com/googleapis/google-cloud-python/issues/6380
-  doCheck = false;
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Firestore API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix
deleted file mode 100644
index 96364cfd7029..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, grpc_google_iam_v1
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-iot";
-  version = "2.0.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8af2be9c74697a350d5cc8ead00ae6cb4e85943564f1d782e8060d0d5eb15723";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud IoT API API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    # maintainers = [ maintainers. ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix
deleted file mode 100644
index 4f3defb4e4b9..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-language";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "abe7abcd64d25ffdf6d063385869ef8f34a7de421d5676541cd6df63b3c37b88";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 google_api_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Natural Language API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix
deleted file mode 100644
index 96473edd583b..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, django
-, flask, google_api_core, google_cloud_core, google_cloud_testutils, mock
-, webapp2 }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-logging";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c8e4869ec22aa7958ff937c1acbd34d7a2a8a446af9a09ce442f24128eee063c";
-  };
-
-  disabled = pythonOlder "3.5";
-
-  checkInputs =
-    [ django flask google_cloud_testutils mock pytestCheckHook webapp2 ];
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
-
-  # api_url test broken, fix not yet released
-  # https://github.com/googleapis/python-logging/pull/66
-  disabledTests =
-    [ "test_build_api_url_w_custom_endpoint" "test_write_log_entries" ];
-
-  # prevent google directory from shadowing google imports
-  # remove system integration tests
-  preCheck = ''
-    rm -r google
-    rm tests/system/test_system.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Stackdriver Logging API client library";
-    homepage = "https://github.com/googleapis/python-logging";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix
deleted file mode 100644
index 99557565e63a..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pandas
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-monitoring";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1debfa046ab9518d46b68712c03d86d0ddb11d1aad428aed62c6465752f2201f";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core pandas ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Stackdriver Monitoring API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix
deleted file mode 100644
index b7b810370f98..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook
-, google_api_core, google_cloud_testutils, grpc_google_iam_v1, libcst, mock
-, proto-plus, pytest-asyncio }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-pubsub";
-  version = "2.2.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bc50a60803f5c409a295ec0e31cdd4acc271611ce3f4963a072036bbfa5ccde5";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
-  propagatedBuildInputs =
-    [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
-
-  # prevent google directory from shadowing google imports
-  # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com
-  preCheck = ''
-    rm -r google
-    rm -r tests/unit/pubsub_v1
-  '';
-
-  pythonImportsCheck = [ "google.cloud.pubsub" ];
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Pub/Sub API client library";
-    homepage = "https://pypi.org/project/google-cloud-pubsub";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix
deleted file mode 100644
index 3337d9f3c55b..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-redis";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c783118462d9272fb9f519ef43b6ce383e99ad631e922a1f06fbef7148aec7b8";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 google_api_core ];
-
-  # requires old version of google-api-core (override)
-  preBuild = ''
-    sed -i "s/'google-api-core\[grpc\] >= 0.1.0, < 0.2.0dev'/'google-api-core'/g" setup.py
-    sed -i "s/google-api-core\[grpc\]<0.2.0dev,>=0.1.0/google-api-core/g" google_cloud_redis.egg-info/requires.txt
-  '';
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Memorystore for Redis API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
deleted file mode 100644
index 815ecc118f9b..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_cloud_core, google_api_core, mock, pytest }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-resource-manager";
-  version = "0.30.3";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3577bbf38f2c7c2f42306b8dfdeffbb0eedf45aaec947fd513d51937f72046d1";
-  };
-
-  disabled = pythonOlder "3.5";
-
-  checkInputs = [ mock pytestCheckHook ];
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
-
-  # api_url test broken, fix not yet released
-  # https://github.com/googleapis/python-resource-manager/pull/31
-  disabledTests =
-    [ "api_url_no_extra_query_param" "api_url_w_custom_endpoint" ];
-
-  # prevent google directory from shadowing google imports
-  preCheck = ''
-    rm -r google
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Resource Manager API client library";
-    homepage = "https://github.com/googleapis/python-resource-manager";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
deleted file mode 100644
index d4fb4c59a18c..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_api_core, google_cloud_core, mock }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-runtimeconfig";
-  version = "0.32.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "57143ec3c5ed3e0bee590a98857eec06c68aa2eacbce477403226a0d2e85a8ad";
-  };
-
-  disabled = pythonOlder "3.5";
-
-  checkInputs = [ mock pytestCheckHook ];
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
-
-  # api_url test broken, fix not yet released
-  # https://github.com/googleapis/python-resource-manager/pull/31
-  # Client tests require credentials
-  disabledTests = [ "build_api_url_w_custom_endpoint" "client_options" ];
-
-  # prevent google directory from shadowing google imports
-  preCheck = ''
-    rm -r google
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud RuntimeConfig API client library";
-    homepage = "https://pypi.org/project/google-cloud-runtimeconfig";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix
deleted file mode 100644
index c744701c7789..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, grpc_google_iam_v1, google_api_core, libcst, proto-plus
-, pytest, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-secret-manager";
-  version = "2.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "2f08b49164aca8623b2e4ee07352980b3ffca909ce205c03568e203bbc455c30";
-  };
-
-  propagatedBuildInputs = [
-    google_api_core
-    grpc_google_iam_v1
-    libcst
-    proto-plus
-  ];
-
-  checkInputs = [
-    mock
-    pytest
-  ];
-  checkPhase = ''
-    pytest
-  '';
-
-  meta = with lib; {
-    description = "Secret Manager API: Stores, manages, and secures access to application secrets";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ siriobalmelli ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
deleted file mode 100644
index cad4b0799c28..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, grpc_google_iam_v1
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-securitycenter";
-  version = "1.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "45d47a4389f2f19958a9db8e5c2f169c9b9385e74338fef0a4e49160153df7f7";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud Security Command Center API API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix
deleted file mode 100644
index 38bd65aa091d..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, grpc_google_iam_v1, grpcio-gcp, google_api_core, google_cloud_core
-, google_cloud_testutils, mock, pytest }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-spanner";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "edac9d86ea2d8e87c048423f610cd3e5dbb6f9db7f1f9353ff133014689e97c6";
-  };
-
-  disabled = pythonOlder "3.5";
-
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook ];
-  propagatedBuildInputs =
-    [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ];
-
-  # prevent google directory from shadowing google imports
-  # remove tests that require credentials
-  preCheck = ''
-    rm -r google
-    rm tests/system/test_system.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud Spanner API client library";
-    homepage = "https://pypi.org/project/google-cloud-spanner";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix
deleted file mode 100644
index 57b2efb9ebbc..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, google_api_core, pytest, mock }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-speech";
-  version = "2.0.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a7428190f4c10440148a273eb4c91480470b34180eec422b7325acdc0b2c0832";
-  };
-
-  propagatedBuildInputs = [ google_api_core ];
-  checkInputs = [ pytest mock ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud Speech API enables integration of Google speech recognition into applications.";
-    homepage = "https://github.com/googleapis/google-cloud-python/tree/master/speech";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix
deleted file mode 100644
index a1b572db11e5..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_api_core, google_auth, google-cloud-iam, google_cloud_core
-, google_cloud_kms, google_cloud_testutils, google_resumable_media, mock
-, requests }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-storage";
-  version = "1.33.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "900ba027bdee6b97f21cd22d1db3d1a6233ede5de2db4754db860438bdad72d2";
-  };
-
-  disabled = pythonOlder "3.5";
-
-  propagatedBuildInputs = [
-    google_api_core
-    google_auth
-    google_cloud_core
-    google_resumable_media
-    requests
-  ];
-  checkInputs = [
-    google-cloud-iam
-    google_cloud_kms
-    google_cloud_testutils
-    mock
-    pytestCheckHook
-  ];
-
-  # disable tests which require credentials
-  disabledTests = [ "create" "get" "post" "test_build_api_url" ];
-
-  # prevent google directory from shadowing google imports
-  # remove tests which require credentials
-  preCheck = ''
-    rm -r google
-    rm tests/system/test_system.py tests/unit/test_client.py
-  '';
-
-  meta = with lib; {
-    description = "Google Cloud Storage API client library";
-    homepage = "https://github.com/googleapis/python-storage";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix
deleted file mode 100644
index ca252b2c5edb..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, grpc_google_iam_v1
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-tasks";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a9dd004057fc441eee8c18bb2dc3bb20ba7b85f353d66894c61e42aeb8764e76";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud Tasks API API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
deleted file mode 100644
index 32e8fa223a88..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_api_core, libcst, mock, proto-plus, pytest-asyncio, }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-texttospeech";
-  version = "2.2.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e";
-  };
-
-  disabled = pythonOlder "3.5";
-
-  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
-
-  # Disable tests that require credentials
-  disabledTests = ["test_synthesize_speech" "test_list_voices"];
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Text-to-Speech API client library";
-    homepage = "https://github.com/googleapis/python-texttospeech";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix
deleted file mode 100644
index b0efb65d0d2f..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-trace";
-  version = "1.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1bd1ee5c274a584929913d9118134e01afe106644cb749ccc3111e1a38a96cd3";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Stackdriver Trace API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
deleted file mode 100644
index 1049895bda1b..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_api_core, google_cloud_core, google_cloud_testutils, grpcio, libcst
-, mock, proto-plus, pytest-asyncio }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-translate";
-  version = "3.0.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6183168465749f007449ef4125356d03cca0114ed49faf7ed64f34ec3edd4fe8";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  # google_cloud_core[grpc] -> grpcio
-  propagatedBuildInputs =
-    [ google_api_core google_cloud_core grpcio libcst proto-plus ];
-
-  checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ];
-
-  # test_http.py broken, fix not yet released
-  # https://github.com/googleapis/python-translate/pull/69
-  disabledTests = [
-    "test_build_api_url_w_extra_query_params"
-    "test_build_api_url_no_extra_query_params"
-    "test_build_api_url_w_custom_endpoint"
-  ];
-
-  preCheck = ''
-    rm -r google
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Translation API client library";
-    homepage = "https://github.com/googleapis/python-translate";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
deleted file mode 100644
index b823e105b843..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pytest
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-videointelligence";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "02a91a25b3890a743bde21e03abddf11dcaf7966cc44f09bc8d507f2e28f15fa";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core ];
-
-  checkPhase = ''
-    pytest tests/unit
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Video Intelligence API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix
deleted file mode 100644
index fd738a522661..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, google_api_core
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "google-cloud-vision";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6a067d9a661df2e9b356b2772051decfea1971f8d659c246412a165baf827c61";
-  };
-
-  checkInputs = [ mock ];
-  propagatedBuildInputs = [ enum34 google_api_core ];
-
-  # pytest seems to pick up some file which overrides PYTHONPATH
-  checkPhase = ''
-    cd tests/unit
-    python -m unittest discover
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Cloud Vision API API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
deleted file mode 100644
index 356759f9bcb5..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
-, google_api_core, libcst, mock, proto-plus, pytest-asyncio }:
-
-buildPythonPackage rec {
-  pname = "google-cloud-websecurityscanner";
-  version = "1.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
-
-  meta = with stdenv.lib; {
-    description = "Google Cloud Web Security Scanner API client library";
-    homepage = "https://github.com/googleapis/python-websecurityscanner";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix b/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix
deleted file mode 100644
index 37bfbfc481ba..000000000000
--- a/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-, six
-, requests
-, setuptools
-, pytest
-, mock
-, crcmod
-, google-crc32c
-}:
-
-buildPythonPackage rec {
-  pname = "google-resumable-media";
-  version = "1.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "dcdab13e95bc534d268f87d5293e482cce5bc86dfce6ca0f2e2e89cbb73ef38c";
-  };
-
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ requests setuptools six ]
-    ++ lib.optional isPy3k google-crc32c
-    ++ lib.optional (!isPy3k) crcmod;
-
-  checkPhase = ''
-    py.test tests/unit
-  '';
-
-  meta = with lib; {
-    description = "Utilities for Google Media Downloads and Resumable Uploads";
-    homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python";
-    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 507c3ba229a6..7e5b786b4fba 100644
--- a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -1,5 +1,10 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, protobuf, pytest, setuptools }:
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, grpc
+, protobuf
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
@@ -7,18 +12,26 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351";
+    sha256 = "0lakcsd35qm5x4visvw6z5f1niasv9a0mjyf2bd98wqi0z41c1sn";
   };
 
-  propagatedBuildInputs = [ protobuf setuptools ];
-  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ grpc protobuf ];
 
-  doCheck = false;  # there are no tests
+  # does not contain tests
+  doCheck = false;
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [
+    "google.api"
+    "google.logging"
+    "google.longrunning"
+    "google.rpc"
+    "google.type"
+  ];
+
+  meta = with lib; {
     description = "Common protobufs used in Google APIs";
-    homepage = "https://github.com/googleapis/googleapis";
+    homepage = "https://github.com/googleapis/python-api-common-protos";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
index 7e13aedec475..c971119833e6 100644
--- a/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
@@ -1,6 +1,11 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv
+, buildPythonPackage
+, fetchFromGitHub
 , requests
-, responses, pytestCheckHook, pytest, pytestcov, isPy27
+, responses
+, pytestCheckHook
+, pytestcov
+, isPy27
 }:
 
 buildPythonPackage rec {
@@ -25,7 +30,7 @@ buildPythonPackage rec {
     "test_transit_without_time"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/googlemaps/google-maps-services-python";
     description = "Python client library for Google Maps API Web Services";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/googletrans/default.nix b/nixpkgs/pkgs/development/python-modules/googletrans/default.nix
index 06d008200059..32b839ab11c2 100644
--- a/nixpkgs/pkgs/development/python-modules/googletrans/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/googletrans/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, requests, pytest, coveralls }:
+{ lib, buildPythonPackage, fetchFromGitHub, requests }:
 
 buildPythonPackage rec {
   pname = "googletrans";
@@ -11,17 +11,10 @@ buildPythonPackage rec {
     sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz";
   };
 
-  propagatedBuildInputs = [
-    requests
-  ];
-
-  checkInputs = [ pytest coveralls ];
+  propagatedBuildInputs = [ requests ];
 
   # majority of tests just try to ping Google's Translate API endpoint
   doCheck = false;
-  checkPhase = ''
-    pytest
-  '';
 
   pythonImportsCheck = [ "googletrans" ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/gorilla/default.nix b/nixpkgs/pkgs/development/python-modules/gorilla/default.nix
index d93cddee765e..bf4212edc510 100644
--- a/nixpkgs/pkgs/development/python-modules/gorilla/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gorilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi}:
+{ lib, stdenv, buildPythonPackage, fetchPypi}:
 
 buildPythonPackage rec {
   pname = "gorilla";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "feb2899b923935c25420b94aa8c266ccb5c0315199c685b725303a73195d802c";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/christophercrouzet/gorilla";
     description = "Convenient approach to monkey patching";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/gpapi/default.nix b/nixpkgs/pkgs/development/python-modules/gpapi/default.nix
index 1181c59c1fc4..788473b5ab8f 100644
--- a/nixpkgs/pkgs/development/python-modules/gpapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , requests
 , protobuf
 , pycryptodome
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests protobuf pycryptodome ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/NoMore201/googleplay-api";
     license = licenses.gpl3;
     description = "Google Play Unofficial Python API";
diff --git a/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
index 2834fc5a735d..0dd68918aed6 100644
--- a/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchPypi, buildPythonPackage
-, pkgconfig
+{ lib, stdenv, fetchPypi, buildPythonPackage
+, pkg-config
 , libgphoto2 }:
 
 buildPythonPackage rec {
@@ -11,13 +11,13 @@ buildPythonPackage rec {
     sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libgphoto2 ];
 
   doCheck = false; # No tests available
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python interface to libgphoto2";
     homepage = "https://github.com/jim-easterbrook/python-gphoto2";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix b/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix
index 7e7403239010..ecd52ad848c9 100644
--- a/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
+{ buildPythonPackage, lib, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
 , protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub
 }:
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/matlink/gplaycli";
     description = "Google Play Downloader via Command line";
     license = licenses.agpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/gps3/default.nix b/nixpkgs/pkgs/development/python-modules/gps3/default.nix
new file mode 100644
index 000000000000..76321182dcb6
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/gps3/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "gps3";
+  version = "0.33.3";
+
+  src = fetchFromGitHub {
+    owner = "onkelbeh";
+    repo = pname;
+    rev = version;
+    sha256 = "0a0qpk7d2b1cld58qcdn6bxrkil6ascs51af01dy4p83062h1hi6";
+  };
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "gps3" ];
+
+  meta = with lib; {
+    description = "Python client for GPSD";
+    homepage = "https://github.com/onkelbeh/gps3";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix b/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
index 57130a7aa529..2c4dfcd81395 100644
--- a/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cffi
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python client library for Google Play Services OAuth";
     homepage = "https://github.com/simon-weber/gpsoauth";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/gpy/default.nix b/nixpkgs/pkgs/development/python-modules/gpy/default.nix
index e4a20bc83d72..9c444f465f30 100644
--- a/nixpkgs/pkgs/development/python-modules/gpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     "GPy"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Gaussian process framework in Python";
     homepage = "https://sheffieldml.github.io/GPy";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix b/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix
index 67f934ccf053..22e6743582c2 100644
--- a/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, setuptools
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools
 , numpy, scipy, gpy, emcee, nose }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ setuptools numpy scipy gpy emcee ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bayesian optimization toolbox in Python";
     homepage = "https://sheffieldml.github.io/GPyOpt";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix b/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix
index 3ee66a1c5242..adaafd8eadbe 100644
--- a/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , hyperopt
 }:
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "gradient_sdk" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Gradient ML SDK";
     homepage    = "https://github.com/Paperspace/gradient-sdk";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix b/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
index 14623ff625f5..607737d99ae0 100644
--- a/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # Pypi does not contain tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wrapper around the DogStatsd client";
     homepage    = "https://paperspace.com";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/nixpkgs/pkgs/development/python-modules/graphene/default.nix
new file mode 100644
index 000000000000..301ffca03477
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/graphene/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aniso8601
+, iso8601
+, graphql-core
+, graphql-relay
+, pytestCheckHook
+, pytest-asyncio
+, pytest-benchmark
+, pytest-mock
+, pytz
+, snapshottest
+}:
+
+buildPythonPackage rec {
+  pname = "graphene";
+  version = "3.0.0b7";
+
+  src = fetchFromGitHub {
+    owner = "graphql-python";
+    repo = "graphene";
+    rev = "v${version}";
+    sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338=";
+  };
+
+  propagatedBuildInputs = [
+    aniso8601
+    graphql-core
+    graphql-relay
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-benchmark
+    pytest-mock
+    pytz
+    snapshottest
+  ];
+
+  pythonImportsCheck = [ "graphene" ];
+
+  meta = with lib; {
+    description = "GraphQL Framework for Python";
+    homepage = "https://github.com/graphql-python/graphene";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix
index 16341e718084..0bced13cd112 100644
--- a/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir
 }:
 buildPythonPackage rec {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
       --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://graphiteapp.org/";
     description = "Enterprise scalable realtime graphing";
     maintainers = with maintainers; [ offline basvandijk ];
diff --git a/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix b/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix
index cc070f55323c..06b66ccbc145 100644
--- a/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , tornado_5, pyyaml, funcparserlib
 , nixosTests
 }:
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     nixos = nixosTests.graphite;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple alerting application for Graphite metrics";
     homepage = "https://github.com/klen/graphite-beacon";
     maintainers = [ maintainers.offline ];
diff --git a/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix b/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix
new file mode 100644
index 000000000000..fa6a9ec60a73
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, graphql-core, pytestCheckHook }:
+
+buildPythonPackage rec {
+  pname = "graphql-relay";
+  version = "3.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0mjmpf4abrxfyln0ykxq4xa6lp7xwgqr8631qp011hv0nfl6jgxd";
+  };
+
+  propagatedBuildInputs = [ graphql-core ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "graphql_relay" ];
+
+  meta = with lib; {
+    description = "A library to help construct a graphql-py server supporting react-relay";
+    homepage = "https://github.com/graphql-python/graphql-relay-py/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix
index f531c547f9cc..1a0e6d903a47 100644
--- a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix
@@ -6,21 +6,21 @@
 , makeFontsConf
 , freefont_ttf
 , mock
-, pytest
+, pytestCheckHook
 , pytest-mock
 , pytestcov
 }:
 
 buildPythonPackage rec {
   pname = "graphviz";
-  version = "0.14.1";
+  version = "0.16";
 
   # patch does not apply to PyPI tarball due to different line endings
   src = fetchFromGitHub {
     owner = "xflr6";
     repo = "graphviz";
     rev = version;
-    sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c";
+    sha256 = "147vi60mi57z623lhllwwzczzicv2iwj1yrmllj5xx5788i73j6g";
   };
 
   patches = [
@@ -35,11 +35,7 @@ buildPythonPackage rec {
     fontDirectories = [ freefont_ttf ];
   };
 
-  checkInputs = [ mock pytest pytest-mock pytestcov ];
-
-  checkPhase = ''
-    pytest
-  '';
+  checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ];
 
   meta = with lib; {
     description = "Simple Python interface for Graphviz";
diff --git a/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
index d6da1ff47ce7..fa2f634bbc29 100644
--- a/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
@@ -1,19 +1,28 @@
 diff --git a/graphviz/backend.py b/graphviz/backend.py
-index 6f4cc0c..bc4781e 100644
+index d2c4b97..f7175cd 100644
 --- a/graphviz/backend.py
 +++ b/graphviz/backend.py
 @@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
          raise ValueError('unknown formatter: %r' % formatter)
  
      output_format = [f for f in (format_, renderer, formatter) if f is not None]
--    cmd = [engine, '-T%s' % ':'.join(output_format)]
-+    cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)]
+-    cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
++    cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
  
      if filepath is None:
          rendered = None
-@@ -255,7 +255,7 @@ def version():
-         subprocess.CalledProcessError: If the exit status is non-zero.
-         RuntimmeError: If the output cannot be parsed into a version number.
+@@ -275,7 +275,7 @@ def unflatten(source,
+     if fanout and stagger is None:
+         raise RequiredArgumentError('fanout given without stagger')
+ 
+-    cmd = ['unflatten']
++    cmd = ['@graphviz@/bin/unflatten']
+     if stagger is not None:
+         cmd += ['-l', str(stagger)]
+     if fanout:
+@@ -304,7 +304,7 @@ def version():
+         Graphviz Release version entry format
+         https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20
      """
 -    cmd = ['dot', '-V']
 +    cmd = ['@graphviz@/bin/dot', '-V']
@@ -21,10 +30,10 @@ index 6f4cc0c..bc4781e 100644
                   stdout=subprocess.PIPE,
                   stderr=subprocess.STDOUT)
 diff --git a/tests/test_backend.py b/tests/test_backend.py
-index 9f307f5..e43bf5b 100644
+index d10ef1a..e4aba58 100644
 --- a/tests/test_backend.py
 +++ b/tests/test_backend.py
-@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
+@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
          m.decode.assert_called_once_with(encoding)
  
  
@@ -33,34 +42,43 @@ index 9f307f5..e43bf5b 100644
  @pytest.mark.usefixtures('empty_path')
  @pytest.mark.parametrize('func, args', [
      (render, ['dot', 'pdf', 'nonfilepath']),
-@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
+@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
  
      assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
  
--    Popen.assert_called_once_with(['dot', '-Tpdf', '-O', 'nonfilepath'],
-+    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'],
+-    Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
++    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
                                    cwd=None, startupinfo=mocker.ANY)
-@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet):  # noqa: N803
+@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet):  # noqa: N803
      assert e.value.stdout is mocker.sentinel.out
      e.value.stdout = mocker.sentinel.new_stdout
      assert e.value.stdout is mocker.sentinel.new_stdout
--    Popen.assert_called_once_with(['dot', '-Tpng'],
-+    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
+-    Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
++    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
                                    stdin=subprocess.PIPE,
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
-@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
+@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
  
      assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
  
--    Popen.assert_called_once_with(['dot', '-Tpng'],
-+    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
+-    Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
++    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
+                                   stdin=subprocess.PIPE,
+                                   stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE,
+@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen):
+     proc.communicate.return_value = (b'nonresult', b'')
+ 
+     assert unflatten('nonsource') == 'nonresult'
+-    Popen.assert_called_once_with(['unflatten'],
++    Popen.assert_called_once_with(['@graphviz@/bin/unflatten'],
                                    stdin=subprocess.PIPE,
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
-@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen):  # noqa: N803
+@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen):  # noqa: N803
      with pytest.raises(RuntimeError, match=r'nonversioninfo'):
          version()
  
@@ -69,7 +87,7 @@ index 9f307f5..e43bf5b 100644
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT,
                                    startupinfo=mocker.ANY)
-@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected):  # noqa: N803
+@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected):  # noqa: N803
  
      assert version() == expected
  
diff --git a/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix
index 299ce04f6fa2..7b2dd7e3fedd 100644
--- a/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "35b7ccaf9acc54684c73aeefbeaddc63b8a16143bd981bd5b3ebef253def07df";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A snapshot of django-grappelli for the Mezzanine CMS";
     longDescription = ''
       grappelli_safe was created to provide a snapshot of the
diff --git a/nixpkgs/pkgs/development/python-modules/grequests/default.nix b/nixpkgs/pkgs/development/python-modules/grequests/default.nix
index 34e8c7ff16ff..5ce5df8cdea2 100644
--- a/nixpkgs/pkgs/development/python-modules/grequests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grequests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests gevent ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Asynchronous HTTP requests";
     homepage = "https://github.com/kennethreitz/grequests";
     license = with licenses; [ bsd2 ];
diff --git a/nixpkgs/pkgs/development/python-modules/grip/default.nix b/nixpkgs/pkgs/development/python-modules/grip/default.nix
index cf29b11b268e..019cd798d640 100644
--- a/nixpkgs/pkgs/development/python-modules/grip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 # Python bits:
@@ -42,7 +42,7 @@ buildPythonPackage rec {
       py.test -xm "not assumption"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Preview GitHub Markdown files like Readme locally before committing them";
     homepage = "https://github.com/joeyespo/grip";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
index caa3b8cafb4c..dd9527006dad 100644
--- a/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , grpcio
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   doCheck = false;
   checkInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GRPC library for the google-iam-v1 service";
     homepage = "https://github.com/googleapis/googleapis";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix
index 6af70be2f6cb..1b631c0973ed 100644
--- a/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , grpcio
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ grpcio ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "gRPC extensions for Google Cloud Platform";
     homepage = "https://grpc.io";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
index 417b9d82e2e2..629c51071abd 100644
--- a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.34.0";
+  version = "1.34.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "db5a6f0130256d534cbe35eab37d37a448d96f4fd736e5051c6be1aee49cea1d";
+    sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08";
   };
 
   outputs = [ "out" "dev" ];
@@ -18,7 +18,9 @@ buildPythonPackage rec {
   # no tests in the package
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [ "grpc_tools" ];
+
+  meta = with lib; {
     description = "Protobuf code generator for gRPC";
     license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
diff --git a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
index 55d569c90547..1b1ffb975fb6 100644
--- a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
@@ -1,6 +1,18 @@
-{ stdenv, buildPythonPackage, darwin, grpc
-, six, protobuf, enum34, futures, isPy27, pkgconfig
-, cython, c-ares, openssl, zlib }:
+{ lib, stdenv
+, buildPythonPackage
+, darwin
+, grpc
+, six
+, protobuf
+, enum34
+, futures
+, isPy27
+, pkg-config
+, cython
+, c-ares
+, openssl
+, zlib
+}:
 
 buildPythonPackage rec {
   inherit (grpc) src version;
@@ -8,24 +20,29 @@ buildPythonPackage rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cython pkgconfig ]
-                    ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
+  nativeBuildInputs = [ cython pkg-config ]
+    ++ lib.optional stdenv.isDarwin darwin.cctools;
 
   buildInputs = [ c-ares openssl zlib ];
   propagatedBuildInputs = [ six protobuf ]
-                        ++ stdenv.lib.optionals (isPy27) [ enum34 futures ];
+    ++ lib.optionals (isPy27) [ enum34 futures ];
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR";
+  preBuild = lib.optionalString stdenv.isDarwin "unset AR";
 
   GRPC_BUILD_WITH_BORING_SSL_ASM = "";
   GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
   GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1;
   GRPC_PYTHON_BUILD_SYSTEM_CARES = 1;
 
-  meta = with stdenv.lib; {
+  # does not contain any tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "grpc" ];
+
+  meta = with lib; {
     description = "HTTP/2-based RPC framework";
     license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix b/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix
index 6e6f0504aa72..0512a4906a27 100644
--- a/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix
+++ b/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # tests not packaged with gsd
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/glotzer/gsd";
     description = "General simulation data file format";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix
index 5fd73541dd42..7cf2a8c8df11 100644
--- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
-, google_auth
+, google-auth
 , google-auth-oauthlib
 }:
 
@@ -15,9 +15,9 @@ buildPythonPackage rec {
     sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c";
   };
 
-  propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ];
+  propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google Spreadsheets client library";
     homepage = "https://github.com/burnash/gspread";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
index c66ceedc3cee..9ff8434cc9aa 100644
--- a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
@@ -1,9 +1,10 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchurl
 , meson
 , ninja
 , stdenv
-, pkgconfig
+, pkg-config
 , python3
 , pygobject3
 , gobject-introspection
@@ -30,7 +31,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     gobject-introspection
     gst-plugins-base
@@ -51,11 +52,9 @@ buildPythonPackage rec {
   # https://github.com/NixOS/nixpkgs/issues/47390
   installCheckPhase = "meson test --print-errorlogs";
 
-  meta = {
+  meta = with lib; {
     homepage = "https://gstreamer.freedesktop.org";
-
     description = "Python bindings for GStreamer";
-
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix
index c092da735854..3af8e97ba71b 100644
--- a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , glibcLocales, gobject-introspection, gtk3, libsoup, libsecret
 , buildPythonPackage, python
 , pygobject3, freezegun, mock
@@ -37,7 +37,7 @@ buildPythonPackage rec {
       --prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib" \
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A time tracking app";
     longDescription = ''
       GTimeLog is a small time tracking application for GNOME.
diff --git a/nixpkgs/pkgs/development/python-modules/guestfs/default.nix b/nixpkgs/pkgs/development/python-modules/guestfs/default.nix
index a446166c2917..23a2545525a3 100644
--- a/nixpkgs/pkgs/development/python-modules/guestfs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/guestfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }:
+{ lib, stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }:
 
 buildPythonPackage rec {
   pname = "guestfs";
@@ -11,7 +11,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ libguestfs qemu ];
 
-  meta = with stdenv.lib; {
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "guestfs" ];
+
+  meta = with lib; {
     homepage = "https://libguestfs.org/guestfs-python.3.html";
     description = "Use libguestfs from Python";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/gumath/default.nix b/nixpkgs/pkgs/development/python-modules/gumath/default.nix
index ccf1627d7f32..601aecdf331c 100644
--- a/nixpkgs/pkgs/development/python-modules/gumath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gumath/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , numba
@@ -28,7 +29,7 @@ buildPythonPackage {
                 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]'
   '';
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so
   '';
 
diff --git a/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix b/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix
index f9681eef97e3..c1091fa980c9 100644
--- a/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix
+++ b/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , coverage
 , mock
 , pytest
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "gunicorn" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/benoitc/gunicorn";
     description = "WSGI HTTP Server for UNIX";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
index 8bdc42969032..983335f4395b 100644
--- a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
 , coverage
 , mock
 , pytest
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "gunicorn" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/benoitc/gunicorn";
     description = "WSGI HTTP Server for UNIX";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
index 7b4498afb2c5..f70625b86fe2 100644
--- a/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, sphinx, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, sphinx, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "guzzle_sphinx_theme";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ sphinx ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sphinx theme used by Guzzle: http://guzzlephp.org";
     homepage = "https://github.com/guzzle/guzzle_sphinx_theme/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix b/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
new file mode 100644
index 000000000000..fabc2d147fca
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "gviz_api";
+  version = "1.9.0";
+  format = "wheel";
+
+  src = fetchPypi {
+    inherit pname version;
+    format = "wheel";
+    sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ];
+
+  meta = with lib; {
+    description = "Python API for Google Visualization";
+    homepage = https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ndl ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/gyp/default.nix b/nixpkgs/pkgs/development/python-modules/gyp/default.nix
index c951c97b20f4..5be56c81257a 100644
--- a/nixpkgs/pkgs/development/python-modules/gyp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gyp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitiles
 , isPy3k
@@ -14,12 +14,12 @@ buildPythonPackage {
     sha256 = "0r9phq5yrmj968vdvy9vivli35wn1j9a6iwshp69wl7q4p0x8q2b";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     ./no-darwin-cflags.patch
     ./no-xcode.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to generate native build files";
     homepage = "https://chromium.googlesource.com/external/gyp/+/master/README.md";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/h11/default.nix b/nixpkgs/pkgs/development/python-modules/h11/default.nix
index 28461311021f..f3d37dacfa3c 100644
--- a/nixpkgs/pkgs/development/python-modules/h11/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h11/default.nix
@@ -1,33 +1,26 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, fetchpatch }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "h11";
-  version = "0.9.0";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k";
+    sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7";
   };
 
-  patches = [
-    # pytest5 compatability
-    (fetchpatch {
-      url = "https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch";
-      sha256 = "1s3ipf9s41m1lksws3xv3j133q7jnjdqvmgk4sfnm8q7li2dww39";
-    })
-  ];
-
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    py.test
-  '';
+  checkInputs = [ pytestCheckHook ];
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
     description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";
+    homepage = "https://github.com/python-hyper/h11";
     license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/h2/default.nix b/nixpkgs/pkgs/development/python-modules/h2/default.nix
index 7597abbe0f9e..6dad775732c0 100644
--- a/nixpkgs/pkgs/development/python-modules/h2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , enum34, hpack, hyperframe, pytestCheckHook, hypothesis }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook hypothesis ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "HTTP/2 State-Machine based protocol implementation";
     homepage = "http://hyper.rtfd.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/h3/default.nix b/nixpkgs/pkgs/development/python-modules/h3/default.nix
index e0d6ffce6531..46b774a25c1e 100644
--- a/nixpkgs/pkgs/development/python-modules/h3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , cmake
 , fetchPypi
@@ -25,7 +25,7 @@ buildPythonPackage rec {
       --subst-var-by libh3_path ${h3}/lib/libh3${stdenv.hostPlatform.extensions.sharedLibrary}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/uber/h3-py";
     description = "This library provides Python bindings for the H3 Core Library.";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/nixpkgs/pkgs/development/python-modules/h5py/default.nix
index a9ebdc5dfe88..c167e2115c66 100644
--- a/nixpkgs/pkgs/development/python-modules/h5py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h5py/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder
+{ lib, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder
 , numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch
 , mpi4py ? null, openssh, pytestCheckHook, cached-property }:
 
 assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
 
-with stdenv.lib;
-
 let
   mpi = hdf5.mpi;
   mpiSupport = hdf5.mpiSupport;
@@ -31,27 +29,26 @@ in buildPythonPackage rec {
   postConfigure = ''
     # Needed to run the tests reliably. See:
     # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30
-    ${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"}
+    ${lib.optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"}
   '';
 
   preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
 
   # tests now require pytest-mpi, which isn't available and difficult to package
   doCheck = false;
-  checkInputs = optional isPy27 unittest2 ++ [ pytestCheckHook openssh ];
+  checkInputs = lib.optional isPy27 unittest2 ++ [ pytestCheckHook openssh ];
   nativeBuildInputs = [ pkgconfig cython ];
   buildInputs = [ hdf5 ]
-    ++ optional mpiSupport mpi;
+    ++ lib.optional mpiSupport mpi;
   propagatedBuildInputs = [ numpy six]
-    ++ optionals mpiSupport [ mpi4py openssh ]
-    ++ optionals (pythonOlder "3.8") [ cached-property ];
+    ++ lib.optionals mpiSupport [ mpi4py openssh ]
+    ++ lib.optionals (pythonOlder "3.8") [ cached-property ];
 
   pythonImportsCheck = [ "h5py" ];
 
-  meta = {
-    description =
-      "Pythonic interface to the HDF5 binary data format";
+  meta = with lib; {
+    description = "Pythonic interface to the HDF5 binary data format";
     homepage = "http://www.h5py.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
index 01d0343b171f..653c4483ce82 100644
--- a/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , ffmpeg_3, async-timeout }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # only manual tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pvizeli/ha-ffmpeg";
     description = "Library for home-assistant to handle ffmpeg";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/handout/default.nix b/nixpkgs/pkgs/development/python-modules/handout/default.nix
index c5c111845d15..b2b7b4b3d142 100644
--- a/nixpkgs/pkgs/development/python-modules/handout/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/handout/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , imageio, imageio-ffmpeg }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ imageio imageio-ffmpeg ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Turn Python scripts into handouts with Markdown and figures";
     homepage = "https://github.com/danijar/handout";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
index 90ff3df89e14..102ab3a2540c 100644
--- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -1,33 +1,50 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, acme, aiohttp, snitun, attrs, pycognito, warrant
-, pytest-aiohttp, asynctest, atomicwrites, pytest }:
+{ lib
+, acme
+, aiohttp
+, asynctest
+, atomicwrites
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, pycognito
+, pytest-aiohttp
+, pytestCheckHook
+, snitun
+, warrant
+}:
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.39.0";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = pname;
     rev = version;
-    sha256 = "1bsvwxddpp4dsq3k2320qrx5x9lscqzffzz1zj6fbwgc4741f01w";
+    sha256 = "sha256-ewWw3PyJGRHP23J6WBBWs9YGl4vTb9/j/soZ6n5wbLM=";
   };
 
   postPatch = ''
     sed -i 's/"acme.*"/"acme"/' setup.py
-    sed -i 's/"attrs.*"/"attrs"/' setup.py
-    sed -i 's/"cryptography.*"/"cryptography"/' setup.py
   '';
 
   propagatedBuildInputs = [
-    acme aiohttp atomicwrites snitun attrs warrant pycognito
+    acme
+    aiohttp
+    atomicwrites
+    attrs
+    pycognito
+    snitun
+    warrant
   ];
 
-  checkInputs = [ pytest pytest-aiohttp asynctest ];
+  checkInputs = [
+    asynctest
+    pytest-aiohttp
+    pytestCheckHook
+  ];
 
-  checkPhase = ''
-    pytest tests/
-  '';
+  pythonImportsCheck = [ "hass_nabucasa" ];
 
   meta = with lib; {
     homepage = "https://github.com/NabuCasa/hass-nabucasa";
diff --git a/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix
new file mode 100644
index 000000000000..d375effd1609
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, voluptuous
+}:
+
+buildPythonPackage rec {
+  pname = "hatasmota";
+  version = "0.2.6";
+
+  src = fetchFromGitHub {
+    owner = "emontnemery";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-kRTgHFRnhjLM2DhKNy9HDKIsRk+w0AKP+o0hy8w+3ys=";
+  };
+
+  propagatedBuildInputs = [
+    attrs
+    voluptuous
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "hatasmota" ];
+
+  meta = with lib; {
+    description = "Python module to help parse and construct Tasmota MQTT messages";
+    homepage = "https://github.com/emontnemery/hatasmota";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/haversine/default.nix b/nixpkgs/pkgs/development/python-modules/haversine/default.nix
new file mode 100644
index 000000000000..7f5e462d1b3c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/haversine/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "haversine";
+  version = "2.3.0";
+
+  src = fetchFromGitHub {
+    owner = "mapado";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv";
+  };
+
+  checkInputs = [
+    numpy
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "haversine" ];
+
+  meta = with lib; {
+    description = "Python module the distance between 2 points on earth";
+    homepage = "https://github.com/mapado/haversine";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
index 1a8ddacdd690..a0b7d50b560d 100644
--- a/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , requests
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests webob ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mozilla-services/hawkauthlib";
     description = "Hawk Access Authentication protocol";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
index 76ae5718024a..003805f939c6 100644
--- a/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools
 , transitions, websockets, passlib, docopt, pyyaml, nose }:
 
 buildPythonPackage rec {
   pname = "hbmqtt";
   version = "0.9.6";
 
-  disabled = !isPy3k;
+  # https://github.com/beerfactory/hbmqtt/issues/223
+  disabled = !isPy3k || pythonAtLeast "3.9";
 
   src = fetchPypi {
     inherit pname version;
@@ -27,7 +28,7 @@ buildPythonPackage rec {
     nosetests -e test_connect_tcp
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/beerfactory/hbmqtt";
     description = "MQTT client/broker using Python asynchronous I/O";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix
index 445c2fe1f827..56e9811396e6 100644
--- a/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }:
+{ lib, stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }:
 
 buildPythonPackage rec {
   pname = "hcs_utils";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.4";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library collecting some useful snippets";
     homepage    = "https://pypi.python.org/pypi/hcs_utils/1.3";
     license     = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix
index 80e287d376f4..3b65e10bfcec 100644
--- a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/daleroberts/hdmedians";
     description = "High-dimensional medians";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/heapdict/default.nix b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix
index 159e0a7d74e9..4cd695925f28 100644
--- a/nixpkgs/pkgs/development/python-modules/heapdict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "HeapDict";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "a heap with decrease-key and increase-key operations.";
     homepage = "http://stutzbachenterprises.com";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/helper/default.nix b/nixpkgs/pkgs/development/python-modules/helper/default.nix
index 00e4ddce8b4b..4c7ff0c3878f 100644
--- a/nixpkgs/pkgs/development/python-modules/helper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/helper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }:
 
 buildPythonPackage rec {
   pname = "helper";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests in the pypi tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Development library for quickly writing configurable applications and daemons";
     homepage = "https://helper.readthedocs.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/hetzner/default.nix b/nixpkgs/pkgs/development/python-modules/hetzner/default.nix
index 2909d2c2a6c5..3b938dfc237c 100644
--- a/nixpkgs/pkgs/development/python-modules/hetzner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hetzner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "152fklxff08s71v0b78yp5ajwpqyszm3sd7j0qsrwa2x9ik4968h";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/RedMoonStudios/hetzner";
     description = "High-level Python API for accessing the Hetzner robot";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix
index 29a29a3b6522..ce2918188241 100644
--- a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   # and these aren't in Nixpkgs
   checkPhase = "pytest -k 'not test_dlad and not test_monitor' heudiconv/tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://heudiconv.readthedocs.io";
     description = "Flexible DICOM converter for organizing imaging data";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
index 434c6ffba2b9..38a770e879fa 100644
--- a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,10 +15,10 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Enables the “changeset evolution” feature of Mercurial core";
     homepage = "https://www.mercurial-scm.org/doc/evolution/";
     maintainers = with maintainers; [ xavierzwirtz ];
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/hg-git/default.nix b/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
index c82352f9bfef..1d8e1ec1e29f 100644
--- a/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , dulwich
@@ -26,11 +26,11 @@ buildPythonPackage rec {
       sha256 = "12r4qzbc5xcqwv0kvf8g4wjji7n45421zkbf6i75vyi4nl6n4j15";
     };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Push and pull from a Git server using Mercurial";
     homepage = "http://hg-git.github.com/";
     maintainers = with maintainers; [ koral ];
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/python-modules/hglib/default.nix b/nixpkgs/pkgs/development/python-modules/hglib/default.nix
index e96d7e228708..afac7983584c 100644
--- a/nixpkgs/pkgs/development/python-modules/hglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hglib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }:
 
 buildPythonPackage rec {
   pname = "python-hglib";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mercurial Python library";
     homepage = "http://selenic.com/repo/python-hglib";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix b/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix
index ccf8635b8b11..2ee6024cd475 100644
--- a/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   doCheck = false;  # too many assumptions
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/hgsvn";
     description = "A set of scripts to work locally on Subversion checkouts using Mercurial";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/hidapi/default.nix b/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
index 856a36f77916..790e7aa08fc2 100644
--- a/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:
+{ lib, stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:
 
 buildPythonPackage rec {
   pname = "hidapi";
@@ -10,22 +10,22 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs =
-    stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++
-    stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++
+    lib.optionals stdenv.isLinux [ libusb1 udev ] ++
+    lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++
     [ cython ];
 
   # Fix the USB backend library lookup
-  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = lib.optionalString stdenv.isLinux ''
     libusb=${libusb1.dev}/include/libusb-1.0
     test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
     sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #'
   '';
 
   pythonImportsCheck = [ "hid" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Cython interface to the hidapi from https://github.com/libusb/hidapi";
     homepage = "https://github.com/trezor/cython-hidapi";
     # license can actually be either bsd3 or gpl3
diff --git a/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix b/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix
index 0959d117de34..418059c51658 100644
--- a/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }:
 
 buildPythonPackage rec {
   pname = "hieroglyph";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate HTML presentations from plain text sources";
     homepage = "https://github.com/nyergler/hieroglyph/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/hiredis/default.nix b/nixpkgs/pkgs/development/python-modules/hiredis/default.nix
index 891c79f1b7b8..e9d5677f8beb 100644
--- a/nixpkgs/pkgs/development/python-modules/hiredis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hiredis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , redis
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   '';
   pythonImportsCheck = [ "hiredis" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wraps protocol parsing code in hiredis, speeds up parsing of multi bulk replies";
     homepage = "https://github.com/redis/hiredis-py";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/hiro/default.nix b/nixpkgs/pkgs/development/python-modules/hiro/default.nix
index f8ef8ba028d0..3ff672a22db6 100644
--- a/nixpkgs/pkgs/development/python-modules/hiro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hiro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six, mock }:
 buildPythonPackage rec {
   pname = "hiro";
   version = "0.5.1";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Time manipulation utilities for Python";
     homepage = "https://hiro.readthedocs.io/en/latest/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hjson/default.nix b/nixpkgs/pkgs/development/python-modules/hjson/default.nix
index 13dce54b9c3a..3393ad186918 100644
--- a/nixpkgs/pkgs/development/python-modules/hjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pythonImportsCheckHook
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     wrapProgram $out/bin/hjson --set PYTHONPATH "$PYTHONPATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A user interface for JSON";
     homepage = "https://github.com/hjson/hjson-py";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hkdf/default.nix b/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
index 347cd94c8f51..966ce7001fbb 100644
--- a/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # no tests in PyPI tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)";
     homepage = "https://github.com/casebeer/python-hkdf";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix
index fdc578c76dff..79a2e83508aa 100644
--- a/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix
@@ -3,7 +3,7 @@
 , lxml
 , pillow
 , reportlab
-, stdenv
+, lib, stdenv
 }:
 buildPythonPackage rec {
   pname = "hocr-tools";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pillow lxml reportlab ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "
 Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML";
     homepage = "https://github.com/tmbdev/hocr-tools";
diff --git a/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix
index 10ee1bbf2e76..b5e0062d115a 100644
--- a/nixpkgs/pkgs/development/python-modules/holidays/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , convertdate
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   ];
   pythonImportsCheck = [ "holidays" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dr-prodigy/python-holidays";
     description = "Generate and work with holidays in Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix
index 7d6ceb0cc5a6..f726340b7c88 100644
--- a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit
+{ lib, stdenv, fetchgit
 , cmake, pkgconfig
 , python
 , mpi ? null
@@ -29,11 +29,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = stdenv.lib.optionals withMPI [ mpi ];
+  buildInputs = lib.optionals withMPI [ mpi ];
   propagatedBuildInputs = [ python.pkgs.numpy ]
-   ++ stdenv.lib.optionals withMPI [ python.pkgs.mpi4py ];
-
-  enableParallelBuilding = true;
+   ++ lib.optionals withMPI [ python.pkgs.mpi4py ];
 
   dontAddPrefix = true;
   cmakeFlags = [
@@ -54,7 +52,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/";
     description = "HOOMD-blue is a general-purpose particle simulation toolkit";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/nixpkgs/pkgs/development/python-modules/hpack/default.nix
index 36578856286f..9b6f724cd318 100644
--- a/nixpkgs/pkgs/development/python-modules/hpack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure-Python HPACK header compression";
     homepage = "http://hyper.rtfd.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix b/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix
index 2da6e4a150c9..fba71dc3f109 100644
--- a/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure Python library that lets one to read metadata from media files";
     homepage = "http://hg.hardcoded.net/hsaudiotag/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix
index d12d3bc8c832..52919e489837 100644
--- a/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure Python library that lets one to read metadata from media files";
     homepage = "http://hg.hardcoded.net/hsaudiotag/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/html2text/2018.nix b/nixpkgs/pkgs/development/python-modules/html2text/2018.nix
index e0a60e1ef0ac..73540359ee1a 100644
--- a/nixpkgs/pkgs/development/python-modules/html2text/2018.nix
+++ b/nixpkgs/pkgs/development/python-modules/html2text/2018.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Turn HTML into equivalent Markdown-structured text";
     homepage = "https://github.com/Alir3z4/html2text/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix
index 4962e89526d8..0ceeda045827 100644
--- a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }:
 
 buildPythonPackage rec {
   pname = "html5-parser";
@@ -9,12 +9,12 @@ buildPythonPackage rec {
     sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ];
 
   doCheck = false; # No such file or directory: 'run_tests.py'
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast C based HTML 5 parsing for python";
     homepage = "https://html5-parser.readthedocs.io";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix b/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix
index 33d3691e85ad..ef660fc0b924 100644
--- a/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi, nose
 , six
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # not relevant for me, if releavnt for you, fix it...
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple HTML cleanup utilities";
     license = licenses.bsd3;
     homepage = "https://pypi.org/project/htmllaundry/";
diff --git a/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix b/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix
index ccbc157837c3..e91aedc6cdb1 100644
--- a/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
+
 buildPythonPackage rec {
   pname = "htmlmin";
   version = "0.1.12";
@@ -10,10 +11,10 @@ buildPythonPackage rec {
   # Tests run fine in a normal source checkout, but not when being built by nix.
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "A configurable HTML Minifier with safety features";
     homepage = "https://pypi.python.org/pypi/htmlmin";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     maintainers = [];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/httmock/default.nix b/nixpkgs/pkgs/development/python-modules/httmock/default.nix
index 5913ceca777b..117c7f5e132f 100644
--- a/nixpkgs/pkgs/development/python-modules/httmock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httmock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, requests }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }:
 
 buildPythonPackage rec {
   pname   = "httmock";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   checkInputs = [ requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A mocking library for requests";
     homepage    = "https://github.com/patrys/httmock";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/http_signature/default.nix b/nixpkgs/pkgs/development/python-modules/http_signature/default.nix
index d86861a92517..145eea751b9b 100644
--- a/nixpkgs/pkgs/development/python-modules/http_signature/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/http_signature/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pycrypto ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/atl/py-http-signature";
     description = "Simple secure signing for HTTP requests using http-signature";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/httpauth/default.nix b/nixpkgs/pkgs/development/python-modules/httpauth/default.nix
index bab2193f6a2d..b7867e22f175 100644
--- a/nixpkgs/pkgs/development/python-modules/httpauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WSGI HTTP Digest Authentication middleware";
     homepage = "https://github.com/jonashaag/httpauth";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
index cf5891ed0ee2..cbaf89c3ca61 100644
--- a/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kennethreitz/httpbin";
     description = "HTTP Request & Response Service";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/httpretty/0.nix b/nixpkgs/pkgs/development/python-modules/httpretty/0.nix
index ee0e598a9ac2..92ed5c6616e0 100644
--- a/nixpkgs/pkgs/development/python-modules/httpretty/0.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpretty/0.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , tornado
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   # drop this for version > 0.9.7
   # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
-  doCheck = stdenv.lib.versionAtLeast version "0.9.8";
+  doCheck = lib.versionAtLeast version "0.9.8";
 
   src = fetchPypi {
     inherit pname version;
@@ -37,14 +37,14 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   # Those flaky tests are failing intermittently on all platforms
-  NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
+  NOSE_EXCLUDE = lib.concatStringsSep "," [
     "tests.functional.test_httplib2.test_callback_response"
     "tests.functional.test_requests.test_streaming_responses"
     "tests.functional.test_httplib2.test_callback_response"
     "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://httpretty.readthedocs.org/";
     description = "HTTP client request mocking tool";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
index 0d061df86bf7..8974672d0a93 100644
--- a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , tornado
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   # drop this for version > 0.9.7
   # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
-  doCheck = stdenv.lib.versionAtLeast version "0.9.8";
+  doCheck = lib.versionAtLeast version "0.9.8";
 
   src = fetchPypi {
     inherit pname version;
@@ -44,14 +44,14 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   # Those flaky tests are failing intermittently on all platforms
-  NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
+  NOSE_EXCLUDE = lib.concatStringsSep "," [
     "tests.functional.test_httplib2.test_callback_response"
     "tests.functional.test_requests.test_streaming_responses"
     "tests.functional.test_httplib2.test_callback_response"
     "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://httpretty.readthedocs.org/";
     description = "HTTP client request mocking tool";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/nixpkgs/pkgs/development/python-modules/httpx/default.nix
index 1f527b47ec08..6e81cc92193c 100644
--- a/nixpkgs/pkgs/development/python-modules/httpx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpx/default.nix
@@ -56,6 +56,8 @@ buildPythonPackage rec {
     "test_sync_proxy_close"
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "The next generation HTTP client";
     homepage = "https://github.com/encode/httpx";
diff --git a/nixpkgs/pkgs/development/python-modules/hug/default.nix b/nixpkgs/pkgs/development/python-modules/hug/default.nix
index 6769b5371b88..872798c6ced8 100644
--- a/nixpkgs/pkgs/development/python-modules/hug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hug/default.nix
@@ -1,8 +1,7 @@
 { lib , buildPythonPackage, fetchFromGitHub, isPy27
 , falcon
-, pytestrunner
 , requests
-, pytest
+, pytestCheckHook
 , marshmallow
 , mock
 , numpy
@@ -20,19 +19,33 @@ buildPythonPackage rec {
     sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq";
   };
 
-  nativeBuildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ falcon requests ];
 
-  checkInputs = [ mock marshmallow pytest numpy ];
-  checkPhase = ''
-    mv hug hug.hidden
-    # some tests attempt network access
-    PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)"
+  checkInputs = [ mock marshmallow pytestCheckHook numpy ];
+
+  postPatch = ''
+    substituteInPlace setup.py --replace '"pytest-runner"' ""
+  '';
+
+  preCheck = ''
+    # some tests need the `hug` CLI on the PATH
+    export PATH=$out/bin:$PATH
   '';
 
+  disabledTests = [
+    # some tests attempt network access
+    "test_datagram_request"
+    "test_request"
+    # these tests use an unstable test dependency (https://github.com/hugapi/hug/issues/859)
+    "test_marshmallow_custom_context"
+    "test_marshmallow_schema"
+    "test_transform"
+    "test_validate_route_args_negative_case"
+  ];
+
   meta = with lib; {
     description = "A Python framework that makes developing APIs as simple as possible, but no simpler";
-    homepage = "https://github.com/timothycrosley/hug";
+    homepage = "https://github.com/hugapi/hug";
     license = licenses.mit;
   };
 
diff --git a/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/nixpkgs/pkgs/development/python-modules/humanize/default.nix
index 70ac0297b739..09e94f6275dd 100644
--- a/nixpkgs/pkgs/development/python-modules/humanize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/humanize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python humanize utilities";
     homepage = "https://github.com/jmoiron/humanize";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/nixpkgs/pkgs/development/python-modules/hupper/default.nix
index b70202138d41..1fe5ab7153d3 100644
--- a/nixpkgs/pkgs/development/python-modules/hupper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hupper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, watchdog, mock
 }:
 
@@ -17,5 +17,5 @@ buildPythonPackage rec {
 
   # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent
   # segfaults in the testsuite that end up failing the tests in a background thread (in myapp)
-  checkInputs = [ pytest pytestcov mock ] ++ stdenv.lib.optional (!stdenv.isDarwin) watchdog;
+  checkInputs = [ pytest pytestcov mock ] ++ lib.optional (!stdenv.isDarwin) watchdog;
 }
diff --git a/nixpkgs/pkgs/development/python-modules/hwi/default.nix b/nixpkgs/pkgs/development/python-modules/hwi/default.nix
index 6431791d65e6..7c34235a190b 100644
--- a/nixpkgs/pkgs/development/python-modules/hwi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hwi/default.nix
@@ -1,46 +1,47 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, mnemonic
+, fetchFromGitHub
+, bitbox02
 , ecdsa
-, typing-extensions
 , hidapi
 , libusb1
+, mnemonic
 , pyaes
-, trezor
-, btchip
-, ckcc-protocol
+, pythonAtLeast
 }:
 
 buildPythonPackage rec {
   pname = "hwi";
   version = "1.2.1";
+  disabled = pythonAtLeast "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d0d220a4967d7f106b828b12a98b78c220d609d7cc6c811898e24fcf1a6f04f3";
+  src = fetchFromGitHub {
+    owner = "bitcoin-core";
+    repo = "HWI";
+    rev = version;
+    sha256 = "0fs3152lw7y5l9ssr5as8gd739m9lb7wxpv1vc5m77k5nw7l8ax5";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'ecdsa>=0.13.0,<0.14.0'" "'ecdsa'" \
+      --replace "'hidapi>=0.7.99,<0.8.0'" "'hidapi'" \
+      --replace "'mnemonic>=0.18.0,<0.19.0'" "'mnemonic'"
+  '';
+
   propagatedBuildInputs = [
-    mnemonic
+    bitbox02
     ecdsa
-    typing-extensions
     hidapi
     libusb1
+    mnemonic
     pyaes
-    trezor
-    btchip
-    ckcc-protocol
   ];
 
-  patches = [ ./relax-deps.patch ];
-
-  # tests are not packaged in the released tarball
+  # tests require to clone quite a few firmwares
   doCheck = false;
 
-  pythonImportsCheck = [
-    "hwilib"
-  ];
+  pythonImportsCheck = [ "hwilib" ];
 
   meta = {
     description = "Bitcoin Hardware Wallet Interface";
diff --git a/nixpkgs/pkgs/development/python-modules/hwi/relax-deps.patch b/nixpkgs/pkgs/development/python-modules/hwi/relax-deps.patch
deleted file mode 100644
index ff6c6b9768f6..000000000000
--- a/nixpkgs/pkgs/development/python-modules/hwi/relax-deps.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -98,10 +98,10 @@ package_data = \
- modules = \
- ['hwi', 'hwi-qt']
- install_requires = \
--['ecdsa>=0.13.0,<0.14.0',
-- 'hidapi>=0.7.99,<0.8.0',
-+['ecdsa',
-+ 'hidapi',
-  'libusb1>=1.7,<2.0',
-+ 'mnemonic',
-- 'mnemonic>=0.18.0,<0.19.0',
-  'pyaes>=1.6,<2.0',
-  'typing-extensions>=3.7,<4.0']
- 
diff --git a/nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix b/nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix
new file mode 100644
index 000000000000..feccc73707c2
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+, pythonOlder
+, pyyaml
+, requests
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "hydrawiser";
+  version = "0.2";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "ptcryan";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+    requests
+    requests-mock
+  ];
+
+  pythonImportsCheck = [ "hydrawiser" ];
+
+  meta = with lib; {
+    description = "Python library for Hydrawise API";
+    homepage = "https://github.com/ptcryan/hydrawiser";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
index 2c6796ca6d0c..a74198f38321 100644
--- a/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "hyperframe";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "HTTP/2 framing layer for Python";
     homepage = "http://hyper.rtfd.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix b/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
index 16599214ede7..ba4aeef402ec 100644
--- a/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , cloudpickle, numpy, future, networkx
 , six, tqdm, scipy, pymongo
 }:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "hyperopt" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Distributed Asynchronous Hyperparameter Optimization";
     homepage    = "http://hyperopt.github.com/hyperopt/";
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/i3-py/default.nix b/nixpkgs/pkgs/development/python-modules/i3-py/default.nix
index ea6e449947c5..4dea7526b7e7 100644
--- a/nixpkgs/pkgs/development/python-modules/i3-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/i3-py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # no tests in tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for i3 users and developers";
     homepage =  "https://github.com/ziberna/i3-py";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix b/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix
index 231cb4f1d413..c27d41354112 100644
--- a/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo
 , makeFontsConf, coreutils
 }:
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   '';
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An improved Python library to control i3wm and sway";
     homepage    = "https://github.com/acrisci/i3ipc-python";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix
index c8a3a09fd550..4499d5d62f4f 100644
--- a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   buildInputs = [ setuptools ];
   propagatedBuildInputs = [ dateutil pytz ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A parser/generator of iCalendar files";
     homepage = "https://icalendar.readthedocs.org/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/icmplib/default.nix b/nixpkgs/pkgs/development/python-modules/icmplib/default.nix
new file mode 100644
index 000000000000..b89df0bd2ce0
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/icmplib/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pbr
+, pythonOlder
+, requests
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "icmplib";
+  version = "2.0.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "ValentinBELYN";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h";
+  };
+
+  propagatedBuildInputs = [
+    pbr
+    six
+    requests
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "icmplib" ];
+
+  meta = with lib; {
+    description = "Python implementation of the ICMP protocol";
+    homepage = "https://github.com/ValentinBELYN/icmplib";
+    license = with licenses; [ lgpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/ics/default.nix b/nixpkgs/pkgs/development/python-modules/ics/default.nix
index 30661c9bc91a..c186020fee1e 100644
--- a/nixpkgs/pkgs/development/python-modules/ics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
 , tatsu, arrow
 , pytestCheckHook, pytest-flakes
 }:
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook pytest-flakes ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pythonic and easy iCalendar library (RFC 5545)";
     longDescription = ''
       Ics.py is a pythonic and easy iCalendar library. Its goals are to read and
diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix
index 833e1e3dd29e..f3b8393a2759 100644
--- a/nixpkgs/pkgs/development/python-modules/identify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "1.5.10";
+  version = "1.5.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "943cd299ac7f5715fcb3f684e2fc1594c1e0f22a90d15398e5888143bd4144b5";
+    sha256 = "70b638cf4743f33042bebb3b51e25261a0a10e80f978739f17e7fd4837664a66";
   };
 
   # Tests not included in PyPI tarball
diff --git a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix
index b4a9b20f08d1..47997dbdc265 100644
--- a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , ipaddress
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pydron/ifaddr";
     description = "Enumerates all IP addresses on all network adapters of the system";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix b/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix
index cb3fb0fded5d..bdfd3767f8c4 100644
--- a/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "ifconfig-parser";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     python -m unittest -v test_ifconfig_parser.TestIfconfigParser
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Unsophisticated python package for parsing raw output of ifconfig.";
     homepage = "https://github.com/KnightWhoSayNi/ifconfig-parser";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix b/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix
index 16ee8dcbace8..75d1c4d77405 100644
--- a/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , substituteAll
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source IFC library and geometry engine";
     homepage    = http://ifcopenshell.org/;
     license     = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/nixpkgs/pkgs/development/python-modules/ijson/default.nix
index 8dc22d20e69a..a82a20ca7c8a 100644
--- a/nixpkgs/pkgs/development/python-modules/ijson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ijson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ijson";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false; # something about yajl
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Iterative JSON parser with a standard Python iterator interface";
     homepage = "https://github.com/ICRAR/ijson";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/image-match/default.nix b/nixpkgs/pkgs/development/python-modules/image-match/default.nix
index 6bb45f83790f..5c1953d6ac3f 100644
--- a/nixpkgs/pkgs/development/python-modules/image-match/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/image-match/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
 
 buildPythonPackage {
   pname = "image-match";
@@ -25,7 +25,7 @@ buildPythonPackage {
   # tests cannot work without elasticsearch
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ascribe/image-match";
     description = "Quickly search over billions of images";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
index 843537453c53..65c1cfd020a8 100644
--- a/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -2,7 +2,7 @@
 , fetchPypi
 , numpy
 , scikitimage
-, stdenv
+, lib, stdenv
 , opencv3
 }:
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     opencv3
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bethgelab/imagecorruptions";
     description = "This package provides a set of image corruptions";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/nixpkgs/pkgs/development/python-modules/imageio/default.nix
index ce24dfb5896a..71f7eae9c32f 100644
--- a/nixpkgs/pkgs/development/python-modules/imageio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imageio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy27
 , pathlib
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     inherit pname version;
   };
 
-  checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
+  checkInputs = [ pytest psutil ] ++ lib.optionals isPy3k [
     imageio-ffmpeg ffmpeg_3
     ];
   propagatedBuildInputs = [ numpy pillow ];
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
     homepage = "http://imageio.github.io/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/imagesize/default.nix b/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
index ab3ee46c1b83..cd48f54ee8f4 100644
--- a/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Getting image size from png/jpeg/jpeg2000/gif file";
     homepage = "https://github.com/shibukawa/imagesize_py";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/imapclient/default.nix b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix
index ea9bc4844fad..c091f53b8d4f 100644
--- a/nixpkgs/pkgs/development/python-modules/imapclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , mock
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   checkInputs = [ mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://imapclient.readthedocs.io";
     description = "Easy-to-use, Pythonic and complete IMAP client library";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix
index 1ec139d5b3ad..fe21096d635d 100644
--- a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix
+++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }:
 
 buildPythonPackage rec {
   pname = "imbalanced-learn";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
                          and not wrong_memory'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance";
     homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
index 21018518ca28..4253ed30e415 100644
--- a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
 , pandas
 , pytestCheckHook
 , scikitlearn
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     "test_make_imbalanced_iris"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance";
     homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix
index 82f10c1bb74c..9ca8531dbbce 100644
--- a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix
@@ -9,7 +9,7 @@
 , scipy
 , shapely
 , six
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -49,7 +49,7 @@ buildPythonPackage rec {
 
   checkInputs = [ opencv3 pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/aleju/imgaug";
     description = "Image augmentation for machine learning experiments";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/imgsize/default.nix b/nixpkgs/pkgs/development/python-modules/imgsize/default.nix
index d4f066b8b0b2..d1a69c043d0f 100644
--- a/nixpkgs/pkgs/development/python-modules/imgsize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imgsize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "0k24qj4i996fz7lpjrs36il6lp51rh13b0j2wip87cy5v9109m2d";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python image size library";
     homepage = "https://github.com/ojii/imgsize";
     license = with licenses; [ bsd3 ];
diff --git a/nixpkgs/pkgs/development/python-modules/importmagic/default.nix b/nixpkgs/pkgs/development/python-modules/importmagic/default.nix
index 5217474ac232..3a6a3c9ef8d7 100644
--- a/nixpkgs/pkgs/development/python-modules/importmagic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/importmagic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = false;  # missing json file from tarball
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Import Magic - automagically add, remove and manage imports";
     homepage = "https://github.com/alecthomas/importmagic";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/imread/default.nix b/nixpkgs/pkgs/development/python-modules/imread/default.nix
index 1e4ccde4b310..65ae47ed87b0 100644
--- a/nixpkgs/pkgs/development/python-modules/imread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imread/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
-, pkgconfig
+, pkg-config
 , libjpeg
 , libpng
 , libtiff
@@ -21,11 +21,11 @@ buildPythonPackage rec {
   };
 
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ nose libjpeg libpng libtiff libwebp ];
   propagatedBuildInputs = [ numpy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python package to load images as numpy arrays";
     homepage = "https://imread.readthedocs.io/en/latest/";
     maintainers = with maintainers; [ luispedro ];
diff --git a/nixpkgs/pkgs/development/python-modules/imutils/default.nix b/nixpkgs/pkgs/development/python-modules/imutils/default.nix
index 9a0797f095f6..33c2ae0001c2 100644
--- a/nixpkgs/pkgs/development/python-modules/imutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , opencv3
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jrosebr1/imutils";
     description = "A series of convenience functions to make basic image processing functions";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/inflection/default.nix b/nixpkgs/pkgs/development/python-modules/inflection/default.nix
index 6f439f0f69ac..f6d327d229d8 100644
--- a/nixpkgs/pkgs/development/python-modules/inflection/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inflection/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   # Suppress overly verbose output if tests run successfully
-  checkPhase = ''pytest >/dev/null || pytest'';
+  checkPhase = "pytest >/dev/null || pytest";
 
   meta = {
    homepage = "https://github.com/jpvanhal/inflection";
diff --git a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix
index 650235b29401..2d0fd5a93adb 100644
--- a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   doCheck = false;
   propagatedBuildInputs = [ requests dateutil pytz six msgpack ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client for InfluxDB";
     homepage = "https://github.com/influxdb/influxdb-python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix
index c4597650fe71..32374453375d 100644
--- a/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , influxdb, graphite_api, memcached
 }:
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy";
   };
 
-  patchPhase = stdenv.lib.optionalString isPy3k ''
+  patchPhase = lib.optionalString isPy3k ''
     sed 's/python-memcached/python3-memcached/' \
       -i ./influxgraph.egg-info/requires.txt    \
       -i ./setup.py
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   passthru.moduleName = "influxgraph.InfluxDBFinder";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "InfluxDB storage plugin for Graphite-API";
     homepage = "https://github.com/InfluxGraph/influxgraph";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix
index 4a1543083432..4baa891a7790 100644
--- a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , html5lib
 , six
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   buildInputs = [ html5lib ];
   propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url";
     homepage = "https://github.com/cykl/infoqscraper/wiki";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/inifile/default.nix b/nixpkgs/pkgs/development/python-modules/inifile/default.nix
index e64ef76356d1..9bd24a4d7889 100644
--- a/nixpkgs/pkgs/development/python-modules/inifile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inifile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small INI library for Python";
     homepage    = "https://github.com/mitsuhiko/python-inifile";
     license     = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/iniparse/default.nix b/nixpkgs/pkgs/development/python-modules/iniparse/default.nix
index e240b0863c23..c515b7865b15 100644
--- a/nixpkgs/pkgs/development/python-modules/iniparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iniparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # Does not install tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Accessing and Modifying INI files";
     homepage = "https://github.com/candlepin/python-iniparse";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
index c17c3eb4af88..c434a3f52bce 100644
--- a/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }:
 
 buildPythonPackage rec {
   pname = "inquirer";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pytest --cov-report=term-missing  --cov inquirer --no-cov-on-fail tests/unit tests/integration
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/magmax/python-inquirer";
     description = "A collection of common interactive command line user interfaces, based on Inquirer.js";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix b/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix
index 279fb1c9685b..b4e1dfaff181 100644
--- a/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "interruptingcow";
   version = "0.8";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
     sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A watchdog that interrupts long running code";
     homepage = "https://bitbucket.org/evzijst/interruptingcow";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix b/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix
index 8b0bbf2dd395..27a5fa3650e8 100644
--- a/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , python, pytest, sortedcontainers }:
 
 buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Editable interval tree data structure for Python 2 and 3";
     homepage =  "https://github.com/chaimleib/intervaltree";
     license = [ licenses.asl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix
index e76aa6ee2a57..427681fedb86 100644
--- a/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google's IP address manipulation library";
     homepage = "https://github.com/google/ipaddr-py";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix b/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix
index 0074ad2420d8..f2e479aff96e 100644
--- a/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
@@ -18,7 +18,7 @@ if (pythonAtLeast "3.3") then null else buildPythonPackage rec {
     ${python.interpreter} test_ipaddress.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2";
     homepage = "https://github.com/phihag/ipaddress";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
index df2ae6b46616..b21907f75ff5 100644
--- a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , ipython
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gotcha/ipdb";
     description = "IPython-enabled pdb";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix
index 7c9ee263b2b4..057d82cbebc3 100644
--- a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ nose ipython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master";
     description = "Nose plugin to use iPdb instead of Pdb when tests fail";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix
index 1778e5a81af6..3deb0c6cb80c 100644
--- a/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -20,7 +20,7 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ six requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python client library for the IPFS API";
     license = licenses.mit;
     maintainers = with maintainers; [ mguentner ];
diff --git a/nixpkgs/pkgs/development/python-modules/iptools/default.nix b/nixpkgs/pkgs/development/python-modules/iptools/default.nix
index 9498ee2762a3..431c05bb3881 100644
--- a/nixpkgs/pkgs/development/python-modules/iptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iptools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting";
     homepage = "https://pypi.python.org/pypi/iptools";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/ipython/5.nix b/nixpkgs/pkgs/development/python-modules/ipython/5.nix
index 598e890bb1c5..a75ceaa0b76d 100644
--- a/nixpkgs/pkgs/development/python-modules/ipython/5.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipython/5.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906";
   };
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py --replace "'gnureadline'" " "
   '';
 
diff --git a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix
index 3941f08348a5..0ccb1b2a4e14 100644
--- a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "ipyvue";
-  version = "1.4.1";
+  version = "1.5.0";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b59cf92a1eb7fbef4f2d02be49ac562a721a6cf34f991ac963222cf4c8885a1";
+    sha256 = "e8549a7ac7dc45948a5f2735e17f97622313c7fea24ea3c1bd4a5ebf02bf5638";
   };
 
   propagatedBuildInputs = [ ipywidgets ];
diff --git a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
index 8398117041be..3b03a15b9a4d 100644
--- a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "isbnlib";
-  version = "3.10.4";
+  version = "3.10.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f5bfbc362e2a73dfc82449ac459b59a7f6b20bcebf82f6bd87d773dc45073646";
+    sha256 = "cb3b400b37a73cf4a0bc698be2ea414e78ff117867baed9313aa8c97596e1b98";
   };
 
   checkInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/iso3166/default.nix b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix
index f6a4a00283c5..acf6d3c9331d 100644
--- a/nixpkgs/pkgs/development/python-modules/iso3166/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage {
   pname = "iso3166";
@@ -18,7 +18,7 @@ buildPythonPackage {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/deactivated/python-iso3166";
     description = "Self-contained ISO 3166-1 country definitions";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/isodate/default.nix b/nixpkgs/pkgs/development/python-modules/isodate/default.nix
index d46fb7ed74ca..d2098a83c95e 100644
--- a/nixpkgs/pkgs/development/python-modules/isodate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/isodate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover -s src/isodate/tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ISO 8601 date/time parser";
     homepage = "http://cheeseshop.python.org/pypi/isodate";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix b/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix
index 08c7e50e95e9..107585f0416c 100644
--- a/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "itemloaders";
-  version = "1.0.3";
+  version = "1.0.4";
 
   disabled = isPy27;
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "scrapy";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1s8c2il7jyfixpb7h5zq0lf4s07pqwia4ycpf3slb8whcp0h8bfm";
+    sha256 = "0j68xgx2z63sc1nc9clw6744036vfbijdsghvjv6pk674d5lgyam";
   };
 
   propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ];
diff --git a/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix b/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix
index 4761a98dc301..e89786d4e18d 100644
--- a/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Helpers to pass trusted data to untrusted environments and back";
     homepage = "https://pypi.python.org/pypi/itsdangerous/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/itypes/default.nix b/nixpkgs/pkgs/development/python-modules/itypes/default.nix
index 17ba3a2183a3..417d1a20b3bf 100644
--- a/nixpkgs/pkgs/development/python-modules/itypes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/itypes/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   fetchFromGitHub,
   buildPythonPackage,
   pytest,
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     pytest tests.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple immutable types for python";
     homepage = "https://github.com/tomchristie/itypes";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix
index b2b80e2766c7..14cf18ae694f 100644
--- a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , jinja2
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false; # tests aren't installed thus aren't found, so skip
   propagatedBuildInputs = [ jinja2 pyyaml setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kolypto/j2cli";
     description = "Jinja2 Command-Line Tool";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix b/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix
index 4e550bcca20c..4c625d944859 100644
--- a/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }:
 
 buildPythonPackage rec {
   pname = "jabberbot";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false; # lol, it does not even specify dependencies properly
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A framework for writing Jabber/XMPP bots and services";
     homepage = "http://thp.io/2007/python-jabberbot/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix
index ba96f8ccfb94..6f120fa6ea2e 100644
--- a/nixpkgs/pkgs/development/python-modules/jc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix
@@ -1,27 +1,30 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , ruamel_yaml
 , xmltodict
 , pygments
 , isPy27
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "jc";
-  version = "1.14.0";
+  version = "1.14.1";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
     repo = "jc";
     rev = "v${version}";
-    sha256 = "0js3mqp6xxg45qsz8wnyyqf4m0wj1kz67bkmvirhdy7s01zhd5hq";
+    sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw";
   };
 
   propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
 
-  meta = with stdenv.lib; {
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
     description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output";
     homepage = "https://github.com/kellyjonbrazil/jc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
index d51d54287e76..d4aa49c3ca3c 100644
--- a/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "jdatetime";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jalali datetime binding for python";
     homepage = "https://pypi.python.org/pypi/jdatetime";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/nixpkgs/pkgs/development/python-modules/jedi/default.nix
index ab8f72ea9f18..6e833a774604 100644
--- a/nixpkgs/pkgs/development/python-modules/jedi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jedi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
 
 buildPythonPackage rec {
   pname = "jedi";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # tox required for tests: https://github.com/davidhalter/jedi/issues/808
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/davidhalter/jedi";
     description = "An autocompletion tool for Python that can be used for text editors";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 3cc2bb69e0e9..7d4f6dd93639 100644
--- a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bca1f458206fc8be82d790685b603d4158e2034a651f2e148e31526984b9d551";
+    sha256 = "sha256-uRyeRP1y3GS7tXb0kHLBi7+trJRme/Ke3xgOY+LqZ6k=";
   };
 
   postPatch = ''
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ];
 
   # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
-  checkPhase = ''$out/bin/jenkins-jobs --help'';
+  checkPhase = "$out/bin/jenkins-jobs --help";
 
   meta = with lib; {
     description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
diff --git a/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix b/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix
index 40bf7752a90b..912c21cc8fb4 100644
--- a/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -30,7 +30,7 @@ buildPythonPackage rec {
       -k "not systests and not test_plugins and not test_view"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python API for accessing resources on a Jenkins continuous-integration server";
     homepage = "https://github.com/salimfadhley/jenkinsapi";
     maintainers = with maintainers; [ drets ];
diff --git a/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
index 33d6003cae74..5dc3cbe105e5 100644
--- a/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     pytest -v tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://jinja.pocoo.org/";
     description = "Stand-alone template engine";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix
index 4a62fa4c25b7..0a6d0c365a04 100644
--- a/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }:
 
 buildPythonPackage rec {
   pname = "jinja2_pluralize";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     inflect
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jinja2 pluralize filters";
     homepage = "https://github.com/audreyr/jinja2_pluralize";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix
index d84c16f1abae..7887fe96f75e 100644
--- a/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , arrow
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ arrow jinja2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/hackebrot/jinja2-time";
     description = "Jinja2 Extension for Dates and Times";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix
index 993955f2a032..3b31700de0eb 100644
--- a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , ply
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   buildInputs = [ nose ];
   propagatedBuildInputs = [ ply ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/boto/jmespath";
     description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document";
     license = "BSD";
diff --git a/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch b/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch
new file mode 100644
index 000000000000..b70f9304c728
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch
@@ -0,0 +1,1194 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..84c37bc
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,1188 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "addr2line"
++version = "0.14.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
++dependencies = [
++ "gimli",
++]
++
++[[package]]
++name = "adler"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
++
++[[package]]
++name = "aead"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.7.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "anyhow"
++version = "1.0.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86"
++
++[[package]]
++name = "arrayref"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
++
++[[package]]
++name = "arrayvec"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
++
++[[package]]
++name = "ascii-canvas"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29"
++dependencies = [
++ "term",
++]
++
++[[package]]
++name = "atty"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++dependencies = [
++ "hermit-abi",
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++
++[[package]]
++name = "backtrace"
++version = "0.3.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
++dependencies = [
++ "addr2line",
++ "cfg-if 1.0.0",
++ "libc",
++ "miniz_oxide",
++ "object",
++ "rustc-demangle",
++]
++
++[[package]]
++name = "base64"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++
++[[package]]
++name = "bindgen"
++version = "0.51.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
++dependencies = [
++ "bitflags",
++ "cexpr",
++ "cfg-if 0.1.10",
++ "clang-sys",
++ "lazy_static",
++ "peeking_take_while",
++ "proc-macro2",
++ "quote",
++ "regex",
++ "rustc-hash",
++ "shlex",
++]
++
++[[package]]
++name = "bit-set"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
++dependencies = [
++ "bit-vec",
++]
++
++[[package]]
++name = "bit-vec"
++version = "0.6.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "blake2b_simd"
++version = "0.5.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
++dependencies = [
++ "arrayref",
++ "arrayvec",
++ "constant_time_eq",
++]
++
++[[package]]
++name = "buffered-reader"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f5711ccfa79a8167779ad2176d3334078f03b1579ddf8f42aa556196eba60a42"
++dependencies = [
++ "bzip2",
++ "flate2",
++ "libc",
++]
++
++[[package]]
++name = "byteorder"
++version = "1.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
++
++[[package]]
++name = "bzip2"
++version = "0.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "275d84fe348b838dc49477d39770682839b3e73e21a3eadc07b12924f1a9fcbe"
++dependencies = [
++ "bzip2-sys",
++ "libc",
++]
++
++[[package]]
++name = "bzip2-sys"
++version = "0.1.9+1.0.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e"
++dependencies = [
++ "cc",
++ "libc",
++ "pkg-config",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.66"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
++
++[[package]]
++name = "cexpr"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
++dependencies = [
++ "nom",
++]
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "chrono"
++version = "0.4.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
++dependencies = [
++ "libc",
++ "num-integer",
++ "num-traits",
++ "time",
++ "winapi",
++]
++
++[[package]]
++name = "cipher"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "clang-sys"
++version = "0.28.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
++dependencies = [
++ "glob",
++ "libc",
++ "libloading",
++]
++
++[[package]]
++name = "cmac"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "73d4de4f7724e5fe70addfb2bd37c2abd2f95084a429d7773b0b9645499b4272"
++dependencies = [
++ "crypto-mac",
++ "dbl",
++]
++
++[[package]]
++name = "constant_time_eq"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
++
++[[package]]
++name = "crc32fast"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
++dependencies = [
++ "autocfg",
++ "cfg-if 1.0.0",
++ "lazy_static",
++]
++
++[[package]]
++name = "crunchy"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
++
++[[package]]
++name = "crypto-mac"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
++dependencies = [
++ "cipher",
++ "generic-array",
++ "subtle",
++]
++
++[[package]]
++name = "ctor"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "373c88d9506e2e9230f6107701b7d8425f4cb3f6df108ec3042a26e936666da5"
++dependencies = [
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "ctr"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
++dependencies = [
++ "cipher",
++]
++
++[[package]]
++name = "dbl"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2735145c3b9ba15f2d7a3ae8cdafcbc8c98a7bef7f62afe9d08bd99fbf7130de"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "diff"
++version = "0.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
++
++[[package]]
++name = "digest"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "dirs"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
++dependencies = [
++ "libc",
++ "redox_users",
++ "winapi",
++]
++
++[[package]]
++name = "dyn-clone"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
++
++[[package]]
++name = "eax"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e1f76e7a5e594b299a0fa9a99de627530725e341df41376aa342aecb2c5eb76e"
++dependencies = [
++ "aead",
++ "cipher",
++ "cmac",
++ "ctr",
++ "subtle",
++]
++
++[[package]]
++name = "either"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++
++[[package]]
++name = "ena"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3"
++dependencies = [
++ "log",
++]
++
++[[package]]
++name = "fixedbitset"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
++
++[[package]]
++name = "flate2"
++version = "1.0.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crc32fast",
++ "libc",
++ "miniz_oxide",
++]
++
++[[package]]
++name = "generic-array"
++version = "0.14.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
++dependencies = [
++ "typenum",
++ "version_check 0.9.2",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.9.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "ghost"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "gimli"
++version = "0.23.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
++
++[[package]]
++name = "glob"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
++
++[[package]]
++name = "hashbrown"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "idna"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
++dependencies = [
++ "matches",
++ "unicode-bidi",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "indexmap"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
++dependencies = [
++ "autocfg",
++ "hashbrown",
++]
++
++[[package]]
++name = "indoc"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
++dependencies = [
++ "unindent",
++]
++
++[[package]]
++name = "instant"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "inventory"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
++dependencies = [
++ "ctor",
++ "ghost",
++ "inventory-impl",
++]
++
++[[package]]
++name = "inventory-impl"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "itertools"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
++dependencies = [
++ "either",
++]
++
++[[package]]
++name = "johnnycanencrypt"
++version = "0.5.0"
++dependencies = [
++ "anyhow",
++ "chrono",
++ "pyo3",
++ "sequoia-openpgp",
++ "talktosc",
++]
++
++[[package]]
++name = "lalrpop"
++version = "0.19.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c64e04d8ea9c95c2135dfc4298088eafaf956bc90ba372eb1bea4f715634587"
++dependencies = [
++ "ascii-canvas",
++ "atty",
++ "bit-set",
++ "diff",
++ "ena",
++ "itertools",
++ "lalrpop-util",
++ "petgraph",
++ "pico-args",
++ "regex",
++ "regex-syntax",
++ "string_cache",
++ "term",
++ "tiny-keccak",
++ "unicode-xid",
++]
++
++[[package]]
++name = "lalrpop-util"
++version = "0.19.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f9de203e2fa3e883364fcc778a1293ab4d936f6cff400433013c20105df178c5"
++dependencies = [
++ "regex",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "libc"
++version = "0.2.81"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
++
++[[package]]
++name = "libloading"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
++dependencies = [
++ "cc",
++ "winapi",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
++dependencies = [
++ "scopeguard",
++]
++
++[[package]]
++name = "log"
++version = "0.4.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
++dependencies = [
++ "cfg-if 0.1.10",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++
++[[package]]
++name = "memchr"
++version = "2.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
++
++[[package]]
++name = "memsec"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2af4f95d8737f4ffafbd1fb3c703cdc898868a244a59786793cba0520ebdcbdd"
++
++[[package]]
++name = "miniz_oxide"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
++dependencies = [
++ "adler",
++ "autocfg",
++]
++
++[[package]]
++name = "nettle"
++version = "7.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b1afae85450b829ad720f2827e3b07d78e06b5521cfe5ed72808a9f593e7cdd8"
++dependencies = [
++ "getrandom",
++ "libc",
++ "nettle-sys",
++ "thiserror",
++]
++
++[[package]]
++name = "nettle-sys"
++version = "2.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8629333ff5f3b74d251dae253e383cda9242410fac4244a4fe855469be101fb"
++dependencies = [
++ "bindgen",
++ "pkg-config",
++]
++
++[[package]]
++name = "new_debug_unreachable"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
++
++[[package]]
++name = "nom"
++version = "4.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
++dependencies = [
++ "memchr",
++ "version_check 0.1.5",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
++dependencies = [
++ "autocfg",
++ "num-traits",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "object"
++version = "0.22.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
++
++[[package]]
++name = "parking_lot"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
++dependencies = [
++ "instant",
++ "lock_api",
++ "parking_lot_core",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
++dependencies = [
++ "cfg-if 1.0.0",
++ "instant",
++ "libc",
++ "redox_syscall",
++ "smallvec",
++ "winapi",
++]
++
++[[package]]
++name = "paste"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
++
++[[package]]
++name = "pcsc"
++version = "2.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88e09a8d8705a2c9b1ffe1f9dd9580efe3f8e80c19fc9f99038fe99b7bb56c83"
++dependencies = [
++ "bitflags",
++ "pcsc-sys",
++]
++
++[[package]]
++name = "pcsc-sys"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e1b7bfecba2c0f1b5efb0e7caf7533ab1c295024165bcbb066231f60d33e23ea"
++dependencies = [
++ "pkg-config",
++]
++
++[[package]]
++name = "peeking_take_while"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
++
++[[package]]
++name = "petgraph"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
++dependencies = [
++ "fixedbitset",
++ "indexmap",
++]
++
++[[package]]
++name = "phf_shared"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
++dependencies = [
++ "siphasher",
++]
++
++[[package]]
++name = "pico-args"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
++
++[[package]]
++name = "precomputed-hash"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "pyo3"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436"
++dependencies = [
++ "cfg-if 1.0.0",
++ "ctor",
++ "indoc",
++ "inventory",
++ "libc",
++ "parking_lot",
++ "paste",
++ "pyo3-macros",
++ "unindent",
++]
++
++[[package]]
++name = "pyo3-macros"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16"
++dependencies = [
++ "pyo3-macros-backend",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "pyo3-macros-backend"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.57"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
++
++[[package]]
++name = "redox_users"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
++dependencies = [
++ "getrandom",
++ "redox_syscall",
++ "rust-argon2",
++]
++
++[[package]]
++name = "regex"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++ "thread_local",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
++
++[[package]]
++name = "rpassword"
++version = "5.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9"
++dependencies = [
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "rust-argon2"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
++dependencies = [
++ "base64",
++ "blake2b_simd",
++ "constant_time_eq",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
++
++[[package]]
++name = "rustc-hash"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "sequoia-openpgp"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "664de0a9388e38d0f350547056f18fcc03f78d85e5a49fa4fa8927ca6aea1424"
++dependencies = [
++ "anyhow",
++ "backtrace",
++ "base64",
++ "buffered-reader",
++ "bzip2",
++ "chrono",
++ "dyn-clone",
++ "eax",
++ "flate2",
++ "idna",
++ "lalrpop",
++ "lalrpop-util",
++ "lazy_static",
++ "libc",
++ "memsec",
++ "nettle",
++ "regex",
++ "sha1collisiondetection",
++ "thiserror",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "sha1collisiondetection"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7a6cf187c4059b3e63de2358b7e2f9a2261b6f3fd8ef4e7342308d0863ed082"
++dependencies = [
++ "digest",
++ "generic-array",
++ "libc",
++]
++
++[[package]]
++name = "shlex"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
++
++[[package]]
++name = "siphasher"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
++
++[[package]]
++name = "smallvec"
++version = "1.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0"
++
++[[package]]
++name = "string_cache"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a"
++dependencies = [
++ "lazy_static",
++ "new_debug_unreachable",
++ "phf_shared",
++ "precomputed-hash",
++]
++
++[[package]]
++name = "subtle"
++version = "2.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
++
++[[package]]
++name = "syn"
++version = "1.0.57"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "talktosc"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eda5fee425f91e5a4083946f4468948f59cc16412cdcd659554e474c647a5645"
++dependencies = [
++ "pcsc",
++ "rpassword",
++ "thiserror",
++]
++
++[[package]]
++name = "term"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
++dependencies = [
++ "byteorder",
++ "dirs",
++ "winapi",
++]
++
++[[package]]
++name = "thiserror"
++version = "1.0.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
++dependencies = [
++ "thiserror-impl",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "1.0.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "thread_local"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
++dependencies = [
++ "lazy_static",
++]
++
++[[package]]
++name = "time"
++version = "0.1.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
++dependencies = [
++ "libc",
++ "wasi 0.10.0+wasi-snapshot-preview1",
++ "winapi",
++]
++
++[[package]]
++name = "tiny-keccak"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
++dependencies = [
++ "crunchy",
++]
++
++[[package]]
++name = "tinyvec"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
++dependencies = [
++ "tinyvec_macros",
++]
++
++[[package]]
++name = "tinyvec_macros"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
++
++[[package]]
++name = "typenum"
++version = "1.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++dependencies = [
++ "matches",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
++dependencies = [
++ "tinyvec",
++]
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++
++[[package]]
++name = "unindent"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
++
++[[package]]
++name = "version_check"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
++
++[[package]]
++name = "version_check"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "wasi"
++version = "0.10.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix b/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix
new file mode 100644
index 000000000000..77789fa44dbe
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix
@@ -0,0 +1,99 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, pipInstallHook
+, llvmPackages
+, pkg-config
+, maturin
+, pcsclite
+, nettle
+, python
+, requests
+, vcrpy
+, numpy
+, pytestCheckHook
+, pythonOlder
+, PCSC
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "johnnycanencrypt";
+  version = "0.5.0";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "kushaldas";
+    repo = "johnnycanencrypt";
+    rev = "v${version}";
+    sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4";
+  };
+  cargoPatches = [ ./Cargo.lock.patch ];
+
+  cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r";
+
+  LIBCLANG_PATH = llvmPackages.libclang + "/lib";
+
+  propagatedBuildInputs = [
+    requests
+    vcrpy
+  ];
+
+  nativeBuildInputs = [
+    llvmPackages.clang
+    pkg-config
+    python
+    maturin
+    pipInstallHook
+  ];
+
+  buildInputs = [
+    pcsclite
+    nettle
+  ] ++ lib.optionals stdenv.isDarwin [ PCSC ];
+
+  # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
+  doCheck = false;
+  doInstallCheck = true;
+
+  installCheckInputs = [
+    pytestCheckHook
+    numpy
+  ];
+
+  # Remove with the next release after 0.5.0. This change is required
+  # for compatibility with maturin 0.9.0.
+  postPatch = ''
+    sed '/project-url = /d' -i Cargo.toml
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen"
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    install -Dm644 -t dist target/wheels/*.whl
+    pipInstallPhase
+  '';
+
+  preCheck = ''
+    export TESTDIR=$(mktemp -d)
+    cp -r tests/ $TESTDIR
+    pushd $TESTDIR
+  '';
+
+  postCheck = ''
+    popd
+  '';
+
+  pythonImportsCheck = [ "johnnycanencrypt" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/kushaldas/johnnycanencrypt";
+    description = "Python module for OpenPGP written in Rust";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ _0x4A6F ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix b/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix
index 0d6398a768a1..c5c9cdf15056 100644
--- a/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , six
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # runner seems to be upset by the project layout
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor";
     homepage = "https://jpylyzer.openpreservation.org/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix
new file mode 100644
index 000000000000..4e762e456ceb
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, pbr, click, dataclasses-json, htmlmin, jinja2, markdown2, pygments, pytz, pyyaml, requests, pytestCheckHook, beautifulsoup4, tox
+}:
+
+buildPythonPackage rec {
+  pname = "json-schema-for-humans";
+  version = "0.27.1";
+
+  src = fetchFromGitHub {
+    owner = "coveooss";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0d2a4a2lcqssr5g9rmc76f86nkqc9grixh507vzc9fi1h3gbi765";
+  };
+
+  nativeBuildInputs = [ pbr ];
+  propagatedBuildInputs = [
+    click dataclasses-json htmlmin jinja2 markdown2
+    pygments pytz pyyaml requests
+  ];
+
+  preBuild = ''
+    export PBR_VERSION=0.0.1
+  '';
+
+  checkInputs = [ pytestCheckHook beautifulsoup4 ];
+  pytestFlagsArray = [ "--ignore tests/generate_test.py" ];
+
+  meta = with lib; {
+    description = "Quickly generate HTML documentation from a JSON schema";
+    homepage    = "https://github.com/coveooss/json-schema-for-humans";
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ astro ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix b/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix
index e9887b473793..07ee609d6534 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }:
 
 buildPythonPackage rec {
   pname = "jsonfield";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reusable model field that allows you to store validated JSON, automatically handling serialization to and from the database";
     homepage = "https://github.com/rpkilby/jsonfield/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix
index 4b842a02af83..81a6eb3fb27b 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # ImportError: No module named tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kennknowles/python-jsonpath-rw";
     description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
index 6971393b80c9..e1eaaed6c178 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,10 +12,10 @@ buildPythonPackage rec {
     sha256 = "0qjkjy1qlyc1nl3k95wd03ssxac0a717x8889ypgs1cfcj3bm4n1";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Resolve JSON Pointers in Python";
     homepage = "https://github.com/stefankoegl/python-json-pointer";
-    license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi"
+    license = licenses.bsd2; # "Modified BSD license, says pypi"
   };
 
 }
diff --git a/nixpkgs/pkgs/development/python-modules/jsonref/default.nix b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix
index c174a011b5fa..b901d811a230 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonref/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, mock }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     py.test tests.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of JSON Reference for Python";
     homepage    = "https://github.com/gazpachoking/jsonref";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix
index c410b9407ea6..0b77db5df4e6 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , aiohttp, jsonrpc-base }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ aiohttp jsonrpc-base ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JSON-RPC client library for asyncio";
     homepage = "https://github.com/armills/jsonrpc-async";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
index 9318fc09373c..cc4bd1b2f686 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "jsonrpc-base";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JSON-RPC client library base interface";
     homepage = "https://github.com/armills/jsonrpc-base";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index 4fe136f69b7b..d14d382f013c 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , aiohttp, jsonrpc-base, pep8
 , pytestCheckHook
 , pytest-asyncio
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   checkInputs = [ pytestCheckHook pytest-asyncio ];
   pytestFlagsArray = [ "tests.py" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JSON-RPC websocket client library for asyncio";
     homepage = "https://github.com/armills/jsonrpc-websocket";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix
index 1b859e21e904..feced9442257 100644
--- a/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , six
@@ -17,7 +17,7 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Like watch -d but for JSON";
     longDescription = ''
       jsonwatch is a command line utility with which you can track
diff --git a/nixpkgs/pkgs/development/python-modules/jug/default.nix b/nixpkgs/pkgs/development/python-modules/jug/default.nix
index edfc7573d4e4..eff6accaa024 100644
--- a/nixpkgs/pkgs/development/python-modules/jug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jug/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch
 , nose, numpy
 , bottle, pyyaml, redis, six
 , zlib
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   checkInputs = [ pytestCheckHook ];
   pythonImportsCheck = [ "jug" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Task-Based Parallelization Framework";
     license = licenses.mit;
     homepage = "https://jug.readthedocs.io/";
diff --git a/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix b/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
index d47130c5f3fb..d9234d836b0f 100644
--- a/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.github.com/Juniper/py-junos-eznc";
     description = "Junos 'EZ' automation for non-programmers";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index 4dc878e26701..f01605513cb6 100644
--- a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
 , docker
 , escapism
 , jinja2
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     "repo2docker.contentproviders.base"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://repo2docker.readthedocs.io/en/latest/";
     description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix
index 4b3093cf6ce1..0f0c0d346e6a 100644
--- a/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     python-json-logger jsonschema ruamel_yaml traitlets
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Telemetry for Jupyter Applications and extensions";
     homepage = "https://jupyter-telemetry.readthedocs.io/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix
index b6d2a5e5a901..03d28bbf55d6 100644
--- a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , notebook
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # Meta-package, no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Installs all the Jupyter components in one go";
     homepage = "https://jupyter.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
index dc38acc66f7c..71fba8a12225 100644
--- a/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub-systemdspawner";
-  version = "0.14";
+  version = "0.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "080dd9cd9292266dad35d1efc7aa1af0ed6993d15eadc79bd959d1ee273d1923";
+    sha256 = "b6e2d981657aa5d3794abb89b1650d056524158a3d0f0f706007cae9b6dbeb2b";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix
index 1c6c9a5b9e3c..3219bd5730bb 100644
--- a/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "jupyterlab_git" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jupyter lab extension for version control with Git.";
     license = with licenses; [ bsd3 ];
     homepage = "https://github.com/jupyterlab/jupyterlab-git";
diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
index 0344a66cf663..bfbd1cc89e08 100644
--- a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , notebook
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JupyterLab Server";
     homepage = "https://jupyter.org";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
index a0b8cd97ced6..24a02f7f696a 100644
--- a/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic application framework, providing the foundation for other modules";
     homepage = "https://github.com/freevo/kaa-base";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix
index 31f87965a038..5164004e8ea5 100644
--- a/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , kaa-base
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files";
     homepage = "https://github.com/freevo/kaa-metadata";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix
index 8069632c1705..b147b30c2ce3 100644
--- a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:
 
 buildPythonPackage rec {
   version = "2.0.2";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # E   ImportError: cannot import name 'unittest'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python client for Apache Kafka";
     homepage = "https://github.com/dpkp/kafka-python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix b/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
index 61892063278b..866042b6942c 100644
--- a/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "kaitaistruct";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Kaitai Struct: runtime library for Python";
     homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/kajiki/default.nix b/nixpkgs/pkgs/development/python-modules/kajiki/default.nix
index 8643e562fa07..2a45404919c0 100644
--- a/nixpkgs/pkgs/development/python-modules/kajiki/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kajiki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , Babel
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ Babel pytz nine ];
   checkInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Kajiki provides fast well-formed XML templates";
     homepage = "https://github.com/nandoflorestan/kajiki";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/kaptan/default.nix b/nixpkgs/pkgs/development/python-modules/kaptan/default.nix
index 78a33a8e3022..dea22059f096 100644
--- a/nixpkgs/pkgs/development/python-modules/kaptan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaptan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyyaml
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Configuration manager for python applications";
     homepage = "https://kaptan.readthedocs.io/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/kazoo/default.nix b/nixpkgs/pkgs/development/python-modules/kazoo/default.nix
index 3c040abc7247..d8743776578e 100644
--- a/nixpkgs/pkgs/development/python-modules/kazoo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kazoo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   doCheck = false;
   #ZOOKEEPER_PATH = "${pkgs.zookeeper}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://kazoo.readthedocs.org";
     description = "Higher Level Zookeeper Client";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/keep/default.nix b/nixpkgs/pkgs/development/python-modules/keep/default.nix
index 4e7003aef9f9..22ae853c043c 100644
--- a/nixpkgs/pkgs/development/python-modules/keep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , PyGithub
@@ -24,9 +24,10 @@ buildPythonPackage rec {
   ];
 
   # no tests
+  doCheck = false;
   pythonImportsCheck = [ "keep" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/orkohunter/keep";
     description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/python-modules/keepalive/default.nix b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix
index c53bc25d198d..7a488edf895d 100644
--- a/nixpkgs/pkgs/development/python-modules/keepalive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive";
     homepage = "https://github.com/wikier/keepalive";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/keepkey/default.nix b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
index 82391d377503..437a0193c61d 100644
--- a/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pytest
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest
 , ecdsa , mnemonic, protobuf, hidapi, trezor }:
 
 buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # Remove impossible dependency constraint
   postPatch = "sed -i -e 's|hidapi==|hidapi>=|' setup.py";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "KeepKey Python client";
     homepage = "https://github.com/keepkey/python-keepkey";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix b/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix
index fec2d198fdd9..b9189cf4e167 100644
--- a/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , keepkey
@@ -20,7 +20,10 @@ buildPythonPackage rec {
     keepkey libagent setuptools wheel
   ];
 
-  meta = with stdenv.lib; {
+  doCheck = false;
+  pythonImportsChecks = [ "keepkey_agent" ];
+
+  meta = with lib; {
     description = "Using KeepKey as hardware-based SSH/PGP agent";
     homepage = "https://github.com/romanz/trezor-agent";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/keras/default.nix b/nixpkgs/pkgs/development/python-modules/keras/default.nix
index f2243a1531f6..7274d3d17a69 100644
--- a/nixpkgs/pkgs/development/python-modules/keras/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keras/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, pytest_xdist
 , six, numpy, scipy, pyyaml, h5py
 , keras-applications, keras-preprocessing
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # Couldn't get tests working
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Deep Learning library for Theano and TensorFlow";
     homepage = "https://keras.io";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/kerberos/default.nix b/nixpkgs/pkgs/development/python-modules/kerberos/default.nix
index 7f5341a6a253..985339caed53 100644
--- a/nixpkgs/pkgs/development/python-modules/kerberos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kerberos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , kerberos
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "kerberos";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19663qxmma0i8bfbjc2iwy5hgq0g4pfb75r023v5dps68zfvffgh";
+    sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c";
   };
 
   nativeBuildInputs = [ kerberos ];
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Kerberos high-level interface";
     homepage = "https://pypi.python.org/pypi/kerberos";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/keyring/2.nix b/nixpkgs/pkgs/development/python-modules/keyring/2.nix
index ce4aa145e8ee..ee3b42b9bb85 100644
--- a/nixpkgs/pkgs/development/python-modules/keyring/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/keyring/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , dbus-python, setuptools_scm, entrypoints, secretstorage
 , pytest, pytest-flake8 }:
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytest-flake8 ];
 
-  propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
+  propagatedBuildInputs = [ dbus-python entrypoints ] ++ lib.optional stdenv.isLinux secretstorage;
 
   doCheck = !stdenv.isDarwin;
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Store and access your passwords safely";
     homepage    = "https://pypi.python.org/pypi/keyring";
     license     = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
index 506081659f65..bc20ff4e3740 100644
--- a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six
 , pytest, backports_unittest-mock, keyring, setuptools_scm, toml
 }:
 
 buildPythonPackage rec {
   pname = "keyrings.alt";
-  version = "4.0.1";
+  version = "4.0.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cd23d4c6930b5271134ac815d868164cb6d0d2252ee6dcb07fadfca26caaa230";
+    sha256 = "cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25";
   };
 
   postPatch = ''
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm toml ];
   propagatedBuildInputs = [ six ];
 
-  checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock;
+  checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock;
 
   # heavily relies on importing tests from keyring package
   doCheck = false;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     "keyrings.alt"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     description = "Alternate keyring implementations";
     homepage = "https://github.com/jaraco/keyrings.alt";
diff --git a/nixpkgs/pkgs/development/python-modules/kitchen/default.nix b/nixpkgs/pkgs/development/python-modules/kitchen/default.nix
index 494a4f8fc063..1a14b974114e 100644
--- a/nixpkgs/pkgs/development/python-modules/kitchen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kitchen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "kitchen";
   version = "1.2.6";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
     sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Kitchen contains a cornucopia of useful code";
     license = licenses.lgpl2;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix b/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix
index f4621c9c54de..0702e3518e01 100644
--- a/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix
+++ b/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   # Does not include tests
   doCheck = false;
diff --git a/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
index a24e7300538a..d4d62787092b 100644
--- a/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   nativeBuildInputs = [
     cppy
diff --git a/nixpkgs/pkgs/development/python-modules/koji/default.nix b/nixpkgs/pkgs/development/python-modules/koji/default.nix
index eac2ab596433..5f560be4e887 100644
--- a/nixpkgs/pkgs/development/python-modules/koji/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/koji/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }:
+{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }:
 
 buildPythonPackage rec {
   pname = "koji";
@@ -23,10 +23,10 @@ buildPythonPackage rec {
     rm -rf $out/nix
   '';
 
-  meta = {
+  meta = with lib; {
     description = "An RPM-based build system";
     homepage = "https://pagure.io/koji";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix
index 41569ac9dc9b..8ad94d955aec 100644
--- a/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # no real tests
   pythonImportsCheck = [ "korean_lunar_calendar" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to convert Korean lunar-calendar to Gregorian calendar.";
     homepage = "https://github.com/usingsky/korean_lunar_calendar_py";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
index 2679c81de0f0..172180781968 100644
--- a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast,
-  ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal,
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast,
+  ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
   isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
 
 buildPythonPackage rec {
@@ -28,9 +28,9 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
-  propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ];
+  propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Kubernetes python client";
     homepage = "https://github.com/kubernetes-client/python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
index 0556411ee47e..1efe01092124 100644
--- a/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
@@ -8,7 +8,8 @@
 , shapely
 , ndjson
 , backoff
-, google_api_core
+, google-api-core
+, backports-datetime-fromisoformat
 }:
 
 buildPythonPackage rec {
@@ -22,12 +23,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jinja2 requests pillow rasterio shapely ndjson backoff
-    google_api_core
+    google-api-core backports-datetime-fromisoformat
   ];
 
   # Test cases are not running on pypi or GitHub
   doCheck = false;
-
   pythonImportsCheck = [ "labelbox" ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/larch/default.nix b/nixpkgs/pkgs/development/python-modules/larch/default.nix
index 3be8b2404192..7708bc0dbc02 100644
--- a/nixpkgs/pkgs/development/python-modules/larch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/larch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , sphinx
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://liw.fi/larch/";
     description = "Python B-tree library";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/lasagne/default.nix b/nixpkgs/pkgs/development/python-modules/lasagne/default.nix
index febd38acc63f..5bddf5cbe6f2 100644
--- a/nixpkgs/pkgs/development/python-modules/lasagne/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lasagne/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # there are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight library to build and train neural networks in Theano";
     homepage = "https://github.com/Lasagne/Lasagne";
     maintainers = with maintainers; [ NikolaMandic ];
diff --git a/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix b/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix
index 77b75193ca40..37ffe23b8061 100644
--- a/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, pytest }:
+{ lib, buildPythonPackage, fetchPypi, six, pytest }:
 
 buildPythonPackage rec {
   pname = "latexcodec";
@@ -17,10 +17,10 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/mcmtroffaes/latexcodec";
     description = "Lexer and codec to work with LaTeX code in Python";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix b/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
index dc2eecb002d4..63784b4005bb 100644
--- a/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # Broken tests. Seem to be fixed upstream according to Travis.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast and thorough lazy object proxy";
     homepage = "https://github.com/ionelmc/python-lazy-object-proxy";
     license = with licenses; [ bsd2 ];
diff --git a/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix b/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix
index 743604d539ba..1bc52b3a65c8 100644
--- a/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest
 , pytest_xdist
 , six }:
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pytest --boxed
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "lazy_import provides a set of functions that load modules, and related attributes, in a lazy fashion.";
     homepage = https://github.com/mnmelo/lazy_import;
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ldap/default.nix b/nixpkgs/pkgs/development/python-modules/ldap/default.nix
index 0e4f5597ce64..e5cd3d3828e1 100644
--- a/nixpkgs/pkgs/development/python-modules/ldap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldap/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage, fetchPypi
 , pyasn1, pyasn1-modules, pytest
-, openldap, cyrus_sasl, stdenv }:
+, openldap, cyrus_sasl, lib, stdenv }:
 
 buildPythonPackage rec {
   pname = "python-ldap";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python modules for implementing LDAP clients";
     homepage = "https://www.python-ldap.org/";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix
index 178477dcc6b0..e1accc4d177e 100644
--- a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pyasn1 }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pyasn1 }:
 
 buildPythonPackage rec {
   pname = "ldap3";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false; # requires network
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/ldap3";
     description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix
index d1b9da15cc5f..bc08633da8b4 100644
--- a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage rec {
   postPatch = ''
     # Tests run without most of the dependencies
     echo "" > test-requirements.txt
+    # PrettyTable is now maintained again
+    substituteInPlace requirements.txt --replace "PrettyTable<0.8,>=0.7.2" "PrettyTable"
   '';
 
   nativeBuildInputs = [ pbr ];
@@ -24,7 +26,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A simple connector pool for python-ldap";
-    homepage = "https://git.openstack.org/cgit/openstack/ldappool";
-    license = licenses.mpl20;
+    homepage = "https://opendev.org/openstack/ldappool/";
+    license = with licenses; [ mpl11 lgpl21Plus gpl2Plus ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
index 2a4550d6b423..e3694bffe378 100644
--- a/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
@@ -3,12 +3,13 @@
 , fetchPypi
 , twisted
 , passlib
-, pycrypto
 , pyopenssl
 , pyparsing
 , service-identity
 , zope_interface
 , isPy3k
+, pythonAtLeast
+, python
 }:
 
 buildPythonPackage rec {
@@ -21,13 +22,15 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface
+    twisted passlib pyopenssl pyparsing service-identity zope_interface
   ];
 
-  disabled = isPy3k;
+  # https://github.com/twisted/ldaptor/pull/210
+  disabled = !isPy3k || pythonAtLeast "3.9";
 
-  # TypeError: None is neither bytes nor unicode
-  doCheck = false;
+  checkPhase = ''
+    ${python.interpreter} -m twisted.trial ldaptor
+  '';
 
   meta = {
     description = "A Pure-Python Twisted library for LDAP";
diff --git a/nixpkgs/pkgs/development/python-modules/le/default.nix b/nixpkgs/pkgs/development/python-modules/le/default.nix
index 927b3f44bcf3..6415b255c716 100644
--- a/nixpkgs/pkgs/development/python-modules/le/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/le/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPy3k
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ simplejson psutil ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rapid7/le";
     description = "Logentries agent";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/leather/default.nix b/nixpkgs/pkgs/development/python-modules/leather/default.nix
index 30a76747723a..99c1f080a031 100644
--- a/nixpkgs/pkgs/development/python-modules/leather/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/leather/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, six }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, six }:
 
 buildPythonPackage rec {
   pname = "leather";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://leather.rtfd.io";
     description = "Python charting library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix b/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix
index 605fbed98a19..4fc935799c31 100644
--- a/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , ledgerblue
@@ -20,7 +20,10 @@ buildPythonPackage rec {
     ledgerblue libagent setuptools wheel
   ];
 
-  meta = with stdenv.lib; {
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
     description = "Using Ledger as hardware-based SSH/PGP agent";
     homepage = "https://github.com/romanz/trezor-agent";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
index c84d5fa471bd..f853dfbf01f9 100644
--- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, hidapi
+{ lib, stdenv, fetchPypi, buildPythonPackage, hidapi
 , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
 , websocket_client
 }:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library to communicate with Ledger Blue/Nano S";
     homepage = "https://github.com/LedgerHQ/blue-loader-python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix
index e25e9d5d2a4f..42bc0c391295 100644
--- a/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , cryptography
@@ -25,14 +25,14 @@ buildPythonPackage rec {
     sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit ];
+  buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
   propagatedBuildInputs = [
     cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate
   ];
 
   pythonImportsCheck = [ "ledgerwallet" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/LedgerHQ/ledgerctl";
     description = "A library to control Ledger devices";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/nixpkgs/pkgs/development/python-modules/libagent/default.nix
index 4bc07e969330..debe88f2f6cc 100644
--- a/nixpkgs/pkgs/development/python-modules/libagent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libagent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
   unidecode, mock, pytest , backports-shutil-which, ConfigArgParse,
   python-daemon, pymsgbox }:
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     py.test libagent/tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Using hardware wallets as SSH/GPG agent";
     homepage = "https://github.com/romanz/trezor-agent";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/libais/default.nix b/nixpkgs/pkgs/development/python-modules/libais/default.nix
index 3d7408e87126..eb1ce861dd26 100644
--- a/nixpkgs/pkgs/development/python-modules/libais/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libais/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   six, pytest, pytestrunner, pytestcov, coverage
 }:
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest pytestrunner pytestcov coverage ];
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/schwehr/libais";
     description = "Library for decoding maritime Automatic Identification System messages";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix b/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix
index 6bcb7f80484c..73d99afda674 100644
--- a/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Changaco/python-libarchive-c";
     description = "Python interface to libarchive";
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
index e69e51ccf555..5a5116de5478 100644
--- a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, python, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub
 , cmake, sip, protobuf, pythonOlder }:
 
 buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Communication library between internal components for Ultimaker software";
     homepage = "https://github.com/Ultimaker/libArcus";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix b/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix
index fa7320bdf4ec..fc45622a671d 100644
--- a/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchurl
-, libasyncns, pkgconfig }:
+{ lib, stdenv, buildPythonPackage, fetchurl
+, libasyncns, pkg-config }:
 
 buildPythonPackage rec {
   pname = "libasyncns-python";
@@ -13,10 +13,10 @@ buildPythonPackage rec {
   patches = [ ./libasyncns-fix-res-consts.patch ];
 
   buildInputs = [ libasyncns ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   doCheck = false; # requires network access
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "libasyncns-python is a python binding for the asynchronous name service query library";
     license = licenses.lgpl21;
     maintainers = [ maintainers.mic92 ];
diff --git a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
index 671de812f272..bda0553b8eee 100644
--- a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "apache-libcloud";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b14b1f5f91ceeff5cf228613e76577d7b41e790dccd53a0f647ef816fb5495c";
+    sha256 = "2e3e4d02f9b3197f9119e737bc704fba52f34459d4bc96d8ad8f183d600747ba";
   };
 
   checkInputs = [ mock pytest pytestrunner requests-mock ];
diff --git a/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/nixpkgs/pkgs/development/python-modules/libcst/default.nix
index e0ea0e332af6..f064c34e1586 100644
--- a/nixpkgs/pkgs/development/python-modules/libcst/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libcst/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, black, isort
-, pytestCheckHook, pyyaml, typing-extensions, typing-inspect }:
+, pytestCheckHook, pyyaml, typing-extensions, typing-inspect, dataclasses }:
 
 buildPythonPackage rec {
   pname = "libcst";
@@ -16,7 +16,8 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  propagatedBuildInputs = [ pyyaml typing-inspect ];
+  propagatedBuildInputs = [ pyyaml typing-inspect ]
+    ++ lib.optional (pythonOlder "3.7") dataclasses;
 
   checkInputs = [ black isort pytestCheckHook ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/libevdev/default.nix b/nixpkgs/pkgs/development/python-modules/libevdev/default.nix
index a17612c79cbc..4a4ba489e0a6 100644
--- a/nixpkgs/pkgs/development/python-modules/libevdev/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libevdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , isPy27
 , fetchPypi
@@ -20,13 +20,13 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      libevdev = stdenv.lib.getLib pkgs.libevdev;
+      libevdev = lib.getLib pkgs.libevdev;
     })
   ];
 
   checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper around the libevdev C library";
     homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
index 40a4f6f7429f..567ad2cf4892 100644
--- a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
 
   postFixup = ''
     rm $out/lib/libgpuarray-static.a
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     function fixRunPath {
       p=$(patchelf --print-rpath $1)
       patchelf --set-rpath "$p:$libraryPath" $1
@@ -63,8 +63,6 @@ buildPythonPackage rec {
     Mako
   ];
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
@@ -72,7 +70,7 @@ buildPythonPackage rec {
     nose
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Theano/libgpuarray";
     description = "Library to manipulate tensors on GPU.";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix b/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix
index 0969e62c79e8..cfc687e37c14 100644
--- a/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , lxml, pycryptodome, colorama }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests on PyPI
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libkeepass/libkeepass";
     description = "A library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/liblarch/default.nix b/nixpkgs/pkgs/development/python-modules/liblarch/default.nix
index 30b52be0b850..b824dec172ed 100644
--- a/nixpkgs/pkgs/development/python-modules/liblarch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/liblarch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , python
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python library built to easily handle data structure such are lists, trees and acyclic graphs";
     homepage = "https://github.com/getting-things-gnome/liblarch";
     downloadPage = "https://github.com/getting-things-gnome/liblarch/releases";
diff --git a/nixpkgs/pkgs/development/python-modules/libmr/default.nix b/nixpkgs/pkgs/development/python-modules/libmr/default.nix
index 7b1bbf6020d2..a0ef924e56e6 100644
--- a/nixpkgs/pkgs/development/python-modules/libmr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libmr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, cython }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }:
 
 buildPythonPackage rec {
   pname = "libmr";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests in the pypi tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "libMR provides core MetaRecognition and Weibull fitting functionality";
     homepage = "https://github.com/Vastlab/libMR";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/libnacl/default.nix b/nixpkgs/pkgs/development/python-modules/libnacl/default.nix
index 9e19fe5e8e17..2406738cf1bb 100644
--- a/nixpkgs/pkgs/development/python-modules/libnacl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libnacl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }:
 
 buildPythonPackage rec {
   pname = "libnacl";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ xvapx ];
     description = "Python bindings for libsodium based on ctypes";
     homepage = "https://pypi.python.org/pypi/libnacl";
diff --git a/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/nixpkgs/pkgs/development/python-modules/librosa/default.nix
index 0fc5d857fb84..777eed4ddb33 100644
--- a/nixpkgs/pkgs/development/python-modules/librosa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/librosa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , joblib
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160
   pythonImportsCheck = [ "librosa" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python module for audio and music processing";
     homepage = "http://librosa.github.io/";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
index 9b6aa7bc3a8d..559289987e6c 100644
--- a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }:
+{ lib, stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }:
 
 buildPythonPackage rec {
   pname = "libsavitar";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.4.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ implementation of 3mf loading with SIP python bindings";
     homepage = "https://github.com/Ultimaker/libSavitar";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix
index 119cb6cbefa7..40f1b2f8e9ca 100644
--- a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bose Soundtouch Python library";
     homepage    = "https://github.com/CharlesBlonde/libsoundtouch";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix b/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix
index e8b7c45417a1..72e62514a526 100644
--- a/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "libthumbor is the python extension to thumbor";
     homepage = "https://github.com/heynemann/libthumbor";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
index 9df5cffec97b..df9728eb334b 100644
--- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   pname = "libtmux";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scripting library for tmux";
     homepage = "https://libtmux.readthedocs.io/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
index 63a97652381b..0446299fd1bd 100644
--- a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, libusb1, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, libusb1, pytest }:
 
 buildPythonPackage rec {
   pname = "libusb1";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/vpelletier/python-libusb1";
     description = "Python ctype-based wrapper around libusb1";
     license     = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/libversion/default.nix b/nixpkgs/pkgs/development/python-modules/libversion/default.nix
index ed3629ce65d5..d54a176f6862 100644
--- a/nixpkgs/pkgs/development/python-modules/libversion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libversion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "libversion";
@@ -9,12 +9,12 @@ buildPythonPackage rec {
     sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libversion ];
 
   disabled = pythonOlder "3.6";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/repology/py-libversion";
     description = "Python bindings for libversion, which provides fast, powerful and correct generic version string comparison algorithm";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix b/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix
index 7b0b7c438d9a..1134d4f1c57b 100644
--- a/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix
+++ b/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
+{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }:
 
 buildPythonPackage rec {
   pname = "libvirt";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libvirt lxml ];
 
   checkInputs = [ nose ];
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.libvirt.org/";
     description = "libvirt Python bindings";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
index 4c0e730f7d57..d29cf5a7a85f 100644
--- a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }:
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "6.6.0";
+  version = "6.8.0";
 
   src = assert version == libvirt.version; fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt-python";
     rev = "v${version}";
-    sha256 = "0jj6b2nlx7qldwbvixz74abn3p0sq4lkf6ak74vynrv5xvlycb9v";
+    sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00=";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libvirt lxml ];
 
   checkInputs = [ nose ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libvirt.org/python.html";
     description = "libvirt Python bindings";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/lightblue/default.nix b/nixpkgs/pkgs/development/python-modules/lightblue/default.nix
index 99db9e5c2f73..3e85a3cfaa04 100644
--- a/nixpkgs/pkgs/development/python-modules/lightblue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lightblue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , pkgs
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pkgs.bluez pkgs.openobex ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://lightblue.sourceforge.net";
     description = "Cross-platform Bluetooth API for Python";
     maintainers = with maintainers; [ leenaars ];
diff --git a/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
index eae2e4208d1d..62686234b6e9 100644
--- a/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cmake
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # we never actually explicitly call the install command so this is the only way
   # to inject these options to it - however, openmp-library doesn't appear to have
   # any effect, so we have to inject it into NIX_LDFLAGS manually below
-  postPatch = stdenv.lib.optionalString stdenv.cc.isClang ''
+  postPatch = lib.optionalString stdenv.cc.isClang ''
     cat >> setup.cfg <<EOF
 
     [install]
@@ -44,7 +44,7 @@ buildPythonPackage rec {
 
   postConfigure = ''
     export HOME=$(mktemp -d)
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -L${llvmPackages.openmp}/lib -lomp"
   '';
 
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   # `make check`.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework";
     homepage = "https://github.com/Microsoft/LightGBM";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/lightning/default.nix b/nixpkgs/pkgs/development/python-modules/lightning/default.nix
index 8b128e7cb892..782bd41413eb 100644
--- a/nixpkgs/pkgs/development/python-modules/lightning/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lightning/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   buildInputs = [ pytest ];
   propagatedBuildInputs = [ jinja2 matplotlib numpy requests six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python client library for the Lightning data visualization server";
     homepage = "http://lightning-viz.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/limits/default.nix b/nixpkgs/pkgs/development/python-modules/limits/default.nix
index 22bd6607fb6b..e1cd31867de4 100644
--- a/nixpkgs/pkgs/development/python-modules/limits/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/limits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, six }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, six }:
 
 buildPythonPackage rec {
   pname = "limits";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false; # ifilter
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Rate limiting utilities";
     license = licenses.mit;
     homepage = "https://limits.readthedocs.org/";
diff --git a/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
index b46d1566532b..c92e014e9898 100644
--- a/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modified version of Supybot, an IRC bot";
     homepage = "https://github.com/ProgVal/Limnoria";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/linecache2/default.nix b/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
index ba2525155d30..3945ec5001cd 100644
--- a/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pbr
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # circular dependencies for tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A backport of linecache to older supported Pythons";
     homepage = "https://github.com/testing-cabal/linecache2";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/linode-api/default.nix b/nixpkgs/pkgs/development/python-modules/linode-api/default.nix
index 4689050ba6c7..61624a64d66a 100644
--- a/nixpkgs/pkgs/development/python-modules/linode-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/linode-api/default.nix
@@ -15,9 +15,9 @@ buildPythonPackage rec {
   disabled = (pythonOlder "2.7");
 
   propagatedBuildInputs = [ requests future ]
-                             ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
+                             ++ lib.optionals (pythonOlder "3.4") [ enum34 ];
 
-  postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") ''
+  postPatch = (lib.optionalString (!pythonOlder "3.4") ''
     sed -i -e '/"enum34",/d' setup.py
   '');
 
diff --git a/nixpkgs/pkgs/development/python-modules/linode/default.nix b/nixpkgs/pkgs/development/python-modules/linode/default.nix
index d0c8b0ff7943..611b91bb9309 100644
--- a/nixpkgs/pkgs/development/python-modules/linode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/linode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ghickman/linode";
     description = "A thin python wrapper around Linode's API";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix
index 888f09dba95b..97d80fbbbda7 100644
--- a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix
@@ -27,6 +27,10 @@ buildPythonPackage rec {
     smbus-cffi
   ];
 
+  # does not contain tests
+  doCheck = false;
+  pythonImportsCheck = [ "liquidctl" ];
+
   meta = with lib; {
     description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices";
     homepage    = "https://github.com/liquidctl/liquidctl";
diff --git a/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix b/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix
index c58a18dffe8e..bbf1b966bf1e 100644
--- a/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     pytest tests tests/external_test_examples.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Live training loss plot in Jupyter for Keras, PyTorch, and others";
     homepage = "https://github.com/stared/livelossplot";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix b/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix
index 846f7633924b..d76eb736ac73 100644
--- a/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPyPy
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ livestreamer ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gapato/livestreamer-curses";
     description = "Curses frontend for livestreamer";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
index 83bd4bcfb72c..7ae9124bb82c 100644
--- a/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pkgs
 , isPyPy
@@ -22,13 +22,13 @@ buildPythonPackage rec {
   buildInputs = [ pkgs.makeWrapper ];
 
   propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ]
-    ++ stdenv.lib.optionals isPy27 [ singledispatch futures ];
+    ++ lib.optionals isPy27 [ singledispatch futures ];
 
   postInstall = ''
     wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://livestreamer.tanuki.se";
     description = ''
       Livestreamer is CLI program that extracts streams from various
diff --git a/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
index ac9360cb02df..e615582a282d 100644
--- a/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
@@ -1,11 +1,7 @@
-{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
+{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which
 , contextlib2, osxfuse
 }:
 
-let
-  inherit (stdenv.lib) optionals optionalString;
-in
-
 buildPythonPackage rec {
   pname = "llfuse";
   version = "1.3.8";
@@ -23,20 +19,22 @@ buildPythonPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
+
   buildInputs =
-    optionals stdenv.isLinux [ fuse ]
-    ++ optionals stdenv.isDarwin [ osxfuse ];
+    lib.optionals stdenv.isLinux [ fuse ]
+    ++ lib.optionals stdenv.isDarwin [ osxfuse ];
+
   checkInputs = [ pytest which ] ++
-    optionals stdenv.isLinux [ attr ];
+    lib.optionals stdenv.isLinux [ attr ];
 
   propagatedBuildInputs = [ contextlib2 ];
 
   checkPhase = ''
-    py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
+    py.test -k "not test_listdir" ${lib.optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for the low-level FUSE API";
     homepage = "https://github.com/python-llfuse/python-llfuse";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
index 7a7106a5eaa6..02ee088782aa 100644
--- a/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetchPypi
 , buildPythonPackage
 , python
@@ -21,7 +22,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ llvm ];
-  propagatedBuildInputs = [ ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+  propagatedBuildInputs = [ ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   # Disable static linking
   # https://github.com/numba/llvmlite/issues/93
@@ -38,14 +39,14 @@ buildPythonPackage rec {
     ${python.executable} runtests.py
   '';
 
-  __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+  __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
 
   passthru.llvm = llvm;
 
-  meta = {
+  meta = with lib; {
     description = "A lightweight LLVM python binding for writing JIT compilers";
     homepage = "http://llvmlite.pydata.org/";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ fridh ];
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fridh ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/lmdb/default.nix b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
index 76cd2acd7435..20020b97ef23 100644
--- a/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
@@ -1,8 +1,10 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
-, pytest
+, pytestCheckHook
 , cffi
+, lmdb
+, ludios_wpull
 }:
 
 buildPythonPackage rec {
@@ -14,16 +16,18 @@ buildPythonPackage rec {
     sha256 = "4136ffdf0aad61da86d1402808029d002a771b2a9ccc9b39c6bcafa7847c21b6";
   };
 
-  checkInputs = [ pytest cffi ];
-  checkPhase = ''
-    py.test
-  '';
+  buildInputs = [ lmdb ];
 
-  meta = with stdenv.lib; {
+  propogatedBuildInputs = [ ludios_wpull ];
+
+  checkInputs = [ cffi pytestCheckHook ];
+
+  LMDB_FORCE_SYSTEM=1;
+
+  meta = with lib; {
     description = "Universal Python binding for the LMDB 'Lightning' Database";
     homepage = "https://github.com/dw/py-lmdb";
     license = licenses.openldap;
     maintainers = with maintainers; [ copumpkin ivan ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix b/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix
index 336b799eee2c..3a1beba29d40 100644
--- a/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k, stdenv }:
+{ buildPythonPackage, fetchPypi, isPy3k, lib, stdenv }:
 
 buildPythonPackage rec {
   pname = "lmtpd";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "2c6825d2ffa1de099440411a742f58e1b3e8deeb3345adcfd4c2c38d4baf62b3";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/moggers87/lmtpd";
     description = "LMTP counterpart to smtpd in the Python standard library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/localzone/default.nix b/nixpkgs/pkgs/development/python-modules/localzone/default.nix
index f4ed4b98ef59..8690b1e4c91e 100644
--- a/nixpkgs/pkgs/development/python-modules/localzone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/localzone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , dnspython
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple DNS library for managing zone files";
     homepage = "https://localzone.iomaestro.com";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/locket/default.nix b/nixpkgs/pkgs/development/python-modules/locket/default.nix
index d98ab6379744..45985a17d3e9 100644
--- a/nixpkgs/pkgs/development/python-modules/locket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/locket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "locket";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # weird test requirements (spur.local>=0.3.7,<0.4)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Locket implements a lock that can be used by multiple processes provided they use the same path.";
     homepage = "https://github.com/mwilliamson/locket.py";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/nixpkgs/pkgs/development/python-modules/logilab/common.nix
index 3da263757cc6..b7ba746d79ee 100644
--- a/nixpkgs/pkgs/development/python-modules/logilab/common.nix
+++ b/nixpkgs/pkgs/development/python-modules/logilab/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }:
 
 buildPythonPackage rec {
   pname = "logilab-common";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # and is not currently in nixos
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python packages and modules used by Logilab ";
     homepage = "https://www.logilab.org/project/logilab-common";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix
index aa26f21820b7..9a071b5cf5f9 100644
--- a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix
+++ b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, logilab_common, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, logilab_common, six }:
 
 buildPythonPackage rec {
   pname = "logilab-constraint";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   ];
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "logilab-database provides some classes to make unified access to different";
     homepage = "https://www.logilab.org/project/logilab-database";
   };
diff --git a/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix b/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix
index 81879b2218de..15cea1d7baaa 100644
--- a/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , logilab_common
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ logilab_common ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.logilab.org/project/logilab-astng";
     description = "Python Abstract Syntax Tree New Generation";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/nixpkgs/pkgs/development/python-modules/loguru/default.nix
index 216fb3c5181e..458d2ca50329 100644
--- a/nixpkgs/pkgs/development/python-modules/loguru/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/loguru/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "loguru";
@@ -12,12 +12,12 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook colorama ];
 
-  pytestFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ];
+  pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ];
 
   disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
+    ++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Delgan/loguru";
     description = "Python logging made (stupidly) simple";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/logutils/default.nix b/nixpkgs/pkgs/development/python-modules/logutils/default.nix
index 8b4cb4e69c5c..d49667d7cc8a 100644
--- a/nixpkgs/pkgs/development/python-modules/logutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/logutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Logging utilities";
     homepage = "https://bitbucket.org/vinay.sajip/logutils/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/lpod/default.nix b/nixpkgs/pkgs/development/python-modules/lpod/default.nix
index effdc3f432a6..67b48cecd62c 100644
--- a/nixpkgs/pkgs/development/python-modules/lpod/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lpod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , lxml
@@ -22,7 +22,7 @@ buildPythonPackage {
     sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lpod/lpod-python/";
     description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) ";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/lsassy/default.nix b/nixpkgs/pkgs/development/python-modules/lsassy/default.nix
new file mode 100644
index 000000000000..6b1d5ec2bb4c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/lsassy/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, impacket
+, netaddr
+, pypykatz
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "lsassy";
+  version = "2.1.3";
+
+  src = fetchFromGitHub {
+    owner = "Hackndo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1zig34ymc1h18gjc2ji0w0711im5sm9xm6nydc01c13yfpvvj1rh";
+  };
+
+  propagatedBuildInputs = [
+    impacket
+    netaddr
+    pypykatz
+  ];
+
+  # Tests require an active domain controller
+  doCheck = false;
+  pythonImportsCheck = [ "lsassy" ];
+
+  meta = with lib; {
+    description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)";
+    homepage = "https://github.com/Hackndo/lsassy";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/lsi/default.nix b/nixpkgs/pkgs/development/python-modules/lsi/default.nix
index 5f193f52e9a5..0fca2f7b372f 100644
--- a/nixpkgs/pkgs/development/python-modules/lsi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lsi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ colored boto pkgs.openssh pkgs.which ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CLI for querying and SSHing onto AWS EC2 instances";
     homepage = "https://github.com/NarrativeScience/lsi";
     maintainers = [maintainers.adnelson];
diff --git a/nixpkgs/pkgs/development/python-modules/lxc/default.nix b/nixpkgs/pkgs/development/python-modules/lxc/default.nix
index 2798cb800757..a20db9dd5034 100644
--- a/nixpkgs/pkgs/development/python-modules/lxc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lxc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
@@ -19,7 +19,7 @@ buildPythonPackage {
 
   buildInputs = [ pkgs.lxc ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Out of tree python 2.7 binding for liblxc";
     homepage = "https://github.com/lxc/python2-lxc";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix b/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
index 4e58c6a7d676..585c38ab33ec 100644
--- a/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }:
 buildPythonPackage rec {
   pname = "lyricwikia";
   version = "0.1.11";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # upstream has no code tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/enricobacis/lyricwikia";
     maintainers = [ maintainers.kmein ];
     description = "LyricWikia API for song lyrics";
diff --git a/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix b/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix
index f3ca43f5e9a5..af07be47dcdc 100644
--- a/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   doCheck = false; # another test that depends on the network.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python crypto and SSL toolkit";
     homepage = "https://gitlab.com/m2crypto/m2crypto";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/nixpkgs/pkgs/development/python-modules/m2r/default.nix
index 3de9ec079d49..149e4d6ed562 100644
--- a/nixpkgs/pkgs/development/python-modules/m2r/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/m2r/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
   mistune, docutils } :
 buildPythonPackage rec {
   pname = "m2r";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # deleted by some tests and not properly regenerated)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/miyakogi/m2r";
     description = "converts a markdown file including reST markups to a valid reST format";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/nixpkgs/pkgs/development/python-modules/maestral/default.nix
index cb7119860f59..990545e41736 100644
--- a/nixpkgs/pkgs/development/python-modules/maestral/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/maestral/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
@@ -38,24 +38,24 @@ buildPythonPackage rec {
     sqlalchemy
     survey
     watchdog
-  ] ++ stdenv.lib.optionals (pythonOlder "3.8") [
+  ] ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
-  ] ++ stdenv.lib.optionals (pythonOlder "3.9") [
+  ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-resources
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     dbus-next
   ];
 
   makeWrapperArgs = [
     # Add the installed directories to the python path so the daemon can find them
-    "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}"
+    "--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}"
     "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages"
   ];
 
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source Dropbox client for macOS and Linux";
     license = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
index 571a92900c90..14ae268c03a0 100644
--- a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }:
 
 buildPythonPackage rec {
   version = "0.4.1";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Securely transfer data between computers";
     homepage = "https://github.com/warner/magic-wormhole-mailbox-server";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix
index 9e73001a1499..0d8b3a1ec070 100644
--- a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ];
   checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = lib.optionalString stdenv.isLinux ''
     sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
   '';
 
@@ -54,7 +54,7 @@ buildPythonPackage rec {
       --replace 'locale_env = dict(LC_ALL=locale, LANG=locale)' 'locale_env = dict(LC_ALL=locale, LANG=locale, LOCALE_ARCHIVE=os.getenv("LOCALE_ARCHIVE"))'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Securely transfer data between computers";
     homepage = "https://github.com/warner/magic-wormhole";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/magic/default.nix b/nixpkgs/pkgs/development/python-modules/magic/default.nix
index 98e6731a1b86..45fd740e2e89 100644
--- a/nixpkgs/pkgs/development/python-modules/magic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/magic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pkgs
 }:
@@ -19,7 +19,7 @@ buildPythonPackage {
   # No test suite
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python wrapper around libmagic";
     homepage = "http://www.darwinsys.com/file/";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/mahotas/default.nix b/nixpkgs/pkgs/development/python-modules/mahotas/default.nix
index b7d17d943f7b..818ff459985c 100644
--- a/nixpkgs/pkgs/development/python-modules/mahotas/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mahotas/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, stdenv }:
+{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, lib, stdenv }:
 
 buildPythonPackage rec {
   pname = "mahotas";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   disabled = stdenv.isi686; # Failing tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Computer vision package based on numpy";
     homepage = "https://mahotas.readthedocs.io/";
     maintainers = with maintainers; [ luispedro ];
diff --git a/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix b/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix
index 886a3ed66b37..08991edce4aa 100644
--- a/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy36
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A patched mailcap module that conforms to RFC 1524";
     homepage = "https://github.com/michael-lazar/mailcap_fix";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix b/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix
index b9640a4ab5d5..0032caa7a0a5 100644
--- a/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , docopt
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     sed -i 's/==/>=/' setup.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A CLI client and Python API library for the MailChimp email platform";
     homepage = "http://apidocs.mailchimp.com/api/2.0/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix
index 6abe5f5c6bc4..8ab80e337179 100644
--- a/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, mailman, mock }:
 
 buildPythonPackage rec {
   pname = "mailman-hyperkitty";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   '';
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mailman archiver plugin for HyperKitty";
     homepage = "https://gitlab.com/mailman/mailman-hyperkitty";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix
index d0d103bfbec5..84c97eb16e2e 100644
--- a/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages, withTwitter ? false}:
+{ lib, stdenv, python3Packages, withTwitter ? false}:
 
 python3Packages.buildPythonApplication rec {
   pname = "mailman-rss";
@@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec {
   };
 
   propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ]
-    ++ stdenv.lib.optional withTwitter python3Packages.twitter
+    ++ lib.optional withTwitter python3Packages.twitter
   ;
 
   # No tests in Pypi Tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mailman archive -> rss converter";
     homepage = "https://github.com/kyamagu/mailman-rss";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix
index 45dfc55ae9a8..280ee95b8301 100644
--- a/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }:
 
 buildPythonPackage rec {
   pname = "mailmanclient";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six httplib2 requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/mailman/";
     description = "REST client for driving Mailman 3";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/manhole/default.nix b/nixpkgs/pkgs/development/python-modules/manhole/default.nix
index 13b887f6ee4d..b9d57a7c0899 100644
--- a/nixpkgs/pkgs/development/python-modules/manhole/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/manhole/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     py.test -vv -k "not test_uwsgi"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ionelmc/python-manhole";
     description = "Debugging manhole for Python applications";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/manticore/default.nix b/nixpkgs/pkgs/development/python-modules/manticore/default.nix
new file mode 100644
index 000000000000..f9ca3afc4b15
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/manticore/default.nix
@@ -0,0 +1,109 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, capstone
+, crytic-compile
+, ply
+, prettytable
+, pyelftools
+, pyevmasm
+, pysha3
+, pyyaml
+, rlp
+, stdenv
+, unicorn
+, wasm
+, yices
+, pytestCheckHook
+, z3
+}:
+
+buildPythonPackage rec {
+  pname = "manticore";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "trailofbits";
+    repo = "manticore";
+    rev = version;
+    sha256 = "0z2nhfcraa5dx6srbrw8s11awh2la0x7d88yw9in8g548nv6qa69";
+  };
+
+  propagatedBuildInputs = [
+    crytic-compile
+    ply
+    prettytable
+    pyevmasm
+    pysha3
+    pyyaml
+    rlp
+    wasm
+  ] ++ lib.optionals (stdenv.isLinux) [
+    capstone
+    pyelftools
+    unicorn
+  ];
+
+  # Python API is not used in the code, only z3 from PATH
+  postPatch = ''
+    sed -ie s/z3-solver// setup.py
+  '';
+
+  checkInputs = [ pytestCheckHook ];
+  preCheck = "export PATH=${yices}/bin:${z3}/bin:$PATH";
+  pytestFlagsArray = [
+    "--ignore=tests/ethereum" # TODO: enable when solc works again
+    "--ignore=tests/ethereum_bench"
+  ] ++ lib.optionals (!stdenv.isLinux) [
+    "--ignore=tests/native"
+    "--ignore=tests/other/test_locking.py"
+  ];
+  disabledTests = [
+    # failing tests
+    "test_chmod"
+    "test_timeout"
+    "test_wasm_main"
+    # slow tests
+    "testmprotectFailSymbReading"
+    "test_ConstraintsForking"
+    "test_resume"
+    "test_symbolic"
+    "test_symbolic_syscall_arg"
+    "test_state_merging"
+    "test_decree"
+    "test_register_comparison"
+    "test_arguments_assertions_armv7"
+    "test_integration_basic_stdout"
+    "test_fclose_linux_amd64"
+    "test_fileio_linux_amd64"
+    "test_arguments_assertions_amd64"
+    "test_ioctl_bogus"
+    "test_ioctl_socket"
+    "test_brk_regression"
+    "test_basic_arm"
+    "test_logger_verbosity"
+    "test_profiling_data"
+    "test_integration_basic_stdin"
+    "test_getchar"
+    "test_ccmp_reg"
+    "test_ld1_mlt_structs"
+    "test_ccmp_imm"
+    "test_try_to_allocate_greater_than_last_space_memory_page_12"
+    "test_not_enough_memory_page_12"
+    "test_PCMPISTRI_30_symbolic"
+    "test_ld1_mlt_structs"
+    "test_time"
+    "test_implicit_call"
+    "test_trace"
+    "test_plugin"
+  ];
+
+  meta = with lib; {
+    description = "Symbolic execution tool for analysis of smart contracts and binaries";
+    homepage = "https://github.com/trailofbits/manticore";
+    changelog = "https://github.com/trailofbits/manticore/releases/tag/${version}";
+    license = licenses.agpl3Only;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ arturcygan ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/manuel/default.nix b/nixpkgs/pkgs/development/python-modules/manuel/default.nix
index 1f2c09d43709..59243783ecf9 100644
--- a/nixpkgs/pkgs/development/python-modules/manuel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/manuel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six ];
   checkInputs = [ zope_testing ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A documentation builder";
     homepage = "https://pypi.python.org/pypi/manuel";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix
index d21d09571ad1..54d0ade40f35 100644
--- a/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Custom Python plots on a Google Maps background";
     homepage = "https://github.com/tcassou/mapsplotlib";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 03187c00bef9..56c8fc5254d2 100644
--- a/nixpkgs/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -12,9 +12,8 @@ buildPythonPackage rec {
   format = "wheel";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit pname version format;
     sha256 = "1n7l3drdh3rm3320v98c9hhh37ljk9l861hyw18psca7jdd717n5";
-    format = "wheel";
   };
 
   propagatedBuildInputs = [ mozlog moznetwork mozprocess ];
diff --git a/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index 1aca4cb58468..b7d91cc16f52 100644
--- a/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ mozfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "System information utilities for Mozilla testing";
     homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/marisa/default.nix b/nixpkgs/pkgs/development/python-modules/marisa/default.nix
index 0fa5a98f7522..a30f7062df0a 100644
--- a/nixpkgs/pkgs/development/python-modules/marisa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marisa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig
 , isPy3k
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/bindings/python";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)";
     homepage    = "https://github.com/s-yata/marisa-trie";
     license     = with licenses; [ bsd2 lgpl2 ];
diff --git a/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix b/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix
index 41a634f4b9a5..e248bfe60cc4 100644
--- a/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An extension for python-markdown that makes writing trac-like macros easy";
     homepage = "https://github.com/wnielson/markdown-macros";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/markdown2/default.nix b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix
index 8add8f15298f..2f929012df89 100644
--- a/nixpkgs/pkgs/development/python-modules/markdown2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "markdown2";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "08a124043aa0ad36ba2136239547d5011a2b770278abb11a5609611e0040ea05";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast and complete Python implementation of Markdown";
     homepage =  "https://github.com/trentm/python-markdown2";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix b/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
index 6c2e6ab1b634..94cfb637a15e 100644
--- a/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, markdown,
+{ lib, buildPythonPackage, fetchPypi, markdown,
   pytest, pytestrunner, pytestcov, coverage }:
 
 buildPythonPackage rec {
@@ -22,10 +22,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestrunner pytestcov coverage ];
 
-  meta = {
+  meta = with lib; {
     description = "An extension to the Python Markdown package enabling superscript text";
     homepage = "https://github.com/jambonrose/markdown_superscript_extension";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
     broken = true; # unmaintained in nixpkgs, barely maintained in pypi, added 2020-11-29
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/markerlib/default.nix b/nixpkgs/pkgs/development/python-modules/markerlib/default.nix
index 256f395a8f8f..d039198b3938 100644
--- a/nixpkgs/pkgs/development/python-modules/markerlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markerlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/dholth/markerlib/";
     description = "A compiler for PEP 345 environment markers";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix
index 864e30214efa..6a6e06cd3177 100644
--- a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implements a XML/HTML/XHTML Markup safe string";
     homepage = "http://dev.pocoo.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix
index dd25860795ba..2c929d9a694e 100644
--- a/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
+{ lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
-, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
+, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
 , fetchpatch
 , enableGhostscript ? false, ghostscript ? null, gtk3
 , enableGtk3 ? false, cairo
@@ -39,20 +39,20 @@ buildPythonPackage rec {
 
   XDG_RUNTIME_DIR = "/tmp";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ which sphinx ]
-    ++ stdenv.lib.optional enableGhostscript ghostscript
-    ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
+    ++ lib.optional enableGhostscript ghostscript
+    ++ lib.optional stdenv.isDarwin [ Cocoa ];
 
   propagatedBuildInputs =
     [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
       libpng mock pytz ]
-    ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
-    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
-    ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
-    ++ stdenv.lib.optionals enableQt [ pyqt4 ]
-    ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ];
+    ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache
+    ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
+    ++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
+    ++ lib.optionals enableQt [ pyqt4 ]
+    ++ lib.optionals python.isPy2 [ functools32 subprocess32 ];
 
   setup_cfg = ./setup.cfg;
   preBuild = ''
@@ -67,17 +67,16 @@ buildPythonPackage rec {
   # script.
   postPatch =
     let
-      inherit (stdenv.lib.strings) substring;
-      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"'';
+      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
     in
-    stdenv.lib.optionalString enableTk
+    lib.optionalString enableTk
       "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
 
   # Matplotlib needs to be built against a specific version of freetype in
   # order for all of the tests to pass.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python plotting library, making publication quality plots";
     homepage    = "https://matplotlib.org/";
     maintainers = with maintainers; [ lovek323 veprbl ];
diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
index 5ad3c92393d8..bf21422b7721 100644
--- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
+{ lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
-, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection
+, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
 , certifi, pillow
 , enableGhostscript ? true, ghostscript ? null, gtk3
 , enableGtk3 ? false, cairo
@@ -32,18 +32,18 @@ buildPythonPackage rec {
 
   XDG_RUNTIME_DIR = "/tmp";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ which sphinx ]
-    ++ stdenv.lib.optional enableGhostscript ghostscript
-    ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
+    ++ lib.optional enableGhostscript ghostscript
+    ++ lib.optional stdenv.isDarwin [ Cocoa ];
 
   propagatedBuildInputs =
     [ cycler dateutil numpy pyparsing tornado freetype kiwisolver
       certifi libpng mock pytz pillow ]
-    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
-    ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
-    ++ stdenv.lib.optionals enableQt [ pyqt5 ];
+    ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
+    ++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
+    ++ lib.optionals enableQt [ pyqt5 ];
 
   setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg;
   preBuild = ''
@@ -58,17 +58,16 @@ buildPythonPackage rec {
   # script.
   postPatch =
     let
-      inherit (stdenv.lib.strings) substring;
-      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"'';
+      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
     in
-    stdenv.lib.optionalString enableTk
+    lib.optionalString enableTk
       "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
 
   # Matplotlib needs to be built against a specific version of freetype in
   # order for all of the tests to pass.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python plotting library, making publication quality plots";
     homepage    = "https://matplotlib.org/";
     maintainers = with maintainers; [ lovek323 veprbl ];
diff --git a/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
index 71092583d7fd..34c99a1ebe1c 100644
--- a/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Matrix Client-Server SDK";
     homepage = "https://github.com/matrix-org/matrix-python-sdk";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index 0944d5fa4cfe..2d890115a51d 100644
--- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.8.6";
+  version = "0.8.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e28d89cb8297ec36d78ef79507613c45ab3ab0bc709f1944ca5be349797f8f6b";
+    sha256 = "13669a0150370c96cabcff859fb4d17f4a539dc7c707ff0c99c00612e24f5447";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/maya/default.nix b/nixpkgs/pkgs/development/python-modules/maya/default.nix
index 6df4091664b3..9cd1019a0301 100644
--- a/nixpkgs/pkgs/development/python-modules/maya/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/maya/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch, buildPythonPackage
+{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage
 , dateparser, humanize, pendulum, ruamel_yaml, tzlocal }:
 
 buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Datetimes for Humans";
     homepage = "https://github.com/kennethreitz/maya";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mccabe/default.nix b/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
index 7a4605e68ced..2886a436a00d 100644
--- a/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   pname = "mccabe";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pytest pytestrunner ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "McCabe checker, plugin for flake8";
     homepage = "https://github.com/flintwork/mccabe";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mdp/default.nix b/nixpkgs/pkgs/development/python-modules/mdp/default.nix
index a93b00a0f91e..5313cd8e89aa 100644
--- a/nixpkgs/pkgs/development/python-modules/mdp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mdp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }:
 
 buildPythonPackage rec {
   pname = "MDP";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Tests disabled because of missing dependencies not in nix
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for building complex data processing software by combining widely used machine learning algorithms";
     homepage = "http://mdp-toolkit.sourceforge.net";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix
index 1d63a6e2b6a1..e2d2269a43c0 100644
--- a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , html5lib
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Stateful programmatic web browsing in Python";
     homepage = "https://github.com/python-mechanize/mechanize";
     license = "BSD-style";
diff --git a/nixpkgs/pkgs/development/python-modules/meinheld/default.nix b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix
index 2941505184de..ce7f23168007 100644
--- a/nixpkgs/pkgs/development/python-modules/meinheld/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, greenlet }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, greenlet }:
 
 buildPythonPackage rec {
   pname = "meinheld";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High performance asynchronous Python WSGI Web Server";
     homepage = "https://meinheld.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/meld3/default.nix b/nixpkgs/pkgs/development/python-modules/meld3/default.nix
index b2f514623315..8871bfdda463 100644
--- a/nixpkgs/pkgs/development/python-modules/meld3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/meld3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTML/XML templating engine used by supervisor";
     homepage = "https://github.com/supervisor/meld3";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/python-modules/meliae/default.nix b/nixpkgs/pkgs/development/python-modules/meliae/default.nix
index e02e72c1add5..d602e3d94fdc 100644
--- a/nixpkgs/pkgs/development/python-modules/meliae/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/meliae/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cython
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ cython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Memory Usage Analyzer";
     homepage = "https://launchpad.net/meliae";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/memcached/default.nix b/nixpkgs/pkgs/development/python-modules/memcached/default.nix
index 0e1ec2a2765c..b75bd31361de 100644
--- a/nixpkgs/pkgs/development/python-modules/memcached/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/memcached/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , fetchPypi
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python API for communicating with the memcached distributed memory object cache daemon";
     homepage = "http://www.tummy.com/Community/software/python-memcached/";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix b/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix
index 0dafde83c404..28ff6b7c5e31 100644
--- a/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python
 }:
 
@@ -16,7 +16,7 @@ python.pkgs.buildPythonPackage rec {
     matplotlib # needed for plotting memory usage
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A module for monitoring memory usage of a process";
     longDescription = ''
       This is a python module for monitoring memory consumption of a process as
diff --git a/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix b/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix
index 3b5536ed6fbc..bcbca3475485 100644
--- a/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }:
+{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }:
 
 buildPythonPackage rec {
   pname = "mergedeep";
-  version = "1.3.0";
+  version = "1.3.1";
   disabled = isPy27;
 
   # PyPI tarball doesn't include tests directory
@@ -10,14 +10,14 @@ buildPythonPackage rec {
     owner = "clarketm";
     repo = "mergedeep";
     rev = "v${version}";
-    sha256 = "1a0y26a04limiggjwqyyqpryxiylbqya74nq1bij75zhz42sa02b";
+    sha256 = "1ryccb64hg438y1wsjlfp4ciq05q4c6khwhllwdnndm8cbkbrgph";
   };
 
   checkInputs = [ pytest ];
   checkPhase = "pytest";
   pythonImportsCheck = [ "mergedeep" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/clarketm/mergedeep";
     description = "A deep merge function for python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mesa/default.nix b/nixpkgs/pkgs/development/python-modules/mesa/default.nix
index 78c0f1656a3c..5b97f972dad1 100644
--- a/nixpkgs/pkgs/development/python-modules/mesa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mesa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , cookiecutter, networkx , pandas, tornado, tqdm
 , pytest }:
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/projectmesa/mesa";
     description = "An agent-based modeling (or ABM) framework in Python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/metaphone/default.nix b/nixpkgs/pkgs/development/python-modules/metaphone/default.nix
index a9a4409c0de6..1c8557f15c41 100644
--- a/nixpkgs/pkgs/development/python-modules/metaphone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/metaphone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "metaphone";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/oubiwann/metaphone";
     description = "A Python implementation of the metaphone and double metaphone algorithms";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix
index d27fd8620459..86deecb5d4f2 100644
--- a/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix
@@ -28,8 +28,8 @@ buildPythonPackage rec {
     sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3";
   };
 
-  disabled = isPyPy || stdenv.lib.versionOlder django.version "1.11"
-    || stdenv.lib.versionAtLeast django.version "2.0";
+  disabled = isPyPy || lib.versionOlder django.version "1.11"
+    || lib.versionAtLeast django.version "2.0";
 
   buildInputs = [ pyflakes pep8 ];
   propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ];
diff --git a/nixpkgs/pkgs/development/python-modules/micawber/default.nix b/nixpkgs/pkgs/development/python-modules/micawber/default.nix
index 0240a21aca33..9d31dd378ac4 100644
--- a/nixpkgs/pkgs/development/python-modules/micawber/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/micawber/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }:
 
 buildPythonPackage rec {
   pname = "micawber";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ beautifulsoup4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://micawber.readthedocs.io/en/latest/";
     description = "A small library for extracting rich content from urls";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/midiutil/default.nix b/nixpkgs/pkgs/development/python-modules/midiutil/default.nix
index 0b9945f97d3d..5ac8d917d75d 100644
--- a/nixpkgs/pkgs/development/python-modules/midiutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/midiutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "MIDIUtil";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "02m9sqv36zrzgz5zg2w9qmz8snzlm27yg3ways2hgipgs4xriykr";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/MarkCWirt/MIDIUtil";
     description = "A pure python library for creating multi-track MIDI files";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/milc/default.nix b/nixpkgs/pkgs/development/python-modules/milc/default.nix
index adee40650bce..dc824d565474 100644
--- a/nixpkgs/pkgs/development/python-modules/milc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/milc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , appdirs
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     ./hello | grep "Hello, World"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An Opinionated Batteries-Included Python 3 CLI Framework";
     homepage = "https://milc.clueboard.co";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/minidump/default.nix b/nixpkgs/pkgs/development/python-modules/minidump/default.nix
new file mode 100644
index 000000000000..346430d23926
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/minidump/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "minidump";
+  version = "0.0.13";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w93yh2dz7llxjgv0jn7gf9praz7d5952is7idgh0lsyj67ri2ms";
+  };
+
+  # Upstream doesn't have tests
+  doCheck = false;
+  pythonImportsCheck = [ "minidump" ];
+
+  meta = with lib; {
+    description = "Python library to parse and read Microsoft minidump file format";
+    homepage = "https://github.com/skelsec/minidump";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix
new file mode 100644
index 000000000000..51ee529e234b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, asn1crypto
+, asysocks
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "minikerberos";
+  version = "0.2.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16bbyihap2ygsi7xg58rwdn14ms1j0jy2kxbdljpg39s9q1rz6ps";
+  };
+
+  propagatedBuildInputs = [
+    asn1crypto
+    asysocks
+  ];
+
+  # no tests are published: https://github.com/skelsec/minikerberos/pull/5
+  doCheck = false;
+  pythonImportsCheck = [ "minikerberos" ];
+
+  meta = with lib; {
+    description = "Kerberos manipulation library in Python";
+    homepage = "https://github.com/skelsec/minikerberos";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/minimock/default.nix b/nixpkgs/pkgs/development/python-modules/minimock/default.nix
index 6275d92b0559..f154eabb744c 100644
--- a/nixpkgs/pkgs/development/python-modules/minimock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/minimock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , nose
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     ./test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A minimalistic mocking library for python";
     homepage = "https://pypi.python.org/pypi/MiniMock";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix b/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix
index b3c559c84622..7178405ab74c 100644
--- a/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "miniupnpc";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "miniUPnP client";
     homepage = "http://miniupnp.free.fr/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
index d22ce7df128a..dd351931e062 100644
--- a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , isPy27
@@ -107,7 +107,7 @@ buildPythonPackage rec {
     requests
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Man-in-the-middle proxy";
     homepage    = "https://mitmproxy.org/";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
index e86a27e1657f..89cc8f991466 100644
--- a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
 , alembic
 , click
 , cloudpickle
@@ -61,7 +61,7 @@ buildPythonPackage rec {
     gunicorn
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mlflow/mlflow";
     description = "Open source platform for the machine learning lifecycle";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/mlrose/default.nix b/nixpkgs/pkgs/development/python-modules/mlrose/default.nix
index 5fd39d9b347a..c3c7c55f292d 100644
--- a/nixpkgs/pkgs/development/python-modules/mlrose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mlrose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }:
+{ lib, stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }:
 
 buildPythonPackage rec {
   pname = "mlrose";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sed -i 's,sklearn,scikit-learn,g' setup.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Machine Learning, Randomized Optimization and SEarch";
     homepage    = "https://github.com/gkhayes/mlrose";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix
index 2bfd12249101..94af156d9afb 100644
--- a/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     joblib
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library of Python tools and extensions for data science";
     homepage = "https://github.com/rasbt/mlxtend";
     license= licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mmpython/default.nix b/nixpkgs/pkgs/development/python-modules/mmpython/default.nix
index dbb6590eee6d..e40fc197a5bf 100644
--- a/nixpkgs/pkgs/development/python-modules/mmpython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mmpython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPyPy
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   disabled = isPyPy || isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Media Meta Data retrieval framework";
     homepage = "https://sourceforge.net/projects/mmpython/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/nixpkgs/pkgs/development/python-modules/mocket/default.nix
index f7e97bb955c3..2102718ab6ef 100644
--- a/nixpkgs/pkgs/development/python-modules/mocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mocket/default.nix
@@ -5,23 +5,25 @@
 , python
 , python_magic
 , six
-, urllib3 }:
+, urllib3
+, pytestCheckHook
+, pytest-mock
+, aiohttp
+, gevent
+, redis
+, requests
+, sure
+}:
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.9.35";
+  version = "3.9.39";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d822a2adfd8e028a2856785fbfe78e7dd8c7a3b623516298aef6d42a4c9149d1";
+    sha256 = "1mbcgfy1vfwwzn54vkq8xmfzdyc28brfpqk4d55r3a6abwwsn6a4";
   };
 
-  patchPhase = ''
-    sed -iE "s,python-magic==.*,python-magic," requirements.txt
-    sed -iE "s,urllib3==.*,urllib3," requirements.txt
-    substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]"
-  '';
-
   propagatedBuildInputs = [
     decorator
     http-parser
@@ -30,8 +32,36 @@ buildPythonPackage rec {
     six
   ] ++ lib.optionals (isPy27) [ six ];
 
-  # Pypi has no runtests.py, github has no requirements.txt. No way to test, no way to install.
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+    pytest-mock
+    aiohttp
+    gevent
+    redis
+    requests
+    sure
+  ];
+
+  pytestFlagsArray = [
+    "--ignore=tests/main/test_pook.py" # pook is not packaged
+    "--ignore=tests/main/test_redis.py" # requires a live redis instance
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    # uses IsolatedAsyncioTestCase which is only available >= 3.8
+    "--ignore=tests/tests38/test_http_aiohttp.py"
+  ];
+
+  disabledTests = [
+    # tests that require network access (like DNS lookups)
+    "test_truesendall"
+    "test_truesendall_with_chunk_recording"
+    "test_truesendall_with_gzip_recording"
+    "test_truesendall_with_recording"
+    "test_wrongpath_truesendall"
+    "test_truesendall_with_dump_from_recording"
+    "test_truesendall_with_recording_https"
+    "test_truesendall_after_mocket_session"
+    "test_real_request_session"
+  ];
 
   pythonImportsCheck = [ "mocket" ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/mockito/default.nix b/nixpkgs/pkgs/development/python-modules/mockito/default.nix
index 1238388a91c0..d7ca86b8ea30 100644
--- a/nixpkgs/pkgs/development/python-modules/mockito/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mockito/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
 
 buildPythonPackage rec {
   version = "1.2.2";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "d6b3aca6cdb92bbd47e19ebdb1a0b84ef23ab874eae5c6d505323c8657257c06";
   };
 
-  propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ];
+  propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ];
   checkInputs = [ pytest numpy ];
 
   # tests are no longer packaged in pypi tarball
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Spying framework";
     homepage = "https://github.com/kaste/mockito-python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix
index c7b1071954d2..a7862ef5c678 100644
--- a/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pillow
@@ -17,10 +17,10 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pillow ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for building interactive maps";
     homepage = "http://modestmaps.com";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/python-modules/mongodict/default.nix b/nixpkgs/pkgs/development/python-modules/mongodict/default.nix
index 932160bb9fad..467093e84ceb 100644
--- a/nixpkgs/pkgs/development/python-modules/mongodict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mongodict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pymongo
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pymongo ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MongoDB-backed Python dict-like interface";
     homepage = "https://github.com/turicas/mongodict/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
index 3ac24f7430d9..c8969d9e2d4d 100644
--- a/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mongoengine";
-  version = "0.21.0";
+  version = "0.22.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "MongoEngine";
     repo = pname;
     rev = "v${version}";
-    sha256 = "02amfdirdw3nc0kgiyax7yndk5b65g83kbjvwwxbgnlcrb9vjzcd";
+    sha256 = "14n9rl8w3i1fq96f3jzsg7gy331d7fmrapva6m38ih53rnf38bdf";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/monotonic/default.nix b/nixpkgs/pkgs/development/python-modules/monotonic/default.nix
index 38a25841c7b6..e93bf206edaa 100644
--- a/nixpkgs/pkgs/development/python-modules/monotonic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/monotonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,14 +12,14 @@ buildPythonPackage rec {
     sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0";
   };
 
-  __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
+  __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
 
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     substituteInPlace monotonic.py --replace \
       "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of time.monotonic() for Python 2 & < 3.3";
     homepage = "https://github.com/atdt/monotonic";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/moretools/default.nix b/nixpkgs/pkgs/development/python-modules/moretools/default.nix
index c9fd953f350e..d39f67a73113 100644
--- a/nixpkgs/pkgs/development/python-modules/moretools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moretools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , six, pathpy, zetup, pytest
 , decorator }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   checkInputs = [ six pathpy pytest ];
   propagatedBuildInputs = [ decorator ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Many more basic tools for python 2/3 extending itertools, functools, operator and collections
     '';
diff --git a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix
index 1e08d5dc3af2..8bc984a52879 100644
--- a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
@@ -39,11 +39,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     numpy decorator imageio imageio-ffmpeg tqdm requests proglog
-  ] ++ (stdenv.lib.optionals advancedProcessing [
+  ] ++ (lib.optionals advancedProcessing [
     opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl
   ]);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Video editing with Python";
     homepage = "https://zulko.github.io/moviepy/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mox/default.nix b/nixpkgs/pkgs/development/python-modules/mox/default.nix
index 3537d936bb61..94d4791224df 100644
--- a/nixpkgs/pkgs/development/python-modules/mox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pymox.readthedocs.io/";
     description = "A mock object framework for Python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/mox3/default.nix b/nixpkgs/pkgs/development/python-modules/mox3/default.nix
index 70b982ef4b86..77a02ae8a733 100644
--- a/nixpkgs/pkgs/development/python-modules/mox3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mox3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mock object framework for Python";
     homepage = "https://docs.openstack.org/mox3/latest/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix b/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix
index 780a162a916e..55afb1773fe3 100644
--- a/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pyramid
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false; # too many dependencies and conflicting versions; I (nadrieril) gave up
   propagatedBuildInputs = [ pyramid simplejson konfig ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mozilla-services/mozservices";
     description = "Various utilities for Mozilla apps";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/mpd/default.nix b/nixpkgs/pkgs/development/python-modules/mpd/default.nix
index 5ae3e2b41ec7..212e6b5f13c4 100644
--- a/nixpkgs/pkgs/development/python-modules/mpd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "02812eba1d2e0f46e37457f5a6fa23ba203622e4bcab0a19b265e66b08cd21b4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An MPD (Music Player Daemon) client library written in pure Python";
     homepage = "http://jatreuman.indefero.net/p/python-mpd/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/mpd2/default.nix b/nixpkgs/pkgs/development/python-modules/mpd2/default.nix
index 3573c7987c59..7fdf64c0e4b7 100644
--- a/nixpkgs/pkgs/development/python-modules/mpd2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpd2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "python-mpd2";
-  version = "3.0.1";
+  version = "3.0.3";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "772fa6861273bb9f363a97987c2c45ca3965eb770570f1f02566efec9c89fc5f";
+    sha256 = "1ikvn2qv6cnbjscpbk6hhsqg34h832mxgg6hp1mf4d8d6nwdx4sn";
   };
 
   buildInputs = [ mock ];
@@ -23,11 +23,11 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest mpd.tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python client module for the Music Player Daemon";
     homepage = "https://github.com/Mic92/python-mpd2";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ rvl mic92 ];
+    maintainers = with maintainers; [ rvl mic92 hexa ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix
index c16c4719a34d..058133665f4a 100644
--- a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }:
+{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }:
 
 buildPythonPackage rec {
   pname = "mpi4py";
@@ -43,10 +43,9 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ mpi openssh ];
 
-  meta = {
-    description =
-      "Python bindings for the Message Passing Interface standard";
+  meta = with lib; {
+    description = "Python bindings for the Message Passing Interface standard";
     homepage = "https://bitbucket.org/mpi4py/mpi4py/";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/mpmath/default.nix b/nixpkgs/pkgs/development/python-modules/mpmath/default.nix
index 1cbb8b04130b..86d55b34f044 100644
--- a/nixpkgs/pkgs/development/python-modules/mpmath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpmath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://mpmath.org/";
     description = "A pure-Python library for multiprecision floating arithmetic";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mpv/default.nix b/nixpkgs/pkgs/development/python-modules/mpv/default.nix
index 6dab88e0286c..0ff66fa8132e 100644
--- a/nixpkgs/pkgs/development/python-modules/mpv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27
 , mpv
 }:
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # tests impure, will error if it can't load libmpv.so
   checkPhase = "${python.interpreter} -c 'import mpv'";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python interface to the mpv media player";
     homepage = "https://github.com/jaseg/python-mpv";
     license = licenses.agpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/mrbob/default.nix b/nixpkgs/pkgs/development/python-modules/mrbob/default.nix
index 7074dab739be..64d0ce13a86d 100644
--- a/nixpkgs/pkgs/development/python-modules/mrbob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mrbob/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six
+{ buildPythonPackage, lib, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six
 , fetchPypi
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ jinja2 six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/domenkozar/mr.bob";
     description = "A tool to generate code skeletons from templates";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/msal/default.nix b/nixpkgs/pkgs/development/python-modules/msal/default.nix
index 6bbdc6f5e5f9..37266df5f216 100644
--- a/nixpkgs/pkgs/development/python-modules/msal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msal/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.6.0";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15mx1fakz9c5qrrspsckd3yr3l5lac0pbjq8v65r26n3203xx5f9";
+    sha256 = "1dcc737ca517df53438bc9a3fae97f17d93d7a93fa1389e6bc44e82eee81ab83";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
index ad612550d7e8..56bfa06a628a 100644
--- a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cython
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     ${python.interpreter} msgpack_numpy.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Numpy data type serialization using msgpack";
     homepage = "https://github.com/lebedov/msgpack-numpy";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/nixpkgs/pkgs/development/python-modules/msldap/default.nix
new file mode 100644
index 000000000000..ea2ae26c96bc
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/msldap/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, asn1crypto
+, asysocks
+, minikerberos
+, prompt_toolkit
+, tqdm
+, winacl
+, winsspi
+}:
+
+buildPythonPackage rec {
+  pname = "msldap";
+  version = "0.3.24";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0q9bhw0lfw9iykjdsqz62ipy3ihfz6kprzw5sc7v1678l2pvs84j";
+  };
+
+  propagatedBuildInputs = [
+    asn1crypto
+    asysocks
+    minikerberos
+    prompt_toolkit
+    tqdm
+    winacl
+    winsspi
+  ];
+
+  # Project doesn't have tests
+  doCheck = false;
+  pythonImportsCheck = [ "msldap" ];
+
+  meta = with lib; {
+    description = "Python LDAP library for auditing MS AD";
+    homepage = "https://github.com/skelsec/msldap";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/nixpkgs/pkgs/development/python-modules/msrest/default.nix
index 1f21778f7db8..21b93bf5bfe3 100644
--- a/nixpkgs/pkgs/development/python-modules/msrest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msrest/default.nix
@@ -18,7 +18,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.6.18";
+  version = "0.6.19";
   pname = "msrest";
 
   # no tests in PyPI tarball
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "Azure";
     repo = "msrest-for-python";
     rev = "v${version}";
-    sha256 = "0j0dbca47qnxnhpfgj3v5bglg8dpx2cy1psix8kp3ldrkf6rjwdb";
+    sha256 = "sha256-hcUJrWw5EU0aO5Gyhn5+LmuRQN9Bom59cTz3maQ0jvw=";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/msrplib/default.nix b/nixpkgs/pkgs/development/python-modules/msrplib/default.nix
index ffb87ff48ee0..16c4cc0f43ae 100644
--- a/nixpkgs/pkgs/development/python-modules/msrplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msrplib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchdarcs
 , eventlib
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ eventlib application gnutls ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/AGProjects/python-msrplib";
     description = "Client library for MSRP protocol and its relay extension (RFC 4975 and RFC4976)";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/mulpyplexer/default.nix b/nixpkgs/pkgs/development/python-modules/mulpyplexer/default.nix
new file mode 100644
index 000000000000..ee27dc20766d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/mulpyplexer/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "mulpyplexer";
+  version = "0.09";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c5xzci1djy1yi9hxxh8g67l6ms8r7ad7ja20pv8hfbdysdrwkhl";
+  };
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "mulpyplexer" ];
+
+  meta = with lib; {
+    description = "Multiplex interactions with lists of Python objects";
+    homepage = "https://github.com/zardus/mulpyplexer";
+    license = with licenses; [ bsd2 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix b/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix
index a094b373f8f3..f76cde9bec53 100644
--- a/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "multi_key_dict";
     homepage = "https://github.com/formiaczek/multi_key_dict";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/munch/default.nix b/nixpkgs/pkgs/development/python-modules/munch/default.nix
index 0d7d6f7c633a..2ff2ce4cefb9 100644
--- a/nixpkgs/pkgs/development/python-modules/munch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/munch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A dot-accessible dictionary (a la JavaScript objects)";
     license = licenses.mit;
     homepage = "https://github.com/Infinidat/munch";
diff --git a/nixpkgs/pkgs/development/python-modules/munkres/default.nix b/nixpkgs/pkgs/development/python-modules/munkres/default.nix
index 3df0e2b01f3b..cb88b666cfa0 100644
--- a/nixpkgs/pkgs/development/python-modules/munkres/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/munkres/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://bmc.github.com/munkres/";
     description = "Munkres algorithm for the Assignment Problem";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
index 2bd156bd63fd..68aa29a6edeb 100644
--- a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cython
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     pytest murmurhash
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cython bindings for MurmurHash2";
     homepage = "https://github.com/explosion/murmurhash";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix b/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix
index 7ae3445377e6..02ec38157117 100644
--- a/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     rm test/test_submit.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://python-musicbrainzngs.readthedocs.org/";
     description = "Python bindings for musicbrainz NGS webservice";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/mutag/default.nix b/nixpkgs/pkgs/development/python-modules/mutag/default.nix
index 273a009a1f41..45725c0fabb7 100644
--- a/nixpkgs/pkgs/development/python-modules/mutag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mutag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ pyparsing ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/aroig/mutag";
     description = "A script to change email tags in a mu indexed maildir";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/muttils/default.nix b/nixpkgs/pkgs/development/python-modules/muttils/default.nix
index 01e789fb7594..1d6b5ce8df44 100644
--- a/nixpkgs/pkgs/development/python-modules/muttils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/muttils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage {
   # Tests don't work
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities for use with console mail clients, like mutt";
     homepage = "https://www.blacktrash.org/hg/muttils";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/mwclient/default.nix b/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
index 644f01fdb1f2..ac9373b574ac 100644
--- a/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , requests, requests_oauthlib, six
 , pytest, pytestcache, pytestcov, responses, mock
 }:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client library to the MediaWiki API";
     license = licenses.mit;
     homepage = "https://github.com/mwclient/mwclient";
diff --git a/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix
index cfcbdc2d0ac3..0a81fd58d7ee 100644
--- a/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "9229193ee719568d482192d9d913b3c4bb96af7c589d6c31ed4a62caf5054278";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Dependencies for mwlib markup";
     homepage = "http://pediapress.com/code/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix
index 21820d95c7fa..d27de2ed45cc 100644
--- a/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mwlib
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   buildInputs = [ mwlib mwlib-ext pygments ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate pdfs from mediawiki markup";
     homepage = "http://pediapress.com/code/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mwlib/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib/default.nix
index 55a19e1a6da3..e9defe3ee148 100644
--- a/nixpkgs/pkgs/development/python-modules/mwlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   # Tests are in build directory but we need extension modules that are in $out
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for parsing MediaWiki articles and converting them to different output formats";
     homepage = "http://pediapress.com/code/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
index 791ffe0b1ea3..0546688b867e 100644
--- a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "75787b6ab140ab267b313d37d045f3276f5dc6a9741074eddfbabc1635cb2efc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MWParserFromHell is a parser for MediaWiki wikicode";
     homepage = "https://mwparserfromhell.readthedocs.io/en/latest/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mxnet/default.nix b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
index 65eb2d44ffcc..2ad3b9fd6df1 100644
--- a/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , pkgs
 , requests
@@ -14,15 +14,13 @@ buildPythonPackage {
   buildInputs = [ pkgs.mxnet ];
   propagatedBuildInputs = [ requests numpy graphviz ];
 
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ pkgs.mxnet ];
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ];
 
   doCheck = !isPy3k;
 
   postPatch = ''
     substituteInPlace python/setup.py \
-      --replace "graphviz<0.9.0," "graphviz" \
-      --replace "numpy<=1.15.2," "numpy" \
-      --replace "requests<2.19.0," "requests"
+      --replace "graphviz<0.9.0," "graphviz"
   '';
 
   preConfigure = ''
diff --git a/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix b/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
index 2af73f2d8974..c6956b828dbc 100644
--- a/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }:
 
 buildPythonPackage rec {
   pname = "mypgoclient";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   doCheck = (!stdenv.isDarwin);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A gpodder.net client library";
     longDescription = ''
         The mygpoclient library allows developers to utilize a Pythonic interface
diff --git a/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix
index 3e0ab2cf1820..f444ba039c20 100644
--- a/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonApplication, protobuf }:
+{ lib, stdenv, fetchPypi, buildPythonApplication, protobuf }:
 
 buildPythonApplication rec {
   pname = "mypy-protobuf";
@@ -11,7 +11,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ protobuf ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate mypy stub files from protobuf specs";
     homepage = "https://github.com/dropbox/mypy-protobuf";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/nixpkgs/pkgs/development/python-modules/mypy/default.nix
index 1b8d763eb6fe..4bea992f6ba8 100644
--- a/nixpkgs/pkgs/development/python-modules/mypy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mypy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, typed-ast, psutil, isPy3k
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, typed-ast, psutil, isPy3k
 , mypy-extensions
 , typing-extensions
 , fetchpatch
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   # is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
   MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Optional static typing for Python";
     homepage    = "http://www.mypy-lang.org";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix
index b3bb68a53b72..21a3ee21dbd9 100644
--- a/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix
+++ b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "mypy-extensions";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Experimental type system extensions for programs checked with the mypy typechecker";
     homepage    = "http://www.mypy-lang.org";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
index d3465110194e..692c021a64ff 100644
--- a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
@@ -4,13 +4,13 @@ let
   py = python;
 in buildPythonPackage rec {
   pname = "mysql-connector";
-  version = "8.0.22";
+  version = "8.0.23";
 
   src = fetchFromGitHub {
     owner = "mysql";
     repo = "mysql-connector-python";
     rev = version;
-    sha256 = "084q8x86ywgxgpsgdid8y9rjjys06146dqinfpmlggjswbq9kl0d";
+    sha256 = "sha256-YVtcHbDsW1mTjbCY1YhqgtqWv4keKlLExn2AhlOzNEw=";
   };
 
   propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
diff --git a/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix b/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
index b844d9e2c025..9d91543b7ff3 100644
--- a/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
 
 buildPythonPackage rec {
   pname = "mysqlclient";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python interface to MySQL";
     homepage = "https://github.com/PyMySQL/mysqlclient-python";
     license = licenses.gpl1;
diff --git a/nixpkgs/pkgs/development/python-modules/namebench/default.nix b/nixpkgs/pkgs/development/python-modules/namebench/default.nix
index 44b590bae2cf..eefdcce79901 100644
--- a/nixpkgs/pkgs/development/python-modules/namebench/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/namebench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , isPyPy
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     sed -i "s|import os|import os; os.chdir(\"$out/namebench\")|" "$out/bin/namebench.py"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/namebench"; # Formerly https://code.google.com/archive/p/namebench/
     description = "Find fastest DNS servers available";
     license = with licenses; [
diff --git a/nixpkgs/pkgs/development/python-modules/nameparser/default.nix b/nixpkgs/pkgs/development/python-modules/nameparser/default.nix
index 3384ed67c1ef..0c8e442affcf 100644
--- a/nixpkgs/pkgs/development/python-modules/nameparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nameparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   LC_ALL="en_US.UTF-8";
   buildInputs = [ glibcLocales ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple Python module for parsing human names into their individual components";
     homepage = "https://github.com/derek73/python-nameparser";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix b/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
index ea15da78bfb5..f6131cd53095 100644
--- a/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "nanoleaf";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python interface for Nanoleaf Aurora lighting";
     homepage = "https://github.com/software-2/nanoleaf";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix
index 29d71d0243f9..4cf33fb2074c 100644
--- a/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }:
 
 buildPythonPackage {
   pname = "nanomsg-python";
@@ -16,7 +16,7 @@ buildPythonPackage {
   # Tests requires network connections
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bindings for nanomsg";
     homepage = "https://github.com/tonysimpson/nanomsg-python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nassl/default.nix b/nixpkgs/pkgs/development/python-modules/nassl/default.nix
index 0df4b0218b59..908ecff8c177 100644
--- a/nixpkgs/pkgs/development/python-modules/nassl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nassl/default.nix
@@ -5,13 +5,15 @@
 , pkgsStatic
 , openssl
 , invoke
-, pytest
 , tls-parser
 , cacert
+, pytestCheckHook
 }:
 
 let
-  zlibStatic = pkgsStatic.zlib;
+  zlibStatic = pkgsStatic.zlib.override {
+    splitStaticOutput = false;
+  };
   nasslOpensslArgs = {
     static = true;
     enableSSL2 = true;
@@ -34,17 +36,16 @@ let
   opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs (
     oldAttrs: rec {
       name = "openssl-${version}";
-      version = "1.1.1";
+      version = "1.1.1h";
       src = fetchurl {
         url = "https://www.openssl.org/source/${name}.tar.gz";
-        sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
+        sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
       };
       configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [
         "enable-weak-ssl-ciphers"
         "enable-tls1_3"
         "no-async"
       ];
-      patches = [ ./nix-ssl-cert-file.patch ];
       buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
     }
   );
@@ -66,32 +67,36 @@ let
 in
 buildPythonPackage rec {
   pname = "nassl";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "nabla-c0d3";
     repo = pname;
     rev = version;
-    sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z";
+    sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci";
   };
 
-  postPatch = ''
-    mkdir -p deps/openssl-OpenSSL_1_0_2e/
+  postPatch = let
+    legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version;
+    modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version;
+    zlibVersion = zlibStatic.version;
+  in ''
+    mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
     cp ${opensslLegacyStatic.out}/lib/libssl.a \
       ${opensslLegacyStatic.out}/lib/libcrypto.a \
-      deps/openssl-OpenSSL_1_0_2e/
-    ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include
-    ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps
+      deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
+    ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include
+    ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps
 
-    mkdir -p deps/openssl-OpenSSL_1_1_1/
+    mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
     cp ${opensslStatic.out}/lib/libssl.a \
       ${opensslStatic.out}/lib/libcrypto.a \
-      deps/openssl-OpenSSL_1_1_1/
-    ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include
-    ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps
+      deps/openssl-OpenSSL_${modernOpenSSLVersion}/
+    ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
+    ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps
 
-    mkdir -p deps/zlib-1.2.11/
-    cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/
+    mkdir -p deps/zlib-${zlibVersion}/
+    cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
   '';
 
   propagatedBuildInputs = [ tls-parser ];
@@ -103,7 +108,7 @@ buildPythonPackage rec {
     invoke package.wheel
   '';
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytestCheckHook ];
 
   checkPhase = ''
     # Skip online tests
diff --git a/nixpkgs/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch b/nixpkgs/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch
deleted file mode 100644
index 893fb3eb6643..000000000000
--- a/nixpkgs/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c
---- openssl-1.0.2j-orig/crypto/x509/by_file.c	2016-09-26 11:49:07.000000000 +0200
-+++ openssl-1.0.2j/crypto/x509/by_file.c	2016-10-13 16:54:31.400288302 +0200
-@@ -97,7 +97,9 @@
-     switch (cmd) {
-     case X509_L_FILE_LOAD:
-         if (argl == X509_FILETYPE_DEFAULT) {
--            file = getenv(X509_get_default_cert_file_env());
-+            file = getenv("NIX_SSL_CERT_FILE");
-+            if (!file)
-+                file = getenv(X509_get_default_cert_file_env());
-             if (file)
-                 ok = (X509_load_cert_crl_file(ctx, file,
-                                               X509_FILETYPE_PEM) != 0);
diff --git a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
index f37cb3bc58f9..d846511eb3f4 100644
--- a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder,
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder,
   async_generator, traitlets, nbformat, nest-asyncio, jupyter_client,
   pytest, xmltodict, nbconvert, ipywidgets
 , doCheck ? true
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
   propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jupyter/nbclient";
     description = "A client library for executing notebooks";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix
index fb1945ddf427..28946bd1a6e7 100644
--- a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }:
+{ lib, stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }:
 
 let
   pname = "nbxmpp";
@@ -18,7 +18,7 @@ in buildPythonPackage {
   checkInputs = [ gobject-introspection libsoup pygobject3 ];
   propagatedBuildInputs = [ idna pyopenssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
     description = "Non-blocking Jabber/XMPP module";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
index 203ffc656806..f933587dcad1 100644
--- a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , paramiko
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   #Unfortunately the test hangs at te end
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ncclient/ncclient";
     description = "Python library for NETCONF clients";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix b/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix
index 687f589fe1af..7768614a5d12 100644
--- a/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pyopenssl
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # uses networking
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cedadev/ndg_httpsclient/";
     description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix b/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix
index 0a6e5635a4fa..75fc5373b4c5 100644
--- a/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , numpy
@@ -26,7 +27,7 @@ buildPythonPackage {
   postInstall = ''
     mkdir $out/include
     cp python/ndtypes/*.h $out/include
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so
   '';
 
diff --git a/nixpkgs/pkgs/development/python-modules/netaddr/default.nix b/nixpkgs/pkgs/development/python-modules/netaddr/default.nix
index 95f567a6c0c6..7f4aab9c3714 100644
--- a/nixpkgs/pkgs/development/python-modules/netaddr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netaddr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -18,11 +18,11 @@ buildPythonPackage rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ];
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ];
 
   checkInputs = [ glibcLocales pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://netaddr.readthedocs.io/en/latest/";
     downloadPage = "https://github.com/netaddr/netaddr/releases";
     changelog = "https://netaddr.readthedocs.io/en/latest/changes.html";
diff --git a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
index 33c7d307b037..456124b19bd3 100644
--- a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   CURL_DIR=curl.dev;
   JPEG_DIR=libjpeg.dev;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interface to netCDF library (versions 3 and 4)";
     homepage = "https://pypi.python.org/pypi/netCDF4";
     license = licenses.free;  # Mix of license (all MIT* like)
diff --git a/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix
index a26a212d8f7e..e546ac6cd579 100644
--- a/nixpkgs/pkgs/development/python-modules/netdisco/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }:
 
 buildPythonPackage rec {
   pname = "netdisco";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library to scan local network for services and devices";
     homepage = "https://github.com/home-assistant/netdisco";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/netifaces/default.nix b/nixpkgs/pkgs/development/python-modules/netifaces/default.nix
index 94cdb8290133..07dc63c2181f 100644
--- a/nixpkgs/pkgs/development/python-modules/netifaces/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netifaces/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://alastairs-place.net/projects/netifaces/";
     description = "Portable access to network interfaces from Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix b/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix
index 1d258effda7d..b81398f918cd 100644
--- a/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   #No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interfaces and utilities for the NEURON simulator and analysis of neural data";
     maintainers = [ maintainers.nico202 ];
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nevow/default.nix b/nixpkgs/pkgs/development/python-modules/nevow/default.nix
index 301d2c7a3947..356754fdeac8 100644
--- a/nixpkgs/pkgs/development/python-modules/nevow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nevow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }:
+{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }:
 
 buildPythonPackage rec {
   pname = "Nevow";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     trial formless nevow
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Nevow, a web application construction kit for Python";
     longDescription = ''
       Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
diff --git a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
index e67bdcc31946..91195abce1cd 100644
--- a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
@@ -34,6 +34,5 @@ buildPythonPackage rec {
     description = "Access a multitude of neuroimaging data formats";
     license = licenses.mit;
     maintainers = with maintainers; [ ashgillman ];
-    platforms = platforms.x86_64;  # https://github.com/nipy/nibabel/issues/861
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix b/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix
index 937e6c1c91bd..9d916cc9324d 100644
--- a/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   # Fixture "x_series_device" called directly. Fixtures are not meant to be called directly
   doCheck = false;
 
-  pythonCheckImports = [
+  pythonImportsCheck = [
     "nidaqmx.task"
   ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/nimfa/default.nix b/nixpkgs/pkgs/development/python-modules/nimfa/default.nix
index bd3e92e90dbc..dc889440aa41 100644
--- a/nixpkgs/pkgs/development/python-modules/nimfa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nimfa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   checkInputs = [ matplotlib pytest ];
   doCheck = !isPy3k;  # https://github.com/marinkaz/nimfa/issues/42
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Nonnegative matrix factorization library";
     homepage = "http://nimfa.biolab.si";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/nine/default.nix b/nixpkgs/pkgs/development/python-modules/nine/default.nix
index e0d1cb173ea7..1747332ed5a2 100644
--- a/nixpkgs/pkgs/development/python-modules/nine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "e8a96b6326341637d25ca9c257c1d2af4033c957946438d9d37bf6eb798d3bbe";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Let's write Python 3 right now!";
     homepage = "https://github.com/nandoflorestan/nine";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/python-modules/nipy/default.nix b/nixpkgs/pkgs/development/python-modules/nipy/default.nix
index fef24e837d1b..cb7871aed610 100644
--- a/nixpkgs/pkgs/development/python-modules/nipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nipy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "1pn731nsczrx198i2gadffqmfbhviglrclv6xxwhnbv6w5hfs2yk";
   };
 
-  buildInputs = stdenv.lib.optional doCheck [ nose ];
+  buildInputs = lib.optional doCheck [ nose ];
   propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ];
 
   checkPhase = ''    # wants to be run in a different directory
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   # nipy.tests.test_scripts.test_nipy_3_4d         # ditto re.: `nipy_3_4d` script
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://nipy.org/nipy";
     description = "Software for structural and functional neuroimaging analysis";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/nixpkgs/pkgs/development/python-modules/nipype/default.nix
index f152287d25dc..5f847007bdc5 100644
--- a/nixpkgs/pkgs/development/python-modules/nipype/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nipype/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -106,7 +106,7 @@ buildPythonPackage rec {
   '';
   pythonImportsCheck = [ "nipype" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://nipy.org/nipype/";
     description = "Neuroimaging in Python: Pipelines and Interfaces";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/nitime/default.nix b/nixpkgs/pkgs/development/python-modules/nitime/default.nix
index 8fa40465c10d..ccbf540f75f4 100644
--- a/nixpkgs/pkgs/development/python-modules/nitime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nitime/default.nix
@@ -2,7 +2,8 @@
 , buildPythonPackage
 , python
 , fetchPypi
-, pytest
+, isPy27
+, pytestCheckHook
 , cython
 , numpy
 , scipy
@@ -13,20 +14,18 @@
 
 buildPythonPackage rec {
   pname = "nitime";
-  version = "0.8.1";
-  disabled = python.pythonVersion != "3.7";  # gcc error when running Cython with Python 3.8
+  version = "0.9";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6";
+    sha256 = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ=";
   };
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytestCheckHook ];
   buildInputs = [ cython ];
   propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ];
 
-  checkPhase = "pytest nitime/tests";
-
   meta = with lib; {
     homepage = "https://nipy.org/nitime";
     description = "Algorithms and containers for time-series analysis in time and spectral domains";
diff --git a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix
index 7df6d72c55c4..4edd31d6a25f 100644
--- a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pbr
@@ -19,7 +19,11 @@ buildPythonPackage rec {
   buildInputs = [ pbr ];
   propagatedBuildInputs = [ pythonix ];
 
-  meta = with stdenv.lib; {
+  # does not have any tests
+  doCheck = false;
+  pythonImportsCheck = [ "nixpkgs" ];
+
+  meta = with lib; {
     description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
     homepage = "https://github.com/t184256/nixpkgs-python-importer";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/node-semver/default.nix b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
index 9c787147407a..5ba62fb9210e 100644
--- a/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   version = "0.7.0";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "1p7ink1wajkc31r05k1yn37gk377033a9vhin8v4j757d4ha1f91";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/podhmo/python-semver";
     description = "A port of node-semver";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/noise/default.nix b/nixpkgs/pkgs/development/python-modules/noise/default.nix
index 736444ec6e19..98f336c49866 100644
--- a/nixpkgs/pkgs/development/python-modules/noise/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/noise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "noise";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/caseman/noise";
     description = "Native-code and shader implementations of Perlin noise";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix
new file mode 100644
index 000000000000..76ed1b1fc2a0
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchFromGitHub, cryptography, pytestCheckHook }:
+
+buildPythonPackage rec {
+  pname = "noiseprotocol";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "plizonczyk";
+    repo = "noiseprotocol";
+    rev = "v${version}";
+    sha256 = "1mk0rqpjifdv3v1cjwkdnjbrfmzzjm9f3qqs1r8vii4j2wvhm6am";
+  };
+
+  propagatedBuildInputs = [ cryptography ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "noise" ];
+
+  meta = with lib; {
+    description = "Noise Protocol Framework";
+    homepage = "https://github.com/plizonczyk/noiseprotocol/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix b/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix
index 7f954f7ebca3..185270176acb 100644
--- a/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Coverage 3.x support for Nose";
     homepage = "https://github.com/ask/nosecover3";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix b/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix
index aa3f0d37f092..4f90ee4be8b4 100644
--- a/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler";
     homepage = "https://github.com/msherry/nose-cprof";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix b/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix
index d7b13eb1059b..8e31867d85c0 100644
--- a/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti
 , nose-pattern-exclude, which }:
 
 buildPythonPackage rec {
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ./test.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Decorator and plugin to make nose focus on specific tests";
     homepage = "https://nose-focus.readthedocs.io/en/latest/";
     license = licenses.wtfpl;
diff --git a/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix b/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix
index b7fd1e241aaa..2bd63f3295d4 100644
--- a/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }:
 
 buildPythonPackage rec {
   pname = "nose-of-yeti";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     ./test.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Nose plugin providing BDD dsl for python";
     homepage = "https://github.com/delfick/nose-of-yeti";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix
index 2170ac224d95..05a7102f1ae7 100644
--- a/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "nose-pattern-exclude";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # There are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Exclude specific files and directories from nosetests runs";
     homepage = "https://github.com/jakubroztocil/nose-pattern-exclude";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/nose/default.nix b/nixpkgs/pkgs/development/python-modules/nose/default.nix
index a5ed49a29d73..2805b7c2ea19 100644
--- a/nixpkgs/pkgs/development/python-modules/nose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     ${python}/bin/${python.executable} selftest.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A unittest-based testing framework for python that makes writing and running tests easier";
     homepage = "http://readthedocs.org/docs/nose/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/nose2/default.nix b/nixpkgs/pkgs/development/python-modules/nose2/default.nix
index 300ed80ca408..b815e223d82d 100644
--- a/nixpkgs/pkgs/development/python-modules/nose2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # AttributeError: 'module' object has no attribute 'collector'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "nose2 is the next generation of nicer testing for Python";
     homepage = "https://github.com/nose-devs/nose2";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix b/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix
index b4683ef12cbf..b920bb40736c 100644
--- a/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # fails with obscure error
   doCheck = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/erikrose/nose-progressive";
     description = "A testrunner with a progress bar and smarter tracebacks";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nosejs/default.nix b/nixpkgs/pkgs/development/python-modules/nosejs/default.nix
index 9d30855c68e1..c165e87ff2ee 100644
--- a/nixpkgs/pkgs/development/python-modules/nosejs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nosejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     nosetests -v
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.org/project/NoseJS/";
     description = "A Nose plugin for integrating JavaScript tests into a Python test suite";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix b/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix
index 84cc4994b08a..36747a50aae7 100644
--- a/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , coverage
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ coverage nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extends nose.plugins.cover to add Cobertura-style XML reports";
     homepage = "https://github.com/cmheisel/nose-xcover/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix
index 116fa153cdad..bab3aa590ec6 100644
--- a/nixpkgs/pkgs/development/python-modules/notebook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notebook/default.nix
@@ -68,6 +68,7 @@ buildPythonPackage rec {
     "launch_socket"
     "sock_server"
     "test_list_formats" # tries to find python MIME type
+    "KernelCullingTest" # has a race condition failing on slower hardware
   ] ++ lib.optional stdenv.isDarwin [
     "test_delete"
     "test_checkpoints_follow_file"
diff --git a/nixpkgs/pkgs/development/python-modules/notify/default.nix b/nixpkgs/pkgs/development/python-modules/notify/default.nix
index 7e71eb8b3021..1a60cf70d2d2 100644
--- a/nixpkgs/pkgs/development/python-modules/notify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python
 , pygobject2
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
   };
 
-  patches = stdenv.lib.singleton (fetchurl {
+  patches = lib.singleton (fetchurl {
     name = "libnotify07.patch";
     url = "https://src.fedoraproject.org/cgit/notify-python.git/plain/"
         + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c";
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for libnotify";
     homepage = "http://www.galago-project.org/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/notmuch/2.nix b/nixpkgs/pkgs/development/python-modules/notmuch/2.nix
index 593eed6c2514..970928e03f40 100644
--- a/nixpkgs/pkgs/development/python-modules/notmuch/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/notmuch/2.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , notmuch
 , python
@@ -13,7 +14,11 @@ buildPythonPackage {
 
   buildInputs = [ python notmuch cffi ];
 
-  meta = with stdenv.lib; {
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "notmuch2" ];
+
+  meta = with lib; {
     description = "Pythonic bindings for the notmuch mail database using CFFI";
     homepage = "https://notmuchmail.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/notmuch/default.nix b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix
index 4ae42b3390b5..609d4c78d5d7 100644
--- a/nixpkgs/pkgs/development/python-modules/notmuch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , notmuch
 , python
@@ -16,7 +17,11 @@ buildPythonPackage {
       notmuch/globals.py
   '';
 
-  meta = with stdenv.lib; {
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "notmuch" ];
+
+  meta = with lib; {
     description = "A Python wrapper around notmuch";
     homepage = "https://notmuchmail.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ntplib/default.nix b/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
index e87fc6292e74..266482a8ff28 100644
--- a/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Require networking
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python NTP library";
     homepage = "http://code.google.com/p/ntplib/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
index 890180d0dec9..44ee4597dbe4 100644
--- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , vmprof
@@ -26,12 +26,12 @@ in buildPythonPackage rec {
 
   postPatch = ''
     patchShebangs tests/run-tests
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.util-linux.out}/lib/libuuid.so"'
   '';
 
   # We do not want any wrappers here.
-  postFixup = '''';
+  postFixup = "";
 
   checkPhase = ''
     tests/run-tests
@@ -43,7 +43,7 @@ in buildPythonPackage rec {
   # Requires CPython
   disabled = isPyPy;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python compiler with full language support and CPython compatibility";
     license = licenses.asl20;
     homepage = "https://nuitka.net/";
diff --git a/nixpkgs/pkgs/development/python-modules/numba/default.nix b/nixpkgs/pkgs/development/python-modules/numba/default.nix
index ad31b8e960c8..aa08ead2d971 100644
--- a/nixpkgs/pkgs/development/python-modules/numba/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numba/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , pythonOlder
 , fetchPypi
 , python
@@ -23,10 +24,10 @@ buildPythonPackage rec {
     sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   propagatedBuildInputs = [numpy llvmlite]
-    ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch];
+    ++ lib.optionals isPy27 [ funcsigs singledispatch];
 
   # Copy test script into $out and run the test suite.
   checkPhase = ''
@@ -35,10 +36,10 @@ buildPythonPackage rec {
   # ImportError: cannot import name '_typeconv'
   doCheck = false;
 
-  meta =  {
+  meta =  with lib; {
     homepage = "http://numba.pydata.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
     description = "Compiling Python code using LLVM";
-    maintainers = with stdenv.lib.maintainers; [ fridh ];
+    maintainers = with maintainers; [ fridh ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
index f628daf833b4..0c71b065a32d 100644
--- a/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypi.python.org/pypi/numericalunits";
     description = "A package that lets you define quantities with unit";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
index b675fa6f06be..832e281a9a1e 100644
--- a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
@@ -46,7 +46,7 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "-m 'not needs_net'" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lilydjwg/nvchecker";
     description = "New version checker for software";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
index 9e7d4958e3be..4676fdef0cdc 100644
--- a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
+{ lib, stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
 , blockdiag, setuptools
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # tests fail
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
     homepage = "http://blockdiag.com/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix
index aae9b5f74370..4057ba1de8ad 100644
--- a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , isPy3k
@@ -25,7 +25,7 @@ buildPythonPackage {
   # Tests fail on Mac dependency
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python driver/interface for Lego Mindstorms NXT robot";
     homepage = "https://github.com/Eelviny/nxt-python";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/oath/default.nix b/nixpkgs/pkgs/development/python-modules/oath/default.nix
index a64eeb8e1036..158cf0368406 100644
--- a/nixpkgs/pkgs/development/python-modules/oath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1xqgcqgx6aa0j21hwsdb3aqpqhviwj756bcqjjjcm1h1aij11p6m";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python implementation of the three main OATH specifications: HOTP, TOTP and OCRA";
     homepage = "https://github.com/bdauvergne/python-oath";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/oauth/default.nix b/nixpkgs/pkgs/development/python-modules/oauth/default.nix
index 133640f66202..0e53eaec7c0e 100644
--- a/nixpkgs/pkgs/development/python-modules/oauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests included in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.google.com/archive/p/oauth/";
     description = "Library for OAuth version 1.0a";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/oauth2/default.nix b/nixpkgs/pkgs/development/python-modules/oauth2/default.nix
index 8233b132344f..70b2e94e37ca 100644
--- a/nixpkgs/pkgs/development/python-modules/oauth2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauth2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , httplib2
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # ServerNotFoundError: Unable to find the server at oauth-sandbox.sevengoslings.net
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/simplegeo/python-oauth2";
     description = "Library for OAuth version 1.0";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix b/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix
index 185ef9748637..40501733e4c7 100644
--- a/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     py.test tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/idan/oauthlib";
     description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
     maintainers = with maintainers; [ prikhi ];
diff --git a/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix
index bc2c8c1094c0..df65547a256d 100644
--- a/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , mock
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     py.test tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/idan/oauthlib";
     description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
     maintainers = with maintainers; [ prikhi ];
diff --git a/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix b/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix
index c320f299ddb1..1dec57cafb44 100644
--- a/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , pyptlib
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pluggable transport proxy";
     homepage = "https://www.torproject.org/projects/obfsproxy";
     repositories.git = "https://git.torproject.org/pluggable-transports/obfsproxy.git";
diff --git a/nixpkgs/pkgs/development/python-modules/objgraph/default.nix b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
index 79c448b5cced..8bb119bcb4bf 100644
--- a/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   checkInputs = [ mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Draws Python object reference graphs with graphviz";
     homepage = "https://mg.pov.lt/objgraph/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/offtrac/default.nix b/nixpkgs/pkgs/development/python-modules/offtrac/default.nix
index be796b5c37df..edec161a133b 100644
--- a/nixpkgs/pkgs/development/python-modules/offtrac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/offtrac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://fedorahosted.org/offtrac";
     description = "Trac xmlrpc library";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix b/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix
index 7eb4bef73504..5ef7060b7f66 100644
--- a/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ lib, stdenv, buildPythonPackage, fetchPypi,
  ofxhome, ofxparse, beautifulsoup4, lxml, keyring
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/captin411/ofxclient";
     description = "OFX client for dowloading transactions from banks";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix b/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
index 518c34951fce..d9a28da18060 100644
--- a/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   version = "0.3.3";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # ImportError: No module named tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/captin411/ofxhome";
     description = "ofxhome.com financial institution lookup REST client";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix b/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix
index fbdafc291dc5..235875eec7ce 100644
--- a/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six beautifulsoup4 lxml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://sites.google.com/site/ofxparse";
     description = "Tools for working with the OFX (Open Financial Exchange) file format";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix
index da087e8b520f..8f280d1cfd45 100644
--- a/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , nose
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     HOME=$TMPDIR nosetests tests/*.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/csingley/ofxtools";
     description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/olefile/default.nix b/nixpkgs/pkgs/development/python-modules/olefile/default.nix
index 5667da7fbc6d..96c0a0b51bef 100644
--- a/nixpkgs/pkgs/development/python-modules/olefile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/olefile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "olefile";
   version = "0.46";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python package to parse, read and write Microsoft OLE2 files";
     homepage = "https://www.decalage.info/python/olefileio";
     # BSD like + reference to Pillow
diff --git a/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
index 4219aad3865f..99b9cccc7de6 100644
--- a/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
 , pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }:
 
 buildPythonPackage rec {
@@ -14,9 +14,9 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   buildInputs = [ pytestrunner ];
-  propagatedBuildInputs = [ pyyaml six ] ++ stdenv.lib.optional isPy27 pathlib2;
+  propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A framework for configuring complex applications";
     homepage = "https://github.com/omry/omegaconf";
     license = licenses.free;  # prior bsd license (1988)
diff --git a/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix b/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix
index 117b8228d2e5..067db3a69fef 100644
--- a/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , docopt, netifaces }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ docopt netifaces ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Control Onkyo receivers over ethernet";
     homepage = "https://github.com/miracle2k/onkyo-eiscp";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/openant/default.nix b/nixpkgs/pkgs/development/python-modules/openant/default.nix
index a9598825dd00..374b7cb059d1 100644
--- a/nixpkgs/pkgs/development/python-modules/openant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/openant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pyusb
@@ -28,7 +28,7 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ pyusb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Tigge/openant";
     description = "ANT and ANT-FS Python Library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix b/nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix
new file mode 100644
index 000000000000..18a6a8dd032c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, openbabel, python, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "openbabel";
+  version = "3.1.1";
+
+  src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages";
+
+  nativeBuildInputs = [ openbabel ];
+
+  # these env variables are used by the bindings to find libraries
+  # they need to be included explicitly in your nix-shell for
+  # some functionality to work (inparticular, pybel).
+  # see https://openbabel.org/docs/dev/Installation/install.html
+  BABEL_LIBDIR = "${openbabel}/lib/openbabel/3.1.0";
+  LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${openbabel}/lib";
+
+  doCheck = false;
+  pythonImportsCheck = [ "openbabel" ];
+
+  meta = with lib; {
+    homepage = "http://openbabel.org/wiki/Main_Page";
+    description = "Python bindings for openbabel";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ danielbarter ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix b/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix
index 9cfe714ef6f2..7d373c13a8a5 100644
--- a/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "openidc-client";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A CLI python OpenID Connect client with token caching and management";
     homepage = "https://github.com/puiterwijk";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
index 67896c362f56..843380ebf21d 100644
--- a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
+++ b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }: rec {
   version = "2.9.0";
@@ -8,7 +8,7 @@
     rev = "v${version}";
     sha256 = "1js7hq7zx5kj99brffrfaaah283ydkffmmrzsxv4mkd3nnd6rykk";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://openrazer.github.io/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ roelvandijk evanjs ];
diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix
index fb7b48e2266f..6c22d3bae5d0 100644
--- a/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix
@@ -1,4 +1,5 @@
-{ buildPythonApplication
+{ lib
+, buildPythonApplication
 , isPy3k
 , daemonize
 , dbus-python
@@ -15,7 +16,7 @@
 }:
 
 let
-  common = import ./common.nix { inherit stdenv fetchFromGitHub; };
+  common = import ./common.nix { inherit stdenv lib fetchFromGitHub; };
 in
 buildPythonApplication (common // rec {
   pname = "openrazer_daemon";
diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix
index 2f9ff467b2d9..52fe63318a3e 100644
--- a/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix
+++ b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , dbus-python
 , fetchFromGitHub
 , numpy
@@ -7,7 +8,7 @@
 }:
 
 let
-  common = import ./common.nix { inherit stdenv fetchFromGitHub; };
+  common = import ./common.nix { inherit stdenv lib fetchFromGitHub; };
 in
 buildPythonPackage (common // rec {
   pname = "openrazer";
diff --git a/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix b/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix
index 5cf070d610fb..60f94072681d 100644
--- a/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "openwebifpy";
-  version = "3.1.1";
+  version = "3.2.7";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zqa74i54ww9qjciiv8s58mxbs6vxq06cq5k4pxfarc0l75l4gh2";
+    sha256 = "0n9vi6b0y8b41fd7m9p361y3qb5m3b9p9d8g4fasqi7yy4mw2hns";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/nixpkgs/pkgs/development/python-modules/optuna/default.nix
index 64ed54cafbe2..aa61b18291d6 100644
--- a/nixpkgs/pkgs/development/python-modules/optuna/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/optuna/default.nix
@@ -84,6 +84,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
+    broken = true;  # Dashboard broken, other build failures.
     description = "A hyperparameter optimization framework";
     homepage = "https://optuna.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/opuslib/default.nix b/nixpkgs/pkgs/development/python-modules/opuslib/default.nix
index aa7fc4add493..7db467f26d50 100644
--- a/nixpkgs/pkgs/development/python-modules/opuslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/opuslib/default.nix
@@ -3,7 +3,7 @@
   isPy27,
   libopus,
   nose,
-  stdenv,
+  lib, stdenv,
   substituteAll,
 }:
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings to the libopus, IETF low-delay audio codec";
     homepage = "https://github.com/orion-labs/opuslib";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix b/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix
index 9c028777fc9f..e2931840a66a 100644
--- a/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix b/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix
index 1a3ab347945a..1cd0f648bd3e 100644
--- a/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }:
 
 buildPythonPackage rec {
   pname = "orderedmultidict";
@@ -12,11 +12,11 @@ buildPythonPackage rec {
   checkInputs = [ flake8 ];
 
   propagatedBuildInputs = [ six ]
-    ++ stdenv.lib.optionals (pythonOlder "3.8") [
+    ++ lib.optionals (pythonOlder "3.8") [
       importlib-metadata
     ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ordered Multivalue Dictionary.";
     homepage = "https://github.com/gruns/orderedmultidict";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/python-modules/orderedset/default.nix b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix
index ac7b21361c97..aced6cf08536 100644
--- a/nixpkgs/pkgs/development/python-modules/orderedset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "orderedset";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0abf19w37kxypsj6v7dz79jj92y1kivjk2zivnrv7rw6bbxwrxdj";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An Ordered Set implementation in Cython";
     homepage = "https://pypi.python.org/pypi/orderedset";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/orm/default.nix b/nixpkgs/pkgs/development/python-modules/orm/default.nix
index dece359b0c0f..872a54076125 100644
--- a/nixpkgs/pkgs/development/python-modules/orm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/orm/default.nix
@@ -4,8 +4,9 @@
 , databases
 , typesystem
 , aiosqlite
-, pytest
+, pytestCheckHook
 , pytestcov
+, typing-extensions
 }:
 
 buildPythonPackage rec {
@@ -26,13 +27,12 @@ buildPythonPackage rec {
 
   checkInputs = [
     aiosqlite
-    pytest
+    pytestCheckHook
     pytestcov
+    typing-extensions
   ];
 
-  checkPhase = ''
-    PYTHONPATH=$PYTHONPATH:. pytest
-  '';
+  pythonImportsCheck = [ "orm" ];
 
   meta = with lib; {
     description = "An async ORM";
diff --git a/nixpkgs/pkgs/development/python-modules/orvibo/default.nix b/nixpkgs/pkgs/development/python-modules/orvibo/default.nix
new file mode 100644
index 000000000000..6209baa144bb
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/orvibo/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, click
+, fetchFromGitHub
+, mock
+, pytest-runner
+, pytestCheckHook
+, requests
+, websocket_client
+}:
+
+buildPythonPackage rec {
+  pname = "orvibo";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "happyleavesaoc";
+    repo = "python-orvibo";
+    rev = version;
+    sha256 = "042prd5yxqvlfija7ii1xn424iv1p7ndhxv6m67ij8cbvspwx356";
+  };
+
+  # Project as no tests
+  doCheck = false;
+  pythonImportsCheck = [ "orvibo" ];
+
+  meta = with lib; {
+    description = "Python client to work with Orvibo devices";
+    homepage = "https://github.com/happyleavesaoc/python-orvibo";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix
index cae6a468c776..dad78727f2d1 100644
--- a/nixpkgs/pkgs/development/python-modules/osc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/osc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber
 , m2crypto, rpm, chardet
 }:
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/openSUSE/osc";
     description = "opensuse-commander with svn like handling";
     maintainers = [ maintainers.peti ];
diff --git a/nixpkgs/pkgs/development/python-modules/oset/default.nix b/nixpkgs/pkgs/development/python-modules/oset/default.nix
index aa435b403e8b..5d8a5f741bdc 100644
--- a/nixpkgs/pkgs/development/python-modules/oset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oset/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "oset";
@@ -11,9 +11,9 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Ordered set";
-    license = stdenv.lib.licenses.psfl;
+    license = licenses.psfl;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix
index 856c2bb45dbc..c624e262cf96 100755
--- a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
 , pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}:
 
 buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   #  coverage run --source osmnx -m pytest --verbose
   #'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX.";
     homepage = "https://github.com/gboeing/osmnx";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/osqp/default.nix b/nixpkgs/pkgs/development/python-modules/osqp/default.nix
index 88189493a62f..1db266e116d4 100644
--- a/nixpkgs/pkgs/development/python-modules/osqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/osqp/default.nix
@@ -4,18 +4,20 @@
 , cmake
 , future
 , numpy
+, qdldl
 , scipy
 # check inputs
 , pytestCheckHook
+, cvxopt
 }:
 
 buildPythonPackage rec {
   pname = "osqp";
-  version = "0.6.1";
+  version = "0.6.2.post0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7";
+    sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -24,15 +26,14 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     future
     numpy
+    qdldl
     scipy
   ];
 
   pythonImportsCheck = [ "osqp" ];
-  checkInputs = [ pytestCheckHook ];
-  dontUseSetuptoolsCheck = true;  # don't run checks twice
+  checkInputs = [ pytestCheckHook cvxopt ];
   disabledTests = [
     "mkl_"
-    "update_matrices_tests" # broken w/ scipy >= 1.5.0. Remove next release. See https://github.com/oxfordcontrol/osqp-python/issues/44
   ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/nixpkgs/pkgs/development/python-modules/ovito/default.nix
index d813d2ac47f3..a33e5d19b44e 100644
--- a/nixpkgs/pkgs/development/python-modules/ovito/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ovito/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , cmake
 , ffmpeg
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scientific visualization and analysis software for atomistic simulation data";
     homepage = "https://www.ovito.org";
     license = with licenses; [ gpl3Only mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/packaging/2.nix b/nixpkgs/pkgs/development/python-modules/packaging/2.nix
index 36764e64b860..5d841eb4fb13 100644
--- a/nixpkgs/pkgs/development/python-modules/packaging/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/packaging/2.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyparsing
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   # Prevent circular dependency
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core utilities for Python packages";
     homepage = "https://github.com/pypa/packaging";
     license = [ licenses.bsd2 licenses.asl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/nixpkgs/pkgs/development/python-modules/packaging/default.nix
index 061e8edaac6f..973e516f5a90 100644
--- a/nixpkgs/pkgs/development/python-modules/packaging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/packaging/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyparsing
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   # Prevent circular dependency
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core utilities for Python packages";
     homepage = "https://github.com/pypa/packaging";
     license = [ licenses.bsd2 licenses.asl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix b/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix
index d7adc9b17c04..5daa60f475d3 100644
--- a/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pdfrw }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pdfrw }:
 
 buildPythonPackage rec {
   pname = "pagelabels";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # upstream doesn't contain tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library to manipulate PDF page labels.";
     homepage = "https://github.com/lovasoa/pagelabels-py";
     maintainers = with maintainers; [ teto ];
diff --git a/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix
index 00236f3c2345..ebe2c8b5854d 100644
--- a/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "e8c237239d3ffb061069aa04fc5b3d8ae4fb0af16a9713fe0977f02261d323e9";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/samuel/python-pagerduty";
     description = "Library for the PagerDuty service API";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/palettable/default.nix b/nixpkgs/pkgs/development/python-modules/palettable/default.nix
index f96e05950b80..d61973aa3bfa 100644
--- a/nixpkgs/pkgs/development/python-modules/palettable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/palettable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "palettable";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library of color palettes";
     homepage = "https://jiffyclub.github.io/palettable/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pamela/default.nix b/nixpkgs/pkgs/development/python-modules/pamela/default.nix
index 9a55719d77f3..7fd62dae2cd9 100644
--- a/nixpkgs/pkgs/development/python-modules/pamela/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pamela/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -16,12 +16,12 @@ buildPythonPackage rec {
   postUnpack = ''
     substituteInPlace $sourceRoot/pamela.py --replace \
       'find_library("pam")' \
-      '"${stdenv.lib.getLib pkgs.pam}/lib/libpam.so"'
+      '"${lib.getLib pkgs.pam}/lib/libpam.so"'
   '';
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PAM interface using ctypes";
     homepage = "https://github.com/minrk/pamela";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pamqp/default.nix b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
index 8353e8d7895f..2e8e4500f247 100644
--- a/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   buildInputs = [ mock nose pep8 pylint mccabe ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RabbitMQ Focused AMQP low-level library";
     homepage = "https://pypi.python.org/pypi/pamqp";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix b/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix
index 92adfb9d3f16..c4bf9c140df3 100644
--- a/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pandas lxml requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Up to date remote data access for pandas, works for multiple versions of pandas";
     homepage = "https://github.com/pydata/pandas-datareader";
     license= licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pandas/2.nix b/nixpkgs/pkgs/development/python-modules/pandas/2.nix
index e4f65a94dc53..936a3db296ec 100644
--- a/nixpkgs/pkgs/development/python-modules/pandas/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandas/2.nix
@@ -1,6 +1,7 @@
 # Python 2 expression
 
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
 , python
 , stdenv
@@ -26,11 +27,7 @@
 , libcxx ? null
 }:
 
-let
-  inherit (stdenv.lib) optional optionals optionalString;
-  inherit (stdenv) isDarwin;
-
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pandas";
   version = "0.24.2";
 
@@ -42,7 +39,7 @@ in buildPythonPackage rec {
   checkInputs = [ pytest glibcLocales moto hypothesis ];
 
   nativeBuildInputs = [ cython ];
-  buildInputs = optional isDarwin libcxx;
+  buildInputs = lib.optional stdenv.isDarwin libcxx;
   propagatedBuildInputs = [
     dateutil
     scipy
@@ -61,7 +58,7 @@ in buildPythonPackage rec {
 
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
-  postPatch = optionalString isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     cpp_sdk="${libcxx}/include/c++/v1";
     echo "Adding $cpp_sdk to the setup.py common_include variable"
     substituteInPlace setup.py \
@@ -70,7 +67,7 @@ in buildPythonPackage rec {
   '';
 
 
-  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+  disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
     # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
     # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
     "test_fallback_plural"
@@ -86,7 +83,7 @@ in buildPythonPackage rec {
     "io"
     # KeyError Timestamp
     "test_to_excel"
-  ] ++ optionals isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "test_locale"
     "test_clipboard"
   ]);
@@ -98,7 +95,7 @@ in buildPythonPackage rec {
   ''
   # TODO: Get locale and clipboard support working on darwin.
   #       Until then we disable the tests.
-  + optionalString isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     # Fake the impure dependencies pbpaste and pbcopy
     echo "#!${runtimeShell}" > pbcopy
     echo "#!${runtimeShell}" > pbpaste
@@ -109,14 +106,14 @@ in buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = {
+  meta = with lib; {
     # https://github.com/pandas-dev/pandas/issues/14866
     # pandas devs are no longer testing i686 so safer to assume it's broken
     broken = stdenv.isi686;
     homepage = "https://pandas.pydata.org/";
     description = "Python Data Analysis Library";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ raskin knedlsepp ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ raskin knedlsepp ];
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix
index 46348deca8d6..ab70a7782adf 100644
--- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -27,11 +27,7 @@
 , libcxx ? null
 }:
 
-let
-  inherit (stdenv.lib) optional optionals optionalString;
-  inherit (stdenv) isDarwin;
-
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pandas";
   version = "1.1.5";
 
@@ -41,7 +37,7 @@ in buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ cython ];
-  buildInputs = optional isDarwin libcxx;
+  buildInputs = lib.optional stdenv.isDarwin libcxx;
   propagatedBuildInputs = [
     beautifulsoup4
     bottleneck
@@ -62,11 +58,11 @@ in buildPythonPackage rec {
 
   # doesn't work with -Werror,-Wunused-command-line-argument
   # https://github.com/NixOS/nixpkgs/issues/39687
-  hardeningDisable = optional stdenv.cc.isClang "strictoverflow";
+  hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
 
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
-  postPatch = optionalString isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     cpp_sdk="${libcxx}/include/c++/v1";
     echo "Adding $cpp_sdk to the setup.py common_include variable"
     substituteInPlace setup.py \
@@ -76,7 +72,7 @@ in buildPythonPackage rec {
 
   # Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next
   # release. https://github.com/pandas-dev/pandas/pull/30862
-  setupPyBuildFlags = optionals (!(isPy38 && isDarwin)) [
+  setupPyBuildFlags = lib.optionals (!(isPy38 && stdenv.isDarwin)) [
     # As suggested by
     # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment
     "--parallel=$NIX_BUILD_CORES"
@@ -85,7 +81,6 @@ in buildPythonPackage rec {
   doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
 
   pytestFlagsArray = [
-    "$out/${python.sitePackages}/pandas"
     "--skip-slow"
     "--skip-network"
   ];
@@ -115,18 +110,21 @@ in buildPythonPackage rec {
     "test_constructor_with_embedded_frames"
     # tries to import compiled C extension locally
     "test_missing_required_dependency"
-  ] ++ optionals isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "test_locale"
     "test_clipboard"
   ];
 
+  # tests have relative paths, and need to reference compiled C extensions
+  # so change directory where `import .test` is able to be resolved
   preCheck = ''
+    cd $out/${python.sitePackages}/pandas
     export LC_ALL="en_US.UTF-8"
     PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
   ''
   # TODO: Get locale and clipboard support working on darwin.
   #       Until then we disable the tests.
-  + optionalString isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     # Fake the impure dependencies pbpaste and pbcopy
     echo "#!${runtimeShell}" > pbcopy
     echo "#!${runtimeShell}" > pbpaste
@@ -134,7 +132,7 @@ in buildPythonPackage rec {
     export PATH=$(pwd):$PATH
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # https://github.com/pandas-dev/pandas/issues/14866
     # pandas devs are no longer testing i686 so safer to assume it's broken
     broken = stdenv.isi686;
diff --git a/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
index 848e59313af9..d31bc2657c93 100644
--- a/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests available
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python module for writing pandoc filters, with a collection of examples";
     homepage = "https://github.com/jgm/pandocfilters";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/paperspace/default.nix b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
index fad394a5339b..4553b253819f 100644
--- a/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , boto3, requests, gradient_statsd, terminaltables
 , click-completion , click-didyoumean, click-help-colors
 , colorama, requests_toolbelt, gradient_sdk, progressbar2
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # tries to use /homeless-shelter to mimic container usage, etc
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python API for Paperspace Cloud";
     homepage    = "https://paperspace.com";
     license     = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/parameterized/default.nix b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
index 77529c059afd..16925bd1286b 100644
--- a/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }:
 
 buildPythonPackage rec {
   pname = "parameterized";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     LC_ALL="en_US.UTF-8" nosetests -v
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parameterized testing with any Python test framework";
     homepage = "https://pypi.python.org/pypi/parameterized";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/paramz/default.nix b/nixpkgs/pkgs/development/python-modules/paramz/default.nix
index 63014647880d..65cc79745caa 100644
--- a/nixpkgs/pkgs/development/python-modules/paramz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paramz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }:
 
 buildPythonPackage rec {
   pname = "paramz";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
       nosetests -v paramz/tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parameterization framework for parameterized model creation and handling";
     homepage = "https://github.com/sods/paramz";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/parse-type/default.nix b/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
index cbf4ee0836e4..d338a351e54b 100644
--- a/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi
+{ lib, stdenv, fetchPypi
 , buildPythonPackage, pythonOlder
 , pytest, pytestrunner
 , parse, six, enum34
@@ -14,13 +14,13 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest pytestrunner ];
-  propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+  propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   checkPhase = ''
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jenisys/parse_type";
     description = "Simplifies to build parse types based on the parse module";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/parse/default.nix b/nixpkgs/pkgs/development/python-modules/parse/default.nix
index 7b160237d5eb..d72e607bc410 100644
--- a/nixpkgs/pkgs/development/python-modules/parse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi
+{ lib, stdenv, fetchPypi
 , buildPythonPackage, python
 }:
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     ${python.interpreter} test_parse.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/r1chardj0n3s/parse";
     description = "parse() is the opposite of format()";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
index 0b7d5cd6fb4c..1f98940fff06 100644
--- a/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   buildInputs = [ pytest pytestrunner ];
   propagatedBuildInputs = [ future ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parse human-readable date/time text";
     homepage = "https://github.com/bear/parsedatetime";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix b/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix
index 25d87a7f2f1f..d41953246db9 100644
--- a/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # performance tests tend to fail sometimes
   NOSE_EXCLUDE = "test_benchmarks";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/erikrose/parsimonious";
     description = "Fast arbitrary-lookahead parser written in pure Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/paste/default.nix b/nixpkgs/pkgs/development/python-modules/paste/default.nix
index 6bed8144a21e..a29deed503ed 100644
--- a/nixpkgs/pkgs/development/python-modules/paste/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paste/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     py.test -k "not test_cgiapp and not test_proxy"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for using a Web Server Gateway Interface stack";
     homepage = "http://pythonpaste.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix b/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
index 21149da917f1..950b232fa7e4 100644
--- a/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytestrunner
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # should be included with versions > 2.0.1
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Load, configure, and compose WSGI applications and servers";
     homepage = "http://pythonpaste.org/deploy/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pastescript/default.nix b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
index ce012c3d102a..57dbb7b9352e 100644
--- a/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pluggable command-line frontend, including commands to setup package file layouts";
     homepage = "https://github.com/cdent/pastescript/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/patator/default.nix b/nixpkgs/pkgs/development/python-modules/patator/default.nix
index b876e913e3cf..96ed85d7bcee 100644
--- a/nixpkgs/pkgs/development/python-modules/patator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/patator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy27, fetchPypi
+{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi
 , paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient
 , psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }:
 
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   # tests require docker-compose and vagrant
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "multi-purpose brute-forcer";
     homepage = "https://github.com/lanjelot/patator";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix b/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix
index 7cab25707984..981dc067fe7e 100644
--- a/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1kja1nn08w0k8k6j4kad48k581hh9drvjjb8x60v9j13sxdvqyk2";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to parse and apply unified diffs.";
     homepage = "https://github.com/conan-io/python-patch";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/patch/default.nix b/nixpkgs/pkgs/development/python-modules/patch/default.nix
index a4af8319f622..8d7e78c6c27c 100644
--- a/nixpkgs/pkgs/development/python-modules/patch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/patch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchzip
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # No tests included in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to parse and apply unified diffs";
     homepage = "https://github.com/techtonik/python-patch/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix b/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix
index f30a6ddd4083..9512b0eb0b88 100644
--- a/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Functions for server CLI applications used by humans";
     homepage = "https://github.com/joeyespo/path-and-address";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pathos/default.nix b/nixpkgs/pkgs/development/python-modules/pathos/default.nix
index 2b9134750fe2..778070906022 100644
--- a/nixpkgs/pkgs/development/python-modules/pathos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pathos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , dill
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # Require network
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parallel graph management and execution in heterogeneous computing";
     homepage = "https://github.com/uqfoundation/pathos/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pathtools/default.nix b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix
index 75901743c7e4..57fff82a81d7 100644
--- a/nixpkgs/pkgs/development/python-modules/pathtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pattern matching and various utilities for file systems paths";
     homepage = "https://github.com/gorakhargosh/pathtools";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/paver/default.nix b/nixpkgs/pkgs/development/python-modules/paver/default.nix
index ec4a40fec1b4..5d01df22b6d5 100644
--- a/nixpkgs/pkgs/development/python-modules/paver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # the tests do not pass
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python-based build/distribution/deployment scripting tool";
     homepage    = "https://github.com/paver/paver";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix b/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix
index c83cada08f2e..18a2b9b95a3a 100644
--- a/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pbkdf2";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # ImportError: No module named test
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pbr/default.nix b/nixpkgs/pkgs/development/python-modules/pbr/default.nix
index bc7c6399473b..6b204a946b3a 100644
--- a/nixpkgs/pkgs/development/python-modules/pbr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pbr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pbr";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
   # circular dependencies with fixtures
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "http://docs.openstack.org/developer/pbr/";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     description = "Python Build Reasonableness";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index e85df06b5002..6a12eea1b00c 100644
--- a/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder
+{ lib, stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder
 , buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   dontUseCmakeConfigure = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bluetooth Low Energy nRF5 SoftDevice serialization";
     homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py";
     license = licenses.unfreeRedistributable;
diff --git a/nixpkgs/pkgs/development/python-modules/pcpp/default.nix b/nixpkgs/pkgs/development/python-modules/pcpp/default.nix
index f57798c40a84..aea7ff0fcdaf 100644
--- a/nixpkgs/pkgs/development/python-modules/pcpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pcpp/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , fetchFromGitHub
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     fetchSubmodules = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ned14/pcpp";
     description = "A C99 preprocessor written in pure Python";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
index b9342821b209..adc43ef4c2ed 100644
--- a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }:
 
 buildPythonPackage rec {
   pname = "pdf2image";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "066527e1bf954762fb4369c677ae3bc15f2ce8707eee830cccef8471fde736d7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object";
     homepage = "https://github.com/Belval/pdf2image";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix b/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix
index dc9d33ddf0df..10bc09e8ca92 100644
--- a/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # tests are not distributed
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/pdfkit";
     description = "Wkhtmltopdf python wrapper to convert html to pdf using the webkit rendering engine and qt";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix b/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
index 9bc8f8915701..9a659eebe330 100644
--- a/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }:
 
 buildPythonPackage rec {
   pname = "pdfminer_six";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PDF parser and analyzer";
     homepage = "https://github.com/pdfminer/pdfminer.six";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix b/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix
index 43e2f1f57f75..0a21ed1e4999 100644
--- a/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pypdf2 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pypdf2 }:
 
 buildPythonPackage rec {
   pname = "pdftools.pdfposter";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Split large pages of a PDF into smaller ones for poster printing";
     homepage = "https://pdfposter.readthedocs.io";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix b/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix
index 15b8a8dc8d6b..49abb3751c91 100644
--- a/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pdfrw";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # tests require the extra download of github.com/pmaupin/static_pdfs
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "pdfrw is a pure Python library that reads and writes PDFs.";
     homepage = "https://github.com/pmaupin/pdfrw";
     maintainers = with maintainers; [ teto ];
diff --git a/nixpkgs/pkgs/development/python-modules/pdfx/default.nix b/nixpkgs/pkgs/development/python-modules/pdfx/default.nix
index d2397fb5c82b..97dee7e75705 100644
--- a/nixpkgs/pkgs/development/python-modules/pdfx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }:
 
 buildPythonPackage rec {
   pname = "pdfx";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/nixpkgs/pkgs/development/python-modules/pecan/default.nix
index 332f5153a981..ed0c89b7802b 100644
--- a/nixpkgs/pkgs/development/python-modules/pecan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pecan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , isPy27
@@ -45,13 +45,13 @@ buildPythonPackage rec {
     mock
     sqlalchemy
     virtualenv
-  ] ++ stdenv.lib.optionals isPy27 [ Kajiki ];
+  ] ++ lib.optionals isPy27 [ Kajiki ];
 
   pytestFlagsArray = [
     "--pyargs pecan "
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pecan";
     homepage = "http://www.pecanpy.org/";
     changelog = "https://pecan.readthedocs.io/en/latest/changes.html";
diff --git a/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/nixpkgs/pkgs/development/python-modules/peewee/default.nix
index ee3d08a173c3..6f5d8e262279 100644
--- a/nixpkgs/pkgs/development/python-modules/peewee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/peewee/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
 , sqlite
 , cython
 , apsw
@@ -40,7 +42,7 @@ buildPythonPackage rec {
 
   doCheck = withPostgres;
 
-  meta = with stdenv.lib;{
+  meta = with lib; {
     description = "a small, expressive orm";
     homepage    = "http://peewee-orm.com";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/nixpkgs/pkgs/development/python-modules/pelican/default.nix
index 30d6546d5705..0b103b780c08 100644
--- a/nixpkgs/pkgs/development/python-modules/pelican/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pelican/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , glibcLocales, git
 , mock, nose, markdown, lxml, typogrify
 , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     patchShebangs $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to generate a static blog from reStructuredText or Markdown input files";
     homepage = "http://getpelican.com/";
     license = licenses.agpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pep257/default.nix b/nixpkgs/pkgs/development/python-modules/pep257/default.nix
index 8f3a1e0ea8bd..296b55eec125 100644
--- a/nixpkgs/pkgs/development/python-modules/pep257/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pep257/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, pytest, mock }:
+{ lib, stdenv, buildPythonPackage, fetchurl, pytest, mock }:
 buildPythonPackage rec {
   pname = "pep257";
   version = "0.7.0";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/GreenSteam/pep257/";
     description = "Python docstring style checker";
     longDescription = "Static analysis tool for checking compliance with Python PEP 257.";
diff --git a/nixpkgs/pkgs/development/python-modules/pep517/default.nix b/nixpkgs/pkgs/development/python-modules/pep517/default.nix
index a56366569844..90dc50461990 100644
--- a/nixpkgs/pkgs/development/python-modules/pep517/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pep517/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pep517";
-  version = "0.8.2";
+  version = "0.9.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e6199cf1288d48a0c44057f112acf18aa5ebabbf73faa242f598fbe145ba29e";
+    sha256 = "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/pep8/default.nix b/nixpkgs/pkgs/development/python-modules/pep8/default.nix
index 12176b97380d..8ef3bfea0f5d 100644
--- a/nixpkgs/pkgs/development/python-modules/pep8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pep8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # FAIL: test_checkers_testsuite (testsuite.test_all.Pep8TestCase)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pep8.readthedocs.org/";
     description = "Python style guide checker";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix b/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix
index 51114a591a57..6caf61b0cd0d 100644
--- a/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1ip4bfwcpwkq9hz2dai14k2cyabvwrnvcvrcmzxmqm04g8fnimwn";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for converting a token stream into a data structure for use in web form posts";
     homepage = "https://docs.pylonsproject.org/projects/peppercorn/en/latest/";
     maintainers = with maintainers; [ domenkozar ];
diff --git a/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix b/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix
index ca14f80868c8..86bae927d9ff 100644
--- a/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , nose
 }:
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkPhase = "nosetests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.eliotberriot.com/eliotberriot/persisting-theory";
     description = "Automate data discovering and access inside a list of packages";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix
index 0bbbf551f280..1d7de0088a84 100644
--- a/nixpkgs/pkgs/development/python-modules/pex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # A few more dependencies I don't want to handle right now...
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library and tool for generating .pex (Python EXecutable) files";
     homepage = "https://github.com/pantsbuild/pex";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pexif/default.nix b/nixpkgs/pkgs/development/python-modules/pexif/default.nix
index f3086b6b0553..326dde176ae6 100644
--- a/nixpkgs/pkgs/development/python-modules/pexif/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pexif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "45a3be037c7ba8b64bbfc48f3586402cc17de55bb9d7357ef2bc99954a18da3f";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A module for editing JPEG EXIF data";
     homepage = "http://www.benno.id.au/code/pexif/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix b/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix
index bc4ff9f4f031..d84bb2014b80 100644
--- a/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix
+++ b/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytz
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytz six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tlocke/pg8000";
     description = "PostgreSQL interface library, for asyncio";
     maintainers = with maintainers; [ domenkozar ];
diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
index 0c9459772186..8f63e00e7997 100644
--- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , scramp
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ passlib scramp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tlocke/pg8000";
     description = "PostgreSQL interface library, for asyncio";
     maintainers = with maintainers; [ domenkozar ];
diff --git a/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix b/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix
index 0f200409622a..d795cc3678f7 100644
--- a/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Disabling check because of: https://github.com/toofishes/python-pgpdump/issues/18
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for parsing PGP packets";
     homepage = "https://github.com/toofishes/python-pgpdump";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pgpy/default.nix b/nixpkgs/pkgs/development/python-modules/pgpy/default.nix
index 9067817a3ba9..2c527d87d186 100644
--- a/nixpkgs/pkgs/development/python-modules/pgpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgpy/default.nix
@@ -1,7 +1,6 @@
 { lib, isPy3k, fetchFromGitHub, buildPythonPackage
 , six, enum34, pyasn1, cryptography, singledispatch
-, fetchPypi
-, gpgme, flake8, pytest, pytestcov, pep8-naming, pytest-ordering }:
+, fetchPypi, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "pgpy";
@@ -22,17 +21,10 @@ buildPythonPackage rec {
   ] ++ lib.optional (!isPy3k) enum34;
 
   checkInputs = [
-    gpgme
-    flake8
-    pytest
-    pytestcov
-    pep8-naming
-    pytest-ordering
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    pytest
-  '';
+  disabledTests = [ "test_sign_string" "test_verify_string" ];
 
   meta = with lib; {
     homepage = "https://github.com/SecurityInnovation/PGPy";
diff --git a/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix b/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
index f7212493e59c..26e5eb2bd6ac 100644
--- a/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , python
 , fetchPypi
 , buildPythonPackage
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   checkInputs = [ postgresql ];
   propagatedBuildInputs = [ postgresql ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/markdrago/pgsanity";
     description = "Checks the syntax of Postgresql SQL files";
     longDescription = ''
@@ -30,7 +30,7 @@ buildPythonPackage rec {
       run it through ecpg and
       let ecpg report on the syntax errors of the SQL.
     '';
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     maintainers = with maintainers; [ nalbyuites ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix b/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix
index 61ab5532ca9d..796a38198814 100644
--- a/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:
 
 buildPythonPackage rec {
   pname = "pgspecial";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Meta-commands handler for Postgres Database";
     homepage = "https://pypi.python.org/pypi/pgspecial";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/phe/default.nix b/nixpkgs/pkgs/development/python-modules/phe/default.nix
index 6a849734e908..5a00a4ccb099 100644
--- a/nixpkgs/pkgs/development/python-modules/phe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } :
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } :
 
 let
   pname = "phe";
@@ -21,7 +21,7 @@ buildPythonPackage {
   # 29/233 tests fail
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for Partially Homomorphic Encryption in Python";
     homepage = "https://github.com/n1analytics/python-paillier";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
index 62149a788665..354ca2796e19 100644
--- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "phonenumbers";
@@ -9,10 +9,10 @@ buildPythonPackage rec {
     sha256 = "96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562";
   };
 
-  meta = {
+  meta = with lib; {
     description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
     homepage    = "https://github.com/daviddrysdale/python-phonenumbers";
-    license     = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ fadenb ];
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ fadenb ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
index 1a768b7cf57f..03e0c54caab7 100644
--- a/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }:
+{ lib, stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "phonopy";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     rm -r phonopy
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package for phonon calculations at harmonic and quasi-harmonic levels";
     homepage = "https://atztogo.github.io/phonopy/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix
index db0359a1d4fc..9ed84e86371c 100644
--- a/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "phx-class-registry";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     "test_len"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Registry pattern for Python classes, with setuptools entry points integration";
     homepage = "https://github.com/todofixthis/class-registry";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix b/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix
index 496d20d52e3c..2151e13b960d 100644
--- a/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pathpy
@@ -16,12 +16,12 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ pathpy ]
-    ++ stdenv.lib.optional (pythonOlder "3.4") pathlib2;
+    ++ lib.optional (pythonOlder "3.4") pathlib2;
 
   # No proper test suite
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tiny 'shelve'-like database with concurrency support";
     homepage = "https://github.com/vivainio/pickleshare";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pid/default.nix b/nixpkgs/pkgs/development/python-modules/pid/default.nix
index e934ea4577b4..95aca29da5d1 100644
--- a/nixpkgs/pkgs/development/python-modules/pid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pidfile featuring stale detection and file-locking";
     homepage = "https://github.com/trbs/pid/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/piep/default.nix b/nixpkgs/pkgs/development/python-modules/piep/default.nix
index 667a8e3b7371..c4fd24d070e6 100644
--- a/nixpkgs/pkgs/development/python-modules/piep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/piep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pygments ];
   checkInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bringing the power of python to stream editing";
     homepage = "https://github.com/timbertson/piep";
     maintainers = with maintainers; [ timbertson ];
diff --git a/nixpkgs/pkgs/development/python-modules/piexif/default.nix b/nixpkgs/pkgs/development/python-modules/piexif/default.nix
index af4b539d4574..440df36384c9 100644
--- a/nixpkgs/pkgs/development/python-modules/piexif/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/piexif/default.nix
@@ -1,19 +1,29 @@
-{ stdenv, buildPythonPackage, fetchPypi, pillow }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pillow }:
 
 buildPythonPackage rec {
   pname = "piexif";
   version = "1.1.3";
 
+  # patch does not apply to PyPI sdist due to different line endings
+  src = fetchFromGitHub {
+    owner = "hMatoba";
+    repo = "Piexif";
+    rev = version;
+    sha256 = "1akmaxq1cjr8wghwaaql1bd3sajl8psshl58lprgfsigrvnklp8b";
+  };
+
+  patches = [
+    # Fix tests with Pillow >= 7.2.0: https://github.com/hMatoba/Piexif/pull/109
+    (fetchpatch {
+      url = "https://github.com/hMatoba/Piexif/commit/5209b53e9689ce28dcd045f384633378d619718f.patch";
+      sha256 = "0ak571jf76r1vszp2g3cd5c16fz2zkbi43scayy933m5qdrhd8g1";
+    })
+  ];
+
   # Pillow needed for unit tests
   checkInputs = [ pillow ];
 
-  src = fetchPypi {
-    inherit pname version;
-    extension = "zip";
-    sha256 = "06sz58q4mrw472p8fbnq7wsj8zpi5js5r8phm2hiwfmz0v33bjw3";
-  };
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simplify Exif manipulations with Python";
     homepage = "https://github.com/hMatoba/Piexif";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix b/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix
index c13490fb3e80..a36fcdf18bb5 100644
--- a/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pika
 }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ pika ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bninja/pika-pool";
     license = licenses.bsdOriginal;
     description = "Pools for pikas.";
diff --git a/nixpkgs/pkgs/development/python-modules/pika/default.nix b/nixpkgs/pkgs/development/python-modules/pika/default.nix
index 8b0807e3569b..ec8310bdb55f 100644
--- a/nixpkgs/pkgs/development/python-modules/pika/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pika/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose mock twisted tornado ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure-Python implementation of the AMQP 0-9-1 protocol";
     homepage = "https://pika.readthedocs.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
index a5f512fae97f..ff2a2ce4c5e7 100644
--- a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
@@ -18,7 +18,7 @@
 , qpdf
 , setuptools-scm-git-archive
 , setuptools_scm
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -68,7 +68,7 @@ buildPythonPackage rec {
     HOME=$TMPDIR
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pikepdf/pikepdf";
     description = "Read and write PDFs with Python, powered by qpdf";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pilkit/default.nix b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix
index 019d5551a3a6..4a3c682c1229 100644
--- a/nixpkgs/pkgs/development/python-modules/pilkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pillow
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pillow nose_progressive nose mock blessings ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/matthewwithanm/pilkit/";
     description = "A collection of utilities and processors for the Python Imaging Libary";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pillow/6.nix b/nixpkgs/pkgs/development/python-modules/pillow/6.nix
index 64f162c24eb7..0e3fabf1fbca 100644
--- a/nixpkgs/pkgs/development/python-modules/pillow/6.nix
+++ b/nixpkgs/pkgs/development/python-modules/pillow/6.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy
 , olefile
 , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
 , openjpeg, libimagequant
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
-    python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"}
+    python -m pytest -v -x -W always${lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"}
     runHook postCheck
   '';
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
-    ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
+    ++ lib.optionals (isPyPy) [ tk libX11 ];
 
   # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
   # NOTE: The Pillow install script will, by default, add paths like /usr/lib
@@ -61,13 +61,13 @@ buildPythonPackage rec {
     export CFLAGS="-I${libwebp}/include"
   ''
   # Remove impurities
-  + stdenv.lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py \
       --replace '"/Library/Frameworks",' "" \
       --replace '"/System/Library/Frameworks"' ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://python-pillow.github.io/";
     description = "Fork of The Python Imaging Library (PIL)";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix
index 199bdae8fc25..4084df19404b 100644
--- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy
 , olefile
 , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
 , openjpeg, libimagequant
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   '';
 
   # Disable darwin tests which require executables: `iconutil` and `screencapture`
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ];
 
   propagatedBuildInputs = [ olefile ];
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
-    ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
+    ++ lib.optionals (isPyPy) [ tk libX11 ];
 
   # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
   # NOTE: The Pillow install script will, by default, add paths like /usr/lib
@@ -61,13 +61,13 @@ buildPythonPackage rec {
     export CFLAGS="-I${libwebp}/include"
   ''
   # Remove impurities
-  + stdenv.lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py \
       --replace '"/Library/Frameworks",' "" \
       --replace '"/System/Library/Frameworks"' ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://python-pillow.org/";
     description = "The friendly PIL fork (Python Imaging Library)";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix b/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix
index ed0daf123d46..9e23f69d19c5 100644
--- a/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pillow
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pillow ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Eases the transition from PIL to Pillow for Python packages";
     homepage = "https://github.com/beanbaginc/pillowfight";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pims/default.nix b/nixpkgs/pkgs/development/python-modules/pims/default.nix
index 76eaa4fac698..d2a5641acff5 100644
--- a/nixpkgs/pkgs/development/python-modules/pims/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pims/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , slicerator
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # not everything packaged with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/soft-matter/pims";
     description = "Python Image Sequence: Load video and sequential images in many formats with a simple, consistent interface";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/pint/default.nix b/nixpkgs/pkgs/development/python-modules/pint/default.nix
index bb2a20cf62f3..c0aa86a3763d 100644
--- a/nixpkgs/pkgs/development/python-modules/pint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pint/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.6";
 
   nativeBuildInputs = [ setuptools_scm ];
-  
+
   propagatedBuildInputs = [ packaging ]
     ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
index 0952c7056c31..4ea6f75932cd 100644
--- a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six
+{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six
 , setuptools_scm, git, glibcLocales, mock }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest git glibcLocales mock ];
   propagatedBuildInputs = [ pip click six setuptools_scm ];
 
-  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [
+  disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [
     # Depend on network tests:
     "test_allow_unsafe_option" #paramaterized, but all fail
     "test_annotate_option" #paramaterized, but all fail
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     py.test -k "${disabledTests}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Keeps your pinned dependencies fresh";
     homepage = "https://github.com/jazzband/pip-tools/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/nixpkgs/pkgs/development/python-modules/pipx/default.nix
index 122f34edb604..c29847c9f29c 100644
--- a/nixpkgs/pkgs/development/python-modules/pipx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pipx/default.nix
@@ -5,12 +5,13 @@
 , userpath
 , argcomplete
 , packaging
+, importlib-metadata
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pipx";
-  version = "0.15.6.0";
+  version = "0.16.0.0";
 
   disabled = pythonOlder "3.6";
 
@@ -19,10 +20,16 @@ buildPythonPackage rec {
     owner = "pipxproject";
     repo = pname;
     rev = version;
-    sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a";
+    sha256 = "08mn7vm8iw20pg0gfn491y1jx8wcyjijps6f1hy7ipzd5ckynscn";
   };
 
-  propagatedBuildInputs = [ userpath argcomplete packaging ];
+  propagatedBuildInputs = [
+    userpath
+    argcomplete
+    packaging
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
 
   checkInputs = [ pytestCheckHook ];
 
@@ -31,6 +38,7 @@ buildPythonPackage rec {
   '';
 
   # disable tests, which require internet connection
+  pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ];
   disabledTests = [
     "install"
     "inject"
@@ -38,10 +46,12 @@ buildPythonPackage rec {
     "missing_interpreter"
     "cache"
     "internet"
+    "run"
     "runpip"
     "upgrade"
     "suffix"
     "legacy_venv"
+    "determination"
   ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/nixpkgs/pkgs/development/python-modules/pivy/default.nix
index 3d3f93f21a27..aae90d2f8b49 100644
--- a/nixpkgs/pkgs/development/python-modules/pivy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pivy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }:
 
 buildPythonPackage rec {
   pname = "pivy";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
       \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/coin3d/pivy/";
     description = "A Python binding for Coin";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
index 05f13e8878a3..1b03f720fbcd 100644
--- a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
@@ -1,10 +1,10 @@
-{ lib, buildPythonPackage, fetchPypi, nose, pkgconfig }:
+{ lib, buildPythonPackage, fetchPypi, pkg-config }:
 
 buildPythonPackage rec {
   pname = "pkgconfig";
   version = "1.5.1";
 
-  inherit (pkgconfig)
+  inherit (pkg-config)
     setupHooks
     wrapperName
     suffixSalt
@@ -17,19 +17,18 @@ buildPythonPackage rec {
     sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f";
   };
 
-  checkInputs = [ nose ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  propagatedNativeBuildInputs = [ pkg-config ];
 
-  checkPhase = ''
-    nosetests
-  '';
+  doCheck = false;
 
   patches = [ ./executable.patch ];
   postPatch = ''
-    substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"'
+    substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"'
   '';
 
+  pythonImportsCheck = [ "pkgconfig" ];
+
   meta = with lib; {
     description = "Interface Python with pkg-config";
     homepage = "https://github.com/matze/pkgconfig";
diff --git a/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
index 7a0fc2080702..dbf487c5d3aa 100644
--- a/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pkginfo";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false; # I don't know why, but with doCheck = true it fails.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/pkginfo";
     license = licenses.mit;
     description = "Query metadatdata from sdists / bdists / installed packages";
diff --git a/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix b/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix
index 3b1c2bd5bce4..8e3e301793aa 100644
--- a/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pkuseg" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Toolkit for multi-domain Chinese word segmentation";
     homepage = "https://github.com/lancopku/pkuseg-python";
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/python-modules/plac/default.nix b/nixpkgs/pkgs/development/python-modules/plac/default.nix
index dbcd7f213008..9e2c66d9d1ed 100644
--- a/nixpkgs/pkgs/development/python-modules/plac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -17,7 +17,7 @@ buildPythonPackage rec {
       ${python.interpreter} -m unittest discover -p "*test_plac*"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parsing the Command Line the Easy Way";
     homepage = "https://github.com/micheles/plac";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix
index c35fbf7bd13a..956ea1b720ae 100644
--- a/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   version = "1.0.0";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     PYTHONPATH=.. pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mitsuhiko/pluginbase";
     description = "A support library for building plugins sytems in Python";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/plyvel/default.nix b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
index c768c606ca8a..d8537d68158a 100644
--- a/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -15,12 +15,12 @@ buildPythonPackage rec {
     sha256 = "a7a09033a0fd33ca47094e8bbe01714abfcf644f4b7a337d3970e91a2599e2c4";
   };
 
-  buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest;
+  buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest;
 
   # no tests for python2
   doCheck = isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast and feature-rich Python interface to LevelDB";
     platforms = platforms.unix;
     homepage = "https://github.com/wbolster/plyvel";
diff --git a/nixpkgs/pkgs/development/python-modules/pocket/default.nix b/nixpkgs/pkgs/development/python-modules/pocket/default.nix
index e351d26ca481..3599d3dec55d 100644
--- a/nixpkgs/pkgs/development/python-modules/pocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pocket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wrapper for the pocket API";
     homepage    = "https://github.com/tapanpandita/pocket";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/polib/default.nix b/nixpkgs/pkgs/development/python-modules/polib/default.nix
index 304ef95a8846..f7c4e1139a86 100644
--- a/nixpkgs/pkgs/development/python-modules/polib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/polib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "polib";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to manipulate gettext files (po and mo files)";
     homepage = "https://bitbucket.org/izi/polib/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix
index c3d5638841d6..7595730eb31b 100644
--- a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }:
 
 buildPythonPackage rec {
   pname = "pomegranate";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Probabilistic and graphical models for Python, implemented in cython for speed";
     homepage = "https://github.com/jmschrei/pomegranate";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pony/default.nix b/nixpkgs/pkgs/development/python-modules/pony/default.nix
index 1ed0a7cafffb..7a734927ee1e 100644
--- a/nixpkgs/pkgs/development/python-modules/pony/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pony/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, python, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pony";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     rm -rf $out/${python.sitePackages}/pony/orm/tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pony is a Python ORM with beautiful query syntax";
     homepage = "https://ponyorm.org/";
     maintainers = with maintainers; [ d-goldin xvapx ];
diff --git a/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/nixpkgs/pkgs/development/python-modules/pooch/default.nix
index 6530cbd4a5d1..282239d9890b 100644
--- a/nixpkgs/pkgs/development/python-modules/pooch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pooch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy27
 , fetchPypi
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     "integration"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A friend to fetch your data files.";
     homepage = "https://github.com/fatiando/pooch";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/poolsense/default.nix b/nixpkgs/pkgs/development/python-modules/poolsense/default.nix
new file mode 100644
index 000000000000..0ffdf8952277
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/poolsense/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "poolsense";
+  version = "0.0.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "poolsense" ];
+
+  meta = with lib; {
+    description = "Python module to access PoolSense device";
+    homepage = "https://github.com/haemishkyd/poolsense";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
index 6f12a9e69810..4aaaea406774 100644
--- a/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch
+{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch
 , substituteAll
 }:
 
@@ -28,13 +28,13 @@ buildPythonPackage rec {
   ];
 
   buildInputs = [ qtbase.dev poppler ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ sip pyqt5.dev ];
 
   # no tests, just bindings for `poppler_qt5`
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/wbsoft/python-poppler-qt5";
     license = licenses.gpl2;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/python-modules/portend/default.nix b/nixpkgs/pkgs/development/python-modules/portend/default.nix
index 280cadf4db4e..10b30d05fa3e 100644
--- a/nixpkgs/pkgs/development/python-modules/portend/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/portend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, setuptools_scm, tempora, pytest-black, pytestcov }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Monitor TCP ports for bound or unbound states";
     homepage = "https://github.com/jaraco/portend";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix b/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix
index 2be2a89cc6da..2fb6128dc1b1 100644
--- a/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "POSIX IPC primitives (semaphores, shared memory and message queues)";
     license = licenses.bsd3;
     homepage = "http://semanchuk.com/philip/posix_ipc/";
diff --git a/nixpkgs/pkgs/development/python-modules/poster3/default.nix b/nixpkgs/pkgs/development/python-modules/poster3/default.nix
index 269995717aa4..09e8055bdd91 100644
--- a/nixpkgs/pkgs/development/python-modules/poster3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/poster3/default.nix
@@ -15,8 +15,7 @@ buildPythonPackage rec {
   disabled = !isPy3k;
 
   src = fetchPypi {
-    inherit pname version;
-    format = "wheel";
+    inherit pname version format;
     python = "py3";
     sha256 = "1b27d7d63e3191e5d7238631fc828e4493590e94dcea034e386c079d853cce14";
   };
diff --git a/nixpkgs/pkgs/development/python-modules/potr/default.nix b/nixpkgs/pkgs/development/python-modules/potr/default.nix
index adcb71104676..9f2774b9a607 100644
--- a/nixpkgs/pkgs/development/python-modules/potr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/potr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pycrypto }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pycrypto }:
 
 buildPythonPackage rec {
   pname = "python-potr";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pycrypto ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure Python OTR implementation";
     homepage = "http://python-otr.pentabarf.de/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/power/default.nix b/nixpkgs/pkgs/development/python-modules/power/default.nix
index b3d750f7e652..d1998faf6b64 100644
--- a/nixpkgs/pkgs/development/python-modules/power/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/power/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Tests can't work because there is no power information available.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform system power status information";
     homepage = "https://github.com/Kentzo/Power";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pox/default.nix b/nixpkgs/pkgs/development/python-modules/pox/default.nix
index e4869a8f46cc..e7013154f998 100644
--- a/nixpkgs/pkgs/development/python-modules/pox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "06afe1a4a1dbf8b47f7ad5a3c1d8ada9104c64933a1da11338269a2bd8642778";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities for filesystem exploration and automated builds";
     license = licenses.bsd3;
     homepage = "https://github.com/uqfoundation/pox/";
diff --git a/nixpkgs/pkgs/development/python-modules/poyo/default.nix b/nixpkgs/pkgs/development/python-modules/poyo/default.nix
index 3eff663aed9c..d600e46c6b42 100644
--- a/nixpkgs/pkgs/development/python-modules/poyo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/poyo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1pflivs6j22frz0v3dqxnvc8yb8fb52g11lqr88z0i8cg2m5csg2";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/hackebrot/poyo";
     description = "A lightweight YAML Parser for Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ppft/default.nix b/nixpkgs/pkgs/development/python-modules/ppft/default.nix
index d8e8f33181f6..ba23948fdb8c 100644
--- a/nixpkgs/pkgs/development/python-modules/ppft/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ppft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m ppft.tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Distributed and parallel python";
     homepage = "https://github.com/uqfoundation";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/ppscore/default.nix b/nixpkgs/pkgs/development/python-modules/ppscore/default.nix
index 3fd047402ee7..00542c6e90e1 100644
--- a/nixpkgs/pkgs/development/python-modules/ppscore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ppscore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     scikitlearn
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python implementation of the Predictive Power Score (PPS)";
     homepage = "https://github.com/8080labs/ppscore/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/praw/6.3.nix b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
index 6c2201d1f1d2..00182eda0379 100644
--- a/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
+++ b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , betamax
 , betamax-serializers
 , betamax-matchers
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     six
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Reddit API wrapper";
     homepage = "https://praw.readthedocs.org/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/praw/default.nix b/nixpkgs/pkgs/development/python-modules/praw/default.nix
index 698c9cc1ccf6..61b869e87fb2 100644
--- a/nixpkgs/pkgs/development/python-modules/praw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/praw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , betamax
 , betamax-serializers
 , betamax-matchers
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     six
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Reddit API wrapper";
     homepage = "https://praw.readthedocs.org/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
index 7be75eae90a5..533c31d87ce2 100644
--- a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
 , requests
 , testfixtures, mock, requests_toolbelt
 , betamax, betamax-serializers, betamax-matchers, pytest
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Low-level communication layer for PRAW";
     homepage = "https://praw.readthedocs.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/preggy/default.nix b/nixpkgs/pkgs/development/python-modules/preggy/default.nix
index a3ca7d15c77e..a2144f303be7 100644
--- a/nixpkgs/pkgs/development/python-modules/preggy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/preggy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }:
 
 buildPythonPackage rec {
   pname = "preggy";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     nosetests .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assertion library for Python";
     homepage = "http://heynemann.github.io/preggy/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/nixpkgs/pkgs/development/python-modules/preshed/default.nix
index a544d6fab910..5d75c95d770b 100644
--- a/nixpkgs/pkgs/development/python-modules/preshed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/preshed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , murmurhash
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cython hash tables that assume keys are pre-hashed";
     homepage = "https://github.com/explosion/preshed";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pretend/default.nix b/nixpkgs/pkgs/development/python-modules/pretend/default.nix
index af5b33998315..4fe726591e60 100644
--- a/nixpkgs/pkgs/development/python-modules/pretend/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pretend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pretend";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/alex/pretend";
     license = licenses.bsd3;
   };
diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/1.nix b/nixpkgs/pkgs/development/python-modules/prettytable/1.nix
index ccaa02e2f494..5b7457af9bf7 100644
--- a/nixpkgs/pkgs/development/python-modules/prettytable/1.nix
+++ b/nixpkgs/pkgs/development/python-modules/prettytable/1.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "prettytable" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
     homepage = "http://code.google.com/p/prettytable/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
index bc8bd3f835d6..5a15cfd24eb0 100644
--- a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "prettytable" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
     homepage = "http://code.google.com/p/prettytable/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/nixpkgs/pkgs/development/python-modules/primer3/default.nix
new file mode 100644
index 000000000000..e8aa83ed94d9
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/primer3/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, click
+}:
+
+buildPythonPackage rec {
+  pname = "primer3";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "libnano";
+    repo = "primer3-py";
+    rev = version;
+    sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g";
+  };
+
+  nativeBuildInputs = [ cython ];
+
+  # pytestCheckHook leads to a circular import issue
+  checkInputs = [ click ];
+
+  pythonImportsCheck = [ "primer3" ];
+
+  meta = with lib; {
+    description = "Oligo analysis and primer design";
+    homepage = "https://github.com/libnano/primer3-py";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/nixpkgs/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
index ec87186a4fdd..25a81510c7dc 100644
--- a/nixpkgs/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
+++ b/nixpkgs/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
@@ -1,9 +1,12 @@
-{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }:
+{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }:
 
 buildPythonPackage rec {
   pname = "privacyidea-ldap-proxy";
   version = "0.6.1";
 
+  # https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
+  disabled = isPy3k;
+
   src = fetchFromGitHub {
     owner = "privacyidea";
     repo = pname;
diff --git a/nixpkgs/pkgs/development/python-modules/proboscis/default.nix b/nixpkgs/pkgs/development/python-modules/proboscis/default.nix
index 9d4ae92f2c10..00905136716f 100644
--- a/nixpkgs/pkgs/development/python-modules/proboscis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/proboscis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "proboscis";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ nose ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG";
     homepage = "https://pypi.python.org/pypi/proboscis";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/process-tests/default.nix b/nixpkgs/pkgs/development/python-modules/process-tests/default.nix
index de43ea71fd48..4b83205d723e 100644
--- a/nixpkgs/pkgs/development/python-modules/process-tests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/process-tests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for testing processes";
     license = licenses.bsd2;
     homepage = "https://github.com/ionelmc/python-process-tests";
diff --git a/nixpkgs/pkgs/development/python-modules/proglog/default.nix b/nixpkgs/pkgs/development/python-modules/proglog/default.nix
index ef5c21f450d5..3f8c11043811 100644
--- a/nixpkgs/pkgs/development/python-modules/proglog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/proglog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, tqdm }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, tqdm }:
 
 buildPythonPackage rec {
   pname = "proglog";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ tqdm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Logs and progress bars manager for Python";
     homepage = "https://github.com/Edinburgh-Genome-Foundry/Proglog";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/progress/default.nix b/nixpkgs/pkgs/development/python-modules/progress/default.nix
index 9ebef268571c..2c5dbc1386e8 100644
--- a/nixpkgs/pkgs/development/python-modules/progress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     ${python.interpreter} test_progress.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/verigak/progress/";
     description = "Easy to use progress bars";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix
index c756a41b5d0e..a1fdddd95db8 100644
--- a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "progressbar";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/progressbar";
     description = "Text progressbar library for python";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
index 55590f8bd063..cc3029ade64e 100644
--- a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python
 , buildPythonPackage
 , fetchPypi
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "progressbar" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://progressbar-2.readthedocs.io/en/latest/";
     description = "Text progressbar library for python";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix
index 5271912cc0ad..f8980647482c 100644
--- a/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "progressbar231";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # no tests implemented
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/progressbar231";
     description = "Text progressbar library for python";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix
index 5aef28447849..0b53b83f5cca 100644
--- a/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "progressbar33";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # no tests implemented
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/progressbar33";
     description = "Text progressbar library for python";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
index 4a36b625298d..1cd732b19aea 100644
--- a/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
@@ -1,30 +1,33 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
 , protobuf
-, google_api_core
+, googleapis_common_protos
 , pytestCheckHook
+, pytz
 }:
 
 buildPythonPackage rec {
   pname = "proto-plus";
-  version = "1.11.0";
+  version = "1.13.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "416a0f13987789333cd8760a0ee998f8eccd6d7165ee9f283d64ca2de3e8774d";
+    sha256 = "1i5jjnwpd288378h37zads08h695iwmhxm0sxbr3ln6aax97rdb1";
   };
 
   propagatedBuildInputs = [ protobuf ];
 
-  checkInputs = [ pytestCheckHook google_api_core ];
+  checkInputs = [ pytestCheckHook pytz googleapis_common_protos ];
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [ "proto" ];
+
+  meta = with lib; {
     description = "Beautiful, idiomatic protocol buffers in Python";
     homepage = "https://github.com/googleapis/proto-plus-python";
     license = licenses.asl20;
-    maintainers = [ maintainers.ruuda ];
+    maintainers = with maintainers; [ ruuda SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
index ab95eeb51f91..e7bbdd6ccdf8 100644
--- a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
@@ -1,8 +1,19 @@
-{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37
-, protobuf, google_apputils, pyext, libcxx, isPy27
-, disabled, doCheck ? true }:
-
-with stdenv.lib;
+{ buildPackages
+, lib
+, stdenv
+, fetchpatch
+, python
+, buildPythonPackage
+, isPy37
+, protobuf
+, google-apputils
+, six
+, pyext
+, libcxx
+, isPy27
+, disabled
+, doCheck ? true
+}:
 
 buildPythonPackage {
   inherit (protobuf) pname src version;
@@ -11,18 +22,18 @@ buildPythonPackage {
 
   NIX_CFLAGS_COMPILE = toString (
     # work around python distutils compiling C++ with $CC
-    optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
-    ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"
+    lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
+    ++ lib.optional (lib.versionOlder protobuf.version "2.7.0") "-std=c++98"
   );
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [ google_apputils ];
-  propagatedNativeBuildInputs = [ buildPackages.protobuf ];  # For protoc.
-  nativeBuildInputs = [ google_apputils pyext ];
+  propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];
+  propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.
+  nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ];
   buildInputs = [ protobuf ];
 
-  patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2"))
+  patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2"))
     # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)
     (fetchpatch {
       url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
@@ -38,7 +49,7 @@ buildPythonPackage {
     cd python
   '';
 
-  preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+  preConfigure = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
     export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
     export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
   '';
@@ -46,21 +57,21 @@ buildPythonPackage {
   preBuild = ''
     # Workaround for https://github.com/google/protobuf/issues/2895
     ${python.pythonForBuild.interpreter} setup.py build
-  '' + optionalString (versionAtLeast protobuf.version "2.6.0") ''
+  '' + lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
     ${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation
   '';
 
-  installFlags = optional (versionAtLeast protobuf.version "2.6.0")
+  installFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0")
     "--install-option='--cpp_implementation'";
 
   # the _message.so isn't installed, so we'll do that manually.
   # if someone can figure out a less hacky way to get the _message.so to
   # install, please do replace this.
-  postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+  postInstall = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
     cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Protocol Buffers are Google's data interchange format";
     homepage = "https://developers.google.com/protocol-buffers/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/prov/default.nix b/nixpkgs/pkgs/development/python-modules/prov/default.nix
index 3844a0fade9e..9ab4cbf72bdf 100644
--- a/nixpkgs/pkgs/development/python-modules/prov/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prov/default.nix
@@ -1,14 +1,11 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , lxml
 , networkx
 , dateutil
-, six
-, pydotplus
 , rdflib
 , pydot
-, glibcLocales
 }:
 
 buildPythonPackage rec {
@@ -20,29 +17,18 @@ buildPythonPackage rec {
     sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee";
   };
 
-  prePatch = ''
-    substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
-  '';
-
   propagatedBuildInputs = [
     lxml
     networkx
     dateutil
-    six
-    pydotplus
     rdflib
   ];
 
   checkInputs = [
     pydot
-    glibcLocales
   ];
 
-  preCheck = ''
-    export LC_ALL="en_US.utf-8"
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python library for W3C Provenance Data Model (PROV)";
     homepage = "https://github.com/trungdong/prov";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/nixpkgs/pkgs/development/python-modules/psutil/default.nix
index 2d9f0a9440d5..6760ff168e56 100644
--- a/nixpkgs/pkgs/development/python-modules/psutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/psutil/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.7.3";
+  version = "5.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2";
+    sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c";
   };
 
   # arch doesn't report frequency is the same way
diff --git a/nixpkgs/pkgs/development/python-modules/ptable/default.nix b/nixpkgs/pkgs/development/python-modules/ptable/default.nix
index f1118325610c..ffa9bdacd2d1 100644
--- a/nixpkgs/pkgs/development/python-modules/ptable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ptable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, nose }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }:
 
 buildPythonPackage {
   pname = "ptable";
@@ -18,7 +18,7 @@ buildPythonPackage {
     nosetests --with-coverage --cover-package=prettytable --cover-min-percentage=75
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kxxoling/PTable";
     description = "A simple Python library designed to make it quick and easy to represent tabular data in visually appealing ASCII tables";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/ptest/default.nix b/nixpkgs/pkgs/development/python-modules/ptest/default.nix
index 0cdbeb372e3b..c19780a4411c 100644
--- a/nixpkgs/pkgs/development/python-modules/ptest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ptest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "0v1zpfjagjlvdmgv6d502nmb7s996wadvpzg93i651s64rrlwq4s";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports";
     homepage = "https://pypi.python.org/pypi/ptest";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/ptpython/default.nix b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
index 85ba8838f667..fd7b92692fc6 100644
--- a/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # no tests to run
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An advanced Python REPL";
     license = licenses.bsd3;
     maintainers = with maintainers; [ mlieberman85 ];
diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix
index 061ad6858614..abac4fb3baa0 100644
--- a/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "publicsuffix";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows to get the public suffix of a domain name";
     homepage = "https://pypi.python.org/pypi/publicsuffix/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix
index fe360168aa5a..2d9bc73baa3f 100644
--- a/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, requests }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }:
 
 buildPythonPackage rec {
   pname = "publicsuffix2";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Get a public suffix for a domain name using the Public Suffix
       List. Forked from and using the same API as the publicsuffix package.
diff --git a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix
new file mode 100644
index 000000000000..e4bab25fd9c1
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, cbor2
+, fetchFromGitHub
+, pycryptodomex
+, pytestCheckHook
+, pyyaml
+, pytest-vcr
+, pytest-asyncio
+, requests
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "pubnub";
+  version = "4.8.0";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = "python";
+    rev = "v${version}";
+    sha256 = "16wjal95042kh5fxhvji0rwmw892pacqcnyms520mw15wcwilqir";
+  };
+
+  propagatedBuildInputs = [
+    cbor2
+    pycryptodomex
+    requests
+    six
+  ];
+
+  checkInputs = [
+    aiohttp
+    pycryptodomex
+    pytest-asyncio
+    pytestCheckHook
+    pytest-vcr
+
+  ];
+
+  # Some tests don't pass with recent releases of tornado/twisted
+  pytestFlagsArray = [
+    "--ignore tests/integrational"
+    "--ignore tests/manual/asyncio"
+    "--ignore tests/manual/tornado/test_reconnections.py"
+  ];
+
+  pythonImportsCheck = [ "pubnub" ];
+
+  meta = with lib; {
+    description = "Python-based APIs for PubNub";
+    homepage = "https://github.com/pubnub/python";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pubnubsub-handler/default.nix b/nixpkgs/pkgs/development/python-modules/pubnubsub-handler/default.nix
new file mode 100644
index 000000000000..32ad2a8e1b8d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pubnubsub-handler/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pubnub
+, pycryptodomex
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pubnubsub-handler";
+  version = "1.0.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy";
+  };
+
+  propagatedBuildInputs = [
+    pubnub
+    pycryptodomex
+    requests
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pubnubsubhandler" ];
+
+  meta = with lib; {
+    description = "PubNub subscription between PubNub and Home Assistant";
+    homepage = "https://github.com/w1ll1am23/pubnubsub-handler";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pudb/default.nix
index 789a9484d730..0ee2a8470b5e 100644
--- a/nixpkgs/pkgs/development/python-modules/pudb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pudb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pygments
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Tests fail on python 3 due to writes to the read-only home directory
   doCheck = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A full-screen, console-based Python debugger";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/nixpkgs/pkgs/development/python-modules/pulp/default.nix
index 590fc022d669..3e4c4b4b6632 100644
--- a/nixpkgs/pkgs/development/python-modules/pulp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pulp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , pyparsing
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "pulp" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/coin-or/pulp";
     description = "PuLP is an LP modeler written in python";
     maintainers = with maintainers; [ teto ];
diff --git a/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix b/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
index 43d6244ebf0c..9679cc593df0 100644
--- a/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pure-pcapy3";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement.";
     homepage = "https://bitbucket.org/viraptor/pure-pcapy";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/purepng/default.nix b/nixpkgs/pkgs/development/python-modules/purepng/default.nix
index fe504a0776b7..715b2ca69029 100644
--- a/nixpkgs/pkgs/development/python-modules/purepng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/purepng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , python
 , fetchFromGitHub
@@ -38,7 +38,7 @@ buildPythonPackage {
     ${python.interpreter} code/test_png.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python library for PNG image encoding/decoding";
     homepage    = "https://github.com/scondo/purepng";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pushover/default.nix b/nixpkgs/pkgs/development/python-modules/pushover/default.nix
index 72d38259129e..1093f125a969 100644
--- a/nixpkgs/pkgs/development/python-modules/pushover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pushover/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # tests require network
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bindings and command line utility for the Pushover notification service";
     homepage = "https://github.com/Thibauth/python-pushover";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
index f9d97c211055..006246e58366 100644
--- a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six
 , pytestCheckHook, flaky, mock, pytest-mock, requests }:
 
 buildPythonPackage rec {
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     "backtrack"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pvlib-python.readthedocs.io";
     description = "Simulate the performance of photovoltaic energy systems";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pweave/default.nix b/nixpkgs/pkgs/development/python-modules/pweave/default.nix
index aba58b54c3b5..fe74fcece1c0 100644
--- a/nixpkgs/pkgs/development/python-modules/pweave/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pweave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # fails due to trying to run CSS as test
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scientific reports with embedded python computations with reST, LaTeX or markdown";
     homepage = "http://mpastell.com/pweave/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
index a6f43ae5b1f8..77f7859c6d47 100644
--- a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , debugger
 , fetchPypi
@@ -62,10 +62,10 @@ buildPythonPackage rec {
 
   postFixup = ''
     mkdir -p "$out/bin"
-    makeWrapper "${debugger}/bin/${stdenv.lib.strings.getName debugger}" "$out/bin/pwntools-gdb"
+    makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pwntools.com";
     description = "CTF framework and exploit development library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pxml/default.nix b/nixpkgs/pkgs/development/python-modules/pxml/default.nix
index 229b174adec2..57614089e66e 100644
--- a/nixpkgs/pkgs/development/python-modules/pxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , pythonAtLeast
 , isPy27
 , buildPythonPackage
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     nosetests -e 'test_prefixedWhitespace'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/metagriffin/pxml";
     description = ''A python library and command-line tool to "prettify" and colorize XML.'';
     maintainers = with maintainers; [ glittershark ];
diff --git a/nixpkgs/pkgs/development/python-modules/py-radix/default.nix b/nixpkgs/pkgs/development/python-modules/py-radix/default.nix
index 16a362591dd7..fa057ae99254 100644
--- a/nixpkgs/pkgs/development/python-modules/py-radix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py-radix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , coverage
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   doCheck = true;
   checkInputs = [ coverage nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python radix tree for IPv4 and IPv6 prefix matching";
     homepage = "https://github.com/mjschultz/py-radix";
     license = with licenses; [ isc bsdOriginal ];
diff --git a/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix b/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix
index ebaf5f7f64f6..c35e650e18bb 100644
--- a/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "py-sonic";
-  version = "0.7.7";
+  version = "0.7.8";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4cea42a2b0dc2ed0fd8568d6bf0509cfa2675a8b1c347ce9364a00881ebc0272";
+    sha256 = "1nfpiry1jlgcyxcs5zamyfxwdvdiwg4yw0v8jysfc74hm362rg7d";
   };
 
   # package has no tests
diff --git a/nixpkgs/pkgs/development/python-modules/py/default.nix b/nixpkgs/pkgs/development/python-modules/py/default.nix
index 19366ea7146c..4d2b77bb1f2a 100644
--- a/nixpkgs/pkgs/development/python-modules/py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "py";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     "py"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library with cross-python path, ini-parsing, io, code, log facilities";
     homepage = "https://pylib.readthedocs.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix b/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix
index 459922c9bafd..b8a25480799b 100644
--- a/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , python
 , pyusb
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     install -D 99-ibuddy.rules $out/lib/udev/rules.d/99-ibuddy.rules
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code to work with the iBuddy MSN figurine";
     homepage = "https://github.com/armijnhemel/py3buddy";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/py3dns/default.nix b/nixpkgs/pkgs/development/python-modules/py3dns/default.nix
index 223e6c0ab7a4..1f7aeaf1e118 100644
--- a/nixpkgs/pkgs/development/python-modules/py3dns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3dns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python 3 DNS library";
     homepage = "https://launchpad.net/py3dns";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix b/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix
index f9ed9acd0c80..0c2ae1288279 100644
--- a/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
 
 buildPythonPackage rec {
   pname = "py3exiv2";
@@ -13,13 +13,13 @@ buildPythonPackage rec {
   buildInputs = [ exiv2 boost ];
 
   # work around python distutils compiling C++ with $CC (see issue #26709)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
-  meta = {
+  meta = with lib; {
     homepage = "https://launchpad.net/py3exiv2";
     description = "A Python3 binding to the library exiv2";
-    license = with stdenv.lib.licenses; [ gpl3 ];
-    maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ vinymeuh ];
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix
index 03f142a8aba6..71314a08eebc 100644
--- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -33,9 +33,8 @@ buildPythonPackage rec {
 
   doCheck = false;
   propagatedBuildInputs = [
-    pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python
+    pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python file
   ];
-  buildInputs = [ file ];
   prePatch = ''
     sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py
     sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py
@@ -49,7 +48,7 @@ buildPythonPackage rec {
     sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extensible i3status wrapper";
     license = licenses.bsd3;
     homepage = "https://github.com/ultrabug/py3status";
diff --git a/nixpkgs/pkgs/development/python-modules/py4j/default.nix b/nixpkgs/pkgs/development/python-modules/py4j/default.nix
index e8faee8d817d..588d7a32d22f 100644
--- a/nixpkgs/pkgs/development/python-modules/py4j/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py4j/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, stdenv }:
+{ buildPythonPackage, fetchPypi, lib, stdenv }:
 
 buildPythonPackage rec {
   pname = "py4j";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects.";
     homepage = "https://www.py4j.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix
index c82f18d377d3..f53cc45b9fe7 100644
--- a/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , cryptography
 , deprecated
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "PyGithub";
-  version = "1.51";
+  version = "1.54.1";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "PyGithub";
     repo = "PyGithub";
     rev = "v${version}";
-    sha256 = "1hz5fc3rkryl4vzxmmwx75p25wk0ida54lf6bz7261rm5hb05r7j";
+    sha256 = "1nl74bp5ikdnrc8xq0qr25ryl1mvarf0xi43k8w5jzlrllhq0nkq";
   };
 
   checkInputs = [ httpretty parameterized pytestCheckHook ];
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   # Test suite makes REST calls against github.com
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/PyGithub/PyGithub";
     description = "A Python (2 and 3) library to access the GitHub API v3";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix
index e7c75f98231b..af86ce3821eb 100644
--- a/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , openssl
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   buildInputs = [ openssl ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bindings for scrypt key derivation function library";
     homepage = "https://pypi.python.org/pypi/scrypt";
     maintainers = [];
diff --git a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix
index 75b0964e259d..d424b2144292 100644
--- a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -23,7 +23,7 @@ buildPythonPackage rec {
         acoustid.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bindings for Chromaprint acoustic fingerprinting";
     homepage = "https://github.com/sampsyo/pyacoustid";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix b/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix
new file mode 100644
index 000000000000..9ef89c6e920d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pyahocorasick";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "WojciechMula";
+    repo = pname;
+    rev = version;
+    sha256 = "0plm9x2gziayjsl7flsgn1z8qx88c9vqm4fs1wq7dv7fr188liik";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "unittests.py" ];
+  pythonImportsCheck = [ "ahocorasick" ];
+
+  meta = with lib; {
+    description = "Python module implementing Aho-Corasick algorithm";
+    longDescription = ''
+      This Python module is a fast and memory efficient library for exact or
+      approximate multi-pattern string search meaning that you can find multiple
+      key strings occurrences at once in some input text.
+    '';
+    homepage = "https://github.com/WojciechMula/pyahocorasick";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
index 084852fa5371..2e9aa97f1f23 100644
--- a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyairvisual";
-  version = "5.0.4";
+  version = "5.0.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "bachya";
     repo = pname;
     rev = version;
-    sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3";
+    sha256 = "0jjvng3py5g97gvx6rdbk5zxbn5rw8gq1ki4qi4vfsypchxbpz2q";
   };
 
   nativeBuildInputs = [ poetry ];
@@ -43,13 +43,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [
-    "tests"
-  ];
+  # Ignore the examples as they are prefixed with test_
+  pytestFlagsArray = [ "--ignore examples/" ];
+  pythonImportsCheck = [ "pyairvisual" ];
 
   meta = with lib; {
-    description = "A simple, clean, well-tested Python library for interacting with AirVisual©";
-    license = licenses.mit;
+    description = "Python library for interacting with AirVisual";
     homepage = "https://github.com/bachya/pyairvisual";
+    changelog = "https://github.com/bachya/pyairvisual/releases/tag/${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix b/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix
index 3703b5fcca4c..075103e9e40f 100644
--- a/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , matplotlib
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   # no tests in PyPI tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Algorithmic Trading";
     homepage = "http://gbeced.github.io/pyalgotrade/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pyamf/default.nix b/nixpkgs/pkgs/development/python-modules/pyamf/default.nix
index 1c31efadff7c..f0cf111a87ad 100644
--- a/nixpkgs/pkgs/development/python-modules/pyamf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyamf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }:
 
 buildPythonPackage rec {
   pname = "PyAMF";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ defusedxml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AMF (Action Message Format) support for Python";
     homepage = "https://pypi.python.org/pypi/PyAMF";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix
index a2dd4eaf7cf0..9c9c18a886e9 100644
--- a/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -19,13 +19,13 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ six mypy-extensions ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+    ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkPhase = ''
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dropbox/pyannotate";
     description = "Auto-generate PEP-484 annotations";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyarlo/default.nix b/nixpkgs/pkgs/development/python-modules/pyarlo/default.nix
new file mode 100644
index 000000000000..76fe9bc0a108
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyarlo/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+, requests
+, requests-mock
+, sseclient-py
+}:
+
+buildPythonPackage rec {
+  pname = "pyarlo";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "tchellomello";
+    repo = "python-arlo";
+    rev = version;
+    sha256 = "0pp7y2llk4xnf6zh57j5xas0gw5zqm42qaqssd8p4qa3g5rds8k3";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    sseclient-py
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    mock
+    requests-mock
+  ];
+
+  pythonImportsCheck = [ "pyarlo" ];
+
+  meta = with lib; {
+    description = "Python library to work with Netgear Arlo cameras";
+    homepage = "https://github.com/tchellomello/python-arlo";
+    license = with licenses; [ lgpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix
index 82f8f5da3d9c..780c8c2df854 100644
--- a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { python3 = python; };
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   sourceRoot = "apache-arrow-${version}/python";
 
-  nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
+  nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ];
   propagatedBuildInputs = [ numpy six ];
   checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix
index 87e72e1ae5bd..2be2e8b9c11a 100644
--- a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyasn1
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of ASN.1-based protocols modules";
     homepage = "https://pypi.python.org/pypi/pyasn1-modules";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix
index 206db053a564..9b269f79c86a 100644
--- a/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, }:
 
 buildPythonPackage rec {
   pname = "pyasn1";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ASN.1 tools for Python";
     homepage = "http://pyasn1.sourceforge.net/";
     license = "mBSD";
diff --git a/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
index 22acf8725260..6bea15df386f 100644
--- a/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
@@ -12,20 +12,20 @@
 
 buildPythonPackage rec {
   pname = "pyatmo";
-  version = "4.2.1";
+  version = "4.2.2";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jabesq";
-    repo = "netatmo-api-python";
+    repo = "pyatmo";
     rev = "v${version}";
-    sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m";
+    sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I=";
   };
 
   postPatch = ''
     substituteInPlace setup.cfg \
-      --replace "oauthlib~=3.1.0" "oauthlib" \
-      --replace "requests~=2.23.0" "requests"
+      --replace "oauthlib~=3.1" "oauthlib" \
+      --replace "requests~=2.24" "requests"
   '';
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
index 232e44d0999e..5ae00417b6c0 100644
--- a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
+{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
 
 buildPythonPackage rec {
   pname = "pyatspi";
@@ -6,11 +6,11 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     at-spi2-core
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client bindings for D-Bus AT-SPI";
     homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
index 647866b143fb..187f94dbd778 100644
--- a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage
+{ lib, stdenv, buildPythonPackage
 , aiohttp
 , aiozeroconf
 , asynctest
@@ -46,7 +46,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  meta = with stdenv.lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
     description = "A python client library for the Apple TV";
     homepage = "https://github.com/postlund/pyatv";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix
index 91791f5a0674..d88dc7009b73 100644
--- a/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pkgs.portaudio ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for PortAudio";
     homepage = "https://people.csail.mit.edu/hubert/pyaudio/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
index 372d2feff15c..63e180b11b2b 100644
--- a/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
+{ buildPythonPackage, lib, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
 
 buildPythonPackage rec {
   version = "0.3.24";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     py.test tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python3 Parser for Android XML file and get Application Name without using Androguard";
     homepage = "https://github.com/appknox/pyaxmlparser";
     # Files from Androguard are licensed ASL 2.0
diff --git a/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
index d48fed13543b..e462d53fea88 100644
--- a/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, stdenv, fetchPypi, six, pytest }:
+{ buildPythonPackage, isPy3k, lib, stdenv, fetchPypi, six, pytest }:
 
 buildPythonPackage rec {
   pname = "pybase64";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/pybase64";
     description = "Fast Base64 encoding/decoding";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix b/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix
index 136917c68371..4b6f7f1682ff 100644
--- a/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }:
 buildPythonPackage rec {
   pname = "PyBindGen";
   version = "0.21.0";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   checkInputs = [ pygccxml ];
   doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gjcarneiro/pybindgen";
     description = "Python Bindings Generator";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pyblackbird/default.nix b/nixpkgs/pkgs/development/python-modules/pyblackbird/default.nix
new file mode 100644
index 000000000000..fd8f46a968fe
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyblackbird/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "pyblackbird";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "koolsb";
+    repo = pname;
+    rev = version;
+    sha256 = "0m1yd1cb3z8011x7nicxpf091bdcwghcphn0l21c65f71rabzg6s";
+  };
+
+  propagatedBuildInputs = [
+    pyserial
+    pyserial-asyncio
+  ];
+
+  # Test setup try to create a serial port
+  doCheck = false;
+  pythonImportsCheck = [ "pyblackbird" ];
+
+  meta = with lib; {
+    description = "Python implementation for Monoprice Blackbird units";
+    homepage = "https://github.com/koolsb/pyblackbird";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix
index e7af4f70b1e5..0e94764e4a22 100644
--- a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python
 , pkgs
 , isPy3k
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     "SITELIB=$(out)/${python.sitePackages}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html";
     description = "Interface for working with block devices";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix b/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix
index dfb3e94ba276..dee6aea559a5 100644
--- a/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , pygments
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # both tests fail due to time issue that doesn't seem to matter in practice
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pyblosxom.github.io";
     description = "File-based blogging engine";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pybluez/default.nix b/nixpkgs/pkgs/development/python-modules/pybluez/default.nix
index 47c70758e4ca..a02861c68cda 100644
--- a/nixpkgs/pkgs/development/python-modules/pybluez/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybluez/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pkgs
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # the tests do not pass
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bluetooth Python extension module";
     license = licenses.gpl2;
     maintainers = with maintainers; [ leenaars ];
diff --git a/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix b/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
index c5e239ab8973..ca093ba8e8bb 100644
--- a/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
@@ -1,18 +1,33 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, requests_oauthlib
+, voluptuous
+}:
 
 buildPythonPackage rec {
   pname = "pybotvac";
-  version = "0.0.18";
+  version = "0.0.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f";
+    sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [
+    requests
+    requests_oauthlib
+    voluptuous
+  ];
 
-  meta = with stdenv.lib; {
-    description = "Python package for controlling Neato pybotvac Connected vacuum robot";
+  # no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "pybotvac" ];
+
+  meta = with lib; {
+    description = "Python module for interacting with Neato Botvac Connected vacuum robots";
     homepage = "https://github.com/stianaske/pybotvac";
     license = licenses.mit;
     maintainers = with maintainers; [ elseym ];
diff --git a/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix
index fe5ace886ac0..eacbd81055c5 100644
--- a/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , requests, mock }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   checkInputs = [ mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for the BrowserID Protocol";
     homepage    = "https://github.com/mozilla/PyBrowserID";
     license     = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix
index 878654cef163..2dbd4e8cff58 100644
--- a/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
+{ lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
 
 buildPythonPackage rec {
-  version = "0.2.2";
+  version = "1.0.0";
   pname = "pybtex-docutils";
 
   doCheck = false;
@@ -9,12 +9,12 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea90935da188a0f4de2fe6b32930e185c33a0e306154322ccc12e519ebb5fa7d";
+    sha256 = "cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e";
   };
 
-  meta = {
+  meta = with lib; {
     description = "A docutils backend for pybtex";
     homepage = "https://github.com/mcmtroffaes/pybtex-docutils";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pybtex/default.nix b/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
index a62e7e27f9cf..fb6fbf8dd381 100644
--- a/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
+{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
 
 buildPythonPackage rec {
   version = "0.23.0";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
     sha256 = "b92be18ccd5e9a37895949dcf359a1f6890246b73646dddf1129178ee12e4bef";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://pybtex.org/";
     description = "A BibTeX-compatible bibliography processor written in Python";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix b/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix
index 293489cce05b..1353af406ca4 100644
--- a/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pycallgraph.slowchop.com";
     description = "Call graph visualizations for Python applications";
     maintainers = with maintainers; [ auntie ];
diff --git a/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix
index dc4ab1d4bbda..6fc9d2af1cbc 100644
--- a/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
+{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie
 , sqlite, buildPythonPackage, cython
 }:
 
@@ -14,7 +14,7 @@ in buildPythonPackage {
     sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05";
   };
 
-  nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ];
+  nativeBuildInputs = [ pkg-config libtool autoconf automake cython ];
   buildInputs = [ libcangjie sqlite ];
 
   preConfigure = ''
@@ -26,7 +26,7 @@ in buildPythonPackage {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper to libcangjie";
     homepage = "http://cangjians.github.io/projects/pycangjie/";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix b/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
index 1997021ce010..ab9088cf1e5f 100644
--- a/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
@@ -1,34 +1,35 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
-, fetchPypi
 , capnproto
 , cython
+, fetchFromGitHub
+, isPy27
 , isPyPy
-, isPy3k
+, pkgconfig
 }:
 
 buildPythonPackage rec {
   pname = "pycapnp";
   version = "1.0.0";
-  disabled = isPyPy || isPy3k;
+  disabled = isPyPy || isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9f6fcca349ebf2ec04ca7eacb076aea3e4fcdc010ac33c98b54f0a19d4e5d3e0";
+  src = fetchFromGitHub {
+    owner = "capnproto";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1n6dq2fbagi3wvrpkyb7wx4y15nkm2grln4y75hrqgmnli8ggi9v";
   };
 
-  buildInputs = [ capnproto cython ];
+  buildInputs = [ capnproto cython pkgconfig ];
 
-  # import setuptools as soon as possible, to minimize monkeypatching mayhem.
-  postConfigure = ''
-    sed -i '3iimport setuptools' setup.py
-  '';
+  # Tests disabled due to dependency on jinja and various other libraries.
+  doCheck = false;
 
-  meta = with stdenv.lib; {
-    maintainers = with maintainers; [ cstrahan ];
+  pythonImportsCheck = [ "capnp" ];
+
+  meta = with lib; {
+    maintainers = with maintainers; [ cstrahan lukeadams ];
     license = licenses.bsd2;
-    homepage = "http://jparyani.github.io/pycapnp/index.html";
-    broken = true; # 2018-04-11
+    homepage = "https://capnproto.github.io/pycapnp/";
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix b/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix
index 674c9e9af86b..7885cf65b83b 100644
--- a/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ vobject lxml requests urwid pyxdg ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line interface carddav client";
     homepage = "http://lostpackets.de/pycarddav";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pycares/default.nix b/nixpkgs/pkgs/development/python-modules/pycares/default.nix
index e233d8d70884..8404063ac1f8 100644
--- a/nixpkgs/pkgs/development/python-modules/pycares/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycares/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # requires network access
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/saghul/pycares";
     description = "Interface for c-ares";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pycassa/default.nix b/nixpkgs/pkgs/development/python-modules/pycassa/default.nix
index d366486c8f89..0e07d8d436f7 100644
--- a/nixpkgs/pkgs/development/python-modules/pycassa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycassa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, thrift, isPy3k }:
 
 let
 
@@ -30,9 +30,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ thrift' ];
 
-  meta = {
+  meta = with lib; {
     description = "A python client library for Apache Cassandra";
     homepage = "https://github.com/pycassa/pycassa";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pycdio/default.nix b/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
index d5633f9eaefa..712029b692ce 100644
--- a/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ];
   buildInputs = [ setuptools pkgs.libcdio ]
-    ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv;
+    ++ lib.optional stdenv.isDarwin pkgs.libiconv;
 
   # Run tests using nosetests but first need to install the binaries
   # to the root source directory where they can be found.
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/libcdio/";
     description = "Wrapper around libcdio (CD Input and Control library)";
     maintainers = with maintainers; [ rycee ];
diff --git a/nixpkgs/pkgs/development/python-modules/pycfdns/default.nix b/nixpkgs/pkgs/development/python-modules/pycfdns/default.nix
new file mode 100644
index 000000000000..ca0b0fe5ecf0
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pycfdns/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, aiohttp
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "pycfdns";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "ludeeus";
+    repo = pname;
+    rev = version;
+    sha256 = "0df4695cb0h6f2lnn6dx4h5al2ra93zp1hzfaz07nj2gvirswp83";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pycfdns" ];
+
+  meta = with lib; {
+    description = "Python module for updating Cloudflare DNS A records";
+    homepage = "https://github.com/ludeeus/pycfdns";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pychart/default.nix b/nixpkgs/pkgs/development/python-modules/pychart/default.nix
index 98c3242cb29d..2c2399fca92e 100644
--- a/nixpkgs/pkgs/development/python-modules/pychart/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pychart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
 
 buildPythonPackage rec {
   pname = "pychart";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";
     homepage = "https://pypi.python.org/pypi/PyChart";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pychef/default.nix b/nixpkgs/pkgs/development/python-modules/pychef/default.nix
index 6d60573b96eb..1702cde840cf 100644
--- a/nixpkgs/pkgs/development/python-modules/pychef/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pychef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # FIXME
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/coderanger/pychef";
     description = "Python implementation of a Chef API client";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
index 6e45eb2a626f..fecf3f09ca7c 100644
--- a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,17 +2,19 @@
 
 buildPythonPackage rec {
   pname = "PyChromecast";
-  version = "7.7.1";
+  version = "7.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09mdz1y1bfwkszxsawffwy1mr7lc1j2rma571qkb60sk76107zfn";
+    sha256 = "1w7jayb0z529bh1ybb16pfm0m08qqi4px1q0qwlvcxlcrd2v3m5a";
   };
 
   disabled = !isPy3k;
 
   propagatedBuildInputs = [ requests zeroconf protobuf casttube ];
 
+  # no tests available
+  doCheck = false;
   pythonImportsCheck = [ "pychromecast" ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix b/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix
index 6096f30181a1..e89389547096 100644
--- a/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , setuptools_scm
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "pyclipper" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cython wrapper for clipper library";
     homepage    = "https://github.com/fonttools/pyclipper";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/nixpkgs/pkgs/development/python-modules/pycm/default.nix
index a51aa1b931aa..ada4eeeb556c 100644
--- a/nixpkgs/pkgs/development/python-modules/pycm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }:
 
 buildPythonPackage rec {
   pname = "pycm";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pytest Test/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Multiclass confusion matrix library";
     homepage = "https://pycm.ir";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pycognito/default.nix b/nixpkgs/pkgs/development/python-modules/pycognito/default.nix
index a30c1cd344b4..511df9f07f55 100644
--- a/nixpkgs/pkgs/development/python-modules/pycognito/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycognito/default.nix
@@ -1,24 +1,25 @@
 { lib
+, boto3
 , buildPythonPackage
-, fetchFromGitHub
 , cryptography
-, boto3
 , envs
+, fetchFromGitHub
+, isPy27
+, mock
+, pytestCheckHook
 , python-jose
 , requests
-, mock
-, isPy27
 }:
 
 buildPythonPackage rec {
   pname = "pycognito";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "pvizeli";
-    repo = "pycognito";
+    repo = pname;
     rev = version;
-    sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w=";
+    sha256 = "sha256-RJeHPCTuaLN+zB0N0FGt4qrTI6++1ks5iBn64Cx0Psc=";
   };
 
   postPatch = ''
@@ -35,7 +36,13 @@ buildPythonPackage rec {
 
   disabled = isPy27;
 
-  checkInputs = [ mock ];
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "tests.py" ];
+  pythonImportsCheck = [ "pycognito" ];
 
   meta = with lib; {
     description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support";
diff --git a/nixpkgs/pkgs/development/python-modules/pycoin/default.nix b/nixpkgs/pkgs/development/python-modules/pycoin/default.nix
index cb0431be61f8..a21c8f6f549d 100644
--- a/nixpkgs/pkgs/development/python-modules/pycoin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycoin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , gnupg
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     "test_tx_with_gpg"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities for Bitcoin and altcoin addresses and transaction manipulation";
     homepage = "https://github.com/richardkiss/pycoin";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pycollada/default.nix b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix
index 4015f9164e9d..4b177012f4ed 100644
--- a/nixpkgs/pkgs/development/python-modules/pycollada/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }:
 
 buildPythonPackage rec {
   pname = "pycollada";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # (upstream packaging issue)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for reading and writing collada documents";
     homepage = "http://pycollada.github.io/";
     license = "BSD"; # they don't specify which BSD variant
diff --git a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix
index 330acab3e1d0..0b511e024dc0 100644
--- a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , nose, pyparsing, decorator, six, future }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   buildInputs = [ nose ];
   propagatedBuildInputs = [ pyparsing decorator six future ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows to declare constraints on function parameters and return values";
     homepage = "https://pypi.python.org/pypi/PyContracts";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pycountry/default.nix b/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
index 2cd707ee8dcb..b402e9092406 100644
--- a/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 ,
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/flyingcircus/pycountry";
     description = "ISO country, subdivision, language, currency and script definitions and their translations";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pycparser/default.nix b/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
index f3fa6f883fb6..a246ce53a1e0 100644
--- a/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, python }:
 
 buildPythonPackage rec {
   pname = "pycparser";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover -s tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C parser in Python";
     homepage = "https://github.com/eliben/pycparser";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix b/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
index 40084c2885e8..e88b8529a356 100644
--- a/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   version = "3.9.9";
@@ -9,9 +9,9 @@ buildPythonPackage rec {
     sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://www.pycryptodome.org/";
     description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix b/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix
index 25ac99082c0a..0f17d9e59a80 100644
--- a/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://tahoe-lafs.org/trac/pycryptopp";
     description = "Python wrappers for the Crypto++ library";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
index 3876485dd966..1db5df28e32a 100644
--- a/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
@@ -12,7 +12,7 @@
 , cudatoolkit
 , python
 , mkDerivation
-, stdenv
+, lib
 }:
 let
   compyte = import ./compyte.nix {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     sha256 = "effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5";
   };
 
-  preConfigure = with stdenv.lib.versions; ''
+  preConfigure = with lib.versions; ''
     ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \
                           --boost-lib-dir=${boost}/lib \
                           --no-use-shipped-boost \
@@ -60,7 +60,7 @@ buildPythonPackage rec {
     Mako
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/inducer/pycuda/";
     description = "CUDA integration for Python.";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix b/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix
index db04991e6ebc..763cfb9b8456 100644
--- a/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pillow
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pillow mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/azaghal/pydenticon";
     description = "Library for generating identicons. Port of Sigil (https://github.com/cupcake/sigil) with enhancements";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix b/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix
new file mode 100644
index 000000000000..f83d3cbf1102
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pydexcom";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "gagebenne";
+    repo = pname;
+    rev = version;
+    sha256 = "19h7r0qbsqd6k6g4nz6z3k9kdmk0sx5zpsrgxwnhsff5fqi0y2ls";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # tests are interacting with the Dexcom API
+  doCheck = false;
+  pythonImportsCheck = [ "pydexcom" ];
+
+  meta = with lib; {
+    description = "Python API to interact with Dexcom Share service";
+    homepage = "https://github.com/gagebenne/pydexcom";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
index 450a6a3c049e..08c5f099d28c 100644
--- a/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -51,7 +51,7 @@ buildPythonPackage {
     "test_fetch_data_files"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pydicom.github.io";
     description = "Pure-Python package for working with DICOM files";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix b/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix
index 066410b7a0da..d132fad73138 100644
--- a/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pydispatcher.sourceforge.net/";
     description = "Signal-registration and routing infrastructure for use in multiple contexts";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pydns/default.nix b/nixpkgs/pkgs/development/python-modules/pydns/default.nix
index 399eab3e6742..a93820bfaef2 100644
--- a/nixpkgs/pkgs/development/python-modules/pydns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python DNS library";
     homepage = "http://pydns.sourceforge.net/";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/pydotplus/default.nix b/nixpkgs/pkgs/development/python-modules/pydotplus/default.nix
deleted file mode 100644
index bb25ecd85e26..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pydotplus/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, pyparsing
-, graphviz
-}:
-
-buildPythonPackage rec {
-  pname = "pydotplus";
-  version = "2.0.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i";
-  };
-
-  propagatedBuildInputs = [
-    pyparsing
-    graphviz
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/erocarrera/pydot";
-    description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ashgillman ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/pydub/default.nix b/nixpkgs/pkgs/development/python-modules/pydub/default.nix
index 42d33c00cbe8..884df63ce036 100644
--- a/nixpkgs/pkgs/development/python-modules/pydub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:
 
 buildPythonPackage rec {
   pname = "pydub";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
 
   # disable a test that fails on aarch64 due to rounding errors
-  postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+  postPatch = lib.optionalString stdenv.isAarch64 ''
     substituteInPlace test/test.py \
       --replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
   '';
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     python test/test.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Manipulate audio with a simple and easy high level interface.";
     homepage    = "http://pydub.com/";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix b/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix
index 510849edf475..10ade4fa2cab 100644
--- a/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "pyechonest";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "1da4b3b8b457232a7eb35b59a48390b3c208759b01d596acaa71e6a172b40495";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web";
     homepage = "https://github.com/echonest/pyechonest";
   };
diff --git a/nixpkgs/pkgs/development/python-modules/pyee/default.nix b/nixpkgs/pkgs/development/python-modules/pyee/default.nix
index 3c92dee783ad..712db3e87123 100644
--- a/nixpkgs/pkgs/development/python-modules/pyee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyee/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     pytest-trio
     pytestrunner
     twisted
-  ] ++ stdenv.lib.optional isPy27 [
+  ] ++ lib.optional isPy27 [
     attrs
     futures
     pyparsing
diff --git a/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix b/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
index 51e1886f1d0d..258c97a3c112 100644
--- a/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
@@ -1,18 +1,19 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , python
+, stdenv
 }:
 
 buildPythonPackage rec {
   pname = "pyelftools";
-  version = "unstable-2020-09-23";
+  version = "0.27";
 
   src = fetchFromGitHub {
     owner = "eliben";
     repo = pname;
-    rev = "ab84e68837113b2d700ad379d94c1dd4a73125ea";
-    sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q=";
+    rev = "v${version}";
+    sha256 = "09igdym2qj2fvfcazbz25qybmgz7ccrn25xn3havfkdkka0z0i3p";
   };
 
   doCheck = stdenv.is64bit && !stdenv.isDarwin;
@@ -24,11 +25,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "elftools" ];
 
-  meta = with stdenv.lib; {
-    description = "A library for analyzing ELF files and DWARF debugging information";
+  meta = with lib; {
+    description = "Python library for analyzing ELF files and DWARF debugging information";
     homepage = "https://github.com/eliben/pyelftools";
     license = licenses.publicDomain;
     maintainers = with maintainers; [ igsha pamplemousse ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyemd/default.nix b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix
index c6bc941046d5..4e7594fbab5b 100644
--- a/nixpkgs/pkgs/development/python-modules/pyemd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, cython }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }:
 
 buildPythonPackage rec {
   pname = "pyemd";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ numpy ];
   buildInputs = [ cython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
     homepage = "https://github.com/wmayner/pyemd";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix b/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix
index 1c82f7c9d630..fe4182fd53d8 100644
--- a/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy27
 , fetchPypi
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   # dictionaries needed for tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "pyenchant: Python bindings for the Enchant spellchecker";
     homepage = "https://github.com/pyenchant/pyenchant";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/pyeverlights/default.nix b/nixpkgs/pkgs/development/python-modules/pyeverlights/default.nix
new file mode 100644
index 000000000000..00b9f8fb0154
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyeverlights/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "pyeverlights";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "joncar";
+    repo = pname;
+    rev = version;
+    sha256 = "16xpq933j8yydq78fnf4f7ivyw5a45ix4mfycpmm91aj549p6pm0";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  # no tests are present
+  doCheck = false;
+  pythonImportsCheck = [ "pyeverlights" ];
+
+  meta = with lib; {
+    description = "Python module for interfacing with an EverLights control box";
+    homepage = "https://github.com/joncar/pyeverlights";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix b/nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix
new file mode 100644
index 000000000000..d2923f1ad44a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pyevmasm";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "crytic";
+    repo = pname;
+    rev = version;
+    sha256 = "134q0z0dqzxzr0jw5jr98kp90kx2dl0qw9smykwxdgq555q1l6qa";
+  };
+
+  propagatedBuildInputs = [ future ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Ethereum Virtual Machine (EVM) assembler and disassembler";
+    homepage = "https://github.com/crytic/pyevmasm";
+    changelog = "https://github.com/crytic/pyevmasm/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ arturcygan ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix b/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix
index 2dfb5831f7fe..373885073949 100644
--- a/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # No tests are included in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "library for generating Excel 97/2000/XP/2003 and OpenOffice Calc compatible spreadsheets.";
     homepage = "https://sourceforge.net/projects/pyexcelerator";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/pyexiv2/default.nix b/nixpkgs/pkgs/development/python-modules/pyexiv2/default.nix
index cca8b552de1e..bf7afdf79e2c 100644
--- a/nixpkgs/pkgs/development/python-modules/pyexiv2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyexiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, python, exiv2, scons, boost }:
+{ lib, buildPythonPackage, fetchurl, python, exiv2, scons, boost }:
 
 buildPythonPackage rec {
   pname = "pyexiv2";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
 
   buildInputs = [ python exiv2 scons boost ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with lib; {
+    platforms = platforms.linux;
     # Likely needs an older boost which does not have `boost_pythonXY` but `boost_python`.
     broken = true; # 2018-06-23
   };
diff --git a/nixpkgs/pkgs/development/python-modules/pyext/default.nix b/nixpkgs/pkgs/development/python-modules/pyext/default.nix
index 9351ee5d1043..befbd3c2de1d 100644
--- a/nixpkgs/pkgs/development/python-modules/pyext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyext/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage {
     pname = "pyext";
@@ -15,7 +15,7 @@ buildPythonPackage {
     # Has no test suite
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Simple Python extensions";
       homepage = "https://github.com/kirbyfan64/PyExt";
       license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyface/default.nix b/nixpkgs/pkgs/development/python-modules/pyface/default.nix
index 68afbafef308..d317ebdf21b8 100644
--- a/nixpkgs/pkgs/development/python-modules/pyface/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyface/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , setuptools, six, traits
 }:
 
@@ -15,10 +15,10 @@ buildPythonPackage rec {
 
   doCheck = false; # Needs X server
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Traits-capable windowing framework";
     homepage = "https://github.com/enthought/pyface";
-    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    maintainers = with maintainers; [ knedlsepp ];
     license = licenses.bsdOriginal;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
index 6f44b7fb2796..64ec58487c45 100644
--- a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }:
 
 buildPythonPackage rec {
   version = "4.3.2";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
       --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows"
     substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \
       --replace "test_copy_real_file" "notest_copy_real_file"
-  '' + (stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + (lib.optionalString stdenv.isDarwin ''
     # this test fails on darwin due to case-insensitive file system
     substituteInPlace pyfakefs/tests/fake_os_test.py \
       --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir"
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fake file system that mocks the Python file system modules";
     license     = licenses.asl20;
     homepage    = "http://pyfakefs.org/";
diff --git a/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix
index a3facfc771ce..a17388b34b5c 100644
--- a/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 }:
@@ -15,7 +15,7 @@ buildPythonPackage {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pyfantom.ni.fr.eu.org/";
     description = "Wrapper for the LEGO Mindstorms Fantom Driver";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix b/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix
index c8dc83b4eba5..ff66dc8f8675 100644
--- a/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }:
 
 buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   #  export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib"
   #'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
     homepage = "http://hgomersall.github.com/pyFFTW/";
     license = with licenses; [ bsd2 bsd3 ];
diff --git a/nixpkgs/pkgs/development/python-modules/pyfido/default.nix b/nixpkgs/pkgs/development/python-modules/pyfido/default.nix
new file mode 100644
index 000000000000..43909e2c130f
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyfido/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "pyfido";
+  version = "2.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0b28bhyhscaw7dbc92dxswann05x8mz92cagyawdfm8jnc67gq4b";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pyfido" ];
+
+  meta = with lib; {
+    description = "Python client to get fido account data";
+    homepage = "https://github.com/titilambert/pyfido";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix
index d8256e9632a3..a4fe9ec9dfe6 100644
--- a/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   version = "0.8.post1";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "FIGlet in pure Python";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ thoughtpolice ];
diff --git a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
index 04bc56df12d2..2ff88a78a4e7 100644
--- a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }:
 
 buildPythonPackage rec {
   pname = "pyflakes";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # some tests are output dependent, which have changed slightly
   doCheck = pythonOlder "3.9";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/pyflakes";
     description = "A simple program which checks Python source files for errors";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyfnip/default.nix b/nixpkgs/pkgs/development/python-modules/pyfnip/default.nix
new file mode 100644
index 000000000000..1306c530bb43
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyfnip/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pyfnip";
+  version = "0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pyfnip" ];
+
+  meta = with lib; {
+    description = "Python client to get fido account data";
+    homepage = "https://github.com/juhaniemi/pyfnip";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyfribidi/default.nix b/nixpkgs/pkgs/development/python-modules/pyfribidi/default.nix
index e71550867a3d..dfe5449b2826 100644
--- a/nixpkgs/pkgs/development/python-modules/pyfribidi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfribidi/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -16,14 +17,14 @@ buildPythonPackage rec {
     sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c";
   };
 
-  patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
+  patches = lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple wrapper around fribidi";
     homepage = "https://github.com/pediapress/pyfribidi";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix b/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix
index 71253a894e76..2b46a4ce6825 100644
--- a/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyftdi";
-  version = "0.52.0";
+  version = "0.52.9";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "eblot";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0nm4z7v9qcb9mxqbl21jgzica4faldnpy5qmbkrc6scnx55pxfm9";
+    sha256 = "07q9wmpl97a6laxfbcjqhv373msbsjppsyf5i77h0f6ccil0q1i6";
   };
 
   propagatedBuildInputs = [ pyusb pyserial ];
diff --git a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix
index 721d279478d6..5d0d72eb4959 100644
--- a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # on Hydra: https://hydra.nixos.org/build/84374861
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/giampaolo/pyftpdlib/";
     description = "Very fast asynchronous FTP server library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix b/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix
index 8592d9b0aeef..8648ad4f876d 100644
--- a/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # tests need a server to run against
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Package for sending events to the IFTTT Webhooks Channel";
     homepage = "https://github.com/briandconnelly/pyfttt";
     maintainers = with maintainers; [ peterhoeg ];
diff --git a/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/nixpkgs/pkgs/development/python-modules/pygal/default.nix
index b02b60434252..6855c9e4f02c 100644
--- a/nixpkgs/pkgs/development/python-modules/pygal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygal/default.nix
@@ -1,6 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , isPyPy
 , flask
 , pyquery
@@ -16,12 +17,20 @@ buildPythonPackage rec {
   pname = "pygal";
   version = "2.4.0";
 
-  doCheck = !isPyPy;  # one check fails with pypy
+  doCheck = !isPyPy; # one check fails with pypy
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "9204f05380b02a8a32f9bf99d310b51aa2a932cba5b369f7a4dc3705f0a4ce83";
   };
+  patches = [
+    # Fixes compatibility with latest pytest. October 12, 2020.
+    # Should be included in the next release after 2.4.0
+    (fetchpatch {
+      url = "https://github.com/Kozea/pygal/commit/19e5399be18a054b3b293f4a8a2777d2df4f9c18.patch";
+      sha256 = "1j0hpcvd2mhi449wmlr0ml9gw4cakqk3av1j79bi2qy86dyrss2l";
+    })
+  ];
 
   buildInputs = [
     flask
@@ -46,12 +55,12 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ cairosvg tinycss cssselect ]
-    ++ stdenv.lib.optionals (!isPyPy) [ lxml ];
+    ++ lib.optionals (!isPyPy) [ lxml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sexy and simple python charting";
     homepage = "http://www.pygal.org";
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ sjourdois ];
   };
 
diff --git a/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix
index ab46a5670eeb..afca3dd7bc19 100644
--- a/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy27
+{ lib, stdenv, buildPythonPackage, fetchurl, isPy27
 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
 
 buildPythonPackage rec {
@@ -34,7 +34,7 @@ buildPythonPackage rec {
       ln -s pygame-sdl2 pygame_sdl2 || true ; )
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A reimplementation of parts of pygame API using SDL2";
     homepage    = "https://github.com/renpy/pygame_sdl2";
     # Some parts are also available under Zlib License
diff --git a/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix
index 14bd14ab75e7..a1a6b0222b83 100644
--- a/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, castxml, fetchFromGitHub, buildPythonPackage,
+{ lib, stdenv, castxml, fetchFromGitHub, buildPythonPackage,
 llvmPackages }:
 buildPythonPackage rec {
   pname = "pygccxml";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # but the format doesn't accept -isystem directives
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gccxml/pygccxml";
     description = "Python package for easy C++ declarations navigation";
     license = licenses.boost;
diff --git a/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix b/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix
index 6cd21a94a9be..7aa16ac1e9a8 100644
--- a/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , nose }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python GeoIP API";
     homepage = "https://github.com/appliedsec/pygeoip";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix
index a37872d90945..1bb36d6029ec 100644
--- a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , libGL
@@ -75,7 +75,7 @@ buildPythonPackage rec {
     py.test tests/unit tests/integration
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.pyglet.org/";
     description = "A cross-platform windowing and multimedia library";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix b/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix
index 87b8e0b3ffb7..2e5d6271c66a 100644
--- a/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pygments
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pygments_better_html" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Kwpolska/pygments_better_html";
     description = "Improved line numbering for Pygments’ HTML formatter.";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
index 8f41995cf395..31a6b043494d 100644
--- a/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pygments
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jhermann/pygments-markdown-lexer";
     description = "Pygments Markdown Lexer – A Markdown lexer for Pygments to highlight Markdown code snippets";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/nixpkgs/pkgs/development/python-modules/pygmt/default.nix
index 28e7db2a99ea..318706edd930 100644
--- a/nixpkgs/pkgs/development/python-modules/pygmt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , pythonOlder
 , buildPythonPackage
 , fetchFromGitHub
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pygmt" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python interface for the Generic Mapping Tools";
     homepage = "https://github.com/GenericMappingTools/pygmt";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix b/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix
index 7e31e788f31e..ccad57eba1ed 100644
--- a/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
+{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
 pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
 
 buildPythonPackage rec {
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
   };
 
@@ -18,9 +18,9 @@ buildPythonPackage rec {
     "-Dpython=python${if isPy3k then "3" else "2" }"
   ];
 
-  nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
+  nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
   buildInputs = [ glib gobject-introspection ]
-                 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
+                 ++ lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
 
   passthru = {
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pygobject.readthedocs.io/";
     description = "Python bindings for Glib";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
index 6e34e7f91007..8c26ec6174b2 100644
--- a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
+{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
 pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
 
 buildPythonPackage rec {
@@ -10,15 +10,15 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU=";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
+  nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
   buildInputs = [ glib gobject-introspection ]
-                 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
+                 ++ lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
 
   passthru = {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pygobject.readthedocs.io/";
     description = "Python bindings for Glib";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pygobject/default.nix b/nixpkgs/pkgs/development/python-modules/pygobject/default.nix
index a7b25e57a336..bf42d17b4deb 100644
--- a/nixpkgs/pkgs/development/python-modules/pygobject/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k }:
+{ lib, stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:
 
 buildPythonPackage rec {
   pname = "pygobject";
   version = "2.28.7";
   format = "other";
+  disabled = pythonAtLeast "3.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
@@ -12,20 +13,20 @@ buildPythonPackage rec {
 
   outputs = [ "out" "devdoc" ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     ./pygobject-2.0-fix-darwin.patch
   ];
 
   configureFlags = [ "--disable-introspection" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ];
 
   # in a "normal" setup, pygobject and pygtk are installed into the
   # same site-packages: we need a pth file for both. pygtk.py would be
   # used to select a specific version, in our setup it should have no
   # effect, but we leave it in case somebody expects and calls it.
-  postInstall = stdenv.lib.optionalString (!isPy3k) ''
+  postInstall = lib.optionalString (!isPy3k) ''
     mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}
 
     # Prevent wrapping of codegen files as these are meant to be
@@ -33,9 +34,9 @@ buildPythonPackage rec {
     chmod a-x $out/share/pygobject/*/codegen/*.py
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://pygobject.readthedocs.io/";
     description = "Python bindings for GLib";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix b/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
index 4322e76e3e74..416410ab3ce7 100644
--- a/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, isPyPy
+{ lib, stdenv, buildPythonPackage, fetchurl, isPyPy
 , gpgme }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ gpgme ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/pygpgme";
     description = "A Python wrapper for the GPGME library";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
index a8d80f6e6175..f239647bafa5 100644
--- a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz
-, pkgconfig, doctest-ignore-unicode, mock, nose }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz
+, pkg-config, doctest-ignore-unicode, mock, nose }:
 
 buildPythonPackage rec {
   pname = "pygraphviz";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ graphviz ];
   checkInputs = [ doctest-ignore-unicode mock nose ];
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   # https://github.com/pygraphviz/pygraphviz/pull/129
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python interface to Graphviz graph drawing package";
     homepage = "https://github.com/pygraphviz/pygraphviz";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pygreat/default.nix b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix
index bdced30f9831..20a96d1f8f2c 100644
--- a/nixpkgs/pkgs/development/python-modules/pygreat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }:
 
 buildPythonPackage {
   pname = "pygreat";
@@ -22,7 +22,7 @@ buildPythonPackage {
     echo "$version" > ../VERSION
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for talking with libGreat devices";
     homepage = "https://greatscottgadgets.com/greatfet/";
     license = with licenses; [ bsd3 ];
diff --git a/nixpkgs/pkgs/development/python-modules/pygtk/default.nix b/nixpkgs/pkgs/development/python-modules/pygtk/default.nix
index 4779f76aed46..938b55630c06 100644
--- a/nixpkgs/pkgs/development/python-modules/pygtk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango
+{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango
 , buildPythonPackage, libglade ? null, isPy3k }:
 
 buildPythonPackage rec {
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d";
   };
 
@@ -24,10 +24,10 @@ buildPythonPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     pango
-  ] ++ stdenv.lib.optional (libglade != null) libglade;
+  ] ++ lib.optional (libglade != null) libglade;
 
   propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
 
@@ -35,11 +35,11 @@ buildPythonPackage rec {
 
   buildPhase = "buildPhase";
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-ObjC";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC";
 
   installPhase = "installPhase";
 
-  checkPhase = stdenv.lib.optionalString (libglade == null)
+  checkPhase = lib.optionalString (libglade == null)
     ''
       sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
              tests/common.py
@@ -65,7 +65,7 @@ buildPythonPackage rec {
                   $out/lib/${python.libPrefix}/site-packages/${pname}-${version}.pth
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GTK 2 Python bindings";
     homepage = "https://gitlab.gnome.org/Archive/pygtk";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix b/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix
index 947b5733a7e5..57a21f1e1784 100644
--- a/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
+{ lib, fetchurl, python, buildPythonPackage, pkg-config, pygobject2, glib, pygtk, gnome2 }:
 
 buildPythonPackage rec {
   pname = "pygtksourceview";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   patches = [ ./codegendir.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ];
 
   meta = {
diff --git a/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix b/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix
index 592172c6550d..5df52d9b658c 100644
--- a/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , mock, pytest
 , six
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   doCheck = false;  # pypi tarball does not include tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/hamcrest/PyHamcrest";
     description = "Hamcrest framework for matcher objects";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix
index 40469bd0deba..a66e26b1319a 100644
--- a/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , mock, pytest
 , six
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   doCheck = false;  # pypi tarball does not include tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/hamcrest/PyHamcrest";
     description = "Hamcrest framework for matcher objects";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
index 1a32851e6f38..22290695cc0a 100644
--- a/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
@@ -1,49 +1,49 @@
 { lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-# propagatedBuildInputs
 , aiohttp
+, aresponses
 , async-timeout
-, semantic-version
-# buildInputs
-, pytestrunner
-# checkInputs
-, pytest
+, awesomeversion
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
 , pytest-asyncio
-, aresponses
+, pytestCheckHook
 }:
+
 buildPythonPackage rec {
   pname = "pyhaversion";
-  version = "3.4.2";
+  version = "20.12.1";
 
-  # needs aiohttp which is py3k-only
-  disabled = !isPy3k;
+  # Only 3.8.0 and beyond are supported
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b4e49dfa0f9dae10edd072e630d902e5497daa312baad58b7df7618efe863377";
+  src = fetchFromGitHub {
+    owner = "ludeeus";
+    repo = pname;
+    rev = version;
+    sha256 = "17yl67dgw75dghljcfwzblm11kqnh6sxf47w62mxz86aq9zrvcxd";
   };
 
   propagatedBuildInputs = [
     aiohttp
     async-timeout
-    semantic-version
-  ];
-
-  buildInputs = [
-    pytestrunner
+    awesomeversion
   ];
 
   checkInputs = [
-    pytest
-    pytest-asyncio
     aresponses
+    awesomeversion
+    pytest-asyncio
+    pytestCheckHook
   ];
 
+  pythonImportsCheck = [ "pyhaversion" ];
+
   meta = with lib; {
-    description = "A python module to the newest version number of Home Assistant";
+    description = "Python module to the newest version number of Home Assistant";
     homepage = "https://github.com/ludeeus/pyhaversion";
-    maintainers = [ maintainers.makefu ];
+    changelog = "https://github.com/ludeeus/pyhaversion/releases/tag/${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ makefu ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
index 9534762f4e48..502d648b4007 100644
--- a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pyhomematic";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python 3 Interface to interact with Homematic devices";
     homepage = "https://github.com/danielperna84/pyhomematic";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyicu/default.nix b/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
index 9dcdfb64c93a..3512e33c81d7 100644
--- a/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/PyICU/";
     description = "Python extension wrapping the ICU C++ API";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix b/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix
index 7193fe118fd2..92c2f5bb6717 100644
--- a/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests distributed
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/seb-m/pyinotify/wiki";
     description = "Monitor filesystems events on Linux platforms with inotify";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix
index 90d13ae07877..a52a0bb40010 100644
--- a/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage {
     sha256 = "0rkis0xp8f9jc00x7jb9kbvhdla24z1vl30djqa6wy6fx0cr6sib";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ntzrmtthihu777/pyinputevent";
     description = "Python interface to the Input Subsystem's input_event and uinput";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
new file mode 100644
index 000000000000..8596883326ba
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiofiles
+, aiohttp
+, async_generator
+, pypubsub
+, pyserial
+, pyserial-asyncio
+, pyyaml
+, pytestCheckHook
+, pythonOlder
+, pytest-cov
+, pytest-asyncio
+, pytest-timeout
+}:
+
+buildPythonPackage rec {
+  pname = "pyinsteon";
+  version = "1.0.8";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h";
+  };
+
+  propagatedBuildInputs = [
+    aiofiles
+    aiohttp
+    async_generator
+    pypubsub
+    pyserial
+    pyserial-asyncio
+    pyyaml
+  ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytest-cov
+    pytest-timeout
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyinsteon" ];
+
+  meta = with lib; {
+    description = "Python library to support Insteon home automation projects";
+    longDescription = ''
+      This is a Python package to interface with an Insteon Modem. It has been
+      tested to work with most USB or RS-232 serial based devices such as the
+      2413U, 2412S, 2448A7 and Hub models 2242 and 2245.
+    '';
+    homepage = "https://github.com/pyinsteon/pyinsteon";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix
index 98bb6360ce54..ed5a5f4576ab 100644
--- a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix
@@ -1,11 +1,18 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy27
-, aiohttp, deepmerge, yarl
-, aresponses, pytest, pytest-asyncio, pytestcov }:
+{ lib
+, aiohttp
+, aresponses
+, buildPythonPackage
+, deepmerge
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+, pytestcov
+, yarl
+}:
 
 buildPythonPackage rec {
   pname = "pyipp";
   version = "0.11.0";
-  disabled = isPy27;
 
   src = fetchFromGitHub {
    owner = "ctalkington";
@@ -22,14 +29,26 @@ buildPythonPackage rec {
 
   checkInputs = [
     aresponses
-    pytest
     pytest-asyncio
     pytestcov
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    pytest -q .
-  '';
+  # Some tests are failing due to encoding issues
+  # https://github.com/ctalkington/python-ipp/issues/121
+  disabledTests = [
+    "test_internal_session"
+    "test_request_port"
+    "est_http_error426"
+    "test_unexpected_response"
+    "test_printer"
+    "test_raw"
+    "test_ipp_request"
+    "test_request_tls"
+    "test_ipp_error_0x0503"
+  ];
+
+  pythonImportsCheck = [ "pyipp" ];
 
   meta = with lib; {
     description = "Asynchronous Python client for Internet Printing Protocol (IPP)";
diff --git a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix
new file mode 100644
index 000000000000..762e39fe4b14
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, aiohttp
+, aresponses
+, fetchFromGitHub
+, poetry
+, pytest-aiohttp
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pyiqvia";
+  version = "0.3.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "bachya";
+    repo = pname;
+    rev = version;
+    sha256 = "1yjsbq4p040a35n8g2l0wgnv83wkjirv4rj73s2mjzn3cxf395bz";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [
+    aresponses
+    pytest-aiohttp
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # Ignore the examples as they are prefixed with test_
+  pytestFlagsArray = [ "--ignore examples/" ];
+  pythonImportsCheck = [ "pyiqvia" ];
+
+  meta = with lib; {
+    description = "Python3 API for IQVIA data";
+    longDescription = ''
+      pyiqvia is an async-focused Python library for allergen, asthma, and
+      disease data from the IQVIA family of websites (such as https://pollen.com,
+      https://flustar.com and more).
+    '';
+    homepage = "https://github.com/bachya/pyiqvia";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
index 9f355743ead2..f37ddb2483e1 100644
--- a/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }:
 
 buildPythonPackage rec {
   pname = "pykdtree";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "kd-tree implementation for fast nearest neighbour search in Python";
     homepage = "https://github.com/storpipfugl/pykdtree";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix b/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix
index 07db7e7002bd..07a32a25a0c6 100644
--- a/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, krb5 }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, krb5 }:
 
 buildPythonPackage rec {
   pname = "pykerberos";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # there are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-level interface to Kerberos";
     license     = licenses.asl20;
     maintainers = with maintainers; [ catern ];
diff --git a/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix
index 6461f0391caa..bc10295e232a 100644
--- a/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , urlgrabber
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     ${python.interpreter} tests/baseclass.py -vv
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://fedoraproject.org/wiki/Pykickstart";
     description = "Read and write Fedora kickstart files";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pykira/default.nix b/nixpkgs/pkgs/development/python-modules/pykira/default.nix
new file mode 100644
index 000000000000..43d381e6bce7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pykira/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "pykira";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zxglzmd2k1nc4wri76ykra910fdgli027nw9d6541ic7xmw87vj";
+  };
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pykira" ];
+
+  meta = with lib; {
+    description = "Python module to interact with Kira modules";
+    homepage = "https://github.com/stu-gott/pykira";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix b/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix
new file mode 100644
index 000000000000..74b244f52965
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, nose
+, pyserial
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pylacrosse";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "hthiery";
+    repo = "python-lacrosse";
+    rev = version;
+    sha256 = "0g5hqm8lq0gsnvhcydjk54rjf7lpxzph8k7w1nnvnqfbhf31xfcf";
+  };
+
+  propagatedBuildInputs = [ pyserial ];
+
+  checkInputs = [
+    mock
+    nose
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pylacrosse" ];
+
+  meta = with lib; {
+    description = "Python library for Jeelink LaCrosse";
+    homepage = "https://github.com/hthiery/python-lacrosse";
+    license = with licenses; [ lgpl2Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/nixpkgs/pkgs/development/python-modules/pylast/default.nix
index 12fac476f633..707554be5599 100644
--- a/nixpkgs/pkgs/development/python-modules/pylast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylast/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six
 , setuptools_scm
 }:
 
 buildPythonPackage rec {
   pname = "pylast";
-  version = "4.0.0";
+  version = "4.1.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8ec555d6c4c1b474e9b3c96c3786abd38303a1a5716d928b0f3cfdcb4499b093";
+    sha256 = "ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # tests require last.fm credentials
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pylast/pylast";
     description = "A python interface to last.fm (and compatibles)";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix b/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix
index 3c2a0be941df..25989d0353e0 100644
--- a/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyparsing }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pyparsing }:
 buildPythonPackage rec {
   pname = "pylibconfig2";
   version = "0.2.5";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyparsing ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/heinzK1X/pylibconfig2";
     description = "Pure python library for libconfig syntax";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix b/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
index 4c0a406bed34..454f08fd10ed 100644
--- a/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPyPy
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   buildInputs = [ liblo cython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://das.nasophon.de/pyliblo/";
     description = "Python wrapper for the liblo OSC library";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix b/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix
index 26d6e4fb6fb6..8bb62c091348 100644
--- a/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:
+{ buildPythonPackage, fetchPypi, lib, stdenv, libmemcached, zlib, cyrus_sasl }:
 
 buildPythonPackage rec {
   version = "1.6.1";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # requires an external memcached server running
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Quick and small memcached client for Python";
     homepage = "http://sendapatch.se/projects/pylibmc/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix
new file mode 100644
index 000000000000..7e1fa0606191
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, python-language-server }:
+
+buildPythonPackage rec {
+  pname = "pyls-spyder";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07apxh12b8ybkx5izr7pg8kbg5g5wgzw7vh5iy2n8dhiqarzp7s1";
+  };
+
+  propagatedBuildInputs = [ python-language-server ];
+
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pyls_spyder" ];
+
+  meta = with lib; {
+    description = "Spyder extensions for the python-language-server";
+    homepage = "https://github.com/spyder-ide/pyls-spyder";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/nixpkgs/pkgs/development/python-modules/pylutron/default.nix
new file mode 100644
index 000000000000..90a45640812e
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pylutron/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "pylutron";
+  version = "0.2.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q8qdy26s9hvfsh75pak7xiqjwrwsgq18p4d86dwf4dwmy5s4qj1";
+  };
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pylutron" ];
+
+  meta = with lib; {
+    description = "Python library for controlling a Lutron RadioRA 2 system";
+    homepage = "https://github.com/thecynic/pylutron";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pymaging/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix
index 68a2e59b298c..3b35ce3e7166 100644
--- a/nixpkgs/pkgs/development/python-modules/pymaging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage {
     sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support";
     homepage    = "http://pymaging.rtfd.org";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix
index 9bf2559e2f0c..64ea5b4ff5b0 100644
--- a/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pymaging
@@ -17,7 +17,7 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ pymaging ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support";
     homepage    = "https://github.com/ojii/pymaging-png/";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pymata-express/default.nix b/nixpkgs/pkgs/development/python-modules/pymata-express/default.nix
new file mode 100644
index 000000000000..1a50a91a3092
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pymata-express/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pymata-express";
+  version = "1.19";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "MrYsLab";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0gfjmqcxwsnfjgll6ql5xd1n3xp4klf4fcaajaivh053i02p0a79";
+  };
+
+  propagatedBuildInputs = [ pyserial ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pymata_express" ];
+
+  meta = with lib; {
+    description = "Python Asyncio Arduino Firmata Client";
+    longDescription = ''
+      Pymata-Express is a Python Firmata Protocol client. When used in conjunction
+      with an Arduino Firmata sketch, it permits you to control and monitor Arduino
+      hardware remotely over a serial link.
+    '';
+    homepage = "https://mryslab.github.io/pymata-express/";
+    license = with licenses; [ agpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
index ce89cb1e079e..84fcdbef6a3f 100644
--- a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , enum34
 , glibcLocales
 , matplotlib
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   # No tests in pypi tarball.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A robust materials analysis code that defines core object representations for structures and molecules";
     homepage = "https://pymatgen.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
index 8438df73c1c4..b04276f1f559 100644
--- a/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , libmediainfo
 , setuptools_scm
 , pytest, glibcLocales }:
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     py.test -k 'not test_parse_url' tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper for the mediainfo library";
     homepage = "https://github.com/sbraz/pymediainfo";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix b/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix
index 4c8097325bcc..96fb9d6f6943 100644
--- a/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "PyMeeus";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     pytest .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/architest/pymeeus";
     description = "Library of astronomical algorithms";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix b/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix
index 4efafeaaca42..b44ff9fef491 100644
--- a/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , django
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # django.core.exceptions.ImproperlyConfigured: Requested settings, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple Python cache and memoizing module";
     homepage = "https://github.com/mikeboers/PyMemoize";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pymetar/default.nix b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix
index 6896eaa097ec..84139091ae49 100644
--- a/nixpkgs/pkgs/development/python-modules/pymetar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, buildPythonPackage, isPy3k, fetchPypi }:
+{ lib, stdenv, python, buildPythonPackage, isPy3k, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pymetar";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     ./runtests.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command-line tool to show the weather report by a given station ID";
     homepage = "http://www.schwarzvogel.de/software/pymetar.html";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pymetno/default.nix b/nixpkgs/pkgs/development/python-modules/pymetno/default.nix
index 92e26c4f6e53..2b10e2f164fb 100644
--- a/nixpkgs/pkgs/development/python-modules/pymetno/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymetno/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , aiohttp
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "metno"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to communicate with the met.no api";
     homepage = "https://github.com/Danielhiversen/pyMetno/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix
new file mode 100644
index 000000000000..76f2e9a9338b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pyserial
+, pyserial-asyncio
+, pytestCheckHook
+, pythonOlder
+, redis
+, sqlalchemy
+, tornado
+, twisted
+}:
+
+buildPythonPackage rec {
+  pname = "pymodbus";
+  version = "2.4.0";
+
+  src = fetchFromGitHub {
+    owner = "riptideio";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0x0dv02shcc2yxxm9kvcbhip111sna74dvcfssxdzzy967vnq76v";
+  };
+
+  # Twisted asynchronous version is not supported due to a missing dependency
+  propagatedBuildInputs = [
+    pyserial
+    pyserial-asyncio
+    tornado
+  ];
+
+  checkInputs = [
+    asynctest
+    mock
+    pyserial-asyncio
+    pytestCheckHook
+    redis
+    sqlalchemy
+    tornado
+    twisted
+  ];
+
+  pythonImportsCheck = [ "pymodbus" ];
+
+  meta = with lib; {
+    description = "Python implementation of the Modbus protocol";
+    longDescription = ''
+      Pymodbus is a full Modbus protocol implementation using twisted,
+      torndo or asyncio for its asynchronous communications core. It can
+      also be used without any third party dependencies if a more
+      lightweight project is needed.
+    '';
+    homepage = "https://github.com/riptideio/pymodbus";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pympler/default.nix b/nixpkgs/pkgs/development/python-modules/pympler/default.nix
index f80c91e8f2dd..856458bf043f 100644
--- a/nixpkgs/pkgs/development/python-modules/pympler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pympler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   doCheck = stdenv.hostPlatform.isLinux;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to measure, monitor and analyze memory behavior";
     homepage = "https://pythonhosted.org/Pympler/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix b/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix
index d844144addbc..d69c0011ac53 100644
--- a/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, tkinter }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, tkinter }:
 
 buildPythonPackage rec {
   pname = "PyMsgBox";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Finding tests fails
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple, cross-platform, pure Python module for JavaScript-like message boxes";
     homepage = "https://github.com/asweigart/PyMsgBox";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
index 30df7589c9ee..8ce7d5a19c6f 100644
--- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
 buildPythonPackage rec {
   pname = "pymupdf";
   version = "1.18.0";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for MuPDF's rendering library.";
     homepage = "https://github.com/pymupdf/PyMuPDF";
     maintainers = with maintainers; [ teto ];
diff --git a/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/nixpkgs/pkgs/development/python-modules/pymyq/default.nix
new file mode 100644
index 000000000000..2500909d534e
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pymyq/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, aiodns
+, aiohttp
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "pymyq";
+  version = "2.0.14";
+
+  src = fetchFromGitHub {
+    owner = "arraylabs";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w";
+  };
+
+  propagatedBuildInputs = [
+    aiodns
+    aiohttp
+    async-timeout
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pymyq" ];
+
+  meta = with lib; {
+    description = "Python wrapper for MyQ API";
+    homepage = "https://github.com/arraylabs/pymyq";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix b/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix
index 16c0e1a58d3f..6009b03e5086 100644
--- a/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pymysql
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pymysql sqlalchemy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PyMySQL dialect for SQL Alchemy";
     homepage = "https://pypi.python.org/pypi/pymysql_sa";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pynac/default.nix b/nixpkgs/pkgs/development/python-modules/pynac/default.nix
index 69233adc264e..656825a36bbb 100644
--- a/nixpkgs/pkgs/development/python-modules/pynac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 }:
@@ -12,7 +12,7 @@ buildPythonPackage {
     sha256 = "0avzqqcxl54karjmla9jbsyid98mva36lxahwmrsx5h40ys2ggxp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/se-esss-litterbox/Pynac";
     description = "A Python wrapper around the Dynac charged particle simulator";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
index dfce6652d03a..be69bf3d8023 100644
--- a/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ va1entin ];
     description = "Python binding to the Networking and Cryptography (NaCl) library";
     homepage = "https://github.com/pyca/pynacl/";
diff --git a/nixpkgs/pkgs/development/python-modules/pync/default.nix b/nixpkgs/pkgs/development/python-modules/pync/default.nix
index b7c819c4593d..9506b8bae953 100644
--- a/nixpkgs/pkgs/development/python-modules/pync/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -19,11 +19,11 @@ buildPythonPackage rec {
   buildInputs = [ pkgs.coreutils ];
   propagatedBuildInputs = [ dateutil ];
 
-  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  preInstall = lib.optionalString stdenv.isDarwin ''
     sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Wrapper for Mac OS 10.8 Notification Center";
     homepage    = "https://pypi.python.org/pypi/pync/1.4";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix b/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix
index 3a7c6b43392b..6214f3db42b2 100644
--- a/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake
 , pythonOlder, libnest2d, sip, clipper }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
      sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' cmake/SIPMacros.cmake
    '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for libnest2d";
     homepage = "https://github.com/Ultimaker/pynest2d";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
index e2ead68d11b9..0ecac704e1e8 100644
--- a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, psutil, docutils }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, psutil, docutils }:
 
 buildPythonPackage rec {
   pname = "pynisher";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # no tests in the Pypi archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The pynisher is a little module intended to limit a functions resources.";
     homepage = "https://github.com/sfalkner/pynisher";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pynput/default.nix b/nixpkgs/pkgs/development/python-modules/pynput/default.nix
index b525f22b2d34..49da01f8e716 100644
--- a/nixpkgs/pkgs/development/python-modules/pynput/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }:
 
 buildPythonPackage rec {
   pname = "pynput";
@@ -12,13 +12,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [ sphinx ];
 
   propagatedBuildInputs = [ setuptools-lint xlib ]
-  ++ stdenv.lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.isLinux [
     evdev
   ];
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to control and monitor input devices";
     homepage = "https://github.com/moses-palmer/pynput";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pynzb/default.nix b/nixpkgs/pkgs/development/python-modules/pynzb/default.nix
index 530a5e2e179f..294c2374f537 100644
--- a/nixpkgs/pkgs/development/python-modules/pynzb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynzb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Can't get them working
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ericflo/pynzb";
     description = "Unified API for parsing NZB files";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix b/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
index 9799cbaf0e8f..4b27bea10bc5 100644
--- a/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, isPy3k, buildPythonPackage }:
+{ lib, fetchPypi, isPy3k, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "pyobjc";
@@ -13,10 +13,10 @@ buildPythonPackage rec {
     sha256 = "2b6c3e98f1408564ace1df36927154d7827c8e2f382386ab5d2db95c891e35a0";
   };
 
-  meta = {
+  meta = with lib; {
     description = "A bridge between the Python and Objective-C programming languages";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
     homepage = "https://pythonhosted.org/pyobjc/";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix
index 7451b1102ed2..2dec1d8705bb 100644
--- a/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }:
 
 buildPythonPackage rec {
   pname = "pyodbc";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false; # tests require a database server
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python ODBC module to connect to almost any database";
     homepage = "https://github.com/mkleehammer/pyodbc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
index 297757687688..4171eaeeb57e 100644
--- a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , Mako
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   # gcc: error: pygpu_language_opencl.cpp: No such file or directory
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper for OpenCL";
     homepage = "https://github.com/pyopencl/pyopencl";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix
index 2a3b90733c46..b2d62e3730d1 100644
--- a/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   # Should run test suite from $out/${python.sitePackages}
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pyopengl.sourceforge.net/";
     description = "PyOpenGL, the Python OpenGL bindings";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
index 202607186b94..c8b3bd4158c4 100644
--- a/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , openssl
@@ -13,9 +14,6 @@
 , fetchpatch
 }:
 
-with stdenv.lib;
-
-
 let
   # https://github.com/pyca/pyopenssl/issues/791
   # These tests, we disable in the case that libressl is passed in as openssl.
@@ -51,21 +49,20 @@ let
     # https://github.com/pyca/pyopenssl/issues/768
     "test_wantWriteError"
   ] ++ (
-    optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
+    lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests
   ) ++ (
-    optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
+    lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
   ) ++ (
     # https://github.com/pyca/pyopenssl/issues/974
-    optionals stdenv.isi686 [ "test_verify_with_time" ]
+    lib.optionals stdenv.is32bit [ "test_verify_with_time" ]
   );
 
   # Compose the final string expression, including the "-k" and the single quotes.
-  testExpression = optionalString (disabledTests != [])
-    "-k 'not ${concatStringsSep " and not " disabledTests}'";
+  testExpression = lib.optionalString (disabledTests != [])
+    "-k 'not ${lib.concatStringsSep " and not " disabledTests}'";
 
 in
 
-
 buildPythonPackage rec {
   pname = "pyOpenSSL";
   version = "20.0.0";
diff --git a/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix b/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix
new file mode 100644
index 000000000000..f4f5bf6c70d4
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fixtures
+, mock
+, pbr
+, pytest-cov
+, pytestCheckHook
+, pythonOlder
+, requests
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "pyopnsense";
+  version = "0.3.0";
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06rssdb3zhccnm63z96mw5yd38d9i99fgigfcdxn9divalbbhp5a";
+  };
+
+  propagatedBuildInputs = [
+    pbr
+    six
+    requests
+  ];
+
+  checkInputs = [
+    fixtures
+    mock
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyopnsense" ];
+
+  meta = with lib; {
+    description = "Python client for the OPNsense API";
+    homepage = "https://github.com/mtreinish/pyopnsense";
+    license = with licenses; [ gpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
index ffcd3569e0a3..577f00fd1114 100644
--- a/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "pyosmium";
-  version = "3.0.1";
+  version = "3.1.0";
 
   disabled = pythonOlder "3.4" || isPyPy;
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     owner = "osmcode";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128";
+    sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
index 3da9c3ae0a7c..ffe7bf014232 100644
--- a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
 , pandoc, haskellPackages, texlive }:
 
 buildPythonPackage rec {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     export PATH="${haskellPackages.pandoc-citeproc}/bin:${texlive.combined.scheme-small}/bin:$PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Thin wrapper for pandoc";
     homepage = "https://github.com/bebraw/pypandoc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix b/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
index 4acc4fa804b3..5ecfdfb88839 100644
--- a/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "pyparsing";
-  version = "2.4.6";
+  version = "2.4.7";
 
   src = fetchFromGitHub {
     owner = "pyparsing";
     repo = pname;
     rev = "pyparsing_${version}";
-    sha256 = "1fh7s3cfr274pd6hh6zygl99842rqws98an2nkrrqj2spb9ldxcm";
+    sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h";
   };
 
   # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6
diff --git a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
index c51c55a5eb23..f46a5d2db827 100644
--- a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , isPyPy
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     sed -i -e '
       s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
     ' tests/test__ped_ped.py
-  '' + stdenv.lib.optionalString stdenv.isi686 ''
+  '' + lib.optionalString stdenv.isi686 ''
     # remove some integers in this test case which overflow on 32bit systems
     sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
       tests/test__ped_ped.py
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     make test PYTHON=${python.executable}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dcantrell/pyparted/";
     description = "Python interface for libparted";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pypass/default.nix b/nixpkgs/pkgs/development/python-modules/pypass/default.nix
index 2458a29ac31d..f3e49452c89a 100644
--- a/nixpkgs/pkgs/development/python-modules/pypass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypass/default.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , click
 , colorama
 , enum34
@@ -11,7 +12,6 @@
 , pexpect
 , pythonAtLeast
 , pythonOlder
-, stdenv
 , substituteAll
 , tree
 , xclip
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   ];
 
   # Remove enum34 requirement if Python >= 3.4
-  postPatch = stdenv.lib.optionalString (pythonAtLeast "3.4") ''
+  postPatch = lib.optionalString (pythonAtLeast "3.4") ''
     substituteInPlace requirements.txt --replace "enum34" ""
   '';
 
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     click
     colorama
     pexpect
-  ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+  ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   checkInputs = [ nose ];
 
@@ -74,11 +74,11 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Password manager pass in Python";
     homepage = "https://github.com/aviau/python-pass";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ jluttine ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pypck/default.nix b/nixpkgs/pkgs/development/python-modules/pypck/default.nix
new file mode 100644
index 000000000000..3d39b3516b69
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pypck/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytest-cov
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, stdenv
+}:
+
+buildPythonPackage rec {
+  pname = "pypck";
+  version = "0.7.9";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "alengwenus";
+    repo = pname;
+    rev = version;
+    sha256 = "0clpi6bplzw7qg2m0hgwqr71zwxrh901gwprhd1yjykn30njp5bw";
+  };
+
+  checkInputs = [
+    pytest-asyncio
+    pytest-cov
+    pytest-timeout
+    pytestCheckHook
+  ];
+
+  disabledTests = lib.optionals stdenv.isDarwin [
+    "test_connection_lost"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [ "pypck" ];
+
+  meta = with lib; {
+    description = "LCN-PCK library written in Python";
+    homepage = "https://github.com/alengwenus/pypck";
+    license = with licenses; [ epl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pypdf/default.nix b/nixpkgs/pkgs/development/python-modules/pypdf/default.nix
index 5842e1c510af..d69b1078aeef 100644
--- a/nixpkgs/pkgs/development/python-modules/pypdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # Not supported. Package is no longer maintained.
   disabled = isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure-Python PDF toolkit";
     homepage = "http://pybrary.net/pyPdf/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix
index 1c3b908396ec..cd91cc347a4f 100644
--- a/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # Tests broken on Python 3.x
   doCheck = !(isPy3k);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Pure-Python library built as a PDF toolkit";
     homepage = "http://mstamy2.github.com/PyPDF2/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix b/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix
index 7aa0f2eda42c..1f16a307a0c1 100644
--- a/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35
   doCheck = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PEG parser interpreter in Python";
     homepage = "http://fdik.org/pyPEG";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
index b5018e40d7eb..d8b9abcf97a3 100644
--- a/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "Pyphen";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python module to hyphenate text";
     homepage = "https://github.com/Kozea/Pyphen";
     license = with licenses; [gpl2 lgpl21 mpl20];
diff --git a/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix
index feb1f9451bca..bc0e45359990 100644
--- a/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow
+{ lib, stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow
 , isPy3k, isPyPy
 }:
 buildPythonPackage rec {
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   buildInputs = [ nose ];
   propagatedBuildInputs = [ pillow ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library containing various image processing algorithms";
     inherit (src.meta) homepage;
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix
index 78d939bca1cf..8747840fd7c0 100644
--- a/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to simulate plate tectonics with Python bindings";
     homepage    = "https://github.com/Mindwerks/plate-tectonics";
     license     = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix b/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
index 3287c70db9cb..83190bc292ab 100644
--- a/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.launchpad.net/~mriedesel/poppler-python/main";
     description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix b/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
index 09d2415f8e0a..a15f7aadb88c 100644
--- a/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pyppeteer";
-  version = "0.2.2";
+  version = "0.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s92izan7s3iffc85wpwi1qv9brcq0rlfqyi84wmpmg1dxk64g0m";
+    sha256 = "d1bcc61575ff788249d3bcaee696d856fa1153401a5428cb7376d826dd68dd9b";
   };
 
   # tests want to write to /homeless-shelter
diff --git a/nixpkgs/pkgs/development/python-modules/pyprind/default.nix b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix
index 42c99c300883..d270136558fc 100644
--- a/nixpkgs/pkgs/development/python-modules/pyprind/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , psutil
 , pytest }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Progress Bar and Percent Indicator Utility";
     homepage = "https://github.com/rasbt/pyprind";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix
index f820f161de56..af2575d21431 100644
--- a/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = false;  # No such file or directory errors on 32bit
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.org/project/pyptlib/";
     description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
index e6bf3b9211af..b806177b4d7d 100644
--- a/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
 , django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     nosetests pypugjs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates";
     homepage = "https://github.com/kakulukia/pypugjs";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix b/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
new file mode 100644
index 000000000000..2e5f19e1d12d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, aiowinreg
+, buildPythonPackage
+, fetchFromGitHub
+, minidump
+, minikerberos
+, msldap
+, winsspi
+}:
+
+buildPythonPackage rec {
+  pname = "pypykatz";
+  version = "0.3.15";
+
+  src = fetchFromGitHub {
+    owner = "skelsec";
+    repo = pname;
+    rev = version;
+    sha256 = "0bx2jdcfr1pdy3jgzg8fr5id9ffl2m1nc81dqhcplxdj8p214yri";
+  };
+
+  propagatedBuildInputs = [
+    aiowinreg
+    minikerberos
+    msldap
+    winsspi
+    minidump
+  ];
+
+  # Project doesn't have tests
+  doCheck = false;
+  pythonImportsCheck = [ "pypykatz" ];
+
+  meta = with lib; {
+    description = "Mimikatz implementation in Python";
+    homepage = "https://github.com/skelsec/pypykatz";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix
index 05cf0aba354b..3427438b8a26 100644
--- a/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }:
+{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }:
 
 buildPythonPackage rec {
   pname = "PyQt-x11-gpl";
@@ -16,13 +16,13 @@ buildPythonPackage rec {
     rm -rf "$out/nix-support"
 
     export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \
     ''}
 
     substituteInPlace configure.py \
       --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \
     ''}
 
@@ -38,11 +38,11 @@ buildPythonPackage rec {
     "--destdir=${placeholder "out"}/${python.sitePackages}"
     "--plugin-destdir=${placeholder "out"}/lib/qt4/plugins"
     "--sipdir=${placeholder "out"}/share/sip/PyQt4"
-    "--dbus=${stdenv.lib.getDev dbus-python}/include/dbus-1.0"
+    "--dbus=${lib.getDev dbus-python}/include/dbus-1.0"
     "--verbose"
   ];
 
-  nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ];
+  nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
   buildInputs = [ qt4 dbus ];
 
   propagatedBuildInputs = [ sip ];
@@ -59,11 +59,11 @@ buildPythonPackage rec {
     qt = qt4;
   };
 
-  meta = {
+  meta = with lib; {
     description = "Python bindings for Qt";
     license = "GPL";
     homepage = "http://www.riverbankcomputing.co.uk";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = [ maintainers.sander ];
+    platforms = platforms.mesaPlatforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
index 0c32985cfaae..26bf5dc1c4b8 100644
--- a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,4 +1,4 @@
-{ lib, pythonPackages, pkgconfig
+{ lib, pythonPackages, pkg-config
 , dbus
 , qmake, lndir
 , qtbase
@@ -15,18 +15,35 @@ let
 
   inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
 
-  sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
-    # If we install sip in another folder, then we need to create a __init__.py as well
-    # if we want to be able to import it with Python 2.
-    # Python 3 could rely on it being an implicit namespace package, however,
-    # PyQt5 we made an explicit namespace package so sip should be as well.
-    postInstall = ''
-      cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
-      from pkgutil import extend_path
-      __path__ = extend_path(__path__, __name__)
-      EOF
-    '';
-  });
+  sip = if isPy3k then
+    pythonPackages.sip_5
+  else
+    (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
+      # If we install sip in another folder, then we need to create a __init__.py as well
+      # if we want to be able to import it with Python 2.
+      # Python 3 could rely on it being an implicit namespace package, however,
+      # PyQt5 we made an explicit namespace package so sip should be as well.
+      postInstall = ''
+        cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
+        from pkgutil import extend_path
+        __path__ = extend_path(__path__, __name__)
+        EOF
+      '';
+    });
+
+  pyqt5_sip = buildPythonPackage rec {
+    pname = "PyQt5_sip";
+    version = "12.8.1";
+
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd";
+    };
+
+    # There is no test code and the check phase fails with:
+    # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
+    doCheck = false;
+  };
 
 in buildPythonPackage rec {
   pname = "PyQt5";
@@ -41,7 +58,7 @@ in buildPythonPackage rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     qmake
     lndir
     sip
@@ -69,8 +86,7 @@ in buildPythonPackage rec {
 
   propagatedBuildInputs = [
     dbus-python
-    sip
-  ] ++ lib.optional (!isPy3k) enum34;
+  ] ++ (if isPy3k then [ pyqt5_sip ] else [ sip enum34 ]);
 
   patches = [
     # Fix some wrong assumptions by ./configure.py
@@ -103,7 +119,7 @@ in buildPythonPackage rec {
     runHook postConfigure
   '';
 
-  postInstall = ''
+  postInstall = lib.optionalString (!isPy3k) ''
     ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
@@ -116,26 +132,21 @@ in buildPythonPackage rec {
     EOF
   '';
 
-  installCheckPhase = let
-    modules = [
-      "PyQt5"
-      "PyQt5.QtCore"
-      "PyQt5.QtQml"
-      "PyQt5.QtWidgets"
-      "PyQt5.QtGui"
-    ]
+  # Checked using pythonImportsCheck
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "PyQt5"
+    "PyQt5.QtCore"
+    "PyQt5.QtQml"
+    "PyQt5.QtWidgets"
+    "PyQt5.QtGui"
+  ]
     ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
     ++ lib.optional withWebKit "PyQt5.QtWebKit"
     ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
     ++ lib.optional withConnectivity "PyQt5.QtConnectivity"
-    ;
-    imports = lib.concatMapStrings (module: "import ${module};") modules;
-  in ''
-    echo "Checking whether modules can be imported..."
-    ${python.interpreter} -c "${imports}"
-  '';
-
-  doCheck = true;
+  ;
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
index 80f914294848..98b30b247077 100644
--- a/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyqtgraph" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scientific Graphics and GUI Library for Python";
     homepage = "http://www.pyqtgraph.org/";
     changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
diff --git a/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
index 51506598ca18..262c5a17504a 100644
--- a/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -1,4 +1,4 @@
-{ lib, pythonPackages, pkgconfig
+{ lib, pythonPackages, pkg-config
 , qmake, qtbase, qtsvg, qtwebengine
 , wrapQtAppsHook
 }:
@@ -27,7 +27,7 @@ in buildPythonPackage rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     qmake
     sip
     qtbase
diff --git a/nixpkgs/pkgs/development/python-modules/pyquery/default.nix b/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
index 6ba9cb91982b..2496d9d968fc 100644
--- a/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cssselect
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # circular dependency on webtest
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gawel/pyquery";
     description = "A jquery-like library for python";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
index a7ba7728a355..5f1e5c7d75a8 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , webtest
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   # https://github.com/Pylons/pyramid/issues/1899
   doCheck = !isPy35;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Pyramid Web Framework, a Pylons project";
     homepage = "https://trypyramid.com/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix
index 19b26a30ad71..88dc62886fc6 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }:
 
 buildPythonPackage rec {
   pname = "pyramid_beaker";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ beaker pyramid ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix
index 9e148ca8ed51..2bb5a03bdb91 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , chameleon
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Chameleon template compiler for pyramid";
     homepage = "https://github.com/Pylons/pyramid_chameleon";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix
index 0c2abeb74e28..80514cc91b48 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyramid
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyramid ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package which logs to a Python logger when an exception is raised by a Pyramid application";
     homepage = "https://docs.pylonsproject.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
index fc76d9af68d9..ab4025b72309 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pyramid
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ];
   buildInputs = [ webtest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mozilla-services/pyramid_hawkauth";
     description = "A Pyramid authentication plugin for HAWK";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix
index 6be0fe479d2f..0497ab79613f 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , webtest
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   buildInputs = [ webtest ];
   propagatedBuildInputs = [ jinja2 pyramid ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jinja2 template bindings for the Pyramid web framework";
     homepage = "https://github.com/Pylons/pyramid_jinja2";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix
index 2bae93d1e306..8c71563e2d77 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , webtest
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   buildInputs = [ webtest ];
   propagatedBuildInputs = [ pyramid Mako ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Pylons/pyramid_mako";
     description = "Mako template bindings for the Pyramid web framework";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix
index f441aaed8c13..9167918fc47d 100644
--- a/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyramid
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyramid ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies";
     homepage = "https://github.com/mozilla-services/pyramid_multiauth";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pyregion/default.nix b/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
index b1868e7edde5..86a5ef6bfe0f 100644
--- a/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
@@ -33,8 +33,8 @@ buildPythonPackage rec {
       name = "conftest-astropy-3-fix.patch";
       url = "https://github.com/astropy/pyregion/pull/136.patch";
       sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m";
-	  })
-	];
+    })
+  ];
 
   nativeBuildInputs = [ astropy-helpers ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/pyreport/default.nix b/nixpkgs/pkgs/development/python-modules/pyreport/default.nix
index 9795d30ea2e2..09a1e7c6b418 100644
--- a/nixpkgs/pkgs/development/python-modules/pyreport/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyreport/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/pyreport";
     license = licenses.bsd0;
     description = "Pyreport makes notes out of a python script";
diff --git a/nixpkgs/pkgs/development/python-modules/pyres/default.nix b/nixpkgs/pkgs/development/python-modules/pyres/default.nix
index d4bd8789144a..6d49bd025948 100644
--- a/nixpkgs/pkgs/development/python-modules/pyres/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyres/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
 
 let
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     nosetests . --exclude test_worker_pids
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python resque clone";
     homepage = "https://github.com/binarydud/pyres";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
index 3c157d83fec1..f6be3c4c8974 100644
--- a/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytz
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pytz ];
   buildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate and parse RFC 3339 timestamps";
     homepage = "https://github.com/kurtraschke/pyRFC3339";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
index 508722e70fb4..a84b22e06567 100644
--- a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   # otherwise the tests hang the build
   __darwinAllowLocalNetworking = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Distributed object middleware for Python (RPC)";
     homepage = "https://github.com/irmen/Pyro4";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyroma/default.nix b/nixpkgs/pkgs/development/python-modules/pyroma/default.nix
index 4ec06506b38b..e533f6501697 100644
--- a/nixpkgs/pkgs/development/python-modules/pyroma/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyroma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , docutils, pygments, setuptools
 }:
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ docutils pygments setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Test your project's packaging friendliness";
     homepage = "https://github.com/regebro/pyroma";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix
index b7dfd6d42b3d..f2378863720c 100644
--- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildPythonPackage, fetchPypi}:
+{lib, stdenv, buildPythonPackage, fetchPypi}:
 
 buildPythonPackage rec {
   pname = "pyroute2";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # requires root priviledges
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Netlink library";
     homepage = "https://github.com/svinota/pyroute2";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pyrr/default.nix b/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
index 96d160619588..f8ac5d8e8675 100644
--- a/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   buildInputs = [ setuptools ];
   propagatedBuildInputs = [ multipledispatch numpy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "3D mathematical functions using NumPy";
     homepage = "https://github.com/adamlwgriffiths/Pyrr/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
index 7da3239f3e74..211bc85f5112 100644
--- a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace 'pytest<5' 'pytest'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tobgu/pyrsistent/";
     description = "Persistent/Functional/Immutable data structures";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix b/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix
index ee51e84ba0f4..e3586e6dbf1c 100644
--- a/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.dalkescientific.om/Python/PyRSS2Gen.html";
     description = "Library for generating RSS 2.0 feeds";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
index f30fddc1efd8..7d2fdb5b4260 100644
--- a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchFromGitHub
@@ -53,7 +53,7 @@ buildPythonPackage rec {
             and not test_conf_syslog"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rohe/pysaml2";
     description = "Python implementation of SAML Version 2 Standard";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
index 9798d94900b0..28c40e5ec5fc 100644
--- a/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
@@ -1,11 +1,8 @@
-{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
 
 let
   # Package does not support configuring the pcsc library.
   withApplePCSC = stdenv.isDarwin;
-
-  inherit (stdenv.lib) getLib getDev optionalString optionals;
-  inherit (stdenv.hostPlatform.extensions) sharedLibrary;
 in
 
 buildPythonPackage rec {
@@ -24,19 +21,19 @@ buildPythonPackage rec {
   '' else ''
     substituteInPlace smartcard/scard/winscarddll.c \
       --replace "libpcsclite.so.1" \
-                "${getLib pcsclite}/lib/libpcsclite${sharedLibrary}"
+                "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
   '';
 
-  NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
-    "-I ${getDev pcsclite}/include/PCSC";
+  NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC)
+    "-I ${lib.getDev pcsclite}/include/PCSC";
 
   propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
   nativeBuildInputs = [ swig ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://pyscard.sourceforge.io/";
     description = "Smartcard library for python";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ layus ];
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ layus ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
index 30b5205050dd..6da19bc48ab8 100644
--- a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
@@ -23,14 +23,14 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
 
   propagatedBuildInputs = [ six ]
-    ++ (stdenv.lib.optionals (pythonOlder "3.4") [ enum34 pathlib ])
-    ++ (stdenv.lib.optionals (pythonOlder "2.7") [ ordereddict ]);
+    ++ (lib.optionals (pythonOlder "3.4") [ enum34 pathlib ])
+    ++ (lib.optionals (pythonOlder "2.7") [ ordereddict ]);
 
   checkPhase = ''
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Scss compiler for Python";
     homepage = "https://pyscss.readthedocs.org/en/latest/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix b/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix
index b49ec5030f9a..a35f2ae77f02 100644
--- a/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     ${python.executable} test/test_sendfile.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/giampaolo/pysendfile";
     description = "A Python interface to sendfile(2)";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pysensors/default.nix b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix
index cc2dee7957d8..214412c4ceed 100644
--- a/nixpkgs/pkgs/development/python-modules/pysensors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
+{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
 buildPythonPackage {
   version = "2017-07-13";
   pname = "pysensors";
@@ -22,7 +22,7 @@ buildPythonPackage {
     ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ guibou ];
     description = "Easy hardware health monitoring in Python for Linux systems";
     homepage = "https://pysensors.readthedocs.org";
diff --git a/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
index 5e721504eda5..ff3d624490ba 100644
--- a/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , pyserial }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyserial ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "asyncio extension package for pyserial";
     homepage = "https://github.com/pyserial/pyserial-asyncio";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pysftp/default.nix b/nixpkgs/pkgs/development/python-modules/pysftp/default.nix
index 61fc4f122d29..28daf6b385e6 100644
--- a/nixpkgs/pkgs/development/python-modules/pysftp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysftp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ paramiko ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/dundeemt/pysftp";
     description = "A friendly face on SFTP";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyshp/default.nix b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
index 33ebe945b231..661c70a0ab26 100644
--- a/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , setuptools }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   buildInputs = [ setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure Python read/write support for ESRI Shapefile format";
     homepage = "https://github.com/GeospatialPython/pyshp";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix b/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
index 07ddfb69fa0f..9398a62997b2 100644
--- a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
+{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
 
 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
@@ -11,8 +11,6 @@ in stdenv.mkDerivation {
     sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3";
   };
 
-  enableParallelBuilding = true;
-
   outputs = [ "out" "dev" ];
 
   preConfigure = ''
@@ -22,11 +20,11 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pythonEnv ];
   buildInputs = [ qt4 libxml2 libxslt ];
 
-  meta = {
+  meta = with lib; {
     description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = "http://www.pyside.org/docs/apiextractor/";
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/default.nix b/nixpkgs/pkgs/development/python-modules/pyside/default.nix
index 2bbeb7a1233f..08fd8cbfa862 100644
--- a/nixpkgs/pkgs/development/python-modules/pyside/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/default.nix
@@ -11,8 +11,6 @@ buildPythonPackage rec {
     sha256 = "90f2d736e2192ac69e5a2ac798fce2b5f7bf179269daa2ec262986d488c3b0f7";
   };
 
-  enableParallelBuilding = true;
-
   outputs = [ "out" "dev" ];
 
   preConfigure = ''
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
index 8fc505a89fc4..532ee6b2b24e 100644
--- a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
+{ lib, stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
 
 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
@@ -13,8 +13,6 @@ in stdenv.mkDerivation {
     sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj";
   };
 
-  enableParallelBuilding = true;
-
   outputs = [ "out" "dev" ];
 
   preConfigure = ''
@@ -24,11 +22,11 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pythonEnv ];
   buildInputs = [ pysideApiextractor qt4 ];
 
-  meta = {
+  meta = with lib; {
     description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = "http://www.pyside.org/docs/generatorrunner/";
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
index cf7192f92ffb..2690422932f2 100644
--- a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
@@ -27,8 +27,6 @@ buildPythonPackage rec {
     sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ];
 
   buildInputs = [ python libxml2 libxslt ];
diff --git a/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix
index 9f1f94ffecbb..095a10c1047d 100644
--- a/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5,
+{ buildPythonPackage, wrapPython, python, fetchurl, lib, stdenv, cmake, qt5,
   shiboken2, pyside2 }:
 
 stdenv.mkDerivation {
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     wrapPythonPrograms
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PySide2 development tools";
     license = licenses.gpl2;
     homepage = "https://wiki.qt.io/Qt_for_Python";
diff --git a/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
index 8133b677db28..6986c8e5384b 100644
--- a/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, python, fetchurl, stdenv,
+{ buildPythonPackage, python, fetchurl, lib, stdenv,
   cmake, ninja, qt5, shiboken2 }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
   propagatedBuildInputs = [ shiboken2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "LGPL-licensed Python bindings for Qt";
     license = licenses.lgpl21;
     homepage = "https://wiki.qt.io/Qt_for_Python";
diff --git a/nixpkgs/pkgs/development/python-modules/pysigset/default.nix b/nixpkgs/pkgs/development/python-modules/pysigset/default.nix
index 4e1b87a1f1b0..8e31735db2e4 100644
--- a/nixpkgs/pkgs/development/python-modules/pysigset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysigset/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pysigset";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0ym44z3nwp8chfi7snmknkqnl2q9bghzv9p923r8w748i5hvyxx8";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides access to sigprocmask(2) and friends and convenience wrappers to python application developers wanting to SIG_BLOCK and SIG_UNBLOCK signals";
     homepage = "https://github.com/ossobv/pysigset";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix
index e242dbe5e96e..6834a78f4286 100644
--- a/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, samba, pkgconfig
+{ lib, stdenv, buildPythonPackage, fetchPypi
+, samba, pkg-config
 , setuptools }:
 
 buildPythonPackage rec {
@@ -12,10 +12,10 @@ buildPythonPackage rec {
     sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ setuptools samba ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "libsmbclient binding for Python";
     homepage = "https://github.com/hamano/pysmbc";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pysmf/default.nix b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix
index ef5e560b08c7..02559510100c 100644
--- a/nixpkgs/pkgs/development/python-modules/pysmf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }:
 
 buildPythonPackage rec {
   pname = "pysmf";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config pytest ];
   buildInputs = [ libsmf glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://das.nasophon.de/pysmf/";
     description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf.";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/pysmi/default.nix b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix
index a3a7c3d7ec10..953581aa3029 100644
--- a/nixpkgs/pkgs/development/python-modules/pysmi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , ply
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Tests require pysnmp, which in turn requires pysmi => infinite recursion
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pysmi.sf.net";
     description = "SNMP SMI/MIB Parser";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix b/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix
index c0bed855a4cd..7dce4d9b4d18 100644
--- a/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyasn1
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://snmplabs.com/pysnmp/index.html";
     description = "A pure-Python SNMPv1/v2c/v3 library";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/pysocks/default.nix b/nixpkgs/pkgs/development/python-modules/pysocks/default.nix
index e8d853d625d4..79c163726b76 100644
--- a/nixpkgs/pkgs/development/python-modules/pysocks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SOCKS module for Python";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ thoughtpolice ];
diff --git a/nixpkgs/pkgs/development/python-modules/pysoma/default.nix b/nixpkgs/pkgs/development/python-modules/pysoma/default.nix
new file mode 100644
index 000000000000..893736ff1603
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pysoma/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "pysoma";
+  version = "0.0.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q8afi6m3mfh0rfpghyvx6z76kgrpkbnlqzbs4p8ax13n0fnlkdi";
+  };
+
+  # Project has no test
+  doCheck = false;
+  pythonImportsCheck = [ "api" ];
+
+  meta = with lib; {
+    description = "Python wrapper for the HTTP API provided by SOMA Connect";
+    homepage = "https://pypi.org/project/pysoma";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
index d181d6a29d90..342755131a3d 100644
--- a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, stdenv, py4j }:
+{ buildPythonPackage, fetchPypi, lib, stdenv, py4j }:
 
 buildPythonPackage rec {
   pname = "pyspark";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # Tests assume running spark...
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Apache Spark";
     homepage = "https://github.com/apache/spark/tree/master/python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pyspice/default.nix b/nixpkgs/pkgs/development/python-modules/pyspice/default.nix
index bed00ddabe7d..53fb7e6d248f 100644
--- a/nixpkgs/pkgs/development/python-modules/pyspice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
@@ -44,7 +44,7 @@ buildPythonPackage rec {
         "ffi.dlopen('${libngspice}/lib/libngspice${stdenv.hostPlatform.extensions.sharedLibrary}')"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simulate electronic circuit using Python and the Ngspice / Xyce simulators";
     homepage = "https://github.com/FabriceSalvaire/PySpice";
     license = licenses.gpl3Only;
diff --git a/nixpkgs/pkgs/development/python-modules/pyspotify/default.nix b/nixpkgs/pkgs/development/python-modules/pyspotify/default.nix
index d6d0a6007f66..302eb12de5a1 100644
--- a/nixpkgs/pkgs/development/python-modules/pyspotify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , cffi
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     find -print0 | xargs -0 touch
   '';
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     find "$out" -name _spotify.so -exec \
         install_name_tool -change \
         @loader_path/../Frameworks/libspotify.framework/libspotify \
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   # There are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://pyspotify.mopidy.com";
     description = "A Python interface to Spotify’s online music streaming service";
     license     = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/python-modules/pyspread/default.nix b/nixpkgs/pkgs/development/python-modules/pyspread/default.nix
deleted file mode 100644
index 2e7f458253ea..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyspread/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ buildPythonPackage
-, fetchPypi
-, isPy3k
-, stdenv
-, numpy
-, wxPython
-, matplotlib
-, pycairo
-, python-gnupg
-, xlrd
-, xlwt
-, jedi
-, pyenchant
-, basemap
-, pygtk
-, makeDesktopItem
-}:
-
-buildPythonPackage rec {
-  pname = "pyspread";
-  version = "1.99.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d396c2f94bf1ef6140877ab19205e6f2375bfe01d1bf50ff33bb63384744dd78";
-  };
-
-  propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
-  # Could also (optionally) add pyrsvg and python bindings for libvlc
-
-  # Tests try to access X Display
-  doCheck = false;
-
-  disabled = isPy3k;
-
-  desktopItem = makeDesktopItem rec {
-    name = pname;
-    exec = name;
-    icon = name;
-    desktopName = "Pyspread";
-    genericName = "Spreadsheet";
-    comment = meta.description;
-    categories = "Development;Spreadsheet;";
-  };
-
-  postInstall = ''
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python";
-    homepage = "https://manns.github.io/pyspread/";
-    license = licenses.gpl3;
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix b/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix
index a1916f09a6cd..09cc312223ad 100644
--- a/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -26,10 +26,10 @@ buildPythonPackage rec {
     substituteInPlace "setup.cfg"                                     \
             --replace "/usr/local/include" "${pkgs.sqlite.dev}/include"   \
             --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"
-    ${stdenv.lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}
+    ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pysqlite.org/";
     description = "Python bindings for the SQLite embedded relational database engine";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
index 11c9d9c40d06..7c5d8ca5abf5 100644
--- a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }:
 
 buildPythonPackage rec {
   pname = "pysqueezebox";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "pysqueezebox" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Asynchronous library to control Logitech Media Server";
     homepage = "https://github.com/rajlaud/pysqueezebox";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pysrt/default.nix b/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
index e8c9aa3d5c88..4012a7324660 100644
--- a/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , chardet
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ chardet ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/byroot/pysrt";
     license = licenses.gpl3;
     description = "Python library used to edit or create SubRip files";
diff --git a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix
index ad2057351d9a..4f73ada61af6 100644
--- a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }:
 
 buildPythonPackage rec {
   pname = "pyssim";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     $out/bin/pyssim --cw --width 128 --height 128 test-images/test3-orig.jpg test-images/test3-rot.jpg | grep 0.938
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Module for computing Structured Similarity Image Metric (SSIM) in Python";
     homepage = "https://github.com/jterrace/pyssim";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pystache/default.nix b/nixpkgs/pkgs/development/python-modules/pystache/default.nix
index 1900bc31f212..6ed036aecb1a 100644
--- a/nixpkgs/pkgs/development/python-modules/pystache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pystache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }:
+{ lib, stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "pystache";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # https://github.com/defunkt/pystache/issues/181
   doCheck = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
     homepage = "https://github.com/defunkt/pystache";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix
index 1ff26ffa37ba..691865919490 100644
--- a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, systemd }:
+{ lib, stdenv, python, systemd }:
 
 python.pkgs.buildPythonPackage rec {
   pname = "pystemd";
@@ -15,7 +15,7 @@ python.pkgs.buildPythonPackage rec {
   checkInputs = with python.pkgs; [ pytest mock ];
   checkPhase = "pytest tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way.";
     homepage = "https://github.com/facebookincubator/pystemd/";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix b/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix
index 37260404906b..0ba23ffec5df 100644
--- a/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchPypi, buildPythonPackage, cython }:
+{ lib, stdenv, python, fetchPypi, buildPythonPackage, cython }:
 
 buildPythonPackage rec {
   pname = "PyStemmer";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     ${python.interpreter} runtests.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Snowball stemming algorithms, for information retrieval";
     homepage = "http://snowball.tartarus.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
index 0fca57cb2923..9e9948607093 100644
--- a/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
@@ -75,7 +75,7 @@ buildPythonPackage rec {
     rm -v $out/share/doc/pysvn-${version}/generate_cpp_docs_from_html_docs.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for Subversion";
     homepage = "http://pysvn.tigris.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytabix/default.nix b/nixpkgs/pkgs/development/python-modules/pytabix/default.nix
index eb21ca198180..db8437d8957c 100644
--- a/nixpkgs/pkgs/development/python-modules/pytabix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytabix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   '';
   pythonImportsCheck = [ "tabix" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/slowkow/pytabix";
     description = "Python interface for tabix";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytado/default.nix b/nixpkgs/pkgs/development/python-modules/pytado/default.nix
index 40b221d3dc9d..636210c93d59 100644
--- a/nixpkgs/pkgs/development/python-modules/pytado/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytado/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "PyTado";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "14xdfw4913g4j4h576hjbigm7fiw8k0dc8s98gh2ag9xrc2ifgr0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python binding for Tado web API. Pythonize your central heating!";
     homepage = "https://github.com/wmalgadey/PyTado";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyte/default.nix b/nixpkgs/pkgs/development/python-modules/pyte/default.nix
index f09bd95d0703..65d3d9218d06 100644
--- a/nixpkgs/pkgs/development/python-modules/pyte/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyte/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
 
 buildPythonPackage rec {
   pname = "pyte";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     py.test -k "not test_input_output"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple VTXXX-compatible linux terminal emulator";
     homepage = "https://github.com/selectel/pyte";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix
index f2491bd571c1..7384eb360704 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }:
 
 buildPythonPackage rec {
   pname = "pytest-aiohttp";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # There are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/aio-libs/pytest-aiohttp/";
     description = "Pytest plugin for aiohttp support";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix
index 53879bffbc8a..1a7f77bf9b6e 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyannotate
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   # no testing in a testing module...
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kensho-technologies/pytest-annotate";
     description = "Generate PyAnnotate annotations from your pytest tests";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix
index 2e98654c5d46..309a33e89073 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , ansible
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     HOME=$TMPDIR pytest tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jlaska/pytest-ansible";
     description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
index 8942263a5788..c621d9a47854 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
 buildPythonPackage rec {
   pname = "pytest-asyncio";
   version = "0.14.0";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ pytest ]
-    ++ stdenv.lib.optionals isPy35 [ async_generator ];
+    ++ lib.optionals isPy35 [ async_generator ];
 
   # No tests in archive
   doCheck = false;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     substituteInPlace setup.cfg --replace "license_file = LICENSE" ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "library for testing asyncio code with pytest";
     license = licenses.asl20;
     homepage = "https://github.com/pytest-dev/pytest-asyncio";
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix
index ccde881d3839..493a2307e7e7 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , execnet
 , glob2
 , Mako
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     PATH=$PATH:$out/bin pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "BDD library for the py.test runner";
     homepage = "https://github.com/pytest-dev/pytest-bdd";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
index 35d3fce49d1b..2fb02244d1d7 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, unzip }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, unzip }:
 
 buildPythonPackage rec {
   pname = "pytest-catchlog";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # Requires pytest < 3.1
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://pypi.python.org/pypi/pytest-catchlog/";
     description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog.";
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix
index e3d463a39aa6..034c657b5b0f 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "pytest-celery";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false; # This package has nothing to test or import.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "pytest plugin for unittest subTest() support and subtests fixture";
     homepage = "https://github.com/pytest-dev/pytest-subtests";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix
index 9636d20c73b7..41f316a18a65 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pytest ];
   checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "pytest plugin allowing multiple failures per test";
     homepage = "https://github.com/okken/pytest-check";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix
index 649e41f7d662..aa921ddeb3d1 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, coverage }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing";
     homepage = "https://github.com/pytest-dev/pytest-cov";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix
index 6ce784419206..b1cdb1033a64 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , setuptools_scm, pytest, cmake
 }:
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
   checkPhase = "pytest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gabrielcnr/pytest-datadir";
     description = "pytest plugin for manipulating test data directories and files";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix
index 2fafdcd1aaa0..bc6e2441b0f0 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, py, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, py, pytest }:
 
 buildPythonPackage rec {
   pname = "pytest-datafiles";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   buildInputs = [ py pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://github.com/omarkohl/pytest-datafiles";
     description = "py.test plugin to create a 'tmpdir' containing predefined files/directories.";
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix
index 9e570a801f99..9a3dbed55b15 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }:
 
 buildPythonPackage rec {
   version = "0.5.1";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/RKrahl/pytest-dependency";
     description = "Manage dependencies of tests";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
index 4b257b0a3d13..069aa2812eb5 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # Complicated. Requires Django setup.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "py.test plugin for testing of Django applications";
     homepage = "https://pytest-django.readthedocs.org/en/latest/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
index 48c5020a44f8..e63b7329c965 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -1,42 +1,44 @@
-{ stdenv
-, fetchFromGitHub
+{ lib
 , buildPythonPackage
-, pytestCheckHook
-, pytest
-, inflection
 , factory_boy
+, fetchFromGitHub
+, inflection
+, mock
+, pytest
 , pytestcache
+, pytestCheckHook
 , pytestcov
-, mock
 }:
 
 buildPythonPackage rec {
   pname = "pytest-factoryboy";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-factoryboy";
     rev = version;
-    sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn";
+    sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p";
   };
 
-  # TODO: remove in next release, it's removed in master.
-  postPatch = "substituteInPlace tox.ini --replace '--pep8' ''";
-
-  propagatedBuildInputs = [ factory_boy inflection pytest ];
+  propagatedBuildInputs = [
+    factory_boy
+    inflection
+    pytest
+  ];
 
-  # The project uses tox, which we can't. So we simply run pytest manually.
   checkInputs = [
     mock
     pytestCheckHook
     pytestcache
     pytestcov
   ];
+
   pytestFlagsArray = [ "--ignore=docs" ];
+  pythonImportsCheck = [ "pytest_factoryboy" ];
 
-  meta = with stdenv.lib; {
-    description = "Integration of factory_boy into the pytest runner.";
+  meta = with lib; {
+    description = "Integration of factory_boy into the pytest runner";
     homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/";
     maintainers = with maintainers; [ winpat ];
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix
index 7c7d4c66cd47..061f62bfc17b 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , setuptools-git, pytest }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set.";
     homepage = "https://github.com/manahl/pytest-plugins";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
index 440cc632185b..fd4ed0978060 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , pytest
 , pyflakes
 }:
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     py.test test_flakes.py -k 'not test_syntax_error'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://pypi.python.org/pypi/pytest-flakes";
     description = "pytest plugin to check source code with pyflakes";
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
index 1e6c34aee3c0..74e33a7731b3 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }:
 
 buildPythonPackage rec {
   pname = "pytest-flask";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools_scm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pytest-dev/pytest-flask/";
     license = licenses.mit;
     description = "A set of py.test fixtures to test Flask applications";
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
index 8f24d1dc1f68..41263ce692b3 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage
 , fetchFromGitHub
 , pytest
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # The tests fail with newest pytest. They passed with pytest_3, which no longer exists
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/saltstack/pytest-helpers-namespace";
     description = "PyTest Helpers Namespace";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
index e6e17adc92ee..0b1090f7b81d 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , pytest, pytest-metadata, setuptools_scm }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ pytest pytest-metadata ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for generating HTML reports";
     homepage = "https://github.com/pytest-dev/pytest-html";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix
new file mode 100644
index 000000000000..f9942dd5bcd3
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-instafail";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "pytest_instafail" ];
+  meta = {
+    description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session";
+    homepage = "https://github.com/pytest-dev/pytest-instafail";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.jacg ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix
index f2191ab617d2..e8b224dc1d4d 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, setuptools_scm }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for accessing test session metadata";
     homepage = "https://github.com/pytest-dev/pytest-metadata";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
index 78d5243cf641..0cc3a993c235 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     ln -s $HOME/.config/matplotlib $HOME/.matplotlib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pytest plugin to help with testing figures output from Matplotlib";
     homepage = "https://github.com/matplotlib/pytest-mpl";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix
index 8c20cf873aba..eb5203c02466 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }:
 
 buildPythonPackage rec {
   pname = "pytest-pep257";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   buildInputs = [ pytest ];
   propagatedBuildInputs = [ pep257 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/anderslime/pytest-pep257";
     description = "py.test plugin for PEP257";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 7db982ed857c..5148fa4b7608 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }:
 buildPythonPackage rec {
   pname = "pytest-quickcheck";
   version = "0.8.6";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   buildInputs = [ pytest ];
   propagatedBuildInputs = [ pytest-flakes tox ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.asl20;
     homepage = "https://pypi.python.org/pypi/pytest-quickcheck";
     description = "pytest plugin to generate random data inspired by QuickCheck";
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix
index 638548e9424f..0d02a25ec3c7 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , py, pytest }:
 
 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read(),"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple pytest plugin to look for regex in Exceptions";
     homepage = "https://github.com/Walkman/pytest_raisesregexp";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix
index 088f8702436f..2def886c5cba 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jbasko/pytest-random-order";
     description = "Randomise the order of tests with some control over the randomness";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
index c9871368bbe4..401307039e55 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     pytest tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pytest-relaxed.readthedocs.io/";
     description = "Relaxed test discovery/organization for pytest";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 384681eee1f9..537f32316a31 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }:
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     py.test test_pytest_rerunfailures.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "pytest plugin to re-run tests to eliminate flaky failures";
     homepage = "https://github.com/pytest-dev/pytest-rerunfailures";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix
index 90b60686ee6c..41fcfc7b1597 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, pytest-shutil, pytest-fixture-config, psutil
 , requests, future, retry }:
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # RuntimeError: Unable to find a free server number to start Xvfb
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extensible server fixures for py.test";
     homepage  = "https://github.com/manahl/pytest-plugins";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
index ef03762e188d..3edafdfb4734 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A goodie-bag of unix shell and environment tools for py.test";
     homepage = "https://github.com/manahl/pytest-plugins";
     maintainers = with maintainers; [ ryansydnor ];
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix
new file mode 100644
index 000000000000..42f399bb67f9
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, packaging, pytest, setuptools-scm }:
+
+buildPythonPackage rec {
+  pname = "pytest-snapshot";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1p33fcplfykwf5mdwg25n8hjgzxpx8w1iprjnfzibpxclfrxmy5i";
+  };
+
+  nativeBuildInputs = [ setuptools-scm ];
+
+  propagatedBuildInputs = [ packaging pytest ];
+
+  # pypi does not contain tests and GitHub archive is not supported because setuptools-scm can't detect the version
+  doCheck = false;
+  pythonImportsCheck = [ "pytest_snapshot" ];
+
+  meta = with lib; {
+    description = "A plugin to enable snapshot testing with pytest";
+    homepage = "https://github.com/joseph-roitman/pytest-snapshot/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix
index d42eb5f8aa31..f7454ee644ca 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "pytest-subtesthack";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # no upstream test
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Terrible plugin to set up and tear down fixtures within the test function itself";
     homepage = "https://github.com/untitaker/pytest-subtesthack";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix
new file mode 100644
index 000000000000..9373c597b367
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pytest
+, vcrpy
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-vcr";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "ktosiek";
+    repo = pname;
+    rev = version;
+    sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i";
+  };
+
+  propagatedBuildInputs = [
+    pytest
+    vcrpy
+   ];
+
+  # Tests are using an obsolete attribute 'config'
+  # https://github.com/ktosiek/pytest-vcr/issues/43
+  doCheck = false;
+  pythonImportsCheck = [ "pytest_vcr" ];
+
+  meta = with lib; {
+    description = "Integration VCR.py into pytest";
+    homepage = "https://github.com/ktosiek/pytest-vcr";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
index 27350efd7457..a910bf3245f4 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }:
 
 buildPythonPackage rec {
@@ -12,11 +12,11 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestcov mock cmdline ];
   propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ];
-  checkPhase = '' py.test tests/unit '';
+  checkPhase = "py.test tests/unit ";
 
   nativeBuildInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed.";
     homepage = "https://github.com/manahl/pytest-plugins";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix b/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix
index 6dc4b666db54..0c5ae06e8611 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest
 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
                     and not test_rsyncignore"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
     homepage = "https://github.com/pytest-dev/pytest-xdist";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
index cc58c5ab6bde..e5019f842fee 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6
+{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6
 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
 
 buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
       -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
     homepage = "https://github.com/pytest-dev/pytest-xdist";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest/4.nix b/nixpkgs/pkgs/development/python-modules/pytest/4.nix
index 43cfe6c822c4..63e57a7f769b 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest/4.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest/4.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
 , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
 }:
@@ -14,8 +14,8 @@ buildPythonPackage rec {
   checkInputs = [ hypothesis mock ];
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
-    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
-    ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+    ++ lib.optionals (!isPy3k) [ funcsigs ]
+    ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
   checkPhase = ''
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     preDistPhases+=" pytestcachePhase"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://docs.pytest.org";
     description = "Framework for writing tests";
     maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
diff --git a/nixpkgs/pkgs/development/python-modules/pytest/5.nix b/nixpkgs/pkgs/development/python-modules/pytest/5.nix
index 2b45c330cf38..1293cc94b0f1 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest/5.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest/5.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
 , atomicwrites
 , attrs
 , funcsigs
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     six
     toml
     wcwidth
-  ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+  ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
 
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     "pytest"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://docs.pytest.org";
     description = "Framework for writing tests";
     maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
diff --git a/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix
index 93282218871a..6f5c99a99b19 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
 , atomicwrites
 , attrs
 , funcsigs
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     six
     toml
     wcwidth
-  ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+  ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
 
@@ -58,6 +58,12 @@ buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
     $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py
+
+    # tests leave behind unreproducible pytest binaries in the output directory, remove:
+    find $out/lib -name "*-pytest-${version}.pyc" -delete
+    # specifically testing/test_assertion.py and testing/test_assertrewrite.py leave behind those:
+    find $out/lib -name "*opt-2.pyc" -delete
+
     runHook postCheck
   '';
 
@@ -73,7 +79,7 @@ buildPythonPackage rec {
     "pytest"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://docs.pytest.org";
     description = "Framework for writing tests";
     maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
diff --git a/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix b/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix
index f2427991e3f2..877e357d9469 100644
--- a/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, execnet }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Too many failing tests. Are they maintained?
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://pypi.python.org/pypi/pytest-cache/";
     description = "pytest plugin with mechanisms for caching across test runs";
diff --git a/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix b/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix
index 5ea632fa7f80..7fd901babd0b 100644
--- a/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
 
 buildPythonPackage rec {
   pname = "pytest-runner";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # Fixture not found
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Invoke py.test as distutils command with dependency resolution";
     homepage = "https://github.com/pytest-dev/pytest-runner";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-doi/default.nix b/nixpkgs/pkgs/development/python-modules/python-doi/default.nix
index 2fcd30e84b3e..7e94f743da46 100644
--- a/nixpkgs/pkgs/development/python-modules/python-doi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-doi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }:
 
 buildPythonPackage rec {
   pname = "python-doi";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library to work with Document Object Identifiers (doi)";
     homepage = "https://github.com/alejandrogallo/python-doi";
     maintainers = with maintainers; [ teto ];
diff --git a/nixpkgs/pkgs/development/python-modules/python-editor/default.nix b/nixpkgs/pkgs/development/python-modules/python-editor/default.nix
index 523229220efe..19efcb89d3d3 100644
--- a/nixpkgs/pkgs/development/python-modules/python-editor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-editor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   version = "1.0.4";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No proper tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that provides the `editor` module for programmatically";
     homepage = "https://github.com/fmoo/python-editor";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix
index 4e3cffa9d223..44e35a186e21 100644
--- a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , buildPythonPackage
-, pkgconfig
+, pkg-config
 , python
 , dbus-python
 , enlightenment
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ enlightenment.efl ];
 
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for EFL and Elementary";
     homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
index a74ee0455f2f..ed03d9663076 100644
--- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv
+, buildPythonPackage
+, fetchFromGitHub
 , aiohttp
 , eventlet
 , iana-etc
@@ -14,19 +16,15 @@
 
 buildPythonPackage rec {
   pname = "python-engineio";
-  version = "3.13.2";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-engineio";
     rev = "v${version}";
-    sha256 = "1hn5nnxp7y2dpf52vrwdxza2sqmzj8admcnwgjkmcxk65s2dhvy1";
+    sha256 = "00x9pmmnl1yd59wd96ivkiqh4n5nphl8cwk43hf4nqr0icgsyhar";
   };
 
-  propagatedBuildInputs = [
-    six
-  ];
-
   checkInputs = [
     aiohttp
     eventlet
@@ -38,7 +36,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
+  doCheck = !stdenv.isDarwin;
+
+  preCheck = lib.optionalString stdenv.isLinux ''
     echo "nameserver 127.0.0.1" > resolv.conf
     export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
       LD_PRELOAD=${libredirect}/lib/libredirect.so
@@ -47,11 +47,16 @@ buildPythonPackage rec {
 
   # somehow effective log level does not change?
   disabledTests = [ "test_logger" ];
+  pythonImportsCheck = [ "engineio" ];
 
-  meta = with stdenv.lib; {
-    description = "Engine.IO server";
+  meta = with lib; {
+    description = "Python based Engine.IO client and server";
+    longDescription = ''
+      Engine.IO is a lightweight transport protocol that enables real-time
+      bidirectional event-based communication between clients and a server.
+    '';
     homepage = "https://github.com/miguelgrinberg/python-engineio/";
-    license = licenses.mit;
-    maintainers = [ maintainers.mic92 ];
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ mic92 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix b/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix
index 714c324b4405..f4305473797c 100644
--- a/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   # Some issues with etcd not in path even though most tests passed
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python client for Etcd";
     homepage = "https://github.com/jplana/python-etcd";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix b/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix
index 7ef2eee4f2e5..392c5c2126d3 100644
--- a/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, stdenv, fetchPypi
+{ buildPythonPackage, lib, stdenv, fetchPypi
 , requests
 , nose
 , responses
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zeevgilovitz.com/python-forecast.io/";
     description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix b/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix
index 8edd87556675..661ea4ba2493 100644
--- a/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec {
     pytest
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/eyeseast/python-frontmatter";
     description = "Parse and manage posts with YAML (or other) frontmatter";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix
index 6108ea74a23a..c706ff7903c3 100644
--- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }:
 
 buildPythonPackage rec {
   pname = "python-gitlab";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interact with GitLab API";
     homepage = "https://github.com/python-gitlab/python-gitlab";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
index 3dd44a72ea46..36ca3a719061 100644
--- a/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, gnupg }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, gnupg }:
 
 buildPythonPackage rec {
   pname   = "python-gnupg";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     --replace "test_search_keys" "disabled__test_search_keys"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper for the Gnu Privacy Guard";
     homepage    = "https://pypi.python.org/pypi/python-gnupg";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
index e76dbc3e3b24..238b9b9e4afa 100644
--- a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }:
 
 buildPythonPackage rec {
   pname = "python-hosts";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     pytest tests/test_utils.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for managing a hosts file. It enables adding and removing entries, or importing them from a file or URL";
     homepage = "https://github.com/jonhadfield/python-hosts";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-hpilo/default.nix b/nixpkgs/pkgs/development/python-modules/python-hpilo/default.nix
new file mode 100644
index 000000000000..f151e3ffb4cd
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/python-hpilo/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, utils
+}:
+
+buildPythonPackage rec {
+  pname = "python-hpilo";
+  version = "4.4.3";
+
+  src = fetchFromGitHub {
+    owner = "seveas";
+    repo = pname;
+    rev = version;
+    sha256 = "1dk5xswydw7nmn9hlna1xca1mzcas9qv2kmid5yx8kvk3hjqci9v";
+  };
+
+  # Most tests requires an actual iLO to run
+  doCheck = false;
+  pythonImportsCheck = [ "hpilo" ];
+
+  meta = with lib; {
+    description = "Python module to access the HP iLO XML interface";
+    homepage = "https://seveas.github.io/python-hpilo/";
+    license = with licenses; [ asl20 gpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix b/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix
new file mode 100644
index 000000000000..f4b19ba379e4
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "python_http_client";
+  version = "3.3.1";
+
+  src = fetchFromGitHub {
+    owner = "sendgrid";
+    repo = "python-http-client";
+    rev = version;
+    sha256 = "0mbcg0vb9v41v7hbvycrxx5wyrf3ysvfgxkix8hn8c4x5l2lmidc";
+  };
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  # Failure was fixed by https://github.com/sendgrid/python-http-client/commit/6d62911ab0d0645b499e14bb17c302b48f3c10e4
+  disabledTests = [ "test__daterange" ];
+  pythonImportsCheck = [ "python_http_client" ];
+
+  meta = with lib; {
+    description = "Python HTTP library to call APIs";
+    homepage = "https://github.com/sendgrid/python-http-client";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix b/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
index 51d544eb5f81..728d47b1f967 100644
--- a/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchPypi, lib, isPy3k
-, pkgconfig, igraph
+, pkg-config, igraph
 , texttable }:
 
 buildPythonPackage rec {
@@ -7,7 +7,7 @@ buildPythonPackage rec {
   version = "0.8.3";
   disabled = !isPy3k; # fails to build
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ igraph ];
   propagatedBuildInputs = [ texttable ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
index 6b8104516ea9..0de220094c06 100644
--- a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , future, six, ecdsa, rsa
 , pycrypto, pytestcov, pytestrunner, cryptography
 , pytestCheckHook
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ future six ecdsa rsa ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mpdavis/python-jose";
     description = "A JOSE implementation in Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix
index d21e1dfccc91..96ce13ab265b 100644
--- a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/madzak/python-json-logger";
     description = "A python library adding a json log formatter";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index fa6ba97b406d..3a0ab33363ec 100644
--- a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -1,49 +1,31 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
-, pytest, mock, pytestcov, coverage
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+, pytestCheckHook, mock, pytestcov, coverage
 , future, futures, ujson, isPy38
-, fetchpatch
 }:
 
 buildPythonPackage rec {
   pname = "python-jsonrpc-server";
-  version = "0.3.4";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-jsonrpc-server";
     rev = version;
-    sha256 = "027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd";
+    sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6";
   };
 
   postPatch = ''
     sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py
-    # https://github.com/palantir/python-jsonrpc-server/issues/36
-    sed -iEe "s!'ujson.*\$!'ujson',!" setup.py
   '';
 
   checkInputs = [
-    pytest mock pytestcov coverage
-  ];
-
-  checkPhase = ''
-    pytest
-  '';
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/palantir/python-jsonrpc-server/commit/0a04cc4e9d44233b1038b12d63cd3bd437c2374e.patch";
-      sha256 = "177zdnp1808r2pg189bvzab44l8i2alsgv04kmrlhhnv40h66qyg";
-    })
-    (fetchpatch {
-      url = "https://github.com/palantir/python-jsonrpc-server/commit/5af6e43d0c1fb9a6a29b96d38cfd6dbeec85d0ea.patch";
-      sha256 = "1gx7lc1jxar1ngqqfkdn21s46y1mfnjf7ky2886ydk53nkaba91m";
-    })
+    pytestCheckHook mock pytestcov coverage
   ];
 
   propagatedBuildInputs = [ future ujson ]
-    ++ stdenv.lib.optional (pythonOlder "3.2") futures;
+    ++ lib.optional (pythonOlder "3.2") futures;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/palantir/python-jsonrpc-server";
     description = "A Python 2 and 3 asynchronous JSON RPC server";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
index 4558bc7edba4..f22652d0f73c 100644
--- a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
-, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson
+, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
   providers ? ["*"]
   # The following packages are optional and
@@ -21,33 +21,33 @@ in
 
 buildPythonPackage rec {
   pname = "python-language-server";
-  version = "0.34.1";
+  version = "0.36.2";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-language-server";
     rev = version;
-    sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU=";
+    sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q";
   };
 
-  patches = [
-    # https://github.com/palantir/python-language-server/pull/851
-    (fetchpatch {
-      url = "https://github.com/palantir/python-language-server/commit/f513f3297132492dd41e001d943980e6c4f40809.patch";
-      sha256 = "04c9hrb3dzlfchjk4625ipazyfcbq6qq2kj2hg3zf2xsny2jcvi5";
-    })
-  ];
+  propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
+    ++ lib.optional (withProvider "autopep8") autopep8
+    ++ lib.optional (withProvider "mccabe") mccabe
+    ++ lib.optional (withProvider "pycodestyle") pycodestyle
+    ++ lib.optional (withProvider "pydocstyle") pydocstyle
+    ++ lib.optional (withProvider "pyflakes") pyflakes
+    ++ lib.optional (withProvider "pylint") pylint
+    ++ lib.optional (withProvider "rope") rope
+    ++ lib.optional (withProvider "yapf") yapf
+    ++ lib.optional isPy27 configparser
+    ++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];
 
-  postPatch = ''
-    # https://github.com/palantir/python-jsonrpc-server/issues/36
-    sed -i -e 's!ujson<=!ujson>=!' setup.py
-  '';
 
   # The tests require all the providers, disable otherwise.
   doCheck = providers == ["*"];
 
   checkInputs = [
-    pytestCheckHook mock pytestcov coverage
+    pytestCheckHook mock pytestcov coverage flaky
     # rope is technically a dependency, but we don't add it by default since we
     # already have jedi, which is the preferred option
     rope
@@ -67,21 +67,10 @@ buildPythonPackage rec {
     "test_matplotlib_completions"
     "test_snippet_parsing"
     "test_numpy_hover"
-  ] ++ stdenv.lib.optional isPy27 "test_flake8_lint";
-
-  propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
-    ++ stdenv.lib.optional (withProvider "autopep8") autopep8
-    ++ stdenv.lib.optional (withProvider "mccabe") mccabe
-    ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
-    ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle
-    ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes
-    ++ stdenv.lib.optional (withProvider "pylint") pylint
-    ++ stdenv.lib.optional (withProvider "rope") rope
-    ++ stdenv.lib.optional (withProvider "yapf") yapf
-    ++ stdenv.lib.optional isPy27 configparser
-    ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];
+    "test_symbols"
+  ] ++ lib.optional isPy27 "test_flake8_lint";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/palantir/python-language-server";
     description = "An implementation of the Language Server Protocol for Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix b/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix
index 3f543e8569b9..94d8abd1fabd 100644
--- a/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, py4j }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, py4j }:
 
 buildPythonPackage rec {
   pname = "python-ldap-test";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # Tests needs java to be present in path
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for testing code speaking with LDAP server";
     homepage = "https://github.com/zoldar/python-ldap-test";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix b/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
index 7a16621da0a5..60767e77e761 100644
--- a/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests included in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Functions for fast computation of Levenshtein distance and string similarity";
     homepage    = "https://github.com/ztane/python-Levenshtein";
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/python-ly/default.nix b/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
index f8b7f023717c..6f83a7f61c75 100644
--- a/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, stdenv }:
+{ buildPythonPackage, fetchPypi, lib, stdenv }:
 
 buildPythonPackage rec {
   pname = "python-ly";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool and library for manipulating LilyPond files";
     license = licenses.gpl2;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix b/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix
index 3064afe3ba42..a1fd01134235 100644
--- a/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   version = "0.2.4";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1l8m6vzwm1m8hn7ldw8j8r2b6r199k8z3q0wnhdyy4p68hahyhni";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "liblzf python bindings";
     homepage = "https://github.com/teepark/python-lzf";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
index 61cd5e34855c..fe68ed60e372 100644
--- a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPyPy
 , python
@@ -30,7 +30,7 @@ in buildPythonPackage rec {
   disabled = isPyPy;
   doCheck = false; # doesn't find needed test data files
   preBuild = let
-    pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
+    pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
   in ''
     export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
     export BOOST_THREAD_LIB="boost_thread"
@@ -57,7 +57,7 @@ in buildPythonPackage rec {
   ]);
   propagatedBuildInputs = [ pillow pycairo ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for Mapnik";
     homepage = "https://mapnik.org";
     license  = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
index 136483761cf8..8321795c2fba 100644
--- a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , appdirs
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for interfacing with Xiaomi smart appliances";
     homepage = "https://github.com/rytilahti/python-miio";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix b/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix
index 0004c297b619..a24f2a383a31 100644
--- a/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "python-mnist";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "a0cced01e83b5b844cff86109280df7a672a8e4e38fc19fa68999a17f8a9fbd8";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sorki/python-mnist";
     description = "Simple MNIST data parser written in Python";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix
index f03b3b10e487..ba3ecd3883a4 100644
--- a/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "python-nomad";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # Tests require nomad agent
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python client library for Hashicorp Nomad";
     homepage = "https://github.com/jrxFive/python-nomad";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-otr/default.nix b/nixpkgs/pkgs/development/python-modules/python-otr/default.nix
index d83d25972450..7a40998eebdc 100644
--- a/nixpkgs/pkgs/development/python-modules/python-otr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-otr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_interface cryptography application gmpy2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure python implementation of OTR";
     homepage = "https://github.com/AGProjects/python-otr";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/python-packer/default.nix b/nixpkgs/pkgs/development/python-modules/python-packer/default.nix
index 420efb40039e..ba02ec84635f 100644
--- a/nixpkgs/pkgs/development/python-modules/python-packer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-packer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }:
 
 buildPythonPackage rec {
   pname = "python-packer";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Tests requires network connections
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interface for packer.io";
     homepage = "https://github.com/nir0s/python-packer";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix
index e21f01d5cd6b..6e0c0ef5788e 100644
--- a/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   doCheck = false; # Tests are not provided.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for interacting with the pipedrive.com API";
     homepage = "https://github.com/jscott1989/python-pipedrive";
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix b/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix
index 5eff4707d4e2..2d81581c0cc1 100644
--- a/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python binding of ptrace library";
     homepage = "https://github.com/vstinner/python-ptrace";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
index b128e767d872..c4cf0dc74255 100644
--- a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     pytest tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/python-rapidjson/python-rapidjson";
     description = "Python wrapper around rapidjson ";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
index 32189495cdd4..235d085fffdb 100644
--- a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , redis
@@ -24,10 +24,10 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ redis ]
-  ++ stdenv.lib.optional withDjango django_redis;
+  ++ lib.optional withDjango django_redis;
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ionelmc/python-redis-lock";
     license = licenses.bsd2;
     description = "Lock context manager implemented via redis SETNX/BLPOP";
diff --git a/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix b/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
index f41aefe92aaa..8ec7f6887ad4 100644
--- a/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , unzip }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   buildInputs = [ unzip ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy peasy wrapper for HipChat's v1 API";
     homepage = "https://github.com/kurttheviking/simple-hipchat-py";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
index 30ce55a12a0c..1860ff6d24d5 100644
--- a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }:
 
 buildPythonPackage rec {
     pname = "python-slugify";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
       ${python.interpreter} test.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://github.com/un33k/python-slugify";
       description = "A Python Slugify application that handles Unicode";
       license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
index cfa260205715..ee9a60301444 100644
--- a/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
@@ -1,33 +1,43 @@
-{ lib
+{ lib, stdenv
+, bidict
 , buildPythonPackage
-, fetchPypi
-, six
-, python-engineio
+, fetchFromGitHub
 , mock
+, pytestCheckHook
+, python-engineio
 }:
 
 buildPythonPackage rec {
   pname = "python-socketio";
-  version = "4.6.1";
+  version = "5.0.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cd1f5aa492c1eb2be77838e837a495f117e17f686029ebc03d62c09e33f4fa10";
+  src = fetchFromGitHub {
+    owner = "miguelgrinberg";
+    repo = "python-socketio";
+    rev = "v${version}";
+    sha256 = "0mpqr53mrdzk9ki24y1inpsfvjlvm7pvxf8q4d52m80i5pcd5v5q";
   };
 
   propagatedBuildInputs = [
-    six
+    bidict
     python-engineio
   ];
 
-  checkInputs = [ mock ];
-  # tests only on github, but latest github release not tagged
-  doCheck = false;
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "socketio" ];
 
   meta = with lib; {
-    description = "Socket.IO server";
-    homepage = "https://github.com/miguelgrinberg/python-socketio/";
-    license = licenses.mit;
-    maintainers = [ maintainers.mic92 ];
+    description = "Python Socket.IO server and client";
+    longDescription = ''
+      Socket.IO is a lightweight transport protocol that enables real-time
+      bidirectional event-based communication between clients and a server.
+    '';
+    homepage = "https://github.com/miguelgrinberg/python-engineio/";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ mic92 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
index f16f581ade3d..52dea24c45fe 100644
--- a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , certifi
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "telegram" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This library provides a pure Python interface for the Telegram Bot API.";
     homepage = "https://python-telegram-bot.org";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix b/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
index 6210c13f56e8..4b1e7e2c1eba 100644
--- a/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ future requests requests_oauthlib ];
   checkInputs = [ pytest responses hypothesis ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python wrapper around the Twitter API";
     homepage = "https://github.com/bear/python-twitter";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix b/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix
index eddf0deb015c..7f6f14c9888c 100644
--- a/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, requests, hidapi }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, requests, hidapi }:
 
 buildPythonPackage rec {
   pname = "python-u2flib-host";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # Tests fail: "ValueError: underlying buffer has been detached"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python based U2F host library";
     homepage = "https://github.com/Yubico/python-u2flib-host";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix b/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix
index e7579058f71a..69f741e74379 100644
--- a/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , udev }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   NIX_CFLAGS_LINK = "-ludev";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pythonic API to Linux uinput kernel module";
     homepage = "http://tjjr.fi/sw/python-uinput/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix
index a7f0bd93b0af..fa82027777f6 100644
--- a/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -16,7 +16,7 @@ buildPythonPackage {
     sha256 = "1h9biinhy5m7r2cj4abhvsg2hb6xjny3n2dxnj1336zpa082ys3h";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for the Linux unshare() syscall";
     homepage    = "https://github.com/thetincho/python-unshare";
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix b/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix
index cdafd3cd2a0f..f96086393f2e 100644
--- a/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , oath
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     pytest tests/ -k 'not test_check_token'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free software implementation of Symantec's VIP Access application and protocol";
     homepage = "https://github.com/dlenski/python-vipaccess";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix b/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix
index 7300efc77bcc..503fbe101b92 100644
--- a/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "149c3dznb63d82143cz5hqdim0mqjysz6p3yk0zv271vq3xnmzvv";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Read & write wireless card capabilities using the Linux Wireless Extensions";
     homepage = "http://pythonwifi.tuxfamily.org/";
diff --git a/nixpkgs/pkgs/development/python-modules/python-wink/default.nix b/nixpkgs/pkgs/development/python-modules/python-wink/default.nix
new file mode 100644
index 000000000000..fa0dc670133e
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/python-wink/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "python-wink";
+  version = "1.10.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1r6qabnqxyy3llnj10z60d4w9pg2zabysl3l7znpy1adss4ywxl0";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pywink" ];
+
+  meta = with lib; {
+    description = "Python implementation of the Wink API";
+    homepage = "https://github.com/python-wink/python-wink";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
index e5d7a7f0326d..3e6d72845687 100644
--- a/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
@@ -4,7 +4,7 @@
 , mock
 , pythonOlder
 , pytz
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage {
@@ -26,7 +26,7 @@ buildPythonPackage {
 
   buildInputs = [ exempi ];
 
-  checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ];
+  checkInputs = lib.optionals (pythonOlder "3.3") [ mock ];
 
   propagatedBuildInputs = [ pytz ];
 
@@ -35,7 +35,7 @@ buildPythonPackage {
       --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit";
     description = "Python XMP Toolkit for working with metadata";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix b/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix
index a19156d1018b..b9d9b110f60c 100644
--- a/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python interface to the UNIX dialog utility and mostly-compatible programs (Python 2 backport)";
     homepage = "http://pythondialog.sourceforge.net/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix b/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix
index 2a85482cbb68..ad8ea88d1d0d 100644
--- a/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
+{ lib, stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
 
 buildPythonPackage rec {
   pname = "python3-openid";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenID support for modern servers and consumers";
     homepage = "https://github.com/necaris/python3-openid";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
index 2224c94ac6f7..df12d7aeaff6 100644
--- a/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver
+{ lib, stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver
 , six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     six munch urllib3 beautifulsoup4 openidc-client ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Fedora Module";
     homepage = "https://github.com/fedora-infra/python-fedora";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix b/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix
index c9e29ab5c639..5fff75ada911 100644
--- a/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyasn1
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pyasn1 pycrypto ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Toolkit for safe and simple cryptography";
     homepage    = "https://pypi.python.org/pypi/python-keyczar";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix b/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix
index 9484d24f5e2f..c3f85affe81b 100644
--- a/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges";
     homepage = "https://github.com/dbtsai/python-mimeparse";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix
index d3f1a0a81204..2c5357297ea7 100644
--- a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
-, pkgconfig
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+, pkg-config
 , systemd, libyaml, openzwave, cython, pyserial
 , six, pydispatcher, urwid }:
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ systemd libyaml openzwave cython ];
   propagatedBuildInputs = [ six urwid pydispatcher pyserial ];
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   # no tests available
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper for the OpenZWave C++ library";
     homepage = "https://github.com/OpenZWave/python-openzwave";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix b/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix
index 6455b6945172..ae293c44c0f7 100644
--- a/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   buildInputs = [ mock nose coverage ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client for Etsy's node-js statsd server";
     homepage = "https://github.com/WoLpH/python-statsd";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix b/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix
index 4f54c5a8fad8..c385f11b2f01 100644
--- a/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python interface to the UNIX dialog utility and mostly-compatible programs";
     homepage = "http://pythondialog.sourceforge.net/";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix b/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix
index 6074b76d300a..178e1855a061 100644
--- a/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , paver
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ paver ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python IRC library";
     homepage = "https://github.com/jaraco/irc";
     license = with licenses; [ lgpl21 ];
diff --git a/nixpkgs/pkgs/development/python-modules/pythonix/default.nix b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix
index 6ed150d12398..80535b28bf23 100644
--- a/nixpkgs/pkgs/development/python-modules/pythonix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix
@@ -1,24 +1,32 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }:
 
 buildPythonPackage rec {
   pname = "pythonix";
-  version = "0.1.6";
+  version = "0.1.7";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "pythonix";
     rev = "v${version}";
-    sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5";
+    sha256 = "1wxqv3i4bva2qq9mx670bcx0g0irjn68fvk28dwvhay9ndwcspqf";
   };
 
   disabled = !isPy3k;
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
 
   buildInputs = [ nix boost ];
 
-  meta = with stdenv.lib; {
+  postInstall = ''
+    # This is typically set by pipInstallHook/eggInstallHook,
+    # so we have to do so manually when using meson
+    export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
+  '';
+
+  pythonImportsCheck = [ "nix" ];
+
+  meta = with lib; {
     description = ''
        Eval nix code from python.
     '';
diff --git a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix
index 82ddb8c810b0..d0054f7076a1 100644
--- a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix
@@ -6,7 +6,7 @@
 , pytest
 , pycparser
 , psutil
-, pkgconfig
+, pkg-config
 , dotnetbuildhelpers
 , clang
 , glib
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     pytest
     pycparser
 
-    pkgconfig
+    pkg-config
     dotnetbuildhelpers
     clang
 
diff --git a/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix b/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix
index 96c79a45b277..d1d06d22c641 100644
--- a/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchFromGitHub, cmake, swig, ninja
+{ lib, stdenv, python, fetchFromGitHub, cmake, swig, ninja
 , opencascade, smesh, freetype, libGL, libGLU, libX11
 , Cocoa }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python opencascade smesh
     freetype libGL libGLU libX11
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   cmakeFlags = [
     "-Wno-dev"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     "-DPYTHONOCC_WRAP_SMESH=TRUE"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper for the OpenCASCADE 3D modeling kernel";
     homepage = "https://github.com/tpaviot/pythonocc-core";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix b/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix
index a0aade1fe670..16f6e4232b30 100644
--- a/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, html-tidy }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, python, html-tidy }:
 
 buildPythonPackage rec {
   pname = "pytidylib";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python wrapper for HTML Tidy (tidylib) on Python 2 and 3";
     homepage = "https://countergram.github.io/pytidylib/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/nixpkgs/pkgs/development/python-modules/pytile/default.nix
new file mode 100644
index 000000000000..771ae4d13281
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pytile/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, aiohttp
+, async-timeout
+, aresponses
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pylint
+, pytest-aiohttp
+, pytest-asyncio
+, pytestCheckHook
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+  pname = "pytile";
+  version = "5.1.1";
+  disabled = pythonAtLeast "3.9";
+
+  src = fetchFromGitHub {
+    owner = "bachya";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-bVoFTaK/Alemtc5I+Z/M9y/FWczvJ+P86R0DMD89/BM=";
+  };
+
+  format = "pyproject";
+
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [
+    aiohttp
+    pylint
+  ];
+
+  checkInputs = [
+    aresponses
+    pytest-aiohttp
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # Ignore the examples as they are prefixed with test_
+  pytestFlagsArray = [ "--ignore examples/" ];
+  pythonImportsCheck = [ "pytile" ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
+    description = " Python API for Tile Bluetooth trackers";
+    longDescription = ''
+      pytile is a simple Python library for retrieving information on Tile
+      Bluetooth trackers (including last location and more).
+    '';
+    homepage = "https://github.com/bachya/pytile";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix b/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
index 9aa11a480cd6..1ced64375301 100644
--- a/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, nose }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, nose }:
 
 buildPythonPackage rec {
     pname = "pytimeparse";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
     checkInputs = [ nose ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "A small Python library to parse various kinds of time expressions";
       homepage    = "https://github.com/wroberts/pytimeparse";
       license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytmx/default.nix b/nixpkgs/pkgs/development/python-modules/pytmx/default.nix
index aa6eecfdeb53..17c18a96c736 100644
--- a/nixpkgs/pkgs/development/python-modules/pytmx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytmx/default.nix
@@ -1,21 +1,28 @@
-{ lib, fetchFromGitHub, isPy3k, buildPythonPackage, pygame, pyglet, pysdl2, six }:
+{ lib, fetchFromGitHub
+, python, buildPythonPackage, isPy27
+, pygame, pyglet, pysdl2, six
+}:
 
 buildPythonPackage rec {
   pname = "pytmx";
-  version = "3.22.0";
+  version = "3.24.0";
+
+  disabled = isPy27;
 
   src = fetchFromGitHub {
     # The release was not git tagged.
     owner = "bitcraft";
     repo = "PyTMX";
-    rev = "187fd429dadcdc5828e78e6748a983aa1434e4d2";
-    sha256 = "0480pr61v54bwdyzb983sk0fqkyfbcgrdn8k11yf1yck4zb119gc";
+    rev = "eb96efea30d57b731654b2a167d86b8b553b147d";
+    sha256 = "1g1j4w75zw76p5f8m5v0hdigdlva2flf0ngyk8nvqcwzcl5vq5wc";
   };
 
   propagatedBuildInputs = [ pygame pyglet pysdl2 six ];
 
   checkPhase = ''
-    python -m unittest tests.pytmx.test_pytmx
+    # Change into the test directory due to a relative resource path.
+    cd tests/pytmx
+    ${python.interpreter} -m unittest test_pytmx
   '';
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/pytoml/default.nix b/nixpkgs/pkgs/development/python-modules/pytoml/default.nix
index 8ec17b158449..64e6ed4c669a 100644
--- a/nixpkgs/pkgs/development/python-modules/pytoml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytoml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , python
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   '';
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A TOML parser/writer for Python";
     homepage    = "https://github.com/avakar/pytoml";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
index 6a97e6d30a4f..1ffda5c86b0e 100644
--- a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPy37
@@ -52,7 +52,7 @@ in buildPythonPackage {
   '';
 
   postFixup = let
-    rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ];
+    rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ];
   in ''
     find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting rpath for $lib..."
@@ -63,7 +63,7 @@ in buildPythonPackage {
 
   pythonImportsCheck = [ "torch" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source, prototype-to-production deep learning platform";
     homepage = "https://pytorch.org/";
     license = licenses.unfree; # Includes CUDA and Intel MKL.
diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
index f072972937a9..db1914f4ee7b 100644
--- a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null,
   mklDnnSupport ? true, useSystemNccl ? true,
-  openMPISupport ? false, openmpi ? null,
+  MPISupport ? false, mpi,
   buildDocs ? false,
   cudaArchList ? null,
 
@@ -29,8 +29,6 @@
 
   isPy3k, pythonOlder }:
 
-assert !openMPISupport || openmpi != null;
-
 # assert that everything needed for cuda is present and that the correct cuda versions are used
 assert !cudaSupport || cudatoolkit != null;
 assert cudnn == null || cudatoolkit != null;
@@ -38,7 +36,7 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
                         in majorIs == "9" || majorIs == "10" || majorIs == "11");
 
 # confirm that cudatoolkits are sync'd across dependencies
-assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit;
+assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit;
 assert !cudaSupport || magma.cudatoolkit == cudatoolkit;
 
 let
@@ -224,7 +222,7 @@ in buildPythonPackage rec {
     typing-extensions
     # the following are required for tensorboard support
     pillow six future tensorflow-tensorboard protobuf
-  ] ++ lib.optionals openMPISupport [ openmpi ]
+  ] ++ lib.optionals MPISupport [ mpi ]
     ++ lib.optionals (pythonOlder "3.7") [ dataclasses ];
 
   checkInputs = [ hypothesis ninja psutil ];
@@ -267,7 +265,7 @@ in buildPythonPackage rec {
     cp -r $out/${python.sitePackages}/torch/lib     $lib/lib
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     for f in $(ls $lib/lib/*.dylib); do
         install_name_tool -id $lib/lib/$(basename $f) $f || true
     done
diff --git a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix
index 8317c5ea0182..83980c3d00b9 100644
--- a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests lxml pandas ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pseudo API for Google Trends";
     homepage = "https://github.com/GeneralMills/pytrends";
     license = [ licenses.asl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/pytricia/default.nix b/nixpkgs/pkgs/development/python-modules/pytricia/default.nix
index 80e95fb60507..8e168bf8181a 100644
--- a/nixpkgs/pkgs/development/python-modules/pytricia/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytricia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for fast IP address lookup in Python";
     homepage = "https://github.com/jsommers/pytricia";
     license = with licenses; [ lgpl3Plus ];
diff --git a/nixpkgs/pkgs/development/python-modules/pytun/default.nix b/nixpkgs/pkgs/development/python-modules/pytun/default.nix
index b37dbf26fb7b..2b49b169c6d1 100644
--- a/nixpkgs/pkgs/development/python-modules/pytun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # Test directory contains examples, not tests.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/montag451/pytun";
     description = "Linux TUN/TAP wrapper for Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix b/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix
index 5adcbd0d2368..739325d33337 100644
--- a/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "pytzdata";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Timezone database for Python";
     homepage = "https://github.com/sdispater/pytzdata";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix b/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix
index ed2dd4cc2564..1eec6f3ea84d 100644
--- a/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "API towards Ubiquity Networks UniFi controller";
     homepage = "https://github.com/finish06/unifi-api";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix
index 9ce93d67a52a..f33aba8d6256 100644
--- a/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , requests }:
 
 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # This description is terrible, but it's what upstream uses.
     description = "Package to update stuff";
     homepage = "https://github.com/ludeeus/pyupdate";
diff --git a/nixpkgs/pkgs/development/python-modules/pyusb/default.nix b/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
index 7e5fc90453ff..41207984e0ca 100644
--- a/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "pyusb";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "usb" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
     homepage = "https://pyusb.github.io/pyusb/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix
index a943c8eb523b..f1c0d3be8ccf 100644
--- a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptoolsDarcs
@@ -24,11 +24,11 @@ buildPythonPackage rec {
   # package, apparently some kind of plugin.
   doCheck = false;
 
-  prePatch = stdenv.lib.optionalString isPyPy ''
+  prePatch = lib.optionalString isPyPy ''
     grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pyutil, a collection of mature utilities for Python programmers";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/pyuv/default.nix b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
index 7f476d3c11d2..95477196d8b9 100644
--- a/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPyPy
 , pkgs
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pkgs.libuv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python interface for libuv";
     homepage = "https://github.com/saghul/pyuv";
     repositories.git = "git://github.com/saghul/pyuv.git";
diff --git a/nixpkgs/pkgs/development/python-modules/pyvera/default.nix b/nixpkgs/pkgs/development/python-modules/pyvera/default.nix
new file mode 100644
index 000000000000..4415ca7c376d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyvera/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, poetry-core
+, pytest-cov
+, pytest-asyncio
+, pytest-timeout
+, responses
+, pytestCheckHook
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pyvera";
+  version = "0.3.11";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "pavoni";
+    repo = pname;
+    rev = version;
+    sha256 = "0yi2cjd3jag95xa0k24f7d7agi26ywb3219a0j0k8l2nsx2sdi87";
+  };
+
+  patches = [
+    (fetchpatch {
+      # build-system section is missing https://github.com/pavoni/pyvera/pull/142
+      url = "https://github.com/pavoni/pyvera/pull/142/commits/e90995a8d55107118d324e8cf189ddf1d9e3aa6c.patch";
+      sha256 = "1psq3fiwg20kcwyybzh5g17dzn5fh29lhm238npyg846innbzgs7";
+    })
+  ];
+
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytest-timeout
+    pytest-cov
+    pytestCheckHook
+    responses
+  ];
+
+  pythonImportsCheck = [ "pyvera" ];
+
+  meta = with lib; {
+    description = "Python library to control devices via the Vera hub";
+    homepage = "https://github.com/pavoni/pyvera";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix b/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix
new file mode 100644
index 000000000000..1a78aefa6daf
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "pyvlx";
+  version = "0.2.19";
+
+  src = fetchFromGitHub {
+    owner = "Julius2342";
+    repo = pname;
+    rev = version;
+    sha256 = "031gp3sjagvmgdhfpdqlawva425ja1n3bmxk6jyn4zx54szj9zwf";
+  };
+
+  propagatedBuildInputs = [ pyyaml ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "pyvlx" ];
+
+  meta = with lib; {
+    description = "Python client to work with Velux units";
+    longDescription = ''
+      PyVLX uses the Velux KLF 200 interface to control io-Homecontrol
+      devices, e.g. Velux Windows.
+    '';
+    homepage = "https://github.com/Julius2342/pyvlx";
+    license = with licenses; [ lgpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix
index e99865417820..7013cc7809dd 100644
--- a/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # No tests in package
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/joe-jordan/pyvoro";
     description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix b/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix
index f9951465e256..5e3c4d6cc5a0 100644
--- a/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, watchman }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, watchman }:
 
 buildPythonPackage rec {
   pname = "pywatchman";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Watchman client for Python";
     homepage = "https://facebook.github.io/watchman/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix b/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix
index 9a56bf760464..5ed3e28b5b1b 100644
--- a/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
   pname = "PyWebDAV";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://code.google.com/p/pywebdav/";
     description = "WebDAV library including a standalone server for python";
     maintainers = with maintainers; [ johbo ];
diff --git a/nixpkgs/pkgs/development/python-modules/pywilight/default.nix b/nixpkgs/pkgs/development/python-modules/pywilight/default.nix
new file mode 100644
index 000000000000..66bdcca4793d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pywilight/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ifaddr
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pywilight";
+  version = "0.0.65";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bldhg81lal9mbf55ky3gj2ndlplr0vfjp1bamd0mz5d9icas8nf";
+  };
+
+  propagatedBuildInputs = [
+    ifaddr
+    requests
+  ];
+
+  # no tests are present
+  doCheck = false;
+  pythonImportsCheck = [ "pywilight" ];
+
+  meta = with lib; {
+    description = "Python API for WiLight device";
+    homepage = "https://github.com/leofig-rj/pywilight";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix b/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix
new file mode 100644
index 000000000000..32baa25e52e7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, asyncio-dgram
+, click
+}:
+
+buildPythonPackage rec {
+  pname = "pywizlight";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "sbidy";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0kyhyda28zbni9sjv6kvky6wlhqldl47niddgpbjsv5dlb9xvxns";
+  };
+
+  propagatedBuildInputs = [
+    asyncio-dgram
+    click
+  ];
+
+  # no tests are present
+  doCheck = false;
+  pythonImportsCheck = [ "pywizlight" ];
+
+  meta = with lib; {
+    description = "Python connector for WiZ light bulbs";
+    homepage = "https://github.com/sbidy/pywizlight";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyx/default.nix b/nixpkgs/pkgs/development/python-modules/pyx/default.nix
index 339fa9029b70..b19e5f97e141 100644
--- a/nixpkgs/pkgs/development/python-modules/pyx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python package for the generation of PostScript, PDF, and SVG files";
     homepage = "http://pyx.sourceforge.net/";
     license = with licenses; [ gpl2 ];
diff --git a/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix b/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix
new file mode 100644
index 000000000000..9b8b6eeac8ff
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "pyxeoma";
+  version = "1.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c9q6xdh2ciisv0crlz069haz01gfkhd5kasyr14jng4vjpzinc7";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  # Project doesn't have any tests
+  doCheck = false;
+  pythonImportsCheck = [ "pyxeoma" ];
+
+  meta = with lib; {
+    description = "Python wrapper for Xeoma web server API";
+    homepage = "https://github.com/jeradM/pyxeoma";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix b/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix
index 2c5121e61e80..03fce00629d8 100644
--- a/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }:
+{ lib, stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }:
 
 buildPythonPackage rec {
   pname = "PyZufall";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pyzufall.readthedocs.io/de/latest/";
     description = "Library for generating random data and sentences in german language";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/qdldl/default.nix b/nixpkgs/pkgs/development/python-modules/qdldl/default.nix
new file mode 100644
index 000000000000..d8e043d546da
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/qdldl/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cmake
+, pybind11
+, numpy
+, scipy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "qdldl";
+  version = "0.1.5.post0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "c392c7427651d8b226423c7aba4a0f2338a1f38a4bbdabac6bc4afd8bc934f06";
+  };
+
+  dontUseCmakeConfigure = true;
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ pybind11 ];
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+  ];
+
+  pythonImportsCheck = [ "qdldl" ];
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "A free LDL factorization routine";
+    homepage = "https://github.com/oxfordcontrol/qdldl";
+    downloadPage = "https://github.com/oxfordcontrol/qdldl-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix b/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix
index f7221a981ea6..ef540538792d 100644
--- a/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPy3k
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # needs a broker running and then ./qpid-python-test
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://qpid.apache.org/";
     description = "Python client implementation and AMQP conformance tests for Apache Qpid";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix
index 714c74188976..113d53ff29b8 100644
--- a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six pillow pymaging_png setuptools ];
   checkInputs = [ mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Quick Response code generation for Python";
     homepage = "https://pypi.python.org/pypi/qrcode";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix
index e44f6205d39f..82c3773f3032 100644
--- a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , disabledIf
 , isPy3k
@@ -34,7 +34,7 @@ disabledIf (isPy3k || isPyPy)
           --sipdir $out/share/sip
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "A Python binding to QScintilla, Qt based text editing control";
       license = licenses.lgpl21Plus;
       maintainers = with maintainers; [ danbst ];
diff --git a/nixpkgs/pkgs/development/python-modules/qserve/default.nix b/nixpkgs/pkgs/development/python-modules/qserve/default.nix
index ad1a7fd2ca36..ff606d132363 100644
--- a/nixpkgs/pkgs/development/python-modules/qserve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qserve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "0b04b2d4d11b464ff1efd42a9ea9f8136187d59f4076f57c9ba95361d41cd7ed";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Job queue server";
     homepage = "https://github.com/pediapress/qserve";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
index 6ec8ce367735..11b4885e4c8a 100644
--- a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }:
 
 buildPythonPackage rec {
   pname = "QtAwesome";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Requires https://github.com/boylea/qtbot
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Iconic fonts in PyQt and PySide applications";
     homepage = "https://github.com/spyder-ide/qtawesome";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix
index 313b1266a52d..76db7090a045 100644
--- a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyside, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pyside, pytest }:
 
 buildPythonPackage rec {
   pname = "QtPy";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     py.test qtpy/tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide";
     homepage = "https://github.com/spyder-ide/qtpy";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix b/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix
index f9d04a8f797c..25b3c113cec6 100644
--- a/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, python, isPy27
 , six
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # one test fails due to https://github.com/bernii/querystring-parser/issues/35
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bernii/querystring-parser";
     description = "QueryString parser for Python/Django that correctly handles nested dictionaries";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/queuelib/default.nix b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix
index dbcdd4c5924e..7471ea180655 100644
--- a/nixpkgs/pkgs/development/python-modules/queuelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of persistent (disk-based) queues for Python";
     homepage = "https://github.com/scrapy/queuelib";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
index 341d3f9660c5..3fbb0fb4042c 100644
--- a/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
@@ -18,10 +18,10 @@ buildPythonPackage rec {
   ''
     # Fix find_library, can be removed after
     # https://github.com/NixOS/nixpkgs/issues/7307 is resolved.
-    substituteInPlace r2pipe/native.py --replace "find_library('r_core')" "'${libr_core}'"
+    substituteInPlace r2pipe/native.py --replace 'find_library("r_core")' "'${libr_core}'"
 
     # Fix the default r2 executable
-    substituteInPlace r2pipe/open_sync.py --replace "r2e = 'radare2'" "r2e = '${radare2}/bin/radare2'"
+    substituteInPlace r2pipe/open_sync.py --replace 'r2e = "radare2"' "r2e = '${radare2}/bin/radare2'"
     substituteInPlace r2pipe/open_base.py --replace 'which("radare2")' "'${radare2}/bin/radare2'"
   '';
 
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interact with radare2";
     homepage = "https://github.com/radare/radare2-r2pipe";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix b/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix
index 9844c8dca443..79975ada5015 100644
--- a/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , mock
@@ -34,7 +34,7 @@ buildPythonPackage rec {
       --replace 'pamqp>=2,<3' 'pamqp'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library";
     homepage = "https://pypi.python.org/pypi/rabbitpy";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/rachiopy/default.nix b/nixpkgs/pkgs/development/python-modules/rachiopy/default.nix
new file mode 100644
index 000000000000..3fcf773e83d9
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/rachiopy/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, requests
+, buildPythonPackage
+, fetchFromGitHub
+, jsonschema
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "rachiopy";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "rfverbruggen";
+    repo = pname;
+    rev = version;
+    sha256 = "1d5v9qc7ymzns3ivc5fzwxnxz9sjkhklh57cw05va95mpk5kdskc";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [
+    jsonschema
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "rachiopy" ];
+
+  meta = with lib; {
+    description = "Python client for Rachio Irrigation controller";
+    homepage = "https://github.com/rfverbruggen/rachiopy";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix
index 4b30d643fbd7..5c561b6e6541 100644
--- a/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage {
   pname = "radicale_infcloud";
@@ -13,7 +13,7 @@ buildPythonPackage {
 
   doCheck = false; # Tries to import radicale, circular dependency
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Unrud/RadicaleInfCloud/";
     description = "Integrate InfCloud into Radicale's web interface";
     license = with licenses; [ agpl3 gpl3 ];
diff --git a/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix
index 7fc7f057009a..c5ec1d3ab4ef 100644
--- a/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -44,7 +44,7 @@ buildPythonPackage rec {
 
   buildInputs =  [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow dateutil pysocks pocket ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Streaming command-line twitter client";
     homepage    = "http://www.rainbowstream.org/";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix b/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix
index 0f870a5ab7a1..2d3e2bdc0e03 100644
--- a/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , mock, pytest, pytest-mock, pytest-server-fixtures, pytest-localserver
 , termcolor, click, markdown2, six, jsonref, pyyaml, xmltodict, attrs
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0xvnna7kaq4nm5nfnwcwbr5bcm2s532hgyp7kq4v9iivn48rrf3v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python RAML parser.";
     homepage    = "https://ramlfications.readthedocs.org";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/random2/default.nix b/nixpkgs/pkgs/development/python-modules/random2/default.nix
index 1334fa2aa32c..9ed7701a3f45 100644
--- a/nixpkgs/pkgs/development/python-modules/random2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/random2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypi.python.org/pypi/random2";
     description = "Python 3 compatible Python 2 `random` Module";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix
index 6502d9f4ae6a..22c34b82a5fa 100644
--- a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27
 # unrar is non-free software
 , useUnrar ? false, unrar
 }:
@@ -28,14 +28,13 @@ buildPythonPackage rec {
        else
         ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\""
         '')
-     + ''
-   '';
+     + "";
   # the tests only work with the standard unrar package
   doCheck = useUnrar;
   LC_ALL = "en_US.UTF-8";
   pythonImportsCheck = [ "rarfile" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RAR archive reader for Python";
     homepage = "https://github.com/markokr/rarfile";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix b/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix
index 15437889fc2f..4d3ff6d486b4 100644
--- a/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv
+  lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/RazerM/ratelimiter";
     license = licenses.asl20;
     description = "Simple python rate limiting object";
diff --git a/nixpkgs/pkgs/development/python-modules/rawkit/default.nix b/nixpkgs/pkgs/development/python-modules/rawkit/default.nix
index a114d2400aa7..974f7ac4d1c6 100644
--- a/nixpkgs/pkgs/development/python-modules/rawkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rawkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, fetchpatch
+{ lib, stdenv, fetchPypi, buildPythonPackage, fetchpatch
 , libraw
 , pytest, mock }:
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CTypes based LibRaw bindings for Python";
     homepage = "https://rawkit.readthedocs.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rbtools/default.nix b/nixpkgs/pkgs/development/python-modules/rbtools/default.nix
index 477a11f2ce90..1c99ee0fc8df 100644
--- a/nixpkgs/pkgs/development/python-modules/rbtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rbtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPy3k
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   disabled = !isPy3k;
 
   src = fetchurl {
-    url = "https://downloads.reviewboard.org/releases/RBTools/${stdenv.lib.versions.majorMinor version}/RBTools-${version}.tar.gz";
+    url = "https://downloads.reviewboard.org/releases/RBTools/${lib.versions.majorMinor version}/RBTools-${version}.tar.gz";
     sha256 = "577c2f8bbf88f77bda84ee95af0310b59111c156f48a5aab56ca481e2f77eaf4";
   };
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # The kgb test dependency is not in nixpkgs
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.reviewboard.org/docs/rbtools/dev/";
     description = "RBTools is a set of command line tools for working with Review Board and RBCommons";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix b/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix
index 30d5a3c0e278..507102222fe0 100644
--- a/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "rcssmin";
   version = "1.0.6";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # tests auto-discovery
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://opensource.perlig.de/rcssmin/";
     license = licenses.asl20;
     description = "CSS minifier written in pure python";
diff --git a/nixpkgs/pkgs/development/python-modules/readchar/default.nix b/nixpkgs/pkgs/development/python-modules/readchar/default.nix
index 1ed4539dca08..211f5d63a7dd 100644
--- a/nixpkgs/pkgs/development/python-modules/readchar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/readchar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }:
 
 buildPythonPackage rec {
   pname = "readchar";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ flake8 ];
   checkInputs = [ pytest pytestcov pexpect ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/magmax/python-readchar";
     description = "Python library to read characters and key strokes";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/readme/default.nix b/nixpkgs/pkgs/development/python-modules/readme/default.nix
index 057283babe7b..044c487eb037 100644
--- a/nixpkgs/pkgs/development/python-modules/readme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/readme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   # package is not readme_renderer
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Readme is a library for rendering readme descriptions for Warehouse";
     homepage = "https://github.com/pypa/readme";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/rebulk/default.nix b/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
index f1591e4df741..750efe357c22 100644
--- a/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}:
 
 buildPythonPackage rec {
   pname = "rebulk";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   buildInputs = [ pytest pytestrunner ];
   propagatedBuildInputs = [ six regex ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Toilal/rebulk/";
     license = licenses.mit;
     description = "Advanced string matching from simple patterns";
diff --git a/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix b/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix
index bcb6741bb295..08e7ff47aa1c 100644
--- a/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A CAPTCHA for Python using the reCAPTCHA service";
     homepage = "http://recaptcha.net/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rednose/default.nix b/nixpkgs/pkgs/development/python-modules/rednose/default.nix
index 948fe39dae7d..73b7f5d4758e 100644
--- a/nixpkgs/pkgs/development/python-modules/rednose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rednose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
 , nose, six, colorama, termstyle }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   checkInputs = [ six ];
   propagatedBuildInputs = [ nose colorama termstyle ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python nose plugin adding color to console results";
     homepage = "https://github.com/JBKahn/rednose";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix b/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix
index 2a22907ebe6c..c87a89b82a44 100644
--- a/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }:
 
 buildPythonPackage rec {
   pname = "reedsolo";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
   checkPhase = "nosetests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure-python universal errors-and-erasures Reed-Solomon Codec";
     homepage = "https://github.com/tomerfiliba/reedsolomon";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/python-modules/reikna/default.nix b/nixpkgs/pkgs/development/python-modules/reikna/default.nix
index ebe3dc772d72..896bc8e02f09 100644
--- a/nixpkgs/pkgs/development/python-modules/reikna/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/reikna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , sphinx
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   checkInputs = [ sphinx pytestcov pytest ];
 
   propagatedBuildInputs = [ Mako numpy funcsigs ]
-    ++ stdenv.lib.optional withCuda pycuda
-    ++ stdenv.lib.optional withOpenCL pyopencl;
+    ++ lib.optional withCuda pycuda
+    ++ lib.optional withOpenCL pyopencl;
 
   checkPhase = ''
     py.test
@@ -33,11 +33,11 @@ buildPythonPackage rec {
   # Requires device
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "GPGPU algorithms for PyCUDA and PyOpenCL";
     homepage = "https://github.com/fjarri/reikna";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.fridh ];
+    license = licenses.mit;
+    maintainers = [ maintainers.fridh ];
 
   };
 
diff --git a/nixpkgs/pkgs/development/python-modules/remotecv/default.nix b/nixpkgs/pkgs/development/python-modules/remotecv/default.nix
index 9ab250f78afb..dc40763f6fe6 100644
--- a/nixpkgs/pkgs/development/python-modules/remotecv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/remotecv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose
 , preggy, numpy, yanc, nose-focus, mock, opencv }:
 
 buildPythonPackage rec {
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     nosetests --with-yanc -s tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCV worker for facial and feature recognition";
     homepage = "https://github.com/thumbor/remotecv/wiki";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rencode/default.nix b/nixpkgs/pkgs/development/python-modules/rencode/default.nix
index 3240c524d3bd..a8f0f81ee71d 100644
--- a/nixpkgs/pkgs/development/python-modules/rencode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rencode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , cython
@@ -16,7 +16,7 @@ buildPythonPackage {
 
   buildInputs = [ cython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/aresch/rencode";
     description = "Fast (basic) object serialization similar to bencode";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix b/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix
index c5c2e43b6573..a9355cda41ca 100644
--- a/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , unittest2
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   buildInputs = [ unittest2 ];
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A quick unittest-compatible framework for repeating a test function over many fixtures";
     homepage = "https://github.com/epsy/repeated_test";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/repocheck/default.nix b/nixpkgs/pkgs/development/python-modules/repocheck/default.nix
index 88437ae90327..ad8c3aef2eac 100644
--- a/nixpkgs/pkgs/development/python-modules/repocheck/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repocheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "kynikos";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Check the status of code repositories under a root directory";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix
index afaac0b35f3e..7b8f0ecd8091 100644
--- a/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db80aff77";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tiny LRU cache implementation and decorator";
     homepage = "http://www.repoze.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
index 0cc55ef7fea5..53761203113d 100644
--- a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_interface
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_interface sphinx ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/repoze/repoze.sphinx.autointerface";
     description = "Auto-generate Sphinx API docs from Zope interfaces";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix
index 7f4a89f3d24e..f64158f26a10 100644
--- a/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_interface
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_interface webob ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WSGI Authentication Middleware / API";
     homepage = "http://www.repoze.org";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
index 4042197e1c31..2b3d57831c8d 100644
--- a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , mock, requests, six, urllib3 }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   buildInputs = [ mock ];
   propagatedBuildInputs = [ requests six urllib3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Persistent cache for requests library";
     homepage = "https://pypi.python.org/pypi/requests-cache";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix b/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix
index 992c54930ca6..cd36a4528198 100644
--- a/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , requests
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     ${python.interpreter} test/test.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Requests auth module for HTTP Signature";
     homepage = "https://github.com/kislyuk/requests-http-signature";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix b/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix
index ab0758a84e16..a1c6f4fb0a1b 100644
--- a/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }:
 
 buildPythonPackage rec {
   pname = "requests-kerberos";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # they have a setup.py which mentions a test suite that doesn't exist...
   patches = [ ./fix_setup.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An authentication handler for using Kerberos with Python Requests.";
     homepage    = "https://github.com/requests/requests-kerberos";
     license     = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix
index c4394fa87cdf..aed6576c90df 100644
--- a/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix
@@ -1,21 +1,43 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, oauthlib, requests }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mock
+, oauthlib
+, pytestCheckHook
+, requests
+, requests-mock
+}:
 
 buildPythonPackage rec {
-  version = "1.3.0";
   pname = "requests-oauthlib";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml";
   };
 
-  doCheck = false;        # Internet tests fail when building in chroot
   propagatedBuildInputs = [ oauthlib requests ];
 
-  meta = with stdenv.lib; {
+  checkInputs = [
+    mock
+    pytestCheckHook
+    requests-mock
+  ];
+
+  # Exclude tests which require network access
+  disabledTests = [
+    "testCanPostBinaryData"
+    "test_content_type_override"
+    "test_url_is_native_str"
+  ];
+
+  pythonImportsCheck = [ "requests_oauthlib" ];
+
+  meta = with lib; {
     description = "OAuthlib authentication support for Requests";
     homepage = "https://github.com/requests/requests-oauthlib";
+    license = with licenses; [ isc ];
     maintainers = with maintainers; [ prikhi ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/requests/default.nix b/nixpkgs/pkgs/development/python-modules/requests/default.nix
index 47431274b2c6..a49b07102201 100644
--- a/nixpkgs/pkgs/development/python-modules/requests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , urllib3, idna, chardet, certifi
 , pytest }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # sadly, tests require networking
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An Apache2 licensed HTTP library, written in Python, for human beings";
     homepage = "http://docs.python-requests.org/en/latest/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/resampy/default.nix b/nixpkgs/pkgs/development/python-modules/resampy/default.nix
index 43088cf5122e..38b4ae9911d2 100644
--- a/nixpkgs/pkgs/development/python-modules/resampy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/resampy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     pytest tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bmcfee/resampy";
     description = "Efficient signal resampling";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/respx/default.nix b/nixpkgs/pkgs/development/python-modules/respx/default.nix
new file mode 100644
index 000000000000..61e2016a4975
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/respx/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, httpcore
+, httpx
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+, trio
+, xmltodict
+}:
+
+buildPythonPackage rec {
+  pname = "respx";
+  version = "0.16.3";
+
+  src = fetchFromGitHub {
+    owner = "lundberg";
+    repo = pname;
+    rev = version;
+    sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd";
+  };
+
+  # Coverage is under 100 % due to the excluded tests
+  postPatch = ''
+    substituteInPlace setup.cfg --replace "--cov-fail-under 100" ""
+  '';
+
+  propagatedBuildInputs = [ httpx ];
+
+  checkInputs = [
+    httpcore
+    httpx
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+    trio
+  ];
+
+  disabledTests = [ "test_pass_through" ];
+  pythonImportsCheck = [ "respx" ];
+
+  meta = with lib; {
+    description = "Python library for mocking HTTPX";
+    homepage = "https://lundberg.github.io/respx/";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
index 616cabc29a01..b35900233736 100644
--- a/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "rethinkdb" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python driver library for the RethinkDB database server";
     homepage = "https://pypi.python.org/pypi/rethinkdb";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix b/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix
index c1e495f56a99..12ba4f9a1a5b 100644
--- a/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "e1e8ad02e518fe11073f2ea7d80b6b8be19daa27a60a1838aff7c731ddcf2ebe";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pnpnpn/retry-decorator";
     description = "Retry Decorator for python functions";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/retrying/default.nix b/nixpkgs/pkgs/development/python-modules/retrying/default.nix
index 75a17fb6dc44..65127d040f42 100644
--- a/nixpkgs/pkgs/development/python-modules/retrying/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/retrying/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # doesn't ship tests in tarball
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rholder/retrying";
     description = "General-purpose retrying library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix
index 7eb79d1b251c..c002f0baaa9d 100644
--- a/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchPypi, isPy3k }:
+{ lib, stdenv, buildPythonApplication, fetchPypi, isPy3k }:
 
 buildPythonApplication rec {
   pname = "rfc-bibtex";
@@ -11,7 +11,7 @@ buildPythonApplication rec {
 
   disabled = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/iluxonchik/rfc-bibtex/";
     description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix
index 3af6d2f022be..561bda08d0cd 100644
--- a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi,
-  pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, idna, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "rfc3986";
@@ -10,14 +9,14 @@ buildPythonPackage rec {
     sha256 = "17dvx15m3r49bmif5zlli8kzjd6bys6psixzbp14sd5367d9h8qi";
   };
 
-  checkInputs = [ pytest ];
-  checkPhase = ''
-    pytest
-  '';
+  propagatedBuildInputs = [ idna ];
 
-  meta = with stdenv.lib; {
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Validating URI References per RFC 3986";
     homepage = "https://rfc3986.readthedocs.org";
     license = licenses.asl20;
-    description = "Validating URI References per RFC 3986";
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix
index 6488dfdd8ce5..1ec8fc2153c1 100644
--- a/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "rfc3987";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   };
 
   doCheck = false;
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/rfc3987";
     license = licenses.gpl3Plus;
     description = "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)";
diff --git a/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix b/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
index 0bd7b0ca686c..4e47915bdf76 100644
--- a/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonPackages }:
+{ lib, buildPythonPackage, fetchPypi, pythonPackages }:
 
 buildPythonPackage rec {
   pname = "rfc6555";
@@ -19,10 +19,10 @@ buildPythonPackage rec {
     py.test tests/
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Python implementation of the Happy Eyeballs Algorithm";
     homepage = "https://pypi.org/project/rfc6555";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ endocrimes ];
+    license = licenses.asl20;
+    maintainers = with maintainers; [ endocrimes ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/rich/default.nix b/nixpkgs/pkgs/development/python-modules/rich/default.nix
index 6284ed7b649a..d19f47281cdc 100644
--- a/nixpkgs/pkgs/development/python-modules/rich/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rich/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
@@ -32,12 +32,12 @@ buildPythonPackage rec {
     ipywidgets
     pygments
     typing-extensions
-  ] ++ stdenv.lib.optional (pythonOlder "3.7") dataclasses;
+  ] ++ lib.optional (pythonOlder "3.7") dataclasses;
 
   checkInputs = [ pytestCheckHook ];
   pythonImportsCheck = [ "rich" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal";
     homepage = "https://github.com/willmcgugan/rich";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
index 49520b1ee452..7ca9d711739a 100644
--- a/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "rjsmin";
   version = "1.1.0";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # tests auto-discovery
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://opensource.perlig.de/rjsmin/";
     license = licenses.asl20;
     description = "Javascript minifier written in python";
diff --git a/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix b/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix
index e9efb0c02b4e..0ac5d9ab2a3b 100644
--- a/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix
@@ -89,7 +89,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5"; # minimum required version
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Enables easy experimentation with state of the art Reinforcement Learning algorithms";
     homepage = "https://nervanasystems.github.io/coach/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robomachine/default.nix b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix
index 11fff472e98a..fe069be459cc 100644
--- a/nixpkgs/pkgs/development/python-modules/robomachine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }:
 
 buildPythonPackage rec {
   pname = "RoboMachine";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "argparse" ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Test data generator for Robot Framework";
     homepage = "https://github.com/mkorpela/RoboMachine";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/roboschool/default.nix b/nixpkgs/pkgs/development/python-modules/roboschool/default.nix
index 9387f3775beb..3e15f18a3dd1 100644
--- a/nixpkgs/pkgs/development/python-modules/roboschool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/roboschool/default.nix
@@ -9,7 +9,7 @@
 , assimp
 , gym
 , bullet-roboschool
-, pkgconfig
+, pkg-config
 , which
 }:
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     qtbase # needs the `moc` tool
     which
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix
index 5cf864cd8019..3cf064d2669d 100644
--- a/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "robot-detection";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # no tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for detecting if a HTTP User Agent header is likely to be a bot";
     homepage = "https://github.com/rory/robot-detection";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
index 73b538aa12f7..c3eb309dfe0b 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , robotframework
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ robotframework ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database Library contains utilities meant for Robot Framework";
     homepage = "https://github.com/franz-see/Robotframework-Database-Library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
index 0a22dc1eec6c..967138620e98 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , unittest2
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   buildInputs = [ unittest2 ];
   propagatedBuildInputs = [ robotframework lxml requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Robot Framework keyword library wrapper around the HTTP client library requests";
     homepage = "https://github.com/bulkan/robotframework-requests";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix
index 368c4e4c15ad..39e42596e2ae 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }:
+{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }:
 
 buildPythonPackage rec {
   version = "1.2.3";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Light-weight and intuitive editor for Robot Framework test case files";
     homepage = "https://code.google.com/p/robotframework-ride/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix
index 14ce2db5d0b2..5fa87d17d11f 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }:
 
 buildPythonPackage rec {
   version = "3.0.0";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ robotframework-seleniumlibrary ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Web testing library for Robot Framework";
     homepage = "https://github.com/robotframework/Selenium2Library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index 2bba9cfbdd8a..60123d6b87d1 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
 
 buildPythonPackage rec {
   version = "3.3.1";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     ${python.interpreter} utest/run.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Web testing library for Robot Framework";
     homepage = "https://github.com/robotframework/SeleniumLibrary";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index e5e2d022dc8a..7e3bcbcc55da 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , robotframework
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ robotframework paramiko scp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SSHLibrary is a Robot Framework test library for SSH and SFTP";
     homepage = "https://github.com/robotframework/SSHLibrary";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix
index 0ed0bcaf4948..5bc7bbceae71 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     pytest test --ignore test/remote/test_remote.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Tools for Robot Framework and Test Libraries";
     homepage = "https://bitbucket.org/userzimmermann/robotframework-tools";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
index 1a3b55451537..953602ca1ada 100644
--- a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "robotframework";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic test automation framework";
     homepage = "https://robotframework.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix
index c5094b4ee59d..b0bd44f9c152 100644
--- a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }:
 
 buildPythonPackage rec {
   version = "1.3";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     ${python.interpreter} test/run.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for checking that Robot Framework test cases have expected statuses and log messages";
     homepage = "https://github.com/robotframework/statuschecker";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix b/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix
index e9d4ddbed116..126153ec50e5 100644
--- a/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , unittest2, lxml, robotframework
 }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
       --replace robotframework-python3 robotframework
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python unittest test suite for Robot Framework";
     homepage = "https://github.com/collective/robotsuite/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/roku/default.nix b/nixpkgs/pkgs/development/python-modules/roku/default.nix
index 6cdfa2aa15b1..5e3644468fe8 100644
--- a/nixpkgs/pkgs/development/python-modules/roku/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/roku/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27
 }:
 
 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest flask ];
   pythonImportsCheck = [ "roku" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Screw remotes. Control your Roku with Python.";
     homepage = "https://github.com/jcarbaugh/python-roku";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/roman/default.nix b/nixpkgs/pkgs/development/python-modules/roman/default.nix
index 52d45d728752..33f0f7f18d7d 100644
--- a/nixpkgs/pkgs/development/python-modules/roman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/roman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Integer to Roman numerals converter";
     homepage = "https://pypi.python.org/pypi/roman";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/roombapy/default.nix b/nixpkgs/pkgs/development/python-modules/roombapy/default.nix
new file mode 100644
index 000000000000..9c438bde7562
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/roombapy/default.nix
@@ -0,0 +1,37 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, hbmqtt
+, lib
+, paho-mqtt
+, poetry
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "roombapy";
+  version = "1.6.2-1";
+
+  src = fetchFromGitHub {
+    owner = "pschmitt";
+    repo = "roombapy";
+    rev = version;
+    sha256 = "14k7bys479xwpa4alpdwphzmxm3x8kc48nfqnshn1wj94vyxc425";
+  };
+
+  format = "pyproject";
+
+  nativeBuildInputs = [ poetry ];
+  propagatedBuildInputs = [ paho-mqtt ];
+
+  checkInputs = [ hbmqtt pytest-asyncio pytestCheckHook ];
+  pytestFlagsArray = [ "tests/" "--ignore=tests/test_discovery.py" ];
+  pythonImportsCheck = [ "roombapy" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/pschmitt/roombapy";
+    description = "Python program and library to control Wi-Fi enabled iRobot Roombas";
+    maintainers = with maintainers; [ justinas ];
+    license = licenses.mit;
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix
index 81e306f81db2..65edd602d8de 100644
--- a/nixpkgs/pkgs/development/python-modules/rope/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }:
 
 buildPythonPackage rec {
   pname = "rope";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python refactoring library";
     homepage = "https://github.com/python-rope/rope";
     maintainers = with maintainers; [ goibhniu ];
diff --git a/nixpkgs/pkgs/development/python-modules/ropper/default.nix b/nixpkgs/pkgs/development/python-modules/ropper/default.nix
index 51fc191dd467..8b193caa7b8b 100644
--- a/nixpkgs/pkgs/development/python-modules/ropper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ropper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonApplication
 , fetchPypi
 , capstone
@@ -23,7 +23,7 @@ buildPythonApplication rec {
 
   checkInputs = [pytest];
   propagatedBuildInputs = [ capstone filebytes ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://scoding.de/ropper/";
     license = licenses.bsd3;
     description = "Show information about files in different file formats";
diff --git a/nixpkgs/pkgs/development/python-modules/routes/default.nix b/nixpkgs/pkgs/development/python-modules/routes/default.nix
index 95eebe8ab69d..0129ef69e2c6 100644
--- a/nixpkgs/pkgs/development/python-modules/routes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/routes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , repoze_lru
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "routes" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions";
     homepage = "http://routes.groovie.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rpdb/default.nix b/nixpkgs/pkgs/development/python-modules/rpdb/default.nix
index d7faeeaed7c9..fb84adb7d240 100644
--- a/nixpkgs/pkgs/development/python-modules/rpdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "5d1a1cee34378ab075879dc30fa6328d448a9f680a66c4e84cac7382ad92f15f";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "pdb wrapper with remote access via tcp socket";
     homepage = "https://github.com/tamentis/rpdb";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/rpkg/default.nix b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix
index 2be6830130dc..731a5738e73e 100644
--- a/nixpkgs/pkgs/development/python-modules/rpkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils
 , koji, rpmfluff }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = false; # needs /var/lib/rpm database to run tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python library for dealing with rpm packaging";
     homepage = "https://pagure.io/fedpkg";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/rply/default.nix b/nixpkgs/pkgs/development/python-modules/rply/default.nix
index 1c4fd16eedf6..0da9d2b71018 100644
--- a/nixpkgs/pkgs/development/python-modules/rply/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rply/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }:
+{ lib, stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }:
 
 buildPythonPackage rec {
   pname = "rply";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     HOME=$(mktemp -d) py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python Lex/Yacc that works with RPython";
     homepage = "https://github.com/alex/rply";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix
index 1893f7dd19c3..96050ba14b01 100644
--- a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , glibcLocales
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   LC_ALL="en_US.utf-8";
   buildInputs = [ glibcLocales ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "lightweight way of building RPMs, and sabotaging them";
     homepage = "https://pagure.io/rpmfluff";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
index 055341dfd1d3..0b042288fb75 100644
--- a/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , python
 , buildPythonPackage
 , fetchpatch
@@ -20,30 +21,37 @@
 , cffi
 , tzlocal
 , simplegeneric
-, pytest
+, pytestCheckHook
 , extraRPackages ? []
 }:
 
 buildPythonPackage rec {
-    version = "3.3.6";
+    version = "3.4.1";
     pname = "rpy2";
 
     disabled = isPyPy;
     src = fetchPypi {
       inherit version pname;
-      sha256 = "0xvfkxvh01r5ibd5mpisp8bz385hgpn27b988y8v65z7hqr3y1nf";
+      sha256 = "1qnjjlgh6i31z45jykwd29n1336gq678fn9zw7gh0rv5d6sn0hv4";
     };
 
+    patches = [
+      # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
+      # This patch sets R_LIBS_SITE when rpy2 is imported.
+      ./rpy2-3.x-r-libs-site.patch
+    ];
+
+    postPatch = ''
+      substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
+      substituteInPlace 'requirements.txt' --replace 'pytest' ""
+    '';
+
     buildInputs = [
-      R
       pcre
       lzma
       bzip2
       zlib
       icu
-
-      # is in the upstream `requires` although it shouldn't be -- this is easier than patching it away
-      pytest
     ] ++ (with rPackages; [
       # packages expected by the test framework
       ggplot2
@@ -58,23 +66,10 @@ buildPythonPackage rec {
       tidyr
     ]) ++ extraRPackages ++ rWrapper.recommendedPackages;
 
-    checkPhase = ''
-      pytest
-    '';
-
     nativeBuildInputs = [
       R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
     ];
 
-    patches = [
-      # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
-      # This patch sets R_LIBS_SITE when rpy2 is imported.
-      ./rpy2-3.x-r-libs-site.patch
-    ];
-    postPatch = ''
-      substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
-    '';
-
     propagatedBuildInputs = [
       ipython
       jinja2
@@ -86,8 +81,10 @@ buildPythonPackage rec {
       simplegeneric
     ];
 
+    doCheck = !stdenv.isDarwin;
+
     checkInputs = [
-      pytest
+      pytestCheckHook
     ];
 
     meta = {
diff --git a/nixpkgs/pkgs/development/python-modules/rpyc/default.nix b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix
index 5b6dba0f9ed0..e549a00c8948 100644
--- a/nixpkgs/pkgs/development/python-modules/rpyc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix
@@ -1,34 +1,38 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , nose
 , plumbum
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "rpyc";
-  version = "4.1.3";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = pname;
     rev = version;
-    sha256 = "145mi8p37x9cbfm5117g4ng7b5rmghjjwgm319qqhwgzvqg3y4j9";
+    sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1";
   };
 
   propagatedBuildInputs = [ plumbum ];
 
-  checkInputs = [ nose ];
-  checkPhase = ''
-    cd tests
-    # some tests have added complexities and some tests attempt network use
-    nosetests -I test_deploy -I test_gevent_server -I test_ssh -I test_registry
-  '';
+  checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  # Disable tests that requires network access
+  disabledTests = [
+    "test_api"
+    "test_pruning"
+    "test_rpyc"
+  ];
+  pythonImportsCheck = [ "rpyc" ];
+
+  meta = with lib; {
     description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
     homepage = "https://rpyc.readthedocs.org";
-    license = licenses.mit;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/rq/default.nix b/nixpkgs/pkgs/development/python-modules/rq/default.nix
index c788d4164102..c9ca5977cb10 100644
--- a/nixpkgs/pkgs/development/python-modules/rq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }:
 
 buildPythonPackage rec {
   pname = "rq";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ click redis ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple, lightweight library for creating background jobs, and processing them";
     homepage = "https://github.com/nvie/rq/";
     maintainers = with maintainers; [ mrmebelman ];
diff --git a/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix b/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix
index 459ca0437968..8400647aaad6 100644
--- a/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix
+++ b/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , unittest2
@@ -20,11 +20,11 @@ buildPythonPackage rec {
   checkInputs = [ unittest2 mock ];
   propagatedBuildInputs = [ pyasn1 ];
 
-  preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") ''
+  preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") ''
     substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://stuvel.eu/rsa";
     license = licenses.asl20;
     description = "A pure-Python RSA implementation";
diff --git a/nixpkgs/pkgs/development/python-modules/rsa/default.nix b/nixpkgs/pkgs/development/python-modules/rsa/default.nix
index a5380709eda9..b688369beb56 100644
--- a/nixpkgs/pkgs/development/python-modules/rsa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rsa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , unittest2
@@ -21,14 +21,14 @@ buildPythonPackage rec {
   checkInputs = [ unittest2 mock ];
   propagatedBuildInputs = [ pyasn1 ];
 
-  preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") ''
+  preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") ''
     substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
   '';
 
   # No tests in archive
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://stuvel.eu/rsa";
     license = licenses.asl20;
     description = "A pure-Python RSA implementation";
diff --git a/nixpkgs/pkgs/development/python-modules/rtslib/default.nix b/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
index aaf879d2a3f4..e53756b0181a 100644
--- a/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }:
 
 buildPythonPackage rec {
   pname = "rtslib";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six pyudev pygobject3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python object API for managing the Linux LIO kernel target";
     homepage = "https://github.com/open-iscsi/rtslib-fb";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix
index f7e473f9f561..950f523f4a9a 100644
--- a/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common routines for ruamel packages";
     homepage = "https://sourceforge.net/projects/ruamel-base/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
index 7f05229a4f54..1e5820a37f73 100644
--- a/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A version of dict that keeps keys in insertion resp. sorted order";
     homepage = "https://sourceforge.net/projects/ruamel-ordereddict/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
index 46b55c04d30e..debf2aaf7747 100644
--- a/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchhg
 , ruamel_base
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # outputs match wheel
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix b/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
index 6115702009ac..edb793c19d51 100644
--- a/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:
 
 buildPythonPackage rec {
   pname = "rubymarshal";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "rubymarshal" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/d9pouces/RubyMarshal/";
     description = "Read and write Ruby-marshalled data";
     license = licenses.wtfpl;
diff --git a/nixpkgs/pkgs/development/python-modules/ruffus/default.nix b/nixpkgs/pkgs/development/python-modules/ruffus/default.nix
index da905f7ab477..a425c077343f 100644
--- a/nixpkgs/pkgs/development/python-modules/ruffus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruffus/default.nix
@@ -4,7 +4,7 @@
 , hostname
 , pytest
 , python
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   '';
   pythonImportsCheck = [ "ruffus" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Light-weight Python Computational Pipeline Management";
     homepage = "http://www.ruffus.org.uk";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix b/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix
index 6d601197d76e..1475b0032313 100644
--- a/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , squaremap
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ squaremap wxPython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GUI Viewer for Python profiling runs";
     homepage = "http://www.vrplumber.com/programming/runsnakerun/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
index 739b32ec70d1..0154059c4f7b 100644
--- a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }:
 
 buildPythonPackage rec {
   pname = "s3fs";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # pythonPackages.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3.";
     homepage = "https://github.com/dask/s3fs/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
index 27551a798d7b..6f816fc9bb89 100644
--- a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , fetchPypi
 , pythonOlder
 , buildPythonPackage
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [ botocore
-    ] ++ stdenv.lib.optional (pythonOlder "3") futures;
+    ] ++ lib.optional (pythonOlder "3") futures;
 
   buildInputs = [
     docutils
@@ -43,9 +43,9 @@ buildPythonPackage rec {
   # version on pypi has no tests/ dir
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/boto/s3transfer";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     description = "A library for managing Amazon S3 transfers";
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix b/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
index f5c0ee715c3a..9f97757edad4 100644
--- a/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, stdenv
+, lib, stdenv
 , fetchFromGitHub
 , click
 , six
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     pytest -k 'not truecase'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/alvations/sacremoses";
     description = "Python port of Moses tokenizer, truecaser and normalizer";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/safe/default.nix b/nixpkgs/pkgs/development/python-modules/safe/default.nix
index f7f6f7eabf91..d167760c3e0e 100644
--- a/nixpkgs/pkgs/development/python-modules/safe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/safe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lepture/safe";
     license = licenses.bsd3;
     description = "Check password strength";
diff --git a/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix b/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
index a33bec431d68..5e6aa5927eca 100644
--- a/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd
+{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd
 , python-daemon, six, jinja2, mock, click }:
 
 buildPythonPackage rec {
@@ -20,10 +20,12 @@ buildPythonPackage rec {
   # The tests use salmon executable installed by salmon itself so we need to add
   # that to PATH
   checkPhase = ''
+    # tests fail and pytest is not supported
+    rm tests/server_tests.py
     PATH=$out/bin:$PATH python setup.py test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://salmon-mail.readthedocs.org/";
     description = "Pythonic mail application server";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix
index 02278d9be415..a4a19f7ad12e 100644
--- a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , numpy
 , pkgs
@@ -27,7 +27,7 @@ buildPythonPackage {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cournape/samplerate";
     description = "High quality sampling rate convertion from audio data in numpy arrays";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix b/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix
index b41935c58256..3a12568c4d6d 100644
--- a/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix
@@ -5,18 +5,14 @@
 
 buildPythonPackage rec {
   pname = "samsungtvws";
-  version = "1.5.3";
+  version = "1.6.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n";
+    sha256 = "09nls4n0lbnr8nj8105lagr9h2my8lb1s2k285kmsbli36ywd8lj";
   };
 
-  patchPhase = ''
-    substituteInPlace setup.py --replace "websocket-client==" "websocket-client>="
-  '';
-
   propagatedBuildInputs = [
     websocket_client
     requests
diff --git a/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix b/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix
index 541bd8108714..42872e318916 100644
--- a/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pbr
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pbr ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sandboxing Library for Python";
     homepage = "https://pypi.python.org/pypi/sandboxlib/0.3.1";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/sane/default.nix b/nixpkgs/pkgs/development/python-modules/sane/default.nix
index 2359ff0aa7fe..d45c736d8d03 100644
--- a/nixpkgs/pkgs/development/python-modules/sane/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sane/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "sane";
-  version = "2.8.2";
+  version = "2.9.1";
 
   src = fetchPypi {
     inherit version;
     pname = "python-sane";
-    sha256 = "0sri01h9sld6w7vgfhwp29n5w19g6idz01ba2giwnkd99k1y2iqg";
+    sha256 = "JAmOuDxujhsBEm5q16WwR5wHsBPF0iBQm1VYkv5JJd4=";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix b/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix
index 4642b69f7d2e..c78b6f13d152 100644
--- a/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix
@@ -1,21 +1,19 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, sanic }:
+{ lib, buildPythonPackage, fetchPypi, sanic, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "Sanic-Auth";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb";
+    sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198";
   };
 
   propagatedBuildInputs = [ sanic ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytestCheckHook ];
 
-  checkPhase = ''
-    pytest tests
-  '';
+  pythonImportsCheck = [ "sanic_auth" ];
 
   meta = with lib; {
     description = "Simple Authentication for Sanic";
diff --git a/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/nixpkgs/pkgs/development/python-modules/sanic/default.nix
index aaedaa5ef8c5..f503b0b85561 100644
--- a/nixpkgs/pkgs/development/python-modules/sanic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sanic/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
     "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution.
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "A microframework based on uvloop, httptools, and learnings of flask";
     homepage = "http://github.com/channelcat/sanic/";
diff --git a/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix
index 847acb3c9cd4..8a7a62d8ce84 100644
--- a/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:
+{ lib, stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:
 
 buildPythonPackage rec {
     pname = "sapi-python-client";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
     propagatedBuildInputs = [ setuptools requests boto3 responses ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
         description = "Keboola Connection Storage API client";
         homepage = "https://github.com/keboola/sapi-python-client";
         maintainers = with maintainers; [ mrmebelman ];
diff --git a/nixpkgs/pkgs/development/python-modules/scales/default.nix b/nixpkgs/pkgs/development/python-modules/scales/default.nix
index 0407c1fa86d8..5aae62972688 100644
--- a/nixpkgs/pkgs/development/python-modules/scales/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scales/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Stats for Python processes";
     homepage = "https://www.github.com/Cue/scales";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/schedule/default.nix b/nixpkgs/pkgs/development/python-modules/schedule/default.nix
index 118c95cc8c57..596ed993233e 100644
--- a/nixpkgs/pkgs/development/python-modules/schedule/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/schedule/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , mock
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python job scheduling for humans";
     homepage = "https://github.com/dbader/schedule";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/schema/default.nix b/nixpkgs/pkgs/development/python-modules/schema/default.nix
index 8dd89480074a..1502c7d10abe 100644
--- a/nixpkgs/pkgs/development/python-modules/schema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/schema/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }:
 
 buildPythonPackage rec {
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest mock ];
   checkPhase = "pytest ./test_schema.py";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for validating Python data structures";
     homepage = "https://github.com/keleshev/schema";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix
index 650a67709913..8fa0186498f4 100644
--- a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , cython
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m skbio.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://scikit-bio.org/";
     description = "Data structures, algorithms and educational resources for bioinformatics";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix
index 4d8e8d00f434..81915e83d2dc 100644
--- a/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , gfortran, glibcLocales
 , numpy, scipy, pytest, pillow
 }:
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of python modules for machine learning and data mining";
     homepage = "https://scikit-learn.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
index cffd29f09d3a..e7307c926320 100644
--- a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "0.23.2";
+  version = "0.24.1";
   # UnboundLocalError: local variable 'message' referenced before assignment
   disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480";
+    sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98=";
   };
 
   buildInputs = [
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of python modules for machine learning and data mining";
     changelog = let
       major = versions.major version;
diff --git a/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix
index d85d8e396f20..383cf1f70c68 100644
--- a/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy";
     homepage = "https://github.com/bmcage/odes";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 218415354db7..8d08e43bc713 100644
--- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix
@@ -9,11 +9,11 @@ let
   });
 in buildPythonPackage rec {
   pname = "scipy";
-  version = "1.5.4";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b";
+    sha256 = "0rh5b1rwdcvvagld8vpxnpaibszy1skpx39a0fwzd5gx5pwcjvfb";
   };
 
   checkInputs = [ nose pytest ];
@@ -37,8 +37,6 @@ in buildPythonPackage rec {
     ln -s ${numpy.cfg} site.cfg
   '';
 
-  enableParallelBuilding = true;
-
   checkPhase = ''
     runHook preCheck
     pushd dist
diff --git a/nixpkgs/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix
index a37927b9a641..f5cd96e71aaf 100644
--- a/nixpkgs/pkgs/development/python-modules/scp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , paramiko
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   #The Pypi package doesn't include the test
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jbardin/scp.py";
     description = "SCP module for paramiko";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix
index cf6f8a010714..900943a0e153 100644
--- a/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }:
+{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }:
 
 buildPythonPackage rec {
   pname = "scrapy-deltafetch";
@@ -11,9 +11,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ bsddb3 scrapy ];
 
-  checkInputs = [ pytest ];
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "scrapy_deltafetch" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls";
     homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index b2de4e9a993b..4f6eecfe9143 100644
--- a/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }:
 
 buildPythonPackage rec {
   pname = "scrapy-fake-useragent";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Random User-Agent middleware based on fake-useragent";
     homepage = "https://github.com/alecxe/scrapy-fake-useragent";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix
index 7799186d6216..ab00377f4a0e 100644
--- a/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }:
+{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, six }:
 
 buildPythonPackage rec {
   pname = "scrapy-splash";
@@ -9,9 +9,13 @@ buildPythonPackage rec {
     sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488";
   };
 
-  checkInputs = [ pytest hypothesis scrapy ];
+  propagatedBuildInputs = [ scrapy six ];
 
-  meta = with stdenv.lib; {
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "scrapy_splash" ];
+
+  meta = with lib; {
     description = "Scrapy+Splash for JavaScript integration";
     homepage = "https://github.com/scrapy-plugins/scrapy-splash";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
index c377ace69685..6887eded3bfd 100644
--- a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , isPy27
 , fetchPypi
@@ -79,7 +80,10 @@ buildPythonPackage rec {
     "test_retry_dns_error"
     "test_custom_asyncio_loop_enabled_true"
     "test_custom_loop_asyncio"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" ];
+  ] ++ lib.optionals stdenv.isDarwin [
+    "test_xmliter_encoding"
+    "test_download"
+  ];
 
   src = fetchPypi {
     inherit pname version;
@@ -92,7 +96,9 @@ buildPythonPackage rec {
     install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
   '';
 
-  meta = with stdenv.lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
     description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
     homepage = "https://scrapy.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
index 1b79a43af9c9..f71f8d0c263a 100644
--- a/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
+{ lib, stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
 
 buildPythonApplication rec {
   pname = "screeninfo";
@@ -23,11 +23,11 @@ buildPythonApplication rec {
       --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")"
   '';
 
-  propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses;
+  propagatedBuildInputs = lib.optional isPy36 dataclasses;
 
   buildInputs = [ libX11 libXinerama libXrandr];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fetch location and size of physical screens";
     homepage = "https://github.com/rr-/screeninfo";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/scripttest/default.nix b/nixpkgs/pkgs/development/python-modules/scripttest/default.nix
index ab53585fe8c2..ab234ce22434 100644
--- a/nixpkgs/pkgs/development/python-modules/scripttest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scripttest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Tests are not included. See https://github.com/pypa/scripttest/issues/11
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for testing interactive command-line applications";
     homepage = "https://pypi.python.org/pypi/ScriptTest/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix b/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix
index f1a7fc4d52c0..0003d9c01312 100644
--- a/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     inherit pname version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure Python implementation of systemd's service notification protocol";
     homepage = "https://github.com/bb4242/sdnotify";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix b/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix
index 7cf062765d3b..cc9594d04525 100644
--- a/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , pyusb
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   setupPyBuildFlags = [ "--without-cseabreeze" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ap--/python-seabreeze";
     description = "A python library to access Ocean Optics spectrometers";
     maintainers = [];
diff --git a/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
index 3cd6b2fe3ccd..78ddb269f3db 100644
--- a/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pkgconfig
+, pkg-config
 , pytest
 , pytestrunner
 , cffi
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   checkInputs = [ pytest pytestrunner ];
   propagatedBuildInputs = [ cffi secp256k1 ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/seekpath/default.nix b/nixpkgs/pkgs/development/python-modules/seekpath/default.nix
index e70ba02ce0e3..637b55eec8d7 100644
--- a/nixpkgs/pkgs/development/python-modules/seekpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/seekpath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }:
 
 buildPythonPackage rec {
   pname = "seekpath";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pytest . -k 'not oI2Y'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A module to obtain and visualize band paths in the Brillouin zone of crystal structures.";
     homepage = "https://github.com/giovannipizzi/seekpath";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/segments/default.nix b/nixpkgs/pkgs/development/python-modules/segments/default.nix
index 8c2e22708aab..00953a8e9090 100644
--- a/nixpkgs/pkgs/development/python-modules/segments/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/segments/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "segments";
-  version = "2.1.3";
+  version = "2.2.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "cldf";
     repo = pname;
     rev = "v${version}";
-    sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0";
+    sha256 = "04yc8q79zk09xj0wnal0vdg5azi9jlarfmf2iyljqyr80p79gwvv";
   };
 
   patchPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/selectors2/default.nix b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix
index c78f1811a069..ff6b81d3105d 100644
--- a/nixpkgs/pkgs/development/python-modules/selectors2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , nose, psutil, mock }:
 
 buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
       --exclude=test_above_fd_setsize
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.github.com/SethMichaelLarson/selectors2";
     description = "Back-ported, durable, and portable selectors";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix
index 6d02c9dc79b2..ea3b403fdaed 100644
--- a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A backport of the selectors module from Python 3.4";
     homepage = "https://github.com/berkerpeksag/selectors34";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/nixpkgs/pkgs/development/python-modules/selenium/default.nix
index b32dfe2653e4..664f84933ed7 100644
--- a/nixpkgs/pkgs/development/python-modules/selenium/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/selenium/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     geckodriver urllib3
   ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
     substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6"
     cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
diff --git a/nixpkgs/pkgs/development/python-modules/semantic/default.nix b/nixpkgs/pkgs/development/python-modules/semantic/default.nix
index f0371f860cf5..83e4879e1fdd 100644
--- a/nixpkgs/pkgs/development/python-modules/semantic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/semantic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # strange setuptools error (can not import semantic.test)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common Natural Language Processing Tasks for Python";
     homepage = "https://github.com/crm416/semantic";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/semver/default.nix b/nixpkgs/pkgs/development/python-modules/semver/default.nix
index 5aca34b52f11..71ec776db7c4 100644
--- a/nixpkgs/pkgs/development/python-modules/semver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/semver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , pytestCheckHook
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest
   checkInputs = [ pytestCheckHook pytestcov ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python package to work with Semantic Versioning (http://semver.org/)";
     homepage = "https://python-semver.readthedocs.io/en/latest/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
index 16528c976ac6..a91be0151119 100644
--- a/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   checkPhase = "HOME=$TMPDIR pytest";
   checkInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Send file to trash natively under macOS, Windows and Linux";
     homepage = "https://github.com/hsoft/send2trash";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
new file mode 100644
index 000000000000..77cd35938635
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flask
+, pytestCheckHook
+, python-http-client
+, pyyaml
+, starkbank-ecdsa
+, werkzeug
+}:
+
+buildPythonPackage rec {
+  pname = "sendgrid";
+  version = "6.5.0";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = "sendgrid-python";
+    rev = version;
+    sha256 = "14kqjdv49486ksc1s0m0hc4k5nf9vn1v1g489mpib01hiiqxjp1b";
+  };
+
+  propagatedBuildInputs = [
+    python-http-client
+    starkbank-ecdsa
+  ];
+
+  checkInputs = [
+    flask
+    pytestCheckHook
+    pyyaml
+    werkzeug
+  ];
+
+  # Exclude tests that require network access
+  pytestFlagsArray = [
+    "--ignore test/test_sendgrid.py"
+    "--ignore live_test.py"
+  ];
+
+  pythonImportsCheck = [ "sendgrid" ];
+
+  meta = with lib; {
+    description = "Python client for SendGrid";
+    homepage = "https://github.com/sendgrid/sendgrid-python";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix
index 430e61399b2f..dd324260f836 100644
--- a/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix
@@ -1,14 +1,14 @@
 { buildPythonPackage
 , stdenv
 , sentencepiece
-, pkgconfig
+, pkg-config
 }:
 
 buildPythonPackage rec {
   pname = "sentencepiece";
   inherit (sentencepiece) version src;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ sentencepiece.dev ];
 
   sourceRoot = "source/python";
diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
index 9df9453b2b4d..ea9bbc1f0c3f 100644
--- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -17,7 +17,7 @@
 , rq
 , sanic
 , sqlalchemy
-, stdenv
+, lib, stdenv
 , tornado
 , urllib3
 , trytond
@@ -38,16 +38,10 @@ buildPythonPackage rec {
 
   checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
     executing pure-eval asttokens ]
-  ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ];
+  ++ lib.optionals isPy3k [ celery pyramid sanic aiohttp ];
 
   propagatedBuildInputs = [ urllib3 certifi ];
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/getsentry/sentry-python";
-    description = "New Python SDK for Sentry.io";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ gebner ];
-  };
 
   # The Sentry tests need access to `/etc/protocols` (the tests call
   # `socket.getprotobyname('tcp')`, which reads from this file). Normally
@@ -57,5 +51,17 @@ buildPythonPackage rec {
     export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols
     export LD_PRELOAD=${libredirect}/lib/libredirect.so
   '';
+
   postCheck = "unset NIX_REDIRECTS LD_PRELOAD";
+
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "sentry_sdk" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/getsentry/sentry-python";
+    description = "New Python SDK for Sentry.io";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ gebner ];
+  };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix b/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix
index 94fd2d65d464..095b47db2bff 100644
--- a/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , lxml
 , pytest
 , text-unidecode
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/raphaelm/python-sepaxml/";
     description = "SEPA Direct Debit XML generation in python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
index b7fba9986002..ba4cdca0c636 100644
--- a/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils
+{ lib, stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils
 , blockdiag
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   #   ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/')
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";
     homepage = "http://blockdiag.com/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/serpent/default.nix b/nixpkgs/pkgs/development/python-modules/serpent/default.nix
index cfb734e54759..36840813b401 100644
--- a/nixpkgs/pkgs/development/python-modules/serpent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/serpent/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple serialization library based on ast.literal_eval";
     homepage = "https://github.com/irmen/Serpent";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix
index e8541da6cd45..fa212d6a4de5 100644
--- a/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     pymysqlsa umemcache WSGIProxy requests pybrowserid
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     broken = cornice.version != "0.17";
     description = "The SyncServer server software, as used by Firefox Sync";
     homepage = "https://github.com/mozilla-services/server-syncstorage";
diff --git a/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix b/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
index 473ef25e162e..a9c0e7fda893 100644
--- a/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # tries to compile programs with dependencies that aren't available
   pytestFlagsArray = [ "--ignore=tests/setproctitle_test.py" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows a process to change its title (as displayed by system tools such as ps and top)";
     homepage =  "https://github.com/dvarrazzo/py-setproctitle";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix
index 5c0b40b4af4e..18fae7b1610b 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pkgs.git ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Setuptools revision control system plugin for Git";
     homepage = "https://pypi.python.org/pypi/setuptools-git";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix
index fbe1528c4c3b..ba42c21ad360 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pylint }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pylint }:
 
 buildPythonPackage rec {
   pname = "setuptools-lint";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pylint ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Package to expose pylint as a lint command into setup.py";
     homepage = "https://github.com/johnnoone/setuptools-pylint";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
index 5125e166a0ce..2d9a4b17d40f 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ semantic-version setuptools toml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Setuptools plugin for Rust support";
     homepage = "https://github.com/PyO3/setuptools-rust";
     changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
index d2b464054969..d8558aaf83a7 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
 
 buildPythonPackage rec {
   pname = "setuptools-scm-git-archive";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "setuptools_scm_git_archive" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "setuptools_scm plugin for git archives";
     homepage = "https://github.com/Changaco/setuptools_scm_git_archive";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix b/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix
index c2f6eb230b47..7c7d6b01e408 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix
@@ -73,7 +73,7 @@ in buildPythonPackage rec {
   # Requires pytest, causing infinite recursion.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = "https://pypi.python.org/pypi/setuptools";
     license = with licenses; [ psfl zpl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
index 987c75ba5a03..12bbbb7d0e5b 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
@@ -73,7 +73,7 @@ in buildPythonPackage rec {
   # Requires pytest, causing infinite recursion.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = "https://pypi.python.org/pypi/setuptools";
     license = with licenses; [ psfl zpl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix
index fb527a1336d9..a766bb6c294f 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pip, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pip, pytest }:
 
 buildPythonPackage rec {
   pname = "setuptools_scm";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # Requires pytest, circular dependency
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/pypa/setuptools_scm/";
     description = "Handles managing your python package versions in scm metadata";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix
index 5e58f80985f5..f6358a831c9c 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , darcsver
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "name=PKG" "name=PKG, version='${version}'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Setuptools plugin for the Darcs version control system";
     homepage = "http://allmydata.org/trac/setuptools_darcs";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix b/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
index b393d0eb2003..1d29f77cf0f2 100644
--- a/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   # Couldn't get tests working
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit.";
     homepage = "https://github.com/rutsky/setuptools-trial";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix
index 1e282f9660a8..89f716d9be25 100644
--- a/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "S-expression parser for Python";
     homepage = "https://github.com/tkf/sexpdata";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/shap/default.nix b/nixpkgs/pkgs/development/python-modules/shap/default.nix
index deb6dcf2a21a..1ce9a879ee19 100644
--- a/nixpkgs/pkgs/development/python-modules/shap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -60,7 +60,7 @@ buildPythonPackage rec {
     "test_single_row_gradient_boosting_regressor"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A unified approach to explain the output of any machine learning model";
     homepage = "https://github.com/slundberg/shap";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/nixpkgs/pkgs/development/python-modules/shapely/default.nix
index e2b738c479e6..b5dd0be5445c 100644
--- a/nixpkgs/pkgs/development/python-modules/shapely/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shapely/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder
 , geos, pytest, cython
 , numpy
 }:
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     (substituteAll {
       src = ./library-paths.patch;
       libgeos_c = GEOS_LIBRARY_PATH;
-      libc = stdenv.lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
+      libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
     })
   ];
 
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Geometric objects, predicates, and operations";
     maintainers = with maintainers; [ knedlsepp ];
     homepage = "https://pypi.python.org/pypi/Shapely/";
diff --git a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
index 238d394ee11e..77a4b98f54c3 100644
--- a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 }:
 
 buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to Detect Surrounding Shell";
     homepage = "https://github.com/sarugaku/shellingham";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix
index 9b2062dbf6c6..b7508a8f6447 100644
--- a/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix
@@ -1,5 +1,5 @@
-{ buildPythonPackage, python, fetchurl, stdenv, pyside2,
-  cmake, qt5, llvmPackages }:
+{ buildPythonPackage, python, fetchurl, lib, stdenv, pyside2
+, cmake, qt5, llvmPackages }:
 
 stdenv.mkDerivation {
   pname = "shiboken2";
@@ -27,10 +27,11 @@ stdenv.mkDerivation {
     rm $out/bin/shiboken_tool.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generator for the PySide2 Qt bindings";
     license = with licenses; [ gpl2 lgpl21 ];
     homepage = "https://wiki.qt.io/Qt_for_Python";
     maintainers = with maintainers; [ gebner ];
+    broken = stdenv.isDarwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/shippai/default.nix b/nixpkgs/pkgs/development/python-modules/shippai/default.nix
index 1bae1c50fb66..8fd15b71a015 100644
--- a/nixpkgs/pkgs/development/python-modules/shippai/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shippai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "shippai";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "0r6iwvmay8ygn2m15pyjrk9am4mfpk7rkf0lcbcb15pnabixlyzj";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Use Rust failures as Python exceptions";
     homepage = "https://github.com/untitaker/shippai";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix b/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
index 4fec2a3f04c0..35401afa6e3e 100644
--- a/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   buildInputs = [pep8];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A generator library for concise, unambiguous and URL-safe UUIDs";
     homepage = "https://github.com/stochastic-technologies/shortuuid/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix
index abfe47bfc7a7..1499f1ce4bc8 100644
--- a/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "should-dsl";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # There are no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Should assertions in Python as clear and readable as possible";
     homepage = "http://www.should-dsl.info/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix
index 068ed9343117..9959f26036cf 100644
--- a/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pythonAtLeast
 , fetchPypi
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
   propagatedBuildInputs = [ forbiddenfruit ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python Assertion Helpers inspired by Shouldly";
     homepage =  "https://pypi.python.org/pypi/shouldbe/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/signedjson/default.nix b/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
index 69f7a93f509d..12614a3446bb 100644
--- a/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , canonicaljson
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.org/project/signedjson/";
     description = "Sign JSON with Ed25519 signatures";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/sigtools/default.nix b/nixpkgs/pkgs/development/python-modules/sigtools/default.nix
index 92a39e26da0e..0c11a2b6c561 100644
--- a/nixpkgs/pkgs/development/python-modules/sigtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sigtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , repeated_test
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities for working with 3.3's inspect.Signature objects.";
     homepage = "https://pypi.python.org/pypi/sigtools";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/simanneal/default.nix b/nixpkgs/pkgs/development/python-modules/simanneal/default.nix
index 5b084c399ba5..958f53be567d 100644
--- a/nixpkgs/pkgs/development/python-modules/simanneal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simanneal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   pname = "simanneal";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
   checkPhase = "pytest tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python implementation of the simulated annealing optimization technique";
     homepage = "https://github.com/perrygeo/simanneal";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix
index c80206813724..f8d579b6088d 100644
--- a/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage {
   pname = "simple-websocket-server";
@@ -12,7 +12,7 @@ buildPythonPackage {
 
   doCheck = false; # no tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python based websocket server that is simple and easy to use";
     homepage = "https://github.com/dpallot/simple-websocket-server/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/simpleai/default.nix b/nixpkgs/pkgs/development/python-modules/simpleai/default.nix
index c8d1a99326f9..0786ebfae6e4 100644
--- a/nixpkgs/pkgs/development/python-modules/simpleai/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simpleai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    #No tests in archive
    doCheck = false;
 
-   meta = with stdenv.lib; {
+   meta = with lib; {
      homepage = "https://github.com/simpleai-team/simpleai";
      description = "This lib implements many of the artificial intelligence algorithms described on the book 'Artificial Intelligence, a Modern Approach'";
      maintainers = with maintainers; [ NikolaMandic ];
diff --git a/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix
index 57f7df73c21d..ed86b48fc072 100644
--- a/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , nose
@@ -21,13 +21,13 @@ buildPythonPackage {
 
   checkInputs = [ nose mock ];
 
-  postPatch = stdenv.lib.optionalString isPy3k ''
+  postPatch = lib.optionalString isPy3k ''
     sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py
   '';
 
   checkPhase = "nosetests tests/test.py";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Memory-based naive bayesian text classifier";
     homepage = "https://github.com/hickeroar/simplebayes";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix b/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix
index d1117b3a9d89..6395f4af223d 100644
--- a/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   doCheck = false;  # weird error
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Parser Generator for Python";
     homepage = "https://pypi.python.org/pypi/SimpleParse";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sip/5.x.nix b/nixpkgs/pkgs/development/python-modules/sip/5.x.nix
new file mode 100644
index 000000000000..cebffd5765bd
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/sip/5.x.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage, packaging, toml }:
+
+buildPythonPackage rec {
+  pname = "sip";
+  version = "5.5.0";
+
+  src = fetchPypi {
+    pname = "sip";
+    inherit version;
+    sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
+  };
+
+  propagatedBuildInputs = [ packaging toml ];
+
+  # There aren't tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "sipbuild" ];
+
+  meta = with lib; {
+    description = "Creates C++ bindings for Python modules";
+    homepage    = "http://www.riverbankcomputing.co.uk/";
+    license     = licenses.gpl3Only;
+    maintainers = with maintainers; [ eduardosm ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix
index d7791fcf96cb..568ce67d1434 100644
--- a/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     export LD=$CC
   '';
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
   buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ];
   propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/skein/default.nix b/nixpkgs/pkgs/development/python-modules/skein/default.nix
index 32320c5042fc..40a179264273 100644
--- a/nixpkgs/pkgs/development/python-modules/skein/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/skein/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     ln -s ${skeinJar} skein/java/skein.jar
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://jcristharif.com/skein";
     description = "A tool and library for easily deploying applications on Apache YARN";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix
index e4a01778352a..36ec8b18ca7e 100644
--- a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:
 
 buildPythonPackage rec {
   pname = "sklearn-deap";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ${python.interpreter} test.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Use evolutionary algorithms instead of gridsearch in scikit-learn";
     homepage = "https://github.com/rsteca/sklearn-deap";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
index b2578d5dd63d..571398b783dc 100644
--- a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , aiohttp
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     responses
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API";
     homepage = "https://github.com/slackapi/python-slackclient";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix
index 426019fc8a97..e6d5e59a80e7 100644
--- a/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }:
 
 buildPythonPackage rec {
   pname = "sleekxmpp";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "d213c1de71d92505f95ced0460ee0f84fdc4ddcacb7d7dd343739ed4028e5569";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XMPP library for Python";
     license = licenses.mit;
     homepage = "http://sleekxmpp.com/";
diff --git a/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/nixpkgs/pkgs/development/python-modules/slicer/default.nix
index 8711055766c6..b5521f415d7b 100644
--- a/nixpkgs/pkgs/development/python-modules/slicer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slicer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook pandas pytorch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__";
     homepage = "https://github.com/interpretml/slicer";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
index 45d406f560e6..396692200039 100644
--- a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # run_tests.py not packaged with pypi release
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/soft-matter/slicerator";
     description = "A lazy-loading, fancy-sliceable iterable";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
index 19677a71eca3..deb12817a7bd 100644
--- a/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "slither-analyzer";
-  version = "0.6.14";
+  version = "0.7.0";
 
   disabled = pythonOlder "3.6";
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "79f5098d27c149ca9cce2b8008ed29e2e0c8cee8fa3414c7e5455cb73c90a9a8";
+    sha256 = "10r479xidgxvas4wb0z6injp59jrn7rfq8d7bxlcalc2dy4mawr0";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/development/python-modules/slob/default.nix b/nixpkgs/pkgs/development/python-modules/slob/default.nix
index 9e6ba2ff6350..a7520c62a62c 100644
--- a/nixpkgs/pkgs/development/python-modules/slob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slob/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
@@ -24,7 +24,7 @@ buildPythonPackage {
     ${python.interpreter} -m unittest slob
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/itkach/slob/";
     description = "Reference implementation of the slob (sorted list of blobs) format";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/slowaes/default.nix b/nixpkgs/pkgs/development/python-modules/slowaes/default.nix
index f9175e507b46..5d738fea57e0 100644
--- a/nixpkgs/pkgs/development/python-modules/slowaes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slowaes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   disabled = isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://code.google.com/p/slowaes/";
     description = "AES implemented in pure python";
     license = with licenses; [ asl20 ];
diff --git a/nixpkgs/pkgs/development/python-modules/smartdc/default.nix b/nixpkgs/pkgs/development/python-modules/smartdc/default.nix
index 2fe9926cab9a..0b36a7e9f6e7 100644
--- a/nixpkgs/pkgs/development/python-modules/smartdc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smartdc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests http_signature ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests";
     homepage = "https://github.com/atl/py-smartdc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/smartypants/default.nix b/nixpkgs/pkgs/development/python-modules/smartypants/default.nix
index 71ff2037de89..a497f3db413b 100644
--- a/nixpkgs/pkgs/development/python-modules/smartypants/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smartypants/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchhg
 , isPyPy
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "1cmzz44d2hm6y8jj2xcq1wfr26760gi7iq92ha8xbhb1axzd7nq6";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python with the SmartyPants";
     homepage = "https://bitbucket.org/livibetter/smartypants.py";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix b/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix
index b762730914b5..6715cfd60d95 100644
--- a/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix
@@ -42,5 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bivab/smbus-cffi";
     license = licenses.gpl2;
     maintainers = with maintainers; [ mic92 ];
+    platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix
index a34996b8734c..2c54f65d9c35 100644
--- a/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, tornado }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, tornado }:
 
 buildPythonPackage rec {
   pname = "snakeviz";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   doCheck = false;
   propagatedBuildInputs = [ tornado ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Browser based viewer for profiling data";
     homepage = "https://jiffyclub.github.io/snakeviz";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
index 93d7d1d9d9cf..8446683cb1aa 100644
--- a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest
 , construct }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Control Snapcast, a multi-room synchronous audio solution";
     homepage = "https://github.com/happyleavesaoc/python-snapcast/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/snappergui/default.nix b/nixpkgs/pkgs/development/python-modules/snappergui/default.nix
deleted file mode 100644
index ff274c1ba8b3..000000000000
--- a/nixpkgs/pkgs/development/python-modules/snappergui/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchgit
-, pygobject3
-, dbus-python
-}:
-
-buildPythonPackage {
-  pname = "Snapper-GUI";
-  version = "0.1";
-
-  src = fetchgit {
-    url = "https://github.com/ricardomv/snapper-gui";
-    rev = "11d98586b122180c75a86fccda45c4d7e3137591";
-    sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1";
-  };
-
-  # no tests available
-  doCheck = false;
-
-  propagatedBuildInputs = [ pygobject3 dbus-python ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/ricardomv/snapper-gui";
-    description = "Graphical frontend for snapper";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ tstrobel ];
-  };
-
-}
diff --git a/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix b/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix
new file mode 100644
index 000000000000..b20f9afff9e6
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fastdiff
+, six
+, termcolor
+, pytestCheckHook
+, pytest-cov
+, django
+}:
+
+buildPythonPackage rec {
+  pname = "snapshottest";
+  version = "0.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g35ggqw4jd9zmazw55kj6gfjdghv49qx4jw5q231qyqj8fzijmv";
+  };
+
+  propagatedBuildInputs = [ fastdiff six termcolor ];
+
+  checkInputs = [ django pytestCheckHook pytest-cov ];
+
+  pythonImportsCheck = [ "snapshottest" ];
+
+  meta = with lib; {
+    description = "Snapshot testing for pytest, unittest, Django, and Nose";
+    homepage = "https://github.com/syrusakbary/snapshottest";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix b/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
index c546fefcf503..3364470da1b3 100644
--- a/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, PyStemmer, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, PyStemmer, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "snowballstemmer";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ PyStemmer ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms";
     homepage = "http://sigal.saimon.org/en/latest/index.html";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 3e958a3076c3..96f489ec6ed9 100644
--- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "2.3.6";
+  version = "2.3.8";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a4ebf25989fc13d6f70dc3e2064721c54834e493a7964a1d67be61d40e75f50";
+    sha256 = "sha256-zsS5+0UGDwZM65MILfgAvZ67AbXGcLsVmGacgoxX530=";
   };
 
   propagatedBuildInputs = [
@@ -59,6 +59,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \
       --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
+      --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \
       --replace "'idna<2.10'," "'idna'," \
       --replace "'requests<2.24.0'," "'requests',"
   '';
diff --git a/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix b/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix
index e17f38cb50dd..ca9d8707ac63 100644
--- a/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://code.google.com/p/socksipy-branch/";
     description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/nixpkgs/pkgs/development/python-modules/somajo/default.nix
index c0b8aaca24fc..bd351b5e86fa 100644
--- a/nixpkgs/pkgs/development/python-modules/somajo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/somajo/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
+{ pkgs, lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
 
 buildPythonPackage rec {
   pname = "SoMaJo";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ regex ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tokenizer and sentence splitter for German and English web texts";
     homepage = "https://github.com/tsproisl/SoMaJo";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix
index 706175dfaad3..095c0917e596 100644
--- a/nixpkgs/pkgs/development/python-modules/sopel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy
 , dnspython
 , geoip2
 , ipython
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple and extensible IRC bot";
     homepage = "http://sopel.chat";
     license = licenses.efl20;
diff --git a/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix b/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
index 03fbc638f160..e918a1aee3bc 100644
--- a/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/";
     description = "Thumbnails for Django";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix b/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix
index 3742c625205c..9f9f99a1856c 100644
--- a/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix
@@ -1,27 +1,35 @@
-{ stdenv
+{ lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytest-cov
+, pytestCheckHook
 , sortedcontainers
 }:
 
 buildPythonPackage rec {
   pname = "sortedcollections";
-  version = "1.2.1";
+  version = "2.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0sihzm5aqz7r3irh4jn6rzicb7lf81d27z7vl6kaslnhwcsizhsq";
+  src = fetchFromGitHub {
+    owner = "grantjenks";
+    repo = "python-sortedcollections";
+    rev = "v${version}";
+    sha256 = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg=";
   };
 
   propagatedBuildInputs = [ sortedcontainers ];
 
-  # No tests in PyPi tarball
-  doCheck = false;
+  checkInputs = [
+    pytest-cov
+    pytestCheckHook
+  ];
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [ "sortedcollections" ];
+
+  meta = with lib; {
     description = "Python Sorted Collections";
     homepage = "http://www.grantjenks.com/docs/sortedcollections/";
-    license = licenses.asl20;
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/spacy/models.nix b/nixpkgs/pkgs/development/python-modules/spacy/models.nix
index c4a314ea4742..8c57d2e0d262 100644
--- a/nixpkgs/pkgs/development/python-modules/spacy/models.nix
+++ b/nixpkgs/pkgs/development/python-modules/spacy/models.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }:
+{ lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }:
 let
   buildModelPackage = { pname, version, sha256, license }:
   let
@@ -16,7 +16,7 @@ let
 
     pythonImportsCheck = [ pname ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Models for the spaCy NLP library";
       homepage    = "https://github.com/explosion/spacy-models";
       license     = licenses.${license};
@@ -24,8 +24,8 @@ let
     };
   };
 
-  makeModelSet = models: with stdenv.lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models);
+  makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models);
 
-in makeModelSet (stdenv.lib.importJSON ./models.json)
+in makeModelSet (lib.importJSON ./models.json)
 
 # cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url
diff --git a/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix b/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix
index b513a9f33c8c..ba927431f2c0 100644
--- a/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   buildInputs = [ nose ];
   propagatedBuildInputs = [ click ];
 
-  meta = with stdenv.lib; {
-    description = ''An Early-Algorithm Context-free grammar Parser'';
+  meta = with lib; {
+    description = "An Early-Algorithm Context-free grammar Parser";
     homepage = "https://github.com/rocky/python-spark";
     license = licenses.mit;
     maintainers = with maintainers; [raskin];
diff --git a/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix
index fe400630507b..b97cbee2a5fe 100644
--- a/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six isodate pyparsing html5lib keepalive ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format";
     homepage = "http://rdflib.github.io/sparqlwrapper";
     license = licenses.w3c;
diff --git a/nixpkgs/pkgs/development/python-modules/speaklater/default.nix b/nixpkgs/pkgs/development/python-modules/speaklater/default.nix
index 03b525147bfd..efb0908dc5fc 100644
--- a/nixpkgs/pkgs/development/python-modules/speaklater/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/speaklater/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implements a lazy string for python useful for use with gettext";
     homepage = "https://github.com/mitsuhiko/speaklater";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
index 37b9c24a22e1..08bbb34156bf 100644
--- a/nixpkgs/pkgs/development/python-modules/spglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }:
 
 buildPythonPackage rec {
   pname = "spglib";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose pyyaml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for C library for finding and handling crystal symmetries";
     homepage = "https://atztogo.github.io/spglib";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
index 6d353cc63c96..77f283795db5 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "5f919a47ce7a7e6028dba809de81ae1297ac192347cf6fc54efca919d4865159";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Setuptools command for uploading Sphinx documentation to PyPI";
     homepage = "https://bitbucket.org/jezdez/sphinx-pypi-upload/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
index bb9fcb293da7..11e3c2a87e93 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , sphinx
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ReadTheDocs.org theme for Sphinx";
     homepage = "https://github.com/snide/sphinx_rtd_theme/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
index 95aa0c5fdeb8..e2bfc5bdaa55 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Check is disabled due to circular dependency of sphinx
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books";
     homepage = "http://sphinx-doc.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
index 03ac746137f7..6822c0f153d3 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/readthedocs/sphinx-autoapi";
     description = "Provides 'autodoc' style documentation";
     longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented.";
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index bc9a90efcf23..b429522f9d3c 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
-, oset, pybtex, pybtex-docutils, sphinx
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, oset
+, pybtex
+, pybtex-docutils
+, sphinx
 }:
 
 buildPythonPackage rec {
@@ -15,10 +21,13 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
 
-  meta = {
+  doCheck = false;
+  pythonImportsCheck = [ "sphinxcontrib.bibtex" ];
+
+  meta = with lib; {
     description = "A Sphinx extension for BibTeX style citations";
     homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
index b8f23afabcd5..a2603b876e5e 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover -s tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sphinx blockdiag extension";
     homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag";
     maintainers = with maintainers; [ nand0p ];
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
index 01d34dd0ae62..7398cbc433ff 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # Check is disabled due to circular dependency of sphinx
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document.";
     homepage = "http://sphinx-doc.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
index 8eec8ab3267a..150840f19b40 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Check is disabled due to circular dependency of sphinx
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "sphinxcontrib-htmlhelp is a sphinx extension which ...";
     homepage = "http://sphinx-doc.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
index 9b1d93287b03..609799f18647 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Check is disabled due to circular dependency of sphinx
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript.";
     homepage = "http://sphinx-doc.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index bd62d2ef4f8f..6375bdab3c24 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi";
     description = "OpenAPI (fka Swagger) spec renderer for Sphinx";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
index f8e826adf1f3..adf02860d127 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Check is disabled due to circular dependency of sphinx
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.";
     homepage = "http://sphinx-doc.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
index 05f2749c49d6..52ebe15c1b62 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Check is disabled due to circular dependency of sphinx
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle).";
     homepage = "http://sphinx-doc.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index 44e19997569c..a3054f341450 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sphinx spelling extension";
     homepage = "https://bitbucket.org/dhellmann/sphinxcontrib-spelling";
     maintainers = with maintainers; [ nand0p ];
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
index 9f042efcc97b..ee652b42d8a1 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , sphinx
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a Sphinx domain for describing RESTful HTTP APIs";
     homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
index 93c53581c4fa..2d56b57df9be 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , sphinx
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ sphinx ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website";
     homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index ce65822e3b1f..db8997dfd216 100644
--- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , sphinx
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ sphinx plantuml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
     homepage = "https://github.com/sphinx-contrib/plantuml/";
     license = with licenses; [ bsd2 ];
diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
index 8655d9cbbd5d..e0a8d6b9c18a 100644
--- a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
+{ lib, stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
   jupyter_client, pyzmq }:
 
 buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jupyter kernels for Spyder's console";
     homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html";
     downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases";
diff --git a/nixpkgs/pkgs/development/python-modules/spyder/3.nix b/nixpkgs/pkgs/development/python-modules/spyder/3.nix
index cac20ad6fce5..34d59d0eb227 100644
--- a/nixpkgs/pkgs/development/python-modules/spyder/3.nix
+++ b/nixpkgs/pkgs/development/python-modules/spyder/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle,
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle,
   psutil, pyflakes, rope, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
   spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library providing a scientific python development environment";
     longDescription = ''
       Spyder (previously known as Pydee) is a powerful interactive development
diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix
index f0c4ea50e72e..26013e71158d 100644
--- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle,
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle,
   psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
   spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server
-, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch
+, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch, three-merge, pyls-black, pyls-spyder
 }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
     numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
     pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server
-    atomicwrites pyxdg diff-match-patch
+    atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder
   ];
 
   # There is no test for spyder
@@ -44,14 +44,13 @@ buildPythonPackage rec {
     sed -i /pyqtwebengine/d setup.py
     substituteInPlace setup.py \
       --replace "pyqt5<5.13" "pyqt5" \
-      --replace "parso==0.7.0" "parso" \
-      --replace "jedi==0.17.1" "jedi"
+      --replace "parso==0.7.0" "parso"
   '';
 
   postInstall = ''
     # add Python libs to env so Spyder subprocesses
     # created to run compute kernels don't fail with ImportErrors
-    wrapProgram $out/bin/spyder3 --prefix PYTHONPATH : "$PYTHONPATH"
+    wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH"
 
     # Create desktop item
     mkdir -p $out/share/icons
@@ -65,7 +64,7 @@ buildPythonPackage rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scientific python development environment";
     longDescription = ''
       Spyder (previously known as Pydee) is a powerful interactive development
diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
index 35e6854137e3..6a8c910cfce6 100644
--- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pytest
 , Wand
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   doCheck = !isPyPy;  # failures due to sqla version mismatch
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dahlia/sqlalchemy-imageattach";
     description = "SQLAlchemy extension for attaching images to entity objects";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index 1f5c893c6dbc..bb757ab45b0a 100644
--- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python
+{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python
 , unittest2, scripttest, pytz, mock
 , testtools, pbr, tempita, decorator, sqlalchemy
 , six, sqlparse, testrepository
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/openstack/sqlalchemy-migrate";
     description = "Schema migration tools for SQLAlchemy";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
index 727a840476a4..2bb700f67557 100644
--- a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "sqlite-utils";
-  version = "3.1.1";
+  version = "3.3";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54df73364662ff3c763da3b42b9d27b1771ebfb3361caa255e44e1bf1544015b";
+    sha256 = "1linla3za1gb3w0n0k6h3q8in62qhipizff259p14gzmyr95rjjv";
   };
 
   propagatedBuildInputs = [
@@ -37,11 +37,6 @@ buildPythonPackage rec {
     hypothesis
   ];
 
-  # disabled until upstream updates tests
-  disabledTests = lib.optionals (lib.versionAtLeast sqlite.version "3.34.0") [
-    "test_optimize"
-  ];
-
   meta = with lib; {
     description = "Python CLI utility and library for manipulating SQLite databases";
     homepage = "https://github.com/simonw/sqlite-utils";
diff --git a/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix
index 66a1200eeb2a..1d0b3f15c3fc 100644
--- a/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "4721607e0b817b89efdba7e79cab881a03164b94777f4cf796ad5dd59a7612c5";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "sqlite-backed dictionary";
     homepage = "https://github.com/Yelp/sqlite3dbm";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix
index ccd4190bbfde..ccbc6659fe3d 100644
--- a/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ FormEncode PasteDeploy paste pydispatcher ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Object Relational Manager for providing an object interface to your database";
     homepage = "http://www.sqlobject.org/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/squaremap/default.nix b/nixpkgs/pkgs/development/python-modules/squaremap/default.nix
index 4927d8c725d4..c17a88435dd6 100644
--- a/nixpkgs/pkgs/development/python-modules/squaremap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/squaremap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , isPy3k
 , fetchPypi
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six wxPython ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hierarchic visualization control for wxPython";
     homepage = "https://launchpad.net/squaremap";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/srptools/default.nix b/nixpkgs/pkgs/development/python-modules/srptools/default.nix
index 9fca318db0b9..f130009d30d6 100644
--- a/nixpkgs/pkgs/development/python-modules/srptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/srptools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   pname = "srptools";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestrunner ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python-Tools to implement Secure Remote Password (SRP) authentication";
     homepage = "https://github.com/idlesign/srptools";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/nixpkgs/pkgs/development/python-modules/srsly/default.nix
index ee53af641a05..42320e50fa8d 100644
--- a/nixpkgs/pkgs/development/python-modules/srsly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/srsly/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "srsly" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Modern high-performance serialization utilities for Python";
     homepage = "https://github.com/explosion/srsly";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix b/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix
index 6cbdc81ef86d..c399ee760fd6 100644
--- a/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , dnspython
 , mock, nose
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ dnspython ];
   checkInputs = [ mock nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gmr/srvlookup";
     license = [ licenses.bsd3 ];
     description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples.";
diff --git a/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
index fc6b548ed5b8..8300c3ec2f65 100644
--- a/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # tests repository does not include required files
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/DinoTools/python-ssdeep";
     description = "Python wrapper for the ssdeep library";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix
index 3c1d2c9976fa..82ea4b066a3c 100644
--- a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # test suite uses new async primitives
   doCheck = !isPy27;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/codingjoe/ssdp";
     description = "Python asyncio library for Simple Service Discovery Protocol (SSDP).";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
index ebc6435bc794..9d944e112fe2 100644
--- a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
 , requests, six
 , backports_unittest-mock, pytestCheckHook, pytestrunner }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # tries to open connection to wikipedia
   disabledTests = [ "event_stream" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client library for reading Server Sent Event streams";
     homepage = "https://github.com/btubbs/sseclient";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sslib/default.nix b/nixpkgs/pkgs/development/python-modules/sslib/default.nix
index 0f1edfd31bde..026ac8a30b75 100644
--- a/nixpkgs/pkgs/development/python-modules/sslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
   pname = "sslib";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # No tests available
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jqueiroz/python-sslib";
     description = "A Python3 library for sharing secrets";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sslyze/default.nix b/nixpkgs/pkgs/development/python-modules/sslyze/default.nix
index 24b334ef8822..991f85c900ec 100644
--- a/nixpkgs/pkgs/development/python-modules/sslyze/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sslyze/default.nix
@@ -1,30 +1,30 @@
 { lib
 , fetchFromGitHub
-, pytest
 , buildPythonPackage
 , nassl
 , cryptography
 , typing-extensions
 , faker
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "sslyze";
-  version = "3.0.8";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "nabla-c0d3";
     repo = pname;
     rev = version;
-    sha256 = "06mwzxw6xaqin2gwzcqb9r7qhbyx3k7zcxygxywi2bpxyjv9lq32";
+    sha256 = "02p0lgpkfq88dys0dqw0z8bpg9g8pds2lvs9awd9f2w5cb1pwr83";
   };
 
   patchPhase = ''
     substituteInPlace setup.py \
-      --replace "cryptography>=2.6,<=2.9" "cryptography"
+      --replace "cryptography>=2.6,<3.3" "cryptography>=2.6,<4.0"
   '';
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytestCheckHook ];
 
   checkPhase = ''
     # Most of the tests are online; hence, applicable tests are listed
diff --git a/nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix
new file mode 100644
index 000000000000..70b66b9a4683
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "starkbank-ecdsa";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "starkbank";
+    repo = "ecdsa-python";
+    rev = "v${version}";
+    sha256 = "03smk33zhmv1j1svgjnykak0jnw8yl0yv03i1gsasx71f33zmfwi";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "-v tests/*.py" ];
+  pythonImportsCheck = [ "ellipticcurve" ];
+
+  meta = with lib; {
+    description = "Python ECDSA library";
+    homepage = "https://github.com/starkbank/ecdsa-python";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix
index ff8a93d335ea..d802a2300035 100644
--- a/nixpkgs/pkgs/development/python-modules/starlette/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix
@@ -2,25 +2,26 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, isPy27
 , aiofiles
 , graphene
 , itsdangerous
 , jinja2
+, python-multipart
 , pyyaml
 , requests
 , ujson
-, python-multipart
-, pytest
-, uvicorn
-, isPy27
-, darwin
-, databases
 , aiosqlite
+, databases
+, pytestCheckHook
+, pytest-asyncio
+, pytestcov
+, typing-extensions
+, ApplicationServices
 }:
 
 buildPythonPackage rec {
   pname = "starlette";
-
   version = "0.13.8";
   disabled = isPy27;
 
@@ -36,22 +37,21 @@ buildPythonPackage rec {
     graphene
     itsdangerous
     jinja2
+    python-multipart
     pyyaml
     requests
     ujson
-    uvicorn
-    python-multipart
-    databases
-  ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
+  ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ];
 
   checkInputs = [
-    pytest
     aiosqlite
+    databases
+    pytestCheckHook
+    typing-extensions
   ];
 
-  checkPhase = ''
-    pytest --ignore=tests/test_graphql.py
-  '';
+  pytestFlagsArray = [ "--ignore=tests/test_graphql.py" ];
+
   pythonImportsCheck = [ "starlette" ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
index cba55e5aca28..d49bae2eab91 100644
--- a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
@@ -1,24 +1,45 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
+, isPy27
 , docopt
 , easywatch
 , jinja2
+, pytestCheckHook
+, markdown
 }:
 
 buildPythonPackage rec {
   pname = "staticjinja";
   version = "0.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "597837899008409359680ee9cd04779639b9c0eb3380b6545025d26a702ba36c";
+  disabled = isPy27; # 0.4.0 drops python2 support
+
+  # For some reason, in pypi the tests get disabled when using
+  # PY_IGNORE_IMPORTMISMATCH, so we just fetch from GitHub
+  src = fetchFromGitHub {
+    owner = "staticjinja";
+    repo = pname;
+    rev = version;
+    sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i";
   };
 
-  propagatedBuildInputs = [ jinja2 docopt easywatch ];
+  propagatedBuildInputs = [
+    jinja2
+    docopt
+    easywatch
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    markdown
+  ];
 
-  # There are no tests on pypi
-  doCheck = false;
+  # Import paths differ by a "build/lib" subdirectory, but the files are
+  # the same, so we ignore import mismatches.
+  preCheck = ''
+    export PY_IGNORE_IMPORTMISMATCH=1
+  '';
 
   meta = with lib; {
     description = "A library and cli tool that makes it easy to build static sites using Jinja2";
@@ -27,4 +48,3 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ fgaz ];
   };
 }
-
diff --git a/nixpkgs/pkgs/development/python-modules/statsd/default.nix b/nixpkgs/pkgs/development/python-modules/statsd/default.nix
index cf376113b3e3..447fed3263c3 100644
--- a/nixpkgs/pkgs/development/python-modules/statsd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/statsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     sed -i 's/assert_called_once()/called/' statsd/tests.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar ];
     description = "A simple statsd client";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/stdiomask/default.nix b/nixpkgs/pkgs/development/python-modules/stdiomask/default.nix
new file mode 100644
index 000000000000..8ef59074fc00
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/stdiomask/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "stdiomask";
+  version = "0.0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19m3p6i7fj7nmkbsjhiha3f2l7d05j9gf9ha2pd0pqfrx9lp1r61";
+  };
+
+  # tests are not published: https://github.com/asweigart/stdiomask/issues/5
+  doCheck = false;
+  pythonImportsCheck = [ "stdiomask" ];
+
+  meta = with lib; {
+    description = "Python module for masking passwords";
+    homepage = "https://github.com/asweigart/stdiomask";
+    license = with licenses; [ gpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/stompclient/default.nix b/nixpkgs/pkgs/development/python-modules/stompclient/default.nix
index 4cb59cf5f285..17bafbad282e 100644
--- a/nixpkgs/pkgs/development/python-modules/stompclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stompclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   # XXX: Ran 0 tests in 0.217s
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight and extensible STOMP messaging client";
     homepage = "https://bitbucket.org/hozn/stompclient";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix b/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix
index 7f45f326903a..53701999b021 100644
--- a/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "strict-rfc3339";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/danielrichman/strict-rfc3339";
     license = licenses.gpl3;
     description = "Strict, simple, lightweight RFC3339 functions";
diff --git a/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
index ee18a6ca6b22..8f383b60b175 100644
--- a/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.1.1";
+  version = "1.3.0";
   pname = "strictyaml";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea2bb97aacc12fff7df11bd4cb4ae64b1418a0311fbd1611445cc59dc650bdd3";
+    sha256 = "f640ae4e6fe761c3ae7138092c3dcb9b5050ec56e9cbac45d8a6b549d7ec973c";
   };
 
   propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
diff --git a/nixpkgs/pkgs/development/python-modules/stringcase/default.nix b/nixpkgs/pkgs/development/python-modules/stringcase/default.nix
index 531f1eb92231..10afb5113931 100644
--- a/nixpkgs/pkgs/development/python-modules/stringcase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stringcase/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, stdenv
+{ buildPythonPackage, fetchPypi, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # PyPi package does not include tests.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/okunishinishi/python-stringcase";
     description = "Convert string cases between camel case, pascal case, snake case etc…";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix b/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix
index c70cac59920e..8bdb69a3074e 100644
--- a/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}:
+{ lib, fetchurl, buildPythonPackage, antlr, isPy3k }:
 
 buildPythonPackage rec {
   pname = "PyStringTemplate";
@@ -16,9 +16,9 @@ buildPythonPackage rec {
   # No tests included in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://www.stringtemplate.org/";
     description = "Text Templating Library";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix
new file mode 100644
index 000000000000..5b6362b76a14
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, asynctest
+, stdiomask
+, cryptography
+, pytestcov
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "subarulink";
+  version = "0.3.11";
+
+  src = fetchFromGitHub {
+    owner = "G-Two";
+    repo = pname;
+    rev = "subaru-v${version}";
+    sha256 = "1ink9bhph6blidnfsqwq01grhp7ghacmkd4vzgb9hnhl9l52s1jq";
+  };
+
+  propagatedBuildInputs = [ aiohttp stdiomask ];
+
+  checkInputs = [
+    asynctest
+    cryptography
+    pytest-asyncio
+    pytestcov
+    pytestCheckHook
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [ "subarulink" ];
+
+  meta = with lib; {
+    description = "Python module for interacting with STARLINK-enabled vehicle";
+    homepage = "https://github.com/G-Two/subarulink";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix
index c4d57bef0ea9..2dac94ac15d2 100644
--- a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , mmpython
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     echo '${setup}' > $sourceRoot/setup.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for automatic download/upload subtitles for videofiles using fast hashing";
     homepage = "https://www.subdownloader.net";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix
index e83448d82cf9..4bf74fe00b4e 100644
--- a/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -23,7 +23,7 @@ buildPythonPackage rec {
       --replace "test_sending_unicode_data" "noop"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight SOAP client (Jurko's fork)";
     homepage = "https://bitbucket.org/jurko/suds";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/suds/default.nix b/nixpkgs/pkgs/development/python-modules/suds/default.nix
index 77f4c731265e..24425fef95f1 100644
--- a/nixpkgs/pkgs/development/python-modules/suds/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/suds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   patches = [ ./suds-0.4-CVE-2013-2217.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # Broken for security issues:
     # - https://github.com/NixOS/nixpkgs/issues/19678
     # - https://lwn.net/Vulnerabilities/559200/
diff --git a/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/nixpkgs/pkgs/development/python-modules/sumo/default.nix
index 504d91212874..e647cd4a9d27 100644
--- a/nixpkgs/pkgs/development/python-modules/sumo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sumo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , h5py
 , matplotlib
 , numpy
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   # tests have type annotations, can only run on 3.5+
   doCheck = (!isPy27);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Toolkit for plotting and analysis of ab initio solid-state calculation data";
     homepage = "https://github.com/SMTG-UCL/sumo";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sure/default.nix b/nixpkgs/pkgs/development/python-modules/sure/default.nix
index 2e6e7548efd8..efff79f679f4 100644
--- a/nixpkgs/pkgs/development/python-modules/sure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , rednose
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   buildInputs = [ rednose ];
   propagatedBuildInputs = [ six mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility belt for automated testing";
     homepage = "https://sure.readthedocs.io/en/latest/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/survey/default.nix b/nixpkgs/pkgs/development/python-modules/survey/default.nix
index 1f5438140e2b..f9bec0451ff4 100644
--- a/nixpkgs/pkgs/development/python-modules/survey/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/survey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , wrapio
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "survey" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Exahilosys/survey";
     description = "A simple library for creating beautiful interactive prompts";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/svg-path/default.nix b/nixpkgs/pkgs/development/python-modules/svg-path/default.nix
index a8427558f436..585dbf64b3c3 100644
--- a/nixpkgs/pkgs/development/python-modules/svg-path/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/svg-path/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "svg.path";
   version = "4.0.2";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
     sha256 = "4bd627ec6526cd5da14f3c6a51205d930187db2d8992aed626825492c033b195";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SVG path objects and parser";
     homepage = "https://github.com/regebro/svg.path";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix
index b592ee75dece..fb0475ef3b97 100644
--- a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchgit
 , lxml
@@ -18,7 +18,7 @@ buildPythonPackage {
     rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kjellmf/svg2tikz";
     description = "An SVG to TikZ converter";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix
index 823f834b417c..613de201b2d1 100644
--- a/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }:
 
 buildPythonPackage rec {
   pname = "swagger-ui-bundle";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # package contains no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "bundled swagger-ui pip package";
     homepage = "https://github.com/dtkav/swagger_ui_bundle";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix b/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix
new file mode 100644
index 000000000000..f4f191d2b423
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "swisshydrodata";
+  version = "0.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1adpy6k2bknffzl5rckqpvaqyrvc00d6a4a4541438dqasx61npl";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Tests are not releases at the moment
+  doCheck = false;
+  pythonImportsCheck = [ "swisshydrodata" ];
+
+  meta = with lib; {
+    description = "Python client to get data from the Swiss federal Office for Environment FEON";
+    homepage = "https://github.com/bouni/swisshydrodata";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/swspotify/default.nix b/nixpkgs/pkgs/development/python-modules/swspotify/default.nix
index 27e5f0cb0bb8..321a48e72b6f 100644
--- a/nixpkgs/pkgs/development/python-modules/swspotify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/swspotify/default.nix
@@ -18,7 +18,8 @@ buildPythonPackage rec {
 
   preConfigure = ''
     substituteInPlace setup.py \
-      --replace 'requests>=2.24.0' 'requests~=2.23'
+      --replace 'requests>=2.24.0' 'requests~=2.23' \
+      --replace 'flask-cors==3.0.8' 'flask-cors'
   '';
 
   checkPhase = ''
@@ -27,7 +28,9 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook mock ];
 
-  meta = with stdenv.lib; {
+  pythonImportsCheck = [ "SwSpotify" ];
+
+  meta = with lib; {
     homepage = "https://github.com/SwagLyrics/SwSpotify";
     description = "Library to get the currently playing song and artist from Spotify";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/sybase/default.nix b/nixpkgs/pkgs/development/python-modules/sybase/default.nix
index 8fd0f023d0fa..20c2a158a3b2 100644
--- a/nixpkgs/pkgs/development/python-modules/sybase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sybase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , isPy3k
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   SYBASE = freetds;
   setupPyBuildFlags = [ "-DHAVE_FREETDS" "-UWANT_BULKCOPY" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Sybase module provides a Python interface to the Sybase relational database system";
     homepage    = "http://python-sybase.sourceforge.net";
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/sympy/default.nix b/nixpkgs/pkgs/development/python-modules/sympy/default.nix
index 9c3353aa2e74..c935176e0d51 100644
--- a/nixpkgs/pkgs/development/python-modules/sympy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sympy/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.6.2";
+  version = "1.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cfadcc80506e4b793f5b088558ca1fcbeaec24cd6fc86f1fdccaa3ee1d48708";
+    sha256 = "sha256-o96SYel1Nbg7uGB7DaLH0DEmZQ+v6isniWV7Ipwkay4=";
   };
 
   checkInputs = [ glibcLocales ];
diff --git a/nixpkgs/pkgs/development/python-modules/systemd/default.nix b/nixpkgs/pkgs/development/python-modules/systemd/default.nix
index f0be01b92d89..2035ce8b26ba 100644
--- a/nixpkgs/pkgs/development/python-modules/systemd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/systemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }:
 
 buildPythonPackage rec {
   pname = "systemd";
@@ -12,11 +12,11 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ systemd ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python module for native access to the systemd facilities";
     homepage = "http://www.freedesktop.org/software/systemd/python-systemd/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix b/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix
index 1c2e3baa526b..87a81e4fb17d 100644
--- a/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1p5lx3yz4p40rfb453m80a4hh8341yp4dki2nhhxz7bq2zfi1zwf";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SysV IPC primitives (semaphores, shared memory and message queues)";
     license = licenses.bsd3;
     homepage = "http://semanchuk.com/philip/sysv_ipc/";
diff --git a/nixpkgs/pkgs/development/python-modules/tables/3.5.nix b/nixpkgs/pkgs/development/python-modules/tables/3.5.nix
index bf0eb51c851c..efc47a1ad3f4 100644
--- a/nixpkgs/pkgs/development/python-modules/tables/3.5.nix
+++ b/nixpkgs/pkgs/development/python-modules/tables/3.5.nix
@@ -1,8 +1,6 @@
-{ stdenv, lib, fetchPypi, python, buildPythonPackage
+{ lib, fetchPypi, python, buildPythonPackage
 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   version = "3.5.2";
   pname = "tables";
@@ -18,10 +16,10 @@ buildPythonPackage rec {
   # The setup script complains about missing run-paths, but they are
   # actually set.
   setupPyBuildFlags = [
-    "--hdf5=${getDev hdf5}"
-    "--lzo=${getDev lzo}"
-    "--bzip2=${getDev bzip2}"
-    "--blosc=${getDev c-blosc}"
+    "--hdf5=${lib.getDev hdf5}"
+    "--lzo=${lib.getDev lzo}"
+    "--bzip2=${lib.getDev bzip2}"
+    "--blosc=${lib.getDev c-blosc}"
   ];
   # Run the test suite.
   # It requires the build path to be in the python search path.
@@ -50,9 +48,9 @@ buildPythonPackage rec {
   # Disable tests until the failure described above is fixed.
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Hierarchical datasets for Python";
     homepage = "http://www.pytables.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/tables/default.nix b/nixpkgs/pkgs/development/python-modules/tables/default.nix
index cd2af0dc28d6..fe49ab4d9ed6 100644
--- a/nixpkgs/pkgs/development/python-modules/tables/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tables/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPy38
+{ lib, fetchPypi, python, buildPythonPackage, isPy38
 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   version = "3.6.1";
   pname = "tables";
@@ -30,10 +28,10 @@ buildPythonPackage rec {
   # The setup script complains about missing run-paths, but they are
   # actually set.
   setupPyBuildFlags = [
-    "--hdf5=${getDev hdf5}"
-    "--lzo=${getDev lzo}"
-    "--bzip2=${getDev bzip2}"
-    "--blosc=${getDev c-blosc}"
+    "--hdf5=${lib.getDev hdf5}"
+    "--lzo=${lib.getDev lzo}"
+    "--bzip2=${lib.getDev bzip2}"
+    "--blosc=${lib.getDev c-blosc}"
   ];
   # Run the test suite.
   # It requires the build path to be in the python search path.
@@ -62,9 +60,9 @@ buildPythonPackage rec {
   # Disable tests until the failure described above is fixed.
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Hierarchical datasets for Python";
     homepage = "http://www.pytables.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/tarman/default.nix b/nixpkgs/pkgs/development/python-modules/tarman/default.nix
index f2a503cb55d8..682da22ced8a 100644
--- a/nixpkgs/pkgs/development/python-modules/tarman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tarman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # tests are still failing
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/matejc/tarman";
     description = "Archive manager with curses interface";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/tasklib/default.nix b/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
index 319dd98234d2..591f4cdabe96 100644
--- a/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
@@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true";
 
 in buildPythonPackage rec {
   pname = "tasklib";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "21525a34469928876b64edf8abf79cf788bb3fa796d4554ba22a68bc1f0693f5";
+    sha256 = "7fe8676acb4559129c4e958be7704c12dccdbae302fff47c5398bc0dd1c9e563";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/nixpkgs/pkgs/development/python-modules/taskw/default.nix
index ee9a9716d117..5a1358947130 100644
--- a/nixpkgs/pkgs/development/python-modules/taskw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/taskw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   buildInputs = [ nose pkgs.taskwarrior tox ];
   propagatedBuildInputs = [ six dateutil kitchen pytz ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage =  "https://github.com/ralphbean/taskw";
     description = "Python bindings for your taskwarrior database";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
index 922ca1b9b957..cba34a95a7bd 100644
--- a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
 , colorama, mypy, pyyaml, regex
 , dataclasses, typing
 , pytestrunner, pytest-mypy
@@ -25,15 +25,15 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ colorama mypy pyyaml regex ]
-    ++ stdenv.lib.optionals (pythonOlder "3.7") [ dataclasses ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+    ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]
+    ++ lib.optionals (pythonOlder "3.5") [ typing ];
   checkInputs = [ pytest-mypy ];
 
   checkPhase = ''
     pytest test/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generates Python parsers from grammars in a variation of EBNF";
     longDescription = ''
       TatSu (the successor to Grako) is a tool that takes grammars in a
diff --git a/nixpkgs/pkgs/development/python-modules/tblib/default.nix b/nixpkgs/pkgs/development/python-modules/tblib/default.nix
index 86992e6e16aa..7e704e0b2c60 100644
--- a/nixpkgs/pkgs/development/python-modules/tblib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tblib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "tblib";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Traceback fiddling library. Allows you to pickle tracebacks.";
     homepage = "https://github.com/ionelmc/python-tblib";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix b/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix
index 2d0efeceda04..bcc5cbbef946 100644
--- a/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix
@@ -5,17 +5,15 @@
 , pendulum
 , pprintpp
 , wrapt
-, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "tbm-utils";
   version = "2.6.0";
-  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "235748cceeb22c042e32d2fdfd4d710021bac9b938c4f2c35e1fce1cfd58f7ec";
+    sha256 = "1v7pb3yirkhzbv1z5i1qp74vl880f56zvzfj68p08b5jxv64hmr3";
   };
 
   propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ];
@@ -24,7 +22,7 @@ buildPythonPackage rec {
   # issues with package failing to build from source, but nixpkgs is better
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0"
+      --replace "'attrs>=18.2,<19.4'" "'attrs'"
   '';
 
   # No tests in archive.
diff --git a/nixpkgs/pkgs/development/python-modules/telegram/default.nix b/nixpkgs/pkgs/development/python-modules/telegram/default.nix
index 6074f479071e..95293d095fd5 100644
--- a/nixpkgs/pkgs/development/python-modules/telegram/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/telegram/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1495l2ml8mg120wfvqhikqkfczhwwaby40vdmsz8v2l69jps01fl";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/liluo/telegram";
     description = "Telegram APIs";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
index 18570c90c00f..51f055d06607 100644
--- a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "tenacity";
-  version = "6.2.0";
+  version = "6.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16ikf6n6dw1kzncs6vjc4iccl76f9arln59jhiiai27lzbkr1bi9";
+    sha256 = "0zsdajdpcjd7inrl7r9pwiyh7qpgh9jk7g2bj1iva2d3n0gijkg1";
   };
 
   nativeBuildInputs = [ pbr setuptools_scm ];
diff --git a/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix
new file mode 100644
index 000000000000..1ae1aa471be5
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix
@@ -0,0 +1,31 @@
+{ lib, fetchPypi, buildPythonPackage
+, gviz-api
+, protobuf
+, werkzeug
+}:
+
+buildPythonPackage rec {
+  pname = "tensorboard_plugin_profile";
+  version = "2.4.0";
+  format = "wheel";
+
+  src = fetchPypi {
+    inherit pname version;
+    format = "wheel";
+    python = "py3";
+    sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj";
+  };
+
+  propagatedBuildInputs = [
+    gviz-api
+    protobuf
+    werkzeug
+  ];
+
+  meta = with lib; {
+    description = "Profile Tensorboard Plugin.";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ndl ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix b/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix
new file mode 100644
index 000000000000..b0966ca2c7c0
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchPypi, buildPythonPackage
+}:
+
+buildPythonPackage rec {
+  pname = "tensorboard_plugin_wit";
+  version = "1.7.0";
+  format = "wheel";
+
+  src = fetchPypi {
+    inherit pname version;
+    format = "wheel";
+    python = "py3";
+    sha256 = "0nv855qm2fav70lndsrv810pqgg41sbmd70fk86wk18ih825yxzf";
+  };
+
+  meta = with lib; {
+    description = "What-If Tool TensorBoard plugin.";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ndl ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/1/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/1/default.nix
deleted file mode 100644
index c34d6948d89e..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/1/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchPypi, buildPythonPackage
-, numpy
-, absl-py
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "tensorflow-estimator";
-  # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before
-  # actually updating the version in setup.py, which is why this tag is called
-  # 1.15.1.
-  version = "1.15.1";
-  format = "wheel";
-
-  src = fetchPypi {
-    pname = "tensorflow_estimator";
-    inherit version format;
-    sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8";
-  };
-
-  propagatedBuildInputs = [ mock numpy absl-py ];
-
-  meta = with stdenv.lib; {
-    description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting.";
-    homepage = "http://tensorflow.org";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jyp ];
-  };
-}
-
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix
index 750ef6e8a907..bca75224fa3e 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , numpy
 , absl-py
 , mock
@@ -6,18 +6,18 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  version = "2.3.0";
+  version = "2.4.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    sha256 = "11n4sl9wfr00fv1i837b7a36ink86ggmlsgj7i06kcfc011h6pmp";
+    sha256 = "1w0pkcslm6934qqd6m5gxyjdlnb4pbl47k6s99wsh6dyvvr7nysv";
   };
 
   propagatedBuildInputs = [ mock numpy absl-py ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting.";
     homepage = "http://tensorflow.org";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
index a89c6fa307ea..91880562eb3a 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -122,9 +122,10 @@ in buildPythonPackage {
   '';
 
   meta = with lib; {
+    broken = true;  # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2
     description = "Library for probabilistic reasoning and statistical analysis";
     homepage = "https://www.tensorflow.org/probability/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = with maintainers; [];  # This package is maintainerless.
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix
index 6cc3636b7f30..f58b1a207719 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix
@@ -20,8 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi ({
     pname = "tensorboard";
-    inherit version;
-    format = "wheel";
+    inherit version format;
   } // (if isPy3k then {
     python = "py3";
     sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac";
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index 945896dda018..031254205066 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -5,9 +5,10 @@
 , protobuf
 , grpcio
 , markdown
-, futures
 , absl-py
 , google-auth-oauthlib
+, tensorboard-plugin-wit
+, tensorboard-plugin-profile
 }:
 
 # tensorflow/tensorboard is built from a downloaded wheel, because
@@ -16,20 +17,16 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-tensorboard";
-  version = "2.1.0";
+  version = "2.4.0";
   format = "wheel";
+  disabled = !isPy3k;
 
-  src = fetchPypi ({
+  src = fetchPypi {
     pname = "tensorboard";
-    inherit version;
-    format = "wheel";
-  } // (if isPy3k then {
+    inherit version format;
     python = "py3";
-    sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6";
-  } else {
-    python = "py2";
-    sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w";
-  }));
+    sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d";
+  };
 
   propagatedBuildInputs = [
     numpy
@@ -39,10 +36,12 @@ buildPythonPackage rec {
     grpcio
     absl-py
     google-auth-oauthlib
+    tensorboard-plugin-profile
+    tensorboard-plugin-wit
     # not declared in install_requires, but used at runtime
     # https://github.com/NixOS/nixpkgs/issues/73840
     wheel
-  ] ++ lib.optional (!isPy3k) futures;
+  ];
 
   # in the absence of a real test suite, run cli and imports
   checkPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix
deleted file mode 100644
index 5c93e957f7c1..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, buildPythonPackage
-, isPy3k, pythonOlder, pythonAtLeast
-, astor
-, gast
-, google-pasta
-, wrapt
-, numpy
-, six
-, termcolor
-, protobuf
-, absl-py
-, grpcio
-, mock
-, backports_weakref
-, tensorflow-estimator_1
-, tensorflow-tensorboard
-, cudaSupport ? false
-, cudatoolkit ? null
-, cudnn ? null
-, nvidia_x11 ? null
-, zlib
-, python
-, symlinkJoin
-, keras-applications
-, keras-preprocessing
-, addOpenGLRunpath
-}:
-
-# We keep this binary build for two reasons:
-# - the source build doesn't work on Darwin.
-# - the source build is currently brittle and not easy to maintain
-
-assert cudaSupport -> cudatoolkit != null
-                   && cudnn != null
-                   && nvidia_x11 != null;
-
-# unsupported combination
-assert ! (stdenv.isDarwin && cudaSupport);
-
-let
-  packages = import ./binary-hashes.nix;
-
-  variant = if cudaSupport then "-gpu" else "";
-  pname = "tensorflow${variant}";
-
-in buildPythonPackage {
-  inherit pname;
-  inherit (packages) version;
-  format = "wheel";
-  disabled = pythonAtLeast "3.8";
-
-  src = let
-    pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
-    pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;
-    platform = if stdenv.isDarwin then "mac" else "linux";
-    unit = if cudaSupport then "gpu" else "cpu";
-    key = "${platform}_py_${pyver}_${unit}";
-  in fetchurl packages.${key};
-
-  propagatedBuildInputs = [
-    protobuf
-    numpy
-    termcolor
-    grpcio
-    six
-    astor
-    absl-py
-    gast
-    google-pasta
-    wrapt
-    tensorflow-estimator_1
-    tensorflow-tensorboard
-    keras-applications
-    keras-preprocessing
-  ] ++ lib.optional (!isPy3k) mock
-    ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
-
-  nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
-
-  # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
-  # and the propageted input tensorflow-tensorboard which causes environment collisions.
-  # another possibility would be to have tensorboard only in the buildInputs
-  # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79
-  postInstall = ''
-    rm $out/bin/tensorboard
-  '';
-
-  # Note that we need to run *after* the fixup phase because the
-  # libraries are loaded at runtime. If we run in preFixup then
-  # patchelf --shrink-rpath will remove the cuda libraries.
-  postFixup = let
-    rpath = stdenv.lib.makeLibraryPath
-      ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
-  in
-  lib.optionalString stdenv.isLinux ''
-    rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}"
-    internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
-    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      patchelf --set-rpath "$rrPath" "$lib"
-      ${lib.optionalString cudaSupport ''
-        addOpenGLRunpath "$lib"
-      ''}
-    done
-  '';
-
-
-  meta = with stdenv.lib; {
-    description = "Computation using data flow graphs for scalable machine learning";
-    homepage = "http://tensorflow.org";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jyp abbradar ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
-    # Python 2.7 build uses different string encoding.
-    # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253
-    broken = stdenv.isDarwin && !isPy3k;
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix
deleted file mode 100644
index fa4809dc3f19..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-version = "1.14.0";
-linux_py_27_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl";
-  sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k";
-};
-linux_py_35_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj";
-};
-linux_py_36_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44";
-};
-linux_py_37_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl";
-  sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5";
-};
-linux_py_27_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl";
-  sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5";
-};
-linux_py_35_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx";
-};
-linux_py_36_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd";
-};
-linux_py_37_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl";
-  sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2";
-};
-mac_py_2_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl";
-  sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26";
-};
-mac_py_3_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl";
-  sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3";
-};
-}
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix
deleted file mode 100644
index 4dd30e4687ad..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix
+++ /dev/null
@@ -1,456 +0,0 @@
-{ stdenv, pkgs, bazel_0_26, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
-, addOpenGLRunpath
-# Python deps
-, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python
-# Python libraries
-, numpy, tensorflow-tensorboard_1, backports_weakref, mock, enum34, absl-py
-, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta
-, functools32
-, opt-einsum
-, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1
-# Common deps
-, git, swig, which, binutils, glibcLocales, cython
-# Common libraries
-, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2
-, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib
-# Upsteam by default includes cuda support since tensorflow 1.15. We could do
-# that in nix as well. It would make some things easier and less confusing, but
-# it would also make the default tensorflow package unfree. See
-# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
-, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null
-, mklSupport ? false, mkl ? null
-# XLA without CUDA is broken
-, xlaSupport ? cudaSupport
-# Default from ./configure script
-, cudaCapabilities ? [ "3.5" "5.2" ]
-, sse42Support ? stdenv.hostPlatform.sse4_2Support
-, avx2Support  ? stdenv.hostPlatform.avx2Support
-, fmaSupport   ? stdenv.hostPlatform.fmaSupport
-# Darwin deps
-, Foundation, Security
-}:
-
-assert cudaSupport -> nvidia_x11 != null
-                   && cudatoolkit != null
-                   && cudnn != null;
-
-# unsupported combination
-assert ! (stdenv.isDarwin && cudaSupport);
-
-assert mklSupport -> mkl != null;
-
-let
-  withTensorboard = pythonOlder "3.6";
-
-  cudatoolkit_joined = symlinkJoin {
-    name = "${cudatoolkit.name}-merged";
-    paths = [
-      cudatoolkit.lib
-      cudatoolkit.out
-      # for some reason some of the required libs are in the targets/x86_64-linux
-      # directory; not sure why but this works around it
-      "${cudatoolkit}/targets/${stdenv.system}"
-    ];
-  };
-
-  cudatoolkit_cc_joined = symlinkJoin {
-    name = "${cudatoolkit.cc.name}-merged";
-    paths = [
-      cudatoolkit.cc
-      binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip
-    ];
-  };
-
-  # Needed for _some_ system libraries, grep INCLUDEDIR.
-  includes_joined = symlinkJoin {
-    name = "tensorflow-deps-merged";
-    paths = [
-      pkgs.protobuf
-      jsoncpp
-    ];
-  };
-
-  tfFeature = x: if x then "1" else "0";
-
-  version = "1.15.4";
-  variant = if cudaSupport then "-gpu" else "";
-  pname = "tensorflow${variant}";
-
-  pythonEnv = python.withPackages (_:
-    [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that)
-      numpy
-      keras-preprocessing
-      protobuf
-      wrapt
-      gast
-      astor
-      absl-py
-      termcolor
-      keras-applications
-      setuptools
-      wheel
-  ] ++ lib.optionals (!isPy3k)
-  [ future
-    functools32
-    mock
-  ]);
-
-  bazel-build = buildBazelPackage {
-    name = "${pname}-${version}";
-    bazel = bazel_0_26;
-
-    src = fetchFromGitHub {
-      owner = "tensorflow";
-      repo = "tensorflow";
-      rev = "v${version}";
-      sha256 = "0lg8ahyr2k7dmp0yfypk8ivl9a0xcg3j0f0dakmn5ljk8nsji0bj";
-    };
-
-    patches = [
-      # Work around https://github.com/tensorflow/tensorflow/issues/24752
-      ../no-saved-proto.patch
-      # Fixes for NixOS jsoncpp
-      ../system-jsoncpp.patch
-
-      # https://github.com/tensorflow/tensorflow/pull/29673
-      (fetchpatch {
-        name = "fix-compile-with-cuda-and-mpi.patch";
-        url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch";
-        sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di";
-      })
-      (fetchpatch {
-        name = "backport-pr-18950.patch";
-        url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch";
-        sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz";
-      })
-
-      (fetchpatch {
-        # be compatible with gast >0.2 instead of only gast 0.2.2
-        name = "gast-update.patch";
-        url = "https://github.com/tensorflow/tensorflow/commit/85751ad6c7f5fd12c6c79545d96896cba92fa8b4.patch";
-        sha256 = "077cpj0kzyqxzdya1dwh8df17zfzhqn7c685hx6iskvw2979zg2n";
-      })
-      ./lift-gast-restriction.patch
-
-      (fetchpatch {
-        # fix compilation with numpy >= 1.19
-        name = "add-const-overload.patch";
-        url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
-        sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
-      })
-
-      # cuda 10.2 does not have "-bin2c-path" option anymore
-      # https://github.com/tensorflow/tensorflow/issues/34429
-      ../cuda-10.2-no-bin2c-path.patch
-    ];
-
-    # On update, it can be useful to steal the changes from gentoo
-    # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
-
-    nativeBuildInputs = [
-      swig which pythonEnv
-    ] ++ lib.optional cudaSupport addOpenGLRunpath;
-
-    buildInputs = [
-      jemalloc
-      openmpi
-      glibcLocales
-      git
-
-      # libs taken from system through the TF_SYS_LIBS mechanism
-      # grpc
-      sqlite
-      openssl
-      jsoncpp
-      pkgs.protobuf
-      curl
-      snappy
-      flatbuffers
-      icu
-      double-conversion
-      libpng
-      libjpeg
-      giflib
-      re2
-      pkgs.lmdb
-    ] ++ lib.optionals cudaSupport [
-      cudatoolkit
-      cudnn
-      nvidia_x11
-    ] ++ lib.optionals mklSupport [
-      mkl
-    ] ++ lib.optionals stdenv.isDarwin [
-      Foundation
-      Security
-    ];
-
-    # arbitrarily set to the current latest bazel version, overly careful
-    TF_IGNORE_MAX_BAZEL_VERSION = true;
-
-    # Take as many libraries from the system as possible. Keep in sync with
-    # list of valid syslibs in
-    # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl
-    TF_SYSTEM_LIBS = lib.concatStringsSep "," [
-      "absl_py"
-      "astor_archive"
-      "boringssl"
-      # Not packaged in nixpkgs
-      # "com_github_googleapis_googleapis"
-      # "com_github_googlecloudplatform_google_cloud_cpp"
-      "com_google_protobuf"
-      "com_googlesource_code_re2"
-      "curl"
-      "cython"
-      "double_conversion"
-      "flatbuffers"
-      "gast_archive"
-      "gif_archive"
-      # Lots of errors, requires an older version
-      # "grpc"
-      "hwloc"
-      "icu"
-      "jpeg"
-      "jsoncpp_git"
-      "keras_applications_archive"
-      "lmdb"
-      "nasm"
-      # "nsync" # not packaged in nixpkgs
-      "opt_einsum_archive"
-      "org_sqlite"
-      "pasta"
-      "pcre"
-      "png_archive"
-      "six_archive"
-      "snappy"
-      "swig"
-      "termcolor_archive"
-      "wrapt"
-      "zlib_archive"
-    ];
-
-    INCLUDEDIR = "${includes_joined}/include";
-
-    PYTHON_BIN_PATH = pythonEnv.interpreter;
-
-    TF_NEED_GCP = true;
-    TF_NEED_HDFS = true;
-    TF_ENABLE_XLA = tfFeature xlaSupport;
-
-    CC_OPT_FLAGS = " ";
-
-    # https://github.com/tensorflow/tensorflow/issues/14454
-    TF_NEED_MPI = tfFeature cudaSupport;
-
-    TF_NEED_CUDA = tfFeature cudaSupport;
-    TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}";
-    GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
-    GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc";
-    TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
-
-    postPatch = ''
-      # https://github.com/tensorflow/tensorflow/issues/20919
-      sed -i '/androidndk/d' tensorflow/lite/kernels/internal/BUILD
-
-      # Tensorboard pulls in a bunch of dependencies, some of which may
-      # include security vulnerabilities. So we make it optional.
-      # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560
-      sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py
-
-      substituteInPlace tensorflow/tools/pip_package/setup.py \
-        --replace "numpy >= 1.16.0, < 1.19.0" "numpy >= 1.16.0"
-
-      # glibc 2.31+ does not have sys/sysctl.h
-      # see https://github.com/tensorflow/tensorflow/issues/45861
-      substituteInPlace third_party/hwloc/BUILD.bazel\
-        --replace "#define HAVE_SYS_SYSCTL_H 1" "#undef HAVE_SYS_SYSCTL_H"
-    '';
-
-    preConfigure = let
-      opt_flags = []
-        ++ lib.optionals sse42Support ["-msse4.2"]
-        ++ lib.optionals avx2Support ["-mavx2"]
-        ++ lib.optionals fmaSupport ["-mfma"];
-    in ''
-      patchShebangs configure
-
-      # dummy ldconfig
-      mkdir dummy-ldconfig
-      echo "#!${stdenv.shell}" > dummy-ldconfig/ldconfig
-      chmod +x dummy-ldconfig/ldconfig
-      export PATH="$PWD/dummy-ldconfig:$PATH"
-
-      export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages"
-      export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}"
-      mkdir -p "$PYTHON_LIB_PATH"
-
-      # To avoid mixing Python 2 and Python 3
-      unset PYTHONPATH
-    '';
-
-    configurePhase = ''
-      runHook preConfigure
-      ./configure
-      runHook postConfigure
-    '';
-
-    # FIXME: Tensorflow uses dlopen() for CUDA libraries.
-    NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn";
-
-    hardeningDisable = [ "format" ];
-
-    bazelFlags = [
-      # temporary fixes to make the build work with bazel 0.27
-      "--incompatible_no_support_tools_in_action_inputs=false"
-    ];
-    bazelBuildFlags = [
-      "--config=opt" # optimize using the flags set in the configure phase
-    ]
-    ++ lib.optionals (mklSupport) [ "--config=mkl" ];
-
-    bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow";
-
-    fetchAttrs = {
-      # So that checksums don't depend on these.
-      TF_SYSTEM_LIBS = null;
-
-      # cudaSupport causes fetch of ncclArchive, resulting in different hashes
-      sha256 = if cudaSupport then
-        "1bi6aydidgi943hiqj0d279jbz2g173hvafdqla1ifw2qdsm73pb"
-      else
-        "0l5510fr8n22c4hx9llr0vqqhx9wlgkyxl55fxbixhssd0ai05r4";
-    };
-
-    buildAttrs = {
-      outputs = [ "out" "python" ];
-
-      preBuild = ''
-        patchShebangs .
-      '';
-
-      installPhase = ''
-        mkdir -p "$out"
-        tar -xf bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz -C "$out"
-        # Write pkgconfig file.
-        mkdir "$out/lib/pkgconfig"
-        cat > "$out/lib/pkgconfig/tensorflow.pc" << EOF
-        Name: TensorFlow
-        Version: ${version}
-        Description: Library for computation using data flow graphs for scalable machine learning
-        Requires:
-        Libs: -L$out/lib -ltensorflow
-        Cflags: -I$out/include/tensorflow
-        EOF
-
-        # build the source code, then copy it to $python (build_pip_package
-        # actually builds a symlink farm so we must dereference them).
-        bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist"
-        cp -Lr "$PWD/dist" "$python"
-      '';
-
-      postFixup = lib.optionalString cudaSupport ''
-        find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-          addOpenGLRunpath "$lib"
-        done
-      '';
-    };
-
-    meta = with stdenv.lib; {
-      description = "Computation using data flow graphs for scalable machine learning";
-      homepage = "http://tensorflow.org";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ jyp abbradar ];
-      platforms = with platforms; linux ++ darwin;
-      # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in
-      # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b
-      broken = !(xlaSupport -> cudaSupport) || !isPy3k;
-    };
-  };
-
-in buildPythonPackage {
-  inherit version pname;
-  disabled = isPy27 || (pythonAtLeast "3.8");
-
-  src = bazel-build.python;
-
-  # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
-  # and the propagated input tensorflow-tensorboard, which causes environment collisions.
-  # Another possibility would be to have tensorboard only in the buildInputs
-  # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79
-  postInstall = ''
-    rm $out/bin/tensorboard
-  '';
-
-  setupPyGlobalFlags = [ "--project_name ${pname}" ];
-
-  # tensorflow/tools/pip_package/setup.py
-  propagatedBuildInputs = [
-    absl-py
-    astor
-    gast
-    google-pasta
-    keras-applications
-    keras-preprocessing
-    numpy
-    six
-    protobuf
-    tensorflow-estimator_1
-    termcolor
-    wrapt
-    grpcio
-    opt-einsum
-  ] ++ lib.optionals (!isPy3k) [
-    mock
-    future
-    functools32
-  ] ++ lib.optionals (pythonOlder "3.4") [
-    backports_weakref enum34
-  ] ++ lib.optionals withTensorboard [
-    tensorflow-tensorboard_1
-  ];
-
-  nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
-
-  postFixup = lib.optionalString cudaSupport ''
-    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addOpenGLRunpath "$lib"
-    done
-  '';
-
-  # Actual tests are slow and impure.
-  # TODO try to run them anyway
-  # TODO better test (files in tensorflow/tools/ci_build/builds/*test)
-  checkPhase = ''
-    ${python.interpreter} <<EOF
-    # A simple "Hello world"
-    import tensorflow as tf
-    hello = tf.constant("Hello, world!")
-    sess = tf.Session()
-    sess.run(hello)
-
-    # Fit a simple model to random data
-    import numpy as np
-    np.random.seed(0)
-    tf.random.set_random_seed(0)
-    model = tf.keras.models.Sequential([
-        tf.keras.layers.Dense(1, activation="linear")
-    ])
-    model.compile(optimizer="sgd", loss="mse")
-
-    x = np.random.uniform(size=(1,1))
-    y = np.random.uniform(size=(1,))
-    model.fit(x, y, epochs=1)
-
-    # regression test for #77626
-    from tensorflow.contrib import tensor_forest
-    EOF
-  '';
-
-  passthru = {
-    deps = bazel-build.deps;
-    libtensorflow = bazel-build.out;
-  };
-
-  meta = bazel-build.meta // {
-    broken = gast.version != "0.3.2";
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch
deleted file mode 100644
index 30861d923417..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index 992f2eae22..d9386f9b13 100644
---- a/tensorflow/tools/pip_package/setup.py
-+++ b/tensorflow/tools/pip_package/setup.py
-@@ -54,7 +54,7 @@ REQUIRED_PACKAGES = [
-     'enum34 >= 1.1.6;python_version<"3.4"',
-     # functools comes with python3, need to install the backport for python2
-     'functools32 >= 3.2.3;python_version<"3"',
--    'gast == 0.2.2',
-+    'gast >= 0.2.2',
-     'google_pasta >= 0.1.6',
-     'keras_applications >= 1.0.8',
-     'keras_preprocessing >= 1.0.5',
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/1/prefetcher.sh b/nixpkgs/pkgs/development/python-modules/tensorflow/1/prefetcher.sh
deleted file mode 100755
index d590fb0f1732..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/1/prefetcher.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-version=1.14.0
-hashfile=binary-hashes.nix
-rm -f $hashfile
-echo "{" >> $hashfile
-echo "version = \"$version\";" >> $hashfile
-for sys in "linux" "mac"; do
-    for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do
-        for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do
-            if [ $sys == "mac" ]; then
-               [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]]
-               result=$?
-               pyver=${pykind:2:1}
-               flavour=cpu
-            else
-               [[ $pykind =~ .*linux.* ]]
-               result=$?
-               pyver=${pykind:2:2}
-               flavour=${tfpref:0:3}
-            fi
-            if [ $result == 0 ]; then
-                url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl
-                hash=$(nix-prefetch-url $url)
-                echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile
-                echo "  url = \"$url\";" >> $hashfile
-                echo "  sha256 = \"$hash\";" >> $hashfile
-                echo "};" >> $hashfile
-            fi
-        done
-    done
-done
-echo "}" >> $hashfile
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch
deleted file mode 100644
index fc11a04cbdc5..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index 594e74f40c0..bfbf010144f 100644
---- a/tensorflow/tools/pip_package/setup.py
-+++ b/tensorflow/tools/pip_package/setup.py
-@@ -54,9 +54,9 @@ _VERSION = '2.3.1'
- REQUIRED_PACKAGES = [
-     'absl-py >= 0.7.0',
-     'astunparse == 1.6.3',
--    'gast == 0.3.3',
-+    'gast >= 0.3.3',
-     'google_pasta >= 0.1.8',
--    'h5py >= 2.10.0, < 2.11.0',
-+    'h5py >= 2.10.0',
-     'keras_preprocessing >= 1.1.1, < 1.2',
-     # TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage
-     # https://github.com/numpy/numpy/pull/15355
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
index 8dd282666a75..ef6d4f45ef9b 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
@@ -125,7 +125,7 @@ in buildPythonPackage {
         zlib
       ];
 
-      rpath = stdenv.lib.makeLibraryPath (libpaths ++ cudapaths);
+      rpath = lib.makeLibraryPath (libpaths ++ cudapaths);
     in
     lib.optionalString stdenv.isLinux ''
       # This is an array containing all the directories in the tensorflow2
@@ -174,7 +174,7 @@ in buildPythonPackage {
     "tensorflow.python.framework"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Computation using data flow graphs for scalable machine learning";
     homepage = "http://tensorflow.org";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix
index 90848e93273f..90848e93273f 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch
deleted file mode 100644
index 25f1ba7a5518..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/third_party/nccl/build_defs.bzl.tpl
-+++ b/third_party/nccl/build_defs.bzl.tpl
-@@ -113,7 +113,6 @@ def _device_link_impl(ctx):
-             "--cmdline=--compile-only",
-             "--link",
-             "--compress-all",
--            "--bin2c-path=%s" % bin2c.dirname,
-             "--create=%s" % tmp_fatbin.path,
-             "--embedded-fatbin=%s" % fatbin_h.path,
-         ] + images,
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
index 68c983c05941..9f64a689e2b8 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,24 +1,25 @@
-{ stdenv, pkgs, bazel_3, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
+{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
 , addOpenGLRunpath
 # Python deps
-, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python
+, buildPythonPackage, pythonOlder, pythonAtLeast, python
 # Python libraries
-, numpy, tensorflow-tensorboard_2, backports_weakref, mock, enum34, absl-py
-, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta
-, functools32
+, numpy, tensorflow-tensorboard_2, absl-py
+, future, setuptools, wheel, keras-preprocessing, google-pasta
 , opt-einsum, astunparse, h5py
 , termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2
+, dill, flatbuffers-python, tblib, typing-extensions
 # Common deps
-, git, swig, which, binutils, glibcLocales, cython
+, git, pybind11, which, binutils, glibcLocales, cython, perl
 # Common libraries
-, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2
-, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib
+, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp
+, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib
 # Upsteam by default includes cuda support since tensorflow 1.15. We could do
 # that in nix as well. It would make some things easier and less confusing, but
 # it would also make the default tensorflow package unfree. See
 # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
 , cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null
 , mklSupport ? false, mkl ? null
+, tensorboardSupport ? true
 # XLA without CUDA is broken
 , xlaSupport ? cudaSupport
 # Default from ./configure script
@@ -39,7 +40,7 @@ assert ! (stdenv.isDarwin && cudaSupport);
 assert mklSupport -> mkl != null;
 
 let
-  withTensorboard = pythonOlder "3.6";
+  withTensorboard = (pythonOlder "3.6") || tensorboardSupport;
 
   cudatoolkit_joined = symlinkJoin {
     name = "${cudatoolkit.name}-merged";
@@ -65,34 +66,40 @@ let
   includes_joined = symlinkJoin {
     name = "tensorflow-deps-merged";
     paths = [
-      pkgs.protobuf
       jsoncpp
     ];
   };
 
   tfFeature = x: if x then "1" else "0";
 
-  version = "2.3.1";
+  version = "2.4.0";
   variant = if cudaSupport then "-gpu" else "";
   pname = "tensorflow${variant}";
 
   pythonEnv = python.withPackages (_:
     [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that)
-      numpy
+      # This list can likely be shortened, but each trial takes multiple hours so won't bother for now.
+      absl-py
+      astunparse
+      dill
+      flatbuffers-python
+      gast
+      google-pasta
+      grpcio
+      h5py
       keras-preprocessing
+      numpy
+      opt-einsum
       protobuf
-      wrapt
-      gast
-      astor
-      absl-py
-      termcolor
-      keras-applications
       setuptools
+      six
+      tblib
+      tensorflow-estimator_2
+      tensorflow-tensorboard_2
+      termcolor
+      typing-extensions
       wheel
-  ] ++ lib.optionals (!isPy3k)
-  [ future
-    functools32
-    mock
+      wrapt
   ]);
 
   bazel-build = buildBazelPackage {
@@ -103,51 +110,44 @@ let
       owner = "tensorflow";
       repo = "tensorflow";
       rev = "v${version}";
-      sha256 = "1lvmrqfnwzh24fl5rdkksiqfv2bn0ld5gvzq1z57rphfkf0zg996";
+      sha256 = "0yl06aypfxrcs35828xf04mkidz1x0j89v0q5h4d2xps1cb5rv3f";
     };
 
     patches = [
-      # Fixes for NixOS jsoncpp
-      ../system-jsoncpp.patch
-
+      # Relax too strict Python packages versions dependencies.
       ./relax-dependencies.patch
-
-      # see https://github.com/tensorflow/tensorflow/issues/40688
-      (fetchpatch {
-        url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
-        sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
-      })
+      # Add missing `io_bazel_rules_docker` dependency.
+      ./workspace.patch
     ];
 
     # On update, it can be useful to steal the changes from gentoo
     # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
 
     nativeBuildInputs = [
-      swig which pythonEnv
+      which pythonEnv cython perl
     ] ++ lib.optional cudaSupport addOpenGLRunpath;
 
     buildInputs = [
       jemalloc
-      openmpi
+      mpi
       glibcLocales
       git
 
       # libs taken from system through the TF_SYS_LIBS mechanism
       grpc
       sqlite
-      openssl
+      boringssl
       jsoncpp
-      pkgs.protobuf
       curl
+      pybind11
       snappy
-      flatbuffers
+      flatbuffers-core
       icu
       double-conversion
       libpng
-      libjpeg
+      libjpeg_turbo
       giflib
-      re2
-      pkgs.lmdb
+      lmdb-core
     ] ++ lib.optionals cudaSupport [
       cudatoolkit
       cudnn
@@ -173,10 +173,17 @@ let
       # "com_github_googleapis_googleapis"
       # "com_github_googlecloudplatform_google_cloud_cpp"
       "com_github_grpc_grpc"
-      "com_google_protobuf"
-      "com_googlesource_code_re2"
+      # Multiple issues with custom protobuf.
+      # First `com_github_googleapis` fails to configure. Can be worked around by disabling `com_github_googleapis`
+      # and related functionality, but then the next error is about "dangling symbolic link", and in general
+      # looks like that's only the beginning: see
+      # https://stackoverflow.com/questions/55578884/how-to-build-tensorflow-1-13-1-with-custom-protobuf
+      # "com_google_protobuf"
+      # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
+      # "com_googlesource_code_re2"
       "curl"
       "cython"
+      "dill_archive"
       "double_conversion"
       "enum34_archive"
       "flatbuffers"
@@ -198,8 +205,9 @@ let
       "pybind11"
       "six_archive"
       "snappy"
-      "swig"
+      "tblib_archive"
       "termcolor_archive"
+      "typing_extensions_archive"
       "wrapt"
       "zlib"
     ];
@@ -224,18 +232,18 @@ let
     TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
 
     postPatch = ''
+      # bazel 3.3 should work just as well as bazel 3.1
+      rm -f .bazelversion
+    '' + lib.optionalString (!withTensorboard) ''
       # Tensorboard pulls in a bunch of dependencies, some of which may
       # include security vulnerabilities. So we make it optional.
       # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560
-      sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py
-
-      # numpy 1.19 added in https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch
-      sed -i 's/numpy >= 1.16.0, < 1.19.0/numpy >= 1.16.0/' tensorflow/tools/pip_package/setup.py
-
-      # bazel 3.3 should work just as well as bazel 3.1
-      rm -f .bazelversion
+      sed -i '/tensorboard ~=/d' tensorflow/tools/pip_package/setup.py
     '';
 
+    # https://github.com/tensorflow/tensorflow/pull/39470
+    NIX_CFLAGS_COMPILE = [ "-Wno-stringop-truncation" ];
+
     preConfigure = let
       opt_flags = []
         ++ lib.optionals sse42Support ["-msse4.2"]
@@ -274,16 +282,15 @@ let
     bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow";
 
     removeRulesCC = false;
+    # Without this Bazel complaints about sandbox violations.
+    dontAddBazelOpts = true;
 
     fetchAttrs = {
-      # So that checksums don't depend on these.
-      TF_SYSTEM_LIBS = null;
-
       # cudaSupport causes fetch of ncclArchive, resulting in different hashes
       sha256 = if cudaSupport then
-        "11blnw3ghp1kdi9hh9pdqa4qni9ysc3nk9iqqk9bg4dlr9zl1yld"
+        "0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz"
       else
-        "1kkghhwhl8frs68kv28r408lps7mpgq1xvq6hc3k0j35asv1g2kc";
+        "0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9";
     };
 
     buildAttrs = {
@@ -320,21 +327,19 @@ let
       '';
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Computation using data flow graphs for scalable machine learning";
       homepage = "http://tensorflow.org";
       license = licenses.asl20;
       maintainers = with maintainers; [ jyp abbradar ];
       platforms = with platforms; linux ++ darwin;
-      # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in
-      # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b
-      broken = !(xlaSupport -> cudaSupport) || !isPy3k;
+      broken = !(xlaSupport -> cudaSupport);
     };
   };
 
 in buildPythonPackage {
   inherit version pname;
-  disabled = isPy27;
+  disabled = !isPy3k;
 
   src = bazel-build.python;
 
@@ -351,27 +356,23 @@ in buildPythonPackage {
   # tensorflow/tools/pip_package/setup.py
   propagatedBuildInputs = [
     absl-py
-    astor
+    astunparse
+    dill
+    flatbuffers-python
     gast
     google-pasta
-    keras-applications
+    grpcio
+    h5py
     keras-preprocessing
     numpy
-    six
+    opt-einsum
     protobuf
+    six
+    tblib
     tensorflow-estimator_2
     termcolor
+    typing-extensions
     wrapt
-    grpcio
-    opt-einsum
-    astunparse
-    h5py
-  ] ++ lib.optionals (!isPy3k) [
-    mock
-    future
-    functools32
-  ] ++ lib.optionals (pythonOlder "3.4") [
-    backports_weakref enum34
   ] ++ lib.optionals withTensorboard [
     tensorflow-tensorboard_2
   ];
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/no-saved-proto.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/no-saved-proto.patch
deleted file mode 100644
index ead112f8ddd6..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/no-saved-proto.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD
-index 8626ed0087..27deb34387 100644
---- a/tensorflow/cc/saved_model/BUILD
-+++ b/tensorflow/cc/saved_model/BUILD
-@@ -49,9 +49,6 @@ cc_library(
-         # tf_lib depending on the build platform.
-         "//tensorflow/core:lib",
-         "//tensorflow/core:protos_all_cc",
--    ]) + if_mobile([
--        # Mobile-friendly SavedModel proto. See go/portable-proto for more info.
--        "//tensorflow/core:saved_model_portable_proto",
-     ]) + if_android([
-         "//tensorflow/core:android_tensorflow_lib",
-     ]) + if_ios([
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/2/prefetcher.sh b/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh
index abb0faac2834..abb0faac2834 100755
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/2/prefetcher.sh
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/relax-dependencies.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/relax-dependencies.patch
new file mode 100644
index 000000000000..b26c1e95a645
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/relax-dependencies.patch
@@ -0,0 +1,51 @@
+diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
+index 65133afdafe..8ef6364ff7e 100644
+--- a/tensorflow/tools/pip_package/setup.py
++++ b/tensorflow/tools/pip_package/setup.py
+@@ -75,23 +75,23 @@ if '--project_name' in sys.argv:
+ # comment the versioning scheme.
+ # NOTE: Please add test only packages to `TEST_PACKAGES` below.
+ REQUIRED_PACKAGES = [
+-    'absl-py ~= 0.10',
+-    'astunparse ~= 1.6.3',
+-    'flatbuffers ~= 1.12.0',
+-    'google_pasta ~= 0.2',
+-    'h5py ~= 2.10.0',
+-    'keras_preprocessing ~= 1.1.2',
+-    'numpy ~= 1.19.2',
+-    'opt_einsum ~= 3.3.0',
++    'absl-py >= 0.10',
++    'astunparse >= 1.6.3',
++    'flatbuffers >= 1.12.0',
++    'google_pasta >= 0.2',
++    'h5py >= 2.10.0',
++    'keras_preprocessing >= 1.1.2',
++    'numpy >= 1.19.1',
++    'opt_einsum >= 3.3.0',
+     'protobuf >= 3.9.2',
+-    'six ~= 1.15.0',
+-    'termcolor ~= 1.1.0',
+-    'typing_extensions ~= 3.7.4',
+-    'wheel ~= 0.35',
+-    'wrapt ~= 1.12.1',
++    'six >= 1.15.0',
++    'termcolor >= 1.1.0',
++    'typing_extensions >= 3.7.4',
++    'wheel >= 0.34.2',
++    'wrapt >= 1.12.1',
+     # These packages needs to be pinned exactly as newer versions are
+     # incompatible with the rest of the ecosystem
+-    'gast == 0.3.3',
++    'gast >= 0.3.3',
+     # TensorFlow ecosystem packages that TF exposes API for
+     # These need to be in sync with the existing TF version
+     # They are updated during the release process
+@@ -118,7 +118,7 @@ if 'tf_nightly' in project_name:
+ # BoringSSL support.
+ # See https://github.com/tensorflow/tensorflow/issues/17882.
+ if sys.byteorder == 'little':
+-  REQUIRED_PACKAGES.append('grpcio ~= 1.32.0')
++  REQUIRED_PACKAGES.append('grpcio >= 1.31.0')
+ 
+ 
+ # Packages which are only needed for testing code.
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch
deleted file mode 100644
index ecb2d04d7eef..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/third_party/systemlibs/jsoncpp.BUILD b/third_party/systemlibs/jsoncpp.BUILD
-index 526fd0c418..646f3fdcea 100644
---- a/third_party/systemlibs/jsoncpp.BUILD
-+++ b/third_party/systemlibs/jsoncpp.BUILD
-@@ -7,6 +7,7 @@ filegroup(
- 
- HEADERS = [
-     "include/json/autolink.h",
-+    "include/json/allocator.h",
-     "include/json/config.h",
-     "include/json/features.h",
-     "include/json/forwards.h",
-@@ -23,7 +24,7 @@ genrule(
-     cmd = """
-       for i in $(OUTS); do
-         i=$${i##*/}
--        ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i
-+        ln -sf $(INCLUDEDIR)/json/$$i $(@D)/include/json/$$i
-       done
-     """,
- )
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/workspace.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/workspace.patch
new file mode 100644
index 000000000000..15a527815ec3
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/workspace.patch
@@ -0,0 +1,18 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index 9db1d9b80eb..c46f13f4ca4 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -12,6 +12,13 @@ http_archive(
+     ],
+ )
+ 
++http_archive(
++    name = "io_bazel_rules_docker",
++    sha256 = "1698624e878b0607052ae6131aa216d45ebb63871ec497f26c67455b34119c80",
++    strip_prefix = "rules_docker-0.15.0",
++    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.15.0/rules_docker-v0.15.0.tar.gz"],
++)
++
+ # Load tf_repositories() before loading dependencies for other repository so
+ # that dependencies like com_google_protobuf won't be overridden.
+ load("//tensorflow:workspace.bzl", "tf_repositories")
diff --git a/nixpkgs/pkgs/development/python-modules/termcolor/default.nix b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix
index 7879482f17d7..df0f4d6208a3 100644
--- a/nixpkgs/pkgs/development/python-modules/termcolor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Termcolor";
     homepage = "https://pypi.python.org/pypi/termcolor";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix b/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix
index bb6961f77ecf..28e49316ad71 100644
--- a/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Display simple tables in terminals";
     homepage = "https://github.com/Robpol86/terminaltables";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix
new file mode 100644
index 000000000000..c4520b1c1982
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, aiohttp
+, backoff
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, wrapt
+}:
+
+buildPythonPackage rec {
+  pname = "teslajsonpy";
+  version = "0.10.4";
+
+  src = fetchFromGitHub {
+    owner = "zabuldon";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "18frynmy47i9c24mdy819y2dnjwmhnmkly5mbmhikpbmm6d0yjf1";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    backoff
+    wrapt
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  # Not all Home Assistant related check pass
+  disabledTests = [ "test_values_on_init" ];
+  pythonImportsCheck = [ "teslajsonpy" ];
+
+  meta = with lib; {
+    description = "Python library to work with Tesla API";
+    homepage = "https://github.com/zabuldon/teslajsonpy";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/testpath/default.nix b/nixpkgs/pkgs/development/python-modules/testpath/default.nix
index 8357cd2c4568..a5ab52e5cdd5 100644
--- a/nixpkgs/pkgs/development/python-modules/testpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testpath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "bfcf9411ef4bf3db7579063e0546938b1edda3d69f4e1fb8756991f5951f85d4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Test utilities for code working with files and commands";
     license = licenses.mit;
     homepage = "https://github.com/jupyter/testpath";
diff --git a/nixpkgs/pkgs/development/python-modules/testrepository/default.nix b/nixpkgs/pkgs/development/python-modules/testrepository/default.nix
index f3c7e169207f..c249ca212b6d 100644
--- a/nixpkgs/pkgs/development/python-modules/testrepository/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testrepository/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , testtools
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ${python.interpreter} ./testr
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A database of test results which can be used as part of developer workflow";
     homepage = "https://pypi.python.org/pypi/testrepository";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix b/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix
index 751ab02670a3..465384edcb0c 100644
--- a/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , testtools
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ testtools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pyunit extension for dependency injection";
     homepage = "https://pypi.python.org/pypi/testscenarios";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/nixpkgs/pkgs/development/python-modules/thinc/default.nix
index cfc926424605..bd520f2c4bfd 100644
--- a/nixpkgs/pkgs/development/python-modules/thinc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thinc/default.nix
@@ -74,7 +74,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "thinc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Practical Machine Learning for NLP in Python";
     homepage = "https://github.com/explosion/thinc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/threadpool/default.nix b/nixpkgs/pkgs/development/python-modules/threadpool/default.nix
index bbc3074c9642..7a1696feb665 100644
--- a/nixpkgs/pkgs/development/python-modules/threadpool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/threadpool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "197gzrxn9lbk0q1v079814c6s05cr4rwzyl6c1m6inkyif4yzr6c";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://chrisarndt.de/projects/threadpool/";
     description = "Easy to use object-oriented thread pool framework";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/three-merge/default.nix b/nixpkgs/pkgs/development/python-modules/three-merge/default.nix
new file mode 100644
index 000000000000..dab312c88455
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/three-merge/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, diff-match-patch }:
+
+buildPythonPackage rec {
+  pname = "three-merge";
+  version = "0.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0w6rv7rv1zm901wbjkmm6d3vkwyf3csja9p37bb60mar8khszxk0";
+  };
+
+  propagatedBuildInputs = [ diff-match-patch ];
+
+  dontUseSetuptoolsCheck = true;
+
+  pythonImportsCheck = [ "three_merge" ];
+
+  meta = with lib; {
+    description = "Simple library for merging two strings with respect to a base one";
+    homepage = "https://github.com/spyder-ide/three-merge";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/thrift/default.nix b/nixpkgs/pkgs/development/python-modules/thrift/default.nix
index 999d950771c7..c7279b867b10 100644
--- a/nixpkgs/pkgs/development/python-modules/thrift/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thrift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # No tests. Breaks when not disabling.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for the Apache Thrift RPC system";
     homepage = "http://thrift.apache.org/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix b/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix
index 586045edc273..abfad4ffaac9 100644
--- a/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "96dcc03ea6066d9546baf54f6841f4048b0b24a291eed65d098b3348c8872d99";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Module to parse and edit the EXIF data tags in a JPEG image";
     homepage = "http://www.benno.id.au/code/pexif/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/tilestache/default.nix b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix
index d4e54fcc40e1..170360c133ed 100644
--- a/nixpkgs/pkgs/development/python-modules/tilestache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , modestmaps
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tile server for rendered geographic data";
     homepage = "http://tilestache.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/timelib/default.nix b/nixpkgs/pkgs/development/python-modules/timelib/default.nix
index 559dd0dd92f0..65b121ddfafd 100644
--- a/nixpkgs/pkgs/development/python-modules/timelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/timelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "6ac9f79b09b63bbc07db88525c1f62de1f6d50b0fd9937a0cb05e3d38ce0af45";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parse english textual date descriptions";
     homepage = "https://github.com/pediapress/timelib/";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix b/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
index d3b4a58c17e3..b1160cafe309 100644
--- a/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "timeout-decorator";
   version = "0.5.0";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
     sha256 = "6a2f2f58db1c5b24a2cc79de6345760377ad8bdc13813f5265f6c3e63d16b3d7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Timeout decorator";
     license = licenses.mit;
     homepage = "https://github.com/pnpnpn/timeout-decorator";
diff --git a/nixpkgs/pkgs/development/python-modules/tissue/default.nix b/nixpkgs/pkgs/development/python-modules/tissue/default.nix
index 8f551ab5926d..fc4316c98fe9 100644
--- a/nixpkgs/pkgs/development/python-modules/tissue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tissue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   buildInputs = [ nose ];
   propagatedBuildInputs = [ pep8 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/WoLpH/tissue";
     description = "Tissue - automated pep8 checker for nose";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/tkinter/default.nix b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix
index 1efebed98721..9f82dee45ef0 100644
--- a/nixpkgs/pkgs/development/python-modules/tkinter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , py
@@ -17,7 +18,7 @@ buildPythonPackage {
     # Move the tkinter module
     mkdir -p $out/${py.sitePackages}
     mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     # Update the rpath to point to python without x11Support
     old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
     new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
diff --git a/nixpkgs/pkgs/development/python-modules/tld/default.nix b/nixpkgs/pkgs/development/python-modules/tld/default.nix
index c3333aef9e1f..13f23edaad15 100644
--- a/nixpkgs/pkgs/development/python-modules/tld/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tld/default.nix
@@ -1,39 +1,39 @@
-{ stdenv, fetchPypi, python }:
-
-python.pkgs.buildPythonPackage rec {
-  pname   = "tld";
-  version = "0.12.4";
+{ lib
+, buildPythonPackage
+, factory_boy
+, faker
+, fetchPypi
+, pytest-cov
+, pytestCheckHook
+, six
+, tox
+}:
+
+buildPythonPackage rec {
+  pname = "tld";
+  version = "0.12.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0976g7jcpi3jv7snawmfis5ybb6737cv2xw7wlanlfkyqljip24x";
+    sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv";
   };
 
-  propagatedBuildInputs = with python.pkgs; [ six ];
-  checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook];
-
-  # https://github.com/barseghyanartur/tld/issues/54
-  disabledTests = [
-    "test_1_update_tld_names"
-    "test_1_update_tld_names_command"
-    "test_2_update_tld_names_module"
+  checkInputs = [
+    factory_boy
+    faker
+    pytest-cov
+    pytestCheckHook
+    tox
   ];
 
-  preCheck = ''
-    export PATH="$PATH:$out/bin"
-  '';
-
-  dontUseSetuptoolsCheck = true;
+  pythonImportsCheck = [ "tld" ];
 
-  pythonImportsCheck = [
-    "tld"
-  ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/barseghyanartur/tld";
     description = "Extracts the top level domain (TLD) from the URL given";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    # https://github.com/barseghyanartur/tld/blob/master/README.rst#license
+    # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
+    license = with licenses; [ lgpl21Plus mpl11 gpl2Only ];
+    maintainers = with maintainers; [ fab ];
   };
-
 }
diff --git a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
index 3448d40cf3a4..302b113364d2 100644
--- a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , cmake
@@ -24,7 +24,7 @@ buildPythonPackage {
     cd ../py_ext
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Trend Micro Locality Sensitive Hash";
     homepage = "https://github.com/trendmicro/tlsh";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix b/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
index 7c8bb17b8b70..a952c95d93e4 100644
--- a/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , ecdsa
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ ecdsa ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure python implementation of SSL and TLS.";
     homepage = "https://pypi.python.org/pypi/tlslite-ng";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/tlslite/default.nix b/nixpkgs/pkgs/development/python-modules/tlslite/default.nix
index ac0c572ec3e7..a1e78c5db76c 100644
--- a/nixpkgs/pkgs/development/python-modules/tlslite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tlslite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "9b9a487694c239efea8cec4454a99a56ee1ae1a5f3af0858ccf8029e2ac2d42d";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pure Python implementation of SSL and TLS";
     homepage = "https://pypi.python.org/pypi/tlslite";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/tmb/default.nix b/nixpkgs/pkgs/development/python-modules/tmb/default.nix
new file mode 100644
index 000000000000..713cf6139285
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/tmb/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "tmb";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "alemuro";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE=";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "tmb" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/alemuro/tmb";
+    description = "Python library that interacts with TMB API";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/todoist/default.nix b/nixpkgs/pkgs/development/python-modules/todoist/default.nix
index ac7817962300..62749d3b02f6 100644
--- a/nixpkgs/pkgs/development/python-modules/todoist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/todoist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , requests, fetchpatch, pythonOlder, typing
 }:
 
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing;
+  propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing;
 
-  meta = {
+  meta = with lib; {
     description = "The official Todoist Python API library";
     homepage = "https://todoist-python.readthedocs.io/en/latest/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ma27 ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
index c004c4a5d9f3..875e70cee58e 100644
--- a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder
 , click
 , click-completion
 , factory_boy
@@ -61,7 +61,7 @@ buildPythonPackage rec {
     validate-email
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://toggl.uhlir.dev/";
     description = "Command line tool and set of Python wrapper classes for interacting with toggl's API";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
index 4e5aacd6c7ac..ec435a0ac359 100644
--- a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , rustPlatform
 , fetchFromGitHub
 , fetchurl
@@ -7,6 +7,7 @@
 , wheel
 , numpy
 , python
+, datasets
 , pytestCheckHook
 , requests
 }:
@@ -50,16 +51,16 @@ let
   };
 in rustPlatform.buildRustPackage rec {
   pname = "tokenizers";
-  version = "0.9.4";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = "python-v${version}";
-    hash = "sha256-JXoH9yfhMIFg5qDY5zrF6iWb7XKugjMfk1NxSizfaWg=";
+    hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw=";
   };
 
-  cargoSha256 = "sha256-u9qitrOxJSABs0VjwHUZgmw7VTQXNbp6l8fKKE/RQ7M=";
+  cargoSha256 = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0=";
 
   sourceRoot = "source/bindings/python";
 
@@ -75,6 +76,7 @@ in rustPlatform.buildRustPackage rec {
   ];
 
   installCheckInputs = [
+    datasets
     pytestCheckHook
     requests
   ];
@@ -105,7 +107,16 @@ in rustPlatform.buildRustPackage rec {
     pipInstallPhase
   '';
 
-  meta = with stdenv.lib; {
+  preCheck = ''
+    HOME=$TMPDIR
+  '';
+
+  disabledTests = [
+    # Downloads data using the datasets module.
+    "TestTrainFromIterators"
+  ];
+
+  meta = with lib; {
     homepage = "https://github.com/huggingface/tokenizers";
     description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix b/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
index 7c8e99cc399a..2bed18870166 100644
--- a/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , requests
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests webob ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mozilla-services/tokenlib";
     description = "Generic support library for signed-token-based auth schemes";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/toml/default.nix b/nixpkgs/pkgs/development/python-modules/toml/default.nix
index 96c6635771c7..0d0d87c73d11 100644
--- a/nixpkgs/pkgs/development/python-modules/toml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "toml";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # git to download a test suite.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "a Python library for parsing and creating TOML";
     homepage = "https://github.com/uiri/toml";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/toonapi/default.nix b/nixpkgs/pkgs/development/python-modules/toonapi/default.nix
new file mode 100644
index 000000000000..003670989920
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/toonapi/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, aiohttp
+, backoff
+, buildPythonPackage
+, fetchFromGitHub
+, yarl
+}:
+
+buildPythonPackage rec {
+  pname = "toonapi";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "frenck";
+    repo = "python-toonapi";
+    rev = "v${version}";
+    sha256 = "1d4n615vlcgkvmchrfjw4h3ndav3ljmcfydxr2b41zn83mzizqdf";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    backoff
+    yarl
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "toonapi" ];
+
+  meta = with lib; {
+    description = "Python client for the Quby ToonAPI";
+    homepage = "https://github.com/frenck/python-toonapi";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/toposort/default.nix b/nixpkgs/pkgs/development/python-modules/toposort/default.nix
index f1767862ad32..43df3c4e21e9 100644
--- a/nixpkgs/pkgs/development/python-modules/toposort/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toposort/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A topological sort algorithm";
     homepage = "https://pypi.python.org/pypi/toposort/1.1";
     maintainers = with maintainers; [ tstrobel ];
diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix
index ea702a78fe1d..928616eb4f8a 100644
--- a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , ninja
@@ -41,7 +41,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PyTorch vision library";
     homepage = "https://pytorch.org/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/traceback2/default.nix b/nixpkgs/pkgs/development/python-modules/traceback2/default.nix
index 3a70df1548d0..5309ae47a02d 100644
--- a/nixpkgs/pkgs/development/python-modules/traceback2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/traceback2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pbr
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # circular dependencies for tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A backport of traceback to older supported Pythons";
     homepage = "https://pypi.python.org/pypi/traceback2/";
     license = licenses.psfl;
diff --git a/nixpkgs/pkgs/development/python-modules/tracing/default.nix b/nixpkgs/pkgs/development/python-modules/tracing/default.nix
index 6f9091d8517f..f4c01f003a9a 100644
--- a/nixpkgs/pkgs/development/python-modules/tracing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tracing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , sphinx
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://liw.fi/tracing/";
     description = "Python debug logging helper";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix
index 6d198534149d..ff4c4a767583 100644
--- a/nixpkgs/pkgs/development/python-modules/trackpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , numpy
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    ${stdenv.lib.optionalString (stdenv.isDarwin) ''
+    ${lib.optionalString (stdenv.isDarwin) ''
     # specifically needed for darwin
     export HOME=$(mktemp -d)
     mkdir -p $HOME/.matplotlib
@@ -49,7 +49,7 @@ buildPythonPackage rec {
                    --ignore trackpy/tests/test_legacy_linking.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Particle-tracking toolkit";
     homepage = "https://github.com/soft-matter/trackpy";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/traits/default.nix b/nixpkgs/pkgs/development/python-modules/traits/default.nix
index 789ba7a1691e..e3bc8b43fe4e 100644
--- a/nixpkgs/pkgs/development/python-modules/traits/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/traits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   # Furthermore, some tests fail due to being in a chroot
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Explicitly typed attributes for Python";
     homepage = "https://pypi.python.org/pypi/traits";
     license = "BSD";
diff --git a/nixpkgs/pkgs/development/python-modules/transaction/default.nix b/nixpkgs/pkgs/development/python-modules/transaction/default.nix
index 887c46863362..def2559a72d0 100644
--- a/nixpkgs/pkgs/development/python-modules/transaction/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transaction/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , zope_interface
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_interface mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Transaction management";
     homepage = "https://pypi.python.org/pypi/transaction";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix
index bd9040668c08..594204754408 100644
--- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix
@@ -1,32 +1,28 @@
 { buildPythonPackage
-, stdenv
+, lib, stdenv
 , fetchFromGitHub
-, isPy39
+, pythonOlder
 , cookiecutter
 , filelock
+, importlib-metadata
 , regex
 , requests
 , numpy
-, pandas
-, parameterized
 , protobuf
 , sacremoses
-, timeout-decorator
 , tokenizers
 , tqdm
-, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.1.1";
-  disabled = isPy39;
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1l1gxdsakjmzsgggypq45pnwm87brhlccjfzafs43460pz0wbd6k";
+    hash = "sha256-sBMCzEgYX6HQbzoEIYnmMdpYecCCsQjTdl2mO1Veu9M=";
   };
 
   propagatedBuildInputs = [
@@ -39,65 +35,18 @@ buildPythonPackage rec {
     sacremoses
     tokenizers
     tqdm
-  ];
+  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
-  checkInputs = [
-    pandas
-    parameterized
-    pytestCheckHook
-    timeout-decorator
-  ];
+  # Many tests require internet access.
+  doCheck = false;
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "tokenizers == 0.9.4" "tokenizers"
+    sed -ri 's/tokenizers==[0-9.]+/tokenizers/g' setup.py
   '';
 
-  preCheck = ''
-    export HOME="$TMPDIR"
+  pythonImportsCheck = [ "transformers" ];
 
-    # This test requires the `datasets` module to download test
-    # data. However, since we cannot download in the Nix sandbox
-    # and `dataset` is an optional dependency for transformers
-    # itself, we will just remove the tests files that import
-    # `dataset`.
-    rm tests/test_retrieval_rag.py
-    rm tests/test_trainer.py
-  '';
-
-  # We have to run from the main directory for the tests. However,
-  # letting pytest discover tests leads to errors.
-  pytestFlagsArray = [ "tests" ];
-
-  # Disable tests that require network access.
-  disabledTests = [
-    "BlenderbotSmallTokenizerTest"
-    "Blenderbot3BTokenizerTests"
-    "GetFromCacheTests"
-    "TokenizationTest"
-    "TestTokenizationBart"
-    "test_all_tokenizers"
-    "test_batch_encoding_is_fast"
-    "test_batch_encoding_pickle"
-    "test_batch_encoding_word_to_tokens"
-    "test_config_from_model_shortcut"
-    "test_config_model_type_from_model_identifier"
-    "test_from_pretrained_use_fast_toggle"
-    "test_hf_api"
-    "test_outputs_can_be_shorter"
-    "test_outputs_not_longer_than_maxlen"
-    "test_padding_accepts_tensors"
-    "test_pretokenized_tokenizers"
-    "test_tokenizer_equivalence_en_de"
-    "test_tokenizer_from_model_type"
-    "test_tokenizer_from_model_type"
-    "test_tokenizer_from_pretrained"
-    "test_tokenizer_from_tokenizer_class"
-    "test_tokenizer_identifier_with_correct_config"
-    "test_tokenizer_identifier_non_existent"
-  ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/huggingface/transformers";
     description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch";
     changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/python-modules/transip/default.nix b/nixpkgs/pkgs/development/python-modules/transip/default.nix
index 8ea70a19ead4..e270d5a0662d 100644
--- a/nixpkgs/pkgs/development/python-modules/transip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests cryptography suds-jurko ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "TransIP API Connector";
     homepage = "https://github.com/benkonrath/transip-api";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/nixpkgs/pkgs/development/python-modules/transitions/default.nix
index 2691890a5ee1..2dda33fd9682 100644
--- a/nixpkgs/pkgs/development/python-modules/transitions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transitions/default.nix
@@ -1,28 +1,23 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, six, nose, mock, dill, pycodestyle }:
+{ lib, buildPythonPackage, fetchFromGitHub
+, six, pytestCheckHook, mock, dill, pycodestyle }:
 
 buildPythonPackage rec {
   pname = "transitions";
-  version = "0.8.5";
+  version = "0.8.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b";
+  # test_codestyle.py fails in PyPI sdist
+  src = fetchFromGitHub {
+    owner = "pytransitions";
+    repo = "transitions";
+    rev = version;
+    sha256 = "1d913hzzyqhdhhbkbvjw65dqkajrw50a4sxhyxk0jlg8pcs7bs7v";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "dill<0.2.7" dill
-  '';
-
   propagatedBuildInputs = [ six ];
 
-  checkInputs = [ nose mock dill pycodestyle ];
-
-  checkPhase = ''
-    nosetests
-  '';
+  checkInputs = [ pytestCheckHook mock dill pycodestyle ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pytransitions/transitions";
     description = "A lightweight, object-oriented finite state machine implementation in Python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/translationstring/default.nix b/nixpkgs/pkgs/development/python-modules/translationstring/default.nix
index 013615de800b..2f39b57b480f 100644
--- a/nixpkgs/pkgs/development/python-modules/translationstring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/translationstring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "bf947538d76e69ba12ab17283b10355a9ecfbc078e6123443f43f2107f6376f3";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pylonsproject.org/";
     description = "Utility library for i18n relied on by various Repoze and Pyramid packages";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix b/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix
index eb209a0d49ec..a128b150579a 100644
--- a/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python implementation of the Transmission bittorent client RPC protocol";
     homepage = "https://pypi.python.org/pypi/transmissionrpc/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/treq/default.nix b/nixpkgs/pkgs/development/python-modules/treq/default.nix
index 919ef529407a..477223e96186 100644
--- a/nixpkgs/pkgs/development/python-modules/treq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/treq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six
+{ lib, stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six
 , mock, twisted, incremental, pep8, httpbin
 }:
 
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   # Failing tests https://github.com/twisted/treq/issues/208
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/twisted/treq";
     description = "A requests-like API built on top of twisted.web's Agent";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
index 82cb14b31cb1..537b4db7995a 100644
--- a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , trezor
@@ -24,7 +24,10 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ];
 
-  meta = with stdenv.lib; {
+  doCheck = false;
+  pythonImportsCheck = [ "libagent" ];
+
+  meta = with lib; {
     description = "Using Trezor as hardware SSH agent";
     homepage = "https://github.com/romanz/trezor-agent";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
index 251d6c3d94dd..b157e32ed876 100644
--- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.8.19";
+  version = "3.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e2ec4fc75bddf46fd494a9c95adc0bf0fe6f667cae242ead99955ad659d6e375";
+    sha256 = "d19cbdb830a17297aa218ba6ce4955fc11b4b553414289cfd71f58f8144cc91f";
   };
 
   propagatedBuildInputs = [ numpy ];
diff --git a/nixpkgs/pkgs/development/python-modules/trollius/default.nix b/nixpkgs/pkgs/development/python-modules/trollius/default.nix
index b81a92d08e66..019326c54217 100644
--- a/nixpkgs/pkgs/development/python-modules/trollius/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trollius/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Port of the asyncio project to Python 2.7";
     homepage = "https://github.com/vstinner/trollius";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/trueskill/default.nix b/nixpkgs/pkgs/development/python-modules/trueskill/default.nix
index 18033aff391c..0c3efa404ec6 100644
--- a/nixpkgs/pkgs/development/python-modules/trueskill/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trueskill/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , six }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # Can't build distribute, see https://github.com/NixOS/nixpkgs/pull/49340
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The video game rating system";
     homepage = "https://trueskill.org";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/nixpkgs/pkgs/development/python-modules/trytond/default.nix
index 7db53969402b..68254d8601ec 100644
--- a/nixpkgs/pkgs/development/python-modules/trytond/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trytond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonApplication
 , fetchPypi
 , pythonOlder
@@ -21,8 +21,6 @@
 , withPostgresql ? true
 }:
 
-with stdenv.lib;
-
 buildPythonApplication rec {
   pname = "trytond";
   version = "5.8.2";
@@ -56,14 +54,14 @@ buildPythonApplication rec {
     python-Levenshtein
     simplejson
     html2text
-  ] ++ stdenv.lib.optional withPostgresql psycopg2;
+  ] ++ lib.optional withPostgresql psycopg2;
 
   # If unset, trytond will try to mkdir /homeless-shelter
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
 
-  meta = {
+  meta = with lib; {
     description = "The server of the Tryton application platform";
     longDescription = ''
       The server for Tryton, a three-tier high-level general purpose
diff --git a/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix b/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
index a76a5f8df383..24eb10637078 100644
--- a/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , sphinx
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # error: invalid command 'test'
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://liw.fi/ttystatus/";
     description = "Progress and status updates on terminals for Python";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
index 297642599107..7a4b4454b3b6 100644
--- a/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
@@ -2,27 +2,27 @@
 , buildPythonPackage
 , internetarchive
 , fetchPypi
-, youtube-dlc
+, youtube-dl
 , docopt
 , isPy27
 }:
 
 buildPythonPackage rec {
   pname = "tubeup";
-  version = "0.0.20";
+  version = "0.0.21";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
+    sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6";
   };
 
   postPatch = ''
     substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
   '';
 
-  propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
+  propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
 
   pythonImportsCheck = [ "tubeup" ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/tumpa/default.nix b/nixpkgs/pkgs/development/python-modules/tumpa/default.nix
new file mode 100644
index 000000000000..6d953740eb80
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/tumpa/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools
+, pyside2
+, johnnycanencrypt
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "tumpa";
+  version = "0.1.1";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "kushaldas";
+    repo = "tumpa";
+    rev = "v${version}";
+    sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq";
+  };
+
+  propagatedBuildInputs = [
+    setuptools
+    johnnycanencrypt
+    pyside2
+  ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "OpenPGP key creation and smartcard access";
+    homepage = "https://github.com/kushaldas/tumpa";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ _0x4A6F ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix b/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix
index beabc8c23106..f2cdbe8dc633 100644
--- a/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests-cache
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # requires network access
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple to use TVDB (thetvdb.com) API in Python";
     homepage = "https://github.com/dbr/tvdb_api";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix b/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
index 81fa2e61b02a..fa155b86f407 100644
--- a/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or ..
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api.";
     homepage = "https://github.com/dbr/tvnamer";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/python-modules/twiggy/default.nix b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix
index fdff4a90f9e1..9647dc8ae67c 100644
--- a/nixpkgs/pkgs/development/python-modules/twiggy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://twiggy.wearpants.org";
     # Taken from http://i.wearpants.org/blog/meet-twiggy/
     description = "Twiggy is the first totally new design for a logger since log4j";
diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix
index d4cd7b5d59bf..7931a4ad0ec9 100644
--- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , pyjwt, pysocks, pytz, requests, six, nose, mock }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyjwt pysocks pytz six requests ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Twilio API client and TwiML generator";
     homepage = "https://github.com/twilio/twilio-python/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/nixpkgs/pkgs/development/python-modules/twisted/default.nix
index d38d6aebcbd8..421565725b14 100644
--- a/nixpkgs/pkgs/development/python-modules/twisted/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twisted/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   # Patch t.p._inotify to point to libc. Without this,
   # twisted.python.runtime.platform.supportsINotify() == False
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     substituteInPlace src/twisted/python/_inotify.py --replace \
       "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
   '';
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   # Tests require network
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://twistedmatrix.com/";
     description = "Twisted, an event-driven networking engine written in Python";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix
index d562eac5cc7d..72f30514dc67 100644
--- a/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , twitter-common-lang
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ twitter-common-lang ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Twitter's common collections";
     homepage    = "https://twitter.github.io/commons/";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix
index 1253b8077e75..ee5bf9bdbe10 100644
--- a/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , twitter-common-log
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ twitter-common-log ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Twitter's API to the confluence wiki";
     homepage    = "https://twitter.github.io/commons/";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix
index df2f614c5a04..14b0bcd0673c 100644
--- a/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , twitter-common-lang
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ twitter-common-lang ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities for manipulating and finding files and directories";
     homepage    = "https://twitter.github.io/commons/";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix
index 59f6d74ad67a..4b4a5c0fc2e2 100644
--- a/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "6e967ca2b5bb96ea749d21052f45b18e37deb5cc160eb12c64a8f1cb9dba7a22";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Twitter's 2.x / 3.x compatibility swiss-army knife";
     homepage    = "https://twitter.github.io/commons/";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix
index 1c3d1808f5dd..8cf99c39dc20 100644
--- a/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , twitter-common-options
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Twitter's common logging library";
     homepage    = "https://twitter.github.io/commons/";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix
index 12e55a46ab8e..a5505330bc0a 100644
--- a/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "a495bcdffc410039bc4166f1a30c2caa3c92769d7a161a4a39d3651836dd27e1";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Twitter's optparse wrapper";
     homepage    = "https://twitter.github.io/commons/";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/twitter/default.nix b/nixpkgs/pkgs/development/python-modules/twitter/default.nix
index 2e8481198a41..23d647d93153 100644
--- a/nixpkgs/pkgs/development/python-modules/twitter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Twitter API library";
     license     = licenses.mit;
     maintainers = with maintainers; [ thoughtpolice ];
diff --git a/nixpkgs/pkgs/development/python-modules/txaio/default.nix b/nixpkgs/pkgs/development/python-modules/txaio/default.nix
index 7e87a2d59ea4..4d756fa89f3f 100644
--- a/nixpkgs/pkgs/development/python-modules/txaio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txaio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }:
 
 buildPythonPackage rec {
   pname = "txaio";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # Needs some fixing
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utilities to support code that runs unmodified on Twisted and asyncio.";
     homepage    = "https://github.com/crossbario/txaio";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix
index db973dbffbed..f0e3904a8815 100644
--- a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , twisted
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ twisted ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/txamqp/txamqp";
     description = "Library for communicating with AMQP peers and brokers using Twisted";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/txdbus/default.nix b/nixpkgs/pkgs/development/python-modules/txdbus/default.nix
index f6bc44981fb1..461ddeee34b4 100644
--- a/nixpkgs/pkgs/development/python-modules/txdbus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txdbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, twisted }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, six, twisted }:
 
 buildPythonPackage rec {
   pname = "txdbus";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six twisted ];
   pythonImportsCheck = [ "txdbus" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Native Python implementation of DBus for Twisted";
     homepage = "https://github.com/cocagne/txdbus";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/txgithub/default.nix b/nixpkgs/pkgs/development/python-modules/txgithub/default.nix
index 5340b202e688..402e5011ede6 100644
--- a/nixpkgs/pkgs/development/python-modules/txgithub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txgithub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyopenssl
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   # No tests distributed
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GitHub API client implemented using Twisted.";
     homepage    = "https://github.com/tomprince/txgithub";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/txrequests/default.nix b/nixpkgs/pkgs/development/python-modules/txrequests/default.nix
index ee7d09d51657..06979e2b9b39 100644
--- a/nixpkgs/pkgs/development/python-modules/txrequests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txrequests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , twisted
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Asynchronous Python HTTP for Humans.";
     homepage    = "https://github.com/tardyp/txrequests";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
index ee36a6dab810..448e52af7afa 100644
--- a/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage
 , fetchPypi
 , pythonOlder
-, stdenv
+, lib, stdenv
 , setuptools_scm
 , pytest
 , typing-extensions
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.3";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This library provides run-time type checking for functions defined with argument type annotations";
     homepage = "https://github.com/agronholm/typeguard";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
index bfaed58b13fb..e993363769a8 100644
--- a/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
-, pytest
+, pytestCheckHook
 , pytestcov
 , jinja2
 , pyyaml
@@ -26,14 +26,11 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
+    pytestCheckHook
     pytestcov
   ];
 
-  # for some reason jinja2 not picking up forms directory (1% of tests)
-  checkPhase = ''
-    pytest --ignore=tests/test_forms.py
-  '';
+  disabledTests = [ "test_to_json_schema_complex_regular_expression" ];
 
   meta = with lib; {
     description = "A type system library for Python";
diff --git a/nixpkgs/pkgs/development/python-modules/typogrify/default.nix b/nixpkgs/pkgs/development/python-modules/typogrify/default.nix
index f5724877bf2b..faa1c8641c05 100644
--- a/nixpkgs/pkgs/development/python-modules/typogrify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typogrify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # Wants to set up Django
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Filters to enhance web typography, including support for Django & Jinja templates";
     homepage = "https://github.com/mintchaos/typogrify";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix
index e5ab11595303..df0923833fd5 100644
--- a/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytz }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # test fail (timezone test fail)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tzinfo object for the local timezone";
     homepage = "https://github.com/regebro/tzlocal";
     license = licenses.cddl;
diff --git a/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix b/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix
index 875f0ee2075a..370ed527d193 100644
--- a/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyyaml }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }:
 
 buildPythonPackage rec {
   pname = "ua-parser";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false; # requires files from uap-core
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python implementation of the UA Parser";
     homepage = "https://github.com/ua-parser/uap-python";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
index a0d24785eb69..05bc653b0591 100644
--- a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
@@ -1,23 +1,37 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, isPy3k
 , certifi
-, CFNetwork
 , cmake
 , enum34
 , openssl
-, Security
 , six
-, stdenv
+, CFNetwork
+, CoreFoundation
+, Security
 }:
 
 buildPythonPackage rec {
   pname = "uamqp";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6657f1d8aae566b89d02c6282827dddcec2a90f75dc0d2d91a47e00c8999d99";
+    sha256 = "sha256-zDUFe/yMCThn+qJqDekMrUHEf1glGxBw4pioExLLoqg=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch";
+      sha256 = "06pxhdpkv94pv3lhj1vy0wlsqsdznz485bvg3zafj67r55g40lhd";
+      stripLen = "2";
+      extraPrefix = "src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/";
+    })
+  ];
+
   buildInputs = [
     openssl
     certifi
@@ -25,7 +39,9 @@ buildPythonPackage rec {
   ] ++ lib.optionals (!isPy3k) [
     enum34
   ] ++ lib.optionals stdenv.isDarwin [
-    CFNetwork Security
+    CoreFoundation
+    CFNetwork
+    Security
   ];
 
   dontUseCmakeConfigure = true;
diff --git a/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix b/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix
index db5b1400fe45..b0f5b11ad3a4 100644
--- a/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix
@@ -26,6 +26,15 @@ buildPythonPackage rec {
     mutatormath
   ];
 
+  checkPhase = ''
+    runHook preCheck
+    for t in Tests/*.py; do
+      # https://github.com/LettError/ufoProcessor/issues/32
+      [[ "$(basename "$t")" = "tests_fp.py" ]] || python "$t"
+    done
+    runHook postCheck
+  '';
+
   meta = with lib; {
     description = "Read, write and generate UFOs with designspace data";
     homepage = "https://github.com/LettError/ufoProcessor";
diff --git a/nixpkgs/pkgs/development/python-modules/ujson/2.nix b/nixpkgs/pkgs/development/python-modules/ujson/2.nix
index e1d1185f6f5e..f31b26a1960a 100644
--- a/nixpkgs/pkgs/development/python-modules/ujson/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/ujson/2.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/ujson";
     description = "Ultra fast JSON encoder and decoder for Python";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/nixpkgs/pkgs/development/python-modules/ujson/default.nix
index e7a9ee8f35a7..1c12a092a2f5 100644
--- a/nixpkgs/pkgs/development/python-modules/ujson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ujson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools_scm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/ujson";
     description = "Ultra fast JSON encoder and decoder for Python";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix b/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix
index 2eea9ebf385c..4411dbac11b8 100644
--- a/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   # See for license
   # https://github.com/tytkal/python-hijiri-ummalqura/issues/4
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Date Api that support Hijri Umalqurra calendar";
     homepage = "https://github.com/tytkal/python-hijiri-ummalqura";
     license = with licenses; [ publicDomain ];
diff --git a/nixpkgs/pkgs/development/python-modules/umemcache/default.nix b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix
index 07bb181958ad..f852483cda68 100644
--- a/nixpkgs/pkgs/development/python-modules/umemcache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchurl }:
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl }:
 
 buildPythonPackage rec {
   pname = "umemcache";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ultra fast memcache client written in highly optimized C++ with Python bindings";
     homepage = "https://github.com/esnme/ultramemcache";
     license = licenses.bsdOriginal;
diff --git a/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
index 84705be59bc1..117188198ca8 100644
--- a/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , nose, numpy, future
 }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   checkPhase = "python setup.py nosetests -sv";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pythonhosted.org/uncertainties/";
     description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
     maintainers = with maintainers; [ rnhmjoj ];
diff --git a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
index 425b2e31ca61..4f8d461c87e2 100644
--- a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python cross-version byte-code deparser";
     homepage = "https://github.com/rocky/python-uncompyle6/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix
index 111ff6278eab..80ac5151b53f 100644
--- a/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose unittest2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generates unicode slugs";
     homepage = "https://pypi.org/project/unicode-slugify/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix b/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix
index 83ef602de600..9393ff58bc27 100644
--- a/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # ImportError: No module named runtests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Drop-in replacement for Python2's stdlib csv module, with unicode support";
     homepage = "https://github.com/jdunck/python-unicodecsv";
     maintainers = with maintainers; [ koral ];
diff --git a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
index 8bd6507bb5ba..484f422adf3e 100644
--- a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildPythonPackage, setuptools, unicorn-emu }:
+{ lib, stdenv, buildPythonPackage, setuptools, unicorn-emu }:
 
 buildPythonPackage rec {
   pname = "unicorn";
-  version = stdenv.lib.getVersion unicorn-emu;
+  version = lib.getVersion unicorn-emu;
 
   src = unicorn-emu.src;
   sourceRoot = "source/bindings/python";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ setuptools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for Unicorn CPU emulator engine";
     homepage = "https://www.unicorn-engine.org/";
     license = [ licenses.gpl2 ];
diff --git a/nixpkgs/pkgs/development/python-modules/unidecode/default.nix b/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
index 0ff066850ddb..34de3d713866 100644
--- a/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, glibcLocales }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "Unidecode";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   buildInputs = [ glibcLocales ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/Unidecode/";
     description = "ASCII transliterations of Unicode text";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/unifi/default.nix b/nixpkgs/pkgs/development/python-modules/unifi/default.nix
index 4d2eae618c32..66ab9ba3972b 100644
--- a/nixpkgs/pkgs/development/python-modules/unifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unifi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage
+{ lib, stdenv, buildPythonPackage
 , fetchPypi, urllib3 }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # upstream has no tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An API towards the Ubiquity Networks UniFi controller";
     homepage    = "https://pypi.python.org/pypi/unifi/";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/unifiled/default.nix b/nixpkgs/pkgs/development/python-modules/unifiled/default.nix
new file mode 100644
index 000000000000..68fa57165df2
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/unifiled/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, urllib3
+}:
+
+buildPythonPackage rec {
+  pname = "unifiled";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "florisvdk";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    urllib3
+  ];
+
+  # Project doesn't have any tests
+  doCheck = false;
+  pythonImportsCheck = [ "unifiled" ];
+
+  meta = with lib; {
+    description = "Python module for Ubiquiti Unifi LED controller";
+    homepage = "https://github.com/florisvdk/unifiled";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/unittest2/default.nix b/nixpkgs/pkgs/development/python-modules/unittest2/default.nix
index 65774d1e33ab..a7c1252f4b46 100644
--- a/nixpkgs/pkgs/development/python-modules/unittest2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unittest2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A backport of the new features added to the unittest testing framework";
     homepage = "https://pypi.python.org/pypi/unittest2";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix b/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
index 386478cbb752..52d2a42b4baf 100644
--- a/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/matrix-org/python-unpaddedbase64";
     description = "Unpadded Base64";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/upass/default.nix b/nixpkgs/pkgs/development/python-modules/upass/default.nix
index 2d532be36404..442876d7a975 100644
--- a/nixpkgs/pkgs/development/python-modules/upass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/upass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchurl
 , pyperclip
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Console UI for pass";
     homepage = "https://github.com/Kwpolska/upass";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/update_checker/default.nix b/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
index 6779a50e2c47..f9171e8cbc9d 100644
--- a/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, isPy27
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests, isPy27
 }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # requires network
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A python module that will check for package updates";
     homepage = "https://github.com/bboe/update_checker";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/upnpy/default.nix b/nixpkgs/pkgs/development/python-modules/upnpy/default.nix
new file mode 100644
index 000000000000..d64ff4b875c8
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/upnpy/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "upnpy";
+  version = "1.1.8";
+
+  src = fetchFromGitHub {
+    owner = "5kyc0d3r";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf";
+  };
+
+  # Project has not published tests yet
+  doCheck = false;
+  pythonImportsCheck = [ "upnpy" ];
+
+  meta = with lib; {
+    description = "UPnP client library for Python";
+    homepage = "https://github.com/5kyc0d3r/upnpy";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix b/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix
index 3a9457a574ba..5164bf854ada 100644
--- a/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # No tests on PyPi
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/scikit-hep/uproot3-methods";
     description = "Pythonic mix-ins for ROOT classes";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/uproot3/default.nix b/nixpkgs/pkgs/development/python-modules/uproot3/default.nix
index 0d0c2365b637..1150c76d2b48 100644
--- a/nixpkgs/pkgs/development/python-modules/uproot3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uproot3/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "uproot3";
-  version = "3.14.1";
+  version = "3.14.2";
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot3";
     rev = version;
-    sha256 = "1npwh4l96wg3m24jhfc8i84nfwfc18flrmymf80fx101wmpi2qz8";
+    sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc=";
   };
 
   nativeBuildInputs = [ pytestrunner ];
diff --git a/nixpkgs/pkgs/development/python-modules/uptime/default.nix b/nixpkgs/pkgs/development/python-modules/uptime/default.nix
index 0e1d10f7ae5e..8f8c067d36ae 100644
--- a/nixpkgs/pkgs/development/python-modules/uptime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uptime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Cairnarvon/uptime";
     description = "Cross-platform way to retrieve system uptime and boot time";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/uranium/default.nix b/nixpkgs/pkgs/development/python-modules/uranium/default.nix
index 0bcfa0305e8c..f5bca2ed0fef 100644
--- a/nixpkgs/pkgs/development/python-modules/uranium/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uranium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, cmake
 , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
      UM/Application.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python framework for building Desktop applications";
     homepage = "https://github.com/Ultimaker/Uranium";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/uritools/default.nix b/nixpkgs/pkgs/development/python-modules/uritools/default.nix
index 570fc5dc7180..b06da7c6acc7 100644
--- a/nixpkgs/pkgs/development/python-modules/uritools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uritools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
 
 buildPythonPackage rec {
   pname = "uritools";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "405917a31ce58a57c8ccd0e4ea290f38baf2f4823819c3688f5331f1aee4ccb0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse";
     license = licenses.mit;
     maintainers = [ maintainers.rvolosatovs ];
diff --git a/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix b/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix
new file mode 100644
index 000000000000..ea7825d9ffd2
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, pytest-cov
+, pytest-flakes
+, pytest-mock
+, pytest-socket
+, pytestCheckHook
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "url-normalize";
+  version = "1.4.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "niksite";
+    repo = pname;
+    rev = version;
+    sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [
+    pytest-cov
+    pytest-flakes
+    pytest-mock
+    pytest-socket
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "url_normalize" ];
+
+  meta = with lib; {
+    description = "URL normalization for Python";
+    homepage = "https://github.com/niksite/url-normalize";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix
index 7af69e5ded89..3a7158be73c8 100644
--- a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pycurl, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pycurl, six }:
 
 buildPythonPackage rec {
   pname = "urlgrabber";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pycurl six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://urlgrabber.baseurl.org";
     license = licenses.lgpl2Plus;
     description = "Python module for downloading files";
diff --git a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
index aafa11720a22..6cf7ce34d388 100644
--- a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, mock, tornado, pyopenssl, cryptography
 , idna, certifi, ipaddress, pysocks }:
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
   };
 
-  NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
+  NOSE_EXCLUDE = lib.concatStringsSep "," [
     "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
     "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
   ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest mock tornado ];
   propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Powerful, sanity-friendly HTTP client for Python";
     homepage = "https://github.com/shazow/urllib3";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/nixpkgs/pkgs/development/python-modules/urwid/default.nix
index 0846d801059a..e3c5311136c2 100644
--- a/nixpkgs/pkgs/development/python-modules/urwid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urwid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "urwid";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "urwid" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A full-featured console (xterm et al.) user interface library";
     homepage = "http://excess.org/urwid";
     repositories.git = "git://github.com/wardi/urwid.git";
diff --git a/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix b/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
index c441d93f6f76..4c3a3e896f86 100644
--- a/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , glibcLocales
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   checkInputs = [ glibcLocales ];
   LC_ALL="en_US.UTF-8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tree widgets for urwid";
     homepage = "https://github.com/pazz/urwidtrees";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix
index 34e6025dcfb6..b1f5b301dee4 100644
--- a/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pyusb }:
+{ lib, stdenv, fetchurl, buildPythonPackage, pyusb }:
 
 buildPythonPackage rec {
   pname = "usbtmc";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyusb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python implementation of the USBTMC instrument control protocol";
     homepage = "http://alexforencich.com/wiki/en/python-usbtmc/start";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/user-agents/default.nix b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
index 5fb926607bae..7f8470cfbdc8 100644
--- a/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }:
 
 buildPythonPackage rec {
   pname = "user-agents";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ua-parser ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python library to identify devices by parsing user agent strings";
     homepage = "https://github.com/selwin/python-user-agents";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/utils/default.nix b/nixpkgs/pkgs/development/python-modules/utils/default.nix
new file mode 100644
index 000000000000..a6dd57e0e5ea
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/utils/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "utils";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "haaksmash";
+    repo = "pyutils";
+    rev = version;
+    sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr";
+  };
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "utils" ];
+
+  meta = with lib; {
+    description = "Python set of utility functions and objects";
+    homepage = "https://github.com/haaksmash/pyutils";
+    license = with licenses; [ lgpl3Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix b/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
index 55511be4926c..36e8b12929e0 100644
--- a/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , buildPythonPackage
 , fetchFromGitHub
 , click
@@ -7,21 +8,26 @@
 , uvloop
 , websockets
 , wsproto
-, pytest
+, pytestCheckHook
+, pytest-mock
+, pyyaml
 , requests
+, trustme
+, typing-extensions
 , isPy27
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.11.5";
+  version = "0.13.2";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "0cf0vw6kzxwlkvk5gw85wv3kg1kdil0wkq3s7rmxpvrk6gjk8jvq";
+    sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9";
   };
 
   propagatedBuildInputs = [
@@ -31,25 +37,33 @@ buildPythonPackage rec {
     uvloop
     websockets
     wsproto
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    typing-extensions
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "h11==0.8.*" "h11" \
-      --replace "httptools==0.0.13" "httptools"
-  '';
-
-  checkInputs = [ pytest requests ];
+  checkInputs = [
+    pytestCheckHook
+    pytest-mock
+    pyyaml
+    requests
+    trustme
+  ];
 
   doCheck = !stdenv.isDarwin;
 
-  # watchgod required the watchgod package, which isn't available in nixpkgs
-  checkPhase = ''
-    pytest --ignore=tests/supervisors/test_watchgodreload.py \
-      -k 'not test_supported_upgrade_request and not test_invalid_upgrade[WSProtocol]'
-  '';
+  __darwinAllowLocalNetworking = true;
+
+  pytestFlagsArray = [
+    # watchgod required the watchgod package, which isn't available in nixpkgs
+    "--ignore=tests/supervisors/test_reload.py"
+  ];
+
+  disabledTests = [
+    "test_supported_upgrade_request"
+    "test_invalid_upgrade"
+  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.uvicorn.org/";
     description = "The lightning-fast ASGI server";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/validate-email/default.nix b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix
index ea2c5a8db749..327cfcf3f0d3 100644
--- a/nixpkgs/pkgs/development/python-modules/validate-email/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "validate-email";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/syrusakbary/validate_email";
     description = "Verify if an email address is valid and really exists";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/validictory/default.nix b/nixpkgs/pkgs/development/python-modules/validictory/default.nix
index 81e80375e680..e89b3d7bcd23 100644
--- a/nixpkgs/pkgs/development/python-modules/validictory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/validictory/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Validate dicts against a schema";
     homepage = "https://github.com/sunlightlabs/validictory";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix b/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix
index 5f7f30e2c336..7d73a6e812dd 100644
--- a/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "vcversioner";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "take version numbers from version control";
     homepage = "https://github.com/habnabit/vcversioner";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/python-modules/vdf/default.nix b/nixpkgs/pkgs/development/python-modules/vdf/default.nix
index 7d4e3e34b86d..9e4e92d21ae7 100644
--- a/nixpkgs/pkgs/development/python-modules/vdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , pytest, pytestcov, mock }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest pytestcov mock ];
   checkPhase = "make test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for working with Valve's VDF text format";
     homepage = "https://github.com/ValvePython/vdf";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
index b93050144eb6..bda65ab49076 100644
--- a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pimutils/vdirsyncer";
     description = "Synchronize calendars and contacts";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix
index b81481b0774a..3a36d5de6064 100644
--- a/nixpkgs/pkgs/development/python-modules/vega/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vega/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage , fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage , fetchPypi, pythonOlder
 , pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }:
 
 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
   checkInputs = [ altair ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An IPython/Jupyter widget for Vega and Vega-Lite";
     longDescription = ''
       To use this you have to enter a nix-shell with vega. Then run:
diff --git a/nixpkgs/pkgs/development/python-modules/venusian/default.nix b/nixpkgs/pkgs/development/python-modules/venusian/default.nix
index 06f0d55acf00..68d974aabec8 100644
--- a/nixpkgs/pkgs/development/python-modules/venusian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/venusian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for deferring decorator actions";
     homepage = "https://pylonsproject.org/";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
index 31042c8cc1c4..fa3329503a36 100644
--- a/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
 
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # pip.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Version-string management for VCS-controlled trees";
     homepage = "https://github.com/warner/python-versioneer";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/python-modules/versiontools/default.nix b/nixpkgs/pkgs/development/python-modules/versiontools/default.nix
index ea282c22ddc8..45b34d95301d 100644
--- a/nixpkgs/pkgs/development/python-modules/versiontools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/versiontools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   doCheck = (!isPy3k);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/versiontools";
     description = "Smart replacement for plain tuple used in __version__";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix b/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix
index eff996c3ae4c..f2c8cee451d3 100644
--- a/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , termcolor
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ termcolor colorama ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
     homepage = "https://github.com/smeggingsmegger/VeryPrettyTable";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix
index f43fe542677b..548105a01778 100644
--- a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # tests not packaged with pypi
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/AdamSpannbauer/python_video_stab";
     description = "Video Stabilization using OpenCV";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/vine/default.nix b/nixpkgs/pkgs/development/python-modules/vine/default.nix
index 1f4933d7dd8a..048fa435e0be 100644
--- a/nixpkgs/pkgs/development/python-modules/vine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , case, pytest, pythonOlder }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   buildInputs = [ case pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python promises";
     homepage = "https://github.com/celery/vine";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/virtkey/default.nix b/nixpkgs/pkgs/development/python-modules/virtkey/default.nix
index 9ab89e9ac0dd..072fd25c7f07 100644
--- a/nixpkgs/pkgs/development/python-modules/virtkey/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtkey/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:
+{ lib, buildPythonPackage, fetchurl, pkg-config, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:
 
 let
   majorVersion = "0.63";
@@ -12,7 +12,7 @@ in buildPythonPackage rec {
     sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix b/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix
index 958f8a01704c..7559ae1ccca5 100644
--- a/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "PyVirtualDisplay";
-  version = "1.3.2";
+  version = "2.0";
 
   propagatedBuildInputs = [ EasyProcess ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fa85a6e490e45eab64e6be19841e0ab15ec8054c97f162079a061da6a93eba0";
+    sha256 = "3cdacd70970a74d163a2417d8581f43a56bb1ac8d31c71a1a6a4348969062d65";
   };
 
   # requires X server
diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix
index cc68d4b7090f..9b225021cf21 100644
--- a/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # needs tox to run the tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/edwardgeorge/virtualenv-clone";
     description = "Script to clone virtualenvs";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix
index 19ec56a1ece8..658f41126fc9 100644
--- a/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pbr
@@ -66,7 +66,7 @@ EOF
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Enhancements to virtualenv";
     homepage = "https://pypi.python.org/pypi/virtualenvwrapper";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/vmprof/default.nix b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix
index 149efb753e20..f8be722ef90f 100644
--- a/nixpkgs/pkgs/development/python-modules/vmprof/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , colorama
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "vmprof" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A vmprof client";
     license = licenses.mit;
     homepage = "https://vmprof.readthedocs.org/";
diff --git a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix
index ffc01906f459..cb1b1677e1b5 100644
--- a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , buildPythonPackage, isPy27
 , pillow
 , twisted
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   doCheck = !isPy27;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sibson/vncdotool";
     description = "A command line VNC client and python library";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix b/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix
index 383eed03a4e3..4c31b5f758a4 100644
--- a/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, pytestCheckHook
+, voluptuous
+}:
 
 buildPythonPackage rec  {
   pname = "voluptuous-serialize";
@@ -6,28 +12,24 @@ buildPythonPackage rec  {
 
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6";
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = pname;
+    rev = version;
+    sha256 = "1km2y1xaagkdvsy3bmi1sc040x5yyfdw6llmwdv9z8nz67m9v1ya";
   };
 
-  propagatedBuildInputs = [
-    voluptuous
-  ];
+  propagatedBuildInputs = [ voluptuous ];
 
   checkInputs = [
-    pytest
+    pytestCheckHook
+    voluptuous
   ];
 
-  checkPhase = ''
-    py.test
-  '';
-
-  # no tests in PyPI tarball
-  doCheck = false;
+  pythonImportsCheck = [ "voluptuous_serialize" ];
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/balloob/voluptuous-serialize";
+  meta = with lib; {
+    homepage = "https://github.com/home-assistant-libs/voluptuous-serialize";
     license = licenses.asl20;
     description = "Convert Voluptuous schemas to dictionaries so they can be serialized";
     maintainers = with maintainers; [ etu ];
diff --git a/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix b/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix
index 4d5b5d48fda5..63be8cd4bd05 100644
--- a/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "voluptuous";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p5j3fgbpqj31fajkaisdrz10ah9667sijz4kp3m0sbgw6ag4kis";
+    sha256 = "0js4avmhmmys78z376xk1w9305hq5nad8zqrnksgmpc1j90p4db6";
   };
 
   checkInputs = [ nose ];
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Voluptuous is a Python data validation library";
     homepage = "http://alecthomas.github.io/voluptuous/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/nixpkgs/pkgs/development/python-modules/vsure/default.nix
new file mode 100644
index 000000000000..578578a21b17
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/vsure/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "vsure";
+  version = "1.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lsr0wl1dwbzpn68ww348yk6v42bw89nrghz5gjsimrr428zw6qn";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "verisure" ];
+
+  meta = with lib; {
+    description = "Python library for working with verisure devices";
+    homepage = "https://github.com/persandstrom/python-verisure";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/vultr/default.nix b/nixpkgs/pkgs/development/python-modules/vultr/default.nix
index 236e4121cf86..d4349d310be2 100644
--- a/nixpkgs/pkgs/development/python-modules/vultr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vultr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , requests
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Tests disabled. They fail because they try to access the network
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Vultr.com API Client";
     homepage = "https://github.com/spry-group/python-vultr";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/nixpkgs/pkgs/development/python-modules/vulture/default.nix
index 76f379ef8449..7ab5bcbb65bc 100644
--- a/nixpkgs/pkgs/development/python-modules/vulture/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vulture/default.nix
@@ -1,19 +1,34 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }:
+{ lib
+, buildPythonPackage
+, coverage
+, fetchPypi
+, isPy27
+, pytest-cov
+, pytestCheckHook
+, toml
+}:
 
 buildPythonPackage rec {
   pname = "vulture";
-  version = "2.1";
+  version = "2.3";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "933bf7f3848e9e39ecab6a12faa59d5185471c887534abac13baea6fe8138cc2";
+    sha256 = "0ryrmsm72z3fzaanyblz49q40h9d3bbl4pspn2lvkkp9rcmsdm83";
   };
 
-  checkInputs = [ coverage pytest pytestcov ];
-  checkPhase = "pytest";
+  propagatedBuildInputs = [ toml ];
 
-  meta = with stdenv.lib; {
+  checkInputs = [
+    coverage
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "vulture" ];
+
+  meta = with lib; {
     description = "Finds unused code in Python programs";
     homepage = "https://github.com/jendrikseipp/vulture";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/vxi11/default.nix b/nixpkgs/pkgs/development/python-modules/vxi11/default.nix
index 15a9d7073abc..5d9531aa904d 100644
--- a/nixpkgs/pkgs/development/python-modules/vxi11/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vxi11/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, nose }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }:
 
 buildPythonPackage rec {
   pname = "python-vxi11";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     nosetests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "VXI-11 driver for controlling instruments over Ethernet";
     homepage = "https://github.com/python-ivi/python-vxi11";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
index a37f786c018d..ae404e01cfb9 100644
--- a/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   buildInputs = [ six pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library of web-related functions";
     homepage = "https://github.com/scrapy/w3lib";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/waitress/default.nix b/nixpkgs/pkgs/development/python-modules/waitress/default.nix
index 3812ed06b60c..09f4f66e0b52 100644
--- a/nixpkgs/pkgs/development/python-modules/waitress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/waitress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
      homepage = "https://github.com/Pylons/waitress";
      description = "Waitress WSGI server";
      license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix
index dd947c0555ce..29c30e7ba6ad 100644
--- a/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "wakeonlan";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small python module for wake on lan";
     homepage = "https://github.com/remcohaszing/pywakeonlan";
     license = licenses.wtfpl;
diff --git a/nixpkgs/pkgs/development/python-modules/waqiasync/default.nix b/nixpkgs/pkgs/development/python-modules/waqiasync/default.nix
new file mode 100644
index 000000000000..3b8dfce61146
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/waqiasync/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, aiohttp
+, async-timeout
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "waqiasync";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yxls7ywfg954c3vxgnp98qa1b8dsq9b2fld11fb9sx1k4mjc29d";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "waqiasync" ];
+
+  meta = with lib; {
+    description = "Python library for http://aqicn.org";
+    homepage = "https://github.com/andrey-git/waqi-async";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/warlock/default.nix b/nixpkgs/pkgs/development/python-modules/warlock/default.nix
index 34815f99a94c..80dcabdcb207 100644
--- a/nixpkgs/pkgs/development/python-modules/warlock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/warlock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bcwaldon/warlock";
     description = "Python object model built on JSON schema and JSON patch";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
index ec9cbb3d5608..5a0c2ecaa5f5 100644
--- a/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight console printing and formatting toolkit";
     homepage = "https://github.com/ines/wasabi";
     changelog = "https://github.com/ines/wasabi/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/python-modules/wasm/default.nix b/nixpkgs/pkgs/development/python-modules/wasm/default.nix
new file mode 100644
index 000000000000..f6c2cc42e387
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/wasm/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+}:
+
+buildPythonPackage rec {
+  pname = "wasm";
+  version = "1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "179xcinfc35xgk0bf9y58kwxzymzk7c1p58w6khmqfiqvb91j3r8";
+  };
+
+  # there are no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "wasm" ];
+
+  meta = with lib; {
+    description = "WebAssembly decoder and disassembler";
+    homepage = "https://github.com/athre0z/wasm";
+    changelog = "https://github.com/athre0z/wasm/blob/master/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ arturcygan ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix
new file mode 100644
index 000000000000..62c8a2a06b71
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix
@@ -0,0 +1,71 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, maturin
+, buildPythonPackage
+, isPy38
+, python
+}:
+let
+  pname = "wasmer";
+  version = "1.0.0";
+
+  wheel = rustPlatform.buildRustPackage rec {
+    inherit pname version;
+
+    src = fetchFromGitHub {
+      owner = "wasmerio";
+      repo = "wasmer-python";
+      rev = version;
+      hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY=";
+    };
+
+    cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc=";
+
+    nativeBuildInputs = [ maturin python ];
+
+    preBuild = ''
+      cd packages/api
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+      maturin build --release --manylinux off --strip
+      runHook postBuild
+    '';
+
+    postBuild = ''
+      cd ../..
+    '';
+
+    doCheck = false;
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm644 -t $out target/wheels/*.whl
+      runHook postInstall
+    '';
+  };
+
+in
+buildPythonPackage rec {
+  inherit pname version;
+
+  format = "wheel";
+  src = wheel;
+
+  unpackPhase = ''
+    mkdir -p dist
+    cp $src/*.whl dist
+  '';
+
+  pythonImportsCheck = [ "wasmer" ];
+
+  meta = with lib; {
+    description = "Python extension to run WebAssembly binaries";
+    homepage = "https://github.com/wasmerio/wasmer-python";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
index ffec68785260..5cb8929b9dbe 100644
--- a/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , argh
@@ -16,13 +16,13 @@ buildPythonPackage rec {
     sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin
+  buildInputs = lib.optionals stdenv.isDarwin
     [ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
   propagatedBuildInputs = [ argh pathtools pyyaml ];
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python API and shell utilities to monitor file system events";
     homepage = "https://github.com/gorakhargosh/watchdog";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix b/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix
new file mode 100644
index 000000000000..a07c1e6333e8
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, click
+, fetchFromGitHub
+, mock
+, pytest-runner
+, pytestCheckHook
+, requests
+, websocket_client
+}:
+
+buildPythonPackage rec {
+  pname = "waterfurnace";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "sdague";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf";
+  };
+
+  propagatedBuildInputs = [
+    click
+    pytest-runner
+    requests
+    websocket_client
+  ];
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "waterfurnace" ];
+
+  meta = with lib; {
+    description = "Python interface to waterfurnace geothermal systems";
+    homepage = "https://github.com/sdague/waterfurnace";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
index 06f7a9f1011b..a7188a3103f4 100644
--- a/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
@@ -11,7 +11,7 @@
   glib,
   pango,
   fontconfig,
-  stdenv,
+  lib, stdenv,
   pytest,
   pytestrunner,
   pytest-isort,
@@ -62,7 +62,7 @@ buildPythonPackage rec {
     sha256 = "0rwf43111ws74m8b1alkkxzz57g0np3vmd8as74adwnxslfcg4gs";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://weasyprint.org/";
     description = "Converts web documents to PDF";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/web/default.nix b/nixpkgs/pkgs/development/python-modules/web/default.nix
index ab91d80b8c7b..84b4cc8dcfbb 100644
--- a/nixpkgs/pkgs/development/python-modules/web/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/web/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook
 , cheroot
 , dbutils, mysqlclient, pymysql, mysql-connector, psycopg2
 }:
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Makes web apps";
     longDescription = ''
       Think about the ideal way to write a web app.
diff --git a/nixpkgs/pkgs/development/python-modules/webapp2/default.nix b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix
index 01c1ca309d4c..048c5d91b1d2 100644
--- a/nixpkgs/pkgs/development/python-modules/webapp2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , webob
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ webob six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Taking Google App Engine's webapp to the next level";
     homepage = "http://webapp-improved.appspot.com";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix
index d88f8210ae1d..040341ed376a 100644
--- a/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , routes
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://webhelpers.readthedocs.org/en/latest/";
     description = "Web Helpers";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/python-modules/webob/default.nix b/nixpkgs/pkgs/development/python-modules/webob/default.nix
index 17b20ecd34dd..78ca8f918a3f 100644
--- a/nixpkgs/pkgs/development/python-modules/webob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webob/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ nose pytest ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WSGI request and response object";
     homepage = "http://pythonpaste.org/webob/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/websockify/default.nix b/nixpkgs/pkgs/development/python-modules/websockify/default.nix
index e885a1ba9b72..021344b2207a 100644
--- a/nixpkgs/pkgs/development/python-modules/websockify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/websockify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , numpy
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ numpy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WebSockets support for any application/server";
     homepage = "https://github.com/kanaka/websockify";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/webtest/default.nix b/nixpkgs/pkgs/development/python-modules/webtest/default.nix
index 48acb6c881de..98ee58d3f6c4 100644
--- a/nixpkgs/pkgs/development/python-modules/webtest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy27
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Helper to test WSGI applications";
     homepage = "https://webtest.readthedocs.org/en/latest/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/webthing/default.nix b/nixpkgs/pkgs/development/python-modules/webthing/default.nix
new file mode 100644
index 000000000000..92e4ea5a8fb5
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/webthing/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, ifaddr
+, jsonschema
+, pyee
+, tornado
+, zeroconf
+}:
+
+buildPythonPackage rec {
+  pname = "webthing";
+  version = "0.15.0";
+
+  src = fetchFromGitHub {
+    owner = "WebThingsIO";
+    repo = "webthing-python";
+    rev = "v${version}";
+    sha256 = "06264rwchy4qmbn7lv7m00qg864y7aw3rngcqqcr9nvaqz4rb0fg";
+  };
+
+  propagatedBuildInputs = [
+    ifaddr
+    jsonschema
+    pyee
+    tornado
+    zeroconf
+  ];
+
+  # no tests are present
+  doCheck = false;
+  pythonImportsCheck = [ "webthing" ];
+
+  meta = with lib; {
+    description = "Python implementation of a Web Thing server";
+    homepage = "https://github.com/WebThingsIO/webthing-python";
+    license = with licenses; [ mpl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
index fd634e51796e..7f35dd124d86 100644
--- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , itsdangerous, hypothesis
 , pytestCheckHook, requests
 , pytest-timeout
@@ -17,11 +17,11 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ itsdangerous ];
   checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
 
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [
+  disabledTests = lib.optionals stdenv.isDarwin [
     "test_get_machine_id"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://palletsprojects.com/p/werkzeug/";
     description = "A WSGI utility library for Python";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix b/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix
index a43aa915ea0b..f42df0054952 100644
--- a/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix
@@ -1,5 +1,6 @@
 { buildPythonPackage
 , chardet
+, colorama
 , configparser
 , fetchFromGitHub
 , future
@@ -8,44 +9,61 @@
 , mock
 , netaddr
 , pkgs
-, pyparsing
 , pycurl
+, pyparsing
 , pytest
+, pytestCheckHook
+, setuptools
 , six
+, stdenv
 }:
 
 buildPythonPackage rec {
   pname = "wfuzz";
-  version = "2.4.2";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "xmendez";
     repo = pname;
-    rev = "v.${version}";
-    sha256 = "15dihrc7jsvpxcmb4fp254s633mkjm7ksjfkr9pqaai49qmnddyf";
+    rev = "v${version}";
+    sha256 = "1izasczm2zwknwzxbfzqhlf4zp02jvb54ha1hfk4rlwiz0rr1kj4";
   };
 
-  buildInputs = [ pyparsing configparser ];
-
   propagatedBuildInputs = [
     chardet
-    future
     pycurl
     six
+    setuptools
+    pyparsing
+  ] ++ lib.optionals isPy27 [
+    mock
+    future
+  ] ++ lib.optionals stdenv.hostPlatform.isWindows [
+    colorama
   ];
 
-  checkInputs = [ netaddr pytest ] ++ lib.optionals isPy27 [ mock ];
+  checkInputs = [
+    netaddr
+    pytest
+    pytestCheckHook
+  ] ++ lib.optionals isPy27 [
+    mock
+  ];
 
-  # Skip tests requiring a local web server.
-  checkPhase = ''
-    HOME=$TMPDIR pytest \
-      tests/test_{moduleman,filterintro,reqresp,api,clparser,dotdict}.py
-  '';
+  preCheck = "export HOME=$(mktemp -d)";
+  # The skipped tests are requiring a local web server
+  pytestFlagsArray = [ "tests/test_{moduleman,filterintro,reqresp,api,clparser}.py" ];
+  pythonImportsCheck = [ "wfuzz" ];
 
   meta = with lib; {
-    description = "Web content fuzzer, to facilitate web applications assessments";
+    description = "Web content fuzzer to facilitate web applications assessments";
+    longDescription = ''
+      Wfuzz provides a framework to automate web applications security assessments
+      and could help you to secure your web applications by finding and exploiting
+      web application vulnerabilities.
+    '';
     homepage = "https://wfuzz.readthedocs.io";
-    license = licenses.gpl2;
+    license = with licenses; [ gpl2Only ];
     maintainers = with maintainers; [ pamplemousse ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/whisper/default.nix b/nixpkgs/pkgs/development/python-modules/whisper/default.nix
index 70709d3e6663..ad25df4868a4 100644
--- a/nixpkgs/pkgs/development/python-modules/whisper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/whisper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, mock, six }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, mock, six }:
 
 buildPythonPackage rec {
   pname = "whisper";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six ];
   checkInputs = [ mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://graphite.wikidot.com/";
     description = "Fixed size round-robin style database";
     maintainers = with maintainers; [ offline basvandijk ];
diff --git a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix
index dbc069f434e4..2399c6ed73f2 100644
--- a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy27 }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 }:
 
 buildPythonPackage rec {
   pname = "whitenoise";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Radically simplified static file serving for WSGI applications";
     homepage = "http://whitenoise.evans.io/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/whoosh/default.nix b/nixpkgs/pkgs/development/python-modules/whoosh/default.nix
index e203cdb29344..f5bbccec2a5e 100644
--- a/nixpkgs/pkgs/development/python-modules/whoosh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/whoosh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "Whoosh";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     py.test -k "not test_timelimit and not test_minimize_dfa"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast, pure-Python full text indexing, search, and spell
 checking library.";
     homepage    = "https://bitbucket.org/mchaput/whoosh";
diff --git a/nixpkgs/pkgs/development/python-modules/willow/default.nix b/nixpkgs/pkgs/development/python-modules/willow/default.nix
index e9e5001fec91..fbf4965117b3 100644
--- a/nixpkgs/pkgs/development/python-modules/willow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/willow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # https://github.com/torchbox/Willow/issues/34
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Python image library that sits on top of Pillow, Wand and OpenCV";
     homepage = "https://github.com/torchbox/Willow/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/winacl/default.nix b/nixpkgs/pkgs/development/python-modules/winacl/default.nix
new file mode 100644
index 000000000000..c08c5541a61a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/winacl/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "winacl";
+  version = "0.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05xhdhbvzs1hcd8lxmdr9mpr6ifx5flhlvk6jr0qi6h25imhqclp";
+  };
+
+  # Project doesn't have tests
+  doCheck = false;
+  pythonImportsCheck = [ "winacl" ];
+
+  meta = with lib; {
+    description = "Python module for ACL/ACE/Security descriptor manipulation";
+    homepage = "https://github.com/skelsec/winacl";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/winsspi/default.nix b/nixpkgs/pkgs/development/python-modules/winsspi/default.nix
new file mode 100644
index 000000000000..02156ba17e50
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/winsspi/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, minikerberos
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+  pname = "winsspi";
+  version = "0.0.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q8hr8l8d9jxyp55qsrlkyhdhqjc0n18ajzms7hf1xkhdl7rrbd2";
+  };
+  propagatedBuildInputs = [ minikerberos ];
+
+  # Project doesn't have tests
+  doCheck = false;
+  pythonImportsCheck = [ "winsspi" ];
+
+  meta = with lib; {
+    description = "Python module for ACL/ACE/Security descriptor manipulation";
+    homepage = "https://github.com/skelsec/winsspi";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/word2vec/default.nix b/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
index 1e448c377096..647914bfbe5f 100644
--- a/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , fetchzip
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for computing continuous distributed representations of words";
     homepage = "https://github.com/danielfrg/word2vec";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix b/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
index 6ed44c1e0c20..b4dd108ae739 100644
--- a/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , matplotlib
 , mock
 , numpy
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A little word cloud generator in Python";
     homepage = "https://github.com/amueller/word_cloud";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
index dafa948f69d8..51c0de77917d 100644
--- a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
@@ -1,9 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , pythonOlder
 , isPy27
 , fetchFromGitHub
-, nose
 , noise
 , numpy
 , pyplatec
@@ -11,6 +10,7 @@
 , purepng
 , h5py
 , gdal
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -47,15 +47,14 @@ buildPythonPackage rec {
       --replace 'PyPlatec==1.4.0' 'PyPlatec' \
   '';
 
-  # with python<3.5, unittest fails to discover tests because of their filenames
-  # so nose is used instead.
   doCheck = !isPy27; # google namespace clash
-  checkInputs = stdenv.lib.optional (pythonOlder "3.5") [ nose ];
-  postCheck = stdenv.lib.optionalString (pythonOlder "3.5") ''
-    nosetests tests
-  '';
+  checkInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    "TestSerialization"
+  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://world-engine.org";
     description = "World generator using simulation of plates, rain shadow, erosion, etc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/wrapio/default.nix b/nixpkgs/pkgs/development/python-modules/wrapio/default.nix
index 4289c2020727..757585bd1455 100644
--- a/nixpkgs/pkgs/development/python-modules/wrapio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wrapio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "wrapio" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Exahilosys/wrapio";
     description = "Handling event-based streams";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix
index c4bc74a58d23..29279cc1a448 100644
--- a/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix
@@ -39,5 +39,5 @@ buildPythonPackage rec {
     homepage = "http://wrf-python.rtfd.org";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mhaselsteiner ];
-	};
+  };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/ws4py/default.nix b/nixpkgs/pkgs/development/python-modules/ws4py/default.nix
index 83e1fbad3233..2b7a66df285c 100644
--- a/nixpkgs/pkgs/development/python-modules/ws4py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ws4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, git
 , cherrypy, gevent, tornado }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ws4py.readthedocs.org";
     description = "A WebSocket package for Python";
     maintainers = [];
diff --git a/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix b/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix
index 8ae8b4aefa54..12aa3c88d968 100644
--- a/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , paste
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ paste six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other";
     homepage = "http://pythonpaste.org/wsgiproxy/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix b/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix
index ef3ce69742c1..81a2f98b86f8 100644
--- a/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # circular dep on webtest
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pythonpaste.org/wsgiproxy/";
     description = "HTTP proxying tools for WSGI apps";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
index 66667c74ef3d..45c465ddcba7 100644
--- a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , markupsafe
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A flexible forms validation and rendering library for Python";
     homepage = "https://github.com/wtforms/wtforms";
     changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst";
diff --git a/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix b/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix
index dc15c1c01bee..6649c5f69315 100644
--- a/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix
@@ -6,7 +6,7 @@
 , libX11
 , wxGTK
 , wxmac
-, pkgconfig
+, pkg-config
 , buildPythonPackage
 , pyopengl
 , isPy3k
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ]
+  nativeBuildInputs = [ pkg-config ]
     ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ])
     ++ (lib.optionals stdenv.isDarwin [ wxmac ]);
 
diff --git a/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
index 406493362c46..d72d4aa35d4d 100644
--- a/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
@@ -2,17 +2,25 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, pkgconfig
+, pkg-config
 , which
 , cairo
 , pango
 , python
 , doxygen
 , ncurses
-, wxGTK
+, libintl
 , numpy
 , pillow
 , six
+, wxGTK
+, wxmac
+, IOKit
+, Carbon
+, Cocoa
+, AudioToolbox
+, OpenGL
+, CoreFoundation
 }:
 
 buildPythonPackage rec {
@@ -26,8 +34,16 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  nativeBuildInputs = [ pkgconfig which doxygen wxGTK ];
-  buildInputs = [ ncurses wxGTK.gtk ];
+  nativeBuildInputs = [ pkg-config which doxygen ]
+  ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]);
+
+  buildInputs = [ ncurses libintl ]
+  ++ (if stdenv.isDarwin
+  then
+    [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ]
+  else
+    [ wxGTK.gtk ]
+  );
 
   DOXYGEN = "${doxygen}/bin/doxygen";
 
@@ -50,7 +66,7 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py install --skip-build --prefix=$out
   '';
 
-  passthru = { inherit wxGTK; };
+  passthru = { wxWidgets = if stdenv.isDarwin then wxmac else wxGTK; };
 
 
   meta = {
diff --git a/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix b/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
index 6d07f8b5e281..e4cb6ec79e01 100644
--- a/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
+++ b/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , buildPythonPackage
 , which
-, pkgconfig
+, pkg-config
 , python
 , isPy27
 , pyopengl
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   # https://github.com/wxWidgets/Phoenix/issues/1316
   doCheck = false;
 
-  nativeBuildInputs = [ which doxygen wxGTK pkgconfig ];
+  nativeBuildInputs = [ which doxygen wxGTK pkg-config ];
 
   buildInputs = [
     wxGTK.gtk
diff --git a/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix
index 22ce5917e2a6..21bb787402c1 100644
--- a/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Binding for X11 proof of work hashing";
     homepage = "https://github.com/mazaclub/x11_hash";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/x256/default.nix b/nixpkgs/pkgs/development/python-modules/x256/default.nix
index bc0f0f657908..4ceb2dcae791 100644
--- a/nixpkgs/pkgs/development/python-modules/x256/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/x256/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Find the nearest xterm 256 color index for an RGB";
     homepage = "https://github.com/magarcia/python-x256";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/xapp/default.nix b/nixpkgs/pkgs/development/python-modules/xapp/default.nix
index de779fc2c00b..28901017b2b5 100644
--- a/nixpkgs/pkgs/development/python-modules/xapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xapp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , buildPythonPackage
 , psutil
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/linuxmint/python-xapp";
     description = "Cross-desktop libraries and common resources for python";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/xattr/default.nix b/nixpkgs/pkgs/development/python-modules/xattr/default.nix
index 8634d616b736..3583358a5605 100644
--- a/nixpkgs/pkgs/development/python-modules/xattr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xattr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m compileall -f xattr
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/xattr/xattr";
     description = "Python wrapper for extended filesystem attributes";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix b/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix
index 25061d5321ab..f6bb5712c2eb 100644
--- a/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchdarcs
 , isPy3k
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ eventlib application ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/AGProjects/python-xcaplib";
     description = "XCAP (RFC4825) client library";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
index b75179bdc2a4..8f51ec1e77f8 100644
--- a/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , xorg
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "xcffib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A drop in replacement for xpyb, an XCB python binding";
     homepage = "https://github.com/tych0/xcffib";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/xdg/default.nix b/nixpkgs/pkgs/development/python-modules/xdg/default.nix
index 8b2d73b00fb8..e47a91fb993b 100644
--- a/nixpkgs/pkgs/development/python-modules/xdg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xdg/default.nix
@@ -1,11 +1,11 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy27
 , clikit
-, poetry
+, poetry-core
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  version = "4.0.1";
+  version = "5.0.1";
   pname = "xdg";
   disabled = isPy27;
   format = "pyproject";
@@ -14,10 +14,10 @@ buildPythonPackage rec {
     owner = "srstevenson";
     repo = pname;
     rev = version;
-    sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2";
+    sha256 = "sha256-WMY9Hs9SbErTp8hVBoCWTz4dLQhuzqTRpXFEyE7+woo=";
   };
 
-  nativeBuildInputs = [ poetry ];
+  nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [
     clikit
diff --git a/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/nixpkgs/pkgs/development/python-modules/xdot/default.nix
index 75d090699a47..21b45b9c322d 100644
--- a/nixpkgs/pkgs/development/python-modules/xdot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xdot/default.nix
@@ -20,7 +20,8 @@ buildPythonPackage rec {
   '';
 
   # https://github.com/NixOS/nixpkgs/pull/107872#issuecomment-752175866
-  doCheck = stdenv.isLinux;
+  # cannot import name '_gi' from partially initialized module 'gi' (most likely due to a circular import)
+  doCheck = false;
 
   meta = with lib; {
     description = "An interactive viewer for graphs written in Graphviz's dot";
diff --git a/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
index 88143b2193f4..e3328c7e4534 100644
--- a/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pillow
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A PDF generator using HTML and CSS";
     homepage = "https://github.com/xhtml2pdf/xhtml2pdf";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
index 8cb5b5f0777a..88f7b9b94a1f 100644
--- a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # https://github.com/redacted/XKCD-password-generator/issues/32
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pypi.python.org/pypi/xkcdpass/";
     description = "Generate secure multiword passwords/passphrases, inspired by XKCD";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/nixpkgs/pkgs/development/python-modules/xknx/default.nix
new file mode 100644
index 000000000000..b448f87a2d36
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/xknx/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, netifaces
+, voluptuous
+, pyyaml
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "xknx";
+  version = "0.16.1";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "XKNX";
+    repo = pname;
+    rev = version;
+    sha256 = "0nma0fq67p9c90b6s5v7n4s6j94sdiwqf8rk1k2vfc6nxxn1jfll";
+  };
+
+  propagatedBuildInputs = [
+    voluptuous
+    netifaces
+    pyyaml
+  ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "xknx" ];
+
+  meta = with lib; {
+    description = "KNX Library Written in Python";
+    longDescription = ''
+      XKNX is an asynchronous Python library for reading and writing KNX/IP
+      packets. It provides support for KNX/IP routing and tunneling devices.
+    '';
+    homepage = "https://github.com/XKNX/xknx";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/xlib/default.nix b/nixpkgs/pkgs/development/python-modules/xlib/default.nix
index 599abf1974cd..1819fd5a5124 100644
--- a/nixpkgs/pkgs/development/python-modules/xlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , six
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "xlib";
-  version = "0.28";
+  version = "0.29";
 
   src = fetchFromGitHub {
     owner = "python-xlib";
     repo = "python-xlib";
     rev = version;
-    sha256 = "13551vi65034pjf2g7zkw5dyjqcjfyk32a640g5jr055ssf0bjkc";
+    sha256 = "sha256-zOG1QzRa5uN36Ngv8i5s3mq+VIoRzxFj5ltUbKdonJ0=";
   };
 
   checkPhase = ''
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fully functional X client library for Python programs";
     homepage = "http://python-xlib.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/xlrd/default.nix b/nixpkgs/pkgs/development/python-modules/xlrd/default.nix
index 9b5e8b83e306..031ac047936e 100644
--- a/nixpkgs/pkgs/development/python-modules/xlrd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xlrd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     py.test -k "not test_tilde_path_expansion"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.python-excel.org/";
     description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
index 1c42b1b17845..a5b67632d836 100644
--- a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "09vigknmz15izirfddkmb3a39h1rp2jmc00bnrff12i757n7jjl4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bitprophet/alabaster";
     description = "Convert xlsx to csv";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
index 1a1ac6fc6d24..e06daf3c5b86 100644
--- a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
+{ lib, stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
 , pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs
 }:
 
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "xml2rfc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool generating IETF RFCs and drafts from XML sources";
     homepage = "https://tools.ietf.org/tools/xml2rfc/trac/";
     # Well, parts might be considered unfree, if being strict; see:
diff --git a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
index 55b45fb51714..e31054e74c13 100644
--- a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
@@ -5,14 +5,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.3.1";
+  version = "1.4.1";
   pname = "xmlschema";
 
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "v${version}";
-    sha256 = "08p6fm15600h40r5h7f3gfv34cys481f89pf57dv3y8gf6y2if56";
+    sha256 = "1yd7whf74z8bw99gldxlnrs8bjnjzald29b5cf2ka0i144sxbvad";
   };
 
   propagatedBuildInputs = [ elementpath ];
diff --git a/nixpkgs/pkgs/development/python-modules/xmodem/default.nix b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix
index 7e0a25709fb4..9023c4cc79ee 100644
--- a/nixpkgs/pkgs/development/python-modules/xmodem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }:
 
 buildPythonPackage rec {
   pname = "xmodem";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pure python implementation of the XMODEM protocol";
     maintainers = with maintainers; [ emantor ];
     homepage = "https://github.com/tehmaze/xmodem";
diff --git a/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix b/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix
index b812609a7d7b..fd046adadd97 100644
--- a/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy3k }:
+{ lib, stdenv, buildPythonPackage, fetchurl, isPy3k }:
 buildPythonPackage rec {
   pname = "xmpp.py";
   version = "0.5.0rc1";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   disabled = isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XMPP python library";
     homepage = "http://xmpppy.sourceforge.net/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/xnd/default.nix b/nixpkgs/pkgs/development/python-modules/xnd/default.nix
index 3178e171f844..3657997f5a74 100644
--- a/nixpkgs/pkgs/development/python-modules/xnd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xnd/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , ndtypes
@@ -27,7 +28,7 @@ buildPythonPackage {
   postInstall = ''
     mkdir $out/include
     cp python/xnd/*.h $out/include
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so
   '';
 
diff --git a/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix
index dacb3b634368..0852fd2e15cf 100644
--- a/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , xorgserver
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   checkInputs = [ mock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Run headless display inside X virtual framebuffer (Xvfb)";
     homepage = "https://github.com/cgoldberg/xvfbwrapper";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/xxhash/default.nix b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix
index 52b3f8b1b5b5..d2f6ae54a4cf 100644
--- a/nixpkgs/pkgs/development/python-modules/xxhash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ifduyue/python-xxhash";
     description = "Python Binding for xxHash https://pypi.org/project/xxhash/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix
index f0407dff1735..7145c504cd92 100644
--- a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , nose, pyyaml, pathspec }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # Two test failures
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A linter for YAML files";
     homepage = "https://github.com/adrienverge/yamllint";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/yanc/default.nix b/nixpkgs/pkgs/development/python-modules/yanc/default.nix
index 9bbfc4100682..6d4a3b41fbcc 100644
--- a/nixpkgs/pkgs/development/python-modules/yanc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yanc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }:
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "yanc";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     nosetests .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yet another nose colorer";
     homepage = "https://github.com/0compute/yanc";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/yapf/default.nix b/nixpkgs/pkgs/development/python-modules/yapf/default.nix
index 65a4e9abcb29..36409ae40195 100644
--- a/nixpkgs/pkgs/development/python-modules/yapf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yapf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "yapf";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A formatter for Python code.";
     homepage    = "https://github.com/google/yapf";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/yapsy/default.nix b/nixpkgs/pkgs/development/python-modules/yapsy/default.nix
index f0d39f69e555..359a855a3e5f 100644
--- a/nixpkgs/pkgs/development/python-modules/yapsy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yapsy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "12rznbnswfw0w7qfbvmmffr9r317gl1rqg36nijwzsklkjgks4fq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://yapsy.sourceforge.net/";
     description = "Yet another plugin system";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/nixpkgs/pkgs/development/python-modules/yarl/default.nix
index 7a15907e59be..7a88b695f639 100644
--- a/nixpkgs/pkgs/development/python-modules/yarl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yarl/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
       typing-extensions
     ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yet another URL library";
     homepage = "https://github.com/aio-libs/yarl/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/ydiff/default.nix b/nixpkgs/pkgs/development/python-modules/ydiff/default.nix
index 822bb40783e9..be935b1995c6 100644
--- a/nixpkgs/pkgs/development/python-modules/ydiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ydiff/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, docutils, pygments
+, gitMinimal, mercurial, subversion, patchutils, less
+}:
 
 buildPythonPackage rec {
   pname = "ydiff";
@@ -9,21 +11,38 @@ buildPythonPackage rec {
     sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121";
   };
 
-  # test suite requires a multitude of other version control tooling
-  # currently only a single file, an import/usage should suffice
+  patchPhase = ''
+    substituteInPlace ydiff.py \
+      --replace "['git'" "['${gitMinimal}/bin/git'" \
+      --replace "['hg'" "['${mercurial}/bin/hg'" \
+      --replace "['svn'" "['${subversion}/bin/svn'" \
+      --replace "['filterdiff'" "['${patchutils}/bin/filterdiff'" \
+      --replace "['less'" "['${less}/bin/less'" # doesn't support PAGER from env
+    substituteInPlace tests/test_ydiff.py \
+      --replace /bin/rm rm \
+      --replace /bin/sh sh
+    patchShebangs setup.py
+    patchShebangs tests/*.sh
+  '';
+
+  checkInputs = [ docutils pygments ];
+
   checkPhase = ''
-    $out/bin/ydiff --help
+    runHook preCheck
+    make doc-check reg # We don't want the linter or coverage check.
+    runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")";
     longDescription = ''
-      Term based tool to view colored, incremental diff in a Git/Mercurial/Svn
-      workspace or from stdin, with side by side (similar to diff -y) and auto
-      pager support
+      Term based tool to view colored, incremental diff in a version
+      controlled workspace (supports Git, Mercurial, Perforce and Svn
+      so far) or from stdin, with side by side (similar to diff -y)
+      and auto pager support.
     '';
     homepage = "https://github.com/ymattw/ydiff";
     license = licenses.bsd3;
-    maintainers = [ maintainers.limeytexan ];
+    maintainers = (with maintainers; [ leenaars ]) ++ teams.deshaw.members;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix b/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix
deleted file mode 100644
index 9599828e65ee..000000000000
--- a/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
-  pname = "youtube_dlc";
-  version = "2020.11.11.post3";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM=";
-  };
-
-  # They are broken
-  doCheck = false;
-
-  pythonImportsCheck = [ "youtube_dlc" ];
-
-  meta = with lib; {
-    homepage = "Media downloader supporting various sites such as youtube";
-    description = "https://github.com/blackjack4494/yt-dlc";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ freezeboy ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
index c1f6b6632aab..48c21434194f 100644
--- a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest
+{ buildPythonPackage, lib, stdenv, fetchFromGitHub, six, python-axolotl, pytest
 , isPy3k, consonance, appdirs
 }:
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six python-axolotl consonance appdirs ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tgalal/yowsup";
     description = "The python WhatsApp library";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix
index f4f42cf9e3fc..f1af120d56eb 100644
--- a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m zope.testrunner --test-path=src []
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/z3c.checkversions";
     description = "Find newer package versions on PyPI";
     license = licenses.zpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/zake/default.nix b/nixpkgs/pkgs/development/python-modules/zake/default.nix
index 8eafaafadf58..1d1d21a462ec 100644
--- a/nixpkgs/pkgs/development/python-modules/zake/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , kazoo
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover zake/tests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/yahoo/Zake";
     description = "A python package that works to provide a nice set of testing utilities for the kazoo library";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix
index a87bd3093f4f..4e126074b184 100644
--- a/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zconfig
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # too many deps..
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A daemon process control library and tools for Unix-based systems";
     homepage = "https://pypi.python.org/pypi/zdaemon";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zbase32/default.nix b/nixpkgs/pkgs/development/python-modules/zbase32/default.nix
index 9c97ad066ed5..a4e7a476beca 100644
--- a/nixpkgs/pkgs/development/python-modules/zbase32/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zbase32/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptoolsDarcs
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ setuptoolsDarcs pyutil ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "zbase32, a base32 encoder/decoder";
     homepage = "https://pypi.python.org/pypi/zbase32";
     license = licenses.bsd0;
diff --git a/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix b/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix
index 18fc7bcf5115..3b75de3a24b6 100644
--- a/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix
@@ -2,7 +2,7 @@
 , fetchPypi
 , mock
 , zope_testing
-, stdenv
+, lib, stdenv
 }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   buildInputs = [ mock ];
   propagatedBuildInputs = [ zope_testing ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Inter-process locks";
     homepage =  "https://www.python.org/pypi/zc.lockfile";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zconfig/default.nix b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix
index ef4754504dd6..a6a00ad821b8 100644
--- a/nixpkgs/pkgs/development/python-modules/zconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , fetchpatch
 , buildPythonPackage
@@ -23,12 +23,12 @@ buildPythonPackage rec {
       url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch";
       sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij";
     })
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
 
   buildInputs = [ manuel docutils ];
   propagatedBuildInputs = [ zope_testrunner ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Structured Configuration Library";
     homepage = "https://pypi.python.org/pypi/ZConfig";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix
index a87bd3093f4f..4e126074b184 100644
--- a/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zconfig
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # too many deps..
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A daemon process control library and tools for Unix-based systems";
     homepage = "https://pypi.python.org/pypi/zdaemon";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zerobin/default.nix b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix
index efc2bb380b8e..e12088756686 100644
--- a/nixpkgs/pkgs/development/python-modules/zerobin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , cherrypy
@@ -24,7 +24,7 @@ buildPythonPackage {
   # can wrongly fail the check phase.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client side encrypted pastebin";
     homepage = "https://0bin.net/";
     license = licenses.wtfpl;
diff --git a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
index 16bf5b7855c5..f85674d68673 100644
--- a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }:
 
 buildPythonPackage rec {
   pname = "zeroc-ice";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   buildInputs = [ openssl bzip2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zeroc.com/";
     license = licenses.gpl2;
     description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more.";
diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
index a8715a2133c3..a3b00ec32324 100644
--- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchPypi
 , ifaddr
@@ -10,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.28.6";
+  version = "0.28.8";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "70f10f0f16e3a8c4eb5e1a106b812b8d052253041cf1ee1195933df706f5261c";
+    sha256 = "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb";
   };
 
   propagatedBuildInputs = [ ifaddr ]
@@ -29,12 +30,15 @@ buildPythonPackage rec {
     "test_launch_and_close_v4_v6"
     "test_launch_and_close_v6_only"
     "test_integration_with_listener_ipv6"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "test_lots_of_names"
   ];
+  __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [ "zeroconf" ];
 
   meta = with lib; {
-    description = "A pure python implementation of multicast DNS service discovery";
+    description = "Python implementation of multicast DNS service discovery";
     homepage = "https://github.com/jstasiak/python-zeroconf";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
diff --git a/nixpkgs/pkgs/development/python-modules/zfec/default.nix b/nixpkgs/pkgs/development/python-modules/zfec/default.nix
index b365438a1c97..8a5aaf46b0e4 100644
--- a/nixpkgs/pkgs/development/python-modules/zfec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zfec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptoolsDarcs
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     sed -i -e '/argparse/d' setup.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://allmydata.org/trac/zfec";
     description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
index 0c6ac7dbf499..2f3500516cb9 100644
--- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
@@ -1,19 +1,26 @@
-{ lib, buildPythonPackage, fetchPypi
-, aiohttp, zigpy, conftest, asynctest
-, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, zigpy
+, asynctest
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.47";
+  version = "0.0.51";
 
-  propagatedBuildInputs = [ aiohttp zigpy ];
-  checkInputs = [ pytestCheckHook conftest asynctest ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bf7dbd5d1c1a3849b059e62afcef248b6955f5ceef78f87201ae2fc8420738de";
+  src = fetchFromGitHub {
+    owner = "zigpy";
+    repo = "zha-device-handlers";
+    rev = version;
+    sha256 = "14v01kclf096ax88cd6ckfs8gcffqissli9vpr0wfzli08afmbi9";
   };
 
+  propagatedBuildInputs = [ aiohttp zigpy ];
+  checkInputs = [ pytestCheckHook asynctest ];
+
   meta = with lib; {
     description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
     homepage = "https://github.com/dmulcahey/zha-device-handlers";
diff --git a/nixpkgs/pkgs/development/python-modules/zict/default.nix b/nixpkgs/pkgs/development/python-modules/zict/default.nix
index c5629a6fb73f..da36c1cba899 100644
--- a/nixpkgs/pkgs/development/python-modules/zict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, heapdict, pythonOlder }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   buildInputs = [ pytest ];
   propagatedBuildInputs = [ heapdict ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mutable mapping tools.";
     homepage = "https://github.com/dask/zict";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
index 12964652752f..d9c7854bf984 100644
--- a/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -1,20 +1,29 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyserial, pyserial-asyncio, zigpy
-, pytest, pytest-asyncio, asynctest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, zigpy
+, pytestCheckHook
+, pytest-asyncio
+, asynctest
+}:
 
 buildPythonPackage rec {
   pname = "zigpy-deconz";
-  version = "0.11.0";
+  version = "0.11.1";
 
-  propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
-  checkInputs = [ pytest pytest-asyncio asynctest ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a2263f8bc5807ebac55bb665eca553b514384ce270b66f83df02c39184193020";
+  src = fetchFromGitHub {
+    owner = "zigpy";
+    repo = pname;
+    rev = version;
+    sha256 = "1p9mdsfc200iyszppcflazzfwqg4v8nqqwqsx114nip5km7a5s37";
   };
 
-  meta = with stdenv.lib; {
+  propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
+  checkInputs = [ pytestCheckHook pytest-asyncio asynctest ];
+
+  meta = with lib; {
     description = "Library which communicates with Deconz radios for zigpy";
     homepage = "https://github.com/zigpy/zigpy-deconz";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix
index 018017c89a4c..5ebb17dd498b 100644
--- a/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-zigate";
-  version = "0.7.3";
+  version = "0.7.4";
   # https://github.com/Martiusweb/asynctest/issues/152
   # broken by upstream python bug with asynctest and
   # is used exclusively by home-assistant with python 3.8
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy-zigate";
     rev = version;
-    sha256 = "068v8n8yimmpnwqcdz5m9g35z1x0dir478cbc1s1nyhw1xn50vg1";
+    sha256 = "0xl8qgljvmypi602f52m89iv9pcrzsdal3jw619vrcavp40rc04d";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
index 9b8e65e23d03..4de49cbc46b3 100644
--- a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , async-timeout
 , asynctest
 , buildPythonPackage
@@ -45,7 +45,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  meta = with stdenv.lib; {
+  disabledTests = [
+    # zigpy-znp was too slow to sync up with the zigpy 0.29 release and has API breakage, remove >0.3.0
+    "test_force_remove"
+  ];
+
+  meta = with lib; {
     description = "A library for zigpy which communicates with TI ZNP radios";
     homepage = "https://github.com/zha-ng/zigpy-znp";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
index 54f0df340169..9a6b0feb3b77 100644
--- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
@@ -1,5 +1,6 @@
 { lib
 , aiohttp
+, aiosqlite
 , asynctest
 , buildPythonPackage
 , crccheck
@@ -14,17 +15,18 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.26.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy";
     rev = version;
-    sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs=";
+    sha256 = "14qyxm7bj62fsvxfp6x3r1ygjlv7q3jjvq6gzj30na78x1fqr9g1";
   };
 
   propagatedBuildInputs = [
     aiohttp
+    aiosqlite
     crccheck
     pycrypto
     pycryptodome
diff --git a/nixpkgs/pkgs/development/python-modules/zodb/default.nix b/nixpkgs/pkgs/development/python-modules/zodb/default.nix
index e8097461d3b1..d48b9c4b9507 100644
--- a/nixpkgs/pkgs/development/python-modules/zodb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zodb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchPypi
 , buildPythonPackage
 , python
@@ -52,7 +52,7 @@ buildPythonPackage rec {
       ${python.interpreter} -m zope.testrunner --test-path=src []
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Zope Object Database: object database and persistence";
       homepage = "https://pypi.python.org/pypi/ZODB";
       license = licenses.zpl21;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix b/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix
index aa12167bddc2..899d7f3344be 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_interface
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   buildInputs = [ zope_interface ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypi.python.org/pypi/zope.broken";
     description = "Zope Broken Object Interfaces";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix
index df0835841bce..6ea86b9b984d 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope-deferredimport
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # ignore tests because of a circular dependency on zope_security
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.component";
     description = "Zope Component Architecture";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix
index 587cbf60d88c..e8d05b7767b3 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_i18nmessageid
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # Need to investigate how to run the tests with zope-testrunner
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Zope Configuration Markup Language (ZCML)";
     homepage = "https://github.com/zopefoundation/zope.configuration";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix
index b1792d718543..6b66cca18aab 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_testrunner
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkInputs = [ zope_testrunner ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.contenttype";
     description = "A utility module for content-type (MIME type) handling";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix
index c4059dbcd416..cda7af8e7a0c 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_testing
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   buildInputs = [ zope_testing ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.deprecation";
     description = "Zope Deprecation Infrastructure";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix b/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix
index b2afc9cc23f4..0e8f35431364 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0cec09844d309550359ac1941abfcd9141e213f67f3c19bb8f90360c40787576";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypi.python.org/pypi/zope.dottedname";
     description = "Resolver for Python dotted names";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_event/default.nix b/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
index b5481ae2e2b7..cc82da7ea9a1 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An event publishing system";
     homepage = "https://pypi.python.org/pypi/zope.event";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix b/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix
index ae7797b8736b..09f08c7bba48 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_interface
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # circular deps
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Exception interfaces and implementations";
     homepage = "https://pypi.python.org/pypi/zope.exceptions";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix b/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix
index 635727a11734..7aae2a24d623 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_schema
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     cd src/zope/filerepresentation && python -m unittest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zopefilerepresentation.readthedocs.io/";
     description = "File-system Representation Interfaces";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
index ca5f818cd620..49270488ecdb 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , six
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   checkInputs = [ coverage zope_testrunner ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.i18nmessageid";
     description = "Message Identifiers for internationalization";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix b/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
index 919c3ade3c28..7a32045fc3e3 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_event
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   doCheck = false; # Circular deps.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Zope.Interface";
     homepage = "https://zope.org/Products/ZopeInterface";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
index 6494aa7a71af..390624b50de7 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -22,12 +22,12 @@ buildPythonPackage rec {
   doCheck = false;
 
   # zope uses pep 420 namespaces for python3, doesn't work with nix + python2
-  pythonImportsCheck = stdenv.lib.optionals isPy3k [
+  pythonImportsCheck = lib.optionals isPy3k [
     "zope.lifecycleevent"
     "zope.interface"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.lifecycleevent";
     description = "Object life-cycle events";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_location/default.nix b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix
index 1c868a739719..62b2cef9ea75 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_location/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_proxy
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.location/";
     description = "Zope Location";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
index 7092f7508708..af108c058c7f 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_interface
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # circular deps
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.proxy";
     description = "Generic Transparent Proxies";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix b/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
index d32fb05ef94a..c7e228c4e05b 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_location
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # Package seems to work fine.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.schema";
     description = "zope.interface extension for defining data schemas";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_size/default.nix b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix
index 92df0aa1eb7e..79eadc880a25 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_size/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_i18nmessageid
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_i18nmessageid zope_interface ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.size";
     description = "Interfaces and simple adapter that give the size of an object";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix b/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix
index 1ea12eb377d9..3d7cbf90c25f 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Zope testing helpers";
     homepage =  "http://pypi.python.org/pypi/zope.testing";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix b/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
index 90fa0b8143cd..c516106e48bb 100644
--- a/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonPackage
 , fetchPypi
 , zope_interface
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   doCheck = false; # custom test modifies sys.path
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A flexible test runner with layer support";
     homepage = "https://pypi.python.org/pypi/zope.testrunner";
     license = licenses.zpl20;
diff --git a/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/nixpkgs/pkgs/development/python-modules/zstd/default.nix
index 95626c802bad..af7bb7692f66 100644
--- a/nixpkgs/pkgs/development/python-modules/zstd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zstd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchPypi, buildPythonPackage
+{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage
 , buildPackages
 , zstd, pytest }:
 
@@ -13,10 +13,10 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config"
+      --replace "/usr/bin/pkg-config" "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zstd ];
 
   setupPyBuildFlags = [
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple python bindings to Yann Collet ZSTD compression library";
     homepage = "https://github.com/sergey-dryabzhinsky/python-zstd";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/python-modules/zulip/default.nix b/nixpkgs/pkgs/development/python-modules/zulip/default.nix
index 229a4f17bd34..2c7b7582b80e 100644
--- a/nixpkgs/pkgs/development/python-modules/zulip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zulip/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "zulip";
-  version = "0.7.0";
+  version = "0.7.1";
 
   disabled = !isPy3k;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "zulip";
     repo = "python-zulip-api";
     rev = version;
-    sha256 = "0waldgpzq3ms1r1z14lxdj56lf082fnmi83l3fn8i8gqr8nvnch1";
+    sha256 = "0da1ki1v252avy27j6d7snnc0gyq0xa9fypm3qdmxhw2w79d6q36";
   };
   sourceRoot = "source/zulip";
 
diff --git a/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix b/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix
index 773e64ec8027..372f1438ebff 100644
--- a/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix
@@ -7,7 +7,7 @@
 let derive2 = derive { biocVersion = "3.11"; };
 in with self; {
   AHCytoBands = derive2 { name="AHCytoBands"; version="0.99.0"; sha256="0g92nz33rx14zl5can7s701bipdgz7rxqygvvc22c4a0qj52ijnq"; depends=[]; };
-  AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.14"; sha256="0fb94bxk6ggx09a0icraaxfzncvvgxk223146b17lbxsyl6i02z8"; depends=[AnnotationHubData ensembldb]; };
+  AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.15"; sha256="0by0y2nyqhihpwzm36lggkc0dqvxz22k6ck1wcmrf7sck8xg54ji"; depends=[AnnotationHubData ensembldb]; };
   BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.0"; sha256="06549kkzy36n378zb61lrf9zardncp7i20r73rmmiq1pnfjp3gww"; depends=[BSgenome]; };
   BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; };
   BSgenome_Amellifera_UCSC_apiMel2 = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2"; version="1.4.0"; sha256="1967w7aly7qydykk7rar712kvgsav3zjr4kirybkj17nwiynd74g"; depends=[BSgenome]; };
diff --git a/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix b/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix
index 0fb24f27daaf..a5fca5b2b55f 100644
--- a/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix
@@ -249,13 +249,13 @@ in with self; {
   curatedCRCData = derive2 { name="curatedCRCData"; version="2.20.0"; sha256="0bcfa5w6sqabz35npl2vmrj35ymgciiqkcgjhplm0ngimsm9f0wn"; depends=[BiocGenerics nlme]; };
   curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.18.2"; sha256="02m06scv1wxvh858bpxwlvwz4lf0qmvd8246axx65d2ln5fkvrc9"; depends=[AnnotationHub Biobase dplyr ExperimentHub magrittr S4Vectors tidyr]; };
   curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.26.0"; sha256="0wvpbagh9v1lyc9rsvymzy38r18g23yajvis1pj0rl7wa0zk2p4x"; depends=[affy BiocGenerics]; };
-  curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.10.0"; sha256="0f8ariq3c0xh3w1gcfp8vgmkmlx3ybfry215flq01cc523pgrka7"; depends=[AnnotationHub ExperimentHub HDF5Array MultiAssayExperiment S4Vectors SummarizedExperiment]; };
+  curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.10.1"; sha256="05vlj0ivd9dym0078cjd3wswkmqsa7k5ffkl792fw9r5246s9dqc"; depends=[AnnotationHub ExperimentHub HDF5Array MultiAssayExperiment S4Vectors SummarizedExperiment]; };
   davidTiling = derive2 { name="davidTiling"; version="1.28.0"; sha256="0cqkz6rlkk2a3fsaa736s731lb3mdvpqzd6ywff2l1wkdza7n3ha"; depends=[Biobase GO_db tilingArray]; };
   depmap = derive2 { name="depmap"; version="1.2.0"; sha256="0ymdfkddrl3rbini83528x2ah8lvlvy0ard9m303dkpg5b90axim"; depends=[AnnotationHub dplyr ExperimentHub]; };
   derfinderData = derive2 { name="derfinderData"; version="2.6.0"; sha256="1kbdwwdn7ykrdm36bqd8hnj0rw9ikcnxwg0w1xdc5caqmxsg1w8h"; depends=[]; };
   diffloopdata = derive2 { name="diffloopdata"; version="1.16.0"; sha256="03rl0ffl9103zi3mk028l79vhlpnlybx0hnl8x9fsxnqkx1rkj32"; depends=[]; };
   diggitdata = derive2 { name="diggitdata"; version="1.20.0"; sha256="0wb6g9q5m2cjnxnpz2aralridmsdmd70lp1iwszdl6qc2634c2bc"; depends=[Biobase viper]; };
-  dorothea = derive2 { name="dorothea"; version="1.0.0"; sha256="0c8bp0fxqf2kwi196al34a4pc78y6v0lchrjw0jn29cbihs2yjax"; depends=[bcellViper dplyr magrittr]; };
+  dorothea = derive2 { name="dorothea"; version="1.0.1"; sha256="189j44hfc12bf3r28hjm2wnigb9k4mmpwp6wnbxyx69nci3jh4zj"; depends=[bcellViper dplyr magrittr]; };
   dressCheck = derive2 { name="dressCheck"; version="0.26.0"; sha256="0sa5d4isv3ni6bdq1i2yskycq357272flj2wbravy4zi7xrsk7iw"; depends=[Biobase]; };
   dsQTL = derive2 { name="dsQTL"; version="0.26.0"; sha256="1pkwppfkfacf8xxmdflckql8x2n6abvfdvwly1va69288ibxy1xf"; depends=[Biobase GGBase SummarizedExperiment]; };
   dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.28.0"; sha256="1l8628150dic4l48r8gqasxpil6552d3h9imysvznkq13j5j48wa"; depends=[GEOquery marray]; };
@@ -357,7 +357,7 @@ in with self; {
   pwrEWAS_data = derive2 { name="pwrEWAS.data"; version="1.2.0"; sha256="02aq2sqilz11sknbwkdfca7gw95i4x5mf2n477kzn09dhiplq1l9"; depends=[ExperimentHub]; };
   qPLEXdata = derive2 { name="qPLEXdata"; version="1.6.0"; sha256="16jzij7cmiagxb0cp2pyna8s424kx3gz55b6v2qsssm9apy77bg3"; depends=[dplyr knitr MSnbase qPLEXanalyzer]; };
   rRDPData = derive2 { name="rRDPData"; version="1.8.0"; sha256="09n5289fk5mq1q9skfzmg4rxq66l68k5rv72pz256p7k5xslxx2y"; depends=[rRDP]; };
-  rcellminerData = derive2 { name="rcellminerData"; version="2.10.0"; sha256="0v8aj14pwjm60rvnk9nsp02m3vavhn6l49ny0k0rmdrq79bvyymn"; depends=[Biobase]; };
+  rcellminerData = derive2 { name="rcellminerData"; version="2.10.2"; sha256="0w8hyfyk1sqlz0kicxazn60rl6zxi36c2g6yrdnxfdm3sfjvws1d"; depends=[Biobase]; };
   restfulSEData = derive2 { name="restfulSEData"; version="1.10.0"; sha256="0l4qamp6x2g5k2bix0mlxpv344yqzz3ap80zdw4b2jgdlq9gvfgg"; depends=[ExperimentHub SummarizedExperiment]; };
   rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.26.0"; sha256="1bsv8i3xapkpga04388598slqqjwpkh9nh3vy9q4ibj14wnmcf0w"; depends=[]; };
   sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.12.0"; sha256="1v5qi6fh86snfpw4q0lqi0sznfdqv5d95a07bsdqf3g4p6saalxd"; depends=[SummarizedExperiment]; };
@@ -370,14 +370,14 @@ in with self; {
   sesameData = derive2 { name="sesameData"; version="1.6.0"; sha256="0fyiwd2sfqdyb1msm4clz8lwbxlw4dfl83kkj25xmp5hh2dh915a"; depends=[AnnotationHub curl ExperimentHub]; };
   seventyGeneData = derive2 { name="seventyGeneData"; version="1.24.0"; sha256="1rla88mcnpl0w3k0szbhzzkbc786fq67vqyqwv2aq9f4nssjw95k"; depends=[]; };
   shinyMethylData = derive2 { name="shinyMethylData"; version="1.8.0"; sha256="19wfry1xx7kvl5mrmn4pv4amlv035nl73ni58qa6s5kwxzklpavn"; depends=[]; };
-  signatureSearchData = derive2 { name="signatureSearchData"; version="1.2.1"; sha256="0q5p2g3im5nyngpdfdvk4xm1fp064cgavjrx7pf1q2fkijc3m07a"; depends=[affy Biobase dplyr ExperimentHub limma magrittr R_utils rhdf5 signatureSearch]; };
+  signatureSearchData = derive2 { name="signatureSearchData"; version="1.2.2"; sha256="0fm3zy3z1p8f7li14ic2za219pav1sslsxkxd8yprlbi20ab7rx9"; depends=[affy Biobase dplyr ExperimentHub limma magrittr R_utils rhdf5 signatureSearch]; };
   simpIntLists = derive2 { name="simpIntLists"; version="1.24.0"; sha256="1sxscydcd43xlyxr4rn3rmjc9hmwvqzrqw40ihmkva0ld8r635n1"; depends=[]; };
   spatialLIBD = derive2 { name="spatialLIBD"; version="1.0.0"; sha256="0yx12mcrmb2g6sjnk1ajclnc0z3i2aps2snw85gyanaad5l1igq5"; depends=[AnnotationHub benchmarkme cowplot DT ExperimentHub fields ggplot2 golem IRanges plotly png Polychrome RColorBrewer S4Vectors scater sessioninfo shiny shinyWidgets SingleCellExperiment SummarizedExperiment viridisLite]; };
   spqnData = derive2 { name="spqnData"; version="1.0.0"; sha256="19sisn5l3nvz2nr400jgz5clcj0iygk17xhpsjqgswi9p43a3k9z"; depends=[SummarizedExperiment]; };
   stemHypoxia = derive2 { name="stemHypoxia"; version="1.24.0"; sha256="03kzrmdlixi31k6jfjhcn4dkm5g16rbd315ws4pqilpdwhgmrlff"; depends=[]; };
   stjudem = derive2 { name="stjudem"; version="1.28.0"; sha256="07cbpxzc78asjm41rx5nl4gyzczp7j293ih86ins31r65grwjwm3"; depends=[]; };
   synapterdata = derive2 { name="synapterdata"; version="1.26.0"; sha256="0a1k831pw0sl0blr1iy5is0s06sw4kadb30prd0h2l2z8s6ldarm"; depends=[synapter]; };
-  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.16.1"; sha256="1rjh7ki3kczfx2f5vfrmbd6gwjm0f4dpm845x79fxy4k4sfb9zq2"; depends=[BiocGenerics devtools]; };
+  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.16.2"; sha256="0iamb2hp4dlib85jmzr77xm02ykriyzbh1ikqx9gs0hy15bribyv"; depends=[BiocGenerics devtools]; };
   tartare = derive2 { name="tartare"; version="1.2.0"; sha256="0v4s0xbxqrv8syihn1ahcrak8gsyklxl3xnzfy4dmqz6bzarpcgd"; depends=[AnnotationHub ExperimentHub]; };
   tcgaWGBSData_hg19 = derive2 { name="tcgaWGBSData.hg19"; version="1.6.0"; sha256="06f4xi2lh8idv7h5hmrmlha71k0dxc4s07apc2lj27l2wpm5dp85"; depends=[bsseq ExperimentHub knitr]; };
   tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.26.0"; sha256="04f3wy2k884vxyij1yrivxb6jymkh2j7byh0qzmkq2gs9k2lbrka"; depends=[]; };
diff --git a/nixpkgs/pkgs/development/r-modules/bioc-packages.nix b/nixpkgs/pkgs/development/r-modules/bioc-packages.nix
index 3fca87d57fd7..9d33a3cdc076 100644
--- a/nixpkgs/pkgs/development/r-modules/bioc-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/bioc-packages.nix
@@ -13,7 +13,7 @@ in with self; {
   ACME = derive2 { name="ACME"; version="2.44.0"; sha256="0hsfi1xmdp6kxv4vpacy8awwj2mils7avfqx418s2fwh6ms0l2a9"; depends=[Biobase BiocGenerics]; };
   ADAM = derive2 { name="ADAM"; version="1.4.0"; sha256="1r702walyspqad5xr1qf5xjifszlmgqqac4qbvz3qg1zcgc9l17w"; depends=[dplyr DT GO_db KEGGREST knitr pbapply Rcpp stringr SummarizedExperiment]; };
   ADAMgui = derive2 { name="ADAMgui"; version="1.4.0"; sha256="05apdy8r16r9j42wd43y67206ysmi2qhyayyc9v1adnxdsx5jiw0"; depends=[ADAM colorRamps data_table dplyr DT ggplot2 ggpubr ggrepel ggsignif GO_db gridExtra knitr RColorBrewer reshape2 shiny shinyjs stringi stringr testthat varhandle]; };
-  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.28.0"; sha256="0xwzl1yhcgv6rppzdspyygs8nr1hhnv53xnc3m2wh30di09fpyi9"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
+  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.28.1"; sha256="0k040bgb2j1wjlsi51m0pj5jfsb9qnqf297a5hjv46kga08w77af"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
   AGDEX = derive2 { name="AGDEX"; version="1.36.0"; sha256="1n08v7x7fgqyr79dmc5fkbcl6bgd1gjfx61hpm2ixp2px8b609ic"; depends=[Biobase GSEABase]; };
   AIMS = derive2 { name="AIMS"; version="1.20.0"; sha256="024hd1p37ccmfvvd5saa5qa531mb6rp90glzmd1scibz6hg4jg1g"; depends=[Biobase e1071]; };
   ALDEx2 = derive2 { name="ALDEx2"; version="1.20.0"; sha256="1cns8gdgcic6whry6b3hjlzhhfnrwjd4n4d1ijr3yaamp010rhph"; depends=[BiocParallel GenomicRanges IRanges multtest S4Vectors SummarizedExperiment zCompositions]; };
@@ -31,7 +31,7 @@ in with self; {
   ASSIGN = derive2 { name="ASSIGN"; version="1.24.0"; sha256="1qspirfdmqgh2lxba5xgny4qf12mc1wkbxbx7dbdp2r4balbca1h"; depends=[ggplot2 gplots msm Rlab sva yaml]; };
   ASpediaFI = derive2 { name="ASpediaFI"; version="1.2.0"; sha256="10k8cj6klbxidhrxp2ms059k5aacbgmgz2psp7dx82agwssxi3si"; depends=[BiocParallel biomaRt dplyr DRaWR e1071 fgsea GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz igraph IRanges IVAS limma Matrix mGSZ reshape2 ROCR Rsamtools rtracklayer S4Vectors scales SummarizedExperiment]; };
   ASpli = derive2 { name="ASpli"; version="1.14.0"; sha256="0lbi8jmkbl8jrf6i6xraqk419k7jlgpym3hj87jvr1ws3jp7yxrl"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; };
-  ATACseqQC = derive2 { name="ATACseqQC"; version="1.12.3"; sha256="12710c4024pndwwqiiqr6dhrd360z26fc8r3fxhs739gyd0ddk9r"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno edgeR GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; };
+  ATACseqQC = derive2 { name="ATACseqQC"; version="1.12.5"; sha256="1103daz82k97vzmxjmf7jwm2nd3w8i0jwplrsi9996bkih11qwbf"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno edgeR GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; };
   AUCell = derive2 { name="AUCell"; version="1.10.0"; sha256="0fgqkgjhf92vkljkwn44lm8cjvzq1lvk80nk6xhsp5q6s5isbmns"; depends=[BiocGenerics data_table GSEABase mixtools R_utils S4Vectors shiny SummarizedExperiment]; };
   AWFisher = derive2 { name="AWFisher"; version="1.2.0"; sha256="0ay1pv299akm9nbqhsw1s638c0wh15kgn3zc3qrwlivi9pzfa6qy"; depends=[edgeR limma]; };
   AffiXcan = derive2 { name="AffiXcan"; version="1.6.0"; sha256="0073z6waxg6bba1p4ks5cqilyywrm5c7cv6ggjpqg3msz4f2y3y8"; depends=[BiocParallel crayon MultiAssayExperiment SummarizedExperiment]; };
@@ -73,7 +73,7 @@ in with self; {
   BLMA = derive2 { name="BLMA"; version="1.12.0"; sha256="19ndm2cp6xp5mdydqv58klbj8aijkrb6qrfh17v7qcxjjfxhq3l3"; depends=[Biobase graph GSA limma PADOG ROntoTools]; };
   BPRMeth = derive2 { name="BPRMeth"; version="1.14.1"; sha256="1sha7gbvckd7li9vc804w1lydp1jg735kz0a5sh5fzi3wzs7rjqk"; depends=[assertthat BiocStyle cowplot data_table doParallel e1071 earth foreach GenomicRanges ggplot2 IRanges kernlab magrittr MASS matrixcalc mvtnorm randomForest Rcpp RcppArmadillo S4Vectors truncnorm]; };
   BRAIN = derive2 { name="BRAIN"; version="1.34.0"; sha256="1xk955fq92rrgiccbxps34mc56xl8dy9yyc4ah62lhhxccxwf84c"; depends=[Biostrings lattice PolynomF]; };
-  BRGenomics = derive2 { name="BRGenomics"; version="1.0.2"; sha256="03j8mmdd6im6x611c44flha7zxq3l7cdq2g94ccgm2rqxszaz5fs"; depends=[DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  BRGenomics = derive2 { name="BRGenomics"; version="1.0.3"; sha256="1q0kay73f1llhkfcfsh45i9bcbbp2r7br60fsi6rahq1as3xp3p5"; depends=[DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
   BSgenome = derive2 { name="BSgenome"; version="1.56.0"; sha256="1jw8r1qm9fpg2s1cw2y4np243jjxm65j2xdy2785h8fc1b02msf6"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges matrixStats Rsamtools rtracklayer S4Vectors XVector]; };
   BUMHMM = derive2 { name="BUMHMM"; version="1.12.0"; sha256="1baisaavlyrg83gqyzh0p0ls0bvq6darjs14ah9vpjdl7w50ngsj"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; };
   BUS = derive2 { name="BUS"; version="1.44.0"; sha256="0wcdjirgkc5d3xhwfjn8mnwv7aj3cac1sp7zh54k762j13jr794r"; depends=[infotheo minet]; };
@@ -84,7 +84,7 @@ in with self; {
   BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.32.0"; sha256="0c5hzf56q7nsiz316ldbafn0gg829ww6037i2miy4gprkj6s3f33"; depends=[RCurl RJSONIO]; };
   Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.24.0"; sha256="08sqiqxyc1cadwsp30sqbf9hwy45bcscf8cpaj8zp5llrbjlwhyy"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; };
   BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.16.0"; sha256="1f4la089chpypj1lhsazgzb3010swadk4xmaz403k8isj9winc0h"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; };
-  BatchQC = derive2 { name="BatchQC"; version="1.16.2"; sha256="0k3ccz3rmrq27c0dn0c4yh1xqyryiwfdy95274mappsy60lhwffp"; depends=[corpcor ggvis gplots heatmaply knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
+  BatchQC = derive2 { name="BatchQC"; version="1.16.3"; sha256="1cc5a0wy6na5nb9zbbizl727biq4r35s1nk5w2xkan9rsgwicp47"; depends=[corpcor ggvis gplots heatmaply knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
   BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.14.0"; sha256="0ndn6v8j526dx66j038d09jjlphx1gcdr1jbd8d0ybzqnv51zlxm"; depends=[Biobase]; };
   BayesPeak = derive2 { name="BayesPeak"; version="1.39.0"; sha256="1qzfvxp5jsp8zv9gdglmz9mf4xjl2ck4wjz2lngnjrnlxb9v6y4g"; depends=[IRanges]; };
   BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.40.0"; sha256="1k05fizqvdj4z4snp170mzj2vnaim2jy49k7wbv31fkin2xbf4bb"; depends=[]; };
@@ -116,7 +116,7 @@ in with self; {
   BiocSet = derive2 { name="BiocSet"; version="1.2.2"; sha256="041hq3rp0kv7kjwcjjrksk8lw3sj6j1v3wdcr8z611k0g0z6p0cj"; depends=[AnnotationDbi dplyr KEGGREST plyr rlang rtracklayer tibble]; };
   BiocSingular = derive2 { name="BiocSingular"; version="1.4.0"; sha256="0368a9xj4cvicqkxmhh12ln46q9gnxla70s1dqrxxfn3b6k525ih"; depends=[beachmat BiocGenerics BiocParallel DelayedArray irlba Matrix Rcpp rsvd S4Vectors]; };
   BiocSklearn = derive2 { name="BiocSklearn"; version="1.10.3"; sha256="11vv7b10q2az0l60d572sriyf37xcvm65yaw4i6bwjx7cpy5ch2v"; depends=[basilisk knitr Rcpp reticulate SummarizedExperiment]; };
-  BiocStyle = derive2 { name="BiocStyle"; version="2.16.0"; sha256="07rjl2n4sazdg581zh7w3yykzphgr2gpz41ba4ryqs7347vh9nbf"; depends=[BiocManager bookdown knitr rmarkdown yaml]; };
+  BiocStyle = derive2 { name="BiocStyle"; version="2.16.1"; sha256="09sz2bnbfbj8wz16k0q8xrvag9fldxqyp5vbg9pvd9skh28hv7c7"; depends=[BiocManager bookdown knitr rmarkdown yaml]; };
   BiocVersion = derive2 { name="BiocVersion"; version="3.11.1"; sha256="1rrzx3dqds0jlj1bmjc744wiamb2hssbh3jfxz1s9jp4cvnwrpmz"; depends=[]; };
   BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.14.0"; sha256="0p9r71ql67sdlgd5pv118lhz8b85pr5y4ijfwzcy8wrr8jwlbddy"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown rstudioapi stringr usethis]; };
   Biostrings = derive2 { name="Biostrings"; version="2.56.0"; sha256="0imhfz7dg8b3l5qzipjranqqshdsg2x6zc49drlhn8sc7j40cvi8"; depends=[BiocGenerics crayon IRanges S4Vectors XVector]; };
@@ -136,7 +136,7 @@ in with self; {
   CATALYST = derive2 { name="CATALYST"; version="1.12.2"; sha256="1m6cqv0h75bzw3gd9dq72y4iyk8clp894an5dzws6gr5vcd1vl8j"; depends=[circlize ComplexHeatmap ConsensusClusterPlus cowplot data_table dplyr drc flowCore FlowSOM ggplot2 ggrepel ggridges gridExtra magrittr Matrix matrixStats nnls purrr RColorBrewer reshape2 Rtsne S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; };
   CAnD = derive2 { name="CAnD"; version="1.20.0"; sha256="1gh5l8bw6ilc0gq24sqgaghp7q54fx0834mzd837ppshz3bd9vkf"; depends=[ggplot2 reshape]; };
   CCPROMISE = derive2 { name="CCPROMISE"; version="1.14.0"; sha256="18zs0nrarzw5xfs3q2zknf81dcjphwmiqlfim5rlnz6icp53prrp"; depends=[Biobase CCP GSEABase PROMISE]; };
-  CEMiTool = derive2 { name="CEMiTool"; version="1.12.1"; sha256="1dx0z9z89p741bg6w9ay1bbz9db1nzaama1fz4yilw68yj151i18"; depends=[clusterProfiler data_table dplyr DT fastcluster fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
+  CEMiTool = derive2 { name="CEMiTool"; version="1.12.2"; sha256="1wm69dyfkhr1rapvc73lfj4si8ff3snz8hgay6c7y8nwgkykk0pn"; depends=[clusterProfiler data_table dplyr DT fastcluster fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
   CFAssay = derive2 { name="CFAssay"; version="1.22.0"; sha256="0kdv5i6cm63yjai2xg25y1mq0728drwnqs8r9vx3k7djxrkx8ad7"; depends=[]; };
   CGEN = derive2 { name="CGEN"; version="3.23.0"; sha256="0m40xq2ixdkdhq4fpi8bw0p2y2p1vln40ly0iixjyl33z2zpyrrj"; depends=[mvtnorm survival]; };
   CGHbase = derive2 { name="CGHbase"; version="1.48.0"; sha256="0gfqqa9rs5hid53ihlky88qndgrwxxz0s6j7s505f660dd5nzlkf"; depends=[Biobase marray]; };
@@ -178,15 +178,15 @@ in with self; {
   Cardinal = derive2 { name="Cardinal"; version="2.6.0"; sha256="15l3ra6r45ppj49yapzrk9js92znnsfsvisvrdh8q177dvr9i64z"; depends=[Biobase BiocGenerics BiocParallel dplyr EBImage irlba lattice magrittr Matrix matter mclust nlme ProtGenerics S4Vectors signal sp viridisLite]; };
   Category = derive2 { name="Category"; version="2.54.0"; sha256="1grspdzk5a4vidnxwcd1jmy1vcn494aydsp3vydx235yv7iqac1b"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; };
   CausalR = derive2 { name="CausalR"; version="1.20.0"; sha256="189qvw32ih926k1fvhjb8bj0rfdmrijip5j8vsvx7v1mh7xk4kvx"; depends=[igraph]; };
-  CeTF = derive2 { name="CeTF"; version="1.0.6"; sha256="1is1vjrbnm15wvzag2jpl26j7mpwwc0qgrm45k7zxnawb7bgk0w4"; depends=[circlize clusterProfiler ComplexHeatmap DESeq2 GenomicTools GenomicTools_fileHandler GGally ggnetwork ggplot2 ggpubr ggrepel igraph Matrix network Rcpp RcppArmadillo RCy3 S4Vectors SummarizedExperiment WebGestaltR]; };
+  CeTF = derive2 { name="CeTF"; version="1.0.7"; sha256="13q5fzlvrfmdv75hdl2dk1vjgl503dnxrdjfr9yrf0zch8h5b51f"; depends=[circlize clusterProfiler ComplexHeatmap DESeq2 GenomicTools GenomicTools_fileHandler GGally ggnetwork ggplot2 ggpubr ggrepel igraph Matrix network Rcpp RcppArmadillo RCy3 S4Vectors SummarizedExperiment WebGestaltR]; };
   CellBench = derive2 { name="CellBench"; version="1.4.1"; sha256="0b854k76459gplbibc9dl9mmcspnn6cp2b0dipi6k7cm48vcv67x"; depends=[BiocFileCache BiocParallel dplyr glue lubridate magrittr memoise purrr rappdirs rlang SingleCellExperiment tibble tidyr tidyselect]; };
   CellMapper = derive2 { name="CellMapper"; version="1.14.0"; sha256="04rv1xr4kdz85s1178jcai1047f3ah67clargmxw3qzb49q999db"; depends=[S4Vectors]; };
-  CellMixS = derive2 { name="CellMixS"; version="1.4.1"; sha256="1zhxay1injsciz0sdkay9i444zlyz1v7hxr1sg3jnnlzr6cblk18"; depends=[BiocGenerics BiocNeighbors BiocParallel cowplot dplyr ggplot2 ggridges kSamples magrittr purrr scater SingleCellExperiment SummarizedExperiment tidyr viridis]; };
+  CellMixS = derive2 { name="CellMixS"; version="1.4.2"; sha256="0qi5mmhsbi9qw42v9qnphawqw5l5rpjn3gkskbj0450skgz6f712"; depends=[BiocGenerics BiocNeighbors BiocParallel cowplot dplyr ggplot2 ggridges kSamples magrittr purrr scater SingleCellExperiment SummarizedExperiment tidyr viridis]; };
   CellNOptR = derive2 { name="CellNOptR"; version="1.34.0"; sha256="16fs4baafwf3mg99386l3kgwzzpf5cqxv1ib3dsv0hldz8n95zkg"; depends=[ggplot2 graph hash igraph RBGL RCurl Rgraphviz stringi stringr XML]; };
   CellScore = derive2 { name="CellScore"; version="1.8.0"; sha256="15j8cgpvkvw6hyah6437lqrlqfspzdqs71v162s0sqmfk501b9g3"; depends=[Biobase gplots lsa RColorBrewer squash]; };
   CellTrails = derive2 { name="CellTrails"; version="1.6.1"; sha256="1gf5m553vgsh216s7dgg7dawlzkaibqwmmnd5ra31gj720f47ilh"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; };
   CexoR = derive2 { name="CexoR"; version="1.26.0"; sha256="1vlb38msz8hc5xy3w9an3vlv70yxh8ryy0rshn4ghjamcbfiv9qz"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
-  ChAMP = derive2 { name="ChAMP"; version="2.18.2"; sha256="08ix46pakcrxyh3y0kg2jr0v5hfn4b51r7zvnnkl5a2q3x30ml73"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel DT FEM GenomicRanges ggplot2 globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva kpmt limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; };
+  ChAMP = derive2 { name="ChAMP"; version="2.18.3"; sha256="1b5ndi5r404yg1dzr58bflzd3p8l317di1yb5hc48f6yk4fwysif"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel DT GenomicRanges ggplot2 globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva kpmt limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; };
   ChIC = derive2 { name="ChIC"; version="1.8.0"; sha256="1lc21gjw8g6plgbcv7m13wfd8lczmh1zdllfxah2cxzzvkdswgpv"; depends=[BiocGenerics caret caTools ChIC_data GenomicRanges IRanges progress S4Vectors spp]; };
   ChIPComp = derive2 { name="ChIPComp"; version="1.18.0"; sha256="0780kj9vbzdhf2jkfb1my8m58pcdwk6jqw6zfng82g46jias98cp"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
   ChIPQC = derive2 { name="ChIPQC"; version="1.24.1"; sha256="13znqva6xn2qn9c11kf3ghycb1hck0rzk300bp08zw64mk1nh6v5"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
@@ -194,13 +194,13 @@ in with self; {
   ChIPXpress = derive2 { name="ChIPXpress"; version="1.32.0"; sha256="0xb8p0ap0kmj53skp7bm151lmf6cdwlyv18jaji7lcsrvnni3ilm"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
   ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.10.0"; sha256="0wxq7w95gxvb9wjm2amh37hvnbsy1cikyzdh8aa7a21nr71jp8km"; depends=[BiocManager Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges RcppRoll ROCR rtracklayer S4Vectors]; };
   ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.12.0"; sha256="02rsf1rvm0p6dn18zq2a4hpvpd9m2i5rziyi4zm8j43qvs8xhafp"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; };
-  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.22.2"; sha256="199mlg0gwjy39afyk0ah6lzcm759bzxla4hgcajj0ay9jiibjqpa"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools rtracklayer S4Vectors seqinr SummarizedExperiment VennDiagram]; };
+  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.22.4"; sha256="0wxgjdikinkqj7jvs2725ak0291q6zhikyf1c93w8cngwvd9i1gq"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools rtracklayer S4Vectors seqinr SummarizedExperiment VennDiagram]; };
   ChIPseeker = derive2 { name="ChIPseeker"; version="1.24.0"; sha256="04lvw4bglab7vrhz5frn8vvp311dhr19ff2r97l1qharh22bnyq2"; depends=[AnnotationDbi BiocGenerics boot dplyr enrichplot GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; };
   ChIPseqR = derive2 { name="ChIPseqR"; version="1.42.0"; sha256="1r60ia052wlkmvjlfwagfnnx4kzgmh91b8na3g7wn05fl708nyzl"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
   ChIPsim = derive2 { name="ChIPsim"; version="1.42.0"; sha256="12v77hzh9d5iz4byn80qlsssj5vgyhhmd0xfbcczjw1hv81iizxq"; depends=[Biostrings IRanges ShortRead XVector]; };
   ChemmineOB = derive2 { name="ChemmineOB"; version="1.26.0"; sha256="1507fqhdw3zm5yi8zg8wbvf2nymyvg72qwsj2m11q42xsy6czns2"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
   ChemmineR = derive2 { name="ChemmineR"; version="3.40.0"; sha256="0cna5xsqflvhlp2k47asxyv3w4ympmz2wy2cwjyzlal6936fjikf"; depends=[base64enc BH BiocGenerics DBI digest DT ggplot2 gridExtra png Rcpp RCurl rjson rsvg]; };
-  Chicago = derive2 { name="Chicago"; version="1.16.0"; sha256="1x8rv9132yasb0nda80b0cig0ylbbzbwhjxyf8wmvk6fxpar1wbr"; depends=[data_table Delaporte Hmisc MASS matrixStats]; };
+  Chicago = derive2 { name="Chicago"; version="1.16.1"; sha256="1jkkkh5nxmrbyzki111hyvv1yabwj3my4d7vqyzhqvq3iny3anys"; depends=[data_table Delaporte Hmisc MASS matrixStats]; };
   ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.42.0"; sha256="0zwqpsnl2zwibv0l4dqp28w3c2f53l73hz1vh0mcrg43lr7p2cx8"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; };
   CiteFuse = derive2 { name="CiteFuse"; version="1.0.0"; sha256="1arf69yk6zkijq0pinh8w3vgxp4qdg5bsc8f3s7417r95p998141"; depends=[cowplot dbscan ggplot2 ggraph ggridges gridExtra igraph Matrix mixtools pheatmap propr randomForest reshape2 rhdf5 rlang Rtsne S4Vectors scales scran SingleCellExperiment SNFtool SummarizedExperiment uwot]; };
   ClassifyR = derive2 { name="ClassifyR"; version="2.8.0"; sha256="1gdxj4gccbl8w82piyvkkg5dgwdjyqnbyy4rjxrxw8ngri0rrd6q"; depends=[BiocParallel locfit MultiAssayExperiment plyr S4Vectors]; };
@@ -227,8 +227,8 @@ in with self; {
   CrossICC = derive2 { name="CrossICC"; version="1.2.0"; sha256="1ilfgmrpr85i0x6grhjlrb3gq74hnjlvsmz0af41ajvnz9mbh6s0"; depends=[Biobase cluster ConsensusClusterPlus data_table dplyr limma MASS MergeMaid]; };
   CytoDx = derive2 { name="CytoDx"; version="1.8.0"; sha256="052k8p47kdqvidw28qzp6x1g599crlx15wakz17ja6067drs5axx"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; };
   CytoML = derive2 { name="CytoML"; version="2.0.5"; sha256="174brv027mm90lydfg6hnhazwh8jy4vf6ial4hpsfalwa5jrz55n"; depends=[base64enc BH Biobase corpcor cytolib data_table dplyr flowCore flowWorkspace ggcyto graph jsonlite lattice openCyto plyr RBGL Rcpp RcppArmadillo RcppParallel Rgraphviz Rhdf5lib RProtoBufLib RUnit tibble XML xml2 yaml]; };
-  DAMEfinder = derive2 { name="DAMEfinder"; version="1.0.2"; sha256="18ydik1xapv8zan7qcrfx0c68n4ddh60ik9d1zq456nsmgysy71l"; depends=[BiocGenerics Biostrings bumphunter cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma plyr readr reshape2 Rsamtools S4Vectors stringr SummarizedExperiment VariantAnnotation]; };
-  DAPAR = derive2 { name="DAPAR"; version="1.20.2"; sha256="1c1vs8pxvgnvgf2i6pln4bp5jw3p9zjkjcq2220q1ld65cwfgdp0"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter igraph imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot visNetwork vsn]; };
+  DAMEfinder = derive2 { name="DAMEfinder"; version="1.0.3"; sha256="0wdcycgsd9zcjnagp3spbzy8dn20q3a1a21dw5f0rl3yllpk12s9"; depends=[BiocGenerics Biostrings bumphunter cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma plyr readr reshape2 Rsamtools S4Vectors stringr SummarizedExperiment VariantAnnotation]; };
+  DAPAR = derive2 { name="DAPAR"; version="1.20.3"; sha256="1ndi82gk3mshccr9iyhlk6y9zxazgg5qvcby90w8kkhhiq34vi7v"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter igraph imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot visNetwork vsn]; };
   DART = derive2 { name="DART"; version="1.36.0"; sha256="1gjhhxyypaza598f51cvyn5564m5dgli6v3cl6rqmh9qzil482hv"; depends=[igraph]; };
   DBChIP = derive2 { name="DBChIP"; version="1.32.0"; sha256="16zzgbfnnvjissnzg8lqsy60kpivjwyfzh1zp7b4bhzmfw8awwqy"; depends=[DESeq edgeR]; };
   DChIPRep = derive2 { name="DChIPRep"; version="1.18.0"; sha256="0xpafzd8xdcqjnn4i8iv819240rnvi4wbwwlzn8kb76cdqn6299x"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; };
@@ -253,7 +253,7 @@ in with self; {
   DMCHMM = derive2 { name="DMCHMM"; version="1.10.0"; sha256="1zyjpimvgsimz1xb4i9mc79yl9cj5ivqzc1rlvdpmisb1zls89q9"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; };
   DMRScan = derive2 { name="DMRScan"; version="1.10.0"; sha256="09rdmd0x5rhysxvipdnvfhp7y5l9n3r8b5xqn8dz96pfdddli8nm"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; };
   DMRcaller = derive2 { name="DMRcaller"; version="1.20.0"; sha256="0an24sa3d760d6pp2z5dclammmqys0snbx41rlcgb0yhljv5bja5"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
-  DMRcate = derive2 { name="DMRcate"; version="2.2.2"; sha256="1991mwka0ajazwxszlnbbmr928i1q5fdl6hr7x0z4a5faymn3m3n"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; };
+  DMRcate = derive2 { name="DMRcate"; version="2.2.3"; sha256="1ly90isdzbpqhy3y0gjkhg5qkgdqj0w1n6kvjyl4xi8s70v1nps5"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; };
   DMRforPairs = derive2 { name="DMRforPairs"; version="1.24.0"; sha256="0fxsf7m0ks9ycx7nnyi4v7qr5lcgab8ayfvl1bk763wy77nipaiq"; depends=[GenomicRanges Gviz R2HTML]; };
   DNABarcodeCompatibility = derive2 { name="DNABarcodeCompatibility"; version="1.4.0"; sha256="0l9q3c12lramf4pdbv58hcmyv3d8j082l17aqjpyjvabla4zk8yc"; depends=[DNABarcodes dplyr numbers purrr stringr tidyr]; };
   DNABarcodes = derive2 { name="DNABarcodes"; version="1.18.0"; sha256="03y39hjpkb05fnawy3k797bph1iydi1blmpgyy4244zjgk6rs5x7"; depends=[BH Matrix Rcpp]; };
@@ -272,13 +272,13 @@ in with self; {
   DelayedDataFrame = derive2 { name="DelayedDataFrame"; version="1.4.0"; sha256="1wipxplcgzhglrgjnwb7f3n2acrf40qv8nb02im233ixyb7r4l3c"; depends=[BiocGenerics DelayedArray S4Vectors]; };
   DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.10.1"; sha256="046sam0rz42ph0m7jz7v3bck7d3h2mp45gzywh5dvc1qkjq6fdxx"; depends=[BiocParallel DelayedArray HDF5Array IRanges Matrix matrixStats S4Vectors]; };
   DepecheR = derive2 { name="DepecheR"; version="1.4.1"; sha256="0dscfl6wxpl5538jzkrwisdwbr873d38rzd19vl6z5br71jvpv3v"; depends=[beanplot doSNOW dplyr FNN foreach ggplot2 gplots MASS matrixStats mixOmics moments Rcpp RcppEigen reshape2 robustbase viridis]; };
-  DiffBind = derive2 { name="DiffBind"; version="2.16.0"; sha256="1mwqgljya1c7r2dfrdds3nswn9bn1l3ak1wavbpv4lbv3nkmykn5"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment systemPipeR]; };
+  DiffBind = derive2 { name="DiffBind"; version="2.16.2"; sha256="11y9kigdikqcd0cnksh306nsaadak0kgivk7773mv3yszrxxwzj1"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment systemPipeR]; };
   DiffLogo = derive2 { name="DiffLogo"; version="2.12.2"; sha256="0wl8q1vm4b9f0hfypn4q1xc3jiqgjl1h7kiigkfj2kxih96qw3jw"; depends=[cba]; };
   Director = derive2 { name="Director"; version="1.14.0"; sha256="144jkdnxfkvp2pxh1fq6xr9qilsxv3g8b6y294l45hxm8zag8r9v"; depends=[htmltools]; };
   DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.30.0"; sha256="1m9dsrddrllb2i88qzik1867iv9mggrgdkn0dlp8sq7gl69vmalb"; depends=[BiocGenerics IRanges S4Vectors]; };
-  DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.4.1"; sha256="004wv9b16fzz4w8smzda1fzs3mwis1wf54zyw4qvfkdsc4mcq5wn"; depends=[BiocGenerics BiocStyle broom data_table dplyr DT ggExtra ggplot2 gridExtra heatmaply kableExtra knitr magick matrixStats matrixTests MetaCycle plotly reshape2 rmarkdown S4Vectors shiny shinyBS shinycssloaders shinydashboard shinyjs SummarizedExperiment UpSetR VennDiagram viridis zip]; };
+  DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.4.2"; sha256="0vrra6mrd0awjnhvb1vha0g35nn7wa5bdxq5g8qaiq5bq850p886"; depends=[BiocGenerics BiocStyle broom data_table dplyr DT ggExtra ggplot2 gridExtra heatmaply kableExtra knitr magick matrixStats matrixTests MetaCycle plotly reshape2 rmarkdown S4Vectors shiny shinyBS shinycssloaders shinydashboard shinyjs SummarizedExperiment UpSetR VennDiagram viridis zip]; };
   DominoEffect = derive2 { name="DominoEffect"; version="1.8.0"; sha256="0m9l1zdghsv3haqk03ab9768vqbsiz0dibp9xlhl998mjlaixmbz"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; };
-  Doscheda = derive2 { name="Doscheda"; version="1.10.0"; sha256="199lrd1d2sn7w86mnmg9lqfywjfqcplp8dwrzrwqcda8z8hrqq37"; depends=[affy calibrate corrgram drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; };
+  Doscheda = derive2 { name="Doscheda"; version="1.10.4"; sha256="1zgy89gpylzxikrddbsv39ilx0q6pkjjyrbz5jnmlp7jp0l50zf0"; depends=[affy calibrate corrgram drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; };
   DriverNet = derive2 { name="DriverNet"; version="1.28.0"; sha256="02sw2dpa0hkmq7pn8x22mp6zvy1q9ck26rx3bpnlkzwa4ij95rc6"; depends=[]; };
   DropletUtils = derive2 { name="DropletUtils"; version="1.8.0"; sha256="0zqwx0a9frsw3pmm47pwpd6rxaps0cy1hqv1iw0qv14zdhi379y2"; depends=[beachmat BH BiocParallel dqrng edgeR HDF5Array Matrix R_utils Rcpp rhdf5 Rhdf5lib S4Vectors SingleCellExperiment]; };
   DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.30.0"; sha256="1mv7g47qjzf7id00jlxcd8s5irps13nqi5m1n1g5q3jp3rgxk6db"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; };
@@ -304,10 +304,10 @@ in with self; {
   ERSSA = derive2 { name="ERSSA"; version="1.6.0"; sha256="06d2yjcpzk40hr6n87ivfcaxjr9bwj97i0ns7cnlkzyzf3ymck9v"; depends=[BiocParallel DESeq2 edgeR ggplot2 plyr RColorBrewer]; };
   EasyqpcR = derive2 { name="EasyqpcR"; version="1.30.0"; sha256="0pf9k6hgbwhlhi75bgs640cp5jri2vc21pml0s89phs048cpkqqb"; depends=[matrixStats plotrix plyr]; };
   EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.16.0"; sha256="1brvls8z49x632yny835s90smxbac8bgnykcmn96sgs2lm6g7qbj"; depends=[]; };
-  EnMCB = derive2 { name="EnMCB"; version="1.0.8"; sha256="00dsc431x0h0h5wh4nnxpqjl2yjr7mjwy5xycwi0zgjq2cxavi4l"; depends=[doParallel foreach ggplot2 glmnet IlluminaHumanMethylation450kanno_ilmn12_hg19 minfi rms survival survivalROC survivalsvm]; };
+  EnMCB = derive2 { name="EnMCB"; version="1.0.11"; sha256="17c1bwdb92d17v547pw9flrkryr5bi9kbh9cwka0zbzfb32pbc16"; depends=[doParallel foreach ggplot2 glmnet IlluminaHumanMethylation450kanno_ilmn12_hg19 minfi survival survivalROC survivalsvm]; };
   EnhancedVolcano = derive2 { name="EnhancedVolcano"; version="1.6.0"; sha256="0xmsk3c2sz3c5rimaza5vj3ps2fdyl9dxxyvkws9frcz9d39mwb3"; depends=[ggplot2 ggrepel]; };
   EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.18.2"; sha256="1alz7awnmv0ml1vabqis2av9g4rr50bnjfmcwvixzaq23g6m969l"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; };
-  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.18.0"; sha256="1gs27n6cwwz8a0w2alnrc3m9walbady3km4pa9d3nrlhm003glhm"; depends=[AnnotationDbi BiocFileCache biocGraph BiocManager ComplexHeatmap edgeR geneplotter GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview rappdirs Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
+  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.18.2"; sha256="0frknd19zgb8iw4wvdybhwrlbzwkki02bj9qx9sqwvfk0gvc54rk"; depends=[AnnotationDbi BiocFileCache biocGraph BiocManager ComplexHeatmap edgeR geneplotter GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview rappdirs Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
   EpiDISH = derive2 { name="EpiDISH"; version="2.4.0"; sha256="0igymdkwcla1vlbkmnvdd6js0mizygsa082fwp61wbw49b872g40"; depends=[e1071 locfdr MASS matrixStats quadprog stringr]; };
   EpiTxDb = derive2 { name="EpiTxDb"; version="1.0.0"; sha256="02a5zwmbkymx2xzfjgzq5ix364820pi1q6y72cayqn9pv4qgaxll"; depends=[AnnotationDbi BiocFileCache BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges httr IRanges Modstrings RSQLite S4Vectors tRNAdbImport xml2]; };
   EventPointer = derive2 { name="EventPointer"; version="2.6.0"; sha256="1dbb3zjzn2d7ccd0dnhw6md284vfblh443mm7nzj8jr90520zbwf"; depends=[affxparser Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg38 cobs doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph IRanges limma MASS Matrix matrixStats nnls prodlim qvalue RBGL rhdf5 S4Vectors SGSeq stringr SummarizedExperiment]; };
@@ -323,7 +323,7 @@ in with self; {
   FEM = derive2 { name="FEM"; version="3.15.0"; sha256="1d0p5jibzmfs2kmxlr30yr2ws1b3jyhpsbng1iszd6q904k302xd"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
   FGNet = derive2 { name="FGNet"; version="3.22.1"; sha256="02jlkhi81d0z8f384acl4c1xzzv0hlgzkb9y3gmydx7pai3a6rrb"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
   FISHalyseR = derive2 { name="FISHalyseR"; version="1.22.0"; sha256="1hhfi6rznqjzf4iq606qx9phql7kdv35m1dl71dpvczvsyajxlsn"; depends=[abind EBImage]; };
-  FRASER = derive2 { name="FRASER"; version="1.0.1"; sha256="15i3pwr58d352qkyirppzbq3yzw790fn7r9nwlrqrnqicl3hvyil"; depends=[AnnotationDbi BBmisc Biobase BiocGenerics BiocParallel biomaRt BSgenome cowplot data_table DelayedArray DelayedMatrixStats extraDistr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 HDF5Array IRanges matrixStats pcaMethods pheatmap plotly PRROC R_utils RColorBrewer Rcpp RcppArmadillo rhdf5 Rsamtools Rsubread S4Vectors SummarizedExperiment tibble VGAM]; };
+  FRASER = derive2 { name="FRASER"; version="1.0.2"; sha256="1x64kv8lrxspai1yafxcj8gnzjcb1b33mynnnfw0sh91ffj2222v"; depends=[AnnotationDbi BBmisc Biobase BiocGenerics BiocParallel biomaRt BSgenome cowplot data_table DelayedArray DelayedMatrixStats extraDistr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel HDF5Array IRanges matrixStats pcaMethods pheatmap plotly PRROC R_utils RColorBrewer Rcpp RcppArmadillo rhdf5 Rsamtools Rsubread S4Vectors SummarizedExperiment tibble VGAM]; };
   FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.24.0"; sha256="0wxxhhfy8y8nnz037wxxj69hsyf1hznklhd955r2ifzjnhm0kv79"; depends=[fda MASS]; };
   FamAgg = derive2 { name="FamAgg"; version="1.16.0"; sha256="1igmbcca10fanlnyjkhhnsbpcadq3914yggp5b7r857inqrv76jp"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
   FastqCleaner = derive2 { name="FastqCleaner"; version="1.6.0"; sha256="1b4il9hvpif6galzgzhcp4j6y1kh62y7hc3wislv7zp33lq80888"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; };
@@ -360,7 +360,7 @@ in with self; {
   GMRP = derive2 { name="GMRP"; version="1.16.0"; sha256="0l38yqjyl6za6wkx435cygcwj1mhqw57l7bgcnp7s0606a82vql1"; depends=[diagram GenomicRanges plotrix]; };
   GNET2 = derive2 { name="GNET2"; version="1.4.0"; sha256="0853nrd4zwgidmn73az1352y5jcxl65siijnx1v0gac8wj1vgkn1"; depends=[DiagrammeR dplyr ggplot2 igraph matrixStats Rcpp reshape2 SummarizedExperiment xgboost]; };
   GOFunction = derive2 { name="GOFunction"; version="1.35.0"; sha256="172abls5qlcg7kq0bax9z0xj75f7wmj3725h6s7hl0dwjjiypair"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; };
-  GOSemSim = derive2 { name="GOSemSim"; version="2.14.1"; sha256="0v4q9xr1cm5xr08pgbzrss41kh3yz7xyh31n55l0sjmr1629ykln"; depends=[AnnotationDbi GO_db Rcpp]; };
+  GOSemSim = derive2 { name="GOSemSim"; version="2.14.2"; sha256="02r7m1x6g8bb7q8l0hpvakdzdv5v1nplhx5lbiy798a7c3xg895b"; depends=[AnnotationDbi GO_db Rcpp]; };
   GOSim = derive2 { name="GOSim"; version="1.26.0"; sha256="1q8q48vggqsi1wnv2c188rhcvn8njzzmgi479z99854l3557va32"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; };
   GOTHiC = derive2 { name="GOTHiC"; version="1.24.0"; sha256="077wrwf7y10nwvkc3pv1kw38bm14zivr0h5df7b1382sisbqv69n"; depends=[BiocGenerics BiocManager Biostrings BSgenome data_table GenomeInfoDb GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
   GOexpress = derive2 { name="GOexpress"; version="1.22.0"; sha256="1zkqly6xsyna7151yfdws089i0imzh8ck0q003ds8bvm764prds0"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; };
@@ -380,7 +380,7 @@ in with self; {
   GSEAlm = derive2 { name="GSEAlm"; version="1.48.0"; sha256="1jgh806jysws49czkcrbz7b69hkyrwwrsjarzf6nd234097rxbbc"; depends=[Biobase]; };
   GSRI = derive2 { name="GSRI"; version="2.36.0"; sha256="1w53fn9aihj1l2shv2dydvnc9kjxmxmj4lw2vp1ds0fs833bvh7y"; depends=[Biobase fdrtool genefilter GSEABase les]; };
   GSReg = derive2 { name="GSReg"; version="1.22.0"; sha256="1zpsqaqxhqhgf2jr7hq918f6bdjlvb2vsyp46bxkspkbprpljx6b"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; };
-  GSVA = derive2 { name="GSVA"; version="1.36.2"; sha256="0sv3hhky9npykf3pjvmrzkxjjv3phg2z562v3mv3n50bj5r21sis"; depends=[Biobase BiocGenerics BiocParallel fastmatch GSEABase S4Vectors shiny shinythemes SummarizedExperiment]; };
+  GSVA = derive2 { name="GSVA"; version="1.36.3"; sha256="1arbzjr88yibbg8f9zmb6s5lvambbp72bc1rg0dmm6a032y9crjq"; depends=[Biobase BiocGenerics BiocParallel fastmatch GSEABase S4Vectors shiny shinythemes SummarizedExperiment]; };
   GUIDEseq = derive2 { name="GUIDEseq"; version="1.18.0"; sha256="0synw91pis14ysi0bwndgzf8pa2cq2ls9l7l4v47163yi7ddcfi1"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; };
   GWASTools = derive2 { name="GWASTools"; version="1.34.0"; sha256="18jxfgv5l1cg0024pzf5ns7l2s4dpfai6xz2lzbi0afjms9x0awp"; depends=[Biobase DBI DNAcopy dplyr gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; };
   GateFinder = derive2 { name="GateFinder"; version="1.8.0"; sha256="076165xapgmds3syrq4j1r7w8lwlqxchdmrn9clqasd3pp97dp1x"; depends=[diptest flowCore flowFP mvoutlier splancs]; };
@@ -451,11 +451,11 @@ in with self; {
   HybridMTest = derive2 { name="HybridMTest"; version="1.32.0"; sha256="1knqyqb3q1l21h4n5572j773hm23rim8i7wbazldbg39dwxkmcwx"; depends=[Biobase fdrtool MASS survival]; };
   IHW = derive2 { name="IHW"; version="1.16.0"; sha256="169ir0k1gygdh1wybwa0drdxnhrdrlyzzy0rkygi7jsirn69m74j"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
   IMAS = derive2 { name="IMAS"; version="1.12.0"; sha256="1vq0i0568c6gqn4vqsaqrj038dm4qrnh32kmqmn3c0blwal8abia"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; };
-  IMMAN = derive2 { name="IMMAN"; version="1.7.0"; sha256="009hnr27jcj9pwz5s1vbjrvrxhp0pvdfg5w575vgx180yrp9gfhy"; depends=[Biostrings igraph seqinr STRINGdb]; };
+  IMMAN = derive2 { name="IMMAN"; version="1.8.2"; sha256="06f3yfyzxxz6nk7i3irpxnsbd2dqaixyj1i26bfha4mn2wrfd882"; depends=[Biostrings igraph seqinr STRINGdb]; };
   IMPCdata = derive2 { name="IMPCdata"; version="1.24.0"; sha256="0jnj6mrwfjyfp4vgiyn5h2l9nry2gcqyjhp5bfsb086xvj98qvr4"; depends=[rjson]; };
   INDEED = derive2 { name="INDEED"; version="2.2.0"; sha256="10nlkkcqan6ihn9g2fxw306bcvgqvsfdcv2ar4pvs6jy939m6g1y"; depends=[devtools glasso igraph visNetwork]; };
   INPower = derive2 { name="INPower"; version="1.24.0"; sha256="1cfny1pyx29gdfcgp9xv87ra9n9kgl73qiv8kc71l5zdvvwja4l4"; depends=[mvtnorm]; };
-  INSPEcT = derive2 { name="INSPEcT"; version="1.18.0"; sha256="1yyglkdc3ww2jzswhcxk9g1imydfm39krl87as5l9fbm7mv3vd4z"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve gdata GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges KernSmooth plgem pROC rootSolve Rsamtools rtracklayer S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; };
+  INSPEcT = derive2 { name="INSPEcT"; version="1.18.1"; sha256="16bdrfn4sx83nl81m7qvdxbx8l80y9da983497s6c45cad0jws6y"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve gdata GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges KernSmooth plgem pROC rootSolve Rsamtools rtracklayer S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; };
   IONiseR = derive2 { name="IONiseR"; version="2.12.0"; sha256="05fndlblczabva60gn6h0dijqxyn0wknrv8a925fgc4bn415g31w"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; };
   IPO = derive2 { name="IPO"; version="1.14.0"; sha256="07agz8ambs974dfssvbralmk4id4dvrwz1grxzp1gh72a27f2072"; depends=[BiocParallel CAMERA rsm xcms]; };
   IPPD = derive2 { name="IPPD"; version="1.35.0"; sha256="00aa0pfawwinnx6wnmgwf8vm7j5g77xm1cikswj1f3k1r604p1ha"; depends=[bitops digest MASS Matrix XML]; };
@@ -488,14 +488,14 @@ in with self; {
   KEGGlincs = derive2 { name="KEGGlincs"; version="1.14.0"; sha256="043nhw0yjz735v6injd4axygkjy15b6a4xa3qnnzrg8qg82jg2xf"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; };
   KEGGprofile = derive2 { name="KEGGprofile"; version="1.30.0"; sha256="017zm9ciasyfqqil7wszcs1kdj6qzzcbmknm1nnp7ylsm7gdlz0y"; depends=[AnnotationDbi biomaRt ggplot2 KEGG_db KEGGREST png RCurl reshape2 TeachingDemos XML]; };
   KinSwingR = derive2 { name="KinSwingR"; version="1.6.0"; sha256="1cxj8cw5q9976wpy950ra8ghkpz1dy5zp4rf5d7hgb9kfs16pscr"; depends=[BiocParallel data_table sqldf]; };
-  KnowSeq = derive2 { name="KnowSeq"; version="1.2.1"; sha256="09flwbmxz02wjh3730lywjkyfxb2kz5q6p8mb7d69m4sh38zsada"; depends=[Biobase caret class cqn e1071 edgeR ggplot2 gplots gridExtra Hmisc httr jsonlite kernlab limma multtest pathview praznik R_utils randomForest RCurl reshape2 rlist rmarkdown stringr sva XML]; };
+  KnowSeq = derive2 { name="KnowSeq"; version="1.2.2"; sha256="1nh0j0i8mdq8vllwhchwc3jgpdk1jn1fxzwj70cg45rgzx1d7vkq"; depends=[Biobase caret class cqn e1071 edgeR ggplot2 gplots gridExtra Hmisc httr jsonlite kernlab limma multtest pathview praznik R_utils randomForest reshape2 rlist rmarkdown stringr sva XML]; };
   LACE = derive2 { name="LACE"; version="1.0.0"; sha256="1xkv6w4q9waqxsmj0r1p2km0y2jg04sbgz3sqpbsc46ncmzaf1zs"; depends=[igraph RColorBrewer Rfast SummarizedExperiment]; };
   LBE = derive2 { name="LBE"; version="1.56.0"; sha256="1ks7qryqqkkl0j081ip8j6k41gy2031bknpxkx0dv0g2gzsiflcc"; depends=[]; };
   LEA = derive2 { name="LEA"; version="3.0.0"; sha256="1ynzv0kdyy9sz3cf8izv47gy6nqm6znfcgsjqk7wc9xy3nn22a40"; depends=[]; };
   LINC = derive2 { name="LINC"; version="1.15.0"; sha256="0w9fildgdliq938kbiirhbs4i7nb918ggn080yh24wwya19b763s"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; };
   LMGene = derive2 { name="LMGene"; version="2.43.0"; sha256="1pj8kwdyb7hkj1jmng2zxmijrspjmfcysswlz4hjg0xn4xqi8kr5"; depends=[affy Biobase multtest survival]; };
   LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.14.0"; sha256="1psx9z3smc1v9mlbgnr13m2b4wz1cal5mry6fcczzs04qrg3sa0c"; depends=[CAMERA xcms]; };
-  LOLA = derive2 { name="LOLA"; version="1.18.0"; sha256="1whpbny38a50q6ibzadzqwj1v1khm0y845wvshf8kqw0k9jsnviz"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; };
+  LOLA = derive2 { name="LOLA"; version="1.18.1"; sha256="04kxsgl6h7gfg9bvhy3qlkj6hzrj3g1wyl84w4b7p75j0ams0xm9"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; };
   LPE = derive2 { name="LPE"; version="1.62.0"; sha256="0f9l6zbkgqg389x4yf8v20fc1irvivjqdw1s0lr4z4rm1g71s9ln"; depends=[]; };
   LPEadj = derive2 { name="LPEadj"; version="1.48.0"; sha256="06skkc26ah4kxlvs8bmx27z5l38yp68d9dn7vbfh04gxcmc1cbi9"; depends=[LPE]; };
   LRBaseDbi = derive2 { name="LRBaseDbi"; version="1.6.0"; sha256="1dcwb1qjvyir29plkai4lslfhip4vnngkcch8n57fhvs5cgjwf27"; depends=[AnnotationDbi Biobase DBI RSQLite]; };
@@ -513,7 +513,7 @@ in with self; {
   M3Drop = derive2 { name="M3Drop"; version="1.14.0"; sha256="0l3gzakicn9n6fcylfzf4h8cc2v7arih9mhyi41jdalqbhycx7x4"; depends=[bbmle gplots Hmisc irlba Matrix matrixStats numDeriv RColorBrewer reldist statmod]; };
   MACPET = derive2 { name="MACPET"; version="1.8.0"; sha256="0d4g8pf7qlm0pp1zcsknhlz974q4qc5d28yiypc89yd7nhkivb1q"; depends=[BH bigmemory BiocParallel Biostrings futile_logger GenomeInfoDb GenomicAlignments GenomicRanges GEOquery gtools InteractionSet intervals IRanges knitr plyr Rbowtie Rcpp Rsamtools rtracklayer S4Vectors ShortRead]; };
   MACSQuantifyR = derive2 { name="MACSQuantifyR"; version="1.2.0"; sha256="13fcrka1k1c4q7vmvpwip37midfd1ki4bkzlk4h4b4gnbff4scc0"; depends=[ggplot2 ggrepel gridExtra lattice latticeExtra png prettydoc readxl rmarkdown rvest xml2]; };
-  MADSEQ = derive2 { name="MADSEQ"; version="1.14.0"; sha256="16vzh5h4iblw0xmv29zcg9pln629zjnp185zar8mxml8l0fdj4f9"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM zlibbioc]; };
+  MADSEQ = derive2 { name="MADSEQ"; version="1.14.0"; sha256="16vzh5h4iblw0xmv29zcg9pln629zjnp185zar8mxml8l0fdj4f9"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation vcfR VGAM zlibbioc]; };
   MAGeCKFlute = derive2 { name="MAGeCKFlute"; version="1.8.0"; sha256="0n649c8nn9snxc5n11303jaqwnsa1nnhiacsah9g272pqyrymq7z"; depends=[Biobase biomaRt clusterProfiler data_table dendextend DOSE enrichplot ggplot2 ggpubr ggrepel ggsci graph gridExtra KEGGgraph KEGGREST msigdbr pathview pheatmap png scales sva XML]; };
   MAIT = derive2 { name="MAIT"; version="1.22.1"; sha256="1aqb7isy691jj0xf1jqjr000pg6jz9rg7xc5am5g8wa3p8p9sv8x"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
   MANOR = derive2 { name="MANOR"; version="1.60.0"; sha256="04kdiw2ps0y1q9ipk6zfa4fsc6viadqzkqnfmrl7jxgmsadfv3na"; depends=[GLAD]; };
@@ -526,7 +526,7 @@ in with self; {
   MCbiclust = derive2 { name="MCbiclust"; version="1.12.0"; sha256="1283kaxj4874alcqv5crc2a3kp75hx93mhdza8lr4c83mfl58izd"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; };
   MDTS = derive2 { name="MDTS"; version="1.8.0"; sha256="1vg2sriwkkqc1d7s4lj4rf96aj3shj7vfrkzmrhw1crswp10x3kk"; depends=[Biostrings DNAcopy GenomicAlignments GenomicRanges IRanges Rsamtools stringr]; };
   MEAL = derive2 { name="MEAL"; version="1.18.0"; sha256="17h6hr30vkyknkkc90l9ns5xq3kwpaj22izi7wh8hl43g58yka2a"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SummarizedExperiment vegan]; };
-  MEAT = derive2 { name="MEAT"; version="1.0.3"; sha256="18yzxs0j4zr59fk06hrb9zk6ah7rdhds7yygabv4vvy3fyc062n7"; depends=[dplyr dynamicTreeCut glmnet impute minfi RPMM stringr SummarizedExperiment tibble wateRmelon]; };
+  MEAT = derive2 { name="MEAT"; version="1.0.4"; sha256="19bbhyjdkhimqm079m0dp9v1ri4r324rijl3656555x3hzgraal3"; depends=[dplyr dynamicTreeCut glmnet impute minfi RPMM stringr SummarizedExperiment tibble wateRmelon]; };
   MEB = derive2 { name="MEB"; version="1.2.0"; sha256="0yjw3mpk3cjya2vwx5c6zpnq8bwd2b7knirqml1lnm0p1qxgixlc"; depends=[e1071 SummarizedExperiment]; };
   MEDIPS = derive2 { name="MEDIPS"; version="1.40.0"; sha256="14y2ybanmvcxac86wfnhnq4mwjfmsqypg1n5a77rnhac5j0z1v88"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
   MEDME = derive2 { name="MEDME"; version="1.48.0"; sha256="1fdb2r8nvfjsyk526lybfyah0fg0sbirm0am4gwjb19w9yxvq4lm"; depends=[Biostrings drc MASS]; };
@@ -546,17 +546,17 @@ in with self; {
   MOFA = derive2 { name="MOFA"; version="1.4.0"; sha256="0wjc3k9bqdjrwa25a430rb2sh7bj4s692hmd7iy01wcph7nhaq4g"; depends=[Biobase corrplot cowplot doParallel dplyr foreach GGally ggbeeswarm ggplot2 ggrepel MultiAssayExperiment pheatmap RColorBrewer reshape2 reticulate rhdf5 scales]; };
   MOMA = derive2 { name="MOMA"; version="1.0.2"; sha256="1rdw3yafr9f9dr6iwb8dlh5yfi9cppvx2l1h6zc20p31df9qwy81"; depends=[circlize cluster ComplexHeatmap dplyr ggplot2 magrittr MKmisc MultiAssayExperiment qvalue RColorBrewer readr reshape2 rlang stringr tibble tidyr]; };
   MOSim = derive2 { name="MOSim"; version="1.2.0"; sha256="063aspwbqhcf578qi5ryj3fzrr8wby14r40vxb1ckx7ca3pcxvxw"; depends=[Biobase dplyr ggplot2 HiddenMarkov IRanges lazyeval matrixStats purrr rlang S4Vectors scales stringi stringr tibble tidyr zoo]; };
-  MPFE = derive2 { name="MPFE"; version="1.23.0"; sha256="09n55k60n86mqv7mm6ms17qbvm6s5963bmclz3wp6pb1zqhzjnxb"; depends=[]; };
+  MPFE = derive2 { name="MPFE"; version="1.24.1"; sha256="0b7a5ncdcfpwbnhiqnra1q2y8qj62lcxr1hsjgxr27jfxdzns3g1"; depends=[]; };
   MPRAnalyze = derive2 { name="MPRAnalyze"; version="1.6.0"; sha256="1sc62bk6dp6c34a9q5x5j1a81s4jrxrrkj56348581k56i6rlk0i"; depends=[BiocParallel progress SummarizedExperiment]; };
   MSGFgui = derive2 { name="MSGFgui"; version="1.22.0"; sha256="16s4zlps57sjkdkm1gkx8ypmpvl7dcngiv82m944mrvsk3xkac54"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
   MSGFplus = derive2 { name="MSGFplus"; version="1.22.0"; sha256="14g2wf4h8qsldv2s07viizq37q6r7fnb31hb2qkyynx1hxyw1f7d"; depends=[mzID ProtGenerics]; };
   MSnID = derive2 { name="MSnID"; version="1.22.0"; sha256="0dwa6j2nqb3223a8g4f453aznjh69wngrpvdi12iy69j1psbbjcc"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; };
   MSnbase = derive2 { name="MSnbase"; version="2.14.2"; sha256="17vlv9gh41s1hp043b7j1jfqiw52alh1misjzy1kxl0g90rld00l"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; };
-  MSstats = derive2 { name="MSstats"; version="3.20.1"; sha256="0y2bswgvpyfiz470j01lsjiyhxig23m47rl1x0b3qrckl2gp0ayc"; depends=[broom data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore purrr reshape2 snow statmod stringr survival tidyr]; };
+  MSstats = derive2 { name="MSstats"; version="3.20.3"; sha256="05s2nakl93p5hanb7lf34k3dv9m6jlbx6dqjmf272p3x3w9v7mkl"; depends=[broom data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore purrr reshape2 snow statmod stringr survival tidyr]; };
   MSstatsQC = derive2 { name="MSstatsQC"; version="2.6.0"; sha256="1nbr01ybx4a764w5hfgpyzhp893lcajrwansxl9sarfj600xl50i"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; };
   MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.8.0"; sha256="11dawln2v70m0x6n5ybkpnb1xz2jzvx4440s33s87algnsgaiy5s"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; };
   MSstatsSampleSize = derive2 { name="MSstatsSampleSize"; version="1.2.0"; sha256="1nz70ixbb948izqziip1hla83kzj386y1czinf7af71x7ic8hw77"; depends=[BiocParallel caret ggplot2 gridExtra MSstats reshape2]; };
-  MSstatsTMT = derive2 { name="MSstatsTMT"; version="1.6.3"; sha256="1xwcsfdskbqndxvwv8yv6458953dfkdzamvcrk7gzqlpxkmck7fh"; depends=[data_table dplyr ggplot2 limma lme4 lmerTest matrixStats MSstats reshape2 statmod tidyr]; };
+  MSstatsTMT = derive2 { name="MSstatsTMT"; version="1.6.6"; sha256="0dq5bcbz2x1l07xwrhay044vkii31jcy641cl6zgbjvplljqcnp1"; depends=[data_table dplyr ggplot2 limma lme4 lmerTest matrixStats MSstats reshape2 statmod tidyr]; };
   MVCClass = derive2 { name="MVCClass"; version="1.62.0"; sha256="0vjw6dr7h0d71jknxwlm34xrgp7nm5y8mir5l4qqa5bnn148qzqk"; depends=[]; };
   MWASTools = derive2 { name="MWASTools"; version="1.12.0"; sha256="0v9rwhalsv4kiwqcbcrhhx17flgpqcvkkpv0z8gm4f867pdsln0a"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; };
   Maaslin2 = derive2 { name="Maaslin2"; version="1.2.0"; sha256="1jickmbz84z25klg5bhq5p1vr45j0gd9ifzrki4wvqjbi69pp3wl"; depends=[biglm car chemometrics cplm data_table dplyr edgeR ggplot2 hash lmerTest logging lpsymphony MASS metagenomeSeq MuMIn optparse pbapply pcaPP pheatmap pscl robustbase vegan]; };
@@ -628,10 +628,10 @@ in with self; {
   OLINgui = derive2 { name="OLINgui"; version="1.62.0"; sha256="05si2bln02mhczwvqsz2m5g46f511p226lfcddsxsy19qq301jdc"; depends=[marray OLIN tkWidgets widgetTools]; };
   OMICsPCA = derive2 { name="OMICsPCA"; version="1.6.0"; sha256="0d3h3lpy0k099ja59sqjr5ca3czk20qf0nlzslnh4d5vlp60z7vh"; depends=[cluster clValid corrplot cowplot data_table factoextra FactoMineR fpc GenomeInfoDb ggplot2 HelloRanges IRanges kableExtra magick MASS MultiAssayExperiment NbClust OMICsPCAdata pdftools PerformanceAnalytics reshape2 rgl rmarkdown rtracklayer tidyr]; };
   OPWeight = derive2 { name="OPWeight"; version="1.10.0"; sha256="1plhy2klsl104vxqhd3yf87w0r5075vhq59p248b8100hl9vjg10"; depends=[MASS qvalue tibble]; };
-  ORFik = derive2 { name="ORFik"; version="1.8.1"; sha256="185kp4l3pqc8v6dqg6b6lxqnb4y7043677hnidx5yqpp31fkkx49"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table DESeq2 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  ORFik = derive2 { name="ORFik"; version="1.8.6"; sha256="13km1084prm49ydizkic97qxhi44z75dfy6qv7h5gfljqk791mw8"; depends=[AnnotationDbi BiocGenerics BiocParallel biomartr Biostrings cowplot data_table DESeq2 fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra IRanges R_utils Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
   OSAT = derive2 { name="OSAT"; version="1.36.0"; sha256="0j5qhsla3b4sfhd5i8pn1mn1zj885x88mpc421r33mw259i7a8r6"; depends=[]; };
   OTUbase = derive2 { name="OTUbase"; version="1.38.0"; sha256="12ysm7fhkpi0jza71a48jkllf4dz11g13712ciprqnxqr93afs7n"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
-  OUTRIDER = derive2 { name="OUTRIDER"; version="1.6.0"; sha256="1rw4bms5zsd263v6dk9k4n46wymfkqacjlv25d697y7rylcvybin"; depends=[BBmisc Biobase BiocGenerics BiocParallel data_table DESeq2 GenomicFeatures GenomicRanges ggplot2 gplots heatmaply IRanges matrixStats pcaMethods pheatmap plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reshape2 S4Vectors scales SummarizedExperiment]; };
+  OUTRIDER = derive2 { name="OUTRIDER"; version="1.6.1"; sha256="1y2rvz29inrg6f394an228k122nv753nxdwqrjrwxaxmwxhm32fa"; depends=[BBmisc BiocGenerics BiocParallel data_table DESeq2 generics GenomicFeatures GenomicRanges ggplot2 heatmaply IRanges matrixStats pcaMethods pheatmap plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reshape2 S4Vectors scales SummarizedExperiment]; };
   OVESEG = derive2 { name="OVESEG"; version="1.4.0"; sha256="02skny8ndwm1afm7sb1g64l78vx64yi02f7isc3rcbcfdkpzsf8f"; depends=[BiocParallel fdrtool limma Rcpp SummarizedExperiment]; };
   OmaDB = derive2 { name="OmaDB"; version="2.4.0"; sha256="0flvx8bai79j4krlmhjmgvbwmgk9w10f1h0k9dzhdz104csgpbmw"; depends=[ape Biostrings GenomicRanges httr IRanges jsonlite plyr topGO]; };
   OmicCircos = derive2 { name="OmicCircos"; version="1.26.0"; sha256="062m61f69fs2ld11g27pwpwm6vri19i447spi2lac458wkn0hq00"; depends=[GenomicRanges]; };
@@ -649,7 +649,7 @@ in with self; {
   OutlierD = derive2 { name="OutlierD"; version="1.52.0"; sha256="0qhw5zr3d5dxa1mcqhzbamgzydk27zd009laibh3c4nn5107p7f9"; depends=[Biobase quantreg]; };
   PAA = derive2 { name="PAA"; version="1.22.0"; sha256="1g15f0f84r8fdlq1ifbypzg25jv4sa30r0w8l5c5a5qvi902hlsc"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; };
   PADOG = derive2 { name="PADOG"; version="1.30.0"; sha256="1zgyr3arzmc54h19jcq7rs883n63fkgjqn4z8g41rlfgmhzynk0a"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGGdzPathwaysGEO KEGGREST limma nlme]; };
-  PAIRADISE = derive2 { name="PAIRADISE"; version="1.4.0"; sha256="1f9s1kxqljfazsxpi24kppabpbi45hk6j8v8xqgk3ivxhbhvgbkl"; depends=[abind BiocParallel nloptr S4Vectors SummarizedExperiment]; };
+  PAIRADISE = derive2 { name="PAIRADISE"; version="1.4.1"; sha256="1cdmps7k9vdp3j00fqvp3d4iyrav78db8fzxy8b6wbs2s35vpl59"; depends=[abind BiocParallel nloptr S4Vectors SummarizedExperiment]; };
   PANR = derive2 { name="PANR"; version="1.34.0"; sha256="12dan58ccd677rb75dsvvd7lhbzdydfz7fwzgafc4kiixnhdxcrh"; depends=[igraph MASS pvclust RedeR]; };
   PAST = derive2 { name="PAST"; version="1.4.3"; sha256="1n2gk4b6lyxnrmyh0w4sp2xjg6dnvwn6fsyaddj0j566kmss359z"; depends=[doParallel dplyr foreach GenomicRanges ggplot2 iterators qvalue rlang rtracklayer S4Vectors]; };
   PCAN = derive2 { name="PCAN"; version="1.16.0"; sha256="1wr5djwfgyp7703s5kk2zd7x6x40933q06cq3ljzq0wqb6val9ir"; depends=[BiocParallel]; };
@@ -657,7 +657,7 @@ in with self; {
   PCpheno = derive2 { name="PCpheno"; version="1.50.0"; sha256="1wgvq9hvbnr01rbkigs43lky7bh5vcz3ixqlq0w5dwsgkklxwfbs"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
   PECA = derive2 { name="PECA"; version="1.24.0"; sha256="0y84f8hnb0wx9981lawnn29v5hl2ly9jw6q1384qxmhsd1al657q"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; };
   PERFect = derive2 { name="PERFect"; version="1.2.0"; sha256="10nhmjxnplp03lq1dxk07axdf8a2c50z0s5gyiwwrws4m1732mys"; depends=[fitdistrplus ggplot2 Matrix phyloseq psych sn zoo]; };
-  PGA = derive2 { name="PGA"; version="1.18.0"; sha256="1wjr80d8s334wd5ai0wc5b9372l8rx85l4rvjc84g3xccdvr4ld6"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table dplyr GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap processx RCurl readr Rsamtools RSQLite rTANDEM rtracklayer S4Vectors seqinr stringr VariantAnnotation]; };
+  PGA = derive2 { name="PGA"; version="1.18.1"; sha256="07jw0kab971yv2891jcgmdv96lkqa7qnk983vcj9b2nr1rvfm7aq"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table dplyr GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap processx RCurl readr Rsamtools RSQLite rTANDEM rtracklayer S4Vectors seqinr stringr VariantAnnotation]; };
   PGSEA = derive2 { name="PGSEA"; version="1.61.0"; sha256="05dd1wrzzsfzhb3zpc1dh10dpywj2jxdwy2hiqsbzm0ybnx4cfnx"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
   PICS = derive2 { name="PICS"; version="2.32.0"; sha256="1vyf99llhbmwih0cxmzbsq0chfdgb6q0clhmmdvy2pz8dq3clc7m"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools]; };
   PING = derive2 { name="PING"; version="2.32.0"; sha256="05b3fvlnykrqjshqngvy7w2z23h2b0bnk5hxgcpw9hbkii92kv60"; depends=[BiocGenerics BSgenome fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
@@ -678,10 +678,10 @@ in with self; {
   PathoStat = derive2 { name="PathoStat"; version="1.14.0"; sha256="0b3rhzcjvi0n6x46bkavgwis08jf8pld38mg3srkw1l6s65ipcaz"; depends=[ape BiocStyle ComplexHeatmap corpcor DESeq2 devtools dplyr DT edgeR ggplot2 glmnet gmodels knitr limma matrixStats phyloseq plotly plyr RColorBrewer rentrez reshape2 ROCR scales shiny shinyjs tidyr vegan webshot XML]; };
   PathwaySplice = derive2 { name="PathwaySplice"; version="1.11.0"; sha256="0645k6gipcgs4zp2yfyj9ylh358lzfcfpzh06ky2jg6dh0zilbjj"; depends=[annotate AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr EnrichmentBrowser ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq KEGGREST mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; };
   PepsNMR = derive2 { name="PepsNMR"; version="1.6.1"; sha256="12fr13bn576xgqwgss0kskx695gqqiizv9j53xn55ya8r739ahl7"; depends=[ggplot2 gridExtra Matrix matrixStats ptw reshape2]; };
-  PharmacoGx = derive2 { name="PharmacoGx"; version="2.0.5"; sha256="18xc66dw9bp33nl4whfl3nyz60wy72sralk1jmnwikyk4j2vn28i"; depends=[Biobase BiocParallel caTools CoreGx downloader ggplot2 jsonlite magicaxis RColorBrewer reshape2 S4Vectors SummarizedExperiment testthat]; };
+  PharmacoGx = derive2 { name="PharmacoGx"; version="2.0.9"; sha256="0if6jhy6jz9ph0njl8xkrvgk6lwh8jhqp29v10x8q6ydd97hgqjh"; depends=[Biobase BiocParallel caTools CoreGx downloader ggplot2 jsonlite magicaxis RColorBrewer reshape2 S4Vectors SummarizedExperiment testthat]; };
   PhenStat = derive2 { name="PhenStat"; version="2.24.0"; sha256="0yg1gpm2qz0q2x3v8yl472x16r590vh1knc9x17kjjh58fk8lr7v"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; };
   PhyloProfile = derive2 { name="PhyloProfile"; version="1.2.8"; sha256="0zlfxq2s28jfmklki6hnxfkvj88j6b0l02jgc126iy6cxgpkmppk"; depends=[ape BiocStyle bioDist Biostrings colourpicker data_table DT energy ExperimentHub ggplot2 gridExtra OmaDB pbapply plyr RColorBrewer shiny shinyBS shinyjs xml2 zoo]; };
-  Pi = derive2 { name="Pi"; version="2.0.2"; sha256="1yq2pgaj62ysfd29815ja90g58shbxrvirsdzdsh7vkp8ml8wwr4"; depends=[BiocGenerics caret dnet dplyr GenomeInfoDb GenomicRanges ggbio ggnetwork ggplot2 ggrepel glmnet Gviz igraph IRanges lattice MASS Matrix osfr plot3D purrr randomForest RCircos readr ROCR scales supraHex tibble tidyr]; };
+  Pi = derive2 { name="Pi"; version="2.0.3"; sha256="1ziqnz7cxwqv7770f8lwbqgmr70z15sayrfb00izlxlyh1nqna16"; depends=[BiocGenerics caret dnet dplyr GenomeInfoDb GenomicRanges ggbio ggnetwork ggplot2 ggrepel glmnet Gviz igraph IRanges lattice MASS Matrix osfr plot3D purrr randomForest RCircos readr ROCR scales supraHex tibble tidyr]; };
   Pigengene = derive2 { name="Pigengene"; version="1.14.0"; sha256="1j32bmjksz6ywkgdqzzl60arjpcaqpf0dyz8x13xnigkj8rf2gj7"; depends=[bnlearn C50 dplyr gdata GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
   PloGO2 = derive2 { name="PloGO2"; version="1.0.0"; sha256="1cizkdp5wc6pi2cip77n2qd4lisjwckqsic82mnr9fwb41i95wwc"; depends=[GO_db GOstats httr lattice openxlsx xtable]; };
   PoTRA = derive2 { name="PoTRA"; version="1.4.0"; sha256="1kark8hn5yb0visn7r02qqy54mfw46ypdh7wnvckwnkb5dbyh5ff"; depends=[BiocGenerics graph graphite igraph org_Hs_eg_db]; };
@@ -713,7 +713,7 @@ in with self; {
   RCAS = derive2 { name="RCAS"; version="1.14.0"; sha256="0f812pgv3ys1zv4n9sqkgm01hj4cdd0i0h85dqbhkwd94zl6cavl"; depends=[BiocGenerics Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gprofiler2 IRanges knitr pbapply pheatmap plotly plotrix proxy ranger rmarkdown RSQLite rtracklayer S4Vectors]; };
   RCASPAR = derive2 { name="RCASPAR"; version="1.34.0"; sha256="0ddy2zkp5xk4x12s0217y61im63aikb3ijy7c59karj64h8dl0nv"; depends=[]; };
   RCM = derive2 { name="RCM"; version="1.4.0"; sha256="0sq1wxr04igw13dn50ljczj6fbbisz4qkwf3dwpmbsk74pc2kfjw"; depends=[alabama edgeR ggplot2 MASS nleqslv phyloseq RColorBrewer reshape2 tensor tseries vegan VGAM]; };
-  RCy3 = derive2 { name="RCy3"; version="2.8.0"; sha256="1rj8h6h17shnd94ra74l0ag549jbhcnc7s040g9faashh3w8pdjf"; depends=[BiocGenerics graph httr igraph R_utils RJSONIO XML]; };
+  RCy3 = derive2 { name="RCy3"; version="2.8.1"; sha256="0wfqq3xiisd7rk3xsi4jymcj387yqj1944ms6akzjmnda2p9qq8d"; depends=[BiocGenerics graph httr igraph R_utils RJSONIO XML]; };
   RCyjs = derive2 { name="RCyjs"; version="2.10.0"; sha256="0mimh459rzry2gfsgry7k8wzxfpn656b7l2abmhp9v7h7g6as5zg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; };
   RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.26.0"; sha256="1dmqszi1f5cwjphrcw98fib53c6n340avprfayd2jaxzkxlr7ylx"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; };
   RDRToolbox = derive2 { name="RDRToolbox"; version="1.38.0"; sha256="0vff12kknq0smrw34np9zn92s3vxkz13yqx1maaavpwpnhxi9d04"; depends=[MASS rgl]; };
@@ -730,13 +730,13 @@ in with self; {
   RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.12.0"; sha256="18z2bn8l5wp7pxa8pkbgg1g0z81c2yyx9x60djac616vnwqzc4bp"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
   RLMM = derive2 { name="RLMM"; version="1.50.0"; sha256="0xzrj61x4bdh4q4hszg3zbyj8rnndb5i5h841vih58419yp86dbk"; depends=[MASS]; };
   RMassBank = derive2 { name="RMassBank"; version="2.16.0"; sha256="066hvm406r9jy0s5jv8a808k14dchfb3rr23r521mlqcy6f4s8rm"; depends=[Biobase digest enviPat httr MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; };
-  RNAAgeCalc = derive2 { name="RNAAgeCalc"; version="1.0.1"; sha256="1p8cl4wj1bs1089lwyz0lhlj17g2wypjj2cfq551vm1hvscmf5mf"; depends=[AnnotationDbi ggplot2 impute org_Hs_eg_db recount SummarizedExperiment]; };
+  RNAAgeCalc = derive2 { name="RNAAgeCalc"; version="1.0.2"; sha256="06h6gv4zxz9ca8bsaq2vq51mz3mw0r6b2an4sp241b99hwgl2pw4"; depends=[AnnotationDbi ggplot2 impute org_Hs_eg_db recount SummarizedExperiment]; };
   RNASeqPower = derive2 { name="RNASeqPower"; version="1.28.0"; sha256="14ir731p4ccbszkmlyf7ncbz2vm2nzqqgyflrqrdc2ik060gvzcr"; depends=[]; };
   RNASeqR = derive2 { name="RNASeqR"; version="1.6.0"; sha256="1pggfzy2ji0k6wyjm2sacdwk3ndbkjlvksisw02ic7hgim3hc3bw"; depends=[ballgown Biostrings clusterProfiler corrplot DESeq2 DOSE edgeR factoextra FactoMineR ggplot2 gridExtra org_Hs_eg_db org_Sc_sgd_db pathview PerformanceAnalytics pheatmap rafalib reshape2 reticulate Rsamtools stringr systemPipeR systemPipeRdata]; };
   RNAdecay = derive2 { name="RNAdecay"; version="1.8.0"; sha256="06y0slqalgksp3kwmm0rw7mj99jw02w42nqfrwhv401kknxga8hn"; depends=[ggplot2 gplots nloptr scales TMB]; };
   RNAinteract = derive2 { name="RNAinteract"; version="1.36.0"; sha256="0nh9ll8f8wfwhbxyq1lj4y0v854wj55q2zg2bdrzg1bl89dakqa6"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
   RNAither = derive2 { name="RNAither"; version="2.36.0"; sha256="0lf1swy8f990bciss3y95ha22lkigb0gwdk884rsbkn20f6xn6p0"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
-  RNAmodR = derive2 { name="RNAmodR"; version="1.2.2"; sha256="1yssncp2raf9mw6wlcsww792k2v93apqgl2sgpz7fj7n84vgl8sm"; depends=[BiocGenerics BiocParallel Biostrings BSgenome colorRamps GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges matrixStats Modstrings RColorBrewer reshape2 ROCR Rsamtools rtracklayer S4Vectors]; };
+  RNAmodR = derive2 { name="RNAmodR"; version="1.2.3"; sha256="0lhf84hsw0qnrb2ndj2qkdzgllf6bk56dysvnn0qg0ssglm0gd2i"; depends=[BiocGenerics BiocParallel Biostrings BSgenome colorRamps GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges matrixStats Modstrings RColorBrewer reshape2 ROCR Rsamtools rtracklayer S4Vectors]; };
   RNAmodR_AlkAnilineSeq = derive2 { name="RNAmodR.AlkAnilineSeq"; version="1.2.0"; sha256="16fnsvpfj1cq4sznna09ky8bm8j02sznqvknhq82il1d3b40ysmz"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; };
   RNAmodR_ML = derive2 { name="RNAmodR.ML"; version="1.2.1"; sha256="19q4gh79kxz1hpa477rvishab1sgzp7kgw73ki6cisrz6hsvfjqn"; depends=[BiocGenerics GenomicRanges IRanges ranger RNAmodR S4Vectors]; };
   RNAmodR_RiboMethSeq = derive2 { name="RNAmodR.RiboMethSeq"; version="1.2.0"; sha256="06lzarfip7477r080jc145pvvmrhqc5nh3jb4z8g1b7zf30ca0ir"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; };
@@ -756,8 +756,8 @@ in with self; {
   RTCGA = derive2 { name="RTCGA"; version="1.18.0"; sha256="1jlmwb7b3gapx47kc0rgq11vzhm3g554pwv8mg6jfxcl1ypw9v57"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; };
   RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.18.0"; sha256="0idn65dbm12p1gnbgqfs0fk3q95y3171mmzfwwpxpdrkm4hywbqk"; depends=[BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges httr limma RaggedExperiment RCircos RCurl RJSONIO S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; };
   RTN = derive2 { name="RTN"; version="2.12.1"; sha256="139v6hyssdhkr5gmrlir41gwmy6da1wpi7csjvmv98qxg09h84zp"; depends=[car data_table igraph IRanges limma minet mixtools pheatmap pwr RedeR S4Vectors snow SummarizedExperiment viper]; };
-  RTNduals = derive2 { name="RTNduals"; version="1.12.1"; sha256="0491wsi6978990a0rzxjfrn9sk7nxizc2rbrpmw9g8502dbdc489"; depends=[RTN]; };
-  RTNsurvival = derive2 { name="RTNsurvival"; version="1.12.1"; sha256="1cwsn33pdah3mfflarb1244g4s3vfqlhfhya47y2lanjksfjx753"; depends=[data_table dunn_test egg ggplot2 pheatmap RColorBrewer RTN RTNduals scales survival]; };
+  RTNduals = derive2 { name="RTNduals"; version="1.12.2"; sha256="0150avr4aba7gpfxq7bv287shqhpwiwkwrlsk4c7ip16656jc59r"; depends=[RTN]; };
+  RTNsurvival = derive2 { name="RTNsurvival"; version="1.12.2"; sha256="1rnjj373y98ywcwdbxzzmk01cp4gwr1ni07yc3g7fiscmrlcsgck"; depends=[data_table dunn_test egg ggplot2 pheatmap RColorBrewer RTN RTNduals scales survival]; };
   RTopper = derive2 { name="RTopper"; version="1.34.0"; sha256="0ia8h1xmz6flv0bvrzrskwzi7acx96mv95hxfyklpivndhfd7bkg"; depends=[Biobase limma multtest]; };
   RUVSeq = derive2 { name="RUVSeq"; version="1.22.0"; sha256="0yqs9xgyzw3cwb4l7zjl1cjgbsjp05qrqnwyvh7q81wdp7x5p55x"; depends=[Biobase EDASeq edgeR MASS]; };
   RUVcorr = derive2 { name="RUVcorr"; version="1.20.0"; sha256="01kdmvbvl8aip8xb4ld2jdv3139cfsa71a2s0p15rf87ipjj9hwl"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
@@ -779,7 +779,7 @@ in with self; {
   RcwlPipelines = derive2 { name="RcwlPipelines"; version="1.4.5"; sha256="0pqa462iaiih2zxxfa51fm320yjjyj89d0h6xsihbxrwrsicwrcm"; depends=[BiocFileCache rappdirs Rcwl]; };
   Rdisop = derive2 { name="Rdisop"; version="1.48.0"; sha256="1danfv8v16mn1phha8wb5ip7gdv7mxyvzkbaylx5xj9qhdzm9rnj"; depends=[Rcpp]; };
   ReQON = derive2 { name="ReQON"; version="1.34.0"; sha256="06m0hd4aqsxjyzhs8b1zys7lz8289qgwn7jp2dpln1j7cf02q4bz"; depends=[rJava Rsamtools seqbias]; };
-  ReactomeGSA = derive2 { name="ReactomeGSA"; version="1.2.2"; sha256="00w5vzxjs27wxm1j3qb5l41sn8cf6d0mzc1bwacq0xwj191mvly9"; depends=[ggplot2 gplots httr jsonlite progress RColorBrewer]; };
+  ReactomeGSA = derive2 { name="ReactomeGSA"; version="1.2.4"; sha256="04f2w24ia2w84ws1ray8nmiankqpy4sbsn5pda9k90avxcsqbrpd"; depends=[ggplot2 gplots httr jsonlite progress RColorBrewer]; };
   ReactomePA = derive2 { name="ReactomePA"; version="1.32.0"; sha256="1ngilyn1mihwxs4sh5gk9y829xghdmh277cfw3vfgflz9sgwy21x"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite igraph reactome_db]; };
   ReadqPCR = derive2 { name="ReadqPCR"; version="1.34.0"; sha256="1z97qb1vlwddbzpq4g9n986g46qk39mk69hhxwfqw3xdgnqqbj92"; depends=[Biobase]; };
   RedeR = derive2 { name="RedeR"; version="1.36.0"; sha256="15f1qb5k9x7agjjjrinc4i237ag4vjv1875a1kqakwlg1jvw5izg"; depends=[igraph]; };
@@ -809,7 +809,7 @@ in with self; {
   Rtreemix = derive2 { name="Rtreemix"; version="1.50.0"; sha256="11vxwsx9nv8hkj747yk27ln6a06idf1x78dzfijyqs85gcvdsjaw"; depends=[Biobase graph Hmisc]; };
   S4Vectors = derive2 { name="S4Vectors"; version="0.26.1"; sha256="1ddr3ngyczx332zw9ai1a6h7442lgrbfcj8vrhvbkdkzqwj14xmb"; depends=[BiocGenerics]; };
   SAGx = derive2 { name="SAGx"; version="1.62.0"; sha256="0ar2chczdzzadib0mz3fyk8g2anqsi6jsxh61r2x74r8gwy0w6q0"; depends=[Biobase multtest]; };
-  SAIGEgds = derive2 { name="SAIGEgds"; version="1.2.1"; sha256="0zb6lsdbhc2zm5ipj4r51q96w7pgh3s054jmljqc1xgq3ygy4a5m"; depends=[gdsfmt Rcpp RcppArmadillo RcppParallel SeqArray SPAtest]; };
+  SAIGEgds = derive2 { name="SAIGEgds"; version="1.2.3"; sha256="04mgsakqjd0zr6bjj1sm8zsp0jrg32qyqqmdf77k9dd6w2f847rx"; depends=[gdsfmt Rcpp RcppArmadillo RcppParallel SeqArray SPAtest]; };
   SBGNview = derive2 { name="SBGNview"; version="1.2.0"; sha256="05391s9alhxdjx4zdqsx03jnsm0agnm1cky18mwlmbrv0i0bm0js"; depends=[AnnotationDbi igraph knitr pathview Rdpack rmarkdown rsvg SBGNview_data SummarizedExperiment xml2]; };
   SBMLR = derive2 { name="SBMLR"; version="1.84.0"; sha256="07k2a259pdynh0lchzcmdkj85f0054h6ad7h5rnxjv21fqscqfqj"; depends=[deSolve XML]; };
   SC3 = derive2 { name="SC3"; version="1.16.0"; sha256="15x7q8c13r4b6shrn0j88hw5vbrj7vrinihg5ihgd3l5g1x8x499"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; };
@@ -880,7 +880,7 @@ in with self; {
   SpatialCPie = derive2 { name="SpatialCPie"; version="1.4.0"; sha256="1sdnc8f7x6n5k5i7qgfv7gh0y5s27gy3zh94ffwwic947xzw1b7k"; depends=[colorspace data_table digest dplyr ggforce ggiraph ggplot2 ggrepel igraph lpSolve purrr readr rlang shiny shinycssloaders shinyjs shinyWidgets SummarizedExperiment tibble tidyr tidyselect zeallot]; };
   SpeCond = derive2 { name="SpeCond"; version="1.42.0"; sha256="0vr4assa8i8dnsfsvwqi0dg57qxi1yg3sjiqxs109ybcfg3y5rlj"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
   SpectralTAD = derive2 { name="SpectralTAD"; version="1.4.0"; sha256="0ncqmfzip0bggxsrsbgfkh39d59d9pv031rg11r2spknd9hyn3mn"; depends=[BiocParallel cluster dplyr GenomicRanges HiCcompare magrittr Matrix PRIMME]; };
-  SpidermiR = derive2 { name="SpidermiR"; version="1.18.1"; sha256="0y32rmq8c68rlvkm9bxkw6ifzqgivd56ikzm3mz3xfrq2xgb9pzq"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra MAGeCKFlute miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
+  SpidermiR = derive2 { name="SpidermiR"; version="1.18.2"; sha256="166wjg5xk2vyqr9lzpabapaydi92n5bd58if3mb9apxwfsdskszy"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra MAGeCKFlute miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
   SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.28.0"; sha256="1a19dr126cs3lr0bjnwnnz2qjxyl0dmw1xm15p14w4lgvmndg5az"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
   StarBioTrek = derive2 { name="StarBioTrek"; version="1.14.0"; sha256="010a9fmlwknrig642g12lk3r583rynsq2kwpj7an2ax1ndc8my87"; depends=[AnnotationDbi e1071 ggplot2 graphite igraph MLmetrics reshape2 ROCR SpidermiR]; };
   Starr = derive2 { name="Starr"; version="1.43.0"; sha256="1cbbgdz92ja25fvn3v0cq83lb9h2dgpw7c03galjxprnkkgngmb5"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
@@ -898,10 +898,10 @@ in with self; {
   TAPseq = derive2 { name="TAPseq"; version="1.0.0"; sha256="1az32hk1l9n6j1ak70npfji8xkwjyggca8najq6hm9z22n1mj90n"; depends=[BiocGenerics BiocParallel Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges S4Vectors tidyr]; };
   TBSignatureProfiler = derive2 { name="TBSignatureProfiler"; version="1.0.0"; sha256="1gcn1876qm9fzra1hiqg47vxlpqqh79mg6n61f5f3ik3qsarxyy5"; depends=[ASSIGN BiocParallel bioDist boot caret circlize ComplexHeatmap DESeq2 DT e1071 edgeR gdata ggfortify ggplot2 glmnet GSVA RColorBrewer readr reshape2 ROCit S4Vectors shiny singscore SummarizedExperiment]; };
   TCC = derive2 { name="TCC"; version="1.28.0"; sha256="0ah46f6h4y9l737a4jgd3y6af1nz693fl9pm3nxkgdakf0v46bly"; depends=[baySeq DESeq DESeq2 edgeR ROC]; };
-  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.16.3"; sha256="06d15k7khlwia0z1j6zhsbkvdfyqpc6sqdlig5alajcb76p2a8kx"; depends=[biomaRt data_table downloader dplyr GenomicRanges ggplot2 httr IRanges jsonlite knitr plyr purrr R_utils readr rvest S4Vectors stringr SummarizedExperiment tibble tidyr XML xml2]; };
+  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.16.4"; sha256="0v360yaics0p3xlnvb2acgfmfapafmxpj6dvmk6cldgksnazv0sx"; depends=[biomaRt data_table downloader dplyr GenomicRanges ggplot2 httr IRanges jsonlite knitr plyr purrr R_utils readr rvest S4Vectors stringr SummarizedExperiment tibble tidyr XML xml2]; };
   TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.14.0"; sha256="1jjq7jcf0978mik9k25y4rqyljwlcy2wypmz607vkyxl58q6kql1"; depends=[caret clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr sesame shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks TCGAbiolinksGUI_data]; };
-  TCGAutils = derive2 { name="TCGAutils"; version="1.8.0"; sha256="0mggkcp3pr53315k4938wncbh04bn75j1x50h8b87py0hg88d6n8"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; };
-  TCseq = derive2 { name="TCseq"; version="1.12.0"; sha256="1s0grvs1a5x857jw4r9x6ymg2bm987nrhnfxcz2p512pwn79s62j"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; };
+  TCGAutils = derive2 { name="TCGAutils"; version="1.8.1"; sha256="1ikkjz73q7qw86jzrmbddqr9sd40g7xaznpyf4zz9aj0dzjvdj5z"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; };
+  TCseq = derive2 { name="TCseq"; version="1.12.1"; sha256="0xfbvr1qah0vwa5g15jpbzdqx4x3dkygdg6p92k67ip1qwsjar26"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; };
   TDARACNE = derive2 { name="TDARACNE"; version="1.38.0"; sha256="1k59i57nq2k8a5ih8i8ikyim9i4nr41s74anggbgwnpypdxbvrdy"; depends=[Biobase GenKern Rgraphviz]; };
   TEQC = derive2 { name="TEQC"; version="4.10.0"; sha256="1bb2yar0qjlpr5zw5ld4pmvgn3ni3fz6n01q7j8a8zs9ql8jiqjk"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
   TFARM = derive2 { name="TFARM"; version="1.10.0"; sha256="0w7rs22wga1xjyqfg500lcfd0yaajgck7jkpp510daksw9f0xw9r"; depends=[arules fields GenomicRanges gplots stringr]; };
@@ -913,7 +913,7 @@ in with self; {
   TMixClust = derive2 { name="TMixClust"; version="1.10.0"; sha256="0lzzfwcl0zvhjyzjq88n8fr90spw6b35slbmgxmca0lc3py12gwi"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; };
   TNBC_CMS = derive2 { name="TNBC.CMS"; version="1.4.0"; sha256="114w957i392yls73w33qcmw2ynyfc415y8gdvqh6p3k6kyiv7c90"; depends=[e1071 forestplot GGally ggplot2 ggpubr GSVA pheatmap pracma quadprog R_utils RColorBrewer SummarizedExperiment survival]; };
   TOAST = derive2 { name="TOAST"; version="1.2.0"; sha256="1q7xan3qwmxjr0l8mlxi97khnp5h22r2q84vgca4wl9s9j5rz7vl"; depends=[EpiDISH limma nnls RefFreeEWAS SummarizedExperiment]; };
-  TPP = derive2 { name="TPP"; version="3.16.2"; sha256="032yvln001808fxjkmwi98dl98h2700dxv0rsa7pg3whj4fj61kq"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown stringr tibble tidyr VennDiagram VGAM]; };
+  TPP = derive2 { name="TPP"; version="3.16.5"; sha256="0flaz2p6j4rlk65589i1f6d9m8spis19h51lc0is9rdbqzz721xb"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown stringr tibble tidyr VennDiagram VGAM]; };
   TPP2D = derive2 { name="TPP2D"; version="1.4.1"; sha256="0r790nr2x5blnphsvb4xmjq6n9ivrrdihaxxpp2f9hg14rdi1l47"; depends=[BiocParallel doParallel dplyr foreach ggplot2 limma MASS openxlsx RCurl stringr tidyr]; };
   TRONCO = derive2 { name="TRONCO"; version="2.20.1"; sha256="0nq2nmb69wabblal845llyx89fqna1rk2kjj0aw0scm0gydrs232"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
   TSCAN = derive2 { name="TSCAN"; version="1.26.0"; sha256="0hvrnva8lanr97p34i6irx8i6gskdk9jsa1mj6jhh7jlb0khv7d9"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
@@ -930,7 +930,7 @@ in with self; {
   ToPASeq = derive2 { name="ToPASeq"; version="1.22.0"; sha256="04bd54xy2qhccbj8mpa3c7lgzf54q2lxprh9zxv5jirplkmklkf0"; depends=[Biobase corpcor graph graphite gRbase limma RBGL Rcpp SummarizedExperiment]; };
   TransView = derive2 { name="TransView"; version="1.32.0"; sha256="1bcyz9hk4vqlv6nv70m146fs3ha2x89vpli56g3n7rz718q79yj2"; depends=[BiocGenerics GenomicRanges gplots IRanges Rhtslib S4Vectors zlibbioc]; };
   TreeAndLeaf = derive2 { name="TreeAndLeaf"; version="1.0.0"; sha256="0g7fd5l0r4sqc35cfw4dx7sskb89ikyr7xkmc8qx7y3hj57kidpp"; depends=[ape igraph RedeR]; };
-  TreeSummarizedExperiment = derive2 { name="TreeSummarizedExperiment"; version="1.4.6"; sha256="1708kgbfddy3dy4q1i9h2zxrdqv6xaj171940vn6h6d59kxsvf6m"; depends=[ape BiocGenerics dplyr rlang S4Vectors SingleCellExperiment SummarizedExperiment]; };
+  TreeSummarizedExperiment = derive2 { name="TreeSummarizedExperiment"; version="1.4.8"; sha256="1cs7w9yl2nc2dl96pghpvxhqw586lw7cblhsmhl22m50n7d92wj4"; depends=[ape BiocGenerics dplyr rlang S4Vectors SingleCellExperiment SummarizedExperiment]; };
   Trendy = derive2 { name="Trendy"; version="1.10.0"; sha256="0snsipp212s4f646pk5r7hychbkf4xjyfng8pmawss9h1qsig32f"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; };
   TurboNorm = derive2 { name="TurboNorm"; version="1.36.0"; sha256="17jxsgi3096xcyfddanqm38cd1gm5agmxzqcpyr07ys7snqy9vdf"; depends=[affy convert lattice limma marray]; };
   TxRegInfra = derive2 { name="TxRegInfra"; version="1.8.0"; sha256="07z97cs3dv4d3a5q36k8lslg2ic8r3f8dhk0hq4d52r2wcg8axnx"; depends=[BiocParallel GenomeInfoDb GenomicRanges IRanges mongolite RaggedExperiment rjson S4Vectors SummarizedExperiment]; };
@@ -956,7 +956,7 @@ in with self; {
   XINA = derive2 { name="XINA"; version="1.6.0"; sha256="0k3w3cbp7gv1pv0ylz6gq619hq0i4dm2955s4pawfm7lgh5nls3m"; depends=[alluvial ggplot2 gridExtra igraph mclust plyr STRINGdb]; };
   XVector = derive2 { name="XVector"; version="0.28.0"; sha256="11h1hszv4798q1gbx8r6zf8vlaqx4v9ql0lbh2xaxybp66a03pvc"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
   Xeva = derive2 { name="Xeva"; version="1.4.0"; sha256="0x5gg018bgmv9dpawzpqf64k05rdrhwk30zxd4yfbxxfq8r7pa8m"; depends=[BBmisc Biobase ComplexHeatmap doParallel downloader ggplot2 nlme PharmacoGx Rmisc scales]; };
-  YAPSA = derive2 { name="YAPSA"; version="1.14.0"; sha256="06lkf01vl4fyhj82srx8k870fhw76a1han0kp4jglh43b1c19c1k"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST magrittr PMCMR pracma reshape2 SomaticSignatures VariantAnnotation]; };
+  YAPSA = derive2 { name="YAPSA"; version="1.14.0"; sha256="06lkf01vl4fyhj82srx8k870fhw76a1han0kp4jglh43b1c19c1k"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST lsei magrittr PMCMR pracma reshape2 SomaticSignatures VariantAnnotation]; };
   a4 = derive2 { name="a4"; version="1.36.0"; sha256="1rzxg1h48jnlwqfjyyqzz6i3zlkfzc0i714rfplry7dyni6asgr7"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
   a4Base = derive2 { name="a4Base"; version="1.36.0"; sha256="0b7fy1wcydb9z43wb1663skswvhivn7ji15g00gqcshwkkiq4x02"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
   a4Classif = derive2 { name="a4Classif"; version="1.36.0"; sha256="0bj8m4nprw3maahd1qx9jjdxfip9ihbbpydbzwjxn6dlgw2i8mcr"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; };
@@ -1020,7 +1020,7 @@ in with self; {
   beadarray = derive2 { name="beadarray"; version="2.38.0"; sha256="1yg0039zyj0azb28kz6ljrd2nwc7afvncmqqsi0d72fjlznh6rrh"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 hexbin illuminaio IRanges limma reshape2]; };
   beadarraySNP = derive2 { name="beadarraySNP"; version="1.54.0"; sha256="0c6fhl9h1f3rm9a1qi5p8jfaj94iffjg2jzdksns2mf2mcjhky4k"; depends=[Biobase quantsmooth]; };
   bgafun = derive2 { name="bgafun"; version="1.49.0"; sha256="0hp1kljv7dx6p3g4k9frsrgspg2gfr1mnypgwz05f6ll3zfjfm1c"; depends=[ade4 made4 seqinr]; };
-  bgx = derive2 { name="bgx"; version="1.54.0"; sha256="0r67a6m5hrnsxgk0f57hl5yaagi2wai2kpfyjjlhrck4rlm1sjcx"; depends=[affy Biobase gcrma Rcpp]; };
+  bgx = derive2 { name="bgx"; version="1.54.1"; sha256="0a10fg9n5p024jrmbis102gqpbz23sc6vdn1sal2697hlxikzb46"; depends=[affy Biobase gcrma Rcpp]; };
   bigPint = derive2 { name="bigPint"; version="1.4.0"; sha256="1m92ngkzimcc37byf0ziphrby8wmjd5hfa53gvfphgaakyj9bjg8"; depends=[DelayedArray dplyr GGally ggplot2 gridExtra hexbin Hmisc htmlwidgets plotly plyr RColorBrewer reshape shiny shinycssloaders shinydashboard stringr SummarizedExperiment tidyr]; };
   bigmelon = derive2 { name="bigmelon"; version="1.14.0"; sha256="1cryjhbiacm45g097rpqgbva49hs5vdx4y4h5h2v1gw4k78hwb4y"; depends=[Biobase BiocGenerics gdsfmt GEOquery methylumi minfi wateRmelon]; };
   bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.36.0"; sha256="053bqcd3p4i7agj43ccjxfz40a1sxrymd49vdpfq8ypslkwk7g0g"; depends=[bigmemory]; };
@@ -1031,7 +1031,7 @@ in with self; {
   biobtreeR = derive2 { name="biobtreeR"; version="1.0.0"; sha256="1vl06mv3ns0bnxd5sjypidw5v1spjqz8gvrjm5x5cwsdgg9zrvqn"; depends=[httpuv httr jsonlite stringi]; };
   biocGraph = derive2 { name="biocGraph"; version="1.50.0"; sha256="1372bm4y3czqhpki10pnprxfkfncfcsy59zzvf8wj6q03acaavrj"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
   biocViews = derive2 { name="biocViews"; version="1.56.2"; sha256="0kw0qfm1fw5yv2rbz6x23431rh0fnzj66f2bls7j285biyjmmx7w"; depends=[Biobase BiocManager graph RBGL RCurl RUnit XML]; };
-  biomaRt = derive2 { name="biomaRt"; version="2.44.1"; sha256="0np4nh3gj60mgb6312z7x0z9fg5bhrhw872sp3dzgmqc8q8b84iz"; depends=[AnnotationDbi BiocFileCache httr openssl progress rappdirs stringr XML]; };
+  biomaRt = derive2 { name="biomaRt"; version="2.44.4"; sha256="1zx98zas8ngy5g2pmdvcv1b0afhh7v2skyimkjmbgmi99sswp09i"; depends=[AnnotationDbi BiocFileCache httr openssl progress rappdirs stringr XML xml2]; };
   biomformat = derive2 { name="biomformat"; version="1.16.0"; sha256="1l126nd1jmix4x3lh9my5nskc9bzbzrbz1brr23677vplfhrhy38"; depends=[jsonlite Matrix plyr rhdf5]; };
   biomvRCNS = derive2 { name="biomvRCNS"; version="1.28.0"; sha256="0bzw6pm0xgbi1gc3ybvf07hvih4k61hhpxk67gsqiq2w50010hp8"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
   biosigner = derive2 { name="biosigner"; version="1.16.0"; sha256="1v760q7hzaybkf2q9230rmr4phi8hglm59qwsjzvncxrhs3dpj06"; depends=[Biobase e1071 MultiDataSet randomForest ropls]; };
@@ -1050,7 +1050,7 @@ in with self; {
   bridge = derive2 { name="bridge"; version="1.52.0"; sha256="0cy35wcab4941s4136nqwwd27s4gqdgy06q0cvggld39jrpn467f"; depends=[rama]; };
   bsseq = derive2 { name="bsseq"; version="1.24.4"; sha256="0ymay9csrylpg6x9s7fgbr1mbw47skw9lqv2p7jn8fyilk2rbbcj"; depends=[beachmat Biobase BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit permute R_utils Rcpp rhdf5 S4Vectors scales SummarizedExperiment]; };
   bumphunter = derive2 { name="bumphunter"; version="1.30.0"; sha256="04y6spdx89j3bsq2xniqd3sbfmakwc0klbpzjlp1q2xs9kywr4dq"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
-  cBioPortalData = derive2 { name="cBioPortalData"; version="2.0.7"; sha256="0v3k3iznfzn3419ixlm1zv5sjfj5arpiyvfy5fc1682g762zv3lk"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment rappdirs readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; };
+  cBioPortalData = derive2 { name="cBioPortalData"; version="2.0.10"; sha256="1fqm5hsdmx3v9x0ziwhjjhrjjfzm26i51as2wkmpnvn7y13zws1j"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; };
   cTRAP = derive2 { name="cTRAP"; version="1.6.1"; sha256="09fwxr40q6wcqiwdr8q75sr5njrfl48jp6dl68z9a7parmpmgv9q"; depends=[biomaRt cowplot data_table dplyr fgsea ggplot2 ggrepel httr limma pbapply R_utils readxl reshape2 rhdf5 scales]; };
   caOmicsV = derive2 { name="caOmicsV"; version="1.18.0"; sha256="1cfqw7xvr4sr3b14w7slrvw093m4933c7717l9inlv0dj7jkz4g9"; depends=[bc3net igraph]; };
   calm = derive2 { name="calm"; version="1.2.0"; sha256="09by842lv26psr85sck0n94w011kjav4bm5bx4kwji7vrd12m869"; depends=[mgcv]; };
@@ -1064,7 +1064,7 @@ in with self; {
   ccrepe = derive2 { name="ccrepe"; version="1.24.0"; sha256="0kyrrllpmrn2bbxyvfwxs1g9qvjxhisfw34b545z8hhjmdhlxlwk"; depends=[infotheo]; };
   ceRNAnetsim = derive2 { name="ceRNAnetsim"; version="1.0.0"; sha256="0j79b1gg709i23r776h37gydnvvbg0hi60wkwlp0r638263l3qr1"; depends=[dplyr furrr future ggplot2 ggraph igraph purrr rlang tibble tidygraph tidyr]; };
   celaref = derive2 { name="celaref"; version="1.6.0"; sha256="0k1vzwr91l4cdb81lqxil5302888q94qrwc1y237734ldkrj1bhh"; depends=[BiocGenerics DelayedArray dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; };
-  celda = derive2 { name="celda"; version="1.4.6"; sha256="0afmvwl8s3crk48iag22whq3p7am3xw745gcy9mcp3hda128xlwq"; depends=[data_table dbscan DelayedArray dendextend digest doParallel enrichR foreach ggdendro ggplot2 ggrepel gridExtra gtable MAST Matrix matrixStats MCMCprecision plyr pROC RColorBrewer Rcpp RcppEigen reshape2 Rtsne S4Vectors scales scater scran Seurat SingleCellExperiment stringi stringr SummarizedExperiment uwot withr]; };
+  celda = derive2 { name="celda"; version="1.4.7"; sha256="1h3psbfv0az7n17bh3j3lanp6r2kmw5kxnja2qn50gny342wf1la"; depends=[data_table dbscan DelayedArray dendextend digest doParallel enrichR foreach ggdendro ggplot2 ggrepel gridExtra gtable MAST Matrix matrixStats MCMCprecision plyr pROC RColorBrewer Rcpp RcppEigen reshape2 Rtsne S4Vectors scales scater scran Seurat SingleCellExperiment stringi stringr SummarizedExperiment uwot withr]; };
   cellHTS2 = derive2 { name="cellHTS2"; version="2.52.0"; sha256="11h7jyysl98mqqa6224sxrmrl19jghl8b7p3lkni4qgri9n0wdd2"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
   cellTree = derive2 { name="cellTree"; version="1.18.0"; sha256="050hyrghmbgc2rw0x9jzx787gnapa7xh5djp16bw0s3h20xqw0gl"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; };
   cellbaseR = derive2 { name="cellbaseR"; version="1.12.0"; sha256="0n7sv3wy71p32hffhrkhvxaj98m7j63hf6576yi0srllxgffr991"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; };
@@ -1081,7 +1081,7 @@ in with self; {
   chromVAR = derive2 { name="chromVAR"; version="1.10.0"; sha256="0igzsa206m29r7fhpkgkyllii30rd4kbiwqby8nz2cz86znmmx5w"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
   chromstaR = derive2 { name="chromstaR"; version="1.14.1"; sha256="1y71ipmg1wacx9ga1jyfzxr39s30kxfy9qji77fhxmalasvp9gbm"; depends=[bamsignals BiocGenerics chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; };
   chromswitch = derive2 { name="chromswitch"; version="1.10.0"; sha256="1ii4shpbr3k5gpvw1l9ihvdc34qjbzgq05bj31v2p3a9p8wx6ii2"; depends=[Biobase BiocParallel cluster dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats NMF rtracklayer S4Vectors tidyr]; };
-  cicero = derive2 { name="cicero"; version="1.6.1"; sha256="0nf9yqg5krj26n4n82iyx3rsr84d46b17i9zfk35sh12l4xssbii"; depends=[assertthat Biobase BiocGenerics data_table dplyr FNN GenomicRanges ggplot2 glasso Gviz igraph IRanges Matrix monocle plyr reshape2 S4Vectors stringi stringr tibble tidyr VGAM]; };
+  cicero = derive2 { name="cicero"; version="1.6.2"; sha256="042ba6yfa7fksij2v7cwnp2sca3vmz7izn6fsxx9xswnncrkgcqh"; depends=[assertthat Biobase BiocGenerics data_table dplyr FNN GenomicRanges ggplot2 glasso Gviz igraph IRanges Matrix monocle plyr reshape2 S4Vectors stringi stringr tibble tidyr VGAM]; };
   circRNAprofiler = derive2 { name="circRNAprofiler"; version="1.2.1"; sha256="0x6acd7gfbna9dv5c459sg1k89kz8q9wpp96d3rfgrwjlssx6vmm"; depends=[AnnotationHub Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 DESeq2 dplyr edgeR GenomeInfoDb GenomicRanges ggplot2 gwascat IRanges magrittr R_utils readr reshape2 rlang rtracklayer S4Vectors seqinr stringi stringr universalmotif]; };
   cisPath = derive2 { name="cisPath"; version="1.28.0"; sha256="0vc7j6j6f18hrvja38crmxq85hashwic21skfvz3379xv0qzhypj"; depends=[]; };
   cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.26.0"; sha256="1hjs1hjr6mb9iqy1ba10sc8mrhff4p8bra11gq9k4sc5axiwcdjp"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomeInfoDb GenomicRanges IRanges seqinr]; };
@@ -1153,8 +1153,8 @@ in with self; {
   ddPCRclust = derive2 { name="ddPCRclust"; version="1.8.0"; sha256="1il123xc37pckj58nlh8vzbdmfwi9qqghdvkl5948c747swrfyy1"; depends=[clue flowCore flowDensity flowPeaks ggplot2 openxlsx plotrix R_utils SamSPECTRAL]; };
   dearseq = derive2 { name="dearseq"; version="1.0.0"; sha256="1v2w3b9z638vqwjqfssibkbjvydby4d73jqj5h87sbsapgjhcvqq"; depends=[CompQuadForm ggplot2 KernSmooth matrixStats pbapply statmod]; };
   debCAM = derive2 { name="debCAM"; version="1.6.0"; sha256="0ifbn3vmlrpi4d2ybqhvygndqa200h0hb0b47523fx0vw985f9k5"; depends=[apcluster Biobase BiocParallel corpcor DMwR geometry NMF nnls pcaPP rJava SummarizedExperiment]; };
-  debrowser = derive2 { name="debrowser"; version="1.16.2"; sha256="1iz1mjsarrc0xrrm7nlk7llbhsja47a039chs5ahrjg4bsj52wpf"; depends=[annotate AnnotationDbi clusterProfiler colourpicker DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 gplots Harman heatmaply igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview plotly RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva]; };
-  deco = derive2 { name="deco"; version="1.4.0"; sha256="05rzdk88grl05vwpzvrd1p6bwg1sx6fbvnlzmh9mb0ls668gj2h7"; depends=[ade4 AnnotationDbi Biobase BiocParallel BiocStyle cluster foreign gdata ggplot2 gplots gridExtra limma locfit made4 RColorBrewer reshape2 scatterplot3d sfsmisc SummarizedExperiment]; };
+  debrowser = derive2 { name="debrowser"; version="1.16.3"; sha256="0lqsagl0qwzikm6mw8mw8ygpvylzr4jz810fjm020a8h155pwp2g"; depends=[annotate AnnotationDbi clusterProfiler colourpicker DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 gplots Harman heatmaply igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview plotly RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva]; };
+  deco = derive2 { name="deco"; version="1.4.1"; sha256="1lbrlacbdr16mw21jsvall18gfzq001p854nsa3jpgbhfs9y13zs"; depends=[ade4 AnnotationDbi Biobase BiocParallel BiocStyle cluster foreign gdata ggplot2 gplots gridExtra limma locfit made4 RColorBrewer reshape2 scatterplot3d sfsmisc SummarizedExperiment]; };
   decompTumor2Sig = derive2 { name="decompTumor2Sig"; version="2.4.1"; sha256="014z3p784v53bv3wpx1njcc0xzwg1hklaa44qjvg9x7j95vrpmq9"; depends=[BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg19 data_table GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gridExtra Matrix plyr quadprog S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
   decontam = derive2 { name="decontam"; version="1.8.0"; sha256="10y3iydzgwbr9ixyyylzxkd7jfg0qz14gmphmdhq94ys0frhwpxi"; depends=[ggplot2 reshape2]; };
   deepSNV = derive2 { name="deepSNV"; version="1.34.1"; sha256="1hagkdq06c3xsrba3c3bnqwwmk406f9plkdh66a4hypx6hbwp6k7"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
@@ -1173,7 +1173,7 @@ in with self; {
   diffuStats = derive2 { name="diffuStats"; version="1.8.0"; sha256="10ln1c1ic44inxmi19fvxi4scnwl9qi5hpswhsnqsngql3yg69wp"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; };
   diggit = derive2 { name="diggit"; version="1.20.0"; sha256="1k6i7w70yizc8drsdvz05sdfyrxr7z7fflbznc1wpnfv54phx00m"; depends=[Biobase ks viper]; };
   discordant = derive2 { name="discordant"; version="1.12.0"; sha256="161y6xmzrsj88swii85v43q48n10snawzfz6305m2hsdj6463qxq"; depends=[Biobase biwt gtools MASS]; };
-  distinct = derive2 { name="distinct"; version="1.0.3"; sha256="1a10v4ldgqqsk5lrnq1zi9pkw5brv9zys8bqdkfdb7xbc06yzgzq"; depends=[doParallel doRNG foreach ggplot2 limma Matrix Rcpp RcppArmadillo SingleCellExperiment SummarizedExperiment]; };
+  distinct = derive2 { name="distinct"; version="1.0.4"; sha256="1c0pp3sqm0l8gyfixv9774lvdzsdk9x7gz82hf8ldinvyn6frraf"; depends=[doParallel doRNG foreach ggplot2 limma Matrix Rcpp RcppArmadillo scater SingleCellExperiment SummarizedExperiment]; };
   dittoSeq = derive2 { name="dittoSeq"; version="1.0.2"; sha256="1fj7chyv077ffqnqvh2vv7x9x2alibk92fz3sihdfb167l0acdp4"; depends=[colorspace cowplot edgeR ggplot2 ggrepel ggridges gridExtra pheatmap reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; };
   divergence = derive2 { name="divergence"; version="1.4.0"; sha256="0m87v1z2mjmy9b74aknzbal22r2rj55prqclpq68shg6g2iw8q8c"; depends=[SummarizedExperiment]; };
   dks = derive2 { name="dks"; version="1.34.0"; sha256="1mrixifn868p0wjl6fcal1wm7ngf942lgas35wn0z1sqxnzqxl9n"; depends=[cubature]; };
@@ -1268,7 +1268,7 @@ in with self; {
   gCMAP = derive2 { name="gCMAP"; version="1.32.0"; sha256="04aaqa9gvv97ijgnr05drwcn637w1n1k1v9gna0zzxrbcwln36n8"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
   gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.27.0"; sha256="1361qlzq5lgj24ssb7l1pds5h0g1wzn7q2ff9f03kpl5nhlbzrwd"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
   gCrisprTools = derive2 { name="gCrisprTools"; version="1.16.0"; sha256="0n5zxyrfnr981r1ynlclcxh6axxmbpd3m169zf767zicmjsxxcl7"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg SummarizedExperiment]; };
-  gQTLBase = derive2 { name="gQTLBase"; version="1.20.0"; sha256="06xvzp4fn3qfa46ggg8kxi267gbyd821vvx4040173xkqxpr0g5j"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
+  gQTLBase = derive2 { name="gQTLBase"; version="1.20.4"; sha256="1ly14vhhqxjpbxjypi6ppd37dycabdhf4ny4nsvp9969k418zv41"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
   gQTLstats = derive2 { name="gQTLstats"; version="1.20.0"; sha256="1jjqfpjp93nmxjn757j5mzcax96bzcqdd1gr3rsdxg7ap008l2w7"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr erma ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggbeeswarm ggplot2 gQTLBase HardyWeinberg Homo_sapiens IRanges limma mgcv plotly reshape2 S4Vectors shiny snpStats SummarizedExperiment VariantAnnotation]; };
   gaga = derive2 { name="gaga"; version="2.34.0"; sha256="10livlmxsdzf82rybhpqz81zdc0ndchy9z3kz62c651hc4x4pki1"; depends=[Biobase coda EBarrays mgcv]; };
   gage = derive2 { name="gage"; version="2.38.3"; sha256="1bqmvjiya1df0b3h491lp1jxahiyidvaf9n094z0sk84x5y3xh2p"; depends=[AnnotationDbi GO_db graph KEGGREST]; };
@@ -1280,7 +1280,7 @@ in with self; {
   gcrma = derive2 { name="gcrma"; version="2.60.0"; sha256="1klbnygc1i5ac1x00bsk0rjw5h5dn6pn65fa3y9r09q47gpy1c5g"; depends=[affy affyio Biobase BiocManager Biostrings XVector]; };
   gdsfmt = derive2 { name="gdsfmt"; version="1.24.1"; sha256="0ipf60wylbhvwk9q3mbnak0f1n6k7spfh90s1c1c0b47ryxsri67"; depends=[]; };
   geNetClassifier = derive2 { name="geNetClassifier"; version="1.28.0"; sha256="163fbly8yglkmwqzwksj5ss4b50sma82khc2q74qgxrd8ji9155i"; depends=[Biobase e1071 EBarrays minet]; };
-  geecc = derive2 { name="geecc"; version="1.21.0"; sha256="018yfiik3x0nchhgr5lb58ycngapx300p4r0aplzv2fz43avf4yi"; depends=[gplots hypergea MASS Rcpp]; };
+  geecc = derive2 { name="geecc"; version="1.21.0"; sha256="018yfiik3x0nchhgr5lb58ycngapx300p4r0aplzv2fz43avf4yi"; depends=[gplots MASS Rcpp]; };
   gemini = derive2 { name="gemini"; version="1.2.0"; sha256="1n5h9rvwpnvibbrdy71n4irc8j41b6hizqqff8ffh4pjy5n6g1hs"; depends=[dplyr ggplot2 magrittr mixtools pbmcapply scales]; };
   genArise = derive2 { name="genArise"; version="1.64.0"; sha256="03kih2334l3np25k09mnhyvjzs0l6a7nbnbgc3wwkrrds8fbncnc"; depends=[locfit tkrplot xtable]; };
   genbankr = derive2 { name="genbankr"; version="1.16.0"; sha256="0vd115ccllmzi5wr69aw46c2ny79qj76ds8qdm9bj4mrx1ayj611"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
@@ -1311,7 +1311,7 @@ in with self; {
   globalSeq = derive2 { name="globalSeq"; version="1.16.1"; sha256="0zlb0h3djabwrm5sszx76r55r9svavpahhnlgzf1qi2iz6a9mjc5"; depends=[]; };
   globaltest = derive2 { name="globaltest"; version="5.42.0"; sha256="0ndkpwi8dmz5kv2yzmdfx0qq00x6jismiah0xd6kh44l42k88510"; depends=[annotate AnnotationDbi Biobase survival]; };
   gmapR = derive2 { name="gmapR"; version="1.30.0"; sha256="14dda16jgpc29nm4llswz6yr47hwmndd9zg2qlz2psfbn31z5k6w"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  gmoviz = derive2 { name="gmoviz"; version="1.0.0"; sha256="1489jqx8ih2hb9915xpg9xgxkal4h5cai1zwikzqshsdd4g1z327"; depends=[BiocGenerics Biostrings circlize colorspace ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridBase IRanges pracma Rsamtools rtracklayer S4Vectors]; };
+  gmoviz = derive2 { name="gmoviz"; version="1.0.1"; sha256="0rrqzqr64724ip19ql34yds3vd7r9s8bhw4bicq80pffz0c0idyx"; depends=[BiocGenerics Biostrings circlize colorspace ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridBase IRanges pracma Rsamtools rtracklayer S4Vectors]; };
   goProfiles = derive2 { name="goProfiles"; version="1.50.0"; sha256="0kdmr4mdjjb79srljbd0lr7np14gz58fya2v21qgny4m5lpw902d"; depends=[AnnotationDbi Biobase CompQuadForm GO_db stringr]; };
   goSTAG = derive2 { name="goSTAG"; version="1.12.1"; sha256="1p4rhmfc09vzywrdkzak6784y92bdfkr6jw3l4xfq6sw77wd3wml"; depends=[AnnotationDbi biomaRt GO_db memoise]; };
   goTools = derive2 { name="goTools"; version="1.62.0"; sha256="185ydv7hajhxw0jgv5gplcx59grbv7aqypfrxx6ny422d5mb86rm"; depends=[AnnotationDbi GO_db]; };
@@ -1361,7 +1361,7 @@ in with self; {
   iSeq = derive2 { name="iSeq"; version="1.40.0"; sha256="1k5fw917z94imflwz87zz0qlazsnvz2c8cka4i7l02h6nqs16yhn"; depends=[]; };
   iasva = derive2 { name="iasva"; version="1.6.0"; sha256="1fbbwz6fjw83ca9z910rv96wf4qv9v43fyxncydmn1d02fq9ck13"; depends=[BiocParallel cluster irlba SummarizedExperiment]; };
   ibh = derive2 { name="ibh"; version="1.36.0"; sha256="1wkd36673b1ksk7aph87awlpm7wwqfpa3qznkmv894nvmxhrd9r6"; depends=[simpIntLists]; };
-  icetea = derive2 { name="icetea"; version="1.6.0"; sha256="0690siz5cd8qjpalyhrahqz7q5svfdyyq8hm61ygf3g5jqi1pczd"; depends=[BiocGenerics BiocParallel Biostrings csaw DESeq2 edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; };
+  icetea = derive2 { name="icetea"; version="1.6.1"; sha256="0lxiyha44m2ir9h68wbizzzg28c38290dd709c50kpcfd9mfg7n9"; depends=[BiocGenerics BiocParallel Biostrings csaw DESeq2 edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; };
   ideal = derive2 { name="ideal"; version="1.12.1"; sha256="1j1ys3sizvnkv8i54gf9vbakjaj84mmb3353lpj56wl2i4qvhvfb"; depends=[AnnotationDbi base64enc BiocParallel DESeq2 dplyr DT GenomicRanges ggplot2 ggrepel GO_db goseq GOstats gplots heatmaply IHW IRanges knitr limma pcaExplorer pheatmap plotly rentrez rintrojs rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; };
   idiogram = derive2 { name="idiogram"; version="1.64.0"; sha256="1fia0sa7xqylshk8alwkg2a9vgvgqicwss8jvplvppniyan364bh"; depends=[annotate Biobase plotrix]; };
   idr2d = derive2 { name="idr2d"; version="1.2.2"; sha256="1ycnjj4zy0k4qij7xv5i5w3jgd633nn4gxcb8n0z4kxh60117cq4"; depends=[dplyr futile_logger GenomeInfoDb GenomicRanges ggplot2 idr IRanges magrittr reticulate scales stringr]; };
@@ -1384,7 +1384,7 @@ in with self; {
   iteremoval = derive2 { name="iteremoval"; version="1.8.0"; sha256="1z2d4ggnh6n5k36rh1c9s2vmnbm4kvali7fsrb13xs60947c4r4m"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; };
   ivygapSE = derive2 { name="ivygapSE"; version="1.10.0"; sha256="0fsfh8mczbv6ng79h84i9hz0awyrp69np25jv6k2krxixan58adk"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; };
   joda = derive2 { name="joda"; version="1.35.0"; sha256="044fhha4vrsfzz0bpa5q263lxqaz7nfb1b9hz0q870ja7j9wcmb3"; depends=[bgmm RBGL]; };
-  karyoploteR = derive2 { name="karyoploteR"; version="1.14.0"; sha256="0h0gk4xd95k5phy6qcsv7j931d7gk3p24i2fg4mz5dsk110lpifs"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+  karyoploteR = derive2 { name="karyoploteR"; version="1.14.1"; sha256="1wlnzkq58baqj9854nzf5rbglchb2xy4wsp3s0q8xfq8v0p3baxf"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
   kebabs = derive2 { name="kebabs"; version="1.22.0"; sha256="10jgn45dq0x1brpx6lgl2z8p6pg06ncrhi3ywasj4sjgvakil63r"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
   keggorthology = derive2 { name="keggorthology"; version="2.40.0"; sha256="1y25xmj0f99nmlgi7ff0lqsyin5vx9jshmh3k98c4znls6k3hrpx"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
   kimod = derive2 { name="kimod"; version="1.15.0"; sha256="1rrjfy4hibvzwprb4cg9q83b0rlzrbw68j5rrg1frvddgfimycz4"; depends=[Biobase cluster]; };
@@ -1414,7 +1414,7 @@ in with self; {
   maanova = derive2 { name="maanova"; version="1.58.0"; sha256="1vqq5y34cg27pr5ma51m60jcivcvarrz5h7j8rrb77vms08r6ad9"; depends=[Biobase]; };
   macat = derive2 { name="macat"; version="1.62.0"; sha256="1fjcp8cy0bn916bli0iy040mbhmmswlacy4pc5kcb4yji1nlj4x2"; depends=[annotate Biobase]; };
   made4 = derive2 { name="made4"; version="1.61.0"; sha256="1bm2n99rkl38y97zzg8mvb52jnf42ka0gqljzg4jphq8j97f8qj2"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
-  maftools = derive2 { name="maftools"; version="2.4.05"; sha256="1wwd2n3xlqdv0yfw64hrpj443gmjyyibcfavfp7jd4ccph9g5wfd"; depends=[data_table RColorBrewer survival]; };
+  maftools = derive2 { name="maftools"; version="2.4.12"; sha256="1hzgvi0siav2gzn3nc99bclk4am5b40jk8njkn4ggil223cn1ajv"; depends=[data_table RColorBrewer survival]; };
   maigesPack = derive2 { name="maigesPack"; version="1.52.0"; sha256="14jf4b0kcd0l9mbnrvl2c55a7pggyfj14kj1gf7mc0k34ys9q04g"; depends=[convert graph limma marray]; };
   makecdfenv = derive2 { name="makecdfenv"; version="1.64.0"; sha256="1mzsqkyyldcvf0b26j9pzwdy19n5hrsalvaw4vfhp36793f7r99v"; depends=[affy affyio Biobase zlibbioc]; };
   mapscape = derive2 { name="mapscape"; version="1.12.0"; sha256="0yzf1p9nvg7ncpadnvad50c4mrxc6isn32b3vvyfrhq0adqidykl"; depends=[base64enc htmlwidgets jsonlite stringr]; };
@@ -1425,7 +1425,7 @@ in with self; {
   massiR = derive2 { name="massiR"; version="1.24.0"; sha256="1ki1886i90wfd5jmjjn6nddnkaaxq81xr5jmz9l226g5xmq7xh0l"; depends=[Biobase cluster diptest gplots]; };
   matchBox = derive2 { name="matchBox"; version="1.30.0"; sha256="1mfrxp3scmfakysbyqs5i7kjw9kx2jllcz1vnb6jpdlvah7928ij"; depends=[]; };
   matter = derive2 { name="matter"; version="1.14.0"; sha256="0ys1zmfyxz7lmffa8v02qcd5lg5aypjh3lhwzyzaal4cncx16fnp"; depends=[biglm BiocGenerics BiocParallel digest irlba Matrix ProtGenerics]; };
-  mbkmeans = derive2 { name="mbkmeans"; version="1.4.0"; sha256="113s6cxvx61y75cky0y0a9q4b3zhj2qwx2d5ldvbmji3mfxh7i7x"; depends=[beachmat benchmarkme BiocParallel ClusterR DelayedArray Matrix Rcpp RcppArmadillo Rhdf5lib SingleCellExperiment SummarizedExperiment]; };
+  mbkmeans = derive2 { name="mbkmeans"; version="1.4.1"; sha256="0h1phy2nvs4cpg7zm06dwlvm5v60s5029wg2h69p3cqiimciihrm"; depends=[beachmat benchmarkme BiocParallel ClusterR DelayedArray Matrix Rcpp RcppArmadillo Rhdf5lib SingleCellExperiment SummarizedExperiment]; };
   mcaGUI = derive2 { name="mcaGUI"; version="1.36.0"; sha256="1b7ww5vd295a5dws1qx5mzsdy95ch81svbk9xcmnjkyp5kjjmlfi"; depends=[bpca foreign lattice MASS OTUbase proto vegan]; };
   mdgsa = derive2 { name="mdgsa"; version="1.20.0"; sha256="1yv2fvjfmhvs2xdawm8clrsgasvmaiadfja606igrg0vdj4bmpwd"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; };
   mdp = derive2 { name="mdp"; version="1.8.0"; sha256="01dwydhclszzxhd91j4jdvpn88s77bn3dyfpf36q6wx2qzjfql6h"; depends=[ggplot2 gridExtra]; };
@@ -1467,7 +1467,7 @@ in with self; {
   miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.16.0"; sha256="0x83bz4mg4sr3kcjb6kzigyb4w5r3571y0whd77a57baw4n3ywr0"; depends=[AnnotationDbi DBI miRBaseVersions_db reshape2]; };
   miRNApath = derive2 { name="miRNApath"; version="1.48.0"; sha256="0r0s1hcq5wqlv0gpizh0abjqnk93fpii1hj4y128qd6fcgf1pkgf"; depends=[]; };
   miRNAtap = derive2 { name="miRNAtap"; version="1.22.0"; sha256="1bxllfl9nc7hfzc996jlri6sqnydm1hyg1awc253vvxyccvinbn0"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
-  miRSM = derive2 { name="miRSM"; version="1.6.0"; sha256="1n86a4mqkmcb8x3rf5r8dv6lw0iqixgfp8wxraa1dr0syp43rj3g"; depends=[BiBitR BicARE biclust Biobase dbscan dynamicTreeCut energy fabia flashClust GFA GSEABase iBBiG igraph isa2 linkcomm MatrixCorrelation MCL mclust miRspongeR NMF org_Hs_eg_db PMA ppclust Rcpp rqubic runibic s4vd SOMbrero subspace SummarizedExperiment WGCNA]; };
+  miRSM = derive2 { name="miRSM"; version="1.6.4"; sha256="06c8qygdbzr9yr30wki060bd18bv4a5nawjx0wf8pir4hlznyig8"; depends=[BiBitR BicARE biclust Biobase dbscan dynamicTreeCut energy fabia flashClust GFA GSEABase iBBiG igraph isa2 linkcomm MatrixCorrelation MCL mclust miRspongeR NMF org_Hs_eg_db PMA ppclust Rcpp rqubic s4vd SOMbrero subspace SummarizedExperiment WGCNA]; };
   miRcomp = derive2 { name="miRcomp"; version="1.18.0"; sha256="1n5n1sp204a7rzdi3wbmqk2wp997s33kfkijg9i5qzrfj041ndyz"; depends=[Biobase KernSmooth miRcompData]; };
   miRmine = derive2 { name="miRmine"; version="1.10.0"; sha256="1fllcmq5vb0fx4yxyrxwzflh5sy5yla8x4h12lb5vhy252c08y3b"; depends=[SummarizedExperiment]; };
   miRspongeR = derive2 { name="miRspongeR"; version="1.14.0"; sha256="074w9bchvj4il92zdm39agr3l83flizl82x2gcqqnmmj7phcsv8v"; depends=[clusterProfiler corpcor DOSE igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA survival varhandle]; };
@@ -1480,10 +1480,10 @@ in with self; {
   mirIntegrator = derive2 { name="mirIntegrator"; version="1.18.0"; sha256="11k73fabgnzj3b50xxhccqn850gid2d8bkns272yhpi2qj0ip8cx"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; };
   missMethyl = derive2 { name="missMethyl"; version="1.22.0"; sha256="0h5m45v0s23a17b8glr5x2pmaz79znillnca7zdr7fvs0da3xdxg"; depends=[AnnotationDbi BiasedUrn Biobase BiocGenerics GenomicRanges GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest IRanges limma methylumi minfi org_Hs_eg_db ruv S4Vectors statmod stringr SummarizedExperiment]; };
   missRows = derive2 { name="missRows"; version="1.8.0"; sha256="031ahbgpb4808wb6rr3qvaxq2gn3am28kjxcndlwpcwmhd55dpaq"; depends=[ggplot2 gtools MultiAssayExperiment plyr S4Vectors]; };
-  mitch = derive2 { name="mitch"; version="1.0.8"; sha256="0ym4jpvyxivh82wsf48799am9xcppxnd18xgka7h9v3w1vv3l199"; depends=[beeswarm echarts4r GGally ggplot2 gplots gridExtra knitr MASS pbmcapply plyr reshape2 rmarkdown]; };
+  mitch = derive2 { name="mitch"; version="1.0.10"; sha256="1qajkgni8pinkh0s95r910zwc50syzwxjdnx23a7imddwpfjca88"; depends=[beeswarm echarts4r GGally ggplot2 gplots gridExtra knitr MASS plyr reshape2 rmarkdown]; };
   mitoODE = derive2 { name="mitoODE"; version="1.26.1"; sha256="1iskvlg811dfpzcr6xskw73piwf2ga3wv3c17hgppc66zygc6z3f"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
-  mixOmics = derive2 { name="mixOmics"; version="6.12.1"; sha256="13kq9l5xwhwp30y5gfqfh5f11n63vn8rk195mb2y2mww4cwi6lv4"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 tidyr]; };
-  mnem = derive2 { name="mnem"; version="1.4.1"; sha256="1nq01w5kzd1w065k4iwnr6badk2gwmgby1zqn9c2fh74hcsr32d8"; depends=[cluster data_table e1071 flexclust graph lattice Linnorm matrixStats naturalsort Rcpp RcppEigen Rgraphviz snowfall tsne]; };
+  mixOmics = derive2 { name="mixOmics"; version="6.12.2"; sha256="1nkqlvm9j1f4vfj3f3kyxqgan38rpa9imimvl9pwivvsfl647vvc"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 tidyr]; };
+  mnem = derive2 { name="mnem"; version="1.4.5"; sha256="1arbsisinygjxhg94j74np4bmjv3yrpba08xdgm31b9ip6nkyb7g"; depends=[cluster data_table e1071 flexclust graph lattice Linnorm matrixStats naturalsort Rcpp RcppEigen Rgraphviz snowfall tsne]; };
   mogsa = derive2 { name="mogsa"; version="1.22.1"; sha256="0gzi0j6cx6scb3gcc8xgv117yzma79cgllyklss8wrb97l1w8nvz"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
   monocle = derive2 { name="monocle"; version="2.16.0"; sha256="1vziidavlyhixmx6j7lf29qx8xcjwrc9q3x2f63gcff41q3jf9xd"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
   mosaics = derive2 { name="mosaics"; version="2.26.0"; sha256="1n5s8j7v1l619msnxfg88rpkgm2kcldm4y1v491h1bnxw336gyjn"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
@@ -1493,8 +1493,8 @@ in with self; {
   motifcounter = derive2 { name="motifcounter"; version="1.12.0"; sha256="082hc9g08qsc659wcq8kazaghd9japichvdb6821cfm2vwafc93a"; depends=[Biostrings]; };
   motifmatchr = derive2 { name="motifmatchr"; version="1.10.0"; sha256="145d9nykhzaf9kr30iq38c9yyv2pn459b7q4ypfmgi1g302lxfxz"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; };
   mpra = derive2 { name="mpra"; version="1.10.0"; sha256="1p12skbhgi4r1xcmg0fbf7696y9694r1ih95pi85xv5vjqwp1jx0"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; };
-  msPurity = derive2 { name="msPurity"; version="1.14.0"; sha256="0r59bv8bj4165vnwdck51fyz544krwchzf5hx9fk0sbjbgzmm4hs"; depends=[DBI dbplyr doSNOW dplyr fastcluster foreach ggplot2 jsonlite magrittr mzR plyr Rcpp reshape2 RSQLite stringr uuid]; };
-  msa = derive2 { name="msa"; version="1.20.0"; sha256="1dq75smsh5jhz95azi7xzmcnpqwhc06g0ncmpg84dyjvs5wsigcq"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
+  msPurity = derive2 { name="msPurity"; version="1.14.1"; sha256="0fgy4k823xz85g03758hzhvsfmyqr7r543n52mb9lypz3h6pqarz"; depends=[DBI dbplyr doSNOW dplyr fastcluster foreach ggplot2 jsonlite magrittr mzR plyr Rcpp reshape2 RSQLite stringr uuid]; };
+  msa = derive2 { name="msa"; version="1.20.1"; sha256="027l9kvhf6y8rh8hb9lg0g2qdjvyk4fsdpm35g7y5zc5y75p8cv5"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
   msgbsR = derive2 { name="msgbsR"; version="1.12.0"; sha256="0v86y2ivzy0b4zrwcmy0vagnqms2735r552a6z1md2hx6lh9k2qi"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; };
   msmsEDA = derive2 { name="msmsEDA"; version="1.26.0"; sha256="02fm1z9fidmhkkhijxmjzhzl2kmahif24gcllhfjc2g191kbwns2"; depends=[gplots MASS MSnbase RColorBrewer]; };
   msmsTests = derive2 { name="msmsTests"; version="1.26.0"; sha256="0vg8523kwc3xals6ghja6z2rdcc0q8nzdh2h2637b6clkbs0g1cy"; depends=[edgeR msmsEDA MSnbase qvalue]; };
@@ -1514,14 +1514,14 @@ in with self; {
   ncGTW = derive2 { name="ncGTW"; version="1.2.0"; sha256="19qlxpwc0ir5bvwnls8k87lv7mrp8aa1kly627vy8326na9f8la9"; depends=[BiocParallel Rcpp xcms]; };
   ncdfFlow = derive2 { name="ncdfFlow"; version="2.34.0"; sha256="0avxn2abh4fk1gkncrxz7jwzgvd90m3m0ly318q0z38cjhsw3j9f"; depends=[BH Biobase BiocGenerics flowCore Rcpp RcppArmadillo Rhdf5lib zlibbioc]; };
   ndexr = derive2 { name="ndexr"; version="1.10.0"; sha256="11zzh4p9gj5srkmv5gx563s58q0n9hs84pw5szb6xs5jkfx85jy9"; depends=[httr igraph jsonlite plyr tidyr]; };
-  netDx = derive2 { name="netDx"; version="1.0.3"; sha256="0zl3fjgl88lgkn4bb3dz8mhaz1cl31mjhpiklh99p972idi3mk6q"; depends=[bigmemory BiocFileCache combinat doParallel foreach GenomeInfoDb GenomicRanges ggplot2 glmnet igraph IRanges MultiAssayExperiment pracma rappdirs RColorBrewer RCy3 reshape2 ROCR S4Vectors]; };
+  netDx = derive2 { name="netDx"; version="1.0.4"; sha256="1adn2gh5am1x61s3waiar7zivisbg46vmjnccfqg488d41minj82"; depends=[bigmemory BiocFileCache clusterExperiment combinat doParallel foreach GenomeInfoDb GenomicRanges ggplot2 glmnet igraph IRanges MultiAssayExperiment netSmooth pracma rappdirs RColorBrewer RCy3 reshape2 ROCR Rtsne S4Vectors scater]; };
   netReg = derive2 { name="netReg"; version="1.11.0"; sha256="08caaspcjgmczawmp5ng6xl5lsp1nbwc72mww69isx9bnx25vn21"; depends=[Rcpp RcppArmadillo]; };
   netSmooth = derive2 { name="netSmooth"; version="1.8.0"; sha256="13ypki31mq03kxg30hcpj2p5nf5fjhr779mfyynx9dzzm6jq9kf4"; depends=[cluster clusterExperiment data_table DelayedArray entropy HDF5Array Matrix scater SingleCellExperiment SummarizedExperiment]; };
   netbenchmark = derive2 { name="netbenchmark"; version="1.19.0"; sha256="13ni8hi5n4arp5p12ximw04my79vckadjamadxj63rlmkknff6sp"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet pracma Rcpp]; };
   netbiov = derive2 { name="netbiov"; version="1.22.0"; sha256="03c2v8ihlrk6v0wqkdy047p6nf7iwaal4s0mm5l4hcjihalsg1pl"; depends=[igraph]; };
   netboost = derive2 { name="netboost"; version="1.4.0"; sha256="190zwyfadlqz162qp08dbrvnznm5p1zbfjm8xm8p510jmsb2fxkl"; depends=[colorspace dynamicTreeCut impute R_utils Rcpp RcppParallel WGCNA]; };
-  netboxr = derive2 { name="netboxr"; version="1.0.0"; sha256="1ljl61dy5wx5rm2zw8s2da69x23sp63wf4c5s79jg6khywmbsi6c"; depends=[clusterProfiler data_table DT gplots igraph jsonlite plyr]; };
-  nethet = derive2 { name="nethet"; version="1.20.0"; sha256="0d96nmyzihzhv8vg81hmdspz2cj6pc7gib3z7r810fzab8mfgivd"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network]; };
+  netboxr = derive2 { name="netboxr"; version="1.0.1"; sha256="1c496av5h6iqsvbl6dd1xh8yrcy8vw5l12wnmxn8jjjxl7fgwfdx"; depends=[clusterProfiler data_table DT gplots igraph jsonlite plyr RColorBrewer]; };
+  nethet = derive2 { name="nethet"; version="1.20.1"; sha256="025ylsxvqdz50bggzmcf535fhflj29flic49956hygpf0mjyiqh6"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network]; };
   netprioR = derive2 { name="netprioR"; version="1.14.0"; sha256="0qwbz1pjyppwvf5sfd14n9q5w2hpn8ns5pdgl16fj1w1y3nnih2q"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; };
   netresponse = derive2 { name="netresponse"; version="1.48.0"; sha256="0sdly4lba4yyqxqdkx45zvj2p3179llkkf65i62wp9p01pc0xgpa"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; };
   networkBMA = derive2 { name="networkBMA"; version="2.28.0"; sha256="0pymqhmrwmbkdvjaf0wk6wqgv3lbkmsw6g21nqm6vjvilf2rgcl9"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; };
@@ -1545,14 +1545,14 @@ in with self; {
   oncomix = derive2 { name="oncomix"; version="1.10.0"; sha256="0hxbagxra2630yjl858prlijgcyq1v4qz7aq0b78vrwpcrnv5rqj"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; };
   oneSENSE = derive2 { name="oneSENSE"; version="1.10.0"; sha256="0zd6xwrggsc4p66f8dm387mlpwficxa8zl880xprkqsia74g7m2k"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; };
   onlineFDR = derive2 { name="onlineFDR"; version="1.6.0"; sha256="1laqprlxbfy8lfdcihsbqvwzi5gwvgwz5d7ihri77nvddild9swr"; depends=[]; };
-  ontoProc = derive2 { name="ontoProc"; version="1.10.0"; sha256="1iwq1wi1qnq10594hdd9pkhc4srzwvsw0fk7mzfaygjzg9ppd369"; depends=[AnnotationDbi Biobase dplyr DT graph magrittr ontologyIndex ontologyPlot Rgraphviz S4Vectors shiny]; };
+  ontoProc = derive2 { name="ontoProc"; version="1.10.1"; sha256="0fm53qm1qq4nf4669j5ls9440jg8hhhyn1wkm5sjglg2avz4xb19"; depends=[AnnotationDbi Biobase dplyr DT graph magrittr ontologyIndex ontologyPlot Rgraphviz S4Vectors shiny]; };
   openCyto = derive2 { name="openCyto"; version="2.0.0"; sha256="10dyd6dddskv70vhpwfbsqdb8pb9i3ka0fgvl1h51wqlckbsj89m"; depends=[Biobase BiocGenerics clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
   openPrimeR = derive2 { name="openPrimeR"; version="1.10.4"; sha256="1hv2q37s6f1ns17jhcqnlwk2arqd2ikwy4ncp3fbzc3xwlqc7qwb"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; };
   openPrimeRui = derive2 { name="openPrimeRui"; version="1.10.0"; sha256="0vx3fba6faczqv3m5zaw53md9d6j0sm0c2n4w5gr5skyyhqfwpy6"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; };
   oposSOM = derive2 { name="oposSOM"; version="2.6.0"; sha256="1dickvmach4vm3553l4xxkgbmbn7pjvafcsg0bpf6b03w1nb5rdg"; depends=[ape Biobase biomaRt fastICA fdrtool igraph pixmap Rcpp RcppParallel scatterplot3d tsne]; };
   oppar = derive2 { name="oppar"; version="1.16.0"; sha256="0k8r8a11x4ckjc14fxy84jw9dn2kj2k9m1x1wpbs4hzfj013yk9q"; depends=[Biobase GSEABase GSVA]; };
   oppti = derive2 { name="oppti"; version="1.2.0"; sha256="0v8mrdz1li7g1g827h0m4gbhpxmz1qffhpczmyw7pxd6467c15yp"; depends=[devtools ggplot2 knitr limma pheatmap RColorBrewer reshape]; };
-  optimalFlow = derive2 { name="optimalFlow"; version="1.0.0"; sha256="072mqa8lhihzd238qy7zqv4fsrcd0v5affhr7wsdx8xp1gsikx9f"; depends=[dbscan doParallel dplyr ellipse flowMeans foreach optimalFlowData randomForest Rfast rgl rlang robustbase transport]; };
+  optimalFlow = derive2 { name="optimalFlow"; version="1.0.1"; sha256="0jzaq9f4r631d0a3przf42sg19p4ssblb48v9x5dry3nxnjch59s"; depends=[dbscan doParallel dplyr ellipse flowMeans foreach optimalFlowData randomForest Rfast rgl rlang robustbase transport]; };
   pRoloc = derive2 { name="pRoloc"; version="1.28.0"; sha256="0g2ji5cx3wxvni2rf2y1np7fha4yvcx6rzg2arkrhsgqnh731kv4"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class coda dendextend e1071 FNN ggplot2 gtools hexbin kernlab knitr LaplacesDemon lattice MASS mclust mixtools MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
   pRolocGUI = derive2 { name="pRolocGUI"; version="1.22.0"; sha256="1c22zfkk8ww4h79mfwig5x177gnqb73y136d5vjjylgpxvrsd20a"; depends=[Biobase dplyr DT ggplot2 MSnbase pRoloc scales shiny]; };
   packFinder = derive2 { name="packFinder"; version="1.0.0"; sha256="1zd991v8ni6qid2prd2i8yqnzcp9v008c7x8xah77ci9aslq8wzn"; depends=[ape Biostrings GenomicRanges IRanges kmer S4Vectors]; };
@@ -1622,7 +1622,7 @@ in with self; {
   progeny = derive2 { name="progeny"; version="1.10.0"; sha256="09rq3nf9zm7w9djmx8xc8j3win3597p2v36zqgkhgkjwq5rkjgsh"; depends=[Biobase dplyr ggplot2 ggrepel gridExtra tidyr]; };
   projectR = derive2 { name="projectR"; version="1.4.0"; sha256="1xn8kfxw6g1mq53yp8380p401lxwff6j0z5px6iq0ssajrl7md67"; depends=[cluster CoGAPS dplyr ggalluvial ggplot2 limma NMF RColorBrewer reshape2 ROCR scales viridis]; };
   proteinProfiles = derive2 { name="proteinProfiles"; version="1.28.0"; sha256="0qdax0xq0hw6im9f9ai8k230gin66vnba23i132d8mg0hlh4aic6"; depends=[]; };
-  psichomics = derive2 { name="psichomics"; version="1.14.2"; sha256="1rgi89van6h8wkwhflkf9k79jxh4cz6wmrh897nqg0l330sdw7q0"; depends=[AnnotationDbi AnnotationHub BiocFileCache cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma org_Hs_eg_db pairsD3 plyr R_utils Rcpp recount reshape2 Rfast shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; };
+  psichomics = derive2 { name="psichomics"; version="1.14.4"; sha256="11bbk8k29bppd0fx5piqm5h17451bvn1nmsvchaldnrm0wj4bcah"; depends=[AnnotationDbi AnnotationHub BiocFileCache cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma org_Hs_eg_db pairsD3 plyr R_utils Rcpp recount reshape2 Rfast shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; };
   psygenet2r = derive2 { name="psygenet2r"; version="1.20.0"; sha256="1321yih217rqspfxi829p6ymdda10d1q0vk1vkn0dj5721c4p1sg"; depends=[BgeeDB Biobase BiocManager biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; };
   pulsedSilac = derive2 { name="pulsedSilac"; version="1.2.0"; sha256="13isv3ip1ia5z09sa3fydcf5736ymlm1d00iy0p5b8m38g7znryv"; depends=[cowplot ggplot2 ggridges MuMIn R_utils robustbase S4Vectors SummarizedExperiment taRifx UpSetR]; };
   puma = derive2 { name="puma"; version="3.30.0"; sha256="02qdjc64ad5h564p1q06fr5pj4dx0lwbk06kf73jlzv0xzsqzlym"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
@@ -1654,20 +1654,20 @@ in with self; {
   rTANDEM = derive2 { name="rTANDEM"; version="1.27.0"; sha256="095nqny8nzh3400b4l2npgxy4jwg4vq3j6zircipyr7qz6qd61fs"; depends=[data_table Rcpp XML]; };
   rTRM = derive2 { name="rTRM"; version="1.26.0"; sha256="0ah6idnvxdyq9wq06ja6nkswl6prg0n3yfnbag4hnr9vz7dw1xbf"; depends=[AnnotationDbi DBI igraph RSQLite]; };
   rTRMui = derive2 { name="rTRMui"; version="1.26.0"; sha256="1bwqd31pp9b27r7ckw3ixm06vbajljby42d9w6fffl7sl464qbnf"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; };
-  rWikiPathways = derive2 { name="rWikiPathways"; version="1.8.3"; sha256="0ymjmnmz3lffjz6js2xdz0qfqrvmz33yb0d58ssdwfjf9nq0gx38"; depends=[data_table httr rjson tidyr XML]; };
+  rWikiPathways = derive2 { name="rWikiPathways"; version="1.8.5"; sha256="08mrwmkd0lb9psp42c8252gg835q2ydyjw4mlaw9r8hq92hc0912"; depends=[data_table httr rjson tidyr XML]; };
   rain = derive2 { name="rain"; version="1.22.0"; sha256="1sgz52j08y35828rpb46iv25k62yw70bqw3qp5l9nj7kbkqrvjqw"; depends=[gmp multtest]; };
   rama = derive2 { name="rama"; version="1.62.0"; sha256="1cir9jp0ma4afj427n1k0w8g41mqglbswhmb3q3hsc9dg4skcl1x"; depends=[]; };
   ramwas = derive2 { name="ramwas"; version="1.12.0"; sha256="134lalqnqqphc13glh460za2anbcgysfd5dci9iyb7sykmil3cl4"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; };
   randPack = derive2 { name="randPack"; version="1.34.0"; sha256="1qvnk0bl3wkk23a3h50khjbbnf7yhcqc6sr7yf5nnill0d1rqk1h"; depends=[Biobase]; };
   randRotation = derive2 { name="randRotation"; version="1.0.0"; sha256="0maz3h4p7z08z6qifh3qkcj5nb92q2naa8hg71a2109qqbifl04r"; depends=[Rdpack]; };
   rbsurv = derive2 { name="rbsurv"; version="2.46.0"; sha256="13l4llcgic3z56vz1rf17k8v958193bj93dapapibjrj384mhfck"; depends=[Biobase survival]; };
-  rcellminer = derive2 { name="rcellminer"; version="2.10.0"; sha256="0vzsw24jbsvnjcb5ia814jnw1zgy3h7j1g54zqwivmpq1pidcni7"; depends=[Biobase ggplot2 gplots rcellminerData shiny stringr]; };
+  rcellminer = derive2 { name="rcellminer"; version="2.10.2"; sha256="0y6d6i0djc6slr5rg6dc0bw5aml03cc53h2x4xak2a6aaa8xajs1"; depends=[Biobase ggplot2 gplots rcellminerData shiny stringr]; };
   reb = derive2 { name="reb"; version="1.65.0"; sha256="0id6acnzaqahrn2gax8zy07hrk8dnpzbb7n8aki4qadggn2i7fl6"; depends=[Biobase idiogram]; };
   receptLoss = derive2 { name="receptLoss"; version="1.0.0"; sha256="0r74bfgjyikg9z7bnr933cc1s4x2jipam1ygx3wx86f5s39srvr3"; depends=[dplyr ggplot2 magrittr SummarizedExperiment tidyr]; };
   reconsi = derive2 { name="reconsi"; version="1.0.0"; sha256="1xzmzi22mrwslbar1clh253vyv3hv427dbb7rhjqn5z4vib6piz9"; depends=[ggplot2 KernSmooth MASS phyloseq reshape2]; };
   recount = derive2 { name="recount"; version="1.14.0"; sha256="1x5wyml3hmpgs32f97hikm8h0150nj66ai7ldqpsn600fx2qivy8"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
   recoup = derive2 { name="recoup"; version="1.16.0"; sha256="0wv5s62mmigkq9xj3rlz229g8m6x2n9zkjk3rimxb1izg0ix22m2"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 rtracklayer S4Vectors]; };
-  regionReport = derive2 { name="regionReport"; version="1.22.0"; sha256="001j7b45gqc4shh4f71686zflj1z331vw0ll9z8gmgki5a0vdms9"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
+  regionReport = derive2 { name="regionReport"; version="1.22.0"; sha256="001j7b45gqc4shh4f71686zflj1z331vw0ll9z8gmgki5a0vdms9"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
   regioneR = derive2 { name="regioneR"; version="1.20.1"; sha256="0bzjwzj5mvb49wgvs3gd3jfpm7s0zfkca763i65i7m994lgvz33c"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; };
   regsplice = derive2 { name="regsplice"; version="1.14.0"; sha256="07fglqjm8zi64r4sp3hf7x4a86vblrbmv78km73lj6602nk3wqb7"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; };
   regutools = derive2 { name="regutools"; version="1.0.1"; sha256="1jwfxw5il4f4kdgkn3zi57fbf05ag51ab18k0mx50glmca8271r6"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings DBI GenomicRanges Gviz IRanges RCy3 RSQLite S4Vectors]; };
@@ -1676,7 +1676,7 @@ in with self; {
   rfPred = derive2 { name="rfPred"; version="1.26.0"; sha256="1w2kwjqsvak271h82v96aqyrzilavz4ynnk5r5ldpyfi4all4lsz"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
   rfaRm = derive2 { name="rfaRm"; version="1.0.0"; sha256="0zrmb2accyr7naccnk2kp8fkg2zzwflx2knymgvv3gfmdysnq4bc"; depends=[Biostrings data_table httr magick rsvg stringi]; };
   rgsepd = derive2 { name="rgsepd"; version="1.20.2"; sha256="179dn7kc7frr87f03qjkm7vxj3licn7mrq9yvagzfjm7pnqzr5ps"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; };
-  rhdf5 = derive2 { name="rhdf5"; version="2.32.2"; sha256="1v6ygi0avh3gmaj2ld2nr7vww4ipw39b5kqci9w27i3ja985lb8j"; depends=[Rhdf5lib]; };
+  rhdf5 = derive2 { name="rhdf5"; version="2.32.4"; sha256="1qlgqn68xki82qm4i07h1z8c59dnjw29mravds9kby8419ra19gq"; depends=[Rhdf5lib]; };
   rhdf5client = derive2 { name="rhdf5client"; version="1.10.0"; sha256="0l49i56dnvabls011rd8yiqv6qkf8iszwq5afirzcs3fs2acb6iz"; depends=[DelayedArray httr R6 rjson S4Vectors]; };
   rhdf5filters = derive2 { name="rhdf5filters"; version="1.0.1"; sha256="06lp7phfz1asvppgm6sx9ix5w4wh8qz2dvklz1k0rvzrli5mb7pp"; depends=[Rhdf5lib]; };
   riboSeqR = derive2 { name="riboSeqR"; version="1.22.0"; sha256="04a4dkmacd6xy55m84amxa0fspbc4kgg9r9k7bc3wrxswk77ccxk"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; };
@@ -1686,12 +1686,12 @@ in with self; {
   rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.46.0"; sha256="17s1ad22zj09cklqxnccb3c4x75vgv01da5y7r1c08g6cvzv456a"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
   rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.18.0"; sha256="1cqfx6fwkpbx7c31dhq6j0ijll39y90r54a1bnhxg2q0m4fba2a7"; depends=[RColorBrewer]; };
   roar = derive2 { name="roar"; version="1.24.0"; sha256="069g887migvk70n0377dqr0fk7wjbz3w0asgk42bwhp8xpjfym6f"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; };
-  rols = derive2 { name="rols"; version="2.16.3"; sha256="1hyp0q7jlixjia850xxr2kl2094xwmjfj92cgjxq3lmg173ljl2y"; depends=[Biobase BiocGenerics httr jsonlite progress]; };
+  rols = derive2 { name="rols"; version="2.16.4"; sha256="1zbj2m1xnbpw5wlpa2v6c7z72hsy4r5k1gdfvh0f7yv9nppxy1r8"; depends=[Biobase BiocGenerics httr jsonlite progress]; };
   ropls = derive2 { name="ropls"; version="1.20.0"; sha256="1drww1mr0nira3qplyga6s3mljpjxshjgbn524kzxi0nrfbcvmnx"; depends=[Biobase MultiDataSet]; };
   rpx = derive2 { name="rpx"; version="1.24.0"; sha256="1m9n19dj4wvnx31m3hlpw4pf55rw1wvh5s7fwsh4xil4c4h236m8"; depends=[RCurl xml2]; };
   rqt = derive2 { name="rqt"; version="1.14.0"; sha256="0hv1hhmnk6qbilwbg6978mljk9cssz1ma1ri3qqmq9wdn6z6bxjl"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; };
   rqubic = derive2 { name="rqubic"; version="1.34.0"; sha256="1n1xdkgcynlawp0gl12fbynrxzjf5rpxa9i8ywc9dbl5q7dg7082"; depends=[biclust Biobase BiocGenerics]; };
-  rrvgo = derive2 { name="rrvgo"; version="1.0.1"; sha256="19slkap9fy60p8xkq73vyzc4r1q2qkq0wi640dkgjnydxjpkm9p7"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap wordcloud]; };
+  rrvgo = derive2 { name="rrvgo"; version="1.0.2"; sha256="0v6skch7wgncbzqqzzwph0c37l7yh245i09j4p2nszjkx8c7kgj7"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap wordcloud]; };
   rsbml = derive2 { name="rsbml"; version="2.46.0"; sha256="1i1izznnwzrc6m7s3hblfff466icfvxl2gjdqaln8qfg9v87rslx"; depends=[BiocGenerics graph]; };
   rtracklayer = derive2 { name="rtracklayer"; version="1.48.0"; sha256="1zcgk92sidhy4y7ws9ms4nkkh2hnccfhfh53qgna0kma9jy4v5xf"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
   runibic = derive2 { name="runibic"; version="1.10.0"; sha256="1x3a710pxa0slw51267r6hrx7048mv3qfj7brdp27n8wyrrfih8w"; depends=[biclust Rcpp SummarizedExperiment testthat]; };
@@ -1758,13 +1758,13 @@ in with self; {
   sigaR = derive2 { name="sigaR"; version="1.35.0"; sha256="05cmjdd7brmmshlam940qhpj1wzk7a4j86hqp3i5rwcqljc7qhzf"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; };
   siggenes = derive2 { name="siggenes"; version="1.62.0"; sha256="0i4y1hgq1ljxkf6sypb6c8yp412a8q5v5z68cx1zrgxnccvp0mfy"; depends=[Biobase multtest scrime]; };
   sights = derive2 { name="sights"; version="1.14.0"; sha256="1m71q14hwqlyrisgsl8j93rl4z2qkya531pzsajq70n2x87ghjxy"; depends=[ggplot2 lattice MASS qvalue reshape2]; };
-  signatureSearch = derive2 { name="signatureSearch"; version="1.2.4"; sha256="0wbf4bk8chkhb930c2clcvllvnrwx2p779h56fm4v7x1qp9shzxz"; depends=[AnnotationDbi BiocParallel clusterProfiler data_table DelayedArray DOSE dplyr ExperimentHub fastmatch fgsea ggplot2 GSEABase HDF5Array magrittr Matrix qvalue Rcpp readr reshape2 rhdf5 RSQLite scales SummarizedExperiment visNetwork]; };
+  signatureSearch = derive2 { name="signatureSearch"; version="1.2.5"; sha256="1fwx8xhv7c9hxhb2ny0niyj89rsd51vfdvzni0cx8pj7l6vpssg6"; depends=[AnnotationDbi BiocParallel clusterProfiler data_table DelayedArray DOSE dplyr ExperimentHub fastmatch fgsea ggplot2 GSEABase HDF5Array magrittr Matrix qvalue Rcpp readr reshape2 rhdf5 RSQLite scales SummarizedExperiment visNetwork]; };
   signeR = derive2 { name="signeR"; version="1.14.0"; sha256="1mjnh1vxqx0mld10m5plsnml1c30j534nbwqiyxcv2habchkdfnf"; depends=[BiocGenerics Biostrings class GenomeInfoDb GenomicRanges IRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; };
   signet = derive2 { name="signet"; version="1.7.0"; sha256="1qq3hnawaslqv2fp5dc5c552r430kmxhf0b0qwzny8ms9g83azf5"; depends=[graph igraph RBGL]; };
   sigsquared = derive2 { name="sigsquared"; version="1.20.0"; sha256="1mgg4gg5h0ms6srbib8am1i8l9k0vcxj99j7i90h72pmdipwmy4a"; depends=[Biobase survival]; };
   similaRpeak = derive2 { name="similaRpeak"; version="1.20.0"; sha256="02nhbwf0xck8inn49hnhk629f5jbh3ian069nif7hvi6pxg5l8bx"; depends=[R6]; };
   simpleaffy = derive2 { name="simpleaffy"; version="2.64.0"; sha256="040043spblr8v67lkn3nnxhgfmfh2iwaizph4fnms1ik6qz662x7"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
-  simulatorZ = derive2 { name="simulatorZ"; version="1.22.0"; sha256="1i8bp08bs129d9crj7hhqabb2di72zwcl27v58a0vzbnwkf1m0fd"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc SummarizedExperiment survival]; };
+  simulatorZ = derive2 { name="simulatorZ"; version="1.22.0"; sha256="1i8bp08bs129d9crj7hhqabb2di72zwcl27v58a0vzbnwkf1m0fd"; depends=[Biobase BiocGenerics gbm GenomicRanges Hmisc SummarizedExperiment survival]; };
   sincell = derive2 { name="sincell"; version="1.20.0"; sha256="1byzikl2c0w25ni9djksdzqsvlxdm0n03lc476qafai46vk7jzr6"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
   singleCellTK = derive2 { name="singleCellTK"; version="1.8.0"; sha256="069p7nh2lkdy8kb7rdp6zqjjyjbsbvycf8zfcvbxr7fmxyvnks2r"; depends=[AnnotationDbi ape Biobase celda circlize cluster colourpicker ComplexHeatmap data_table DelayedArray DESeq2 DT enrichR ggplot2 ggtree gridExtra GSVA GSVAdata limma MAST matrixStats multtest plotly RColorBrewer reshape2 Rtsne S4Vectors shiny shinyalert shinyBS shinycssloaders shinyjs shinythemes SingleCellExperiment SummarizedExperiment sva umap]; };
   singscore = derive2 { name="singscore"; version="1.8.0"; sha256="134ycza15x82g7f039fd6qyq2gwzvwq1jx9wya3qpi13lbfazicw"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape reshape2 S4Vectors SummarizedExperiment tidyr]; };
@@ -1782,7 +1782,7 @@ in with self; {
   sojourner = derive2 { name="sojourner"; version="1.2.1"; sha256="0sda3mb8r6s5s4c1ha9570n29ls76x57wvyq8nclrys7x0v325gi"; depends=[dplyr EBImage fitdistrplus ggplot2 gridExtra lattice MASS mclust minpack_lm mixtools mltools nls2 pixmap plyr R_matlab Rcpp reshape2 rlang rtiff sampSurf scales shiny shinyjs sp truncnorm]; };
   sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.12.0"; sha256="0fckk5iy4masrc0kyw666mrz8mdzvmpn9akk9fr4qa63shxxgfaq"; depends=[MASS MCMCpack optparse tmvtnorm]; };
   sparseMatrixStats = derive2 { name="sparseMatrixStats"; version="1.0.5"; sha256="1jjf467q3minqc01rvmm8phkpas61k63c18iqzdrngdy9yj6kb2z"; depends=[Matrix MatrixGenerics matrixStats Rcpp]; };
-  sparsenetgls = derive2 { name="sparsenetgls"; version="1.6.0"; sha256="1pn2v98d16y3y8d6x41x0srx12zz6lki4apcvsj76nz88m7kr64l"; depends=[glmnet huge MASS Matrix]; };
+  sparsenetgls = derive2 { name="sparsenetgls"; version="1.6.1"; sha256="0s7qhr49j1q0iisnjc5c88v1vnvnw0hpydfgsmsl01pmhwzmzvmp"; depends=[glmnet huge MASS Matrix]; };
   specL = derive2 { name="specL"; version="1.22.0"; sha256="1h0lfbqx1qsqvrwhhh16s52g1wlr9c2pkb26wbrlb3nar2514x66"; depends=[DBI protViz RSQLite seqinr]; };
   spicyR = derive2 { name="spicyR"; version="1.0.1"; sha256="1dqnf39pw0d6fbxl5sz5r9zi5ns3bj0003jhm4ipckp5h4kiydqq"; depends=[BiocGenerics BiocParallel class concaveman ggplot2 IRanges lme4 lmerTest mgcv pheatmap purrr rlang S4Vectors spatstat]; };
   spikeLI = derive2 { name="spikeLI"; version="2.48.0"; sha256="0s9qm44n8m03vwl66zmjhq0hpcvm8j7a9xqag7ig8kwv5n6rhzsr"; depends=[]; };
@@ -1792,7 +1792,7 @@ in with self; {
   splots = derive2 { name="splots"; version="1.54.0"; sha256="16a18m8q04avv46wn75pz1vkfpschhs0j1gfvmdl6dd29r82d9r4"; depends=[RColorBrewer]; };
   spotSegmentation = derive2 { name="spotSegmentation"; version="1.61.0"; sha256="1fsz8xqxrc000jj1mn59ip3lx558j0589snyxvb9kkkhbc253n6c"; depends=[mclust]; };
   spqn = derive2 { name="spqn"; version="1.0.0"; sha256="14z5dyi8wl03f4sc56d03z72nhyzgf7dcxq7ap5s2ch961ifyycp"; depends=[BiocGenerics ggplot2 ggridges matrixStats SummarizedExperiment]; };
-  srnadiff = derive2 { name="srnadiff"; version="1.8.0"; sha256="01pxawr362wgfj0smnivjrwr3f5p8wlnhb5jrjv2hpshak2jsacg"; depends=[BiocManager BiocParallel BiocStyle DESeq2 devtools GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  srnadiff = derive2 { name="srnadiff"; version="1.8.2"; sha256="1fsb2p44iyz0xhgvj6qmpssmynm1l22q8ccfb9rd95dh2p2pc0kl"; depends=[BiocManager BiocParallel BiocStyle DESeq2 devtools GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
   ssPATHS = derive2 { name="ssPATHS"; version="1.2.0"; sha256="0n6safqhsw8490vpy1xvagx9m1am4l9y0plkq4ldds4m92g6p432"; depends=[dml MESS ROCR SummarizedExperiment]; };
   sscore = derive2 { name="sscore"; version="1.60.0"; sha256="141jwdaj5kww1fb0vv6m36ai1irz4z2gqb4xzl1hvch42m5ryfkl"; depends=[affy affyio]; };
   sscu = derive2 { name="sscu"; version="2.18.0"; sha256="13avxlg06r3xmirb6hgya4m5sgza66agxfm5x9y2xc93azww28js"; depends=[BiocGenerics Biostrings seqinr]; };
@@ -1828,20 +1828,20 @@ in with self; {
   tidybulk = derive2 { name="tidybulk"; version="1.0.2"; sha256="06yawix0whsg0knhbc1km1in1njx5lj4yq39j475imbv23wr3gjl"; depends=[dplyr lifecycle magrittr preprocessCore purrr readr rlang tibble tidyr]; };
   tigre = derive2 { name="tigre"; version="1.42.0"; sha256="1ai4ygai6094shavp5s6zkczgsmkfc8sv3xad5z2hdi53lap3gvl"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
   tilingArray = derive2 { name="tilingArray"; version="1.66.0"; sha256="0q2h1bgyj9sa03d8f6lyrqx336ln74zky1ijqzdrhnd1vyjdlbbf"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
-  timeOmics = derive2 { name="timeOmics"; version="1.0.1"; sha256="0ks7aarl88sl5x0p43x8w0i6ai64ydz86jm47vysya0mdl3apsyc"; depends=[dplyr ggplot2 ggrepel lmms lmtest magrittr mixOmics propr purrr stringr tibble tidyr]; };
+  timeOmics = derive2 { name="timeOmics"; version="1.0.1"; sha256="0ks7aarl88sl5x0p43x8w0i6ai64ydz86jm47vysya0mdl3apsyc"; depends=[dplyr ggplot2 ggrepel lmtest magrittr mixOmics propr purrr stringr tibble tidyr]; };
   timecourse = derive2 { name="timecourse"; version="1.60.0"; sha256="16pla2lp8agkv23pjg015dh0davwjdxhlb0npyynnnrgsbrsnxn7"; depends=[Biobase limma marray MASS]; };
   timescape = derive2 { name="timescape"; version="1.12.0"; sha256="0as8viljb0ivq8ngvjqc4kli48x559amgr9v5jkmxl29bpblv2l5"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; };
   tkWidgets = derive2 { name="tkWidgets"; version="1.66.0"; sha256="1v335n7yb9586i43q5m3fzw3gxnyghwib66zb5z5bj9720z0h7cy"; depends=[DynDoc widgetTools]; };
-  tofsims = derive2 { name="tofsims"; version="1.16.0"; sha256="0ij0nmans69hp3h6l80aqn3lhzxlfyn7gvxmc1fmikv5y15sv3ds"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
+  tofsims = derive2 { name="tofsims"; version="1.16.0"; sha256="0ij0nmans69hp3h6l80aqn3lhzxlfyn7gvxmc1fmikv5y15sv3ds"; depends=[ALS KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
   topGO = derive2 { name="topGO"; version="2.40.0"; sha256="13rhbvn27sj75fklf1cnjaazacx8yyjlhqlnbp5zk157q6y5cwdr"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
   topconfects = derive2 { name="topconfects"; version="1.4.0"; sha256="1wphsf09ji2mdhdyd4xzka4b6s8xc8kmyz7gk798796h2qr4w5s7"; depends=[assertthat ggplot2]; };
   topdownr = derive2 { name="topdownr"; version="1.10.0"; sha256="0vhlic84vlq8m6npkq97r1vzppfwpyzl7q6mhw2g6kjaglp0gkyh"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR ProtGenerics S4Vectors]; };
-  trackViewer = derive2 { name="trackViewer"; version="1.24.1"; sha256="0hsqkxckjby9zidcsqplc5cync4r44akn3al2ff4iw6m2fjsf78b"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rgraphviz Rsamtools rtracklayer S4Vectors scales]; };
+  trackViewer = derive2 { name="trackViewer"; version="1.24.2"; sha256="172vxksv33f829vibdvvcl11jqv8q8kqqsnzm3kvvm1virwj6z39"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rgraphviz Rsamtools rtracklayer S4Vectors scales]; };
   tracktables = derive2 { name="tracktables"; version="1.22.0"; sha256="1r8i05wak92s9cq7jg9s5kdyx2yix973d6rpav2lc9ngnqaa485d"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
   tradeSeq = derive2 { name="tradeSeq"; version="1.2.01"; sha256="1jqy2xn58j89lfsah9gvkphq9a5a8s7h6g5025r13n7ksh3whfbp"; depends=[Biobase BiocParallel clusterExperiment dplyr edgeR ggplot2 igraph magrittr mgcv monocle pbapply princurve RColorBrewer S4Vectors SingleCellExperiment slingshot SummarizedExperiment tibble]; };
   transcriptR = derive2 { name="transcriptR"; version="1.16.0"; sha256="0wy5jdfivbr1wfcpi56srn7xc0gg7iz3jq21k50z48zr8f3vmmbp"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
   transcriptogramer = derive2 { name="transcriptogramer"; version="1.10.0"; sha256="13bjcs3wl4ky5b51p9lvlhn2a3472shkim6jjy5jhh23njvynnq1"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; };
-  transite = derive2 { name="transite"; version="1.6.1"; sha256="0x6490avcmxkmilsmw6q4vq79q4xfvf9xsh75mibza6cx68f8nw9"; depends=[BiocGenerics Biostrings dplyr GenomicRanges ggplot2 ggseqlogo gridExtra Rcpp RcppArmadillo scales TFMPvalue]; };
+  transite = derive2 { name="transite"; version="1.6.2"; sha256="0l0yca9az9ggbd6bmwjzs4rcm6fbwi07i50fjm96gx2zapgsjx74"; depends=[BiocGenerics Biostrings dplyr GenomicRanges ggplot2 ggseqlogo gridExtra Rcpp RcppArmadillo scales TFMPvalue]; };
   traseR = derive2 { name="traseR"; version="1.18.0"; sha256="0hd6483s92mby7pdzx8siil1issf1dz13f6yrpi1jzbjw16vcla5"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
   treeio = derive2 { name="treeio"; version="1.12.0"; sha256="1jkd96gqcfnhvx3d4f4ba9r39nxz2fyykc9i1kgl6ac43kcnrhfp"; depends=[ape dplyr jsonlite magrittr rlang tibble tidytree]; };
   trena = derive2 { name="trena"; version="1.10.2"; sha256="06d561sj2x3n9lcz9pjzrljk5lqdc4c76h27fpqjm9h2iwkkc02x"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 vbsr xgboost]; };
@@ -1854,11 +1854,11 @@ in with self; {
   tweeDEseq = derive2 { name="tweeDEseq"; version="1.34.0"; sha256="1xmh63nb407nvkrdgxp2gav09496pxaadw482gcbs02qk45lah42"; depends=[cqn edgeR limma MASS]; };
   twilight = derive2 { name="twilight"; version="1.64.0"; sha256="1hq28bskrz4fyzcfy0zz2vjbn1dz2y3yks5rcprnq6gjhy0dgv7f"; depends=[Biobase]; };
   twoddpcr = derive2 { name="twoddpcr"; version="1.12.0"; sha256="0i2084pqswhcwr8ldkw3f9d3phwi0rq5jl6b6xw7fzlmifa0l1gb"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; };
-  tximeta = derive2 { name="tximeta"; version="1.6.2"; sha256="13wqkmqbjlw970fjmqng3c8ii6fhram30j9ajqih2m5ywfadswsa"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix rappdirs S4Vectors SummarizedExperiment tibble tximport]; };
+  tximeta = derive2 { name="tximeta"; version="1.6.3"; sha256="19yacn1pmgmvj8fclz32mhm76d4qdkplfwj12bcp9492qpxyldma"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix rappdirs S4Vectors SummarizedExperiment tibble tximport]; };
   tximport = derive2 { name="tximport"; version="1.16.1"; sha256="1x9959lkjl2h869rgd1b30q1idxzjkr1fyqbpndqk3kbi4q2gr40"; depends=[]; };
   uSORT = derive2 { name="uSORT"; version="1.14.0"; sha256="1qsgbr4ljngl4qjdvrx7plj81alxyaqnbzy94w44agxngl8y44z6"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; };
   unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.24.0"; sha256="1l9gxq3askr3cz2a4bqsw7vjr1agivzvx651cblkygv57x08zf81"; depends=[BiocGenerics HTqPCR]; };
-  universalmotif = derive2 { name="universalmotif"; version="1.6.3"; sha256="1iw2yq0cfpdq6fnng61x8w7z8j0qwz9x4y6n2jv641xjwpv5drdd"; depends=[ape BiocGenerics Biostrings ggplot2 ggseqlogo ggtree MASS processx Rcpp RcppThread Rdpack rlang S4Vectors yaml]; };
+  universalmotif = derive2 { name="universalmotif"; version="1.6.4"; sha256="10j37wj2lyazgq32xxjrisgc8lqr17n8igmic2adgm3azc79m2q0"; depends=[ape BiocGenerics Biostrings ggplot2 ggseqlogo ggtree MASS processx Rcpp RcppThread Rdpack rlang S4Vectors yaml]; };
   variancePartition = derive2 { name="variancePartition"; version="1.18.3"; sha256="1jrlhi2c5ibvq8a41g5hwdq4kk4rdd7m464rz5767zaaci7l2ay0"; depends=[Biobase BiocParallel colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS pbkrtest progress reshape2 scales]; };
   vasp = derive2 { name="vasp"; version="1.0.0"; sha256="1zvby4m66q61d6mjh9hlfhr2sf9iy3g83xwjd7fbxcj5vlp86piv"; depends=[ballgown cluster GenomeInfoDb GenomicAlignments GenomicRanges IRanges matrixStats Rsamtools S4Vectors Sushi]; };
   vbmp = derive2 { name="vbmp"; version="1.56.0"; sha256="0vgskhxmgdfwk3dvmsh62x4sw2rqdhcckjbifbj5s8dv636jf5w8"; depends=[]; };
@@ -1875,13 +1875,13 @@ in with self; {
   weitrix = derive2 { name="weitrix"; version="1.0.0"; sha256="1wy2s2jgwy0gzhs3q4m1g0djmn3wxmzndxw7w460za3k2yfsh067"; depends=[assertthat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dplyr ggplot2 limma purrr reshape2 RhpcBLASctl S4Vectors scales SummarizedExperiment]; };
   widgetTools = derive2 { name="widgetTools"; version="1.66.0"; sha256="0lrdpsgm9r7yfyyj5crvb7px4hrghxhmiic4iissz40slbfyvilx"; depends=[]; };
   wiggleplotr = derive2 { name="wiggleplotr"; version="1.12.1"; sha256="1wknigh1md3w4h68caqlpq945maipdkpmw10hc2rlx4nbbpcnawp"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; };
-  xcms = derive2 { name="xcms"; version="3.10.1"; sha256="1aa11gy1v7kkamv3hsnvdx715q8f1saw9p664j6wifyjj0hx13kn"; depends=[Biobase BiocGenerics BiocParallel IRanges lattice MassSpecWavelet MSnbase mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors SummarizedExperiment]; };
+  xcms = derive2 { name="xcms"; version="3.10.2"; sha256="0sk53jcl7sjrpw2ncdpl8sw1b1j9mizlrj517rinr1qrbm6lsn8f"; depends=[Biobase BiocGenerics BiocParallel IRanges lattice MassSpecWavelet MSnbase mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors SummarizedExperiment]; };
   xmapbridge = derive2 { name="xmapbridge"; version="1.46.0"; sha256="1qz39p1nr0j245smcng0qzraz7k9j363c48ppp5hdw076cz622m0"; depends=[]; };
   xps = derive2 { name="xps"; version="1.48.0"; sha256="185cvningg3vnzvchfczjph2wlpwfmyhhnfjfigf0gis8a8asar9"; depends=[]; };
   yamss = derive2 { name="yamss"; version="1.14.0"; sha256="00x2lnssgzbmhy5bb2m0f8rq2nsz3lb5xlp2vhkcagza39h3xb0c"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; };
   yaqcaffy = derive2 { name="yaqcaffy"; version="1.48.0"; sha256="1l0cblh9sfrsil15bjya7d8kkas8bj6klj2w3c4384njdsjsjcf0"; depends=[simpleaffy]; };
   yarn = derive2 { name="yarn"; version="1.14.0"; sha256="1xdjwy1gkfg8lhgq4iwwmbi01903qljjs7yd96cvacmvgn8z6qvx"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; };
   zFPKM = derive2 { name="zFPKM"; version="1.10.0"; sha256="0scszhfqrgzhglz1a6kxfydq9dx8fqx28j3dypp91y5ah2w6mdys"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; };
-  zinbwave = derive2 { name="zinbwave"; version="1.10.0"; sha256="16giyks17hv6svl9kvhgd2vp14mbg3b3bp7z16bzcjf9adhf0wi5"; depends=[BiocParallel edgeR genefilter Matrix SingleCellExperiment softImpute SummarizedExperiment]; };
+  zinbwave = derive2 { name="zinbwave"; version="1.10.1"; sha256="10p3map06plf68d8xls6hdx1crqrrxwzxr1k6kgz9jhdjlcnnfgd"; depends=[BiocParallel edgeR genefilter Matrix SingleCellExperiment softImpute SummarizedExperiment]; };
   zlibbioc = derive2 { name="zlibbioc"; version="1.34.0"; sha256="0j1l052jb2cwc1nifxzwknc9csagf4f2d092zs0i95dz0rma89l0"; depends=[]; };
 }
diff --git a/nixpkgs/pkgs/development/r-modules/cran-packages.nix b/nixpkgs/pkgs/development/r-modules/cran-packages.nix
index 530f0dcf177a..1482a872dffd 100644
--- a/nixpkgs/pkgs/development/r-modules/cran-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2020-08-19"; };
+let derive2 = derive { snapshot = "2020-12-31"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   AATtools = derive2 { name="AATtools"; version="0.0.1"; sha256="08is383xhs2lc9wfffykcwqyl8mwcxfpk3lnvlpkp96hq9m9ikbf"; depends=[doParallel dplyr foreach magrittr]; };
@@ -19,38 +19,41 @@ in with self; {
   ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
   ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
   ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
-  ACEt = derive2 { name="ACEt"; version="1.8.0"; sha256="0626d6kg485xjya164wagrr5z223jvi93ywbwpdns7fkm03c0dlq"; depends=[BH MASS Rcpp RcppArmadillo]; };
+  ACEsearch = derive2 { name="ACEsearch"; version="1.0.0"; sha256="1ssq8avj20dk2mal0j5dvshf7qgk0as90sgl71cn91cq8lbiilpn"; depends=[httr testthat]; };
+  ACEt = derive2 { name="ACEt"; version="1.8.1"; sha256="0b5lfpnppyk0237phr2aybhx29nhm8ngwk2qa1y4lshrvsw97wg4"; depends=[BH MASS Rcpp RcppArmadillo]; };
   ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; };
   ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; };
   ACTCD = derive2 { name="ACTCD"; version="1.2-0"; sha256="0mzjxxr2zfdidw8ibh6w8mvpkw3q3nvngqi05g9ind26ckvk053p"; depends=[GDINA R_methodsS3]; };
-  ADAPTS = derive2 { name="ADAPTS"; version="1.0.3"; sha256="12hh0l5zp0camadn0nfj5v3k3wvyp9kmq8hh4bi71g4s4ygaipbk"; depends=[ComICS DeconRNASeq doParallel e1071 foreach missForest nnls pcaMethods pheatmap preprocessCore quantmod ranger WGCNA]; };
+  ADAPTS = derive2 { name="ADAPTS"; version="1.0.6"; sha256="1rfj4j5y4bxla62f25wfrcbbxjh97lj5cpfhd2i70dm1450ilksl"; depends=[ComICS doParallel e1071 foreach missForest nnls pcaMethods pheatmap preprocessCore quantmod ranger WGCNA]; };
   ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; };
   ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; };
   ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
   ADMM = derive2 { name="ADMM"; version="0.3.2"; sha256="0wxjl9pdrcrbbcl1vq48ajgqdm2m1ymaf5xcnr5sf44v50lxyqic"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; };
-  ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; };
+  ADMMnet = derive2 { name="ADMMnet"; version="0.1.1"; sha256="1la92fwg75ylqbz00znqd0rhv5r509kgh9wwznjacppif773wp6i"; depends=[Matrix Rcpp RcppEigen]; };
   ADMMsigma = derive2 { name="ADMMsigma"; version="2.1"; sha256="1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
+  ADMUR = derive2 { name="ADMUR"; version="1.0.1"; sha256="1h32vm2gs95dd339b0v7nxspig04m13wvpyri94ngcz70gl9sa79"; depends=[mathjaxr scales zoo]; };
   ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; };
   ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; };
+  ADtools = derive2 { name="ADtools"; version="0.5.4"; sha256="0bl6wgdjhf55cxjkw2k7wd2kmkhlr1006lgs35ny1av8s7m2bwmk"; depends=[assertthat dplyr magrittr Matrix mvtnorm purrr Rcpp RcppArmadillo]; };
   AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; };
   AEP = derive2 { name="AEP"; version="0.1.2"; sha256="07a3nlkiqbbwbd59n27sgiinlwsgfpy4mn13h41va97wlvd5zl2b"; depends=[]; };
   AER = derive2 { name="AER"; version="1.2-9"; sha256="03al0jfxdbi8sqkav7gz3aqbxm32qjdnh4l93vy1jr3n2h5kjy9v"; depends=[car Formula lmtest sandwich survival zoo]; };
   AEenrich = derive2 { name="AEenrich"; version="1.0.0"; sha256="1rly49n3azga6xbfjgg38387pw9mw92j37k5l7ccczay039597ax"; depends=[dplyr magrittr qvalue]; };
   AF = derive2 { name="AF"; version="0.1.5"; sha256="1r87ra55g0qm2s8cgsmdwck93ia2vr8zfab3in45mxm5xc501xgk"; depends=[data_table drgee ivtools stdReg survival]; };
-  AFM = derive2 { name="AFM"; version="1.2.6"; sha256="0yngk3j1wkamqzrwibn2csbn61jbdb872n0gi4d3hyhgilqzwbwf"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; };
+  AFM = derive2 { name="AFM"; version="2.0"; sha256="1l0yd68h8vlii1437zhyrxj6fq1ghfaqclk860c25q2d055ajnqd"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; };
   AFheritability = derive2 { name="AFheritability"; version="0.1.0"; sha256="03w0a4z2x539ykyzdxm1mfqkhzz03cg0aqvgi062jrrm5m6f57ix"; depends=[ggplot2 mvtnorm reshape2 shiny]; };
   AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; };
-  AGHmatrix = derive2 { name="AGHmatrix"; version="1.0.2"; sha256="0qipqk8p80463hfkbjnkw8ivziqj2xb15l54x52kcgbd9hl4zami"; depends=[Matrix zoo]; };
+  AGHmatrix = derive2 { name="AGHmatrix"; version="2.0.0"; sha256="1hm9ak885xi6b6fzqaj5ipykwc81a1r6p68fcfhwcd2qy0cqqsvv"; depends=[Matrix zoo]; };
+  AGPRIS = derive2 { name="AGPRIS"; version="1.0"; sha256="0xlaz75d19adfq79sh5aa52bzpmjqawshay2a3vw9mq8l23z64if"; depends=[Matrix matrixcalc maxLik plyr rgdal sp spacetime spdep]; };
   AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; };
   AGread = derive2 { name="AGread"; version="1.1.1"; sha256="0ar0cnlaxxmvn2gdydmm9vr45xjhx06kky556d17l93k0xwfvzm3"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp reshape2 rlang seewave stringr]; };
   AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; };
-  AHMbook = derive2 { name="AHMbook"; version="0.2.0"; sha256="1m3xfvaqzgl3vjdcsrbrf7alzm7sxqda47pzks8qgdddsc9hcj8n"; depends=[coda mvtnorm plotrix RandomFields raster sp spdep unmarked]; };
-  AICcmodavg = derive2 { name="AICcmodavg"; version="2.3-0"; sha256="092y9q80sql90nfpplm0kfpzs64nclwv4jfqzp79vgj9qprwyssd"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
+  AHMbook = derive2 { name="AHMbook"; version="0.2.2"; sha256="0js9hlpi5yw6dwc7lsff7d71x045gx4scggik352p6y2y339hhpr"; depends=[coda mvtnorm plotrix RandomFields raster sp spdep unmarked]; };
+  AICcmodavg = derive2 { name="AICcmodavg"; version="2.3-1"; sha256="1c2qqizssy7jvzkndlljazk28rjq5csgawzs43gv3s9qbahpslfh"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
   AID = derive2 { name="AID"; version="2.5"; sha256="0il6qjv1gcbxdf1lknsfij4vxzc31qyp359abqzdvkzyxwgbbzsy"; depends=[ggplot2 MASS nortest psych tseries]; };
   AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; };
-  AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
-  ALA4R = derive2 { name="ALA4R"; version="1.8.0"; sha256="0bxfpzj6993sdhh5002vmf84r6gfd46s9vjw3d58hbyrxnsiaipr"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; };
+  ALA4R = derive2 { name="ALA4R"; version="1.9.0"; sha256="0bxsdv2spdcbll09lmayln8ald8gbkngnqxwn0q5ccjdiaavmc4f"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; };
   ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; };
   ALEPlot = derive2 { name="ALEPlot"; version="1.1"; sha256="0bakl8a7xda7vh9zsc66kkd5w5jmb5j28kfwpfq2ifvk2mrakr3w"; depends=[yaImpute]; };
   ALS = derive2 { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; };
@@ -66,23 +69,25 @@ in with self; {
   AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
   AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; };
   AMPLE = derive2 { name="AMPLE"; version="0.0.2"; sha256="0j19f8rl7gkads4n52l5gfc5k7dx27sswzrypwl7dnxhfp4ivql7"; depends=[dplyr ggplot2 shiny shinyjs tidyr wesanderson]; };
-  AMR = derive2 { name="AMR"; version="1.3.0"; sha256="1qjdlrpx3g6011pylmdsy3vvv00xvq0vz4f1x8700daxipsnahwy"; depends=[]; };
-  ANN2 = derive2 { name="ANN2"; version="2.3.3"; sha256="12l02fnnfa42qy4w1bv2zr963k61xn7mbpj9rycdzi8wl18hxrb8"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; };
+  AMR = derive2 { name="AMR"; version="1.4.0"; sha256="1mni1yxg9pgbc45n1c7rpipj3794llw674ryzrihim0h8rpgh39i"; depends=[]; };
+  ANN2 = derive2 { name="ANN2"; version="2.3.4"; sha256="1izljhz3rkzq05dkvg9q3fdyj7q871j8lsky67d5r8ffpzm1lk3z"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
   ANOVAIREVA = derive2 { name="ANOVAIREVA"; version="0.1.0"; sha256="04z2g79nnh5yhn4aqw0i7ck2b1z5dbasf1zp1sj6rjjrp9aqmaa6"; depends=[car dplyr ggplot2 plotly rmarkdown shiny]; };
   ANOVAShiny = derive2 { name="ANOVAShiny"; version="0.1.0"; sha256="1z8wi8c8j3rlchfk1vx101qz1r9j2jl5lfh72y5lqsisqxl2fyyz"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; };
+  ANOVAShiny2 = derive2 { name="ANOVAShiny2"; version="0.1.0"; sha256="0bnxfg5c37wi5g53jd0zqq31yx29zvlk2m2jh6jlwki8khpp9y00"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; };
   ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.4"; sha256="0rq4aphjmqrr4pm55vpc8qr4rghqkmlsqsvxzarx3kmr3aqlmqg8"; depends=[quadprog shiny]; };
+  AOV1R = derive2 { name="AOV1R"; version="0.1.0"; sha256="0dv7k0mifybkarpwqyla5j6cvw9dcch09wvdq09ra9bsf4vyk652"; depends=[cellranger data_table lazyeval purrr]; };
   APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; };
   APFr = derive2 { name="APFr"; version="1.0.2"; sha256="1vax7rfccds6qz3bi6n1h3nzl9jnxpwk331wmpsbqlk23md3m4g4"; depends=[]; };
-  APIS = derive2 { name="APIS"; version="1.0.0"; sha256="1lifc1nlksprb9zjmirxkgjddd56avbp6dli93yqr9d81xasrp5p"; depends=[doParallel foreach ggplot2 gridExtra]; };
+  APIS = derive2 { name="APIS"; version="1.0.1"; sha256="1af82mixamllly7v1jfvn1anpm1pafkv5mshwp6nmc27vaq201z5"; depends=[doParallel foreach ggplot2 gridExtra]; };
+  APML = derive2 { name="APML"; version="0.0.1"; sha256="0qd3r6j5in0b9cz7k4pyb8qg0s5p7gvav41lm89mf4wm9gsdijpy"; depends=[DMwR dplyr dummies ggplot2 h2o pROC survival tidyverse]; };
   APML0 = derive2 { name="APML0"; version="0.10"; sha256="1l6mw1mqb7qnsvfv9w6yydqjsrwrsrqx3bpifyp43cf2q71yx5gp"; depends=[Matrix Rcpp RcppEigen]; };
   APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; };
-  APSIM = derive2 { name="APSIM"; version="0.9.3"; sha256="1pqyy170h2s0kv7nf9v6xr8lgp8yh4psnmpi0naghjg7h72bl53k"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
-  APfun = derive2 { name="APfun"; version="0.1.4"; sha256="0k4m3zwxcjfb1y4njig6yyjqzsvqi99zmglbfpvp65s829zxd881"; depends=[maptools raster rgdal sp]; };
+  APfun = derive2 { name="APfun"; version="0.1.6"; sha256="0j54pcjzr5f8xhvp41vrl0i1hchphnij6p87j16rawp21apvnxyd"; depends=[maptools raster rgdal sp withr]; };
   APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; };
   AQLSchemes = derive2 { name="AQLSchemes"; version="1.7-1"; sha256="10j8qh7m975666ipgdvzrjiraqqb5rn8qj4w76s3ijl83y0v5j3v"; depends=[]; };
-  AQuadtree = derive2 { name="AQuadtree"; version="1.0.1"; sha256="0k9457xyhl8h3jhkn3py48ppylyhzm466ap9rzcy6l56g16vclyk"; depends=[dplyr sp]; };
+  AQuadtree = derive2 { name="AQuadtree"; version="1.0.2"; sha256="1nq2k8dkviazh09pglgla7vgvxwgckkbwx20rs8q9k0xnmsz86yz"; depends=[dplyr sp]; };
   AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; };
   ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; };
   ARCokrig = derive2 { name="ARCokrig"; version="0.1.1"; sha256="0l7z23k4bc2s295cvm3gs8kgkaawgq8g0j0r5jz1c2q2cdadh68q"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo RcppEigen]; };
@@ -93,13 +98,13 @@ in with self; {
   ARPobservation = derive2 { name="ARPobservation"; version="1.2.0"; sha256="1kgflalpymbsfzwg4c70mdxgrbsg8r8z44433v3y9rymhfyq9nmj"; depends=[]; };
   ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; };
   ARTP2 = derive2 { name="ARTP2"; version="0.9.45"; sha256="12nqxry2jkl1n07rbms38mrnp39cn00d0h272d9f1z5x883flv62"; depends=[data_table Formula]; };
-  ARTool = derive2 { name="ARTool"; version="0.10.7"; sha256="1qk029q5ikz33s0d1gpywdb54ljvdlyxkb9v6zrc86f5ixcc7dnd"; depends=[car dplyr lme4 magrittr plyr]; };
+  ARTool = derive2 { name="ARTool"; version="0.10.8"; sha256="1m7vc6ipbhl9rbrnk77af8l5f3z36500whynmp5v8k9ayv2h5b6k"; depends=[car dplyr lme4 magrittr plyr]; };
   ARpLMEC = derive2 { name="ARpLMEC"; version="1.1"; sha256="1arn9cks6jbj0rk1r915bw92ac70jfk2b13zwgk78npxbwrnm80x"; depends=[gmm lmec MASS Matrix mnormt mvtnorm numDeriv sandwich tmvtnorm]; };
   ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.2.1"; sha256="0f0bl1fxda012d8pgqpaqb80m0nn490xih3ddscfqgb87zgrp4sx"; depends=[sp]; };
   ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; };
   ASMap = derive2 { name="ASMap"; version="1.0-4"; sha256="0xnrl8jhbvbc789w5gc9dz7j7gzc7wsc94a3d2wdplrmxn186nrb"; depends=[fields gtools lattice qtl RColorBrewer]; };
   ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
-  ASSA = derive2 { name="ASSA"; version="1.0"; sha256="0xdmkl3qy1i6rb5wpiw6rqhz5c88zg9nav7qll235jvxwh3388xk"; depends=[]; };
+  ASSA = derive2 { name="ASSA"; version="2.0"; sha256="10r5406g6i0959k1zm5h9cbwqmnyf7zy80ahiqsyrapm3g5rphxg"; depends=[]; };
   ASSISTant = derive2 { name="ASSISTant"; version="1.4.2"; sha256="1vh1glk83lg010v2fc289gr6xy0dzbrqcjfva2mmaymk6v78a1w5"; depends=[dplyr knitr magrittr mvtnorm R6]; };
   ASSOCShiny = derive2 { name="ASSOCShiny"; version="0.1.0"; sha256="1g1ba9d5ywd3gbwjb36xnms8l15dg1vwc6r0nsb5adhpb602xsw1"; depends=[arules arulesViz dplyr plotly rmarkdown shiny shinyMatrix]; };
   AST = derive2 { name="AST"; version="0.1.0"; sha256="0z5dw5qw0i61v4796ms7pp66f9y4ylxrcls31ixzcmkklh3rcnp3"; depends=[]; };
@@ -108,23 +113,20 @@ in with self; {
   ATmet = derive2 { name="ATmet"; version="1.2.1"; sha256="17lzb4qnxgvlwy5zaz250mb0c4ayk509700k8mj8zf4dgv51kxa3"; depends=[DiceDesign lhs metRology msm sensitivity]; };
   AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; };
   AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
-  AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; };
-  AWAPer = derive2 { name="AWAPer"; version="0.1.3"; sha256="0v753kp4acjhhfyq9492sr7x9931cq3i774yva322x4dskvk8n2w"; depends=[chron Evapotranspiration maptools ncdf4 R_utils raster sp zoo]; };
+  AUtests = derive2 { name="AUtests"; version="0.99"; sha256="0ima350mjlqvij6f9xy6wfcibvlji7nh0prpqngj7apn82ri4m2k"; depends=[logistf]; };
   AWR = derive2 { name="AWR"; version="1.11.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; };
   AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; };
   AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; };
   AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; };
   AbSim = derive2 { name="AbSim"; version="0.2.6"; sha256="16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m"; depends=[ape poweRlaw]; };
-  AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5.1"; sha256="15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w"; depends=[Biobase DESeq limma Rcpp RcppArmadillo]; };
   Ac3net = derive2 { name="Ac3net"; version="1.2.2"; sha256="1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz"; depends=[data_table]; };
   AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-6"; sha256="1z3rmln63ki2kik9kinbwr9qhr32ggbmh4mm3xqy6di119n47ca9"; depends=[]; };
   AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.2"; sha256="1fgzgwanpv2pzy74xdk3hamc44p8qch467wh163dxby8jr9ik0sb"; depends=[seewave tuneR zoo]; };
   AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; };
   ActCR = derive2 { name="ActCR"; version="0.1.0"; sha256="1rrbn0l0yy8nlp9ghjya1gh0c7brbypazdy934209h3kqm17cgzv"; depends=[cosinor cosinor2 dplyr zoo]; };
   ActFrag = derive2 { name="ActFrag"; version="0.1.1"; sha256="08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1"; depends=[accelerometry dplyr ineq survival tidyr]; };
-  Actigraphy = derive2 { name="Actigraphy"; version="1.4.0"; sha256="0bpmvszzv5fm72nar3wgnmfl5am7znqfajmlbv38ihkbi7jbwk20"; depends=[fda]; };
   ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; };
-  ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.0.1"; sha256="08l9dj8d3cd74z1dqn8n4yqykwvqjxsfa067wnxyh7xnfvvnm5v1"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges plyr S4Vectors]; };
+  ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.1.1"; sha256="06mvakdc8d2pn91p0sr4ixc561s4ia5h1cvd1p7pqd6s50dy4say"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   ActivePathways = derive2 { name="ActivePathways"; version="1.0.2"; sha256="1hxy760x141ykrpqdbfldq4ggj1svj3lsrpwi4rb2x7r4lna937l"; depends=[data_table ggplot2]; };
   AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; };
   AdMit = derive2 { name="AdMit"; version="2.1.5"; sha256="1gsskg3ayzyz0wa4abi20zzmkbnal6igwd6m7rafvpgzlffms1r9"; depends=[mvtnorm]; };
@@ -142,16 +144,17 @@ in with self; {
   AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; };
   AdvDif4 = derive2 { name="AdvDif4"; version="0.7.18"; sha256="1xdbk7w55cb2fh0mqlyrkdpnglrs55kyvvp32anvf2nw3ssrfmy7"; depends=[]; };
   AeRobiology = derive2 { name="AeRobiology"; version="2.0.1"; sha256="14d5gjx53v2wfij8m4br0k7lfi6x2frc8ny1li4g8c05qv2dvnbb"; depends=[circular data_table dplyr ggplot2 ggvis lubridate plotly scales tidyr writexl zoo]; };
-  AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; };
+  AggregateR = derive2 { name="AggregateR"; version="0.1.1"; sha256="1s2q888bqx6ilisv5s4g8ryja97nz6cz4ycm4sw1i63l5wjrwljc"; depends=[data_table NCmisc tibble]; };
   AgreementInterval = derive2 { name="AgreementInterval"; version="0.1.1"; sha256="1bvinzylvsaipa8mq15f45b6h37znavlrdl0rbrx1pqw52r7z8kv"; depends=[psych]; };
-  AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.0"; sha256="0k2lcyxfsavis9g1g5293f0mw7f6jakkr11wkkjvxdlnba9c80r8"; depends=[Rcpp]; };
+  AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.2"; sha256="0zh3y5jd8m0xbj6lqr01zvwj9qd1xr3iq7vd6sgr3g3qh4kqm5pq"; depends=[Rcpp]; };
+  AirSensor = derive2 { name="AirSensor"; version="1.0.2"; sha256="01fnsn8g9d99mvrp9kyjvfd2m4d7gh21n8v2yi93i1g4fwp3dmj7"; depends=[countrycode cowplot dplyr dygraphs geodist geosphere GGally ggmap ggplot2 gridExtra httpcode httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaLocationUtils MazamaSpatialUtils openair PWFSLSmoke RColorBrewer readr rlang scales seismicRoll sp stringr tibble tidyr tidyselect worldmet xts zoo]; };
   Ake = derive2 { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; };
   AlgDesign = derive2 { name="AlgDesign"; version="1.2.0"; sha256="0ammlg148gk0p24fh700116nd66636np0jb1wwh0axq5jphwk1pz"; depends=[]; };
   AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; };
   AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
   AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; };
   AlphaPart = derive2 { name="AlphaPart"; version="0.8.1"; sha256="0gmiwx6f1bzyakz6yz9bk25xlys7rlapglrqv5qkmn4l4ddqyhwq"; depends=[directlabels gdata ggplot2 pedigree Rcpp reshape]; };
-  AlphaSimR = derive2 { name="AlphaSimR"; version="0.12.2"; sha256="0cfz2dh6qdyi8nj81dyy2g26xhwn8l6cfr0r7q6bm0ci21vmcwl0"; depends=[BH R6 Rcpp RcppArmadillo]; };
+  AlphaSimR = derive2 { name="AlphaSimR"; version="0.13.0"; sha256="0rhdj7gy8k6nfdczg1y5xa0lhjmsxr9g7cpd0z68mxdzycrchhvl"; depends=[BH R6 Rcpp RcppArmadillo]; };
   AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; };
   Amelia = derive2 { name="Amelia"; version="1.7.6"; sha256="1shvc8x1kmb0cincgggsv5c5w25k36kqvisdqd3ayy5g98vqvh33"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
@@ -162,14 +165,15 @@ in with self; {
   AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1.1"; sha256="0vw06x47vc0dqzafgpkn4abdsrhxfs9dq8nnrr2pl49skj5n4hks"; depends=[ggplot2 xtable]; };
   AmyloGram = derive2 { name="AmyloGram"; version="1.1"; sha256="1xdi3i3nw4fzj4d040r55f0gid72gy3vbz5nbdrvapl97zk3kp8c"; depends=[biogram ranger seqinr shiny]; };
   AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; };
-  AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.3.0"; sha256="1aps8fnh2d4vw5c9ypmgqnvwqzkjjfrmm7wq4xcy6lmlqks35zdv"; depends=[mvtnorm Rcpp]; };
-  AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-21"; sha256="1gn0ixxi42rw8vr4ykl232cmdcc1qqbbivhw3n8f20jgicwg8x06"; depends=[fastICA R_matlab tkrplot]; };
+  AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.4.4"; sha256="1b03bxysvw9v4j3bzsmrjf5ci06v6s83ix89qxy73ba5akf2gb7h"; depends=[mvtnorm Rcpp VGAM]; };
+  AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-23"; sha256="0i4llbd0h266y26j1skkgmlsbvg4imka5zyd951n2bl1zr7wlds2"; depends=[fastICA R_matlab]; };
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
-  Andromeda = derive2 { name="Andromeda"; version="0.3.2"; sha256="1irkfhxz12m343a8lw0g0r6xvmgzm636kqcv1wygmdzzz9mf554c"; depends=[cli DBI dbplyr dplyr pillar RSQLite tidyselect zip]; };
+  AnchorRegression = derive2 { name="AnchorRegression"; version="0.1.1"; sha256="1inv40r39f3lakvaxsrr7ffqfym6yzsnc088w1mv7y087218bz1w"; depends=[glmnet selectiveInference]; };
+  Andromeda = derive2 { name="Andromeda"; version="0.4.0"; sha256="05zp89ns9adh9ffyk8lswiydzdm2pinzslrxzg82j4c16q9k94h5"; depends=[cli DBI dbplyr dplyr pillar rlang RSQLite tidyselect zip]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; };
   AnimalHabitatNetwork = derive2 { name="AnimalHabitatNetwork"; version="0.1.0"; sha256="1bhqypkiw5v9w26jbdmhndqj5hjfmf7zwivrq2hgs0zcjxwa8gfn"; depends=[ggplot2 igraph]; };
   AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
-  AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.2"; sha256="1r52qry6xvn79b6qsbch35jhzg8y71kxqq9xm6gd302cv2xbwq7q"; depends=[ape seqinr]; };
+  AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.3.0"; sha256="1q5yxzzmzvw1r64r4y0xh1fiyhaqbx5q4lzpawqaggra4w9igdl8"; depends=[ape seqinr]; };
   AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; };
   AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
@@ -183,10 +187,10 @@ in with self; {
   ArCo = derive2 { name="ArCo"; version="0.3-1"; sha256="1afjdmcalx3m19jlvqs83fg5qlds59l5zzg3pzk13qk31r0hz7mk"; depends=[boot glmnet Matrix]; };
   ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
   ArchaeoChron = derive2 { name="ArchaeoChron"; version="0.1"; sha256="1qma2432mm73h72g9ah1k02wlcb6yrhc6mpai9nj7v58s126ffxn"; depends=[ArchaeoPhases Bchron coda rjags]; };
-  ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.4.5"; sha256="1i7xpxm8mj1vfn6yc4rz566vssjdvpgi3pnk6xdrbhk83hgi4gn3"; depends=[coda DT ggalt ggplot2 ggthemes hdrcde readr shiny shinythemes toOrdinal]; };
+  ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.5"; sha256="1jp5ip595vvni1iqqm5wiqmqw9g2d1vvvwl06cr8qj8yh4n6xsfw"; depends=[coda digest dplyr DT ggalt ggplot2 ggthemes gplots hdrcde magrittr readr reshape2 shiny shinythemes tibble toOrdinal]; };
   ArchaeoPhases_dataset = derive2 { name="ArchaeoPhases.dataset"; version="0.1.0"; sha256="1bwfw3azhz4cbcinimj1nnmz04zw4lmn3bh419w73jmcswqrym0n"; depends=[]; };
   ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; };
-  Arothron = derive2 { name="Arothron"; version="1.1.1"; sha256="18vman573mss704v5rqa13vq5nwlbdrg1j5b4wc441782znm34y3"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
+  Arothron = derive2 { name="Arothron"; version="2.0.1"; sha256="10gfw64y34dvds72s1fj2dphm18nc3xrnvadxarq89aaxsknil3h"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
   ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
   AsioHeaders = derive2 { name="AsioHeaders"; version="1.16.1-1"; sha256="0hp08v6if476745v2mk9k2sp1ikiac94fcnp8v9jdcyx954fqqlq"; depends=[]; };
   AssetCorr = derive2 { name="AssetCorr"; version="1.0.3"; sha256="0xcyj9xw895p4j03j9c76k7ylhkmf777akg4m90av12ad05njjbv"; depends=[boot ggplot2 mvQuad mvtnorm numDeriv Rdpack VineCopula]; };
@@ -205,18 +209,19 @@ in with self; {
   Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; };
   AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; };
   Autoseed = derive2 { name="Autoseed"; version="0.1.0"; sha256="0xr3sjfccvp8h18jqxzajb2pfn4nm8q9maic6k9zzr15fxvphiy5"; depends=[]; };
-  AzureAuth = derive2 { name="AzureAuth"; version="1.2.4"; sha256="0f0skabl51xv72c3cvj4nd8l686hvqakh0gpghs8fnay1qbh78gg"; depends=[httr jose jsonlite openssl R6 rappdirs]; };
-  AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.0"; sha256="1yg8fq77fbgf21dg9zq7kkgqyx6ax9ma46yv1nhnvdhc3dpvax5a"; depends=[AzureAuth AzureRMR httr jsonlite]; };
-  AzureContainers = derive2 { name="AzureContainers"; version="1.3.0"; sha256="08n878lxwxsp0sra0y44qzwb813rfbpcj6sl779nlkhfmjk66pz8"; depends=[AzureGraph AzureRMR httr openssl processx R6]; };
-  AzureGraph = derive2 { name="AzureGraph"; version="1.1.1"; sha256="15l6bl7w8d4kq0kmhywmncyrdx5zmgyprd4m8ikraxk5xkrhf4c2"; depends=[AzureAuth httr jsonlite openssl R6]; };
-  AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.3"; sha256="06lz7cg3f9qrl9nzi54fsx37gm517skjl0jn1fwq4s4b07p4klia"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; };
+  AzureAuth = derive2 { name="AzureAuth"; version="1.2.5"; sha256="10lwfnsl08s6l0c1ll1pdysznkaj2xxizi3bny99zlvl4phqxgy5"; depends=[httr jose jsonlite openssl R6 rappdirs]; };
+  AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.1"; sha256="1mn3qw5g77x24qyhybhn1p3h4s9ymdafrj35i24f32ncr5abnd2f"; depends=[AzureAuth AzureRMR httr jsonlite]; };
+  AzureContainers = derive2 { name="AzureContainers"; version="1.3.1"; sha256="1ms576p6g0lkm3b7jzj9b6b0phdrz4z8ws1nsrvdhn13s33zwrzi"; depends=[AzureGraph AzureRMR httr openssl processx R6]; };
+  AzureGraph = derive2 { name="AzureGraph"; version="1.1.2"; sha256="0ghhv6ifpgwc3gbwvsp5dz6qfci3xwd99r3wfzjh1cdan09i7l6m"; depends=[AzureAuth httr jsonlite openssl R6]; };
+  AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.4"; sha256="0b56z3b2f6l58gy2z3zy3sx3kpagvywr8dasl65qvg4ha6wbz3xg"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; };
   AzureKusto = derive2 { name="AzureKusto"; version="1.0.6"; sha256="02wj1nzbs9l6aapk94p89gahbffmk3gy80l57bd1l0afpw0y3jr8"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; };
-  AzureQstor = derive2 { name="AzureQstor"; version="1.0.0"; sha256="0cdzslsb00wpg2di9nm444iwaizk9if4irx2q8gj6hrhn8sp0qn9"; depends=[AzureRMR AzureStor httr openssl]; };
-  AzureRMR = derive2 { name="AzureRMR"; version="2.3.5"; sha256="0q0611ddmq7d6hxl6cyrii5mnc019zl6z70r83rmynjymznbjar9"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; };
-  AzureStor = derive2 { name="AzureStor"; version="3.2.3"; sha256="137jcv5gm2wd40w787r00y98kby03s7ah8jmk2dxhl1681055ykg"; depends=[AzureRMR httr mime openssl R6 xml2]; };
-  AzureVM = derive2 { name="AzureVM"; version="2.2.1"; sha256="08mw3x60xqa6by1mzr0axf3vidwncxli29cd5ss0kvf8pmvlir0z"; depends=[AzureRMR jsonlite R6]; };
-  AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; };
-  AzureVision = derive2 { name="AzureVision"; version="1.0.1"; sha256="0wfnq77rn10wpj0d3s8mbpybc3dgvjc4f3lhgalabif4h11zgz9c"; depends=[AzureCognitive AzureRMR httr]; };
+  AzureQstor = derive2 { name="AzureQstor"; version="1.0.1"; sha256="1z7j8kakiarpw3q2rii7gl9zc2nsb49nzs1nxg1hgfyvcdhw2fcg"; depends=[AzureRMR AzureStor httr openssl]; };
+  AzureRMR = derive2 { name="AzureRMR"; version="2.3.6"; sha256="0ck7g1idrpkqsv1qdhlb98i45jslgj242l7mk5k06dcmqa17q2wx"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; };
+  AzureStor = derive2 { name="AzureStor"; version="3.3.0"; sha256="1qb1cl1wndx330gyd9w62gbr9kkrfivwn7ywb97lwkp8b7yhqpsm"; depends=[AzureRMR httr mime openssl R6 xml2]; };
+  AzureTableStor = derive2 { name="AzureTableStor"; version="1.0.0"; sha256="0xrfpi9psn1h21g4mvcbqsjav56s8cha381vsjkp1swilrxhmk5l"; depends=[AzureRMR AzureStor httr jsonlite openssl uuid vctrs]; };
+  AzureVM = derive2 { name="AzureVM"; version="2.2.2"; sha256="0766a4y17qgq3vgb398n6zn8sdjrv65gpvrnr9b9g89zdsdy9fc4"; depends=[AzureRMR jsonlite R6]; };
+  AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.1"; sha256="15ghijzva6qzq2riq8ci4bh6ssknnp15yyy1fql0k4878wkf7vs0"; depends=[httr openssl]; };
+  AzureVision = derive2 { name="AzureVision"; version="1.0.2"; sha256="0a4lnj60577bxy5vyd7yqji984kgwpwd4zykxz2d060r8l31rf42"; depends=[AzureCognitive AzureRMR httr]; };
   BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; };
   BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; };
   BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; };
@@ -231,15 +236,16 @@ in with self; {
   BANOVA = derive2 { name="BANOVA"; version="1.1.8"; sha256="1xa0mp6m78w07a70ii8cbmlsx0qhqm09pczmwb085f4l6bqc8d16"; depends=[coda rjags rstan runjags]; };
   BAREB = derive2 { name="BAREB"; version="0.1.0"; sha256="1h3bgfxbs489cywgblrpl8jjhgs1krimdvv6fryjnc9rhw1mymdr"; depends=[Rcpp RcppArmadillo]; };
   BARIS = derive2 { name="BARIS"; version="1.1.1"; sha256="1h1zrgpn69nvz61567c08vfynmzy70g31a37wp4p6g8wri1hr7xg"; depends=[checkmate data_table downloader dplyr httr janitor jsonlite magrittr memoise miniUI rgdal rio rstudioapi sf shiny stringi stringr XML]; };
-  BART = derive2 { name="BART"; version="2.7"; sha256="16klaqzp525da6swlcdcr13mjlm88zpqyqnzjk6l4nlcwa3b7z1m"; depends=[nlme nnet Rcpp survival]; };
+  BART = derive2 { name="BART"; version="2.8"; sha256="05vh4bzbimf81dcpdzvrylfl78p6mviapzwha1420hprfq9zgvzc"; depends=[nlme nnet Rcpp survival]; };
   BAS = derive2 { name="BAS"; version="1.5.5"; sha256="1iakx36r4lnl6xs77m9mfcj5w3mb4g482s2mpzq65v69k10nj8lj"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
-  BASS = derive2 { name="BASS"; version="1.2.0"; sha256="00fww6nwfq8di21ja5y4fl2ria5p9a80x58xz43im20iz1f83i28"; depends=[gsl truncdist]; };
+  BASS = derive2 { name="BASS"; version="1.2.2"; sha256="14zimfdkpsil22n1z4ldpi9smmja5kf7qqlklr5sr7y5avnh0hd9"; depends=[hypergeo truncdist]; };
   BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; };
-  BAT = derive2 { name="BAT"; version="2.1.0"; sha256="1mhspbgn860vkysncz0cd62jgq2i8vr3gzkivmaq04fb2glh36ns"; depends=[hypervolume nls2 raster spatstat vegan]; };
+  BAT = derive2 { name="BAT"; version="2.4.1"; sha256="1swi3r99200bg4hmpf075y2zfmdf8r5wcnmyz1fwr1l82w4mfgds"; depends=[geometry hypervolume nls2 raster spatstat vegan]; };
   BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; };
   BAwiR = derive2 { name="BAwiR"; version="1.2.4"; sha256="19iphlhas0d5hyjv00761zbdxx1ijycrnswww5sczr30r5dkacp8"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; };
   BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; };
+  BBEST = derive2 { name="BBEST"; version="0.1-8"; sha256="0j3ykxsmxima75h40mhqm32l2ffc27pk11rfzjyvv1cm6q2q3gbh"; depends=[aws DEoptim ggplot2 reshape2 shiny]; };
   BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; };
   BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
   BBMV = derive2 { name="BBMV"; version="2.1"; sha256="11d4wd1zx99hrhwagw73jkk088rz5vgkjml6mckssc2iqvhj1dc9"; depends=[ape]; };
@@ -257,57 +263,60 @@ in with self; {
   BCHM = derive2 { name="BCHM"; version="1.00"; sha256="1nyf65grcyf74sixixzl12gylk2rzh7n5id4mbhim4lzdm4j272i"; depends=[cluster coda crayon knitr plyr rjags]; };
   BCRA = derive2 { name="BCRA"; version="2.1.2"; sha256="17h0ara1y3fh2xyhjarbw3b549v6kq108bg946ndh7kjykara9dd"; depends=[]; };
   BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
+  BCT = derive2 { name="BCT"; version="1.1"; sha256="058iir5mhgc7zy1nha8g6299ya9jvg1skxj3flgn3b97snjx5qky"; depends=[igraph Rcpp stringr]; };
   BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; };
   BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; };
   BClustLonG = derive2 { name="BClustLonG"; version="0.1.3"; sha256="1p6fm60vhs9l3b120h2l7nz4rf4ckhka7124kzwjd7znax2a336g"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; };
   BDEsize = derive2 { name="BDEsize"; version="1.2"; sha256="1b2lms4nmn6gfjmnjq1vq1g3s1ikv7pl4xpbsxfrph14g6awidax"; depends=[fpow ggplot2 shiny shinyalert]; };
   BDP2 = derive2 { name="BDP2"; version="0.1.3"; sha256="14m85sigx6hk0qzhfgih43m2lxp9xczmp9g3z4pping6msbnbdrz"; depends=[rmarkdown shiny shinyBS]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.62"; sha256="1b1vfar940swvn3pcil848qsp8ji50fjjll8jjzp6y2adx0f8pby"; depends=[igraph]; };
-  BE = derive2 { name="BE"; version="0.1.1"; sha256="1ldzj1fvbgmnp0cn7g348md2xskm2q5b7y6l1sm3pa2am8jc7ixa"; depends=[rtf]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.63"; sha256="05q6dbvdnxmh7myvw60zqcqx16f80i8d6qa4y7xnfkx02l9lwiyc"; depends=[igraph]; };
+  BE = derive2 { name="BE"; version="0.1.2"; sha256="0y67jvlakpga21r0gxmbp0kdmnvcvikgnjsi5g715vh79612sbb2"; depends=[rtf]; };
   BEACH = derive2 { name="BEACH"; version="1.3.1"; sha256="0biq6c74k8vb8ykafzf3blyi08rp65x1vaw3bfpwdc1ihc9wrgjr"; depends=[devtools DT haven plyr rJava rtf sas7bdat shiny WriteXLS xtable]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
   BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.3"; sha256="1pq333x1shxw3wcqgcb4gqg6rwa0hyc24rib235q4zg10r2gyrbm"; depends=[crochet]; };
-  BENMMI = derive2 { name="BENMMI"; version="4.3-6"; sha256="07jmf4icij8yb83bf7x0vsaf60gcvdzaijjckv5400xjykpm7scm"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; };
+  BENMMI = derive2 { name="BENMMI"; version="4.3-7"; sha256="1v96g4l1zkpvvx8jdifnafyaz4ml8v1bxbl97r1n5n6mgw88gk77"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; };
   BEST = derive2 { name="BEST"; version="0.5.2"; sha256="0mx5j6hxxvs9mc2ss2wyavdylh857833bsci3yi6lljidv9g28zc"; depends=[coda HDInterval rjags]; };
   BESTree = derive2 { name="BESTree"; version="0.5.2"; sha256="0yij6xdlvhbqifckaylgbhszwwp38d9x6vbpr1nl40mwwnv4bswz"; depends=[plyr]; };
+  BET = derive2 { name="BET"; version="0.2.0"; sha256="04dx2338ahkhxwc69cvv5vpy70q48prbf79pmrxwiw6xbbn265bs"; depends=[Rcpp]; };
   BETS = derive2 { name="BETS"; version="0.4.9"; sha256="0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; };
   BFS = derive2 { name="BFS"; version="0.2.5"; sha256="0qcqgxzj00n04p20w6hm60lcnccl2mpbxn9mri0x0wdad587jfgi"; depends=[janitor magrittr pins progress purrr pxR rvest tibble xml2]; };
-  BFpack = derive2 { name="BFpack"; version="0.2.1"; sha256="1ar1b6sfsd8j7q5pay3a0arlkiff0qvzng7m3ccwhw8i0gffkvs2"; depends=[bain lme4 MASS Matrix mvtnorm pracma]; };
+  BFpack = derive2 { name="BFpack"; version="0.3.1"; sha256="1bzcbpb1wwln0panpfgbkqfqnls002z229nqhkb5f9m5gyi78rv4"; depends=[bain extraDistr lme4 MASS Matrix mvtnorm pracma]; };
   BGData = derive2 { name="BGData"; version="2.2.0"; sha256="1pn8vwpinn6l6h3lsfpszrp0m2wc3896pi408rjxk8ali0np0182"; depends=[BEDMatrix bigmemory bit crochet ff LinkedMatrix symDMatrix synchronicity]; };
   BGGE = derive2 { name="BGGE"; version="0.6.5"; sha256="1h76c40y45xhf2vp9g0q5j9lfwh16q9axbk5c9aqn4md008xr1j2"; depends=[]; };
-  BGGM = derive2 { name="BGGM"; version="2.0.2"; sha256="0z3vgmc92x3ch8gkddgqc4m7libxi7zddmbx0hhawr7amfhqmfgg"; depends=[BFpack GGally ggplot2 ggridges MASS mvnfast network Rcpp RcppArmadillo RcppDist RcppProgress Rdpack reshape sna]; };
+  BGGM = derive2 { name="BGGM"; version="2.0.3"; sha256="0nybs1x2as01cnpqakls1v63y9c6sj074s5cfkhahaaipig1ivp8"; depends=[BFpack GGally ggplot2 ggridges MASS mvnfast network Rcpp RcppArmadillo RcppDist RcppProgress Rdpack reshape sna]; };
   BGLR = derive2 { name="BGLR"; version="1.0.8"; sha256="15cv5k44yj5cws9jjd70hvrkm8gzn5x4hfx408n2fbqbv289b5jy"; depends=[truncnorm]; };
   BGPhazard = derive2 { name="BGPhazard"; version="2.0.1"; sha256="1bpj644mcfy1lx9f611zymsc8znr250xwms16rwsbrplifwgpylp"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr purrr readr rlang survival tibble]; };
   BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
-  BGVAR = derive2 { name="BGVAR"; version="2.0.1"; sha256="0rjh5rvkf89q06arggz09ndk7c8ifmdg6an2r2lfy7xg5pmm5f5h"; depends=[abind bayesm coda doParallel foreach GIGrvg knitr MASS Matrix Rcpp RcppArmadillo RcppProgress stochvol xts zoo]; };
+  BGVAR = derive2 { name="BGVAR"; version="2.1.5"; sha256="0m419i2yrhk3yh8zi3z4bv5gcz4vxrz2ic8pd4xdv0y0m9x6z817"; depends=[abind bayesm coda GIGrvg knitr MASS Matrix Rcpp RcppArmadillo RcppProgress stochvol xts zoo]; };
+  BGmisc = derive2 { name="BGmisc"; version="0.1"; sha256="15xgm3n3hn5zkrvyfcylyz5q3zah0155914a0rck0ipihb45sbbl"; depends=[Matrix]; };
   BH = derive2 { name="BH"; version="1.72.0-3"; sha256="1ay8vb6i730lipg8b8g3893vqglhw2kqpc29lwdrxdkb66iw33l8"; depends=[]; };
   BHAI = derive2 { name="BHAI"; version="0.99.2"; sha256="1hawa55mk590is8ziav7fdszsa3a42bqb0znzqsazz5lkg4daaa7"; depends=[MCMCpack plotrix prevtoinc]; };
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
   BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.3"; sha256="1cha6bw0zvv30y2hjl1a4d04g1r80dfa7r7zi63q5jjnnbklbswg"; depends=[oro_nifti wavethresh]; };
-  BHSBVAR = derive2 { name="BHSBVAR"; version="2.0.2"; sha256="1y0fjdrg0wg66r3blb8app0h52f24v8vl04n0mgk9ypm45hm64my"; depends=[Rcpp RcppArmadillo]; };
+  BHSBVAR = derive2 { name="BHSBVAR"; version="2.1.0"; sha256="16d1jn96qwk569zy49qbxspayi3p6q826mhpizdpnwd1044lcllv"; depends=[Rcpp RcppArmadillo]; };
   BHTSpack = derive2 { name="BHTSpack"; version="0.5"; sha256="1sz99sgxhiajxca5bx2ns9g9qs9ymsvh8i5882nlp7c78qxmqc4g"; depends=[R2HTML xtable]; };
   BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; };
   BIEN = derive2 { name="BIEN"; version="1.2.4"; sha256="1dagrs54ciagm2mgqrvxl6k2akahr0qk63ifxqnks7iljm0x1gw6"; depends=[ape DBI doParallel fasterize foreach raster rgdal rgeos RPostgreSQL sf sp]; };
   BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.3-12"; sha256="1kphczvj3rxyjvi93cx2j714scvmmpqv5wrg5pdyy8l891jxsr89"; depends=[miceadds Rcpp RcppArmadillo]; };
-  BIGDAWG = derive2 { name="BIGDAWG"; version="2.3"; sha256="1lnw31dl161siml6vcp74c30g0rld962ry3am9ljxmd9mw83shnz"; depends=[haplo_stats httr knitr XML]; };
-  BIGL = derive2 { name="BIGL"; version="1.5.2"; sha256="1n5izivzj01kx94n5p7shd6zlvknqwy6cbdr6xhg32g7p4rvi7s0"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
+  BIGDAWG = derive2 { name="BIGDAWG"; version="2.3.1"; sha256="19dc4rsy8w53jdhvmc63pbd769m5sv5s0n4jz71qmvvnh76jaw82"; depends=[haplo_stats httr knitr XML]; };
+  BIGL = derive2 { name="BIGL"; version="1.6.0"; sha256="1nrb8856vp97krnwmnj8vb8hwcqncs51nqhmwlimc4j34n39h3m4"; depends=[ggplot2 MASS minpack_lm nleqslv numDeriv progress rgl robustbase scales]; };
   BINCOR = derive2 { name="BINCOR"; version="0.2.0"; sha256="0x2s82jql429shk70bhjdy9kamz8dz5ymsxj6kp8ga1711bpwyq6"; depends=[pracma]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
-  BIOMASS = derive2 { name="BIOMASS"; version="2.1.3"; sha256="185k2j38jvzgan76qwyvnx8safj25w1q0rzh2h8p3lh9rgqzz7dz"; depends=[data_table jsonlite minpack_lm proj4 rappdirs raster sp]; };
+  BIOMASS = derive2 { name="BIOMASS"; version="2.1.4"; sha256="0ghpw6w9w4llf835x18k3v9fiw2girkhriiqm1ny8hqnx1p5iaps"; depends=[data_table jsonlite minpack_lm proj4 rappdirs raster sp]; };
   BIOdry = derive2 { name="BIOdry"; version="0.8"; sha256="1zga8g50wjnnz2h9b3ak9q67qnl1f14cq6hvdzf9f84pphsnpasa"; depends=[ecodist nlme]; };
-  BIRDS = derive2 { name="BIRDS"; version="0.1"; sha256="1bfkwyc2hbd23adh11hgzkfr1dpffc3kzshjirizs6nzb7yyq0gz"; depends=[data_table dplyr esquisse geosphere leaflet lubridate magrittr mapedit nnet rgdal rgeos rlang sf shiny shotGroups sp stringr xts]; };
+  BIRDS = derive2 { name="BIRDS"; version="0.1.2"; sha256="11iir53h7a4sqsqpp08yawbwwpwpsn34cxadqzgnq6ygh28w6niz"; depends=[data_table dbscan dplyr esquisse geosphere leaflet lubridate magrittr mapedit nnet rgdal rgeos rlang sf shiny shotGroups sp stringr taxize tidyr xts]; };
   BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; };
   BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; };
-  BLCOP = derive2 { name="BLCOP"; version="0.3.2"; sha256="00x8xk7c8pdwpbmzshjg2ph1yz55vxmliblj1xr7y0gqhcmgyr27"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
   BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; };
   BLOQ = derive2 { name="BLOQ"; version="0.1-1"; sha256="0qs4pnzpfwkii6wpd8my34zw9k003b3is0y0aj1lhcm0qnn1p8h4"; depends=[maxLik mvtnorm]; };
   BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.2"; sha256="0prc2m3hixv8hmnyhr5549406ln509llkhpqra2ifpzif0waw704"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; };
   BLR = derive2 { name="BLR"; version="1.6"; sha256="1wivqh19kxgr7nwa09s5ay6x1yidjk4hqanv0mzb1nbik98w9024"; depends=[]; };
   BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; };
   BLRShiny = derive2 { name="BLRShiny"; version="0.1.0"; sha256="0z3gr0bvjs7y0jkygh7h9habnk2807cwziajpgfmb7dxdrhccj68"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; };
+  BLRShiny2 = derive2 { name="BLRShiny2"; version="0.1.0"; sha256="0cl959hlchba4ikzdvxv2jz30sswh5hc0d8hwx8ckzz52kkj4csa"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; };
   BLSM = derive2 { name="BLSM"; version="0.1.0"; sha256="02xidwp91rh34rcqd0q552wzm2j80axs1nnwwv2aj04g96lf7myj"; depends=[Rcpp RcppEigen]; };
-  BMA = derive2 { name="BMA"; version="3.18.12"; sha256="0yfx6m0y8chxlpyngzw27xsgz3g7481ra0xdhsli36mhj9yvgayb"; depends=[inline leaps robustbase rrcov survival]; };
+  BMA = derive2 { name="BMA"; version="3.18.14"; sha256="08ybcbs7vj0hbg0abh2sl3w0fx4ncsr9znlfdbf1fn0w012gvh1v"; depends=[inline leaps robustbase rrcov survival]; };
   BMAmevt = derive2 { name="BMAmevt"; version="1.0.4"; sha256="10241cibzmgrmxzjw7fpw64qkayc1wig5xilahyc182841k4if6w"; depends=[coda]; };
   BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; };
   BMRSr = derive2 { name="BMRSr"; version="1.0.1"; sha256="0falfkw3gx0c1y52lf82lr6z9l6w7lw8bh04vvl2f1cq02c59nvk"; depends=[httr readr stringr tibble xml2]; };
@@ -315,11 +324,11 @@ in with self; {
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
   BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; };
   BMTAR = derive2 { name="BMTAR"; version="0.1.0"; sha256="016pjaddszisj8rgq0k82zss37zkiij5wa9q884w2zxk5c245sy7"; depends=[Brobdingnag doParallel expm ggplot2 ks MASS MCMCpack mvtnorm]; };
-  BMTME = derive2 { name="BMTME"; version="1.0.15"; sha256="1vbivzkf6m8808x6mhk6wkpg4i35ik1mzpy69sj0rhi7j4xb3f6c"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; };
-  BMisc = derive2 { name="BMisc"; version="1.4.1"; sha256="176sqq24xyw9sz1pq721inmqwjxqqzbcp6w65f0m0n4b64yk5gyd"; depends=[]; };
+  BMTME = derive2 { name="BMTME"; version="1.0.19"; sha256="07iw6aqcwn4a29b85cavfw6hp66csdzlaqwas40zr5ga3kp72j51"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; };
+  BMisc = derive2 { name="BMisc"; version="1.4.2"; sha256="03bhq5gf4x959sam0mhk3sm9h6q6ylbwqp3399l00k7zhg6n7dw8"; depends=[tidyr]; };
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; };
-  BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; };
+  BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.3"; sha256="1dnylvag24zqp93acdbn0ilbdzbn250pjjp6hjdd9d1zvla2ck85"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; };
   BNPTSclust = derive2 { name="BNPTSclust"; version="2.0"; sha256="1ymvklv6d9684xzwdkvaxdjd1q20xmsf6kkfibn2wphlaqs2rh2n"; depends=[MASS mvtnorm]; };
   BNPdensity = derive2 { name="BNPdensity"; version="2020.3.4"; sha256="0775fcf5y78ibmhl5fljrlvznn1a74s5ihldb6wgixmm4c0xmz3x"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; };
   BNPmix = derive2 { name="BNPmix"; version="0.2.6"; sha256="1r359fxiir0avy5pynszj839hxj17g0ypy8zqfkchmapdzh04zhj"; depends=[coda ggplot2 ggpubr Rcpp RcppArmadillo]; };
@@ -327,7 +336,7 @@ in with self; {
   BNSP = derive2 { name="BNSP"; version="2.1.4"; sha256="0685f979zr8mbisbzf27n95064pgr7amk41c024w9gw1p0dj1lai"; depends=[coda corrplot cubature Formula ggplot2 gridExtra label_switching mgcv plot3D plyr threejs]; };
   BNrich = derive2 { name="BNrich"; version="0.1.1"; sha256="0m3cz7npc7mwq2vj68hllbd2vf5xqw00jaxv1pm3c28mq7pb459j"; depends=[bnlearn corpcor glmnet graph]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
-  BOIN = derive2 { name="BOIN"; version="2.6.8"; sha256="1p4hj6z6i4xbv9cwdzdalf5ja48jcq3plg59xzqfkgslwwn96gpx"; depends=[Iso]; };
+  BOIN = derive2 { name="BOIN"; version="2.7.1"; sha256="1rpb90wpa9rgbxhxi1nn83k1vd8ixv9gbh738y6rrnnk3cp95vk2"; depends=[Iso]; };
   BOJ = derive2 { name="BOJ"; version="0.2.2"; sha256="0xr55jif6al9qyz25k7ab0k938z93j0gzwf6njwv0xnp92j3a30i"; depends=[dplyr readr rvest tidyr tidyselect xml2]; };
   BOSSreg = derive2 { name="BOSSreg"; version="0.1.0"; sha256="1nngs9j1hbb9ws423dxccjxwpkc5zl6l0zv46gb0v6m8y11d077b"; depends=[Matrix Rcpp RcppArmadillo]; };
   BPEC = derive2 { name="BPEC"; version="1.3.1"; sha256="0jvq56cq1wnhwd6wvg02hbx4b5vc2hz1lyxi63pl41rk0xva615a"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; };
@@ -337,29 +346,29 @@ in with self; {
   BRISC = derive2 { name="BRISC"; version="0.2.0"; sha256="0dnkf4ld1blbadmxvgd0k021ihszrf2x19qypvv8jvgfrgcr8ax7"; depends=[matrixStats pbapply RANN rdist]; };
   BRL = derive2 { name="BRL"; version="0.1.0"; sha256="13qi78v3057qn4hfby14sp26hy3ibl50f06x8gpak6gi76g8bhwi"; depends=[]; };
   BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; };
+  BSBT = derive2 { name="BSBT"; version="1.0.0"; sha256="191c3scnlbbqs16xj4mfk3k8vl53gjw1dif827dysac9wi1m0ryc"; depends=[igraph lifecycle MASS]; };
   BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; };
   BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
   BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; };
-  BSL = derive2 { name="BSL"; version="3.0.0"; sha256="1cmydj59slj88awc2i7jg84hfaa9j3qp4d1042dgamc7xqvfh397"; depends=[coda copula foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; };
+  BSL = derive2 { name="BSL"; version="3.2.0"; sha256="1qv7p6x7gb78qdif32c1n16rkn4yaw4905amz9x8w13mffia682n"; depends=[coda copula doRNG foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo Rdpack stringr whitening]; };
   BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; };
   BSS = derive2 { name="BSS"; version="0.1.0"; sha256="1lxmrdmr6c0niqz61kc9ybzszprn66jyinfy4dr9r6i161gvs4qg"; depends=[hypergeo MASS phangorn]; };
   BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; };
   BSW = derive2 { name="BSW"; version="0.1.0"; sha256="0wh8m09nqzvsij8q8mdyr5yafdq7h568s28vih2wpplp0sv01945"; depends=[Matrix matrixStats quadprog]; };
   BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
-  BTLLasso = derive2 { name="BTLLasso"; version="0.1-10"; sha256="0ab19dcn55nzkl3q865affiqjkd4j9yiil0a7kxcpbm0rva9x6zj"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; };
-  BTM = derive2 { name="BTM"; version="0.3.1"; sha256="0dl8gnq31xm5dfxdn9s47p31j3dhqpq5gfhq1q8wjm9gdiybg4ad"; depends=[Rcpp]; };
-  BTSPAS = derive2 { name="BTSPAS"; version="2020.1.1"; sha256="004klyyg9gqalwx2i5lx57p1qxrm50nszzg839kv3v421b14qg80"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2]; };
-  BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; };
-  BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; };
+  BTLLasso = derive2 { name="BTLLasso"; version="0.1-11"; sha256="1nz90jg74xzcwjxi9ppp7a78bg4976h2cmvlz140ss5403pnfbsk"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; };
+  BTM = derive2 { name="BTM"; version="0.3.4"; sha256="0b0ksk8k7gr53v4jgnm55ki4vhvk1c5p7wnfr8xwffgd8iml345h"; depends=[Rcpp]; };
+  BTSPAS = derive2 { name="BTSPAS"; version="2021.1.1"; sha256="1clppkr1bflqp1kvy8k7vnr1bjaqy135k7zn5mxfrnkh5hhcj7zm"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2 scales]; };
+  BTYD = derive2 { name="BTYD"; version="2.4.2"; sha256="0yccq603vxjzhssb59icmps4iz0sn52wirwajx7995rz0zkfgfvh"; depends=[dplyr hypergeo Matrix optimx]; };
   BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; };
-  BUCSS = derive2 { name="BUCSS"; version="1.2.0"; sha256="0shz72l69iz0d1ncdwzklhabmvhp983vr2yqhmdhpzcmz3fkp1wp"; depends=[]; };
-  BVAR = derive2 { name="BVAR"; version="1.0.0"; sha256="1fkf8yl9f8c70p8hmz8xx3phdqhyh4s9kbrxjmp75yq1piwqrpsx"; depends=[mvtnorm]; };
-  BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
-  BVSNLP = derive2 { name="BVSNLP"; version="1.1.8"; sha256="0qlmvi189ky6h0a3jyvyil488asx3v6x52mvca7s93dvarxr6rw1"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
+  BUCSS = derive2 { name="BUCSS"; version="1.2.1"; sha256="1nf0xpy5r49yfd0xydzxxxrc6isj14s8lswrf5nhh7g60nkkwcxr"; depends=[]; };
+  BVAR = derive2 { name="BVAR"; version="1.0.1"; sha256="0nfq5ffa600hx3cbr85jbwawdfczrnr1dvg80qqz74v6lh3k8j7x"; depends=[mvtnorm]; };
+  BVARverse = derive2 { name="BVARverse"; version="0.0.1"; sha256="00nghvd5bavmn5hw89pcz20x5kbpxr707r5yvvsakn77rdis37ig"; depends=[BVAR generics ggplot2 rlang tidyr]; };
+  BVSNLP = derive2 { name="BVSNLP"; version="1.1.9"; sha256="1k2sr9wq0q7lq2hmgp75hzxy6v688lw5npwvpma88975yqi6ghiw"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
   BWGS = derive2 { name="BWGS"; version="0.1.0"; sha256="10cqwc9lx5m2s3qay1223whah3jj9fcmyqsw3x8schi9wvrfx8v8"; depends=[BGLR brnn e1071 glmnet randomForest rrBLUP]; };
   BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; };
   BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
-  BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; };
+  BaM = derive2 { name="BaM"; version="1.0.2"; sha256="017x6i8glbbx8aqglyglv9pvcss4vg6l6rnwzaa4vbln95y4582d"; depends=[dlm MASS mice]; };
   BaMORC = derive2 { name="BaMORC"; version="1.0.1"; sha256="133j1rhfvsq1qxr7hxp7gfarbj8lfimirr73gyyrpfkq1vjxmhc9"; depends=[BMRBr data_table DEoptim devtools docopt httr jsonlite RBMRB readr stringr tidyr]; };
   BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; };
   BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; };
@@ -373,16 +382,17 @@ in with self; {
   BarcodingR = derive2 { name="BarcodingR"; version="1.0-3"; sha256="03x26mrlvg00rnfh74wacpgbdk7xr2lq4yd0bx4q2442nli54rdv"; depends=[ape class nnet sp]; };
   Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; };
   Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; };
+  BaseSet = derive2 { name="BaseSet"; version="0.0.14"; sha256="0x1171g819vkh23v96l72jvrmmala478jcpvbm9z9z1c7qxhwwbx"; depends=[dplyr magrittr rlang]; };
   BasketballAnalyzeR = derive2 { name="BasketballAnalyzeR"; version="0.5.0"; sha256="1bad287llg89smqg43lgz2hdkjg3l39mh4k82avgb52xwqp5gjxc"; depends=[circlize corrplot dendextend directlabels dplyr GGally ggnetwork ggplot2 ggplotify ggrepel gridExtra hexbin magrittr MASS network operators PBSmapping plyr readr rlang scales sna sp statnet_common stringr tidyr]; };
   BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; };
-  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.7"; sha256="155wwskqagz3qcng71nn0v52mvassdinhmvaf1hv74dakvvfjrj2"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; };
+  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.6.1"; sha256="0jm4bswczmha7p8xb78n4q3wxyjxmi7ya5zrfm0gb31g7r275wba"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; };
   BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; };
   BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
-  BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; };
+  BayLum = derive2 { name="BayLum"; version="0.2.0"; sha256="1i0pfqygn8s6r63089wgs74fx6cwm7ypascr70g4zwgbgkp8l80d"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags runjags]; };
   BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
   BayesARIMAX = derive2 { name="BayesARIMAX"; version="0.1.1"; sha256="1rcfq0r8sqiqs65mbpcr8i4667cdb50k6bx6wdh9spr0djh8gfv0"; depends=[coda forecast]; };
   BayesBEKK = derive2 { name="BayesBEKK"; version="0.1.0"; sha256="0fykcmf54820krwy7q573gmlcrx96i94knx7rgzc83i287lnpnfg"; depends=[coda MTS mvtnorm]; };
-  BayesBP = derive2 { name="BayesBP"; version="1.0"; sha256="1gmjljkp4pvm87qf6rq2kixqdx64sfg34b1xxdl242a3cckmjc5y"; depends=[iterators openxlsx]; };
+  BayesBP = derive2 { name="BayesBP"; version="1.1"; sha256="043msccrins1smaizmf7qc6q1cyjdzirw2ygnvi56lskib1cls7m"; depends=[iterators openxlsx]; };
   BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; };
   BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; };
   BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.6.0"; sha256="1ym2v5ynmb28miwivyjx604vfsfi5ksmaha0far0ddq2cl06if2q"; depends=[eha ggplot2 reshape2 survival]; };
@@ -390,20 +400,19 @@ in with self; {
   BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; };
   BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
   BayesESS = derive2 { name="BayesESS"; version="0.1.19"; sha256="023r5pxqa2ll3vyfmchdlcg6ay0qixphz24078g1immqp43mlrxm"; depends=[dfcrm LaplacesDemon MASS MatrixModels MCMCpack Rcpp RcppArmadillo RcppEigen]; };
-  BayesFM = derive2 { name="BayesFM"; version="0.1.3"; sha256="0bfi1g6s02brd3phsg3sxvyc7sqvd48vlx37yavbg1nnyx1c53rw"; depends=[checkmate coda ggplot2 gridExtra plyr]; };
+  BayesFM = derive2 { name="BayesFM"; version="0.1.4"; sha256="14m318nxb4aqxni4zm0p6g9pysx81rmay48qglwm98gmdjxigzzk"; depends=[checkmate coda ggplot2 gridExtra plyr]; };
   BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.2"; sha256="1z083v7is21gm0a458jm5ph3xfdm7mh29a6sg2r1njq82f8x3s3g"; depends=[coda gtools hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
   BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
   BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
   BayesGPfit = derive2 { name="BayesGPfit"; version="0.1.0"; sha256="1sz0bb102h5fj1yz0k89cvcy0pvsh6rfm06i6lfz3pdhdjszsx00"; depends=[lattice]; };
   BayesGWQS = derive2 { name="BayesGWQS"; version="0.0.2"; sha256="0xy71d121hl8mg71cfyqw3j0sjx46qj5bifdk55h7jyfynr80pax"; depends=[coda rjags]; };
   BayesLCA = derive2 { name="BayesLCA"; version="1.9"; sha256="11ji5s1njip57zkr4bxwp3agx1ddv7yagm5prn9ckcbasan4rbx1"; depends=[coda e1071 fields MCMCpack nlme]; };
-  BayesLN = derive2 { name="BayesLN"; version="0.1.2"; sha256="16nw6nxqqcqlcqjbz1nyk2laz5naqfj9hg1a616x1ms88bhxmcsx"; depends=[coda data_table fAsianOptions ghyp lme4 MASS optimx Rcpp RcppArmadillo]; };
+  BayesLN = derive2 { name="BayesLN"; version="0.2.1"; sha256="1km5jq0jxkwafn1ak0srsmxzrkv4vfhgvrkcy25laap1yn95qrvm"; depends=[coda data_table fAsianOptions ghyp lme4 MASS Matrix optimx Rcpp RcppEigen]; };
   BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; };
-  BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; };
   BayesMFSurv = derive2 { name="BayesMFSurv"; version="0.1.0"; sha256="1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg"; depends=[coda FastGP MCMCpack mvtnorm Rcpp RcppArmadillo]; };
   BayesMRA = derive2 { name="BayesMRA"; version="1.0.0"; sha256="005pygpa8bmr153naxnag7kn876lqwq34d8pzbj954nivlxl4zaw"; depends=[fields igraph Matrix mvnfast Rcpp RcppArmadillo spam]; };
-  BayesMallows = derive2 { name="BayesMallows"; version="0.4.4"; sha256="1zgvmdhygfvbql6fhb81h6734kqs1h7v0qqicq8s9z5d6zgy247g"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; };
-  BayesMassBal = derive2 { name="BayesMassBal"; version="0.2.0"; sha256="1ac1kirnic8c5mzja1m2mnv3wd89z0r0l3nqjx7a0h36cddykl6s"; depends=[HDInterval LaplacesDemon MASS Matrix pracma Rdpack tmvtnorm]; };
+  BayesMallows = derive2 { name="BayesMallows"; version="0.5.0"; sha256="0m8npkp76z566sam02kdyhfx0jpch8k8cj8j165l7mqz8v7x7b9n"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; };
+  BayesMassBal = derive2 { name="BayesMassBal"; version="1.0.0"; sha256="158vwfp5wn9g28fg48zmd95lfsr6flmcdm4igfw4cmgp4w0w69lq"; depends=[coda HDInterval LaplacesDemon Matrix pracma Rdpack tmvtnorm]; };
   BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; };
   BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
   BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.1"; sha256="11c83iafhl8yasyy8xwk9wladbj986xpmgc8d3yd9dxkic71flw8"; depends=[FNN Matrix nimble StatMatch]; };
@@ -411,11 +420,13 @@ in with self; {
   BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; };
   BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
   BayesPostEst = derive2 { name="BayesPostEst"; version="0.2.1"; sha256="0n2blfdzga93zmf0v94wlcmcyqlvbga50chqyv5pkx2z6l5xhdnc"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges HDInterval R2jags reshape2 rlang ROCR runjags texreg tidyr]; };
+  BayesProject = derive2 { name="BayesProject"; version="1.0"; sha256="0b1xqw7f9kfbmr8m6fl9d2fpwr364s4a5vdw57l6i5rm6lszyfh5"; depends=[Rcpp RcppEigen Rdpack]; };
   BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; };
-  BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.3"; sha256="07ijys5qd29qpa1hh6kbbp6fx97nmxydiijd0k0dh262vqfhh5ll"; depends=[Rcpp RcppArmadillo]; };
+  BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.4"; sha256="1wigp9692z0vf1vm3cpbl6wcgp3zyqzfbrkd344hi88421kj1yxj"; depends=[Rcpp RcppArmadillo]; };
   BayesS5 = derive2 { name="BayesS5"; version="1.41"; sha256="0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql"; depends=[abind Matrix snowfall splines2]; };
   BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; };
-  BayesSUR = derive2 { name="BayesSUR"; version="1.2-1"; sha256="08319q3xcid9vmh78x5l18xc53ca43xm9ij5bya3nznf2safbwls"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; };
+  BayesSPsurv = derive2 { name="BayesSPsurv"; version="0.1.1"; sha256="1szzhqr6m8cbl8lrah0aj03pnkva2b7r4ga34fzpard2l6aypbvw"; depends=[ape coda dplyr FastGP ggplot2 MCMCpack Rcpp RcppArmadillo reshape2]; };
+  BayesSUR = derive2 { name="BayesSUR"; version="1.2-4"; sha256="0qwqydmikf3ja4z3mwf6r1a6wxqnvkmx2747g38nzhcj53ipgsw0"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; };
   BayesSampling = derive2 { name="BayesSampling"; version="1.0.0"; sha256="06gy902ksa753hn5p4zmsxaw6qg4qx4prd8n5m2w1300561cfbkl"; depends=[MASS Matrix]; };
   BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.2"; sha256="0vzvc7xmr39mlhqx0cmqrw2bszmxfbzbyy2l3ssbw2cz0c4xarkj"; depends=[dplyr ggplot2 lme4 Rcpp rstan]; };
   BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
@@ -428,24 +439,26 @@ in with self; {
   BayesX = derive2 { name="BayesX"; version="0.3-1"; sha256="0g4cdkvicqzg75qgr62j89dc9mni38ai7705j6jbfx59vn6dbrr5"; depends=[coda colorspace maptools shapefiles sp]; };
   BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
-  BayesianFROC = derive2 { name="BayesianFROC"; version="0.3.0"; sha256="0h5qnkvm2grhl4wvyyfy2n86d4llpqw3bijgzkdw7871j5h7yflg"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; };
+  BayesianFROC = derive2 { name="BayesianFROC"; version="0.4.0"; sha256="1rq75kz2s4gphmiqr9jwv2jdjkia64bxa95sglb0h55wlsrww1fh"; depends=[bridgesampling car crayon ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; };
   BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; };
+  BayesianLaterality = derive2 { name="BayesianLaterality"; version="0.1.0"; sha256="1wrpgha9xfc9w2vf8z2fqagkrh8iyp2xgm92y2pwn3dmmbqza8d2"; depends=[dplyr purrr Rdpack rlang tidyr tmvtnorm]; };
   BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; };
   BayesianPower = derive2 { name="BayesianPower"; version="0.2.3"; sha256="00rn3wmqrhk2pssbq5j2prl8m6cgfarr49672pnksp2dcbi47p20"; depends=[]; };
   BayesianReasoning = derive2 { name="BayesianReasoning"; version="0.3.2"; sha256="1d9s47bkx5m6dsdq4hbflm7x1lax4n9gk3wbvilpybp6gn3bhlm9"; depends=[dplyr ggforce ggplot2 magrittr reshape2 tibble tidyr]; };
   BayesianTools = derive2 { name="BayesianTools"; version="0.1.7"; sha256="0330bbnny35h4gsmwg31p3n3i511wrckzmp174ydm55pvsdkhjdg"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; };
   Bayesiangammareg = derive2 { name="Bayesiangammareg"; version="0.1.0"; sha256="0b0fqmig7vgmlrq2884q0apfd89nn5k4dj8rqjizkkbw4qpzmylb"; depends=[mvtnorm]; };
-  Bayesrel = derive2 { name="Bayesrel"; version="0.6.1"; sha256="1mdc53g17c4r078mw74iiir03ks8kv60qh16l8fqy00vzwvbgpi9"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; };
+  Bayesrel = derive2 { name="Bayesrel"; version="0.7.0.2"; sha256="1in4bz0b18qaix5dakfrzl8wpzljpy239pp5dsz2xl0c89iqvb9y"; depends=[coda LaplacesDemon lavaan MASS Rcpp RcppArmadillo Rdpack]; };
   BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; };
-  Bchron = derive2 { name="Bchron"; version="4.7.1"; sha256="1s6rvbxmsj5ksykxlvfzprxapn83wd8wcrq0yxpfd647jq4y7c20"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; };
+  Bchron = derive2 { name="Bchron"; version="4.7.3"; sha256="045hr118yyny9qbm9n0i85zrzx70bj0d5mbllak782sj9wspll3l"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; };
   Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; };
   BeSS = derive2 { name="BeSS"; version="1.0.9"; sha256="1fslwh0fyhgaqrlhn6gsiq8rs3xcylwva98dqvch0hjg6sckccww"; depends=[glmnet Matrix Rcpp RcppEigen survival]; };
+  BeastJar = derive2 { name="BeastJar"; version="1.10.6"; sha256="0581q9m7lb681d12vld231vn6wqv5s2sqkvav4fd0xllvjighlx7"; depends=[rJava]; };
   Benchmarking = derive2 { name="Benchmarking"; version="0.29"; sha256="06zphnpnxvp6frl2gkmrsfils8xi64b4m8gvs483k8l0z4bjrfbk"; depends=[lpSolveAPI quadprog Rcpp ucminf]; };
   BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
-  Bergm = derive2 { name="Bergm"; version="5.0.1"; sha256="1zy2ar43v7pf1ibbhf7visy1ia24lfpa2kb921vxd7hiilky1h8v"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; };
+  Bergm = derive2 { name="Bergm"; version="5.0.2"; sha256="03v90hh30ydpf9i60f6fraxrlr8i3zjxq3pg1yd56122kb93aa5y"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network statnet_common]; };
   Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; };
   Bestie = derive2 { name="Bestie"; version="0.1.1"; sha256="1vd139nl8dh707nvq35hylcng1hs8zycvjksnzxmwar1db9kgr7p"; depends=[BiDAG Rcpp]; };
-  BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; };
+  BetaBit = derive2 { name="BetaBit"; version="1.4"; sha256="11cvl9m20ycc0zsxbdapjflgsiaxx4dzaygjhv948adjfi5fycbn"; depends=[digest]; };
   BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; };
   BeviMed = derive2 { name="BeviMed"; version="5.7"; sha256="1fjxin14x9i44wq6ad2i70k6sdfzy7zxyq1pibnmsyk4a0k2cfv1"; depends=[Rcpp]; };
   BeyondBenford = derive2 { name="BeyondBenford"; version="1.4"; sha256="04jdx35955g44v2is6zxfw1gip7zh3li8divc7iy5hl0jrshfhv3"; depends=[ggplot2]; };
@@ -456,6 +469,7 @@ in with self; {
   BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; };
   BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; };
   BiTrinA = derive2 { name="BiTrinA"; version="1.3"; sha256="0sjq5a21vpsjs0ad0v8gsqlbk3n8virg1hzj0nvgm3h3xqhymh1d"; depends=[diptest]; };
+  BiasCorrector = derive2 { name="BiasCorrector"; version="0.1.2"; sha256="1aa7h3l8rnwdkgbx000idkin671fqz8461fnqzdx9qcc2v1zbnv2"; depends=[data_table DT magrittr rBiasCorrection shiny shinydashboard shinyjs]; };
   BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; };
   BibPlots = derive2 { name="BibPlots"; version="0.0.6"; sha256="0gbywbxhqw226mzhxlkl98yky206f9m81wcrp6r4wj8wqhzc2fay"; depends=[]; };
   BigQuic = derive2 { name="BigQuic"; version="1.1-9"; sha256="09fpqs5b733gq2kb7yj8a8snhr6zqg0mqa04p7fm6z2vas9cl3ri"; depends=[Matrix Rcpp scalreg]; };
@@ -484,14 +498,15 @@ in with self; {
   BioPETsurv = derive2 { name="BioPETsurv"; version="0.1.0"; sha256="0svwf8pzvlmlp8aacf70hzlg2h81m6lyhh4p73ixqw5v9bnyq6m0"; depends=[ggplot2 gridExtra survival]; };
   BioProbability = derive2 { name="BioProbability"; version="1.0"; sha256="051m761zf079s0p4q0ambwqc22qjz2yajxrsmnjnxvqiaadaj1q7"; depends=[]; };
   BioStatR = derive2 { name="BioStatR"; version="3.0.0"; sha256="1fv37xckhpn0b744r71q7h57pr5j2y0v8hcc97cgzdsqd8p4axmk"; depends=[ggplot2]; };
+  BioVenn = derive2 { name="BioVenn"; version="1.1.0"; sha256="0y3drysz6s535yd0wkrinfpkm7kxkh9h6gk64cs0ln81sad4ifcx"; depends=[biomaRt plotrix svglite]; };
   BiocManager = derive2 { name="BiocManager"; version="1.30.10"; sha256="03n9s2vf7vgpgb5alpxwamf9xfkn32cbzngwyn6spq1bnh9a9dzk"; depends=[]; };
   Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
   Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
-  BiodiversityR = derive2 { name="BiodiversityR"; version="2.12-1"; sha256="1dziagy01ksckpkvrfq2hiamb7k1g8sh2g93l9zr8nk7q0y690p4"; depends=[Rcmdr rgl vegan vegan3d]; };
+  BiodiversityR = derive2 { name="BiodiversityR"; version="2.12-3"; sha256="1f3r156m53j823vwnyqfmsqd0z0gyhdili7f91y3d4p9x3d4ggw8"; depends=[Rcmdr vegan]; };
   Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; };
   Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; };
   Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; };
-  Bios2cor = derive2 { name="Bios2cor"; version="2.1"; sha256="04wk1cjrrxhpv1kdhd67r1qvjv268xxi0z0r105wy912110z9m6x"; depends=[bigmemory bio3d circular igraph]; };
+  Bios2cor = derive2 { name="Bios2cor"; version="2.2"; sha256="1wkj9vr33m9jilidil9jpw5rzr3pf7gkimxdvch22ks4bgkx7l1w"; depends=[bigmemory bio3d circular igraph]; };
   Biotech = derive2 { name="Biotech"; version="1.0.0"; sha256="01ddpxlgav8jjns0r23yjjynv80gwqcfalnz8gr553lm0wffdvj5"; depends=[dr4pl ggplot2 magrittr tidyverse]; };
   BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; };
   BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.4"; sha256="01g34n87ml7n3pck77497ddgbv3rr5p4153ac8ninpgjijlm3jw2"; depends=[Biobase limSolve]; };
@@ -501,18 +516,19 @@ in with self; {
   BivUnifBin = derive2 { name="BivUnifBin"; version="1.3.2"; sha256="14v00fycxwnnm4x4hckckqb90j5m8hsbkr65z2zln459l6rsdwx9"; depends=[BinOrdNonNor rootSolve]; };
   BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
   Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.3"; sha256="11knwynqfxdz6zl7vzr48jpygcilsxarpmwphaajh62asdlg5w6p"; depends=[compound_Cox]; };
+  BlackCarbon = derive2 { name="BlackCarbon"; version="0.1.0"; sha256="19ll2lcdxj5bmgh4wyk47ddxpwrqdiy67wsvj7mi1vm7y5ccyfhn"; depends=[]; };
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-6"; sha256="0dcmnaf0k195caajy8h4qymyfj45cjwmkcgsbwv0z7x3h9sx5k6v"; depends=[]; };
   BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
   Blaunet = derive2 { name="Blaunet"; version="2.1.0"; sha256="0rbqbi57f4qkdd8b2zbw1i8afb6355ba4yv0zg6f410qqgxiq0c4"; depends=[cairoDevice ergm foreign haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; };
   Blendstat = derive2 { name="Blendstat"; version="1.0.3"; sha256="0d5zzqiav7b5prh8332kwqy6ga96lkbkdjis8qwifa11j5qa087a"; depends=[lattice MASS]; };
   BlockCov = derive2 { name="BlockCov"; version="0.1.1"; sha256="1ilqd8kvhlq0nc1n4y7g0aiwran3kyqs8i143j6dv2wy3myn5x0l"; depends=[BBmisc dplyr magrittr Matrix Rdpack rlang tibble]; };
-  BlockFeST = derive2 { name="BlockFeST"; version="1.6"; sha256="0hj7a5as7nxbgjac7lbj6qfwffx3g8x8phpf9a55f1c9cdzi73a5"; depends=[BASIX]; };
+  BlockFeST = derive2 { name="BlockFeST"; version="1.8"; sha256="12cbrmgqszlj729zrn9d1d7drbr0iay43knnmrzcxs6v7lfszsx5"; depends=[BASIX]; };
   BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
   BlythStillCasellaCI = derive2 { name="BlythStillCasellaCI"; version="1.0.0"; sha256="0xgrrh6rf732c2dh1z1qyvkqw8ga1yl6i802r399bb7k55g6z6d0"; depends=[]; };
   Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; };
-  BoSSA = derive2 { name="BoSSA"; version="3.6"; sha256="00jxml2lyw1rc0ifs111sbz30186z61zvz1qy6wz74024c6gsw89"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
+  BoSSA = derive2 { name="BoSSA"; version="3.7"; sha256="0qhcar3grp6l6islbjc27jqvgh37kkdi0nql6plsqwilldv3kis6"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
   BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; };
-  Bolstad = derive2 { name="Bolstad"; version="0.2-40"; sha256="1xz2x8gm27aqw1b3psjbpmzkxla8rvkvb974c3imgj71d1x0ykgm"; depends=[mvtnorm]; };
+  Bolstad = derive2 { name="Bolstad"; version="0.2-41"; sha256="0rrx254wmr4i57h097ahba151chm8l2287qfg01p1lg47znld21h"; depends=[mvtnorm]; };
   Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
   BoltzMM = derive2 { name="BoltzMM"; version="0.1.4"; sha256="17nsjr2y8nniaxd6f13g85gb9rshar72qqp45yh2ygg4zrx1d226"; depends=[BH Rcpp RcppArmadillo]; };
   BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; };
@@ -527,7 +543,6 @@ in with self; {
   BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.2"; sha256="1qf93wmrh6znm81jr3gyn1sl8x4i6pdx811r70fg8k026fbfjn3a"; depends=[data_table foreach MatrixEQTL]; };
   Boptbd = derive2 { name="Boptbd"; version="1.0.5"; sha256="1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6"; depends=[igraph MASS Matrix]; };
   Boruta = derive2 { name="Boruta"; version="7.0.0"; sha256="0y2w4wb45kfnzrxcrdsiwgal9fsnlr3wad1sqdc70qv8gp921xbg"; depends=[ranger]; };
-  BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; };
   BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="6.0.1"; sha256="0wg81bg1bm9llir17v4xmsai3jgx3f10fqphwk450w4zr889fhy5"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-2"; sha256="0vss3ib74cz2zn1afmrvllawghj9z2ay4x1ysvk4rqvjmiia4a2i"; depends=[brglm gtools lme4 qvcalc]; };
   Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
@@ -546,7 +561,7 @@ in with self; {
   Bvalue = derive2 { name="Bvalue"; version="1.0"; sha256="17zlllzjrcq4grggal3hlg384990n62wnflr2g21fa6hcnglwy7d"; depends=[]; };
   C443 = derive2 { name="C443"; version="3.0.0"; sha256="1wfj5avyrqf60g0vdfk6dmrs7dzp3zq22g9j9j9j78hcykbnjdj4"; depends=[cluster ggplot2 gridExtra igraph MASS partykit plyr qgraph RColorBrewer reshape2 rpart]; };
   C50 = derive2 { name="C50"; version="0.1.3.1"; sha256="0ikm0awb6v5iignr1izmcaw6l32gyn3rsinq58panl7gvsl1n58b"; depends=[Cubist partykit]; };
-  CA3variants = derive2 { name="CA3variants"; version="2.5"; sha256="0n9zzca5vdp09yp0c9znph6av28pc33lrm5hbfijs5riplp1ixa1"; depends=[ggforce ggplot2 ggrepel gridExtra multichull plotly]; };
+  CA3variants = derive2 { name="CA3variants"; version="3.0"; sha256="0n0a4rxaskz94kibcycrsg46w8r515r4pzadvlv6b43qpgwrqh92"; depends=[checkmate ggforce ggplot2 ggrepel gridExtra multichull plotly]; };
   CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; };
   CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; };
   CAISEr = derive2 { name="CAISEr"; version="1.0.16"; sha256="08br6hdpgf9y2fix299diwd8r3q4gylpbzll4knpxq0vi18a3hz3"; depends=[assertthat ggplot2 gridExtra pbmcapply]; };
@@ -555,7 +570,7 @@ in with self; {
   CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; };
   CARBayes = derive2 { name="CARBayes"; version="5.2"; sha256="08ajcgc0ycngcl2d757yjz1mpki88aq2jp07nr64j8aqpych5lw2"; depends=[CARBayesdata coda dplyr GGally leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; };
   CARBayesST = derive2 { name="CARBayesST"; version="3.1"; sha256="12l4jdbaadnyngqphzc8fsspynryci9p9h6bl1196arqd5igax94"; depends=[CARBayesdata coda dplyr GGally ggplot2 gridExtra gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; };
-  CARBayesdata = derive2 { name="CARBayesdata"; version="2.1"; sha256="09rjxdrbpnqm6gv9g1jxh91jmww345wi9vlhb4s1n6b3xnh44fhs"; depends=[shapefiles sp]; };
+  CARBayesdata = derive2 { name="CARBayesdata"; version="2.2"; sha256="06pkhmlkp4hl7c6bgarhab6z640h1xvgw86q1ihipbc432an4gvl"; depends=[shapefiles sp]; };
   CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
   CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
   CARRoT = derive2 { name="CARRoT"; version="2.5.1"; sha256="0z5vrsyzfiv1nzggqmrgybfyjg0wdcdag4xjg0f70p5x91fg1cqk"; depends=[doParallel foreach nnet Rdpack]; };
@@ -568,15 +583,14 @@ in with self; {
   CAinterprTools = derive2 { name="CAinterprTools"; version="1.1.0"; sha256="07rvi91ysqyfwagmip0cnqjahv1n8slicd5hznqf5v3l841xh7p7"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; };
   CAvariants = derive2 { name="CAvariants"; version="5.5"; sha256="0bxifvhpjay18k6gkppypc1d0zaln1zhnxabvvld0pz4h59s2hlv"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; };
   CB2 = derive2 { name="CB2"; version="1.3.4"; sha256="0431bd956hmkrhs9x845vjwbzzwzd7n9nfx9y95mv6qv84zd4wv2"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; };
-  CBCgrps = derive2 { name="CBCgrps"; version="2.7"; sha256="1hqndrz3snir3pibqsbyzgbllgmdiprgq27a31vl29vkswpiwwsm"; depends=[nortest]; };
+  CBCgrps = derive2 { name="CBCgrps"; version="2.8.1"; sha256="1dqzn7ip49y5q863bzw5i086nl3ck2cfsvyw86k8dhcbs785pr56"; depends=[nortest]; };
   CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; };
   CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
   CBSr = derive2 { name="CBSr"; version="1.0.3"; sha256="0lfs8p9nha1aq6dn6sd3pc9x0931zawxprpflfv9gqb8w7n1z4sd"; depends=[NlcOptim rJava]; };
   CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; };
   CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
-  CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
-  CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.5"; sha256="1sdgpp96ja4lkkr276aj0d5f5gipayp7fdq7dfd48iraqyb8y2ph"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; };
+  CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.6"; sha256="1xcxg3k0qgsh85l60sr9mi7a1mjjrw0rim4k05piwr2binwn1s1c"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; };
   CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; };
   CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
   CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
@@ -586,25 +600,25 @@ in with self; {
   CDM = derive2 { name="CDM"; version="7.5-15"; sha256="159ny2dz0rf1r3k1mqlfwambffc8rx425sggf5bn51nybpzanq3l"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; };
   CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
   CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
-  CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
   CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; };
   CEC = derive2 { name="CEC"; version="0.10.2"; sha256="03fxhqlpn7x3djfanlix3yzf1cy6zf854g70gq2d93ix9gis7knv"; depends=[]; };
   CEGO = derive2 { name="CEGO"; version="2.4.0"; sha256="1rmx9ppiw7k5cznanz3m4lnhriz3fs4f7wk5h3q9wg9cyzfjhh38"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; };
   CENFA = derive2 { name="CENFA"; version="1.1.0"; sha256="03l0i24m2mh0gfmg7b48qg15zmfr8a39l1nswvmbmcj2a5hxybf4"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
+  CFAcoop = derive2 { name="CFAcoop"; version="0.1.0"; sha256="11p53kr15s6xmv0wmn93n71dja2rkivkb5f83lhpy6iv5ihcf1wq"; depends=[Hmisc mvtnorm]; };
   CFC = derive2 { name="CFC"; version="1.1.2"; sha256="0k0685cgsd0lm7id6h216r4x236xn3nqj4h906qn2i0kvwmx4nda"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
   CFF = derive2 { name="CFF"; version="1.0"; sha256="04z3q0s4b1yns5l7lplw8qrcdjzsdy9crnhakyzd6r449hjfsvnz"; depends=[]; };
-  CFilt = derive2 { name="CFilt"; version="0.1.0"; sha256="1kxpw91rsnd6c962ldvvn3xylc0sadb69yi5gv3zkzj9isncv2zy"; depends=[]; };
+  CFilt = derive2 { name="CFilt"; version="0.2.1"; sha256="1iah41s0pd8s4vmg7r6npsgmfr6mvyp5wfnyimx51fqr2f3narwf"; depends=[]; };
   CGE = derive2 { name="CGE"; version="0.3.3"; sha256="0q1fv62159cx9z25488fxf6a6fi1m59hdh60ldypsjwil77q0s3i"; depends=[]; };
   CGGP = derive2 { name="CGGP"; version="1.0.2"; sha256="0z71sl1vsz3f84scxa25444fb6wm1jbd05syapggjxnjcglmiq45"; depends=[Rcpp RcppArmadillo]; };
   CGManalyzer = derive2 { name="CGManalyzer"; version="1.3"; sha256="1wmp5im18s447rjkj891skrm7558xkqlbx43n9hyxiqg49zq1ng9"; depends=[]; };
   CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; };
-  CGPfunctions = derive2 { name="CGPfunctions"; version="0.6.2"; sha256="05f1h29hd1mr2h68rz6yc1ickkmbv12z2xav8gppqqj5657zxnhf"; depends=[BayesFactor broom car DescTools dplyr forcats ggmosaic ggplot2 ggrepel paletteer partykit purrr rlang scales sjstats stringr tidyr]; };
+  CGPfunctions = derive2 { name="CGPfunctions"; version="0.6.3"; sha256="12l3ww9wfrk8i0a63wv5h4ayqj6fj5fz5yvkiskvaaida32vds2m"; depends=[BayesFactor DescTools dplyr forcats ggmosaic ggplot2 ggrepel paletteer partykit purrr rlang scales sjstats stringr tidyr]; };
   CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
   CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; };
   CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; };
-  CHNCapitalStock = derive2 { name="CHNCapitalStock"; version="0.0.2"; sha256="187rkb7bi5lm4xfg6ibw3n1x5cgrbz30d9x3i1jdyhg619xgg8nl"; depends=[dplyr magrittr]; };
-  CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.6"; sha256="0imfyvagvxqffvz3ksvkmfc2lbfli5lsxvnqby7iw2dp1gzpaxqc"; depends=[]; };
+  CHNCapitalStock = derive2 { name="CHNCapitalStock"; version="0.1.0"; sha256="1w8abj1rxkpql696dr6w19xsgxjmkm0jwnln7lp48fnxdsa424x8"; depends=[dplyr magrittr]; };
+  CHNOSZ = derive2 { name="CHNOSZ"; version="1.4.0"; sha256="0lifanx2y2crhmfdqja26dj5agyb3qnryjhp3c1vnnp774vqabr6"; depends=[]; };
   CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; };
   CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.3"; sha256="0yhay4fp5lyf0sdcf807yvys17qz9cr5f5ikim25mq336p7fp03x"; depends=[Matrix mvtnorm numDeriv stringr]; };
   CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; };
@@ -619,23 +633,26 @@ in with self; {
   CJAMP = derive2 { name="CJAMP"; version="0.1.1"; sha256="0caznbqy5hsp7h0gkdbv966vfpq8z1khvbizi4vpc9mxck1nqc99"; depends=[optimx]; };
   CKAT = derive2 { name="CKAT"; version="0.1.0"; sha256="03vxl91z2mhi1h0xgcwhw63mvj56156zgphm16ijdff63pqxaryr"; depends=[CompQuadForm]; };
   CKLRT = derive2 { name="CKLRT"; version="0.2.3"; sha256="1d8sg3ncns3fpjaghz1h1z9nfrl31v09xijrzzsias8xjrpi191b"; depends=[MASS mgcv nlme Rcpp RcppEigen]; };
-  CLA = derive2 { name="CLA"; version="0.95-1"; sha256="0h3b1wmmfhajdgd2nmm1wkrg83fwbwj4yphjqin8yw9a0izqf0mz"; depends=[]; };
+  CLA = derive2 { name="CLA"; version="0.96-1"; sha256="1nxzs0y6mid5f2903pxrkqc3rhk7vpax8wm588ddlz6c97y3m8gk"; depends=[]; };
   CLME = derive2 { name="CLME"; version="2.0-12"; sha256="161maq22r8wbd6c2dc8b47mh6991vc4iqmjr8g6yqb5gcwca8zhg"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
   CLONETv2 = derive2 { name="CLONETv2"; version="2.1.0"; sha256="15wqs4hdxyfdglfr4dkm4rndz15rbq7dxlq1zq3vfslvi1qxaxdb"; depends=[arules ggplot2 ggrepel sets]; };
   CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
   CLUSTShiny = derive2 { name="CLUSTShiny"; version="0.1.0"; sha256="19mh5g1ylvlab4xjxw7girxk9zkpxxczhbfijf11b592hbw0qxqk"; depends=[cluster dplyr klaR MASS psycho rmarkdown shiny]; };
-  CLVTools = derive2 { name="CLVTools"; version="0.6.0"; sha256="165b8mxmvfm7j2v10c0pn451fy05gy90vlxqbm3n1m4il0ynlhs3"; depends=[data_table foreach ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL]; };
+  CLVTools = derive2 { name="CLVTools"; version="0.7.0"; sha256="0w15dnl9ld5fjsq9xmm7j8fpar3fgr3mz6aj7ndnsxwhpja21rn5"; depends=[data_table foreach ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL]; };
   CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
+  CME_assistant = derive2 { name="CME.assistant"; version="1.1.1"; sha256="1dfb1pld4bsdkmgcfmaxyxqj8dh8wjsmvm82klc45sbhbaj10s5c"; depends=[data_table ggforce ggplot2 here lubridate readr readxl scales stringr usethis xlsx]; };
   CMF = derive2 { name="CMF"; version="1.0.2"; sha256="0hm6srsylg1syz86iz93qyxr7xgh1qvmp27k2hgkj1z1z8lsw1ca"; depends=[Rcpp]; };
   CMLS = derive2 { name="CMLS"; version="1.0-0"; sha256="1542qqsl6sksrcpwhnn55d260hkbmy4ikd0v2an96yxk5w95spvn"; depends=[quadprog]; };
   CMShiny = derive2 { name="CMShiny"; version="0.1.0"; sha256="0ciis3930yhn4dmazsg2yp7wi9hdfj5slr032x8qfllxis7m4k0w"; depends=[caret e1071 epitools Matrix rmarkdown shiny shinyMatrix]; };
   CMapViz = derive2 { name="CMapViz"; version="0.1.0"; sha256="1s7xyp13p7fpbq0bghk07dfv90339kxs7k3343jqhrn8djf3as67"; depends=[dplyr ggplot2 readxl reshape2 scales stringr]; };
   CMatching = derive2 { name="CMatching"; version="2.3.0"; sha256="0q0hplhsamj46z7g6pa7yg1bap5822ka1419yhcip551djhvnpmv"; depends=[lme4 lmtest Matching multiwayvcov]; };
   CMplot = derive2 { name="CMplot"; version="3.6.2"; sha256="13y05j5gsdc712fn7yvcz5nx2pbcdvl201hfb6jzpvl86qx2l0j1"; depends=[]; };
+  CNAIM = derive2 { name="CNAIM"; version="1.0.1"; sha256="1k1n4a60mslkrazarn12yaj54kibqsdhj44himpcjvf4kzv8k7vd"; depends=[dplyr htmltools htmlwidgets jsonlite magrittr plyr r2d3 readxl stringr testthat tibble widgetframe]; };
   CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
-  CNVScope = derive2 { name="CNVScope"; version="3.1.8"; sha256="1qgnwivb66bw1m5f3r5r3r4a8439pja0w44rdvbpdlwfdfk23d0b"; depends=[biomaRt data_table doParallel dplyr foreach GenomicInteractions ggplot2 jointseg magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rtracklayer shiny stringr tidyr]; };
+  CNVRG = derive2 { name="CNVRG"; version="0.2"; sha256="1678bkhpyynl0vzgdf9knn4xwa3289pmiw7x383fgv3hh8jsp1mn"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders vegan]; };
+  CNVScope = derive2 { name="CNVScope"; version="3.3.9"; sha256="0l2wrh314cyslyxd2fkx92ay4s5a7v23in4whs316qx5al04jbzw"; depends=[biomaRt data_table doParallel dplyr foreach GenomicInteractions ggplot2 jointseg magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rtracklayer shiny stringr tidyr]; };
   CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
   CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; };
   COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
@@ -651,10 +668,11 @@ in with self; {
   COST = derive2 { name="COST"; version="0.1.0"; sha256="06xgnsccd621ihlrdmnnh14vh83q1r2bnp3iqi7vp5553b3y4l3w"; depends=[copula mvtnorm]; };
   COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; };
   COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; };
-  COVID19 = derive2 { name="COVID19"; version="2.2.0"; sha256="0h4a1r84xb5d97p4v24xp518jv08kb9798fcnxrzy059cqv2dip8"; depends=[dplyr tidyr wbstats]; };
+  COVID19 = derive2 { name="COVID19"; version="2.3.1"; sha256="0a2d7hl22hmmwqnv88y7n2habvn85zi3gn2q18n16w03wp1kmnvq"; depends=[dplyr tidyr]; };
+  COVIDIBGE = derive2 { name="COVIDIBGE"; version="0.1.0"; sha256="0r505811wnskya507f9qwwy1j4gkv3cj4h8nl42892m3vk07w0vl"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; };
   CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; };
   CPAT = derive2 { name="CPAT"; version="0.1.0"; sha256="0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71"; depends=[purrr Rcpp RcppArmadillo Rdpack]; };
-  CPBayes = derive2 { name="CPBayes"; version="1.0.0"; sha256="0m9hy14xmaa0lswn2dlrjvqcsg14smxy3w1nmy48l3af1c2kjnxv"; depends=[forestplot MASS mvtnorm purrr]; };
+  CPBayes = derive2 { name="CPBayes"; version="1.1.0"; sha256="1kw0r8spqm0s7cb3w5gplw67mhfmcbbf3ligngbary77ghkzirnb"; depends=[forestplot MASS mvtnorm purrr]; };
   CPE = derive2 { name="CPE"; version="1.5.1"; sha256="0n3pd6daj0mzhh547syh7nz8iys6q27igqngldb8zd4ib4778603"; depends=[rms survival]; };
   CPMCGLM = derive2 { name="CPMCGLM"; version="1.2"; sha256="07hx2ik5zg05w1h6i94398mp54q958phws9ydgp6syjqlp9dpf1p"; depends=[abind mvtnorm plyr]; };
   CPP = derive2 { name="CPP"; version="0.1.0"; sha256="1kdf43pnavjbmxkvrj78fiwl0ykln9x9ck8pcivhj9q5rsfbhbh4"; depends=[ineq kappalab mc2d]; };
@@ -668,59 +686,66 @@ in with self; {
   CRPClustering = derive2 { name="CRPClustering"; version="1.2"; sha256="19m7jg6ck2gqmry2p35h3vv8msm4w1x7qwwmm746r646q7w9ylml"; depends=[dplyr lucid MASS mvtnorm png randomcoloR]; };
   CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
   CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; depends=[ggplot2 MASS Matrix]; };
-  CRUF = derive2 { name="CRUF"; version="0.5.1"; sha256="0mx7ksd5csy7v7v0wacfafs84sdfd41sy3f0yzpis9f07r7pqp3w"; depends=[aod miceadds survival survminer]; };
   CRWRM = derive2 { name="CRWRM"; version="0.0.1"; sha256="0w6lg5q2c0w5p9vg5qr32pycyl8d1zp0s55jlvf2xhmqx34677hd"; depends=[]; };
   CSESA = derive2 { name="CSESA"; version="1.2.0"; sha256="0pv6iabq1w22qbhlsbckdvva4n7igpzrjnrahmq83a6wxgvjbf5j"; depends=[Biostrings]; };
   CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; };
   CSMES = derive2 { name="CSMES"; version="1.0.0"; sha256="1ddr2b39d7nwan6dqf5xx9h6gzfxxk50r1d9vbpb9hc8a7d15vnp"; depends=[caTools data_table mco ROCR rpart zoo]; };
   CSTools = derive2 { name="CSTools"; version="3.1.0"; sha256="11mw7kl85m5l6ixlsbbmb9rfy6z6mfjdbgwmwrggjn4wbb0d0p76"; depends=[abind ClimProjDiags data_table ggplot2 maps multiApply ncdf4 plyr qmap rainfarmr RColorBrewer reshape2 s2dv s2dverification verification]; };
+  CSUV = derive2 { name="CSUV"; version="0.1.1"; sha256="1gh8gxwnrg4j017c08xfhm57rwci24sqmxxx00k3d0mw6j0mbdvw"; depends=[caret doParallel DT futile_logger ggplot2 glmnet HDCI MASS ncvreg relaxo reshape2 shiny shinyjs]; };
   CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; };
   CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; };
   CTAShiny = derive2 { name="CTAShiny"; version="0.1.0"; sha256="18qw8nx1r4gwlxj9zxn4hllpn29fv3i4fgwyl5fh3qsv9hmbvi0x"; depends=[epitools rpivotTable shiny shinyMatrix]; };
+  CTD = derive2 { name="CTD"; version="0.99.8"; sha256="1mq9hb5b8x08lc0x9xng09v1bw1w15fscvdj9lmwvwjg2hmjqfdg"; depends=[gmp igraph]; };
   CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; };
+  CTP = derive2 { name="CTP"; version="2.0.0"; sha256="10nzqswzga0rnsv5ivz120a9ybarnzq690xnxzfhsswhbc5mld6i"; depends=[clinfun diagram dplyr Gmisc magrittr MASS shape survival]; };
   CTShiny = derive2 { name="CTShiny"; version="0.1.0"; sha256="0lmzf02w8j4rgz1kh7jwvl0sb6y38r56gwmsf7pkc00w1dskb722"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; };
+  CTShiny2 = derive2 { name="CTShiny2"; version="0.1.0"; sha256="13klj1h0m80hlf5hbbzm2xriy37ky772pk1fm4b6k3xma7ss2a6q"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; };
   CTT = derive2 { name="CTT"; version="2.3.3"; sha256="02z354gf7rzh9xzyflmsag4hgmqgv3sr9s9ja903rwdz1pjqrlff"; depends=[]; };
   CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; };
   CTTinShiny = derive2 { name="CTTinShiny"; version="0.1.0"; sha256="1dc6kaxajkvviszmrcvhh9cg2k8g1hbpf1f6fg3wlgnb80fsx9b7"; depends=[CTT foreign shiny]; };
   CUB = derive2 { name="CUB"; version="1.1.4"; sha256="1l47fkfvd91mbfzgl0vwaahbyi53jv3md6zah9ns85ns6xlwap7n"; depends=[Formula]; };
-  CUFF = derive2 { name="CUFF"; version="1.6"; sha256="06ip6jrw6zgysz1lhlxxj26bv6hwg87qx6spqfinqrc9lz3p1y93"; depends=[DT lmerTest nlme openxlsx xtable]; };
+  CUFF = derive2 { name="CUFF"; version="1.7"; sha256="1fvzr5fq4ciwqkfcasv9lad3g831l2nmx307ya91qamjblaaryqb"; depends=[DT lmerTest nlme xlsx xtable]; };
   CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; };
   CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.5"; sha256="1qxq1a8b5pnmlq6rpjzvcp32scn2qknafch3h7qjsy8499zzbxx8"; depends=[]; };
   CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; };
+  CVEK = derive2 { name="CVEK"; version="0.1-2"; sha256="03z4s0szi8rl3izc651rvrhl2z247aaflyphzizplgmpw81xv1ry"; depends=[limSolve MASS]; };
   CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; };
   CVST = derive2 { name="CVST"; version="0.2-2"; sha256="05l3yzkfrbds09ah9cdwn2sn4ryhq78lz33ryzrgkv176jc8qjw5"; depends=[kernlab Matrix]; };
   CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; };
   CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
-  CVXR = derive2 { name="CVXR"; version="1.0-1"; sha256="023pf67ar0g795jdm6k3xjagns7gacmvab0sivrgisl4s51firdk"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; };
+  CVXR = derive2 { name="CVXR"; version="1.0-8"; sha256="02hb7msmsal1b4svpb8bxvd8d4mpvscp48ajhsggh576h23y1mnv"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; };
   CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
   CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; };
+  CVrisk = derive2 { name="CVrisk"; version="1.0.0"; sha256="1cv9nkmligbl46mabhhlp35csgmqsri536qr6vxs493xmq4wjlyf"; depends=[]; };
   CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; };
   CaPO4Sim = derive2 { name="CaPO4Sim"; version="0.1.0"; sha256="1ihkx0swj9adz2pgfm9c20pcipq748czkyg76q3y0zk1j987nfik"; depends=[DT htmltools magrittr plotly purrr rintrojs shiny shinycssloaders shinydashboard shinydashboardPlus shinyjqui shinyjs shinyWidgets visNetwork]; };
   Cairo = derive2 { name="Cairo"; version="1.5-12.2"; sha256="14hgz5wmnhlbqkd1g662n1agmjnlj3pq69gfng1vb0ivr02l2lnx"; depends=[]; };
-  CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; };
+  CalSim = derive2 { name="CalSim"; version="0.5.1"; sha256="1412i1d4i184yc34j221i59m4w46s02467sjnr1a955faj1k3c9k"; depends=[ExactMultinom spatstat]; };
   Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; };
   CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; };
   CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.3.0"; sha256="0qwqvyrpprxc5v0ng6qjp9gmdf0n0iiv46z14d8h303xpi84g42x"; depends=[survey]; };
   CamelUp = derive2 { name="CamelUp"; version="2.0.2"; sha256="102adw46rwhjx2wp34lhjxlgwi858dpmlzpj5wq85cnx5qkx01yx"; depends=[data_table dplyr ggplot2 magrittr Rcpp shiny]; };
+  CancerGram = derive2 { name="CancerGram"; version="1.0.0"; sha256="1p612dbn6dxn3nz8m0pzlsbczg3f8gwqk9q0fnxbcdlbll0vf2k0"; depends=[biogram devtools dplyr pbapply ranger shiny stringi]; };
   Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; };
   CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; };
   Carlson = derive2 { name="Carlson"; version="1.0.0"; sha256="1m030x30cd0w2r6y280v9kpqalx6djhyx9hfzhk1qbqh5rk7br2l"; depends=[]; };
   Cascade = derive2 { name="Cascade"; version="1.8"; sha256="0d75a9f43ligyjv62476plb86ipfq9y7g9njq4rx84cp17vbb662"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; };
   CascadeData = derive2 { name="CascadeData"; version="1.2"; sha256="0czc41f1vj61rkdl6gnnnga3qliyxp0ffl5j9wrhrlwnbdaknics"; depends=[]; };
+  CatDataAnalysis = derive2 { name="CatDataAnalysis"; version="0.1-3"; sha256="15wz7yjb83rd6d3xx0lb0p4x3ccnqpdkfanmbhykia50y8y32k5n"; depends=[]; };
   CatDyn = derive2 { name="CatDyn"; version="1.1-1"; sha256="0gkaxs7apqhq7mp3chjsyhrnk3qkk11f8p7smmyj6h73888ry8jn"; depends=[BB optimx]; };
   CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; };
   CatPredi = derive2 { name="CatPredi"; version="1.1"; sha256="1fqz2mb3xhpzvamf0bpqfql3vd86vq6fq7n6p8xq7lraj1w77lys"; depends=[CPE mgcv rgenoud rms survival]; };
-  CatReg = derive2 { name="CatReg"; version="1.0.0"; sha256="10qvp3v8bwsynxxl1a6qkp9ddfqygjc0cm1nbxi86dwyi26mcvz0"; depends=[Rcpp Rdpack]; };
+  CatReg = derive2 { name="CatReg"; version="2.0.1"; sha256="1wlzs7my9bdjb85bayq3rgb9mw5aqzhsf7s1j498w60z7hsgf7df"; depends=[Rcpp Rdpack]; };
   CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
-  CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; };
   CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; };
   CausalImpact = derive2 { name="CausalImpact"; version="1.2.4"; sha256="0nszqvaxmz9jrb7wqdmjjplajk8mxpyyl14n2fm5p4pyx8srwphq"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; };
   CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; };
+  CausalMBSTS = derive2 { name="CausalMBSTS"; version="0.1.0"; sha256="19ils8254vrbm3hbrjkk2r7xczr52zjhd38dfy7p1ksd2lm6x5qy"; depends=[CholWishart forecast KFAS MASS Matrix MixMatrix]; };
   CausalQueries = derive2 { name="CausalQueries"; version="0.0.3"; sha256="1hnxxyix9zrg5ryzqksv0cl8m3n3n660dbg1msa0pn18dnbjbmj0"; depends=[BH dagitty dplyr gtools randomizr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr]; };
   CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; };
   CePa = derive2 { name="CePa"; version="0.7.0"; sha256="0jykh0f168azphjd3h1q81wlvj8zn8qy0c4wi275gvw0xwi104mk"; depends=[graph igraph Rgraphviz]; };
   CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.3"; sha256="0l36bz73xy9miikqdigbnyr0bk83dx6wsaqlsc14b0r64jca4ak6"; depends=[gtools igraph survival]; };
-  CenBAR = derive2 { name="CenBAR"; version="0.1.0"; sha256="0qa1jzgvf33fi0vns7v49hjk0wkaxic7dw67m0wr33wjplf93wnh"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; };
+  CenBAR = derive2 { name="CenBAR"; version="0.1.1"; sha256="1k8ycm2rzwadr5bg6m0ay81c5v4wjg04yigch6a1w7g75gw01q50"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; };
   CensMFM = derive2 { name="CensMFM"; version="2.11"; sha256="0rq0a9041ipl6pjm15plb1hjz3a3fk27wzj94z91wf1jsmdj3j9z"; depends=[ggplot2 gridExtra MomTrunc mvtnorm tlrmvnmvt]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
   CensSpatial = derive2 { name="CensSpatial"; version="2.58"; sha256="1jlr6v4qmqvmhcs10iv2nckmlhz3hzmrmj2gsdvfa5n8pgi2mak9"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tlrmvnmvt tmvtnorm]; };
@@ -738,28 +763,26 @@ in with self; {
   ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
   ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-  ChemoSpec = derive2 { name="ChemoSpec"; version="5.2.12"; sha256="1qr09n2yc009x8ag0lbmn1m93qhck05jc8vx7j5wfa0g4i1b2r7f"; depends=[ChemoSpecUtils plyr readJDX]; };
-  ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.147"; sha256="0rmnkk9ddxr32l09bj8qkh1jpffwkyczjr6vwk1qliwfwsbc78rl"; depends=[ChemoSpecUtils colorspace readJDX]; };
+  ChemoSpec = derive2 { name="ChemoSpec"; version="5.3.2"; sha256="0f1jl018a5mbr5dn6996n3il1y3cc6iabvh1vqjf6f0wgxa2k94s"; depends=[ChemoSpecUtils plyr readJDX]; };
+  ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.176"; sha256="0a6vs1zr0kjcaph0vkxzhy6i5fzv48nkdzavvq788mqaszd50kxv"; depends=[ChemoSpecUtils colorspace readJDX]; };
   ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.51"; sha256="0wwzv6qkm6iya6gld1jlxk1hnzf6ndpwjppk93bi6pgjkgjq5i5g"; depends=[plyr]; };
-  ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; };
   ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; };
   ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; };
   ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
   CholWishart = derive2 { name="CholWishart"; version="1.1.0"; sha256="1p92i5ibv9805fg8s5wrpxx63k4c1ihs1x2zlaz9vbkqypkl8aqz"; depends=[]; };
-  CircMLE = derive2 { name="CircMLE"; version="0.2.3"; sha256="02nhxw75w84m95p3hmkcgbrs547scvfap8130fxm480y0r3d0zc6"; depends=[circular]; };
+  CircMLE = derive2 { name="CircMLE"; version="0.3.0"; sha256="1nr6qicy5y247j970jw74pkbyhx4zjgajf2ygkxmdw6gfx5byn64"; depends=[circular energy]; };
   CircNNTSR = derive2 { name="CircNNTSR"; version="2.2-1"; sha256="0mpm6vrkl3ap67khky8dndwvl9yzycm0rlv0vzznlygvlsg8sc38"; depends=[]; };
   CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; };
   CircSpaceTime = derive2 { name="CircSpaceTime"; version="0.9.0"; sha256="0dplgm5x4c1xxnv6062n643mn5zh0najw3f41pv2qafc1lil4wx8"; depends=[circular coda ggplot2 Rcpp RcppArmadillo RInside]; };
   CircStats = derive2 { name="CircStats"; version="0.2-6"; sha256="07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf"; depends=[boot MASS]; };
   CircularDDM = derive2 { name="CircularDDM"; version="0.1.0"; sha256="1wxdjj7dndvhvl00cykcrwmw9f7halsg3a0db56kp2mhf54rj37z"; depends=[Rcpp RcppArmadillo]; };
-  Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; };
   CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
   CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; };
   Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.3"; sha256="0k08smvgplzcjq1rdbxyalw6iynr129bhdq0wcdn95baqpb5w556"; depends=[Rcpp Rdpack]; };
-  Claddis = derive2 { name="Claddis"; version="0.3.4"; sha256="161qgj4r8qah3r1m7gx2rwn9ng62y1p6gn62r1gp43pkrp2jlqj9"; depends=[ape clipr gdata phytools strap]; };
+  Claddis = derive2 { name="Claddis"; version="0.6.3"; sha256="0wq34n6vj5sdc22yf9p4g9iy8ssgr4kkrsr2ak4sqahadwgngl8i"; depends=[ape clipr geoscale phytools strap]; };
   ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
   ClassComparison = derive2 { name="ClassComparison"; version="3.1.8"; sha256="0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl"; depends=[Biobase oompaBase]; };
-  ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.12"; sha256="1r9fri9mlvzhd5ki5spd6xqq6767p6hha72cr3r20s1z5327wkpy"; depends=[Biobase cluster mclust oompaBase oompaData]; };
+  ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.13"; sha256="08ngmp77aff3dhh711wmzybk4ial2lv9750g3w19l0wjjd1rsm0m"; depends=[Biobase cluster mclust oompaBase oompaData]; };
   CleanBSequences = derive2 { name="CleanBSequences"; version="0.4.0"; sha256="12s24v2kfyc32pm34ibw58zzjqhzwlrqrkhl0m70jcqvn50b5r98"; depends=[Biostrings]; };
   ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; };
   ClickClustCont = derive2 { name="ClickClustCont"; version="0.1.7"; sha256="1caymvpwvxq4rirnjm2kwzvqm1pl01rdc3785k8mq4k2m0n6l2rz"; depends=[gtools]; };
@@ -773,14 +796,14 @@ in with self; {
   ClinicalUtilityRecal = derive2 { name="ClinicalUtilityRecal"; version="0.1.0"; sha256="17xj9cmdkjrzx7mshka2hlkxh8887sprdqix7fd8jcr9bmc6ad9r"; depends=[caret cowplot ggplot2 lattice nloptr]; };
   CliquePercolation = derive2 { name="CliquePercolation"; version="0.2.0"; sha256="1zllhl1674734sr0hmfgwdyqlk4rcjdqqrd7rx30llqri478jdff"; depends=[colorspace igraph magrittr Matrix Polychrome qgraph]; };
   CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.10"; sha256="1mpzcbwrrah7kf60l6khdqd4nivm6hpp5xmgg40rahph4wl5ydfp"; depends=[combinat gtools quantmod]; };
-  CluMP = derive2 { name="CluMP"; version="0.8"; sha256="130aqfxdp1pj5z3hnmy06rp5ywcmr389wn114ja5c2imxxkm3fi3"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; };
+  CluMP = derive2 { name="CluMP"; version="0.8.1"; sha256="1vpxl2rcknqx32b94b48iirkh7r7cdri9mcljrw29gsbvhrfc46k"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; };
   ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; };
   ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; };
   ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; };
   ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; };
-  ClustBlock = derive2 { name="ClustBlock"; version="2.2.0"; sha256="07hcgfap2bjcwy8bynz1hk2cb1amli204k2fsjc30m9p7bhyrqs3"; depends=[FactoMineR]; };
+  ClustBlock = derive2 { name="ClustBlock"; version="2.3.1"; sha256="16dhwrpw6c8l9nzk2k3wryhz9ydmnl3va1ncab6wl52gzdbd7c9j"; depends=[FactoMineR]; };
   ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; };
-  ClustImpute = derive2 { name="ClustImpute"; version="0.1.5"; sha256="17wx4w0cw0cvfbibj1dchi6g0ipr4ly6x5d2iy4lz6r9yj185nmw"; depends=[ClusterR copula dplyr magrittr rlang]; };
+  ClustImpute = derive2 { name="ClustImpute"; version="0.1.6"; sha256="1jv3hlbw2k94pw8vhyli9lnr3vb3czrh346rgd4wkiwk7c7a58bz"; depends=[ClusterR copula dplyr magrittr rlang]; };
   ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; };
   ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; };
   ClustVarLV = derive2 { name="ClustVarLV"; version="2.0.1"; sha256="1wl4kkhf17fi3vgbv0ph0yii2l93cgisxm3s0g9w8zhyn60dwwb0"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; };
@@ -790,18 +813,18 @@ in with self; {
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
   ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; };
-  Clustering = derive2 { name="Clustering"; version="1.6"; sha256="0r0awijhzv611qf2r2n1xwd369s9719r5hfvw2hipiy0jssfqfbv"; depends=[advclust amap apcluster cluster ClusterR data_table gama ggplot2 glue gmp pracma pvclust sqldf xtable]; };
+  Clustering = derive2 { name="Clustering"; version="1.7.1"; sha256="0al1vgik1qp4nxfm2hfz7m72q158czdkiv0fs9ka73hjwgzdvf1v"; depends=[advclust amap apcluster cluster ClusterR data_table doParallel dplyr foreach future gama ggplot2 gmp pracma pvclust shiny sqldf xtable]; };
   CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; };
   CoDiNA = derive2 { name="CoDiNA"; version="1.1.2"; sha256="1zjj86z8ica9j0x2nfyq9y6nyp54w07dwskcsg7z6kqibrkfvaq9"; depends=[data_table igraph magrittr plyr reshape2 visNetwork]; };
   CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; };
   CoImp = derive2 { name="CoImp"; version="1.0"; sha256="06y722flpiqpwq0p7ik86s09mdnvqw3hdybhdzn8vfns5swc8x1y"; depends=[copula gtools locfit nnet]; };
-  CoRpower = derive2 { name="CoRpower"; version="1.0.3"; sha256="007v6khv2kkf398cqy3vjv0ncd7zc8ad084a5qhpplsnj1f3ll2j"; depends=[osDesign survival]; };
+  CoMiRe = derive2 { name="CoMiRe"; version="0.7"; sha256="19q9qq85xnxlw9zdijmpis83zw98r8spxvb8fsfzp3vyk7hk8gyg"; depends=[ggplot2 gtools KernSmooth mvtnorm NonpModelCheck Rcpp RcppArmadillo rlang splines2 truncnorm]; };
+  CoRpower = derive2 { name="CoRpower"; version="1.0.4"; sha256="08chsbbl74rskinp68pwzpvnxx5lkfqf71j7ryp1cwy7199h3jyw"; depends=[osDesign survival]; };
   CoSMoS = derive2 { name="CoSMoS"; version="2.0.0"; sha256="1qnpfipf24szzrmkla7v5dn8g6mrg5x5lqsc6418mm1p795ym3ry"; depends=[animation cowplot data_table directlabels ggplot2 mAr Matrix matrixcalc MBA mvtnorm nloptr plotly pracma]; };
   CodataGS = derive2 { name="CodataGS"; version="1.43"; sha256="1bjn6s1f5jn64gwrvjz5kvwfkbqrqhavib6dj9k37rb5nzqkwhp6"; depends=[Matrix]; };
   CodeDepends = derive2 { name="CodeDepends"; version="0.6.5"; sha256="0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq"; depends=[codetools graph XML]; };
   CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
   Coinprofile = derive2 { name="Coinprofile"; version="0.1.9"; sha256="1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0"; depends=[coin exactRankTests ggplot2 plyr Rdpack zoo]; };
-  CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; };
   CollapseLevels = derive2 { name="CollapseLevels"; version="0.3.0"; sha256="1d2grxh95893j260igh4yh2z3rm3zymlpadqyp6w3na91birazb4"; depends=[dplyr ggplot2 lazyeval magrittr]; };
   CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; };
   ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; };
@@ -816,8 +839,10 @@ in with self; {
   CommonMean_Copula = derive2 { name="CommonMean.Copula"; version="1.0.0"; sha256="0j489hb4vlj3xkdq9vf2qjmcfb8ccff82vsmz63f25ws9pgc2lk2"; depends=[mvtnorm pracma]; };
   CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
   Comp2ROC = derive2 { name="Comp2ROC"; version="1.1.4"; sha256="06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d"; depends=[boot ROCR]; };
+  CompAREdesign = derive2 { name="CompAREdesign"; version="1.5"; sha256="10c782r1sgwnm0yqfyg3m2x3k8dmpazvb1hy7gvb2kn0z6rzlpbh"; depends=[]; };
   CompDist = derive2 { name="CompDist"; version="1.0"; sha256="02c18ksk6clv674yh79bzg3mh9hymzhal51j6g0rnvqd5ra8g66c"; depends=[actuar fExtremes numDeriv PearsonDS rmutil VGAM]; };
   CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
+  CompModels = derive2 { name="CompModels"; version="0.2.0"; sha256="058yvwb7p6rj6g1hcwgdzgjv0lwg7m5hgrv1pjfi4dskaibd4k17"; depends=[]; };
   CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; };
   CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
   CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-6"; sha256="1yr1d97l6yc07jwh30j26gda15pjfcwx2z3w55dh3nr15vds0qcp"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; };
@@ -827,13 +852,15 @@ in with self; {
   ComparisonCR = derive2 { name="ComparisonCR"; version="1.0.4"; sha256="10xw3ppkzpc3njc409ln7g6bg33csf2ilw3f11hn60ry5xbnn82y"; depends=[boot CIFsmry cmprsk]; };
   ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.0.9"; sha256="1xvxkj0i59fq05df6szx4k32w2447mxcx3877l2myag4x6i6c74l"; depends=[muhaz survival survRM2 TSHRC]; };
   Compind = derive2 { name="Compind"; version="2.1"; sha256="1cjvpgankifiql67imhxx382q2lz1jq9k0nrwzq560h0xizkak6i"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; };
-  Compositional = derive2 { name="Compositional"; version="3.9"; sha256="0ma5law5dx87x9sjdbffgck80cxxbyhq20jld2ic4hdsm41h934z"; depends=[doParallel emplik FlexDir foreach MASS mda mixture RANN Rfast Rfast2 sn]; };
+  ComplexUpset = derive2 { name="ComplexUpset"; version="0.7.3"; sha256="0hyxkr9y001gl49qs5d6rdjmykmgh24mwrjd8cjvh22q43pdn23n"; depends=[ggplot2 patchwork scales]; };
+  Compositional = derive2 { name="Compositional"; version="4.2"; sha256="1a1cv5m5b79zavgzpz8hjzls3sm658n3f9qhv609g5681w2m6iq7"; depends=[codalm doParallel emplik FlexDir foreach MASS mda mixture nnet RANN Rfast Rfast2 sn]; };
   CompoundEvents = derive2 { name="CompoundEvents"; version="0.1.0"; sha256="03shw3016xc41a6by8pnpqs7mmnhs0qmg5aqd4hlfcy3dv2w9wkf"; depends=[]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
-  ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; };
+  ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6.1"; sha256="1ziy646lbx297kia797xjxa8hyl826x1hiighyjslvnlvrhapx08"; depends=[Rcpp]; };
   ConR = derive2 { name="ConR"; version="1.3.0"; sha256="1q93x2b7a2jgkybazk24x8gvwvjjvkhi1gy5zx1sc2f4arm73myq"; depends=[doSNOW fields foreach geosphere raster rgdal rgeos rnaturalearth sf snow sp tibble writexl]; };
   ConSpline = derive2 { name="ConSpline"; version="1.2"; sha256="16r0v0llj0pri69jqxribp8dpzh6yn6acpq20aaky14fyh3i4q7x"; depends=[coneproj]; };
   Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; };
+  ConcordanceTest = derive2 { name="ConcordanceTest"; version="0.1.0"; sha256="04csv3l9avrb304m55plnfhrhrc3kk1kbvzx7r83f3k9c09w41mc"; depends=[Rglpk]; };
   CondIndTests = derive2 { name="CondIndTests"; version="0.1.5"; sha256="0km4z8wnj5msg1pmphk2fccbw1cidsxv174817lwcyii9nf5iwsm"; depends=[caTools kernlab lawstat MASS mgcv mize pracma quantregForest randomForest RPtests]; };
   CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
   ConfIntVariance = derive2 { name="ConfIntVariance"; version="1.0.2"; sha256="0xm3vh3vmf16faa3934100rnrg4rvlqkgjlsqa2smzcvy5vb86z4"; depends=[]; };
@@ -850,19 +877,19 @@ in with self; {
   ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="2.2.1"; sha256="0mn0lnycz5pi821q52g1njjs2pcmvv8yynr13bh237c8cashk2n3"; depends=[lmtest sandwich]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.2"; sha256="1pvcl0bgd4anrbn6wqxsd1s23ycsc7jhrk94yzwx67xx0qs9mmrw"; depends=[lattice tkrplot]; };
   CoopGame = derive2 { name="CoopGame"; version="0.2.1"; sha256="1c11b5l6r5csa6zw5a6lfqaygzhnp5jfdf0vkrxpl7fb4bbxhm31"; depends=[geometry gtools rcdd rgl]; };
-  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-15"; sha256="0hvvfdcdmdi72yd2rsgza8d7ngp6w913rggbvvcj4vh9wvqpk1r3"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; };
+  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-18"; sha256="0gdvna1a43p419hrs78afas9w7xhiqaqr4yivbkjms3l9cr5zb87"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; };
   CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="2.8"; sha256="0wyb80jj9zgh7kn0nah7dljps72083c92hpds94dw4ccmw6cfwf6"; depends=[]; };
   Copula_Markov_survival = derive2 { name="Copula.Markov.survival"; version="1.0.0"; sha256="1sxg0ir39f4hj4m6imija0c88j513j6fflcp7xc0599iglwsrbvs"; depends=[survival]; };
-  Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; };
+  Copula_surv = derive2 { name="Copula.surv"; version="1.1"; sha256="1zs2jvb07948g2aspy8877j4hdzavd57lmv4x2yrf6gb4xzs3x3n"; depends=[]; };
   CopulaCenR = derive2 { name="CopulaCenR"; version="1.1.2"; sha256="1ksxqgb91vww5q4njidchxwia64g5229dvpxhqhfp8w6hvmib1k1"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; };
   CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.3"; sha256="152g8nfa3ksj0dlzlch9a6g18b1vi6dlw748a6m55haghchbyr9l"; depends=[matlab mc2d statmod tensor]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; };
-  CorBin = derive2 { name="CorBin"; version="0.3.3"; sha256="0jf3d0mbr0vmcqmk5p4rcvc3nc4dn6cqcj8fcqyf32y9vwxd2wii"; depends=[]; };
+  CorBin = derive2 { name="CorBin"; version="1.0.0"; sha256="0mjvhj9cw21xjg96fz5bcyfxgwdw367l1942a38by77ylypdfq3y"; depends=[]; };
   CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; };
-  Corbi = derive2 { name="Corbi"; version="0.6-0"; sha256="17jk4kidlvrwhyjgm3hs22pzs7170r7smihmf7v0pnhvn57ak12c"; depends=[Matrix]; };
-  CornerstoneR = derive2 { name="CornerstoneR"; version="2.0.1"; sha256="1vy1zcz4vjpv52icz50gfn5276n1wpjwmzhh90i9ippii7q76vim"; depends=[checkmate data_table minpack_lm ranger SpatialTools vcd]; };
+  Corbi = derive2 { name="Corbi"; version="0.6-1"; sha256="0ig0rx4llkgqvg2sx6xmzhh9sjgy4qnw22xs84gxgqidi50f2a85"; depends=[CRF igraph MASS Matrix]; };
+  CornerstoneR = derive2 { name="CornerstoneR"; version="2.0.2"; sha256="04dvryhcyi7f6bmm4067cn5vmy7kdqi3bys7ln8nnsc0kkdjxhi5"; depends=[checkmate data_table minpack_lm ranger SpatialTools vcd]; };
   CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; };
   CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; };
   CorrMixed = derive2 { name="CorrMixed"; version="1.0"; sha256="0rj987k8pzsw9n9a20ky23rwc3zyqsl0fcibpmry7p8pw2miaj0z"; depends=[nlme psych]; };
@@ -877,29 +904,28 @@ in with self; {
   CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; };
   CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; };
   CovTools = derive2 { name="CovTools"; version="0.5.3"; sha256="0r3q97zl72v7i1d9nhxgsilqczihhfq6zzhl4cmz8rbk3b7c7qrc"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes SHT]; };
-  CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
+  CovidMutations = derive2 { name="CovidMutations"; version="0.1.3"; sha256="03bl9frjfj8i7ydgi245113yzyg8rkgqxasicmqcjdd68zbz00kn"; depends=[cowplot dplyr ggplot2 ggpubr seqinr stringr VennDiagram]; };
   CoxPhLb = derive2 { name="CoxPhLb"; version="1.2.0"; sha256="0jlh2k5ygj896sfx7dcw5qlb80bl64rsvqfayv0c6a107bmrzsw4"; depends=[survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
   CoxR2 = derive2 { name="CoxR2"; version="1.0"; sha256="1fjsa403lbx0hi7b0gsdaz0q9axw521q4xzphbfbknify4y72md6"; depends=[survival]; };
-  CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
   CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; };
   CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; };
   Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; };
   CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
   CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; };
+  Cronbach = derive2 { name="Cronbach"; version="0.1"; sha256="1gkapi7pgf1mwidhgdf3y5cm4bz5igzb7mdflz560aa67asp1qyf"; depends=[boot]; };
   CropDetectR = derive2 { name="CropDetectR"; version="0.0.1"; sha256="14sabqld94if7f2m39bh6652cb62hcwx53k8q5k23anzzsn93qlj"; depends=[dplyr EBImage imager reshape2]; };
-  CropScapeR = derive2 { name="CropScapeR"; version="1.1.1"; sha256="103mnnppa30hxzy3pkaq66n7p5qfnv8g8dh34gqx0n80q2xpck2b"; depends=[data_table dplyr httr magrittr raster RJSONIO sf]; };
-  CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; };
+  CropScapeR = derive2 { name="CropScapeR"; version="1.1.2"; sha256="1d2pyr0p7m7yw7n4ghvyxs2cwxyrpgc4238ma8fy8f29dfp7mnbq"; depends=[data_table dplyr httr magrittr raster RJSONIO sf]; };
   CrossVA = derive2 { name="CrossVA"; version="0.10.0"; sha256="08mq8d6la5gz3yv5a3lc70dxdgf29q1vngi8lrgdy58p9415pxjv"; depends=[stringi]; };
   CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; };
-  CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; };
+  CruzPlot = derive2 { name="CruzPlot"; version="1.4.2"; sha256="1sbw0i0d3qh417ivxxc5hghn94x6055wm985bmm1hscj1ym4vaxq"; depends=[dplyr DT geosphere mapdata maps marmap shiny shinydashboard shinyjs stringr swfscDAS]; };
   CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; };
   CsChange = derive2 { name="CsChange"; version="0.1.6"; sha256="0ahgzir1rz5hh2jkgabp9vccg527vbvmkdyxf9lyz5yxkig3jv2s"; depends=[boot Hmisc rms survival]; };
   Cubist = derive2 { name="Cubist"; version="0.2.3"; sha256="1x71n72n12alyl7d9vdf3xb3ks14lql4pxxxnimk2gq7brc5z10r"; depends=[lattice reshape2]; };
   CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; };
   CustosAscensor = derive2 { name="CustosAscensor"; version="0.1.0"; sha256="1axyhwf9rc9dvrrcrpmx69kp49nwb0an7csn9qbjmx9jwwav11l5"; depends=[]; };
   CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; };
-  Cyclops = derive2 { name="Cyclops"; version="3.0.0"; sha256="0g10pkas9zd87nk47imxywgxdh5kx2kyj4kmmkzi2dba95f8pwil"; depends=[Andromeda BH dbplyr dplyr Matrix Rcpp RcppEigen rlang survival]; };
+  Cyclops = derive2 { name="Cyclops"; version="3.1.0"; sha256="0xb9rd3bjgng4ydr4syrwibyix5h6a6ywq52pidg8g0wnbg8icfz"; depends=[Andromeda BH bit64 dplyr Matrix Rcpp RcppEigen rlang survival]; };
   CytobankAPI = derive2 { name="CytobankAPI"; version="1.3.0"; sha256="1rrqhsqv5xc58dvkrbs9c83pkqz5np59shm7xjmqxdjj2rxj8zqn"; depends=[curl httr jsonlite]; };
   CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; };
   CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; };
@@ -907,16 +933,15 @@ in with self; {
   D3partitionR = derive2 { name="D3partitionR"; version="0.5.0"; sha256="10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03"; depends=[data_table functional htmlwidgets magrittr RColorBrewer titanic]; };
   DAAG = derive2 { name="DAAG"; version="1.24"; sha256="09fxd21p7v9mpy9s876n1jyc3l7w7s3vs5iglc3xphqbffgzfnvs"; depends=[lattice latticeExtra]; };
   DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; };
-  DAC = derive2 { name="DAC"; version="0.1.1"; sha256="0abnl70k4c98n29qi64sfd5nch10abw9fknhf2aksyi0qadsiyjq"; depends=[blavaan flexmix sfsmisc truncnorm]; };
   DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; };
   DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; depends=[]; };
-  DAISIE = derive2 { name="DAISIE"; version="3.0.0"; sha256="1114h6qsydjy1gz3inpmjy4kx9skkkr0n1x3y3nz1igwwr44jp1n"; depends=[DDD deSolve doParallel foreach magrittr Matrix pracma subplex tensor testit]; };
+  DAISIE = derive2 { name="DAISIE"; version="3.0.1"; sha256="10b55m4ycb07l0mfjx58zfmckk627arj575p9via6kr7lp1c3j59"; depends=[DDD deSolve doParallel foreach magrittr Matrix pracma subplex tensor testit]; };
   DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; };
-  DALEX = derive2 { name="DALEX"; version="1.3.1.1"; sha256="0akw1yzhb3shpg6yb89vralqd2z80z5yk9azqaa55dx56as52kjs"; depends=[ggplot2 iBreakDown ingredients]; };
-  DALEXtra = derive2 { name="DALEXtra"; version="1.3.2"; sha256="1acasrhg7apdqd3p2vkkssdpirbg4alsv4lv60ngqvb3ccd8hy31"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; };
+  DALEX = derive2 { name="DALEX"; version="2.0.1"; sha256="1hiknx55d91abyfj3w4a2xxin7f1q8h5k0041m7w93xjdc4kis98"; depends=[ggplot2 iBreakDown ingredients]; };
+  DALEXtra = derive2 { name="DALEXtra"; version="2.0"; sha256="1fbl0idvvhpqn6qiw6pn426n1dvf0hdi228nkr23f2d08rgfbsxh"; depends=[DALEX ggplot2 gridExtra reticulate]; };
   DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; };
   DAMOCLES = derive2 { name="DAMOCLES"; version="2.3"; sha256="0pk9gq82qa18fl7zp74d47bgy8lhj9rkvfq23w8844nz9kn58s1f"; depends=[ape caper DDD deSolve expm Hmisc Matrix matrixStats picante]; };
-  DAMisc = derive2 { name="DAMisc"; version="1.5.4"; sha256="1xs9jibpxg6py9ry4mad2yj4x99jnv19df0d6f9yc760wipb5ymk"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan xtable]; };
+  DAMisc = derive2 { name="DAMisc"; version="1.6.2"; sha256="0arazw6pjgd9xgsdnyz8ccwyrpakyqzraw6j08zlrnn6hv7p29mr"; depends=[AICcmodavg boot car clarkeTest coda dplyr DT effects gamlss ggplot2 glue haven janitor jtools lattice latticeExtra magrittr MASS nnet optiscale rlang rstan survey tibble tidyr tidyselect xtable]; };
   DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; };
   DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; };
   DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
@@ -932,7 +957,7 @@ in with self; {
   DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
   DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; };
   DCPO = derive2 { name="DCPO"; version="0.5.3"; sha256="1h14xnii6kv6sc7pfxalif3bj0mifnxg46x4lwbixx9vzxxz96sq"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; };
-  DCchoice = derive2 { name="DCchoice"; version="0.0.16"; sha256="0wwhdpljg1k70kydhh89lk6c461a9vjw6p2ijzhvgkv2pl5rxaag"; depends=[Formula interval MASS]; };
+  DCchoice = derive2 { name="DCchoice"; version="0.0.17"; sha256="0bhnhrwq54kksaqazz18hsy2x63876rj02d1q62by6vpxb5k0k9w"; depends=[Formula interval MASS]; };
   DChaos = derive2 { name="DChaos"; version="0.1-5"; sha256="0dzwyqncv5cb8qr0bwpy91ijbz8yamlhnhxwpc4wpiffzhf2d4hq"; depends=[nnet outliers pracma sandwich xts zoo]; };
   DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
   DClusterm = derive2 { name="DClusterm"; version="1.0-1"; sha256="04i9fyph2k3ffds0nv49371p8lw6dkzcf27pc98f99x0l6c8k5iq"; depends=[DCluster lme4 sp spacetime xts]; };
@@ -940,31 +965,33 @@ in with self; {
   DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; };
   DDIwR = derive2 { name="DDIwR"; version="0.4"; sha256="0z994anrw746iy83503bah2n39rd7qvx4spxn4qwhxhxbjp4gkfw"; depends=[admisc haven readr tibble xml2]; };
   DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; };
-  DDPGPSurv = derive2 { name="DDPGPSurv"; version="1.0"; sha256="1d271yv621jmwd4dmdnhpwrk95gbpw7g6r2v05lc3d6wzlzpd78c"; depends=[MASS mc2d mvnfast Rcpp RcppArmadillo survival]; };
   DDPNA = derive2 { name="DDPNA"; version="0.2.6"; sha256="0ygyyxhhggyrllgzgmyxk4g1syz9qkp2rsawjgb8cz6w8nr06saq"; depends=[ggalt ggplot2 Hmisc igraph MEGENA plyr scales VennDiagram]; };
   DDRTree = derive2 { name="DDRTree"; version="0.1.5"; sha256="16s5fjw7kwlxhrkzdny62sx32fvmg3rxjc3wrh6krd31jh1fqlfk"; depends=[BH irlba Rcpp RcppEigen]; };
   DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; };
   DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; };
   DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; };
   DEEVD = derive2 { name="DEEVD"; version="1.2.1"; sha256="0r8ymkwqjxjh49bh463f6wgdx22m420y0lkbgdwkbnzfgp5jmaar"; depends=[evd]; };
-  DELTD = derive2 { name="DELTD"; version="2.6.5"; sha256="069njvzrffq64f0y05mm8pn58l9xsxacy12slj1w6np5nbvsp7b2"; depends=[]; };
+  DELTD = derive2 { name="DELTD"; version="2.6.6"; sha256="1slhxclan82sqxi6zyd07z4iapf8p68hrqk4ssr7csr4ffxbp2y9"; depends=[]; };
   DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; };
+  DEPONS2R = derive2 { name="DEPONS2R"; version="1.0.0"; sha256="17iw3cy5hypp0x43x0wwq7mfajbkz4q55bwj7c8pqnfma59vslb8"; depends=[raster sp xml2]; };
   DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; };
   DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
   DET = derive2 { name="DET"; version="2.0.2"; sha256="01vyb3mv4g7zpk7cn44i4069ndk9sn9qqs9k52clqbnf1kl1ynbx"; depends=[doParallel pROC]; };
   DEoptim = derive2 { name="DEoptim"; version="2.2-5"; sha256="0nlm2gdvd33yrwambmlrgj76inxz2a65ya7727l98fd4skfdw4mf"; depends=[]; };
   DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; };
   DEploid = derive2 { name="DEploid"; version="0.5.3"; sha256="0k5bcpfwf9fhkv0wp6s1nvp4l6xgwmdbz3l8mmiy8q1ym7gpvwml"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; };
-  DFA = derive2 { name="DFA"; version="0.1.0"; sha256="14766binxz1bv4c492r4clj77ykp31v2h5bajydfn2336zz18m5y"; depends=[]; };
-  DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.1.8"; sha256="1jcvxngghfx5sdw5vjpx7yf5nqp5ws8fnwb07ycpzsa4sgb4nddn"; depends=[MASS MVN]; };
+  DFA = derive2 { name="DFA"; version="0.9.0"; sha256="0nk8k6xxqbbk1zhq3xsm59azvkj9499vp92pjl9xygasarim90rl"; depends=[]; };
+  DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.2.0"; sha256="1kfnqg281cdws7gqn5s0klcvdc505d0y1chab2925wdihib7m2w4"; depends=[MASS MVN]; };
   DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; };
   DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; };
+  DGEobj = derive2 { name="DGEobj"; version="1.0.1"; sha256="0fvjlb45fx44dqz1njsxdgiiwcmvi7ifzywbrxbvrx0ar7c4yd0m"; depends=[assertthat GenomicRanges magrittr stringr]; };
   DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.3"; sha256="1prsnkkhb61y01flxz57875a9arvyy2qxjl0lz5ajpmf8dhr08j8"; depends=[COMPoissonReg nloptr progress]; };
-  DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; };
-  DHARMa = derive2 { name="DHARMa"; version="0.3.2.0"; sha256="1xhn8bw3fdq1wqwkabdwgv0g41zxjc38kjbj049zjn0k1y1nzhqw"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qgam sfsmisc]; };
+  DHARMa = derive2 { name="DHARMa"; version="0.3.3.0"; sha256="125wmcsnjp8h6bpqk812rysb6yv6ib5jyzf703l3q54bm0g2ww99"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qgam sfsmisc]; };
   DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; };
-  DHS_rates = derive2 { name="DHS.rates"; version="0.7.1"; sha256="0n5cqbi5j57dxah04nsjr5cd0x7ini31fnqwkq6xiq7ds9k5ikf0"; depends=[crayon haven matrixStats reshape survey]; };
+  DHS_rates = derive2 { name="DHS.rates"; version="0.8.0"; sha256="1mq4hqkghp6nk7jjwp9hfd81mjxrnkl4dvafd0vgav4yb8mhq8c2"; depends=[crayon dplyr haven matrixStats reshape rlang survey]; };
+  DICOMread = derive2 { name="DICOMread"; version="0.0.0.2"; sha256="0b78057did8ww4hyfy33ly6b9f7lzpiwjzdm7mjfd4gkfilmvh0j"; depends=[matlabr]; };
+  DIDmultiplegt = derive2 { name="DIDmultiplegt"; version="0.1.0"; sha256="1jzc2ixb92mxlm39xf3rmab9c8959xylnxacr4xqjnhi9hlkq30n"; depends=[assertthat dplyr fixest plotrix sampling stringr]; };
   DIFboost = derive2 { name="DIFboost"; version="0.3"; sha256="07x31ccy2l0drv1356g1v4jw71i7zqb3d0v856gsd3kpqhclpvx0"; depends=[mboost penalized stabs]; };
   DIFlasso = derive2 { name="DIFlasso"; version="1.0-4"; sha256="13ls5018l790cdr26431li4gi9zw03ilypszfqglg4hj485h7dyw"; depends=[grplasso miscTools penalized]; };
   DIFplus = derive2 { name="DIFplus"; version="1.1"; sha256="1k03lr437gx5y762z3h40hz9kcl4m8xgrndxvbyvsgmn2h6pbwsd"; depends=[plyr TestDataImputation]; };
@@ -973,12 +1000,14 @@ in with self; {
   DIMORA = derive2 { name="DIMORA"; version="0.1.0"; sha256="0qcy2pqpx7za4ckf6wvmbhz5a52j44ksn81f8j1lj0z90idj6psn"; depends=[minpack_lm numDeriv]; };
   DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; };
   DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; };
-  DIZutils = derive2 { name="DIZutils"; version="0.0.4"; sha256="1z6kinc7sg88yjb27c2ljrfj3jlyj6s63kvcfyvgdm4113ljclhs"; depends=[config data_table DBI RJDBC RPostgres shiny shinyjs]; };
+  DIZutils = derive2 { name="DIZutils"; version="0.0.6"; sha256="1h53wvbzgbqkyxjblcba4g6fiimyppgan19jlw9gn26qvrs62prs"; depends=[config data_table DBI RJDBC RPostgres shiny shinyjs]; };
   DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; };
-  DJL = derive2 { name="DJL"; version="3.4"; sha256="15lawdpyq1vi325jg5s5rgwi20fak7imddd3wwyh0fw69854pff3"; depends=[car lpSolveAPI]; };
+  DImodels = derive2 { name="DImodels"; version="1.0"; sha256="1kgnfcw386x19vmzhhir907rjvfz15rlrs6xa8ph2w95j5ai4pf0"; depends=[hnp rootSolve]; };
+  DIscBIO = derive2 { name="DIscBIO"; version="1.1.0"; sha256="01v90gy9c9rfynfxjw96icshg6ndj88kifx17m40s98kx67q5iiz"; depends=[AnnotationDbi boot cluster fpc ggplot2 httr igraph impute mclust NetIndices org_Hs_eg_db philentropy png RColorBrewer readr rpart rpart_plot RWeka SingleCellExperiment statmod TSCAN tsne]; };
+  DJL = derive2 { name="DJL"; version="3.6"; sha256="1drfqzla0lqlch21bvyjq5qjwm75c6rggpsc92p4dw5vwzs3p8lj"; depends=[car lpSolveAPI]; };
   DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; };
   DLMtool = derive2 { name="DLMtool"; version="5.4.5"; sha256="1ngvdi88n2qkfr24wqvla0ghwiqhlz66qn9mry9xra8js6c8camw"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; };
-  DMCfun = derive2 { name="DMCfun"; version="0.12.1"; sha256="0bkm9mvx2zknzrdmyh0cf41yzs9m9nvy10hjic221a2nyzyr99yx"; depends=[BH dplyr optimr pbapply Rcpp tibble tidyr]; };
+  DMCfun = derive2 { name="DMCfun"; version="1.1.0"; sha256="05f0m82cxdpi5lj34h9aiaf2h3shahgf3w0ac4w81y122ikqdl70"; depends=[BH DEoptim dplyr optimr pbapply Rcpp tidyr]; };
   DMMF = derive2 { name="DMMF"; version="0.5.1.2"; sha256="0p82cfp0561j4ki20rznx46z7vqdxh128a0m0zj8d2wp3csn1aag"; depends=[raster rgdal sp]; };
   DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; };
   DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; };
@@ -989,38 +1018,40 @@ in with self; {
   DNLC = derive2 { name="DNLC"; version="1.0.0"; sha256="05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00"; depends=[caTools fdrtool GOstats igraph locfdr mvtnorm spdep]; };
   DNMF = derive2 { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; };
   DOBAD = derive2 { name="DOBAD"; version="1.0.6"; sha256="0ifrrfm4yp1416z58qgnak042rgj1xvqby2vvzgrv19z6b3250p3"; depends=[lattice Matrix numDeriv]; };
-  DODR = derive2 { name="DODR"; version="0.99.2"; sha256="16ia9j8vab8n2i6a17wz8nfvkfgj2gsyhxvwgxvjg2cz99hsbhdj"; depends=[Matrix npsm Rfit]; };
   DOS = derive2 { name="DOS"; version="1.0.0"; sha256="0vvkwn4wfvspbk74nb6124hdx9158h6yfksib14xqq7rx7c97ad4"; depends=[MASS]; };
   DOS2 = derive2 { name="DOS2"; version="0.5.2"; sha256="0lcqk2fxfl5pdnxlpppqiqnyc23jyhp1kcxwci8ilagjv4djipmw"; depends=[MASS sensitivity2x2xk sensitivitymult sensitivitymv senstrat]; };
   DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; };
   DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; };
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
   DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; };
-  DPQ = derive2 { name="DPQ"; version="0.4-1"; sha256="1yz905cl0fcafnp5fm1nw0a24m38lgamsm2fxqnlzxmybhfphpxk"; depends=[sfsmisc]; };
-  DPWeibull = derive2 { name="DPWeibull"; version="1.5"; sha256="1dxrhd3wklg7q3grvplas6wcbs05kga1b2va6d0wkynld01ww9ii"; depends=[binaryLogic Rcpp truncdist]; };
+  DPQ = derive2 { name="DPQ"; version="0.4-2"; sha256="0h6605jqqh0wivcpyxn67br9111f4gkyf6fs5xma8mjjvbf8vlwz"; depends=[sfsmisc]; };
+  DPQmpfr = derive2 { name="DPQmpfr"; version="0.3-0"; sha256="00zi574g4dxxwchhqfbd7dwg1h6bxmg530h3n6r19sjvhhnd0mbz"; depends=[DPQ gmp Rmpfr]; };
+  DPWeibull = derive2 { name="DPWeibull"; version="1.7"; sha256="1z261fhx5dr3yxfy10jrnj5xpc5i8bcs169wqp9p32frwpz20ad3"; depends=[binaryLogic prodlim Rcpp RcppArmadillo survival truncdist]; };
   DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; };
   DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; };
   DRDID = derive2 { name="DRDID"; version="1.0.0"; sha256="0fb23sn8v0y35czmg3hh8qff2w329k2aw00q3paxm3sas6ih72rz"; depends=[BMisc trust]; };
   DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; };
   DRHotNet = derive2 { name="DRHotNet"; version="1.2"; sha256="0qvxxqcixzxg6gxgnafgfxwpy5haxgh4nbj9axk3kb9gn3b5g6mq"; depends=[maptools PBSmapping raster sp spatstat spdep]; };
-  DRIP = derive2 { name="DRIP"; version="1.4"; sha256="1rds1161h19waqhiq08hqk5zcn48afccaggmb42xr1zyk31irpi6"; depends=[readbitmap]; };
+  DRIP = derive2 { name="DRIP"; version="1.6"; sha256="08qyv2xwl3a70jrpmyxq37g0cryzc0ca904znyhzidmjgy13d18i"; depends=[]; };
   DRR = derive2 { name="DRR"; version="0.0.4"; sha256="1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk"; depends=[CVST kernlab Matrix]; };
   DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; };
-  DRomics = derive2 { name="DRomics"; version="2.0-1"; sha256="0lfjk202fgvxjljjpakbmdqc41hbpgl39lym215hlqksfpi0jq7a"; depends=[DESeq2 ggplot2 limma]; };
+  DRomics = derive2 { name="DRomics"; version="2.1-3"; sha256="0cr24wajnd19xfp0abiga2znks0alynvp768jj04iqk13q8wwv0i"; depends=[DESeq2 ggplot2 limma SummarizedExperiment]; };
   DSAIDE = derive2 { name="DSAIDE"; version="0.8.3"; sha256="0n1ffv48202pnnsdcd3zpgpviy8613fcgx5c796whjffrc4v8m31"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; };
   DSAIRM = derive2 { name="DSAIRM"; version="0.8.6"; sha256="1c43k56ly4bdfv6drd3zj9dgxg77dy3h36ya2znk2xgkq03smh4y"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly rlang shiny tidyr XML]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
-  DSI = derive2 { name="DSI"; version="1.1.0"; sha256="0ggwfm2678gc98kkprdjyghb9dyydv5wwmh7dy7xl51pi80zplci"; depends=[progress R6]; };
+  DSI = derive2 { name="DSI"; version="1.1.1"; sha256="0wn4vnn81kdp79nqycr0m8ljis78gagk3gnwn3r3xgiapg8xmh85"; depends=[progress R6]; };
   DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; };
   DSLite = derive2 { name="DSLite"; version="1.1.0"; sha256="16nd178lgx89i1qacv9xs8r127kxzchkn3757ps35anci50h8kbh"; depends=[DSI R6]; };
+  DSMolgenisArmadillo = derive2 { name="DSMolgenisArmadillo"; version="1.3.4"; sha256="0xq7cfw94p0aikn4zh07rw3vv0mgbzc041m16qfzbjnk73rshzbx"; depends=[base64enc DSI httr MolgenisAuth stringr urltools]; };
   DSOpal = derive2 { name="DSOpal"; version="1.1.0"; sha256="0n0112alq946zm8am13v5p35kmkc57yfwcbc085sfydpmcwbsjnj"; depends=[DSI opalr]; };
   DSSAT = derive2 { name="DSSAT"; version="0.0.2"; sha256="15v64cgbfi51kj3p2wjmir8cfznhilx4gsd5w24734lwblmqf1bm"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; };
+  DSjobtracker = derive2 { name="DSjobtracker"; version="0.1.1"; sha256="1vi07n7ygsdjj4830rnx7kvacmnizl146c6bfw2fnby47apg38f9"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
   DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; };
   DSsim = derive2 { name="DSsim"; version="1.1.5"; sha256="0dr8dc91m7s5c198k9cb26a09f14wb8ihr46c0mr9cg33l2wf3nv"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
   DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
   DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
-  DT = derive2 { name="DT"; version="0.15"; sha256="1wc2aiqkn01i571h29847yaq7vb624bkf44axp4ygpn0r85hdq7k"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; };
+  DT = derive2 { name="DT"; version="0.16"; sha256="0in4d34nxb4pk2jygj0a21cqf0k0m4dhm4rjv68bnkp5kmmz6kbk"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; };
   DTAT = derive2 { name="DTAT"; version="0.3-4"; sha256="1ddmih8cxbgc1p4m0sm8gdbnf0d3ka8z7014zd4aykz75j3pr002"; depends=[data_table dplyr Hmisc jsonlite km_ci pomp r2d3 shiny survival]; };
   DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; };
   DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
@@ -1031,8 +1062,8 @@ in with self; {
   DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
   DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
   DTRlearn2 = derive2 { name="DTRlearn2"; version="1.1"; sha256="0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm"; depends=[foreach glmnet kernlab MASS Matrix]; };
-  DTRreg = derive2 { name="DTRreg"; version="1.6"; sha256="10r81d5b9g4znbpkbcip4wfipq7r4fsgmqvinhvkhsnnwghb865w"; depends=[dplyr MASS]; };
-  DTSg = derive2 { name="DTSg"; version="0.6.0"; sha256="1g5i9cizbm6r5h1vjgsnjlylbir4911ixc6mifwxknapfd7clib3"; depends=[checkmate data_table R6]; };
+  DTRreg = derive2 { name="DTRreg"; version="1.7"; sha256="0fr2c8fg1acs2kk0r67zml5fp71mvxw116ixqf7yq34n9ljd5yph"; depends=[dplyr MASS]; };
+  DTSg = derive2 { name="DTSg"; version="0.7.0"; sha256="0fqvpffjkkfs8wdv12wi0bp9h02vq2lqn41z29283s0dp8gn6p7l"; depends=[checkmate data_table R6]; };
   DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; };
   DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; };
   DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.10"; sha256="1d8zig3ljld05pwaqsahyvjf95y8k183al5ibx09h6hj3r5bfd8n"; depends=[DT ggplot2 KernSmooth reshape2 shiny]; };
@@ -1050,33 +1081,34 @@ in with self; {
   Data2LD = derive2 { name="Data2LD"; version="3.2.1"; sha256="1y6nyysm96q5mlrcl0vkjhq5lr624n2266xpmyl4ck0h1dhjb6bz"; depends=[deSolve fda knitr rmarkdown]; };
   DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; };
   DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; };
-  DataEditR = derive2 { name="DataEditR"; version="0.0.5"; sha256="0mqwbz2g3k1b9pxzznv6v8l47ggkwdkcbpg1d0j9mqgmlkadvd5a"; depends=[htmltools rhandsontable shiny shinythemes]; };
+  DataEditR = derive2 { name="DataEditR"; version="0.0.9"; sha256="1m9bh4hgm4rkr25kira3835bpj3x3ig796hyb8b43qqy353rlrds"; depends=[htmltools miniUI rhandsontable rstudioapi shiny shinyBS shinyjs shinythemes]; };
   DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; };
-  DataExplorer = derive2 { name="DataExplorer"; version="0.8.1"; sha256="0724ngcw2b1i2cf8jbak61saqk71f06wszvx7nhba4n0z8l503cz"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
+  DataExplorer = derive2 { name="DataExplorer"; version="0.8.2"; sha256="0451fnlaqvyzpqhn25g6lj2svjfsfaxii9vmwhqw7p29fl71zaln"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
   DataGraph = derive2 { name="DataGraph"; version="1.2.1"; sha256="164wbh3by8qf0p84l5v7vwrzf0f2s305fwmrl01khcll8pk34xlm"; depends=[Rcpp]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
-  DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.3"; sha256="0jg77zq12fvwnzfdk83y6wi4547g9r5zlvhjmjj1bp0xp7spcbyk"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; };
-  DataVisualizations = derive2 { name="DataVisualizations"; version="1.2.0"; sha256="10hjhxqm0f8s59x8hqn1nfganx4974lfkcghlqsi686h7vd7fzb3"; depends=[ggplot2 Rcpp RcppArmadillo sp]; };
+  DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.4"; sha256="1sag3mzwx6sb7xjg3xbid9487bgs2rl3xm3qyz1zzd8qm58s3h55"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; };
+  DataVisualizations = derive2 { name="DataVisualizations"; version="1.2.1"; sha256="1mnc8klc47fqlglim4y33aqqii8bd58g3csa7635l0khx45qjx99"; depends=[ggplot2 Rcpp RcppArmadillo sp]; };
   DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; };
   DatabaseConnector = derive2 { name="DatabaseConnector"; version="3.0.0"; sha256="01a4xx7wdfmpvbq2ywdjg7pc90a2xa1rf3ka8vm4xbz31ir066y5"; depends=[DatabaseConnectorJars DBI rJava SqlRender stringr urltools]; };
   DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; };
   DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.3"; sha256="1qjlczpxadvzjn4gl2q7rnmpgygsh8ylk8cfvmynx8p675g657cz"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
+  DatastreamDSWS2R = derive2 { name="DatastreamDSWS2R"; version="1.7.9"; sha256="01fc1rzcgfjlllimvq7va6gdmsavpckgyf4gk1vjd2lvnkf5z592"; depends=[dplyr foreach httr jsonlite stringi stringr xts zoo]; };
   Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; };
   DeCAFS = derive2 { name="DeCAFS"; version="3.1.5"; sha256="0f56xl4is1cknlg55s2vprcf8f41if1vn0hh4xxhpficc6pxmnbv"; depends=[ggplot2 Rcpp]; };
   DeLorean = derive2 { name="DeLorean"; version="1.5.0"; sha256="1ry6j4mvxms9hddi9c56p9yhjh66fzss41wqkf6xq398h1wbn4q1"; depends=[BH broom coda dplyr fastICA functional ggplot2 kernlab lattice MASS memoise Rcpp RcppEigen reshape2 rstan rstantools seriation StanHeaders stringr]; };
   DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; };
   DealGPL570 = derive2 { name="DealGPL570"; version="0.2.0"; sha256="1c202gzbhqaisxvpiiajcbfsjnqrvygd19304m2n89ansv81vi8r"; depends=[affy dplyr GEOquery stringr tibble]; };
   DecisionAnalysis = derive2 { name="DecisionAnalysis"; version="1.1.0"; sha256="0vgvp1c6n8lmi48w1n5v86f8vrf7pf0dksb8wr3fxzg41nc9whrm"; depends=[Cairo data_tree DiagrammeR dplyr ggplot2 gridExtra qpdf tidyr viridisLite]; };
-  DeclareDesign = derive2 { name="DeclareDesign"; version="0.22.0"; sha256="1c4ij70d2002rj595fzik75x44jf0gdnrs4bbm5fv4lqnbrm5j37"; depends=[estimatr fabricatr generics randomizr rlang]; };
-  DecomposeR = derive2 { name="DecomposeR"; version="1.0.2"; sha256="0qimryr3hrl2ni99i3l9m7l4sfz0pkv9nmghh1yjb7wc0hdlayfk"; depends=[colorRamps dplyr hexbin hht StratigrapheR]; };
-  DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; };
+  DeclareDesign = derive2 { name="DeclareDesign"; version="0.24.0"; sha256="0gfxbnl1wnxqghljicrsvwhzkjp1al29rhfn8sjydyq006mv1yy8"; depends=[estimatr fabricatr generics randomizr rlang]; };
+  DecomposeR = derive2 { name="DecomposeR"; version="1.0.3"; sha256="19p3iqpjjbfqb2jgd4n443qi3ksjys426bg41ql4bfp3af0nfw4l"; depends=[colorRamps dplyr hexbin hht StratigrapheR]; };
+  DecorateR = derive2 { name="DecorateR"; version="0.1.2"; sha256="1za2qvdq96f75rmnm421xmq8s01ny4666ghv14i72iy3s4ml2hq9"; depends=[rJava RWeka RWekajars]; };
   Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
   DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; };
   DeducerPlugInScaling = derive2 { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer GPArotation irr klaR mvnormtest psych]; };
   DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; };
   DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
   DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
-  Delaporte = derive2 { name="Delaporte"; version="7.0.3"; sha256="1gwsnrdgiz9sx2hnpywvps1rbxxibcrkq0z43ls0gzpydcjv2dmi"; depends=[]; };
+  Delaporte = derive2 { name="Delaporte"; version="7.0.5"; sha256="1bph2ddvgmzcqvhj6s9rbwq58x0pczkjydfis96kv5zvsaca123x"; depends=[]; };
   DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; };
   Delta = derive2 { name="Delta"; version="0.2.0.3"; sha256="0bi9qca4ky481zycp8r7ihvqfjkpvi7hb9wrjsw9avawqa6ck9bv"; depends=[]; };
   Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; };
@@ -1089,20 +1121,21 @@ in with self; {
   Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
   DepLogo = derive2 { name="DepLogo"; version="1.0"; sha256="0h4jpflf8amip62r936lg0k428gypag296kwl58w1d0qa5jyxrkk"; depends=[]; };
   DepthProc = derive2 { name="DepthProc"; version="2.1.3"; sha256="1dq5y6fgmm00imkim4v2s6kn4z5qnwa0dkfkcq4pap7imvi35aab"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
-  Deriv = derive2 { name="Deriv"; version="4.0"; sha256="03mlfy8jzzzbh2l18gnmw0a71n9savx4cw72yhkxq93v2xj8fy3n"; depends=[]; };
-  DescTools = derive2 { name="DescTools"; version="0.99.37"; sha256="1pjgmvdwlzjbbwj27fkf7w87k6k1brl8j13qyx49y1nd1blfkspm"; depends=[BH boot Exact expm MASS mvtnorm Rcpp rstudioapi]; };
-  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.7"; sha256="0k9qsz6wn97gy23rzm1rr8c6az05xr01jnsqcxknalkx6hj8h1mg"; depends=[DescTools foreign manipulate rstudioapi writexl]; };
+  Deriv = derive2 { name="Deriv"; version="4.1.2"; sha256="1j9sh1w9lsnnhlh59g4ghykyfx46rxh380s8imvm7pzna7rw7c64"; depends=[]; };
+  DescTools = derive2 { name="DescTools"; version="0.99.39"; sha256="03yd43jnb6xb3mz57fpgw48hsbxcsj0k85w3aqy2335lprdhxy2k"; depends=[BH boot Exact expm gld MASS mvtnorm Rcpp rstudioapi]; };
+  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.8"; sha256="108f4p1iy2f2qpxwmsqvd9dxhaysvym40jdpzcmsagdrcgpwfh82"; depends=[DescTools foreign manipulate rstudioapi writexl]; };
+  DescrTab2 = derive2 { name="DescrTab2"; version="2.0.3"; sha256="1dhni83jhl1v094l6axhaain67k307ba6cppzxmhn74ba5rikfcl"; depends=[cli DescTools dplyr exact2x2 flextable forcats kableExtra magrittr nlme officer rlang scales stringr tibble tidyselect]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.7"; sha256="0241mbz0y3ala7fsb4fwjd0xigsk0wq77hfrjyvnnp97rfjfzmcv"; depends=[GGally ggplot2 plyr reshape2 scales]; };
   DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.2"; sha256="0f2inlfkwl2q9ll5lh0ynpsbf6zci149s5nj0s0x0g98z72z8mly"; depends=[dplyr jsonlite magrittr RCurl reshape]; };
-  DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.4"; sha256="16j9ca3y8mcdbd64yqm6js4lb9hjc74dh4r5y3h1ifvwzj0a78yc"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; };
-  DetLifeInsurance = derive2 { name="DetLifeInsurance"; version="0.1.2"; sha256="1d9fi77vfy1494qgskx1v0b8k84fnl17kd14agf3mxhzhxkixpnm"; depends=[]; };
+  DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.5.5"; sha256="1qr6abnyfgf71vcqirpwk4k8zsiddx4s5hd5cjin5jvgkp2q2fjy"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; };
+  DetLifeInsurance = derive2 { name="DetLifeInsurance"; version="0.1.3"; sha256="15yh66mn84cm5ix99lg5lp783dp8il03dyirkhil7m5pwzss42r4"; depends=[]; };
   DetMCD = derive2 { name="DetMCD"; version="0.0.5"; sha256="034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5"; depends=[pcaPP Rcpp RcppEigen robustbase]; };
   DetR = derive2 { name="DetR"; version="0.0.5"; sha256="1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; };
   DetSel = derive2 { name="DetSel"; version="1.0.4"; sha256="01mpjy1cmgbrchdjl0gmrq3zx3mlkznml1qcradj2v5mgz26ifrv"; depends=[ash]; };
   DevTreatRules = derive2 { name="DevTreatRules"; version="1.1.0"; sha256="1h4p78mwl5ir31hfb38x1dwq5xxbdlsasvk5vxa3c7xdvhsd2yrf"; depends=[DynTxRegime glmnet modelObj]; };
   Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
   Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; };
-  DiPALM = derive2 { name="DiPALM"; version="1.0"; sha256="1l7rd2jbviipywnx8fkls21qmzj8kd57158g46s6222yv17rl4qy"; depends=[ggplot2 limma WGCNA]; };
+  DiPALM = derive2 { name="DiPALM"; version="1.1"; sha256="0wni4xz8a9mf9pih332k1fmc62bha9rs63x56dn6w85hsd8wqz7n"; depends=[ggplot2 limma WGCNA]; };
   DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; };
   DiPs = derive2 { name="DiPs"; version="0.6.1"; sha256="0r6r0i417z4ax7cw1a7jbjhi0h2i2n43vf0y4770hyrl3m6spwfj"; depends=[liqueueR mvnfast plyr]; };
   DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; };
@@ -1111,9 +1144,8 @@ in with self; {
   DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.3.0"; sha256="10qfjskawrdrvayrzxpblx9jxwngpwwi1q5aisvx3rpf9c3xrii2"; depends=[ggplot2]; };
   DiceDesign = derive2 { name="DiceDesign"; version="1.8-1"; sha256="11s1m543kxd6gv4amh8z6pph1n67sj9sfwm6hjy83wfs65syf5vp"; depends=[]; };
   DiceEval = derive2 { name="DiceEval"; version="1.5"; sha256="0yvpq0bbp70ipjc9bg2jf0ah7m5nsil669vhky11f42kijm8rsj2"; depends=[DiceKriging]; };
-  DiceKriging = derive2 { name="DiceKriging"; version="1.5.6"; sha256="14jfwvj8vhrngcpkqdzr6klhnqwgr1g5wm5rqz8q6w7ip4nnsii5"; depends=[]; };
-  DiceOptim = derive2 { name="DiceOptim"; version="2.0.1"; sha256="09qggq9csnvc0y8i9cki33095yfjidfirs11lri4aspsg5vjsiv4"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; };
-  DiceView = derive2 { name="DiceView"; version="2.0-0"; sha256="041k45xmh4ks8gxvahlvxnigizljmyk3n9xb83wmnrng9z5jbr94"; depends=[DiceDesign DiceEval DiceKriging geometry R_cache rgl scatterplot3d]; };
+  DiceKriging = derive2 { name="DiceKriging"; version="1.5.8"; sha256="0xsdpyqv7hjr6x617kiymi9al9ds11nppqksi2wdn2dm9j4jpl0i"; depends=[]; };
+  DiceView = derive2 { name="DiceView"; version="2.0-1"; sha256="0y2k7j63qj1nwks9pbm85zj05mfx4q74w52hl2lbj1z1pk3hhcdh"; depends=[DiceDesign DiceEval DiceKriging geometry R_cache scatterplot3d]; };
   Dict = derive2 { name="Dict"; version="0.1.0"; sha256="1v8yp03gajg9i82qyfww14jx93l4jbfq8mh6jqyf6calgrsj06jc"; depends=[dplyr magrittr purrr R6 rlang]; };
   DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; };
   Diderot = derive2 { name="Diderot"; version="0.13"; sha256="04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; };
@@ -1123,13 +1155,14 @@ in with self; {
   DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
+  DirStats = derive2 { name="DirStats"; version="0.1.6"; sha256="1ysz68x18v77b05r6yfkc0c0x87cvj2zxkhl638af0a76xa5ajg4"; depends=[movMF rotasym]; };
   DirectEffects = derive2 { name="DirectEffects"; version="0.2"; sha256="0cawn1i1cyczsr9zpcaky79dfdl9anfjgiaa2404capacnj3call"; depends=[Formula glue sandwich]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.3"; sha256="1qlfvzlig3a2v78fiq6sbbpxklmjczikxdw57m6mqngzrl9vdl2g"; depends=[]; };
   DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; };
-  Directional = derive2 { name="Directional"; version="4.4"; sha256="0119yi3l4zmb6n3n8jbhvmzz6cwr10z0cpyzd0n8mz7024vvka7w"; depends=[bigstatsr doParallel foreach MASS RANN Rfast Rfast2 rgl]; };
+  Directional = derive2 { name="Directional"; version="4.5"; sha256="19xd0krp54gjlhy70689g9ypp3xf3612446y6srsc4j06lv86xkl"; depends=[bigstatsr doParallel foreach MASS RANN Rfast Rfast2 rgl]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.7-0"; sha256="10189c3mj85nbqp7fd5ll4g0qr950309hhma4b7bpv2gb7hvpzsp"; depends=[Formula maxLik]; };
   DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; };
-  DisImpact = derive2 { name="DisImpact"; version="0.0.12"; sha256="1ba7z0r7s50vbgcff664z9si3l3kihmascy955p6gl8j9d9p2v5k"; depends=[dplyr purrr rlang tidyr tidyselect]; };
+  DisImpact = derive2 { name="DisImpact"; version="0.0.14"; sha256="1pzvrk9qna9yrmjxn964ysncpram7qqf3sxmfpnjn7zwicjkj4is"; depends=[dplyr purrr rlang tidyr tidyselect]; };
   DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-4"; sha256="0r3z56xcb5als38rhydia482j5xl9kcgamdj6ibd22yi0ya6k4iv"; depends=[Rcpp]; };
   DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; };
   DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; };
@@ -1138,15 +1171,14 @@ in with self; {
   DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
   Disequilibrium = derive2 { name="Disequilibrium"; version="1.1"; sha256="1jm5n01ih4rnga13058yh939zp2lvjn5pgb6rrwp5fdlk5kqsgb0"; depends=[Formula numDeriv optimr]; };
   DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; };
-  Distance = derive2 { name="Distance"; version="1.0.1"; sha256="1vlsp3dap52hhm70z18k43wf6c3sv222l7w8bz95xzd1vmbnh7qw"; depends=[dplyr mrds rlang]; };
+  Distance = derive2 { name="Distance"; version="1.0.2"; sha256="09cgbhk2ilxkbbaw3hw6zdgrsq174y7bffgkc48gaybnvf8vdgy5"; depends=[dplyr mrds rlang]; };
   DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; };
-  Distributacalcul = derive2 { name="Distributacalcul"; version="0.2.2"; sha256="0gsfgfxgbckyp17xr5y3k05pl22bpkajf2x26cwbgnidq9vk6hdp"; depends=[dplyr ggplot2 plotly rlang shiny shinydashboard shinydashboardPlus shinyWidgets statmod tippy]; };
+  Distributacalcul = derive2 { name="Distributacalcul"; version="0.3.0"; sha256="08v6wc7al6wbf06i22g8cil1a5c4incr9d1c2znb4zgjj31ibbzp"; depends=[dplyr ggplot2 plotly rlang shiny shiny_i18n shinydashboard shinydashboardPlus shinyWidgets statmod tippy]; };
   DistributionFitR = derive2 { name="DistributionFitR"; version="0.1"; sha256="0wg43gqsdy1ja0l489k27k9q1w2zq45wzmqnv9wfc734rf8kvlba"; depends=[doParallel foreach stringr]; };
   DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.6"; sha256="0pp0f7c9szyx426bnnz4fz4vh5q73m8x896z6pqgx04b6v445361"; depends=[AdaptGauss GA ggplot2 pracma]; };
   DistributionTest = derive2 { name="DistributionTest"; version="1.1"; sha256="11xhr6yv42s1i4qqlb1pvzm8q2116v10gjlkhl0ml3id6lx27nmj"; depends=[MASS]; };
   DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; };
   DivE = derive2 { name="DivE"; version="1.2"; sha256="1czj89ljvpgl03471cknki2lc64swdqdpf5wsgicad35kgmlrwlh"; depends=[deSolve FME rgeos sp]; };
-  DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
   DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
   DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; };
@@ -1156,27 +1188,30 @@ in with self; {
   DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
   Dodge = derive2 { name="Dodge"; version="0.9-2"; sha256="0767n6hyspqrv5cgx3ghhai0qffj6haga7s86pv7mq8zvjcxjlzv"; depends=[]; };
-  Dominance = derive2 { name="Dominance"; version="1.1.0"; sha256="1dzfj79hv3ds72dy4fn14bp68fiw06vdxkp4dvyvj37yrrqpcxyz"; depends=[chron gdata igraph XLConnect]; };
+  Dominance = derive2 { name="Dominance"; version="1.1.2"; sha256="0hdia3pp6k035mb28z1iddq1zipy0wq0644sqd49wrsi2k6hcl9h"; depends=[chron gdata igraph XLConnect]; };
   DoseFinding = derive2 { name="DoseFinding"; version="0.9-17"; sha256="1lj96443dj61nxqfl20rc1f6ja2clbr9j6b6l8vi2gpspx5i76qw"; depends=[lattice mvtnorm]; };
   DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; depends=[coneproj MASS Matrix]; };
   DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; };
+  DoubleML = derive2 { name="DoubleML"; version="0.1.1"; sha256="1kvix57h29khdfq6cbjh8vza4fxqfswwc8cq28x7yzcw1g9mw11r"; depends=[checkmate clusterGeneration data_table mlr3 mlr3tuning mvtnorm R6 readstata13]; };
   Dowd = derive2 { name="Dowd"; version="0.12"; sha256="1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk"; depends=[bootstrap forecast MASS]; };
   Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; };
   DrBats = derive2 { name="DrBats"; version="0.1.5"; sha256="1iaffippp9kwfrwryf7klmn8nsm2k8pc0bkgpxcsl4vxyy2na3mp"; depends=[ade4 coda MASS Matrix rstan sde]; };
   DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; };
   DrInsight = derive2 { name="DrInsight"; version="0.1.2"; sha256="1zz9i4aj0ijqfgp30wv0bvrgx2n003dysqg0pm13f7hni27819ff"; depends=[igraph qusage]; };
+  DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.2"; sha256="0nsnwais0r592c50nphfzkr1bbygl67mriwsx7dxbvmpdsswlvl1"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; };
   DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.4.0.1"; sha256="1pmsbv1rl79s520nxj536m8gf7xyfjskj8r88rxmxscbgp8c1xz2"; depends=[Rcpp RcppArmadillo xts zoo]; };
   DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; };
   DriveML = derive2 { name="DriveML"; version="0.1.0"; sha256="0ikhbdgshx51fk629yhwhrdwiqg40qa7rsljb5ihax02cg0cv796"; depends=[caTools data_table ggplot2 iml mlr ParamHelpers rmarkdown sampling SmartEDA]; };
   DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; };
-  DstarM = derive2 { name="DstarM"; version="0.3.0"; sha256="16vcv21dgnymhsy9j5x5pblnipf4hdyscajx6pr8kl6i95hs3hmj"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; };
+  DstarM = derive2 { name="DstarM"; version="0.4.0"; sha256="0wm5kr2pkgbvh9svjq8zq46zn50hwf58rs3y1ybnwcfjc2q75h1s"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; };
   DtD = derive2 { name="DtD"; version="0.2.2"; sha256="1czspjdxjhbfk2df7wk0x3d1ilwrjqw4s4gdc4hq0gjcjqyx0c39"; depends=[checkmate Rcpp RcppArmadillo]; };
   DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; };
   DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; };
   Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; };
   DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
+  DynComm = derive2 { name="DynComm"; version="2020.1.6"; sha256="09nhcp9rldwrybwhyg86mgpgwq4hzlpp4rm5a5gl33nnhvcdm0mx"; depends=[igraph Rcpp Rdpack]; };
   DynNom = derive2 { name="DynNom"; version="5.0.1"; sha256="1ahs93mks2z423sxk4wjgivdz4ggvwm87dha0aan4fg4jarai98s"; depends=[BBmisc compare dplyr ggplot2 magrittr plotly prediction rms shiny stargazer survival]; };
-  DynTxRegime = derive2 { name="DynTxRegime"; version="4.7"; sha256="10lsp58jmn9mmpj8yq9adj5a0sa2wd5izgish61g4f643c40rk18"; depends=[dfoptim kernlab modelObj rgenoud]; };
+  DynTxRegime = derive2 { name="DynTxRegime"; version="4.9"; sha256="0apwqlqdn5vwb4z7s60r2nsgdw7bzkbxj6199aibyansnsai0s35"; depends=[dfoptim kernlab modelObj rgenoud]; };
   DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; };
   DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
   DynamicGP = derive2 { name="DynamicGP"; version="1.1-6"; sha256="1d3ycx6vcv7rcagaxvfyxgsdigbzigxarm66ypkdasbli1507is3"; depends=[lhs]; };
@@ -1187,11 +1222,10 @@ in with self; {
   EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; };
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
-  EBMAforecast = derive2 { name="EBMAforecast"; version="1.0.0"; sha256="15pw49nj7lq9rfq3sn7p19w28kzx7ypc5dflx0lslaay3fdhria1"; depends=[abind gtools Hmisc plyr Rcpp separationplot]; };
-  EBPRS = derive2 { name="EBPRS"; version="2.0.4"; sha256="00rbxmcgaip961g3bkpv6gyjm9bhisfscq51dy00g431rcccjcx4"; depends=[ROCR]; };
+  EBMAforecast = derive2 { name="EBMAforecast"; version="1.0.2"; sha256="0xnzb7hvkc50b65bgq4xbnzks6sb0241lwd6zwp3cz22s3wpyhhr"; depends=[abind gtools Hmisc plyr Rcpp separationplot]; };
+  EBPRS = derive2 { name="EBPRS"; version="2.1.0"; sha256="14wal81cai08xr26fpc2w4ramr5jyv7vwfyqb5hzw3kqxx76y9xx"; depends=[BEDMatrix data_table ROCR]; };
   EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; };
   EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
-  ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; };
   ECGofTestDx = derive2 { name="ECGofTestDx"; version="0.4"; sha256="0y8bw1k9spwxyzc7vsi2iblnmjsidxbybjrzzh2j6frjmv3rk4g1"; depends=[bootstrap orthopolynom]; };
   ECLRMC = derive2 { name="ECLRMC"; version="1.0"; sha256="01z2hmbpb754s2rsvx3i5wf7kkkr2mvs2g89ih2bqrif7w5rmgyg"; depends=[softImpute]; };
   ECOSolveR = derive2 { name="ECOSolveR"; version="0.5.3"; sha256="1xglkx1x9kidznvcz61w0ayhfkgbmkxad92frabr9jsnlf6ns78n"; depends=[]; };
@@ -1202,22 +1236,22 @@ in with self; {
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
   EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; };
   EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; };
-  EDOIF = derive2 { name="EDOIF"; version="0.1.1"; sha256="0lhaajiq01rrvpp2xq2n6ka7pd4xz0spxrf1xv8ljpi2w9kk4p7l"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; };
+  EDNE_EQ = derive2 { name="EDNE.EQ"; version="1.0"; sha256="13aflnpznpzjrrdrn0r7v2mch6hjd77s6c3l7mnc2p59vq7mzmpg"; depends=[MASS]; };
+  EDOIF = derive2 { name="EDOIF"; version="0.1.2"; sha256="0aiz8nxa56qcjcrp6j7vfn02vmf6n00wnir6cxgk2kh9q5rp5ds7"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; };
   EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; };
   EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.9"; sha256="0id0dhpq9350ax573i769m83fncrd6rlp4qmwvf9jz1lbksighf0"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; };
   EFA_dimensions = derive2 { name="EFA.dimensions"; version="0.1.6"; sha256="1372f56h7plijyga851nxjb4j2h3f3wf81qb1zjrqfv7k4imdp25"; depends=[polycor psych]; };
-  EFAtools = derive2 { name="EFAtools"; version="0.1.1"; sha256="0xy2kywpwh9y46jn37w1bl09c8i1nxmhrqqkn9ffdx5qyqmcsn4w"; depends=[checkmate cli crayon dplyr future future_apply ggplot2 GPArotation lavaan magrittr psych Rcpp RcppArmadillo stringr tibble viridisLite]; };
-  EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; };
+  EFAtools = derive2 { name="EFAtools"; version="0.3.0"; sha256="1wksbf485f2iqclh6gnrg2r18sa7f9qmgjgxf0yb5fcwdkivhc79"; depends=[checkmate cli crayon dplyr future future_apply ggplot2 GPArotation lavaan magrittr progress progressr psych Rcpp RcppArmadillo rlang stringr tibble tidyr viridisLite]; };
+  EFAutilities = derive2 { name="EFAutilities"; version="2.1.1"; sha256="0kdwdjv4c9rfy49qs7a4134vwa2sm2pcam17a3xii2dq8mghg1za"; depends=[GPArotation MASS mvtnorm plyr]; };
   EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
   EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; };
   EGAnet = derive2 { name="EGAnet"; version="0.9.6"; sha256="0ddz6qdvgwj9visdvx3k4wm6qgxn5pvjpd6nyh9h4cz06dd2xji0"; depends=[dplyr glasso igraph lavaan Matrix NetworkToolbox plotly qgraph semPlot]; };
   EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; };
   EGRETci = derive2 { name="EGRETci"; version="2.0.3"; sha256="1fzcndah890nfd3fg83jhp5lpwb0xfyrccabgvilkrrm4i4x675m"; depends=[binom EGRET]; };
-  EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; };
-  EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.1.1"; sha256="15mbc23mqkaj09ilrazqwwijp1dx8m65w9bvfn6kw6c0kdhds39m"; depends=[dplyr lubridate MASS plotly RColorBrewer scales viridis xts zoo]; };
+  EHR = derive2 { name="EHR"; version="0.3-1"; sha256="1grg1k4lgl3gfvjw5srflrvci39gs2hr3mw82nx7yya95m3f30id"; depends=[data_table]; };
+  EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.1.2.1"; sha256="1253iya21k9rnp7aqg6cs18haiv5vxhgdhsxbcwzd9wzcxwwab5j"; depends=[dplyr lubridate MASS plotly RColorBrewer scales viridis xts zoo]; };
   EIAdata = derive2 { name="EIAdata"; version="0.1.1"; sha256="06xq17x3zdk5q9zjvw3lxvayyggnz4ck4wpzzpsdd3s6j1b0fmhz"; depends=[XML xts zoo]; };
   EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
-  EIX = derive2 { name="EIX"; version="1.1"; sha256="0mz7q35w304mm412x6jqlr65ji7xfkb293iwrqgifgi2pc6f77ny"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS Matrix purrr scales tidyr xgboost]; };
   EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; };
   EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
   EL2Surv = derive2 { name="EL2Surv"; version="1.1"; sha256="0bn2481rf61qnia468y7k95hhazjaghrv919a2y9ar5wcz5nq2kk"; depends=[survival]; };
@@ -1232,7 +1266,7 @@ in with self; {
   EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; };
   EMCluster = derive2 { name="EMCluster"; version="0.2-12"; sha256="03s828pczfll5fkwa0w6n4m4wb75paj6x0cxgg9r4qmw8w4ag464"; depends=[MASS Matrix]; };
   EMD = derive2 { name="EMD"; version="1.5.8"; sha256="0bvwx5ry41cpj646v93vm50c6qb3m5d7mda9q7znmcr4sdf521j5"; depends=[fields locfit]; };
-  EML = derive2 { name="EML"; version="2.0.3"; sha256="0scqyblnz9h0313wr6yq726gpmqx9mvklc4ckz6h6ksy81f82kjp"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; };
+  EML = derive2 { name="EML"; version="2.0.4"; sha256="0hwm2sl616mq4504zpyfafv6m6mbrcpk85wjhbmcy5lvgl05njnk"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; };
   EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; };
   EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.3"; sha256="0a5q78s9y6ba1641lrv87kglg39x9wbk5xg7ihzbpl4adrb5sz4f"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; };
   EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.11"; sha256="06lfmpw908chhzx512anqacixvvx3y02wm1n4wmpb890rd85n11r"; depends=[]; };
@@ -1241,43 +1275,43 @@ in with self; {
   EMP = derive2 { name="EMP"; version="2.0.5"; sha256="0piagbxk8siagmvzqv2bh12g1y0hy3c0vkxpddlmp7gm3i304rpi"; depends=[ROCR]; };
   EMSC = derive2 { name="EMSC"; version="0.9.2"; sha256="0qdm0g0bwln2ykqvzvxpmv1h9bgqmb1ws0bccjl4f5ni5v295xjn"; depends=[pracma]; };
   EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; };
-  EMSS = derive2 { name="EMSS"; version="1.0.1"; sha256="0b2hl3vvdd1lwqdx415jp25k9993nnzbz45zxx0128vvqcr743hr"; depends=[mvtnorm sampleSelection]; };
+  EMSS = derive2 { name="EMSS"; version="1.0.2"; sha256="1kgs1xq4q31v0p7nchvvqij8fslyg3gkiwfks1jbswk96gdh5pk7"; depends=[mvtnorm sampleSelection]; };
   EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; };
   EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
   EMVS = derive2 { name="EMVS"; version="1.1"; sha256="0pxf2vy3ab5d5zbq089fl27x01yyhh7nyp3g1w4xnifwnm55lx9w"; depends=[Rcpp RcppArmadillo]; };
   EMbC = derive2 { name="EMbC"; version="2.0.3"; sha256="0ns6jmshblf00n4harhls03q9c6h1wvgvjzn8jvr3kf4gm2iz2jd"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
-  ENMTools = derive2 { name="ENMTools"; version="1.0"; sha256="1zrykjcwh0qnqfkvzi72jq0mygbpph4mvqil0v6j98d9qwlm4avd"; depends=[dismo ENMeval ggplot2 ggpubr gridExtra knitr lhs magrittr raster rgdal rgeos sp spatstat]; };
-  ENMeval = derive2 { name="ENMeval"; version="0.3.0"; sha256="0q5s8nxig8kbr0cblfmf3k20ri19fjs770a0fnzsk0kwlac414hw"; depends=[dismo doParallel foreach maxnet raster]; };
+  ENMTools = derive2 { name="ENMTools"; version="1.0.2"; sha256="19b11y3ph1diqq4a1gqmxhh9c4x13jl3bf0dlp59c53k4nczpviv"; depends=[dismo ENMeval forcats ggplot2 ggpubr gridExtra knitr lhs magrittr raster rgdal rgeos sp spatstat]; };
+  ENMeval = derive2 { name="ENMeval"; version="0.3.1"; sha256="1l43065mbhlrniqw3pqjz0vn7r2azkikqvm8mjiq5pky9ldhrwp7"; depends=[dismo doParallel foreach maxnet raster]; };
   EPGMr = derive2 { name="EPGMr"; version="1.0.0"; sha256="1ii4lccv4hyydy3sd5l7c22pgx27x3mdml20sfbdj85pmpyab6q9"; depends=[]; };
   EPT = derive2 { name="EPT"; version="0.7.5"; sha256="1llypf8600mk62cqxnwv5fds8ypfx5is2qkpbp4bh70l3s3lvj31"; depends=[]; };
-  EPX = derive2 { name="EPX"; version="1.0.2"; sha256="0wsyh26n5gjgn7csdxcf4lx70hi58zy8qy8d3m1dvn4y62achksd"; depends=[doParallel doRNG foreach nnet randomForest rngtools]; };
+  EPX = derive2 { name="EPX"; version="1.0.3"; sha256="1bq94pxl60y6km1lhi0nzsa5qfkb1gqfx3h002g2n4n0avlq928s"; depends=[doParallel doRNG foreach nnet randomForest rngtools]; };
   EQL = derive2 { name="EQL"; version="1.0-1"; sha256="0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m"; depends=[lattice ttutils]; };
   EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; };
-  ER = derive2 { name="ER"; version="1.0.0"; sha256="0lblgass55ypy61wf8xra3cxzr77301dyqhbnzh1mk76m9hflvzf"; depends=[ggplot2 glmnet gridExtra pls plsVarSel scales]; };
+  ER = derive2 { name="ER"; version="1.0.2"; sha256="151d120s9kdh8ibxr6j3g40azqb7nzf49ahs1zzza7m5qbsi3nsm"; depends=[ggplot2 glmnet gridExtra pls plsVarSel scales]; };
   ERP = derive2 { name="ERP"; version="2.2"; sha256="17i04rgfj9crnvpi7mf2spwmaw9jgw4kn5fx6x9xbl9cvwwx6q4k"; depends=[corpcor fdrtool irlba mnormt pacman]; };
+  ERSA = derive2 { name="ERSA"; version="0.1.3"; sha256="0djh633vmc89vl4bp7p4bazlb0pshpd2yckfj0yjk6vc9lrbql69"; depends=[broom car combinat dplyr ggplot2 leaps miniUI purrr RColorBrewer shiny tidyr]; };
   ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
   ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; };
-  ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
-  ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.2.0"; sha256="1bzl483lijnxkkxkf32xqf8lxm4436ns1gw8jjyarf19s1acajga"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; };
+  ESG = derive2 { name="ESG"; version="1.2"; sha256="17kw82dikcibqsdb1fvbx2x2f3shzbqggygabprcvwki8bg9hgni"; depends=[]; };
   ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; };
   ETAS = derive2 { name="ETAS"; version="0.4.6"; sha256="02xknf7acpha4y2mwn9q974dr2d75nw48wx28i7gprqc7hf6rcsw"; depends=[fields goftest lattice maps Rcpp spatstat]; };
   ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
   ETLUtils = derive2 { name="ETLUtils"; version="1.5"; sha256="0s0q4f3wzpdd87l3pnzysa8aq7zgz29589xnm65a6xfy9znbpzs3"; depends=[bit ff]; };
-  EValue = derive2 { name="EValue"; version="3.0.0"; sha256="0kaky3hs6wkxbkyz4ry3qwjr1rpna0m56jd6skic91b57ipfbzsq"; depends=[devtools ggplot2 metafor msm]; };
+  EValue = derive2 { name="EValue"; version="4.1.0"; sha256="0yxmi1211f7b2kfmxi8kwrmin4jc2dmqy2r6avjk0ydgdv2gw9f3"; depends=[boot dplyr ggplot2 metafor MetaUtility]; };
   EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
   EWGoF = derive2 { name="EWGoF"; version="2.2.2"; sha256="19gd9grjjdv6hilqj41g5qhz7m0ga40q88clwggbp5f0f1yd5sym"; depends=[Rcpp]; };
   EWOC2 = derive2 { name="EWOC2"; version="1.0"; sha256="1x3l332pmh69kl0c1rka264mi69avdm938mzd79ck4y3qcgn07vr"; depends=[MASS rjags]; };
   EWS = derive2 { name="EWS"; version="0.1.0"; sha256="04bsl0s690k2wm7jnvgihj5r1fd1r3s2547j1sgl0zm8yvia2l8x"; depends=[numDeriv]; };
   EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; };
-  EZtune = derive2 { name="EZtune"; version="2.0.0"; sha256="1arrd9zkssb8ixx7r4nxwayksz1mk7jkvlcbm264pv9ya6kh3yrh"; depends=[ada e1071 GA gbm optimx rpart]; };
-  Eagle = derive2 { name="Eagle"; version="2.3"; sha256="0rkj1d2qwcyz13cl3zxb1kd9l38ckqx69bhn92kvjpxfc0h5xwis"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; };
+  EZtune = derive2 { name="EZtune"; version="3.0.0"; sha256="1s4hdd1j352k8brbfbdyh8mw183df2n37a61rlxhswyhfrp2w877"; depends=[ada e1071 GA gbm glmnet optimx ROCR rpart]; };
+  Eagle = derive2 { name="Eagle"; version="2.4.2"; sha256="13i64kalb5hjfzvj3rs54rn4lzkwr51vmbapqibcddga22d6i40b"; depends=[data_table ggplot2 ggthemes matrixcalc mmap plotly R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; };
   EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; };
   EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; };
   EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; };
   EasyMx = derive2 { name="EasyMx"; version="0.2-12"; sha256="00wj08nwv5zi5d4a1fss40f4cms4svam1hmmxvh60hvc55ygsc3z"; depends=[OpenMx]; };
   EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; };
-  Ecdat = derive2 { name="Ecdat"; version="0.3-7"; sha256="0isaysjagpx10fq47xs57ywr5jidi62g18zjv5a1jd3c0wswxbkv"; depends=[Ecfun]; };
-  Ecfun = derive2 { name="Ecfun"; version="0.2-2"; sha256="0gal91rhyrgpdxalnsy9pn7s0pj444zscv1m7pdgfzlnqcmf1vlf"; depends=[BMA fda gdata jpeg MASS mvtnorm RCurl stringi TeachingDemos tis XML xml2]; };
+  Ecdat = derive2 { name="Ecdat"; version="0.3-9"; sha256="112yg3v0pwssfw38nbbrrn1zrlg2h39brr79m3rdlp8hr810q92b"; depends=[Ecfun]; };
+  Ecfun = derive2 { name="Ecfun"; version="0.2-4"; sha256="0qi0582yxs2bpyryv55j2wr6f20g6zchp1z9r54wakhxr3sllr50"; depends=[BMA fda jpeg MASS mvtnorm RCurl stringi TeachingDemos tis XML xml2]; };
   EcoDiet = derive2 { name="EcoDiet"; version="1.0.0"; sha256="19x2ypmsw6jnq1s0nqk3pdkwi5g3g92r6fgxrxlnyvd0jqi9l8b3"; depends=[coda ggplot2 rjags]; };
   EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-6"; sha256="15lj6l29lwhk89mbmh5hqshg7yf0kgjlrc07b9x56w8382sg849l"; depends=[doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; };
@@ -1288,7 +1322,8 @@ in with self; {
   EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; };
   Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; };
   EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; };
-  EdSurvey = derive2 { name="EdSurvey"; version="2.5.0"; sha256="09zh0r93a0qkw4glnyrqzxjc13fai5nfjzd9sq06wnl6i9750bmq"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg readxl tibble wCorr WeMix xtable]; };
+  EcotoneFinder = derive2 { name="EcotoneFinder"; version="0.2.2"; sha256="02f9sm5dc7150yj6blmg1zgwppj396639v2wc1ypbal6bc0fphy4"; depends=[cluster colorspace corrplot e1071 ggplot2 igraph philentropy plyr purrr qgraph reshape rlang Rmisc vegan vegclust withr]; };
+  EdSurvey = derive2 { name="EdSurvey"; version="2.6.1"; sha256="1ixqbbpl90pvw2n4rczh336jni9xz0dvr2l5qwvwv9kv75q1hgj3"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg readxl tibble wCorr WeMix xtable]; };
   EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.6"; sha256="1hpm198awl30i7vbg1jk578s2i3f2kskirb33xvampcwn8mz0nhh"; depends=[editrules igraph Rcpp]; };
   EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-4"; sha256="17mhp4acj0myr2b54hgbb3wi5j6a6q999nqr9lwcbx3plyrwlljl"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
   EffectStars = derive2 { name="EffectStars"; version="1.9-1"; sha256="131w5bdc615gaa2czi4wyc2f96jcg24ahcmggajrvyhxmi6rag5x"; depends=[VGAM]; };
@@ -1296,6 +1331,7 @@ in with self; {
   EffectTreat = derive2 { name="EffectTreat"; version="1.1"; sha256="1kw1vq9y1q3xyiqsk855wjn9jqkzdh6h4xklbl9kvbqsvvhhsgkz"; depends=[]; };
   EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
   EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; };
+  EigenR = derive2 { name="EigenR"; version="1.0.0"; sha256="173yfqipha8g6m4djkgxki8wlys72xq9cpj7zir9r5lwfkygdzfc"; depends=[Rcpp RcppEigen]; };
   EleChemr = derive2 { name="EleChemr"; version="1.1.0"; sha256="109dv7ayg5nm6zjd70dp8h5qqwrijikymzgb41dl8vx4pqhv43v3"; depends=[ggplot2]; };
   EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; };
   EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; };
@@ -1303,7 +1339,7 @@ in with self; {
   ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
   EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.1"; sha256="1w61dni4vsglxqdhwdy5dcmzb6hx1wb9fhfki8wmal1yaza23ljy"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; };
   EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; };
-  EmissV = derive2 { name="EmissV"; version="0.665.2.1"; sha256="1525h28xwwq94maj07rnx13l7i9q7wcrssld5q99741clvzrygk0"; depends=[data_table ncdf4 raster sf sp units]; };
+  EmissV = derive2 { name="EmissV"; version="0.665.3.0"; sha256="0wfksrca1wl0ic7vqzvns4xsg8vfv1hzpc6v7mq1ibn0c0m68rk3"; depends=[data_table ncdf4 raster sf sp units]; };
   EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.2"; sha256="10as0xl24w9pap26cz21nqgysba70l9s4qxfbia7x0wfsz2s25jf"; depends=[ggplot2 gridExtra]; };
   EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; };
   EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; };
@@ -1317,31 +1353,36 @@ in with self; {
   EntropyExplorer = derive2 { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; };
   EntropyMCMC = derive2 { name="EntropyMCMC"; version="1.0.4"; sha256="065djml9dmn5ahbgaljnshvhziwg61xciq6fzh76449x3wy6bg65"; depends=[mixtools RANN]; };
   EnvCpt = derive2 { name="EnvCpt"; version="1.1.2"; sha256="1him08xs05zrifvhkckljgrskrj777dssv5vs8v4hq8apgifm8sa"; depends=[changepoint MASS zoo]; };
+  EnvExpInd = derive2 { name="EnvExpInd"; version="0.1.0"; sha256="063f3c10a7k9j3f85xilj1s6dd9ky5sw8sbvhzkhg5hg92c9dpns"; depends=[dplyr gstat maptools RCurl sp stringi zoo]; };
   EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; };
-  EnvStats = derive2 { name="EnvStats"; version="2.3.1"; sha256="0ang2s222znrvzvidyvj2sa2bqx95bxicff64p6w2a7z88mx8lyp"; depends=[ggplot2 MASS nortest]; };
+  EnvStats = derive2 { name="EnvStats"; version="2.4.0"; sha256="0505j1hh1xky6hm2i8m22pkw62ql7plkxn0v0bcb6dr085v9wia9"; depends=[ggplot2 MASS nortest]; };
   EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.41"; sha256="09miba6zk63bwc79n3030kgzlvy3whkq968pgqyghxnsjfh5ckp5"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; };
-  EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.13.0"; sha256="1m9gawd0fv0pl9q8n9rnid8shdy88kxw4hr5fvvf9ifngf8ffmqa"; depends=[]; };
-  EpiCurve = derive2 { name="EpiCurve"; version="2.3-1"; sha256="0yi49mdij8gx90kbppxdkm0xzaxhr9i7bpgis64vbx4bpy4ynxbb"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales tibble timeDate]; };
+  Epi = derive2 { name="Epi"; version="2.42"; sha256="1vsyxlxl6n5y3wr8w7ji17hnhvbr0xsawqbdl1ajcfg5faizm9sl"; depends=[cmprsk data_table dplyr etm MASS Matrix mgcv numDeriv plyr survival zoo]; };
+  EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.15.0"; sha256="1ghpvdfwqcxx4gnn6nfkik6bvdk7xnlrkljlqgzd4rdqlxg4gdq1"; depends=[]; };
+  EpiCurve = derive2 { name="EpiCurve"; version="2.4-1"; sha256="028yvxf5zmby7m5xwklhx1xrn9yw3dqhwddg03jq42vpjngds1b6"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales tibble timeDate]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.1"; sha256="0m6yay3r7dqih19f76wxwgq6dh9p1zmp5d9ilj9nd262q61jcy53"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="2.2-3"; sha256="0rg2ys9plqm9crz4h9xh8k045zwnsdwxsyp4k5bpdkdnrh8nvw08"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; };
-  EpiILM = derive2 { name="EpiILM"; version="1.5.1"; sha256="15676j8w7xsh1bdr3ggi8zdf6hf072bzmiymn050jv35l80azqx8"; depends=[adaptMCMC coda LaplacesDemon]; };
+  EpiILM = derive2 { name="EpiILM"; version="1.5.2"; sha256="0drs4qywx9axs7k5qk7sp5r3g8pykn4lqqbm0hxyl24r6b5l3d6b"; depends=[adaptMCMC coda LaplacesDemon]; };
   EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.6"; sha256="0qhpmh28zmgqnsyfxgv06g2slix12nn2pglgpvagx2q40rs4fann"; depends=[coda igraph]; };
-  EpiModel = derive2 { name="EpiModel"; version="2.0.2"; sha256="18r66y267si0zv76k7y93mph5290p8xmlanwg8q8fz6y4rwv5sfa"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm tergmLite]; };
+  EpiModel = derive2 { name="EpiModel"; version="2.0.3"; sha256="1nsrgnabl41cpp9c4lsajgkynxbvbqvdihbdzzkwxkaad40b86p8"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm tergmLite]; };
+  EpiNow2 = derive2 { name="EpiNow2"; version="1.3.2"; sha256="1rcyhk0f18asrym9zd7hr5ss7aw2dd2m5wrjcsqkr8q7x6apwh3g"; depends=[BH cowplot data_table futile_logger future future_apply ggplot2 lifecycle lubridate patchwork progressr purrr R_utils Rcpp RcppEigen rlang rstan runner scales StanHeaders truncnorm]; };
   EpiReport = derive2 { name="EpiReport"; version="0.1.1"; sha256="19pl75ld3s3dzg3z54f65j39di5hw3q4jgasj3cw87hjyqgzgbaq"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; };
   EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; };
   EpiStats = derive2 { name="EpiStats"; version="1.4-1"; sha256="1i9ymqf0p8wplbmbq4j0ixprjvg22l4z05imxhfj087p3p2sqq8w"; depends=[dplyr epiR]; };
   EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; };
   Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
   Equalden_HD = derive2 { name="Equalden.HD"; version="1.2"; sha256="1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb"; depends=[]; };
+  EquiSurv = derive2 { name="EquiSurv"; version="0.1.0"; sha256="1yml5s3rswayxlxqsqknpwa2i55pj9q1p233kj9xsm8f1zmzk1mf"; depends=[eha survival]; };
   EstCRM = derive2 { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; };
   EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
   EstMix = derive2 { name="EstMix"; version="1.0.1"; sha256="13zwhxm0qm83c8k5k4slvq2snkmbq1zz3i5cqvxxwhvkb4b8aja4"; depends=[PSCBS Rcpp RcppArmadillo]; };
   EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
+  EstimDiagnostics = derive2 { name="EstimDiagnostics"; version="0.0.1"; sha256="1jdk6v2n0c73jxvjv5c67pwqzg9zj6zpk1x4mniidw1p2jlxb902"; depends=[foreach ggplot2 goftest reshape2 rlang testthat]; };
   EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.2.2"; sha256="17sx309w4jjhgmpmk27gpj3d5pbra72vxdif4als0jhyd59kk0jw"; depends=[dplyr ggplot2 igraph qgraph]; };
   EstimationTools = derive2 { name="EstimationTools"; version="2.0.0"; sha256="09d0rnlm925my7m3kc3b7dzxvq7zqbyfk3p2m0hr4r6d8s0cwab9"; depends=[BBmisc boot DEoptim foreign numDeriv RCurl Rdpack stringr survival]; };
   EthSEQ = derive2 { name="EthSEQ"; version="2.1.3"; sha256="168wxxb1cyrfr8s4f9gxqj64dmc4i24g5k6yys3xay9c932gf98y"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; };
+  Eunomia = derive2 { name="Eunomia"; version="1.0.1"; sha256="06a42qsf3nx1pbynikkdvmbhh1rmgnfmiggdn86b3a0ij6cq0p2r"; depends=[DatabaseConnector RSQLite SqlRender]; };
   EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; depends=[clinfun data_table plyr shiny VGAM]; };
   EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
   EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
@@ -1349,16 +1390,19 @@ in with self; {
   EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; };
   Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.15"; sha256="1hvvlc8qwgal4lhlccf4dk817xgpyyiqzzlzk7w3ydnczr8pk4bk"; depends=[zoo]; };
   EventDetectGUI = derive2 { name="EventDetectGUI"; version="0.3.0"; sha256="02gwgbp692cfmf933jg1f7h4gghhc1v2cswz7rpcazm8h39mc4wh"; depends=[DT EventDetectR ggplot2 plotly shiny shinyBS shinydashboard shinyjs XML]; };
-  EventDetectR = derive2 { name="EventDetectR"; version="0.3.4"; sha256="1zyv9k0l1s5djvp5hbbrlz96gw3126n43nm2iv6xsil90k2fp827"; depends=[forecast ggplot2 gridExtra imputeTS neuralnet]; };
+  EventDetectR = derive2 { name="EventDetectR"; version="0.3.5"; sha256="0wx3bcs8n95fmyc5vnlrwd75bzqqvy6czb9bsbp04g3770c5ja0r"; depends=[forecast ggplot2 gridExtra imputeTS neuralnet]; };
   EventStudy = derive2 { name="EventStudy"; version="0.36"; sha256="0pd7qbpj4agaqc57lianqinnardyh929nr8ammmpal191v2i7hmw"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rlang rstudioapi scales shiny stringr testthat tidyquant tidyr]; };
+  EvidenceSynthesis = derive2 { name="EvidenceSynthesis"; version="0.2.2"; sha256="1jcs8r3xnigij1k86s2g9xrbgry7ls90ny07p0f86ljm2b3cyfvi"; depends=[BeastJar coda Cyclops EmpiricalCalibration ggplot2 gridExtra HDInterval meta rJava rlang survival]; };
   EviewsR = derive2 { name="EviewsR"; version="0.1.0"; sha256="1chg3g1jsdflgby2bksqw2nf27xin4nayqigxkji4zwbspp6m8ai"; depends=[knitr]; };
   EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
   EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.0"; sha256="1v6xpxk4kbjbmv8vh517rd76gyrd9znpxqdh4jqz8lvdpnpla4wv"; depends=[deSolve geometry ggplot2 interp MASS reshape2 rgl]; };
   Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; };
-  ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.1"; sha256="10jgwvq04cf17kdsjggyvnvmkialgcl38r53k5vj64h2zfwyj2wx"; depends=[corrplot dplyr DT ggplot2 kableExtra lfe lmtest multiwayvcov openssl rio rlang scales shiny shinycssloaders stargazer tictoc tidyr zip]; };
+  EwR = derive2 { name="EwR"; version="1.4"; sha256="1i0cwyylr1lqilykn1q2y1ad2gawfqkw9c51g04yn061c623pkam"; depends=[]; };
+  ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.3"; sha256="1y4ccyvlvdx9lcgpyns6k2npc0rzwk8db4bmbi3pq9xmv7ycgmcz"; depends=[corrplot dplyr DT ggplot2 kableExtra lmtest multiwayvcov openssl plm rio rlang scales shiny shinycssloaders stargazer tictoc tidyr zip]; };
   ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; };
-  Exact = derive2 { name="Exact"; version="2.0"; sha256="142yiz9bz1abgpdqkzgdsz3bp3dwbjlmyg29a62djb8630aicgyn"; depends=[]; };
+  Exact = derive2 { name="Exact"; version="2.1"; sha256="0clzxgqc7a112vaw7qy66kldj7spmj4ni5fvdhwxkn54749jk388"; depends=[rootSolve]; };
   ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
+  ExactMultinom = derive2 { name="ExactMultinom"; version="0.1.2"; sha256="1ygsiwcsmda0pbp7lzr03sb461mr9fff7hxp1lil40y9z0xgdmmb"; depends=[Rcpp]; };
   ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; };
   ExcelFunctionsR = derive2 { name="ExcelFunctionsR"; version="0.1.4"; sha256="1j3vfvfk8lp46zb6fwvq9lafk7r2qrnx4vxyhaih71c0a8g6dz9n"; depends=[lubridate plyr roperators stringr tidyr]; };
   ExcessMass = derive2 { name="ExcessMass"; version="1.0"; sha256="1z8l1lja02wxw8l72s3bq6sgjymn5929n123xk6b7ndd52zlfgf5"; depends=[]; };
@@ -1369,53 +1413,57 @@ in with self; {
   ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; };
   ExpertChoice = derive2 { name="ExpertChoice"; version="0.2.0"; sha256="1pd4v240ywc4wzh249axxb4kz5dccizc08jdjnaygz35hjdg5hvj"; depends=[DoE_base dplyr far purrr rlist]; };
   ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; };
+  ExtDist = derive2 { name="ExtDist"; version="0.6-4"; sha256="006q9xahq5zk7s6yc44ihjkr6cnjzp10pgw47zyk1rk81pjblzp3"; depends=[numDeriv optimx]; };
   ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; };
   ExtractTrainData = derive2 { name="ExtractTrainData"; version="9.1.5"; sha256="132f43mk2mjsfv9pfhj1371b4vxnqmnj5lf8xvfznf57xjna7wp1"; depends=[raster rgdal rgeos sp]; };
   ExtremalDep = derive2 { name="ExtremalDep"; version="0.0.3-3"; sha256="0svl7szscv1blgi2vh4kaqclg95sn871hk650bym2vdkjljy6x2x"; depends=[CompRandFld copula evd fda gtools mvtnorm nloptr numDeriv quadprog rlist sn]; };
   ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.6"; sha256="12bc4mmkmggvk3kfmz6nq13fa2470z0bx8smnvq9vf1ypdiiw85y"; depends=[Formula]; };
-  ExtremeRisks = derive2 { name="ExtremeRisks"; version="0.0.3"; sha256="1ja53780gh4xyid9dd36lc0ikfwr2fd18m1mvsfq069h65b2a8vg"; depends=[copula evd mvtnorm]; };
+  ExtremeRisks = derive2 { name="ExtremeRisks"; version="0.0.4"; sha256="1mvkrwyj9kwg35dzm9jzx311qqd4v3nnbrr6d64x476ni4pnrbl8"; depends=[copula evd mvtnorm plot3D pracma tmvtnorm]; };
   FABInference = derive2 { name="FABInference"; version="0.1"; sha256="0d11vxxa0mry735n7an8n97wmxyffsj4hirxlysljs941zhkhhw4"; depends=[MASS]; };
   FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; };
   FADA = derive2 { name="FADA"; version="1.3.5"; sha256="0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; };
   FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; };
   FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
   FAMoS = derive2 { name="FAMoS"; version="0.3.0"; sha256="14gr9wv9bpibk0rrzzwijvdncx1fgnpbv55nqzbb4jhq7fdckmsa"; depends=[future R_utils]; };
-  FAOSTAT = derive2 { name="FAOSTAT"; version="2.1.2"; sha256="11pmbjz4vkg8a68qfkbqlhnggln1vp8m5pllg2y7wwxxa4ld71qk"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO]; };
+  FAOSTAT = derive2 { name="FAOSTAT"; version="2.2.1"; sha256="1i1zd62qv1zrrnpkrchhk3maj9pfabvbc960gck3ry8l0ns926q9"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO XML]; };
   FARDEEP = derive2 { name="FARDEEP"; version="1.0.1"; sha256="0blvjakcpkh9vpxryk7qyaqnija0r375ckv37kjlr34xg8pg9qnm"; depends=[nnls preprocessCore]; };
   FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; };
   FAdist = derive2 { name="FAdist"; version="2.3"; sha256="0vy9yavg5apawjfvch5a7abrmsnx36zhlk8jff3dvcx409lykrrn"; depends=[]; };
   FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; };
-  FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; };
+  FAwR = derive2 { name="FAwR"; version="1.1.2"; sha256="1x90wvp0w7fhid7i5160b4fiv4xn5mpvy33zjzy0mvqvp0yp8xf0"; depends=[glpkAPI lattice MASS]; };
   FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; };
   FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
   FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; };
   FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; };
-  FCPS = derive2 { name="FCPS"; version="1.2.3"; sha256="1v7hq2gbimnpn9icgr5y05lfz3ml6433z3dbhzchvwla4qkm1xp1"; depends=[DataVisualizations ggplot2 mclust]; };
-  FCSlib = derive2 { name="FCSlib"; version="1.1.1"; sha256="1nr037pg74rwd6i1q1gbhijv3ffjifsjbzcf6hqy3mwy58pflh5d"; depends=[stringr tiff]; };
+  FCPS = derive2 { name="FCPS"; version="1.2.6"; sha256="13r8qv8n14g9dxmgpx1f4vc6r5mbnxs4b92gzqck49j38k5a1m77"; depends=[DataVisualizations ggplot2 mclust]; };
+  FCSlib = derive2 { name="FCSlib"; version="1.3.0"; sha256="1191ba6dwpakcdnbcq61zm5xq24isxjnn98nmvk67fpf1ycw70w9"; depends=[bitops fields stringr tiff]; };
   FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; };
   FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; };
+  FDRestimation = derive2 { name="FDRestimation"; version="1.0.0"; sha256="1m4k71bsfj2sbsnyqi1s9p5wxbvvn24w98lqwms6z4irc0sk6r3g"; depends=[Rdpack]; };
   FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
   FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; };
-  FDX = derive2 { name="FDX"; version="1.0.1"; sha256="1za2w2xykbfy2pvxxr9xq2lblk65mxrskx80cdcr00ivzj1jx2bn"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; };
+  FDX = derive2 { name="FDX"; version="1.0.3"; sha256="1bwads0w8g2w4vb78rq6j4gy5i9f12pcb4y1l540y1acb7d1dsji"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; };
+  FDboost = derive2 { name="FDboost"; version="1.0-0"; sha256="1227fda2m8lsq3cndv0xgbgbcfdxhc4fjiyj2dmha1z4sycd7a28"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
   FENmlm = derive2 { name="FENmlm"; version="2.4.3"; sha256="1a205a4iv54haixanyzx210lzqg7cnryjvqayvkdj1lhmdql4anw"; depends=[Formula MASS numDeriv Rcpp]; };
   FESta = derive2 { name="FESta"; version="1.0.0"; sha256="1kf5iqw8x8079gjaxicrgax5l798l8hxcc5y83l5pqh0ync5bxm6"; depends=[]; };
   FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
+  FFdownload = derive2 { name="FFdownload"; version="1.0.5"; sha256="0fs4bdwr9xhzlvkrjmcfkifkgqlmklp7l5297ahb7acg65h7yawn"; depends=[plyr rvest xml2 xts zoo]; };
   FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
   FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
   FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
-  FHDI = derive2 { name="FHDI"; version="1.4.0"; sha256="1plc4klvjid5ara6ay081xamxr14j3ldgqdm6ni8543cv07zwd74"; depends=[]; };
-  FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; };
+  FHDI = derive2 { name="FHDI"; version="1.4.1"; sha256="1n1rbrqdphp0prmkili6rnpxwdb7fgwsgncllr6yxlrkr5rb76pm"; depends=[]; };
+  FHtest = derive2 { name="FHtest"; version="1.5"; sha256="00mql2r4f5hxhdqf27q3x9s5rz2zzakx2myym97b1w1s7c5znl4q"; depends=[interval KMsurv MASS perm survival]; };
   FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
-  FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; };
   FIT = derive2 { name="FIT"; version="0.0.6"; sha256="1nkjms9cvigc9sjha1krzhd3nmwsfh8pi0f1plf5k8zpb773zzb2"; depends=[gglasso MASS Rcpp RcppEigen XML]; };
   FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; };
   FKF = derive2 { name="FKF"; version="0.1.7"; sha256="1s3qilbkmdfsxcc0vj4yv8jyh8gl9i9rq9f8xb8wiycccpzx119v"; depends=[]; };
+  FKF_SP = derive2 { name="FKF.SP"; version="0.1.0"; sha256="0ni256m45fy5v7mwlfkqc3xx7z03rs069z69ifykklmshxzjwdsy"; depends=[curl mathjaxr Rdpack]; };
   FKSUM = derive2 { name="FKSUM"; version="0.1.4"; sha256="02nicfw0wcprdg0p2p44g740j6bjf6xgzjxcvyfcbcsbr6bpjknx"; depends=[MASS rARPACK Rcpp RcppArmadillo]; };
   FLAME = derive2 { name="FLAME"; version="2.0.0"; sha256="067yy0b668pj25a0jscpjb98in22048vxs249a7pa4rs2c1cyai9"; depends=[devtools dplyr glmnet gmp magrittr mice rlang tidyr xgboost]; };
   FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; };
   FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
-  FLSSS = derive2 { name="FLSSS"; version="8.5.6"; sha256="1c6j54ihc385m1f0r86yb83zqv2myfskq48bh9dcynlnc9crs428"; depends=[Rcpp RcppParallel]; };
+  FLSSS = derive2 { name="FLSSS"; version="8.6.6"; sha256="0kw28zmvgdy4zmj2vnrs84n0rg6jvqj3x8f3ihjjkzkwqrqyiia9"; depends=[Rcpp RcppParallel]; };
   FLightR = derive2 { name="FLightR"; version="0.5.0"; sha256="00walvfjf2rr308mv4v3734qad4i1sgv0mwjldgpgjq077h4xw38"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; };
   FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; };
   FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; };
@@ -1436,34 +1484,36 @@ in with self; {
   FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; };
   FREEtree = derive2 { name="FREEtree"; version="0.1.0"; sha256="1i2liqbcg993snj5vq341mmafzhn1yrwljvx4f3kyzy0pa59k6rn"; depends=[glmertree MASS pre WGCNA]; };
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
-  FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.1.0"; sha256="1gi637fwfpwbghms96bmfqs7zirjskd9hxiw43s0765h3ypjqwx1"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
+  FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.3.0"; sha256="069pj6x4prlzg43q9ag8dl822awz3plk5020x13fv77jmyzq6srb"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
   FRK = derive2 { name="FRK"; version="0.2.2.1"; sha256="0fjfhkv899v08419109qs1gabnc22h7a5b4z6s6fd1zk1dc4agjn"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; };
-  FSA = derive2 { name="FSA"; version="0.8.30"; sha256="0f567dm1fcffjsmm4j8c81q748rl944ia5ll22b2ayvv3qf7v9y7"; depends=[car dplyr dunn_test lmtest plotrix plyr sciplot withr]; };
+  FSA = derive2 { name="FSA"; version="0.8.31"; sha256="0a5arvmabks14a52y1ydbnx52klj6dzfak10b7kfqpygbi2rc37n"; depends=[car dplyr dunn_test lmtest plotrix plyr sciplot withr]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.8"; sha256="0i7wkz0baxcf1dv6qvc891b4ja4x65p4qicil472k6a9gcf5d4qm"; depends=[]; };
+  FSDAM = derive2 { name="FSDAM"; version="2020.11-18"; sha256="09l7zvmbvmbcr5pxizdhs5fn79r6cl4ic0hsz2bazdymsqv3s3nm"; depends=[kyotil reticulate]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
-  FSK2R = derive2 { name="FSK2R"; version="0.1.1"; sha256="046d47zcig1rs76q32v3p6kc9shhb073659gw5vd585svkvcr4ic"; depends=[dplyr googlesheets purrr R_utils readtext readxl rjson rlang shiny stringr tibble tidyr XML xml2 zip]; };
+  FSK2R = derive2 { name="FSK2R"; version="0.1.2"; sha256="0baar5dg9zz89bz4f9x074qknxs296bdclipdy8m1ljzclhxpsbf"; depends=[dplyr googlesheets purrr R_utils readtext readxl rjson rlang shiny stringr tibble tidyr XML xml2 zip]; };
   FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; };
   FSSF = derive2 { name="FSSF"; version="0.1.1"; sha256="024g2rv64yqxmbbwrbkpkrzdfshl0n6jll6axsgsp4q4ia4r9401"; depends=[Rcpp RcppArmadillo]; };
   FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; };
   FSelector = derive2 { name="FSelector"; version="0.31"; sha256="1ryqrwz9h7ggxvmxyw4viajlkvd3r7i6ihcfrwsz6axyk5y0qarg"; depends=[digest entropy randomForest RWeka]; };
-  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.3"; sha256="0x0jysqjvplzmcjs223wma9ng2pyd9mcbdgqmgsiifv0wdic07vi"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
-  FSinR = derive2 { name="FSinR"; version="2.0.3"; sha256="13p28wn4b5f2q28g083r2qyahqrkw6qp6d4ibsipk4zclcrlpqax"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; };
+  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.7"; sha256="1y1hvcxs3516xf5fnzlm4hhd22i9h6cgklv2g2wbs3qph86334rl"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
+  FSinR = derive2 { name="FSinR"; version="2.0.5"; sha256="11ss38qpasbyym9hcfqmv254jvr8lzsw6r85dlm7xlnhfnxil59l"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; };
   FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
   FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; };
   FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; };
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
   FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
-  FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.6"; sha256="0y32k41i1mfh1yxkd8mcgw7x2xkibq9xqf2vgysnibgnabwi15w2"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; };
-  FactoMineR = derive2 { name="FactoMineR"; version="2.3"; sha256="0ldgf3daksh6lpblhqys67m4mxqx3q9s9n5plfam6dwshfik0ky6"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; };
+  FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.7"; sha256="0lndh80pmr5zhhh7j9lhxl4j007rak5gh3dwxd1883cy0d6whjs9"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; };
+  FactoMineR = derive2 { name="FactoMineR"; version="2.4"; sha256="0lg8n9fxxk46nchnj4pbpqqf4swxfsq7r9jzr36dmd36kb7avqxr"; depends=[car cluster DT ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; };
   FactorAssumptions = derive2 { name="FactorAssumptions"; version="1.1.2"; sha256="0k5jjqfajrq5wc0vp07s6kbfyjks6124hpy09nxw2blrai66vhcm"; depends=[MASS psych]; };
+  FactorCopula = derive2 { name="FactorCopula"; version="0.5"; sha256="0mqw6qwm8n2cfqz8srsynqcrki7qd98p5wmkp14i1j8c6n0i4vxd"; depends=[abind polycor statmod]; };
   FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; };
-  Factoshiny = derive2 { name="Factoshiny"; version="2.2"; sha256="0niic7k9z1j3684l0wmyhkbm1x8a2djig6m2k0s49vgfdaf1hcc0"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; };
+  Factoshiny = derive2 { name="Factoshiny"; version="2.3"; sha256="1mg1dynmxbfmagaa6fw3jg6x519nmq0vyq7bbkq4d6wiw7qykx57"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
   FamEvent = derive2 { name="FamEvent"; version="2.0"; sha256="07xb1k3yxsbwxxg6avw2gvai2qpjjd1imjggr8q6lkgcd8j3yxrb"; depends=[eha kinship2 MASS pracma survival truncnorm]; };
   Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; };
   FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; };
-  FarmTest = derive2 { name="FarmTest"; version="2.1.0"; sha256="0vm6mvl8iixm5w3xrzmc685ifypnlhjch4cpqjsvk0pamp5f24dl"; depends=[Rcpp RcppArmadillo]; };
+  FarmTest = derive2 { name="FarmTest"; version="2.2.0"; sha256="1mr2cscz3ywyq280ifaj4gypxanvvl9s7w33ysmwn952camra2md"; depends=[Rcpp RcppArmadillo]; };
   FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; };
   FastCUB = derive2 { name="FastCUB"; version="0.0.2"; sha256="04bphkfkkjp7gfnsgar5gcxzmkr437mz6y8mbf015m7f4cvdhzjz"; depends=[CUB Formula]; };
   FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; };
@@ -1504,7 +1554,7 @@ in with self; {
   FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; };
   FisPro = derive2 { name="FisPro"; version="1.0"; sha256="0wj5xf8qcrbmfixmsirwaf9yl5gk0bb588csp867c8n5jnqqyq0p"; depends=[Rcpp Rdpack]; };
   FishResp = derive2 { name="FishResp"; version="1.0.3"; sha256="0cydxs9knbmsyxrhqi68aqa12x20k6wcs6jw7z58k2jisypwqclw"; depends=[chron lattice mclust respirometry rMR]; };
-  FisherEM = derive2 { name="FisherEM"; version="1.5.2"; sha256="1s9k7p8wij79aljxgmni1nddrqsa1k4bdbxyar54rmrjxxz8y31l"; depends=[elasticnet MASS]; };
+  FisherEM = derive2 { name="FisherEM"; version="1.6"; sha256="18xn0hnj5diq7falrjl04abqyyrvyzaikb9l6wh7hfhflhsd382c"; depends=[elasticnet ellipse ggplot2 MASS plyr]; };
   FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; };
   FitARMA = derive2 { name="FitARMA"; version="1.6.1"; sha256="02di0pkz6hh92glpn3li6z9azkcqa64ja8zfpy0mkh1l97mw6jsv"; depends=[FitAR]; };
   FitUltD = derive2 { name="FitUltD"; version="3.1.0"; sha256="17fj211riybq71k63wjfv2ndc2h46ay5svrac2v5i3b92cb9hkbv"; depends=[ADGofTest assertthat cowplot fitdistrplus ggplot2 MASS mclust purrr]; };
@@ -1513,13 +1563,15 @@ in with self; {
   FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
   FlexGAM = derive2 { name="FlexGAM"; version="0.7.2"; sha256="04xbglg9vli18fd24k1qyvbl7svp70k67ig3jiss96fgkgbi6w7c"; depends=[MASS Matrix mgcv scam]; };
   FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-5"; sha256="1404cn3bhcdr3mjhpr072zcyl0wnksarsg2sry5d1scsmrn4xq83"; depends=[nlme]; };
+  FlexReg = derive2 { name="FlexReg"; version="1.0"; sha256="0zwm9jd7idakmf344fh7bgwyl20cl5iszxh7rk1iw94yjcq3g06l"; depends=[bayesplot BH Formula ggplot2 loo Rcpp RcppEigen rstan rstantools StanHeaders]; };
   FlexScan = derive2 { name="FlexScan"; version="0.2.0"; sha256="1jd93h96qhqvk9xx3va78v76fzl6y0rbm85022zpvk3wz4z2g1xs"; depends=[smerc sp spdep]; };
   FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; };
-  FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; };
   FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; };
   FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; };
   FluMoDL = derive2 { name="FluMoDL"; version="0.0.3"; sha256="0vp3w6hpph6svz8940w9yk9c5iv4n9mj94f9si1ks0xjbi948rqd"; depends=[dlnm mvmeta tsModel]; };
   Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
+  FlyingR = derive2 { name="FlyingR"; version="0.2.0"; sha256="0smishimssanzssndbwh9d276sq8vdldpzb3ww9c4nlwypxjmr8z"; depends=[kableExtra knitr Rcpp rmarkdown]; };
+  FoReco = derive2 { name="FoReco"; version="0.1.1"; sha256="1vlys6wv2h6bdzx5c33glykbipk0dsdf431ww5vgdl6r7p0h9xqs"; depends=[cli corpcor Matrix osqp pracma]; };
   ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
   ForeCA = derive2 { name="ForeCA"; version="0.2.7"; sha256="1falhz9v0z76h60gz66rh9wvk3jsjv8fvbkhkx9jmzbrkla397cd"; depends=[astsa MASS reshape2]; };
@@ -1528,10 +1580,10 @@ in with self; {
   ForecastTB = derive2 { name="ForecastTB"; version="1.0.1"; sha256="1wqgw4i65ajwj8la8mgv2qqm4ydgk90i6chdkd8h33rlwh8yddc6"; depends=[circlize decomposedPSF forecast ggplot2 gridExtra imputeTestbench PSF RColorBrewer reshape2]; };
   ForestDisc = derive2 { name="ForestDisc"; version="0.1.0"; sha256="1mzlrqjxsja51yyxckj4ym1vpfpq30vlhvs8clrg8jv7kz86hdwk"; depends=[moments nloptr randomForest]; };
   ForestFit = derive2 { name="ForestFit"; version="0.6.1"; sha256="1gbf1pgmqw102vp1792jls7f53ag93spkyyvk3qh1s76ag3shzac"; depends=[ars pracma]; };
-  ForestGapR = derive2 { name="ForestGapR"; version="0.0.2"; sha256="0xig9nal83xg312kgq6dhi7n67sa8ixlnh79x957w3n5rv9kdyf2"; depends=[igraph raster rgeos sp spatstat VGAM viridis]; };
+  ForestGapR = derive2 { name="ForestGapR"; version="0.0.3"; sha256="1r5bcgmvdpjyq5csxcvvrm4gd4nj4hm0sn6xf6j45bm9az2v9nj8"; depends=[igraph poweRlaw raster rgeos sp spatstat VGAM viridis]; };
   ForestTools = derive2 { name="ForestTools"; version="0.2.1"; sha256="08cx8pyg2giwpf1lnq5c8s98c1srspmgcwj62rdmb69gl0yp0l1j"; depends=[APfun doSNOW foreach imager plyr progress radiomics raster rgeos sp]; };
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
-  Formula = derive2 { name="Formula"; version="1.2-3"; sha256="0wiqh8rr9d5ciy80wj8f5fnmiiw0ywanvvnhkwd622dx42dk848l"; depends=[]; };
+  Formula = derive2 { name="Formula"; version="1.2-4"; sha256="1bsw282i5m8rlirbhz7hqvf25zbxschk7yrp152whbzdnmry6w6b"; depends=[]; };
   ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
   FossilSim = derive2 { name="FossilSim"; version="2.1.1"; sha256="1dffk14lszq84k61s1jar658qpjc1hm6rwa1gcwwvppvxj6gkvky"; depends=[ape TreeSim]; };
   FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; };
@@ -1547,8 +1599,10 @@ in with self; {
   FunCC = derive2 { name="FunCC"; version="1.0"; sha256="0n8fnrq3grsxxcz1841d3d643nyrwc7y15na1205zxq6rmdjx7wa"; depends=[biclust ggplot2 narray RColorBrewer reshape]; };
   FunChisq = derive2 { name="FunChisq"; version="2.5.1"; sha256="153l9mlynfl1j6ld7v4dl6lvs6rz20hchz009qngpg13szddafzb"; depends=[BH Rcpp Rdpack]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
+  FunWithNumbers = derive2 { name="FunWithNumbers"; version="1.0"; sha256="0kzmfy2dn41v7991crshxjcycp1s432ip0ivw8bq6x9v638skwkk"; depends=[gmp Rmpfr]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; };
-  FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.3"; sha256="16bw1fx2pzmxm8gavq791drnpsczxq5yyfbnl2h1xcrzlw4fw4b0"; depends=[dplyr ggplot2 ggrepel rlang scales]; };
+  FuncNN = derive2 { name="FuncNN"; version="1.0"; sha256="0kcr7c54igzi0imp8w9a0mnrqaa2qcls9777scsjz5sbcxdy3if3"; depends=[caret doParallel fda fda_usc flux foreach ggplot2 ggpubr keras Matrix pbapply reshape2 tensorflow]; };
+  FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.3.2"; sha256="0pplrbw4grphh92d941vqpqwqphc8d5iglgzzb0d0xknr5m20b8w"; depends=[dplyr ggplot2 ggrepel scales]; };
   FusionLearn = derive2 { name="FusionLearn"; version="0.1.1"; sha256="0n8bj7k2r2vf0v2nsw31k75hzkqj5l4hyfnmvid102hx9cl8hv3y"; depends=[]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; };
   FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.5"; sha256="02sx32vlvnr0fzw8rf0f6hiikqn7xp1ibpqzxhxwv8yij2qkiyci"; depends=[MASS]; };
@@ -1557,7 +1611,7 @@ in with self; {
   FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-6"; sha256="1zba28kmzpcza099k1ck7aqn7ms2fh3ijcn05xdimvssjbhsag81"; depends=[]; };
   FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="3.2"; sha256="0gldq0bg1p1vmrn35prha44d7lyymz0jzshdyp2c5rx433mny7h5"; depends=[FuzzyNumbers]; };
   FuzzyR = derive2 { name="FuzzyR"; version="2.3"; sha256="0y22924vhvybiwhsfl3svizk4sgrvg4a8wl30b5kb2c0vjv03ad6"; depends=[plyr shiny]; };
-  FuzzySTs = derive2 { name="FuzzySTs"; version="0.1"; sha256="1xg140vaw3rwv62n3s52v1z96nfii43m6b8b3l84cdyv5y9bwrln"; depends=[FuzzyNumbers polynom]; };
+  FuzzySTs = derive2 { name="FuzzySTs"; version="0.2"; sha256="0zs1pyn9apysspxa0glqc96h6npmvvhiqvqpcm0brslz0b6xnilp"; depends=[FuzzyNumbers polynom]; };
   FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.4"; sha256="1jpqb8xczi1d4g306vrwpi02f9h59aki1pgnckvfmiclr306prpb"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
   FuzzyStatTra = derive2 { name="FuzzyStatTra"; version="1.0"; sha256="1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00"; depends=[]; };
   FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
@@ -1570,10 +1624,12 @@ in with self; {
   GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; };
   GADMTools = derive2 { name="GADMTools"; version="3.8-1"; sha256="02rqpvqawk0y8w20d89cbdbjlmpyvvp826gzzdajqba1wazj6ikx"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr]; };
   GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; };
-  GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
+  GALLO = derive2 { name="GALLO"; version="1.1"; sha256="1jx8y2ph3jmsx9y7y3r1ap5aybqy7zdk43jpnvcfamzv0q5v8mf0"; depends=[circlize data_table doParallel dplyr DT dynamicTreeCut foreach ggplot2 lattice magick RColorBrewer rtracklayer stringr unbalhaar]; };
   GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; };
   GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
   GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
+  GARCHIto = derive2 { name="GARCHIto"; version="0.1.0"; sha256="1rh9da9gb1krxasx1apldns5k3wl2xjjqc8bidsd5c0h5jlqdvr6"; depends=[Rsolnp]; };
+  GARCOM = derive2 { name="GARCOM"; version="1.2.0"; sha256="1fgr03gw86fjrj6hx32qvl6jsc6ax9i1ss4bbfmi8iz2f1nq43wi"; depends=[data_table vcfR]; };
   GAS = derive2 { name="GAS"; version="0.3.3"; sha256="0w5rgx3f965jxl2r6rhsj5ad4bbbwir8hbki3q0cs2z9hc4g6vh9"; depends=[cubature MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
   GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; };
   GAparsimony = derive2 { name="GAparsimony"; version="0.9.4"; sha256="1p1s5q1basy9v3jy1qxpx5g8mzpkwdfarxmmf7s06c6wq0dl9vp8"; depends=[foreach iterators]; };
@@ -1581,59 +1637,60 @@ in with self; {
   GB2group = derive2 { name="GB2group"; version="0.2.0"; sha256="185am9j88f3qjv0h8ag91x8qrck4qk0a4k0mcg5k56rf2lf7s7zi"; depends=[GB2 ineq minpack_lm numDeriv]; };
   GBJ = derive2 { name="GBJ"; version="0.5.3"; sha256="12lsddkcxz37hn2fvjq158wb1bc6b3hx6wj8q8nj21zpmyl3n2qh"; depends=[BH mvtnorm Rcpp SKAT]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
-  GCD = derive2 { name="GCD"; version="4.0.6"; sha256="1lc2n9avg1rfh55gbj3q0yd1gvfw60088zg279s7aikx10zv4sx7"; depends=[raster]; };
+  GCD = derive2 { name="GCD"; version="4.0.7"; sha256="1259z76hajapzzq75fas2sq19r0wapn1ybghdaqdc6dksifdz6fv"; depends=[raster]; };
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
+  GCSM = derive2 { name="GCSM"; version="0.1.0"; sha256="05fyjdchnls4aikhwis3v691vsvxf657f9jf55a61ilvn59552q5"; depends=[Rcpp RcppArmadillo]; };
   GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; };
-  GCalignR = derive2 { name="GCalignR"; version="1.0.2"; sha256="1x0as6mmapvn3a28c3qk3wd5gjkx17xgf9c7yb68wp3lj8pknsnm"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
+  GCalignR = derive2 { name="GCalignR"; version="1.0.3"; sha256="0fq5jglgbw2cqm4pa7x4lczqjr1w65ddnhzlr2i97skzk0gcdlr5"; depends=[ggplot2 pbapply readr reshape2 stringr tibble]; };
   GD = derive2 { name="GD"; version="1.9"; sha256="00sagb5hxxpgvbycbf86kw7nf0wvxcbam9ni8nlp7asjkmkpv5zq"; depends=[badger]; };
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
   GDAtools = derive2 { name="GDAtools"; version="1.5"; sha256="1xya99dqzb9mgkw7h7aj592ya36j1hai8j8zgy1dpmpfxwsbjd6y"; depends=[FactoMineR ggplot2 ggrepel moreparty nleqslv nnet RColorBrewer rlang]; };
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
   GDINA = derive2 { name="GDINA"; version="2.8.0"; sha256="0chxnhp37xfd78gafkgwqrmc0jf3pvpdyrkc438kl0l53fb7dld7"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
-  GE = derive2 { name="GE"; version="0.1.4"; sha256="0h0g3ngdih69lhkkjxbn6i0abw8kg2jdpqbvzzn2xw0cjww2fjh1"; depends=[CGE data_tree DiagrammeR]; };
+  GE = derive2 { name="GE"; version="0.1.6"; sha256="17wwyjzsp2hxc8g3xziwfxqm4df2pngw6dwcqxaljlav10li0s3r"; depends=[CGE data_tree DiagrammeR]; };
   GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; };
   GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; };
-  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; };
-  GENEAread = derive2 { name="GENEAread"; version="2.0.8"; sha256="1phiwdq05h92vlrjbvx4xvazzls5bdlnwfxn5mghx0v9j0n3ahrm"; depends=[bitops mmap]; };
+  GENEAclassify = derive2 { name="GENEAclassify"; version="1.5.1"; sha256="0xwvq0vbv2a9r7r0kcn1a32r6d2kgxz3cxnrclq4b4kwrdc8n7nn"; depends=[changepoint GENEAread MASS rpart signal]; };
+  GENEAread = derive2 { name="GENEAread"; version="2.0.9"; sha256="00whn2xqlcdcgmrifng04j2csxynfb1dmj9wkx981ylz13jsnwm9"; depends=[bitops mmap]; };
   GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.9"; sha256="1ch3wz3y6p6z0rs9b3877iihvp0ycha062ajzf2fhxgjzgf0v5d1"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
   GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; };
   GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; };
   GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; };
   GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
-  GET = derive2 { name="GET"; version="0.1-7"; sha256="0q32a7c09h6qcgyf2xav2i4ajc3i4hd2i7k1il99g5i5p6sx040i"; depends=[ggplot2 gridExtra spatstat]; };
-  GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; };
+  GET = derive2 { name="GET"; version="0.2-1"; sha256="0jzl6yf9ljjsr5k8y71qjr8w2a5gcnrlhiirzcm9wc1h6hchbmqp"; depends=[ggplot2 gridExtra viridisLite]; };
+  GEVACO = derive2 { name="GEVACO"; version="1.0.0"; sha256="0rslnxqbj1pbbnp849pdn6l9dyfib9w19a1q3fw7kdjfir76gk6a"; depends=[nlme RLRsim]; };
   GEVcdn = derive2 { name="GEVcdn"; version="1.1.6-2"; sha256="0vmm9fhyrk5m0zwy7fpq5j9zinws0gn2saf4j9plqc9gj1gphjn0"; depends=[]; };
   GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; };
   GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
   GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; };
-  GFD = derive2 { name="GFD"; version="0.2.6"; sha256="1z98j6nvaa4vrh840q1iy5r0h9ns4xbrk3qfkq51l2kmbrck8r7a"; depends=[magic MASS Matrix plotrix plyr]; };
+  GFD = derive2 { name="GFD"; version="0.2.9"; sha256="1q60n2l00vm5v0wl9zk780lhvh294fqmvcfgch37zm3lyr9zllvh"; depends=[magic MASS Matrix plotrix plyr]; };
   GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; };
   GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; };
   GGClassification = derive2 { name="GGClassification"; version="0.1"; sha256="03wis5ng2mnfhp33xrag8xbmvjagzr1909a6x94wv7s2spji00rp"; depends=[Rcpp RcppEigen]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
   GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; };
-  GGIR = derive2 { name="GGIR"; version="2.0-0"; sha256="10s5q3srmms3h4nwvsdd8clqvifimkqihw5jy5zh03aplwkqwzrq"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; };
-  GGMM = derive2 { name="GGMM"; version="1.0.1"; sha256="1d0qxxdk7b3hzg7dimsbjabpf5rxn3azn2hy00pa1c6wya7kxyvv"; depends=[equSA huge mvtnorm]; };
-  GGMncv = derive2 { name="GGMncv"; version="1.1.0"; sha256="1h7mym10z2y3p6k1xkrnxp3442720453h4k8zclz7kvcqbdwwaiq"; depends=[ggplot2 glassoFast MASS numDeriv psych Rcpp RcppArmadillo Rdpack reshape]; };
+  GGIR = derive2 { name="GGIR"; version="2.2-0"; sha256="1zqlc49d5ydrz7qj59j7a0yqdvmikicslskxki8fybzdbxn65cya"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR unisensR zoo]; };
+  GGMncv = derive2 { name="GGMncv"; version="2.0.0"; sha256="1h1h2qx784f41ihmylj8zxhcxcd67r10qpz5938iynnr04mjm6l0"; depends=[ggplot2 glassoFast MASS mathjaxr numDeriv Rcpp RcppArmadillo Rdpack reshape]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
   GGMselect = derive2 { name="GGMselect"; version="0.1-12.4"; sha256="0p9djnkclnk64bcrd66agi2gw2j3bqvqhamfm0h59b810kh50kbn"; depends=[gtools lars mvtnorm]; };
   GGUM = derive2 { name="GGUM"; version="0.4-1"; sha256="09f4vha23z915fn8nj7wj4ry1m7ifqfqig1gbn0vx6kwg1d03whq"; depends=[abind psych Rdpack viridis xlsx]; };
   GGally = derive2 { name="GGally"; version="2.0.0"; sha256="1gkmpzh1yvwvypkw0nwqv3gsf6za3220wig3rfv8g23kss60rl1s"; depends=[ggplot2 gtable lifecycle plyr progress RColorBrewer reshape rlang scales]; };
-  GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
   GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; };
+  GHap = derive2 { name="GHap"; version="2.0.0"; sha256="0br9civfdlksn5xmyrvz2y0knikcd2i175kddxjdqmiyyayckc8w"; depends=[class data_table e1071 lme4 Matrix]; };
   GIFTr = derive2 { name="GIFTr"; version="0.1.0"; sha256="101vr2qasky8hnxp5i3lhlnymwzciypqwvhpl6mrr0r0czgpcz2f"; depends=[glue stringr]; };
   GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; };
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
   GInSARCorW = derive2 { name="GInSARCorW"; version="1.15.6"; sha256="0rpq8ng9skxg6qzhainsc9jkznql6glq65a1bdbrkc6pwx3pc7lc"; depends=[circular raster rgdal rgeos sp]; };
-  GJRM = derive2 { name="GJRM"; version="0.2-2"; sha256="0hwa3nnlk3q810x5gyx9la090vn8fysm9rdv2gg80j8jifzhs48h"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; };
+  GJRM = derive2 { name="GJRM"; version="0.2-3"; sha256="0hmryv66qlj8kzm5d0fh1qjr7gzfy99dh73fy8knv7ph0l2lc6x6"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; };
   GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; };
   GLDEX = derive2 { name="GLDEX"; version="2.0.0.7"; sha256="1w5ahwbnz9xsn3rdxzcxxvc6m5cgq46nln3i5v8vp4imrs8aafb3"; depends=[cluster]; };
   GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
   GLIDE = derive2 { name="GLIDE"; version="1.0.2"; sha256="1z5h8br6aig24g5gsh8h6npm269id3h5gjjyf5avs4v08b51rpcv"; depends=[doParallel foreach MASS]; };
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
-  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.7-0"; sha256="0ngqshbqi2gzykh8ckg8867mqvzlbyjgs31dsz00k7yzs25gc4np"; depends=[MASS matrixStats nlme]; };
+  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.7-15"; sha256="1nshqmwa1imlx0h5nsw69d8lw4bj5gdxdxccfh7h0f12q505yjgl"; depends=[MASS matrixStats nlme]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
+  GLMcat = derive2 { name="GLMcat"; version="0.1.0"; sha256="102yydldnggklx8dw1slm5pdf1c798j8a8pg1rc0mw42yvn75zs8"; depends=[BH Rcpp RcppEigen]; };
   GLMpack = derive2 { name="GLMpack"; version="0.1.0"; sha256="15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy"; depends=[AER censReg effects foreign lme4 lmtest MASS Matrix nnet pBrackets plm pscl sandwich]; };
   GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; };
   GLSME = derive2 { name="GLSME"; version="1.0.5"; sha256="18gixzg8b8yql91dhv8xsrcrxdix0kr0qgmiva0hwmyzpsn6rqam"; depends=[corpcor mvtnorm]; };
@@ -1642,13 +1699,14 @@ in with self; {
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
   GMDH2 = derive2 { name="GMDH2"; version="1.5"; sha256="0y132zc8q4daj4856xikp4xvrqcibmn9r2shnmwpwxnfbik2ikfb"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
   GMDHreg = derive2 { name="GMDHreg"; version="0.2.1"; sha256="1rav4xhli8gy27sa5zh3lvpgz6zpff37783z1k23n0xf4n0h61nh"; depends=[]; };
-  GMKMcharlie = derive2 { name="GMKMcharlie"; version="1.0.3"; sha256="1ncz3czjg1md1hfahc2403k33nby11ldlq0yixpjs4s8panwpgsb"; depends=[Rcpp RcppArmadillo RcppParallel]; };
-  GMMAT = derive2 { name="GMMAT"; version="1.2.0"; sha256="09zvqak85242xkkfwkhw8r3j8wj6s3zx5w2rcx26gn9lgifmfdhz"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; };
+  GMKMcharlie = derive2 { name="GMKMcharlie"; version="1.1.1"; sha256="1adra4qjq0xriyg08zyh9f99x1sry59kmvrissb0kssaqs4r7gk9"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  GMMAT = derive2 { name="GMMAT"; version="1.3.1"; sha256="0p1wl9wppddggn0hrxmhy3jbw42n9h52jjwijjha5zmhjjlr665b"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.3"; sha256="0p9jnwjc8g83qsxkjz9lhaip1hkpdg6n4fdpz34b96vb7qhzrrqc"; depends=[magic minqa]; };
   GMPro = derive2 { name="GMPro"; version="0.1.0"; sha256="0xhja221wz89cm76qbq01nqz73jx7d2zx9i2ky5vd31zkspmlqkm"; depends=[combinat igraph transport]; };
   GMSE = derive2 { name="GMSE"; version="0.6.0.4"; sha256="1q3laiyrkps9v51hlhyvmam9a5a1djmxkgjl562p46fszk1hm17n"; depends=[shiny shinydashboard shinyjs]; };
   GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; };
-  GNAR = derive2 { name="GNAR"; version="1.1.0"; sha256="14vp64wlpi0z0h3rwfncdmnrhz57nmv1d6n3b0zi1kmylmpng2sw"; depends=[igraph wordcloud]; };
+  GMZTests = derive2 { name="GMZTests"; version="0.1.3"; sha256="0crvgjx47fbv3lnc7h8ra8x04yr9gz4nppn9z7j4860qpwr8f890"; depends=[DCCA fgpt fitdistrplus nonlinearTseries PerformanceAnalytics tseries]; };
+  GNAR = derive2 { name="GNAR"; version="1.1.1"; sha256="1ryiv671nhhhif8xqj8lx6jfh503ayqvldnmzkwfma2ww1518y08"; depends=[igraph wordcloud]; };
   GNE = derive2 { name="GNE"; version="0.99-3"; sha256="11pk9w4xj27dyfn05bna99xqdb89wp0ljl798d5dyk5fcnhh7217"; depends=[alabama BB nleqslv SQUAREM]; };
   GNRS = derive2 { name="GNRS"; version="0.1.0"; sha256="05iclnrdcp4i6h8lfkw4dbkl0qmm814rvb621ypq4w5r4g96h72r"; depends=[jsonlite RCurl rjson]; };
   GNSSseg = derive2 { name="GNSSseg"; version="6.0"; sha256="1zkj98xh63wfyyygg2ahq3m54xlvi3x9sy0rhcn2dlfvbxaxfl4k"; depends=[capushe robustbase]; };
@@ -1656,14 +1714,15 @@ in with self; {
   GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
   GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; };
   GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
+  GOxploreR = derive2 { name="GOxploreR"; version="1.1.0"; sha256="1a3333d94xrj8iavn2yawgb8x296ilji3drcwwvrjs7v7rib0k5f"; depends=[annotate biomaRt dplyr ggnetwork ggplot2 GO_db gontr igraph network]; };
   GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
   GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-4"; sha256="1ff49549cxrylicqgmf1b4gdqqhj8lk5fw0rzyni8ip970bfbkw9"; depends=[caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos]; };
-  GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
   GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; };
   GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; };
   GPL2025 = derive2 { name="GPL2025"; version="1.0.1"; sha256="0af42g3v91fbcmla2yq98v8rd4ifaznb1xvw7ny41r3843d8appc"; depends=[dplyr]; };
   GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; };
   GPM = derive2 { name="GPM"; version="3.0.1"; sha256="01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; };
+  GPP = derive2 { name="GPP"; version="0.1"; sha256="1qryza8mamwzwqiy31drf176w192ksw34kpsa0wc8gsp3ylkm2f9"; depends=[rstan]; };
   GPRMortality = derive2 { name="GPRMortality"; version="0.1.0"; sha256="0k5pfyl7r5vsac927aqx19lz93vyk5l3ydqkazn2hwwaw1lh2wav"; depends=[rstan]; };
   GPSCDF = derive2 { name="GPSCDF"; version="0.1.1"; sha256="1l50a6p81lykiqlqiwb6kix5s6wzwdi8vddqhl418dlwlsh83ybf"; depends=[dplyr MASS nbpMatching nnet survival]; };
   GPSeqClus = derive2 { name="GPSeqClus"; version="1.0.0"; sha256="1zxihac4hd2b1vvrb36v2c6lhn8pfs8q4zgzi2flyb0dnb5di09r"; depends=[geosphere leaflet leaflet_extras plotKML plyr purrr rgdal sp spacetime suncalc]; };
@@ -1678,6 +1737,7 @@ in with self; {
   GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; };
   GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; };
+  GREMLINS = derive2 { name="GREMLINS"; version="0.2.0"; sha256="0wdqikz6k5d2cxcb347lhy7rj54blgf1m4sjv64zd4nx6c4r0ai8"; depends=[aricode blockmodels igraph mclust pbmcapply R6]; };
   GROAN = derive2 { name="GROAN"; version="1.2.0"; sha256="14n3k1wwz5pn82wcj00cdns4bp699f58k1nj8hp8jn0q7xr2sgv5"; depends=[plyr rrBLUP]; };
   GRPtests = derive2 { name="GRPtests"; version="0.1.0"; sha256="1l03rr20xbl6gdj8k3rmmj13basnbmkl80hphldcnmg5iklyqyha"; depends=[glmnet MASS randomForest RPtests]; };
   GRS_test = derive2 { name="GRS.test"; version="1.1"; sha256="1ap9453rj5zan6c3ix7jb1qxhxh42bfv295dgqbgjpdygjdlbm6n"; depends=[]; };
@@ -1692,7 +1752,7 @@ in with self; {
   GSIF = derive2 { name="GSIF"; version="0.5-5.1"; sha256="1nc177f200m3wfppmdh9cf6g2npx87c0mz2g17zdrw5crx688i8d"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; };
-  GSODR = derive2 { name="GSODR"; version="2.1.1"; sha256="1x996cpbq0ms9l94kw02c9aa8by0y0j8jsqff6fpndhyppjk59yv"; depends=[countrycode curl data_table future_apply httr R_utils]; };
+  GSODR = derive2 { name="GSODR"; version="2.1.2"; sha256="0kppdg0si05mfg6rn1zl9q6slq9287fad9hprkc5a462ns2d1hag"; depends=[countrycode curl data_table future_apply httr R_utils]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
   GSelection = derive2 { name="GSelection"; version="0.1.0"; sha256="052vh1haxlzbh3c5i24nrwphapik1y8ribmh6q4axd447ggc0ff9"; depends=[gdata penalized SAM]; };
   GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; };
@@ -1705,15 +1765,15 @@ in with self; {
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
   GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; };
   GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; };
-  GWASinspector = derive2 { name="GWASinspector"; version="1.4.8"; sha256="00495z13r7z5yzpkc4vqqxidkk463n7xlz3mm8a4483zbk7p4l1x"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; };
+  GWASinspector = derive2 { name="GWASinspector"; version="1.4.8.2"; sha256="10kd09rijlwib9ssfgn8mkql1wqwhvp823iw1qi0mnwv2ilrsmxi"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; };
   GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; };
   GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
   GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
   GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; };
-  GWSDAT = derive2 { name="GWSDAT"; version="3.0.3"; sha256="10xvnnhqjs2p1r6yzflhkfi4985ljs57k5k8r6g85y2hq46m80p8"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; };
-  GWmodel = derive2 { name="GWmodel"; version="2.1-4"; sha256="13gm37b43m6i8j0qz4k7lv0myamap88s38fn6m664683bpw8il7h"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; };
-  GWnnegPCA = derive2 { name="GWnnegPCA"; version="0.0.2"; sha256="0aa3lzzgbfy13fc19aq80dj09nwb1r6i2c8iarbhakyc75956npl"; depends=[GWmodel nsprcomp sf sp]; };
-  GWpcor = derive2 { name="GWpcor"; version="0.1.2"; sha256="0gq7fjdry7wysx2x2amzvfz1fs7l0511incgdajyxxi9mls3wcp3"; depends=[corpcor doParallel dplyr foreach GWmodel sf sp]; };
+  GWSDAT = derive2 { name="GWSDAT"; version="3.0.5"; sha256="1j68jyp3528apdi5nb6m4a04x5lf0k1krfg3vmc7r31ylk71q0jm"; depends=[deldir digest geometry Kendall lattice lubridate MASS Matrix officer raster readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; };
+  GWmodel = derive2 { name="GWmodel"; version="2.2-2"; sha256="01lagyqns2kd5myw4x9amk5ayjfqvqvw2mzhqkzjij7vhldj4asf"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; };
+  GWnnegPCA = derive2 { name="GWnnegPCA"; version="0.0.4"; sha256="1yinzlp22z9z5fk9f1nm14i408yfm5kfgkn3pqnh4bkghs569ivg"; depends=[geodist nsprcomp pracma sf sp spData]; };
+  GWpcor = derive2 { name="GWpcor"; version="0.1.5"; sha256="0ci8fjp3k3vpyq83z1vgi23cfc1n5vr757rjbxg7rbnqn43g9dfl"; depends=[corpcor doParallel dplyr foreach geodist pracma sf sp]; };
   GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; };
   GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
   GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
@@ -1724,9 +1784,9 @@ in with self; {
   GaussianHMM1d = derive2 { name="GaussianHMM1d"; version="1.0.1"; sha256="1j1cwh0p7czy2l4qf6nymqcp8kkfaki0j2rj8p99nqn2vgc3vcax"; depends=[doParallel foreach]; };
   GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; };
   GeNetIt = derive2 { name="GeNetIt"; version="0.1-4"; sha256="1z9h3prlf5r7ks0ys4wy0i5i3giaplqmngsqwxllsy70jjb9s90h"; depends=[exactextractr nlme raster rgeos sf sp spdep]; };
-  GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; };
+  GenAlgo = derive2 { name="GenAlgo"; version="2.2.0"; sha256="1pihqxif2v62hwf5761fshyhigcjmlgbvp2j7immxlsysjfw5xgq"; depends=[ClassDiscovery MASS oompaBase]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.1"; sha256="1w6k02bkawk7la7yjj8xby8w2a303gfk18xz08c7gka9a3m1lxqx"; depends=[]; };
-  GenEst = derive2 { name="GenEst"; version="1.4.4"; sha256="17yqf3bd7cwkv3m2gk3zd5pf6jafps82x85qj2bpqp08ca6j6fli"; depends=[corpus DT gsl gtools hellno htmltools htmlwidgets lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; };
+  GenEst = derive2 { name="GenEst"; version="1.4.5"; sha256="176yzgd4xbiypr0w0bywsld2zz7c7bg6c94mk3i7jdvl5csw2ghl"; depends=[corpus DT gsl gtools hellno htmltools htmlwidgets lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
   GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; };
@@ -1741,7 +1801,7 @@ in with self; {
   GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; };
   GeneralisedCovarianceMeasure = derive2 { name="GeneralisedCovarianceMeasure"; version="0.1.0"; sha256="02s1wbsdp5ma4pnmcsdl5dwm156zx12d3n1ypzkc33lxg21ashzj"; depends=[CVST kernlab mgcv xgboost]; };
   GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; };
-  GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.9"; sha256="02wbs1q9wzzgbfnx8nfc8wiyqim8vznlps3w91hgx7s28biq37n7"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+  GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.2.1"; sha256="0dbrm0cfnvp38jkvcc0ib77bjqng9p1czbd2d1i4pdrnwb64xdx6"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
   GenoScan = derive2 { name="GenoScan"; version="0.1"; sha256="0p98imfvvz7l94kim3pxypyjs2pbxng4a2nagbafbady82ylr2vi"; depends=[data_table MASS Matrix seqminer SKAT]; };
   GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; };
@@ -1753,21 +1813,22 @@ in with self; {
   GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; };
   GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; };
   GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.4"; sha256="03m669vy0yj9rj524dkrgkqyhjzwc0xckm3zd1272a48jyc1jywd"; depends=[data_table]; };
+  GeodRegr = derive2 { name="GeodRegr"; version="0.1.0"; sha256="1wr2n1lkn42vix9jfpw1k7y70lvl3qbqzm0kzvq6yyxnl30sirgs"; depends=[zipfR]; };
   GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; };
-  GermaParl = derive2 { name="GermaParl"; version="1.5.1"; sha256="0mlzmjxnhql3691km3kr0b70g4hfxa7zhsfnndzdinrckzj5mn0w"; depends=[cwbtools zen4R]; };
-  GerminaR = derive2 { name="GerminaR"; version="1.4.2"; sha256="1sppkh42yj5p9kwlpiq3l1v720idbc9ni82m1hbdf9bg49h1gf3i"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr purrr readxl shiny shinydashboard tibble tidyr]; };
+  GermaParl = derive2 { name="GermaParl"; version="1.5.2"; sha256="1046zglr72xvv2jfyilrzv5isch867rxg33iq56b5jn8xr3b6780"; depends=[cli cwbtools zen4R]; };
+  GerminaR = derive2 { name="GerminaR"; version="2.0.1"; sha256="0d8waa20s0l56ckns2za5vgcny4r75lhb12jy32hq4nv5fh8krh6"; depends=[agricolae dplyr ggplot2 gtools purrr shiny tibble tidyr]; };
   GetBCBData = derive2 { name="GetBCBData"; version="0.5"; sha256="1i5b5sawa8ngjp1afm1grm9hbmkhd5pcwqagkamlihsrmsvcdffn"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; };
   GetDFPData = derive2 { name="GetDFPData"; version="1.5.3"; sha256="1l2zhay8r16pwmprjmvk4agr0l1ysbvvf99abcihvd1i117ixarq"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; };
   GetLattesData = derive2 { name="GetLattesData"; version="1.4"; sha256="129hnhmw8aw81whyj3g7npwgmg4fmvsji9h2xfg78nrp0abjxijv"; depends=[curl dplyr readr stringdist stringr XML]; };
   GetQuandlData = derive2 { name="GetQuandlData"; version="0.1.0"; sha256="1g1as4m853ab1wp57rzqm0552g0vm7kxzypibv0xywc85084pnmc"; depends=[dplyr jsonlite memoise purrr readr scales stringr]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
   GetTDData = derive2 { name="GetTDData"; version="1.4.2"; sha256="1qz75hq1c89riq0jpzjkr9gbk5y7894kb0ydhdyji7kjl1kvgyvx"; depends=[bizdays curl RCurl readxl rvest stringi stringr tidyr XML xml2]; };
-  GetoptLong = derive2 { name="GetoptLong"; version="1.0.2"; sha256="1p89v2qzqfxyrmqzkv245716n9i4bllnq77a6gw811mgdhxbd51l"; depends=[crayon GlobalOptions rjson]; };
+  GetoptLong = derive2 { name="GetoptLong"; version="1.0.5"; sha256="00fpm6nd3kqa2ikasxa62jzywi46fvvmx1mdavcp5yrxxn37j8wc"; depends=[crayon GlobalOptions rjson]; };
   Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; };
   Ghost = derive2 { name="Ghost"; version="0.1.0"; sha256="0anrb1n3f3jnq2p0dgqzw5a0gby2slafv2bybgy5gm3f9fsj831w"; depends=[R6]; };
-  GiANT = derive2 { name="GiANT"; version="1.3"; sha256="01dzjlcbl6byqa1vxalhr6fpf2vczd38dn1q77c4jgcfz2a25wqz"; depends=[]; };
+  GiANT = derive2 { name="GiANT"; version="1.3.1"; sha256="0788c7yxbi804c2r05hf5dys9lnr961zs835w7siprgwbvnv6apn"; depends=[]; };
   GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; };
-  GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; };
+  GiRaF = derive2 { name="GiRaF"; version="1.0.1"; sha256="1m19jxr6h485v32iqq260cizf30cgrx3pk802r73fbp3ssj7nmvh"; depends=[BH Rcpp RcppArmadillo]; };
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
   Gifi = derive2 { name="Gifi"; version="0.3-9"; sha256="0rwyj60cldf3k118cnc5px16dc5p5bfxgl0w2m1lh6rsqlmza25a"; depends=[colorspace]; };
   GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.1"; sha256="0li0jqnbl9rfj8gbspq7fv327fii53rh93ffsxpic7804rmrnbi7"; depends=[]; };
@@ -1782,21 +1843,21 @@ in with self; {
   Gmedian = derive2 { name="Gmedian"; version="1.2.5"; sha256="0xx8x4g6wb9djmkx3q1bwwa1vgf10avi6ka3x1jzgsxk6x0jsx0i"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
   Gmisc = derive2 { name="Gmisc"; version="1.11.0"; sha256="1fyjyd75mk21y6nfjai1bg3g37sdz27w6vghhcr9zxhlcnwdb6id"; depends=[abind checkmate forestplot glue Hmisc htmlTable knitr lattice lubridate magrittr Rcpp rmarkdown stringr XML yaml]; };
   GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; };
-  GofKmt = derive2 { name="GofKmt"; version="2.1.1"; sha256="11dspnx1cljbbwk4xhg1l5vv2c8q24k294c122rdgc2zqp8k2c04"; depends=[ggplot2 Rcpp RcppArmadillo Rsolnp]; };
+  GofKmt = derive2 { name="GofKmt"; version="2.2.0"; sha256="1v9n1hfracincgaip7pym2l9h54azajw4fmsld0ff2rsd5np362z"; depends=[ggplot2 Rcpp RcppArmadillo Rsolnp]; };
   GomoGomonoMi = derive2 { name="GomoGomonoMi"; version="0.1.0"; sha256="16kvf355yzpv0z2rndc5f50pxjnav6ld48j40vyip4h353wpwaks"; depends=[glue htmltools]; };
   GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.3"; sha256="1d0xkmkcfcwx0qs8m4b9dgrbkg1qpb859mmzg4d1rww8rc0wxh9h"; depends=[classInt corrplot]; };
   GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; };
-  GpGp = derive2 { name="GpGp"; version="0.2.2"; sha256="03lkk4mi5d1gm3wz9ngvndzjylrgx76vlh8xjnm0wmd5y4ncbk8a"; depends=[FNN Rcpp RcppArmadillo]; };
+  GpGp = derive2 { name="GpGp"; version="0.3.1"; sha256="0wp4b2sh52h99j24vimbah0iip6hhdjim5lfhzwan2vjpg9j3fjd"; depends=[BH FNN Rcpp RcppArmadillo]; };
   Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; };
   GraphPCA = derive2 { name="GraphPCA"; version="1.1"; sha256="0x6j3lyd70zc0c1al1407ma8crzi174d5dqkz6lx4vx24knrlhbs"; depends=[FactoMineR ggplot2 ggplot2movies scatterplot3d]; };
-  GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
+  GrapheR = derive2 { name="GrapheR"; version="1.9-86-3"; sha256="0wpq7w4lclkzj9ffmqwk2qp5r6kwggh7by47lvhmai4j8g2ha56c"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
   GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; };
-  GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.2"; sha256="1x3hnyqq75krlygg82qm0ldd8nsv071nzgr63zkjmifc7hgi0nvb"; depends=[GreedyExperimentalDesignJARs rJava]; };
+  GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.4"; sha256="0j2grrnd4yn4d1ly62dzqq0y7l7mh3lpnlfpf5n41a9w489m03hw"; depends=[checkmate GreedyExperimentalDesignJARs kernlab nbpMatching Rcpp rJava survey]; };
   GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; };
   GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; };
   Greg = derive2 { name="Greg"; version="1.3.4"; sha256="1s46arnraj9xc98kxj0av64jjg0khxjrvgj1gjqz5f6bw2bxmkm3"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
-  GridOnClusters = derive2 { name="GridOnClusters"; version="0.0.7"; sha256="009h5yx81by6jscvibkxb2j5xi4wqarcrw0504yxdnmgi8w3khmr"; depends=[cluster dqrng fossil Rcpp]; };
+  GridOnClusters = derive2 { name="GridOnClusters"; version="0.0.8"; sha256="16wr7zssiy6y0hvg2s7vhy30qxq5ja8yplv8xncn6iz8giy1wdww"; depends=[cluster dqrng fossil plotrix Rcpp Rdpack]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
   GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; };
   GroupBN = derive2 { name="GroupBN"; version="0.2.0"; sha256="0aql2ggcyrdpr02bq88xcnpq9jr33iawhwsdi93pzks94hvi8wwz"; depends=[arules bnlearn ClustOfVar magrittr MLmetrics PCAmixdata plyr PRROC rlist stringr visNetwork zoo]; };
@@ -1808,8 +1869,9 @@ in with self; {
   GuardianR = derive2 { name="GuardianR"; version="0.9"; sha256="0z0bgm3kr7yqx0yfzhs07k1gs97zpjajfnxn1w1m5w76s7czfzl7"; depends=[RCurl RJSONIO]; };
   Guerry = derive2 { name="Guerry"; version="1.7.0"; sha256="0r92xs1ps48yznc146gqmdvz47zvlqfb14yz2ys8bjlk0wna9agv"; depends=[sp]; };
   GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; };
+  GxEScanR = derive2 { name="GxEScanR"; version="2.0.2"; sha256="0k3avad4b2x4sqv8iilx5a8gkybjlipx50mj0la4kl9xv0azshkd"; depends=[prodlim Rcpp RcppArmadillo]; };
   GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
-  HAC = derive2 { name="HAC"; version="1.0-7"; sha256="066d0hrhqx3m7ksc136r12wfwscbhj2wi0ibgrsqqbgkpdd9fc8g"; depends=[copula numDeriv]; };
+  HAC = derive2 { name="HAC"; version="1.0-8"; sha256="04pp3xanw8bm5i3fpxg2j6h4qrff81087jmid5grgzs1pgd59p1c"; depends=[copula numDeriv]; };
   HACSim = derive2 { name="HACSim"; version="1.0.5"; sha256="0161h3yhi3bh0jq7x105p3rjlrvl46k4iahfz4k84wsvw3akgk1a"; depends=[ape pegas Rcpp RcppArmadillo]; };
   HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
   HARModel = derive2 { name="HARModel"; version="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; };
@@ -1829,19 +1891,20 @@ in with self; {
   HDInterval = derive2 { name="HDInterval"; version="0.2.2"; sha256="1vb5fn9zfig0jqs3mvkpik4wvrndj4qmxqx8rg0iv8nvqc4fnzh4"; depends=[]; };
   HDLSSkST = derive2 { name="HDLSSkST"; version="1.0.1"; sha256="1rslx3zxqh0byi6g4a446v3pagn174ibn115wd3dncpm8gka6q7s"; depends=[Rcpp]; };
   HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
-  HDMT = derive2 { name="HDMT"; version="1.0.1"; sha256="0wqaz3h1xdzfcgn4gp1x8ini6a836fxwm7izxgjf7r5y48cnl5z7"; depends=[cp4p fdrtool]; };
-  HDPenReg = derive2 { name="HDPenReg"; version="0.94.6"; sha256="08kjyr0lkc0x5hky0i11n6x4dm9az8lbs79c0lmz32qrf9rhayg9"; depends=[Matrix Rcpp rtkore]; };
+  HDMT = derive2 { name="HDMT"; version="1.0.2"; sha256="1nab737pmafsbpda4n7rzf79bpjvaklwhfd93s65x7daz90c1whi"; depends=[fdrtool]; };
+  HDPenReg = derive2 { name="HDPenReg"; version="0.94.7"; sha256="16kmx3lddjvz8k7sric0s9ajhlgp62gf1zkyiscaf7w0pjwzin28"; depends=[Matrix Rcpp rtkore]; };
   HDclassif = derive2 { name="HDclassif"; version="2.2.0"; sha256="1l5zxhayhzh7q50ycl481hy0br66ylxyvzw1ahmjjrdkm8s3czyj"; depends=[MASS rARPACK]; };
   HDclust = derive2 { name="HDclust"; version="1.0.3"; sha256="18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y"; depends=[Rcpp RcppProgress Rtsne]; };
   HDcpDetect = derive2 { name="HDcpDetect"; version="0.1.0"; sha256="0ai35d9df5pmva52sb1rr20f11h0mbal6d179g865b7w6n90kfr1"; depends=[]; };
-  HDoutliers = derive2 { name="HDoutliers"; version="1.0.2"; sha256="13dwshjrz17wv8hn10sjii4caxs771w666mvk0fg831d4afj5bdc"; depends=[FactoMineR FNN mclust]; };
+  HDiR = derive2 { name="HDiR"; version="1.0"; sha256="0aqllrkljj02rr25rr2hci00wgicghqwqc6ivfv2ll67kyfpvviq"; depends=[circular Directional movMF NPCirc rgl]; };
+  HDoutliers = derive2 { name="HDoutliers"; version="1.0.3"; sha256="167g72b23jpjfhnz2faxia2lma328gvqkrlnz6xizzq7vb7cmb18"; depends=[FactoMineR FNN mclust]; };
   HDtest = derive2 { name="HDtest"; version="2.1"; sha256="1c9x4s59762sp7drbm5h1xv22kpifq7p0x3dkrfcd0ficbbma5v8"; depends=[checkmate clime doParallel expm fastclime foreach MASS mvtnorm]; };
   HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
-  HEMDAG = derive2 { name="HEMDAG"; version="2.6.1"; sha256="138byk1vzkw9g58ml3vf2ivj0bdanj8klqv0y8s7af3s5swlis18"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; };
+  HEMDAG = derive2 { name="HEMDAG"; version="2.7.3"; sha256="13sclhqcl8zl54j5sdli3jnc7vw2f26sn2b0cs3hdbrsa4s2kssc"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; };
   HETOP = derive2 { name="HETOP"; version="0.2-6"; sha256="1fjwyqh7l296pghmc4m81q8icgbhvqvxr61zd638fr46gls3ky2p"; depends=[R2jags]; };
   HGNChelper = derive2 { name="HGNChelper"; version="0.8.1"; sha256="0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa"; depends=[]; };
   HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; };
-  HH = derive2 { name="HH"; version="3.1-40"; sha256="18m8sj1s1v94a2nvrbii96ji0j9v3jajqyv9wrky72m903cj8nbr"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
+  HH = derive2 { name="HH"; version="3.1-43"; sha256="0nr3sa6di06cjmljdxfq7bcpnp9d6kna4f9lrv9fk4khr67mrlrf"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
   HHG = derive2 { name="HHG"; version="2.3.2"; sha256="159bs5cxdm770h66fam48451n9krpw2fn5gr397h730x2w7l41ki"; depends=[Rcpp]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; };
@@ -1849,7 +1912,7 @@ in with self; {
   HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
   HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; };
   HKprocess = derive2 { name="HKprocess"; version="0.0-2"; sha256="1j2yhb7k8zf4nlzdf0p6x9ca7ak4lwwak8mcc60kpilw2fws27k5"; depends=[gtools MCMCpack]; };
-  HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; };
+  HLMdiag = derive2 { name="HLMdiag"; version="0.4.0"; sha256="0nmqbz3wva2xsn3v1ir5nayfg3wnr6pz8zp7xmyrgdvvs7hsfqhp"; depends=[dplyr ggplot2 ggrepel janitor magrittr MASS Matrix mgcv plyr purrr Rcpp RcppArmadillo reshape2 rlang stringr tibble tidyselect]; };
   HLSM = derive2 { name="HLSM"; version="0.8.2"; sha256="1jqfk5mlx603s3v069dab7wm0wy8qil50rw1s5x6f21xrahaqks2"; depends=[abind coda igraph MASS]; };
   HMB = derive2 { name="HMB"; version="1.1"; sha256="19z3d0b98fyjcnbxh3g6h2g927nv0408sbxjlzalrjlw9mbpzd2b"; depends=[Rcpp RcppArmadillo]; };
   HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.13"; sha256="1n507nsqz1blikci56jhp48rdpq38dnadh8warc2jmvwizl22a3b"; depends=[httr RCurl XML]; };
@@ -1867,20 +1930,22 @@ in with self; {
   HPLB = derive2 { name="HPLB"; version="1.0.0"; sha256="1xxckjz90sdmng0sm9dlhwpzj79pxa3vd1cidxc44wjk4h25rq7q"; depends=[data_table]; };
   HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
   HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; };
+  HRM_curve = derive2 { name="HRM.curve"; version="0.0.1"; sha256="0p3kvldpz347c0cdjkrdm0x2nfj85hm5cp59lirqhq77hf1zfnd5"; depends=[]; };
   HRW = derive2 { name="HRW"; version="1.0-3"; sha256="12y43sl30949jc9ab10ipx8k4rvb9g8gwaazi8j3k1grh26ivpii"; depends=[KernSmooth]; };
   HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; };
   HSAR = derive2 { name="HSAR"; version="0.5.1"; sha256="03ryscvgiiwjcqk6gy3251nqqk43x508kz3ibw35hi84m2s7fsxj"; depends=[Rcpp RcppArmadillo spatialreg spdep]; };
   HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; };
-  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; };
-  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-9"; sha256="1rpvblak0xvkavbvbd35zq1lcsl5z1zp30vn70wqbkdj7szhj9b4"; depends=[]; };
+  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-18"; sha256="0ggya24clwydi7aligdayds3jpq2ckr4xfm4nik0r6j97x4gl1mj"; depends=[]; };
+  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-10"; sha256="1wi0ficlhh3h60chyrvjb0g3z75avh4bq717nm4zh0b0j838qavg"; depends=[]; };
   HSDiC = derive2 { name="HSDiC"; version="0.1"; sha256="0wiixb1ylx0l8qfgh5ark6alkdq87xaak1jlxizw1m589vghvqfp"; depends=[glmnet Matrix ncvreg quadprog]; };
   HSPOR = derive2 { name="HSPOR"; version="1.1.9"; sha256="06lr8l71y5fcqcnmgq7cgiab1pcc98wnqzndbxcbikbh33cx7nxv"; depends=[corpcor npregfast]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
-  HTLR = derive2 { name="HTLR"; version="0.4-2"; sha256="1q8zlb4iya0sq2jqp4m77v66hdrfc7ncc0k8qllf16h06k24s88x"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; };
+  HTLR = derive2 { name="HTLR"; version="0.4-3"; sha256="1bxgfiwbnvpdw0d6k34c1wc47z6pvx0imnz36c6r99zls5bm129y"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
   HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; };
   HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; };
   HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
+  HURDAT = derive2 { name="HURDAT"; version="0.2.3.2"; sha256="13lq6vdjf5iqwmg61rnq3i6s88q0h54s2dmr2hj0vf8hvisfj0bs"; depends=[dplyr purrr readr rlang rvest tidyr xml2]; };
   HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
   HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; };
   HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; };
@@ -1888,19 +1953,21 @@ in with self; {
   HaDeX = derive2 { name="HaDeX"; version="1.2.1"; sha256="0y380z92blxq52hg20cw71g6vs962xpgk5x2mvl35sz27lm4fr4f"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; };
   HadamardR = derive2 { name="HadamardR"; version="1.0.0"; sha256="0nr8m6fchpmlvhyisb61y0fymjjrk2k1sd67r14n87sgn3mafh4a"; depends=[numbers openxlsx]; };
   HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
-  HandTill2001 = derive2 { name="HandTill2001"; version="1.0.0"; sha256="0qxaxwizx24gm3iycdmwdn8mqvnwnjhacsp9nwl9w4djayb5a9sg"; depends=[]; };
+  HandTill2001 = derive2 { name="HandTill2001"; version="1.0.1"; sha256="0wgr3rhz1iklirpnzk25afh8fv1qpi2ijmx4xwzplw3w3qir4yv6"; depends=[]; };
   Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; };
-  Haplin = derive2 { name="Haplin"; version="7.2.2"; sha256="15q0p563qbf0v91hnx3bdcxwc7chcqzc507wmr5zrsdl8y2pqn40"; depends=[ff ffbase MASS mgcv rlang]; };
+  Haplin = derive2 { name="Haplin"; version="7.2.3"; sha256="1s1jlyr0gwvigfndqjbxb8zib6hkmn341khsnv87f82vzakmhi80"; depends=[ff MASS mgcv rlang]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
-  HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.6"; sha256="1qn1bbzfk4w3mqrzisshw5xx7x249sgmj6qdi39lkqb58a4mf4kh"; depends=[mice Rcpp Rsolnp]; };
+  HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.7.0"; sha256="0fadvv0xv5c2znnmcyaa8dmlijiyv9602wcls600wjlr4l88f67r"; depends=[mice Rcpp Rsolnp]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
+  HeckmanEM = derive2 { name="HeckmanEM"; version="0.1.1"; sha256="1v0359c2v514k139kgjjww3f0z4xgr5s4l0649xxm9hdq7qs6667"; depends=[MomTrunc mvtnorm PerformanceAnalytics sampleSelection]; };
   HellCor = derive2 { name="HellCor"; version="1.3"; sha256="1bzc2ipm7vw7s849d43lcs0xrk2rs67h223dn9kahqg152mmknza"; depends=[energy FNN orthopolynom]; };
   HelpersMG = derive2 { name="HelpersMG"; version="4.3"; sha256="0kgsvzwya6r1zhzy0mwjdm41hpxssyd2qn16bcmpxkdd3njbk4bs"; depends=[coda lme4]; };
   HeritSeq = derive2 { name="HeritSeq"; version="1.0.1"; sha256="0l1saxwj99xwkzcy43v0k9sicqwpw9gc8ywxpablagcddfj05pi3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; };
+  HeterFunctionalData = derive2 { name="HeterFunctionalData"; version="0.1.0"; sha256="0qrfmxwrxn0rd2ncy3afhraf7m0010nf9739jkj19h1j5vksi9n1"; depends=[]; };
   HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; };
   HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
-  HiClimR = derive2 { name="HiClimR"; version="2.1.6"; sha256="1s7l78xjvld8cdbz18zk6mbzwwzpm9x6vj6fq4j4hrz11bzsr14y"; depends=[ncdf4]; };
+  HiClimR = derive2 { name="HiClimR"; version="2.1.7"; sha256="0gzpxwzrr4kh2kd1yy3dlf0d4qricah7l6q1mwz6g79c54z86dz7"; depends=[ncdf4]; };
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
   HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; };
   HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
@@ -1914,8 +1981,8 @@ in with self; {
   HistData = derive2 { name="HistData"; version="0.8-6"; sha256="0an8cki2ahaf3ynbcqgikxi90l3bv7gcn6nnwnli9g1br89y3bd4"; depends=[]; };
   HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
   HiveR = derive2 { name="HiveR"; version="0.3.63"; sha256="1vi24k23a017czfy9kihmq4s1dywzm274dyhyp1imx94afsnmhc3"; depends=[jpeg plyr png RColorBrewer rgl]; };
-  Hmisc = derive2 { name="Hmisc"; version="4.4-1"; sha256="0mm3r2kv0kgrhg7salk2hw0s37d4i2mghwk0l0qxaw2ny0w8w5z6"; depends=[base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; };
-  Hmsc = derive2 { name="Hmsc"; version="3.0-6"; sha256="1n02akdrz4g33aqwigbh9ckdplxvgnzsznwlyx6j40s4rqgv2zrz"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist pROC rlang statmod truncnorm]; };
+  Hmisc = derive2 { name="Hmisc"; version="4.4-2"; sha256="1j7vkckmahdh90ndcl646sjpxq82y4x55ngxqvkni22mv16wc2j9"; depends=[base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; };
+  Hmsc = derive2 { name="Hmsc"; version="3.0-9"; sha256="1xy6xbnfpr7nnrgq9v3gzrfjchnng74p5f9nfxg584n6zyqk4lj0"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack nnet pROC rlang sp statmod truncnorm]; };
   HoRM = derive2 { name="HoRM"; version="0.1.2"; sha256="0vfsya6423i25szdj5s8pa8pwshiqykikxdbbj7r2nz73x3qp6hy"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; };
   Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; };
   Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; };
@@ -1924,25 +1991,26 @@ in with self; {
   HyRiM = derive2 { name="HyRiM"; version="2.0.0"; sha256="1wif31xvrwz0dr6z0hfn1v2fxi8rxws52al6h9rlbzciy6xyl7a3"; depends=[compare grImport2 orthopolynom purrr Rglpk]; };
   HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
   HydeNet = derive2 { name="HydeNet"; version="0.10.11"; sha256="1qi87k2drizqba1nz8psh697ks8ai8xz492kzsrs76xlxpbk1i9k"; depends=[checkmate DiagrammeR dplyr graph magrittr nnet pixiedust plyr rjags stringr]; };
-  HydroCode = derive2 { name="HydroCode"; version="1.0.1"; sha256="0093a19d52pvy5f0c8l8vxix0kni2c6ablqsfxflwwg9wbms81pa"; depends=[sp]; };
-  HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
+  HydroCode = derive2 { name="HydroCode"; version="1.0.2"; sha256="1igshik28xcxrdg116vs9s2yfbz5fik9xvlgfkgai3w9qj0x1h5q"; depends=[sp]; };
   HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
-  HypergeoMat = derive2 { name="HypergeoMat"; version="3.0.0"; sha256="03xnvb7d80nak7wawfi2sniq9syjbjx5gk71xsgchgwqsdnixp8y"; depends=[gsl Rcpp RcppArmadillo]; };
+  HypergeoMat = derive2 { name="HypergeoMat"; version="3.1.0"; sha256="1pnwj0mqzangjvxnp5yq1ll4qhkpkvv427nzq3sqwpn9qd8gisvf"; depends=[gsl Rcpp RcppArmadillo]; };
   IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; };
   IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; };
   IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; };
   IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; };
   IATscores = derive2 { name="IATscores"; version="0.2.7"; sha256="1dmcwkylq6zazjycjsmbxnzvkav19w13j69gnm1f558wsdxpvhx1"; depends=[dplyr qgraph reshape2 stringr]; };
   IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; };
+  IAcsSPCR = derive2 { name="IAcsSPCR"; version="1.2.1"; sha256="0x0h1vicw0jlm9p10cw7g75g2x0d73rjpdwh1j7lxq6cnbpkbxf9"; depends=[abind FrF2 lattice stringi]; };
   IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.6-0"; sha256="1nlfsfdw8lfr3n2717i6kn1hafwr6hmqzfpg249amlrfjn0pghji"; depends=[dplyr lsa tidyr]; };
   IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
   IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
   IBDsim = derive2 { name="IBDsim"; version="0.9-8"; sha256="1a0xz1khl6cz6ajcn903fcmsv8g7hfdh7684zhk0g6awsgwqdf5q"; depends=[paramlink]; };
+  IBMPopSim = derive2 { name="IBMPopSim"; version="0.3.1"; sha256="1infqxfwqg6y4d8g3wmi3wg243hqjjmzirm00dhxiav4ps8yrg1q"; depends=[checkmate dplyr ggplot2 purrr Rcpp readr reshape rlang tidyr]; };
   IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; };
   IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
   ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; };
-  ICAMS = derive2 { name="ICAMS"; version="2.1.2"; sha256="0jgylkc3asg41b0vac5vcyril0n93yqijjbzwwprfh3ps7pq87s0"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; };
-  ICAOD = derive2 { name="ICAOD"; version="1.0.0"; sha256="0gcq4f5pa6sa9850968mr275z2n7xfzlsy12d4khkq9ysd2b6y5p"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; };
+  ICAMS = derive2 { name="ICAMS"; version="2.2.4"; sha256="1qlyj6fqz27gbyjhncmjj0wms8jl562l1yyf30mb0ia2wbc54895"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; };
+  ICAOD = derive2 { name="ICAOD"; version="1.0.1"; sha256="07fxh60vsndlvjijjsh1a9l2qkp78sb9nkg5x5mslh209lpjjhw1"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; };
   ICBayes = derive2 { name="ICBayes"; version="1.2"; sha256="1hdh7g4nk6yy0xz9564vpvh1blrw30lvyw2wc5mmgn78kwjqla34"; depends=[coda HI survival]; };
   ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; };
   ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; };
@@ -1951,11 +2019,11 @@ in with self; {
   ICDS = derive2 { name="ICDS"; version="0.1.1"; sha256="1jb98xi37jcf6nl5lx2ip9614l4w7lz7v53jpcbdj0ymqbfx1s70"; depends=[graphite igraph metap org_Hs_eg_db]; };
   ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
   ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; };
-  ICEinfer = derive2 { name="ICEinfer"; version="1.1"; sha256="0q07npgnssia7assvl1084080w3w434viyz5r1lj5slrx9gfdh8b"; depends=[lattice]; };
+  ICEinfer = derive2 { name="ICEinfer"; version="1.3"; sha256="0hg1vdg9clsk24lqdh89dfzlb0mnig690wq06pzd5nl9mr6dlvns"; depends=[lattice]; };
   ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; };
   ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; };
   ICODS = derive2 { name="ICODS"; version="1.0"; sha256="13wi4mqdwdrjfjh42sjifc6vlkj6jlm4z0x6680xdzkwq8byipi9"; depends=[MASS]; };
-  ICON = derive2 { name="ICON"; version="0.2.0"; sha256="1g8lffp66h3pl6qjbns6427ms696ikhnr48c3qs61isir93x9hvf"; depends=[]; };
+  ICON = derive2 { name="ICON"; version="0.4.0"; sha256="02ilj6mwgzam5pgd3iadpwpyvigbq2y113lh099yrmcq325jb8z5"; depends=[network]; };
   ICRanks = derive2 { name="ICRanks"; version="3.1"; sha256="1vwzqkjg7i5hm96s8frp72n6xqadlsawzr1wby1fhsxl2m5f1797"; depends=[gmp multcomp Rcpp]; };
   ICS = derive2 { name="ICS"; version="1.3-1"; sha256="0x3cwhvzcibgyb8gqy6dc6lgnvbf6x8425zai57g8yn5i6zzc1li"; depends=[mvtnorm survey]; };
   ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; };
@@ -1976,8 +2044,9 @@ in with self; {
   IDmeasurer = derive2 { name="IDmeasurer"; version="1.0.0"; sha256="0n7rziaaxm9dqixmw6rxgq9dwnwdl3dsdnpd9s59k5skdlaxnl5m"; depends=[infotheo lme4 MASS]; };
   IDmining = derive2 { name="IDmining"; version="1.0.6"; sha256="0fsl1byz0n5jwswh2ydzz5lsycja54545cf7dr1r3h1a372yz2mv"; depends=[data_table doParallel foreach]; };
   IETD = derive2 { name="IETD"; version="1.0.0"; sha256="0avhyw0zcb8vj0nqfy41yq5kcd8yf9rmaawdvfcy5rqwxmi1mw9l"; depends=[doParallel dplyr foreach ggplot2 lubridate Rdpack]; };
-  IFC = derive2 { name="IFC"; version="0.0.9"; sha256="0arjy1bz0hcncw0kiv1pcrkdrn5kh2f9q1qhbw504plpzk5rgh67"; depends=[DT gridExtra jpeg KernSmooth lattice latticeExtra png Rcpp RcppProgress tiff visNetwork xml2]; };
-  IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; };
+  IFAA = derive2 { name="IFAA"; version="1.0.0"; sha256="138q74hbvr93qlkb01a9gf9463zb4llklz45gqyf4fxps7m0nggw"; depends=[doParallel expm foreach future HDCI mathjaxr Matrix picasso rlecuyer]; };
+  IFC = derive2 { name="IFC"; version="0.1.1"; sha256="0nr05xz5i9cv4ffjnrxxvxp1mwnym7bmz9jq83z5gi6ca42128xv"; depends=[DT gridExtra jpeg KernSmooth lattice latticeExtra png Rcpp RcppProgress tiff visNetwork xml2]; };
+  IFP = derive2 { name="IFP"; version="0.2.4"; sha256="066wz6bjqcvq22gjg2wcmglp798f87rsc8yhm13p0dic3arb5ph6"; depends=[coda haplo_stats]; };
   IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; };
   IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; };
   IGST = derive2 { name="IGST"; version="0.1.0"; sha256="12ycrfsgwakaj3k39k1j4ky58wr7a2ibyz6j9cznvjjv6cgz9zg5"; depends=[BootMRMR e1071]; };
@@ -1985,9 +2054,11 @@ in with self; {
   ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; };
   IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
   IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
+  IMEC = derive2 { name="IMEC"; version="0.2.0"; sha256="1k85pr6s6lysn53n59i8rcdhyg7r3il5avbckvvz43p6lh0fgxpy"; depends=[igraph IsingSampler qgraph]; };
   IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; };
-  IMIFA = derive2 { name="IMIFA"; version="2.1.3"; sha256="08dikyzl3c34y1hjhcbqx34bn33nfhkggb3m208fjnmq82yqgfm6"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; };
+  IMIFA = derive2 { name="IMIFA"; version="2.1.4"; sha256="00g07ps87wm4r2klkyr3xmf7q369mzxdnq2n7vsi4lig2x05pdq3"; depends=[matrixStats mclust mvnfast Rfast slam viridisLite]; };
   IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
+  IMIX = derive2 { name="IMIX"; version="1.1.0"; sha256="06n03nck5475xsh41pwxlyvdw4y6b0vlh809fmfsjdadjipd218v"; depends=[crayon ggplot2 MASS mclust mixtools mvtnorm]; };
   IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; };
   IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; depends=[]; };
   IMTest = derive2 { name="IMTest"; version="1.0.0"; sha256="0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48"; depends=[lme4 ltm MASS reshape2]; };
@@ -1998,10 +2069,12 @@ in with self; {
   INLABMA = derive2 { name="INLABMA"; version="0.1-11"; sha256="0wzyb3c7zpksqz198kigi4rpblvk0rjamngmyabw5xdpizxdg6zi"; depends=[Matrix sp spdep]; };
   INLAMSM = derive2 { name="INLAMSM"; version="0.1"; sha256="0km7kwwif2hqqa9jhglvkinzcm6gfp7mn219hqm5ds5rfgrcyl75"; depends=[Matrix MCMCpack]; };
   INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; };
+  INTRIGUE = derive2 { name="INTRIGUE"; version="0.1.0"; sha256="1l1vfl0m4iqniwp4bp1bfjpqhwahg341fpyxhryr0j8lypqaw7si"; depends=[dplyr rlist SQUAREM]; };
   IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.4"; sha256="1wp9i4vy40a10y5lj4m2hs2nx5nz1qyqz6gd27284zkydrwhpnxr"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 igraph kableExtra magrittr markdown PlayerRatings plotly RColorBrewer Rcpp reshape2 shiny shinyjs stringi]; };
-  IOHexperimenter = derive2 { name="IOHexperimenter"; version="0.1.3"; sha256="0xk470mm4av9knj8fyss57yvq88qhg2nyapnzlccr63v28v3mn9b"; depends=[assertthat BH magrittr Rcpp]; };
+  IOHexperimenter = derive2 { name="IOHexperimenter"; version="0.1.4"; sha256="0aacliznncl488rjsnx02pfj1mchhcyb36v816g959ll38pvc6bk"; depends=[assertthat BH magrittr Rcpp]; };
   IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; };
-  IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.3"; sha256="173b9vj19622gay58aaz2vad58aw5q2v2xm00y7cpaa2spzb2r85"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; };
+  IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.4"; sha256="1pkdgj4glqarzwn1zrbyrwb59583l8v3qk2p3g3iir1gvpdm9icx"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; };
+  IPDfromKM = derive2 { name="IPDfromKM"; version="0.1.10"; sha256="1pqi6cshiha4gnra25fgpggyi42mn2hg25s9m9mh091rn5km44q0"; depends=[dplyr ggplot2 gridExtra readbitmap survival]; };
   IPEC = derive2 { name="IPEC"; version="0.1.3"; sha256="0h1b9h33zxx23rj8c9790nsqykwhznavy8hfkgv9gx7nphrsy5ma"; depends=[MASS numDeriv]; };
   IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; };
   IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; };
@@ -2009,9 +2082,10 @@ in with self; {
   IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.0"; sha256="0lyqcjnbissick5hzwrx21pykq4pww9j0i03j0gy43awl1cq5qq8"; depends=[isotone]; };
   IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; };
   IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; };
-  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.4.1"; sha256="0bxxs88s0x1n01c7dwm9ki0x9qcfjxsynih5fmfacq5n274cmyz3"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
-  IRISSeismic = derive2 { name="IRISSeismic"; version="1.5.2"; sha256="117p2kh2r2iw758iqlpqaak83czfv34p15907g18x496r5vri429"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
-  IROmiss = derive2 { name="IROmiss"; version="1.0.2"; sha256="0rcyijx5w8nn7n1hc4sdrphgggnq3676f8fpzxs85vkk52z0vp0a"; depends=[equSA huge mvtnorm ncvreg]; };
+  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.4.3"; sha256="1wqm8qd1w07whfg7yn916zp1ks9ffpxz6y6ghsal0d9n9rlmc21w"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
+  IRISSeismic = derive2 { name="IRISSeismic"; version="1.6.0"; sha256="0dgfy7ifghblsd9nxcylbdqlcpxhyladv91r6w2aqykpbkin705r"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
+  IRSF = derive2 { name="IRSF"; version="1.0.3"; sha256="1cq196z2i4by7dfij6w849a49d8dzzcdk5a68nxvmvwq3xskywam"; depends=[abind randomForestSRC survival]; };
+  IRTBEMM = derive2 { name="IRTBEMM"; version="1.0.7"; sha256="09siwm2shjb8hhk64r66fspzykzr2r0m011pv8qcl9k7g040mxpi"; depends=[]; };
   IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
   IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; };
   IRkernel = derive2 { name="IRkernel"; version="1.1.1"; sha256="1y06v3difaiihxfm2abm88nnjzvkla4p346cm1nxmga4iwb2k8gm"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; };
@@ -2021,11 +2095,11 @@ in with self; {
   ISEtools = derive2 { name="ISEtools"; version="3.1.1.1"; sha256="00d6znqz2mfmyi9ijgrg2pwl4lnvvsy00ysa7a7vjq7ip8qvcjfq"; depends=[coda Xmisc]; };
   ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; };
   ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; };
-  ISOcodes = derive2 { name="ISOcodes"; version="2020.03.16"; sha256="1hz1sj57qkkkrgn8slsz2n4jv1fkyp40503j9rg30lxy4gmb83hn"; depends=[]; };
+  ISOcodes = derive2 { name="ISOcodes"; version="2020.12.04"; sha256="18373rkhmwm7y2drvfbhrxkqw9d23avf0ndvh0fg00z4djvddkjx"; depends=[]; };
   ISOpureR = derive2 { name="ISOpureR"; version="1.1.3"; sha256="1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0"; depends=[futile_logger Rcpp RcppEigen]; };
   ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
   ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; };
-  ISRaD = derive2 { name="ISRaD"; version="1.2.3"; sha256="1xgk0mda2w22yf44flyyga15cxffzn25rg83g7dmqa8rqjiis51j"; depends=[assertthat devtools dplyr ggplot2 maps openxlsx pangaear raster rcrossref RCurl rgdal stringr tidyr tidyverse]; };
+  ISRaD = derive2 { name="ISRaD"; version="1.5.6"; sha256="1rjhxg4q0lg4y5y5minqv40wq5ngci8rkj1dgbzpsnphjy55541x"; depends=[dplyr ggplot2 maps raster RCurl readxl tidyr writexl]; };
   ISwR = derive2 { name="ISwR"; version="2.0-8"; sha256="1bay7na68awq68bw82dwhcfxp2d3di2dg33islq0mgrhd4sfdfza"; depends=[]; };
   ITGM = derive2 { name="ITGM"; version="0.41"; sha256="0q278ga51asrr918l088v6qdl17vnmrcbz7y1xc4rzmb61lkwqy7"; depends=[data_table Fgmutils gsubfn plyr sqldf]; };
   ITNr = derive2 { name="ITNr"; version="0.6.0"; sha256="0yxn3768819ph49bizprj3arrvz9rzhb45rkcpfivwfwlyf010yy"; depends=[blockmodeling circlize cowplot dplyr fastmatch GGally ggplot2 igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI]; };
@@ -2035,21 +2109,23 @@ in with self; {
   IalsaSynthesis = derive2 { name="IalsaSynthesis"; version="0.1.6"; sha256="15iwywvzhgiyigl8f488b7ra89rz0a7ymfsdgdlqfls3fmld7b4a"; depends=[testit]; };
   Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
   IceCast = derive2 { name="IceCast"; version="2.1.0"; sha256="0h3z68lfjw5s51601m17m2gvn12vkwj5gzc70dqzfjmxdkgv3p28"; depends=[coda maptools MASS ncdf4 raster Rcpp RcppArmadillo rgeos sp]; };
+  IgAScores = derive2 { name="IgAScores"; version="0.1.2"; sha256="0ckqjbn0xc894dc23gbaqzr6z6rl5h0k8gc5gjhbhwvrc2zlyfsp"; depends=[]; };
   IgorR = derive2 { name="IgorR"; version="0.8.1"; sha256="1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx"; depends=[bitops]; };
   ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; };
   Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
   Immigrate = derive2 { name="Immigrate"; version="0.2.1"; sha256="0pnnvv63kkg7pgyblb1vlx54c6169n40fn58aypdy5xcnknabvxn"; depends=[pROC Rcpp]; };
-  ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.6.0"; sha256="0i2bc72rw410sq8f64nfj6vvkm3wmmlwps19ndg966gcfg9llv6k"; depends=[caTools matrixStats parallelDist Rcpp]; };
+  ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.6.1"; sha256="12pl4kif6s8jllncm3r5133vrknq98h8awbskq4sh55p1ldaldfq"; depends=[caTools matrixStats parallelDist Rcpp]; };
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
-  ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
+  ImportExport = derive2 { name="ImportExport"; version="1.3"; sha256="07i7p9xha1f23r07lw87ak13hd4wavdvwh8vb8sg2gyvnpa5njwp"; depends=[chron gdata haven Hmisc readxl RODBC writexl]; };
   ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
-  InDisc = derive2 { name="InDisc"; version="1.0.2"; sha256="1mvd6r1ly924n17275n4i9p8sghvm929kbir0bq6850kk2m0dgq7"; depends=[optimbase psych]; };
+  InDisc = derive2 { name="InDisc"; version="1.0.3"; sha256="05xcf7gqq9ik8azmyas7ggzg54rlwrrcglzsn0znjd5h2vjp310a"; depends=[matrixStats optimbase psych]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; };
   InSilicoVA = derive2 { name="InSilicoVA"; version="1.3.0"; sha256="0yaqn9hy6cq2n6cylbgycyg1f9l4d0hm00il6g275zflijjzirq7"; depends=[coda ggplot2 InterVA5 rJava]; };
-  IncDTW = derive2 { name="IncDTW"; version="1.1.3.1"; sha256="1hwwsh70mmdwqaqw4xxnbvc3g2nhmx64bd0hzxh63wr15jch0w8b"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; };
+  IncDTW = derive2 { name="IncDTW"; version="1.1.4.2"; sha256="0am4sm244aaqy2jc9fllyxgj2ww6jabfm8n72rg26wyh7zcbr7vj"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; };
   IncomPair = derive2 { name="IncomPair"; version="0.1.0"; sha256="156mc4csbxz976md7ikjd6sqamzsfc8ik9xf1qbhrfl8y7957kbb"; depends=[]; };
-  IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; };
+  IndTestPP = derive2 { name="IndTestPP"; version="3.0"; sha256="1z48pr8znbk1gdvjfdvszxlzhj7v88p3y7zhi1f0xw75dkfpnwwy"; depends=[]; };
   IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; };
+  IndependenceTests = derive2 { name="IndependenceTests"; version="0.5"; sha256="1azqn5jnwyf9mqhz3d016sp0bgjq4fl1w8h1xzbs9gprhgb4mnrx"; depends=[CompQuadForm MASS Runuran xtable]; };
   IndexConstruction = derive2 { name="IndexConstruction"; version="0.1-3"; sha256="08bi3x7a9plxshgj6hq58mzkf1117a7p0fd1akqjh7k8mgywifwf"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; };
   IndexNumR = derive2 { name="IndexNumR"; version="0.1.3"; sha256="1jrbl2gwgp4msigkspgqcvgvxq169jiiz4acixky37i6hw0n34p6"; depends=[]; };
   IndexNumber = derive2 { name="IndexNumber"; version="1.2"; sha256="0xiy84gfks24c1cmqdki95nysa8gkihcgcsdfbm0wn8w8n3vb6va"; depends=[]; };
@@ -2065,6 +2141,7 @@ in with self; {
   Infusion = derive2 { name="Infusion"; version="1.4.1"; sha256="0nxp416mbzawrdk4qwhg5j7lm8zdyplrngka2hw2rlsqmlwhvqzl"; depends=[blackbox foreach mvtnorm numDeriv pbapply proxy spaMM viridis]; };
   InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.2"; sha256="0g52cksa774in18ykrym61l3my9zm343bgsq5mg7mki9x65xd35z"; depends=[dplyr rlang tidyr]; };
   InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.1"; sha256="0zrfyzz3l9jff7044dhrjv8rp8f258fz993ycyxyd29nd7x9n9nj"; depends=[MASS]; };
+  IntCal = derive2 { name="IntCal"; version="0.1.3"; sha256="1drr1wly23sddn4kfqjx1iijpp21zgw1342d354s6id2l3r4cf11"; depends=[]; };
   IntClust = derive2 { name="IntClust"; version="0.1.0"; sha256="0whmc084gq5zip82vnwailnwvw9jawk9rx4wqiz1lr693w9xbq66"; depends=[a4Core ade4 analogue Biobase circlize cluster data_table e1071 FactoMineR ggplot2 gplots gridExtra gtools igraph limma lsa plotrix pls plyr Rdpack SNFtool]; };
   IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
   IntNMF = derive2 { name="IntNMF"; version="1.2.0"; sha256="09qzyvv7d4wr68qrlhcd4ivr65is3mypv1vaxpswwcjmcmyr4gzp"; depends=[cluster InterSIM MASS mclust NMF]; };
@@ -2076,63 +2153,64 @@ in with self; {
   InterVA5 = derive2 { name="InterVA5"; version="1.1.0"; sha256="058vncqp3z1bqr5bdx5rvv07si7pblyfw2n35022bq2k4rc63093"; depends=[curl readxl]; };
   Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
   InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
-  Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; };
+  Interatrix = derive2 { name="Interatrix"; version="1.1.3"; sha256="1pjyfg5p6081hng9h6wcmfnlfkcs300c3x9ksdj01587b97ph9s1"; depends=[MASS]; };
   InterfaceqPCR = derive2 { name="InterfaceqPCR"; version="1.0"; sha256="12nmkv6qnzh2dnbhk1656dla6mrznh24gqblmn4xai7wg4p92fbx"; depends=[plyr reshape2 tkrplot xlsx]; };
   Interpol = derive2 { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
   Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; };
   InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.2"; sha256="1iaw4i14l2vp1f163g2q4pwv9cnqrx14ik4s8zw0iha4zwcrc3ja"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; };
   IntervalSurgeon = derive2 { name="IntervalSurgeon"; version="1.0"; sha256="0dpgfgnnx6r29y8y3pac1rgi503wvlwggx5dh6fhqnxw5yfink61"; depends=[Rcpp]; };
-  IntrinioStockAPI = derive2 { name="IntrinioStockAPI"; version="0.0.1"; sha256="0gvkynyi2iag2kwwb51b8125md8kw65b48zk9qdf8pppg9s1r46a"; depends=[gtools httr jsonlite stringr]; };
   InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.8"; sha256="01ckyvjl9lxdpkr0v1da4n4lw3b5z1bxlmf0v6ibqly1mhfwybjl"; depends=[glmnet mboost]; };
   InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; };
   Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; };
   Irescale = derive2 { name="Irescale"; version="2.3.0"; sha256="037bzli0zwlfbf5xmllqg2pi0shs33ggrnw69kzyw2sf780y3hs2"; depends=[e1071 fBasics ggplot2 imager Rdpack reshape2 sp]; };
   IrishDirectorates = derive2 { name="IrishDirectorates"; version="1.4"; sha256="1mwjrmqga7f0p5w2m4f0i6mb68jimx6791pz03r8iqj3yx0vzkh0"; depends=[Rcpp RcppArmadillo]; };
-  IrregLong = derive2 { name="IrregLong"; version="0.3.2"; sha256="112adsl4lxb5r77zdynn21qi932px6j037r3pnbirk723b306xng"; depends=[data_table frailtypack geepack survival]; };
+  IrregLong = derive2 { name="IrregLong"; version="0.3.3"; sha256="1qmpim7r5wzifr73bb261xhpsxz93n5h70yc883wiaikjg031abb"; depends=[data_table geepack survival]; };
   IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; };
   IsingSampler = derive2 { name="IsingSampler"; version="0.2.1"; sha256="1cs4vk53b5fy6kywvycfjf62571yx92nvgp5i8hlvms1362ir7gv"; depends=[dplyr magrittr nnet plyr Rcpp]; };
   Iso = derive2 { name="Iso"; version="0.0-18.1"; sha256="0vy6jdyvp751430sf2f690yhasjr70cpk3p3lnaaxjq3fs5gg99g"; depends=[]; };
   IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   IsoCheck = derive2 { name="IsoCheck"; version="0.1.0"; sha256="06g0srp14yiha95mbmifaqf5yr5ppjnc20nyr237ah3l776mhsif"; depends=[dplyr gtools plyr]; };
+  IsoCorr = derive2 { name="IsoCorr"; version="1.0"; sha256="0rhbclbpfd9d0dawbwwprlzx2j9k59gsmrb11yabiv5305b7vpx8"; depends=[]; };
   IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
-  IsoSpecR = derive2 { name="IsoSpecR"; version="2.1.2"; sha256="11vni4fwwfwby0r3bsidnb05v1phim5l9njl03l40d2sw08wr11s"; depends=[Rcpp]; };
-  IsoplotR = derive2 { name="IsoplotR"; version="3.4"; sha256="14y4n1v0lrcff4fx3iiywph11zqjarzzv0nbx7pcm9yvyxkh83zf"; depends=[MASS]; };
-  IsoriX = derive2 { name="IsoriX"; version="0.8.1"; sha256="0rr9frj0mhismls60vgax357jgfyq2wci7rvhvp70fh5k998mzid"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
+  IsoSpecR = derive2 { name="IsoSpecR"; version="2.1.3"; sha256="0cy9y3lh20xxj9sah8s2zrwnbzk39s5xmscj4mskvn897bmlksh6"; depends=[Rcpp]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="3.6"; sha256="0dm8kr2m13rwgw4g45k71l3chd4zs9vqrhr2hwi37zxgn84z3cy3"; depends=[MASS]; };
+  IsoplotRgui = derive2 { name="IsoplotRgui"; version="3.6"; sha256="1xn11ybr9ab73dchhgmd7k62sqlbg00hz8rfdpzncfgfdxyanhrm"; depends=[httpuv IsoplotR jsonlite later]; };
+  IsoriX = derive2 { name="IsoriX"; version="0.8.2"; sha256="1yk2xlz658c1kvm3kb89qmacy5g9qnzjawi2pk5xkn7g9v214adr"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
   IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; };
-  ItemResponseTrees = derive2 { name="ItemResponseTrees"; version="0.2.5"; sha256="02lfirlahc1v6mm24j2zvc485q64ybdmh65fgvq8bvy9kgj902kh"; depends=[checkmate dplyr generics glue magrittr MASS Matrix mirt purrr rlang sets stringr tibble tidyr tidyselect]; };
   JADE = derive2 { name="JADE"; version="2.0-3"; sha256="1fj2wawx5ac1fvlp28naqha0i17f1sb47j2qqzgccvx17ycqmmjn"; depends=[clue]; };
   JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
-  JFE = derive2 { name="JFE"; version="2.1.3"; sha256="16fbwi9znvf560vlrpdipg69vw1kyg2081iz1l2adc2wyxp81dda"; depends=[BurStFin fAssets fBasics fPortfolio FRAPO iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; };
+  JFE = derive2 { name="JFE"; version="2.5.1"; sha256="1393gdfm2kv0c0vadkzcj2kcxscrlgg02kihkhbsvnjzadhi1lb1"; depends=[caret fPortfolio magrittr tcltk2 xts zoo]; };
   JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; };
   JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; };
   JGR = derive2 { name="JGR"; version="1.8-7"; sha256="0bwnps4n078ssmmnxc3pbhs3wc2x45i9f567yb5h7nqscmhb20fi"; depends=[JavaGD rJava]; };
   JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; };
   JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; };
   JMbayes = derive2 { name="JMbayes"; version="0.8-85"; sha256="0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; };
-  JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.8"; sha256="0dzwyndiind2h6i2mpaizzd7iyaxq31g7w8xzz64fmagfdza9d6r"; depends=[MASS Rcpp statmod]; };
+  JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.9"; sha256="0zpl2dp6z7qrpmcsv07fbznr68pa4gz3znd7a55pwdknc41nk4m6"; depends=[dplyr MASS pracma Rcpp reshape2 statmod]; };
   JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
-  JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
   JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; };
   JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; };
   JQL = derive2 { name="JQL"; version="3.6.9"; sha256="0d926hngv4r6zl5f6yai3jwhl9hql2hv6ja3yjgplglkns66g4lh"; depends=[caret pdist randomForest]; };
   JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; };
+  JSM = derive2 { name="JSM"; version="1.0.1"; sha256="0vcsay1jpjlfdwykad4hp319swr9lv1ajlcyhmiizwr1ph3f1az9"; depends=[nlme Rcpp RcppEigen statmod survival]; };
+  JSconsole = derive2 { name="JSconsole"; version="0.1.0"; sha256="1jpa48xb7hh4ap25sqrl67rzqra53qhcfwpfgs6hmpjnrld8n3ha"; depends=[rstudioapi V8]; };
   JSmediation = derive2 { name="JSmediation"; version="0.1.1"; sha256="06p413jfv02k88jdsbplnz696knxglgcqa4pjrgkhhic6awdh0jf"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; };
-  JWileymisc = derive2 { name="JWileymisc"; version="1.1.1"; sha256="10nig4b9fgxnlyaiippk6sp65ia1lcwy344cry9b5pdlxnhzva88"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; };
+  JWileymisc = derive2 { name="JWileymisc"; version="1.2.0"; sha256="0c140kcq0fw91r4g33xri8yxms0nk291zi708h00pszliwpg4qhq"; depends=[data_table emmeans extraoperators ggplot2 ggpubr ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; };
   JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; };
   JamendoR = derive2 { name="JamendoR"; version="0.1.0"; sha256="1v5i4ggc4igp83pik32fqp07ff8iv7dp93b3qhxcsy1msa4l88lx"; depends=[dplyr httr jsonlite]; };
-  JavaGD = derive2 { name="JavaGD"; version="0.6-2"; sha256="0bqfwfq2smkxsci2ryw35qms600iffxs1vnm7j5yhqxay4ksmbj7"; depends=[rJava]; };
+  JavaGD = derive2 { name="JavaGD"; version="0.6-4"; sha256="1q48iykjzy22avmx0yy03vv9c7h87qsphg5hsrzfmx5gvck61m06"; depends=[rJava]; };
   Jaya = derive2 { name="Jaya"; version="0.1.9"; sha256="0b23l7xp4waxjy1vkk09xaali5axr5900v9hkki4f75wh4gb1l53"; depends=[GA]; };
   Jdmbs = derive2 { name="Jdmbs"; version="1.4"; sha256="14wprvxjyx1da1642z11wkzjiyxd5rbpaw1mzq4x6aw53dvh1kgv"; depends=[ggplot2 igraph png]; };
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   JoF = derive2 { name="JoF"; version="0.1.0"; sha256="1my6fc4awrc822ibsvx3hiz4l49vp8dx0j05v56r7d27xizy8j0j"; depends=[]; };
   JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; };
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
-  JointAI = derive2 { name="JointAI"; version="0.6.1"; sha256="10q1wnyj56mdgkp9m2csxxxpsl7k71a8vq27cbpisf3b1anq9yyw"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; };
+  JointAI = derive2 { name="JointAI"; version="1.0.1"; sha256="136100b7lhq2r8nk69l2zwfrkmdvhb9y0f4nfrkzi0hrsm2434sx"; depends=[coda foreach future MASS mathjaxr mcmcse rjags rlang survival]; };
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
   JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
   JuliaCall = derive2 { name="JuliaCall"; version="0.17.1"; sha256="0v0mn3q9mp8xq6bpm870v9a228b20n22cph3s0ngphni07pi0kwr"; depends=[knitr Rcpp]; };
-  JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="0.6.1"; sha256="1i1yc9vcnswfzjqds7x44gcn9fyfr2pn43zkqcqxl90x2yl0kxm9"; depends=[]; };
+  JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="0.6.2"; sha256="0xz7w8a8ilklrh71s9jpd0bai0lnljakpgyn89q4d3k9074mznf0"; depends=[]; };
   JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; };
   KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
   KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; };
@@ -2140,12 +2218,12 @@ in with self; {
   KDViz = derive2 { name="KDViz"; version="1.3.1"; sha256="1if4lkq9kvncqw56j7m9kh4piph091zkivvnhxzxj72zq661q5br"; depends=[htmlwidgets igraph mpa networkD3 rvest stringr tm xml2]; };
   KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; };
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
-  KFAS = derive2 { name="KFAS"; version="1.3.7"; sha256="1bmph8ww9f5xpwdpwb4h4wsjkvsbgj30qz7hzfk1wkl6hc3jxxxk"; depends=[]; };
+  KFAS = derive2 { name="KFAS"; version="1.4.1"; sha256="0arsxak3j8xa6w3rqp8z2bh0vrp1yh6v6hdqjl0j6d0db7960ps8"; depends=[]; };
   KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
   KGode = derive2 { name="KGode"; version="1.0.3"; sha256="0r5664vwq3nsjg08xxsx3lrvc4z2758fc013j8djwz5ydaas7xxs"; depends=[mvtnorm pracma pspline R6]; };
   KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
   KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
-  KMunicate = derive2 { name="KMunicate"; version="0.0.2"; sha256="0xkghzw7vdd4d0yq3hrz6xjkxbzivjjc120axwn3ydy5jqc665g0"; depends=[checkmate cowplot ggplot2 pammtools survival tidyr]; };
+  KMunicate = derive2 { name="KMunicate"; version="0.2.0"; sha256="1ji1db4h8mxgs37swr05l74l0yl06jfizdhfmmznbac4p1fx3d6c"; depends=[checkmate cowplot ggplot2 pammtools survival tidyr]; };
   KNNShiny = derive2 { name="KNNShiny"; version="0.1.0"; sha256="16zm8bhdivaap3mvhdx2qn1b1j2iqyarclb0y2qd1n4viwcfm9c1"; depends=[caret dplyr e1071 FNN psycho rhandsontable rmarkdown shiny]; };
   KOBT = derive2 { name="KOBT"; version="0.1.0"; sha256="0dw6s68x95d4z5a6p8bs1368jcxv5jx0wd87js28i2qm3q57ss71"; depends=[glmnet knockoff MASS Rdpack spcov xgboost]; };
   KOGMWU = derive2 { name="KOGMWU"; version="1.2"; sha256="1vz0099gp1r10n7w4p480l8rswdw100sns196d9xin2ibmmd2fx9"; depends=[pheatmap]; };
@@ -2156,39 +2234,39 @@ in with self; {
   KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; };
   KSPM = derive2 { name="KSPM"; version="0.2.1"; sha256="13fq0d016z6880rr93y918l27fsxd5dxc6gbdnkma5sgsjni5cxh"; depends=[CompQuadForm DEoptim expm]; };
   KScorrect = derive2 { name="KScorrect"; version="1.4.0"; sha256="1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa"; depends=[doParallel foreach iterators MASS mclust]; };
-  KSgeneral = derive2 { name="KSgeneral"; version="0.1.2"; sha256="15h65pkkdkakqc86vh90qx2ny9pfmd2pm5vc3qrb797l4b02mqqc"; depends=[dgof MASS Rcpp]; };
-  KTensorGraphs = derive2 { name="KTensorGraphs"; version="1.0"; sha256="1gjcclcqx123xl0i0a31my8l7w4h17y9yxn1dw35dbiyahvn4sdj"; depends=[]; };
+  KSgeneral = derive2 { name="KSgeneral"; version="1.0.0"; sha256="0pfrhmqgdxa13bjs1jgqkggbjfvwbmx6khkjxcfb96rnf2wccgyc"; depends=[dgof MASS Rcpp]; };
+  KTensorGraphs = derive2 { name="KTensorGraphs"; version="1.1"; sha256="1szl66ix6c6vb0zzyp404psglx3lk125903zc4za0qfzcic7a9p6"; depends=[]; };
   KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
-  KarsTS = derive2 { name="KarsTS"; version="2.3"; sha256="08z5gdawkp1chpkkns019aznm6ybrnamv3s9lyrlxqb8x6fj2r8q"; depends=[circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; };
+  KarsTS = derive2 { name="KarsTS"; version="2.4"; sha256="1jd4303xipf7b8bfqvz6xfw0wc2zk61n1926x5wf2ik82l507mzx"; depends=[circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tseries tseriesChaos zoo]; };
   KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.2"; sha256="14g27a0dkj4gpf5l2k96fd3aa21fz8b85lf5a1jxj0qgjmr4kib0"; depends=[]; };
   KenSyn = derive2 { name="KenSyn"; version="0.3"; sha256="0s8sq3caxn4swac81196dp52r9lbmxb3ni45yaxh53f5g34slsi8"; depends=[lme4 metafor nlme]; };
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
-  KernSmooth = derive2 { name="KernSmooth"; version="2.23-17"; sha256="11g6b0q67vasxag6v9m4px33qqxpmnx47c73yv1dninv2pz76g9b"; depends=[]; };
+  KernSmooth = derive2 { name="KernSmooth"; version="2.23-18"; sha256="14640ddvxmczd5xjg1xsd51gll2glfg946vks8wmac6jb8680d43"; depends=[]; };
   KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.4"; sha256="0qqlmcd04m89pmhrbmxxx4lzzb6sksgrm0j8x7fs5r0sxdqy6rcp"; depends=[plotrix Rcpp rgl]; };
   KernelKnn = derive2 { name="KernelKnn"; version="1.1.0"; sha256="1w8k4b2q5bh0kx72ixrdb43aificl991j1akh00xn1zx3gbrjb0p"; depends=[Rcpp RcppArmadillo]; };
   Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.2"; sha256="1aq1yhbs07wl5rjz4v5b8k8brap4p25f76qwr5cif655fxdzxc20"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
   Keyboard = derive2 { name="Keyboard"; version="0.1.0"; sha256="12i9zfpbh2297j78yrz6nnbmj926n3xdkbzmy1p9z7g9bi4cqrp1"; depends=[Iso Rcpp]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
+  KneeArrower = derive2 { name="KneeArrower"; version="1.0.0"; sha256="1blmim4l7375psa9c3wbpksywj5nfbawly4001n6311wcv4dybl5"; depends=[signal]; };
   KnockoffScreen = derive2 { name="KnockoffScreen"; version="0.1.0"; sha256="0z0gzss6p3p9ilcg6jj4nqkb9h3lqc679x1q2vnmyiv6zl9cdrbm"; depends=[CompQuadForm data_table Matrix seqminer SPAtest]; };
   Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
   KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; };
   KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; };
-  KoulMde = derive2 { name="KoulMde"; version="3.1.1"; sha256="0k9077jpr6pv862l7rmrjmi06rl0nlfvn4zdxybsd876r1g861d1"; depends=[expm Rcpp RcppArmadillo]; };
+  KoulMde = derive2 { name="KoulMde"; version="3.2.1"; sha256="0yx04my2vwjpi4l35h1i5xwqckca8b72divww39y1frcvia33g08"; depends=[expm Rcpp RcppArmadillo]; };
   Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; };
   KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; };
   KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; };
-  Kurt = derive2 { name="Kurt"; version="1.0"; sha256="03ivbvgkw3irmcv41zp1wcqzykz81pvvnh39b20qhbgrai2yln79"; depends=[expm labstatR matrixcalc polynom]; };
   L0Learn = derive2 { name="L0Learn"; version="1.2.0"; sha256="17k006nxn9n66nh6nrnhv24p150s7icbhzsaimjidj7hx2c24lms"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
   L1mstate = derive2 { name="L1mstate"; version="1.0"; sha256="04gw078zyzpmnrxibqz27gf4dgyhhcn6lg15w10c6la079vfixx2"; depends=[colorspace MASS Matrix mstate Rcpp RcppEigen]; };
-  L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; };
+  L1pack = derive2 { name="L1pack"; version="0.38.196"; sha256="1cayk11wp6f2vpyz14j7my8wpd8hny2mxpjsdsw4wlz0mmwml70l"; depends=[fastmatrix]; };
   L2DensityGoFtest = derive2 { name="L2DensityGoFtest"; version="0.1.0"; sha256="0yhcj58inmj3qafvvpghs1qi8h5f14jki4qxy28jc7g8ciqxcw60"; depends=[fGarch kedd nor1mix]; };
-  LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.1"; sha256="1lay0zb24k5ms4nfr62pgpriy7nfafnkdjjrd7xxznsi7dqrav0y"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; };
+  LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.2"; sha256="0fhy590mnkypknxk34c7vrhwrgsjrkf1f0yvfbjy1kvzvla0hjkl"; depends=[curl dplyr lazyeval magrittr memoise progress purrr qs rappdirs rlang sf stringr tibble tidyr]; };
   LAM = derive2 { name="LAM"; version="0.5-15"; sha256="18p8w2n2k4788vpxhdxnmcafwj7a5bvihk530fiynkra3xrn1cr4"; depends=[CDM Rcpp RcppArmadillo sirt]; };
   LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; };
   LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
   LARisk = derive2 { name="LARisk"; version="0.1.0"; sha256="05pszgm53dndq114qqb3kcddbvc16a9mgalxjsyh56aa2a4wh7q6"; depends=[Rcpp]; };
-  LAWBL = derive2 { name="LAWBL"; version="1.1.0"; sha256="0sl2pdmf297qds9p818wd17mlj3w6qfynqvc07myjxiwsv8fimkk"; depends=[coda MASS]; };
+  LAWBL = derive2 { name="LAWBL"; version="1.3.0"; sha256="0ixxppxg9kaqk3h0labiq0z0m8x4gzvyh41z4g1ni33br97vdq76"; depends=[coda MASS]; };
   LBSPR = derive2 { name="LBSPR"; version="0.1.5"; sha256="0bkq7lj45c5inm4klwxkwv1y39rkhwis53d1qsr908k5xmkbgg0i"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
   LCA = derive2 { name="LCA"; version="0.1.1"; sha256="014kih33y8b9nls0pcigw68jbz7vgnq8w1xbwm2d37g1m5y6xlyw"; depends=[]; };
   LCAextend = derive2 { name="LCAextend"; version="1.3"; sha256="1l75y3vkbsmsm3pjd5pwy0hlv6gz5ryxs4pkx9aiyhxz2y9wnhpb"; depends=[boot kinship2 mvtnorm rms]; };
@@ -2199,10 +2277,12 @@ in with self; {
   LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; };
   LDATS = derive2 { name="LDATS"; version="0.2.7"; sha256="0im5lvhfbxvrkz9yvfg5xibzdlss869rdz5mixr4ric9lj0ixx0g"; depends=[coda digest extraDistr lubridate magrittr memoise mvtnorm nnet progress topicmodels viridis]; };
   LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; };
+  LDNN = derive2 { name="LDNN"; version="1.10"; sha256="092mnjdmc0l471vd8nym09r9sfx1scp4x6nh22mj6413vaicagq0"; depends=[devtools keras reticulate tensorflow]; };
   LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; };
   LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
   LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; };
-  LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; };
+  LDcorSV = derive2 { name="LDcorSV"; version="1.3.3"; sha256="0wr8i9q9p48vpcia8v3rd8bb2pfijr9r6kg9x26k4wncpg7n83cp"; depends=[]; };
+  LDheatmap = derive2 { name="LDheatmap"; version="1.0-4"; sha256="1jp578cf29qcgx95w10lpymlwx2pgjsf0nypwkl9b8g635gkisq7"; depends=[genetics Rcpp snpStats]; };
   LDlinkR = derive2 { name="LDlinkR"; version="1.0.2"; sha256="0143g41hcljqsfngly56g47pc2pj5xc3myyqia1akxrlwpzdlh7h"; depends=[httr]; };
   LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
   LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; };
@@ -2210,28 +2290,31 @@ in with self; {
   LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; };
   LEGIT = derive2 { name="LEGIT"; version="1.3.1"; sha256="19wkqj7wj8lpni2i2bbfa8l77xb0wbb121fb82srsi6hn76i392g"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators pROC RColorBrewer snow]; };
   LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0.1"; sha256="0ykcd24w71zxb53nch041g7xh83gmg1ia3sysdpn0yzkhm0w7cdl"; depends=[]; };
+  LFDR_MME = derive2 { name="LFDR.MME"; version="1.0"; sha256="1ln0s3ki37cz1a7r96xn0zqw42im7fcanmz2vjk5zycshb423y22"; depends=[]; };
   LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; };
   LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; };
   LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; };
-  LHD = derive2 { name="LHD"; version="1.1.0"; sha256="0aqsb5qfv15il4b52agn4izf6lxvw9z9hh5mhirgfnbqb6w6l0r3"; depends=[]; };
+  LHD = derive2 { name="LHD"; version="1.3.1"; sha256="0y8z829s6l4hml4j0cdd5sh0pax1g8vvnphmvnyf506i8z72k141"; depends=[numbers]; };
   LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; };
+  LIHKGr = derive2 { name="LIHKGr"; version="0.1.0"; sha256="16yyalsdbaxncgfabsz2q2fixzmwyd62gvnvnxazf4vlypp6xlqz"; depends=[dplyr magrittr purrr R6 raster RSelenium rvest tibble xml2]; };
   LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; };
   LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; };
   LINselect = derive2 { name="LINselect"; version="1.1.3"; sha256="1qxqwph5ja2kf1s4ggsv8w6hjgf9mr53a0gahhjix2v78309z42g"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; };
   LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
   LLM = derive2 { name="LLM"; version="1.1.0"; sha256="0kxppzaim7cmjawg5rjih4dsz8adq0asairgq3vx5lyjppb2cybx"; depends=[partykit reghelper RWeka scales stringr survey]; };
   LLSR = derive2 { name="LLSR"; version="0.0.2.19"; sha256="19flvf15sn3fd21fymcg7ag1psl265m0i7siw1fqb6j6fvsn0y8v"; depends=[crayon digest dplyr ggplot2 minpack_lm nleqslv rootSolve svDialogs svglite XLConnect]; };
-  LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; };
-  LMest = derive2 { name="LMest"; version="2.6.1"; sha256="16amjb7dj5czlsjmr5s2hnjrfsiqwnc430q3hcncp3lllqib552g"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; };
-  LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; };
+  LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="3.0"; sha256="0jg889qh5a9wdi01yiw6z7kivs9dzh5dcq39f4zifdpqzglhshzb"; depends=[fields LCFdata lme4 Matrix mgcv]; };
+  LMest = derive2 { name="LMest"; version="3.0.1"; sha256="1ibzk6g2lxxb6cylcfml41dmy1aj4alzi066vsd2v1mfn2b9g1r7"; depends=[diagram Formula MASS mclust mix MultiLCIRT mvtnorm scatterplot3d]; };
+  LMfilteR = derive2 { name="LMfilteR"; version="0.1.3"; sha256="0c27154jghfl83n3sn26pr8mjcybrq02glvnjcx8hllrmz4gmnmi"; depends=[MASS]; };
+  LMoFit = derive2 { name="LMoFit"; version="0.1.6"; sha256="10xiaa5h8c0sq9z70yjs29z8jnjyqgybdv33d6s2100h3n46jd31"; depends=[ggplot2 lmom pracma sf]; };
   LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; };
-  LNIRT = derive2 { name="LNIRT"; version="0.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; };
+  LNIRT = derive2 { name="LNIRT"; version="0.5.0"; sha256="1s7dys4a1gygb9k30l9zby3ls5fwrdy3dvvw4mwdgqsd84zw0rrw"; depends=[MASS]; };
   LOGAN = derive2 { name="LOGAN"; version="1.0.0"; sha256="00y8kcykw01gv2g20vmpwkc3qqyafwbiw5pa731xlfnh1b8sn0hi"; depends=[dplyr foreign ggplot2 magrittr modules pander psych rlang stringr]; };
   LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
   LOPART = derive2 { name="LOPART"; version="2020.6.29"; sha256="1zxaag5pj3l9rzxhlrkx8q4adlap7wsdysb4y6ijvsmxvv63j22k"; depends=[data_table Rcpp]; };
   LOST = derive2 { name="LOST"; version="2.0.2"; sha256="15ggmvjy2k4j692y9h3anfzmb0hgnx66cbr76grwvcfysdx87ick"; depends=[e1071 gdata geomorph MASS miscTools pcaMethods rgl shapes]; };
   LPBkg = derive2 { name="LPBkg"; version="1.2"; sha256="1pgv6cb7m2j7qnrzybnv6x67a3ry8kpvisqj86rvxzclc9q56fdn"; depends=[Hmisc orthopolynom polynom]; };
-  LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; };
+  LPCM = derive2 { name="LPCM"; version="0.46-7"; sha256="1gdinsfn7y3fmv2zr1y8cvy0qwc9zwzf0q1xsnpbmcwljgxb6zdh"; depends=[]; };
   LPGraph = derive2 { name="LPGraph"; version="2.1"; sha256="1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q"; depends=[car PMA]; };
   LPKsample = derive2 { name="LPKsample"; version="2.1"; sha256="0ifhx8w9f6sacmnck2g7i7r742i8bwwzf0rgajw3klw2wni9ikqx"; depends=[apcluster igraph LPGraph mclust]; };
   LPM = derive2 { name="LPM"; version="2.8"; sha256="0a4cf7chjyfwp1s8dfyfgbm2k6nybfmfh4bhz8b8pfj1an68bdr6"; depends=[fracdiff MASS powdist]; };
@@ -2242,7 +2325,7 @@ in with self; {
   LPWC = derive2 { name="LPWC"; version="1.0.0"; sha256="0jgz8rkhhsdiwz7jq568axcsfwlkzdpwssr76zx33r0gz6mf3lln"; depends=[nleqslv]; };
   LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; };
   LPower = derive2 { name="LPower"; version="0.1.1"; sha256="00sabp2snfm0175c0cfyv83yd1zb3b8h2wrr7yxgkmr4i3py1fn7"; depends=[MASS nlme]; };
-  LPsmooth = derive2 { name="LPsmooth"; version="0.1.1"; sha256="039f3iz4zihwb9lx1243jbjaxy5qwgaa2w9kjdcxqls7ax0bixvf"; depends=[Hmisc LPBkg LPGraph nloptr orthopolynom polynom truncnorm]; };
+  LPsmooth = derive2 { name="LPsmooth"; version="0.1.3"; sha256="0fvn6vwfl37xhzzj44vadk8fr3d85zv58jjg7qfdjqvyw8khd59p"; depends=[Hmisc LPBkg LPGraph nloptr orthopolynom polynom truncnorm]; };
   LRQMM = derive2 { name="LRQMM"; version="1.2.2"; sha256="1gly4s8pr8wzcv547h6m1qr74q5n45zn0dz0lmx4pfvfgv1kym47"; depends=[GeneticsPed kinship2 Matrix MCMCglmm quantreg R_matlab rsvd SparseM sparsesvd]; };
   LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; };
   LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; };
@@ -2257,48 +2340,52 @@ in with self; {
   LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; };
   LSPFP = derive2 { name="LSPFP"; version="1.0.3"; sha256="0wxqpwfyyhk9dig9ji5na7czk19jx14lr9iqb2rllggz4cji9y65"; depends=[bit64 data_table R_utils RCurl seqinr]; };
   LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; };
+  LSX = derive2 { name="LSX"; version="0.9.6"; sha256="1lw0nzjzcazakmmwn83rzclgsmxzlg2nwc9wrrdgvvxwpqfwirhy"; depends=[digest e1071 ggplot2 ggrepel irlba locfit Matrix proxyC quanteda quanteda_textmodels quanteda_textstats reshape2 rsparse RSpectra rsvd stringi]; };
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
-  LTRCforests = derive2 { name="LTRCforests"; version="0.5.0"; sha256="0bd2ykcflmwlzvl0iknbnmnw35pm0bvgc50x66l595xsaxgiylwy"; depends=[ipred partykit prodlim survival]; };
-  LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; };
+  LTRCforests = derive2 { name="LTRCforests"; version="0.5.2"; sha256="0khmgrlb4g091m1a38hcmc29a2k0wr31f5jx5l4xyy8gcphn1aws"; depends=[ipred partykit prodlim survival]; };
   LUCIDus = derive2 { name="LUCIDus"; version="2.1.0"; sha256="133cxmvsxm26jmx65snfswqf69ch10bnfbninkks80h2c1y46kq6"; depends=[boot glasso glmnet lbfgs mclust networkD3 nnet]; };
   LVGP = derive2 { name="LVGP"; version="2.1.5"; sha256="03sd777s16nv04ikn9b3rj67ad6n4bwi0rycc7wqdnq0dx6xgniy"; depends=[lhs randtoolbox]; };
   LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; };
   LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; };
   LaF = derive2 { name="LaF"; version="0.8.4"; sha256="1mj010bl4ql0hm33vl0dd08s9dab11y9fa32nsqs6kbb22gjzk6p"; depends=[Rcpp]; };
   LabRS = derive2 { name="LabRS"; version="0.1.0"; sha256="1a9qafimia83qldsif5wfqx273mvqbx22p5i0hg8n4jvj4vzpy2w"; depends=[knitr]; };
-  LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.4"; sha256="0xm6rn8r5z3b04zd7gdrclhzmqcvqxyyjlch5npdyq8sbfd163hh"; depends=[data_table maptools rgdal rgeos sp spdep]; };
+  LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.5"; sha256="1fhr677mp7dp18q9yvqycsmyqvqh007y3pc8r500n2axiczjzkqg"; depends=[data_table maptools rgdal rgeos sp spdep]; };
   LadR = derive2 { name="LadR"; version="1.0.6"; sha256="14n58y1p14wwxwwrbdqv2kkplma8ficpqx8nd22qp931idijpsji"; depends=[L1pack]; };
   LagSequential = derive2 { name="LagSequential"; version="0.1.1"; sha256="1i8h4acfx21r0kxbg4i0k48kvhwy2abri191wp4b22amhz4vqyyd"; depends=[]; };
   Lahman = derive2 { name="Lahman"; version="8.0-0"; sha256="1ha4idp96z9kc2rs0v0iqf7jrg2riccjdqv7rj1vbwz6vjvghbfm"; depends=[dplyr]; };
   LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; };
   Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
-  LambertW = derive2 { name="LambertW"; version="0.6.5"; sha256="1c7rd1zyi43aam1lil764kgpcimpns06d4l980ng59h7bin4yq80"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; };
+  LambertW = derive2 { name="LambertW"; version="0.6.6"; sha256="02pi98nnscaz044jkh2nrxxdyafdbiy9x0szdfkx894s3bwrf29i"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; };
   Langevin = derive2 { name="Langevin"; version="1.2.1"; sha256="1bl7145585z173jv8y6f36ba29q1iq29anm44bdq9hcpql235ihy"; depends=[Rcpp RcppArmadillo]; };
   LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; };
   LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.4"; sha256="1nv1kx86cg8f2s8q15pzskc0lg94bb250p0fhybrx5sjqv1s2lj1"; depends=[]; };
   LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; };
+  LassoGEE = derive2 { name="LassoGEE"; version="1.0"; sha256="1zascnl9hihw0gx2ssmdiv8gcp2672kz9vmsp5vrc2wr9cdcdjz3"; depends=[caret MASS mvtnorm PGEE Rcpp RcppArmadillo SimCorMultRes]; };
   LassoNet = derive2 { name="LassoNet"; version="0.8.3"; sha256="02m0g078wg9ka3ck92nrpqrm3msw1m7r8k43brcaiffqwhky99vy"; depends=[Rcpp]; };
   LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; };
   Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
-  LatticeDesign = derive2 { name="LatticeDesign"; version="1.0-1"; sha256="1wlchqa7914401r0mzca4fffps99nfbj0jym1jxkclnjivdgcn24"; depends=[]; };
+  LatticeDesign = derive2 { name="LatticeDesign"; version="2.0-4"; sha256="1spmm9gk09i5dkz6xh4qvmq9r7wd9r8a84xqh8d21678kvl2j3fc"; depends=[]; };
   LatticeKrig = derive2 { name="LatticeKrig"; version="8.4"; sha256="153yaf0k4l5za8f13yh2mzjv66bnmi5kp6zaxq9vrisld4vdp58h"; depends=[fields spam]; };
   Lavash = derive2 { name="Lavash"; version="1.0"; sha256="0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07"; depends=[glmnet MASS pracma]; };
   LeArEst = derive2 { name="LeArEst"; version="1.0.0"; sha256="0kga9n0ia2zljyw4xa9n572zmxpwql8xd3ys4p9jp02h432pfkpp"; depends=[conicfit doParallel foreach jpeg opencpu]; };
   LeMaRns = derive2 { name="LeMaRns"; version="0.1.2"; sha256="0k7mpl2dgy2qvs068mzgfagvlk116p80cxj4dfzjkrr8wzrmwyni"; depends=[abind Rcpp RcppArmadillo]; };
   LeafArea = derive2 { name="LeafArea"; version="0.1.8"; sha256="0a464bcanq6jfm5j6692h61pipy28vm7m89y5i0hrhz7lzpy9x5z"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; };
+  LearnClust = derive2 { name="LearnClust"; version="1.1"; sha256="0r2ns1bnsygc6jhr83v1ylfp8fkn3j76233zk5cwsxrq0grx5iqs"; depends=[magick]; };
   LearnGeom = derive2 { name="LearnGeom"; version="1.5"; sha256="1pnxiwjkdj78p4hkl1lqagmd937q63yncb45fcra28sa9v9psrcs"; depends=[]; };
   LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; };
-  LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.1"; sha256="1ydkc14hn49z3j1lypjkjnn45gpy5snbdi62q5hksa8733frf9m9"; depends=[data_table pbapply quanteda stringdist stringi tibble]; };
+  LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.3"; sha256="1n4jfdj6b4znwl2vpfc51dy60bksbsniwik8lbdp8z28gm7bdaqv"; depends=[data_table pbapply quanteda quanteda_textstats stringdist stringi tibble]; };
   LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; };
   LibOPF = derive2 { name="LibOPF"; version="2.6.0"; sha256="0xs4098qd4j1c1vl8x8620xkrfg0iisdzs203djaqb7vqlywmlrn"; depends=[]; };
   LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
   LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; };
   Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; };
   LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; };
+  LifeInsuranceContracts = derive2 { name="LifeInsuranceContracts"; version="0.0.2"; sha256="13ml74q19z72ihy7w6vgfrp0wvy8sc2s0kpz4ys875aym6cwrfmf"; depends=[abind dplyr lubridate MortalityTables objectProperties openxlsx R6 rlang scales stringr]; };
   LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; };
   LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; };
   LilRhino = derive2 { name="LilRhino"; version="1.2.0"; sha256="1d1mg77k67b5ddlp41haygagash48b6jy30q20lb231lbiss9ncp"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi textclean tm]; };
+  LimnoPalettes = derive2 { name="LimnoPalettes"; version="0.1.0"; sha256="0qzcx182nn5ygqlsqmxl1r4r0gg89q0qqgk6hk5lvgb5ghf91z3y"; depends=[]; };
   LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
   LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-3"; sha256="1rkxvkv3ls0cgqcvs74dy6qabh62cjc0xh89dlk88bpc8mz76k8z"; depends=[rpanel xtable]; };
   LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; };
@@ -2308,25 +2395,26 @@ in with self; {
   LinkageMapView = derive2 { name="LinkageMapView"; version="2.1.2"; sha256="101g4djzkxgxbn87an2vz4s9nwn8gwz7a3p3wg0y4zpdd1pdp716"; depends=[plotrix qtl RColorBrewer]; };
   LinkedGASP = derive2 { name="LinkedGASP"; version="1.0"; sha256="1win1yd8y677rmic531dyd29f49p7pr1r3kbjysvv9syi5nkydyj"; depends=[nloptr spBayes]; };
   LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.4.0"; sha256="0p6qjnrljxnj3c5nynmx563vcqhxj4jf7czqdg750h38gjy8qzxi"; depends=[crochet]; };
-  LipidMS = derive2 { name="LipidMS"; version="1.1.0"; sha256="193s5pc2dh848hvwwr1jw79yw90l7b9ic396s4jm36187y9nlw7n"; depends=[CHNOSZ enviPick LipidMSdata purrr]; };
+  LipidMS = derive2 { name="LipidMS"; version="1.2.0"; sha256="0fajq38ys1il0x4004xqlx867fsyw0ajbkq4zlkxmqffqbgy0hkq"; depends=[CHNOSZ enviPick LipidMSdata purrr]; };
   LipidMSdata = derive2 { name="LipidMSdata"; version="1.0.0"; sha256="110wvbk59knhsnbv665ji7v0kp4vjn0937k5fg2d724ksy44gxic"; depends=[]; };
   Lmoments = derive2 { name="Lmoments"; version="1.3-1"; sha256="0pc63bj9a8hzr5m3yssrc4kin39fffwkl8rggs3sagzr12d4i7bw"; depends=[Rcpp RcppArmadillo]; };
   LncFinder = derive2 { name="LncFinder"; version="1.1.4"; sha256="04ndxl368glx63pq58mxpyiddj2p84kyi22ylfy1x1x24xmgbdnn"; depends=[caret e1071 seqinr]; };
   LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
   LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; };
   LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
-  LocalControl = derive2 { name="LocalControl"; version="1.1.2.1"; sha256="123s7r11ivnp7fz6zcvzrgfyc17cqvn8k1786hcmgkplq9qnmnf4"; depends=[cluster gss lattice Rcpp]; };
+  LocalControl = derive2 { name="LocalControl"; version="1.1.2.2"; sha256="1lqcjy5fzz1ndqih5nikidy2zfkn2dn7smbyvdjy47pgcjbzm96a"; depends=[cluster gss lattice Rcpp]; };
   LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; depends=[cluster lattice]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
-  LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-3"; sha256="0gplkprvldw2dq43kvij215lv9x9xdnp47smn8m1r93nk4pxy5mr"; depends=[MASS mclust mvtnorm tkrplot]; };
+  LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-4"; sha256="0lfpsm9iqjl8hmagbd26ks7pwngn5z57s6iiy2l6n8xbnvaax2x8"; depends=[MASS mclust mvtnorm]; };
   LogicReg = derive2 { name="LogicReg"; version="1.6.2"; sha256="004dd3vrb0xbwfkij4ickhvsmhfmhd3r4qr6j9haihffnbm6xbjh"; depends=[survival]; };
   LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; };
   LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
   LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
   LogrankPower = derive2 { name="LogrankPower"; version="1.0.0"; sha256="04vynymfv01q423dd9i1li92rl3lp1af3rzn3z4mamkn51mi6my0"; depends=[survival survminer]; };
-  LongCART = derive2 { name="LongCART"; version="2.0"; sha256="1xpbyz6hqwhbcgjv6fxkry30fhq11nw2r9s3smwik8cw8yiciwl5"; depends=[Formula magic nlme rpart survival survminer]; };
+  LongCART = derive2 { name="LongCART"; version="2.1"; sha256="0fgk9qx23kzzqc2s4i4zqf4qaj2fxwcsl54n1zx1qvd8mvi8mkzh"; depends=[Formula magic nlme rpart survival survminer]; };
   LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; };
+  LongituRF = derive2 { name="LongituRF"; version="0.9"; sha256="0h70g0qhv0rgz40i58ykrcak1wibbvya7fql0v79xkd21217y1av"; depends=[latex2exp mvtnorm randomForest rpart]; };
   LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; };
   LoopDetectR = derive2 { name="LoopDetectR"; version="0.1.2"; sha256="0c65svz9v8z9886awdf9jm3ysk7nc7gk7q2ihpy20fcciiv05b30"; depends=[igraph numDeriv]; };
   LoopRig = derive2 { name="LoopRig"; version="0.1.1"; sha256="11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b"; depends=[GenomicRanges IRanges S4Vectors]; };
@@ -2334,25 +2422,30 @@ in with self; {
   LowRankQP = derive2 { name="LowRankQP"; version="1.0.4"; sha256="0cg8f42s15vphnifw6gnrhxaj6j5hmgbq8xki5mkwjsizd0ch5na"; depends=[]; };
   LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; };
   LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.9.7"; sha256="15slaiwhk5a15kmxr5slkbsm963v0dwmdl4adnhvc3j0b0c0d0r8"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.9.10"; sha256="0ikiqnvj3ivzx9bmq3bv3k2d6c91v1j1cbrarv1svxv37zdh6qbr"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M2SMF = derive2 { name="M2SMF"; version="2.0"; sha256="160qjrb3mxybvr4z6zra6rzf6scyrb9mplw36gqlfxj418ndnmm1"; depends=[dplyr MASS]; };
+  M2SMJF = derive2 { name="M2SMJF"; version="1.0"; sha256="0v4sg5h3h2pjp996jspv206c8cymjpn1fg38ivaw12s7bmx8j409"; depends=[dplyr MASS]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
+  MABOUST = derive2 { name="MABOUST"; version="1.0.0"; sha256="0wa948r87sycq828kx58b8zilsl8lfcy6w6hh9pisw59s6f0jsj2"; depends=[Rcpp RcppArmadillo]; };
   MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
   MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.4"; sha256="1asr18byrgy6bkpxpmnkczgr3dam6ymf30lw6izq112krc891bg4"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
-  MAINT_Data = derive2 { name="MAINT.Data"; version="2.4.1"; sha256="1vqh7yfv2wdijhl3jcvm4am9ap91gapfhzcm48pas83bfmazvpri"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppArmadillo robustbase rrcov sn]; };
+  MAINT_Data = derive2 { name="MAINT.Data"; version="2.5.0"; sha256="1zjxzl1qnv6drbzqpjdhm6p32cf3xp5yyfmpsm5lksw29bw6x91n"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppArmadillo robustbase rrcov sn]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.19.3"; sha256="0b7kdz3x4sdq413h1q09l1qhcvdnnwv6fqsqwllks1cd3xy34c57"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.12"; sha256="1r37x1hnhq246dazc76d17jfjc57khxayswbzvc4md39z8dnbihx"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
-  MAMS = derive2 { name="MAMS"; version="1.3"; sha256="181i1p84pacl31qsh5vkvyxnca9sx6rabi7cs42w9qpzk2fxcmzj"; depends=[mvtnorm]; };
+  MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.5"; sha256="02wm9i4lhrhxxmhh0a7d1x0np290fbvwr3rb4scp66ix0s1as4fk"; depends=[lattice MALDIquant robustbase signal]; };
+  MAMS = derive2 { name="MAMS"; version="1.4.1"; sha256="1zc0lnbq4fvsrlyh3a9i010h6gms4872nxv534j5xglq2x2pm7rh"; depends=[mvtnorm]; };
   MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; };
   MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; };
-  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.3.4"; sha256="0x7l9k35g7fm70ybddjxy0xni6xhmb9kjnpgabm3ljjipj62vshv"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; };
+  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.4.2"; sha256="0kjqswz3drpp12cy3imvkkh37lm70fjh2wg6qxn51ykmz4dkr8sa"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; };
   MAP = derive2 { name="MAP"; version="0.1.3"; sha256="19d0m30jh50ibbdgvcvq1vsz5i1vf8qvl0d0nbqklvnndch61jhk"; depends=[flexmix Matrix]; };
   MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; };
+  MAPITR = derive2 { name="MAPITR"; version="1.1.2"; sha256="0vmsdspja4qfs2z14p835g78zggk8h54v25cn268z1hg2p6zxish"; depends=[CompQuadForm doParallel Rcpp RcppArmadillo]; };
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
-  MARSS = derive2 { name="MARSS"; version="3.10.12"; sha256="09b0q9aq1y4nrgpvr1xkzibv5xf9qdcaxlz02zl9sv4x1zmpi80w"; depends=[KFAS mvtnorm nlme]; };
+  MARSS = derive2 { name="MARSS"; version="3.11.3"; sha256="03lk838wd88xh4x8ch77z098syn1373nzljckr6pp1jyhxxkvx5z"; depends=[KFAS mvtnorm nlme]; };
   MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; };
-  MASS = derive2 { name="MASS"; version="7.3-52"; sha256="0c4scl7r4m0bikr0wmdrnn7wfzy1vg5v7gsq6bms2vknzs9ymhxp"; depends=[]; };
-  MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.4"; sha256="1lpmpxgqnczlizx5gwgw96kxqkjqvbjqwf373zkvfmax2pfqr6dn"; depends=[]; };
+  MASS = derive2 { name="MASS"; version="7.3-53"; sha256="0f2bwsbqr3nzsqxva051lg8wd068naqif3vc48hac0m3mmq4x0j1"; depends=[]; };
+  MASSExtra = derive2 { name="MASSExtra"; version="1.0.2"; sha256="1z2671zidiv0w0w0yi80mh91wgg4gyvcps86kqb2cwghynf5b805"; depends=[MASS]; };
+  MASSTIMATE = derive2 { name="MASSTIMATE"; version="2.0-1"; sha256="1dvidwjw4zgflms5njbd9n85g1gbgfg6hk0fb63q5n65iyxxfmyh"; depends=[]; };
   MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
   MATA = derive2 { name="MATA"; version="0.4"; sha256="0x155izylzwajlnlbdnawb3b8gwxd1cx03xb1sqi3w2g50bcljbf"; depends=[]; };
   MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
@@ -2363,29 +2456,28 @@ in with self; {
   MAclinical = derive2 { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; };
   MAd = derive2 { name="MAd"; version="0.8-2.1"; sha256="096vdhfsp7bd3zvv6ydai6p230r16jx8zlqc4hlhnzma8rqypm35"; depends=[]; };
   MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; };
-  MBC = derive2 { name="MBC"; version="0.10-4"; sha256="1fp06xx9jpz5mcxs0yppzzhch9w9c1qbsdbb60r4izrxnrhggpf7"; depends=[energy Matrix]; };
+  MBC = derive2 { name="MBC"; version="0.10-5"; sha256="0iks5nhk4im7l1dxgwcwi4mlnh271zfq9mrlaklpk38zakzyf2n4"; depends=[energy FNN Matrix]; };
   MBCbook = derive2 { name="MBCbook"; version="0.1.1"; sha256="0jmvgyzrahnxfkwdn86k3ffk0zfbbd34ya4zmlnsmp2m9xds7lgn"; depends=[MASS mclust mvtnorm Rmixmod]; };
   MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
   MBESS = derive2 { name="MBESS"; version="4.8.0"; sha256="14zji1iy7ai3hdxz5jpqbac8q9rp96700bimx24if2s9k6f208x9"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; };
-  MBHdesign = derive2 { name="MBHdesign"; version="2.1.6"; sha256="188kx7594qsxq5wnkpzh3xm6rjvsyj5r4hv8kqaa2mcqp5730k1j"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
+  MBHdesign = derive2 { name="MBHdesign"; version="2.1.8"; sha256="0b9bk4qwsymhqylpimsv1vghlwwbnd1jxik927wn2h4ijqq3a9q8"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
   MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
-  MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.7"; sha256="1r8gz0kpkmgs1czyzwrv018l0z8gypwjdd4gmwbbhhaj84fr3gni"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; };
+  MBNMAdose = derive2 { name="MBNMAdose"; version="0.3.0"; sha256="12ij19828nd1r0x1vp7clkwr0zfksk3f755xghzylz0ryjjb716d"; depends=[checkmate dplyr formatR igraph magrittr R2jags Rdpack reshape2 rgeos rjags scales utf8]; };
   MBNMAtime = derive2 { name="MBNMAtime"; version="0.1.3"; sha256="1yyynsdgxdw3zfv0byxbjli332wc3bm8pfhrcy4rsvvvhj458vy7"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags]; };
   MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; };
   MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; };
-  MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
   MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
-  MCAvariants = derive2 { name="MCAvariants"; version="2.2"; sha256="012374zm77i8bl4nm3dg97m7x22697ryq1766mhsgh6gl3jgcm66"; depends=[ggplot2 ggrepel gridExtra]; };
+  MCAvariants = derive2 { name="MCAvariants"; version="2.5"; sha256="17v554ammsk39i3h8i85m2jl0wf4ra1ag3n9x3mcpqakha0p7852"; depends=[ggplot2 ggrepel gridExtra plotly]; };
   MCBackscattering = derive2 { name="MCBackscattering"; version="0.1.1"; sha256="0vvcqjrh8psl480s4q2830rzm2bwy9mmvk9kipp72lzln51qnha6"; depends=[]; };
   MCDA = derive2 { name="MCDA"; version="0.0.20"; sha256="1pzp68dirby5ddwz37kjh9dnmwsbdfi37gfr8pgmngqzgbr9x6dd"; depends=[combinat glpkAPI RColorBrewer Rglpk]; };
   MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; };
   MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; };
-  MCI2 = derive2 { name="MCI2"; version="1.1.2"; sha256="1vxzfab8yn18icarsdvz8ky7frspxax22sb8c0ki91y1mj9m9mgj"; depends=[MCI osrm REAT reshape tmaptools]; };
   MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
   MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.4"; sha256="0v0d43wnq3swbrcsbg9qmwkmk4s50grd6cik4ng5baj2i6i4hd2n"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; };
   MCMCglmm = derive2 { name="MCMCglmm"; version="2.29"; sha256="1d37rk10zi2yymsxif9091z9lnav7p4cazjfq29fhj90x8vpifhk"; depends=[ape coda corpcor cubature Matrix tensorA]; };
+  MCMChybridGP = derive2 { name="MCMChybridGP"; version="5.4"; sha256="19nbch76g7jf53nrb1lyzr3zd0z6rpz2k86mq1r9aidwwxh81g7p"; depends=[MASS]; };
   MCMCpack = derive2 { name="MCMCpack"; version="1.4-9"; sha256="1fskidw7fgy65isqk9msmnfk0ygpb97cla84kgmndxakqy4c2i9c"; depends=[coda lattice MASS mcmc quantreg]; };
   MCMCprecision = derive2 { name="MCMCprecision"; version="0.4.0"; sha256="0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
   MCMCtreeR = derive2 { name="MCMCtreeR"; version="1.1"; sha256="00r6f62h7ryil7qxd25icvkqypjjssjsrz4i5sbqsnw5cdy5al8z"; depends=[ape coda sn]; };
@@ -2393,7 +2485,8 @@ in with self; {
   MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
   MCPMod = derive2 { name="MCPMod"; version="1.0-10.1"; sha256="0j15dpxy62vwbd6pcsvkbpi1nklh0yjzwf53kcmv4jhj0v6xmpp9"; depends=[lattice mvtnorm]; };
   MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-1"; sha256="0izhbiivlb818ak49hl1f7li1chlyrxk5f80cmw4zkim3l6ddaxq"; depends=[DoseFinding MASS]; };
-  MCPModPack = derive2 { name="MCPModPack"; version="0.3"; sha256="0g404qj8prh5cqq9v641vwa6kx4p9ja2migyq9n8s5a6g1sxyrnl"; depends=[devEMF flextable mvtnorm officer Rcpp RcppEigen RcppNumerical shiny shinydashboard]; };
+  MCPModPack = derive2 { name="MCPModPack"; version="0.4"; sha256="1xal4dj6i4qvifv4k8x7i1xzh1qq6fcddxk5d8wgriz1viqy2v03"; depends=[devEMF flextable mvtnorm officer Rcpp RcppEigen RcppNumerical shiny shinydashboard]; };
+  MCPtests = derive2 { name="MCPtests"; version="1.0.1"; sha256="1lzlvzw60fb0mllbl0dx8s30zigzbl9shjas629syb9yw55ypxa2"; depends=[doParallel foreach SMR writexl xtable]; };
   MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; };
   MCSim = derive2 { name="MCSim"; version="1.0"; sha256="1nqry41qa5c02an5fxm3y1g3w1vcqjgsy1an95i3szz1w1ndaj14"; depends=[CircStats MASS]; };
   MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
@@ -2410,7 +2503,7 @@ in with self; {
   MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; };
   MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; };
   MEDITS = derive2 { name="MEDITS"; version="0.1.7"; sha256="0n3llnvpxd4bs1vslhmsahvl9vm0pmbmc94gijss16linpskxxkj"; depends=[ggplot2 hms raster rgdal rgeos sp tibble vegan]; };
-  MEDseq = derive2 { name="MEDseq"; version="1.1.1"; sha256="1pd29wjnyffbjhivg567wilqybpqq30ypnj93p1lrf0920ffnvfy"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; };
+  MEDseq = derive2 { name="MEDseq"; version="1.2.0"; sha256="12wvqar21b077v5dhyab8prfliild7im2xzfw222jncl228ypgxq"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; };
   MEGENA = derive2 { name="MEGENA"; version="1.3.7"; sha256="0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21"; depends=[BH cluster doParallel foreach fpc ggplot2 ggraph ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; };
   MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; };
@@ -2421,23 +2514,25 @@ in with self; {
   MFAg = derive2 { name="MFAg"; version="1.7"; sha256="0cc1p677lsmdyw9x7kzc4prlw70y4rqmygspkvd4r11hrs54m05a"; depends=[]; };
   MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; };
   MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
-  MFPCA = derive2 { name="MFPCA"; version="1.3-5"; sha256="0w198ygksipgxwl73qnz5l0jv6z2irk0dk3dw66vx5wrd08yvxwg"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
+  MFPCA = derive2 { name="MFPCA"; version="1.3-6"; sha256="1xync706kn4l0ky9fbj13f76r34bs95qp32pnsawa3qqsipxi2w3"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
   MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; };
   MGBT = derive2 { name="MGBT"; version="1.0.4"; sha256="1x2yqfb5diqkq82j81slh9kxzxgyy67axyqlqjpv237yf8p0djc0"; depends=[]; };
-  MGDrivE = derive2 { name="MGDrivE"; version="1.5.0"; sha256="1dgmmc34m2pj1l2gkwg85sj4rbhhwyrp8cj4m9b9hlz134n3qgwy"; depends=[R6 Rcpp Rdpack]; };
+  MGDrivE = derive2 { name="MGDrivE"; version="1.6.0"; sha256="0ynn7iwxi5yfpjyrvfr6ym4ns7h8qfy8c10clab7i72pv90jqqlr"; depends=[R6 Rcpp Rdpack]; };
+  MGDrivE2 = derive2 { name="MGDrivE2"; version="1.0.1"; sha256="0s4z2czqp3h6kwjiqngw2xdfjg2sf282sdd7nqxy3br9vw6i0682"; depends=[deSolve Matrix]; };
   MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; };
   MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; };
+  MGMM = derive2 { name="MGMM"; version="0.3.1"; sha256="1q33p1syvw8q4akl172ndcbl23gw2nfsx40dyafl349h5bqyj6rk"; depends=[cluster mvnfast plyr Rcpp RcppArmadillo]; };
   MGMS2 = derive2 { name="MGMS2"; version="1.0.2"; sha256="04f1ng4s163x7gvy1iaf0j8pzs0pm2r2saji0srbp2jyhrj68d7z"; depends=[MALDIquant MALDIquantForeign]; };
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
   MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; };
-  MHCtools = derive2 { name="MHCtools"; version="1.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; };
+  MHCtools = derive2 { name="MHCtools"; version="1.3.0"; sha256="1vfyq2c2lrx2vsxz969pif38gw0vsh0bixyr3wh1rvswbw9wlj0b"; depends=[]; };
   MHMM = derive2 { name="MHMM"; version="1.0.0"; sha256="0d3djaydw0h7x3vlaghrbgmx024rgv36wfsjhlixzzssb2d6lqzi"; depends=[BH ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; };
   MHTcop = derive2 { name="MHTcop"; version="0.1.1"; sha256="1mr8y8brsi37b5qx3fqm0bj90dgknzzwhxfmvyd9kxbxh19whgxq"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; };
   MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.1"; sha256="0czpsk4jiwbzd6g2dwssmggsdhwchikmc1skv48d9j4xvglns7yw"; depends=[]; };
   MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; };
   MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; };
   MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
-  MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.1"; sha256="0azp8w626fhlwrk2qj7lyz9mpxj1hl2l8l1f7pviigdqp35shwf1"; depends=[dplyr e1071 raster]; };
+  MIAmaxent = derive2 { name="MIAmaxent"; version="1.2.0"; sha256="0r4q1735f7apfj0jz4f52ra7sisbkkkk2n6i0kii3q64sx2h3xbj"; depends=[dplyr e1071 raster rlang]; };
   MIDASwrappeR = derive2 { name="MIDASwrappeR"; version="0.5.1"; sha256="07108dg16i20fg6cvsnbflfz65smwk08vjmf1b193zyvhdikwhfm"; depends=[Rcpp]; };
   MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; };
   MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; };
@@ -2449,18 +2544,22 @@ in with self; {
   MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
   MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
-  MKdescr = derive2 { name="MKdescr"; version="0.5"; sha256="0dgdglr173pjlvbh9kd67pl890pnlzlcfm04ax4bdas6gp1cb6j6"; depends=[ggplot2 scales]; };
-  MKinfer = derive2 { name="MKinfer"; version="0.5"; sha256="1zb7zcqis8pdqrgz8pivmysl9lsj03zaikxnljyvhvhcpgy6msgb"; depends=[arrangements boot ggplot2 MKdescr nlme]; };
+  MKclass = derive2 { name="MKclass"; version="0.3"; sha256="0sw0h99k24418iqvvq247kg5558y9mgashr5amay7gbf2va79v6j"; depends=[]; };
+  MKdescr = derive2 { name="MKdescr"; version="0.6"; sha256="14rqbamvf9ndk4ivcpvrcl4ad1nar6gfk9m3q7pb5fg8gs39wypn"; depends=[ggplot2 scales]; };
+  MKinfer = derive2 { name="MKinfer"; version="0.6"; sha256="13ga5pwlnlm28dm6nxg4ccc7br51jg7wvwp61sx31yvzgr5m45ld"; depends=[arrangements boot ggplot2 MKdescr nlme]; };
   MKmisc = derive2 { name="MKmisc"; version="1.6"; sha256="0x518icdgq4mrc6qm1flb5lpr9y7j9znh0ah3gw2xsbjiplqd323"; depends=[ggplot2 limma RColorBrewer robustbase scales]; };
   MKomics = derive2 { name="MKomics"; version="0.5"; sha256="0mr0y1ai3jf3jj4dqvs6xv3clgli7d7lzqk8ya6zah388rqmkg9s"; depends=[limma RColorBrewer robustbase]; };
-  MKpower = derive2 { name="MKpower"; version="0.4"; sha256="1s9njvdjpqn4i4dxarb9agcdmx9dx1g4icg7mfp8bd6rnslsscn5"; depends=[coin ggplot2 matrixTests MKdescr MKinfer qqplotr]; };
+  MKpower = derive2 { name="MKpower"; version="0.5"; sha256="1yr9yk7x8da2b8hj71v4f5c2nikljbr6ayqp004whdi2bh67v95n"; depends=[coin ggplot2 matrixTests MKdescr MKinfer qqplotr]; };
   ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.0"; sha256="1dxvvyha984j3h170s2brhbf4lm53f16f12lhnqf3sl4sc0f4xv8"; depends=[ape foreach]; };
+  ML2Pvae = derive2 { name="ML2Pvae"; version="1.0.0"; sha256="0laazb78qz6348kdyivb062nrmiz45imr3l3ck338a230avy4w4d"; depends=[keras reticulate tensorflow tfprobability]; };
   MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1.1"; sha256="1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b"; depends=[limSolve MASS MultiLCIRT]; };
   MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; };
   MLDAShiny = derive2 { name="MLDAShiny"; version="0.1.0"; sha256="14n8pffzw5y7lq3qx1xly4jwm05cyvs14gn838h6y9yssb16xnmr"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; };
+  MLDAShiny2 = derive2 { name="MLDAShiny2"; version="0.1.0"; sha256="1mx8js54mrrf16jriy467dysxpkcsza9fvdmpdbmxr5m3y564sc7"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; };
   MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; };
   MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
-  MLGL = derive2 { name="MLGL"; version="0.6.1"; sha256="01z4gc1zhhyiin58dm5mwr9x799gq73agh4s10wk4q82f0nn3f55"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; };
+  MLGL = derive2 { name="MLGL"; version="0.6.5"; sha256="1qrqw39hghdlbrs0dkv38awrgwdf8lj95rhb3hixcc6nfb2lkr8j"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; };
+  MLGdata = derive2 { name="MLGdata"; version="0.1.0"; sha256="0ysvrnx8m903h99wr40zgg1c6d26m9vsh62zjxh8mvndh69ikzid"; depends=[]; };
   MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; };
   MLML2R = derive2 { name="MLML2R"; version="0.3.3"; sha256="1jgk0h3chab831g5nsppgc6p0xplv11j82491iymnxixqfswb08w"; depends=[]; };
   MLMOI = derive2 { name="MLMOI"; version="0.1.1"; sha256="0fliax6ajacm2i416xi26qlwg3y7iw8y6hykkz0mcwp7djyn3n6s"; depends=[Rdpack rJava Rmpfr XLConnect]; };
@@ -2477,6 +2576,7 @@ in with self; {
   MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.3"; sha256="0hlm6jp8jq38vkszwdgpf30w11l1fhpblg26zv05j50a6whpmhqd"; depends=[Biobase]; };
   MM4LMM = derive2 { name="MM4LMM"; version="2.0.2"; sha256="0zcaqxz1yxv2lkp39ly4jkl9wk94k7md5ks5wjk9l1qk7k5q7yx9"; depends=[MASS Matrix Rcpp RcppEigen]; };
   MMAC = derive2 { name="MMAC"; version="0.1.2"; sha256="1xwz48iizf0lvmhc7krsraabc49ky85qvgr23w4ip6jzfv4sn1jr"; depends=[]; };
+  MMDCopula = derive2 { name="MMDCopula"; version="0.1.0"; sha256="0xldnz4393hqkidfy03mdb8ia3nycdj5q3s37j8q05m0pn4pjk1z"; depends=[cubature pcaPP randtoolbox VineCopula]; };
   MMDai = derive2 { name="MMDai"; version="2.0.0"; sha256="0b9lksql266sqhxy4k3chz2pcaabgijkp7g0v4pm7ci5v50d4vag"; depends=[]; };
   MMDvariance = derive2 { name="MMDvariance"; version="0.0.9"; sha256="1yiqabifym7gdknqrhfnql6qc8p163npzrrckbyqjry3yvkqr5wi"; depends=[Biobase lawstat MASS]; };
   MMLR = derive2 { name="MMLR"; version="0.2.0"; sha256="1jc33ani6w54j38kxzk0kfj1hjfk80cil2hdja2hcsk6kqwd431d"; depends=[pracma]; };
@@ -2486,15 +2586,15 @@ in with self; {
   MMWRweek = derive2 { name="MMWRweek"; version="0.1.3"; sha256="1l1ks44v52iggw9nhs56lfj6804yab5b17k8fzrc6h1kvj3vda0s"; depends=[]; };
   MMeM = derive2 { name="MMeM"; version="0.1.0"; sha256="1b0wdcyqnliw85il5vnwy9l4x1z42kirbg872hl47plwfrp9gahc"; depends=[jointDiag lme4 MASS Matrix matrixcalc psych stringr]; };
   MNLR = derive2 { name="MNLR"; version="0.1.0"; sha256="0q80232ndp7pkklzqdbga1vf51dmsxaivm4ia4wah32rc2c87fqp"; depends=[caret e1071 nnet rmarkdown shiny]; };
-  MNLpred = derive2 { name="MNLpred"; version="0.0.3"; sha256="1cs2mnk10amhqgzmvrf7357g8yqsgljx9a7klcnb0bq4rwkpwcxx"; depends=[MASS]; };
+  MNLpred = derive2 { name="MNLpred"; version="0.0.4"; sha256="0kazydv6ln6vh5a1l72gg7v4v6j0pma7c3qxlfsgy6p73fhr5hxk"; depends=[MASS]; };
   MNM = derive2 { name="MNM"; version="1.0-3"; sha256="16b2yrm2kn943vzrr38qhk6qq20a842xv7iiln4is02csijxw2b3"; depends=[ellipse ICS ICSNP SpatialNP]; };
-  MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; depends=[MASS]; };
+  MNP = derive2 { name="MNP"; version="3.1-1"; sha256="0hzm048afxick1r8y26dj478mn9kwaww5v2s0b9ks1i01vbjakcl"; depends=[MASS]; };
   MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; };
   MOCCA = derive2 { name="MOCCA"; version="1.4"; sha256="0g70s7hnmrp4sm8gx49vsijj54y4amlcy6axc4k37k4c9g4sdics"; depends=[cclust class clue cluster]; };
-  MODIS = derive2 { name="MODIS"; version="1.2.2"; sha256="0yap72w9i8gc3513lh8m3zfp2cr3v9bw72wazqv5wg0lk61k2lhb"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; };
+  MODIS = derive2 { name="MODIS"; version="1.2.3"; sha256="03bl3a248cx3kd3szqy96vnz4sbccfnj755y6fq2b81ykpw5x47q"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; };
   MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; };
   MODISTools = derive2 { name="MODISTools"; version="1.1.1"; sha256="0188cffsnpy7nmb0c03i64674xyizx6imkymrwsj3mf9s77wa2v0"; depends=[httr jsonlite memoise raster sf]; };
-  MODIStsp = derive2 { name="MODIStsp"; version="1.4.0"; sha256="1jkq7c5sc0bdb4sgxinzdv43lh64psykvscl4fh3a8p052lyb96b"; depends=[bitops data_table gdalUtilities httr jsonlite leaflet mapedit mapview raster sf shiny stringr xml2 xts]; };
+  MODIStsp = derive2 { name="MODIStsp"; version="2.0.5"; sha256="0qrgb5gx550ybx6j8zvdjzrvrp02vigh5gp9iz3pa9mc24665ml4"; depends=[assertthat bitops data_table gdalUtilities geojsonio httr jsonlite raster sf stringr xml2 xts]; };
   MOEADr = derive2 { name="MOEADr"; version="1.1.1"; sha256="0aqkqw5ph5rvsgpasc94i264lxapr37gpjhk4rkkynph2gnvq1zx"; depends=[assertthat FNN]; };
   MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; };
   MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; };
@@ -2503,41 +2603,42 @@ in with self; {
   MOrder = derive2 { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; };
   MPBoost = derive2 { name="MPBoost"; version="0.1-3"; sha256="0fmyy4s2h7hjca6nww0bgcax7309nkqp295mpp8hl8yllz7ylmsm"; depends=[BH Rcpp]; };
   MPCI = derive2 { name="MPCI"; version="1.0.7"; sha256="1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa"; depends=[]; };
-  MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
+  MPDiR = derive2 { name="MPDiR"; version="0.1-19"; sha256="14bjb9c1v2si3gan1pfvvhmfa46q1qrn606sb4zvrqpfs8f7wil7"; depends=[]; };
+  MPGE = derive2 { name="MPGE"; version="1.0.0"; sha256="10lzkk8fhpxd1z4yp051q3k36fsvddrwssv7nn03r2bkp6q8rpzb"; depends=[car purrr]; };
   MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
   MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; };
   MPN = derive2 { name="MPN"; version="0.3.0"; sha256="0rrigkq5bkarncswv8kgvvwd1vrq5cqnb5vypa9d39q2ksqf8j3d"; depends=[]; };
   MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; };
   MPS = derive2 { name="MPS"; version="2.3.1"; sha256="08yzynznf33y7y3pf7fayks5hi3cdvzwzn8axg7aky5kvi2bfv22"; depends=[]; };
   MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; };
-  MPTinR = derive2 { name="MPTinR"; version="1.12.0"; sha256="0iv7hy0lmxadw34cq4gsb5i2my8lbvdfp23qadhiw6ca179hgamy"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
+  MPTinR = derive2 { name="MPTinR"; version="1.13.0"; sha256="16824bydfgm3wf63hrf9lwqwybdvrl3835pk8irl482y6v6x3h91"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
   MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.4-2"; sha256="0fjfj8jk0dk1s3jc9rl9kza6gm5pm6dgsqyk0aq7pir2hrsr3qwy"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; };
   MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; };
   MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; };
   MPsychoR = derive2 { name="MPsychoR"; version="0.10-8"; sha256="19gp2pjy8bllk4pbx139vcydnw04nldfqq9q7291vr5krylfjcqv"; depends=[]; };
-  MQMF = derive2 { name="MQMF"; version="0.1.0"; sha256="0pg120003zgnxw51agmfjzj8snkb19r1d4hyssxxl5y0ykxk1hn0"; depends=[MASS mvtnorm]; };
+  MQMF = derive2 { name="MQMF"; version="0.1.1"; sha256="0cbcmrgd3jvr2b95awklzsr694dqxgc5kk840r293qvhpsbxf27y"; depends=[MASS mvtnorm]; };
   MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
   MRFA = derive2 { name="MRFA"; version="0.4"; sha256="1ivzyp3q2nb6h5mhykina75ak7ajfw62rh23yr4pljma7gmr1hhm"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; };
   MRFcov = derive2 { name="MRFcov"; version="1.0.37"; sha256="1xh7zlnkr93bdgcfmfvrwjc3rj6mfqsxl2rpbzzm204q7n1dh502"; depends=[caret dplyr ggplot2 glmnet gridExtra igraph magrittr MASS Matrix mgcv pbapply plyr purrr reshape2 sfsmisc]; };
   MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; };
   MRHawkes = derive2 { name="MRHawkes"; version="1.0"; sha256="0qhwm708jijv1w6iml18bg7fc2igdcmydwpb9dzpa4gwwads8b78"; depends=[IHSEP]; };
   MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
-  MRPC = derive2 { name="MRPC"; version="2.2.0"; sha256="1ks23kf273khzidgxg6gzkynxlga8dybfcwfigli9wv0kcrzvdpx"; depends=[bnlearn compositions dynamicTreeCut fastcluster GGally graph gtools Hmisc mice network pcalg psych Rgraphviz sna WGCNA]; };
+  MRPC = derive2 { name="MRPC"; version="2.2.1"; sha256="02aa52gk0kflf21hzszsfvmwyvq8n21cxzraxqf1v6f1d41n2w89"; depends=[bnlearn compositions dynamicTreeCut fastcluster GGally graph gtools Hmisc mice network pcalg plyr psych Rgraphviz sna WGCNA]; };
   MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; };
-  MRReg = derive2 { name="MRReg"; version="0.1.1"; sha256="10ijb1814lfizc7gfhckvpqw8ajl2wc7hp0bfla7gc8c1qqhw60v"; depends=[caret ggplot2 igraph]; };
+  MRReg = derive2 { name="MRReg"; version="0.1.2"; sha256="18s9f61fgpmj5wwsg8q8w675mbg9ii4hngzh54bpbml44k3v91cf"; depends=[caret igraph]; };
   MRS = derive2 { name="MRS"; version="1.2.4"; sha256="1sksg70zb72ys1b7vi8amjaqarmdh8vf2l1rb0rasrlvrip3z3br"; depends=[igraph Rcpp RcppArmadillo]; };
-  MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.2.0"; sha256="0c5svjsnzbskj7i0l5p7j04gh9rjvw72f6yyazxwcb339vb5mf7z"; depends=[]; };
-  MRmediation = derive2 { name="MRmediation"; version="1.0.0"; sha256="1k9lknp0xd501x810lrnlrjshv79yvghs4l2clnx3m7zzkvxni5h"; depends=[fda MASS]; };
+  MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.3.0"; sha256="03c6jkanff241rcv1yixvmlnya3sd8hqpawf9dx9mpsri4pp6mdk"; depends=[]; };
+  MRmediation = derive2 { name="MRmediation"; version="1.0.1"; sha256="0v0kn6x4fwj35imj1fb2f2024ifb7081z4cwlhjmdxhabcy6xbx7"; depends=[fda MASS]; };
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MSCMT = derive2 { name="MSCMT"; version="1.3.4"; sha256="1vh0i9nxqiy3qdnb7z7cn5kpp2jahdmaqpnv7q5650pkswhwmfpc"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
   MSCquartets = derive2 { name="MSCquartets"; version="1.0.5"; sha256="0gfbawv7ib31pxmcj8ki67a72jqacm8nlizgk95yg7afjlqiyz8v"; depends=[ape phangorn RandomFieldsUtils Rdpack zipfR]; };
-  MSEtool = derive2 { name="MSEtool"; version="2.0.0"; sha256="0fssl4yanb4y9dw0b3gpibb362dmirzmq6m4bgfmm27anvpfjhsm"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; };
-  MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; };
+  MSEtool = derive2 { name="MSEtool"; version="2.0.1"; sha256="0d9kyz8gbax4g4hmnjgkq3j0rx67zhrw2fx7y4y60kjc6i299f7i"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; };
+  MSG = derive2 { name="MSG"; version="0.6"; sha256="19pckq41gyy4m97ag5q97lbdchl4fpx9xd8xv9r0jmlj66mz2dm7"; depends=[RColorBrewer]; };
   MSGARCH = derive2 { name="MSGARCH"; version="2.42"; sha256="1n5fvj6yx8sfi1vizw89410hc0d37w8mpqfsksdv01pgnfdcs11a"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
+  MSGARCHelm = derive2 { name="MSGARCHelm"; version="0.1.0"; sha256="172xpvs98b9ay44ffb8bp9k4zsjzhy92pp7bv3d1j186pqhl13ib"; depends=[forecast MSGARCH nnfor]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
-  MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
   MSMwRA = derive2 { name="MSMwRA"; version="1.3"; sha256="0b0fqfv6iick1brqik4rqz2936nfa51i6xlfavs65r9692wks73q"; depends=[]; };
-  MSPRT = derive2 { name="MSPRT"; version="2.1"; sha256="0c0hhpjpkx8yl5bxqn6nw747jli9fdzkwmi31lzr664r5xinxyf7"; depends=[doParallel foreach ggplot2 iterators nleqslv]; };
+  MSPRT = derive2 { name="MSPRT"; version="3.0"; sha256="0fvikvnf3fa4ski9idg8llxx33bgkrfj5sgkjn0d1dz30kgcx2w2"; depends=[doParallel foreach ggplot2 ggpubr iterators nleqslv]; };
   MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; };
   MSRDT = derive2 { name="MSRDT"; version="0.1.0"; sha256="1i35zsip6p177k9pnbmvkjdc1hpr6nclhbx2sfah95ls5v6xnzz8"; depends=[dplyr gtools reshape2]; };
   MST = derive2 { name="MST"; version="2.2"; sha256="0p833nyq9p0r0hy02f4sy6gv1wm9flj3dxkv73ihy8503r89bbzz"; depends=[Formula MASS partykit survival]; };
@@ -2548,7 +2649,7 @@ in with self; {
   MTAR = derive2 { name="MTAR"; version="0.1.1"; sha256="17r2da1hdvs8qvgar87zdl51jy8w30vczcsi6jrq0rdyi1lld641"; depends=[CompQuadForm MASS Matrix]; };
   MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; };
   MTLR = derive2 { name="MTLR"; version="0.2.1"; sha256="070121qn7vmxmxgvzv7ymhk19j9kxks4xa7qpd8vkc2rp3ara4cp"; depends=[Rcpp RcppArmadillo survival]; };
-  MTPS = derive2 { name="MTPS"; version="0.1.9"; sha256="125ja7wz8fz1w7hfxks7qs524vwk86rp459ahxw9cjnn1qxyv38k"; depends=[class e1071 glmnet MASS rpart]; };
+  MTPS = derive2 { name="MTPS"; version="1.0.1"; sha256="1jdlw943ywmrp64w1qrjqymqjh2jahnq0i5px8af1l3msznj20x4"; depends=[class e1071 glmnet MASS rpart]; };
   MTS = derive2 { name="MTS"; version="1.0"; sha256="09pypanjmqrvxbrrckydxyyswsgjx4nhb052x4llk7va9w4lbcjs"; depends=[fBasics fGarch mvtnorm Rcpp]; };
   MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; };
   MUACz = derive2 { name="MUACz"; version="2.1.0"; sha256="1d771vb2aimr87kyqj7zkmwarmxcxzbh7mvr396pf2zr3h8wi30c"; depends=[dplyr epiDisplay ggplot2]; };
@@ -2568,8 +2669,8 @@ in with self; {
   MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; };
   MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; };
   MWright = derive2 { name="MWright"; version="0.3.2"; sha256="1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q"; depends=[cubature]; };
-  MXM = derive2 { name="MXM"; version="1.4.8"; sha256="0hhiqsln7i14cbqkfs3dchf0w38hcs58pmfsxp983vnwphdv61sw"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; };
-  MaOEA = derive2 { name="MaOEA"; version="0.5.2"; sha256="1yaa8wr1gr1npqpls5g6mlr9dgjwiyvhk6p1dmjw29f7a4g2cam5"; depends=[e1071 gtools lhs MASS nnet nsga2R randtoolbox reticulate stringr]; };
+  MXM = derive2 { name="MXM"; version="1.4.9"; sha256="14iksg94dc2bqfdjhj83z1zxwj67zsqn4rj0f1g59fj7843z4k6s"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; };
+  MaOEA = derive2 { name="MaOEA"; version="0.6.2"; sha256="0s8jvp7821mb6xff8xwnh78mhz4qfrbk4g7sp4dfnm2ii7ah9c6b"; depends=[e1071 gtools lhs MASS nnet nsga2R pracma randtoolbox reticulate stringr]; };
   MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
   MachineShop = derive2 { name="MachineShop"; version="2.5.0"; sha256="0awx838zjb2n2b9r32cx9h1cvg3h4x57xsif9hskjp5mba9pk78x"; depends=[abind dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline progress recipes rlang rsample Rsolnp survival tibble]; };
   Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
@@ -2582,23 +2683,23 @@ in with self; {
   Map2NCBI = derive2 { name="Map2NCBI"; version="1.4"; sha256="1ssqnm9g5p0nnhdyp9dqbbsz3hw8jzdwy0rv3csp8fxm0f1bi1kb"; depends=[rentrez]; };
   MapGAM = derive2 { name="MapGAM"; version="1.2-5"; sha256="0ardqsa7smx0syh1l591bm6a1rb7kvcyw3rlb3hkfk8rk4k60qmr"; depends=[colorspace gam maptools sp survival]; };
   Mapinguari = derive2 { name="Mapinguari"; version="1.0.0"; sha256="1jfqinfr6wkpmkp4jm9ixgawcywm3n1ni03h6zngvx74saz7kd3g"; depends=[dplyr magrittr raster rgdal rlang stringr testthat]; };
-  MareyMap = derive2 { name="MareyMap"; version="1.3.5"; sha256="1k7hnfrlpj06k8v93xsvph0hwy5f99swg5gw07sn85nls03jdnak"; depends=[tkrplot]; };
+  MareyMap = derive2 { name="MareyMap"; version="1.3.6"; sha256="0zbg72vck9p14zk1924407n5ap84qiisqhbq1vr715sw67fwdcxi"; depends=[]; };
   MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; };
   MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; };
   MarketMatching = derive2 { name="MarketMatching"; version="1.1.2"; sha256="0i3wccclrl7lixny24jif0xvmf6lgmwsgqxc6h5c3mv405cp0h1r"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; };
-  Markovchart = derive2 { name="Markovchart"; version="1.0.6"; sha256="1r1rxsrdil7jxmhfzk8s4rqqs3v97kfvynbh5qa62g14acafm615"; depends=[doParallel foreach ggplot2 metR optimParallel]; };
+  Markovchart = derive2 { name="Markovchart"; version="1.1.1"; sha256="0w15a19b35hah3zjbncgw4bq8ki1wdd86r90y1pr9fhw4vgmc1w2"; depends=[doParallel foreach ggplot2 metR optimParallel]; };
   MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.2"; sha256="0p234zs7lvi83fv02mijrhp7hmr5cklddayb61krhx1h2hn4gzb9"; depends=[gtools matrixcalc]; };
   MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; };
   Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; };
   MasterBayes = derive2 { name="MasterBayes"; version="2.57"; sha256="0f8rc6799nji03slal27gbmprndy3dby0hhsmg2rm9l4ki44vz2y"; depends=[coda genetics gtools kinship2]; };
   MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; };
   MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; };
-  MatTransMix = derive2 { name="MatTransMix"; version="0.1.10"; sha256="12zd0wgpphnv0j8fw437kilcnmci2wjv046jbzhfa48s9n6xc4rz"; depends=[]; };
-  MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; };
+  MatTransMix = derive2 { name="MatTransMix"; version="0.1.12"; sha256="0ygs4xnhkp50xb8238h3gis87z17ahvl0ywxysbiz26mnn751j5y"; depends=[mvtnorm]; };
+  MatchIt = derive2 { name="MatchIt"; version="4.1.0"; sha256="18bvk73mf70a8r9js2mg8fn0yj0i1d1xaj8qg1mhrdygp35nfixk"; depends=[backports Rcpp RcppProgress]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.3"; sha256="1si0zn6vlgyj08841hfjx8an96a8ipnawl4zbalabmpy7r5bfwx8"; depends=[Hmisc Matching]; };
   MatchThem = derive2 { name="MatchThem"; version="0.9.3"; sha256="05m141qn0a9ahraga1lpcjffbddmm70bx9m3javrr9727nnar9wf"; depends=[broom dplyr MatchIt mice survey WeightIt]; };
   Matching = derive2 { name="Matching"; version="4.9-7"; sha256="0vgw0nm40bicda2nwgklc27qsjxbqbjpl9yd28hqxj71xfsyqmhr"; depends=[MASS]; };
-  Matrix = derive2 { name="Matrix"; version="1.2-18"; sha256="06b1rc1vq65b271f2wpzhqkvhng8hwwnvjflzxkng50i52603zzp"; depends=[lattice]; };
+  Matrix = derive2 { name="Matrix"; version="1.3-0"; sha256="1hkxzxdqdlbxf3ai371amrj9s4b0fyibf5j9jdc00k1m2zwr3nl7"; depends=[lattice]; };
   Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.8"; sha256="0a5fq1scykqk0kc9j051j6fix6j2dqwz5wbgb0amaxsiywz9vigb"; depends=[grr Matrix]; };
   MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.4"; sha256="1p98ixz81swvf6d934h4djpgbi46x1hwbhrbxap5ywidplfi322i"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; };
   MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.3"; sha256="10r6h5bidj44kfbwiml9pkysbikqphfb21ig61qnx0qa12xcl6l8"; depends=[]; };
@@ -2608,35 +2709,35 @@ in with self; {
   MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; };
   MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; };
   MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; };
-  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.4"; sha256="06db5xmcimqd0c5kwm2yavrs6dmb5qaflz3wavjhcxdzmhf4lpwh"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang rvest stringr tibble xml2]; };
+  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.6"; sha256="02qk8xlrvkpd36hx92yn1162ggfg6y0w6xxivw22wpzbq8mc7inn"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang rvest stringr tibble xml2]; };
   MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.1.6"; sha256="187lrpc9z3k4jnd1nvqsb0qibz9xz9i1i61vssqm72h1hx1j9j6f"; depends=[digest dplyr geodist httr lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr revgeo rlang stringr]; };
-  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; };
+  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.7.3"; sha256="1ckgsrjy1vxk4zf7p8fw25bb7hw59262pwfmk7414mv7xi4fij2g"; depends=[cleangeo countrycode dplyr magrittr MazamaCoreUtils rgdal rgeos rlang rmapshaper sp stringr tidyr]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
   Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; };
   MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; };
   MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.1"; sha256="11q1yn6l697qa33wqik9y9lji39r6pph109yxkkprg9p80c187xy"; depends=[]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
-  MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.2.0"; sha256="1cxnni1j827pz3v9wb7l15acn9phxs86xxv1031vi5abmal5ngbp"; depends=[lavaan Matrix survey]; };
+  MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.3.0"; sha256="11lkli2arl5w2aizzd93fb6xsy30000nf3qc08qirrm07rwypaly"; depends=[lavaan Matrix survey]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
-  Mega2R = derive2 { name="Mega2R"; version="1.0.7"; sha256="1x93jf3p1yifw9avhpd2lkm7grc7r655f8jbnhypms4a7nz8fjyi"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; };
-  MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.3"; sha256="0k90mbidynw8jxm4xr6ys86q7965v27a9z1y8fb07xiqpck1dann"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; };
-  Mercator = derive2 { name="Mercator"; version="0.10.0"; sha256="04hfcg85vs7gkbbgbsymv7xadzzm2rvypw5awnxrnfmdhwn9r9bk"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; };
+  Mega2R = derive2 { name="Mega2R"; version="1.0.8"; sha256="1p81p371r721wcfz3qrc9l2bbk0v91csgqc961dx2sl7llhmj1fr"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; };
+  MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.5.0"; sha256="00gygggy0yl1qby5xdb8g7z8jllrxf4jwksy8a640qpv5v84r6al"; depends=[ggplot2 glmnet iterpc knitr Matrix plotly quantreg rjson rmarkdown robustbase]; };
+  Mercator = derive2 { name="Mercator"; version="0.11.5"; sha256="0lv1gj0dfh37613gapm0mr1vxj5vsnfyvfqilkmpkjnz0gyd0ay5"; depends=[ClassDiscovery cluster dendextend flexmix igraph KernSmooth Polychrome Rtsne Thresher]; };
   MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
   MetFns = derive2 { name="MetFns"; version="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; };
   MetGen = derive2 { name="MetGen"; version="0.5"; sha256="00yzaicrpwfnxi5mdzwx1ai721vczkkf2yl50q9wwpxhmfx0xbbh"; depends=[chron glmnet MASS]; };
   MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; };
   MetProc = derive2 { name="MetProc"; version="1.0.1"; sha256="1z6538pij1rq5wv9s8rjcn0sck15y26asv4vamav8a6s4135ia3q"; depends=[fastcluster gplots]; };
   MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; };
-  MetaClean = derive2 { name="MetaClean"; version="0.1.0"; sha256="0nd5da7gg28dfmhjnzm90z8y7nkl9scg847rqj5h18hm7hp8gy4h"; depends=[BiocStyle caret fastAdaboost ggplot2 graph kernlab klaR knitr MLmetrics plotrix randomForest reshape2 Rgraphviz rpart xcms]; };
+  MetaClean = derive2 { name="MetaClean"; version="1.0.0"; sha256="12vgdizggyz6wx08qf34jfhwgpzfrkgq63fvhfgi5gbf1nhma5zz"; depends=[BiocStyle caret fastAdaboost ggplot2 graph kernlab klaR knitr MLmetrics plotrix randomForest reshape2 Rgraphviz rpart xcms]; };
   MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.2.0"; sha256="1lh1msrcz70p5jixz5j83pqa3cid21y7m1zvlk872k16awmif00k"; depends=[gnm]; };
+  MetaDBparse = derive2 { name="MetaDBparse"; version="1.0.0"; sha256="166z1zmrs19ngcdqdxzpdshqvrk8pxx1rlr1harjbzyh0bv3pv46"; depends=[ChemmineR cmmr data_table DBI enviPat gsubfn Hmisc httr jsonlite KEGGREST openxlsx pacman pbapply progress R_utils rcdk RCurl Rdisop readxl reshape2 rJava RJSONIO rlist RSQLite rvest SPARQL stringi stringr webchem WikidataQueryServiceR XML xml2 zip]; };
+  MetaIntegration = derive2 { name="MetaIntegration"; version="0.1.1"; sha256="0dsc6s8msi08rz7j8jbjd0p2wa3xsfriyxi6r42dhfd21bfcsw7v"; depends=[corpcor knitr MASS Rsolnp]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.3"; sha256="1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; };
   MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.7"; sha256="1vcwfrw20mjyf926zix530zzr0yw4yydg0i5r5rpddygbz5szd6g"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
   MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.8"; sha256="0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; };
-  MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
   MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; };
-  MetaSKAT = derive2 { name="MetaSKAT"; version="0.80"; sha256="1hkkirbxl17v7sdbj4646fijlwvdw3p10h97r9h46cw6cn77v5gq"; depends=[SKAT]; };
   MetaStan = derive2 { name="MetaStan"; version="0.2.0"; sha256="035qmzkijaql5d9h1a83p535gihy4bbv9n839q9kpp0l05mdwgwm"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; };
   MetaSubtract = derive2 { name="MetaSubtract"; version="1.60"; sha256="19xg95g2qgyi90pz3733l596gzdj6dmb0k9i4qmhaq4yck69rrhj"; depends=[]; };
   MetaUtility = derive2 { name="MetaUtility"; version="2.1.0"; sha256="1lbqqh56pwxlcksv0kf463hc20jb4rkjqkcqal000rzyzd4bi2zj"; depends=[dplyr metafor purrr stringr]; };
@@ -2644,7 +2745,6 @@ in with self; {
   MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; };
   MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; };
   MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3.1"; sha256="070qws759nczjrfdlh7jpbyjz4z3zm1hzb7vcvfgfks82wwb2ny0"; depends=[ellipse gplots gtools mclust mvtnorm]; };
-  MetabolicSurv = derive2 { name="MetabolicSurv"; version="1.1.0"; sha256="0pi3pdl1wz8lbj47d0rvgrrdc72bffjf9q07dp92qx2857pppwz8"; depends=[ggplot2 glmnet gplots matrixStats pls Rdpack rms superpc survival survminer tidyr]; };
   MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.1"; sha256="13q8s96s71g7nyr6mi5q7jwmf4vx3pcr8l9ixqlc8hglnkd0y6rk"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rlang ropls rpart]; };
   MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; };
   Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; };
@@ -2658,7 +2758,7 @@ in with self; {
   MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; };
   MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; };
   MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; };
-  MiRKAT = derive2 { name="MiRKAT"; version="1.1.0"; sha256="15ah3zgf67sv0rxw99qvxsfbivni5pkcrmqhf0c3656bjwb397hd"; depends=[CompQuadForm ecodist GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; };
+  MiRKAT = derive2 { name="MiRKAT"; version="1.1.1"; sha256="0qzfqc26ryngr1iar96a36z4skph7ddjq0nxbbznxhrz6kihyqzi"; depends=[CompQuadForm GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; };
   MiRNAQCD = derive2 { name="MiRNAQCD"; version="1.1"; sha256="0bxzgk1jiw5jdl39pqm63bggpf7bsav6pj2nyyi59sshbrk7c104"; depends=[ggplot2 pROC]; };
   MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
   MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; };
@@ -2667,22 +2767,22 @@ in with self; {
   MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; };
   MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; };
   MicroNiche = derive2 { name="MicroNiche"; version="1.0.0"; sha256="166ci4crkwnnh05rhs5hyrljgm4cdf7gp0ff8kjxjmd60byw80mz"; depends=[ggplot2 reshape2]; };
-  MinBAR = derive2 { name="MinBAR"; version="1.1.1"; sha256="12a44lpcpdwf39dfqcng5l253gp54znvv083hzm9xqa3fbrbypca"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; };
+  MicroSEC = derive2 { name="MicroSEC"; version="1.1.3"; sha256="1imdxm15f792xw5kc9lhry5jsw739j6y3f2fs64abj22hqxfwypi"; depends=[BiocGenerics Biostrings data_table dplyr GenomeInfoDb GenomicAlignments gtools magrittr openxlsx R_utils Rsamtools stringr tidyr]; };
+  MinBAR = derive2 { name="MinBAR"; version="1.1.2"; sha256="099afazil0gfs5yq92clc7ahis5azyvlql4zs7fhp82v9m6b80qj"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; };
   MinEDfind = derive2 { name="MinEDfind"; version="0.1.3"; sha256="1y0iv92mp7hf14vrj54qd0yvmjrv52jv3vg25kc5q7pml63njkqa"; depends=[ggplot2 gridExtra Iso]; };
   MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
   Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
   Minirand = derive2 { name="Minirand"; version="0.1.3"; sha256="19lib0qh3xfzvpgsskl3yypmjygss0w7pimz0136av0px5b4jran"; depends=[]; };
-  MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
   MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; };
   MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.3.0"; sha256="0lp3jazmcg90gp019djr4xx8zwxrrmjidp53rc2v7s122razn9lr"; depends=[stabledist]; };
   MixAll = derive2 { name="MixAll"; version="1.5.1"; sha256="1jsh29ygy1n7lbz93ks725li9hnvfa0kp1qik13m72nmgw7g7q5a"; depends=[Rcpp rtkore]; };
-  MixGHD = derive2 { name="MixGHD"; version="2.3.3"; sha256="16x8pq077w8ikksypr9szy863pwcfzmfa9f13pssb61x7yyqfa2f"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
+  MixGHD = derive2 { name="MixGHD"; version="2.3.4"; sha256="06h4sa5ws2ng87c9sqc0fl9psmk78gy2lxbxvspab1v1i636dq3j"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
   MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; };
   MixMatrix = derive2 { name="MixMatrix"; version="0.2.4"; sha256="1bmd99p98brp8nzqhf442py2hmdj2vnzn15qwhrdskh6i0gzaqc4"; depends=[CholWishart Rcpp RcppArmadillo]; };
   MixOptim = derive2 { name="MixOptim"; version="0.1.2"; sha256="14blyb1dqbdb14rby4nrggpqdx6b43lbb2xwi3059biq9mrj3a2x"; depends=[desirability ggplot2 patchwork rlang]; };
   MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; };
   MixSAL = derive2 { name="MixSAL"; version="1.0"; sha256="15dymyzfs3bwskaf6xndj291g6nhw7k1q93y1cba55a6fdjh5qz9"; depends=[MASS]; };
-  MixSIAR = derive2 { name="MixSIAR"; version="3.1.11"; sha256="1zv5qxbh5vs814r5x33nq5z42m43v9qgvin0q2fdi7gd87hyrpad"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 splancs]; };
+  MixSIAR = derive2 { name="MixSIAR"; version="3.1.12"; sha256="07wiv7x2c9mhqk37zndxvdb76m9shizc48qz2bp2f4g5z9hciid7"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 splancs]; };
   MixSim = derive2 { name="MixSim"; version="1.1-3"; sha256="1mrzbax2inpmhxz26zlybci6ks5q780f10vcy1za638dmkz16fnv"; depends=[MASS]; };
   MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; };
   MixedPsy = derive2 { name="MixedPsy"; version="1.0.0"; sha256="19cgw82jdkcpkca90bab1k5gcb2prlxm634n4m7yx0p0mj736fha"; depends=[beepr boot brglm lme4 Matrix mnormt]; };
@@ -2691,7 +2791,7 @@ in with self; {
   MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; };
   MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; };
   MoBPS = derive2 { name="MoBPS"; version="1.4.87"; sha256="0wzmb02d9b49jrz8a4z28yri2zd8dh016an46h2dkmykr1asxg95"; depends=[]; };
-  MoEClust = derive2 { name="MoEClust"; version="1.3.1"; sha256="1jl0zc6jiay8xmbdjiyyhx7qcq60n1w37kfb6hriajr3phr0ilv8"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
+  MoEClust = derive2 { name="MoEClust"; version="1.3.2"; sha256="1mmhf5pl2c9x2fvpq1jj5q3ifj6xgs8f1fsdqs7qvhbwxk3bk0hc"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
   MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; };
   MoMPCA = derive2 { name="MoMPCA"; version="1.0.0"; sha256="049byaiwxl3h05pvwv9jj94g7dk2nrnba7qgx76hwwfbamvk6n5x"; depends=[doParallel dplyr foreach magrittr Matrix slam tm topicmodels]; };
   MoTBFs = derive2 { name="MoTBFs"; version="1.4"; sha256="1b69wzsy0wnzgbk04x363wb1dfnxz610sn8d28cn2akvf7n8na70"; depends=[bnlearn ggm lpSolve Matrix quadprog]; };
@@ -2703,25 +2803,26 @@ in with self; {
   ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.2"; sha256="0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy"; depends=[data_table Rcpp]; };
   Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; };
   Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
-  MomTrunc = derive2 { name="MomTrunc"; version="5.89"; sha256="0r6p28h2b348l8rr75yp760k18kvan0sns6lmcdbq9r34rmbsc90"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; };
-  Momocs = derive2 { name="Momocs"; version="1.3.0"; sha256="149q4qyplgvcvscg7846m0cjagvby3rj40g9bpx6kvd67arfrl6y"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp vegan]; };
+  MolgenisAuth = derive2 { name="MolgenisAuth"; version="0.0.14"; sha256="0b9k1l66v30hcblbw9m3ylscx8fd4i51d8iggmm0l0gclnkbs5df"; depends=[httr urltools]; };
+  MomTrunc = derive2 { name="MomTrunc"; version="5.91"; sha256="055llc2q32vybk16bkpy9x6na2asrjjhg2d9j489jdv9cn3n5w9s"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; };
+  Momocs = derive2 { name="Momocs"; version="1.3.2"; sha256="1rjfq4vp5n8352v9yqaflcrzj3ysanzbacvx0qzj5k50my7grnhg"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp tibble vegan]; };
   Mondrian = derive2 { name="Mondrian"; version="1.1.0"; sha256="1x40cdry6dwixwqx10kv42xr4254kj1f17va186haw9m949xn5gd"; depends=[RColorBrewer]; };
   MonetDB_R = derive2 { name="MonetDB.R"; version="2.0.0"; sha256="0b5flc9l4nshy2fmwxbzcsn7pdivwy3x6kic94ppyyiqzz41h0b1"; depends=[codetools DBI digest testthat]; };
   MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; };
   MonoPoly = derive2 { name="MonoPoly"; version="0.3-10"; sha256="0ls3sjfkinp9c5002ww0xm4l2galf20w2f45nm5irkk9sbqas0jq"; depends=[quadprog]; };
   Monte_Carlo_se = derive2 { name="Monte.Carlo.se"; version="0.1.0"; sha256="1d5gp4wvpvrlp82g8k8v668mzhmdlk2pvky34v7hxysap9xgmsqr"; depends=[]; };
   MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.6"; sha256="1jwq3by8zfy6sbzahcj5l0vicqn7yyqpb7xhfsaymfspm7xyq6pj"; depends=[abind codetools reshape rlecuyer snow snowfall]; };
+  MonteCarloSEM = derive2 { name="MonteCarloSEM"; version="0.0.1"; sha256="0r6slgm7ka0flpzw0gzrdgjs27sf9757jbx2jsh5fjqfndzsz12j"; depends=[lavaan Matrix]; };
   Morpho = derive2 { name="Morpho"; version="2.8"; sha256="080ix1j0r67l0y66zq4xzfl8lhd3q4y4hzmmxphxkhmx83rhsik0"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortCast = derive2 { name="MortCast"; version="2.3-0"; sha256="0jdfmwz2yd81dz8ks9f79wz5az6j59skvf3cp1rv2122bg5wl7n2"; depends=[wpp2017]; };
   MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; };
-  MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.4"; sha256="0sgxkw9f8s3iv6x2clsx6505wjflg6xa3w19m4q6gz8fkbh2sxfv"; depends=[minpack_lm pbapply RCurl tidyr]; };
-  MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
-  MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; };
-  MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-3"; sha256="0sidvznbknc4pdk4w6izpizap2yvbzxbjnmnrxmwj45ypm9pjpqc"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; };
+  MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.5"; sha256="1kkf2blrv68s7rjcmcq6nbaxlizxqnrsy69cqk077ga0arlzjq1i"; depends=[minpack_lm pbapply RCurl tidyr]; };
+  MortalityTables = derive2 { name="MortalityTables"; version="2.0.2"; sha256="1i2qgk772qyp9mcsrrv7cjwr6afw0fjid26073c1gi1rssifhvib"; depends=[ggplot2 pracma scales]; };
+  MplusAutomation = derive2 { name="MplusAutomation"; version="0.8"; sha256="08k8c4h17k21g9gxj2hwg59dyny7j80kjk7086rgwq9lhqf022y9"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; };
   MplusTrees = derive2 { name="MplusTrees"; version="0.1.1"; sha256="1s119p1fgr27rkh671zpzbfnd368m0s1607r8xwgjm0y5ncxwkv7"; depends=[MplusAutomation nlme rpart rpart_plot]; };
   Mqrcm = derive2 { name="Mqrcm"; version="1.1"; sha256="15pxrh5i8pm6ckp44mlgq1ld5b1y9kg6vjvis5k812h64gm3aizq"; depends=[Hmisc pch]; };
-  MrSGUIDE = derive2 { name="MrSGUIDE"; version="0.1.1"; sha256="09r5dqi4a9fc9hszjwqz0ry96jp80g1f2ibnq3zdngicp3gpm1x9"; depends=[BH magrittr Rcpp RcppArmadillo yaml]; };
+  MrSGUIDE = derive2 { name="MrSGUIDE"; version="0.1.2"; sha256="1hd0lvvy12r6kxa64vwnjavyv2f7a9jqgjxgmlw86wwh5g09hvfd"; depends=[BH magrittr Rcpp RcppArmadillo yaml]; };
   MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; };
   MtreeRing = derive2 { name="MtreeRing"; version="1.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; };
   MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; };
@@ -2759,17 +2860,18 @@ in with self; {
   Myrrix = derive2 { name="Myrrix"; version="1.2"; sha256="05x2h4ppjhfm0wlpwyp8ycjg59qj3gv0yqdilxrzb1lkrzln92xb"; depends=[Myrrixjars rJava]; };
   Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; };
   N2H4 = derive2 { name="N2H4"; version="0.5.7"; sha256="0wpwcv17jvrjgvr0qhjrjr1i2rdxcga49c1c6m7s58p9wmdi8fg2"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; };
+  N2R = derive2 { name="N2R"; version="0.1.1"; sha256="1wjz145d5v1ml2zyvw2znvv550sn6cm7c3rdshg450f7c4j7qyp8"; depends=[Matrix Rcpp RcppEigen RcppSpdlog]; };
   NACHO = derive2 { name="NACHO"; version="1.0.1"; sha256="14xifjfrrpf7mwjqzk9vqnd6hhxf4xm558j7hspjsr5gg0nq6ps6"; depends=[cli crayon dplyr ggbeeswarm ggforce ggplot2 ggrepel knitr magrittr purrr rlang rmarkdown rstudioapi scales sessioninfo shiny shinyWidgets tibble tidyr]; };
   NADA = derive2 { name="NADA"; version="1.6-1.1"; sha256="0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7"; depends=[survival]; };
+  NADIA = derive2 { name="NADIA"; version="0.4.0"; sha256="09ykmvk72j78ypcgfdiwknik83pk3wn1mvlhsvlj227rff16hj2x"; depends=[Amelia data_table doParallel foreach glmnet mice missForest missMDA missRanger mlr3 mlr3learners mlr3pipelines paradox softImpute testthat VIM]; };
   NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; };
   NAM = derive2 { name="NAM"; version="1.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; };
-  NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
   NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
   NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; };
   NBAloveR = derive2 { name="NBAloveR"; version="0.1.3.3"; sha256="0k1f14srzks26x5wnhj8mrfwcq7wgbywcklr804lxsh04h4d6pwp"; depends=[dplyr magrittr tidyr]; };
   NBBttest = derive2 { name="NBBttest"; version="1.0.0"; sha256="165j4smwqz4yra3946nd7ssgfwf7wjpysn22yj0bml36qk9y6vs7"; depends=[gplots gtools]; };
   NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; };
-  NBDesign = derive2 { name="NBDesign"; version="1.0.0"; sha256="15iwrhwpx2c72xg2jk743qgm85vfv4yhyi5i6pm84ya8drsij70p"; depends=[MASS PWEALL]; };
+  NBDesign = derive2 { name="NBDesign"; version="2.0.0"; sha256="0593rh2lf8wlxzjmwh2xx3jsb6miqx0wipqw9di10cbxbf6binb1"; depends=[MASS PWEALL]; };
   NBLDA = derive2 { name="NBLDA"; version="1.0.0"; sha256="0sw84h1mgzhr6vmvxi4smk57r4gplg3kxq38gydcy6ckv2g8nzz2"; depends=[ggplot2]; };
   NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; };
   NBR = derive2 { name="NBR"; version="0.1.3"; sha256="1bh1xwr80qz7qvk3m5ilk9ci03wmjb1bm8qq8kzbg35six6n4har"; depends=[nlme]; };
@@ -2784,10 +2886,11 @@ in with self; {
   NDP = derive2 { name="NDP"; version="0.1.0"; sha256="0wmld7g4w3d7d8lyj4132h3jpr8ng8kpy4ssqjp8r0lqwif2i86b"; depends=[rmarkdown shiny]; };
   NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
   NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; };
+  NFLSimulatoR = derive2 { name="NFLSimulatoR"; version="0.2.1"; sha256="18rq5h1lwdkywr035gasm2gyvc0nlnq5i4m892rp29xwh7avy6kc"; depends=[data_table progress]; };
   NFP = derive2 { name="NFP"; version="0.99.3"; sha256="18alq3nb47jyz0dh54y536a0igkfbh2x5nf2jxryfnizr47qc3a5"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; };
   NFWdist = derive2 { name="NFWdist"; version="0.1.0"; sha256="0833lg0pd763awrc6ibidwf2ldl79w9lmm5acq4bnpd2hzsx60l8"; depends=[]; };
   NGBVS = derive2 { name="NGBVS"; version="0.2.0"; sha256="1k7m7wy54irqci6ccclpylbmz0613ha7r531cji99jb7nkpzl6l0"; depends=[Rfast]; };
-  NGSSEML = derive2 { name="NGSSEML"; version="2.0"; sha256="0pl40dhjr28b4lbbi758n669k484q7diljbp5095gvzbd71pdh02"; depends=[car dlm fields interp mvtnorm]; };
+  NGSSEML = derive2 { name="NGSSEML"; version="2.1"; sha256="0fjpq1nqqh4wbi2xzybz07x48d1nmwm25n93gj7znf7dm8qanxqs"; depends=[car dlm fields interp mvtnorm]; };
   NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; };
   NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; };
   NHMM = derive2 { name="NHMM"; version="3.11"; sha256="1ynxk4dpllb3w8229dmxzjdmf0zh5cgmh3wa55d02disc6yhm77k"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; };
@@ -2800,7 +2903,7 @@ in with self; {
   NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; };
   NITPicker = derive2 { name="NITPicker"; version="1.0.1"; sha256="00jmin7y1bp7a4a1qcvv3rkgiy9qij7gbkxcdgpiyzcs6aaif59z"; depends=[fda fda_usc fdasrvf]; };
   NLMR = derive2 { name="NLMR"; version="1.0"; sha256="0i5whvr42mizkv37fa4am81sfq58fsz9rnrhjlig4id9nddm6m9x"; depends=[checkmate dplyr fasterize RandomFields raster Rcpp sf spatstat tibble]; };
-  NLP = derive2 { name="NLP"; version="0.2-0"; sha256="0xbhkrnxcbf322jfw31xcn4y2gnk5y7ccq1bz4h3prf44h0whr7w"; depends=[]; };
+  NLP = derive2 { name="NLP"; version="0.2-1"; sha256="1dpj04fmld2lnhg072ahgjbhmciqqy9h1lrz0wf32mr7mm9s9sh5"; depends=[]; };
   NLPclient = derive2 { name="NLPclient"; version="1.0"; sha256="0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35"; depends=[curl NLP xml2]; };
   NLPutils = derive2 { name="NLPutils"; version="0.0-5"; sha256="1jxxly85iajzb9qckkkar0przyxv005cyvry0qi5dkzhbyl5k490"; depends=[NLP qdap SnowballC]; };
   NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
@@ -2809,11 +2912,12 @@ in with self; {
   NMF = derive2 { name="NMF"; version="0.23.0"; sha256="0ls7q9yc9l1z10jphq5a11wkfgcxc3gm3sfjj376zx3vnc0wl30g"; depends=[Biobase BiocManager cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
   NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
   NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; };
-  NMOF = derive2 { name="NMOF"; version="2.1-0"; sha256="10dxy35ps8qmyfqhrz0g1yyc30d84wwmf084m94nv0pk87blw7s3"; depends=[]; };
+  NMOF = derive2 { name="NMOF"; version="2.2-2"; sha256="0hj6yb32s79a65192jk4i77780bmgms57xsxldwxgw13j3w74i76"; depends=[]; };
   NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; };
   NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; };
-  NNS = derive2 { name="NNS"; version="0.5.4.3"; sha256="1g13h12n2mgnzkq65nrw0s3jayjwyd2z1f3229n25nq29fwca7dy"; depends=[data_table doParallel dtw meboot Rfast rgl stringr tdigest]; };
+  NNS = derive2 { name="NNS"; version="0.5.6"; sha256="1whq73gl9s0h5nr380s0swv3479synvxbvlc2vsnzxq65nd5qhv1"; depends=[caret data_table doParallel dtw meboot Rfast rgl stringr tdigest]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
+  NNbenchmark = derive2 { name="NNbenchmark"; version="3.1.6"; sha256="188x3j339ljc7lg665x3zv0azdvdcd7h4wv2fdvwhwv2gzi887ry"; depends=[pkgload R6]; };
   NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; };
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
   NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.2"; sha256="0fxcs2l6g1gkvydl04ippkq192jn0zl2c304ww4hczzpvn7l8lsp"; depends=[Rcpp]; };
@@ -2824,27 +2928,28 @@ in with self; {
   NPHazardRate = derive2 { name="NPHazardRate"; version="0.1"; sha256="0na4iphva1dadz457ii8kxrhnki2asaxpbwr824rljyrldj9rcgg"; depends=[survival]; };
   NPMLENCC = derive2 { name="NPMLENCC"; version="1.0"; sha256="1l11vczs7ijfpqv7i7j8c5sxyfcbipqx00lf75i2c0kf21njv1vx"; depends=[MASS survival]; };
   NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; };
+  NPMLEmix = derive2 { name="NPMLEmix"; version="1.2"; sha256="056jb3kz34lajryfbzkhq0g372iib6h8mr74mq18xkarp5blgmsl"; depends=[CAMAN dplyr FDRreg Hmisc latexpdf Matrix mosaic pbapply pracma progress R_utils Rcpp REBayes Rmosek spatstat]; };
   NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
   NPP = derive2 { name="NPP"; version="0.2.0"; sha256="0zm67b9gs32snsd1knmdmz0ksksdin9cvqrqd94n7g378gdql96y"; depends=[]; };
   NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
   NPflow = derive2 { name="NPflow"; version="0.13.3"; sha256="1bgdkm82pmzjv46pkxpvh5ffffmc6q68x5jjl7k330w9vwgx2kf0"; depends=[ellipse fastcluster ggplot2 pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
   NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
   NRejections = derive2 { name="NRejections"; version="1.2.0"; sha256="0lzj7kyn4s8l306a6xwkgkv1z4dlfsr61i902lvdxv4ln4m6a5kq"; depends=[doParallel foreach matrixcalc mvtnorm StepwiseTest]; };
-  NSM3 = derive2 { name="NSM3"; version="1.14"; sha256="0w6ls6k3m395wka6zl64i0nvxjm9c6b3yyd80f6k9k14lmgivm8p"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
+  NSM3 = derive2 { name="NSM3"; version="1.15"; sha256="1ss4gkswb6qr58v1pm9b77qllpn9ks9xq5faiixvmbijjz3kkbj2"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
   NSO1212 = derive2 { name="NSO1212"; version="1.1.0"; sha256="0agsabhdx3il284ycycqq9jhkin513ygsfdbjx5l3h88smy8i7f2"; depends=[httr jsonlite]; };
-  NST = derive2 { name="NST"; version="2.0.4"; sha256="0kwdfqr30av50k1s8sdf7714kzq9z1qrg85c3r7ljzrajj16vnl3"; depends=[ape permute vegan]; };
+  NST = derive2 { name="NST"; version="3.0.3"; sha256="13ki87gkrxczd45kx7bn37sk7r7bgvrs9ysz9ya6mmvc2nab6gpn"; depends=[ape bigmemory iCAMP permute vegan]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
   NScluster = derive2 { name="NScluster"; version="1.3.4"; sha256="1bkzmm573ic6xrsqbbln865rfw2xnmby632m3jcgamddxppx3fjf"; depends=[]; };
   NTS = derive2 { name="NTS"; version="1.1.2"; sha256="02gh9yqflwgqws7a14wwb1y7qx0whw4ss1kkfgh9jp6bxc2dclnf"; depends=[dlm MASS MSwM Rdpack tensor]; };
   NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; };
   NVCSSL = derive2 { name="NVCSSL"; version="1.0"; sha256="00dpi0b0zm5cfkyb2z8wfkw6xcax2kkplm9rzkvfjz7fchlmkx5r"; depends=[grpreg Matrix plyr]; };
   NameNeedle = derive2 { name="NameNeedle"; version="1.2.6"; sha256="0cs65hs6fbkxv8pc2m4394c68nqbahjcryjnhhrhg50wam3y03lq"; depends=[]; };
-  NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; };
+  NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1.1"; sha256="1c2w129mz0linnc959h11zyhm8kyfmifwnbyi75iinqs373kv7vw"; depends=[gdata vsn XML]; };
   NatureSounds = derive2 { name="NatureSounds"; version="1.0.3"; sha256="0db7y6213bkmfjr2r3jkdbx0wja778cgnavap03v7fswrl61w61m"; depends=[knitr tuneR]; };
   NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; };
   NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; };
+  Neighboot = derive2 { name="Neighboot"; version="1.0.0"; sha256="116q82svg8sw1xwnx253nd8vrv5i70rj45v7lf00m778rh9l2rmr"; depends=[dplyr igraph magrittr RDS RDStreeboot]; };
   NestedCategBayesImpute = derive2 { name="NestedCategBayesImpute"; version="1.2.1"; sha256="15j54whvhqy26v1iikpk8ys75d7m5b188ggdzrlgzhjg0f9j45fl"; depends=[coda dplyr Rcpp RcppParallel]; };
-  NestedCohort = derive2 { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[MASS survival]; };
   NetCluster = derive2 { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; };
   NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
   NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
@@ -2853,7 +2958,7 @@ in with self; {
   NetMix = derive2 { name="NetMix"; version="0.1.5"; sha256="1s6h5d34fd6brpiank2mpvpscvsgw86zfyq677s8nh8bkrc4idzs"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo RSpectra]; };
   NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; };
   NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; };
-  NetRep = derive2 { name="NetRep"; version="1.2.1"; sha256="0adlnq22nslp8ildbrf0z26783kzgz4cyn45a981qyjbw4c42hin"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; };
+  NetRep = derive2 { name="NetRep"; version="1.2.4"; sha256="1swlb2k9bc7whvslxbklz864j9ynvna73hvq5rhv61cv5vy05ksd"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; };
   NetSimR = derive2 { name="NetSimR"; version="0.1.0"; sha256="0iadlvc7m78svkjcwx18pk18jg7dv69gm1cvkz8k2a7b1absd9f5"; depends=[]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
   NetWeaver = derive2 { name="NetWeaver"; version="0.0.6"; sha256="058fi3vbp11mbg69n4yp1zf48akfdl6s2p0qpa0v6ngmk2zjk0bq"; depends=[]; };
@@ -2865,16 +2970,16 @@ in with self; {
   NetworkReg = derive2 { name="NetworkReg"; version="1.0"; sha256="0ymbigvl1n5348g77jqs1bcda00kdqrm7zifc0ibh5mwsrx6cmds"; depends=[Matrix randnet RSpectra]; };
   NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.4"; sha256="1121ma43jxc4p9rw0sc8w32shf9xrmn5qd1xsqgzr8diymc49zhg"; depends=[dplyr expm ggplot2 Matrix]; };
   NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; };
-  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.4.0"; sha256="1z7qkcj2djxf9bgdhjk7bgfxhb54m013qcsi421lbdjlppsysm7a"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS Matrix pbapply ppcor psych pwr qgraph R_matlab]; };
+  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.4.1"; sha256="1zm6qgjijwadmwm7hx2w9j813qdrg4hxdxgq619gsjvmqmhgskl5"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS pbapply ppcor psych pwr qgraph R_matlab]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
-  NeuralSens = derive2 { name="NeuralSens"; version="0.2.1"; sha256="0nr060vc30yyff9iydmb3sbj0snjaghk0jbcf8iydh89rcb1m0hk"; depends=[caret fastDummies ggforce ggnewscale ggplot2 gridExtra Hmisc NeuralNetTools reshape2 scales stringr]; };
+  NeuralSens = derive2 { name="NeuralSens"; version="0.2.2"; sha256="17i4dyd487wnvw1zj3jciw684spc62hmjxkcy5scjbpvjv1ymn4y"; depends=[caret fastDummies ggforce ggnewscale ggplot2 gridExtra Hmisc NeuralNetTools reshape2 scales stringr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
   NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.4"; sha256="1ny1w4kwdgfzm4jsj6mf3k0c10bwzwz4gmpb5vg3qffddly9wfaz"; depends=[oompaBase]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; };
   NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; };
   NitrogenUptake2016 = derive2 { name="NitrogenUptake2016"; version="0.2.3"; sha256="13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6"; depends=[car MASS zoo]; };
   NlcOptim = derive2 { name="NlcOptim"; version="0.6"; sha256="121njnbfww6qijbc9x6prw35glyzm18di01qvvjn62z4kgq4f7vi"; depends=[MASS quadprog]; };
-  NlinTS = derive2 { name="NlinTS"; version="1.4.2"; sha256="017y7f7di8bmw0kvbkskv9g4zyaqxk2qxw6bm3nd5llfhgrr6q21"; depends=[Rcpp Rdpack timeSeries]; };
+  NlinTS = derive2 { name="NlinTS"; version="1.4.4"; sha256="1v01gmk3g8j9wampldn2h82cxwqpqd12z5bydkx7b8a47znnfgij"; depends=[Rcpp Rdpack timeSeries]; };
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; };
   Nmisc = derive2 { name="Nmisc"; version="0.3.5"; sha256="1328sfxhkq1lyx8wx2k112iq9lxhg067gnk36vgxpcsq42vdzycr"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; };
   NobBS = derive2 { name="NobBS"; version="0.1.0"; sha256="0i0jyny1c29knpcl4szqwyxvdc3dqjfk5lf2xvwjdx3qas92w03l"; depends=[coda dplyr magrittr rjags]; };
@@ -2893,10 +2998,10 @@ in with self; {
   NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-  Numero = derive2 { name="Numero"; version="1.6.0"; sha256="1f27b8zyh3fpsg6qfvlm1nq1ph5fdydxfff0609plr7prafqz85f"; depends=[Rcpp]; };
-  NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; };
-  OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; };
-  OBASpatial = derive2 { name="OBASpatial"; version="1.1"; sha256="1a6n440z50v75ms3lmjsa9z7cz0fkmj3k98wsqhq1s7sazd85am4"; depends=[cubature invgamma LaplacesDemon modeest truncdist]; };
+  Numero = derive2 { name="Numero"; version="1.7.2"; sha256="0pizlng63mlmyy44sw35ajr9cyq09h1j6495hz9fq65d21jp652b"; depends=[Rcpp]; };
+  NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="1.0.0"; sha256="1cdmscxyr3fm036iw0dh3anbck2zr5fv2kmhx5qc2zr8y7c1kys2"; depends=[ggplot2 shiny]; };
+  OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-1"; sha256="00715bw5ix4w5qfwwqd2bhqcs8m6b44402nglfdwjr9crp95whhq"; depends=[curl xml2]; };
+  OBASpatial = derive2 { name="OBASpatial"; version="1.7"; sha256="0zn5cbj40nfnqw51rc4jg1fhkr95yapcsdp76jdhnh3fqi4i228f"; depends=[cubature HDInterval invgamma LaplacesDemon modeest mvtnorm truncdist]; };
   OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; };
   OBsMD = derive2 { name="OBsMD"; version="6.1"; sha256="0jvvcx2lc39rdnlbhykam6cf94lbci9zc1vshwfhvygblnmjgrzr"; depends=[]; };
   OCA = derive2 { name="OCA"; version="0.2"; sha256="02kja2ixqv4rcjlkzidwmjplmpkjlzcniabyn39zdi6601hfv1jr"; depends=[]; };
@@ -2911,8 +3016,10 @@ in with self; {
   OHPL = derive2 { name="OHPL"; version="1.4"; sha256="0svim112khdymdj1bsj8vri6r0zph5312y148mlh5h98rah40i08"; depends=[glmnet mvtnorm pls]; };
   OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; };
   OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
+  ONEST = derive2 { name="ONEST"; version="0.0.1"; sha256="1r6nz5fmx7vsqq0hyns5kkimm1cgi845cd887xs2qvknzq52v362"; depends=[]; };
   ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; };
   OOBCurve = derive2 { name="OOBCurve"; version="0.3"; sha256="1i7prybs3b60ipl34zrq6mcr6w9kc1d44b14mxcd752k42k6xs2r"; depends=[mlr randomForest ranger]; };
+  OOI = derive2 { name="OOI"; version="0.1.0"; sha256="0ivxgq539v68kak3zzakywppba0grzh7qn1h404s4ag30cxv0g8p"; depends=[modi]; };
   OOR = derive2 { name="OOR"; version="0.1.3"; sha256="13v04rx2q6pbiq7dyd29wvimkr4sbq2f5rnn3a0lcbwr3x35r7h9"; depends=[]; };
   OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
   OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
@@ -2928,12 +3035,11 @@ in with self; {
   OSDR = derive2 { name="OSDR"; version="1.1.3"; sha256="059sj003zsrabmjfhwvvpi599ssrckcqpiw2b3vz405ljnhjmlap"; depends=[]; };
   OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; };
   OSNMTF = derive2 { name="OSNMTF"; version="0.1.0"; sha256="0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2"; depends=[dplyr MASS]; };
-  OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; };
   OTE = derive2 { name="OTE"; version="1.0.1"; sha256="0jvvrrfhpc5kibbxrd5r4dj97jp5m072fxnkpcyz11gi65db3z4g"; depends=[randomForest]; };
   OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; };
   OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; };
-  OTclust = derive2 { name="OTclust"; version="1.0.2"; sha256="1nrgjn13nbki59i51m28h3z0bppmvcp7qgv09h2r2vvdk858iy9z"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; };
-  OUwie = derive2 { name="OUwie"; version="2.4"; sha256="0b5bhb6xw5s1xx37b8bgqnq1z05zzsdpcxrg7j72v17l0q7ai51w"; depends=[ape corpcor geiger igraph interp lhs nloptr numDeriv paleotree phangorn phytools RColorBrewer]; };
+  OTclust = derive2 { name="OTclust"; version="1.0.4"; sha256="11mr67zp68wzf1dd6vb3f31g8a430im97sdjsb0w4awqpmjdyyrz"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; };
+  OUwie = derive2 { name="OUwie"; version="2.5"; sha256="1kvs6s18qbvc9k9i99lhnyfgsvhf5rwm5wj7sc06d751jllk7b16"; depends=[ape corpcor geiger igraph interp lhs nloptr numDeriv paleotree phangorn phylolm phytools RColorBrewer]; };
   OWEA = derive2 { name="OWEA"; version="0.1.1"; sha256="00mx94v3krivsxha6sh13xhn2bdj77g8858vc4r2cy23ab4bg0g7"; depends=[gtools MASS shiny]; };
   Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; };
   OasisR = derive2 { name="OasisR"; version="3.0.2"; sha256="1388ld2nws3ppnkavg8s59q3inqf365c5cf9qvzbj6icmwqs9rdd"; depends=[measurements outliers rgdal rgeos seg spdep]; };
@@ -2952,7 +3058,7 @@ in with self; {
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
   OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; };
   OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; };
-  OneStep = derive2 { name="OneStep"; version="0.9.0"; sha256="19ndvx1jzdi6jn8sj7sw048pzq8s936icbi45ncvp598lnbwh5br"; depends=[fitdistrplus numDeriv]; };
+  OneStep = derive2 { name="OneStep"; version="0.9.1"; sha256="1qqc5rvy2hssflw4qpr548xs7hjian191827dim29b3mr2i2hnry"; depends=[fitdistrplus numDeriv]; };
   OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
   OpVaR = derive2 { name="OpVaR"; version="1.1.1"; sha256="0sb2brwv20ppgsw1x2zz4frkdwhgq8766k8fchr6flp4c4jkkyma"; depends=[actuar evmix MASS pracma ReIns tea truncnorm VineCopula]; };
   OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
@@ -2961,18 +3067,18 @@ in with self; {
   OpenLand = derive2 { name="OpenLand"; version="1.0.1"; sha256="1wa7hkfwvzzj9lm07hdajwf6g8ys3g2ff8vqva3gqwqa9j1fam9n"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; };
   OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.17.4"; sha256="07y4w7xdb63p5kkrj6sdx1kabbsgbbj7nw9hc690jy84r15aryal"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.18.1"; sha256="0gyjps0l3ig90piccgd04s63cz65kk5i5l9iyakps4bv27h1lzwm"; depends=[BH digest lifecycle MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
   OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; };
-  OpenRepGrid_ic = derive2 { name="OpenRepGrid.ic"; version="0.3.0"; sha256="0crhznaqyyjinyd7bzdkjd1zhy4v0mk3g20p1r2490s435vr2hxn"; depends=[dplyr DT formattable igraph magrittr openxlsx reshape2 rintrojs scales shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinythemes shinyWidgets stringr testthat tidyr tidyverse]; };
+  OpenRepGrid_ic = derive2 { name="OpenRepGrid.ic"; version="0.4.0"; sha256="0d6pq31f0r8pqyvv51zp8hcrhnfmp4dw7m6vlqy1b5kkr7622hy3"; depends=[dplyr DT formattable igraph magrittr openxlsx RColorBrewer reshape2 rintrojs scales shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinythemes shinyWidgets stringr testthat tidyr tidyverse withr]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.4"; sha256="0kyv14lxi86n6aba4jqmsfpmn075k0ki34q6gkkvhq8yv48wg831"; depends=[ggplot2 raster rgdal rJava sp]; };
   Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; };
   Opt5PL = derive2 { name="Opt5PL"; version="0.1.1"; sha256="0v3ibfzmkfnkhxylhaqcd3yqygsk7027ga12vb6gj4h4zcccf17f"; depends=[matrixcalc Rcpp]; };
+  OptCirClust = derive2 { name="OptCirClust"; version="0.0.3"; sha256="0z0ak5h2m7cpws17v8z203hjr17jkqsm1h1gw7lqrzsl8cjwnkrn"; depends=[Ckmeans_1d_dp plotrix Rcpp]; };
   OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; };
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
   OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
   OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; };
   OptSig = derive2 { name="OptSig"; version="2.1"; sha256="1k43qsjdc00plgsindjkfn6v098v0zfy7sjkh4n4ybib2qx3v8fn"; depends=[pwr]; };
-  OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.5"; sha256="1j2svfy5lzvz5vazpf55fvzqy5kk0l47x8qfy6j2jz1dc3gjh2rs"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; };
   OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; };
   OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; };
   OptimalDesign = derive2 { name="OptimalDesign"; version="1.0.1"; sha256="02vxxb25q7fl73y7zq0a89ra0s88wji4mrql7p88014p073lj2as"; depends=[lpSolve Matrix matrixcalc matrixStats plyr quadprog rgl]; };
@@ -2994,14 +3100,16 @@ in with self; {
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
   OwenQ = derive2 { name="OwenQ"; version="1.0.3"; sha256="0kra8pvz21kqwzwsrqh6vwfyq9qqrar3glcycd2gip19273whdim"; depends=[BH Rcpp RcppEigen RcppNumerical]; };
   OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; };
-  PAC = derive2 { name="PAC"; version="1.1.2"; sha256="1xh8y6ypicfabfm7kv0l4074mskjbcvyv5y13r10g5b7gqk35vkz"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
+  PAC = derive2 { name="PAC"; version="1.1.3"; sha256="12q8zwdwfhf2g1jgs7783hj2r4n2bl056n4230lwfg773f7ks6l5"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
   PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; };
-  PACVr = derive2 { name="PACVr"; version="0.9.2"; sha256="0pn4k1yxja0blc89ksmhn7pwn3p647hvn6zmi7d0k47dfzy5rch5"; depends=[BiocGenerics Biostrings genbankr GenomicAlignments optparse RCircos]; };
+  PACVr = derive2 { name="PACVr"; version="0.9.4"; sha256="0sj5ibqaw452lncxxbm6xkgmmh9ny6hx4b9hppzwglpgk6vvb5f3"; depends=[BiocGenerics Biostrings genbankr GenomicAlignments GenomicRanges IRanges optparse RCircos]; };
   PAFit = derive2 { name="PAFit"; version="1.0.1.8"; sha256="12rqf7mcbsc4ngq75gw8nrllqc2nd9l5p8jdnx6gjn26ldydg6h6"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
   PAFway = derive2 { name="PAFway"; version="0.1.3"; sha256="1ggmqbls8i5zqihzi66kaw09bbip2spiiizfzkx7amcvpm8zsr7r"; depends=[GGally ggplot2 igraph network scales sna]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
   PAMA = derive2 { name="PAMA"; version="0.1.1"; sha256="0iwfak74422gmfciin940rkqg7m2dkzv0d52jrkk0i6z58rhs426"; depends=[mc2d PerMallows]; };
+  PAMmisc = derive2 { name="PAMmisc"; version="1.6.5"; sha256="11jilwsjb7vkfg79d6ajwwy3ylg30yg5s3qi7s55kvxx8ii5r8kv"; depends=[dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PamBinaries plotKML purrr RcppRoll rerddap RSQLite seewave stringr tuneR]; };
+  PAMpal = derive2 { name="PAMpal"; version="0.9.14"; sha256="1ijzqrndkpqhjczki6g2arp4fscvdff9gixgqlr9ibvr7g7b0z3f"; depends=[data_table dplyr gam ggplot2 knitr lubridate magrittr manipulate PamBinaries PAMmisc purrr readr reticulate rjson rlang RSQLite rstudioapi seewave signal stringr tidyr tuneR xml2]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; };
   PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; };
   PASSED = derive2 { name="PASSED"; version="1.0-3"; sha256="1snphwngs9alg114h9m5i84dpg3zpm577kvz8qlrlk37ar1mxalk"; depends=[betareg rootSolve]; };
@@ -3014,6 +3122,7 @@ in with self; {
   PAutilities = derive2 { name="PAutilities"; version="1.0.1"; sha256="13k0dkgz82d4iqc7kpz1cw71w1m3bjkar4a7xndms1nj6sp7vp03"; depends=[dplyr equivalence ggplot2 lazyeval lubridate magrittr matchingMarkets Rcpp reshape2 rlang]; };
   PBD = derive2 { name="PBD"; version="1.4"; sha256="1n8gq8ms6gszr469hblipbgalc5m7gfiknpsbqywxml62sr4wbsb"; depends=[ade4 ape DDD deSolve phytools]; };
   PBIBD = derive2 { name="PBIBD"; version="1.3"; sha256="0zh73bsiwmsqw1vhs2dazndsf0894kfv3vfv88wr4fnh7njysz6r"; depends=[]; };
+  PBIR = derive2 { name="PBIR"; version="0.1-0"; sha256="1br53bxqp2bhljph2a0nvdlxf695iknymgwy2drfc7pm383w1ma1"; depends=[cmprsk survival]; };
   PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; };
   PBNPA = derive2 { name="PBNPA"; version="0.0.3"; sha256="1wmgcmspilfv6pjy7696j2xmq8m41p27plnr1qr0fnzyz66pf37m"; depends=[metaRNASeq]; };
   PBRF = derive2 { name="PBRF"; version="1.0.0"; sha256="1ibwywgbxnxcb3z2kl2bgh7fz512nhgy2zcdym67asp76c6rkqg6"; depends=[]; };
@@ -3035,10 +3144,10 @@ in with self; {
   PCMBaseCpp = derive2 { name="PCMBaseCpp"; version="0.1.9"; sha256="0k40mxs8w1vk7qwpkv8gnq6cq3kpj7wvf0i6f1qn1wmm2vvz1kfy"; depends=[abind data_table PCMBase Rcpp RcppArmadillo]; };
   PCMRS = derive2 { name="PCMRS"; version="0.1-2"; sha256="1zr2kzwxgr7rifkkmgz9vhq5i9ky6lqrss742vybwl0nx78mad3p"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; };
   PCPS = derive2 { name="PCPS"; version="1.0.7"; sha256="0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh"; depends=[ape nlme phylobase picante RcppArmadillo SYNCSA vegan]; };
-  PCRedux = derive2 { name="PCRedux"; version="1.0-6"; sha256="0s7g6y8iw4w42ihpiqqhbgwaf4fim91pwsp8hh7fh5nawj2wg9k7"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny zoo]; };
   PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; };
   PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; };
   PCovR = derive2 { name="PCovR"; version="2.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; };
+  PDE = derive2 { name="PDE"; version="1.1.2"; sha256="0hmi3mfs9bab0irn682jla4bqiq1fibi4lw3806wl2pmwdf071jj"; depends=[tcltk2]; };
   PDFEstimator = derive2 { name="PDFEstimator"; version="0.1-3"; sha256="0baqysb01xii86akbdq8yix1qrrqqfiyzrpb50jxd7y782xalcly"; depends=[]; };
   PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; };
   PDN = derive2 { name="PDN"; version="0.1.0"; sha256="082ydvwcjc2rs7hlakrkgbbm9c419m408a14a9dgfdwm16yif3jd"; depends=[ggplot2 glmnet network survival]; };
@@ -3046,7 +3155,7 @@ in with self; {
   PDSCE = derive2 { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
   PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; };
   PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; };
-  PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen Matrix pracma RSEIS]; };
+  PEIP = derive2 { name="PEIP"; version="2.2-3"; sha256="1ljalgffgrn9l3q914jjxrn1j740jqk4j8q1vzn3si4np9mz92vp"; depends=[bvls fields geigen Matrix pracma RSEIS]; };
   PELVIS = derive2 { name="PELVIS"; version="2.0.2"; sha256="07lb0vfi6szcbznd7ylqmk02l6w02b5v26i9vbwkvpy71nzvvfxd"; depends=[DT MASS shiny]; };
   PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
   PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; };
@@ -3054,7 +3163,7 @@ in with self; {
   PGRdup = derive2 { name="PGRdup"; version="0.2.3.6"; sha256="0bv3fzkylg70yhvyar1lbpwicli479ql1zfascjv60pic5ia1bc7"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
   PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; };
   PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.2"; sha256="193fc3l1zbbrnr4jl07bxv8jssyhpgh9aydi6f4w8mh56x9nazhk"; depends=[broom dplyr purrr rlang tibble tidyr]; };
-  PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.3"; sha256="097a1wqh6c8y0ny6ikpkfqym4fw2vz7rrhqpf6xfb71vf3big90k"; depends=[coxphf lpSolve mlogit Rdpack survival]; };
+  PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.6"; sha256="1dlmsj5i9f0h91vq5g2kqh4xk38vbc9cszk6075y2flnh5aiv759"; depends=[coxphf lpSolve mlogit Rdpack survival]; };
   PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.11"; sha256="1fq2ny093b4881nwgj6wr8qd5g4dcxb51sdx40ndyxxpq6jj16n9"; depends=[]; };
   PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; };
   PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; };
@@ -3071,79 +3180,86 @@ in with self; {
   PLNmodels = derive2 { name="PLNmodels"; version="0.10.6"; sha256="1rjryyw9zydcqaak72xv8x0gjybl7aan1n52jxj9m5672sw3knwr"; depends=[corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr R6 Rcpp RcppArmadillo tidyr]; };
   PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
-  PLmixed = derive2 { name="PLmixed"; version="0.1.4"; sha256="1plkcv7k6jijywhxrsx2lxcbavzvagzl8wnz132nqq619wvb57ia"; depends=[lme4 Matrix numDeriv optimx]; };
+  PLmixed = derive2 { name="PLmixed"; version="0.1.5"; sha256="03ivginsg1zhdxv5bzzmh6mxjz2b6qi8p4cq7sfm5q4llkld46x6"; depends=[lme4 Matrix numDeriv optimx]; };
   PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; };
   PMA = derive2 { name="PMA"; version="1.2.1"; sha256="1rhiylm3jfarnqdkv7nwg536sgsa30ic80dk9byks9w0wf4mn59s"; depends=[]; };
   PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; };
-  PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.4"; sha256="1myj2hf1sx32j6hcql1zrbxkibg6l0qggcnrpsr2y40kzbw463pi"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
+  PMCMRplus = derive2 { name="PMCMRplus"; version="1.7.1"; sha256="1njyxm69kmparzsawqnm3mjad181pf2fgn3fc4wslls96bcngyrw"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
   PML = derive2 { name="PML"; version="1.2"; sha256="0r4mfnkbg7chrnm3lb78hjcz25fal6vvvqwvnzvicl46mdhl94yb"; depends=[dplyr rbokeh tibble tidyr]; };
-  PMwR = derive2 { name="PMwR"; version="0.14-0"; sha256="15qfpsnnak8qf41cfq3n4g6iwxnzbifxqm50pnbk76v6727s21hy"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; };
-  PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.6.0"; sha256="1xwjw8wcr0xys3bwk7aj0rih2nzdw86rja7fwqis2rfcbk9r8cim"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; };
+  PMwR = derive2 { name="PMwR"; version="0.15-0"; sha256="1xj2j72j907yayxshfckq2pycj9cxiakyz4kdr4xg9wqificivcw"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; };
+  PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.6.1"; sha256="0hj7c1d1l6zxfpba2mjhapwx8kpqx89kbp0gzic8mbyn354p4fxn"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; };
+  PNSIBGE = derive2 { name="PNSIBGE"; version="0.1.0"; sha256="19z7yv91f3v992k74sl5g91czcyzr12khr83xhxr5m53qwbs84yj"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; };
   PNWColors = derive2 { name="PNWColors"; version="0.1.0"; sha256="1phplnclkficfv8s6wsyrckk4ixzbayiy5iix6dddg40485l9nyj"; depends=[]; };
+  PO_EN = derive2 { name="PO.EN"; version="1.0"; sha256="1b4vcj6dnfji99nlskjvls996cmb1b2s3mfdammi07sdx625pvji"; depends=[glmnet pROC PUlasso Rcpp RcppArmadillo]; };
   POCRE = derive2 { name="POCRE"; version="0.5.0"; sha256="0aph1lmb0xkzm4l4ah2wrx13d138igf4k4w9wb9lca4vv6m7xzqf"; depends=[EbayesThresh ggplot2 pracma]; };
   POD = derive2 { name="POD"; version="1.2.0"; sha256="1xg2xzfmzg2qrwd02xy4fwsfmccigw6lm5266z6w1kxzb7p7bbw0"; depends=[]; };
   POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; };
+  POFIBGE = derive2 { name="POFIBGE"; version="0.1.0"; sha256="1lpcas2x8lnrs8acxa05nl32khbx261rilnsq26ywm1fycyx2aaz"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; };
   POINT = derive2 { name="POINT"; version="1.1"; sha256="0bkrsvcmm7927d7c56wr804a2wv5c1dn8y8zhf76433ckj45068x"; depends=[CompQuadForm Matrix rARPACK]; };
   POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; };
   POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; };
   POT = derive2 { name="POT"; version="1.1-7"; sha256="1xxm293lmj22dsiaimivpd90xpwnrr36xa371zg6k6w05q4jjfn3"; depends=[]; };
-  POUMM = derive2 { name="POUMM"; version="2.1.6"; sha256="16yiymfaci9zklbx3klf3nn9xlf305mdbq5n1ccx4w7g7h0ivdi1"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; };
+  POUMM = derive2 { name="POUMM"; version="2.1.7"; sha256="0pwa97sffb571nfqnbc35dj9lr8z07wjsjnwibj9dhj2dr5b2cfp"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; };
+  POV = derive2 { name="POV"; version="0.1.4"; sha256="0mqhi410rwpgr6x5h57wqg0f5k01vva0c280zlfpmf8php121x7j"; depends=[broom formula_tools]; };
   PP = derive2 { name="PP"; version="0.6.2"; sha256="1y6f8pnvdp59xnm0vh1rjhcxy3nyd3il7r76yyrrfamdr42hh8lc"; depends=[Rcpp]; };
   PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; };
   PPCI = derive2 { name="PPCI"; version="0.1.5"; sha256="141811iq0g2rq7lxpz9a44kyjfylj85yqgcjq7b23xfg2wbcp8dd"; depends=[rARPACK]; };
   PPMR = derive2 { name="PPMR"; version="1.0"; sha256="07fky5xc1dmmn23wwdjm46c86i7q20dv5f2147828v52hhky873g"; depends=[Rcpp RcppArmadillo]; };
-  PPQplan = derive2 { name="PPQplan"; version="1.0.0"; sha256="159mgwd2d7qzfwj6dnxr77p0fm7rgq9bpks2ra54s446cm4ahgkd"; depends=[ggplot2 plotly tolerance]; };
+  PPQplan = derive2 { name="PPQplan"; version="1.1.0"; sha256="072r7myqsnpyla37q6bj9glwvbygb9g8xkl60q055yzxmfh4rsbr"; depends=[ggplot2 plotly]; };
   PPRL = derive2 { name="PPRL"; version="0.3.5.2"; sha256="083al6xi9b62vbx71684bxq2xynvmxw25ak01gwngln1r84gsz5l"; depends=[Rcpp settings]; };
+  PPTcirc = derive2 { name="PPTcirc"; version="0.1.0"; sha256="082w0p8f1yacqjid017hhkk2946z7g5wf86af01cb26dhss0y9sy"; depends=[circular progress]; };
   PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.4"; sha256="008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
   PQLseq = derive2 { name="PQLseq"; version="1.2"; sha256="0md6s7yb24zq74b12ackhh1yggyfsg3226acwfaf1pb3l4yvway4"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
+  PRDA = derive2 { name="PRDA"; version="1.0.0"; sha256="1lklwfakd54ylm5gizq36ng6498c2izapsz9yz2a95cjf860rr23"; depends=[MASS pbapply Rcpp RcppArmadillo]; };
   PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; };
   PRIMAL = derive2 { name="PRIMAL"; version="1.0.2"; sha256="04fn0c10v9ai7vrrd4qr84rid3x42wq749rn5p1i6nkvmjv3dnhs"; depends=[Matrix Rcpp RcppEigen]; };
-  PRIMME = derive2 { name="PRIMME"; version="3.1-1"; sha256="1gwdix0qbnap3figh6lskqy3d5hzb4hqi97hbqhp3sz1vnkgm4bz"; depends=[Matrix Rcpp]; };
-  PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; };
-  PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.0"; sha256="1r2fjnd5wjlb0y5x9pnh80dmkdfdr9yhqckynkc92ngc7dr1f44z"; depends=[glmnet xts zoo]; };
+  PRIMME = derive2 { name="PRIMME"; version="3.1-3"; sha256="0afncp0grxr1hb1ymqq8gigl5cvq1wb0vjnxsc8nh39jqsw08cjx"; depends=[Matrix Rcpp]; };
+  PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.1"; sha256="07kq6fprbj8zccs6cx1aiy5mrcg77b0fh42zvg2pimbvr8cqhy31"; depends=[glmnet xts zoo]; };
   PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; };
   PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.1.1"; sha256="1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z"; depends=[DiagrammeR]; };
   PROBShiny = derive2 { name="PROBShiny"; version="0.1.0"; sha256="17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb"; depends=[epitools LaplacesDemon rmarkdown rpivotTable shiny shinyMatrix]; };
-  PROJ = derive2 { name="PROJ"; version="0.1.6"; sha256="0h0iky99wqb4cz7imrwz2p3w71s8n21vfdjwi30w240vim6d3lgg"; depends=[]; };
+  PROJ = derive2 { name="PROJ"; version="0.4.0"; sha256="1rqw28qqcyzla3ssif9jghvv0nyms9riabj2lxhlx1l3rbz0rsfx"; depends=[]; };
   PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; };
   PROSPER = derive2 { name="PROSPER"; version="0.3.3"; sha256="1wdrdqii7d4yfky6706n9xjmabnz99jjja1c80nbj3fp8idsbli5"; depends=[data_table]; };
   PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
   PROreg = derive2 { name="PROreg"; version="1.1"; sha256="0jws41hgrpcih5ispp6f627f81sjbdygzgjbw4gawf31n5z8pi5a"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; };
   PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; };
-  PROsetta = derive2 { name="PROsetta"; version="0.1.4"; sha256="06lpwkcnx71lfawlv20d83y5i7iqskipg8d3wvdc99k4cirdypjy"; depends=[equate lavaan mirt plink psych]; };
+  PROsetta = derive2 { name="PROsetta"; version="0.2.1"; sha256="0lw6biwjrb54b69mq6dj7jmvlpya47n33wvksbqky2pkvgk3iqyj"; depends=[equate lavaan mirt mvnfast plink psych]; };
   PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; };
   PRSim = derive2 { name="PRSim"; version="1.2-2"; sha256="0amvri7s32zrzc7a6lldwhpfsi0z92k3ps0rzlgys57dhpzl0mfs"; depends=[goftest homtest splus2R wavScalogram]; };
   PReMiuM = derive2 { name="PReMiuM"; version="3.2.3"; sha256="1znr1swz73n1ws657dvv56y6crmqicfllbz460vaw8a0dnjiqsc9"; depends=[ald BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen rgdal spdep]; };
-  PResiduals = derive2 { name="PResiduals"; version="0.2-6"; sha256="11r0zn626s701hprjy634a7d3v3sq6lmlzpamv02609fg8wjhy9h"; depends=[Formula MASS rms SparseM]; };
+  PResiduals = derive2 { name="PResiduals"; version="1.0-0"; sha256="0rfi8y12cz6h8bm9715ppq3px4g123k0rlrri4py8brca40smb69"; depends=[Formula MASS rms SparseM]; };
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
   PSCBS = derive2 { name="PSCBS"; version="0.65.0"; sha256="16irvlc3ds7p03racjzyljqsc43bbwng3zsb0bmrkibmadfhcr9k"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
   PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; };
   PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; };
   PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; };
-  PSPManalysis = derive2 { name="PSPManalysis"; version="0.2.2"; sha256="0g59r13nc6w4a4gkjxnvkygp9hax1sw34a5rv6r170gwdj9fiswq"; depends=[pkgbuild]; };
-  PSSMCOOL = derive2 { name="PSSMCOOL"; version="0.2.0"; sha256="1y2y3ajxph5w67gww0yycy766r8yhgiz70228b89yiiildniryps"; depends=[dtt gtools infotheo phonTools]; };
+  PSPManalysis = derive2 { name="PSPManalysis"; version="0.3.4"; sha256="1w51b0dck9b14vnk91ihrm3z574m65b7mdi29jwjsj5v0vh1gang"; depends=[pkgbuild rstudioapi]; };
+  PSS_Health = derive2 { name="PSS.Health"; version="0.1.5"; sha256="0rbxr1rkv9549w9yj2hg143w5izcx3i9f1jiqk5s1vbpdrhwxyq6"; depends=[DT easypower EnvStats ICC_Sample_Size kappaSize longpower MESS plotly powerMediation powerSurvEpi presize pROC pwr pwr2 shiny shinycssloaders shinyFeedback shinyhelper shinythemes tidyverse TrialSize WebPower writexl]; };
+  PSSIM = derive2 { name="PSSIM"; version="0.1.0"; sha256="144lh31b1c4ycq0wrgf9745q0c8b5sfnmrd0f7vwx95i86bzr3mj"; depends=[]; };
+  PSSMCOOL = derive2 { name="PSSMCOOL"; version="0.2.1"; sha256="0ixxaxgpngi27r3zpqzrk5df8aqmrs4iwiyfrgg1ab1kjd1hnpk4"; depends=[dtt gtools infotheo phonTools]; };
   PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; };
   PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; };
-  PSweight = derive2 { name="PSweight"; version="0.1.1"; sha256="17lbmpl68vwsx3240rvj787j30x47sbmhvwp8lfv29kfnlqvyiv9"; depends=[ggplot2 MASS nnet numDeriv]; };
+  PSweight = derive2 { name="PSweight"; version="1.1.2"; sha256="0aa2lbnank1ivqis8l5z3gch6j0awrzvcyhixsp1mjaxz5izd2yn"; depends=[ggplot2 MASS nnet numDeriv]; };
   PTAk = derive2 { name="PTAk"; version="1.3-34"; sha256="0ylnag492v1n0pmzsz73w12frhv8c3r3dxgarf58ny0ir0i0ywvl"; depends=[tensor]; };
   PTE = derive2 { name="PTE"; version="1.7"; sha256="1azkrij4kfmvp03lnzm88gwgvz8g54jq94j0qg8ynxvyjzrppc98"; depends=[doParallel foreach survival]; };
-  PTXQC = derive2 { name="PTXQC"; version="1.0.5"; sha256="0g70fz6ssgz8k0yy33j6135qnf6mbg1ipn6lli27yshzdzwl6yhz"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; };
+  PTXQC = derive2 { name="PTXQC"; version="1.0.8"; sha256="0x3jp829nw4mp2mc1damvbyxsjfp8m21yn3an3m6f6rj3mlk8p30"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; };
   PTwins = derive2 { name="PTwins"; version="0.1.1"; sha256="166mc7w52n9d3n72h5jvvhbki87prkils3yigdf57dn9pyixrd66"; depends=[]; };
   PUPAIM = derive2 { name="PUPAIM"; version="0.2.0"; sha256="1ky6f4yhm3hjrfxwk8vfalzzjgkq1922my26w457q8nfng7f2m53"; depends=[Metrics minpack_lm nls2]; };
   PUlasso = derive2 { name="PUlasso"; version="3.2.3"; sha256="07jf81q898833qswwairkv21dxlz7890219fdgnw3ywgp5kvlp41"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; };
   PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; };
   PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; };
+  PVplr = derive2 { name="PVplr"; version="0.1.0"; sha256="1ssmdhq2qczk6n50f8jj4j3nym7jj9bshfc1f29lccvmp7wxdp9a"; depends=[broom cluster dplyr ggplot2 magrittr minpack_lm purrr rlang segmented stlplus tidyr]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
   PWEALL = derive2 { name="PWEALL"; version="1.3.0"; sha256="0nb0v6wvj9ay90qcbrr9drg2g84fb7a9m78pzb69wp8789i8ixhk"; depends=[survival]; };
   PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.111"; sha256="0gry7nq8gqxfspihsc05pcwn25fciw41hjy9bnd1bsqqk5f520d0"; depends=[cluster curl dplyr dygraphs geosphere ggmap glue httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sf slippymath sp stringr tibble tidyr xts]; };
   PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; };
-  Pade = derive2 { name="Pade"; version="1.0.1"; sha256="11i8cjmqkly78is9rhnd1ipjb8awmwlscv2kvdf75qc71yigvlgz"; depends=[]; };
-  PairViz = derive2 { name="PairViz"; version="1.3.3"; sha256="0zhj4b33dahsyyw0jlnwn2swz2qislgphy8xn9lxdifb6iq7arbr"; depends=[graph gtools TSP]; };
+  Pade = derive2 { name="Pade"; version="1.0.3"; sha256="0q4pk2qk7v9wn5sdlvrwn9ir01jxy9nlzygnwkjzhq5vfa720d1k"; depends=[]; };
+  PairViz = derive2 { name="PairViz"; version="1.3.4"; sha256="1jd99b4bc2yiv91z7szhrgqhrbh6h6qwacvwf1cl6r8nrv5kqd13"; depends=[graph gtools TSP]; };
   PairedData = derive2 { name="PairedData"; version="1.1.1"; sha256="07y5fd4fkwfp0lbacf41ya8cn7x4n1haxl0cln9iibjffc1mbr5q"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
-  PairwiseD = derive2 { name="PairwiseD"; version="0.9.62"; sha256="19qjms99gf7s39nwwgj56n8426d0gw80dipz165sk3km4zb2mcwv"; depends=[openxlsx xlsx]; };
   PakPC2017 = derive2 { name="PakPC2017"; version="1.0.0"; sha256="196jvhv7pv4pvnnz9izk6icxv3aml26mif0w6g4907izyszf8cal"; depends=[dplyr magrittr]; };
   PakPMICS2014Ch = derive2 { name="PakPMICS2014Ch"; version="0.1.0"; sha256="0gjrx34613d9wzal292zfzh8hmkav271fqb0skdxd1f8rs2c79dg"; depends=[data_table]; };
   PakPMICS2014HH = derive2 { name="PakPMICS2014HH"; version="0.1.0"; sha256="1n6cyanqafscizgi1xqmc19w59yigxk5mvqinbivpdr7rydhrac6"; depends=[data_table]; };
@@ -3155,18 +3271,22 @@ in with self; {
   PakPMICS2018hh = derive2 { name="PakPMICS2018hh"; version="0.1.0"; sha256="0wkjxy8qkndhnyf1w03cr3g7s03cm60yn0lxn5j6hvh019b28nmz"; depends=[tibble]; };
   PakPMICS2018mm = derive2 { name="PakPMICS2018mm"; version="0.1.0"; sha256="08f2n134q545kwysy705mgsy6319ns4l9pwxldlxvbzq0lha4hf9"; depends=[tibble]; };
   PakPMICS2018mn = derive2 { name="PakPMICS2018mn"; version="0.1.0"; sha256="1r5cn1mx7i7hif64lhfcdz4xqqfj3j45i092370xhhi19pqq217n"; depends=[tibble]; };
+  PamBinaries = derive2 { name="PamBinaries"; version="1.4.0"; sha256="09b1964k5fipilzzfn8fzrpa29wdbakprzd7gcz04ba29jp1f89g"; depends=[dplyr ggplot2]; };
   PanCanVarSel = derive2 { name="PanCanVarSel"; version="0.0.3"; sha256="06xkzg2kvyr6ivm1z71x2pk20j37h36sx6kf4kmc8q50cq73k9jl"; depends=[Matrix msm mvtnorm smoothmest]; };
   PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; };
+  PandemicLP = derive2 { name="PandemicLP"; version="0.2.0"; sha256="1icqg6a3nfxjnr5r02ndx4gbz88flf9agash5pb6jvzwjw14bl4f"; depends=[BH curl dplyr plotly Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; };
   PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; };
   PanelMatch = derive2 { name="PanelMatch"; version="1.0.0"; sha256="02nsi5bhzqdn3v164f70xs0lll929gi602jw2b1xza7wcszdchfd"; depends=[CBPS data_table ggplot2 MASS Matrix Rcpp RcppArmadillo RcppEigen]; };
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
-  ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.1.0"; sha256="1famkdri08qsamn5ji4knq42pj8z4lkhacbr8mbj439hkmpsfxkv"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; };
+  PantaRhei = derive2 { name="PantaRhei"; version="0.1.2"; sha256="0lv04aa70yd5gr0zfh2gmah4d4h3kw0lym6284akcvll8mhdi8dd"; depends=[]; };
+  ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.2.1"; sha256="13zsmhbfgxg6ip1zmq24hgj9y5b2h67vlbpdk7rgcj3li3m894kc"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; };
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
-  ParallelLogger = derive2 { name="ParallelLogger"; version="2.0.0"; sha256="1hja8flwhkgqj9g7mflvfxdkzx2l8ll5scj06kmib3pihm6s21ag"; depends=[jsonlite snow XML]; };
+  ParallelDSM = derive2 { name="ParallelDSM"; version="0.1"; sha256="0pgkcc2a3k1h0n997m9x0zj4adv4i0q6qfh7m25l3f80kzlxhqdi"; depends=[caret geoR gstat quantregForest randomForest raster rgdal snowfall sp]; };
+  ParallelLogger = derive2 { name="ParallelLogger"; version="2.0.1"; sha256="0vvilx5rcr00nl9gsjynx6dddc692llq63v3mhj3zlmblifxwkyr"; depends=[jsonlite snow xml2]; };
   ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; };
   ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; };
   ParamHelpers = derive2 { name="ParamHelpers"; version="1.14"; sha256="1sx2ddm8hwvvmk0z65wa689w80py3fny82zjd4d29qwxlv854xmi"; depends=[backports BBmisc checkmate fastmatch]; };
-  Pareto = derive2 { name="Pareto"; version="2.2.0"; sha256="0yzqwgl669k461xrwadi8py5krc1kmrqqzygf5yg8q1359r4c2pv"; depends=[]; };
+  Pareto = derive2 { name="Pareto"; version="2.2.1"; sha256="1n438xawc45l3maliw6p3rmp0a97i9wvjfzhvzdbs07ls160wb2d"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
   PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; };
   Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; };
@@ -3187,7 +3307,7 @@ in with self; {
   PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; };
   PenIC = derive2 { name="PenIC"; version="1.0.0"; sha256="0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz"; depends=[MASS Matrix numDeriv]; };
   PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; };
-  Peptides = derive2 { name="Peptides"; version="2.4.2"; sha256="150hxr2qpmp0ad32mkvnr9pagxq38g4c83khbdv8h34bj97nharf"; depends=[Rcpp]; };
+  Peptides = derive2 { name="Peptides"; version="2.4.3"; sha256="1ml1dnk4bigv9gfxx9xpxp9b8id2nid3gngmza9dz9zfcy5dbc1f"; depends=[Rcpp]; };
   PerFit = derive2 { name="PerFit"; version="1.4.3"; sha256="0qmh78wrx3vzz41z30db3bb62n325blphjhpzdzykfx77gr8plyr"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
   PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.5"; sha256="1097cdx69jliwk1d5yv6v0igmqk4dwgypcb4k9dnqla19rbxx8xc"; depends=[]; };
@@ -3203,19 +3323,19 @@ in with self; {
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
   Phase123 = derive2 { name="Phase123"; version="2.1"; sha256="0bz867wsnrflzlzrql1vgacymx70rb9wik9jw3g34i2vigpl8x8i"; depends=[Rcpp RcppArmadillo survival]; };
   Phase12Compare = derive2 { name="Phase12Compare"; version="1.5"; sha256="0n9rjgdllpnj451a8d4p8x3mjf23czcmk7cn1c9v3l7mg4jn18h2"; depends=[mvtnorm Rcpp RcppArmadillo]; };
+  PheCAP = derive2 { name="PheCAP"; version="1.2.1"; sha256="00dfy0iby21kqfxz2npz4dn1klxcdlll8xrk2hsmc56fjfidbdhz"; depends=[glmnet RMySQL]; };
   Phenotype = derive2 { name="Phenotype"; version="0.1.0"; sha256="0bfg2vk35hrfzmpjpnv3yhnsfr17505c49msbppqrrbpw5wgawy5"; depends=[lme4 tidyr]; };
   PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.3.3"; sha256="1micildhgqx4h52927p68g6jvw2rif6maf90d3dzvn76ll2zbpwh"; depends=[cowplot data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
-  PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; };
   PhySortR = derive2 { name="PhySortR"; version="1.0.8"; sha256="19426xjdii74qds0wmq5sa88zys81nyqb9lvf9pfihbjgrjr770a"; depends=[ape phytools]; };
   PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; };
   PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.4.0"; sha256="14a1lczwr8xhv27wqc88raj3yhy8gvflvxjrx8f5hlq15y3wfp4w"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
-  PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; };
+  PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.1"; sha256="0ww9gcni9f0mwya1d3v45wazrss7lq8b75xcp4fb4kxwbh9s35kw"; depends=[chron lubridate stringr]; };
   PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.2-2"; sha256="14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"; depends=[]; };
   PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.4"; sha256="023hq0gg1vi0j3yf8p5lisgs8wfp5qwyd4akxxzx7wad2985gxb3"; depends=[Rcpp RcppArmadillo]; };
-  Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; };
-  PivotalR = derive2 { name="PivotalR"; version="0.1.18.3.1"; sha256="1npfi5bdn0f4arp3wpi5ai21ad5fxx3lm7n5wjhvzvcyr6gl38as"; depends=[Matrix]; };
-  PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-9"; sha256="1sv37wvvp44iwv4bpjhp3mnpyk77c60vi0xwrapzywszi222ynbl"; depends=[igraph Matrix partykit psychotools psychotree qvcalc RSpectra sandwich]; };
+  Pijavski = derive2 { name="Pijavski"; version="1.0.3"; sha256="0jspc19fn1mqv3zjr89sy7rqbbyjk3ij3rhrg2dsw167w63lpykx"; depends=[Rcpp]; };
+  PivotalR = derive2 { name="PivotalR"; version="0.1.18.4"; sha256="18fnpa45q6zfndkb7p6nx7am3kfp6yx0cmvg13gafsaw7imf760y"; depends=[Matrix semver]; };
+  PlackettLuce = derive2 { name="PlackettLuce"; version="0.3.1"; sha256="00qvcick4ph3awr46ihrd6m1zfr4h3pf9laisxl3x7yajdl9qgk8"; depends=[igraph Matrix partykit psychotools psychotree qvcalc RSpectra sandwich]; };
   PlaneGeometry = derive2 { name="PlaneGeometry"; version="1.2.0"; sha256="19ynvclgj2148gphqq825byj6xdvjr5i15h448505gv4j1viw0cx"; depends=[gsl R6 sdpt3r stringr uniformly]; };
   Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; };
   PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
@@ -3226,7 +3346,7 @@ in with self; {
   PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; };
   PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; };
   PoA = derive2 { name="PoA"; version="1.2.1"; sha256="0y8aqz1ainxdglxlfp9iqhvkmirpmc7dvwrcxz2l8lln86yrfqx6"; depends=[dplyr nloptr pracma tibble]; };
-  PoSI = derive2 { name="PoSI"; version="1.0"; sha256="0c08czjvm09mcnkqnas4l22v22r9akgklnacx1j62smk4m546q2m"; depends=[]; };
+  PoSI = derive2 { name="PoSI"; version="1.1"; sha256="1xwlj8dibaik37z6vj9q9vawavi7d49906wvxdd4drjzxzapq4ng"; depends=[]; };
   PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; };
   PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2.1"; sha256="1q89b0nypz2iivmgwg1nb1l7p285wy00s40j3qp8zc78ra1rjhyx"; depends=[]; };
   PointFore = derive2 { name="PointFore"; version="0.2.0"; sha256="0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx"; depends=[boot car ggplot2 gmm lubridate MASS sandwich]; };
@@ -3236,12 +3356,12 @@ in with self; {
   PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.6.2"; sha256="19ilr0fczr7candrmj372hhc6sai863qwcmnpimqgpfac7393qr5"; depends=[corpcor GenOrd Matrix mvtnorm psych]; };
   PoisNonNor = derive2 { name="PoisNonNor"; version="1.6.2"; sha256="1bf0qzgclw7993dc7x1sf3hfzgfv0jlga8ykvaif455d6nkiyy0k"; depends=[BB corpcor MASS Matrix]; };
   PoisNor = derive2 { name="PoisNor"; version="1.3.2"; sha256="1kpac3fz3cq4vi5maij0gbiwqm9qlvjwawvn2qz3sp5f2wn71w90"; depends=[corpcor Matrix mvtnorm]; };
-  PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.1.1"; sha256="0zz8zxd1gl95fd3izwc1hwwbrd6zkxcspzdskqfwb61zp1z6q0zp"; depends=[BH Rcpp]; };
+  PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.2.1"; sha256="10wcz6imlfzikgk5mj9hv3q1c6fcqfq0vri0aiapfl5cfl2mraj7"; depends=[BH Rcpp]; };
   PoissonPCA = derive2 { name="PoissonPCA"; version="1.0.2"; sha256="0rb30l0x8knwvh8li62cfxms9b20db77g4r8cwgwasb9jjljxv3s"; depends=[]; };
   PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
   PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; };
   PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; };
-  Polychrome = derive2 { name="Polychrome"; version="1.2.5"; sha256="028lzsswb36pdb6mmyysb4iggzlsvwrcxlcdbrkyz3338mvqabn2"; depends=[colorspace scatterplot3d]; };
+  Polychrome = derive2 { name="Polychrome"; version="1.2.6"; sha256="0363cgrbbva56146hr0dh7bj7g86c8c1rqh82rbqk7cam3an8g9a"; depends=[colorspace scatterplot3d]; };
   PolynomF = derive2 { name="PolynomF"; version="2.0-3"; sha256="067l71i2zjv6gvd0br2m034ls3r5lcmc0amml1qbj4wchd7mqlw9"; depends=[Rcpp]; };
   Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; };
   PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; };
@@ -3251,8 +3371,8 @@ in with self; {
   PopGenome = derive2 { name="PopGenome"; version="2.7.5"; sha256="0xdwgih1n7bkykbzrnp293yzrlj80vr2v6rlsww61nxlhynbh9yn"; depends=[ff]; };
   PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; };
   PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; };
-  PortalHacienda = derive2 { name="PortalHacienda"; version="0.1.4"; sha256="1mm9939inmrr77irmw30620zff6jf86zw5nf65k5j4i5nawzsx15"; depends=[curl dplyr forecast httr lubridate magrittr readr tibble timetk xts zoo]; };
-  PortfolioAnalysis = derive2 { name="PortfolioAnalysis"; version="1.0.6"; sha256="1chmh1r3hphl4wxy6i5404y8fnlbq6kmr7x8s5s97d5lwkr3dg36"; depends=[dplyr ggplot2 lubridate PerformanceAnalytics plotly purrr quadprog quantmod readr rMorningStar rvest stringi stringr tidyr xml2 xts]; };
+  PortalHacienda = derive2 { name="PortalHacienda"; version="0.1.6"; sha256="11fcd1m751xahv13s61n2lzxqxhzfkcxk3zv9kyjvrzb0fiy4jss"; depends=[curl dplyr forecast httr lubridate magrittr purrr tibble timetk xts zoo]; };
+  PortfolioAnalysis = derive2 { name="PortfolioAnalysis"; version="1.1"; sha256="11nmfyzjkvczwnlr71wg57p0pkgvr3b8ywbvrws820x7yzd1k8l6"; depends=[dplyr ggplot2 lubridate PerformanceAnalytics plotly purrr quadprog quantmod readr rMorningStar rvest stringi stringr tidyr xml2 xts]; };
   PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.1.0"; sha256="1jy89brrdw8ilbi9pjxxq5yhqw85ik4kzdd2sa60crjlhvipx0ff"; depends=[foreach PerformanceAnalytics xts zoo]; };
   PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; };
   PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; };
@@ -3263,41 +3383,42 @@ in with self; {
   PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; };
   Power2Stage = derive2 { name="Power2Stage"; version="0.5.2"; sha256="1837pc94syhyl5i0kjdmlc1h7ckas3vcpwhvhgh46sv022lrg2gi"; depends=[cubature mvtnorm PowerTOST]; };
   PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.5-0"; sha256="0bsdrancxrymylakgxzgqgqmnbnp8ms09f323gffh985fmm1lxfc"; depends=[cubature mvtnorm TeachingDemos]; };
+  PowerTOST = derive2 { name="PowerTOST"; version="1.5-2"; sha256="0afrznjqnfin8am8naj3d9n0kkw26cqy6yim8va2gc592nk62h7s"; depends=[cubature mvtnorm TeachingDemos]; };
   PowerUpR = derive2 { name="PowerUpR"; version="1.0.4"; sha256="0ng88x1zs4kb8cf2v51kynbp32iz41mh40my5sciyvjbw430bk59"; depends=[]; };
   PracTools = derive2 { name="PracTools"; version="1.2.2"; sha256="08s8pm55814w6mjz3q4n1bcxccmjypb5qiws5g8pcafl6dj7z0wh"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
   PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; };
   PreciseSums = derive2 { name="PreciseSums"; version="0.4"; sha256="054y84w3i5yrq74w2hsdxz1z1glccy540dq4jxicnknkkp2c0nmx"; depends=[]; };
-  PredCRG = derive2 { name="PredCRG"; version="1.0.1"; sha256="070cpm4a90s9q78hw352g9bp49im39grd66s8d870likhr8fnrwv"; depends=[Biostrings kernlab Peptides protr]; };
+  PredCRG = derive2 { name="PredCRG"; version="1.0.2"; sha256="0z84p8l2q66rapb9lhx8m8iadz3q989q5qkvcp8ylv80cz6qkibx"; depends=[Biostrings e1071 kernlab Peptides protr]; };
   PredPsych = derive2 { name="PredPsych"; version="0.4"; sha256="00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-4"; sha256="144xmfsp62ssmg501f4y173jrqyv8vps36j4yrwg6ghcmyc01wf8"; depends=[Hmisc lazyeval PBSmodelling ROCR]; };
   PredictionR = derive2 { name="PredictionR"; version="1.0-12"; sha256="0kgc8rjdqskasdaxsbir9gwvm55rw5cpdg3y9nsj7ccg9fc1ji19"; depends=[fitdistrplus Renext]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
   PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
+  PressPurt = derive2 { name="PressPurt"; version="1.0.2"; sha256="05kca0rlhlvhgnw3r3p4sh42zwvhrhcjdwz65ykp14jxybfhc8in"; depends=[data_table ggplot2 gridExtra reticulate]; };
   PrevMap = derive2 { name="PrevMap"; version="1.5.3"; sha256="0pgrfrfw587vsci98lxd205r8wl7x7c9ns15ypnhwr8xaysdxnpf"; depends=[lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
   PriorCD = derive2 { name="PriorCD"; version="0.1.0"; sha256="1mb50w2i8sfxjzqd5xnfysn3jnzkkyv6l8algxnp0xpyhcq41pfs"; depends=[dplyr igraph ROCR visNetwork]; };
   PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
   ProFit = derive2 { name="ProFit"; version="1.3.3"; sha256="0jrw0v7dg5mf4zxg7pqybh9qzsiqb3nnz8g5qlc4iz73mhr9gm2b"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; };
-  ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; };
+  ProFound = derive2 { name="ProFound"; version="1.14.1"; sha256="1p2mdy0z5p7as1x6vc572wjcl6f0acwgpvb39rmk2273kb1ldwz5"; depends=[celestial data_table FITSio foreach magicaxis RColorBrewer Rcpp]; };
   ProPublicaR = derive2 { name="ProPublicaR"; version="1.1.1"; sha256="08bhqm64r79ywj394l1ywwcsjc79wzi85wlbp5xnr49bxzaysfp1"; depends=[config dplyr httr lubridate stringr]; };
   ProTrackR = derive2 { name="ProTrackR"; version="0.3.7"; sha256="15m8g9v254avi68qr7v5q4fzhclkv1q849sj69fs0c9qcli1x384"; depends=[audio lattice signal tuneR XML]; };
   ProbBayes = derive2 { name="ProbBayes"; version="1.1"; sha256="0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn"; depends=[ggplot2 gridExtra LearnBayes shiny]; };
   ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
   ProbMarg = derive2 { name="ProbMarg"; version="1.0.1"; sha256="02qc6c08vfg3inh14d3dzq28zgsgk9p7kb2ni9d14pcx5w9q6sji"; depends=[]; };
-  ProbReco = derive2 { name="ProbReco"; version="0.1.0"; sha256="127gqc80ja4jwm0j2hc1gg3063knvgdhmr0l5i5iqpc64n6ljdnh"; depends=[BH mvtnorm purrr Rcpp RcppEigen StanHeaders]; };
+  ProbReco = derive2 { name="ProbReco"; version="0.1.0.1"; sha256="0ck5jvbgmf2j4qr4rsamjdrds5jzcggwcvs2hqzhh23ildk7hj7h"; depends=[BH mvtnorm purrr Rcpp RcppEigen Rdpack StanHeaders]; };
   ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; };
   ProbeDeveloper = derive2 { name="ProbeDeveloper"; version="1.0.0"; sha256="1d2zr8ikia3mspp2arpx7iwf4a4pq1ywl82pxbxrw6xpz313d5x9"; depends=[Biostrings TmCalculator]; };
   ProcData = derive2 { name="ProcData"; version="0.2.5"; sha256="17nm9sxv9k5mqjqabla6ldz1781446z566vz8cqs6cg1i6ngkrw8"; depends=[keras Rcpp]; };
-  ProcMod = derive2 { name="ProcMod"; version="1.0.3"; sha256="17x4c9vgf14l1x3hx3vyv3ygl8bb5qzq7fxg2cnl910drcdnv5sz"; depends=[expm foreach MASS Matrix mvtnorm permute Rdpack]; };
+  ProcMod = derive2 { name="ProcMod"; version="1.0.7"; sha256="0ka02pwnmgvm55cqh8lqjnamz42dqfwi3c0xglrz6zrmgag119f8"; depends=[foreach MASS Matrix permute Rdpack]; };
   ProfessR = derive2 { name="ProfessR"; version="2.4-1"; sha256="1wsbx0dsygc1ipzhgs1pd0lhdb0qvp4ydqzwarn6zv27rzf4p3bd"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProfoundData = derive2 { name="ProfoundData"; version="0.2.1"; sha256="1zqg821pv3i5nf76s7yppnmy13y14pj0l7rjhk50wlxrxdb53ibz"; depends=[DBI RNetCDF RSQLite settings sqldf zoo]; };
   ProjectManagement = derive2 { name="ProjectManagement"; version="1.3.3"; sha256="186vq7kd2rzqml88q6iskwb9h1xbl0azkn4dv2msd04klw6fir7j"; depends=[GameTheory igraph kappalab lpSolveAPI plotly triangle]; };
-  ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.2"; sha256="0ni0clx9k4amkhkss9ssw3gn40z6mnbxn1gaxgnphaasw0hj1mql"; depends=[]; };
-  ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.1"; sha256="17y1yf8cbcl3yha7mbk22lxmk2v5n98mfqsa886a3012ang4m5sp"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; };
+  ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.3"; sha256="09flfskpp0v7h9n7x9b15i4q242mzbcz6jkd2dqvrfa7sm4hpp8f"; depends=[]; };
+  ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.6"; sha256="0b2bljw5gslkw6jkajnk3jsx1kgi7bk9vrnivgkaxq76qi8bgsr9"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; };
   ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; };
   PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; };
   PropClust = derive2 { name="PropClust"; version="1.4-6"; sha256="1p15n98b6qprphgbhdqgnsxy9d9kik19h6j9f2dy6x1hkinrzsfa"; depends=[dynamicTreeCut fastcluster]; };
@@ -3309,18 +3430,21 @@ in with self; {
   PsyControl = derive2 { name="PsyControl"; version="1.0.0.0"; sha256="1c5ml6s3c8kzf7p0mig84bmq40b0491ah713bm6jpy2s3nwnmafs"; depends=[irtoys ltm]; };
   PtProcess = derive2 { name="PtProcess"; version="3.3-13"; sha256="0vk1n7hk6v592fi5ld70db6m92zgpjx97axs5h8p53c29984qhwz"; depends=[]; };
   PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
+  PubMedMining = derive2 { name="PubMedMining"; version="1.0.0"; sha256="03lhml5jk69racmhlh6xa8j2rv8xb87vg6hr1caiqpd4kqg16n1q"; depends=[easyPubMed stringr]; };
   PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
   PublicationBias = derive2 { name="PublicationBias"; version="2.2.0"; sha256="1mdvzf2qiq4zvp4iinjnnj0rq3dqcz18r27nr62znh05jp6i96gx"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; };
-  Publish = derive2 { name="Publish"; version="2019.12.04"; sha256="0vcfz6hx2bkwrksz6b0rx0w6j24h3qswgca06jhgq3jzvsmjjckx"; depends=[data_table lava multcomp prodlim survival]; };
+  Publish = derive2 { name="Publish"; version="2020.11.30"; sha256="0szyyb9b7g928qbiafakb6q8mnsld1bk8kya2vaiw3m30k2jgv3n"; depends=[data_table lava multcomp prodlim survival]; };
   PupilPre = derive2 { name="PupilPre"; version="0.6.2"; sha256="123m1zqld0jl26vqz41iic7vxzyfs1aw8zi5ki2cy6wzw9ss87m6"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; };
   PupillometryR = derive2 { name="PupillometryR"; version="0.0.3"; sha256="19llm6p67z0z29zxmjfz9ad624428szdjdd1ssj7j3zjcyjvqihy"; depends=[data_table dplyr fda ggplot2 itsadug lazyeval mgcv rlang signal tidyr zoo]; };
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
   Pursuit = derive2 { name="Pursuit"; version="1.0.1"; sha256="0c4bc0ldfx02a8ws3g3gn7smikg3fdjygybs3q764kxhq88kv42l"; depends=[MASS]; };
-  PxWebApiData = derive2 { name="PxWebApiData"; version="0.3.0"; sha256="1c2liqh1asd0mk4cvrwpl4pdid2rqfxrma284ah4hwr6sah5lk6w"; depends=[httr jsonlite pxweb rjstat]; };
+  PxWebApiData = derive2 { name="PxWebApiData"; version="0.4.0"; sha256="0n126fnfyfyvndvhalf8wiybnh00hlg25afxvni66s06r5v2pq8l"; depends=[httr jsonlite pxweb rjstat]; };
   PythonInR = derive2 { name="PythonInR"; version="0.1-12"; sha256="0f6jijbqdn6p2530l4v0b0ys1gcgji1d1i63bcd8g1ml21grvyfg"; depends=[pack R6]; };
+  Q2q = derive2 { name="Q2q"; version="0.1.0"; sha256="1n97axhcq64fg92cbndqw70c8awknjap91bh2h6i5cvd0c80pb85"; depends=[]; };
+  Q7 = derive2 { name="Q7"; version="0.1.0"; sha256="09jhqraajvlm7iiri4f7xlllkcx8q5h3sg472ishj47wg5qf2rym"; depends=[magrittr]; };
   QAIG = derive2 { name="QAIG"; version="0.1.7"; sha256="04ygizvplvrzhf1p0vwj75x7k8sl0ym5zbrsvn63y983awih2p6i"; depends=[Formula stringr]; };
   QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; };
-  QCA = derive2 { name="QCA"; version="3.8.2"; sha256="08gja6m64xwwq2ka2a4chsgbliczaj93kq90dcsa4dhwk202w2r4"; depends=[admisc shiny venn]; };
+  QCA = derive2 { name="QCA"; version="3.10"; sha256="1ws5k7zv0knsr7jn8xz7wvg2xbp1pbcqll6rpyvfvn4ll007y1wh"; depends=[admisc shiny venn]; };
   QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
   QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; };
   QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; };
@@ -3329,6 +3453,7 @@ in with self; {
   QCSIS = derive2 { name="QCSIS"; version="0.1"; sha256="0ibh3060jxf426svdfxiryvfhr8pwk991xs653d50ip4f9290y3a"; depends=[]; };
   QCSimulator = derive2 { name="QCSimulator"; version="0.0.1"; sha256="1ff7xagnzibhrwrmkqyky4ik3kx7rrlajrs1ypm210sl1d73jwvs"; depends=[ggplot2]; };
   QDComparison = derive2 { name="QDComparison"; version="3.0"; sha256="0y4494r3ixkyh58xr9md7c6xgcj1hgbjzfybvqqdbawjxvy5p38i"; depends=[]; };
+  QF = derive2 { name="QF"; version="0.0.3"; sha256="1gd90dyx5h7l1phm1hy7sg78b7l9dxydl63y1jmgaac704zrld1y"; depends=[Rcpp RcppGSL]; };
   QFASA = derive2 { name="QFASA"; version="1.0.3"; sha256="1yw745wk9ijvqs3hv0gbm6bkzjrlj42ipwbzypj73s3f7ygl452f"; depends=[boot futile_logger gamlss gamlss_dist Rsolnp]; };
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
   QGameTheory = derive2 { name="QGameTheory"; version="0.1.2"; sha256="0h3qkb0zg6km3s89bjnv9503hgcng4wfywfy1x5dsbj5azs9hs5w"; depends=[dplyr R_utils RColorBrewer]; };
@@ -3338,42 +3463,43 @@ in with self; {
   QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; };
   QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; };
   QRISK3 = derive2 { name="QRISK3"; version="0.3.0"; sha256="0aqqncmlhb5iks8081y34ydlls3g31j994fqqzsbsc3ckcks87qj"; depends=[]; };
+  QRIpkg = derive2 { name="QRIpkg"; version="0.2.1"; sha256="09pqkqi0jydnin1xvzk9vardp0748mf21p84336swl9wjqfnagwb"; depends=[ggplot2 quantreg]; };
   QRM = derive2 { name="QRM"; version="0.4-31"; sha256="15dyk3zfy92vj4xny04dh5mqcyb8qh61566m313qs17mxwibvn2a"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; };
   QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; };
   QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; };
   QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
-  QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.3"; sha256="15c43n0cazgzfg1w36vqb5mp4ylsglzzgbdziiqsjqwrhj8hnc6d"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl Rcpp stringr]; };
-  QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="2.1"; sha256="0m1asf1np9snjb9fj4pzrp34iwrfij44ampvw4ca58fdpaiqmx9h"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl QTL_gCIMapping Rcpp shiny stringr]; };
+  QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.3.1"; sha256="01lxa52fm6pzicjg252fxqy9hcj0rf511nzc3fcq25cfi9cly0v1"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl Rcpp stringr]; };
+  QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="2.1.1"; sha256="0a155vl869i3li2i67b89p056x50ycqp9yk0ll5g3fp3xcdl80zs"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl QTL_gCIMapping Rcpp shiny stringr]; };
   QTLRel = derive2 { name="QTLRel"; version="1.6"; sha256="1198qrrl7samm4jzliy5i8wfvladz6wpm48l1g2x6ackm1asiw75"; depends=[gdata lattice]; };
   QTOCen = derive2 { name="QTOCen"; version="0.1.1"; sha256="0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr"; depends=[MatrixModels quantreg Rdpack rgenoud survival]; };
-  QUALYPSO = derive2 { name="QUALYPSO"; version="1.1"; sha256="0qpjv6krz66qfgyzndxihy5shmlsb0zs3wh49sxp00fh2bci5msw"; depends=[doParallel expm foreach MASS Rfast]; };
-  QZ = derive2 { name="QZ"; version="0.1-9"; sha256="0i6cgywnfk8klsfr6x35fxzdshfhmps0b1fs5c7199r1rby0b3sc"; depends=[Matrix]; };
-  Qtools = derive2 { name="Qtools"; version="1.5.2"; sha256="1nv8s0q6snpw8lvf5lm6yf8fcf5cb2c32vswp9b9garv4gai2zmk"; depends=[boot glmx Gmisc MASS Matrix mice np numDeriv quantreg Rcpp RcppArmadillo]; };
+  QUALYPSO = derive2 { name="QUALYPSO"; version="1.2"; sha256="0hp99hhlv7rijn34ncshpvbnmhbx3f5km7bzr0z7yr7l3j1vx3sc"; depends=[doParallel expm foreach MASS Rfast]; };
+  QZ = derive2 { name="QZ"; version="0.2-1"; sha256="1xivasa5dppm9z02ki6ciqxj0ybxch41w1xszl9zqrf755b6f6xw"; depends=[Matrix]; };
+  Qapprox = derive2 { name="Qapprox"; version="0.1.0"; sha256="0mcrpmbpmj2hzv15a5rfc4l1vl3iccbsiw3a04zb4ql5mwr9ksyr"; depends=[]; };
+  Qtools = derive2 { name="Qtools"; version="1.5.3"; sha256="02vaz2zmn1vmqmij7zsqxapsydwfabksn0v3ih6bwkxpnnh8kqnf"; depends=[boot glmx Gmisc gtools MASS Matrix np numDeriv quantreg Rcpp RcppArmadillo]; };
   QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
   QuClu = derive2 { name="QuClu"; version="0.1.0"; sha256="0a2malh9vz5jcjgdx4d98k0c61vz3ip8ynqh5i85x8hzcby11qgj"; depends=[]; };
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
   Quandl = derive2 { name="Quandl"; version="2.10.0"; sha256="0kw3hh19q32vc1rr3y65ry3kyxc9dwyb94xpfv9srkpzg48damhr"; depends=[httr jsonlite xts zoo]; };
   QuantNorm = derive2 { name="QuantNorm"; version="1.0.5"; sha256="1hds9ybwsgnmcpa22vlmgdq02ilhn0c6a7z1qjiq4i5iqjd4gwf6"; depends=[]; };
   QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
-  QuantTools = derive2 { name="QuantTools"; version="0.5.7"; sha256="069rvh4yfar5dh6aj6p0q61gasvs9wr72x9pnj00lvyjlnv06p5n"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; };
-  QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
+  QuantTools = derive2 { name="QuantTools"; version="0.5.7.1"; sha256="1nkf7ihzfwgz7svh1jybgcvqwbim2dqzi00l4m9pma463va4q19d"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
   QuantileNPCI = derive2 { name="QuantileNPCI"; version="0.9.0"; sha256="043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38"; depends=[]; };
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
   QuantumOps = derive2 { name="QuantumOps"; version="3.0.1"; sha256="0gl1myf7q444imyvsjvxiaxaahf0n0bsggwbd0z3az73l6yf1gjh"; depends=[]; };
-  Quartet = derive2 { name="Quartet"; version="1.1.0"; sha256="0sndc86dbd57hv75qm7g8611jayqfx4y6qp215bxgyskhscxv09v"; depends=[ape memoise Rcpp Rdpack Ternary TreeTools]; };
+  Quartet = derive2 { name="Quartet"; version="1.2.2"; sha256="0yb4i55zvgn3al01qvr78v9psvn7b1x1fz69mmy3i010lqbyyjnq"; depends=[ape Rcpp Rdpack Ternary TreeTools viridisLite]; };
   QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; };
   R_SamBada = derive2 { name="R.SamBada"; version="0.1.2"; sha256="123a7s3rcmraq4chiqjkdp969jmr4c5br2xamdgvj6gzaf8zpmg0"; depends=[gdsfmt SNPRelate]; };
   R_cache = derive2 { name="R.cache"; version="0.14.0"; sha256="1n8n5ihkryrbxv630dwhz4r048nyv676qd3i9f5z5fa04hvlxbqq"; depends=[digest R_methodsS3 R_oo R_utils]; };
   R_devices = derive2 { name="R.devices"; version="2.16.1"; sha256="15zlnq3g27whq26fbcy5zfl5hiddm256h4rga4frblg6wqlbkvdd"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
-  R_filesets = derive2 { name="R.filesets"; version="2.13.0"; sha256="124rygq0bl9n4akxcm868nl30cyk3rz0iprb98zlpk62gci9f5fg"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
+  R_filesets = derive2 { name="R.filesets"; version="2.14.0"; sha256="08xv8b3c81nf54viyr3w912al18483k5gfnjpg7bxbdfk70dfzbh"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
   R_matlab = derive2 { name="R.matlab"; version="3.6.2"; sha256="1fw6ny8xb2j088k3s9lzd15av3j6xc2bvbccyrp7yjx2f3s3i8qv"; depends=[R_methodsS3 R_oo R_utils]; };
-  R_methodsS3 = derive2 { name="R.methodsS3"; version="1.8.0"; sha256="19c5870v7b59fs6xk58bh3rfkmhfralmgsax86zzpdmz47pga1g0"; depends=[]; };
-  R_oo = derive2 { name="R.oo"; version="1.23.0"; sha256="189fb7mmyzwg6nn8rza8iip7fbyws7i2vkmzy672x9mhvgilq4pm"; depends=[R_methodsS3]; };
+  R_methodsS3 = derive2 { name="R.methodsS3"; version="1.8.1"; sha256="16v1br7lf7vxv40z65giv9jnqkpnyqagcmgqa0s1jy7spj0zp64a"; depends=[]; };
+  R_oo = derive2 { name="R.oo"; version="1.24.0"; sha256="1divisff26fmiqg6vmabnwlrx079c066r8qvkakfp336vnwdm89p"; depends=[R_methodsS3]; };
   R_rsp = derive2 { name="R.rsp"; version="0.44.0"; sha256="0n9sxrffahgxcc8h9vgxg5i446g14cibixpf82nkpm5bvidhfsc9"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
   R_temis = derive2 { name="R.temis"; version="0.1.2"; sha256="1bar4vyjnc9plwqm66vbgf6rakgj095zb7wsypmf3j3az694y62q"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; };
-  R_utils = derive2 { name="R.utils"; version="2.9.2"; sha256="1krj1ny7y43lpm2q8c7swxfdc3ngy2j8knzv71f8bfsgh673nsxc"; depends=[R_methodsS3 R_oo]; };
+  R_utils = derive2 { name="R.utils"; version="2.10.1"; sha256="1gssnk73nhisc20by9kvfl4byfsmwrk6597na0x40ycck58lyylm"; depends=[R_methodsS3 R_oo]; };
   R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; };
   R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
   R2019nCoV = derive2 { name="R2019nCoV"; version="0.1.0"; sha256="1959mwacn0zzq0g5ili2v6aqs51rb6qvlsv16xx7qwml8xahf215"; depends=[dplyr ggplot2 jsonlite maps pinyin]; };
@@ -3391,15 +3517,16 @@ in with self; {
   R2jags = derive2 { name="R2jags"; version="0.6-1"; sha256="0h5si5d8yn6zxbfmv38kmyqhpwm1valnnn3sb445465m8rafl5y6"; depends=[abind coda R2WinBUGS rjags]; };
   R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; };
   R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
-  R3port = derive2 { name="R3port"; version="0.2.3"; sha256="0m0nkmr0hj4dhb762vnin3iqhp6j4a73aslgz59wwlqi7v421vaj"; depends=[plyr reshape2 tinytex whisker]; };
+  R3port = derive2 { name="R3port"; version="0.2.4"; sha256="0h1n5v1hkdqbars8xsid208wkr8jw9gwx5j2gprfl58fh0d2rc94"; depends=[plyr reshape2 tinytex whisker]; };
   R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; };
-  R6 = derive2 { name="R6"; version="2.4.1"; sha256="0gma5z41mx02ka9h96xdyf3p6i1rx0izczrzj26c4mbnh9jgvc16"; depends=[]; };
+  R6 = derive2 { name="R6"; version="2.5.0"; sha256="00ifi2kwa7kn67xf0z1w6jfdicjczygbyi5mhfw2qlzc4sbazhdf"; depends=[]; };
   R62S3 = derive2 { name="R62S3"; version="1.4.1"; sha256="0g01izg77spn79xqwva2gzrvk66i20xlb789wl5rgcz7pz7gpjd2"; depends=[data_table]; };
   R6DS = derive2 { name="R6DS"; version="1.2.0"; sha256="0ai1yqfhn634vm88waxdb6j24vwcna29gdqzdrwm0nxwf7l6g0m3"; depends=[R6]; };
   RAC = derive2 { name="RAC"; version="1.5"; sha256="0q0kk9j3blrnhv0rfmryc35lli5j4kds2vmjdpg77znagb45609k"; depends=[maps maptools matrixStats ncdf4 plotrix raster rgdal rgeos rstudioapi sp]; };
   RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
   RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; };
-  RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.19"; sha256="1h5z8dwla6bzl0chgczy68dqilxwldaabl0jc8xg3zp30yghxf4g"; depends=[ape cluster MASS Matrix optimx pbmcapply Rcpp RcppEigen rgl rrBLUP stringr]; };
+  RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.21"; sha256="076x39rm20j4v7s1c1j0dck7kbwnzm6ddaxd46h9j112f0r5ka76"; depends=[ape cluster expm ggimage ggplot2 ggtree haplotypes MASS Matrix optimx pbapply pbmcapply pegas phylobase Rcpp RcppEigen rgl rrBLUP scatterpie stringr]; };
+  RALSA = derive2 { name="RALSA"; version="0.90.1"; sha256="1yssxzyii7jhki8c4mmi8l5z8p81p0hds7lq8y77kd0xflq9mxa6"; depends=[data_table DT foreign gdata Hmisc openxlsx readr shiny shinydashboard shinyFiles shinyjs stringi stringr]; };
   RAM = derive2 { name="RAM"; version="1.2.1.7"; sha256="0aalswivpjs1glwf4yh3b79lch3n32fyj5xda55h3v7gzs7p0d7f"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
   RAMP = derive2 { name="RAMP"; version="2.0.2"; sha256="0836fiycrsxiwdw7srz1rvsf639iqh2rk89gavx4kvn0i0sc8d2x"; depends=[]; };
   RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; };
@@ -3408,15 +3535,15 @@ in with self; {
   RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
   RAPTOR = derive2 { name="RAPTOR"; version="1.0.1"; sha256="1bj3xsl83mb8zwap8icywrfdld382fram79b0n14jbk1l87rj9r4"; depends=[mgcv]; };
-  RATest = derive2 { name="RATest"; version="0.1.7"; sha256="0xam006fp8qapq2lggpa0bq33qi1ziads6kfsqprdgvcfk64qzsn"; depends=[ggplot2 gridExtra quantreg]; };
+  RATest = derive2 { name="RATest"; version="0.1.8"; sha256="13z2dlyq3cxgqphzjfx4wabbkk4kf33ybmnhcs6f034kya2z7yj3"; depends=[ggplot2 gridExtra quantreg]; };
   RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; };
   RAhrefs = derive2 { name="RAhrefs"; version="0.1.4"; sha256="0yd7jbv2x711dnhbvwjjg7qhg8h8bh5564amsv9bkqw661i042m3"; depends=[assertthat httr jsonlite testthat]; };
   RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
-  RAppArmor = derive2 { name="RAppArmor"; version="3.2.1"; sha256="0n75clpha3452jqk4idb6kffc4zw3vim60k5wh7ajcpwab10j94s"; depends=[unix]; };
-  RAthena = derive2 { name="RAthena"; version="1.10.0"; sha256="116h61850spygvkx64bd8jq9gx5s72bk4cnf70mmyjxbkiyvg3ps"; depends=[data_table DBI reticulate]; };
+  RAppArmor = derive2 { name="RAppArmor"; version="3.2.2"; sha256="0l0f4k666nh00db94sjxz60anr4l9vm0259pcc2a4whk2pmjcq5n"; depends=[unix]; };
+  RAthena = derive2 { name="RAthena"; version="1.11.1"; sha256="0fb7hnlxkjcwxmjcyiwxhj697zqbcyn96lpvf7x8cviivgx8xldk"; depends=[data_table DBI reticulate uuid]; };
   RBF = derive2 { name="RBF"; version="2.0.1"; sha256="1jkjyhb9mdqh59cnyn5x83624cy1wg328x83l422qyh20nckvszp"; depends=[]; };
-  RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; };
+  RBMRB = derive2 { name="RBMRB"; version="2.1.4"; sha256="1n5kskcsw0ks3f97mnlbkgvwdnxv3s6xy02b8cj5wq3hdpf66h94"; depends=[data_table ggplot2 httr plotly rjson]; };
   RBNZ = derive2 { name="RBNZ"; version="1.1.0"; sha256="11fdnc2pmw5nq3lswid078l307ln6853a3b9d383msvrkz6yms26"; depends=[httr lubridate readxl rvest xml2]; };
   RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
   RBaseX = derive2 { name="RBaseX"; version="0.3.0"; sha256="15hn04ijvqbza8brca7g06yi621hyf3gjgkfvf1wp4jgzysgd8ww"; depends=[data_table dplyr magrittr openssl R6 RCurl stringr tibble]; };
@@ -3424,14 +3551,15 @@ in with self; {
   RBitmoji = derive2 { name="RBitmoji"; version="0.0.2"; sha256="1v9qj3vmqsvnccsy735nbflmd81183h2flm0f1ckd4kl08r2fr3f"; depends=[getPass httr jsonlite png RCurl]; };
   RBtest = derive2 { name="RBtest"; version="1.1"; sha256="09da721zfj6cw4i9gifn5f0sv3nj0qfjb96c5w9g9gzx55ihssnk"; depends=[mice nnet psych]; };
   RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; };
-  RCAL = derive2 { name="RCAL"; version="1.0"; sha256="1hpn69891h9cildwr6wsssa3fnnzyw0xw9vfgf4qdg0m9x6il6qb"; depends=[trust]; };
+  RCAL = derive2 { name="RCAL"; version="2.0"; sha256="1k58im8dclyaqqcqm6v9618rlh8jkp74j7ly2lvqfb9jm0wgkx8h"; depends=[trust]; };
   RCALI = derive2 { name="RCALI"; version="0.3.1"; sha256="0hc7h55qi8bpmp9rfh1wgxqs28kbs4yqxch2jlgl42vk5383askq"; depends=[splancs]; };
+  RCBR = derive2 { name="RCBR"; version="0.5.9"; sha256="1nxaf485jfg1kr80bxwczf27xz5ab7yz61c5l3bg9192jdf432ql"; depends=[Formula Matrix mvtnorm orthopolynom REBayes Rmosek]; };
   RCEIM = derive2 { name="RCEIM"; version="0.3"; sha256="1kil5r88b6lf8vxmswz0wn0hhjxjm8jmlcl5kxjwl6fwjyy2z120"; depends=[]; };
+  RCGLS = derive2 { name="RCGLS"; version="1.0.3"; sha256="12mmfs91fmhdxdxr7q16hnjlg7bz2bbkf8chld4cyf8clnflzvsj"; depends=[ncdf4 raster RCurl sp]; };
   RCPmod = derive2 { name="RCPmod"; version="2.190"; sha256="1r24g8fcizyqzgp0da90sxpwalgcsgz2b168j2smpylxraiqb037"; depends=[fishMod glmnet gtools MASS]; };
   RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; };
   RCSF = derive2 { name="RCSF"; version="1.0.2"; sha256="1hjl7qsdgcddn3nh2likndhfhnw9gj3453xqq96gddgb1y0m3bh1"; depends=[Rcpp]; };
-  RCT = derive2 { name="RCT"; version="1.0.3"; sha256="04p9pc9s7gwjly5d8c7xa2x9y7jz1mcf8jxbjql1x2wvwsbmkq6z"; depends=[broom dplyr forcats ggplot2 glue lfe magrittr MASS pracma purrr rlang stringr tidyr tidyselect]; };
-  RCarb = derive2 { name="RCarb"; version="0.1.3"; sha256="0z5hpnlzlvbh14f1wjy9rw4ljdsiqdzmqnmh3yqz7mbw5qxx4gzz"; depends=[interp matrixStats]; };
+  RCarb = derive2 { name="RCarb"; version="0.1.4"; sha256="0mlas45ypwdkk6gr35fhsrjgn8am06ikh123drmky1yj1kkg6p76"; depends=[interp matrixStats]; };
   RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
   RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; };
   RCircos = derive2 { name="RCircos"; version="1.2.1"; sha256="1zdq3ga2pd0p2gzlm0vr8w3a4rq4hgka3r56kkcym0za0nmqk51v"; depends=[]; };
@@ -3442,7 +3570,8 @@ in with self; {
   RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCurl = derive2 { name="RCurl"; version="1.98-1.2"; sha256="1a57jm41550ah3v7cqdv5gdabhp375qgcndr901lns65qg6s0x2x"; depends=[bitops]; };
-  RCzechia = derive2 { name="RCzechia"; version="1.5.1"; sha256="1mxkwrlfg16vpah865lj0519a3vr5icbwsdj33bybkn4gmxfjl3a"; depends=[curl dplyr httr jsonlite magrittr rlang sf]; };
+  RCytoGPS = derive2 { name="RCytoGPS"; version="1.0.1"; sha256="0n0vc9r8wd0ccxgadkggjvzim5fjg4hjscs1n037ndgmks02pf3m"; depends=[rjson]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.6.1"; sha256="043zsswggi5ckdldjacjgbw2bhyz4jhy9m731rb1rk458jy1k5d3"; depends=[curl httr jsonlite magrittr sf]; };
   RDFTensor = derive2 { name="RDFTensor"; version="1.2"; sha256="0ijqb78wwjgz2x52z4zr1mn0lmcj8c0gx04j67cld8zfcqkn0mpg"; depends=[doParallel foreach Matrix pracma]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
@@ -3453,15 +3582,14 @@ in with self; {
   RDieHarder = derive2 { name="RDieHarder"; version="0.2.1"; sha256="1lz5qb51r321wxarnzaf37zxg19fcq8blw2qw3kspgbkvx283l0w"; depends=[]; };
   RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; };
   RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; };
-  REAT = derive2 { name="REAT"; version="3.0.2"; sha256="0x5cal502n8abynx1jk2ccmmggvd41rvd2gc6rxkbyvcp4794l82"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="2.2"; sha256="1jh5vw9pbcf5gpmx3b5b36fh8rz5y8npx53aai0kxh49kjf8d63c"; depends=[Matrix reliaR]; };
   RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; };
   REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.1"; sha256="14hnqjp53w4dl0fwlkr9x9qqm022280r0069akiz4c9axlmyds9r"; depends=[curl data_table keyring lubridate]; };
   REDCapR = derive2 { name="REDCapR"; version="0.11.0"; sha256="0frhmnm25w9b84qk7vvvr8wkv1w3dmm0vqxav2cs7jimq38zwcvz"; depends=[checkmate dplyr httr magrittr readr rlang tibble tidyr]; };
-  REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
   REPLesentR = derive2 { name="REPLesentR"; version="0.4.1"; sha256="0rwd7hxk12f4f1kpj6sl424yhbxi3h9dz6km5awijazmgv95carz"; depends=[dat knitr modules]; };
   REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; };
+  REPPlabShiny = derive2 { name="REPPlabShiny"; version="0.4.1"; sha256="0wim27jm01xbi316jfz5j30sid7z1wsznhrpmxrbd97d4312449w"; depends=[DT REPPlab shiny]; };
   REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; };
   REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
   REREFACT = derive2 { name="REREFACT"; version="1.0"; sha256="0nggva4qfqlcs58df3sgiigw0z75l5kg8c1yh0k5qsvjnhiq19vn"; depends=[combinat gdata Matrix psych]; };
@@ -3470,7 +3598,8 @@ in with self; {
   REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; };
   REddyProc = derive2 { name="REddyProc"; version="1.2.2"; sha256="0b1vyv92wxbvdh1jaqmfb4qb1clpbh50j8h55nq777zc1l9ml4a7"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; };
   REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; };
-  REndo = derive2 { name="REndo"; version="2.4.0"; sha256="0rm5fizgqjwsh6n4ld2vr3i7ynxx8dsxh9vfvn6khjnc78l4jlwp"; depends=[AER corpcor data_table Formula lme4 lmtest Matrix mvtnorm optimx Rcpp RcppEigen]; };
+  REndo = derive2 { name="REndo"; version="2.4.1"; sha256="0knyyc2l2lsr0wrswhvsqsac1k257j46hii84xdl4nhwqch9qzxi"; depends=[AER corpcor data_table Formula lme4 lmtest Matrix mvtnorm optimx Rcpp RcppEigen]; };
+  RFCCA = derive2 { name="RFCCA"; version="1.0.2"; sha256="17zqk95zlm00vhj55yz828kqpkx9bhwg1m6f4s7ij9bcmx72l2gq"; depends=[CCA PMA]; };
   RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
   RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
   RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
@@ -3485,7 +3614,6 @@ in with self; {
   RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; };
   RGCxGC = derive2 { name="RGCxGC"; version="1.1-2"; sha256="03ihqra8q50a98adgxrx8l7js963f41kg2fy3lxzh9zma4gzj62q"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; };
   RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; };
-  RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.5"; sha256="1jqyp91x569la1vc6wl6v7jq6iq1cx2qkds9yiqm85bgzydp4lxw"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
   RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
   RGISTools = derive2 { name="RGISTools"; version="1.0.2"; sha256="0pildj5pmc34f58bv39gxl3p2g0cr32przdhjnss37kcdlcv5zlb"; depends=[curl fields httr mapview raster Rdpack rjson rvest sf sp stars tmap urltools XML xml2]; };
@@ -3502,14 +3630,15 @@ in with self; {
   RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; };
   RHMS = derive2 { name="RHMS"; version="1.6"; sha256="067vxx0s338ziyyshq386br7b8ksycqinn16qnvb53ldshyw0dcm"; depends=[GGally ggplot2 Hmisc network pso]; };
   RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; };
-  RHRV = derive2 { name="RHRV"; version="4.2.5"; sha256="1xjmcb9w285x3q930hm91ln4b8zhd9s741h5iwd71pj0cdf184gh"; depends=[lomb nonlinearTseries tkrplot waveslim]; };
+  RHRV = derive2 { name="RHRV"; version="4.2.6"; sha256="1rdfq1xnimli709waypwhw1v277hxhmiy7ziizgqi4522nip4h49"; depends=[lomb nonlinearTseries waveslim]; };
+  RHSDB = derive2 { name="RHSDB"; version="0.1.0"; sha256="1vhx5q19pi91283d20cc7950f01cqq8frbmxaf9kvxbv6pijhdk9"; depends=[]; };
   RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
   RHawkes = derive2 { name="RHawkes"; version="0.0"; sha256="0qi32f6im6fsgvjs8bravc5z21557zn2d0a7i88dy0rri7czm5p7"; depends=[IHSEP]; };
   RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; };
   RIA = derive2 { name="RIA"; version="1.4.2"; sha256="0i7z16viwgdsdnlkxq44p5l492asxv7ghn8005hlvpyxqihazkqw"; depends=[nat oro_dicom oro_nifti]; };
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
-  RISCA = derive2 { name="RISCA"; version="0.8.2"; sha256="16vpbg0grl497y5r6a3vm0nj1si6qbc6xxiyjb4wsmfgk13rw1dp"; depends=[caret date doParallel foreach glmnet kernlab MASS mvtnorm nlme nnet relsurv statmod SuperLearner survival]; };
-  RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; };
+  RISCA = derive2 { name="RISCA"; version="0.9"; sha256="0fq474xv8dcj548wm3dydz70cgvmgrz3h8q1mlzyrxbbwrvzx8wm"; depends=[caret date doParallel foreach glmnet kernlab MASS mvtnorm nlme nnet relsurv statmod SuperLearner survival]; };
+  RISmed = derive2 { name="RISmed"; version="2.2"; sha256="0nwixhngi4r2f73362salivsmsf7l52bm13jqvhdq8mfiigm80vd"; depends=[]; };
   RIdeogram = derive2 { name="RIdeogram"; version="0.2.2"; sha256="0wvzlnisnxwzdzfh8ph4yspr8abi5qk6p4z2qa14ykzn8yry61ni"; depends=[ggplot2 grImport2 rsvg scales tidyr]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
   RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; };
@@ -3522,7 +3651,8 @@ in with self; {
   RJSDMX = derive2 { name="RJSDMX"; version="2.3-3"; sha256="02lbg82g4abng5vcn2g8ghvmg69q35my8smnbvd09yvha8hb49ps"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.4"; sha256="141ijm9570mg1180isvi0jb9vd3b08s5gb9dl1wa5v0m3s9jq52l"; depends=[]; };
   RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; };
-  RJafroc = derive2 { name="RJafroc"; version="1.3.2"; sha256="11waf05ljzfrizsbb2y6bd2cd8k7950kbq26sfyfgf4idh5w0mbp"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; };
+  RJafroc = derive2 { name="RJafroc"; version="2.0.1"; sha256="1vrjnqn1lv10945ba29zjlbkh3zyw28ppv4093v24lirw8vzmjp4"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp readxl stringr]; };
+  RJcluster = derive2 { name="RJcluster"; version="0.1.0"; sha256="0pjabvh006gplds5h2wq5k7cwzp8rksamzvy3daahhbadvar4jr8"; depends=[doParallel foreach infotheo matrixStats mclust profvis Rcpp RcppArmadillo rlang]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-4"; sha256="1j4643xc8k3zy4rv0h8dd154jafihnjr43wzz3d93j11g2w9xhq3"; depends=[rJava]; };
   RKEEL = derive2 { name="RKEEL"; version="1.3.2"; sha256="120x49zblhs7grqj919m3ll9q5ddr3kkqicy1am5b8hahybiz5al"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
@@ -3536,80 +3666,84 @@ in with self; {
   RLT = derive2 { name="RLT"; version="3.2.2"; sha256="1a8cip975z99g8ljng4y86wv1gf1xwg0sqnxz79wj6zxpw8fk37c"; depends=[]; };
   RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; };
   RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; };
-  RLumCarlo = derive2 { name="RLumCarlo"; version="0.1.6"; sha256="0pprmsd20wqlwbyf9s26p8znpa3i7zj9rn9fhlhhca1zlh0m6ziw"; depends=[abind doParallel foreach khroma magrittr Rcpp RcppArmadillo scatterplot3d]; };
+  RLumCarlo = derive2 { name="RLumCarlo"; version="0.1.7"; sha256="1r70d68y3l43pb47wxhhbgbirnnx0hyaklvphlqrhnlkxp04r4xk"; depends=[abind doParallel foreach khroma magrittr Rcpp RcppArmadillo scatterplot3d]; };
+  RLumModel = derive2 { name="RLumModel"; version="0.2.7"; sha256="03ydiccwj5a3m2wxhz40za546bw83s2lmcz7akdwx6ms6azdd9kk"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
   RLumShiny = derive2 { name="RLumShiny"; version="0.2.2"; sha256="0rwl555564ccw4pdzya88s3h3q30iq5dmi77141ji8ir91x4rz3g"; depends=[data_table DT googleVis knitr Luminescence RCarb readxl rhandsontable rmarkdown shiny shinydashboard shinyjs]; };
   RM_weights = derive2 { name="RM.weights"; version="2.0"; sha256="1by1z7gwwx0jjhhvsjkr7f6m7n0x43bj080ah5275cja7xqr5nm6"; depends=[Hmisc psychotools]; };
   RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
-  RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; };
+  RM2006 = derive2 { name="RM2006"; version="0.1.1"; sha256="1bx2y58c8fkpv0d1sn5abxbajks3sbz2v00idnvbp7rw1i05i5q4"; depends=[]; };
   RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.7"; sha256="10hgssy59fcjbv333grpf6f3m7924hav66xxqhdlsdnwix19q7sb"; depends=[chron date vars]; };
   RMKL = derive2 { name="RMKL"; version="1.0"; sha256="118xdnzljskyf4ibdrlhy07r1y1x5r2b0mqagqaabxs7s9503whc"; depends=[caret e1071 kernlab Rcpp RcppArmadillo]; };
   RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; };
+  RMLPCA = derive2 { name="RMLPCA"; version="0.0.1"; sha256="1xzh6fwl71dzdpbqgpkqnmdzdk8rblg6n1ddic5yxxfvzg3bh13x"; depends=[Matrix pracma RSpectra]; };
   RMOA = derive2 { name="RMOA"; version="1.0.1"; sha256="1ppbwqdfxzk1ayms0rqw22l0r8vkk8av39spwpq8avgl6vssw8c4"; depends=[rJava RMOAjars]; };
   RMOAjars = derive2 { name="RMOAjars"; version="1.0.1"; sha256="0qzpwsbndn8fw9560z9h9w9ff9bx6xj7mr50683q1n3dpn5z637i"; depends=[rJava]; };
   RMPSH = derive2 { name="RMPSH"; version="1.1.1"; sha256="0jffp8942ydwain23kvy7q6avpxxsb77jj1mg4bq43fwgfc9nqjy"; depends=[Rcpp]; };
-  RMPSS = derive2 { name="RMPSS"; version="1.1.1"; sha256="0577z4jmzdirc32ibsnc6gslqjni75w6a1vvybxksaf0lmc0mdz6"; depends=[Rcpp]; };
+  RMSNumpress = derive2 { name="RMSNumpress"; version="1.0"; sha256="0vc35ciaz03agq2cmlmy54dc0yq0c9d6zm0p04nd5pyaq5rlf318"; depends=[Rcpp]; };
   RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; };
   RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
   RMaCzek = derive2 { name="RMaCzek"; version="1.3.4"; sha256="1pg19jx74zdslbffw04agr9fn72sm4ad38rlwgncm84l75m107mr"; depends=[GA seriation]; };
   RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; };
-  RMariaDB = derive2 { name="RMariaDB"; version="1.0.9"; sha256="0gvs8k70jjy6pymc7l02c2p2inxpgphg5hsvwm2q834clr4xllxi"; depends=[BH bit64 DBI hms plogr Rcpp]; };
+  RMariaDB = derive2 { name="RMariaDB"; version="1.0.11"; sha256="0rv41khf13b8vzrb5fl6sgrn1dyfn1d2mvn6ypn68r82q6b3984g"; depends=[BH bit64 DBI hms plogr Rcpp]; };
   RMark = derive2 { name="RMark"; version="2.2.7"; sha256="0qxa383cagzqrnfc3izybb4lrg8z1r3nw1j5b7h4wkjwy0k3kczb"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; };
   RMixtComp = derive2 { name="RMixtComp"; version="4.1.2"; sha256="1a7digfxx0wx1p0fvyvhznffzd13lzf64c2y6gvrgj7wv2z8hg5k"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; };
-  RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.5"; sha256="14xr8ysg9avqhry19iykdg17h0hg8ms15isxcmcvn03q0cap8vim"; depends=[BH doParallel foreach Rcpp RcppEigen]; };
-  RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.2"; sha256="1wasg6d3yr5pwwmaflc1ph3vz6s3wgcqxlzrygfaqvaqgg8llk03"; depends=[ggplot2 plotly scales]; };
-  RMySQL = derive2 { name="RMySQL"; version="0.10.20"; sha256="0lv9m6zpm8dgv7yixr6xhw379vbq45d7n7gkrmjrppdj8vcih77i"; depends=[DBI]; };
+  RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.6"; sha256="1r0za8s31mk9d3vgvsj930qpy5xnzdfgz06fjg5qzzc2l6jp96k3"; depends=[BH doParallel foreach Rcpp RcppEigen]; };
+  RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.4"; sha256="1rhdmiap7xm96igclas67dz8naywjkddydbk9m3hp0d0zhgblc5i"; depends=[ggplot2 plotly scales]; };
+  RMySQL = derive2 { name="RMySQL"; version="0.10.21"; sha256="0cbb5ln9iigl816nzvsls9zil5qlfr8yv2aginapqv6n69nz0srs"; depends=[DBI]; };
   RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.4"; sha256="16ab0p0378j4vvcazynffsgx1rq32llf1sz4h4pp5lrx820j6qvx"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
   RNAsmc = derive2 { name="RNAsmc"; version="0.6.0"; sha256="0q4b24baabzx41zqygy6l2jnyzc4m7knmlnhra4hhc5f5cl5ab8r"; depends=[circlize RRNA]; };
   RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; };
   RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
   RNCEP = derive2 { name="RNCEP"; version="1.0.10"; sha256="19ja7pcp7ajwhqhqw92pdmvxzyjc4kw3943pllpx47s1zvi6dmci"; depends=[abind fields maps RColorBrewer sp tgp]; };
   RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; };
-  RNGforGPD = derive2 { name="RNGforGPD"; version="1.0.2"; sha256="0z1jawq3342ffbv1jp7kfzll9pac5ff09qb3fd0vz564kqcvik0n"; depends=[corpcor Matrix mvtnorm VGAM]; };
+  RNGforGPD = derive2 { name="RNGforGPD"; version="1.1.0"; sha256="0zriv0pd86ciwrms95bbb9wh40xvxv20vla2hxbmaynfy1s1vd4j"; depends=[corpcor Matrix mvtnorm]; };
   RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; };
-  RNOmni = derive2 { name="RNOmni"; version="0.7.1"; sha256="0lzd820x9yw90ddzmxvd89pkqc3nrljlc6kz4cab50zj3s755ack"; depends=[abind foreach plyr Rcpp RcppEigen]; };
+  RNOmni = derive2 { name="RNOmni"; version="1.0.0"; sha256="1zn0yswycvzc3bm5rd7n84b2jbb5rdl66m4x5miz9pv7h6wsckkv"; depends=[plyr Rcpp RcppArmadillo]; };
   RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
   RNeXML = derive2 { name="RNeXML"; version="2.4.5"; sha256="1wsl4xq9w5bp3wk69dw57bg0qcw1vs6ajwya4p0w1r00ck5pwrib"; depends=[ape dplyr httr lazyeval plyr reshape2 stringi stringr tidyr uuid XML xml2]; };
   RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; };
-  RNetCDF = derive2 { name="RNetCDF"; version="2.3-1"; sha256="1ij4cfhfplky8yhikc5ghafk8812bp9v8fqf9kfp3bm2wip1jdvm"; depends=[]; };
+  RNetCDF = derive2 { name="RNetCDF"; version="2.4-2"; sha256="14jgqp3ynf1ndkzbwx7xmxd9gimjigm4012mrn9p076xd2y4qxci"; depends=[]; };
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; };
-  RNewsflow = derive2 { name="RNewsflow"; version="1.2.4"; sha256="1xbkmm7fvpn0ms0qcyn1k33k1gc462cxr1vr5mf5snqvgl836ykq"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; };
-  RNifti = derive2 { name="RNifti"; version="1.1.0"; sha256="1z8ninp3aq18w0slcfn8r2fp48cdz8l0k0namsrnvgyp8lzcpqpn"; depends=[Rcpp]; };
-  RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.8"; sha256="19lij5zplw7jw65ykkjl85iqpfq3i6sia4wnq7fmkv1xlzwda2f4"; depends=[ore Rcpp RcppEigen RNifti]; };
+  RNewsflow = derive2 { name="RNewsflow"; version="1.2.5"; sha256="0q7w0p727b1srdrx4mhbl31hfl4fxcavs5asg2knim4ihw034qqd"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; };
+  RNifti = derive2 { name="RNifti"; version="1.3.0"; sha256="1zr0q79id62csmc30c7gs4hbmavk8n6p50a981sfz51dczhjj5ny"; depends=[Rcpp]; };
+  RNiftyReg = derive2 { name="RNiftyReg"; version="2.7.0"; sha256="0y7s2zcjjnb9jakdhyd6hmdj9axdpvbnhijs2finnlwc0d09jpz1"; depends=[ore Rcpp RcppEigen RNifti]; };
   ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; };
   ROCR = derive2 { name="ROCR"; version="1.0-11"; sha256="0amvvrkiflmr3qygrsgrsja4gaf2v6r6h6i2bgpsm8r069vmlf2p"; depends=[gplots]; };
   ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; };
   ROCit = derive2 { name="ROCit"; version="2.1.1"; sha256="0sd6ckh7k8aqwhzzp3qff6g7d03klbr0mbp403pib3823c8pqa55"; depends=[]; };
-  ROCnReg = derive2 { name="ROCnReg"; version="1.0-2"; sha256="1wf8fsf5sy5c66c8hpiwl1pja1mva1f5vgp12020z1k7nyyf5ak6"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; };
+  ROCnReg = derive2 { name="ROCnReg"; version="1.0-4"; sha256="0kgr3pz39wqd0ngp2xh2avqvcbjg5vnffnpjw0fsfvwjxhrc2i6a"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; };
   ROCpsych = derive2 { name="ROCpsych"; version="1.3"; sha256="0fcrhhxmvrrchbswb94liahbgz5pfhs86fbj0vby7vnakrhngh7v"; depends=[pROC reportROC]; };
   ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
   RODBC = derive2 { name="RODBC"; version="1.3-17"; sha256="1xq4lzx1a09lmnd2lwj5z099z3pfg3r7y2da7rf4sd2wyqswi7s6"; depends=[]; };
   RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; };
   RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
-  ROI = derive2 { name="ROI"; version="0.3-3"; sha256="06d9cqa7g5n10cynkkmy42ilzs7jj2lfz9snimis6ipgkm5n0xr9"; depends=[registry slam]; };
-  ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1"; sha256="0cr4iy4p590zsp47jqyrvhamc4xa9nkpnnddmwqbkgvzmzxf83ap"; depends=[globalOptTests ROI]; };
-  ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-2"; sha256="1brlqyprvrq32ww36j3aa4nqfcn1q1mfv58vv92rlv23cb6b94sv"; depends=[R_utils Rglpk ROI]; };
-  ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.1"; sha256="0dhiiyw9srlih3x381jlgl11y0vr9qyn91b7xi208a0vpsmassa7"; depends=[ROI]; };
-  ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="0.3-1"; sha256="1b70qnm7s5gdcpn7y61gbwcln7r48gvp6hkmdwrvz1qvlsgaz6rk"; depends=[alabama ROI]; };
+  ROI = derive2 { name="ROI"; version="1.0-0"; sha256="0hd3l219wanhanbf4pgrh1pbxah50gf5qg2gff1djdr1xns7zn5h"; depends=[registry slam]; };
+  ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1-1"; sha256="1zj636cmjhhqbn6hh6760bi5y8lf6y7qqkz72yijq7dj2y1za2ph"; depends=[globalOptTests ROI]; };
+  ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="1.0-0"; sha256="12yxra45s9f14dn12wibxrz598g3s39lm3af4dxmw9jnlfb8z84b"; depends=[R_utils Rglpk ROI]; };
+  ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.1-1"; sha256="1h59i7mc21kgwi4mz0qpfj855bp6d2qkrp40lm02dqhf79sps26k"; depends=[ROI]; };
+  ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="1.0-0"; sha256="1h4154w730y06zak0s199lafwnip4xqnnh33ghkyg39y71sn9nfz"; depends=[alabama ROI]; };
   ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[clpAPI Matrix ROI slam]; };
   ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.3-0"; sha256="1ipwvclrxws7nvirvns58gpakg23ldiphyl6g0akxk5hczr0lazf"; depends=[Rcplex ROI slam]; };
-  ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="0.3-2"; sha256="1crmmmxfqcrwp51c74i2s7gdq3rj1imwr8zhwl6xcnjsg24snm3q"; depends=[DEoptim DEoptimR ROI]; };
-  ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.3-1"; sha256="1d409hc4cnd1q9d5ldylygis82a4ha1hfbqq36vn7n4xx89wf0k3"; depends=[ECOSolveR Matrix ROI slam]; };
-  ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.3-0"; sha256="1a1vag47lfhiqmplrbkp95k36angpi9nvh0jd4cgy5y2416w22hn"; depends=[Rglpk ROI]; };
-  ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-3"; sha256="19iir79dg9vb2dlii9a9j9zn5clawzddypdxdwj3vmqh66yk8n5a"; depends=[lpSolveAPI ROI]; };
-  ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="0.3-0"; sha256="00zvjqq2sj7iaymc0lrf5lmqfbqilwh8llmq841lvsmbps45w41k"; depends=[ROI slam]; };
-  ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="0.3-2"; sha256="17s06a9b2adz3m1lh0javw8dfi7gpssnkgalla8693pb38gazbm0"; depends=[ROI xml2 xmlrpc2]; };
-  ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-3"; sha256="0ls241xahmd77q2s02mpzr1i10nq5vqgic5j786y9q00f6c3lxyd"; depends=[nloptr ROI]; };
-  ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.3-3"; sha256="0kqzihx655jxw194xrx5qkdp4pls5wqi479pilw5pnkfvzl3sdgp"; depends=[optimx ROI]; };
-  ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-3"; sha256="132zr4nx220697j2x1vm4sl1wklbrnh549zh5gb0zn7q206r56r4"; depends=[checkmate Rcpp ROI slam]; };
-  ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-5"; sha256="1c4fd16kgg60gfs52xc64ii4kzl8fb8qz3rpy69d08avb4q6grir"; depends=[quadprog ROI slam]; };
-  ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-2"; sha256="0g48awvbsnmdlviksyc57piqvhwfx63iq68ymyrgfxfwkjrk4fwl"; depends=[ROI scs slam]; };
-  ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; };
+  ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="1.0-0"; sha256="1v093r6d14w12p2lmzcnlja9q5lhfvrmfbd3ws7x4igs0fmcdq2y"; depends=[DEoptim DEoptimR ROI]; };
+  ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="1.0-0"; sha256="0wdb86r0z0ck27mn0rfb5l72xq7km2annyk5c5n8nk460j0kygqf"; depends=[ECOSolveR Matrix ROI slam]; };
+  ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="1.0-0"; sha256="0i5l0k5mk2xp2gdvpmlgxjycvzmgc83rkind68ab4x1d4bab0qdk"; depends=[Rglpk ROI]; };
+  ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="1.0-0"; sha256="00xjariraga2j4zk6vyzwl5g4a65ki1jmky556hizma78ksjrikv"; depends=[kernlab ROI slam]; };
+  ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="1.0-0"; sha256="1cr52sj0nj2bv9bfmm0pcb9bs2376fwyslxd15hyqq88la5y42iy"; depends=[lpSolveAPI ROI]; };
+  ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="1.0-0"; sha256="1f7wbzp87zq0css7jpphb96kbyan2lxzynnrcvl3hyn5cqmdcsqd"; depends=[ROI slam]; };
+  ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="1.0-0"; sha256="1q6xj1wg8241lbr9cynx9d4ilh19441qzn3nbqhj4lhpmg423h0p"; depends=[ROI xml2 xmlrpc2]; };
+  ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="1.0-0"; sha256="11dgya755w6h7dkxvdhx8aqz3g0dfxw67g5fwag0fszwb2hfblkx"; depends=[nloptr ROI]; };
+  ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="1.0-0"; sha256="0s0p0071s0i1gcqfs6glmbzg8bfh8fdzki9mrnp7hp8a335sga2g"; depends=[optimx ROI]; };
+  ROI_plugin_osqp = derive2 { name="ROI.plugin.osqp"; version="1.0-0"; sha256="09g947wx2qdimidayyn96gppiwrw28riff2wzsvvl8xvqi8nrh63"; depends=[Matrix osqp ROI slam]; };
+  ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="1.0-0"; sha256="0gha9zzjkkdr2lcalhyghh9sb5260rsaj88k37dk3qncdpk6gnw2"; depends=[checkmate Rcpp ROI slam]; };
+  ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="1.0-0"; sha256="08zgz4nnv7n455lghvzif54m4g3fzzj4czh93p6swb0kghb893wr"; depends=[quadprog ROI slam]; };
+  ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="1.0-0"; sha256="07by36pi82893xi3c0i3amaw7wx814h8pjx44cp4icv3wyxdpqpr"; depends=[ROI scs slam]; };
+  ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="1.0-0"; sha256="0wai3yfglx81f97v139bffxf4cziqlqki4vnq76bw4p22g7hdzl8"; depends=[ROI Rsymphony slam]; };
   ROMDB = derive2 { name="ROMDB"; version="0.1.0"; sha256="14jijcqd2zmps8sacx5nwfclj5yvqf4nx72y8pfvr0nswqqb895i"; depends=[dplyr httr magick purrr RODBC stringr]; };
-  ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
+  ROOPSD = derive2 { name="ROOPSD"; version="0.2.5"; sha256="11cm9bnp0355vfwwlb4x4x3vh2z8k28fjms8ah6pah59x0i536i8"; depends=[Lmoments R6]; };
   ROP = derive2 { name="ROP"; version="1.0"; sha256="12gh83r3hp1qdmw3p5rr1wfhsh90pirx67q456gl9ai6zgd8nkq8"; depends=[ROCR]; };
   ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
   ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; };
@@ -3622,23 +3756,24 @@ in with self; {
   ROptRegTS = derive2 { name="ROptRegTS"; version="1.2.0"; sha256="1wy54kjrpfvj2k9ndmq27zzgx6aygh85f7c83g7gn8d5b2y91qy4"; depends=[distr distrEx RandVar ROptEstOld]; };
   ROptSpace = derive2 { name="ROptSpace"; version="0.2.2"; sha256="09crzp3anw9p9fknw9gv8kzk1gmmdw0hbw1fa2r8i6601xi81ap4"; depends=[Rcpp RcppArmadillo Rdpack]; };
   ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; };
-  RPANDA = derive2 { name="RPANDA"; version="1.8"; sha256="0k9k3zc68kr17jd5r0m6jwmfhf43k5r44h4kqa6kdpd03h60m1rh"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; };
+  RPANDA = derive2 { name="RPANDA"; version="1.9"; sha256="16qhv4zwwrjrjxr06pimjprb74gbzpq2hkii27abln6a62m3z4kb"; depends=[ape bipartite cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust raster Rmpfr TESS]; };
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
   RPEClust = derive2 { name="RPEClust"; version="0.1.0"; sha256="1ysw45335lrxmj3j17xyvgz76p00v80f2m7wxfndh91wklqxzm8r"; depends=[clue clusteval mclust]; };
-  RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0.1"; sha256="1bcci0ih71bxdrwdz336c5wx47d094nczazy8mv3v41vivrk4jkh"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; };
-  RPEIF = derive2 { name="RPEIF"; version="1.0.8"; sha256="0v8kgwzgn1sqs0rgb0mrvzxy1wnk07bm7s4nyz60xcamsj33laj0"; depends=[PerformanceAnalytics xts zoo]; };
-  RPESE = derive2 { name="RPESE"; version="1.0.5"; sha256="0x5lf3xkxmwhilvay1qkklpdbqi1m78z0540mpwnpqwkv7xl1l80"; depends=[boot PerformanceAnalytics RPEGLMEN RPEIF sandwich xts zoo]; };
+  RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.1.0"; sha256="0pqfmrnyyxivrzm4xzhma6wrb3zhy34chdalcg8hw5wy92y9gzhd"; depends=[Rcpp RcppEigen RPEIF]; };
+  RPEIF = derive2 { name="RPEIF"; version="1.1.0"; sha256="169asw2wsvcbknhmqxni4bjkcvshq70qzkhv0d2h39cvkmbmhagq"; depends=[xts zoo]; };
+  RPESE = derive2 { name="RPESE"; version="1.1.0"; sha256="1b8n6y50pzv4w07kchnp5fd4m7j9bqq5085myvwfnm2iklq5yncz"; depends=[boot RPEGLMEN RPEIF sandwich xts zoo]; };
   RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.2"; sha256="1dwblpfm0s4axiggwh4lbz5k1dz7i0d1nqzl70kxj5gnajm7gn1k"; depends=[]; };
   RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; };
   RPMG = derive2 { name="RPMG"; version="2.2-3"; sha256="1di2bcf58z6gc3xknzx35znsjsy1714swvxkdhlq1ljidbdbmmbl"; depends=[]; };
   RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; };
+  RPPASPACE = derive2 { name="RPPASPACE"; version="1.0.7"; sha256="0h28nxybsyjjd23m1y29559pym2i814n4bvkw5jas1nzbiw85fkw"; depends=[bmp cobs doParallel foreach imager iterators jpeg MASS mgcv png quantreg robustbase tiff]; };
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
-  RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.6"; sha256="0ifspa7kiskanqkpi5iw6finfyslvbsirplf2a2l7xgvy96vz9la"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
+  RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.7"; sha256="16xppv7pzqk6kriqd5ym313z1r61l13dzpxp2q2zi0ai23hjgg92"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
   RPS = derive2 { name="RPS"; version="1.0.1"; sha256="16n6wknw2m56kwi6rswgxjwjqblhaz5gyw94f96a7l6navqnvlp4"; depends=[ape geomorph Gmedian igraph MASS matlab]; };
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; };
-  RPostgres = derive2 { name="RPostgres"; version="1.2.0"; sha256="16fjwaj1qvr1i9naq19jg2z3dqssi3pp4wwviyqlkj1mmbyh28zx"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
-  RPresto = derive2 { name="RPresto"; version="1.3.4"; sha256="17hwq76vzr27prwisfxahs1ix9grldknaywnq3v2a3s2x79v8vbv"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
-  RProbSup = derive2 { name="RProbSup"; version="2.2"; sha256="0phf3hhppgwm9m5wpj7r2yi7qmppcd553pc9hvqx7y9j4lg8imlf"; depends=[]; };
+  RPostgres = derive2 { name="RPostgres"; version="1.2.1"; sha256="1iky0z2jkvn7x3607hlamqr18rbgsv9ym03fa1sqs0z48bmc24gi"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
+  RPresto = derive2 { name="RPresto"; version="1.3.5"; sha256="1fhgiin5fa83gp2lnqhzlg41dy2l0zcvwfy7s73cl4rwkk2x4q1p"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
+  RProbSup = derive2 { name="RProbSup"; version="3.0"; sha256="1z53zgx26fwfhb1vxad0l51v34y2lsplhwbjaf4r44rngdaw9h5n"; depends=[]; };
   RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.17"; sha256="0krbxalcfg47cmrwfajgbhmn6rs687ranaiq5j0daw7a1k4qdfd8"; depends=[Rcpp RCurl]; };
   RPscoring = derive2 { name="RPscoring"; version="0.1.0"; sha256="063w83k9krwv3wvw2iq8bqkhjaj26as14d9g99l8jxfc02ljv1rr"; depends=[]; };
   RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; };
@@ -3647,6 +3782,7 @@ in with self; {
   RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; };
   RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; };
   RQuantLib = derive2 { name="RQuantLib"; version="0.4.12"; sha256="1bmjgsdwivrvdysba4hq60xpp7xg1c0p1p05mdm0338zvzix5kb8"; depends=[Rcpp zoo]; };
+  RRBoost = derive2 { name="RRBoost"; version="0.1"; sha256="0zp3csrpi0awk88m6sq5sf5v7j32q5sd4mwv61x6bblg991k404k"; depends=[RobStatTM rpart]; };
   RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; };
   RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
@@ -3655,9 +3791,9 @@ in with self; {
   RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; };
   RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; };
   RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; };
-  RRphylo = derive2 { name="RRphylo"; version="2.4.7"; sha256="037d96fvij08j7dwkm3f83nh9v02yh5qqijgqz51hkivfmmy2lgf"; depends=[ape doParallel emmeans foreach geiger phytools]; };
+  RRphylo = derive2 { name="RRphylo"; version="2.5.0"; sha256="0bhb4j1sxbww4y6hxi61p0s5npa999lz1x3qjgynzwfaf55p7hvj"; depends=[ape doParallel emmeans foreach geiger phytools]; };
   RRreg = derive2 { name="RRreg"; version="0.7.1"; sha256="1mzc9ga5jdh3cf95bxbfy6kdxvqcca74v4hszb63jalzp8w624r9"; depends=[doParallel foreach lme4]; };
-  RSA = derive2 { name="RSA"; version="0.10.1"; sha256="1r0hdmh72l3p6djdgj9p8m234b3n6018k1kdsch007fxwbjixnvf"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
+  RSA = derive2 { name="RSA"; version="0.10.2"; sha256="082mq3vn75nsxn59b527976x6k2n8sfh78v4i4ncvbnsa7knycc3"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer]; };
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
   RSAGA = derive2 { name="RSAGA"; version="1.3.0"; sha256="1y1zhy2bxkfsv8vmnxjdg9i5rqkvs32kw8h5z1mclv953srgkpn9"; depends=[gstat magrittr plyr rgdal shapefiles stringr]; };
   RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; };
@@ -3666,7 +3802,7 @@ in with self; {
   RSCAT = derive2 { name="RSCAT"; version="1.1.0"; sha256="1sh80zlkwma88kssrlwvb6kpqs2dmhfzkck59fgp0xxgxa3vpram"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; };
   RSDA = derive2 { name="RSDA"; version="3.0.4"; sha256="1ps4q3xcyzv5wnwnpwmvvx1gf3ry02rd480gifbfg39km8qwhvgz"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet labelled magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; };
   RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; };
-  RSEIS = derive2 { name="RSEIS"; version="3.9-0"; sha256="16jmakdq6rkyw3cm1ilnaw3ycsg12544ml9gla7y8mgpbglxsn6i"; depends=[RPMG Rwave]; };
+  RSEIS = derive2 { name="RSEIS"; version="3.9-3"; sha256="1wrpsf4cvm34r11ywssnbpcsi56sx4fykkqfhdfb5502agdy2w5w"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; };
   RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; };
   RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; };
@@ -3674,8 +3810,8 @@ in with self; {
   RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
   RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
   RSQL = derive2 { name="RSQL"; version="0.1.4"; sha256="0zda6cgsx1bd3xw2r9flsphbkrgma95qqv5vz70f234y9gkmc6v3"; depends=[DBI knitr lgr R6 RSQLite]; };
-  RSQLite = derive2 { name="RSQLite"; version="2.2.0"; sha256="1m38sj8rwbf3p2lhqabcp7c7djk7s9ng37cz39yxk706v9pi4380"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
-  RSSL = derive2 { name="RSSL"; version="0.9.1"; sha256="0845azknk90ix8xgcj18mdn7jbicalid4fcqyxzp747qswy4hh98"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; };
+  RSQLite = derive2 { name="RSQLite"; version="2.2.1"; sha256="0lynli9144dzb9vhxssba20v7z5h2nirawpvvy8ykv4n3ir7qlsl"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
+  RSSL = derive2 { name="RSSL"; version="0.9.3"; sha256="10rrgxc0ddnd4b4g7qqgpjkc8gh07bnc94xwmgdp1lx7v7ypcziv"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; };
   RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; };
   RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; };
   RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; };
@@ -3688,6 +3824,7 @@ in with self; {
   RSentiment = derive2 { name="RSentiment"; version="2.2.2"; sha256="15d1llzxg1apkwykpb7pic2d5lfj9i9a55hab067wrz2yq5jsyfa"; depends=[NLP openNLP plyr stringr]; };
   RSiena = derive2 { name="RSiena"; version="1.2-23"; sha256="04picf0f9rahd37r9fm0cisgaiy2aqshnzfh7cvhcqfaqmpxc8kp"; depends=[lattice MASS Matrix]; };
   RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.16"; sha256="1plcmxj6sahdy3vvcmxry8cbq1j23bqzhnhn593bkwmzczka24cy"; depends=[base64enc digest httr jsonlite plyr stringr]; };
+  RSmallTelescopes = derive2 { name="RSmallTelescopes"; version="1.0.2"; sha256="0g8h518vzgnxyasb2xqh2hxbmfzhdv3silp084xkmylbgj1hh5cd"; depends=[]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.3"; sha256="02zswadv65a5p5q9rr12f819mh7jjqk8xj1kc1c0wqvr8dgz7fx9"; depends=[RCurl]; };
   RSocrata = derive2 { name="RSocrata"; version="1.7.10-6"; sha256="1pzdpy1mifr6hhhj7pq8l5jl8dsn6270ibm6pnmc66psh0xr2zsa"; depends=[httr jsonlite mime plyr]; };
   RSpectra = derive2 { name="RSpectra"; version="0.16-0"; sha256="1ab45as2ysjrvkhvmx7y3nbhd0y1w4j9k2a789lcd973zz4wzwda"; depends=[Matrix Rcpp RcppEigen]; };
@@ -3706,16 +3843,18 @@ in with self; {
   RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
   RTD = derive2 { name="RTD"; version="0.4.1"; sha256="0zsv62hx1y9q5a6rd8ri91ff64671b84jr3f88h0q4yni2mribhr"; depends=[dplyr httr jsonlite purrr RcppMsgPack readr urltools uuid]; };
   RTDE = derive2 { name="RTDE"; version="0.2-1"; sha256="1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq"; depends=[]; };
-  RTL = derive2 { name="RTL"; version="0.1.3"; sha256="0sswm0x8m7v27hiz3cy9d6w2qglww5z681iafrx246s0qagl9xzi"; depends=[dplyr fabletools feasts fGarch fitdistrplus forecast ggplot2 httr jsonlite lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod readr sp stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; };
+  RTL = derive2 { name="RTL"; version="0.1.5"; sha256="162mwjlhl0py3lr4yrd56ips31kpfsgq0jmg9scm3pakbv63m9ad"; depends=[dplyr fabletools feasts fitdistrplus forecast ggplot2 httr jsonlite lpSolve lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod RCurl readr rlang rugarch sp stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; };
   RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; };
-  RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; };
+  RTaxometrics = derive2 { name="RTaxometrics"; version="3.0"; sha256="0dm0ashxxz59ri9xk9vhn7671khp35gx16lkl6vjgpfwczhl0mc5"; depends=[]; };
   RTextTools = derive2 { name="RTextTools"; version="1.4.3"; sha256="0fxjviqc36k06rn8xzbi8ylzzj9zgf3zsp6xv0kssakss1a45lzz"; depends=[caTools e1071 glmnet ipred nnet randomForest SparseM tau tm tree]; };
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
-  RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; depends=[future future_apply Rcpp]; };
+  RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.13"; sha256="17xmz8579xs4plc034c9cgc200g8sgvb3zmhzbina6psn72wl2fx"; depends=[future future_apply Rcpp]; };
   RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; };
   RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; };
-  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-77"; sha256="0iwwqfdcr2l1ax5397j77cj1p6kvmg4005rfb7bhsii4i9w0mwf0"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; };
+  RVA = derive2 { name="RVA"; version="0.0.3"; sha256="0w146albda4n74nn8h7jz62k5xmr6shibbgymyby0jphwc30fbc7"; depends=[circlize clusterProfiler ComplexHeatmap data_table dplyr edgeR ggplot2 ggpubr gridExtra GSEABase GSVAdata haven msigdbr org_Hs_eg_db plotly purrr rlang rWikiPathways stringr tibble tidyr XML]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-78"; sha256="1kiyczn1y3hxpf6shdy2s248848wvna6zhpkx7ng6hkdfkj8nfiy"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
+  RVIpkg = derive2 { name="RVIpkg"; version="0.1.1"; sha256="0kgjp79n8pxff2b36xnsz1hgb0kbwwvy8vc5dizinmh3fqr9bmqa"; depends=[]; };
   RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; };
   RVerbalExpressions = derive2 { name="RVerbalExpressions"; version="0.1.0"; sha256="1p9wmpgqwnz95sr8km8y6kqax8fcz6sqg54wfdx44kiqkf1ybdsp"; depends=[magrittr]; };
   RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
@@ -3725,26 +3864,26 @@ in with self; {
   RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; };
   RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.4"; sha256="1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; };
   RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; };
-  RWeka = derive2 { name="RWeka"; version="0.4-42"; sha256="0111n0hr3a2gjd2pv5vlh8mian6k86cp0xrw0yyh6ijxhwl31rc4"; depends=[rJava RWekajars]; };
+  RWeka = derive2 { name="RWeka"; version="0.4-43"; sha256="16hp8vkigk7wqwz51f68g5sp65hbs2yp7srh7k881wfg6mcpl8lc"; depends=[rJava RWekajars]; };
   RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; };
   RWiener = derive2 { name="RWiener"; version="1.3-3"; sha256="0afrgflyfjv4jqm04had74zz4cs934zwvyxaan1r4qpg383kibpq"; depends=[]; };
   RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; };
   RWsearch = derive2 { name="RWsearch"; version="4.8.0"; sha256="0zbf03dhcmbyrs2yhl3phk65471qnd7iszvk9rn81fqhd522vq66"; depends=[brew latexpdf networkD3 sig sos XML]; };
   RXKCD = derive2 { name="RXKCD"; version="1.9.2"; sha256="1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15"; depends=[jpeg plyr png RJSONIO]; };
   RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; };
-  RXshrink = derive2 { name="RXshrink"; version="1.4.1"; sha256="1nfph3xz2345kfajg0xbr4ww38vyq1yc46rz0n6ab1h7bys93mx5"; depends=[lars]; };
+  RXshrink = derive2 { name="RXshrink"; version="1.5"; sha256="0mffiscf65fyf2xs9w61nzxhrg55ybsxsa0rqy7y2h2hgvbh5wi4"; depends=[ellipse lars]; };
   RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; };
   RZigZag = derive2 { name="RZigZag"; version="0.2.1"; sha256="1civ8qrk5y95775vzkd2m5arqczgan584r632ixy4q76nd5wa8zc"; depends=[Rcpp RcppEigen]; };
   RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; };
-  RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; };
   RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; };
-  RaSEn = derive2 { name="RaSEn"; version="1.0.0"; sha256="13q9cksn2y56i4rbl95iqhz361bbm2kb454n2rcav2ylpi7prgg5"; depends=[caret class doParallel e1071 foreach formatR ggplot2 gridExtra MASS nnet randomForest rpart]; };
-  RaceID = derive2 { name="RaceID"; version="0.2.1"; sha256="1xh2c2vrm7x4573knk17sws61mr5z0w4whafjksyc5ddkm3wwrlz"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix NlcOptim pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; };
+  RaSEn = derive2 { name="RaSEn"; version="1.1.0"; sha256="0l7k90w4c4xsyr08n93nxnl7jk4818fl6a5kjxbiqzd8f6814q16"; depends=[caret class doParallel e1071 FNN foreach formatR ggplot2 gridExtra MASS nnet randomForest rpart]; };
+  RaceID = derive2 { name="RaceID"; version="0.2.2"; sha256="0602qx6hcdw6yxm49zwf7ri9g18ckqynkmv8s3v81lv612wlcd7w"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; };
   RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; };
   RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; };
   RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
+  RadialVisGadgets = derive2 { name="RadialVisGadgets"; version="0.2.0"; sha256="18a2c89jpdaln9cl5y4w161121fld08wm57m40qacsj1vlnkh6j9"; depends=[caret dplyr ggplot2 miniUI r_import rlang shiny shinyjs shinyscreenshot tidyr]; };
   RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; };
   Radviz = derive2 { name="Radviz"; version="0.9.2"; sha256="1k4bykrs6932n2iz2nngbs2k45ra7nq3rpxw4acpvxwxfciiq3ia"; depends=[dplyr ggplot2 hexbin igraph pracma Rcpp RcppArmadillo rlang]; };
   RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; };
@@ -3759,8 +3898,9 @@ in with self; {
   RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.5.3"; sha256="0783z23rm5kv0x7796ggx6g07wpf18n7fjzv9r9ryji55sx3r0pa"; depends=[]; };
   RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.4"; sha256="01j3gww9kil02d44jwlkz6j7lwn2him830bnshkly0s7mgh22pgr"; depends=[jpeg shiny tidyverse]; };
   RankAggreg = derive2 { name="RankAggreg"; version="0.6.6"; sha256="1g70njfv776qgp3i52kr6yxg7x9qliqaj33jm5vkgbajw1ampsdx"; depends=[gtools]; };
+  RankAggregator = derive2 { name="RankAggregator"; version="0.0.1"; sha256="0j4s4fv28fbc6ij6fzpmza9n5lfrql8ll33fi65vhczz9pjhpjii"; depends=[]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
-  Rankcluster = derive2 { name="Rankcluster"; version="0.94.2"; sha256="1wm7vbv2a4py9yjpcqrzcpfig18n02ip4qkqi62rw32abdlmz6sx"; depends=[Rcpp RcppEigen]; };
+  Rankcluster = derive2 { name="Rankcluster"; version="0.94.4"; sha256="0hdyyncb39a8kl34mj1f296dafng8krk7fbggsj5wg2s181fnqb5"; depends=[Rcpp RcppEigen]; };
   RankingProject = derive2 { name="RankingProject"; version="0.2.0"; sha256="1y2sydppi7y7j9c7r6xcqfm4v9z646w48pnksf11da8lq2nczww8"; depends=[]; };
   RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1.1"; sha256="0h4snn3haa4a5rkafg98419by4nnz219wsm3y0dqgm4hw4bvha0g"; depends=[PBSmapping RANN RgoogleMaps sp]; };
   RapidoPGS = derive2 { name="RapidoPGS"; version="1.0.2"; sha256="1lqvf563zzy5i0sljw7jqwilsj78yqnq821ghm0aqs9ixn5f9gn2"; depends=[bigsnpr curl data_table GenomicRanges IRanges RCurl]; };
@@ -3771,30 +3911,33 @@ in with self; {
   Rata = derive2 { name="Rata"; version="0.0.2"; sha256="1s7am08691lil5hbd8jpa5wnbvr0qqf0gkxczpm6yvizbjpx16qx"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2 Rirt]; };
   RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; };
   RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; };
+  Ravages = derive2 { name="Ravages"; version="0.1.1"; sha256="0gpmml2y8ai6nkdm6h54yfg3ymjlh5aq4q52sxn0v636krgbmixx"; depends=[BH dfidx Formula gaston mlogit Rcpp RcppEigen RcppParallel]; };
+  RavenR = derive2 { name="RavenR"; version="2.0.1"; sha256="0kp5gfs4jfsl05cly79j5gpqbjdik6d3idknlyn86cd837mzc2dc"; depends=[colorspace cowplot deldir dplyr dygraphs gdata ggplot2 igraph lubridate magrittr ncdf4 purrr reshape2 rgdal rgeos scales sf sp xts zoo]; };
   Rbeast = derive2 { name="Rbeast"; version="0.2.2"; sha256="12i6jm7x1hwkj6skva9sli02rm4krzb2gmzny68d9cjhdcan5baq"; depends=[]; };
   Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; };
   Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
-  RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.2"; sha256="1xra0sn4s8rrjmayg36jg6l3i1cvx9ngh30xyhi18226h0qinx9n"; depends=[RCurl xts]; };
+  RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.3"; sha256="1bkb4q2drz12j2saqq9basm8mw4wx5my28nnyiijrgmwmsd6hp9k"; depends=[RCurl xts]; };
   Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; };
   Rborist = derive2 { name="Rborist"; version="0.2-3"; sha256="0qf4m6ibr4mlrmsybb5b8f1hkmp9n6ksjsxc4msd3q4rr99zkczk"; depends=[data_table digest Rcpp]; };
   Rcan = derive2 { name="Rcan"; version="1.3.82"; sha256="0asmlhh786c9gfgxkqybv8xzz8bqzirxvq8nr4gglx1pc812idkb"; depends=[data_table ggplot2 scales]; };
   Rcapture = derive2 { name="Rcapture"; version="1.4-3"; sha256="1rk1zgab6zi7hcmyqlb18kycv3cd15c7lwhw5kig96f2n3xymzig"; depends=[]; };
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
-  Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
+  Rcereal = derive2 { name="Rcereal"; version="1.2.1.1"; sha256="16gak1kgsnla89b6nbhfb5w9xfjhdpxza8sfc2isbhfggvl1h79j"; depends=[]; };
   RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; };
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
   RchivalTag = derive2 { name="RchivalTag"; version="0.1.2"; sha256="0285n5mxs643546qhyqkccaq1fkn1hxagrhj2abahskfl53i9rsw"; depends=[dygraphs mapdata maps maptools ncdf4 oceanmap PBSmapping plyr pracma raster readr rgeos sp xts]; };
   Rchoice = derive2 { name="Rchoice"; version="0.3-2"; sha256="0ldz39cx4blzikwr454f9w263hm8mscxv3rirryzs9xc8sb7j6df"; depends=[Formula maxLik msm plm plotrix]; };
   RclusTool = derive2 { name="RclusTool"; version="0.91.3"; sha256="0f6v2p6dg3fq3vzys6hgwmmgyrxfj2kb4wpbywd7f9p5yd9cfd88"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; };
-  Rcmdr = derive2 { name="Rcmdr"; version="2.6-2"; sha256="1fv4qx4w9x3gi64vba9qdkp6kghl83z5q7mmdjx7068n484kyhm1"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; };
+  Rcmdr = derive2 { name="Rcmdr"; version="2.7-1"; sha256="1rqj5xdafiqks42ai5rdmvk6szjn1b8yrpssx969d6pdv2pxv96j"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; };
   RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.7-1"; sha256="1djm21mfk1l8zmaz6p51li0swpvzs05z9p11ad83d5rbbkdpwl7w"; depends=[abind car colorspace e1071 foreign haven Hmisc lattice MASS nortest readstata13 readxl sandwich]; };
-  RcmdrPlugin_BWS1 = derive2 { name="RcmdrPlugin.BWS1"; version="0.1-2"; sha256="1nkrrr90z7ard070i93fsrsw4zdx8vd975846kf4r9kljmbjnii9"; depends=[crossdes Rcmdr support_BWS support_CEs survival]; };
+  RcmdrPlugin_BWS1 = derive2 { name="RcmdrPlugin.BWS1"; version="0.1-4"; sha256="1iaywd6wvz41whxzpncbvzyg0k8bgi04banna59pz115dqaqwpmd"; depends=[crossdes Rcmdr support_BWS support_CEs survival]; };
   RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.3"; sha256="1v0vdr6rffcq5qjqwmnmxbjwcf01zp7lrj81grnjxwqg4xjrcj69"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr s4vd superbiclust viridis]; };
+  RcmdrPlugin_DCCV = derive2 { name="RcmdrPlugin.DCCV"; version="0.1-0"; sha256="0bxq1ar2l7222pd5zqibza8qmqgv26lvacc297qfc0nyyj761ghp"; depends=[DCchoice Rcmdr]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
   RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
   RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; };
-  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.51"; sha256="1cyfgg48mz5c0fygl4wwd1ijqg0hjzijd6298rvjpin7x7gra3i4"; depends=[Rcmdr readstata13]; };
+  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.54"; sha256="01pbl09c233aqq85vksr9zdb79hkh6r79r4kkbbmp7n8nclfgfsg"; depends=[Rcmdr readstata13]; };
   RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; };
   RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; };
   RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.7"; sha256="1145rpzhq219sl0j2bg5xa0ihq13lmr7ahcn3db4a8mqlz2fp8zy"; depends=[FactoMineR Rcmdr]; };
@@ -3805,25 +3948,24 @@ in with self; {
   RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-6"; sha256="0xh0lfgmr5sc15f3v5avwy1zl0gk1krlw3jb1prjyk9prp8albz9"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
   RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
   RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.2"; sha256="1ynj42p12ncgrbghd8w7mkyys2cq9r9dpbir57rj3k5l46yzj7d5"; depends=[ordinal Rcmdr]; };
-  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.11"; sha256="01isc6wswbi39jdgq2wbc3akbjv6fa5x33q1wrmbcc9ph6lvlr4h"; depends=[car MASS mixlm phia pls Rcmdr xtable]; };
+  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.12"; sha256="0hl6242xssdbin4xdf5k0qrivdkrmmjpn3mj2nsndsr7wi8rbf1z"; depends=[car MASS mixlm phia pls Rcmdr xtable]; };
   RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; };
   RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
   RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
   RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="2.0"; sha256="1mclhcb138f13p7ghiggdm8zjrgxqrn3zn8biygfy6yvhw2j396p"; depends=[demography ftsa Rcmdr rgl]; };
   RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.2.0"; sha256="1yg2b5vcnf956w04phxg15a4my9hvkbc27nzyn30b2wn47ysxghj"; depends=[Rcmdr SCMA SCRT SCVA]; };
   RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
-  RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.0.10"; sha256="0kbbvwjyfmd14d2nxiyin934vz3n3fgbp04bb8hxpcff3sp3wbxk"; depends=[Hmisc randtests Rcmdr tcltk2 tseries]; };
-  RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
+  RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.1.0"; sha256="1djyiqj7k96csrbzql5gmi5dca3c8rf3ymskfskrx62zpxmn4xic"; depends=[distr distrEx Hmisc IndexNumR lme4 randtests Rcmdr tcltk2 tseries]; };
+  RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.2-0"; sha256="14zsqjni2w2smq99cv1pjdw90zw83g4nn7h7cn07fms9j0g12yd6"; depends=[Rcmdr TeachingDemos]; };
   RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.2-6"; sha256="1fdy1xvrfjy2yz9ihhayj3d0avyx8xqlblb2wv73fmqvnvihag49"; depends=[randtests Rcmdr rmarkdown TeachingDemos tseries]; };
-  RcmdrPlugin_WorldFlora = derive2 { name="RcmdrPlugin.WorldFlora"; version="1.0"; sha256="1hjk3f4r71f3615139h0986bgx09h7ayd6shsvyj37axhkvivj8q"; depends=[Rcmdr WorldFlora]; };
+  RcmdrPlugin_WorldFlora = derive2 { name="RcmdrPlugin.WorldFlora"; version="1.1"; sha256="1cv580ar1kp0174h2mcg05nrr1d8sdlmimhyzk908gjhghmi6ahj"; depends=[Rcmdr WorldFlora]; };
   RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; };
   RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
-  RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
+  RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.4"; sha256="16y60yymx97nh587939lahsh0mk53yy25zy6i90l9vad0r7ih23v"; depends=[depthTools Rcmdr]; };
   RcmdrPlugin_lfstat = derive2 { name="RcmdrPlugin.lfstat"; version="0.8.3"; sha256="1rcr43dqyb9zw9av3awkz0640vmvhxrafal5brnhqnpg4hfbpma3"; depends=[lfstat Rcmdr]; };
   RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.7"; sha256="01yd1a7l9r8mb3gqhx7rq9cr3clpjfzzsq7pply6xhv9g77gs88z"; depends=[orloca orloca_es Rcmdr]; };
   RcmdrPlugin_plotByGroup = derive2 { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[lattice Rcmdr]; };
   RcmdrPlugin_pointG = derive2 { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
-  RcmdrPlugin_qual = derive2 { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
   RcmdrPlugin_sampling = derive2 { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve MASS Rcmdr sampling]; };
   RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; };
   RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; };
@@ -3833,14 +3975,14 @@ in with self; {
   Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; };
   Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
   Rcpp = derive2 { name="Rcpp"; version="1.0.5"; sha256="012wbj446k1wz6bp6bpf6h77ypvcsw69xvnax6qf6vyc7dj2qimq"; depends=[]; };
-  Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
+  Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0.1"; sha256="0vw41plcl7hbi0af3la0sb4x8zqnhxjpjslx8r8cllfamy9dixki"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.6"; sha256="0gkvs276hwa4yzd1bwf12p83cq2i1k021nq4y6ll1gcrj41mkdns"; depends=[Rcpp]; };
   RcppAlgos = derive2 { name="RcppAlgos"; version="2.4.1"; sha256="0s97v2agy8pzaqfjm7cabpfxpkidxl1zwi4vkjdhsfzxjp5xwwms"; depends=[gmp Rcpp RcppThread]; };
-  RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.16"; sha256="0bfa35lp6vc4b0h3ymvdx50br233q8vvyjml34ngi81rj0imz3fr"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.900.2.0"; sha256="03dfy0avzpiaf1jk8h18y2gyj3zwlfvvfixi13q3zq5qaz93by2r"; depends=[Rcpp]; };
+  RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.18"; sha256="0n68cf77gz34iq6w6ad87pbqwqam45nxp1gjzns4g6qhf7qdvrz4"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.10.1.2.0"; sha256="0nzi6plhdijx3khavmywzw9wbch0hj8kygphw35wdlslm4cnqcj1"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
-  RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="0.2.4"; sha256="0vy95igfsdnh55vavkhl38f793ifhf63iaxdy3q7m5lhy3fakcz4"; depends=[gmp Rcpp RcppThread]; };
-  RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.8"; sha256="13r6linn4hrzn1ia68pir861awv55bc99zm2myv68ppkb0w4m15w"; depends=[Rcpp]; };
+  RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="1.0.0"; sha256="1mk3xy5dggvmilm6dnwxz4kj0k0hdza9wssn4838238xyd3mzv8x"; depends=[gmp Rcpp RcppThread]; };
+  RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.9"; sha256="1bnagfhx70xmzjddbaf1cpz4hmx3mhym4fg36hr9025yl7n4agvj"; depends=[Rcpp]; };
   RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; };
   RcppCWB = derive2 { name="RcppCWB"; version="0.3.0"; sha256="1jzr7zgaq2gkqialscr9zh9imax37rdg1zshvj42cwf30za0fb8f"; depends=[Rcpp]; };
   RcppClassic = derive2 { name="RcppClassic"; version="0.9.12"; sha256="0v9v34i1c4dkplavdl14kz1k2rnk4hsaiyv6rkc9403z9isvzzr0"; depends=[Rcpp]; };
@@ -3849,17 +3991,17 @@ in with self; {
   RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
   RcppDate = derive2 { name="RcppDate"; version="0.0.1"; sha256="0psa7drm6chwn5w3h6yhaavf33mvzfaghzqa404l5yvxczy22xqi"; depends=[]; };
   RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; };
-  RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.4"; sha256="09ylswc8g4v79n1f7vhdbva7rxm8r5xic1rl4fq45w5c1wsgd74j"; depends=[Rcpp RcppArmadillo wrapr]; };
-  RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.7.0"; sha256="1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2"; depends=[Matrix Rcpp]; };
+  RcppDynProg = derive2 { name="RcppDynProg"; version="0.2.0"; sha256="10nc0sx3n83kg8rddbajifr9q8iyjmm59z5xcpqfmmfi345i26al"; depends=[Rcpp RcppArmadillo wrapr]; };
+  RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.9.1"; sha256="0qp9gypar280lm84pc8w0fxw4jgwqygwi3qnl5sl52kpkcj8c14a"; depends=[Matrix Rcpp]; };
   RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; };
-  RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.13.0.1"; sha256="016nwz2z17sxw75sph6paj1xkss3zlmcqxiwmhw07ckyrhyf0vji"; depends=[Rcpp RcppArmadillo]; };
+  RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.15.0.1"; sha256="0x86hrii230v7lq424mdvf7py8frb9yvwhq5inwwj9snm1y438hp"; depends=[Rcpp RcppArmadillo]; };
   RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; };
   RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
   RcppGSL = derive2 { name="RcppGSL"; version="0.3.8"; sha256="17nlayy6gvwb3v6l5aiqm84i75yf4dfi3zclxrgpqwf3j9v09yvz"; depends=[Rcpp]; };
   RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.3"; sha256="1qcnn482h9b8aw798frnkza4bzzpihp0pf4s1mj6zmn2ar01hsl0"; depends=[Rcpp]; };
   RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; };
   RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; };
-  RcppHNSW = derive2 { name="RcppHNSW"; version="0.2.0"; sha256="0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"; depends=[Rcpp]; };
+  RcppHNSW = derive2 { name="RcppHNSW"; version="0.3.0"; sha256="01z0plf1i6dyibw4ica8shmijyk1grpqb886hcga72z2cpm4xsx0"; depends=[Rcpp]; };
   RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; };
   RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-7"; sha256="07vh1wyp2rxhfrb4vi5njchrby99bynd88na8qjxcnbypkgsrhbl"; depends=[BH Rcpp RcppArmadillo]; };
   RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; };
@@ -3871,17 +4013,18 @@ in with self; {
   RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.3"; sha256="0cj95y8jcjm33d65y42f5ijw775kq3mh2p0659mp3i3r9fvaishk"; depends=[BH Rcpp]; };
   RcppRedis = derive2 { name="RcppRedis"; version="0.1.10"; sha256="07cxp0xdrg1bydlvgryf8jivlqicd880xdfdz6grhqqdxwss8qv1"; depends=[BH RApiSerialize Rcpp]; };
   RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; };
-  RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; };
-  RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.1.1"; sha256="0vdiqf6riiabb3igmnx95ihd1fv533923qizs71rqq7q2abfpp3a"; depends=[Rcpp]; };
+  RcppSMC = derive2 { name="RcppSMC"; version="0.2.2"; sha256="1j9knzm71sszch2wzdr51s7ylmi5n1x540hs5z3ln3v8bz3rb0gn"; depends=[Rcpp RcppArmadillo]; };
+  RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.1.3"; sha256="1009mhpgbj06fs2zr0h9w6k7dzn49ss11ay6r8whq7alysfifz9b"; depends=[Rcpp]; };
+  RcppSpdlog = derive2 { name="RcppSpdlog"; version="0.0.4"; sha256="02qq31xkn4i3s25670xmi72vbf56qymqnlsj2bba73q74nxxdxsv"; depends=[Rcpp]; };
   RcppStreams = derive2 { name="RcppStreams"; version="0.1.3"; sha256="06il7q3afaws57m0fxf04f2p5dvs23l1f7gl78pxwzclacdy3839"; depends=[BH Rcpp]; };
   RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; };
-  RcppTOML = derive2 { name="RcppTOML"; version="0.1.6"; sha256="1nyv4ynryh8vcrzyq01nzj13is40bjhxazlj9ilapyjdv9h5w3bs"; depends=[Rcpp]; };
+  RcppTOML = derive2 { name="RcppTOML"; version="0.1.7"; sha256="0h8517ipwqhqkhcfiyqmvsb585g01p0ra0azbpzyxip6pq6g029g"; depends=[Rcpp]; };
   RcppThread = derive2 { name="RcppThread"; version="0.5.4"; sha256="1mlzng6di30p4nfvq9l3z241vb8rwnpa2yjbafs2vzrl6v3zcfnf"; depends=[]; };
   RcppUUID = derive2 { name="RcppUUID"; version="1.0.0"; sha256="0sx25z71bkjsf3ggljqkv1pji5kc32i3lkq28igiwixxfl2kj89b"; depends=[BH Rcpp]; };
   RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.1"; sha256="0jh64c46gp99d2nsih14vx34pamc8i7gkmiy2nj94rx3sxq62yh5"; depends=[Rcpp]; };
   RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.4"; sha256="171281f8lbdnnv3q9x5c35ak8fkrymx7llnpv88dlh742z8nny1j"; depends=[Rcpp]; };
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
-  RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; };
+  RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.6"; sha256="0wgd1v2p7zajnbrjf3hfi56p3pk3ld6iwkanbb04bjbnlif2ay4w"; depends=[Rcpp RcppGSL]; };
   Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; };
   Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.57.1"; sha256="1dya0c0fcwr6ydcamz8m06nnq0b80vg7b22dg5jv3qi1n1fgp4lv"; depends=[]; };
@@ -3890,35 +4033,36 @@ in with self; {
   Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.11"; sha256="1sqzhfffap8i9nwclsj0q77sn6i0gzkn2hqfvw6k2w7j6aypyv4i"; depends=[formatR roxygen2 xfun]; };
   Rdca = derive2 { name="Rdca"; version="0.1.0"; sha256="06s4n5xpla937q9f55xmsickvdiwiapxmwqvn6k0zsacisscaagl"; depends=[dplyr magrittr minpack_lm Rcpp RcppArmadillo Rdpack]; };
   Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; };
-  Rdimtools = derive2 { name="Rdimtools"; version="1.0.3"; sha256="0s1wq6cc0hsrb3iw8da0cwrf26s616cmlglkqlkg0bi91s0iw971"; depends=[CVXR maotai Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; };
+  Rdimtools = derive2 { name="Rdimtools"; version="1.0.4"; sha256="07vd0i659pwfvv3drwff07k1wir0m3lhsgihhc135pcpw28j94cz"; depends=[CVXR maotai mclustcomp Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; };
   Rdistance = derive2 { name="Rdistance"; version="2.1.3"; sha256="03wh6y9h5jgfc6xdncpgyz0v7lqavikp3pf5wwfmm2rqfj7yjr8c"; depends=[]; };
-  Rdpack = derive2 { name="Rdpack"; version="1.0.0"; sha256="069yh9h57z3gjl5ih1r6wyiwmgmfzkpjxrpxg8mfq7y6zr1mynsw"; depends=[bibtex gbRd]; };
+  Rdpack = derive2 { name="Rdpack"; version="2.1"; sha256="1kmz0kq2z1xl55w22paz98x9jpss06abvicmkslv4zq77kz99q16"; depends=[gbRd rbibutils]; };
   Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; };
-  Rdrw = derive2 { name="Rdrw"; version="1.0.1"; sha256="0nagl559jr6vyq47k7axg2ivgbawmb60j80xkc8rbdapl5cb5ky1"; depends=[mvtnorm]; };
+  Rdrw = derive2 { name="Rdrw"; version="1.0.2"; sha256="1487r8z6h1y0v6fxkp7qfbh7j96hw8gqbb0fc90m4cxwz0hrqrn2"; depends=[mvtnorm]; };
   Rdsdp = derive2 { name="Rdsdp"; version="1.0.5"; sha256="04268fbajm7pgi5mxpghzw0yjwwx1dy9vdi6yhr20q2lmi6xh19w"; depends=[]; };
   Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
   Rdta = derive2 { name="Rdta"; version="1.0.0"; sha256="1zmyh61wrzqwyfjbfcxg41cri7hy9r0jfwnixcvd086y0vxq7fdn"; depends=[MCMCpack mvtnorm Rdpack]; };
   Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; };
   Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; };
   ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
-  ReDaMoR = derive2 { name="ReDaMoR"; version="0.4.2"; sha256="1bvhplbzn3axpl9vwygd209dmfm123ix3c2dpx1i09nhvy2v65lv"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown readr rintrojs rstudioapi shiny shinyjs visNetwork]; };
+  ReDaMoR = derive2 { name="ReDaMoR"; version="0.4.3"; sha256="0dpqa1j43zgrbp77hyymnw6llqfii95q9ivsxidslkdrj3bqb5dc"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown readr rintrojs rstudioapi shiny shinyjs visNetwork]; };
   ReIns = derive2 { name="ReIns"; version="1.0.10"; sha256="04rqb2jhmgq1az1c1rbs6jfg6gpxjs34k0m4w3a8gnq48l6dwqi8"; depends=[doParallel foreach Rcpp survival]; };
   ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; };
   ReadDIM = derive2 { name="ReadDIM"; version="0.2.10"; sha256="0lljl7iazjykgr5kr6j9is5hcs1h7x9im6rxflsniry6bm9j7qy3"; depends=[raster rgdal rgeos sp stringr]; };
   RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
+  RecAssoRules = derive2 { name="RecAssoRules"; version="1.0"; sha256="0jvl9yl1rg69bqb1cimi8r0bry73jhsq73fxfyy33ljwym2cdgv6"; depends=[Rcpp]; };
   Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; };
-  RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12"; sha256="0ycx2y8dbcslsvyvr2spnr5jy8m5la11ji0scdlqjymaamij8f3h"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
-  RecordTest = derive2 { name="RecordTest"; version="0.1.2"; sha256="19gxghp8b56gbyv2crjq2bzgaw5m3agd467ihbwkkjqli8cisgip"; depends=[ggplot2]; };
+  RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12.1"; sha256="0l837hmcn1gwisn1y9q745grg1fyrdbx44jhj81475h2zdn8dbs4"; depends=[ada data_table DBI e1071 evd ff ipred nnet rpart RSQLite xtable]; };
+  RecordTest = derive2 { name="RecordTest"; version="1.0.1"; sha256="1sxwnjkp6hvdfc6xfjldi9sbvy9wbzvw4x920ms3pfpvf7x7q930"; depends=[ggplot2]; };
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
   RecurRisk = derive2 { name="RecurRisk"; version="1.0.2"; sha256="0ss1s0l8hycz90awfa5k4gxiql7ncqfn7vgipdnrxh0ly9s86j9m"; depends=[flexsurvcure SEER2R survival]; };
   RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.1.5"; sha256="1b6pp1vdn7jnyl8k828dgkxrx8sy2wyhkrn4rnfavqw4qvhm0mhm"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; };
   Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; };
   RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.2"; sha256="1aya34iz5v3xfpj86x9ab998m7fdwl138ly007mgdayacvqi4a6y"; depends=[quadprog]; };
-  RefManageR = derive2 { name="RefManageR"; version="1.2.12"; sha256="1hfxa1qacfryk36mpaqdhdgws5jwxiyy489ikd3wa18bp1wz8dkp"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; };
+  RefManageR = derive2 { name="RefManageR"; version="1.3.0"; sha256="1spzdp5ni52dybcaxqnhwdphh27wjyrsfy4hsxsplpg9rqwfqfps"; depends=[httr jsonlite lubridate plyr stringr xml2]; };
   RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   RegSDC = derive2 { name="RegSDC"; version="0.4.0"; sha256="050b8m56qvbfm1mcbs9ns8mq7yzr645pkxm9238q11lxkx8lgahk"; depends=[MASS Matrix SSBtools]; };
-  RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; };
+  RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.4"; sha256="0mhyjqp8x66zwnbxpwq3a8180z48rrm7hp50028grb2x19lp8qkd"; depends=[]; };
   RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.4"; sha256="1nw6hd9y2n1h3j1fqqkymz13xizv5xrsj93w702kkvkbwyl3yall"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; };
   ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.5"; sha256="0zk1hy4p5adyjm1430a8ad5acn9qaax1si8qqfxqayfmlj954sj9"; depends=[data_table ggplot2 hash]; };
   RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
@@ -3929,7 +4073,7 @@ in with self; {
   RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; };
   Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; };
   RenvModule = derive2 { name="RenvModule"; version="1.0"; sha256="0rlgprzy5a08km98yqxjw8lkiyfikryrrmdh6r8bfhx3g2721syc"; depends=[]; };
-  Renvlp = derive2 { name="Renvlp"; version="2.8"; sha256="1avpy3hz693qj4d64mg6085hd0w6igwl1gs63jcda08d10zy6hg6"; depends=[Rsolnp]; };
+  Renvlp = derive2 { name="Renvlp"; version="2.9"; sha256="0nra1hiwdwdfymmyhlq856p0ijlxakf4l2c5kah76gdyifv1vyvz"; depends=[Rsolnp]; };
   ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
   RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; };
   RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
@@ -3937,17 +4081,18 @@ in with self; {
   Replication = derive2 { name="Replication"; version="0.1.2"; sha256="1za7zcdaf839xf8hxy4rcrr1p80n6a3ywb2bsl3wikwa0pxdvvbh"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; };
   Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; };
   RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; };
-  Require = derive2 { name="Require"; version="0.0.7"; sha256="06mzbdrf9qg6zkahmcz1yy6r1si14a296khi1rf5m8rcabb1982l"; depends=[data_table remotes]; };
+  Require = derive2 { name="Require"; version="0.0.10"; sha256="13bzas88862jbia0s2gdl6jssv9n9byc2hg2c9cj03b69nxw71r0"; depends=[data_table remotes]; };
+  ResearchAssociate = derive2 { name="ResearchAssociate"; version="1.0.1"; sha256="00j339ngc72gn2gyn1irjmazrv6l5nbsy3z25r6j1zrjwsbay15p"; depends=[ggplot2 plyr rentrez XML]; };
   ResidentialEnergyConsumption = derive2 { name="ResidentialEnergyConsumption"; version="1.0.1"; sha256="1dkk9hbgkc01i765dknzrfdpzpbc9k57vc4am0pj28hmlj32a0vg"; depends=[stringr]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; };
   ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; };
-  RestRserve = derive2 { name="RestRserve"; version="0.3.0"; sha256="19412fxz301q69zzw1lyg1f50gvjqynm5a2jyrdzj9pr9bzids6y"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; };
+  RestRserve = derive2 { name="RestRserve"; version="0.4.0"; sha256="07mm65yxzpwlg6x3lsggj41v8nl4m6v9mszhqjpgj19v3yxvwgi0"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; };
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   RfEmpImp = derive2 { name="RfEmpImp"; version="2.1.5"; sha256="1bvjk71rfhpbj2j7raibsb0y3skbv1qba7yl2g00npnkk2zk14xj"; depends=[mice ranger]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.9.9"; sha256="18m8xhg24kygwhq7avdp1hibilicb5wppi2wdmc36fkqljc274y0"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
-  Rfast2 = derive2 { name="Rfast2"; version="0.0.5"; sha256="07w0ypwy19cqf4h94pzh0y8fmq5ibr048qzarrs1qzlnk2hx7k4c"; depends=[Rcpp RcppArmadillo Rfast]; };
+  Rfast = derive2 { name="Rfast"; version="2.0.1"; sha256="1cq3mcg49hsvqhwn6f4dgsx7f8ma4qnwr5n6s7m22qy57rg31958"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast2 = derive2 { name="Rfast2"; version="0.0.8"; sha256="03ql7vlslz3l6s0vx8cifkk2kbh9fxav39mb8vwi9j7b4whbs988"; depends=[RANN Rcpp RcppArmadillo Rfast]; };
   Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; };
   Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; };
   Rfractran = derive2 { name="Rfractran"; version="1.0"; sha256="0cwc069f7rhkxkr5kn0n43mdy8m47gh0q6d5ijwzkhncrijb10cy"; depends=[gmp]; };
@@ -3963,9 +4108,7 @@ in with self; {
   RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
   Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
   RiemBase = derive2 { name="RiemBase"; version="0.2.4"; sha256="1h3ascbdgvp56k5ki6qr849296cdkr2bzc33pwwp033rmd8khpr3"; depends=[pracma Rcpp RcppArmadillo Rdpack]; };
-  RiemBaseExt = derive2 { name="RiemBaseExt"; version="0.1.2"; sha256="0g0gkwjh1x18ay03f557g3zvb2cfivpx0pcgsrr3gm0gphli96v8"; depends=[cluster dbscan energy fastcluster kernlab Rcpp RcppArmadillo Rdpack RiemBase]; };
-  RiemGrassmann = derive2 { name="RiemGrassmann"; version="0.1.0"; sha256="05dann9sdkdzmjp8jalxb963x42j7w007dk7vgkfngm62z6dr24v"; depends=[Rcpp RcppArmadillo RiemBase RiemBaseExt]; };
-  RiemStiefel = derive2 { name="RiemStiefel"; version="0.1.1"; sha256="1sdib0xih81n059gi207q01gfb1ac1n02dsyq0qrdqnz1bhffk69"; depends=[Rcpp RcppArmadillo Rdpack RiemBase RiemBaseExt]; };
+  Riemann = derive2 { name="Riemann"; version="0.1.0"; sha256="17k7qs0sppr7qwfjkn5v7pv60jzq1p32smd686w36mycd5ir9lp8"; depends=[maotai Rcpp RcppArmadillo Rdpack RiemBase]; };
   Riex = derive2 { name="Riex"; version="1.0.1"; sha256="1jri01s08g819bvw0bgd5z5iaf9rlikkqq993lm0455k909wm34v"; depends=[dplyr ggplot2 httr purrr quantmod rjson stringr tibble tidyr tidyverse TTR urltools xts zoo]; };
   Rilostat = derive2 { name="Rilostat"; version="1.1"; sha256="0a4bnp0a78a4yflxc535h0pajr4xaclfagx2f527p5ch5k23z2l6"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; };
   Rinstapkg = derive2 { name="Rinstapkg"; version="0.1.0"; sha256="0fvj4jc00g5b8cc4mrsjj72fdcdmvlky05s2ca0g2gndrjs6vxic"; depends=[digest dplyr httr jsonlite lubridate purrr readr rlang uuid]; };
@@ -3980,7 +4123,7 @@ in with self; {
   RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; };
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
-  Rlabkey = derive2 { name="Rlabkey"; version="2.5.2"; sha256="14vl0chazs6ghyya6pvmp1xazvw5zy92dldwzkn1psifrv5cb8fh"; depends=[httr jsonlite Rcpp]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.5.5"; sha256="0jm9dz0w0drl751j2vmanhgy6d7xaiydynwy0aq9pap9jg1hbq09"; depends=[httr jsonlite Rcpp]; };
   Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; };
@@ -3996,18 +4139,19 @@ in with self; {
   Rmixmod = derive2 { name="Rmixmod"; version="2.1.5"; sha256="0cl0bl7554abjwz2as8gqvrzqswlw5727dac5302p7ksy3id9a1j"; depends=[Rcpp RcppEigen]; };
   RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
   Rmosek = derive2 { name="Rmosek"; version="1.3.5"; sha256="18q39n2p3gms9zqrl8g15rjjk4v64365v0rm8r7zvvivh1hy5xa0"; depends=[]; };
-  Rmpfr = derive2 { name="Rmpfr"; version="0.8-1"; sha256="09kw7hyca8xc09r2d88qj81cclar8acaq5q9q5rw9f49iffda0rr"; depends=[gmp]; };
+  Rmpfr = derive2 { name="Rmpfr"; version="0.8-2"; sha256="007pc7fpzl2mcg3qxa2vfjip6m2dr314qjsnybkj3kdj70bszxkl"; depends=[gmp]; };
   Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; };
   Rmst = derive2 { name="Rmst"; version="0.0.3"; sha256="1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl"; depends=[ggplot2 Rata reshape2 Rirt]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; };
   Rnightly = derive2 { name="Rnightly"; version="0.1.0"; sha256="08sb4ic7my8b6xcjn9vim8wp4z3kvk0gyp604dg1az7czc7ics5r"; depends=[glue htmltools]; };
   Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.5"; sha256="0z97pmkksma225s948r0myd4638cy8vl1x2244w1r6n0cybymnd9"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; };
   Rnumerai = derive2 { name="Rnumerai"; version="2.1"; sha256="1f16fp9gzcaz3ad7iyw10n8jrnmnhxygn00mrcg582jz62dih9bd"; depends=[dplyr ggplot2 httr lubridate purrr tidyr]; };
-  RoBMA = derive2 { name="RoBMA"; version="1.0.4"; sha256="0zd18d2zlh9pcwpmz2y5v5gp6lrsgj2cyrz2cg8d26lr0dvgwhp2"; depends=[BH bridgesampling callr coda DPQ extraDistr psych Rdpack rjags runjags scales]; };
+  RoBMA = derive2 { name="RoBMA"; version="1.1.2"; sha256="0f2fjj9hz71gacsimv9gmg8hw72k8r7lmlrbhlhbws642wjs5lwj"; depends=[BH bridgesampling callr coda DPQ extraDistr psych Rdpack rjags runjags scales]; };
   RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
   RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; };
   RobExtremes = derive2 { name="RobExtremes"; version="1.2.0"; sha256="150p94f0g75g54qcaq4x45lk4sxiyvv1zs4hxkicf46raybvsv89"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; };
-  RobGARCHBoot = derive2 { name="RobGARCHBoot"; version="1.0.1"; sha256="1zybpvxp0jj15vvwj3s5adh62fijmdq3nhxl7xapigdc6qaskiv1"; depends=[Rcpp RcppArmadillo]; };
+  RobGARCHBoot = derive2 { name="RobGARCHBoot"; version="1.2.0"; sha256="142r6cmzwhg4xfbpbgrvngncm2wczly2arg6p8612ypjsk4yinrf"; depends=[doParallel doRNG foreach Rcpp RcppArmadillo]; };
+  RobKF = derive2 { name="RobKF"; version="1.0.0"; sha256="05afy56zxl5908z2gqrwsqm19m49q85bz634rmfipb3zmv1pci79"; depends=[ggplot2 Matrix Rcpp RcppEigen Rdpack reshape2]; };
   RobLox = derive2 { name="RobLox"; version="1.2.0"; sha256="1lcylkskfidg576lqfi84l14rvrpfbzmr53hcgzzmfipxhli4dr8"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
   RobLoxBioC = derive2 { name="RobLoxBioC"; version="1.2.0"; sha256="01lydp67v7mc4v3svsnl4zqq2jy1czwg9l9blngjn9ky0hv3haf5"; depends=[affy AnnotationDbi beadarray Biobase BiocGenerics distr distrMod lattice RColorBrewer RobLox]; };
   RobMixReg = derive2 { name="RobMixReg"; version="1.1.0"; sha256="13w6zvncwh561wzzqy548x0w25rnzf0pfvi5cc6mzn71x5l7cmh2"; depends=[dplyr flexmix glmnet gplots gtools lars MASS RColorBrewer rlang robust robustbase scales]; };
@@ -4020,12 +4164,12 @@ in with self; {
   RobustAFT = derive2 { name="RobustAFT"; version="1.4-5"; sha256="1i119qqlavfj7k0srb8fbbyy2nhsjv9rgrni854liizr9m51cgac"; depends=[robustbase survival]; };
   RobustBayesianCopas = derive2 { name="RobustBayesianCopas"; version="1.0"; sha256="1l6rp3b65927nx2z2xqk6rf1k75fbnflapdjvkq81i9bhwl5q1i5"; depends=[rjags statip]; };
   RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; };
-  RobustGaSP = derive2 { name="RobustGaSP"; version="0.6.0"; sha256="08f5kkpxv87b00cdbyr401khgbx8n0jp24lqj1kpj0ij7apbncss"; depends=[nloptr Rcpp RcppEigen]; };
+  RobustGaSP = derive2 { name="RobustGaSP"; version="0.6.1"; sha256="0bcrgrxlwysk8gg2ln17h4jm78iqlx1d46q0dnm0pxknqihi9jwf"; depends=[nloptr Rcpp RcppEigen]; };
   RobustLinearReg = derive2 { name="RobustLinearReg"; version="1.2.0"; sha256="06137f516gyj64qdmwby7m1xnvj4hxzpqj454jn0xcinvl89380w"; depends=[]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
   Rodam = derive2 { name="Rodam"; version="0.1.6"; sha256="1204zj556xciw29bn2dzndv7dfmmvdhyj5r5slgfzhsxyx0ca4i2"; depends=[RCurl]; };
-  RolWinMulCor = derive2 { name="RolWinMulCor"; version="0.4.0"; sha256="1i7vnw0v7h0z5ya5g6vxnanv30pn7pxiy4c6x5s1biba2vy65gz9"; depends=[colorspace gtools pracma zoo]; };
+  RolWinMulCor = derive2 { name="RolWinMulCor"; version="1.0.0"; sha256="0pmdmw8d6rqcagvwr8l13bm9fkvw414y9rvcz4cvwpvy9sfj0kaw"; depends=[colorspace gtools pracma scales zoo]; };
   RonFHIR = derive2 { name="RonFHIR"; version="0.4.0"; sha256="1ajpgpp300m0zzqzzwsn8sfy8x751hrr8py9n9xvzjmkgyrh4hhw"; depends=[httr jsonlite R6 stringr]; };
   Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
   RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.2.1"; sha256="0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi"; depends=[doParallel foreach inflection iterators]; };
@@ -4045,14 +4189,13 @@ in with self; {
   Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; };
   Rprofet = derive2 { name="Rprofet"; version="2.2.1"; sha256="150123vxdd31p96f3vsri46ryfng2xvnjgm6mdiqczg48xyfpbdp"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; };
   Rpvt = derive2 { name="Rpvt"; version="0.1.1"; sha256="0ggd6ikp2s9z4086y8w3qzb9jcyyqpby41p3ayjwam94skh154mf"; depends=[Rcpp RcppArmadillo Rdpack]; };
-  Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
+  Rquake = derive2 { name="Rquake"; version="2.4-4"; sha256="1929qxqbb6s316zb9x2q1kwz2pvwpvqr1w6iw8vm5vijyf1nvv30"; depends=[GEOmap MBA minpack_lm RPMG RSEIS]; };
   Rquefts = derive2 { name="Rquefts"; version="1.0-7"; sha256="1r1b2ga7kfhxsgr2d6ncfyrcpwx1jy0q1h06xajhfpd7i2sk7i84"; depends=[meteor Rcpp]; };
   Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; };
   Rraven = derive2 { name="Rraven"; version="1.0.10"; sha256="1b0av1pwg6n6rbl5k6md8knjqamismd8wbx7hnlkmak8q1yzk282"; depends=[NatureSounds pbapply seewave tuneR warbleR]; };
   Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; };
   Rrelperm = derive2 { name="Rrelperm"; version="0.1.0"; sha256="0cjw91j1sgc27wbx1dcdqk8j4hjkamp3wav78sh4ncdlvkyyz4p0"; depends=[nleqslv Rcpp RcppArmadillo Rdpack]; };
   Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.9"; sha256="19kpdq7x70fs4xd09lslpwclwmclc189hl8lpcycf80q74cm2r55"; depends=[foreign magrittr minpack_lm raster rgdal rlang sf stringr tibble XML]; };
-  Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.3"; sha256="1qnvnhhzhyfbka4zjblddj5ad5d6q7rzb8rpikzpvcqn9s57lnqk"; depends=[ape haplo_stats Rcpp]; };
   Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; };
   Rsconctdply = derive2 { name="Rsconctdply"; version="0.1.3"; sha256="12xc1laxgivv4szp8341pvhmxnzzzzc2s4jhnqsqrbx71lbd9szg"; depends=[dplyr rjson rsconnect]; };
   Rserve = derive2 { name="Rserve"; version="1.7-3.1"; sha256="16cg0cak9pvd9l35fjy1lsplxr5ncvb4apzg5mish5kff0cyk89v"; depends=[]; };
@@ -4062,9 +4205,11 @@ in with self; {
   Rspc = derive2 { name="Rspc"; version="1.2.2"; sha256="1cnzqpnh009wfs51dc4id9q3giaa8b6dc75b1lhzpwcvw0cxcy4y"; depends=[]; };
   Rspotify = derive2 { name="Rspotify"; version="0.1.2"; sha256="1q8ajjx5ghlgxgch9gifvhi2gmsi0ph8pygwrb9jrd3ijahlw5k4"; depends=[dplyr httr jsonlite magrittr plyr]; };
   RsqMed = derive2 { name="RsqMed"; version="0.1.7.1"; sha256="18r78svwbnri5283s5nxg4vrp29r6xx13h0n6w634jdpwaiw56gk"; depends=[GMMAT SIS]; };
-  Rssa = derive2 { name="Rssa"; version="1.0.2"; sha256="14gzd6mz9v8c0c15sinf67f1ii6b6ximpfz8daq3800pw2cav49r"; depends=[forecast lattice svd]; };
+  Rssa = derive2 { name="Rssa"; version="1.0.3"; sha256="1sjl60djgpn4wkgpw1kbm0c376gk1g507dw4bnaqn518qhi8mp6k"; depends=[forecast lattice svd]; };
+  RstoxData = derive2 { name="RstoxData"; version="1.0.17"; sha256="1dfmbfpjqj8p5m7dybjx6h5vapb5xzr4l2sa24z9wjdfxrzf07x9"; depends=[data_table Rcpp readr xml2]; };
   Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; };
-  Rsymphony = derive2 { name="Rsymphony"; version="0.1-28"; sha256="02x54ygbcd2600prcww1l9pb02skn96rj0jdljpky1228jbib4nx"; depends=[]; };
+  Rsymphony = derive2 { name="Rsymphony"; version="0.1-29"; sha256="09ilz815phgjm87ah879dsx008scdp51x7h3jn2j48zgzym59sfb"; depends=[]; };
+  RtD3 = derive2 { name="RtD3"; version="0.0.1"; sha256="0zbm9pf1z8xl99aj64xy8q3hly98c2rzy34fzkbjyndysvxf9032"; depends=[data_table geojsonsf htmlwidgets jsonlite purrr]; };
   Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; };
   Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; };
   Rtrack = derive2 { name="Rtrack"; version="1.0.0"; sha256="01xgbz37rsbjkix9nlx64qyimsbbgsmyswcv4jbpqasvkp6d480q"; depends=[crayon Hmisc KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; };
@@ -4073,7 +4218,7 @@ in with self; {
   RtutoR = derive2 { name="RtutoR"; version="1.2"; sha256="19wmi30b5i6zj673d76gxl6j0k3ppfyl5fqrcs0dwmmadrrvbajq"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes officer plotly rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; };
   Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; };
   Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
-  Runuran = derive2 { name="Runuran"; version="0.30"; sha256="1a3z49nrx1azbm4blqcwwcbwnxcrcr8md350viakl8a0b3y2v59q"; depends=[]; };
+  Runuran = derive2 { name="Runuran"; version="0.33"; sha256="11bn2ifynh0sh8j3aam6x3wb791cbbskdxmn5hicl59jsnr6dm6m"; depends=[]; };
   Rvcg = derive2 { name="Rvcg"; version="0.19.1"; sha256="0brqnvhqj9052kkic1i8mxx7y1si9na5rwj1fmslsf5mih8n4grr"; depends=[Rcpp RcppArmadillo RcppEigen]; };
   Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; };
   Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; };
@@ -4083,13 +4228,12 @@ in with self; {
   Rwofost = derive2 { name="Rwofost"; version="0.6-3"; sha256="0a6fp2hkf51hqmbyp7mlhhnzzxj2gcq0kdrlcm3qmpkv0y44wmmw"; depends=[meteor Rcpp]; };
   Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; };
-  RxODE = derive2 { name="RxODE"; version="0.9.2-0"; sha256="1ynn38wk08szi34pk0hmlnanmfg19arazsqzafyw5kd1v3fdx4g4"; depends=[assertthat brew cli dparser ggplot2 inline knitr lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo rex sys units]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
-  Rxnat = derive2 { name="Rxnat"; version="1.0.12"; sha256="06w99b5lvpycykzlga6grw33zkajwbb04s89s37wy9zxy42vc4cb"; depends=[dplyr httr RCurl]; };
-  Ryacas = derive2 { name="Ryacas"; version="1.1.3"; sha256="12vkylq06c7kqvvf662cyzhdcnpy928xsjflf1kf0nh6y00gywf8"; depends=[magrittr Rcpp]; };
-  Ryacas0 = derive2 { name="Ryacas0"; version="0.4.2"; sha256="0k8q9v9016x8vfskwa6zmh2rbblqqfk8bryxslxaj8irzvkggnvl"; depends=[Rcpp settings xml2]; };
+  Rxnat = derive2 { name="Rxnat"; version="1.0.14"; sha256="00fl68pa0c2vy4xlny67pn41lzgm7b97wgg3dwm6z35izca62l11"; depends=[dplyr httr RCurl tibble]; };
+  Ryacas = derive2 { name="Ryacas"; version="1.1.3.1"; sha256="0c258p7ibas4xbq1wh8c1nfqf6r9d0hicrf8mkkyriw4mb6wmzqq"; depends=[magrittr Rcpp]; };
+  Ryacas0 = derive2 { name="Ryacas0"; version="0.4.3"; sha256="1qsj6hbydi923bvc8qy1k34nl73xf3fsmr5ww3dw9gzn1kzg2470"; depends=[Rcpp settings xml2]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
-  SACCR = derive2 { name="SACCR"; version="2.3"; sha256="0q5fpzmfj08mzxbxksi5fgkfw8n4zsmh37zqnbwkz30llh620hgv"; depends=[data_tree jsonlite Trading]; };
+  SACCR = derive2 { name="SACCR"; version="3.0"; sha256="0h5g2qq3zfx0hdibsghcas8vkwisbw5nr7phj8lrnc5r5g2c487l"; depends=[data_tree jsonlite Trading]; };
   SACOBRA = derive2 { name="SACOBRA"; version="1.2"; sha256="1v45l56vifkg3v2bfhk3kfg4fn0dfvrjcgy13zzymm8blr7vazi5"; depends=[mgcv R6 testit]; };
   SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; };
   SADISA = derive2 { name="SADISA"; version="1.2"; sha256="0yn7f360wl5ykys5zln159xh2h8bx7zb5ddwhv1migjlqry506hp"; depends=[DDD pracma]; };
@@ -4103,7 +4247,7 @@ in with self; {
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
   SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
   SAPP = derive2 { name="SAPP"; version="1.0.8"; sha256="1lb148s8rdx1phmx8ihncgb45iqxzracxznys7zyzs8qcf6hm5wq"; depends=[]; };
-  SAR = derive2 { name="SAR"; version="1.0.1"; sha256="0i6ffssr5iyh4z1ygbg0kg2nq4mlvshym7380f93gf85wpdql5gv"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; };
+  SAR = derive2 { name="SAR"; version="1.0.3"; sha256="1cnf0hsq82lzssvz5xs2abvnrjxda0g6mjx70a1j223zdwjqmw64"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; };
   SARP_compo = derive2 { name="SARP.compo"; version="0.1.3"; sha256="1rps2zfwhxf579v29p929jh1qq71ayy1ij6a5ja6y8rdflzhp4hb"; depends=[car igraph]; };
   SARP_moodle = derive2 { name="SARP.moodle"; version="0.8.1"; sha256="1aszwnyg1nisyz1h75j4zn4b276n83l5wyldf2iysjcb45hir2kl"; depends=[base64enc]; };
   SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
@@ -4114,17 +4258,19 @@ in with self; {
   SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
   SAVER = derive2 { name="SAVER"; version="1.1.2"; sha256="1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158"; depends=[doParallel foreach glmnet iterators Matrix]; };
   SAutomata = derive2 { name="SAutomata"; version="0.1.0"; sha256="0d9q7bm2f7s4aslml40n43vwcdkc8rnn9ygydccwi4b9a7y23k58"; depends=[]; };
+  SBAGM = derive2 { name="SBAGM"; version="0.1.0"; sha256="0vb1679016b0bhz2xlka9wgr2fxwa0447ymfncm1n5fks60rrnnf"; depends=[forecast MSGARCH rugarch]; };
   SBMSplitMerge = derive2 { name="SBMSplitMerge"; version="1.1.1"; sha256="1h44qwz9gkwwgkac25h4vn0kq3mjvjsyq99yfd8v8g6g8fkkclaq"; depends=[ggplot2 reshape2 scales]; };
   SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
   SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; };
   SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; };
-  SBdecomp = derive2 { name="SBdecomp"; version="1.0"; sha256="0352pa2l3b3gylkvv1v62vk0b2djy0cyi4d4ps1r4dwilpir69d5"; depends=[survey twang]; };
+  SBdecomp = derive2 { name="SBdecomp"; version="1.1"; sha256="0i7nkmaix2w0kxjaxhkkizpicvm18838qa6n39azxsjqph04ykmd"; depends=[survey twang]; };
   SBmedian = derive2 { name="SBmedian"; version="0.1.0"; sha256="1flydpajgak0sh6v8r67fvjg3fjaylinqjgfrvi91lf29r822zdw"; depends=[expm Rcpp RcppArmadillo Rdpack]; };
+  SC2API = derive2 { name="SC2API"; version="1.0.0"; sha256="1z3rch5238qih5054ial8vjcpj1cdmzgc7cga9agnp58y19a1lcj"; depends=[data_table httr jsonlite]; };
   SCAT = derive2 { name="SCAT"; version="0.5.0"; sha256="16dh4l5r8b49n68s571npmk14dnnx6y0np7lzvalg61z31zlya29"; depends=[]; };
   SCBiclust = derive2 { name="SCBiclust"; version="1.0.0"; sha256="1wrlzgavri6g7s948775nfls83b8fa5mx3xvbvc8kmbrvdwms6cq"; depends=[sigclust sparcl]; };
   SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.2.2"; sha256="045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz"; depends=[boot KernSmooth]; };
   SCCI = derive2 { name="SCCI"; version="1.2"; sha256="08ibazxiqmkm3n9g8bfp0cfq26zmg6x2fxb064g3z05nczsf72db"; depends=[Rcpp]; };
-  SCCS = derive2 { name="SCCS"; version="1.1"; sha256="1r3lldpd3vaqrwjhlfs4vghjsh70543317brn62z1n08wrxsjjyy"; depends=[corpcor dummies fda gnm R_methodsS3 survival]; };
+  SCCS = derive2 { name="SCCS"; version="1.2"; sha256="13j2vgq4kihkx2bmm8k8z9g2qqfw1kv0imwcicxlxqy7i7dprav9"; depends=[corpcor dummies fda gnm R_methodsS3 survival]; };
   SCEPtER = derive2 { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; };
   SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; };
   SCGLR = derive2 { name="SCGLR"; version="3.0"; sha256="10hsvcjgsycap6wkp06snp2zab1ppsp78kyncpbjnm3vp84qm0nz"; depends=[ade4 expm Formula ggplot2 Matrix pROC]; };
@@ -4133,6 +4279,7 @@ in with self; {
   SCMA = derive2 { name="SCMA"; version="1.3.1"; sha256="0j0np99mcr8vgpcg664769gdb3rxm665h4jgj3zplihbh5ihxfj1"; depends=[]; };
   SCOR = derive2 { name="SCOR"; version="1.1.1"; sha256="0srkn72g1v7hwms68pjmq5sj562blqn27gi628q6q6zlirbmfb9g"; depends=[doParallel foreach iterators]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
+  SCORNET = derive2 { name="SCORNET"; version="0.1.0"; sha256="1nmlqmidq0cxfnf5pysgfmv6lkwijfzkx55ijnh9497ynz6yzckn"; depends=[doParallel foreach Matrix pracma Rcpp RcppArmadillo survival]; };
   SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.7"; sha256="1mswjc1q9dj4yvhx1db50iy041mw3azbi40ha3zjp38fflwcwf2z"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer reshape2 tidyr TSP]; };
   SCOUTer = derive2 { name="SCOUTer"; version="1.0.0"; sha256="1s0mmzfz0zhr5v4wagcjwdba8a5f57xr26vwml92dnw6lai37pj4"; depends=[ggplot2 ggpubr]; };
   SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
@@ -4140,24 +4287,27 @@ in with self; {
   SCRT = derive2 { name="SCRT"; version="1.3.1"; sha256="0wkxc22hv08riivjl09lhxvffqxxdy4xnvdmc2y69gssyinkbln1"; depends=[]; };
   SCVA = derive2 { name="SCVA"; version="1.3.1"; sha256="1gdicpnbr8bdgrbwwslpwpzw2adpp94p8nhsrkdx0bjlpfhd4g9h"; depends=[ggExtra ggplot2 plotly scales]; };
   SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; };
-  SCtools = derive2 { name="SCtools"; version="0.3.0"; sha256="0iw7ckgfpijnbqicky69la3mpxmd1i5p4rgzznymprra3q1lx35h"; depends=[cvTools dplyr furrr future ggplot2 purrr stringr Synth]; };
+  SCtools = derive2 { name="SCtools"; version="0.3.1"; sha256="0vsv9ipz0ys8nrvg7rwr23svqlc5lvjpa6yss79rnjzxarjcyjjz"; depends=[cvTools dplyr furrr future ggplot2 magrittr purrr stringr Synth]; };
   SDALGCP = derive2 { name="SDALGCP"; version="0.3.0"; sha256="1mrx39rspbynnwdpww8vv3rf03589qym70vc9508k7iird5cn0qh"; depends=[geoR maptools mapview Matrix pdist PrevMap progress raster sp spacetime spatstat splancs]; };
-  SDAR = derive2 { name="SDAR"; version="0.9-3"; sha256="173qssvca1ds37x3518q3vfl2185b4fnkprvb52pp7mpv1w1xdrp"; depends=[grImport2 linbin readxl]; };
+  SDAR = derive2 { name="SDAR"; version="0.9-55"; sha256="1a1dy4wpzhfaqxv4x8knazh4kjx042rnkmvxf62r6wkgbfvq4r6b"; depends=[grImport2 linbin readxl]; };
+  SDCNway = derive2 { name="SDCNway"; version="1.0.1"; sha256="0zmjc3xh4qvwyrq4ma2k6q08f4ny4iqnl5a640pj17jk8awzwbg0"; depends=[dplyr ggplot2 MASS plyr Rdpack]; };
   SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
   SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; };
   SDEFSR = derive2 { name="SDEFSR"; version="0.7.21"; sha256="02p46vbyzx5lmyxyhks10l94kz18pldgkxxg2zi5vys80gpy5jd2"; depends=[]; };
   SDLfilter = derive2 { name="SDLfilter"; version="2.0.1"; sha256="0ry7aqcc2ihh2b10xxs0fv4syibwsh1ziynjq6q8wbli4v303kcf"; depends=[data_table dplyr ggmap ggplot2 ggsn gridExtra lubridate maps plotKML plyr pracma raster sp trip]; };
   SDMPlay = derive2 { name="SDMPlay"; version="1.3"; sha256="0653yzw00ix1kh302h1fs735956dw0m2zvp2ng472f8qywrb395s"; depends=[dismo gbm raster]; };
-  SDMtune = derive2 { name="SDMtune"; version="1.1.1"; sha256="02bpdscfw8ql72sq9nh47qik6xnxczr59yysd18m5mf67qf7p0sb"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rlang rstudioapi stringr whisker]; };
+  SDMtune = derive2 { name="SDMtune"; version="1.1.3"; sha256="05hbisg734w7l6ynr8302ynika4gnwnih5kfgrf4v730svl0hfp7"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rlang rstudioapi stringr whisker]; };
   SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; };
   SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
   SDraw = derive2 { name="SDraw"; version="2.1.13"; sha256="1kx8kfga3zspfdgf9vq2lclszrhf3bfwkfhwqri64kn8fdr34jsq"; depends=[covr deldir rgeos sp spsurvey]; };
+  SE_EQ = derive2 { name="SE.EQ"; version="1.0"; sha256="09fqx2rcqpiv072l6gqgfz9pdhas98q4kkkm7m4y28k13q2gicgl"; depends=[MASS]; };
   SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; };
   SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
   SECFISH = derive2 { name="SECFISH"; version="0.1.7"; sha256="0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy"; depends=[ggplot2 Hmisc optimization]; };
   SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
   SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
   SEERaBomb = derive2 { name="SEERaBomb"; version="2019.2"; sha256="0rlah68jbaw4qbqq5rnlrm6m9ckz7igbsay6iq1yvk4gy24p9bfh"; depends=[DBI demography dplyr forcats ggplot2 labelled LaF mgcv openxlsx plyr purrr Rcpp readr reshape2 rgl RSQLite scales stringr survival tibble tidyr WriteXLS]; };
+  SEIRfansy = derive2 { name="SEIRfansy"; version="1.1.0"; sha256="1n7fgn3l4r3xxdppgj9maks151jbamysmlmcdfq13mp6b6c98sja"; depends=[arm DescTools dplyr ggplot2 ggpubr knitr magrittr patchwork pbapply rlang scales]; };
   SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; };
   SELF = derive2 { name="SELF"; version="0.1.1"; sha256="1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx"; depends=[bnlearn CompareCausalNetworks data_table Rcpp xgboost]; };
   SEMID = derive2 { name="SEMID"; version="0.3.2"; sha256="0v1zrx5xxramsg2zzk7b2fyv6kky7xb1q1cg8vi6zg6ln9vgm2dk"; depends=[igraph R_methodsS3 R_oo R_utils]; };
@@ -4188,13 +4338,14 @@ in with self; {
   SILM = derive2 { name="SILM"; version="1.0.0"; sha256="1iaivpdx18djfm5dqak0q9kfl1xfrnx3gk5x9a4y53h1d7jhl9p6"; depends=[glmnet hdi scalreg SIS]; };
   SIMMS = derive2 { name="SIMMS"; version="1.3.0"; sha256="1vnq135sc6f0nn53dmi38as7hzjvifbz3mvhg08zjk2v4rjw8hpw"; depends=[doParallel foreach glmnet MASS randomForestSRC survival]; };
   SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
+  SIPDIBGE = derive2 { name="SIPDIBGE"; version="0.1.0"; sha256="1vvlw2m16r3sxayn21xhqawl3axsfm3f894n9ql6qwz6v17l6xkr"; depends=[cli COVIDIBGE PNADcIBGE png PNSIBGE POFIBGE purrr rstudioapi tibble tidyverse]; };
   SIRE = derive2 { name="SIRE"; version="1.1.0"; sha256="0f624j087k7krg73bqn2qxdgzq66jyhvzz8n024vz3h4hwagxs5n"; depends=[dplyr igraph magrittr MASS Matrix matrixcalc numDeriv psych Rsolnp stringr systemfit]; };
   SIS = derive2 { name="SIS"; version="0.8-8"; sha256="1f5czwcgpmmn8habm24p3xh4w7jn2faais2x2gmaiq4dpjfnv6h8"; depends=[glmnet ncvreg survival]; };
   SISIR = derive2 { name="SISIR"; version="0.1-1"; sha256="13mxw0ad4y29f303zarhhdpw2655ckax1g429grnah07p4kfpkgh"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; };
   SITH = derive2 { name="SITH"; version="1.0.1"; sha256="1g200zc4dbwy7822qhcsi571plm3fpvsdpxipm2ra9zm0x9a4df3"; depends=[Rcpp scatterplot3d]; };
   SIfEK = derive2 { name="SIfEK"; version="0.1.0"; sha256="037ps6yfy7w6i8vm0b78c8w9kdmw312dl5nc2qz86rfk8kjg7w27"; depends=[MASS numDeriv ramcmc smfsb]; };
   SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; };
-  SKAT = derive2 { name="SKAT"; version="2.0.0"; sha256="1qkc95n31bmz5y3saai0z50a081mngjlsypc259hbw355xayj2xr"; depends=[Matrix SPAtest]; };
+  SKAT = derive2 { name="SKAT"; version="2.0.1"; sha256="1iz8s2r295w36m44s2frrz00q4zm78fyzx7kprmnz4kbg3spqqy8"; depends=[Matrix SPAtest]; };
   SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
   SLDAssay = derive2 { name="SLDAssay"; version="1.8"; sha256="04ykj7s9kpvg5bmf7x16154kfpdy45b7y7hhyh31sxlscv7c5bbp"; depends=[]; };
   SLEMI = derive2 { name="SLEMI"; version="1.0"; sha256="1yfyqxl9sszym418p64zalc2yna9s9qgk9wvviz7n44icsdps33q"; depends=[caret corrplot doParallel e1071 foreach ggplot2 ggthemes gridExtra Hmisc nnet reshape2 stringr]; };
@@ -4202,20 +4353,22 @@ in with self; {
   SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; };
   SLIDE = derive2 { name="SLIDE"; version="1.0.0"; sha256="0x4fm29r7icg33k8gw3vqvxib8n9a1xwg484x9yffybips9ka22c"; depends=[]; };
   SLOPE = derive2 { name="SLOPE"; version="0.3.2"; sha256="0hjp34lwwrg60ccwvdy1hnl5vbd8lhyc2j1jp3kfx773akdrqvj1"; depends=[foreach lattice Matrix Rcpp RcppArmadillo]; };
+  SLTCA = derive2 { name="SLTCA"; version="0.1.0"; sha256="0pq87fbi79srgjblv40yyj3w1dzf115kfidp8gi564l8xf0qilqg"; depends=[geepack Matrix mvtnorm VGAM]; };
   SMARTAR = derive2 { name="SMARTAR"; version="1.1.0"; sha256="0ymhka4pjlqlnpv47abmc76ggijfw83i3jp9mrspnzcnb4d378xm"; depends=[MASS]; };
+  SMARTbayesR = derive2 { name="SMARTbayesR"; version="1.0.1"; sha256="0fzmdqsqai5wvn9fvknjlfnyxiz6ya0a9v2v3gw8g87fza3p8nxi"; depends=[]; };
   SMARTp = derive2 { name="SMARTp"; version="0.1.1"; sha256="0gkhl9j4l67brfmln28m4q4hfi271jlg5aijnjwahlj8nsi6384y"; depends=[covr mvtnorm sn]; };
   SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; };
   SMCRM = derive2 { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; };
-  SMDIC = derive2 { name="SMDIC"; version="0.1.2"; sha256="0a50fjfx1nx6khs8pna0v6fxdai4rf6b2rrribx1kq2k039jjj8l"; depends=[e1071 GSVA maftools MASS pheatmap pracma preprocessCore samr survival survminer]; };
+  SMDIC = derive2 { name="SMDIC"; version="0.1.3"; sha256="050lbrgbvyj5pzjswb85dn94fzzhcq1pb212qap64f20l0nzlway"; depends=[backports e1071 GSVA maftools MASS pheatmap pracma preprocessCore quadprog RColorBrewer samr survival survminer]; };
   SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; };
   SMFilter = derive2 { name="SMFilter"; version="1.0.3"; sha256="1islyqg9w08mvs2kf0ddmdlp885arzp0jy7mqvixjm4ayi5zfrri"; depends=[]; };
   SMITIDstruct = derive2 { name="SMITIDstruct"; version="0.0.5"; sha256="12ffxj96w3pi18l0scz5sd3dl37vd4vg2wcfykaxdhf8z142ha3k"; depends=[Biostrings ggplot2 sf]; };
-  SMITIDvisu = derive2 { name="SMITIDvisu"; version="0.0.6"; sha256="0563z9dypxsd9g532i1xfxdi8d29zwdla5ria15harimfda55ksq"; depends=[htmlwidgets jsonlite magrittr Rcpp yaml]; };
+  SMITIDvisu = derive2 { name="SMITIDvisu"; version="0.0.8"; sha256="1g5h0ciwfh53bfdpsngf93zg3qrd596281gjlsgi4nsjzrjfnf3q"; depends=[htmlwidgets jsonlite magrittr Rcpp yaml]; };
   SMLE = derive2 { name="SMLE"; version="0.4.1"; sha256="1ssry4kcqz31na2xns2sqfc7nifclhg8bxi1cnri96b1k6zd29qd"; depends=[doParallel foreach glmnet mvnfast]; };
   SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; };
   SMM = derive2 { name="SMM"; version="1.0.2"; sha256="1g1c7ssdcnzgv6b221ya1xrypg2ksahc7qj1042j8nlx5wg29cld"; depends=[DiscreteWeibull seqinr]; };
-  SMMA = derive2 { name="SMMA"; version="1.0.2"; sha256="13psgrpljnaxpcq4amiyg5mqhpzmb2hyb7jzh3h8wyq18rvs3s4d"; depends=[Rcpp RcppArmadillo]; };
-  SMMT = derive2 { name="SMMT"; version="1.0.2"; sha256="0adg0k0sz3n53cxnz7i6xl8xivl21ky3jmigjv0jjgliqyic3dzk"; depends=[dplyr tibble XML]; };
+  SMMA = derive2 { name="SMMA"; version="1.0.3"; sha256="1nwxp447m1igm7dlxw5kqw472f8470svwx9awjp2d84m66wplinr"; depends=[Rcpp RcppArmadillo]; };
+  SMMT = derive2 { name="SMMT"; version="1.0.5"; sha256="19vx9w04z5x4747c07zb4qnw6y5mgs6mirc6qris9ma5sa65dvh6"; depends=[curl dplyr tibble XML]; };
   SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; };
   SMPracticals = derive2 { name="SMPracticals"; version="1.4-3"; sha256="0zxq84f9i3b86xx6msb25b61gyj9k09iab2b7wg4d93yas9qzayf"; depends=[ellipse MASS nlme survival]; };
   SMR = derive2 { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; };
@@ -4223,7 +4376,7 @@ in with self; {
   SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
   SNFtool = derive2 { name="SNFtool"; version="2.3.0"; sha256="1yplcwmy7jhsvz19r82ivpxfqav7q88jcf8d0r2k8ll9iqmi1dbc"; depends=[alluvial ExPosition heatmap_plus]; };
   SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; };
-  SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; };
+  SNPassoc = derive2 { name="SNPassoc"; version="2.0-2"; sha256="16raq5nkm24xqfshncwmf46z2naf2fcixgjs9b7gy1368wn3ahzl"; depends=[BiocStyle ggplot2 haplo_stats mvtnorm plyr poisbinom survival tidyr]; };
   SNPknock = derive2 { name="SNPknock"; version="0.8.2"; sha256="121pdgvdffj61hw8x8m76na0cg5iw5gb586q05ikw5d959mmbzrs"; depends=[Rcpp RcppArmadillo RcppProgress Rdpack]; };
   SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; };
   SNSequate = derive2 { name="SNSequate"; version="1.3.3"; sha256="1qadhk2acpr0lkh2z37ivif9dbp7zb31lfn32ch2sb0z9pp56his"; depends=[emdbook knitr magic plyr progress statmod]; };
@@ -4236,12 +4389,13 @@ in with self; {
   SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; };
   SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; };
   SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
-  SP2000 = derive2 { name="SP2000"; version="0.1.0"; sha256="0x6l09vhx1r5pra7l1psz6wr7vrmqr4r3jdfw1rv7c9aifvs1l0h"; depends=[DT jsonlite pbmcapply purrr rlist tibble XML xml2]; };
+  SP2000 = derive2 { name="SP2000"; version="0.2.0"; sha256="01wrc7p36js20jv04zhphj2vq7qqfgxmrzic066wij0c0mnh0xn5"; depends=[DT jsonlite pbmcapply purrr rlist tibble urltools XML xml2]; };
   SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; };
   SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; };
+  SPARSEMODr = derive2 { name="SPARSEMODr"; version="1.0"; sha256="0gifz04i35v5vsw1ad9zrjwj6rxypwqbd14haadgzdzsscjj1ibs"; depends=[data_table future future_apply geosphere lubridate Rcpp tidyverse viridis]; };
   SPAS = derive2 { name="SPAS"; version="2020.1.1"; sha256="1bvnyxg3npxv63kikmr30jgc14f1s1a5vfh40qs50nbzq84pl6bx"; depends=[BB MASS Matrix msm numDeriv plyr RcppEigen TMB]; };
   SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
-  SPAtest = derive2 { name="SPAtest"; version="3.0.2"; sha256="0cg8lk0pwzpi5wfcv9843ysnsas94qzh6did7afjjk6z6vv04pks"; depends=[]; };
+  SPAtest = derive2 { name="SPAtest"; version="3.1.2"; sha256="1x5r4a6jnizhhazxywb2cf2jj2rx6rfynl6xcscmlix6n394xmxk"; depends=[]; };
   SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; };
   SPCAvRP = derive2 { name="SPCAvRP"; version="0.4"; sha256="10bvr4lqnim40fihq495a4fy4f33pvfd7gsaqjj9bh6gy0z8y4mi"; depends=[MASS]; };
   SPCDAnalyze = derive2 { name="SPCDAnalyze"; version="0.1.0"; sha256="0zaxlc4dw678s0v22ghv7mc4vqsgkcnmbxh7065w6qj9vm7pg5kz"; depends=[lme4 nlme plyr]; };
@@ -4253,7 +4407,7 @@ in with self; {
   SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; };
   SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
   SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
-  SPOT = derive2 { name="SPOT"; version="2.0.6"; sha256="0l781g8qv67f70fnhdv341hif1zbv8qkpqak6xb1vbdvakjiriar"; depends=[DEoptim ggplot2 MASS nloptr plotly randomForest ranger rgenoud rsm]; };
+  SPOT = derive2 { name="SPOT"; version="2.1.10"; sha256="0ciix6cpci0ssybrg98k7cv1x532lynfi2svh3lp6h6y5gydb54s"; depends=[DEoptim ggplot2 glmnet MASS nloptr plotly randomForest ranger rgenoud rpart rpart_plot rsm SimInf smoof]; };
   SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; };
   SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
@@ -4266,17 +4420,17 @@ in with self; {
   SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
-  SQRL = derive2 { name="SQRL"; version="0.7.2"; sha256="0xvl73rs3ihzd4jg51sh1rgvpfazgsf8jm35zw3jwp1a08ygvnn8"; depends=[RODBC]; };
-  SQUAREM = derive2 { name="SQUAREM"; version="2020.3"; sha256="17l05i87vwvcsk79fbg52zrx04zdlwiiyl3ga8qafs7mqx0j976q"; depends=[]; };
+  SQRL = derive2 { name="SQRL"; version="0.7.4"; sha256="18h3y5fcxd6sbvjiqsjrjdcq3vlgjiknhvnk2dj0ahhdb060iwhg"; depends=[RODBC]; };
+  SQUAREM = derive2 { name="SQUAREM"; version="2020.5"; sha256="1f0j5pbsz2wi7dfl8h8gvdl991bjywiwkd2f6z0xgkh87kl5y0b4"; depends=[]; };
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
-  SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
+  SRS = derive2 { name="SRS"; version="0.2.1"; sha256="0yq3bjskwy23i5p7bhgnla6fbgq2a6hddm1jwi3dzm41m4rbvbn2"; depends=[DT shiny shinybusy shinycssloaders vegan]; };
   SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; };
-  SSBtools = derive2 { name="SSBtools"; version="0.7.0"; sha256="12277lqn2qjvxqs4lq7sx41hkxkr2hp7lxgg5f23ixfqvpf375xs"; depends=[Matrix stringr]; };
+  SSBtools = derive2 { name="SSBtools"; version="0.8.0"; sha256="06b9zkrlqzv57dp1jzl9zpf37xx85zb2mwp7s4w9nys821q4za15"; depends=[MASS Matrix stringr]; };
   SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; };
-  SSDforR = derive2 { name="SSDforR"; version="1.5.17"; sha256="072ala1qdxnc58227b6m7vw79nyxjiasjhr98p8qll64nxyj4lmj"; depends=[MAd MASS metafor psych SingleCaseES TTR]; };
-  SSHAARP = derive2 { name="SSHAARP"; version="1.0.0"; sha256="0qcl4msdwnmrjzxyp1az6zkz4j6abx65ap6n8zxpldg7wgxw26iz"; depends=[BIGDAWG data_table DescTools dplyr filesstrings gmt gtools sessioninfo stringr]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.5.20"; sha256="0qcywzvdjavzmmpawji2r5x1lrj0b7i0zyz32l1f89hq2xir53av"; depends=[MAd MASS metafor psych SingleCaseES TTR]; };
+  SSHAARP = derive2 { name="SSHAARP"; version="1.0.1"; sha256="1dlfv1clkxra1mkp995zii6p3wdx5igz7i3wj9qvs1ivl27inxa9"; depends=[BIGDAWG data_table DescTools dplyr filesstrings gmt gtools sessioninfo stringr]; };
   SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; depends=[]; };
-  SSLR = derive2 { name="SSLR"; version="0.9.2"; sha256="0xkhvfd8ixgv7zqr2kknl8bhri0nkpx3vf2dv44r0ganq21xaa99"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; };
+  SSLR = derive2 { name="SSLR"; version="0.9.3"; sha256="15wx619sjm7yl17q32gm835j61iig8v7brwnfl2qd8bg2q86zf0r"; depends=[conclust dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; };
   SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; };
   SSN = derive2 { name="SSN"; version="1.1.15"; sha256="057lh2ym82ff3c25vyh97csns4jwlbvxwc4jai0i4yplxf0ccmha"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
   SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; };
@@ -4296,23 +4450,23 @@ in with self; {
   STGS = derive2 { name="STGS"; version="0.1.0"; sha256="0xfwd0jsg3glbr3c5l5yyri4is5kg77ivgr6qlzaxp6p8q7yfzqf"; depends=[brnn glmnet kernlab randomForest rrBLUP]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
   STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; };
-  STMotif = derive2 { name="STMotif"; version="2.0.0"; sha256="190qwbh9lhq75mz20cyfsh77y5m91rbg5gharffknbq618gwlcmf"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; };
+  STMotif = derive2 { name="STMotif"; version="2.0.1"; sha256="07725wdm65lxmmivdipxd07yqi3syy7dl10shn4x60ahs0il91nw"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; };
   STOPES = derive2 { name="STOPES"; version="0.1"; sha256="0gv58nf0m67bfqc15c7n4gksqk7h661c9b55qapk210j259b7xbv"; depends=[changepoint glmnet MASS]; };
   STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; };
-  STRAH = derive2 { name="STRAH"; version="1.0"; sha256="0a2av8by99sq7l28c7cjwm6nqhp1i4pd5qxcsarvwd8f9fckvr5z"; depends=[BiocManager Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19]; };
   STRMPS = derive2 { name="STRMPS"; version="0.5.8"; sha256="0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78"; depends=[Biostrings dplyr IRanges purrr ShortRead stringr tibble tidyr]; };
   STV = derive2 { name="STV"; version="1.0.1"; sha256="1gzy47s4qg83fagvm19jwpbbplkvxi9qv6ac0j86i0s8v0yrlrks"; depends=[]; };
   STraTUS = derive2 { name="STraTUS"; version="1.1.2"; sha256="0n3i7gbycp1f10058h9xlh3yk21w2izdb3xgs793mmh1i1sjy394"; depends=[ape ggplot2 ggtree gmp igraph phangorn RcppAlgos]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
   SUMMER = derive2 { name="SUMMER"; version="1.0.0"; sha256="11c3yb61gandl3rk92n451sbwgjf9ah3vs4nmm30qldrqjb9gpna"; depends=[data_table ggplot2 ggridges maptools Matrix RColorBrewer reshape2 shadowtext sp spdep survey survival viridis]; };
+  SUNGEO = derive2 { name="SUNGEO"; version="0.2.0"; sha256="1j4zsawvbzc8mmnkn8vckdhi60z2lmaf5man6iz2rdwhlflxqyxi"; depends=[cartogram data_table dplyr fasterize httr jsonlite packcircles purrr RANN raster Rcpp RCurl rlang rmapshaper sf sp spdep udunits2]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2.9"; sha256="1405gigyjfp8by8nfx4g3rhw9x6r6g7dkpgw52jllv6n4036xa3h"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; };
-  SWIM = derive2 { name="SWIM"; version="0.2.1"; sha256="1v8v48pmb1pxjw1jqkvz0qdd0gpi53hb59xh5kak3jjh94sbxz5g"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; };
+  SWIM = derive2 { name="SWIM"; version="0.2.2"; sha256="18w7rgs9i9flzayy9rvqx447wjhxqbglcjqcmajmywgajwdzbrrf"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; };
   SWMPr = derive2 { name="SWMPr"; version="2.3.1"; sha256="1az6ss8wkdgq4l1cmfflajzs7z6w6140bclb289gb090pi69p7gy"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; };
-  SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.5"; sha256="1jjsl6mk4m9394bsdsm2k08chivy9zmpr6hl8hvg455z7kr2pk5m"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer purrr RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; };
+  SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.6"; sha256="10qai7zfs43x7i7qn1ws3xagq8hi8lx3799fpsp7ckllx1l5mk6p"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer purrr RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; };
   SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; };
-  SailoR = derive2 { name="SailoR"; version="1.1.2"; sha256="01rb3lkf4m969dax36kfyjlavc3zmr7p3si3y1j6x9gf7jzyy1q9"; depends=[]; };
+  SailoR = derive2 { name="SailoR"; version="1.2"; sha256="04qrnps40845ypapf37jg1c1g05nii6iwk4fv1x5xyca963hl5ii"; depends=[]; };
   Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
   SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.2"; sha256="19dl5sfrsmahrf1q0ljpjmp2821mn2h9d53ds9jyci0wv287gzs9"; depends=[]; };
   SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; };
@@ -4329,6 +4483,7 @@ in with self; {
   ScottKnottESD = derive2 { name="ScottKnottESD"; version="2.0.3"; sha256="0gjpjd8ljnp3v4fc72vhwjgscfw9vfivx710yg683pp30z0sv9nf"; depends=[car effsize forecast reshape2]; };
   ScrabbleScore = derive2 { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
   ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; };
+  ScriptMapR = derive2 { name="ScriptMapR"; version="0.0.3"; sha256="18pd23yqn3ai1yfl149081n42hbh0d57hm71s2lhm1z7a5ccjkmf"; depends=[dplyr formatR RCy3 stringr]; };
   SearchTrees = derive2 { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; };
   SecKW = derive2 { name="SecKW"; version="0.2"; sha256="13x9l6ncx8qszkcr7dpfzrk4zqj4w8z5lwd394437vl4xf1xv0k6"; depends=[fdrtool pracma]; };
   SeedCalc = derive2 { name="SeedCalc"; version="1.0.0"; sha256="1p8ncf3l2zhpbbblpjagg8cg9gf7f2izdcgc48n1aq4f7bmjbqgk"; depends=[]; };
@@ -4342,13 +4497,13 @@ in with self; {
   SegCorr = derive2 { name="SegCorr"; version="1.2"; sha256="1g4bwfs539jf7ckzjyindi3v1av7vd38yz16m7cb20qqa0a33kbj"; depends=[jointseg]; };
   SegEnvIneq = derive2 { name="SegEnvIneq"; version="1.0"; sha256="1xl9q47n4vvmr9nr5yairdq9r8mgms44wh6b4l9sbar2kx9ybwj3"; depends=[OasisR outliers rgdal rgeos spdep]; };
   Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
-  SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; };
+  SeleMix = derive2 { name="SeleMix"; version="1.0.2"; sha256="03q5pdgxdfx944zwpl2w7gzf23va4flbd8in3g03980smq0ai2c1"; depends=[mvtnorm]; };
   Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; };
   SelectBoost = derive2 { name="SelectBoost"; version="2.0.0"; sha256="137fxvlpc2vyn5w93ih8bm6pp198xwlbb9ky8dhxgarh0syz8g4v"; depends=[abind Cascade glmnet igraph lars msgps Rfast spls varbvs]; };
   SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
-  SemNeT = derive2 { name="SemNeT"; version="1.3.0"; sha256="19nh0lc979gdny0yw9ppi2kr8g3bcgpakwawqpmhar6jv5v69aj1"; depends=[dplyr ggplot2 igraph magrittr NetworkToolbox pbapply plyr purrr qgraph RColorBrewer scales]; };
-  SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.2.0"; sha256="1zirw6v3xkbw0xjsrwpq3y3rk51v8pxaj0h28c3pjs41dy2wa85i"; depends=[foreign hunspell R_matlab readxl searcher SemNetDictionaries stringdist stringi]; };
-  SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.6"; sha256="1rnclbcq4y8jl395y9im2ink45fq8320zrhbr7bqi54v86banh8r"; depends=[]; };
+  SemNeT = derive2 { name="SemNeT"; version="1.4.1"; sha256="1qda5867gzd10zlq934mp6hy65yfv7xfsy6c9km0f3wrvawv0vn9"; depends=[broom car dplyr effects ggplot2 igraph magrittr pbapply philentropy plyr purrr qgraph RColorBrewer scales]; };
+  SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.3.1"; sha256="1c1fdfp2gy69d5ph7wnyi8klvyfbc87sb0jhpipfwdmnfss2nkir"; depends=[easycsv foreign R_matlab readxl rstudioapi searcher SemNetDictionaries stringdist stringi]; };
+  SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.8"; sha256="0136mqncpqzrrs11m2w183mg7gxzgmm067gl97d7bzv3gwy2xnk4"; depends=[easycsv knitr]; };
   Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; };
   SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; };
   SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.6"; sha256="0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig"; depends=[MASS numDeriv Rsolnp]; };
@@ -4365,21 +4520,23 @@ in with self; {
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
   SeqNet = derive2 { name="SeqNet"; version="1.1.0"; sha256="0dbiafqgqnmws38lpa58mkzciprkan5qnrw9aivi89s065ykjd74"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr RColorBrewer Rcpp rlang tibble]; };
   SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; };
-  Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; };
+  Sequential = derive2 { name="Sequential"; version="3.2.1"; sha256="1sjfspcq114ig221lnqcn27nqgbvlh5pdl3g0c5zl35an411jdna"; depends=[boot]; };
   SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; };
   SetMethods = derive2 { name="SetMethods"; version="2.6"; sha256="1yvn5jcv83cd3z4sd7fws1j298fljzcif6037b65wy6ywrrbb73x"; depends=[admisc betareg fmsb ggplot2 ggrepel QCA scatterplot3d stargazer]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
   SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; };
-  Seurat = derive2 { name="Seurat"; version="3.2.0"; sha256="1vj3dlsqakgnn4x1jz9fkl2cy0jzc5s65h1c20fnamr7lk45pnf2"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba jsonlite KernSmooth leiden lmtest MASS Matrix miniUI patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform shiny spatstat tibble uwot]; };
+  Seurat = derive2 { name="Seurat"; version="3.2.3"; sha256="11rzc7h2ad8z8k5r1sbz4d7y4rl3080qp2hh7vibwmipbkvlial3"; depends=[cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba jsonlite KernSmooth leiden lmtest MASS Matrix matrixStats miniUI patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales scattermore sctransform shiny spatstat tibble uwot]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; };
   ShapePattern = derive2 { name="ShapePattern"; version="2.1.0"; sha256="10lqapjw2vypz1rrwgr7maw79g5j7g3gfp38g88w1sxlxasmx7by"; depends=[igraph landscapemetrics raster rgdal rgeos sp]; };
   ShapeRotator = derive2 { name="ShapeRotator"; version="0.1.0"; sha256="1pg2m1wh7fbchm8gp3mngfnf5g2rbhvzim1bpzqyvxqpx6ynicsa"; depends=[plot3D]; };
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.4"; sha256="15ds3024qcvnq3pnbhpyd6hbif26mdzw1srqv44hwsllgzpi7602"; depends=[coneproj raster]; };
   SharpeR = derive2 { name="SharpeR"; version="1.2.1"; sha256="1xcnbjwcqc9mhb6kqcarkmjcr5zrn5hryfp4i4rayra9yk9k18r8"; depends=[matrixcalc sadists]; };
+  ShellChron = derive2 { name="ShellChron"; version="0.2.8"; sha256="09yqbsfpc3d7z85g3i4b4lkmjr2hf5vk32lsi4fm04n0ips4w19a"; depends=[dplyr ggplot2 ggpubr magrittr rtop scales tidyr tidyverse zoo]; };
   ShiftConvolvePoibin = derive2 { name="ShiftConvolvePoibin"; version="1.0.0"; sha256="0pj3vynm8afns2kcwvmramxgbd0s2ksyyc5iha6p4dw2nz4hahc7"; depends=[]; };
   ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.1"; sha256="09sm3frapxv1zhxy84wqyaxdk5jx62ijszfa34zlknlgivividfy"; depends=[Formula]; };
   ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; };
-  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.3"; sha256="1yc2a2xc6vdfr0qsgw36kd2m15wlfpgam6nx9z0sbxwmr3a95cx6"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; };
+  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.4"; sha256="1j8lb1x7x82wryl4qjqppx9lgbk0mwllm9mkhhi71n65yf8awgdv"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR dplyr DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown rstudioapi shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; };
+  ShinyQuickStarter = derive2 { name="ShinyQuickStarter"; version="1.0.2"; sha256="0zsynf0kl4ippp5qmqfaik6fh7hs010abbkii0i0dnjp5gch6qpc"; depends=[colourpicker data_table dplyr DT fs magrittr miniUI readr rlist shiny shinyalert shinycssloaders shinyFiles shinyjs shinyWidgets stringi stringr styler visNetwork]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
   ShortForm = derive2 { name="ShortForm"; version="0.4.6"; sha256="0r8flmfhm47kyzy97j3mr87srfsxwlqqsx7v0ay9qm7q2jfg6xsw"; depends=[ggplot2 lavaan stringr tidyr]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; };
@@ -4388,21 +4545,21 @@ in with self; {
   SiZer = derive2 { name="SiZer"; version="0.1-7"; sha256="068xaawc9vhi7a0b52jfq5r81kwnxn2wnqar1b35wwckmsd40b20"; depends=[boot]; };
   SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; };
   SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; };
-  SightabilityModel = derive2 { name="SightabilityModel"; version="1.4.0"; sha256="1wxn9jw9vpggl1i5510kkjkh77pmpl1yq28d2c8aivhlc44i1fsm"; depends=[formula_tools Matrix msm plyr survey]; };
-  Signac = derive2 { name="Signac"; version="1.0.0"; sha256="1n6sb39xi2n9j1yk536ii4p7mmhb9vwvmx2y3iai55lzhysm4p9i"; depends=[AnnotationFilter Biobase BiocGenerics Biostrings biovizBase data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel ggseqlogo IRanges irlba lsa Matrix patchwork pbapply qvalue Rcpp RcppRoll Rsamtools S4Vectors scales Seurat stringi tidyr]; };
+  SightabilityModel = derive2 { name="SightabilityModel"; version="1.4.1"; sha256="1nbz8307jspg40ldh4icsananisa396fd7p2xz13mc9lsk2pa4dc"; depends=[formula_tools Matrix msm plyr survey]; };
+  Signac = derive2 { name="Signac"; version="1.1.0"; sha256="1xdcjb81vkrwkv2maqbf3m602r09id4kha0ysp5i38bnp1kfpah2"; depends=[AnnotationFilter BiocGenerics Biostrings biovizBase data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggbio ggforce ggplot2 ggrepel ggseqlogo IRanges irlba lsa Matrix patchwork pbapply Rcpp RcppRoll Rsamtools S4Vectors scales Seurat stringi tidyr]; };
   SignifReg = derive2 { name="SignifReg"; version="3.0"; sha256="0yvbf56ap29rfm10vdv3mc67x1aklkwwapi72vzsi2xhrgwf395d"; depends=[]; };
-  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.6"; sha256="1lkjngfgmk1j4vq2ybg2q0l5y3j7cif7a0yxc07vfxfamr0xq46w"; depends=[Deriv MASS]; };
+  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.8"; sha256="16pzcs1g5ihza9a2glnkgd5pxi77l6w34vkn0vxcb78gc6syhbrd"; depends=[Deriv MASS]; };
   Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; };
   SimBIID = derive2 { name="SimBIID"; version="0.2.0"; sha256="1iz3paav7ayaqwifqsbb6h27pcdw0lmp6fl1nhvzbq3livvypgg7"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; };
   SimComp = derive2 { name="SimComp"; version="3.3"; sha256="04qkis20zk0z42bv4nznffqlpwby0y0ij27gj4sa0ha864pg0hi5"; depends=[mratios multcomp mvtnorm]; };
   SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; };
   SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.7.0"; sha256="10snjwrh95407iracbc52b5cvr3sp2539rrjp7fw63q50pjl285v"; depends=[evd]; };
   SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.1"; sha256="1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; };
-  SimDesign = derive2 { name="SimDesign"; version="2.0.1"; sha256="00f4dk82zqz5gns3cmnzc009hij8sv591wd77cz6zkssh93mk3j8"; depends=[dplyr foreach pbapply plyr]; };
+  SimDesign = derive2 { name="SimDesign"; version="2.2"; sha256="0ssb8l6v41crrwcyid46kpwjf5j0bjk6s9m2ra072h2kc9ymgqil"; depends=[dplyr foreach pbapply plyr]; };
   SimDissolution = derive2 { name="SimDissolution"; version="0.1.0"; sha256="1rdsxykh740h22ln635m0ysm00pdw94vp7qhgify4mcvc46c3632"; depends=[alabama dplyr mvtnorm]; };
   SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
-  SimInf = derive2 { name="SimInf"; version="7.0.1"; sha256="14s72krwk9sd405xgh71z2p9s29q5a1hr2qzaxsv1l4p5zbhvds8"; depends=[digest Matrix]; };
+  SimInf = derive2 { name="SimInf"; version="8.2.0"; sha256="18lmmp8yqhx7zf8az3as0sk70ljw0bj6jr8g45n8f15fxf72fcql"; depends=[digest Matrix]; };
   SimJoint = derive2 { name="SimJoint"; version="0.3.7"; sha256="03xf8n1fbbq63wz8kyj19h9vqz14z463cv8xqhmaknlamnnyhis5"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; };
   SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; };
@@ -4412,6 +4569,8 @@ in with self; {
   SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; };
   SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; };
   SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; };
+  SimSurvNMarker = derive2 { name="SimSurvNMarker"; version="0.1.1"; sha256="0jncq5q3ijczpa4h1i74035w36grjy2p8x71gx58v69ab3ca62k6"; depends=[Rcpp RcppArmadillo]; };
+  SimSurvey = derive2 { name="SimSurvey"; version="0.1.2"; sha256="0wj8c67v1nzxxvskx5a9prfxxg4l2b1nqf6v4xapa1nfmmrxapik"; depends=[data_table doParallel foreach igraph magrittr plotly progress raster rgeos rlang sp]; };
   SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; };
   SimVitD = derive2 { name="SimVitD"; version="0.1.2"; sha256="0ilv17ngs1y09z459yn5wlg0bql93awdy3gbmrjhv00iyp30kvjp"; depends=[poisson]; };
   SimilaR = derive2 { name="SimilaR"; version="1.0.8"; sha256="1wlxscl94r3gxwsc9yw0y4z5nj28nxilijp0pbzv4z2n4aqc7vy6"; depends=[BH Rcpp stringi]; };
@@ -4423,17 +4582,20 @@ in with self; {
   Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
   SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; };
   SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.3"; sha256="05bd03ka6qxmq8ls9w0nfklya3qay90s3i0iqjpcd6id4g8cz2kb"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; };
-  SiteAdapt = derive2 { name="SiteAdapt"; version="1.0.0"; sha256="0ml11bv3sn8ynwsmaj666xpg17qbfqs9x9xi2b8n0v5gqnw44mpz"; depends=[ggplot2 ggpubr glmulti hydroGOF hyfo RColorBrewer solaR]; };
+  SiteAdapt = derive2 { name="SiteAdapt"; version="1.1.0"; sha256="1k79j29d92a8m578xj61iavljikksdmjr2vlzwmdvxpa6rp1i2ff"; depends=[ggplot2 ggpubr glmulti hydroGOF hyfo RColorBrewer solaR]; };
   SitesInterest = derive2 { name="SitesInterest"; version="1.0"; sha256="06l6i6jnzwj683cvd9a9dg4nlb1wy1v3wb561y97a25bikm3mfy6"; depends=[plotrix]; };
   SixSigma = derive2 { name="SixSigma"; version="0.9-52"; sha256="07s4an2az2pgqhq9c08jrf6b95nrs1b3r1092d53n1ps8wbdmbln"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
   SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; };
   SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.4-0"; sha256="1blxibjrgb738q2ybavp4q3d6yn7hayhg851ysghp118wpl32nwr"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; };
   Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; };
+  SlaPMEG = derive2 { name="SlaPMEG"; version="1.0.0"; sha256="1snjcm9rqlgx41kphj0nadlny3yxpdczkvjisk4vp49fp381j4z7"; depends=[ggplot2 globaltest lcmm lme4 magic mvtnorm reshape2]; };
+  SleepCycles = derive2 { name="SleepCycles"; version="1.0.1"; sha256="0kcggihymq726g4p4y3giq0bvc4fvqf19gmh6y8dbxmqlaphj5qp"; depends=[devtools ggplot2 plyr reshape2 stringr viridis]; };
   Sleuth2 = derive2 { name="Sleuth2"; version="2.0-5"; sha256="18rp23dr55p2zqxqj5i86gi8j25b0y7hc2p88rxqszgmbyn5ynhi"; depends=[]; };
   Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; };
+  SlidingWindows = derive2 { name="SlidingWindows"; version="0.1.7"; sha256="1anrmjk0nmhdvq0gnpspdv5xx9sk406g2vjh8qiqhkaglaa9hpw3"; depends=[DCCA nonlinearTseries PerformanceAnalytics TSEntropies]; };
   SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; };
-  SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.4.0"; sha256="0rx47hvm4wkmrj1hrwaa8j61y3agfb09n048j9xlda5rismaqk8z"; depends=[Matrix SSBtools]; };
+  SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.6.0"; sha256="0ghahp0xc3q3w9b3r5hswrmsj88c12wpkgvw39yycrifrpg1syq7"; depends=[Matrix SSBtools]; };
   SmartEDA = derive2 { name="SmartEDA"; version="0.3.6"; sha256="15pry1p82kpyd0w4c9p84bm0812lzblfdpzsr46m221hfhr3spqh"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; };
   SmartMeterAnalytics = derive2 { name="SmartMeterAnalytics"; version="1.0.3"; sha256="0i8my7ngzdbay3cld8axhvbri0nh0dd1dmv2lbsgyx4adr5hb30f"; depends=[FNN futile_logger plyr stinepack zoo]; };
   SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; };
@@ -4442,11 +4604,11 @@ in with self; {
   SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
   SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; };
   SmoothWin = derive2 { name="SmoothWin"; version="3.0.0"; sha256="0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66"; depends=[nlme Rfast]; };
+  Snake = derive2 { name="Snake"; version="1.0"; sha256="10i1bqsva70lzavfqvc56ga70ddjfwf0hqpspj8fqwa0jw86jmbh"; depends=[]; };
   SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; };
   SnowballC = derive2 { name="SnowballC"; version="0.7.0"; sha256="1wwm71mp4b2mjb5985x782p6xj519dfrpd40qli7lmig6afyw3xi"; depends=[]; };
-  SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
+  SoDA = derive2 { name="SoDA"; version="1.0-6.1"; sha256="0d3jb1dsg1q06c08ldmhj0q2sb1pc0g08rfal29ddng3b4qm1lhh"; depends=[]; };
   SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; };
-  SocEpi = derive2 { name="SocEpi"; version="1.0.0"; sha256="0r5wns6hisax6ad1v4lhprsp19a7anx2fyjvy9fdmls33jzrh1rv"; depends=[dplyr Rcpp tidyr]; };
   SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
   SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; };
   Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; };
@@ -4461,8 +4623,9 @@ in with self; {
   SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; };
   SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
   SortedEffects = derive2 { name="SortedEffects"; version="1.2.0"; sha256="0p16kxzss0inzvsd23sh7yiry1znpzdl36wf9dzhb9w7y9js8nxr"; depends=[boot dummies Hmisc pbapply quantreg rlist SparseM]; };
+  SoundShape = derive2 { name="SoundShape"; version="1.0"; sha256="1rpw1irp049r44w23giz33xblq16vgpb293byha4aaffsahbw2rx"; depends=[abind geomorph plot3D reshape2 seewave tuneR]; };
   SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
-  SoupX = derive2 { name="SoupX"; version="1.4.5"; sha256="0kwcf0v4h5432x6gik5xkbybp2b3xjpwn2wcdgrg3pw4lcybhzi3"; depends=[ggplot2 Matrix Seurat]; };
+  SoupX = derive2 { name="SoupX"; version="1.4.8"; sha256="0lyqhzljx2vffcxif6apsh3nsiqjv02w3cv4xmbjxjjv7bmnccdc"; depends=[ggplot2 Matrix Seurat]; };
   SourceSet = derive2 { name="SourceSet"; version="0.1.3"; sha256="159kg4pna24yihkghxc2k5f56dqk8aypxcmj1whgnajmgab29ry1"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; };
   SoyNAM = derive2 { name="SoyNAM"; version="1.6"; sha256="1vwl2mknk6x0sgk0baxsvb6xy4i7mf2ypkmc9lx869nakrx1ypah"; depends=[lme4 NAM reshape2]; };
   SpATS = derive2 { name="SpATS"; version="1.0-11"; sha256="00xw6xz764sqlfr7pw2mxzxvm4i1p76n9h8wz62n0p3afn1d1glm"; depends=[data_table fields plot3Drgl spam]; };
@@ -4471,9 +4634,9 @@ in with self; {
   SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; };
   SpaDES = derive2 { name="SpaDES"; version="2.0.4"; sha256="1ihxkr2c7rfpb02chmdv393nfc1id1cg7lq8pbb64xm5vdpyj0bv"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
   SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.2"; sha256="0z1n48kfwy460zfam88ayfiq8sbzvnf6cpkasr74nykr4fabs5ha"; depends=[devtools magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; };
-  SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.1"; sha256="12963853zk9rb9lsv2l6jsd0n5wi360i8kxvsjl1p3dcp8ii4mxq"; depends=[backports crayon data_table dplyr fastdigest fpCompare igraph lubridate qs quickPlot R_utils raster RCurl reproducible rlang stringi whisker]; };
+  SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.3"; sha256="17wgnasy76braiz070fhn9w7la1x0gbgfa6flbr1rr14jvfpnh2d"; depends=[backports crayon data_table dplyr fastdigest fpCompare igraph lubridate qs quickPlot R_utils raster reproducible Require rlang whisker]; };
   SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.6"; sha256="1rfkdm0dnylpvmsv59vkwxlyq61znrskf43qpr3p8kl7jbkqw7v6"; depends=[backports checkmate CircStats data_table fastmatch fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; };
-  SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
+  SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0.1"; sha256="0w2jxaz2kxfksyss5vy6xy499p8jg8lpqlykwgm2srp1fd2l3rs9"; depends=[Rcpp RcppArmadillo]; };
   SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
   SparseBiplots = derive2 { name="SparseBiplots"; version="4.0.0"; sha256="0cpibfj106is7k0wq8z21r110wpxpqs393ic9hxx5yx386z5rcav"; depends=[ggplot2 ggrepel gtable rlang sparsepca testthat]; };
   SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; };
@@ -4484,36 +4647,39 @@ in with self; {
   SparseMDC = derive2 { name="SparseMDC"; version="0.99.5"; sha256="0d3ashk3l9fjdbiyjhaxc05ayyscissrg7lwhnh46hv3fydbixlj"; depends=[doParallel doRNG foreach]; };
   SparseMSE = derive2 { name="SparseMSE"; version="2.0.1"; sha256="1alpvj0ya3r64wwfdzz2aaxgaf6512glzl65p97606c2fwrm6db7"; depends=[lpSolve Rcapture]; };
   SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; };
-  SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; };
   SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.1"; sha256="0vqajxcjjdp9dv53w0s4d1z63yrnzvs90h7cqs0f6daaihyvm130"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-4"; sha256="09rkzfzg6nh4n7dizkqrz651kp617l2557c9qpxacspl3ngbm82i"; depends=[sp]; };
-  SpatialBSS = derive2 { name="SpatialBSS"; version="0.8"; sha256="0dbra7m99b1jn107gp88fdv08whaq02ny3fdddgdxvyf4mlqid8p"; depends=[JADE Rcpp RcppArmadillo sp]; };
+  SpatialBSS = derive2 { name="SpatialBSS"; version="0.9-0"; sha256="0id5mi8j80kn3s42ibbbsk4m76b48ir1h66y7ds5jck0xl4fndx2"; depends=[JADE Rcpp RcppArmadillo sp]; };
   SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; };
   SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.3"; sha256="0d0kyh591m3hvalqpbj67pynpb9v00kdx1idc5mw4p9hsbfs10xm"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
   SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; };
-  SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-8"; sha256="0r2byz5xxc46zqnigdax28q7446ibmzmsmi10lmm2hdks3ml6sl3"; depends=[fields maps]; };
+  SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-9"; sha256="1mhn1c8n3bmgf0fjyac3wji4790zswzkqliqcv3n8kv9806crb0y"; depends=[fields maps]; };
   SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; };
   SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; };
-  SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.1"; sha256="15znbhfflzz1x396mnnbx9lx8xs6rfr2564kr632qb2d9ihj9s45"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; };
+  SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.2"; sha256="00gdx9jhfybxvfigsym122wfc72vks9bs4zlsij5wp9d1l3r0kfr"; depends=[dplyr glue magrittr raster Rcpp rlang sf vctrs]; };
   SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-4"; sha256="1hj9fjhyxcvl2d0wdqyc899wy4f6iyi03g65icavkmqnwcs8c7hc"; depends=[]; };
-  SpatialPack = derive2 { name="SpatialPack"; version="0.3-819"; sha256="14479j2kfsd5611afg2zc9yp408awq3dyp4xcam5cg28ai95ifwl"; depends=[]; };
-  SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.1"; sha256="0ljhb5j05kxhw1c2ki1m1688mgbg4pnf8z324i21b9idrcypcizn"; depends=[isoband raster rgeos sf sp]; };
+  SpatialPack = derive2 { name="SpatialPack"; version="0.3-8196"; sha256="0kbv4ddl8zdm5z8vi6cj0x59paf669js9vgm28d74yxrdmjy29wh"; depends=[fastmatrix]; };
+  SpatialPosition = derive2 { name="SpatialPosition"; version="2.1.0"; sha256="0hl1xhihjsz7wfmia2qn65m6hkzafv616gficvfa5nclj5ll2dz7"; depends=[isoband raster sf sp]; };
+  SpatialRegimes = derive2 { name="SpatialRegimes"; version="0.2"; sha256="01kbfwzq58zcvclrnmb9n5y3n0ki9nr8zbxyyanzqn7xcng8qmnb"; depends=[GWmodel plm quantreg spdep]; };
   SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; };
   SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; };
-  SpatialVx = derive2 { name="SpatialVx"; version="0.6-6"; sha256="184bfx6yxv53pn20q50z84q7d5lcik0mk4w28vh84xx3zq9951mx"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
-  Spbsampling = derive2 { name="Spbsampling"; version="1.3.3"; sha256="14km5g0yngp4ikndnlfmsgrahpklgsclry269fhmxgk9ingr1isx"; depends=[Rcpp RcppArmadillo]; };
+  SpatialVx = derive2 { name="SpatialVx"; version="0.7-1"; sha256="0xbbfz92h168lag1h7hwnb86fb30jccxhabcdi8x0kcpcn721x69"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
+  Spbsampling = derive2 { name="Spbsampling"; version="1.3.4"; sha256="1rsgrfhipx743qdcpii727hxwg9wqcavy67z5b3kwawss8gf8arc"; depends=[Rcpp RcppArmadillo]; };
   SpecDetec = derive2 { name="SpecDetec"; version="1.0.0"; sha256="1940pl4vm1kzszq0hwhqkwbk1xmrimjdf03acpdndy089mdg9avc"; depends=[abind]; };
   SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; };
   SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-3"; sha256="1v76lilyj65f04881yw19v0qi7n08ysdnr7sc4hf5d8wnmvdh3v3"; depends=[Rcpp RcppArmadillo]; };
   SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; };
   Spectrum = derive2 { name="Spectrum"; version="1.1"; sha256="0n38d360azkck6vvhr771zsh0gbvd9qsf9ygg5r18vhz0pb1xcfw"; depends=[ClusterR diptest ggplot2 Rfast]; };
+  SphereOptimize = derive2 { name="SphereOptimize"; version="0.1.1"; sha256="1b01jpj0sagi3hwfvgd346wvrcypv5b3hh0xfdd8qqnwjgkq8ixi"; depends=[]; };
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; };
   SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; };
+  Spillover = derive2 { name="Spillover"; version="0.1"; sha256="18vk1njd7bzrfic4s1kmnbafcjyrr7wv2lbnifmsafd5qphbx87x"; depends=[fastSOM vars zoo]; };
   SplitReg = derive2 { name="SplitReg"; version="1.0.2"; sha256="1s012qldrsq8rpfpzf7kyd7631b65zai269x53xcaqn75r5ssh3f"; depends=[Rcpp RcppArmadillo]; };
   SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-1"; sha256="0jk46ymgkjh8jg9b9zzn9490cq92fzchvi2yzqiwisww0k15xlvb"; depends=[]; };
   SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
+  SpotSampling = derive2 { name="SpotSampling"; version="0.1.0"; sha256="0s47dvigzkcl9ynrdiwrjzwap18dpkb29jngi8ddvf9m4xywj4al"; depends=[BalancedSampling MASS pracma sampling WaveSampling]; };
   SqlRender = derive2 { name="SqlRender"; version="1.6.8"; sha256="10v2p5law5nqf2bychrbq28albxn9f1aic7cb9lj9pk12w03rpp0"; depends=[rJava]; };
   Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; };
   StAMPP = derive2 { name="StAMPP"; version="1.6.1"; sha256="1x6b032xadjn8yq3n662r9f0lyg5xl71q2lksvx8rn5fmpjlqqrs"; depends=[adegenet doParallel foreach pegas]; };
@@ -4523,10 +4689,10 @@ in with self; {
   StabilizedRegression = derive2 { name="StabilizedRegression"; version="1.0"; sha256="11hfq13b5rc1jj832msrfb0f3fsklx4clp72aqxfccw0z0n8mdq0"; depends=[corpcor ggplot2 ggrepel glmnet MASS R6]; };
   StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
   StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; };
-  StanHeaders = derive2 { name="StanHeaders"; version="2.21.0-6"; sha256="1wwcrss4y6xbi81cg6ldhm57wz5paflzzp3yxh8b6shf9l2jla50"; depends=[RcppEigen RcppParallel]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.21.0-7"; sha256="0srkyawyiykn3p5lw1z3zf18s4ax4iasv1ci3l1px40f9w36wm17"; depends=[RcppEigen RcppParallel]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; };
-  StatCharrms = derive2 { name="StatCharrms"; version="0.90.95"; sha256="05sfrg19slqb31ifw7p0fn5722d2r91fx3xlfhvql0z5mq4hykah"; depends=[cairoDevice car clinfun coxme gWidgets2 gWidgets2RGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
+  StatCharrms = derive2 { name="StatCharrms"; version="0.90.96"; sha256="1451aj1476qjpmxhpbgd8g55i7rp2msml64xsiy25h7x9g6d9w05"; depends=[cairoDevice car clinfun coxme gWidgets2 gWidgets2RGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
   StatDA = derive2 { name="StatDA"; version="1.7.4"; sha256="1ld7fx1lip54n24r2d9zvd4hri3w02vd174bdi8pi9j5n8xpxl02"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat sp xtable]; };
   StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
   StatMatch = derive2 { name="StatMatch"; version="1.4.0"; sha256="0nd4s57rzq4zgi5b7krbdhz9vwxvj5j63kazdyhlwwqk4b6r2042"; depends=[ggplot2 lpSolve proxy survey]; };
@@ -4534,8 +4700,9 @@ in with self; {
   StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; };
   StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; };
   SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; };
+  SteinerNet = derive2 { name="SteinerNet"; version="3.1.0"; sha256="03wr746dkwp8vg91y986q0xvgz1y9b5q25g0kig2sx6m75li3yif"; depends=[igraph]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
-  StempCens = derive2 { name="StempCens"; version="0.1.0"; sha256="11gspjrcl6yiyr19hankan5mcxipfsdkhha6nsiybs1chg5wx6f4"; depends=[distances ggplot2 gridExtra Matrix MCMCglmm mvtnorm optimx sp spTimer ssym tmvtnorm]; };
+  StempCens = derive2 { name="StempCens"; version="1.1.0"; sha256="0jphyikfggx0yj5f5k3fykf3fdv9msppymzpyin1m7xfmfi5cwia"; depends=[distances ggplot2 MCMCglmm mvtnorm Rcpp RcppArmadillo Rdpack tmvtnorm]; };
   StepReg = derive2 { name="StepReg"; version="1.4.1"; sha256="1ash73v9qwy1717w00vajamkd4rb8rsaxch7y9479yqagclfbl18"; depends=[Rcpp RcppEigen]; };
   StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; };
   StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; };
@@ -4544,11 +4711,11 @@ in with self; {
   StrainRanking = derive2 { name="StrainRanking"; version="1.2"; sha256="1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0"; depends=[]; };
   StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; };
   Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; };
-  StrathE2E2 = derive2 { name="StrathE2E2"; version="3.1.0"; sha256="1j9mx3pi22g62x5ard3vwpcmmh5jwb26rvpsma6xk8qjpbc0yzrf"; depends=[deSolve NetIndices]; };
+  StrathE2E2 = derive2 { name="StrathE2E2"; version="3.2.0"; sha256="0yzlnjnczndd06r2s90hs0fnm3rrb0avw0q5mhhsfjglix5p2km3"; depends=[deSolve NetIndices]; };
   StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; };
   StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="1.0.2"; sha256="0vrymsq4n88c8shh2ragx731kyy75bp823kfzs4ldam4f77fp1pz"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; };
   StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; };
-  StratigrapheR = derive2 { name="StratigrapheR"; version="1.1.0"; sha256="0njxvphgjws6349cz8f6scpz0wyiahfqkg50z2dall8ia6kszjnh"; depends=[diagram dplyr shiny stringr XML]; };
+  StratigrapheR = derive2 { name="StratigrapheR"; version="1.1.1"; sha256="1r10sxl09diwn6d76i9ila9apjpfwglndh8z4njldk311nv5c2w0"; depends=[diagram dplyr reshape shiny stringr XML]; };
   StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; };
   StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; };
   String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; };
@@ -4556,30 +4723,31 @@ in with self; {
   StructFDR = derive2 { name="StructFDR"; version="1.3"; sha256="1y0wj7y36iq0lznc4qpsr2yis3an34iilpabkaxxmas2q4abg0qb"; depends=[ape cluster dirmult matrixStats nlme]; };
   StructureMC = derive2 { name="StructureMC"; version="1.0"; sha256="1pj3inznw6flvmk22dzjcfjnwjhx7r98ngckz0axf6ipp3hb85jn"; depends=[MASS matrixcalc]; };
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
-  SubTite = derive2 { name="SubTite"; version="3.0.2"; sha256="1idp6yra1nznkm3hdv82hvp432lywi8kddk3n227g5216q0pmlcn"; depends=[Rcpp RcppArmadillo]; };
+  SubTite = derive2 { name="SubTite"; version="4.0.1"; sha256="1nb7wig34xf8wq50s9i2zs5ymd0z782lh39rp165wi6c62nj36rz"; depends=[Rcpp RcppArmadillo]; };
   SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; };
   SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.3"; sha256="1bi5zndkpgvyk563i0jdfrw73kkpa6zi3yx922dv90w6bdb9kvl2"; depends=[alluvial circlize colorspace diagram dplyr ggplot2 ggrepel gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; };
-  SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; };
   SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; };
   SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; };
-  SubtypeDrug = derive2 { name="SubtypeDrug"; version="0.1.1"; sha256="02dq2byh4m84pckxzcp5zbj7dd5xv2fawrj711m1wwr310dqddns"; depends=[BiocGenerics ChemmineR devtools GSVA igraph pheatmap rvest xml2]; };
+  SubtypeDrug = derive2 { name="SubtypeDrug"; version="0.1.3"; sha256="0rixcdkrm6l62sl3d4jpwn0kidcgr6z26yz3hzyyfzlkcv599l4j"; depends=[BiocGenerics ChemmineR devtools GSVA igraph pheatmap rvest xml2]; };
+  SuessR = derive2 { name="SuessR"; version="0.1.1"; sha256="0hbhwd29q2z0f03p8cf197nbn4i2srrl5nymxy05d4gv2swl1cvn"; depends=[]; };
   SummaryLasso = derive2 { name="SummaryLasso"; version="1.2.1"; sha256="1gb1g1xgda5psq93vy50yfr0cbhvymliblpkxz7ck1nwpp65n9py"; depends=[gtools]; };
   Sunclarco = derive2 { name="Sunclarco"; version="1.0.0"; sha256="0jv92a4ciwkm0wa4irgb6ql3vf6v6p24fmbnk24pqp5p8drp8g5v"; depends=[survival]; };
   Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
-  SunsVoc = derive2 { name="SunsVoc"; version="0.1.0"; sha256="09czc6z453k7qs5vvslnbdr65h7j1yiy5az56hihwg548i3vcj9y"; depends=[data_table ddiv dplyr magrittr purrr rlang stringr]; };
+  SunsVoc = derive2 { name="SunsVoc"; version="0.1.1"; sha256="1rcaip60hdfn496i0ynzkg5r9d9f4g8w502s85icczd07m20y6pb"; depends=[data_table ddiv dplyr magrittr purrr rlang stringr]; };
   SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
   SupMZ = derive2 { name="SupMZ"; version="0.2.0"; sha256="1n81wqacrpk5x6i1pd1zsjivv2jk41743kg1h7gnp0rb3k58vp7r"; depends=[dplyr magrittr]; };
   SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.7"; sha256="1ysfsdzbkldcn7hzxhqikf5h2h9747xhfrirqgr8xx8q81wq989s"; depends=[]; };
-  SuperGauss = derive2 { name="SuperGauss"; version="1.0.2"; sha256="08nrw96y7b04a9xpyklcnqgisbjxd35pqffpay6cr67zxx0zg81i"; depends=[fftw Rcpp RcppEigen]; };
+  SuperGauss = derive2 { name="SuperGauss"; version="2.0.1"; sha256="1v7bva9a4cjjaf924bj02421sk85hmirijrpcpayhyyjr65jscqh"; depends=[fftw R6 Rcpp RcppEigen]; };
   SuperLearner = derive2 { name="SuperLearner"; version="2.0-26"; sha256="10b0fh71ky92mp0ydi81s6zm3sn47k5agppcg4zpgqmailn94qj4"; depends=[cvAUC nnls]; };
   SuperPCA = derive2 { name="SuperPCA"; version="0.3.0"; sha256="139nym0szr7l7hq3xy60jwpx61896h5g7vrklxy7098w53iczyj4"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; };
   SuperRanker = derive2 { name="SuperRanker"; version="1.1.1"; sha256="1yiklw9zk7yw0xz5g3lmyl5lv325fnysimdwbxa37nyj6qdfv0ls"; depends=[prodlim Rcpp]; };
   SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.2"; sha256="07zg9k8a0fb9x37q5wlahvg4xc0lnhidz0xvly8d330iqmxhxmyq"; depends=[ClusterR lattice OpenImageR R6 Rcpp RcppArmadillo]; };
-  Superpower = derive2 { name="Superpower"; version="0.0.3"; sha256="0hwlgscygjcqiclgac97ffcmw081g91rvqbd2pj0z0kijz7g597x"; depends=[afex dplyr emmeans ggplot2 gridExtra magrittr MASS mvtnorm reshape2]; };
+  Superpower = derive2 { name="Superpower"; version="0.1.0"; sha256="0khslcma1b5nlyfwqdanlydblwxb4an94k75ffxpv603nrn3s26x"; depends=[afex dplyr emmeans ggplot2 gridExtra Hmisc magrittr MASS mvtnorm reshape2 tidyselect]; };
   SuppDists = derive2 { name="SuppDists"; version="1.1-9.5"; sha256="1i3iq12a5x5k49ac01mikzcrrq9gc148xq3m08h4xm07bha6f2v8"; depends=[]; };
-  SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.1"; sha256="0q0swp0xs3lmfx2dxffqrna2spyr2l9ka0zbhmw8nkgb1w5rq5q6"; depends=[gstat raster rgeos sp]; };
-  Surrogate = derive2 { name="Surrogate"; version="1.7"; sha256="17f91s6fdlbgwxqggnylx45n3j2mdsqi9613ayrhi77yhqhjpm16"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; };
+  SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.2"; sha256="1l586x9np5rclqdrnv8b72ixlppzlnsq4yf99ny6aq5a9lwzmcgm"; depends=[gstat raster rgeos sp]; };
+  Surrogate = derive2 { name="Surrogate"; version="1.8"; sha256="0kqcij8bxh15ajqlcv6j8zx8c9p5yn0w94i06f0f4b3mpqw3vjik"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rms rootSolve survival]; };
   SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.0"; sha256="0x91bmr4n9zn9cc72s91fzzsqhzhrkfpcbcla00gcsfmbjqz3997"; depends=[survival]; };
+  SurrogateRegression = derive2 { name="SurrogateRegression"; version="0.5.0"; sha256="06xdkg75fs1ymq5x20k5wnv6rji13rk049pm11b686wjvwycrsg7"; depends=[mvnfast plyr Rcpp RcppArmadillo]; };
   SurrogateTest = derive2 { name="SurrogateTest"; version="1.2"; sha256="0wkyz9qkmvsrhvdga6w0qkbgqr7kr0yh04kkc19824sqnx452dc5"; depends=[survival]; };
   SurvBoost = derive2 { name="SurvBoost"; version="0.1.2"; sha256="17av00iwa3kpw0ihrvvynrfcghnq492b5k7n9fxfgf2nily24x2p"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; };
   SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
@@ -4592,19 +4760,23 @@ in with self; {
   Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
   SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
   SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-6"; sha256="09xq7jx70qjyhblzh6kc40hdr0636rqqdnbka7m6rawhd8ivp8yz"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
-  SwimmeR = derive2 { name="SwimmeR"; version="0.3.1"; sha256="10jn491rsaknl6fyialm8g4ipckcr1qcaipqxbhszdakmj8hpfpr"; depends=[dplyr ggplot2 magrittr pdftools purrr rvest scales stringr tibble xml2]; };
+  SwimmeR = derive2 { name="SwimmeR"; version="0.6.0"; sha256="0yycvijsrh9cxniy982n7nrdv2hpq2xykhyybrrcn2x6rk3ikq21"; depends=[dplyr magrittr pdftools purrr readr rvest stringr tibble xml2]; };
   SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; };
   SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
-  SyScSelection = derive2 { name="SyScSelection"; version="1.0.1"; sha256="1q2w21qdw9dcjdfrngbdk50arm8jmrccbhqpnbp2gypnxv4pic1y"; depends=[pracma]; };
+  SyScSelection = derive2 { name="SyScSelection"; version="1.0.2"; sha256="16zx507hlzhdxbh6gzndbgmzpyp6vc59h441l4gv8lx58zi9kyjd"; depends=[pracma]; };
   SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; };
+  SymbolicDeterminants = derive2 { name="SymbolicDeterminants"; version="1.2.0"; sha256="1z24qn6dja6axynqq98zw9pzxwx30aafk53lqlajirnnrmxrvxx6"; depends=[fs]; };
   SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; };
   SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; };
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
+  SynthETIC = derive2 { name="SynthETIC"; version="0.1.0"; sha256="0xlfmsy8dgkajm1r2g5vi63b1vzmq4rvvc6099axn9s8h2yj6w9q"; depends=[ggplot2 magrittr rlang]; };
   SynthTools = derive2 { name="SynthTools"; version="1.0.1"; sha256="19vasz3nnm5vgwqs6g2a5bibmk44br1bxga5zavsx938x3jw9gnd"; depends=[dplyr magrittr Rdpack]; };
   SystemicR = derive2 { name="SystemicR"; version="0.1.0"; sha256="1vk08w734zxvrwzd81iy0azwcj53k6wvgc1qlaxw96hirdwdg6zr"; depends=[igraph Matrix quantreg xts]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAG = derive2 { name="TAG"; version="0.2.0"; sha256="0s4n2f9x36df1pb5p8n98926lgg9z79fka5r9xqxxsc91h35q9aw"; depends=[DiceKriging doParallel FastGP Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; };
+  T4cluster = derive2 { name="T4cluster"; version="0.1.0"; sha256="11x7y8yb7cmjz1a6n53lzhh6q3l76g8jqh8c3xbmnr7hxzbqiwl6"; depends=[maotai Rcpp RcppArmadillo Rdimtools Rdpack]; };
+  T4transport = derive2 { name="T4transport"; version="0.1.0"; sha256="0cp2881j6qyzh1yl23f2layhldsgdy7ic7c8c4hydfv7c7qkkg3d"; depends=[lpSolve Rcpp RcppArmadillo Rdpack]; };
+  TAG = derive2 { name="TAG"; version="0.2.1"; sha256="1sr24mi7s7z155xzs0aki21ywcq10gjc93nra2x6pfm20ymlyndl"; depends=[DiceKriging FastGP foreach Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; };
   TAM = derive2 { name="TAM"; version="3.5-19"; sha256="1x1pdy0hrk4c3x5l4gcslpvyb0sv2zgly4n3a7y8j6yrzajx0sg7"; depends=[CDM Rcpp RcppArmadillo]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.3"; sha256="151rm95q2naw9y58df1lr2qiadnkgfb5j9v47v41bw4iipsmlp4p"; depends=[glmnet Matrix]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; };
@@ -4612,11 +4784,12 @@ in with self; {
   TAShiny = derive2 { name="TAShiny"; version="0.1.0"; sha256="1h8k8py7myrj7c18cbp4q7bmgmck64jagw9s9j1jaqzl9qf8cbgq"; depends=[dplyr igraph shiny SnowballC tm wordcloud2]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
   TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.3"; sha256="0cd0dr8vkf0sfriaafp2x63dilxmirm0fljxm82zw77c9j5ly3kv"; depends=[nnet plotrix stringr VGAM]; };
-  TBRDist = derive2 { name="TBRDist"; version="1.0.1"; sha256="08100f7mswsc9x3h1sf9mibbdh84hwn77mz51a4npxydhkj1bszd"; depends=[ape BH Rcpp TreeDist TreeTools]; };
+  TBRDist = derive2 { name="TBRDist"; version="1.0.2"; sha256="0xwr91fyx3x27szkafmcs5sffgs64svky7mddrrgcfnbdl5c4iia"; depends=[ape BH Rcpp Rdpack TreeDist TreeTools]; };
   TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
   TCA = derive2 { name="TCA"; version="1.1.0"; sha256="0pj052kd378x1gmg5wcbk8c0dca3c2ra65hnagljmsplv169vimy"; depends=[config data_table futile_logger glmnet gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; };
   TCGAretriever = derive2 { name="TCGAretriever"; version="1.5"; sha256="1xg1rz2h5jbpdd5axli3ripqxb0bj64yrd4y5nzr8axajiaybkj9"; depends=[httr]; };
   TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; };
+  TCIU = derive2 { name="TCIU"; version="1.1.0"; sha256="0hlav6i4jvqaa1nhqplqpbw35zcswmrm1x4h3h230zcravmrr1gr"; depends=[AnalyzeFMRI cubature doParallel dplyr DT extraDistr fancycut fmri foreach forecast geometry ggplot2 ggpubr gridExtra ICSNP MultiwayRegression plotly pracma RColorBrewer reshape2 rrcov scales spatstat tidyr zoo]; };
   TDA = derive2 { name="TDA"; version="1.6.9"; sha256="023jwhh1qc2y30g42pgfaha4n4pixzwrrghxlyss4889fr66q9vw"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
   TDAstats = derive2 { name="TDAstats"; version="0.4.1"; sha256="1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5"; depends=[ggplot2 Rcpp]; };
@@ -4636,9 +4809,10 @@ in with self; {
   TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
   TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; };
   TGS = derive2 { name="TGS"; version="1.0.1"; sha256="01mwdlgfjlxy0q5lxcmzk6lsb806987va7yag0zpjjd2bzmdh70k"; depends=[bnstruct doParallel foreach ggm minet rjson]; };
+  TGST = derive2 { name="TGST"; version="1.0"; sha256="1xnb41ksggdi57gnkjaab98c4nfdkxqx53rv9pyh3j0cg0kbkk9v"; depends=[ggplot2 knitr]; };
   TH_data = derive2 { name="TH.data"; version="1.0-10"; sha256="0mgz7aj2d9abbmdr65zgmg1ddp3fdbs3mfj83r5xadh5ldkir2k1"; depends=[MASS survival]; };
   TIMP = derive2 { name="TIMP"; version="1.13.2"; sha256="1y1bc6wsd32792apsc6qncxbw5y8ww9xlhy9v49mhwbffgzn6llg"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; };
-  TITAN2 = derive2 { name="TITAN2"; version="2.4"; sha256="1ai4mr69iwl8lliy1zak73s3a4skny4w09clh4z1ri7r5fmq1c2q"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; };
+  TITAN2 = derive2 { name="TITAN2"; version="2.4.1"; sha256="16zf42s1as2xrvyhd0lnv36mgnr5w19xv11pkl0k8imb5bdkhxa2"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; };
   TInPosition = derive2 { name="TInPosition"; version="0.13.6.1"; sha256="1c0h9zg71whmsjn5rnzv5kdrabl9kqrq627caznvrpa74c7pjks9"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
   TLMoments = derive2 { name="TLMoments"; version="0.7.5"; sha256="0v86rs7f63f59ng9m6lnjgv52czg1xk814flnhz153fjy7y2pidl"; depends=[ggplot2 hypergeo Rcpp]; };
@@ -4652,12 +4826,14 @@ in with self; {
   TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; };
   TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; };
   TPES = derive2 { name="TPES"; version="1.0.0"; sha256="00g1limcappjrly93x7xb1llrgaxivmiky3kw40w2fs0303ha3d7"; depends=[]; };
+  TPLSr = derive2 { name="TPLSr"; version="1.0.1"; sha256="1byi8w38mr4p7ni2wvyamqyjcz97hm6da784070a9c4p8jp4bwv2"; depends=[plotly]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.2"; sha256="1ibb3ayd808x3a562qldaww7czmfq1cd1j4g4ch5k7q38jw5x835"; depends=[KernSmooth]; };
-  TR8 = derive2 { name="TR8"; version="0.9.21"; sha256="0zmbzqvsv7ipbhj7gavvdmcblc2ls057n56zizjn5crls7c6jxbm"; depends=[plyr rappdirs RCurl readxl reshape shiny taxize XML]; };
+  TR8 = derive2 { name="TR8"; version="0.9.22"; sha256="12miq65yl39pngpsa30qjcwp21vn93a4wvid03pmbf6x6hq0v4k7"; depends=[dplyr plyr rappdirs RCurl readxl reshape shiny taxize XML]; };
   TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; };
   TRAMPR = derive2 { name="TRAMPR"; version="1.0-9"; sha256="16fbzp6b6y25k9h7m4qpmbgj10przywm2rh8kvw8a8p0xkskc9k5"; depends=[]; };
   TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; };
-  TRES = derive2 { name="TRES"; version="1.1.2"; sha256="1v2bs111h603s57wphaadq7wb6a27n8cm0yg69n51v0z0zy9n39n"; depends=[ManifoldOptim MASS pracma rTensor]; };
+  TRES = derive2 { name="TRES"; version="1.1.3"; sha256="104nxscgihmlblypy576h8z6vwspvcbv40miilh5n52ab0hmk5b6"; depends=[ManifoldOptim MASS pracma rTensor]; };
+  TSA = derive2 { name="TSA"; version="1.3"; sha256="1bv5q609lhmrcxnjnvcj497fbjlv89zwa8q918hw4iki5nkvwwdb"; depends=[leaps locfit mgcv tseries]; };
   TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; };
   TSDFGS = derive2 { name="TSDFGS"; version="1.0"; sha256="1wk1j0bzcapp2pknhiichh947xs6dpkrfr2h7s1vqyzb9a0yajif"; depends=[Rcpp RcppEigen]; };
   TSDT = derive2 { name="TSDT"; version="1.0.0"; sha256="0cscy8g6qab09lgzdpz9s85l7m7v5gnjf0n3h82730xzd50r4za7"; depends=[hash mlbench modeltools party rpart survival survRM2]; };
@@ -4687,6 +4863,7 @@ in with self; {
   TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
   TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; };
   TSdbi = derive2 { name="TSdbi"; version="2017.4-1"; sha256="0vwx2wyls4byyp67q9bp1psxdq5jnlimwk2162khk6daaxs14aiv"; depends=[DBI tframe]; };
+  TSdist = derive2 { name="TSdist"; version="3.7"; sha256="1xw707ry242i8nhldrsqxj391i8dhhmhdbidzdk95d6hma4vq9z3"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
   TSeriesMMA = derive2 { name="TSeriesMMA"; version="0.1.1"; sha256="0dkrz3m5lh872c0q9nw4h0p6g4j1j9fn92hz8xlifpsbsyzpz63b"; depends=[]; };
   TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
   TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; };
@@ -4698,12 +4875,12 @@ in with self; {
   TSstudio = derive2 { name="TSstudio"; version="0.1.6"; sha256="1r45s4xgc9a2rdh225xzmwr7g6qahmjj7v1a6g7haghnhaq6hv4s"; depends=[data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr tsibble viridis xts zoo]; };
   TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.6"; sha256="1jkjivfg0k6rd6dn1apxyqdwzkxwvkg8zsm4hd6vlrk98ph9d1h3"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt stlplus tcltk2 zoo]; };
   TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; };
-  TTR = derive2 { name="TTR"; version="0.24.0"; sha256="0dcmfr98bxhdhszsdr1yjhvy4kplnfm88fh8sdzrkjank1qsxia2"; depends=[curl xts zoo]; };
+  TTR = derive2 { name="TTR"; version="0.24.2"; sha256="06vicgbhwpsww09hhha5mbcd0cwip6cvkfbhjjhp950rv64bk1r5"; depends=[curl xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
   TULIP = derive2 { name="TULIP"; version="1.0.1"; sha256="0kwkyv266pslsb2rpcri8k3jmhb3p4i7z0axdbx51l2cxglw9pzn"; depends=[glmnet MASS Matrix tensr]; };
   TUWmodel = derive2 { name="TUWmodel"; version="1.1-1"; sha256="1am3ywcj1rqgz5i2g9c6d6fgiv8b2nabllfy84xx1n18pin7mfbk"; depends=[]; };
-  TVMM = derive2 { name="TVMM"; version="3.1"; sha256="014afshwmj4xjqxb7j1fxanag54g7cx2h9wm75i6paq48bpz7150"; depends=[DescToolsAddIns ggplot2 gridExtra MASS robustbase tcltk2 tkrplot]; };
+  TVMM = derive2 { name="TVMM"; version="3.2.1"; sha256="0z2gdcci9pbpgnmr6dch5v0rsn34q18rwb14x9gyxdcvh3bch8z0"; depends=[DescToolsAddIns ggplot2 gridExtra MASS robustbase tcltk2]; };
   Taba = derive2 { name="Taba"; version="0.2.0"; sha256="0ciczkjm33pr52s9awqmk9dh0qd20jh43g04xk0zphgq8fmhkl20"; depends=[robustbase]; };
   Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
   TableHC = derive2 { name="TableHC"; version="0.1.2"; sha256="1il86xjc4h1sdq3gpi4s7xbkcgzpgfqy5ivzjdkbq45d06pssk21"; depends=[]; };
@@ -4712,7 +4889,6 @@ in with self; {
   TailRank = derive2 { name="TailRank"; version="3.2.1"; sha256="142m0cq9j8y5g9wh4plxya1jqi0dv6p6praxx3jb84kwqspi91xr"; depends=[Biobase oompaBase oompaData]; };
   TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; };
   TangPoemR = derive2 { name="TangPoemR"; version="0.1.0"; sha256="06w5gg36mx0vdagkhy7rskgjv2d3irr0d3nkjw26vxp25x1py4sf"; depends=[jiebaR]; };
-  TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
   TargomoR = derive2 { name="TargomoR"; version="0.2.0"; sha256="0dzlqv8v36cm5b9hc9am4351nigknq7vr0mki9kzk2979c18if6b"; depends=[geojsonsf httr jsonlite leaflet magrittr sf tibble xml2]; };
   Tariff = derive2 { name="Tariff"; version="1.0.5"; sha256="1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w"; depends=[]; };
@@ -4722,7 +4898,7 @@ in with self; {
   Taxonstand = derive2 { name="Taxonstand"; version="2.2"; sha256="1cpx5mp17l9gjvb60f0ypm8r8b69ff520p67jac8y6rvw8aqhc6j"; depends=[pbapply]; };
   TcGSA = derive2 { name="TcGSA"; version="0.12.7"; sha256="0l28sldpavyvhm9hab9gb7i7rmlxpj7ivffi6xx8lg7qjn6d21v5"; depends=[cluster cowplot ggplot2 GSA gtools lme4 multtest reshape2 stringr]; };
   Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; };
-  TeXCheckR = derive2 { name="TeXCheckR"; version="0.6.0"; sha256="1qrzslcipg3j1317dhizxhcxyx2dpx7jh91vkms10wgc6vpqgrw4"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; };
+  TeXCheckR = derive2 { name="TeXCheckR"; version="0.7.0"; sha256="0r85yhk3p4ibkzkbjm7j9zpryp1dhajbmaqyfwr4bv1zh29smrxa"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; };
   TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.12"; sha256="0i46d7269zhvr3c2a2w1lb3jnhc1cgwhcppqdmnl1ymgw5f40x9y"; depends=[]; };
   TeachingSampling = derive2 { name="TeachingSampling"; version="4.1.1"; sha256="02nywwmv0r8md00kra7wxwzvm6p51l4p8la51bxh8sqq8ajsdswh"; depends=[dplyr magrittr]; };
@@ -4730,17 +4906,19 @@ in with self; {
   TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; };
   Temporal = derive2 { name="Temporal"; version="0.2.0"; sha256="114ld41l2dipw7cpyh7fy3n332v1dkiqvdng6vkk9wm6jmda7wya"; depends=[expint numDeriv plyr Rcpp RcppArmadillo]; };
   Tendril = derive2 { name="Tendril"; version="2.0.4"; sha256="1wvczfklsccs8jd081vb6d6h7i35lhf6na925fm7wq8ars0b23wd"; depends=[dplyr ggplot2 magrittr plotly plyr reshape2 scales]; };
-  Ternary = derive2 { name="Ternary"; version="1.1.4"; sha256="0js2ylif6171f1548d05lfw4kdlqkmqa6a510x6i9px93bvvkhsq"; depends=[viridisLite]; };
-  TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; };
-  TestDesign = derive2 { name="TestDesign"; version="1.0.2"; sha256="1vz0bbbk74g3i4dlsd972n41mf0dhd74f9p2n47mgs3fh1r598zd"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; };
-  TestDimorph = derive2 { name="TestDimorph"; version="0.3.1"; sha256="163swi09d3nhgp4zkic7gmh302955jm1qr0dv9l3ciyayrc8z842"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; };
+  TensorTest2D = derive2 { name="TensorTest2D"; version="1.0.0"; sha256="1i031wd2ym2yb38ydgy47hmlsk7nnn0vg4p9l2a7z6x4x7sd3jdv"; depends=[]; };
+  Ternary = derive2 { name="Ternary"; version="1.2.1"; sha256="0jbzvxl9pqqw84a3vbgq4sq7m0izxh6zmc3x2d1qxyk11fvbvwxn"; depends=[shiny viridisLite]; };
+  TestCor = derive2 { name="TestCor"; version="0.0.2.2"; sha256="01ndiqi0z672ymm2bid0r0cqz8fqd9268xgmmq74z3agj81l5c5j"; depends=[MASS Rcpp RcppArmadillo]; };
+  TestDataImputation = derive2 { name="TestDataImputation"; version="1.2"; sha256="1nba79i8wr6g1m8hrfa0msz28j9rly51bm8b1qkigfxnzpdhyjmq"; depends=[Amelia mice]; };
+  TestDesign = derive2 { name="TestDesign"; version="1.1.3"; sha256="1bqgyz3d5i0yz839vhs9ag1m5q9ydx6bnw9mbdnyjmhdpmjkb9wm"; depends=[crayon foreach logitnorm lpSolve Rcpp RcppArmadillo]; };
+  TestDimorph = derive2 { name="TestDimorph"; version="0.3.5"; sha256="0fqxc5smf27b1njlc40x71kcr3bbby1i40pw4r1hhsam0hyvrp2q"; depends=[caret corrplot cutpointr dplyr ggplot2 multcompView Rfast tibble tidyr tmvtnorm truncnorm]; };
   TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; };
   TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; };
   TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; };
   TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; };
   TexMix = derive2 { name="TexMix"; version="0.5.3"; sha256="0qp7rlw4y2kw6bvh3rwy33p1g404q4ar1gg8ycdapwsyckq76nhn"; depends=[classInt Formula maptools RColorBrewer sp]; };
   TextForecast = derive2 { name="TextForecast"; version="0.1.2"; sha256="0yj2m22imzllz07wx04nar2mfpyl06jiq0ya1nwgaq74kaiym42p"; depends=[doParallel dplyr forcats ggplot2 glmnet Matrix pdftools plyr pracma RColorBrewer tidyr tidytext tm udpipe wordcloud]; };
-  TextMiningGUI = derive2 { name="TextMiningGUI"; version="0.1"; sha256="0s6zng4zl5iqyrqs824103hc2rgbnd301bz8npbfassk91wrib3n"; depends=[dplyr ggplot2 ggwordcloud RColorBrewer slam syuzhet tibble tidyr tidytext tkrplot tm]; };
+  TextMiningGUI = derive2 { name="TextMiningGUI"; version="0.2"; sha256="0m4iihwsj8qlnp70nzz10yjql9ynd92iiy2wmdj40pqdrwsx1x13"; depends=[dplyr ggplot2 ggwordcloud RColorBrewer slam syuzhet tibble tidyr tidytext tm]; };
   ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; };
   ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; };
   Thermimage = derive2 { name="Thermimage"; version="4.0.1"; sha256="021kjmy0ilg033gf9l46dqfsyd0625v21mcc3sj2smv2dipr8hwd"; depends=[png tiff]; };
@@ -4750,12 +4928,12 @@ in with self; {
   ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; };
   ThreeWiseMonkeys = derive2 { name="ThreeWiseMonkeys"; version="0.1.0"; sha256="1qdb3m15q0gg8dk2znc2syy2jdqsp2893a7ilfa8rg3r2vps86yg"; depends=[stringr tuneR]; };
   Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; };
-  ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.2"; sha256="1fsxf43syp371149wmbxjc13rrai69gc61xdlgrqplv4v0nqqk73"; depends=[MASS numDeriv pROC]; };
+  ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.3"; sha256="0p999hi30sk0spmy1g0qnsdf6zpyyvxrgsijv3d00vinylba8is8"; depends=[MASS numDeriv pROC]; };
   TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
   TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
   TideCurves = derive2 { name="TideCurves"; version="0.0.4"; sha256="1i5qm6wwm6m0xrmr6dvk3pn6apxxqw9hznv8vypzwnky7bizkl90"; depends=[chron data_table fields]; };
   TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-1"; sha256="1g1v99gh6mns4l8ipmw7kpalbk07m92ybcqjq7b0wsjmdvs1y67s"; depends=[]; };
-  TideTables = derive2 { name="TideTables"; version="0.0.2"; sha256="1grm9s9np7xs2d8gql4sgg72rxpxiidw6g1ni8q97qgqr7r3105l"; depends=[chron data_table]; };
+  TideTables = derive2 { name="TideTables"; version="0.0.3"; sha256="0xfwikz9f58pw1j5vp45wp44lbr8b8ijlac474nzahq46d411afp"; depends=[chron data_table]; };
   Tides = derive2 { name="Tides"; version="2.1"; sha256="0da3z010ali83qf8mf1znicqv8vvsa5r93mc40ax60ln2w33nlrm"; depends=[]; };
   TileManager = derive2 { name="TileManager"; version="0.4.0"; sha256="0kc3wgk5n8cxg901c19fjfzq7na46jq0x3gy22fi4jccjb0vgv0v"; depends=[APfun raster rgeos sp XML]; };
   TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; };
@@ -4766,19 +4944,20 @@ in with self; {
   TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.1-0"; sha256="07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0"; depends=[DescTools mclust TeachingDemos]; };
   Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; };
   TmCalculator = derive2 { name="TmCalculator"; version="1.0.1"; sha256="1h1dk4kq6zi3a9wi6bxsqz3b9jk740811dp65sb6lqc668xy5mps"; depends=[]; };
-  Tmisc = derive2 { name="Tmisc"; version="0.1.22"; sha256="0h25k5xs8wnyzhl8alzlwircdl1hmclljjpcapnfg7na4yskzsaq"; depends=[dplyr rstudioapi tibble]; };
-  Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; };
+  Tmisc = derive2 { name="Tmisc"; version="1.0.0"; sha256="1zs7zxawl13pils9hff0i5aplxy32ccp27jcmjdh39lgf083s3v3"; depends=[dplyr magrittr rstudioapi tibble]; };
   TooManyCellsR = derive2 { name="TooManyCellsR"; version="0.1.1.0"; sha256="0cypjf4a9q2kw4gwxlr59nbwn25wrrhrcmpksxi2yhd3qhk71q8n"; depends=[cowplot ggplot2 imager jsonlite Matrix]; };
   ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.5"; sha256="0pg8ymim9pbbmnqnvws1v7g874mv65s1idb4m7dcy800v63pzq7s"; depends=[calibrate MASS robCompositions]; };
   TopKLists = derive2 { name="TopKLists"; version="1.0.7"; sha256="0xwp926l8mr0j3lfxy2077d1qs150iid6v7i7015wqzif948jkxz"; depends=[gplots Hmisc]; };
   TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; };
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; };
   TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; };
-  TraMineR = derive2 { name="TraMineR"; version="2.2-0.1"; sha256="1mpwns17iqs7wkk6hb9xxphmh0zrbvqxzvhr093b9j1ji4wzhgqj"; depends=[boot cluster colorspace Hmisc RColorBrewer]; };
+  Tplyr = derive2 { name="Tplyr"; version="0.2.2"; sha256="0bqwp27qqnjidc816bw96whlrrfmd8iph0mhb3pgd0gxmvxpj4bj"; depends=[assertthat dplyr forcats lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect]; };
+  TraMineR = derive2 { name="TraMineR"; version="2.2-1"; sha256="0varwhc2jvmj36x6vslhfmqwms7zzs4p32ciaqh214i9pc93czhl"; depends=[boot cluster colorspace Hmisc RColorBrewer]; };
   TraMineRextras = derive2 { name="TraMineRextras"; version="0.6.0"; sha256="00g0as69v92azajbcbkhr6lwihlphzpb41la5wz2lfvshq5ywqz1"; depends=[cluster gtools RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="2.1"; sha256="08vhcf3hl3b8pczaawf25vl6j2ap8zbmwdxxdi2g05hq05lywwf9"; depends=[PerformanceAnalytics reticulate]; };
   TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; };
+  TraitStats = derive2 { name="TraitStats"; version="1.0.0"; sha256="0as86h5zgbd39fdk6ip1b51ln3bpybw3j57kiqr4y6p62cl3sgl9"; depends=[gridExtra lattice qpdf rlist]; };
   TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; };
   TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; };
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
@@ -4786,12 +4965,14 @@ in with self; {
   TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; };
   TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.5"; sha256="1977p6lbb29w0cg5lpa5dyig7k3j6i2rd5jwr5bv6hwaq6yqsyrg"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
   TreeDep = derive2 { name="TreeDep"; version="0.1.3"; sha256="0ja2hp9sxzybac6dqdsns5q1rj12swl240znsnsffg9mkvzhq6rl"; depends=[ggplot2 lubridate]; };
-  TreeDist = derive2 { name="TreeDist"; version="1.1.1"; sha256="0b2kw32xg7qswbln69vrfkj8967ml8bm6glsl2n3hlv6ybrhhdvl"; depends=[ape colorspace memoise phangorn Rcpp TreeTools]; };
+  TreeDiagram = derive2 { name="TreeDiagram"; version="0.1.0"; sha256="0lrdhrvy1nfvsmv7immg1b0pgb81n4ksbq4ybjl5n3dzawfizrnm"; depends=[ape cowplot ggplot2 spatstat stringr tree]; };
+  TreeDist = derive2 { name="TreeDist"; version="1.2.1"; sha256="07j44jdf0zni5sb3z5j7d9k2622wirs1inw5gnibr90lh6747kq0"; depends=[ape colorspace memoise phangorn Rcpp Rdpack TreeTools]; };
+  TreeLS = derive2 { name="TreeLS"; version="2.0.2"; sha256="1q10i7ym9c3ggslyccfl0q67hwbcag2bhn587j29q80g0sw30klq"; depends=[benchmarkme BH data_table deldir dismo glue lidR magrittr mathjaxr nabor raster Rcpp RcppArmadillo RcppEigen rgl rlas sp]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
   TreeSearch = derive2 { name="TreeSearch"; version="0.4.3"; sha256="0g5fdmadhpqq2cs5ss75008v6qrd77hppsqrbvbk46y2g83kn0bq"; depends=[ape phangorn R_cache Rdpack TreeTools]; };
   TreeSim = derive2 { name="TreeSim"; version="2.4"; sha256="0nmzx2723n1f5lr951zz2ih2gnpfim5qzihlayhpf181z1qijv93"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="2.5"; sha256="125c9rim272h0dfyygmmijz8dcnch3g9wy1ngki77dyrmdl77yfx"; depends=[ape TreeSim]; };
-  TreeTools = derive2 { name="TreeTools"; version="1.2.0"; sha256="148amv8z4ih08w8yw7h2p1xwnmbf6pxapny5i1rd8zgi501x245w"; depends=[ape bit64 colorspace phangorn R_cache Rcpp]; };
+  TreeTools = derive2 { name="TreeTools"; version="1.4.1"; sha256="1yx54kd39cj1vl33ydv2ibpkqrgcw4q7nkg1rjz4ksxa9as2n99d"; depends=[ape bit64 colorspace phangorn R_cache Rcpp Rdpack]; };
   TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.3"; sha256="0ijkijyhxhjc7202qssa9wnrmwgv4miv5n8jbml4qqj80kcsbdwp"; depends=[nleqslv pracma pROC rms]; };
   TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; };
   TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; };
@@ -4807,6 +4988,7 @@ in with self; {
   TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; };
   Tushare = derive2 { name="Tushare"; version="0.1.3"; sha256="12aabkwlifc82yiym3yijpfpjhmhfwpw8mz4fb11qm6n4igr1yhg"; depends=[data_table forecast httr tidyverse]; };
   TwitterAutomatedTrading = derive2 { name="TwitterAutomatedTrading"; version="0.1.0"; sha256="1aa6fxxvy0s8al30w19wa2pwzp60zbbdvp5myigv8x26k6w2jwgv"; depends=[curl dplyr jsonlite lubridate magrittr naptime plyr purrr tibble tidytext twitteR]; };
+  TwoArmSurvSim = derive2 { name="TwoArmSurvSim"; version="0.1"; sha256="0hxasvahllq88zl2k0p41ra5d2wzsxpn95sqf9cmc1rgbvm1q57z"; depends=[blockrand dplyr survival]; };
   TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
   TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; };
@@ -4816,57 +4998,61 @@ in with self; {
   UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; };
   UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; };
   UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.5.0"; sha256="0rilgngbfh4ignlzm5l6z9mwjngwmhlj9dvaknf8rg9a4g67vgqz"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes shinyWidgets tibble UCSCXenaTools zip]; };
-  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.3.3"; sha256="1jgs2rlgsd2mq69jkpkwszzwp0clvdh3zl90c7z4v04nz4b366cx"; depends=[dplyr httr jsonlite magrittr readr rlang]; };
-  UComp = derive2 { name="UComp"; version="1.1"; sha256="19465rwpdy60f4ah9i77kax36sd2ff0xmjfd78qi6ziippzgxk88"; depends=[Rcpp RcppArmadillo]; };
+  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.3.6"; sha256="031r2p22hj2ivq4z9c43b2aa6cwmby54lrnnjy7fr98h4ykb2658"; depends=[dplyr httr jsonlite magrittr readr rlang]; };
+  UComp = derive2 { name="UComp"; version="2.1"; sha256="0l6gn1i6b2ap9ngm6dyrsxs2h59p4yvxqgmqns68wp1iy5zkfdjk"; depends=[Rcpp RcppArmadillo]; };
+  UKFE = derive2 { name="UKFE"; version="0.1.2"; sha256="1v4sjdrzrmi1azn89pwpshfvwxyhkixf3vvmz7xcybzhlrlw13lf"; depends=[]; };
   UKgrid = derive2 { name="UKgrid"; version="0.1.3"; sha256="1x44iry2j5qbvd8ac9rv9dmg60hbhry2v4jj9hmm49bx10iwl9h2"; depends=[data_table dplyr lubridate magrittr tsibble xts zoo]; };
+  UMR = derive2 { name="UMR"; version="1.0.0"; sha256="12xwv39p3ry8ijf9z8px9vvwd48pnda24cnp0y9qfhqp9iy3r083"; depends=[decon]; };
   UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; };
   UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; };
   UNPaC = derive2 { name="UNPaC"; version="1.1.0"; sha256="12w6vjvkzivnqa6jd75dwr8h8d8xbc2519pqnqw9fk3yanqzx9rk"; depends=[huge PDSCE]; };
   UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; };
-  UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; };
+  UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.2"; sha256="0kgbpk2wc7zsiln7301z8fa1fp4911kpg1zfpjyfw3cv7dqaznv2"; depends=[]; };
   USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; };
-  USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; };
+  USP = derive2 { name="USP"; version="0.1.1"; sha256="1y3argx05bw99lwk94h7h62c5k7xnysdmj1qil38b71psl0ndh88"; depends=[Rdpack]; };
   UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; };
   UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; };
   UScensus2000tract = derive2 { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; };
   UScensus2010 = derive2 { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; };
-  USgrid = derive2 { name="USgrid"; version="0.1.0"; sha256="0kdbq1vbqcm0avzy2y8g8xk56bp8qnqpc1zfqspkwl6a0gzzfjxz"; depends=[tsibble]; };
+  USgas = derive2 { name="USgas"; version="0.1.0"; sha256="0ym75xzbiw0pmnpzkw107rjwa0fjia1fa3ldq6yhsqkr275qmx2r"; depends=[]; };
+  USgrid = derive2 { name="USgrid"; version="0.1.1"; sha256="09msy7bsy4jsba94x7vqzlid9bvn1s7871500ri2aw496mjw1q8w"; depends=[tsibble]; };
   UStatBookABSC = derive2 { name="UStatBookABSC"; version="1.0.0"; sha256="16r6clhfaalfsg5hmvzm8a128zygxax5hyc0vr1q9bsw9hj7cs0c"; depends=[]; };
   UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
   UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; };
   Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; };
   Umatrix = derive2 { name="Umatrix"; version="3.3"; sha256="188h959s5pawnny0fxlqmma03iww6af4x0y8p514bwh5xh9rj3kg"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png pracma Rcpp reshape2 shiny shinyjs]; };
   Umoments = derive2 { name="Umoments"; version="0.1.1"; sha256="089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg"; depends=[]; };
-  Umpire = derive2 { name="Umpire"; version="2.0.9"; sha256="1bqq8zrlfgcr741ydzmyy8rmkv05ijlfr0j2x0kgyxkg2j5r9kj4"; depends=[BimodalIndex mc2d]; };
+  Umpire = derive2 { name="Umpire"; version="2.0.10"; sha256="1bhz1yfvpszqz4nal2wwjgllbq0hj6y0jf2bja3nfb7amj2m10gg"; depends=[BimodalIndex mc2d]; };
   UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; };
   UncertainInterval = derive2 { name="UncertainInterval"; version="0.6.0"; sha256="0gyw1lgq1mni8m44lfi2vnd2wxq6i6ml6c6hy9amdbwmb7aymhhd"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; };
   UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; };
   UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; };
-  Unicode = derive2 { name="Unicode"; version="13.0.0-1"; sha256="12q98hdh46bbx17z6869bmn1j9bbhf524flvn76sqf20phk81xjy"; depends=[]; };
+  Unicode = derive2 { name="Unicode"; version="13.0.0-2"; sha256="08af3j06npj37z0bcgpqdcya07d1ribll9izkir2fcyw61zs65qy"; depends=[]; };
   UnifiedDoseFinding = derive2 { name="UnifiedDoseFinding"; version="0.1.7"; sha256="1kapm7vwsn1a0prjplbd1im480dy6l02vsil82qxbhamvnc8his2"; depends=[]; };
-  UniprotR = derive2 { name="UniprotR"; version="1.4.0"; sha256="0f2v347if81rnp1dvmfqz25qxsjmnmgvs27w3dg4bljydvl9s9n0"; depends=[alakazam curl data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; };
+  UniprotR = derive2 { name="UniprotR"; version="2.0.1"; sha256="1l42nf0jk6gk723zrkhmjh7w9zzlalvxhdhd778iwsrgjcnd8642"; depends=[alakazam curl data_tree dplyr ggplot2 ggpubr gprofiler2 gridExtra htmlwidgets httr magick magrittr networkD3 plyr qdapRegex ReactomePA scales stringr tidyverse]; };
   UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; };
   UnivRNG = derive2 { name="UnivRNG"; version="1.2.2"; sha256="1hv0gg371ndljvn3x7s5vbkh51h1l1pjk57livw630mvb67cffqw"; depends=[]; };
   UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; };
   UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; };
   UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; };
-  V8 = derive2 { name="V8"; version="3.2.0"; sha256="0z0dwa538lkggawiwrlplz698xznzlgv9fwhdslm7g7gdxyf0xgm"; depends=[curl jsonlite Rcpp]; };
+  V8 = derive2 { name="V8"; version="3.4.0"; sha256="1g9z22pc8ydx1yhv57ww2d2jg5hvrl7ilwa79x89zgn17jha5j7m"; depends=[curl jsonlite Rcpp]; };
   VALERIE = derive2 { name="VALERIE"; version="1.1.0"; sha256="15z8234jhh7hv3gijrvy8hap6gdgvm6qll9b00qbji7vyc3dg4pg"; depends=[GenomicAlignments GenomicRanges ggplot2 ggplotify ggpubr IRanges pheatmap plyr Rsamtools scales]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
   VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; };
   VARshrink = derive2 { name="VARshrink"; version="0.3.1"; sha256="09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl"; depends=[ars corpcor MASS mvtnorm strucchange vars]; };
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
   VARtests = derive2 { name="VARtests"; version="2.0.5"; sha256="0gmm2qrrl4v5vx0nhiwq5brvanhybpb2q0zlf4dihramhjjbwyar"; depends=[Rcpp RcppArmadillo sn]; };
+  VBLPCM = derive2 { name="VBLPCM"; version="2.4.7"; sha256="1z2liriwnpz0n81wfwrm12bac0xdby3bi67j6akq4sqn79y0fnkm"; depends=[ergm mclust network sna]; };
   VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; };
-  VC2copula = derive2 { name="VC2copula"; version="0.1.0"; sha256="1nm42zwb5a5nx2gpm48ihxkiw10vlcvx7jp8x5kmf233bhqiaszf"; depends=[copula VineCopula]; };
+  VC2copula = derive2 { name="VC2copula"; version="0.1.1"; sha256="1ylfsszf98b3sp0zr8z67ag8gsa5614ikbv4p1gnhssxrc8s6rwx"; depends=[copula VineCopula]; };
   VCA = derive2 { name="VCA"; version="1.4.3"; sha256="0hqvqq8kvqgrli9426x9npy86nzgc3mhfgq45d8vm7ns3fc6zsay"; depends=[lme4 Matrix numDeriv]; };
   VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; };
   VDJgermlines = derive2 { name="VDJgermlines"; version="0.1"; sha256="1aqjhkcj3bd5hk7iz0f2cy5nfp23gvhqsmg6nzlxd9klwc6xpq2h"; depends=[ape stringdist]; };
   VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; };
   VFP = derive2 { name="VFP"; version="1.3"; sha256="1mkwm1lpxyfarfhsg77ppm55gvsvynqfa8abdsxn5y8w99qb0kmk"; depends=[gnm MASS VCA]; };
   VFS = derive2 { name="VFS"; version="1.0.2"; sha256="1b8sl8id2gj4iqkpjzd3giybbix2jvskwsbw1kqj3zqr77hygxwg"; depends=[e1071 nleqslv]; };
-  VGAM = derive2 { name="VGAM"; version="1.1-3"; sha256="1hwlrdx3nhdp83pvy1h23i16vbbhi4kizdhr58c8nvg7kqdzb7qc"; depends=[]; };
-  VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; };
+  VGAM = derive2 { name="VGAM"; version="1.1-4"; sha256="1iwrpyhz3khgw904zxz3pn7d61zvkd5m22gimzk57f8jjplxh1zm"; depends=[]; };
+  VGAMdata = derive2 { name="VGAMdata"; version="1.1-4"; sha256="13j32jjrsya69lnfry2gs27fhdkqc8kwclmvmxx266dnbfc6rw4k"; depends=[VGAM]; };
   VGAMextra = derive2 { name="VGAMextra"; version="0.0-2"; sha256="18k06k32ajf77z9g53vnbzr8pcb41r89bdv05sbcc9r2833bqa9g"; depends=[VGAM]; };
   VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
   VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
@@ -4879,18 +5065,18 @@ in with self; {
   VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.1"; sha256="0l03zxd2s99g8parjka2w5dwmsjp0k6wwag3axhj4qd7x7z0rfyh"; depends=[dtw ggplot2 RTransferEntropy tseries]; };
   VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; };
   VOSONDash = derive2 { name="VOSONDash"; version="0.5.7"; sha256="1qivx5ddl9jsn6q6ic2w8jrczxlx23z087k5arfz2rixgj7rndyg"; depends=[data_table httpuv httr igraph lattice magrittr RColorBrewer shiny SnowballC systemfonts syuzhet textutils tm vosonSML wordcloud]; };
-  VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
   VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; };
   VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; };
   VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; };
   VUROCS = derive2 { name="VUROCS"; version="1.0"; sha256="1r4hq7az50v7lbyx5w6b4zs2kwi5cypqn9k6ac4kr8jr3jlyanr3"; depends=[doParallel foreach Rcpp RcppArmadillo]; };
-  VWPre = derive2 { name="VWPre"; version="1.2.3"; sha256="0pvk7qmi6s8yqf6s0vbf1ldwrs2b37kgayrdsvfpvxhljg79zl1i"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
+  VWPre = derive2 { name="VWPre"; version="1.2.4"; sha256="1hhpqxzh9h5dy45r04l1fa1k4a14s0m6z6fhfg22kpwpryszbc44"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
   VancouvR = derive2 { name="VancouvR"; version="0.1.1"; sha256="1nzjdassan5kh7wk3xf6kry4jifgjn0gan61ibwhyzy1awpcfngv"; depends=[digest dplyr httr purrr readr rlang sf tibble urltools]; };
   VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; };
   VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; };
+  VarRedOpt = derive2 { name="VarRedOpt"; version="0.1.0"; sha256="0h44m8850q4aksrqj11yr2a2qj37w8fhv0plpvdzcl087ifyj0g9"; depends=[]; };
   VarReg = derive2 { name="VarReg"; version="1.0.2"; sha256="04235hr0r6sp7r3ccvcfb8l6p8yapcdrn6zl7mmvbyc4qb70gawh"; depends=[sn survival]; };
-  VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.3"; sha256="07ss4wxw1q1mvf6y860zcl5ja65f5yaqpgqj1k1yi5smqj50y0jk"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; };
+  VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.3.1"; sha256="03rg7zh1cq55vfc0ak6j7crs4n7fnbsxz8nllmplklx8wm47krf5"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; };
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
   VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.10"; sha256="09j8y6n0bwsj3n620nbni6b7f4pmb91q41770sfpc5v3l5i3jc7c"; depends=[curl RISmed stringi stringr XML XML2R]; };
   VariableScreening = derive2 { name="VariableScreening"; version="0.2.0"; sha256="04j75081g88g5hjydcnl3jcf99zzbrhlbjmmzcprvrlm5i5i3k93"; depends=[energy expm gee MASS]; };
@@ -4905,9 +5091,10 @@ in with self; {
   VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.8"; sha256="0yvm3kkc7ssk85ripdgbxj8gazqb1dfswgjy63c3gb135zi2cbqk"; depends=[Rcpp]; };
   VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
   ViSiElse = derive2 { name="ViSiElse"; version="1.2.2"; sha256="1ay09dahlqnfrgf4gl4s45a4ahrk2xliagxqz5h826w2vzsawqcc"; depends=[chron colorspace ggplot2 Matrix reshape2 stringr]; };
-  VineCopula = derive2 { name="VineCopula"; version="2.3.0"; sha256="0w9lpdb9mjia2vg9h4v418g8zw8xfq83hmih37hf3yp7p88vja1k"; depends=[ADGofTest lattice MASS mvtnorm]; };
+  VineCopula = derive2 { name="VineCopula"; version="2.4.1"; sha256="0c6yi6rva1vxc50a9js762cw3ihv1lna7sbgbhshhrhd3bcl15mi"; depends=[ADGofTest lattice MASS mvtnorm]; };
   Visualize_CRAN_Downloads = derive2 { name="Visualize.CRAN.Downloads"; version="1.0"; sha256="0hzq00dbddzwvhryl38sffchxqz52xk8fizsfjgk1xxjr3g8icw4"; depends=[cranlogs htmlwidgets plotly]; };
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
+  VoxR = derive2 { name="VoxR"; version="1.0.0"; sha256="16r9ggc5x889g8rjqvp1q2kgf5asjzhykd1ldjy3ny9m48p501ad"; depends=[circular data_table dplyr fastcluster FNN geometry raster Rfast rgl]; };
   W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; };
   W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; };
   WACS = derive2 { name="WACS"; version="1.1.0"; sha256="09fmdlpb99q9dw17lwp0bwpklgvgiqq7bfs9ryx5r54m0niklr9d"; depends=[mclust mnormt mvtnorm tmvtnorm]; };
@@ -4921,16 +5108,18 @@ in with self; {
   WGCNA = derive2 { name="WGCNA"; version="1.69"; sha256="022hkprnrafvggi8pkjffkvk1qlnibmbbxxrni00wkrdbga5589f"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp survival]; };
   WGScan = derive2 { name="WGScan"; version="0.1"; sha256="0jma6di9hbdimswdfm58568vahcjy46hbhb78idjsdz4bl9apvq3"; depends=[data_table MASS Matrix seqminer SKAT]; };
   WLasso = derive2 { name="WLasso"; version="1.0"; sha256="0q44ljdsqsnnwfnnsmyn3p65inbw0y71v7v5pp7cz2dzbhhpfzpw"; depends=[genlasso ggplot2 MASS Matrix tibble]; };
+  WLinfer = derive2 { name="WLinfer"; version="1.1.0"; sha256="0vz5vxn4915z5061iczpl51d7vdz28ss6ghfnllrg4lagn4m1mh6"; depends=[bbmle boot cubature goftest LindleyR nleqslv pracma]; };
   WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; };
   WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
   WMWssp = derive2 { name="WMWssp"; version="0.4.0"; sha256="16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47"; depends=[]; };
   WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
   WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
   WR = derive2 { name="WR"; version="0.1.1"; sha256="153f64b2zsykl5f8iwxlcqby96ag1an4w8lhs7dxx72gy5k4vs6c"; depends=[survival]; };
+  WRI = derive2 { name="WRI"; version="0.1.0"; sha256="09klq35q1b9c0v86mhx1klqv41jx0saivhh7a8pq7b3b9f8678zb"; depends=[CVXR expm fdadensity fdapace ggplot2 gridExtra locfit locpol modeest mvtnorm Rcpp RcppArmadillo Rfast rlang]; };
   WRS2 = derive2 { name="WRS2"; version="1.1-0"; sha256="1nkqs5nvsk5n7zj3rh19shaf55q9q0kd8v0686vhyv286g71ism7"; depends=[MASS mc2d plyr reshape]; };
   WRSS = derive2 { name="WRSS"; version="3.0"; sha256="16a7i6glgl5cshsn3w7gxviybmka06ylw5znz94gigyx0vhgv97p"; depends=[GGally ggplot2 Hmisc network nloptr]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.2"; sha256="1ssrqqf2hypif4nnfyl4lq03glyyg9ry9s14llf1njxamhjggfgg"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="1.2.6"; sha256="0d27cbmf31pr2gb84c4hjrw6m19bbj2fbb320nf2v90x5af9rm2z"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="1.3.1"; sha256="0j93wivnalc558lbz0lnhjsyifw0k2bbqjwqsn34x7j6184y9f49"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; };
   WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; };
@@ -4942,18 +5131,19 @@ in with self; {
   WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; };
   WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.1"; sha256="0dj5bmvzfhj1cpn8qi2ax3iipr7jlq0f9vk4b1idqgh5dmdi8lh6"; depends=[FinTS forecast fracdiff rugarch wavelets]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
-  WeMix = derive2 { name="WeMix"; version="3.1.4"; sha256="0ms4qf6lxf2zn7m3qxlxi0sz1rr9mkx998hxj7si2w0k41rdck8v"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; };
+  WeMix = derive2 { name="WeMix"; version="3.1.6"; sha256="1mk2f7iyd98xf5v3vb71gs0zmx7dqxj6bf2qgkwakipnpnkq1ggw"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; };
   WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.4"; sha256="1rgf9s80hk35baiknrwgnqnhxssrcxdansgpvpyhqv07bqd472nn"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang svglite whisker]; };
   WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; };
   WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; };
   WeibullR = derive2 { name="WeibullR"; version="1.0.12"; sha256="0rj4q9hd49b914lz8q1d8n96xrl0h29avn95aigb3z7f8knf7g9g"; depends=[Rcpp RcppArmadillo]; };
-  WeightIt = derive2 { name="WeightIt"; version="0.10.1"; sha256="0fhnnq7r70mrnbr3l1nrvjz8zg4ssrww21gzpzymg313406q46a5"; depends=[backports cobalt crayon ggplot2]; };
+  WeightIt = derive2 { name="WeightIt"; version="0.10.2"; sha256="124pxnyhylbz5lyk4prdcqwi018a6x1swjgql2rr4nvq7hs5nz88"; depends=[backports cobalt crayon ggplot2]; };
   WeightSVM = derive2 { name="WeightSVM"; version="1.7-5"; sha256="02l2iz4p09dmaybp75a4z2lzq3h4dr03xpnr33m7r280lkimz2fx"; depends=[]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.4-1"; sha256="0d239lfigb51ly79aq48xfihmxf07i6qgc64sq94xc29ffjafpkc"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
   WeightedROC = derive2 { name="WeightedROC"; version="2020.1.31"; sha256="1f43hwsabciraj1qxfh5wcqnnx1vvcf4pwqs376rcfd9161k15xv"; depends=[]; };
   WgtEff = derive2 { name="WgtEff"; version="0.1.2"; sha256="1z8pndv43ssgmzldwaq0088lmf1g2mkmrbmzyaismcpngn9fqxsk"; depends=[]; };
+  WhatIf = derive2 { name="WhatIf"; version="1.5-10"; sha256="19w5qw123iahrx96379lrx8i7v3x2ck5dhklf58iw0dmj4pfy2kg"; depends=[lpSolve pbmcapply]; };
   WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.2"; sha256="0kzwglaazn820fzxd2g1fsiw2rnq0qxagns8b5mm3inflsgs35ng"; depends=[mgcv oro_nifti]; };
   WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; };
   WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="1.0.0"; sha256="1bl1nbhbmss8cj9ni7plsjs996n4rwqv6h8bh1zj4whs8z4fw50f"; depends=[dplyr httr jsonlite purrr ratelimitr readr rex WikipediR]; };
@@ -4961,15 +5151,16 @@ in with self; {
   WikipediR = derive2 { name="WikipediR"; version="1.5.0"; sha256="1w4ggq42vlq7zbrz3v9ripz9yscbd8m8as60q7cplpxn9zqfdl7q"; depends=[httr jsonlite]; };
   WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; };
   WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
+  WinRatio = derive2 { name="WinRatio"; version="1.0"; sha256="0d064qq9zad9bdacldhicj3xhyrvp0fcqrxfj594yzra2qwgkx90"; depends=[dplyr magrittr Rcpp tidyselect tidyverse]; };
   WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; };
+  WoodSimulatR = derive2 { name="WoodSimulatR"; version="0.5.0"; sha256="1dd8a0cqa1jdfh0aikm6r2w9iq3s14lwby2awazz9fzcnxs64f6y"; depends=[dplyr purrr rlang scales tibble tidyr]; };
   WoodburyMatrix = derive2 { name="WoodburyMatrix"; version="0.0.1"; sha256="1yg61j8dw0yfz6lhz68vr5ndr7z0w3zgdw8hbbnxwfcpw759n8p1"; depends=[Matrix]; };
   WordOfMouth = derive2 { name="WordOfMouth"; version="1.0.0"; sha256="1ir928rv0xk27arca8bzsdxjvmrkd0azy4ijwnaziqrrm5dpiasj"; depends=[LambertW]; };
   WordPools = derive2 { name="WordPools"; version="1.1-1"; sha256="081qnsq7wn1vczgf6ipz8wjmyg4vwhj1s5nrzh0dw4p9yz28dxv2"; depends=[]; };
   WordR = derive2 { name="WordR"; version="0.3.1"; sha256="17g8v3xhdy57y0b95zrakhi0zamqi35v0zcmjpy47xyqyk4b2grs"; depends=[dplyr flextable officer]; };
-  WorldFlora = derive2 { name="WorldFlora"; version="1.6"; sha256="1sm4v5kqvvy0rpwcygwgxlppz2pbv9a33kkwqgx3s75lgd3j1808"; depends=[]; };
-  Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; };
+  WorldFlora = derive2 { name="WorldFlora"; version="1.7"; sha256="0vs0g5dg19kn4r7d6j5hbvqwp8fhyax5wkwqs0wjmcln9xidqnjg"; depends=[]; };
   WrightMap = derive2 { name="WrightMap"; version="1.2.3"; sha256="0i84xkd1agyp45r84zsk8vvc02ln8qhxvl4n72xjqib12b38kqzl"; depends=[]; };
-  WriteXLS = derive2 { name="WriteXLS"; version="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; };
+  WriteXLS = derive2 { name="WriteXLS"; version="6.1.0"; sha256="05p53xxx4ian0hwq81fcxyb90rfnnl9v9y6j6km8ra4adr7f0ag6"; depends=[]; };
   WufooR = derive2 { name="WufooR"; version="1.0.1"; sha256="0iq1lc1b22zdvclkr4yivxxf8z5mdxik7lx9r3b38h2qy2rckqb2"; depends=[dplyr httr jsonlite]; };
   XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; };
   XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
@@ -4978,18 +5169,18 @@ in with self; {
   XLConnect = derive2 { name="XLConnect"; version="1.0.1"; sha256="0fbfkl26v42bvbz27kjw8cqnq67mwalxqpp5avqjphc17i5a6ylj"; depends=[rJava]; };
   XML = derive2 { name="XML"; version="3.99-0.5"; sha256="19jkpnbjx2ij0h7rxi13sqnjnwsap6wywmd4gnhfnqpic1rrnlk0"; depends=[]; };
   XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; };
-  XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; };
   XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; };
   XR = derive2 { name="XR"; version="0.7.2"; sha256="0j8rkjw9y7mb0yj24nlisfd84148pnnakz8i2y35y2b8gmh5zhvz"; depends=[jsonlite]; };
   XRJulia = derive2 { name="XRJulia"; version="0.9.0"; sha256="0s3g6fkam6hj03mxvw75nzsq3zvz84b71jhrw3v64mdngazdv7zm"; depends=[XR]; };
   XRPython = derive2 { name="XRPython"; version="0.8"; sha256="0alg33spiaqf3jwg1qn543nxvbfaqv8gvf5px3grhbgrcmi5mcmj"; depends=[reticulate XR]; };
   XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; };
-  XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; };
+  XiMpLe = derive2 { name="XiMpLe"; version="0.10-3"; sha256="1j2sg3ik55w81hbs690kfdq5mlsy10mv2r6rfkm63idqxpgv6c0k"; depends=[]; };
   Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
   Xplortext = derive2 { name="Xplortext"; version="1.3.2"; sha256="0vs4nagc7bsjx1m5cww5m2bkv0ay1phdz47070vx5pi6hiwhgaak"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; };
   YPBP = derive2 { name="YPBP"; version="0.0.1"; sha256="1slc7glr4hb0my5zkssprngb6si98npjj33nsbsm0nbm61hnb9n8"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
   YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.3"; sha256="0fca963rsbs9k7ivffsqk4hzap6ll7s709kqs6aby0plghrdla2w"; depends=[MASS Rcpp]; };
   YPPE = derive2 { name="YPPE"; version="1.0.1"; sha256="01q0l22nwfpld2wcygk5x28c2c6cv35hxy2fm1azn8bqsv7xy5il"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
+  YPmodel = derive2 { name="YPmodel"; version="1.4"; sha256="177rzbd8k0356b8z2sbvl3x5cg2w9kr8ryf36laqijyayhcik093"; depends=[]; };
   YRmisc = derive2 { name="YRmisc"; version="0.1.6"; sha256="1crms7dqmhj7br1a5p5j0j7p6sdfimnip31207i6g24f9jkkysv1"; depends=[ggplot2 gridExtra]; };
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
   Yamm = derive2 { name="Yamm"; version="1.3.1"; sha256="0av5q1vx2f8dvxv0br9w65qmw3zr3y4vja45g8qbqyfb3gkfclhn"; depends=[depth interp OjaNP pcaPP]; };
@@ -5000,10 +5191,10 @@ in with self; {
   ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; };
   ZIM = derive2 { name="ZIM"; version="1.1.0"; sha256="0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig"; depends=[MASS]; };
   ZIPFA = derive2 { name="ZIPFA"; version="0.8.1"; sha256="134pkdn4slhiv27rdkkmh2z7xch30ns0jhzxgd7r05bky0z1iri1"; depends=[doParallel foreach Matrix optimx trustOptim]; };
-  ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; };
   ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; };
   ZVCV = derive2 { name="ZVCV"; version="2.1.0"; sha256="0np6h6x74kz1x13wmbkkm1wq43d8bnn2khzjc80prqdi6n0m9v8r"; depends=[abind BH dplyr glmnet magrittr mvtnorm Rcpp RcppArmadillo Rlinsolve]; };
   ZeBook = derive2 { name="ZeBook"; version="1.1"; sha256="0v98kbz9njjdx60x9dn8hl8mc6x19i5knjyg2gkwfd667yy1rkl6"; depends=[deSolve triangle]; };
+  Zelig = derive2 { name="Zelig"; version="5.1.7"; sha256="1x1zcmlhbbzxbb0y91ynz50nfhpki913lnmhcpmlds7drcbbirnk"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
   ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; };
   ZipRadius = derive2 { name="ZipRadius"; version="1.0.1"; sha256="00q4a2bsajs5ns4vdm289iaj9mczxjn3ssyrnmg2z4wicr2ljizv"; depends=[dplyr geosphere ggplot2 magrittr rlang testthat]; };
   Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; };
@@ -5012,6 +5203,7 @@ in with self; {
   aLFQ = derive2 { name="aLFQ"; version="1.3.6"; sha256="0kphpvhz36859f5l0k8mbf59g9871mynbs4ybdi0h5nm2cdjy9vx"; depends=[bio3d caret data_table lattice plyr randomForest reshape2 ROCR seqinr]; };
   aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; };
   aPCoA = derive2 { name="aPCoA"; version="1.2"; sha256="0b5fqxay918if5pfd6xgbzir5myivc3jar2p2is8azrykrr1v2cr"; depends=[ape car cluster randomcoloR vegan]; };
+  aRbs = derive2 { name="aRbs"; version="0.0.1"; sha256="0ghd5sr0jrbm9lymhnq4bk6gcqkbak4sjqfjvsk96zp2nyqmhzrw"; depends=[crayon data_table dplyr progress purrr rvest stringr xml2]; };
   aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; };
   aRxiv = derive2 { name="aRxiv"; version="0.5.19"; sha256="0rik0jkh1xi9fizzw46xmcw139g6nla072p7f8jgvzbhp7k58ba2"; depends=[httr XML]; };
   aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; };
@@ -5036,20 +5228,20 @@ in with self; {
   abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; };
   abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; };
   abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; };
-  abtest = derive2 { name="abtest"; version="0.2.1"; sha256="1zfd13d7dplawk24dbdr1ka8cbdp5w6sxb0zlm7k4dhvn6ksi8h0"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; };
+  abtest = derive2 { name="abtest"; version="0.2.2"; sha256="1ak0m4jd1grriwg4pn3aqf1468qma6rjn5kqjh8izx7zl29jd07v"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; };
   acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; };
   accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; };
   accelerometry = derive2 { name="accelerometry"; version="3.1.2"; sha256="13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"; depends=[dvmisc Rcpp]; };
   accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; };
   accept = derive2 { name="accept"; version="0.7.1"; sha256="0pn8q0jsi0nb2mm2kv6sjczflflshhy55y7nqqnk70yx9f6wm83y"; depends=[dplyr extrafont MASS plotly stringr viridis]; };
   accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; };
-  accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
   ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; };
-  acebayes = derive2 { name="acebayes"; version="1.9"; sha256="1imfwm1vpbb24vfmfn1nljhmaz8429mwjihw34892p387s8h7xz2"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
+  aceEditor = derive2 { name="aceEditor"; version="1.0.0"; sha256="0aphjbzbv308b08jng1pjri1k5macgiz4kl7xc1rxxd45bzr9l7h"; depends=[htmltools htmlwidgets reactR rstudioapi]; };
+  acebayes = derive2 { name="acebayes"; version="1.10"; sha256="11bffz430gdfdaxjx3simig66vhynmx6l1ylac4q2shcmj52nx73"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
   acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; };
   acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; };
   acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; };
-  acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
+  acled_api = derive2 { name="acled.api"; version="1.0.8"; sha256="0ghpw1rw5wzf4889k9mq5ajk9smdc6jkj66fdsm6ns4v61kyyjx5"; depends=[httr jsonlite]; };
   acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; };
   acnr = derive2 { name="acnr"; version="1.0.0"; sha256="087hq4i7jp67ba2finzsqjfnqbiprl33na6ryjv9zqzsdawj9cym"; depends=[]; };
   acopula = derive2 { name="acopula"; version="0.9.3"; sha256="0vvbbw8pfs9jwfz5c57lw48pr0qj661r0ys007q6zf9jmlrhx1ln"; depends=[]; };
@@ -5058,20 +5250,21 @@ in with self; {
   acs = derive2 { name="acs"; version="2.1.4"; sha256="0ajw9rf8l8akcvgqvbxjvryc6wjx74521xyxswz2b0bky3m6kah5"; depends=[httr plyr stringr XML]; };
   acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
   acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
-  actel = derive2 { name="actel"; version="1.1.0"; sha256="1v6bjf52ilgh5g6b63hw44fr2bkxyi3m69gavdphdhrcf06jzvxm"; depends=[circular data_table DiagrammeR DiagrammeRsvg fasttime ggplot2 knitr readr reshape2 rmarkdown rsvg scales stringi stringr svglite]; };
+  act = derive2 { name="act"; version="0.94"; sha256="1qvz84m0m5s1jarjhqxgsfc4aa5qql31f9f9vv2jlnwi3f60nnj2"; depends=[openxlsx progress stringi stringr XML]; };
+  actel = derive2 { name="actel"; version="1.2.0"; sha256="11p4rlb72cvnra1fhaphviafr0gnn24qg8fgaqmq16sjgxw1knvn"; depends=[circular data_table DiagrammeR DiagrammeRsvg fasttime ggplot2 knitr readr reshape2 rmarkdown rsvg scales stringi stringr svglite]; };
   activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; };
-  activegp = derive2 { name="activegp"; version="1.0.4"; sha256="0sqx2pjy0mw8gls4k4qwl64ip55kgs3k10dfdixdrqly035rhr37"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; };
+  activegp = derive2 { name="activegp"; version="1.0.5"; sha256="065swmmrcwkvnm5a6rhg4g4agbsgrzjfpkwyr649wr13d07yn291"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; };
   activity = derive2 { name="activity"; version="1.3"; sha256="12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"; depends=[circular insol pbapply]; };
   activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; };
   activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; };
   actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; };
   actuar = derive2 { name="actuar"; version="3.0-0"; sha256="0dkp1sczldzy7kj70qvh1q59jhsq1brjybmxdz43jnx63y45llpz"; depends=[expint]; };
   actuaryr = derive2 { name="actuaryr"; version="1.1.1"; sha256="08dzn565ax2l2hrn2m32k6magjbskybywl0hsgkg11nrjvkznwnx"; depends=[crayon dplyr lubridate magrittr purrr tibble]; };
+  acumos = derive2 { name="acumos"; version="0.4-1"; sha256="0ddy8gdpm5kapvlybmjd62pxbqa5lkj6zj2qqsmp63cgj3n6yjq2"; depends=[httr jsonlite RestRserve RProtoBuf Rserve yaml]; };
   ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; };
   adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; };
   adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; };
   adamethods = derive2 { name="adamethods"; version="1.2.1"; sha256="150awbd3skb1mqca18bqjykhyycqw8crviw66s6qrcnmcsbk77pj"; depends=[Anthropometry archetypes FNN foreach nnls tolerance univOutl]; };
-  adapr = derive2 { name="adapr"; version="2.0.0"; sha256="1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw"; depends=[archivist devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard versions]; };
   adapt4pv = derive2 { name="adapt4pv"; version="0.1.0"; sha256="0j0vdil277y035bqff3kwwrimjsv1pzfzj6qshyj7xh80dj6qsz8"; depends=[doParallel foreach glmnet Matrix speedglm xgboost]; };
   adaptMCMC = derive2 { name="adaptMCMC"; version="1.3"; sha256="08v11rl0p4w94knb0yzs1ysj42xillya62yaw3zm40d4pqv7vcky"; depends=[coda Matrix]; };
   adaptMT = derive2 { name="adaptMT"; version="1.0.0"; sha256="1yllz1zd4cryf5bj8b2lcrj6zl79yjkllyh9p02ikryy5qmg419b"; depends=[]; };
@@ -5090,9 +5283,8 @@ in with self; {
   additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; };
   additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
   addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; };
-  ade4 = derive2 { name="ade4"; version="1.7-15"; sha256="1xpxznlqm8wb4d5z2dcrl0wi3jjciq2hr5rcx2b5aaipiiyzm1ij"; depends=[MASS pixmap sp]; };
-  ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-0"; sha256="1k1d5vck8plv6rq9nn664p73nhd4k3kah52fvqc3vg2zv1hbizzk"; depends=[ade4 adegraphics lattice tkrplot]; };
-  adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; };
+  ade4 = derive2 { name="ade4"; version="1.7-16"; sha256="142m70im8yd4q01q7z02y3ia0f66yh4ikdznv0ps6c7yyigs5mwv"; depends=[MASS pixmap progress sp]; };
+  ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-1"; sha256="1y0f62n8iv002ayd1nyl3bmszw558niwnfzjpvk0a7cbvfdyvwcg"; depends=[ade4 adegraphics lattice]; };
   adegenet = derive2 { name="adegenet"; version="2.1.3"; sha256="1ipnawi0qfd4rfwj37igvh36x1a9d8x4n7xynn1jcr12rd713407"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
   adegraphics = derive2 { name="adegraphics"; version="1.0-15"; sha256="12k77x6vnjz9s9dvz1r81ajqcl1nh9g33r7dymaqk2cs5q3wvfw7"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
   adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.18"; sha256="0ss3fhpa7i2m4g55ajy9pgwgj393jbw58khgywc3gw9ys53h02sd"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
@@ -5105,21 +5297,23 @@ in with self; {
   adeptdata = derive2 { name="adeptdata"; version="1.0.1"; sha256="07146kv1llj5kci7s7v2jrqd7bl6h3rczx43nha5fhr57ldpcm40"; depends=[]; };
   adespatial = derive2 { name="adespatial"; version="0.3-8"; sha256="01i90802w98zyni6krcngk49f5jgi267w64l0wm8c2izrq4k5zg3"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; };
   adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; };
+  adheRenceRX = derive2 { name="adheRenceRX"; version="1.0.0"; sha256="19kimj88dmcc8mq3s4l7pph9jz8p57gbjyn0pn5zkrcjdrwncslm"; depends=[anytime dplyr lubridate purrr Rcpp rlang tidyr]; };
   adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; };
   adimpro = derive2 { name="adimpro"; version="0.9.2"; sha256="1ajq2889y70lxjdpf5zdg7zkz35i3i92li72wb7nbfngxmw47xzv"; depends=[awsMethods]; };
-  adiv = derive2 { name="adiv"; version="2.0"; sha256="1lp5vylqj8n29smjp3611gxw0nfgk5blcwrhk3c73w1v6695488b"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; };
+  adiv = derive2 { name="adiv"; version="2.0.1"; sha256="184wgf91csafsk1x6blyv2l6m974lq1696d4i612ff7qrwbmicpv"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; };
   adjclust = derive2 { name="adjclust"; version="0.5.99"; sha256="1ij09mlmsqamvr8gmajg82qfn0l7q4x7hkavm7w42ndzjwwdmf7b"; depends=[capushe Matrix matrixStats]; };
   adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; };
   adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; };
   adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; };
-  admisc = derive2 { name="admisc"; version="0.8"; sha256="071xrqimizhs7qgav84fggw8cls4dhhqvzp8f1g0xw1wvj0wnfx1"; depends=[]; };
+  admisc = derive2 { name="admisc"; version="0.11"; sha256="18m2kxr62mw9pkgpnnr7lnik73lb19d5gib8dm0b5d1a2c5abxyh"; depends=[]; };
   admixr = derive2 { name="admixr"; version="0.9.1"; sha256="0wszpzs53cbnha13g2ldpq6z5ndw2v2xgrzadqkjm3hsp6akv4bl"; depends=[dplyr magrittr readr rlang stringr tibble]; };
   admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; };
   admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; };
   adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; };
   adoption = derive2 { name="adoption"; version="0.6.2"; sha256="18mjhsh19bjmh27sv5fiay0xv1la0qy96v48b093f7kqfx4c21xb"; depends=[quadprog RandomFieldsUtils tkrplot]; };
-  adoptr = derive2 { name="adoptr"; version="0.3.2"; sha256="1s35wm1gkbygzbnma5mwpr60zml4yf74ip5fzkj0vfi77b3lclrr"; depends=[glue nloptr]; };
+  adoptr = derive2 { name="adoptr"; version="0.4.1"; sha256="1xx5mg1lhq4n5pi6wgmak2nmkfwyldkphcama5fdls03xiigy0cn"; depends=[glue nloptr]; };
   adpss = derive2 { name="adpss"; version="0.1.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; };
+  ads = derive2 { name="ads"; version="1.5-4"; sha256="1f2pd0hbbahqjv9fjvq1bgq1w5s11b73kpvj54j6i8h1ps6j69n7"; depends=[ade4 spatstat spatstat_data spatstat_utils]; };
   advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; };
   adventr = derive2 { name="adventr"; version="0.1.8"; sha256="0nja1a2xhaimz1fg2bb838x9a37sswjqjc68mp59gbdwkfpdii37"; depends=[BayesFactor boot car dplyr effects effsize forcats GGally ggplot2 Hmisc learnr lm_beta nlme readr robust sandwich sjstats tidyr WRS2]; };
   adwave = derive2 { name="adwave"; version="1.3"; sha256="11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7"; depends=[waveslim]; };
@@ -5127,7 +5321,8 @@ in with self; {
   aemo = derive2 { name="aemo"; version="0.3.0"; sha256="108scwyf0dyvn969cks3ikbj2pf2g4dw051asahx26pl0ggw7ijw"; depends=[assertthat dplyr lubridate stringr]; };
   afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; };
   afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; };
-  afex = derive2 { name="afex"; version="0.27-2"; sha256="0qsmcddy4449qjj3ajmqvdiqdkhkswmz5dqf150wxwq897p3bvf2"; depends=[car lme4 lmerTest pbkrtest reshape2]; };
+  afex = derive2 { name="afex"; version="0.28-0"; sha256="0c47bq2llzw2b4avhkxyhmf1m2zjh9jsjiw2kww9n1bhwqsyr4ci"; depends=[car lme4 lmerTest pbkrtest reshape2]; };
+  affinitymatrix = derive2 { name="affinitymatrix"; version="0.1.0"; sha256="10i7wzl4xiphj5f466ga7c4ha3mkyqn63x1z0jyx50m0b84sggq1"; depends=[expm ggplot2 ggrepel Hmisc MASS]; };
   affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; };
   afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; };
   afpt = derive2 { name="afpt"; version="1.1.0.1"; sha256="0cg5cdm9nl1hs6f3j0ljpw4bkqvh3ksyj615b9nnbqs5k28lyds9"; depends=[]; };
@@ -5139,14 +5334,16 @@ in with self; {
   agricolae = derive2 { name="agricolae"; version="1.3-3"; sha256="13hzlbm7khpz3xq0d7ijfvy4n489y97l3kzdspsqlz7rywbn7cg9"; depends=[AlgDesign cluster klaR MASS nlme]; };
   agridat = derive2 { name="agridat"; version="1.17"; sha256="0pgk9p6ynnz03k1ch9c15xbl777b0ml80shkbkxlnqn297q736vq"; depends=[]; };
   agriwater = derive2 { name="agriwater"; version="1.0.0"; sha256="0m1dpv69nf3pjp63z3a5710skgb6sbrmjv6b8rxvq9lrw63993g9"; depends=[raster rgdal sp]; };
-  agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; };
+  agrmt = derive2 { name="agrmt"; version="1.42.4"; sha256="0kbhmla14s2jr2sg8fz16zgmqz2n8q2228ny8naar0srjqjnb3c6"; depends=[]; };
   agroclim = derive2 { name="agroclim"; version="0.1.0"; sha256="16cyqplzmwziqwkicix0sr06zhc0yx615iv3hda0cxbdyf2rllk3"; depends=[abind cowplot easyNCDF ggforce ggplot2 ggpubr gtable multiApply ncdf4 plyr raster reshape sp zoo]; };
   agrostab = derive2 { name="agrostab"; version="0.1.0"; sha256="0mcskv3144j594wqljzn5pwbhkxh6sb76b1c2wabzjvi61zrapiv"; depends=[dplyr ggplot2 rlang]; };
   agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
+  agtboost = derive2 { name="agtboost"; version="0.9.1"; sha256="01gydh7rlsgv759y3nahm9qi8pd24x37rpzv1frwzrr5jfbajqdl"; depends=[Rcpp RcppEigen]; };
   ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
   ahnr = derive2 { name="ahnr"; version="0.3.1"; sha256="1g8m3q108ricfyn4fjjaihpr93xz7fm2sfzg3i0fz1n1i703jwm8"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; };
   ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; };
   ahpsurvey = derive2 { name="ahpsurvey"; version="0.4.1"; sha256="1r7x4c318nzbx0ppm9272kfpz2bln1cafkv9irnj85nsdcravr33"; depends=[dplyr knitr magrittr randomNames Rdpack tidyr]; };
+  ahptopsis2n = derive2 { name="ahptopsis2n"; version="0.1.0"; sha256="1924hwk861mbbmcvf34lsmhxjga2rqz730817a19b0nkr308p6ma"; depends=[]; };
   aiRly = derive2 { name="aiRly"; version="0.1.0"; sha256="0d3w5dwk0b3pd49zw2005rili4p3l1i3x4hzp8cf6rljr86x01cy"; depends=[httr jsonlite reshape2 tibble]; };
   aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; };
   aibd = derive2 { name="aibd"; version="0.1.8"; sha256="1pgfvz3b276y9pl6m3rghjlvhkrqp04w8gj3zzl7j446d372lm9h"; depends=[commonsMath rscala]; };
@@ -5155,65 +5352,72 @@ in with self; {
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
   aimsir17 = derive2 { name="aimsir17"; version="0.0.2"; sha256="0v804maqaygqhw3y9wqap3h9vvjniqnnbsv1psjj500r2yscicxs"; depends=[tibble]; };
   airGR = derive2 { name="airGR"; version="1.4.3.65"; sha256="1x9zf6bbcaflszqzaki940xy33g4wj4yqsgbg836a1dwv1crd1l7"; depends=[]; };
-  airGRteaching = derive2 { name="airGRteaching"; version="0.2.8.69"; sha256="0z2iwqr0qm9wv7hl337l0kbjnc9h0pjahwnk3y89x8frisa2cc32"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; };
+  airGRteaching = derive2 { name="airGRteaching"; version="0.2.9.25"; sha256="0pkr5mkybxdk7axzd5ll87651x4b5yim1h9c8x3yapgp9vihvhnc"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; };
   aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.2"; sha256="0z9knqdl7ihx2vph154qi1lh4s6yvlcw6kwry8k47mhh3p7pynsd"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; };
   airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; };
   airports = derive2 { name="airports"; version="0.1.0"; sha256="1ahfqqfcvr731hj0h7d00jd87h1adiryh42sv4mh318lk5rglm6f"; depends=[]; };
   airqualityES = derive2 { name="airqualityES"; version="1.0.0"; sha256="1kf673ajk06ggy9524lip5flpfgq0gql7d46kgnri8l3kbzw7zcj"; depends=[tibble]; };
   airr = derive2 { name="airr"; version="1.3.0"; sha256="1lpzd8qz1dr6kkrbc8lnqbknxyamv4y6ahad5w9q5dgwdwn0kpym"; depends=[readr stringi yaml]; };
-  airt = derive2 { name="airt"; version="0.1.0"; sha256="0vzc9i2jj20dk4bb818fvg2xb4ik472cn9wrijw4c2qynl5fz7mz"; depends=[mirt pracma tidyr]; };
+  airt = derive2 { name="airt"; version="0.2.0"; sha256="1psr3zsvgvvg2r4mah0dq8zgagr6y85a541pmpm7aszzkkga4yp5"; depends=[EstCRM mirt pracma rlang tidyr]; };
   ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; };
-  akc = derive2 { name="akc"; version="0.9.4"; sha256="1bvlj3h1fa3n9dkfhr5zhh8j3m8wafr6370sfg24vjwmiqpmx96j"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; };
+  akc = derive2 { name="akc"; version="0.9.5"; sha256="0mjqz5csckdnl9wb2lypcj907qbkvppwbzvmfcl1a06431pj8zgv"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; };
+  akiFlagger = derive2 { name="akiFlagger"; version="0.1.2"; sha256="0dhn44yy9z204blzr8xr7jrphlirl43dj209cxshn5y9wg5s58pp"; depends=[data_table dplyr zoo]; };
   akima = derive2 { name="akima"; version="0.6-2.1"; sha256="086q4ip6j226p8z5iqzfg551i15l5c0rnf4y4zavmpmqvwd2szz2"; depends=[sp]; };
+  akmbiclust = derive2 { name="akmbiclust"; version="0.1.0"; sha256="19dj12vlry6f3agzrnshx2c4rpa2h7dlx2138r49jjy9sm48pyfw"; depends=[]; };
   akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
   akmedoids = derive2 { name="akmedoids"; version="0.1.5"; sha256="0yn5rjgb5rrhphgbjn49098ybkmzda6yxzfqgbsppfgjidrafhza"; depends=[ggplot2 Hmisc kml longitudinalData reshape2 signal]; };
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
   alakazam = derive2 { name="alakazam"; version="1.0.2"; sha256="0ba0gx682g3swbyyw4nmhxnnw0lzxb8rbapcgfq9jaagn8q63d0f"; depends=[ape dplyr ggplot2 igraph lazyeval Matrix progress Rcpp readr rlang scales seqinr stringi tibble tidyr]; };
+  albatross = derive2 { name="albatross"; version="0.2-0"; sha256="0448syyfq6lkq4ccdxryzha9pdh61q45c0c1a59i0r2civa8z934"; depends=[lattice multiway pracma]; };
   albopictus = derive2 { name="albopictus"; version="0.5"; sha256="0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9"; depends=[]; };
   ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; };
   alfr = derive2 { name="alfr"; version="1.2.1"; sha256="1ldq8gvgqjjabn86hdqb6hxch8x4hvr6djv5ly4mx039dipc8jxi"; depends=[httr jsonlite magrittr stringr]; };
-  alfred = derive2 { name="alfred"; version="0.1.7"; sha256="1467rg5q2dqbqy8vj2061glb1gksq96rnjlifgyiv5rarwzy9b4y"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
+  alfred = derive2 { name="alfred"; version="0.1.8"; sha256="0kw5kdcd253xmpfmjqsxky0ilq0djxn02mlnwydis0sxmrf4rxbh"; depends=[dplyr jsonlite lubridate magrittr rlang tibble tidyr]; };
   algaeClassify = derive2 { name="algaeClassify"; version="1.2.0"; sha256="1sna5rij2ngpgqfz5cviqdbyr43xph8cbjc4vnm238n72zgg7cb6"; depends=[httr lubridate plyr RCurl rvest taxize XML xml2]; };
   algo = derive2 { name="algo"; version="0.1.0"; sha256="1g18p8jyj9crkqm16y2im3r9xzqwa36javv4vi1wvsqkg31d81si"; depends=[glue htmltools jsonlite]; };
-  algorithmia = derive2 { name="algorithmia"; version="0.2.0"; sha256="0h1llcwk1qkxg26ikib44nd19da1q39n3gd8jwwb36687drl26qp"; depends=[base64enc httr rjson]; };
+  algorithmia = derive2 { name="algorithmia"; version="0.3.0"; sha256="1ccmcsyxncyv8k0fjvr5y44amygqi7qx2dy6rsy3a5pw281hllr4"; depends=[base64enc httr rjson]; };
   aliases2entrez = derive2 { name="aliases2entrez"; version="0.1.1"; sha256="0gv76a8iwmpqrk3iw35mj7jzyfna7lga2amy5csgfpsz8w54jdd6"; depends=[AnnotationDbi doParallel foreach limma org_Hs_eg_db RCurl readr]; };
   alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; };
   alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; };
   allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
+  allcontributors = derive2 { name="allcontributors"; version="0.0.2"; sha256="0b9qiwp6z33fgci7np4qhsb39rzmarajsj3pa98vkmdn71bw1bxf"; depends=[cli clipr ghql git2r httr jsonlite magrittr]; };
   alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; };
   allelematch = derive2 { name="allelematch"; version="2.5.1"; sha256="00117cj01psax4rjvy2nja5r2ss9l8zzjicczh46kp401i1ghmwc"; depends=[dynamicTreeCut]; };
   allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
-  allestimates = derive2 { name="allestimates"; version="0.1.8"; sha256="0wddcc4gdngwikx5ajr8yf45hk05ijqqczipss253y64viwgi3by"; depends=[broom dplyr ggplot2 speedglm stringr survival tidyr]; };
+  allestimates = derive2 { name="allestimates"; version="0.1.9"; sha256="1ba3hf3wbhswaxmbi3lfjqzdgk7xf44x5xhggsqdw44kk080z7bb"; depends=[broom dplyr ggplot2 speedglm stringr survival tidyr]; };
   alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; };
   almanac = derive2 { name="almanac"; version="0.1.1"; sha256="0qsczk74ihy7ac5c4dzd6ax5gfmr56wfnjxg396qc2c3xykb7dd5"; depends=[glue lubridate magrittr R6 rlang V8 vctrs]; };
   alookr = derive2 { name="alookr"; version="0.3.2"; sha256="197sbnfckk24vsp6znx8q26hlrkawiy69849fkwnzal0bwwqx4l3"; depends=[caTools cli dlookr dplyr future ggmosaic ggplot2 MASS MLmetrics party purrr randomForest ranger RColorBrewer rlang ROCR rpart tibble tidyr tidyselect unbalanced]; };
-  alpaca = derive2 { name="alpaca"; version="0.3.2"; sha256="07r13gyqb876p6zx3pydl414zrgc473dnyn5ja6hmzjmkv19lw4k"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; };
+  alpaca = derive2 { name="alpaca"; version="0.3.3"; sha256="1mpyy9wg2wvznkd9vgzaxyz87py9zmlrlrzrhqbmqiwqh5y99wnq"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; };
   alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; };
   alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; };
   alphahull = derive2 { name="alphahull"; version="2.2"; sha256="024d70z9pasyfp83zwgh7fkjky70l74pbzw1wvazzq75p9m91vzv"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; };
-  alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; };
+  alphashape3d = derive2 { name="alphashape3d"; version="1.3.1"; sha256="0d3rxvsb0yl900dlpr1v5w56z8ci9rbp5dlwx7l2laifyprsns2i"; depends=[geometry rgl]; };
   alphastable = derive2 { name="alphastable"; version="0.2.1"; sha256="01gwrcxlj2jlb8axs5qmrsixk3a8b7044ypyjg6dpdcxfbcf5fvp"; depends=[mvtnorm nlme nnls stabledist]; };
   alphavantager = derive2 { name="alphavantager"; version="0.1.2"; sha256="0c97p8njga4xffvsa0kj0s4y0agjr44y9bnjxs5phm1ldcqjs0yj"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; };
-  alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; };
   alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; };
   altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; };
+  altadata = derive2 { name="altadata"; version="0.1.1"; sha256="0wv8a0423k0gw5i0qgz5d3wqw22a9pk7r80fp33pn0mxq9b54zdv"; depends=[httr jsonlite]; };
   altair = derive2 { name="altair"; version="4.0.1"; sha256="0s3pvlh6y4h3ni5m8yli6gp6gps7pcpndag40ckr31302ai3bxvq"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; };
-  altmeta = derive2 { name="altmeta"; version="3.1"; sha256="1ifdy510m5xdvxzpfjrhjqmxgxr9yxki3vivlgzdcry119fhgh6c"; depends=[coda lme4 Matrix metafor rjags]; };
+  altfuelr = derive2 { name="altfuelr"; version="0.1.0"; sha256="0k3f4wr9gbn5aig40xg817hrnz2lx8g4adyy18s59fs8dw03v87h"; depends=[dplyr httr jsonlite lubridate magrittr purrr stringr]; };
+  altmeta = derive2 { name="altmeta"; version="3.2"; sha256="0z252lbsknqp33i0b0xf5r7spr535iq47bv40vgip6nsqhgrl7b0"; depends=[coda lme4 Matrix metafor rjags]; };
   amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; };
+  amapGeocode = derive2 { name="amapGeocode"; version="0.5.0"; sha256="0asnp4rcarxqx575g85wxpbv9ymrmm2xqyfm5p96x679xkmfanc6"; depends=[data_table httr jsonlite lifecycle magrittr sjmisc stringr xml2]; };
+  amber = derive2 { name="amber"; version="1.0.3"; sha256="0kc7g5rb0wrs1id1k0qay56063gpffwvcll38983b1l3k215mxiv"; depends=[classInt doParallel foreach Hmisc latex2exp ncdf4 raster rgdal rgeos scico sp viridis xtable]; };
   ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; };
   ambient = derive2 { name="ambient"; version="1.0.0"; sha256="0b8nd8g0ydglql2cwi4wmlnv5kyid8q51vz0p08f9m5x73k3z2bd"; depends=[Rcpp rlang]; };
   ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; };
   amelie = derive2 { name="amelie"; version="0.2.1"; sha256="0f4rfijskrw9nmyzbrbz6yfa9d0a5cxjw8n9c36hc6jvh377i7k7"; depends=[]; };
-  amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; };
+  amen = derive2 { name="amen"; version="1.4.4"; sha256="00c4dw6s8yxagbgadvcpw4ima89aqjqgpm3460zi97xwq9404f1d"; depends=[]; };
   amerika = derive2 { name="amerika"; version="0.1.0"; sha256="1c0bi0wrc89d0zv0wzmdvka66mcikgi1w4gn1i22mvg5bivhzaqx"; depends=[]; };
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
   ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
   ampir = derive2 { name="ampir"; version="1.0.0"; sha256="081ah5fvfa4f2yj9zigj5b069dr8z8qs6mwb20w08wldlgcy2a5x"; depends=[caret kernlab Peptides Rcpp]; };
-  amt = derive2 { name="amt"; version="0.1.2"; sha256="174rxcalr2gb168ccc0wyj4b94hf1x37mrh4r3160xh2wvxgi84z"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere KernSmooth leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr]; };
+  amt = derive2 { name="amt"; version="0.1.3"; sha256="0ln08ivhq2s4kcnl2a5h7nlc22z3yvwx5xl45ps1inliddj99y22"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere KernSmooth leaflet lubridate magrittr maptools purrr raster Rcpp Rdpack rgeos rlang sf sp survival tibble tidyr]; };
   anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; };
-  analogsea = derive2 { name="analogsea"; version="0.8.0"; sha256="1naw9qh6rp1hz3mk19jir0qia1daizbfa695qbp1sg6rdh6is8ag"; depends=[httr jsonlite magrittr yaml]; };
+  analogsea = derive2 { name="analogsea"; version="0.9.0"; sha256="0bj9b8ylimjyd4pm29h6dc1inbc0h2dxpbxp4sh2cdm5p65ly3cc"; depends=[httr jsonlite magrittr yaml]; };
   analogue = derive2 { name="analogue"; version="0.17-5"; sha256="1iq0hdblpg1yb5ciralfxq7as9zwc58237hrzm0n51yb6a9vd1vd"; depends=[brglm lattice MASS mgcv princurve vegan]; };
   analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; };
   analysisPipelines = derive2 { name="analysisPipelines"; version="1.0.2"; sha256="1rxam52wrbcjrvixb35b9ha37i8a0fczby49vmgzpnrbvkc50ldx"; depends=[dplyr futile_logger ggplot2 magrittr pipeR proto purrr RCurl rlang]; };
@@ -5224,56 +5428,59 @@ in with self; {
   andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; };
   andurinha = derive2 { name="andurinha"; version="0.0.2"; sha256="1cpz16zv3al6lmsqsb7dl5v6kml2a0hg084rbmwa4wsyk5ygl8bm"; depends=[cowplot ggplot2 plyr rlang signal tidyr]; };
   anesrake = derive2 { name="anesrake"; version="0.80"; sha256="1p2g51w80jiadlf4asbnsw46asarzlzr5c1yfhdb31ymqxd7p76q"; depends=[Hmisc weights]; };
-  anglr = derive2 { name="anglr"; version="0.7.0"; sha256="0yvpixpi3x83a1xjgcvc7khxc91q7n7k21dmf227wcjjj0mbhrdk"; depends=[colourvalues crsmeta dplyr gridBase magrittr palr png polyclip raster reproj rgl rlang RTriangle scales silicate sp terrainmeshr tibble unjoin viridis]; };
   angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; };
   aniDom = derive2 { name="aniDom"; version="0.1.4"; sha256="1h19q3f16g6kacawd2i9i5lg64q436dsbzk9isf3p2mr7p24xbas"; depends=[rptR]; };
   anim_plots = derive2 { name="anim.plots"; version="0.2.1"; sha256="0z811y4zzrqas1ynrq4syhxvbcw2girxa6g9biry9d0qgq1w8cp1"; depends=[animation]; };
+  animalEKF = derive2 { name="animalEKF"; version="1.1"; sha256="0bq2d2iza0c971731b915cd1k2f7gq2x1k7xv4z91sy73v0jngl5"; depends=[bezier colorspace deldir ellipse ggplot2 HDInterval maptools MASS Matrix MCMCpack mvtnorm plyr png rgdal rgeos shiny sp]; };
   animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
-  animaltracker = derive2 { name="animaltracker"; version="0.1.0"; sha256="1c2qx03yawfdcg992l2k3w52r4hfxakd74ws56phbn5c3bm540k9"; depends=[dplyr elevatr forcats geosphere ggplot2 leaflet leaflet_extras lubridate raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr V8 zoo]; };
+  animaltracker = derive2 { name="animaltracker"; version="0.2.0"; sha256="1zv2nj4wfskz1lxfgw8l4gyrlv418drk8zl4cw55i5na6a39shcv"; depends=[dplyr forcats geosphere ggplot2 httr leaflet leaflet_extras lubridate maptools raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr zoo]; };
   animation = derive2 { name="animation"; version="2.6"; sha256="02jv4h9hpp8niw9656r5n36kqr71jbyynxnywkkkdi0aj8w3cach"; depends=[magick]; };
+  animint2 = derive2 { name="animint2"; version="2020.9.18"; sha256="17gr43hyb7yx9rsa0id5ibix09sai95pknc75cf31ra72mkpym8m"; depends=[digest gtable knitr lazyeval MASS plyr reshape2 RJSONIO scales tibble]; };
   anipaths = derive2 { name="anipaths"; version="0.9.8"; sha256="02d2z236gjh40p29h86ikspnxim49c3c33r4dnf3yzns622ckm2c"; depends=[animation ggmap mgcv raster RColorBrewer scales sp]; };
   aniview = derive2 { name="aniview"; version="0.1.0"; sha256="1klakkmdk4xllaxd0pllvxi4396n6rz2idz55niy91mp0fhcjhwf"; depends=[htmltools jsonlite]; };
+  anndata = derive2 { name="anndata"; version="0.7.5"; sha256="0gx2j3xggvp3l793km6v8268ib1qks1qgn5fmjjglavwvs2y2xqc"; depends=[assertthat R6 reticulate]; };
   anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
-  anomalize = derive2 { name="anomalize"; version="0.2.1"; sha256="0fs70zsfawv4326xqnl6xfi4rg6xk3kakgrpyvlqqvfqhw6vx76v"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; };
-  anomaly = derive2 { name="anomaly"; version="3.0.2"; sha256="0zypvgn59ryik6jrasqmhjyfi9ldp6145455nrb7dxfhk1bkp6kg"; depends=[assertive BH cowplot dplyr ggplot2 Rcpp Rdpack reshape2 rlang robustbase]; };
+  anomalize = derive2 { name="anomalize"; version="0.2.2"; sha256="13ncx17hdwv7799s7y6p3wvf59dad97y8rs9p56cbd91f6jkjgs5"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; };
+  anomaly = derive2 { name="anomaly"; version="4.0.0"; sha256="08nlmy65qhxr67lywdgf6kvddms6bkfwfrb9s4pjvdgxp0db5gqk"; depends=[assertive BH cowplot dplyr ggplot2 Rcpp Rdpack reshape2 rlang robustbase]; };
   anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; };
+  anovir = derive2 { name="anovir"; version="0.1.0"; sha256="1x7lvj7xchbv6siyc9miivmf0rlxrjflal4icyvbxgdr285s2s9w"; depends=[bbmle]; };
+  anscombiser = derive2 { name="anscombiser"; version="1.0.0"; sha256="0jpmxgr5hfyv1hcjn4h1063ch3b3xlgqv983f4f9d2ajz5i5mdwv"; depends=[]; };
   antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.9"; sha256="09zmhzfdzxpp01wmdk230gff6zwgd5p2w3ppbq3a0df3f56x0hix"; depends=[antaresRead assertthat data_table whisker]; };
   antaresProcessing = derive2 { name="antaresProcessing"; version="0.18.0"; sha256="1rw7g4706g4fdx7c7magxqj71h6iwkbslmyrqfwna4irnifjmv7g"; depends=[antaresRead data_table]; };
   antaresRead = derive2 { name="antaresRead"; version="2.2.5"; sha256="10c3ql08211ylc271xk8ffnix3pzmnaylgf0ynwayp34hkgkf37h"; depends=[bit64 data_table lubridate plyr shiny stringr]; };
-  antaresViz = derive2 { name="antaresViz"; version="0.15.2"; sha256="1a3h3m34k0ihml8g7d90gy4z9ynyyi7dqlafw4frp90wmc8m1r9g"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; };
-  anthro = derive2 { name="anthro"; version="0.9.3"; sha256="1jikrb1177j04fwwivw3dcpv1687jdph3l9xmxrbcghww1w0sfbk"; depends=[survey]; };
-  anticlust = derive2 { name="anticlust"; version="0.5.0"; sha256="1w5pw6dvbnbfi6acpih9zbpyknl7wxr426kry64qhss25zvjw7a0"; depends=[Matrix RANN]; };
+  antaresViz = derive2 { name="antaresViz"; version="0.15.3"; sha256="07a36dfgbf0bq17kqbvb1xm1mxmbhjj4s8mglawq77jksrjprl11"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; };
+  anthro = derive2 { name="anthro"; version="0.9.4"; sha256="0blsfz3ckizkg4r4i3ib6b4yh40krcy8133v32f3yc220g2g2za9"; depends=[survey]; };
+  anticlust = derive2 { name="anticlust"; version="0.5.6"; sha256="1f5z05p5fwfgcj4vzg6kg9vihamcdha74yyn9c04m4kydyngnm85"; depends=[Matrix RANN]; };
   antitrust = derive2 { name="antitrust"; version="0.99.14"; sha256="0mc7mgvhbfw9rp5w9vdd003mhp13pdjhrb8gybmkvan316mwygds"; depends=[BB evd MASS numDeriv]; };
   antiword = derive2 { name="antiword"; version="1.3"; sha256="034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j"; depends=[sys]; };
   anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; };
-  anyflights = derive2 { name="anyflights"; version="0.3.0"; sha256="0q4bg287x60al47m66wn9sd1vmldgll4kyrd6dc9m5lf80mp7hmc"; depends=[curl dplyr glue httr lubridate progress purrr readr roxygen2 stringr usethis vroom]; };
-  anytime = derive2 { name="anytime"; version="0.3.8"; sha256="1ac92bjhqjvarrr0ddkgiq3hg5vgzj0m87hh2rsvd5x8136iysck"; depends=[BH Rcpp]; };
+  anyflights = derive2 { name="anyflights"; version="0.3.1"; sha256="08x4412xbmiisizdiby6b9xkhrlsag9hrmj681wpm6fm2bpk0q6y"; depends=[curl dplyr glue httr lubridate progress purrr readr roxygen2 stringr usethis vroom]; };
+  anytime = derive2 { name="anytime"; version="0.3.9"; sha256="0jjpqynai5nd7mfy1smb44356f3d5bmpxhs1i9x9jw5c959c35hh"; depends=[BH Rcpp]; };
   aod = derive2 { name="aod"; version="1.3.1"; sha256="1g03ajhs6bid80i83xn3917abhymzgrydqx86wxxpkqga018hb85"; depends=[]; };
   aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; };
   aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; };
   aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; };
   aoristic = derive2 { name="aoristic"; version="1.0.0"; sha256="1qfphg5mh26q832pkh05q50lg60viyiwwcwmsagqb6r64llmysak"; depends=[foreign formattable ggplot2 htmltools lubridate openxlsx plyr]; };
   aos = derive2 { name="aos"; version="0.1.0"; sha256="0nkl7dkqjfp4ahwmn3vs0akx6x2brf0m5gzzzx6pf54j1qwypbhf"; depends=[htmltools jsonlite]; };
-  apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; };
+  apTreeshape = derive2 { name="apTreeshape"; version="1.5-0.1"; sha256="1wxhfp21ir9yv4wnbh7ay2x05k822nsyd5smlxmk67wm5w4vr1v1"; depends=[ape coda cubature pbapply quantreg]; };
   apa = derive2 { name="apa"; version="0.3.3"; sha256="1nvhl5fqramsdrkpl1nmgr1vmki5c1lkdi1kkx7ihf0cz35f7c2a"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; };
   apaTables = derive2 { name="apaTables"; version="2.0.5"; sha256="0h986jqdl65fd33gfa433ik77r6lm9zrq75qfk5r8xsdgzb4wgva"; depends=[boot broom car dplyr tibble]; };
   apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; };
-  apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
+  apc = derive2 { name="apc"; version="2.0.0"; sha256="0vh6iyxm46k8sfa1xgz0y6m619snnm8s072kml5qgiiw5s7bqnpq"; depends=[AER car ChainLadder ggplot2 ISLR lattice lmtest plm plyr reshape survey]; };
   apcf = derive2 { name="apcf"; version="0.1.5"; sha256="1drhzk6v8xirjv3371nay3gz1v6wcklhywrzfqn32ibad7n31ph2"; depends=[Rcpp]; };
   apcluster = derive2 { name="apcluster"; version="1.4.8"; sha256="0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
   ape = derive2 { name="ape"; version="5.4-1"; sha256="1r7fwyz30ippcl1ibqiv1xryf44x5crcks5kx19h146ffj76qcgh"; depends=[lattice nlme Rcpp]; };
   apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; };
   apex = derive2 { name="apex"; version="1.0.4"; sha256="1ddzbzpnc17yvbl5yfyp0widqlx48qwlh80xcmyzhv045s680rdk"; depends=[adegenet ape phangorn]; };
-  apexcharter = derive2 { name="apexcharter"; version="0.1.5"; sha256="0p6my3prqzmvxmnd1dfdfryrk9jy0fndadq9fs69fwkxxr37wvz0"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; };
+  apexcharter = derive2 { name="apexcharter"; version="0.1.8"; sha256="0mgd3i4hw5vg7lci6cwsyjpnvlw71zx57m7jjif1zm0ck70g5cfv"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; };
   aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; };
   aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
-  aplot = derive2 { name="aplot"; version="0.0.5"; sha256="19z8r1l54k4rjs4pwm0aldg25m973708bxjymkhsa9q832vfkm6y"; depends=[ggplot2 magrittr patchwork]; };
+  aplot = derive2 { name="aplot"; version="0.0.6"; sha256="08kqrm9r57l8zgij897wpp428l4i50qfhp7y78r3pk5pjz37bsan"; depends=[ggplot2 magrittr patchwork]; };
   aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; };
-  apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
   apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; };
-  apollo = derive2 { name="apollo"; version="0.1.0"; sha256="0i80js5gxz3rj6977iwnm7pi9qgq2iz4h83nz8301ra94g7kjv40"; depends=[coda Deriv maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; };
+  apollo = derive2 { name="apollo"; version="0.2.2"; sha256="1nfc7fcdfl2p5rs2jmwmljl6vmf02sz37rxf7r9yd8ad96326mmb"; depends=[coda Deriv matrixStats maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB]; };
   apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
   applicable = derive2 { name="applicable"; version="0.0.1.2"; sha256="0yzfk4ajdx4l3xivf6v9vn7fqvzfma4842cvjixrng83p2v25sdq"; depends=[dplyr ggplot2 glue hardhat Matrix proxyC purrr rlang tibble tidyr tidyselect]; };
   appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; };
@@ -5282,38 +5489,38 @@ in with self; {
   aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
   apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; };
   aprof = derive2 { name="aprof"; version="0.4.1"; sha256="14qclp88j4ygd4vrxxpgy2s9939wcajjsqycdzpvn64ws29sdpvh"; depends=[testthat]; };
-  apsimx = derive2 { name="apsimx"; version="1.946"; sha256="1xwa0yhjzdgyrbc3yc4myjfy369gj0ll8y1nml7lfylc57cjdhx3"; depends=[DBI jsonlite knitr RSQLite xml2]; };
+  apsimx = derive2 { name="apsimx"; version="1.964"; sha256="11pzk4jhgn576gbsfp0jrz8lzrg34ixw1s15b4mz4m0fw04fcxjw"; depends=[DBI jsonlite knitr RSQLite xml2]; };
   apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
   apt = derive2 { name="apt"; version="3.0"; sha256="14njvpf6q34nffm3r9gqcszlabzbydsxqj0ln9nk4mv59izp8sqm"; depends=[car erer urca]; };
   apyramid = derive2 { name="apyramid"; version="0.1.2"; sha256="0ws6dfd6v3p9rhpmf06786yl2gaw1h2n1d76a054iap8bvgyahzw"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; };
-  aqp = derive2 { name="aqp"; version="1.19"; sha256="1z5qbzhsn79xz17i53hy48xnwf64k5cc24jxwvysyv8p2ylrir0i"; depends=[cluster digest lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
+  aqp = derive2 { name="aqp"; version="1.25"; sha256="1zy5684jx3j4m7ld8cj34kz7gs721mxs2k45n50q0mp5c1mr8kgl"; depends=[cluster lattice plyr reshape sp stringr]; };
   ar_matrix = derive2 { name="ar.matrix"; version="0.1.0"; sha256="1d531hkl50szfa1q0zbp8dp1a9jli63kwvxjgc9n0ar279y47qdz"; depends=[MASS Matrix sp sparseMVN]; };
   arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
-  arc = derive2 { name="arc"; version="1.2"; sha256="1advs0aqxh84c5n9akww8cdafh7npgaibrb42wncwhv9nfi7wy1v"; depends=[arules discretization Matrix R_utils]; };
+  arc = derive2 { name="arc"; version="1.3"; sha256="0isfa7d26jpj004lf4f06krbfa68zyzrh5431xa63k2dykvg8c5j"; depends=[arules discretization Matrix R_utils]; };
   archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; };
-  archetypal = derive2 { name="archetypal"; version="1.1.0"; sha256="1x1642p2l19drp22mi1pci7v3s19j885pkx0s2kn7aawpjfis9nw"; depends=[doParallel geometry inflection lpSolve Matrix plot3D]; };
+  archeofrag = derive2 { name="archeofrag"; version="0.6.0"; sha256="09ph3yhwj9kddd4clpd1ykdhhd4zn19y6rj7zaz52c3swa3wwgg0"; depends=[igraph RBGL]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0.1"; sha256="0ibxsr173ib77gjhid91m85s8gjii4mi2w3d52q5301igv20p7r0"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="3.3"; sha256="01fmyp3f26v5rdgi00qyn139fgq55yxz5nhx223hg78qwrrbjvpw"; depends=[geometry gtools rgl sp TDA XML]; };
   archivist = derive2 { name="archivist"; version="2.3.4"; sha256="1i11hrcq1910jgd6diw6h3sxx624v57zjianm49pqvb2dvd0b8y7"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; };
   archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; };
-  arcos = derive2 { name="arcos"; version="1.1"; sha256="1zhpbydn3d2fyiy3vfvpm8cr6gvyja8mnzkwdcyjln1vr8kyz5j1"; depends=[dplyr jsonlite magrittr stringr urltools vroom]; };
+  arctools = derive2 { name="arctools"; version="1.0.0"; sha256="092nx4v24ib3m2yw9vr24p38227smvvss30dmf98qwi48pnfdr1k"; depends=[lubridate runstats]; };
   areal = derive2 { name="areal"; version="0.1.7"; sha256="1kdnf7c21g51mhf428nl5jl96cfrk5iw1npzp5rv5ys3jp2mvhhi"; depends=[dplyr glue purrr rlang sf]; };
   arealDB = derive2 { name="arealDB"; version="0.3.4"; sha256="1235j1w2gsv22k6a6zxanxvxx6fj1sifc5nkial883mpgvkbz789"; depends=[checkmate dplyr magrittr readr rlang sf stringr tabshiftr tibble tidyr tidyselect]; };
-  areaplot = derive2 { name="areaplot"; version="1.2-1"; sha256="1bmr092pgflgyss50xy1hs5xjl57i2wmfg7qa513sh120fi2mina"; depends=[]; };
+  areaplot = derive2 { name="areaplot"; version="1.2.2"; sha256="0vyhf3662ppcahaw2zrxgpcxcn8fysd6lhl8vgr7cs8kl6fm4x47"; depends=[]; };
   arena2r = derive2 { name="arena2r"; version="1.0.0"; sha256="14zjpglp389pldi436935fz6mgi4jdgfii1m035nsvihrms9gqkh"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinyBS shinydashboard shinyjs tidyr]; };
-  arenar = derive2 { name="arenar"; version="0.1.8"; sha256="12nyslzcbxr2j9dnc9fpw4fi7dcmbaaand7c9m7qcy9cqvms2dim"; depends=[auditor DALEX gistr iBreakDown ingredients jsonlite plumber]; };
+  arenar = derive2 { name="arenar"; version="0.2.0"; sha256="08b865v7ringqzm5m4ib4nrmlyqywir6bjj7alzmg06dy7mrl9s7"; depends=[auditor DALEX fairmodels gistr iBreakDown ingredients jsonlite plumber]; };
   arfima = derive2 { name="arfima"; version="1.7-0"; sha256="0kj8qv6m2fcdw8x735n8fk9cynm0jxi5v9hif0f879sxk6qkxb9y"; depends=[ltsa]; };
   argo = derive2 { name="argo"; version="2.0.2"; sha256="08ay5rrdra74x97ff4333w6lib92indjh774rsbn24mzc2n140ji"; depends=[boot glmnet Matrix XML xtable xts zoo]; };
   argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; };
   argonDash = derive2 { name="argonDash"; version="0.2.0"; sha256="1wykr7y5375g1nb18ynybccxmd948xrr0gdwxxqsfjf782vlgd2d"; depends=[argonR htmltools shiny]; };
   argonR = derive2 { name="argonR"; version="0.2.0"; sha256="15hlvansqnky9bnq4r7xza3hb1hzylmhz8117wxz9lxa1wiky2is"; depends=[htmltools rstudioapi]; };
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
-  argparse = derive2 { name="argparse"; version="2.0.1"; sha256="1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"; depends=[findpython jsonlite R6]; };
+  argparse = derive2 { name="argparse"; version="2.0.3"; sha256="1c2r417m1dxk1jhcggv3g4zax5a59k9rqs9jcs6xy2pa2333jqfj"; depends=[findpython jsonlite R6]; };
   argparser = derive2 { name="argparser"; version="0.6"; sha256="1pxiz9jlhlnpzqn1lz349r07i7glw708w202x6dlnxp112fg7k4x"; depends=[]; };
   ari = derive2 { name="ari"; version="0.3.5"; sha256="03w99c918jp23d0kl26vx4m7xjicpgwl5rhn9d0fsm4kvv7j87li"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; };
   ariExtra = derive2 { name="ariExtra"; version="0.2.11"; sha256="1gl2r0qksfisv7h27x83b665h7016c6rlff04mgj8iwp29144lch"; depends=[ari docxtractr httr jsonlite magrittr mime pdftools rmarkdown rvest text2speech tuneR xml2 yaml]; };
   aricode = derive2 { name="aricode"; version="1.0.0"; sha256="0i6vynhby4sjiaxscjrgrb5d96f307yjr8r9ff1fhv264lydcqwl"; depends=[Matrix Rcpp]; };
-  arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; };
+  arkdb = derive2 { name="arkdb"; version="0.0.8"; sha256="0028bkxjh1iaiqg1cwszwwz3kix59w4zbwhw01yjdz28giavzdzn"; depends=[DBI R_utils rappdirs]; };
   arkhe = derive2 { name="arkhe"; version="0.2.2"; sha256="0wfi6wgarjfkni4l1wy863i1cbqsckcw3ar357rkcwz3kks47f6p"; depends=[]; };
   arm = derive2 { name="arm"; version="1.11-2"; sha256="1grb27vayr2vhyalzfqbhx6p278r7c3l4pzi5nrz3dmnyqrbx1c3"; depends=[abind coda Hmisc lme4 MASS Matrix nlme]; };
   armada = derive2 { name="armada"; version="0.1.0"; sha256="191iwf5y1za3wssawkyi9jcingfqqxcvv88hglpw6j7y3x5f47hf"; depends=[anapuce circlize ClustOfVar ComplexHeatmap doParallel FAMT glmnet impute mvtnorm qvalue VSURF]; };
@@ -5325,9 +5532,9 @@ in with self; {
   aroma_core = derive2 { name="aroma.core"; version="3.2.1"; sha256="1nc88h7khjabgzyj4nvjkx9dzmic6bhhfskf024yq3rf1d55v09g"; depends=[BiocManager future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
   arpr = derive2 { name="arpr"; version="0.1.1"; sha256="0j69nbmhmhmyfna011gv68wvxv1x2lijz94pyg9g2ax720x74i2q"; depends=[magrittr]; };
   arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; };
-  arrangements = derive2 { name="arrangements"; version="1.1.8"; sha256="03dzvahy8mwp6w1smnbp83zk8w8pfkmsfd1f68bd8jjvdb5lrz71"; depends=[gmp R6]; };
+  arrangements = derive2 { name="arrangements"; version="1.1.9"; sha256="0nrlyxgn6667l2rb1q5rvps1anld9aq88qqr3ch2i6zchnqxrdg9"; depends=[gmp R6]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; };
-  arrow = derive2 { name="arrow"; version="1.0.0"; sha256="1j0n5sapgwim8qk4vrdy9gw4zrsd11a51c50pllk33xnd9p30v3k"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; };
+  arrow = derive2 { name="arrow"; version="2.0.0"; sha256="0n9g8j7bis7aga2icc8gd6mv7fnh2d5m7fy62fqs4z69l69y19r8"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; };
   ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; };
   arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; };
   arsenal = derive2 { name="arsenal"; version="3.5.0"; sha256="0avi434wkk3w7axd89a4jwsbb11fi0239mkkla6zasnjwbqgjim0"; depends=[knitr]; };
@@ -5339,9 +5546,9 @@ in with self; {
   arulesViz = derive2 { name="arulesViz"; version="1.3-3"; sha256="1c51l4hqai07qx20lbdvffxw9kx0vkgbccw7b9wz1h2n5ma90c8y"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; };
   asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
   asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; };
-  asbio = derive2 { name="asbio"; version="1.6-5"; sha256="0ivsn0ilj4f0mlc9cq5lw89xq6n2wxcp7xxr6cb04zfi4hjp4b0r"; depends=[combinat deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d tkrplot]; };
-  ascii = derive2 { name="ascii"; version="2.3"; sha256="0aqkmbp63vf5339r5yn2r5s6h4ghnh06s663j9h570z2jllbv9jk"; depends=[codetools digest survival]; };
-  asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.1"; sha256="031x6kvzpfh2falzg2qgch2czj74a4mskl8cn83y9rs0shswvmhx"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; };
+  asbio = derive2 { name="asbio"; version="1.6-7"; sha256="08lmb4dmbsavw17z1jqqiv2jin5ms4zq8nv1n1cjmh8xk3sywafw"; depends=[combinat deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
+  ascii = derive2 { name="ascii"; version="2.4"; sha256="0k675an7sl00bslx4yb6vvvgnp1kl244cfjljv632asqdm3rkmrv"; depends=[codetools digest survival]; };
+  asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.2"; sha256="13z1zh9xsf8229xiryms704w9klkj6ivxad2df3ns04ar7jy838z"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; };
   asciicast = derive2 { name="asciicast"; version="1.0.0"; sha256="0vga88cq2hzi0bwq43n1yz5cm8kaag9xpg8v73gj06fb93lhha9x"; depends=[curl jsonlite processx tibble uuid V8]; };
   asciichartr = derive2 { name="asciichartr"; version="0.1.0"; sha256="1b73bbysnxy3x3gwhm80xry45m18yh716wrc93v1awk3c1p2cv3m"; depends=[]; };
   asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; };
@@ -5352,11 +5559,12 @@ in with self; {
   asht = derive2 { name="asht"; version="0.9.6"; sha256="0zi0v7v7ivis5v6a8m1vh21c1wymshxcb948amgrq1j6svm505sf"; depends=[bpcp coin exact2x2 exactci perm ssanv]; };
   askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; };
   aslib = derive2 { name="aslib"; version="0.1.1"; sha256="0vzrxxj298skgv6gn9cbhr75ywmh5amsk9m02zncl20jcydf9j91"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; };
-  asnipe = derive2 { name="asnipe"; version="1.1.12"; sha256="01k2qr9vpazj4mhz4zpngav31d69qr73i8fc59x8gdbi3ipic7rs"; depends=[MASS Matrix]; };
+  asnipe = derive2 { name="asnipe"; version="1.1.13"; sha256="1y7nvbnwymmw8bmq1g431sbyf3lng8aaianc63nx731n4m9rwhm9"; depends=[MASS Matrix]; };
   aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
   aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; };
   aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; };
-  asremlPlus = derive2 { name="asremlPlus"; version="4.2-21"; sha256="1dcrh7fxw338h82pccl28hwv9cq0pcy9fs6b9snr4fxlgs146jnh"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; };
+  asremlPlus = derive2 { name="asremlPlus"; version="4.2-26"; sha256="1ayzf5yc07n0gf72xpclv1x5aw6062mlw3nxadywx6l7df08v3if"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; };
+  r_assert = derive2 { name="r_assert"; version="1.0.1"; sha256="0n5l48yb0djl6rdj50p1dslpw3c5kbi15yz6z6rdgic575gjwzdc"; depends=[]; };
   assertable = derive2 { name="assertable"; version="0.2.7"; sha256="1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"; depends=[data_table]; };
   assertive = derive2 { name="assertive"; version="0.3-6"; sha256="02palil82idqhhshcdjsfsja9qkqnd0dczqzj5gbccy4hfg1c0y4"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; };
   assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; };
@@ -5376,9 +5584,9 @@ in with self; {
   assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; };
   assertr = derive2 { name="assertr"; version="2.7"; sha256="1x868pd4dac1c7b1q5390wqh2f6s50km8nqcpim3nxcj2l4qkqdb"; depends=[dplyr MASS rlang]; };
   assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; };
-  assignPOP = derive2 { name="assignPOP"; version="1.2.0"; sha256="1qv600fbzpfi49sx72avcc0y9xnyppbhlchl32xgk3jcwyfk3pxp"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
+  assignPOP = derive2 { name="assignPOP"; version="1.2.2"; sha256="0ws40rrz3zql8xsa0r8hgb81l75isglzsfhnb8jbvig6s9m058yi"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
   assignR = derive2 { name="assignR"; version="1.2.1"; sha256="0xgqim8c5hi34dl76lrmj9nikqcn88wfcjs643a2dx06cmkkj1vi"; depends=[maptools raster rgdal sp]; };
-  assist = derive2 { name="assist"; version="3.1.6"; sha256="13r029z32f2xcspafx01jkgmabbjcvnp8wg1wx1liwxh3mf2zalg"; depends=[lattice nlme]; };
+  assist = derive2 { name="assist"; version="3.1.7"; sha256="0avxaa3v4gvb5d7fg761f9l5nr8nyqdq6sq408zpyaki6s6q3acf"; depends=[lattice nlme]; };
   assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; };
   assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; };
   aster = derive2 { name="aster"; version="1.0-3"; sha256="1bcghw30db8m39fqza2msi6ahfn6yx7gaa3fzcmnxb8jrvrlpjgy"; depends=[trust]; };
@@ -5387,15 +5595,17 @@ in with self; {
   astrochron = derive2 { name="astrochron"; version="0.9"; sha256="14bzyp2927rklx9lfd3bikf5ck8irvr3s7266mh2245lyy79g9xi"; depends=[doParallel fields foreach IDPmisc iterators multitaper]; };
   astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; };
   astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
-  astsa = derive2 { name="astsa"; version="1.10"; sha256="0j6106zn9jqmygfw34vjz123ag7l10s84br4z5rqjwwy219ak3b7"; depends=[]; };
+  astsa = derive2 { name="astsa"; version="1.12"; sha256="00m0hj9b8rvs0l66i5ahr2gyz2zcxwdwhdn9z2hjagmc2zhn9qq1"; depends=[]; };
   asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; };
   asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; };
   asymmetry = derive2 { name="asymmetry"; version="2.0.2"; sha256="0x5yzlf804mhwfr9244b04vnixiyh5d8vmqrfffgid3dijg2zszm"; depends=[gplots smacof]; };
   asymmetry_measures = derive2 { name="asymmetry.measures"; version="0.2"; sha256="039afqmdir200aijln9q0g3rkahkxqahw6yz5mnw62jsslr9xskb"; depends=[gamlss_dist skewt sn]; };
   asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; };
+  asymptor = derive2 { name="asymptor"; version="1.0"; sha256="0fdib7wnfdb0vjflds68638wafw79i0wvwa5ak8q3f7ywawzngzx"; depends=[]; };
   asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; };
-  ata = derive2 { name="ata"; version="1.1.0"; sha256="1v14r9g46pi7fjnf59dh8ljpdbsqxhrwr0zryxxza2y0qrxh0902"; depends=[lpSolve]; };
-  atable = derive2 { name="atable"; version="0.1.8"; sha256="1l4cfgpkjd33xxxmhbqiy901g1jl4bcs39dk6wvy02dihv6m1id6"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; };
+  ata = derive2 { name="ata"; version="1.1.1"; sha256="08wcnfkbcq2al5ivdjkrjr8alaz0026992ra3ihyw6sd74mcracx"; depends=[lpSolve]; };
+  atable = derive2 { name="atable"; version="0.1.10"; sha256="1jbpqsyhkkpiwnhwy9alh5s8q68amh0mylyzlc5pilpw0mnq9cjd"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; };
+  atakrig = derive2 { name="atakrig"; version="0.9.7"; sha256="1dhzd9cb2w7l8hjrgvvnp160g32gs885c5d9x43ylxypbjxvl96g"; depends=[doSNOW FNN foreach gstat MASS Rcpp rgeos snow sp]; };
   atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; };
   atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
   atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; };
@@ -5415,16 +5625,18 @@ in with self; {
   auditor = derive2 { name="auditor"; version="1.3.0"; sha256="1h6k15z3xf8isqqarbah6mz3nabjva4dbrbnf1fjw34idj804jbw"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; };
   augSIMEX = derive2 { name="augSIMEX"; version="3.7.4"; sha256="0620yxqi160ar91shl5macn890zpc60c9nqy4w8i6m7sskv6gl3z"; depends=[Formula MASS nleqslv Rcpp]; };
   augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.3"; sha256="10xp33901i9xczn5gg6pwbcdp4nqbnqhixj4cjhwj8rfn0kjkq7l"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; };
-  auk = derive2 { name="auk"; version="0.4.1"; sha256="0xrxl8qzmc0dnjn7s32wwrdv1z7v7a4wfpz4vrradfn84vxway30"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; };
+  auk = derive2 { name="auk"; version="0.4.3"; sha256="10dvajhxcxx9fdayqyhq5nkfqb1k17xm04gpgahwdhvxx2g74qq6"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; };
   aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
+  ausplotsR = derive2 { name="ausplotsR"; version="1.2.1"; sha256="1wblx9x7lnixdb94park2n3rq06hjdxn0cd843dg17814yfd6w8h"; depends=[betapart curl ggplot2 gtools httr jose jsonlite mapdata maps maptools plyr R_utils simba sp vegan]; };
   auth0 = derive2 { name="auth0"; version="0.2.1"; sha256="077nqh28q3b9jb25fy0157l06zpx3x0rg4z5dz2dqsh88xy4nhqj"; depends=[htmltools httr shiny shinyjs yaml]; };
   auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; };
   autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; };
-  autoFRK = derive2 { name="autoFRK"; version="1.3.0"; sha256="0mgnjlkrdj0rra98n58vp4ai3knmlla98lh6w5afm7gr0pwvi1px"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; };
+  autoCovariateSelection = derive2 { name="autoCovariateSelection"; version="1.0.0"; sha256="0s9ar7bmw0n84hvavp63zhm6769l9p88md0kqqcxl0mw67j8q930"; depends=[data_table dplyr purrr]; };
+  autoFRK = derive2 { name="autoFRK"; version="1.3.3"; sha256="0pll0s1xbf16a30g965lxajh806wbi8dl6xlyz01pzafwvs8yjph"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; };
   autoTS = derive2 { name="autoTS"; version="0.9.11"; sha256="1mwpazynp5hdc2ccnhvddkajfcd4qam23pvjl9accq1rnxzxkiyv"; depends=[dplyr forecast ggplot2 lubridate magrittr plotly prophet RcppRoll rlang shiny shinycssloaders tidyr]; };
   autocogs = derive2 { name="autocogs"; version="0.1.3"; sha256="1xv2sv5p5pskp7mw9zcgcbwsbfzjiabigld92npd3mzy8n7zdli6"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; };
   autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
-  autoimage = derive2 { name="autoimage"; version="2.1.12"; sha256="0qgnz66gm738clfchyz0xp8hd0w548c5r7sq1r6p64v8mvf34fhm"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; };
+  autoimage = derive2 { name="autoimage"; version="2.2.1"; sha256="0y60smwfhwaf305cj7k2p9959xg8m4h6yrxgxl581dzp7crykbxl"; depends=[colorspace fields ggplot2 mapproj maps MBA]; };
   autokeras = derive2 { name="autokeras"; version="1.0.1"; sha256="171q7i1zygzmkm34bi7grx5rvnjwks60ifk4k86kki5aiipzx4d5"; depends=[keras reticulate]; };
   automagic = derive2 { name="automagic"; version="0.5.1"; sha256="1mmm6kj6mxrn3s4v8ryszkxr9z7bh9cvhin7xjq111fkwly7wjkq"; depends=[dplyr formatR knitr magrittr purrr remotes yaml]; };
   automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
@@ -5433,14 +5645,15 @@ in with self; {
   autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; };
   autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; };
   autota = derive2 { name="autota"; version="0.1.3"; sha256="07n34v4lpql5n0y94pm07ywl2z9azjgjrpw7qyfxa6qw6gv71gid"; depends=[base64enc glue httpuv magrittr memoise purrr RJSONIO rlang rlist rstudioapi stringdist stringr xml2]; };
-  autothresholdr = derive2 { name="autothresholdr"; version="1.3.6"; sha256="16yzwq6vy78d7zp88j466086493a06v1hf4dn7xvd20igi3lw22r"; depends=[checkmate filesstrings ijtiff magrittr purrr Rcpp rlang stringr]; };
-  av = derive2 { name="av"; version="0.5.0"; sha256="0v99y47dsa2z3c4qawipdrzynla2aab3x0c8qzdi5w9r5y9a38sh"; depends=[]; };
+  autothresholdr = derive2 { name="autothresholdr"; version="1.3.9"; sha256="0lncasld1pbzkj5sk77qh75y1zjz71g9qvw8y4hf39zqf2prnp72"; depends=[checkmate ijtiff magrittr purrr Rcpp rlang strex stringr]; };
+  av = derive2 { name="av"; version="0.5.1"; sha256="19ac9s8d0ah9ialbqv01lq3dma7lxv8s4alyj6iakjjb8z9l7g29"; depends=[]; };
   available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; };
   avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
+  avocado = derive2 { name="avocado"; version="0.1.0"; sha256="0qy9ripwydm3f70rpxwk0asc7r25hg8jcbrr4rz8bxs93q1lsz8x"; depends=[]; };
   aweek = derive2 { name="aweek"; version="1.0.1"; sha256="0z2n003qg1565kanacw82i5bj33hjgbkp0glj20blwxgc3c7q25y"; depends=[]; };
-  aws = derive2 { name="aws"; version="2.4-3"; sha256="0ccm8ffjf8bylhfr64j9wzi49hzigz4bs172pvkb0bi4d5vdr0l5"; depends=[awsMethods gsl]; };
-  aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; depends=[aws_signature dplyr httr xml2]; };
+  aws = derive2 { name="aws"; version="2.5"; sha256="1mwg1q7l4a07g5aa9c6kh3fpl9lakk01pbzlk7ixbpy12yfvj9nm"; depends=[awsMethods gsl]; };
+  aws_alexa = derive2 { name="aws.alexa"; version="0.1.8"; sha256="0m1i1xgi9fqixq90ai2ag0079aa75nlyhbr3ln3yhk5g8zx9i9m9"; depends=[aws_signature dplyr httr xml2]; };
   aws_comprehend = derive2 { name="aws.comprehend"; version="0.2.1"; sha256="0qn4mkdd17c8kmrm4ml7l1x3rzaw3gbykhrj3m0ga53crcqdhqri"; depends=[aws_signature httr jsonlite]; };
   aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; };
   aws_iam = derive2 { name="aws.iam"; version="0.1.8"; sha256="1p4w50icfw6mrzr6aazdbh977yvyvsf1yavjscyvv11xf3y9f9j2"; depends=[aws_signature httr jsonlite xml2]; };
@@ -5452,11 +5665,11 @@ in with self; {
   aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.3"; sha256="1nni1b935i2ir67lfhcj0106vzr310mk2jvln32gvzbnqxcggz7m"; depends=[aws_signature httr jsonlite]; };
   aws_translate = derive2 { name="aws.translate"; version="0.1.4"; sha256="1x6cvpfddgwywsji4ywygmqn3pwy3i1aci9lk4nsrrfkzggwcbpb"; depends=[aws_signature httr jsonlite]; };
   awsMethods = derive2 { name="awsMethods"; version="1.1-1"; sha256="0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"; depends=[]; };
-  awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; };
-  aziztest = derive2 { name="aziztest"; version="0.1.0"; sha256="0ida4n8dxliq3i1mhjknr5zn0vglfdp4mcg1frz423vds0grzdcn"; depends=[]; };
-  azuremlsdk = derive2 { name="azuremlsdk"; version="0.6.85"; sha256="16w4gispm3sk48zaw1mi0qxg3qgkpy995p6rak7liqkndqfpzh7s"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; };
+  aziztest = derive2 { name="aziztest"; version="0.2.1"; sha256="0rpnyrb7zi42l1fc8ni0r5d0y6a4dr56917z8i54mv1jrk4hijjd"; depends=[]; };
+  azuremlsdk = derive2 { name="azuremlsdk"; version="1.10.0"; sha256="0s64kjrmcdnjdwh5mdm5vxgvrl9ghvfv6bair7qfzz32jlab99m0"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; };
   b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
   bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
+  bRacatus = derive2 { name="bRacatus"; version="1.0.1"; sha256="0miw6bsylfnbsmvjgscl4xzjbwsz43pgq38gaz54nb4vlrcxn9a1"; depends=[data_table geojsonio jsonlite maptools plotfunctions raster rgbif rgeos rworldmap sp]; };
   bReeze = derive2 { name="bReeze"; version="0.4-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; };
   bSims = derive2 { name="bSims"; version="0.2-1"; sha256="024k9s42a9w5pmw024b15sj5ilcfpkm7lv59yimjicr9lmw246kb"; depends=[deldir intrval MASS mefa4 pbapply]; };
   bWGR = derive2 { name="bWGR"; version="1.6.6"; sha256="1m5spafvl5pn0s60vaf8wz7iaibsa7laq7kp8y9xj20pp3f76hvr"; depends=[Rcpp]; };
@@ -5465,22 +5678,23 @@ in with self; {
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
   babelwhale = derive2 { name="babelwhale"; version="1.0.1"; sha256="0mgkg9hji4mab3l33vvyyyc1d2q84l1zrmg63vr3b3gr0d62jcnl"; depends=[crayon dplyr dynutils processx purrr]; };
-  babette = derive2 { name="babette"; version="2.1.4"; sha256="03bbd8qlymg6qfz60yprb8xyqix6ag532a9iv043s72ir9nkf1jp"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; };
+  babette = derive2 { name="babette"; version="2.2"; sha256="0gbbx2awdml3z3wsgj7zsbqnfbvng5lmba5cl358xkz5q621cy9d"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; };
+  babsim_hospital = derive2 { name="babsim.hospital"; version="11.5.14"; sha256="0w86psi062gk2i512dpj2a8fd6cfzixmrqvh5il5cbqii23bkahr"; depends=[data_table dplyr ggplot2 golem igraph lubridate markovchain padr reshape2 rvest scales simmer slider SPOT xml2]; };
   babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; };
   bacistool = derive2 { name="bacistool"; version="1.0.0"; sha256="1hby2bmxbc8qgjzgkp2flv89lpzzvg3vr7s98989ayjmv4vgmqaf"; depends=[rjags]; };
   backShift = derive2 { name="backShift"; version="0.1.4.3"; sha256="1dhmq51w07vcqlngsb04ip0wqbgqq2xdfdm1w82r082f07ywqb16"; depends=[clue ggplot2 igraph MASS matrixcalc reshape2]; };
-  backbone = derive2 { name="backbone"; version="1.2.1"; sha256="1ax6agxiwsckga2hasg0dmyx1fxkr6c4f1xcx9s9b3sljpap7ga7"; depends=[CVXR igraph Matrix network Rcpp]; };
+  backbone = derive2 { name="backbone"; version="1.2.2"; sha256="0h6da62ryjzfvfg1n89fj25400v8j012py9shhprss085j923bl4"; depends=[CVXR igraph Matrix network Rcpp]; };
   backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; };
-  backports = derive2 { name="backports"; version="1.1.8"; sha256="1irc9c23hwliwkky1b3hi0dkzwalhb7zgjj08562ff1k8dqv4qf6"; depends=[]; };
+  backports = derive2 { name="backports"; version="1.2.1"; sha256="1mf2nz78l97lbxyagv55bcxrny51ds8g28h307cfa1g3ayylp0x2"; depends=[]; };
   backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; };
   bacondecomp = derive2 { name="bacondecomp"; version="0.1.1"; sha256="1sd6pbhmx8vxz5c2cvvadbjy7p15y91gzs3n0ish7h5br1vq8fpm"; depends=[]; };
   bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; };
   badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; };
-  badger = derive2 { name="badger"; version="0.0.8"; sha256="1kcyx8792al9cia2b3cvvv9gh5mpgb3s7w73dvbmjwhrlnif6qv0"; depends=[desc dlstats rvcheck]; };
+  badger = derive2 { name="badger"; version="0.0.9"; sha256="0414ynf26apxwgzcwk104dj52j9dbwm475n3s20k4cx471h18xbd"; depends=[desc dlstats rvcheck]; };
   baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; };
   baggr = derive2 { name="baggr"; version="0.4.0"; sha256="1cbajifb4gavamj46zs9vk6ihhg6wnv2hn75452bdc2mc4ingn5n"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; };
-  baguette = derive2 { name="baguette"; version="0.0.1"; sha256="1n8fjac9jha3g48w1iddqrh54gd4lzv1bs3f747y6jasp99y3vg7"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; };
-  bahc = derive2 { name="bahc"; version="0.2.0"; sha256="0n57zcm257c01cdyhsy5si36h3yz9b8nwixx46r27f0xzrzdryl2"; depends=[fastcluster matrixStats]; };
+  baguette = derive2 { name="baguette"; version="0.1.0"; sha256="0yjy0ba3a1r39b7l5igjyzf6v5gfyb4ll6mvd7wskzvnr0gyaq9n"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; };
+  bahc = derive2 { name="bahc"; version="0.3.0"; sha256="0yz0v33fhm38ivhr7bvajk9v7wdmhg9qg7ac8r2qr00rns82m6y3"; depends=[fastcluster matrixStats]; };
   bain = derive2 { name="bain"; version="0.2.4"; sha256="15car9j11s0ywss13g5swf1dxjjc91xmbkvx200mivca9bj6245m"; depends=[lavaan]; };
   baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; };
   balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; };
@@ -5498,10 +5712,10 @@ in with self; {
   bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
   barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
   barplot3d = derive2 { name="barplot3d"; version="1.0.1"; sha256="182kpiknv3id1bsgcc6b3ahbxmm8x3lxcpf1r6rckpr3s0whfx3g"; depends=[rgl]; };
-  barsurf = derive2 { name="barsurf"; version="0.5.0"; sha256="1pfy4l3cg1dzn17rxgh2lhdfm34wzd2wvhbvc7n46gqplghrpa7h"; depends=[colorspace kubik]; };
+  barsurf = derive2 { name="barsurf"; version="0.6.1"; sha256="1qhmzhj4c1qbgafhq6j4rrmc51bh1ymm42vsl2wxwklyfs7qwl66"; depends=[colorspace kubik]; };
   bartBMA = derive2 { name="bartBMA"; version="1.0"; sha256="15syk5a3lgzfyp17wk8mk14317yxsr47br26kyah5jg3dq4cyqdg"; depends=[BH mvnfast Rcpp RcppArmadillo Rdpack]; };
   bartCause = derive2 { name="bartCause"; version="1.0-4"; sha256="1a1g4376l31pswxmmipm0xm3zazm1kfm3iwknjx6pchjavjhin9y"; depends=[dbarts]; };
-  bartMachine = derive2 { name="bartMachine"; version="1.2.5.1"; sha256="17bxpynwyaa1j5a1smn1k4yb6ygr3fi6xlqdvh05z7q36432013j"; depends=[bartMachineJARs missForest randomForest rJava]; };
+  bartMachine = derive2 { name="bartMachine"; version="1.2.6"; sha256="0zw42ffgyx08skl00a428f7gylby2rm8i0jpv6b1md557l1w06jy"; depends=[bartMachineJARs missForest randomForest rJava]; };
   bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; };
   basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; };
   base_rms = derive2 { name="base.rms"; version="1.0"; sha256="0lsbbcvmq5n3dpqic9qkyr8wdbmagaw32qfdnl0ck5b6ijh2wz0a"; depends=[do rms survival]; };
@@ -5510,13 +5724,13 @@ in with self; {
   base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
   base64url = derive2 { name="base64url"; version="1.4"; sha256="0n1c2b68vza1dh7sk38v6biiwm72c4jpl79kpdg1bsb0hq9qy18x"; depends=[backports]; };
   baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; };
-  baseflow = derive2 { name="baseflow"; version="0.12.0"; sha256="0zz7clrqifxk0igvqr38ic8sif86nli8gp8np8nfx89md2zz1njk"; depends=[airGR]; };
+  baseflow = derive2 { name="baseflow"; version="0.12.1"; sha256="17ggwgkz36cq6pp88vfa24gfrwsvgmv5vizp5mqaqrssqji0vsgy"; depends=[airGR]; };
   basefun = derive2 { name="basefun"; version="1.0-7"; sha256="1g72g77yzf6ji4aglm4hpaqbz5ma2d6y93g7r17066iwyzl0ygn3"; depends=[Matrix orthopolynom polynom variables]; };
-  baseline = derive2 { name="baseline"; version="1.3-0"; sha256="1qdzdcz2417slrp7qw8dh76lyvk266jzdqhff05bdalwnk8dxxbc"; depends=[limSolve SparseM]; };
+  baseline = derive2 { name="baseline"; version="1.3-1"; sha256="1spmp8z0hrb6db0r52i16524cp9zy1d1hr4y3b3i9q38m1iskpms"; depends=[limSolve SparseM]; };
   basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; };
-  basf = derive2 { name="basf"; version="0.1.0"; sha256="0v4hhgg8qq4hdih22i3akrjpc4xjnwi81968nyfcv00gy8fd5gjv"; depends=[sf tibble]; };
-  basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.5"; sha256="0sdvhm7n9n67gwymv7whk6f6lfgp74gczisqw90096la566ndd2f"; depends=[]; };
-  basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; };
+  basf = derive2 { name="basf"; version="0.2.0"; sha256="0l3y5p51jic3b8h1jclhhma4myll1g3vsxr8rj0dx1bvjfimkryw"; depends=[raster sf tibble]; };
+  basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.6"; sha256="057w8xzr0d3jvphhsq55ph9ck5hf4kiihfj57xbbyqx8biyfrjhc"; depends=[]; };
+  basicTrendline = derive2 { name="basicTrendline"; version="2.0.5"; sha256="0402nvm3i32sx3m3c7r74iaj22h570v819yiwkraicjpmg55dghi"; depends=[investr scales]; };
   basicspace = derive2 { name="basicspace"; version="0.24"; sha256="1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h"; depends=[]; };
   basictabler = derive2 { name="basictabler"; version="0.3.1"; sha256="1yrrg0mgxfqrn068ggx7b5xqj8wccigb5x6aya2hw3b035cbfprs"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; };
   basket = derive2 { name="basket"; version="0.10.2"; sha256="0d3qp1p11w9warl4cd9icnygqyiarm6vzsnph2hl09lmsqbghahl"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer tibble tidygraph tidyr]; };
@@ -5526,15 +5740,16 @@ in with self; {
   batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; };
   batchmeans = derive2 { name="batchmeans"; version="1.0-4"; sha256="0b2npqxrv08zxj59sahj5s87inhl6dyl10bj01v0l1yr14q5g546"; depends=[]; };
   batchscr = derive2 { name="batchscr"; version="0.1.0"; sha256="094l2cq7lcdrlsdmsxmbal7srxdg20rxbms46h1sd414wq26d413"; depends=[]; };
-  batchtools = derive2 { name="batchtools"; version="0.9.13"; sha256="02bwfinwgn5nl638997javig61jmr0ci0qybmprz13jnvmam1yns"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; };
+  batchtools = derive2 { name="batchtools"; version="0.9.14"; sha256="1b78r70gm4a0wzjr367hqx2rfphfkbppp14d0l5zs2fvyz166lsx"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; };
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
   baycn = derive2 { name="baycn"; version="1.2.0"; sha256="1ykz1brs3mz94n86d5qaq25vf24j5adyzpddxqmn7qklbxxr6fh5"; depends=[egg ggplot2 gtools igraph MASS]; };
   bayefdr = derive2 { name="bayefdr"; version="0.1.0"; sha256="1c40jvdhbc23yvqiidjgs2f0p3mp3zw9wq0ap1d91if99p6him7n"; depends=[assertthat ggplot2 reshape2]; };
-  bayes4psy = derive2 { name="bayes4psy"; version="1.2.3"; sha256="0f8rlivqc36x15c16dybpqgankhc73gcn206yhnr7nyb896nfnl0"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; };
+  bayes4psy = derive2 { name="bayes4psy"; version="1.2.5"; sha256="0lvbp41icr0njyfk87vw2ald8zpmp0gvjabpwaiq2h1km1527yic"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools scales StanHeaders]; };
   bayesAB = derive2 { name="bayesAB"; version="1.1.2"; sha256="0xg29s3h4dy43snlc365q80ix96hwh4mfy1qvv87yys3i9zfinm5"; depends=[ggplot2 Rcpp rlang]; };
   bayesCT = derive2 { name="bayesCT"; version="0.99.3"; sha256="0ragig1x34syhsnbnd58l2s7g23j7fb0cl9wkasvxq8cicw5hqgn"; depends=[bayesDP dplyr magrittr purrr survival]; };
   bayesDP = derive2 { name="bayesDP"; version="1.3.3"; sha256="0g2kw8rsa9s5ahvsr4j363nqs4s49pmbaxgsqrlg8nizjsmj8p49"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; };
+  bayesGAM = derive2 { name="bayesGAM"; version="0.0.1"; sha256="072q3kybnxjwc4s6qlww492cg43cr4zk6midyp5av7y3hnxbmqm8"; depends=[bayesplot BH boot cluster corrplot geometry ggplot2 gridExtra loo MASS mlbench Rcpp RcppEigen RcppParallel rstan rstantools SemiPar StanHeaders]; };
   bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.5"; sha256="01lmpi659cisr7rixz8khaxzyvkvdkvcxjj37x3lw7dpf4ir2535"; depends=[coda mvtnorm]; };
   bayesImageS = derive2 { name="bayesImageS"; version="0.6-0"; sha256="1m0az3z8hwaxpqd1ljly9vlp41dp7c7p39r0rx7k9vcs201vlcg8"; depends=[Rcpp RcppArmadillo]; };
   bayesLife = derive2 { name="bayesLife"; version="4.1-0"; sha256="1sswnwv4x77sd07d3hpsf3wfd5szrdnc4fni8glzl8rk3y0r3jns"; depends=[bayesTFR car coda data_table hett wpp2019]; };
@@ -5547,64 +5762,66 @@ in with self; {
   bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; };
   bayesboot = derive2 { name="bayesboot"; version="0.2.2"; sha256="0976ryd0gbw3kpmxg2qxyp1m2swnrpa86vdhvqrqxp7fcrs8cs2z"; depends=[HDInterval plyr]; };
   bayesbr = derive2 { name="bayesbr"; version="0.0.0.1"; sha256="0f2sy2m417fzznlp2k2ag2xj6jdn027gibsi0cxhlk189pxxfxri"; depends=[BH coda dplyr fdrtool Formula ggplot2 loo magrittr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr tidyr]; };
-  bayescopulareg = derive2 { name="bayescopulareg"; version="0.1.2"; sha256="15arqmjy99rqaywna643l6grl3zlkvygz2hkmhlrjpr35mqd0kw1"; depends=[Rcpp RcppArmadillo RcppDist]; };
+  bayescopulareg = derive2 { name="bayescopulareg"; version="0.1.3"; sha256="0jzj1iwd8g1kpypg6dl3anhay7kjvznfkyzri3sdf538s6vr88m5"; depends=[mvtnorm Rcpp RcppArmadillo RcppDist]; };
   bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
-  bayesdfa = derive2 { name="bayesdfa"; version="0.1.3"; sha256="1jgk1m49aksc2l04qf6k1vddaj6byxbf5vk259i0wcyb76zw785y"; depends=[BH dplyr ggplot2 loo Rcpp RcppEigen reshape2 rlang rstan rstantools StanHeaders]; };
+  bayesdfa = derive2 { name="bayesdfa"; version="0.1.6"; sha256="1syghmscp3fyak8kcvdvhsp3c6qp8yd044ycrmglmy4whny2iwl7"; depends=[BH dplyr ggplot2 loo Rcpp RcppEigen reshape2 rlang rstan rstantools StanHeaders]; };
   bayesdistreg = derive2 { name="bayesdistreg"; version="0.1.0"; sha256="04slvxzbqdi2ak3dlw4lfx55rhw28js8yjmvjpy8vvgq39vcx3dq"; depends=[MASS sandwich]; };
   bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; };
   bayeslincom = derive2 { name="bayeslincom"; version="1.0.0"; sha256="16wy946c05hq6bfn3h364s597wipzwxvdbpq8j2ja0rcsq5x9vw3"; depends=[ggplot2 lifecycle]; };
-  bayeslm = derive2 { name="bayeslm"; version="0.8.0"; sha256="1gvqkbz1wmqkxjwkdgj5pir5j1qy5dzjm4jv6mz3mplm16z5vzbl"; depends=[coda Rcpp RcppArmadillo RcppParallel]; };
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
   bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
   bayesm = derive2 { name="bayesm"; version="3.1-4"; sha256="154glks7rsjkza0sfi1kj7wj727py9sl1ba6sswflwmwc9n226q6"; depends=[Rcpp RcppArmadillo]; };
-  bayesmeta = derive2 { name="bayesmeta"; version="2.5"; sha256="1dvprpmrqnwxhsxb4h972rx7mww6r6w7y5mjw7wm4p1pddzdhqyc"; depends=[forestplot metafor]; };
+  bayesmeta = derive2 { name="bayesmeta"; version="2.6"; sha256="1wg736y4ccicradwaglx3x9bqkbq6v4qrza6zmqdm3f8f8css9j1"; depends=[forestplot metafor numDeriv]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
+  bayesmove = derive2 { name="bayesmove"; version="0.1.0"; sha256="1ldccziayhf8hd9kjbrg7xr50b7cqay4annbym3x5180h7zkh7qc"; depends=[dplyr furrr future ggplot2 lubridate magrittr MCMCpack progress purrr Rcpp RcppArmadillo rlang tictoc tidyr]; };
   bayesplot = derive2 { name="bayesplot"; version="1.7.2"; sha256="0aqy4bfjq1fmds0vpacsmqih528cp8wk4v4w0balzkph6zqzpwcl"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
   bayest = derive2 { name="bayest"; version="1.4"; sha256="1ax1z5aw0irpr5qmfscvbssrz58ablx0nkl0d9fx51f2g1cwm65n"; depends=[MCMCpack]; };
-  bayestestR = derive2 { name="bayestestR"; version="0.7.2"; sha256="1c82bpxg2ha93rna4sy9pdp422dnk6b378dcg8x04clfg0y0lsi2"; depends=[insight]; };
+  bayestestR = derive2 { name="bayestestR"; version="0.8.0"; sha256="11mxnpqc85y13wf8mnnrh0k8d3jqdsr99hkv4cgvwav38qpvjhhw"; depends=[insight]; };
   bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; };
   bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; };
   baymedr = derive2 { name="baymedr"; version="0.1.0"; sha256="0y01s6dpnhnxqqvl15cdxmb5ysb685bbp47xifyp5nz8sjh2pci0"; depends=[rlang stringr]; };
   baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; };
-  baytrends = derive2 { name="baytrends"; version="1.2.1"; sha256="05vd748wp72dnlc5p1higwlvxpyk2pq2xhcl2i58fy3pky2bxsg5"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; };
+  baytrends = derive2 { name="baytrends"; version="2.0.2"; sha256="07dkc9v5w6f4g5md1qgrsk2sy8sn6aaq9m1bm9810gswks6mlflq"; depends=[dataRetrieval digest lubridate memoise mgcv plyr survival XML]; };
   bazar = derive2 { name="bazar"; version="1.0.11"; sha256="1q2w5pvlb51lzbb5k719sf1lrhffandkfqlcvi2prw4dmq7qjxv9"; depends=[kimisc]; };
   bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
   bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
   bbl = derive2 { name="bbl"; version="0.3.1"; sha256="1a6f5744xwn28qkqxlc5q7crarlx0jjg4z7wpp7jwr6ar152apvm"; depends=[pROC RColorBrewer Rcpp]; };
   bbmle = derive2 { name="bbmle"; version="1.0.23.1"; sha256="0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; };
   bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
-  bbotk = derive2 { name="bbotk"; version="0.2.0"; sha256="1yrcbpynqh3hfj6zf2czfb12spid9gwfq6anzmvbpj7jg5a394ri"; depends=[checkmate data_table lgr mlr3misc paradox R6]; };
-  bbreg = derive2 { name="bbreg"; version="1.0.0"; sha256="1v2m7ky9kd16psm9w8njfjzkwc4prvyq0fgbl6i210pjwwv9zvhr"; depends=[betareg expint Formula statmod]; };
+  bbotk = derive2 { name="bbotk"; version="0.2.2"; sha256="06iz6gyymcxkbjiw049v1dk3vjfni646z247q08i2s0x59sqfqxv"; depends=[checkmate data_table lgr mlr3misc paradox R6]; };
+  bbreg = derive2 { name="bbreg"; version="2.0.1"; sha256="0wixhqfw8yp37874zwqb4vwi9xrzlkb761lbw7h70bds0dy6jcg5"; depends=[expint Formula pbapply statmod]; };
   bbricks = derive2 { name="bbricks"; version="0.1.4"; sha256="1hv4hvnns9vgl6c3n7kg3g9mfcp26ksps29hdl5nwi28cgkx80w2"; depends=[]; };
-  bbsBayes = derive2 { name="bbsBayes"; version="2.3.3.2020"; sha256="1zxr93n17svv7ca09gkn7w3j1i1llwilx3nvfsaq57p7qh47mjah"; depends=[dplyr geofacet ggplot2 ggrepel jagsUI latticeExtra progress rappdirs rgdal sbtools sf stringr]; };
+  bbsBayes = derive2 { name="bbsBayes"; version="2.3.5.2020"; sha256="02fnj9935i611znj50d4cyilzh69kwqfynhh0irwkvnsc1v1470w"; depends=[dplyr geofacet ggplot2 ggrepel jagsUI latticeExtra progress rappdirs rgdal sbtools sf stringr]; };
   bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; };
   bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; };
   bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-4"; sha256="0bhwwr9pa78a8lhjz2cfbm09jq585p89l6dr2ihpil4q5r8cmsjr"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
   bcTSNE = derive2 { name="bcTSNE"; version="0.10.0"; sha256="1109kgrrpizhg7j1wbkk6f84hsw89xk2l6vwxpjpg6rh50z3bfi6"; depends=[RSpectra Rtsne]; };
   bcaboot = derive2 { name="bcaboot"; version="0.2-1"; sha256="0wf1igkb0lidz4pvh3kfccs9858m1g9650wprrvrpwsdfrcd7rc9"; depends=[]; };
   bcc = derive2 { name="bcc"; version="1.3.1"; sha256="0ac0wasdifd0v47r9sxrsix5hv7masiphn6dyxpqdrd11z7iimgz"; depends=[qcc]; };
-  bcdata = derive2 { name="bcdata"; version="0.2.0"; sha256="11sgc0k05pjp3ip923mrwzjr86hnikqdkbma6vj7bymxhh9il5bz"; depends=[cli crul dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tibble tidyselect xml2]; };
+  bccp = derive2 { name="bccp"; version="0.1.0"; sha256="142aszl8cvikb9ni0n7jc7bi1nfc5rf67vy1a6ind3g3iz931bgb"; depends=[pracma]; };
+  bcdata = derive2 { name="bcdata"; version="0.2.1"; sha256="0k0vrh02chkziyq6pvn745n1ncnzxklzsxq1dmy4221zvg8khjsg"; depends=[cli crul DBI dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tibble tidyselect xml2]; };
   bcf = derive2 { name="bcf"; version="1.3"; sha256="1f8szjgsyhnff3zzmmy7bnsam12ywj46n3fxsj1y3fn1m5wnd8mz"; depends=[Rcpp RcppArmadillo]; };
   bcfrailph = derive2 { name="bcfrailph"; version="0.1.0"; sha256="0l5v3bc8xw71cj012sbmq1f0glg7m545jzqyg01gzl8kbgm3lbbj"; depends=[survival]; };
+  bcfrailphdv = derive2 { name="bcfrailphdv"; version="0.1.0"; sha256="06xzz5m4s5fp36j3saxmpw1p0bhh42cjd35cadwkk3vg836kj1na"; depends=[bcfrailph survival]; };
   bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; };
   bcmaps = derive2 { name="bcmaps"; version="0.18.1"; sha256="11gj4f0qqgcvyri8zsnfzk02y9xyiwkfy18wahrg4zrpb4ai78zp"; depends=[httr rappdirs sf]; };
   bcmixed = derive2 { name="bcmixed"; version="0.1.4"; sha256="0am6amk1axfxkxgp9nmfys4fp4snplfncwkzh02im7a6zr3v1m63"; depends=[MASS nlme]; };
   bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; };
   bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
   bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
+  bcr = derive2 { name="bcr"; version="0.1.1"; sha256="0ahd1y73sn45ygvklq22790kf2x8ciw672qrpjnq9mai4ica8y1c"; depends=[httr jsonlite]; };
   bcrm = derive2 { name="bcrm"; version="0.5.4"; sha256="1j8bfa3x7h77vs41k4nqbqlb961szp1fkhc181wzb3zpbnzmjhhy"; depends=[ggplot2 knitr mvtnorm rlang]; };
   bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; };
-  bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
+  bcv = derive2 { name="bcv"; version="1.0.1.1"; sha256="18knmzri856kkwcc224b33vz9526r3y6j3ii4wj3qwc6f3c52s05"; depends=[]; };
   bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; };
-  bda = derive2 { name="bda"; version="15.0.2"; sha256="1by3xhx1z44fp1kqx380f6hysfq2w7y9ajpsz0wygiwlricn9gd9"; depends=[]; };
+  bda = derive2 { name="bda"; version="15.1.7"; sha256="0di21yahkyj6hrjpij3pr2545lgzzdkk6byxmahxc6pcp6l9y2yl"; depends=[]; };
   bdchecks = derive2 { name="bdchecks"; version="0.1.7"; sha256="1pzsvn1m1f9bdmhxmh57pvn9jm4z41rkvv6h60hq2lfgkapnjy7q"; depends=[bdDwC data_table DT finch knitr rgbif shiny shinyBS shinydashboard shinyjs spocc yaml]; };
   bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; };
   bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
-  bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; };
-  bdpar = derive2 { name="bdpar"; version="2.0.0"; sha256="0vn53pzr8j3jdl03jzcyjgf0n486l472jm3mm92df3219733l2wi"; depends=[magrittr pipeR purrr R6 rlist]; };
+  bdpar = derive2 { name="bdpar"; version="3.0.0"; sha256="128s13nrr0djcwxj55y5xdfrzq5gbq9czmvgmdbfjzpshjhndi0k"; depends=[digest R6 rlist]; };
   bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; };
   bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; depends=[]; };
   bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; };
@@ -5620,18 +5837,19 @@ in with self; {
   beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
   beanz = derive2 { name="beanz"; version="2.4"; sha256="18i4ygz83l60fdfkl4yg9kp5n2vmqn6yd7qkpkiplq0mzg5s4nk9"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
   beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; };
-  beastier = derive2 { name="beastier"; version="2.1.3"; sha256="1c7n4piai36dll4bpy5q0cv1x8qwqyaz8x9gg2m9rzwk9ask3aby"; depends=[ape assertive beautier phangorn pryr rappdirs remotes rJava stringr xml2]; };
+  beastier = derive2 { name="beastier"; version="2.2.1"; sha256="004lvqiaggpvvypqgjklydv7cfxbf4wgv9sldlxgg01pszp4c8dg"; depends=[ape assertive beautier phangorn pryr rappdirs remotes rJava stringr xml2]; };
   beats = derive2 { name="beats"; version="0.1.1"; sha256="1vg8h2lyn61lii346pf3b5vwxf5cfswmi4b5mmimvgx1ix2i6sxb"; depends=[dplyr ggplot2 lubridate purrr readr shiny zoo]; };
-  beautier = derive2 { name="beautier"; version="2.3.7"; sha256="0fy77fqbz33rykn04130gam66hv9kbr8jw5ir4269g0cm09miv61"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; };
+  beautier = derive2 { name="beautier"; version="2.4"; sha256="0wd9k1faw604mbgsp6bkp85cqd0plprcc35wxwrqp6zi78p2qga8"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; };
   bedr = derive2 { name="bedr"; version="1.0.7"; sha256="0zpqvyjgwyqawxm8qrhcv8zq2b3yxgcqkkc87br29yrl7sjb8h6j"; depends=[data_table R_utils testthat VennDiagram yaml]; };
   beepr = derive2 { name="beepr"; version="1.3"; sha256="061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp"; depends=[audio stringr]; };
   beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
   beezdemand = derive2 { name="beezdemand"; version="0.1.0"; sha256="1i6p36cfvz87k6llpibklmdbjb7vp1v38ijxaqkmv1jzc28sj3cl"; depends=[ggplot2 nlmrt nls2 nlstools reshape2]; };
+  befproj = derive2 { name="befproj"; version="0.1.1"; sha256="194kicmfxamy061zx0ljmvrlh8gm56fcmhj1j2qfrihklpab4xhx"; depends=[dplyr]; };
   beginr = derive2 { name="beginr"; version="0.1.7"; sha256="1a1lzjmq0qimm8yrb4n6knh23gyqxgax60n95rih95sg34904d0m"; depends=[cranlogs]; };
-  behaviorchange = derive2 { name="behaviorchange"; version="0.2.2"; sha256="1xqvlybfmgpr0dg0ys6yjshlghgph6zg81d3bbx8cpbxdysm8lkl"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr png ufs viridis yum]; };
+  behaviorchange = derive2 { name="behaviorchange"; version="0.2.4"; sha256="197x6nhfvm6ac4ik3lhwyj0wp4ww9gy3xc13j988fr0rfnb293cb"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr png ufs viridis yum]; };
   behavr = derive2 { name="behavr"; version="0.3.2"; sha256="01ny099m2zmvlalwiq3nqkgynnxn1mdspch15lkawwd40q8s9s4p"; depends=[data_table]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
-  belg = derive2 { name="belg"; version="1.4.0"; sha256="1ayk4ajk06bism934xclcikv4ccwr93l86zil63sy2739qypw706"; depends=[raster Rcpp RcppArmadillo]; };
+  belg = derive2 { name="belg"; version="1.4.1"; sha256="0ql1hir834hljr58gbi4gxgf939dnd7rpmyp1pxkg0042in4h0p0"; depends=[raster Rcpp RcppArmadillo]; };
   bellreg = derive2 { name="bellreg"; version="0.0.1"; sha256="17a0ac5ab9yblkl3cwv9vf1l6s027r34n4lqw9fs8bfs1inxbn9p"; depends=[BH extraDistr Formula magic MASS numbers Rcpp RcppEigen Rdpack rstan rstantools StanHeaders]; };
   bench = derive2 { name="bench"; version="1.1.1"; sha256="1ldqmf0anwgw6b9jgy5mnnjjncayc1x54pvjm6f5gqv0225ksdw3"; depends=[glue pillar profmem rlang tibble]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
@@ -5649,10 +5867,10 @@ in with self; {
   betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; };
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
-  betafunctions = derive2 { name="betafunctions"; version="1.2.0"; sha256="0jz5cxbi1zd9y7xvazlanwp2pj6j9msdbby1n1nxrbbzix65ks6z"; depends=[]; };
+  betafunctions = derive2 { name="betafunctions"; version="1.4.2"; sha256="0gag9hslqz3sa8sb4fr85gds6km5z9r8flmhs6gsgn224iamjf94"; depends=[]; };
   betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; };
-  betapart = derive2 { name="betapart"; version="1.5.1"; sha256="0j72rfvnn0ag6vxp8nw5v68n3qblyp5gd0y8z1kchs4dbq1v288g"; depends=[ape fastmatch geometry picante rcdd]; };
-  betaper = derive2 { name="betaper"; version="1.1-1"; sha256="0ids2k783lrrf376nfccflzp3alrq15ym484ixjcnxxz84ncmmcl"; depends=[vegan]; };
+  betapart = derive2 { name="betapart"; version="1.5.2"; sha256="176q4zqid38hjarvislf8xchc2sh5bd3rwpd837lniz36idms6k8"; depends=[ape doParallel fastmatch foreach geometry itertools picante rcdd]; };
+  betaper = derive2 { name="betaper"; version="1.1-2"; sha256="0gh5xjimg0wgv626g3y34mvgrji2aylnm89iwadg7d6g4s457ynp"; depends=[vegan]; };
   betareg = derive2 { name="betareg"; version="3.1-3"; sha256="0ik2qydr75dwaphw35l1myi50fbkw43zmkarrw8jsj8nqmz3h6fc"; depends=[flexmix Formula lmtest modeltools sandwich]; };
   betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; };
   bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
@@ -5661,28 +5879,32 @@ in with self; {
   bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; };
   bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; };
   bfp = derive2 { name="bfp"; version="0.0-41"; sha256="0v3fcsg9lq6j18igvknmlws9m4mp0xh3k3y01ghk85zpzikby2r3"; depends=[Rcpp]; };
-  bfsMaps = derive2 { name="bfsMaps"; version="0.9.4"; sha256="0pb081kpmf7040r99szhg7ppvb21cvc9k9bq6lhglinb8wxad9g8"; depends=[DescTools maptools rgdal rlang sp spdep]; };
+  bfsMaps = derive2 { name="bfsMaps"; version="0.9.6"; sha256="0k3bwda32j0rfdkzddqf81mpaa1z73cm05xh19psa51vgrbn9gg9"; depends=[DescTools maptools rgdal rgeos rlang sp spdep]; };
   bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; };
   bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; };
   bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; };
+  bggAnalytics = derive2 { name="bggAnalytics"; version="0.1.1"; sha256="1bkyq11wv2hhb5f34668b2ii19kp5ah4jg38lynrxc8y3b7q1kbp"; depends=[assertthat data_table pryr R6 rvest stringr xml2]; };
   bggum = derive2 { name="bggum"; version="1.0.2"; sha256="04vr9z81awavkhk3lbi8yasmi242lrbnq0pzqp38xlrn5xkf8b1w"; depends=[Rcpp RcppDist]; };
   bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; };
   bgmm = derive2 { name="bgmm"; version="1.8.4"; sha256="1r8qd4niah18jg0lw3vqq1465likal5j7nvlgnblpidd5svn4a2n"; depends=[car combinat lattice mvtnorm]; };
   bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; };
   bhm = derive2 { name="bhm"; version="1.16"; sha256="097vfpqkkbgps9wkabc1k18fa5vv0shbn1jz6g5l96xv96nvx93w"; depends=[coda ggplot2 MASS survival]; };
   bhpm = derive2 { name="bhpm"; version="1.7"; sha256="0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp"; depends=[coda]; };
+  biClassify = derive2 { name="biClassify"; version="1.0"; sha256="1jawds4b0793k3kv7apa2xscqmzbx9fxmbdkqjz1lk1kykcv7m8n"; depends=[DAAG expm fields MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
   bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; };
-  bibliometrix = derive2 { name="bibliometrix"; version="3.0.2"; sha256="0xf7c31a24mvpzhv6a3byib117b9wzrvkn3fp92kyqv7xqqnh34l"; depends=[dimensionsR dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 pubmedR RColorBrewer rio rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr tidyr]; };
-  bibtex = derive2 { name="bibtex"; version="0.4.2.2"; sha256="140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07"; depends=[stringr]; };
+  bibliometrix = derive2 { name="bibliometrix"; version="3.0.3"; sha256="1jqcpwxzccn19rwvcq5k6fbyxqj4fbyq09k3lidij6ff648415a3"; depends=[dimensionsR dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 pubmedR RColorBrewer rio rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr tidyr]; };
+  bibliometrixData = derive2 { name="bibliometrixData"; version="0.1.0"; sha256="0fdfgqsfiq3iacj4vb3bvx98waqzqxdsn2ds8wq86a30lm055d7n"; depends=[]; };
+  bibtex = derive2 { name="bibtex"; version="0.4.2.3"; sha256="0vdwx6808r73pk15263f33bkqbfmb08d8jkmr4d7h4ml414ikbbv"; depends=[stringr]; };
   biclique = derive2 { name="biclique"; version="1.0.5"; sha256="1fdf2r1jc2x8yw0fcw7yyjdxz4b870w6y7mr68qixqxwpl6943zq"; depends=[]; };
   biclust = derive2 { name="biclust"; version="2.0.2"; sha256="1pk7mvwlg4hkc4cn4w6wr2c192qx03d1xfwlzclk5bw1nmcg483b"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; };
   biclustermd = derive2 { name="biclustermd"; version="0.2.2"; sha256="00d7lhkcr9bj45zwpm78hdp3qllfisx097dsql3g64v9ix2q44g5"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; };
-  bife = derive2 { name="bife"; version="0.7"; sha256="04wnc6n3wcykzmhrnd2zkj507ymzbw1n8wssi3bwcylanzj59a3h"; depends=[data_table Formula Rcpp RcppArmadillo]; };
+  bife = derive2 { name="bife"; version="0.7.1"; sha256="0d1hfzji3769nsa5xvlmn7sbn21igwx3aa7vxlcdn1b9ykh7fx76"; depends=[data_table Formula Rcpp RcppArmadillo]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
   bigMap = derive2 { name="bigMap"; version="2.3.1"; sha256="08c9s5sk672j70d6pnva7z52i4s3knkby06lva9al9n8a3jiwsvz"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; };
   bigQueryR = derive2 { name="bigQueryR"; version="0.5.0"; sha256="051c8rkj77dm78237dzhf3lcdawv0xv72pwfiim9bi89z9mp6f9m"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; };
   bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; };
+  bigSurvSGD = derive2 { name="bigSurvSGD"; version="0.0.1"; sha256="08i6hwfr4rpvmxfa0vx8bi2dsa63iasj049ndwfn6zgvai6qaz0s"; depends=[bigmemory doParallel foreach Rcpp survival]; };
   biganalytics = derive2 { name="biganalytics"; version="1.1.21"; sha256="19drir6vclzz1ffccvnkxnmiqnwmddiqm7y64pz4j6ifxpc1igfy"; depends=[BH biglm bigmemory foreach Rcpp]; };
   bigassertr = derive2 { name="bigassertr"; version="0.1.3"; sha256="1f0abvsixdkrr8nfm0knby69j0pac4srlg8nlsmrymz6nzcf82d9"; depends=[]; };
   bigchess = derive2 { name="bigchess"; version="1.9.1"; sha256="1vdzx185y1agh1xjf7qcfi2s6l7qzm1kx6b2kr3cbz2in88bws3n"; depends=[processx]; };
@@ -5690,23 +5912,23 @@ in with self; {
   bigdist = derive2 { name="bigdist"; version="0.1.4"; sha256="1qfnmhyfadmnnagbhdl4jjrb53i1srszf19idp8fy6bczbjq85yi"; depends=[assertthat bigstatsr furrr proxy]; };
   biglasso = derive2 { name="biglasso"; version="1.3-7"; sha256="1s9l8n0a3nv6viyp62k890nhdpfh8jl1ahhsa51x7bx2agdqplhi"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
   bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; depends=[robustbase solartime]; };
-  biglm = derive2 { name="biglm"; version="0.9-2"; sha256="03chwwhnrassz2aqcx2pjzmsl8k1nfi704f9cl6p719k8s0iqhwv"; depends=[DBI]; };
+  biglm = derive2 { name="biglm"; version="0.9-2.1"; sha256="0iy9xr2bq42wlizgwlz7w5kh9206yqkw9h2cr6mcsmizgjg3rkvd"; depends=[DBI]; };
   biglmm = derive2 { name="biglmm"; version="0.9-2"; sha256="1zj1h2hszps3w913j2dk4cyj5jsqkkxsm3pcjlc4jnq810j100l6"; depends=[DBI]; };
   bigmatch = derive2 { name="bigmatch"; version="0.6.2"; sha256="16nmc0n78gzk8x8jhxdilj47gjqqv46sgiivccn5zkv08k1h3jj2"; depends=[liqueueR mvnfast plyr rcbalance]; };
   bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; depends=[BH bigmemory_sri Rcpp]; };
   bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
-  bigparallelr = derive2 { name="bigparallelr"; version="0.2.3"; sha256="1xg48zbwhchclc6lc67hc3j1d0b7cajd4whspj68ipm38w8h7l23"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; };
+  bigparallelr = derive2 { name="bigparallelr"; version="0.3.0"; sha256="1csgvhy192f709g677m1k94j8nx517xj29g28rlmm7x62fivyzav"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; };
   bigreadr = derive2 { name="bigreadr"; version="0.2.0"; sha256="0d5fgs16kdsl23jqrgz7in63pwhh7bvj7m8pa8nj11v84ji6lagr"; depends=[bigassertr data_table Rcpp]; };
-  bigrquery = derive2 { name="bigrquery"; version="1.3.1"; sha256="0mq03sqv5lkyn3dlxvyd6lqqwnryfdaqh05pjvngzp194fxmd9cy"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; };
-  bigsnpr = derive2 { name="bigsnpr"; version="1.4.4"; sha256="0khdhbfi4q7s1kvmhfsn1wh4rq6c1lqrfjn3rj9iavka5d77wk5r"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio]; };
-  bigsparser = derive2 { name="bigsparser"; version="0.3.1"; sha256="10hhgjzi1dq6hxl0b2wpwk6agmqph5rb2nqfxf6gdbq9406ms0g1"; depends=[bigassertr Rcpp RcppEigen rmio]; };
+  bigrquery = derive2 { name="bigrquery"; version="1.3.2"; sha256="16whccv7f94vf57dvbbrhdskz3nnbmpa11a14kp7aynckldlfy0v"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; };
+  bigsnpr = derive2 { name="bigsnpr"; version="1.5.2"; sha256="0i0x98vdh9mr5909ax34yfh4ah73s6l8xkbcybq2xbn74k3b78g2"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio vctrs]; };
+  bigsparser = derive2 { name="bigsparser"; version="0.4.0"; sha256="1rhgsh95si0na3ndbliqblbb5cmv8hyvp1qig8nzr6b5va22szkf"; depends=[bigassertr Rcpp RcppEigen rmio]; };
   bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; };
-  bigstatsr = derive2 { name="bigstatsr"; version="1.2.3"; sha256="0386hrfjsdnm5ns9kkym8nhzfadcn0shdr3yj77051lwxfngdmbx"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; };
+  bigstatsr = derive2 { name="bigstatsr"; version="1.3.1"; sha256="0m8yjwyli68b974ibm50n9a0c7wvjy14gjxry8p0v9jcifv7dr3n"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; };
   bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; };
   bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; };
   bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; };
   bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
-  bigutilsr = derive2 { name="bigutilsr"; version="0.3.2"; sha256="1is0iy4lwx4zbiwbkg9dpkiddjsfp3bgh124k3khfrzn61zldv8i"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; };
+  bigutilsr = derive2 { name="bigutilsr"; version="0.3.3"; sha256="0wvym0xnglxvh5502mfd5wx855h98drwib7cchgzy87k87mjza2a"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; };
   bikeshare14 = derive2 { name="bikeshare14"; version="0.1.2"; sha256="1sib83driqv9k4aa131nw3xasslrxvnxkn3mr8kxycxccky025n9"; depends=[]; };
   bikm1 = derive2 { name="bikm1"; version="1.0.0"; sha256="1pj41d59n3iflwc4iwnwv6g2vhjs9498k85cml7jwb814xpl9jsj"; depends=[ade4 ggplot2 gtools pracma reshape2]; };
   bild = derive2 { name="bild"; version="1.2-0"; sha256="0aygx77fn2w249q6ghpxclhm9xb2ngdzrirldr3lpidg6ivc443v"; depends=[]; };
@@ -5729,7 +5951,7 @@ in with self; {
   binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; };
   bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; };
   binhf = derive2 { name="binhf"; version="1.0-3"; sha256="1vdw2s8zddp7gad8l3c4jpmnjcc0f5wpqbrp6gp9lgp1c3qa505y"; depends=[adlift EbayesThresh wavethresh]; };
-  binman = derive2 { name="binman"; version="0.1.1"; sha256="0hm0h285p4v9lhrqjy8s22f1s1vmfpfla5iaycpj8vw3qb3632az"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; };
+  binman = derive2 { name="binman"; version="0.1.2"; sha256="00l7m98h41r67gf0qxqis3vx63j7wylnk9vlgcyk41szkrz8ikkc"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; };
   binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach kedd mclust nor1mix Rcpp Rdpack]; };
   binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
   binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; };
@@ -5740,37 +5962,39 @@ in with self; {
   binostics = derive2 { name="binostics"; version="0.1.2"; sha256="1izcck2dq8ay9ni1wjg426w5rj39gxwzls1sgnngggapl3pmqzz2"; depends=[]; };
   binovisualfields = derive2 { name="binovisualfields"; version="0.1.1"; sha256="0s2p0miqjckkj4v9l0c7zsdnnq69j08p4c5sgdxvkzlv23rnrkyd"; depends=[gtools plotrix shiny]; };
   binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; };
+  binsegRcpp = derive2 { name="binsegRcpp"; version="2020.9.3"; sha256="0vkvczm32nx67aw1mw53yc6jlbsk70faa5mvwq6k6bzv3nb2c48a"; depends=[data_table Rcpp]; };
   binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; };
   binsmooth = derive2 { name="binsmooth"; version="0.2.2"; sha256="1sidv8ra377glaacib1j4ksg5bg759hk7h6fadrfzip3hgxgjg9x"; depends=[ineq pracma triangle]; };
   binsreg = derive2 { name="binsreg"; version="0.2.0"; sha256="031a794bkb9qdy51p4jgjg3hvh8ga0hwakcdrjn0hv4ls9f5gsm7"; depends=[ggplot2 sandwich]; };
   binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; };
-  bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
+  bio_infer = derive2 { name="bio.infer"; version="1.3-6"; sha256="1hs11c9qpdsl1awgk3b34mcsnr8g1xpg3zd9dlrqrz6ppdqkgxmn"; depends=[]; };
   bio3d = derive2 { name="bio3d"; version="2.4-1"; sha256="07rw6c2d95gb5myxh31727j0jrchd0xisa3x89jjmf4zzs3vv7v7"; depends=[Rcpp]; };
   bioC_logs = derive2 { name="bioC.logs"; version="1.1"; sha256="18v8hj426vdfz30jifhd17fv65w5nv0f55ff9r8s2ahi6qv3w828"; depends=[]; };
   bioOED = derive2 { name="bioOED"; version="0.2.1"; sha256="0wx58bngpzlrbbcnx8l1lqhsg51y98wcym1238p87drf64x2mj1n"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR rlang tidyr tidyselect tidyverse]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
   bioRad = derive2 { name="bioRad"; version="0.5.2"; sha256="1kx1vh6p37170f1crylwyzap0c7s5d82rx7qqi95f8d26niqcjn9"; depends=[assertthat curl data_table fields ggmap ggplot2 lubridate lutz maptools raster rgdal rhdf5 sp tidyr viridis viridisLite]; };
   bioacoustics = derive2 { name="bioacoustics"; version="0.2.4"; sha256="003z6vd19a62mdfzkkpvhfn42c7lws2863nxvfl9hbqcx0zbq7gn"; depends=[htmltools moments Rcpp stringr tuneR]; };
-  bioassays = derive2 { name="bioassays"; version="0.1.0"; sha256="0vsh079hh9w571aki90bhj0clkjknv4zm795hcwgh9grn6h45qrl"; depends=[dplyr ggplot2 magrittr nplr reshape2 rlang]; };
-  biocompute = derive2 { name="biocompute"; version="1.0.3"; sha256="1c23yd0vhar1hvzskr7h6g3a78mcrwminm2pkdmc9qlpy8s8smvv"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; };
+  bioassays = derive2 { name="bioassays"; version="1.0.1"; sha256="1y32wxkv14l7r0f35y4hxxxh3zpw2gd4hsjmkajhmzmnvg5jdw78"; depends=[dplyr ggplot2 magrittr nplr reshape2 rlang]; };
+  biocompute = derive2 { name="biocompute"; version="1.0.4"; sha256="18k8qrc5zy48zmkxxzv7yfsi7z3hpy8fcw7hs61a8fykwl5793ba"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; };
   biogas = derive2 { name="biogas"; version="1.23.2"; sha256="05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
   biogram = derive2 { name="biogram"; version="1.6.3"; sha256="1y7yaa6xwv11b6a4qf4qb3d7rsz0yiiq1k5mb0dbm3avydnl9c4b"; depends=[combinat entropy partitions slam]; };
+  biogrowth = derive2 { name="biogrowth"; version="0.1.2"; sha256="1ipk9pvl05f365adqqcvdf7h16z9l9mbb2s0k6sy705714fv5wdb"; depends=[cowplot deSolve dplyr FME ggplot2 lamW MASS purrr rlang tibble tidyr]; };
   bioimagetools = derive2 { name="bioimagetools"; version="1.1.5"; sha256="1qscyfm7mx9v9ag3hdyyvn7vwnfvms9dc1qffbyby9fr9rj3gs3q"; depends=[EBImage httr tiff]; };
   bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; };
-  biolink = derive2 { name="biolink"; version="0.1.6"; sha256="1szsplhzrn660aw442ad73rwhmyqjwqq6faaz4bw86khsvxh993y"; depends=[DBI glue memoise rentrez RMySQL xml2]; };
+  biolink = derive2 { name="biolink"; version="0.1.7"; sha256="1i9aisvb3lvljird89fy9fx7h3s1wi6dpilycbynqyhz8xqnnszj"; depends=[DBI glue memoise rentrez RMySQL xml2]; };
   biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; };
   biomod2 = derive2 { name="biomod2"; version="3.4.6"; sha256="0nvxg0a78ynydx3wd16vaildw9x4hiagmx4wkrwkzbyhyi2pgza1"; depends=[abind caret checkmate dismo doParallel dplyr earth ENMeval foreach gbm ggplot2 lattice MASS maxnet mda nnet PresenceAbsence pROC purrr randomForest raster rasterVis reshape rlang rpart sp tidyr]; };
   bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
   biorxivr = derive2 { name="biorxivr"; version="1.0.2"; sha256="10fwppflk2ri5qah1vp3q835g0299nkxz8x94xhfazbjikrxqan4"; depends=[RCurl XML]; };
   bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; };
-  bioseq = derive2 { name="bioseq"; version="0.1.1"; sha256="02dmb8c6izy27m5by2mps5wb85nnii0jzv4vpz63pays06qw9276"; depends=[ape crayon dplyr pillar readr rlang stringr tibble vctrs]; };
+  bioseq = derive2 { name="bioseq"; version="0.1.2"; sha256="0njnf4dzan2bc3h69rpbpfqhj3w2msd41nkn9p2kvkik706sx50v"; depends=[ape crayon dplyr pillar readr rlang stringr tibble vctrs]; };
   bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; };
   biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; };
   biospear = derive2 { name="biospear"; version="1.0.2"; sha256="10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; };
-  biostat3 = derive2 { name="biostat3"; version="0.1.4"; sha256="12inmmy5xjd0c6vs2s00z13rm5ykndxpmmgi8h7pkw30rhq4snyc"; depends=[car MASS muhaz survival]; };
+  biostat3 = derive2 { name="biostat3"; version="0.1.5"; sha256="1hnq2al27033zagxjd0r8nls6z8lznfqqiyrharq07s6bgbl5bv9"; depends=[car MASS muhaz survival]; };
   biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; };
-  biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; };
+  biotools = derive2 { name="biotools"; version="4.0"; sha256="0hbcpyfkx658my6k2fl1z597qmfmby0rkysflbz6g09r2yh8mm1k"; depends=[boot MASS]; };
   bipartite = derive2 { name="bipartite"; version="2.15"; sha256="0gr1wm9bvvrvwv5gzzfic7yknp826ga44vjbil84x1kp0h0k1f46"; depends=[fields igraph MASS permute sna vegan]; };
   bipartiteD3 = derive2 { name="bipartiteD3"; version="0.2.0"; sha256="1jvhlycmxii4vcm9qbj246qkwhd1bcggqq56b5rmbyqwd4vhqh8f"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; };
   biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; };
@@ -5783,14 +6007,14 @@ in with self; {
   bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
   bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; };
   bit = derive2 { name="bit"; version="4.0.4"; sha256="0s7isadibxp2wr62r5cpbyh9z31sczzfz4j3rm7gxgjfpqgq8174"; depends=[]; };
-  bit64 = derive2 { name="bit64"; version="4.0.2"; sha256="1yrwvgvxdlsa8y42l05vy173qndlqkwfk6mp2zrqwm8l7c7p79g9"; depends=[bit]; };
+  bit64 = derive2 { name="bit64"; version="4.0.5"; sha256="0y0m7q1rwam1g88cjx7zyi07mj5dipxd9jkl90f294syx8k6ipr5"; depends=[bit]; };
   bite = derive2 { name="bite"; version="0.3"; sha256="00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps"; depends=[ape coda MASS phytools sm vioplot xml2]; };
   bitmexr = derive2 { name="bitmexr"; version="0.3.1"; sha256="1h4fdh88b8j1p6hxabwf2v1wm8wnqzpl67hh15pjky2hhczfds05"; depends=[attempt curl digest dplyr httr jsonlite lubridate magrittr progress purrr rlang stringr]; };
   bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
   bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; };
   biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; };
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
-  bivariate = derive2 { name="bivariate"; version="0.5.0"; sha256="0b8wrzh51wqxiksja4jgjfqfqq3nlnx8vcvnmyhl1nzn9jyzdrfg"; depends=[barsurf intoo KernSmooth mvtnorm]; };
+  bivariate = derive2 { name="bivariate"; version="0.6.0"; sha256="0llpgwwcals3r2dvk8bln448avmf5fd50dhrmirq92w7s3zkxmrp"; depends=[barsurf intoo KernSmooth mvtnorm]; };
   bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; };
   bivquant = derive2 { name="bivquant"; version="0.1"; sha256="05dn4qik2dvmgqc2613vddh312bqhza1vnf94an75888gxri5h03"; depends=[copula cubature lpSolve MASS mvtnorm regpro]; };
   bivrp = derive2 { name="bivrp"; version="1.2-2"; sha256="0b38nh38vgqjllb1z9627dm86yp0s06ky1g829g8kkz7rffdp2za"; depends=[MASS]; };
@@ -5799,17 +6023,19 @@ in with self; {
   bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; };
   bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; };
   bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; };
+  bkmrhat = derive2 { name="bkmrhat"; version="1.0.0"; sha256="170lj3287phywmn85qd18sy5kzxnrk2qqp1k8y2df13610d1m1gh"; depends=[bkmr coda future rstan]; };
   blackbox = derive2 { name="blackbox"; version="1.1.32"; sha256="180y19ls0vdk98smhs9hxpcwg3hwpl62d19zdiml38bjlxmr0kav"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; };
   blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; };
   blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; };
-  blapsr = derive2 { name="blapsr"; version="0.5.1"; sha256="0qlyc9k02w8csi9zjdm03ba2i54fc6g0qq0gammh93vdpg772ykx"; depends=[coda MASS Matrix RSpectra sn survival]; };
+  blapsr = derive2 { name="blapsr"; version="0.5.5"; sha256="1h6bdlawb3wzfw0l62k8b440yvvdh2liylhlnf3jfhdh1fivxq95"; depends=[coda MASS Matrix RSpectra sn survival]; };
   blastula = derive2 { name="blastula"; version="0.3.2"; sha256="084mk6xb8ivqrp8anvisfk8rvwi7qfrp5kmy66vpihmjmqh7dkyc"; depends=[base64enc commonmark curl digest dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; };
-  blavaan = derive2 { name="blavaan"; version="0.3-10"; sha256="0b96rm5w0n0dm2fk3vak8cw4lxzwysicfcrhw63y9xr1ab088zs5"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  blatent = derive2 { name="blatent"; version="0.1.1"; sha256="1jnf3i7s3mn99ff8yzygxys0w8qf6vrfk16iqgxh7jbivbrczysk"; depends=[coda Matrix mnormt R6 Rcpp RcppArmadillo truncnorm]; };
+  blavaan = derive2 { name="blavaan"; version="0.3-12"; sha256="01npki6jx19rzli193r57i8i495bqpnifcawqv8cxp718c9s4i4s"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; };
   blindrecalc = derive2 { name="blindrecalc"; version="0.1.2"; sha256="0nph82l58kgq2dqvga262zh394zp1had85qb8k8rwgaq68lad2vy"; depends=[Rcpp]; };
-  bliss = derive2 { name="bliss"; version="1.0.1"; sha256="1l3l7l9wq53if3w1j9l4d1pvlzhk8hx3pc3sly2h3nl2mds72hi2"; depends=[ggplot2 MASS RColorBrewer Rcpp RcppArmadillo rockchalk]; };
+  blink = derive2 { name="blink"; version="1.1.0"; sha256="053nw592sglzh6fgz7hj8ra6q7lqs83hhv14kcgs67b56q8a3crb"; depends=[plyr stringdist]; };
   blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
   blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; };
   blmeco = derive2 { name="blmeco"; version="1.4"; sha256="1370djpy87816bfr0g8730x7q4d4xx9aa41iqm622q5b5zm2jzmp"; depends=[arm lme4 MASS]; };
@@ -5821,10 +6047,10 @@ in with self; {
   blockcluster = derive2 { name="blockcluster"; version="4.4.3"; sha256="0al1v4r26rh4fx4g8gyk8mxfagn75xb9n4lwh3s6xvk87x33p20c"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
   blockmodeling = derive2 { name="blockmodeling"; version="1.0.0"; sha256="1z4w2kq0id0gb5d0lqcdaw3clplhzywarkpvvx3drivdypzl237i"; depends=[Matrix]; };
-  blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
+  blockmodels = derive2 { name="blockmodels"; version="1.1.4"; sha256="1kx6ryx0ma7j70nzby0wdagqkf1cjdhvw32rf7i1pp8f2rkfsg84"; depends=[digest Rcpp RcppArmadillo]; };
   blockrand = derive2 { name="blockrand"; version="1.5"; sha256="0bic3b8l7mp2hpwd8k1diwy6a4lj92i7s5k20i2wy8kw0c74jwfh"; depends=[]; };
-  blocksdesign = derive2 { name="blocksdesign"; version="4.3"; sha256="0g70ap2x3j3454xyvaqj80njzddq6z880b6w0pqxvwcgy4916k5b"; depends=[lme4 plyr PolynomF]; };
-  blogdown = derive2 { name="blogdown"; version="0.20"; sha256="0iz4idfpzk4s13xhw1n8dpk117c0qkrh6qg2yvcfmrp0wdkwwr6d"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
+  blocksdesign = derive2 { name="blocksdesign"; version="4.6"; sha256="1pgnp3ns8xv1991irxj8apvrnr3d2knbiansfcjiiykvvcpzgm3w"; depends=[plyr PolynomF]; };
+  blogdown = derive2 { name="blogdown"; version="0.21"; sha256="0kbzyr1f9pvh4f3pydjhi9gdczbah9h0xpmic90cnadv8flasvd8"; depends=[bookdown htmltools httpuv knitr later rmarkdown servr xfun yaml]; };
   blorr = derive2 { name="blorr"; version="0.3.0"; sha256="1ynvg6ar7c7p01225q9czy4gxks0p1vw3sx207l7vzqxw20wb1bn"; depends=[car data_table ggplot2 gridExtra lest Rcpp]; };
   blrm = derive2 { name="blrm"; version="1.0-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; };
   blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; };
@@ -5832,17 +6058,20 @@ in with self; {
   bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; };
   bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; };
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
-  bmem = derive2 { name="bmem"; version="1.7"; sha256="1g259j2jzmbbv98l0w6jc4k18ad0a7hvq2s9jgjdxk8n6ymbx67v"; depends=[Amelia lavaan MASS sem snowfall]; };
+  bmem = derive2 { name="bmem"; version="1.8"; sha256="1nhybz8aarzlqjx4443hsflflgy2jcprz5dv6mwxacnyspm93vlq"; depends=[Amelia lavaan MASS sem snowfall]; };
   bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; };
+  bmgarch = derive2 { name="bmgarch"; version="1.0.0"; sha256="1zivja09ci6kj5nymwhdzjjjqvkvbxcjk9v27kk7w25sqbyv9gvk"; depends=[BH forecast ggplot2 loo MASS Rcpp RcppEigen Rdpack rstan rstantools StanHeaders]; };
   bmixture = derive2 { name="bmixture"; version="1.6"; sha256="12csg1nafhwhqrhg5rrzjsw06fbvgd8447a9ypbgs78ah81rmr8f"; depends=[BDgraph]; };
   bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
   bmlm = derive2 { name="bmlm"; version="1.3.11"; sha256="1nlwfrs6kk2jxq8vxwfj388cdf2p8h81lskkb9bp80fp8fx722qh"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
+  bmotif = derive2 { name="bmotif"; version="2.0.2"; sha256="1zy153z7kasfivj0mvrkyn96s0sgdp34w4pdjpcvfnym3lr02f0m"; depends=[gtools Rcpp reshape2 tensor]; };
   bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; };
   bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; };
+  bmscstan = derive2 { name="bmscstan"; version="1.1.0"; sha256="1mr56ry9jzsd2z0zffcysy01bh62cg13hi4swdhdvwmjcsb5gq97"; depends=[bayesplot coda ggplot2 LaplacesDemon logspline rstan]; };
   bnclassify = derive2 { name="bnclassify"; version="0.4.5"; sha256="1ik3n0g6gw7504ryg5skwygyc545150r297gii4mr2zj252lf069"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; };
-  bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; };
-  bnma = derive2 { name="bnma"; version="1.2.0"; sha256="1h01f7f497fgm52nmxw451m8wd6y6gsvm5iprm1klblx7iqzdm6y"; depends=[coda ggplot2 igraph rjags]; };
+  bnlearn = derive2 { name="bnlearn"; version="4.6.1"; sha256="1bxf1p10g40nci92m1nkw9xska45hm29q1vp8wzfac1kmxjl8m74"; depends=[]; };
+  bnma = derive2 { name="bnma"; version="1.3.0"; sha256="1bq25kbll6g5lay3b86kif7i719khn597yfycz7zzayypk4ckiwv"; depends=[coda ggplot2 igraph rjags]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
   bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; };
@@ -5850,18 +6079,19 @@ in with self; {
   bnpsd = derive2 { name="bnpsd"; version="1.2.1"; sha256="1jnv0pnq5fd5pyy1rx4cbrxl715ss2ci3p9k6zwz5s9x1kxhvgd9"; depends=[]; };
   bnspatial = derive2 { name="bnspatial"; version="1.1.1"; sha256="1drm9ia4lr80wahbbn9xrw658ppmgxm4iadwv77jz1x786dda2n1"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0.8"; sha256="1a4x235mji9hkw3gp4br6yj351x0rdxi5nhyrqihna35y4a9429g"; depends=[bitops igraph Matrix]; };
-  bnviewer = derive2 { name="bnviewer"; version="0.1.5"; sha256="10yabl761ci8w4afj1smx4m27s3bdvsrg79xfayfb8428zvwb3la"; depends=[bnlearn igraph shiny visNetwork]; };
+  bnviewer = derive2 { name="bnviewer"; version="0.1.6"; sha256="036jmypxg2ciiz388f90vm73l9djhpi6gzp1ibn9l0x3d072r7zz"; depends=[assertthat bnlearn caret e1071 igraph shiny visNetwork]; };
   boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; };
   bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
   bold = derive2 { name="bold"; version="1.1.0"; sha256="06qxkmfzgq7427js13bddxq9iydq0dpa13wyzrbycl6xg83sha0z"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
-  bomrang = derive2 { name="bomrang"; version="0.7.0"; sha256="0xlsivhnank7bc3y06wk5avlzlc24mfvn9c18rhgxxib8mzf8aak"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; };
-  bookdown = derive2 { name="bookdown"; version="0.20"; sha256="0gnshkp1aj7f29sjkhzxn890hz39nwaqdln61x8apmrc658nacdg"; depends=[htmltools knitr rmarkdown tinytex xfun]; };
+  bomrang = derive2 { name="bomrang"; version="0.7.3"; sha256="1if68q5jsmpyyqgvr9954gkwby8ddyl27wdda9510k6w91h893r9"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magick magrittr readr rvest terra tidyr xml2]; };
+  bookdown = derive2 { name="bookdown"; version="0.21"; sha256="0xms1srx9l2mn8xaxnpic0s21y8k56bhwpj45wy7b0yscmxgmh27"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; };
   bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; };
-  boostmtree = derive2 { name="boostmtree"; version="1.4.1"; sha256="16adb9akrdw1cfcarrv9l5cxhn1nzskir6nwl9nawl1r727s57z6"; depends=[nlme randomForestSRC]; };
+  boostmtree = derive2 { name="boostmtree"; version="1.5.0"; sha256="18w5h8m6g4aszffyn0ixhzn2bgbrwrrcq2k54b70vbw00xqxmg1q"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
   boot = derive2 { name="boot"; version="1.3-25"; sha256="1gpvi1h3nqhnnsfy96rlhakdpj84iqqsxr29rr3261sknky3aj26"; depends=[]; };
-  boot_heterogeneity = derive2 { name="boot.heterogeneity"; version="0.1.0"; sha256="0rv4z1c3knny3z8ybpa8smib2fwxffr882jql3f2lxgswaapp6jj"; depends=[metafor pbmcapply]; };
+  boot_heterogeneity = derive2 { name="boot.heterogeneity"; version="0.1.1"; sha256="124wya02l39rk61sqg5a69s0ly5ih5lsy4rkpslffvs43byjvkwn"; depends=[metafor pbmcapply]; };
+  bootComb = derive2 { name="bootComb"; version="1.0.1"; sha256="1y1kszf5hhacyvkrr9x9b0pjqs4rrzkwy9p30di0vwky5fn0zpp9"; depends=[]; };
   bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; };
   bootImpute = derive2 { name="bootImpute"; version="1.1.0"; sha256="1dkm0l397jp23lcj4pbl03c2pjj027zjy08jq7qyr9s1bjmxrbnq"; depends=[mice smcfcs]; };
   bootLR = derive2 { name="bootLR"; version="1.0.2"; sha256="1aj5l42d5y7czxzlg6r9ykdxyjf8m8bahl41xk4k6xpxckdnka14"; depends=[binom boot]; };
@@ -5869,21 +6099,22 @@ in with self; {
   bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
   bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
   bootUR = derive2 { name="bootUR"; version="0.2.0"; sha256="01hlglks2lwp49g481hyrz645grf0zhpl508vbhbsvk1z2888cs5"; depends=[Rcpp RcppArmadillo RcppProgress]; };
-  bootcluster = derive2 { name="bootcluster"; version="0.1.0"; sha256="1mx08p0csz06mq55bdg4vgnqa9khdgqrz4jnm48c24pg8rpaj98b"; depends=[cluster flexclust fpc mclust plyr sets]; };
+  bootcluster = derive2 { name="bootcluster"; version="0.2.0"; sha256="0vvymj415i3bz9gc8q6jdbnmzrsq753h2jchvbsb7p5hhz3k777i"; depends=[cluster doParallel dplyr flexclust foreach fpc GGally ggplot2 gridExtra igraph intergraph mclust network plyr sets]; };
   bootnet = derive2 { name="bootnet"; version="1.4.3"; sha256="0zmv6wibqkdhffs937xa1xjz6xn6wb4hajpdl36sfkmw3cqfc9sm"; depends=[abind BDgraph corpcor dplyr ggplot2 glasso graphicalVAR gtools huge igraph IsingFit IsingSampler lavaan Matrix mgm mvtnorm NetworkToolbox networktools pbapply psychTools qgraph relaimpo tidyr]; };
   bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; };
   bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; };
   bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
   bootstrap = derive2 { name="bootstrap"; version="2019.6"; sha256="1546jqhhw5h177ii8jkdikyd26rv6gwkav816np1zks4p7zgsljj"; depends=[]; };
-  bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.3"; sha256="19bsahkxh6g2fjz5j1bdq47vnyy38xd0vr4ahkbjz61x0h8g4nli"; depends=[sampling]; };
+  bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.4"; sha256="1j9ag18s2n7cihs5hbjhibx8gikxf8fs5hx2ljfzcn0gv492qm02"; depends=[sampling]; };
   boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
   bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; };
   boral = derive2 { name="boral"; version="1.9"; sha256="05s1bjfz8j17qqi1kszahw4yzczc18g71s44n7i7851kwy1xkcv4"; depends=[abind coda corpcor fishMod lifecycle MASS mvtnorm R2jags reshape2]; };
-  borrowr = derive2 { name="borrowr"; version="0.1.1"; sha256="0q9lkdzf7v9rggrwcny551cx7lfqli60dxqgqx0d2x819d7h0k1d"; depends=[BART mvtnorm Rcpp]; };
+  borrowr = derive2 { name="borrowr"; version="0.2.0"; sha256="0hq9rplb22dm8nikapxnvzq10y4xzi1y7k61ghw9x1fq4fdfyy2f"; depends=[BART mvtnorm Rcpp]; };
   botor = derive2 { name="botor"; version="0.3.0"; sha256="1izhpc491f54p3hz32kcp2b2yxkg59ni1caglyllg22bckw228sg"; depends=[checkmate logger reticulate]; };
   boundingbox = derive2 { name="boundingbox"; version="1.0.1"; sha256="0kgpsvnq8f0qyw55rldwqapys36y6lb4w2bw2azfl4nmrrnayxbc"; depends=[gplots imager]; };
   boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
-  boxcoxmix = derive2 { name="boxcoxmix"; version="0.21"; sha256="0pav4nksh1zbic11l38jyyq8i58hfvwzkp88ra6nny3jn2axzipl"; depends=[npmlreg qicharts statmod]; };
+  boutliers = derive2 { name="boutliers"; version="1.1-1"; sha256="01dp1w5lxmn6nixajg6dz0qincm0i1in03q7g284v37qnszyimqs"; depends=[metafor]; };
+  boxcoxmix = derive2 { name="boxcoxmix"; version="0.28"; sha256="12f1lakfy9i1rq70cq0bffpdachsm58rcmbbhgnq1r31g028zrcc"; depends=[npmlreg qicharts statmod]; };
   boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; };
   boxr = derive2 { name="boxr"; version="0.3.5"; sha256="1mhw3val08l03y7c52kq6ln2l5gjn6x1mxg0hx7nr8b86skbrka4"; depends=[assertthat bit64 digest dplyr fs glue httpuv httr mime rio rlang stringr]; };
   bpDir = derive2 { name="bpDir"; version="0.1.1"; sha256="1ia48ygnncv7msisrgqkbzbs8ld2d3lnmwpjr8myzzx4sbdafdk1"; depends=[circular MASS plotrix]; };
@@ -5891,74 +6122,78 @@ in with self; {
   bpbounds = derive2 { name="bpbounds"; version="0.1.4"; sha256="05knl0lmhbc399zwb35r8m1w5jvmwad8rg5m7m633pg7cfijayb9"; depends=[]; };
   bpca = derive2 { name="bpca"; version="1.3-2"; sha256="0q3rx1wsa9y6c19kh77mvhkdb7qqywc031w6fl3sf0m0jj7skqab"; depends=[rgl scatterplot3d xtable]; };
   bpcp = derive2 { name="bpcp"; version="1.4"; sha256="0jwz9vrz6ivz70qzgvpvksk94rw5m7vi6yijbg8dj6biq5rq01lv"; depends=[ggplot2 survival]; };
+  bpcs = derive2 { name="bpcs"; version="1.0.0"; sha256="0jsy2l1qnzr8098614d6pj7rydf6b9s7kxrkahyzq82ivby9hj5m"; depends=[badger BH coda dplyr ggplot2 gtools HDInterval knitr loo magrittr Rcpp RcppEigen RcppParallel rlang rstan rstantools shinystan StanHeaders stringr tibble tidyr tidyselect]; };
   bpgmm = derive2 { name="bpgmm"; version="1.0.7"; sha256="0abh6jjglims8hjm2fwh0dz2qsgxy0fglxl5fnfgkwc139rsrhgy"; depends=[fabMix gtools label_switching MASS mclust mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; };
   bpnreg = derive2 { name="bpnreg"; version="1.0.3"; sha256="0s1whwi12fs77lycngrm0394cp6cy3g1pikhf670n94y21pk2bvi"; depends=[BH haven MASS Rcpp RcppArmadillo]; };
   bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; };
-  bqror = derive2 { name="bqror"; version="0.1.1"; sha256="1r4g04p8pbk2xkk8ib49pws9hxdxzwq0rh1fmrprmmvy28p4rvic"; depends=[GIGrvg invgamma MASS NPflow pracma truncnorm]; };
+  bqror = derive2 { name="bqror"; version="0.1.3"; sha256="04hxpg12a8iksvm5vahlps1dmirrbzv5rs51s34gqgqf9z072yjl"; depends=[GIGrvg invgamma MASS NPflow pracma truncnorm]; };
   bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; };
-  braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; };
   bracer = derive2 { name="bracer"; version="1.1.1"; sha256="1l722jg88i4898v8fwb9klwl9mbpaz1phypbpqc1j2kp2n2vq0vb"; depends=[stringr]; };
-  braidReports = derive2 { name="braidReports"; version="0.5.3"; sha256="107c9lrzb55dw5pal8qqpn8is3nrh19vfngx3zcfpmc49f06kskq"; depends=[braidrm ggplot2]; };
   braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; };
-  brainGraph = derive2 { name="brainGraph"; version="2.7.3"; sha256="1r39hxjix7vf3x8w46cgrpxfzsjkyw1k2r34xw73rvb75xx0aaay"; depends=[abind ade4 boot data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix oro_nifti permute RcppEigen scales]; };
+  brainGraph = derive2 { name="brainGraph"; version="3.0.0"; sha256="0sr2rf5fs02m3c304wbya2rszxcivc3cypg978hwzzcf30r4fy7y"; depends=[abind data_table doParallel foreach igraph lattice MASS Matrix permute]; };
   brainKCCA = derive2 { name="brainKCCA"; version="0.1.0"; sha256="1ag3qahlba4h4126873hg2bbi6sr729mhiw22gjgr4g4jg6lhh09"; depends=[brainR CCA elasticnet kernlab knitr misc3d oro_nifti rgl]; };
   brainR = derive2 { name="brainR"; version="1.6.0"; sha256="1l5rm6grslc6mivwh2fv3pznhy2cw16fz5695pmyfamzvsjggir1"; depends=[misc3d oro_nifti rgl]; };
   brandwatchR = derive2 { name="brandwatchR"; version="0.3.0"; sha256="10bccsaswsq06wdrxqg71amzx5rabmgfi4n074y651r2c1pyy98w"; depends=[data_table httr jsonlite]; };
-  brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; };
+  brant = derive2 { name="brant"; version="0.3-0"; sha256="0rcp0am4wjlkinvmv0n5bky84v31ds28v163p5mlp343cgma2b62"; depends=[MASS Matrix]; };
+  bravo = derive2 { name="bravo"; version="1.0.3"; sha256="1q5xgxyjss12jpd0arlqk4va3arzvla597vg2v6f9jbqm07ffy7h"; depends=[Matrix Rcpp]; };
   brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; };
   breakDown = derive2 { name="breakDown"; version="0.2.0"; sha256="1ywa7122id4infcb31rbazdd2w2hm0ff8p0a7insy3lvq0xmqd44"; depends=[ggplot2]; };
   breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
-  breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; };
+  breakfast = derive2 { name="breakfast"; version="2.1"; sha256="11i7lqzzkp7ipvi49cv448jz39mlchrpkw2cslhzzj2ha2j785nm"; depends=[plyr Rcpp]; };
   breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; };
   breathtestcore = derive2 { name="breathtestcore"; version="0.8.0"; sha256="08f3bdhpzrb1b2qj3yvf8zaq02vghhq54mzm5brlqw510hq2r6gz"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; };
   breathteststan = derive2 { name="breathteststan"; version="0.8.0"; sha256="1h05yqpsa1r6p0iybwh7rap0n10vr2wj2driq7qyq6wk6y14m8hc"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; };
   brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
-  brglm = derive2 { name="brglm"; version="0.6.2"; sha256="0c9ngscc6zlfm90fqyggnj04qfkhp5qgf5q3wnfpxwyc8cm47by2"; depends=[profileModel]; };
-  brglm2 = derive2 { name="brglm2"; version="0.6.2"; sha256="13apd1p770slnbrqs44khgv7fsh6g3fzd3n04hq36zz308avns9z"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; };
+  brglm = derive2 { name="brglm"; version="0.7.1"; sha256="1v68ma1agwhxar76mfvdfkcnd5h4gmxiz8j491rhdsckg271j7sa"; depends=[profileModel]; };
+  brglm2 = derive2 { name="brglm2"; version="0.7.0"; sha256="00dn50yv72dnkyggg5qkr7gyij1ghv984bjv2alza8qjmpc1ncyw"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; };
   brickr = derive2 { name="brickr"; version="0.3.5"; sha256="1a6yxhq2zly3i3gs4dd19xhyrin1qaxdr7x3a887j7zbcj0j4z9q"; depends=[colorspace dplyr farver ggplot2 magrittr purrr rgl scales tidyr]; };
   bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; };
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
   bridgesampling = derive2 { name="bridgesampling"; version="1.0-0"; sha256="1awhvv0v42w2q6llqi1wqpaiv5zx74cqzigdsvphy2jfp8ajw64y"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
-  brinton = derive2 { name="brinton"; version="0.2.0"; sha256="04g1mz5ivjljb6rk0s6gvqjagn28mk2ixqpmz4dzxwrj0lby2yhq"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; };
-  brio = derive2 { name="brio"; version="1.0.0"; sha256="10gjg205vvdwbw3nr8bfrxy5fzqd27y1fsbyn17xnpk57c66igvc"; depends=[]; };
+  brinton = derive2 { name="brinton"; version="0.2.1"; sha256="1v1kzhydxv3m8mg3wl7znrn8z3x4wk15p5a9jpq63qyqms1ld5ph"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; };
+  brio = derive2 { name="brio"; version="1.1.0"; sha256="0f7amcd2cjm09aiq39209cz680l5d2gqpp6wwfhz24zagfsa7cvb"; depends=[]; };
   briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; };
-  briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
   brlrmr = derive2 { name="brlrmr"; version="0.1.7"; sha256="0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds"; depends=[boot brglm MASS profileModel Rcpp]; };
   brm = derive2 { name="brm"; version="1.1.1"; sha256="0kyr8mxz5g3w41kp08d47f29cff8fqrfbm1ri7hgfg2lgr1151xy"; depends=[]; };
-  brms = derive2 { name="brms"; version="2.13.5"; sha256="0a2m5wr134sxflmiq5jzvanzn81fv7xndy9gyvrq3bay9vakic69"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
+  brms = derive2 { name="brms"; version="2.14.4"; sha256="0mzwihhgmn405l6zq11a180q4k3chggj9qj0j7q838b9vrszg59j"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme projpred Rcpp rstan rstantools shinystan]; };
   brnn = derive2 { name="brnn"; version="0.8"; sha256="119lxm691ci2bf62jwmbhqsl39xy3jvsi988rr6sdslwaxqyx35b"; depends=[Formula truncnorm]; };
-  broman = derive2 { name="broman"; version="0.70-4"; sha256="0xgzxrqqf5l6ydkpmsbcvba2mjggrh02r8vdkdd779vjhh8mqpkh"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.7.0"; sha256="0bq8w1ckrladzck2g0mgiyjdrzi06kbqalk5q3pfvj1607fdv3d5"; depends=[backports dplyr ellipsis generics glue purrr rlang stringr tibble tidyr]; };
+  brokenstick = derive2 { name="brokenstick"; version="1.1.0"; sha256="02n8fv84cfj32mg08ylpg19alf69kkpknpvd6mx86lclhaqa3cnf"; depends=[dplyr lme4 matrixsampling rlang tidyr]; };
+  brolgar = derive2 { name="brolgar"; version="0.1.0"; sha256="1q7rcr59s482f2vg0wifjkwfbrnqq12lbfqfixr2m1njv2ps35vg"; depends=[dplyr fabletools ggplot2 glue magrittr purrr rlang tibble tidyr tsibble vctrs]; };
+  broman = derive2 { name="broman"; version="0.71-6"; sha256="02ka3h1d2hl17bz3793yhglabswr6w3xr0x41dzxpn9ziw3w74n0"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
+  broom = derive2 { name="broom"; version="0.7.3"; sha256="0bxwmqj37m06ci378xqlf7kar7pg5g903i1vnrv4i256dkj50mny"; depends=[backports dplyr ellipsis generics glue purrr rlang stringr tibble tidyr]; };
+  broom_helpers = derive2 { name="broom.helpers"; version="1.1.0"; sha256="1h835wi6gah6hs11cdlgr9d7qnkq65n4qw5qdiqdkdcfsr27dv7v"; depends=[broom dplyr emmeans labelled lifecycle purrr rlang stringr tibble tidyr usethis]; };
   broom_mixed = derive2 { name="broom.mixed"; version="0.2.6"; sha256="1858dninq16s8p00hapn9vb3i1r5alia50bi89a37zcnap31ibai"; depends=[broom coda cubelyr dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; };
-  broomExtra = derive2 { name="broomExtra"; version="4.0.4"; sha256="00a445nlvs9qsgwpaf8ksc3xckdh059id0hcigl5h5m2y1ghld5g"; depends=[broom broom_mixed dplyr ipmisc parameters performance rlang]; };
+  broomExtra = derive2 { name="broomExtra"; version="4.1.0"; sha256="0js4qm1y9pkhyaxk10yknq3bfvgnchbd80l01mb3ifxzplx6xb0z"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang tibble]; };
   brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
   brranching = derive2 { name="brranching"; version="0.6.0"; sha256="032n5yp75bkzwb24zbad25f2059hqgdkv6mxsbb49pda34rm6y76"; depends=[ape conditionz crul curl phylocomr phytools taxize]; };
   brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; };
   brunnermunzel = derive2 { name="brunnermunzel"; version="1.4.1"; sha256="1lba5cpiray65zg1pv3xv6yl1xg78rqlwxkcmhgizlh1rhpd430p"; depends=[]; };
+  brxx = derive2 { name="brxx"; version="0.1.1"; sha256="00lk6h74f8r98is5lp9bhv56jypkx0vljv9k1cb6rj7j44iqjlc0"; depends=[blavaan blme MASS MCMCpack]; };
   bs4Dash = derive2 { name="bs4Dash"; version="0.5.0"; sha256="1y75i6bsdy1bsbzwjblsnimw1zzk0zl3qnzqfq9zcnf6q2ghi3r2"; depends=[htmltools shiny]; };
-  bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; };
+  bsam = derive2 { name="bsam"; version="1.1.3"; sha256="1yiplh4wcc711w59ir5hxlp3mmgsnfz01d6203vfgclzsi7ix5m9"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; };
   bsamGP = derive2 { name="bsamGP"; version="1.2.3"; sha256="1wqs2y9f7fgdvshhzwpjp811h4xhdd1lplpadnpffa2lmyv7vh5s"; depends=[ggplot2 gridExtra MASS]; };
+  bscaling = derive2 { name="bscaling"; version="1.0"; sha256="0v1l6ycf1fyxn79rnhlrfnliirbz9snh8rinfzf34yhlnl0chk1p"; depends=[]; };
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
   bsem = derive2 { name="bsem"; version="1.0.0"; sha256="1h4wsib6ppqj8nbvj4pzkm04bzrdkg9l7xfmzzmld9cswai4iw52"; depends=[BH coda DiagrammeR lattice magrittr Rcpp RcppEigen rstan rstantools shiny StanHeaders viridis visNetwork]; };
   bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
   bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; };
   bsplus = derive2 { name="bsplus"; version="0.1.2"; sha256="19vz8f9ln7kf3myx30lpcz8viv51bbl7n6nppys0zrzb6372cpn1"; depends=[glue htmltools jsonlite lubridate magrittr purrr rmarkdown stringr]; };
-  bspm = derive2 { name="bspm"; version="0.3.4"; sha256="1kb0h6g3r6r0blmgvh3y23rzaz4k99qw3fgsmvsn2bna22ms2yfy"; depends=[]; };
+  bspm = derive2 { name="bspm"; version="0.3.7"; sha256="0fll8kiqn7bcmf1cm4p9i4sny2b6ijk7ls77v5w0cvr8zsbfm8ly"; depends=[]; };
   bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; };
-  bssm = derive2 { name="bssm"; version="1.0.0"; sha256="0c4yxhcrpcq4kx1n097p9yhy4aq7vgsl3m04d323k309ya7bg2mz"; depends=[coda diagis ramcmc Rcpp RcppArmadillo sitmo]; };
+  bssm = derive2 { name="bssm"; version="1.0.1-1"; sha256="09pxpyh40fa7ljfn5xal8n2q3zxcdv73bfn91q2s0zfjbwpfijip"; depends=[coda diagis ramcmc Rcpp RcppArmadillo sitmo]; };
   bssn = derive2 { name="bssn"; version="1.0"; sha256="1brxbvcvqy8n9xpvp5kz47x5ps8hdqgnh6s49051qaylp95qm432"; depends=[ClusterR mvtnorm sn ssmn]; };
-  bst = derive2 { name="bst"; version="0.3-21"; sha256="006pria75zmlc1q8jn353wmb28hm4k1an1qffv9jnj0842md4c8q"; depends=[doParallel foreach gbm rpart]; };
+  bst = derive2 { name="bst"; version="0.3-23"; sha256="1wx039cl8s1j1dwjg50ivn39fckkf8mzgrm953bg02w0p0fpz5bh"; depends=[doParallel foreach gbm rpart]; };
   bsts = derive2 { name="bsts"; version="0.9.5"; sha256="17q82f57xgzgil06z47dgkll88iz6qng7nxw1gjn6sqi5zk72lxq"; depends=[Boom BoomSpikeSlab xts zoo]; };
-  bsub = derive2 { name="bsub"; version="1.0.0"; sha256="1byw2wbbva6i0hsb4xz2f65n6ak7w7bpq9g8n25a1s3h9zvqk4pa"; depends=[clisymbols crayon digest GetoptLong GlobalOptions]; };
+  bsub = derive2 { name="bsub"; version="1.0.2"; sha256="08ahmhg8fcrb5v14g3ij1qi3vpc92r9w02q9h64a7a1m64fib4lw"; depends=[clisymbols crayon digest GetoptLong GlobalOptions]; };
   btb = derive2 { name="btb"; version="0.1.30.3"; sha256="00asbzjgcjd1cm5m1yndbgr60zpvnhbk5b7rhkhc2z1w513bwi8w"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; };
-  btergm = derive2 { name="btergm"; version="1.9.9"; sha256="1z2acmh5k4bzhypr2856wwc3qfns4az058cxab6h24z9y2kr6ki5"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; };
+  btergm = derive2 { name="btergm"; version="1.9.13"; sha256="1md5mxr5in9ag2ydgrkk9kk27zxjx5a9hfxm0mxp3xxcks9h7xk2"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; };
   bubblyr = derive2 { name="bubblyr"; version="0.1.2"; sha256="04agfwk6rmbhlfblfw1irqnv3yrp00zfn4qwy2169b7ypg8r55v2"; depends=[glue htmltools]; };
   bucky = derive2 { name="bucky"; version="1.0.6"; sha256="01rlx0m6h66y1p9k5llg17qpajjhk2vmhbpwc4i5igf5x5g4clgc"; depends=[lmtest sandwich]; };
-  buildmer = derive2 { name="buildmer"; version="1.6"; sha256="135hz3nqmp6sbwhfj1l8cqh6nf5jclz6bmdhy9k2yjhg47j3snwq"; depends=[lme4 mgcv nlme plyr]; };
+  buildmer = derive2 { name="buildmer"; version="1.7.1"; sha256="1439l4kr42ba5z6sh1yds9578zpi0v5c0hwwmb3yh2r5g4lxlrmd"; depends=[lme4 mgcv nlme plyr]; };
   buildr = derive2 { name="buildr"; version="0.0.4"; sha256="1h678bfha02harq0gf35j6rhbwcvf9yzqqidm7131hki42xg2w2q"; depends=[]; };
-  bujar = derive2 { name="bujar"; version="0.2-8"; sha256="13q2zv5q7jyj0vjcqqsf60snpqjpj788559jc1mmj3q11mmii0vv"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; };
+  bujar = derive2 { name="bujar"; version="0.2-9"; sha256="1hx9yrry1v3vl14y1wpfp1l3cymyqhnff86sv6b112b9cfjpwmvq"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; };
   bulletcp = derive2 { name="bulletcp"; version="1.0.0"; sha256="1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln"; depends=[assertthat dplyr mvtnorm Rdpack]; };
   bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; };
   bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; };
@@ -5972,62 +6207,63 @@ in with self; {
   busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; };
   butcher = derive2 { name="butcher"; version="0.1.2"; sha256="0z3rpjvrr42j1qqzmadigcq2ivqd40dhz7yymjmbap9nbz26rb3l"; depends=[fs lobstr modeldata purrr rlang tibble usethis]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
-  bvartools = derive2 { name="bvartools"; version="0.0.3"; sha256="1yxciyvzrzfllnmjspv5ivb9i160y7x2q0d5rn9fjy91wq8hvfag"; depends=[coda Matrix Rcpp RcppArmadillo]; };
+  bvartools = derive2 { name="bvartools"; version="0.1.0"; sha256="1acwfapxz23d24w8f98wszc8j4db5mxhp1fpp06kzadi5cb2a6gg"; depends=[coda Rcpp RcppArmadillo]; };
   bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
   bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
   bvpSolve = derive2 { name="bvpSolve"; version="1.4.1"; sha256="0pxpnf19g085c1a4nb2j48nr611fg1sdl7jlv79nmy4b985yqvrw"; depends=[deSolve rootSolve]; };
   bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; };
   bwimage = derive2 { name="bwimage"; version="1.3"; sha256="1r5l7z90q2qs92dzp78jj4gf1kg1gc85g6y5rn2z8vxjbvbc5vma"; depends=[jpeg png]; };
-  bwsTools = derive2 { name="bwsTools"; version="1.1.1"; sha256="12ww4mb956jxs1329l1zvvc1cgxs69n3naq3502aj80g9giw6xnd"; depends=[crossdes dplyr ggplot2 igraph magrittr rlang tidyr]; };
+  bwsTools = derive2 { name="bwsTools"; version="1.2.0"; sha256="181pm9pr0ykyd3mikn6z4z5m7jkv72sisixmilijh6q3393g9pqw"; depends=[crossdes dplyr igraph magrittr rlang tidyr]; };
   bysykkel = derive2 { name="bysykkel"; version="0.3.1"; sha256="1lvqbax7dvli4265856f9667ckp9g5l4radz2cp0yk0slsjgsdpg"; depends=[glue httr jsonlite lubridate tibble]; };
   bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; };
   bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; };
   c060 = derive2 { name="c060"; version="0.2-5"; sha256="1862lic0vvidbd7s63j65iz4rf70d5337l80vvrbgv8d7fhnxz0y"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
-  c14bazAAR = derive2 { name="c14bazAAR"; version="1.2.0"; sha256="0bgf7fa428zp55qnkzhgghrj4hyv2lkhzg8b6msbq3bz2bah7jlz"; depends=[crayon data_table dplyr httr magrittr pbapply rlang tibble tidyr]; };
-  c212 = derive2 { name="c212"; version="0.95"; sha256="1cgmldy2ysz3934fxh0mmzrb2vw33j3pmws53ng7yxg79mb9ixja"; depends=[coda]; };
+  c212 = derive2 { name="c212"; version="0.98"; sha256="0pzg239602iq56nhxfdvlk26z58lz6vvlbwsdpwhmich0by4gx4x"; depends=[coda]; };
   c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; };
   c3 = derive2 { name="c3"; version="0.3.0"; sha256="1c2k7ml153bby749qi3a6nckhwwr71mvvps9dkbzkxkwnmlwpz1h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; };
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
   cAIC4 = derive2 { name="cAIC4"; version="0.9"; sha256="0imy4kq09an9azqi3aahw3lsmby8km2am0w7fb314xq6ghzf9xmp"; depends=[lme4 Matrix mgcv mvtnorm nlme RLRsim]; };
   cIRT = derive2 { name="cIRT"; version="1.3.1"; sha256="1x7cbawzzpzripzyg4yavc9s6kx06ff4q151kbvylr9wsf78s6qg"; depends=[Rcpp RcppArmadillo]; };
-  cNORM = derive2 { name="cNORM"; version="1.2.3"; sha256="0ywx8cszyg9zk5pp86f0rigv2m04c93z3p6dqhf6nn8hm8pj41px"; depends=[lattice latticeExtra leaps]; };
+  cNORM = derive2 { name="cNORM"; version="2.0.0"; sha256="1pj9mwkb1hq9wvhgngw3gayl0jri861j5dcf4k3albfw15qdxxx2"; depends=[lattice latticeExtra leaps]; };
   cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; };
   cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; };
   cRegulome = derive2 { name="cRegulome"; version="0.3.2"; sha256="0cvxad73l85zsgqmis5p24v71kkzi784b8v5z07f0dh9yp41p96q"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; };
-  cSEM = derive2 { name="cSEM"; version="0.2.0"; sha256="0ynqclr78vi97bd4wds0zws2iydziwzqsfjhpcpi87wca0chm4z8"; depends=[abind alabama cli crayon expm future future_apply lavaan magrittr MASS Matrix matrixcalc matrixStats polycor psych purrr Rdpack symmoments]; };
+  cSEM = derive2 { name="cSEM"; version="0.3.0"; sha256="1fl486lm5mxr9pxmpjy0xbzq43gq3v2s6j6g9w7r7ck6mfd53ivb"; depends=[abind alabama cli crayon expm future future_apply lavaan lifecycle magrittr MASS Matrix matrixcalc matrixStats polycor progressr psych purrr Rdpack rlang symmoments]; };
   ca = derive2 { name="ca"; version="0.71.1"; sha256="095lk7p2b9835hc3a03c4019wg0baf0dhz6c2vqpaq1m9k4jy304"; depends=[]; };
   caMST = derive2 { name="caMST"; version="0.1.3"; sha256="1hhxyw7sbzm2v09xaxvq347gl8p5wkjxx43187mqbw0nzknlg5bg"; depends=[catR diagram mstR]; };
-  caRamel = derive2 { name="caRamel"; version="1.1"; sha256="06nppjx66xwdqchna5j6xlhfzs5g36nv8srwivbnfixys29awabb"; depends=[geometry]; };
+  caRamel = derive2 { name="caRamel"; version="1.2"; sha256="15w1p770cjsxs198rlc8fzs9m8a4pg5day2iya7xz0fkwb3xmm2z"; depends=[geometry]; };
   caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
   caTools = derive2 { name="caTools"; version="1.18.0"; sha256="0y1kgyiy322yhb0phzwvf2zgjz9awp13lhzhk9v1ddg88656jhq3"; depends=[bitops]; };
-  cabinets = derive2 { name="cabinets"; version="0.4.0"; sha256="1crxr1pxs4if86g405x47709zdyv8fqdmlm2wpilcl2bdcpia0y4"; depends=[crayon fs git2r glue here purrr R6 rjson rstudioapi stringr usethis withr]; };
+  cabinets = derive2 { name="cabinets"; version="0.6.0"; sha256="1pypn29v91zqncv5kxinfz0f633qmic7n87rf4amjrq83iiid6md"; depends=[cli crayon fs git2r glue R6 renv rstudioapi stringr]; };
   cabootcrs = derive2 { name="cabootcrs"; version="2.0"; sha256="1a473ca90306brhfrzf5hw6d6v252kd2vfwkvgblwy26jmrrr2km"; depends=[lpSolve]; };
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
-  caesar = derive2 { name="caesar"; version="1.0.0"; sha256="0z1bb5cmjr97l3h9svy4r4bj58jkmq6kdkip577cvy2xf5q9n410"; depends=[binhf]; };
+  caesar = derive2 { name="caesar"; version="1.1.0"; sha256="17w19m1c4a8x68bfbll71r9d3d34xnqw7lkhvqbnajd0cdm9xpa2"; depends=[binhf]; };
   caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; };
   cairoDevice = derive2 { name="cairoDevice"; version="2.28.2"; sha256="0hd8lcps8s2nmbqgrxc19dslsvppn1fbwylczx6h3isiv9zmxapj"; depends=[]; };
   calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; };
   calcUnique = derive2 { name="calcUnique"; version="0.1.2"; sha256="012mjayj90m5gsd8mhm2ic00pa0bnrjiidq9mv4vxj8slwp641rz"; depends=[]; };
   calcWOI = derive2 { name="calcWOI"; version="1.0.3"; sha256="1bxsn9b99hnb365qvlzr0ymwavamlyhs5sm9s2fdjh4zv3f32n3l"; depends=[dualtrees LS2W wavethresh]; };
   calculus = derive2 { name="calculus"; version="0.2.1"; sha256="0hs7hzjl6xjza20v9zx9a1piywxa6w3h2rskr52d1dcbc0vwhinp"; depends=[Rcpp]; };
+  calendR = derive2 { name="calendR"; version="1.1"; sha256="1gji7ns35swdgg7bzq3vrzi4hnb98c5iw6r1j0k7nn2fdx7kbffp"; depends=[dplyr forcats gggibbous ggimage ggplot2 suncalc]; };
   calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; };
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
   calibrate = derive2 { name="calibrate"; version="1.7.7"; sha256="19kgrnsyq67iqv1biyssqi30a6v2836ql20nabpy2m692ns0jfvi"; depends=[MASS]; };
   calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; };
   calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; };
-  callr = derive2 { name="callr"; version="3.4.3"; sha256="1dc20gdawy9mhnc452qlshv2p4krs6c2gymvpv365mn141zjgdq1"; depends=[processx R6]; };
+  callr = derive2 { name="callr"; version="3.5.1"; sha256="15l6ppsxdadlnl4fk0f8bvf327n8izk96px5d08m1ay9iij8qcyf"; depends=[processx R6]; };
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   calpassapi = derive2 { name="calpassapi"; version="0.0.3"; sha256="1vhx5h7ah75cs1mlw25x7hal90m47596kr7fx2pd8fslq7il7p1b"; depends=[digest dplyr httr jsonlite stringr]; };
+  campfin = derive2 { name="campfin"; version="1.0.4"; sha256="0c9hdg8ylw6m0drb87fcqj4pxkyg824xvp2554aw1qij4pk63f1q"; depends=[dplyr fs ggplot2 glue here httr lubridate magrittr purrr readr rlang scales stringdist stringr tibble]; };
   camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; };
   camtrapR = derive2 { name="camtrapR"; version="2.0.3"; sha256="13zg8kx28il7rbyr2p3c1xdxx84b7shpcmgavzjqzh6wjm5bh5mh"; depends=[data_table overlap secr sp]; };
   cancensus = derive2 { name="cancensus"; version="0.3.2"; sha256="17qi7kx23iyvxy5yy6g46avlh988a8l4r7p040waqhz4nd9zy31q"; depends=[digest dplyr httr jsonlite rlang]; };
   cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; };
   cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; };
   candisc = derive2 { name="candisc"; version="0.8-3"; sha256="0bshi686sad31052glai1wmzxshvafp1vkar7zirds3x737gb0fp"; depends=[car heplots]; };
-  canprot = derive2 { name="canprot"; version="1.0.0"; sha256="19dcknp6lrw7r3hs33lqn1iiwqgd34pb470ai8bvxhybx21hzjzi"; depends=[CHNOSZ knitr MASS rmarkdown xtable]; };
+  canprot = derive2 { name="canprot"; version="1.1.0"; sha256="0y6azzs603bf7rrz8hfql754xsdywl35846hj70f6sn1dj5wbzlk"; depends=[MASS rmarkdown xtable]; };
   cansim = derive2 { name="cansim"; version="0.3.5"; sha256="0lqkyq2n8v2y172ihyb9vh3mimrkg2yx2c42cxdaz4p7gqiq7z8r"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; };
-  canvasXpress = derive2 { name="canvasXpress"; version="1.27.6-1"; sha256="0vk2iddcyc81qgvlw3k31sh2hsjbxsrcb77mxay3s32wkqr7knwa"; depends=[htmlwidgets httr]; };
-  canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.29.0"; sha256="12zlw950vjdjlh786c0l4wmhhzmzpgcsjfdyrmqnr1mb1mpx9vqz"; depends=[]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="1.29.6"; sha256="0xy85rj2zd972ziikycsfzghv3q54b2fw4nj29clj2liw4ksm5fq"; depends=[htmlwidgets httr]; };
+  canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.30.5"; sha256="1w6lyc02n2gd59y2q2wwmx8a0awwgv95y6pjcxbj8438djnlqkk7"; depends=[]; };
   cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; };
   caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; };
   capitalR = derive2 { name="capitalR"; version="1.3.0"; sha256="08lvncia9mdrnw84zydf1k7336xawiirh2swziqfwx3z1n172n52"; depends=[]; };
@@ -6037,13 +6273,14 @@ in with self; {
   captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; };
   capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; };
   capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
-  car = derive2 { name="car"; version="3.0-9"; sha256="1clh8c7mj87i4hz27l16w76dpw7k4mlnjbgm9mbrhrfkv0lpb63c"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; };
+  car = derive2 { name="car"; version="3.0-10"; sha256="1w95b7xm0bna3qm637pwyv4s7294ffz9dl153naprd79zv91dqqw"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; };
   carData = derive2 { name="carData"; version="3.0-4"; sha256="09270j39n4jpswxqps20b12zaj8dz4rrqpk2l2j5bnf1xzizb9nd"; depends=[]; };
   carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; };
   caracas = derive2 { name="caracas"; version="1.0.1"; sha256="157m594lyl9726cvyyw3vgbyphrmny01pd2c2yw464krfxxxv0i4"; depends=[reticulate]; };
-  carat = derive2 { name="carat"; version="1.1"; sha256="0c4fbk13gra8vhqxfv0wswnfh72kjd7ppwsr3kw4w6g4xprxmnwp"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; };
+  carat = derive2 { name="carat"; version="1.4"; sha256="1dlmmnsdy1vjiv0fw1k0h0xzd05hqryzc4vw9gbjj3ii6jyds8hk"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; };
   carbonate = derive2 { name="carbonate"; version="0.1.3"; sha256="0y1wjrlh0rbfl1wz9028b637gs20giifp9ykg1yir2ak7fpwbq85"; depends=[clipr details httr magick R6 RSelenium rtweet wdman yaml]; };
   carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; };
+  card = derive2 { name="card"; version="0.1.0"; sha256="1api0j06fp5av5a48vnnm1wvwdcskynf0xsj9pb41njxdh9v8daf"; depends=[broom data_table dplyr generics ggplot2 ggrepel hardhat Hmisc lubridate lutz magrittr purrr readr recipes rlang sf stringr survival tibble tidyr]; };
   cardidates = derive2 { name="cardidates"; version="0.4.8"; sha256="1mfd5sgzswhs9rln2bgxx8c54z69xp8l5dfmx7jfh8jl43qkzpjf"; depends=[boot lattice pastecs]; };
   cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; };
   care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; };
@@ -6056,10 +6293,11 @@ in with self; {
   carpenter = derive2 { name="carpenter"; version="0.2.2"; sha256="13ahhdc6f5ngrhb7slqbxzfs3wswixh0argyr6l46cv4fdkaa80s"; depends=[dplyr lazyeval magrittr pander tibble tidyr]; };
   carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; };
   cartograflow = derive2 { name="cartograflow"; version="1.0.3"; sha256="09n3pgm70frrx9li1djrwkf4lzcq9c1xjs037vmsb1as0xvd19a1"; depends=[dplyr ggplot2 igraph maptools plotly reshape2 rgeos rlang sf sp]; };
-  cartogram = derive2 { name="cartogram"; version="0.2.0"; sha256="1b6jr6sf821xa2cbm09zmnvvai6azh7p9zhz78a4yqpiwdw122sc"; depends=[packcircles sf]; };
-  cartography = derive2 { name="cartography"; version="2.4.1"; sha256="0pb914zbqvii95mfsqkxs2y22fj620ry2hdqbkbvh5pdq5ls549v"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; };
+  cartogram = derive2 { name="cartogram"; version="0.2.2"; sha256="0kz8hwdr5n8llkylwaixnb66f4pzaxxniz57spxhqizmi6qay7yd"; depends=[packcircles sf]; };
+  cartography = derive2 { name="cartography"; version="2.4.2"; sha256="04i1lwf4l420dcgkzr529883yyhfirfr2b0bnksrwili44nfj9ai"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; };
   cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; };
   carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; };
+  cascadess = derive2 { name="cascadess"; version="0.1.0"; sha256="105m5w8rb8bkzmlc5nwb4g0wl8jgvz63jxq665x4jfq0z78qiwgd"; depends=[crayon htmltools magrittr rlang]; };
   caschrono = derive2 { name="caschrono"; version="2.2"; sha256="0lbf7j6p5gzm4kk8sgzcmxwwzg59wp6g6l38m04609lpcsvxkd52"; depends=[Hmisc zoo]; };
   cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; };
   caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; };
@@ -6067,14 +6305,15 @@ in with self; {
   casen = derive2 { name="casen"; version="0.1.4"; sha256="19f52vqrzqd8mmnaf39jmsm5mhydv74gpnb4rxr3n9w07ppb77c9"; depends=[dplyr glue haven janitor labelled magrittr purrr rlang srvyr survey tibble tidyr]; };
   casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; };
   cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; };
-  castor = derive2 { name="castor"; version="1.6.2"; sha256="03i69yk5nwrrw7zhahxk597cs7iamwy966qks8yd9hzl5zj5fpy6"; depends=[naturalsort nloptr Rcpp]; };
+  castor = derive2 { name="castor"; version="1.6.4"; sha256="0dl7j1ccbfr43c1jn2g956f12fvhwrf49w391s20d2q70fnmq7c7"; depends=[naturalsort nloptr Rcpp]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   cat_dt = derive2 { name="cat.dt"; version="0.2.0"; sha256="1g9058gqkk2ij29aicvvqx9yx7iwh4a58akp6qznppfln4zw9wcb"; depends=[ggplot2 Matrix Rglpk]; };
+  cat2cat = derive2 { name="cat2cat"; version="0.2.0"; sha256="0rbzzf8yxi3d9c3xx91hhv8y5mmks40gb6azdd9la22gaywc5m75"; depends=[assertthat caret data_table dplyr MASS progress randomForest rlang tidyr]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
   catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; };
-  catSurv = derive2 { name="catSurv"; version="1.2.0"; sha256="0z91643grmzgd1qn867c7nk3v38vyy6h7q0k082r6hgnfbl6vx6c"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; };
+  catSurv = derive2 { name="catSurv"; version="1.3.0"; sha256="1vj7cw6v94p4ma61wwyxzsh36cj6fp38pqfjmyqr0czwgz04db05"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; };
   catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; };
-  catchr = derive2 { name="catchr"; version="0.2.2"; sha256="02swyg21wd6793nk590lis5bh36lb2mjvv1k05szf22k08vsqv77"; depends=[purrr rlang]; };
+  catchr = derive2 { name="catchr"; version="0.2.3"; sha256="1ix90lqx7m4rx0i6hzj1bph4yg9ch9w8qm3f9yigq1gm74zabzrl"; depends=[purrr rlang]; };
   catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; };
   catdap = derive2 { name="catdap"; version="1.3.5"; sha256="0fyhl69z2lznymvpzxra9qvcg85ggzkfjy68c6mzdmf1ja44d2k5"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.2"; sha256="14kx7yi0cv6dyh9wjasb8gn6cp1bhglgwql7dc2a7lqvdcp0d5vj"; depends=[MASS]; };
@@ -6083,51 +6322,53 @@ in with self; {
   catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; };
   catfun = derive2 { name="catfun"; version="0.1.4"; sha256="1482rll333fvy4h58f15flfs7qrck3vk9bzpdn3hayhnmc7svmma"; depends=[broom cli DescTools epitools Hmisc magrittr rlang]; };
   cati = derive2 { name="cati"; version="0.99.3"; sha256="0hq6hdzriab380pc0mx6g8xqflqj5mznr4b7fqw2f51kx8ang8hg"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; };
-  catlearn = derive2 { name="catlearn"; version="0.7.1"; sha256="194gqx94wkl4zr01ms5g684ma328q35cfqpwa63jv98scrybrbwj"; depends=[doParallel dplyr foreach Rcpp tidyr]; };
+  catlearn = derive2 { name="catlearn"; version="0.8"; sha256="0vk4amvl6l4cxhfcr9z5glyb752vfsizlzqb14jv04am391xl4qd"; depends=[doParallel dplyr foreach Rcpp RcppArmadillo tidyr]; };
   catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; };
+  catmaply = derive2 { name="catmaply"; version="0.9.0"; sha256="0x2pzvjjhbwnvj8q1882bvqg895nj2airgmcidkixjmbq267vajz"; depends=[dplyr lubridate magrittr plotly rlang tidyverse]; };
   catnet = derive2 { name="catnet"; version="1.15.7"; sha256="015qh9k0jj5plp777j3kl20601qiwadkaqrdb0483h3gwqwy828g"; depends=[]; };
   catseyes = derive2 { name="catseyes"; version="0.2.5"; sha256="11n2kxkqv4hqymkj6lkpcvhq6325q8f5w384xf8zb71jl8vx616l"; depends=[]; };
-  catsim = derive2 { name="catsim"; version="0.2.1"; sha256="1ri57jm48ydxkrla46chys86yl4w7jyi1r5rzh4r7viwjp2mrgmz"; depends=[Rcpp testthat]; };
+  catsim = derive2 { name="catsim"; version="0.2.3"; sha256="1gz38xrzbray5ciiimkzdass8bhmiqxh6bcngjm5i8dvafk5gf9g"; depends=[Rcpp testthat]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
   cattonum = derive2 { name="cattonum"; version="0.0.5"; sha256="11h9nh2i2bmd0b562l5avhwpj9ppnfmzd9nsv94cymhwn5h6nmg6"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; };
   causact = derive2 { name="causact"; version="0.3.3"; sha256="11dq6bsjbfk4zgipyhgapq2r2akh82nx3qf7wwaa38lbrrcpiy18"; depends=[coda cowplot DiagrammeR dplyr forcats ggplot2 greta htmlwidgets igraph magrittr purrr rlang rstudioapi stringr tidyr]; };
+  causalCmprsk = derive2 { name="causalCmprsk"; version="1.0.0"; sha256="025p02fph5zirbccw1nxk29fdx53r5jd9asll7pwfnr45l8549pi"; depends=[data_table doParallel foreach inline purrr survival]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
   causaleffect = derive2 { name="causaleffect"; version="1.3.10"; sha256="0z7vdhm9g95s9nkyx4jdzqrap24nb63n8mr23b9gqm6s1m47sc0z"; depends=[ggm igraph XML]; };
   causaloptim = derive2 { name="causaloptim"; version="0.7.1"; sha256="0i74plwzb69pvrqfwjf7nabvj57bid3ff3gm08hgvfincv1mh6xn"; depends=[igraph Rcpp shiny]; };
   causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; };
-  causalweight = derive2 { name="causalweight"; version="0.2.1"; sha256="0r0a0i9y1cfmv5kkic7rpqpk4ixs6xql2k4ssmcdnh2zl5q68m30"; depends=[e1071 glmnet hdm LARF mvtnorm np ranger SuperLearner xgboost]; };
+  causalweight = derive2 { name="causalweight"; version="1.0.0"; sha256="1lbiwmpgs7aqa3z4xz3mfq6pwnxhy264cw0di43sa7b14fprvk20"; depends=[e1071 fastDummies glmnet hdm LARF mvtnorm np ranger SuperLearner xgboost]; };
   cba = derive2 { name="cba"; version="0.2-21"; sha256="0j2hbp0xlfp28gqgnkcvmb4yp1kc5m2bp5x7pr4m1pz2b1s7h7m6"; depends=[proxy]; };
+  cban = derive2 { name="cban"; version="1.0"; sha256="0y0mfb177r9k8j2clyrrs9hjy5kna1z6j23dnb50wkh7jf4496s2"; depends=[]; };
   cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; };
   cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; };
-  cbinom = derive2 { name="cbinom"; version="1.3"; sha256="0d9rsvs0zmm37pf1v9vbkkghi0pjlavzi5ar2cvsjapg9x4zg6wl"; depends=[Rcpp]; };
+  cbinom = derive2 { name="cbinom"; version="1.5"; sha256="0zhsxhbg9v3p5v21lmj00qaag4j6b5qla9hd86zggsw24x2amg1y"; depends=[Rcpp]; };
   cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; };
   cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; };
-  cbq = derive2 { name="cbq"; version="0.2.0.1"; sha256="0809l4qziybxhmkglj9763sjndzjl31c83ghhh2hdy93bcw75bsm"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; };
+  cbq = derive2 { name="cbq"; version="0.2.0.2"; sha256="0vg1mhk147pib61v4im3ikc551c2nmmcfah9fjw9c978gf81g32n"; depends=[BH Formula Rcpp RcppEigen rstan rstantools StanHeaders]; };
   cbsem = derive2 { name="cbsem"; version="1.0.0"; sha256="0gc14rhfy566yw2yqzq7yk0xanpzcz7zp3km483azgk816vakbn4"; depends=[]; };
-  cbsodataR = derive2 { name="cbsodataR"; version="0.4.1"; sha256="1nrkh2505xkpdrvs1wlibp8md0qvlpknwiydiiqn216ipzjyp8p7"; depends=[jsonlite whisker]; };
+  cbsodataR = derive2 { name="cbsodataR"; version="0.5.1"; sha256="02dalankaa4lfv9r7bc9cphmwb0mq6an7bs44rihipj8dsjd0v9y"; depends=[jsonlite whisker]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
   ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; };
   ccaPP = derive2 { name="ccaPP"; version="0.3.3"; sha256="1p08gih67950khfkzhiksa8qw2f9mrmyqiiapsjpv6zc5g0lchhk"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
-  ccafs = derive2 { name="ccafs"; version="0.1.0"; sha256="1bb1127mfpz6s2hs43msjcxk56bsk6vhxznpnv0fb21r8xnx0g7m"; depends=[crul data_table httr jsonlite rappdirs raster tibble xml2]; };
   cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
-  cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
+  cccp = derive2 { name="cccp"; version="0.2-7"; sha256="080rr1nsj465458yfawbcfgvdng42gzbzjzblvkdm5c1hkwnn7ij"; depends=[Rcpp RcppArmadillo]; };
   cccrm = derive2 { name="cccrm"; version="2.0.1"; sha256="15v2d4im7ji7pbi94wagg010wdgf4ly24kyczx4akcq3qd4vihff"; depends=[Deriv dplyr nlme tidyselect]; };
   ccda = derive2 { name="ccda"; version="1.1.1"; sha256="1kka4vmhpcnl4skdmijzsxrfj6dgax6hhlxvp7gkqlfaazq8pzf0"; depends=[MASS]; };
   ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; };
-  cchs = derive2 { name="cchs"; version="0.4.1"; sha256="1aq6mc3hyhp3g8yzk6y82zz8nriwmxms9lgpw06rf857im6bn5ls"; depends=[survival]; };
+  cchs = derive2 { name="cchs"; version="0.4.2"; sha256="18zk50g7rw8cb09fczpcdgzjl1b06rgf6lwy99sg7nq4scnzgzm8"; depends=[survival]; };
   cchsflow = derive2 { name="cchsflow"; version="1.6.0"; sha256="0fj27d4hz4yrs7crqi1zbn7xwbibkjr1nr6srj1zy8lkl7rhicy2"; depends=[dplyr haven magrittr sjlabelled stringr]; };
-  cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; };
+  cclust = derive2 { name="cclust"; version="0.6-22"; sha256="1wyiwq16zyvc0vqbap1y4zfkvlgzwzjrx4vmrjhzlqxci8jryjbs"; depends=[]; };
   ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; };
   ccostr = derive2 { name="ccostr"; version="0.1.0"; sha256="0yfmj8v7ip595v87w9dmlzl5rih2j0lsapswh9b9vvc20wnk48ld"; depends=[data_table dplyr forcats ggplot2 knitr msm Rdpack rlang survival tibble]; };
   ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; };
   ccss = derive2 { name="ccss"; version="1.0"; sha256="0m2facn6kwxrjxg9a8z0pjnhp0rkgw6nxj6sac93ig24zygx4380"; depends=[]; };
   cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; };
-  cdata = derive2 { name="cdata"; version="1.1.7"; sha256="0liwnq4hvgsprkbk9lb4aldr2s9zjy65myj0dpfr7kkjkzd9akxq"; depends=[rqdatatable rquery wrapr]; };
+  cd = derive2 { name="cd"; version="0.1.0"; sha256="1zzhkrsidny5h6jvbip2a4i4klqdgw7s1w8h8hkc3mpbxjfr615r"; depends=[]; };
+  cdata = derive2 { name="cdata"; version="1.1.9"; sha256="1hnc74psz6940v0yqw7zrp9a75g0bmq5a0qfpddxkcij3vm6qiya"; depends=[rqdatatable rquery wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
-  cdcatR = derive2 { name="cdcatR"; version="1.0.1"; sha256="117pw56k44qfz56nd659f6zrsxipk2kj5py96ql3bmds91f96j1h"; depends=[cowplot doSNOW foreach GDINA ggplot2 NPCD]; };
-  cdcfluview = derive2 { name="cdcfluview"; version="0.9.1"; sha256="0j892zwg7y9gm057n1nk7r08wa8b611dzbanphfplh33j66rm4yg"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf tibble units xml2]; };
+  cdcatR = derive2 { name="cdcatR"; version="1.0.2"; sha256="12xrk4v8rlqkndw3pdzvzv7qi86y2xvvsnh36nmpib4qdf6b2jry"; depends=[cowplot doSNOW foreach GDINA ggplot2 NPCD]; };
+  cdcfluview = derive2 { name="cdcfluview"; version="0.9.2"; sha256="05ah96blwkgdzayi7ay14vy9va0y4lxarxapnvw420jy1k40y27j"; depends=[dplyr httr jsonlite MMWRweek progress purrr readr sf tibble units xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; };
-  cde = derive2 { name="cde"; version="0.4.1"; sha256="19aifi2wh3hi929bf15v96z6gbzawgawjdipvx1v95krzij8fl2n"; depends=[data_table viridisLite]; };
   cder = derive2 { name="cder"; version="0.2-2"; sha256="0aw2c170sqx2y4iz16avqijahwxlsaz590mxvsx4bicfd8nrcynk"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; };
   cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.2"; sha256="094mk2hvxww2lndx5wkw368ynqx6klbdwl30d1yv7kqmr2yy7388"; depends=[Formula MASS pracma]; };
   cdlTools = derive2 { name="cdlTools"; version="0.15"; sha256="1p5d48v6nwlrgqqi0sg98zfhiycjcha6g12a7515xrvp6f5p28jn"; depends=[httr raster]; };
@@ -6142,31 +6383,33 @@ in with self; {
   celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; };
   cellOrigins = derive2 { name="cellOrigins"; version="0.1.3"; sha256="0nxhyz9bz0f598wpr10hm1d0zx83450xf9jkrl279v46x8sx36n4"; depends=[iterpc]; };
   cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
-  cellWise = derive2 { name="cellWise"; version="2.1.1"; sha256="10cx5nmqcxx6prwkcpv7av10qcl4qygra9sdnbavbvwgvf46l28z"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; };
+  cellWise = derive2 { name="cellWise"; version="2.2.3"; sha256="0b9m98mdp2zv4qzdh8l2bj4ipgbbg70k1rid272fvywh9xv2vvzc"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; };
   cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; };
   celltrackR = derive2 { name="celltrackR"; version="0.3.1"; sha256="1mnqaklc3rkx5mm41n99ky11bjs4l0dppapkwfvkyg3a0h0xzsbb"; depends=[ellipse]; };
-  cem = derive2 { name="cem"; version="1.1.20"; sha256="058yg297x5i8s9lzfljrn568a8mpx7dcnqhv3b02a6cpnqx0n4py"; depends=[combinat lattice MatchIt nlme randomForest]; };
+  cem = derive2 { name="cem"; version="1.1.27"; sha256="096ilbrkxjsbyf3pk126y2dqc3hzbnfpagr96byagap01q24pyij"; depends=[combinat lattice MatchIt nlme randomForest]; };
   cemco = derive2 { name="cemco"; version="0.1"; sha256="00x9313rlxjb1lrfgx394awyhn2ivkn291q6sb5rpmghsvwq0qpb"; depends=[clusteval doParallel foreach MASS mclust mvtnorm nnet rootSolve]; };
   cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; };
   cenROC = derive2 { name="cenROC"; version="1.2.0"; sha256="07ja3yyqmb9cs76if32aksgcwki3y6nh13lvn9j0bdgbgqx65f3r"; depends=[condSURV icenReg Rcpp RcppEigen survival]; };
   censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; };
   censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
   censReg = derive2 { name="censReg"; version="0.5-32"; sha256="044f3a1vkr318drcipv9zz5qsx85ld95x7fsy0w6cpc6zlkwxsyb"; depends=[glmmML maxLik miscTools plm sandwich]; };
+  censo2017 = derive2 { name="censo2017"; version="0.2"; sha256="1w09jlpy2zaqpn6ddny9sm7a5v2fjlis3d4lvnky0hx7x9w1wjw0"; depends=[cli crayon DBI httr purrr R_utils rappdirs RSQLite rstudioapi sf tibble]; };
   censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; };
   censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; };
-  censusapi = derive2 { name="censusapi"; version="0.6.0"; sha256="03h1np7v539mgnxlmwp1d5jv3nlm2fsylw53hqxd736q3h2rjz0s"; depends=[httr jsonlite]; };
+  censusapi = derive2 { name="censusapi"; version="0.7.1"; sha256="1vvvbig4q9ix8qdl67y2chya2qimaawanh7vznylj1x7is0j49ia"; depends=[httr jsonlite]; };
   censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; };
   censusxy = derive2 { name="censusxy"; version="1.0.0"; sha256="0wvr109hv2injkg2kh6n82wik6pd25m4jx3yiqpy07dmh6ddd5xp"; depends=[httr]; };
   censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; };
   centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; };
   centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; };
-  centrifugeR = derive2 { name="centrifugeR"; version="0.1.4"; sha256="1gky1j5glgigpj21hhm6mkc2xvvb9q8k3y1p4zn40r82lvggpnhz"; depends=[pracma]; };
-  cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
-  cepR = derive2 { name="cepR"; version="0.1.1"; sha256="0ds3hv1va3179i37n7fp4120bq7rmj2hpxrbnslyjgw44hr4p900"; depends=[httr magrittr purrr tibble]; };
+  centrifugeR = derive2 { name="centrifugeR"; version="0.1.5"; sha256="11xqsrm3q2wl10ncn5l50grqybc1b5fs7iy150dx94whll2sw96z"; depends=[pracma]; };
+  cepR = derive2 { name="cepR"; version="0.1.2"; sha256="02dj6vyfgc0lsgclbsmzpms1hnnwb3yjdayim7b7vpciym2c8ww3"; depends=[dplyr httr magrittr purrr tibble]; };
+  cepiigeodist = derive2 { name="cepiigeodist"; version="0.1"; sha256="0i1i8hyl4bkcyxrrfqs3m9yny33w0i33409f4kx83wfnablc54sv"; depends=[]; };
   cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; };
   cepreader = derive2 { name="cepreader"; version="1.1-3"; sha256="0jqmz3gm6fprfjjzw22qdk055csvy1np7vm0mjjsnpim7js5xvc2"; depends=[]; };
   ceramic = derive2 { name="ceramic"; version="0.6.0"; sha256="0n0l1b7gb05kqjrh696faq868q3nbwlg34y6wgr0w205kdq6qs17"; depends=[curl dplyr fs glue jpeg magrittr png purrr rappdirs raster reproj rlang slippymath sp spex tibble]; };
   cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
+  ceser = derive2 { name="ceser"; version="1.0.0"; sha256="1k2k2gykyajlahl7xvpxdla0ghapdxl24yi575pgq2421fpxq2i4"; depends=[dplyr lmtest magrittr purrr tibble]; };
   cetcolor = derive2 { name="cetcolor"; version="0.2.0"; sha256="0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"; depends=[]; };
   ceterisParibus = derive2 { name="ceterisParibus"; version="0.4.2"; sha256="0hxklydsqb69y5sv2hanp5ja9k0063swf5si1j6gcj15lp7phpif"; depends=[DALEX ggplot2 gower knitr]; };
   cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; };
@@ -6177,16 +6420,15 @@ in with self; {
   cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; };
   cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
   cgal4h = derive2 { name="cgal4h"; version="0.1.0"; sha256="0ghcwjfqlhqysnl8mgz6zp7dyqh8pvnpvphwjwk6zqi24n3nhac2"; depends=[]; };
-  cgam = derive2 { name="cgam"; version="1.15"; sha256="0bgvsjhafhhkhdq2b1dvji72913wrhi05adzrsnhrk7vwf8xxjki"; depends=[coneproj lme4 Matrix svDialogs]; };
+  cgam = derive2 { name="cgam"; version="1.16"; sha256="02kbn44jv455vn5f64dsa739y5262xkb34i6azyrib2gg3dhvq8j"; depends=[coneproj lme4 Matrix svDialogs]; };
   cgdsr = derive2 { name="cgdsr"; version="1.3.0"; sha256="07yc819hkabpzzh0g0cbqza6bcfy67b2marrzz1lj97f9iba78ja"; depends=[httr R_methodsS3 R_oo]; };
-  cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
   cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; };
   cglasso = derive2 { name="cglasso"; version="1.1.2"; sha256="1z7scwbcn63iah9aih565rd4lyi6n2y5k2593w885dh1n6j5ss0i"; depends=[igraph MASS]; };
   cglm = derive2 { name="cglm"; version="1.1"; sha256="1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j"; depends=[data_table nleqslv Rcpp RcppArmadillo]; };
   cgmanalysis = derive2 { name="cgmanalysis"; version="2.7"; sha256="0gwlkk0s3xvzy1kgl0hn163rg387y592h6p3f9bgmc24mznwadd4"; depends=[ggplot2 lubridate pastecs pracma readr readxl XML zoo]; };
   cgraph = derive2 { name="cgraph"; version="6.0.1"; sha256="0hmp07iz7ya3j8jaghm4pa0b84lsinc48rsibbh47sd3i6pkxfik"; depends=[]; };
-  cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; };
-  chandwich = derive2 { name="chandwich"; version="1.1.2"; sha256="196k13qg9kl94yki989ncx2mrvvj82vv8mi453s8lqmv9s875841"; depends=[numDeriv]; };
+  cgwtools = derive2 { name="cgwtools"; version="3.2"; sha256="003d9yw8d0as15glshvx1vsiqz91r5xkhy8ryhxk28hlpwfvp160"; depends=[]; };
+  chandwich = derive2 { name="chandwich"; version="1.1.3"; sha256="00lry1y4m1m1q5wrcscxcg9k6caznl58nznzn7n7njp6n1xzmwdw"; depends=[numDeriv]; };
   changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; };
   changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; };
   changepoint_geo = derive2 { name="changepoint.geo"; version="1.0.1"; sha256="1jlixdrq97n6bh09jq3hamlwkqfqbmqs14kr8swx20f8fvfr3fj2"; depends=[changepoint changepoint_np ggplot2 Rdpack]; };
@@ -6202,33 +6444,34 @@ in with self; {
   chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; depends=[geometry]; };
   checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; };
   checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; };
-  checkdown = derive2 { name="checkdown"; version="0.0.5"; sha256="1xd4czhgczjc78wcx8mz9g35ba9q6askda4d9m95sjq0j8pwlkis"; depends=[knitr markdown]; };
+  checkdown = derive2 { name="checkdown"; version="0.0.7"; sha256="1bjij565vss2x8xbgq5qxx1d1snfw9wnphj0jhbm6vxxh2hg6g46"; depends=[knitr markdown]; };
   checkmate = derive2 { name="checkmate"; version="2.0.0"; sha256="193gkifr9spp0x0rwnjq1spdhjkfkh4mv27iklskcj604075phhd"; depends=[backports]; };
-  checkpoint = derive2 { name="checkpoint"; version="0.4.9"; sha256="0kwbfkk3zm60w993gvwxxrikbxjdw4sgjrs9h18v3yw19kw1q9m5"; depends=[]; };
+  checkpoint = derive2 { name="checkpoint"; version="0.4.10"; sha256="0shj9pgpr3fhf1cwzr8q583nyl6f2gcjqn8b5mjy8gvn0fbswqkk"; depends=[]; };
   checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; };
   cheddar = derive2 { name="cheddar"; version="0.1-636"; sha256="1lf39v0p583jgiyb02vx0rgbwzmmhgkfpwjib2fzh9ffbs8bfk66"; depends=[]; };
-  cheese = derive2 { name="cheese"; version="0.1.0"; sha256="11nhfbif5hcfv3389fl74ggyw73xwh013zsin57azrp5mbj1wml5"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; };
+  cheese = derive2 { name="cheese"; version="0.1.1"; sha256="1r4n9li33am0bsyl57kzg1m9g4w0pzbw6garcdp3qk7lwqxy2y26"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; };
   chemCal = derive2 { name="chemCal"; version="0.2.1"; sha256="1kq82x57qm68im6lyqjqmh4p34s4y7fn5v6ymclxjr47mdv8npb5"; depends=[]; };
-  chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; };
+  chemmodlab = derive2 { name="chemmodlab"; version="1.1.0"; sha256="0b7qwysqzvhhyxdvvr6lb65aqwhrh1a2wk3p5xplnfjxpy9gh7lm"; depends=[caret class e1071 elasticnet fingerprint lars MASS MSQC nnet pls pROC randomForest rcdk rpart tree]; };
   chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
   cherry = derive2 { name="cherry"; version="0.6-13"; sha256="1bpahdymkc2w6mc5pjyq4q59iwzskw37swx3sw4rnbmnhzhwaf8n"; depends=[bitops hommel lpSolve Matrix]; };
   cherryblossom = derive2 { name="cherryblossom"; version="0.1.0"; sha256="1fn0xi65y0w1gmyrjlh8lb2is34r2dc5bym0ynrgjv8h595nzhwp"; depends=[]; };
-  chest = derive2 { name="chest"; version="0.3.3"; sha256="09xk6nj8wx7h56mkb9qsl1gar0q5z0qd9r0kpnm237l6pca3qrbx"; depends=[broom dplyr forestplot ggplot2 MASS speedglm survival tibble]; };
+  chess = derive2 { name="chess"; version="1.0.1"; sha256="0b0lz8r48bvksjnh385p1ni22hw1yvs6255pjbpj49ga9dwziin0"; depends=[cli magrittr purrr reticulate rsvg]; };
+  chest = derive2 { name="chest"; version="0.3.4"; sha256="1mkds228d00anmx35120gdkl5wxx1mfbfys41gzsm202z1mp05bj"; depends=[broom dplyr forestplot ggplot2 MASS speedglm survival tibble]; };
   chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; };
   chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; };
   chicane = derive2 { name="chicane"; version="0.1.2"; sha256="080saqwhw54g9frrqr2z8s55d9asq3xjfy95w4y4npvd16a79nil"; depends=[bedr data_table doParallel foreach gamlss gamlss_tr iterators knitr MASS rmarkdown]; };
-  childesr = derive2 { name="childesr"; version="0.1.2"; sha256="170xjsk0sjwlw3w3nf9jmq4yd6ivbznmjhqq2np5grn1rwlswawb"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; };
+  chickn = derive2 { name="chickn"; version="1.2.3"; sha256="1d3xl2pigan6vb29nk2ks04dsl5vy16cv9z7miskmhcqcx2wm1qb"; depends=[bigstatsr doParallel doRNG foreach MASS mvnfast nloptr pracma Rcpp RcppArmadillo RcppParallel Rdpack rmio zipfR]; };
+  childesr = derive2 { name="childesr"; version="0.2.1"; sha256="0dy2qkxyc1hl2v3ssvq7vynj2k7h1lky0ig7ph42pqsjqwfpk06d"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; };
   childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; };
-  childsds = derive2 { name="childsds"; version="0.7.4"; sha256="1dyzidmbr7608y65kymf7x5s19qjsz9hxzfv51ml1kaymml1hbf3"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; };
+  childsds = derive2 { name="childsds"; version="0.7.6"; sha256="1h3p80byfma8zhivlq9jmdszm793chggnhb93qjnbl3vmnmnxgg7"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; };
   chilemapas = derive2 { name="chilemapas"; version="0.2"; sha256="0s2f5bhr7d64rlk4x7cv6zjrbnf5g86lgg026svgrdxvs1vqa4as"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; };
-  chillR = derive2 { name="chillR"; version="0.70.24"; sha256="1a99hxf89yyhcma5002xhp1nvcsgbsz52zg1a5vhhgwlzpkr50s0"; depends=[assertthat dplyr fields ggplot2 httr jsonlite Kendall pls plyr R_utils raster RCurl readxl reshape2 rlang RMAWGEN sp XML]; };
-  chinese_misc = derive2 { name="chinese.misc"; version="0.2.2"; sha256="1r0sg0pfnlpa3q6czjvlh04xdwl6gfw54ykacnxznzzzr528r3mi"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; };
-  chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
+  chillR = derive2 { name="chillR"; version="0.72"; sha256="1qa01zsm1xvdd41dd317ng8xj4wzmbdmay4zdzz49xzi95y6vy5n"; depends=[assertthat dplyr fields GenSA ggplot2 httr jsonlite Kendall pls plyr R_utils raster Rcpp RCurl readxl reshape2 rlang RMAWGEN sp XML]; };
+  chinese_misc = derive2 { name="chinese.misc"; version="0.2.3"; sha256="0hlna52g00nh3908wgpb9ldgghff3gfjx24vmk5gikkazdqk9zrh"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; };
   chirps = derive2 { name="chirps"; version="0.1.2"; sha256="0lvrlpsvncyyzli84ivzmknk0g5g3lhciwl35wmrgyxf08bs4bqb"; depends=[crul jsonlite sf]; };
   chisq_posthoc_test = derive2 { name="chisq.posthoc.test"; version="0.1.2"; sha256="0lvj3jqhaj1ijjpzvpq3fn3a1y3fgv69pxh91j6k958pn6vmp40i"; depends=[]; };
   chk = derive2 { name="chk"; version="0.5.1"; sha256="09qw8i97mbfgymx5nf6iw4s46hqyaa7434y3bwkzmqjh9f18xfmh"; depends=[lifecycle rlang]; };
   chlorpromazineR = derive2 { name="chlorpromazineR"; version="0.1.2"; sha256="0zg3xjq67na98n4amsm5v4cn9ba1k7c0lb7k2lvxa3n1w7rndpw3"; depends=[]; };
-  chngpt = derive2 { name="chngpt"; version="2020.5-21"; sha256="0lh2jznkiv74a88kyqxvxl424chgwghd9jl9z1kx76gkjg8ggr0x"; depends=[boot kyotil MASS survival]; };
+  chngpt = derive2 { name="chngpt"; version="2020.10-12"; sha256="0i8vzqycqd6sinnpb8f88b7pv76d54x09l3iw2s8c6hs46rybqch"; depends=[boot kyotil lme4 MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; };
   cholera = derive2 { name="cholera"; version="0.7.0"; sha256="0ja013k431vd0sjy74y2mlrii46rbwb5x886jaza4ihb48mgz7ah"; depends=[deldir ggplot2 HistData igraph KernSmooth pracma RColorBrewer sp threejs TSP]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
@@ -6241,21 +6484,23 @@ in with self; {
   christmas = derive2 { name="christmas"; version="1.0.0"; sha256="06a2r56vh7m6j0kfbf3b3aapn52x693fzdn29sxfvyackdk5dhj3"; depends=[animation]; };
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoMap = derive2 { name="chromoMap"; version="0.2"; sha256="1ljjwkv7rdy1mcrkb8dd5lfkg54gxzclsjvla4qnc8j5hmfp0p8g"; depends=[htmltools htmlwidgets]; };
-  chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
   chromseq = derive2 { name="chromseq"; version="0.1.3"; sha256="0m9dnm50iw176ffn6syd3538hxmjhkrxfzaf13210q100wk0lgz2"; depends=[]; };
   chron = derive2 { name="chron"; version="2.3-56"; sha256="0p9zz96jfyf139924hdwkzhr8knkjvx6547ac53rknm3a6wwngl6"; depends=[]; };
-  chronosphere = derive2 { name="chronosphere"; version="0.3.1"; sha256="0n6xqnlwcraxdr9d37nnllr8rjq6awng60zmy0skjmsj7xp6x71v"; depends=[raster sp]; };
+  chronosphere = derive2 { name="chronosphere"; version="0.4.0"; sha256="034845mvh873db3i8hm7kz05c1n30gp5m4acjryb80303086k3ih"; depends=[raster sp]; };
   chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; };
-  chunked = derive2 { name="chunked"; version="0.5.0"; sha256="1b28hqngdkkn4wnkd3b8vcaf3md6jan73nbx240v6s2nj2anlnc8"; depends=[DBI dplyr LaF progress rlang]; };
+  chunked = derive2 { name="chunked"; version="0.5.1"; sha256="08gw05bng4p35kfd9zcxz1l73jhlxlymw55vrsl6f2771l1r4bz5"; depends=[DBI dplyr LaF progress rlang]; };
   chunkhooks = derive2 { name="chunkhooks"; version="0.0.1"; sha256="1kps7widb9ql01njy8xl03lplrybl2ci5fvx5vzzwnwps6s4y3fm"; depends=[knitr measurements prettyunits]; };
-  ciTools = derive2 { name="ciTools"; version="0.5.2"; sha256="1q0kh8fsi14dvqr646hn6j9sfjq5b7m89i4r8br5p33wfgqpwlq4"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; };
+  ciTools = derive2 { name="ciTools"; version="0.6.1"; sha256="0d6aq4wcxi1q59g4kfx49x1li41rfwx2z2v4xzz2xkldn6h1794z"; depends=[arm boot dplyr lme4 MASS survival]; };
+  ciccr = derive2 { name="ciccr"; version="0.2.0"; sha256="0xmjqwlw2xq332pyagrn8ay6ipyvmxw1q7zf4cza4ly2mz9mf1ws"; depends=[]; };
   cicerone = derive2 { name="cicerone"; version="1.0.3"; sha256="01swq28pj3p34b1k1gp05wvzdzsivj10fl7rwq0bg4rpawxfgs55"; depends=[assertthat R6 shiny]; };
   cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; };
+  ciftiTools = derive2 { name="ciftiTools"; version="0.1.6.0"; sha256="1fk9cc2jnfa177dg9wjy6gkrhyf3rbmgi98vx65jknwpsg9m5ydn"; depends=[gifti oro_nifti RColorBrewer RNifti xml2]; };
   cimir = derive2 { name="cimir"; version="0.4-0"; sha256="0sp8hd354hnrmbyn3gm2sgvkf32n7kqpg9bc56583ibyfc8s4gwm"; depends=[curl dplyr glue jsonlite purrr rlang stringr tidyr]; };
   cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
+  cinaR = derive2 { name="cinaR"; version="0.1.0"; sha256="13pcxxlx2k1dd2ac7irsjkqq7y6nds5v9y8awbnrfyfr0w5b5zsn"; depends=[ChIPseeker DESeq2 dplyr edgeR fgsea GenomicRanges ggplot2 ggrepel limma pheatmap preprocessCore RColorBrewer sva TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene writexl]; };
   cinterpolate = derive2 { name="cinterpolate"; version="1.0.0"; sha256="1aw6hs41xin2hhgmi4pr5510v4sn6x735lachpc5gpbxch5h3f82"; depends=[]; };
-  cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; };
-  circlize = derive2 { name="circlize"; version="0.4.10"; sha256="1xb1jq3mg4kw1513zv1i09vhn7rj7f8vp0bnms2qml74s47wxsgk"; depends=[colorspace GlobalOptions shape]; };
+  cir = derive2 { name="cir"; version="2.1.0"; sha256="1gw0wawla5lfpbyh5hb3mbv5137jgc923g4jshylvjr22bvjqrdm"; depends=[]; };
+  circlize = derive2 { name="circlize"; version="0.4.11"; sha256="1s84xl7kv3qc1261xxaq4aqh64gwywhacsf5nh6yf8djw0d1w42d"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; };
   circumplex = derive2 { name="circumplex"; version="0.3.6"; sha256="1b5brqhya8jzxhr4zjmr6660w9mzfyncpdknzpvkdhc149s1ksjd"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; };
   cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; };
@@ -6263,43 +6508,44 @@ in with self; {
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
   citecorp = derive2 { name="citecorp"; version="0.3.0"; sha256="0lqxa6qfysrk3rpg9fnsxhrfsd0qsbfxhc3b43090fhlxq9gk3wm"; depends=[crul data_table fauxpas jsonlite]; };
-  citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; };
+  ciu = derive2 { name="ciu"; version="0.1.0"; sha256="04fshss0klib74dr997p8kmv9mgbxnkanl8x24x6aild2nv25lz4"; depends=[ggplot2 Rcpp]; };
   ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; };
   civis = derive2 { name="civis"; version="3.0.0"; sha256="12q96bj21832zqqbisfxmnpqw7w72v350lyf7cpjgr7cq7b51brd"; depends=[future httr jsonlite memoise]; };
   cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; };
   ckanr = derive2 { name="ckanr"; version="0.5.0"; sha256="15ww7svf40j7pd76s93kw8snql0hycliyga4p22bqvm95xy9pmq0"; depends=[crul DBI dbplyr dplyr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-9"; sha256="0j5vgh1ccfxf2yax08p9zswan2rxnfs85ny88xlqbndkm3gmy80b"; depends=[class cluster]; };
   cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; };
-  clam = derive2 { name="clam"; version="2.3.5"; sha256="19kaf1s1m8cz3cj5faprmi11lhmbgdmkspjf8l0xgrx4vas49xw8"; depends=[]; };
-  clampSeg = derive2 { name="clampSeg"; version="1.0-5"; sha256="05922fddvi7s4imdnr9fb27aqskgd489amw9h86g5vw4l494lnl9"; depends=[Rcpp stepR]; };
+  clam = derive2 { name="clam"; version="2.3.7"; sha256="0yd6grq0vyf46bc59fgqvwdbrsb9wd4m8vwjpqxfmkag2wr2a8f3"; depends=[IntCal]; };
+  clampSeg = derive2 { name="clampSeg"; version="1.1-0"; sha256="1138wphhmf5hn5yh8p1fwix4lf2yncbc7xxcnnv2xz1z8b041qhs"; depends=[lowpassFilter stepR]; };
   clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; };
   clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; };
   class = derive2 { name="class"; version="7.3-17"; sha256="04qk8qia0qr8893fizmkbd5hsqn6m8383c0cyn9xnmkmvyv8a7xy"; depends=[MASS]; };
   classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; };
   classInt = derive2 { name="classInt"; version="0.4-3"; sha256="1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply"; depends=[class e1071 KernSmooth]; };
-  classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; };
+  classifierplots = derive2 { name="classifierplots"; version="1.4.0"; sha256="0agxm3vrbs8lqhk1xvfc3wzf0q0hxhgyp23j5qi5mi1drgnw1jj1"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; };
   classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
-  classyfireR = derive2 { name="classyfireR"; version="0.3.3"; sha256="17h9xx5ap77ry50rbpl9gi1hbp1vahdwl99kkqsra79b8aixs2kj"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; };
-  cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; };
+  classyfireR = derive2 { name="classyfireR"; version="0.3.6"; sha256="1xys40pbai7b6xbvc2nip8n6vw2zvg0gm373w3izxzrb62whwd8p"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr rjson stringr tibble tidyjson tidyr]; };
+  cld2 = derive2 { name="cld2"; version="1.2.1"; sha256="01p64r2ij1i0xm3835vfnpxmmbnnaigp0md9x1hrq8gfsdwnzv3x"; depends=[Rcpp]; };
   cld3 = derive2 { name="cld3"; version="1.3"; sha256="1xaac0phck00i2pm81m2xphy7r3lvbvj9z14y6asfz0cfjm7acx3"; depends=[Rcpp]; };
   clda = derive2 { name="clda"; version="0.1"; sha256="03zfanvpz1h42h2z38a63fck1p5hqig4w2svknzpw7mryji5q9b1"; depends=[MASS]; };
   clean = derive2 { name="clean"; version="2.0.0"; sha256="0zvk3a5yz54g2mn7y1d91z6ljglbyq1hkh4iip1dfyi15chrqv7y"; depends=[cleaner]; };
-  cleanNLP = derive2 { name="cleanNLP"; version="3.0.2"; sha256="0fwi717mmw6nb81x4wlq6pfcgv0jizrw2fkiaxz0wnhvkh3i82y6"; depends=[Matrix reticulate stringi udpipe]; };
+  cleanNLP = derive2 { name="cleanNLP"; version="3.0.3"; sha256="0bc0ya36yhknqhqc76yf9clgiacyb6zypzirzg6i0213bqw2ihdp"; depends=[Matrix reticulate stringi udpipe]; };
   cleancall = derive2 { name="cleancall"; version="0.1.1"; sha256="1gq7bjywgslybfk97k3fxglp6j78a0cklaammccvffs3b94i4zh4"; depends=[]; };
   cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; };
-  cleaner = derive2 { name="cleaner"; version="1.5.0"; sha256="0ci21fjcl3slyxf66w7w76vg3dvk6928qhpbgsj7qah2z5c184g6"; depends=[crayon knitr pillar rlang vctrs]; };
+  cleaner = derive2 { name="cleaner"; version="1.5.1"; sha256="0qmg9c299bcrwl1r1hhl56rf0sm6sbqgssrk72him4090j6gslyr"; depends=[backports crayon knitr pillar rlang vctrs]; };
   cleanerR = derive2 { name="cleanerR"; version="0.1.1"; sha256="0rghn8rx7dj5clmc1dqvqwfm9kiva04k9gxsjjga3109l4jcpg63"; depends=[data_table plyr]; };
   cleangeo = derive2 { name="cleangeo"; version="0.2-3"; sha256="02py25pir16yklffpdicljxhwdf7bqchqllgdk069f5gikfc8yrr"; depends=[maptools rgeos sp]; };
-  cleanr = derive2 { name="cleanr"; version="1.3.0"; sha256="15icq6p2sxaz5jsdwqlqg7mgal4310vk96w53wzv3dzpzxndz7s4"; depends=[checkmate pkgload rprojroot]; };
+  cleanr = derive2 { name="cleanr"; version="1.3.1"; sha256="00h6kqsz9f6k2ngcpqzfqpp14c5a6x5f7ghmdnvi2nwyqipzk6xi"; depends=[checkmate pkgload rprojroot]; };
   clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; };
   clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; };
+  clevr = derive2 { name="clevr"; version="0.1.1"; sha256="077qhqfzcy1ciar70df7q98ms003b9mnqgji1nxkx5ncw9hdkzd4"; depends=[BH Matrix Rcpp]; };
   clhs = derive2 { name="clhs"; version="0.7-3"; sha256="19v617dayirbzb5w6mz79lsjinvr2jjlwdm61pd2pppk099fxgqr"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; };
-  cli = derive2 { name="cli"; version="2.0.2"; sha256="1dhkah6jvr96k4h4agcc2rfls75bpjb0j58fzaz3dc0fp3jk8229"; depends=[assertthat crayon fansi glue]; };
-  cliapp = derive2 { name="cliapp"; version="0.1.0"; sha256="152hllp4iiva2qib79700v1mx1biy8bg4sy496vwq6mi4afvswjy"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; };
-  clickR = derive2 { name="clickR"; version="0.4.47"; sha256="1fs0zh9djgvy8cicvab9i6dji85l1z8wlr6wpfypnwvnblc64qam"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; };
+  cli = derive2 { name="cli"; version="2.2.0"; sha256="1f20mk9pb9kqn0ni2z0sqsx8qj1apcbiw08pa4gwry142zv7m9rr"; depends=[assertthat crayon fansi glue]; };
+  cliapp = derive2 { name="cliapp"; version="0.1.1"; sha256="0v62lbcsja0xmlpqcps370n5c7bk4j2n8pwh9xyif5s4wpf82qz1"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; };
+  clickR = derive2 { name="clickR"; version="0.5.27"; sha256="023vcax25kdp42z7nlb635zwdiz4fspxiz8zj679d8g4g897g9fz"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; };
   clickstream = derive2 { name="clickstream"; version="1.3.1"; sha256="0z1yy5lr9m5x9ybimjy3f6kn490abdi038xi0qw7ny80f1ca6ry7"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; };
   clifford = derive2 { name="clifford"; version="1.0-2"; sha256="17br7p4zj1cjf1nbwbk0a2jjxj589qgvlnzi6yp4dqlf2g0w01z6"; depends=[BH Rcpp]; };
-  clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; };
+  clifro = derive2 { name="clifro"; version="3.2-3"; sha256="151j8v6d0wr5np5i8wb7b1k398cg2fz6yndpz8r0rh2d3yx5544l"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 rvest scales xml2]; };
   clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; };
   climaemet = derive2 { name="climaemet"; version="0.2.0"; sha256="0jhyf0wrq5scs8jcn2bpl8fhlimhdkd39pxzdc26zwwya5683cas"; depends=[climatol dplyr gganimate ggplot2 ggpubr ggthemes gtable httr jpeg jsonlite lubridate magrittr RColorBrewer rlang scales stringr tibble tidyr]; };
   climate = derive2 { name="climate"; version="0.9.8"; sha256="0fyj0zmyavsip921axwcqm54jd9dqyzir0761vczn51pw7kqk6y0"; depends=[curl httr XML]; };
@@ -6308,38 +6554,40 @@ in with self; {
   climatrends = derive2 { name="climatrends"; version="0.1.7"; sha256="0dj095jafl571hvf2bp21mdbp2pln0li9bgpymzjbpnbkvn8309j"; depends=[]; };
   climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; };
   clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
-  climextRemes = derive2 { name="climextRemes"; version="0.2.1"; sha256="1ii79zfdz90agirh3kbq80qk8nib9ks8f42f6y664j4pwk9550w3"; depends=[boot extRemes]; };
+  climextRemes = derive2 { name="climextRemes"; version="0.2.2"; sha256="04ra2xqkf9zg7hbmb5ycfql9nwkabxy8412d05ajshld4cr0gi45"; depends=[boot extRemes]; };
   climwin = derive2 { name="climwin"; version="1.2.3"; sha256="1r2x5941k8l9z3517389y120sfhrskdpchc0pkibznza8aa95r85"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv RcppRoll reshape]; };
   clinDR = derive2 { name="clinDR"; version="2.3"; sha256="1bmbbcf5ikima868l2cn9r8xja3zw4zw799i7nb8jb0hhv6fxh80"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; };
   clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; };
   clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
   clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; };
+  clinmon = derive2 { name="clinmon"; version="0.2.0"; sha256="01gj33kmbg6z9qln9la6ph0rsdk10j18jbigjykhjcfpjnfs1inn"; depends=[]; };
   clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; };
   clipp = derive2 { name="clipp"; version="0.1.0"; sha256="0phh2nbpfb5p80ijll4h9j2hy4syl8802a2lhlm5grirws1iif84"; depends=[]; };
-  clipr = derive2 { name="clipr"; version="0.7.0"; sha256="1qn2p13d0c1bpqss6mv9hk60980rzhznfqpyaf5x0fy65svy9903"; depends=[]; };
+  clipr = derive2 { name="clipr"; version="0.7.1"; sha256="1ywa4kipwc2d7na6iiz3wzdah99h6aynnh74yxl3nzl40xxlgbgz"; depends=[]; };
   clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; };
   clogitL1 = derive2 { name="clogitL1"; version="1.5"; sha256="0y6a6s5l98i0vrj66biwr17g6pzpmm5kfz4c57af0yhv7c4s4was"; depends=[Rcpp]; };
   clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; };
   clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; };
-  clordr = derive2 { name="clordr"; version="1.5.0"; sha256="0yzkkzp60gnap96hlfpjncxfkfvvma15yxpwf5pv5fgffacb8281"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; };
+  clordr = derive2 { name="clordr"; version="1.6.0"; sha256="1w9km87wndr4fssfn7c9g2sy5lnk1ik0sqqwqyas7qc2h48la4di"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
   cloudml = derive2 { name="cloudml"; version="0.6.1"; sha256="1j15q9yb2rc4fbjxfh21fiq6is8dnb8nfyi7g8iazgfwb3p9ahpx"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; };
   clpAPI = derive2 { name="clpAPI"; version="1.3.0"; sha256="1ivrvipnvnqf1mnvvqnv2jgf69i0h84f46n8x41bx89lag0161bv"; depends=[]; };
   clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
-  clue = derive2 { name="clue"; version="0.3-57"; sha256="05rdcahawxlxci3fjxihjvvh33wqpxw50sx015165ab4nh3rsdkf"; depends=[cluster]; };
+  clubSandwich = derive2 { name="clubSandwich"; version="0.5.2"; sha256="051943yji30r3mwx9dmy63rfjq3dr2zkfg852cpnysyq15f6vpbq"; depends=[mathjaxr sandwich]; };
+  clue = derive2 { name="clue"; version="0.3-58"; sha256="1rwwxlnpl1k0n4k96vxc9zajw9kb4syqwzj76fvaf0qim8p6ddia"; depends=[cluster]; };
   cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; };
-  clusrank = derive2 { name="clusrank"; version="0.6-2"; sha256="1hjxks8cb1mp1d93rcpwqjrxqavspmzjrxvflhv6nqx41ar9dpxv"; depends=[MASS Rcpp]; };
+  clusrank = derive2 { name="clusrank"; version="1.0-0"; sha256="1ph7rn5cqv67nspadlm8j2vlwvn9c8n0h9qr90003jn0kwz8dic4"; depends=[MASS Rcpp]; };
   clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.1.2"; sha256="11lqd3vmx4kg08n6iv9na8rra49dkldx4f8jyf43hppbjrbvfinm"; depends=[]; };
   clustDRM = derive2 { name="clustDRM"; version="0.1-0"; sha256="1c5z08a15scp3nrwyh0c03pdaawvm3ivbygqpbglwxim7zf73rd2"; depends=[caret doParallel DoseFinding DT foreach IsoGene MCPMod multcomp ORCME ORIClust pheatmap RColorBrewer readr shiny]; };
   clustEff = derive2 { name="clustEff"; version="0.2.0"; sha256="0kh3jzzqnchkgp0w1pz2sjxr215lyjh62v5857g94h91h5kn70y6"; depends=[cluster fda ggplot2 ggpubr qrcm]; };
   clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; };
-  clustMixType = derive2 { name="clustMixType"; version="0.2-5"; sha256="0i3n8w2lsaiak7nz5ypnwnjkr5qq0slklcdpykmaikfmzahihvla"; depends=[RColorBrewer]; };
+  clustMixType = derive2 { name="clustMixType"; version="0.2-9"; sha256="08qfmchj0dk4knw5fd4c1ydsg8qi3vjslwk4q6jlk2f8i2vafb1g"; depends=[RColorBrewer tibble]; };
   clustcurv = derive2 { name="clustcurv"; version="2.0.0"; sha256="1zjyf81ifd2sgkgs548iy1awjhjmb541rrrw2pb92cn8ph7z7nc1"; depends=[data_table doParallel doRNG foreach ggfortify ggplot2 Gmedian KernSmooth npregfast RColorBrewer survival tidyr wesanderson]; };
   cluster = derive2 { name="cluster"; version="2.1.0"; sha256="055af3yz2biqbsbwm4arwr1yqnj4gicpzv2i6dbfl5pnz2z5byga"; depends=[]; };
   cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
   clusterCrit = derive2 { name="clusterCrit"; version="1.2.8"; sha256="10pz1bikdbkm2ky3xnagp0qv60whalavp6j39b4p7d75jj5xcxgk"; depends=[]; };
-  clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
+  clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.7"; sha256="0p1dwl08bf20h7pnspnsycrp3v48nm2miwcnlklyc4gdyzc2jksk"; depends=[MASS]; };
   clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
   clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; };
   clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; };
@@ -6359,53 +6607,59 @@ in with self; {
   clustree = derive2 { name="clustree"; version="0.4.3"; sha256="0lxydy2f83qqd5dhlp2l546jax759l43b29j6g82079yzg1szwsz"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; };
   clustringr = derive2 { name="clustringr"; version="1.0"; sha256="07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq"; depends=[assertthat dplyr forcats ggplot2 ggraph igraph magrittr rlang stringdist stringi stringr tidygraph]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-  clustvarsel = derive2 { name="clustvarsel"; version="2.3.3"; sha256="1dw9iniy2vw4yz1jip4jja6fsp03kbr86mm5knbhhyc0l24i0wrz"; depends=[BMA foreach iterators Matrix mclust]; };
+  clustvarsel = derive2 { name="clustvarsel"; version="2.3.4"; sha256="0hzvfcjs1k13j695jx6m0fgmcxy284gp4d59b7zmnvqib153x89x"; depends=[BMA foreach iterators Matrix mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.2"; sha256="072jn3xh6ii7vfp0gx03k1hiafnla1lkyn5hpj17nmqc0jvzp683"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
+  cmcR = derive2 { name="cmcR"; version="0.1.3"; sha256="06337d039ycv6li4hl3dl710xsdcpzp257i4niy853qx3grjlr8z"; depends=[assertthat dplyr ggnewscale ggplot2 imager magrittr purrr quantreg rlang scales stringr tibble tidyr x3ptools zoo]; };
   cmce = derive2 { name="cmce"; version="0.1.0"; sha256="0d52ci906zbd4q43qylcyw93acxh7f20jn3r0k74ynyy47131dnd"; depends=[]; };
+  cmdfun = derive2 { name="cmdfun"; version="1.0.2"; sha256="1pbcq7hi2lcmqnghmy3q2fsk0c9fy5m0637acyzmc096fxbx723j"; depends=[magrittr purrr R_utils rlang testthat usethis]; };
   cmenet = derive2 { name="cmenet"; version="0.1.1"; sha256="0f7bci6nn63q243i7wvhr9mqlf64gw8w042nc1lqb986p7zfxihk"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo sparsenet]; };
+  cmfrec = derive2 { name="cmfrec"; version="2.3.2"; sha256="192xlmylidq8rlscf5sg1ly6zl8lwpi7pfqcqb207lxl9s25mhw9"; depends=[]; };
   cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; };
   cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; };
   cmna = derive2 { name="cmna"; version="1.0.3"; sha256="07wjjbhpd8g2gsmxh9cq2ij81qvd6y7x8zabspk9jilmxhycpxy6"; depends=[]; };
-  cmocean = derive2 { name="cmocean"; version="0.2"; sha256="0v1bm2qgvjb82ynakglr61swx5jy41ngn6vml5gllv3r7skqr1is"; depends=[]; };
+  cmocean = derive2 { name="cmocean"; version="0.3-1"; sha256="0y6yd3x2swx88r7kv6f9lrbf3zzawhf2x8izszgg4zb21pkal6k8"; depends=[]; };
   cmprsk = derive2 { name="cmprsk"; version="2.2-10"; sha256="1xnx2zanw548prxsw2zw5cddkkg6kj97jgyzw67achq5mnsvfbg8"; depends=[survival]; };
   cmprskQR = derive2 { name="cmprskQR"; version="0.9.2"; sha256="1b3di5fsgglriv00fxydpc4p8lh0xcgi6jc04awq2vmp6s8kvjmw"; depends=[quantreg survival]; };
   cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; };
-  cmsaf = derive2 { name="cmsaf"; version="2.0.1"; sha256="0ampq493i8x40jk8p8acgizy1vlhm05i5nllk5a0xk81vywf7ifi"; depends=[fields FNN ncdf4 rainfarmr raster sp]; };
-  cmstatr = derive2 { name="cmstatr"; version="0.7.0"; sha256="0mah4kd677gj3yifphkd9v5nnfahwn7m4lsqcrhdqi49bgsd61mm"; depends=[generics ggplot2 kSamples MASS rlang tibble]; };
+  cms = derive2 { name="cms"; version="0.1.0"; sha256="0m3cxvw40nyr1jpdkhg5nbms16hkzj0mrx5nl39x1l42cx2hcjrl"; depends=[assertthat dplyr magrittr readr rlang rvest xml2]; };
+  cmsaf = derive2 { name="cmsaf"; version="3.0.0"; sha256="0lq3xr537x9h2j8dajmb3lqpc2yas2lk5f7fql0v914ibhffg8pd"; depends=[cmsafops cmsafvis colorspace colourpicker fields FNN mapproj maps maptools ncdf4 R_utils raster rworldxtra shiny shinyFiles shinyjs shinythemes sp]; };
+  cmsafops = derive2 { name="cmsafops"; version="1.0.0"; sha256="1gjqc9xsiv0n3rc67jhmdz47l0di3cr3k27ah46gxy17glb1mlc3"; depends=[assertthat fields FNN ncdf4 rainfarmr raster sp]; };
+  cmsafvis = derive2 { name="cmsafvis"; version="1.0.1"; sha256="02mhmrcid8npcq5gzsjwp88gqwgzqwx2015mfq6y1i60gizsa6zf"; depends=[animation assertthat cmsafops colorspace countrycode fields mapproj maps maptools ncdf4 png progress raster rworldxtra sp yaml]; };
+  cmstatr = derive2 { name="cmstatr"; version="0.7.1"; sha256="0fi5lv3zaxylxm8qi0msj76k4qgld5gchqlmd4gqv52hscp20cgb"; depends=[dplyr generics ggplot2 kSamples MASS rlang tibble]; };
   cmvnorm = derive2 { name="cmvnorm"; version="1.0-6"; sha256="1wf23w9gxrrgw7j740r381xrss09inzd7mrg6g7wz883c9madbfn"; depends=[elliptic emulator]; };
-  cna = derive2 { name="cna"; version="2.2.3"; sha256="0ffz95yqj435bwzjih9xh1qbcz5zivz1g7fqf1k097z87d2j7qp3"; depends=[matrixStats Rcpp]; };
-  cnaOpt = derive2 { name="cnaOpt"; version="0.1.1"; sha256="179ixxl7lp446ps6nlslnnywxh2yba9ypx2zrya505k1ybryxhc2"; depends=[cna dplyr ggplot2 matrixStats Rcpp]; };
+  cna = derive2 { name="cna"; version="3.0.1"; sha256="0hhx3gzd8sjy3l6fx9ylbz171w5xg381al0ccrsp31q2l67d5ls5"; depends=[car Matrix matrixStats Rcpp]; };
+  cnaOpt = derive2 { name="cnaOpt"; version="0.2.0"; sha256="0zm442nbbnnz47rzh57f0al21kcq0bd81g57q5b9dszf4s64japl"; depends=[cna dplyr ggplot2 matrixStats Rcpp]; };
   cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; };
   cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
   cnum = derive2 { name="cnum"; version="0.1.2"; sha256="0xf8fna91pb7xqgz43a9h32x4gkyak5bqvc01wz2sm02f2rj06cx"; depends=[BH Rcpp stringr]; };
   coRanking = derive2 { name="coRanking"; version="0.2.1"; sha256="10489vbd917mzz5lw7ygi6q8q5qa7sp5d8xgv1ykn4lfx0avch69"; depends=[]; };
   coala = derive2 { name="coala"; version="0.6.0"; sha256="0h7kc12yc90y5i733l6sfd9h12h0a2c7wv9wscjslj18sl3w3ccv"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; };
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
-  coalitions = derive2 { name="coalitions"; version="0.6.12"; sha256="11844sz65axj23xwv505jxck37xv3a5n36jpdr9ywvmb19gshar7"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tidyr xml2]; };
+  coalitions = derive2 { name="coalitions"; version="0.6.15"; sha256="0i9nsbr8z3glxvx1ddm51l98q5xakalmqyvgmy7kmcjm6fb6xdx4"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tibble tidyr xml2]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-5"; sha256="1k42vl49kfbllc5d66yn7y9f4jgbkfibmd85nl7hwm0gkgkssg36"; depends=[MCMCpack]; };
-  cobalt = derive2 { name="cobalt"; version="4.2.2"; sha256="13ks10lg5c1hvbh8dmzp3mqz7frqk6bq3cxkm3wf31hb6086fbqa"; depends=[backports crayon ggplot2 gridExtra gtable rlang]; };
+  cobalt = derive2 { name="cobalt"; version="4.2.4"; sha256="18aqhxvkmf7vwja4a4y9jaqys9gy84sx5bq5rh3fszhhs17i3954"; depends=[backports crayon ggplot2 gridExtra gtable rlang]; };
   cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; };
   cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; };
   coca = derive2 { name="coca"; version="1.1.0"; sha256="1lh7q3ip1jaz5zj5zcnd5whwpjw6zcrxs6j0j8mnmjsnw2kr4m5n"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer sparcl]; };
   cocktailApp = derive2 { name="cocktailApp"; version="0.2.1"; sha256="1aq7m3qb4s5v59ym8p5vh7lr5s1xfp8b04x64a014k47gakgiw1d"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; };
   cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; };
-  cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; };
   cocorresp = derive2 { name="cocorresp"; version="0.4-1"; sha256="10prxmc80yk0l5v1gcy92clmjvjywimypqpzjb6gh5pipsqr4swr"; depends=[vegan]; };
   cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; };
-  coda = derive2 { name="coda"; version="0.19-3"; sha256="1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk"; depends=[lattice]; };
+  coda = derive2 { name="coda"; version="0.19-4"; sha256="13z5dwfpnyyhpsbpg4xr9g5c1685jhqj90f4x4qkcykr6kykqba2"; depends=[lattice]; };
   coda_base = derive2 { name="coda.base"; version="0.3.1"; sha256="0rz0hlhww9ja1y40yi4fah468apwp1xcnbbl1qmfggil863l5fqa"; depends=[Rcpp RcppArmadillo]; };
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
   codalm = derive2 { name="codalm"; version="0.1.0"; sha256="0gfvq6pyqm1slj2bcla65dliffk0fc99hc7ga5142bqxmmr9bx35"; depends=[future future_apply SQUAREM]; };
   codebook = derive2 { name="codebook"; version="0.9.2"; sha256="0hxyzwpjbvfzad8h2428q94m961mmwvv28nagw2d36qxd10awh16"; depends=[dplyr forcats ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert purrr rlang rmdpartials skimr stringr tibble tidyr tidyselect vctrs]; };
+  codebreaker = derive2 { name="codebreaker"; version="0.0.2"; sha256="12gjaziwzzisx4j70z8k17k6i5wdsdyk542yfx04rin4ks829f34"; depends=[beepr cli]; };
   codemetar = derive2 { name="codemetar"; version="0.1.9"; sha256="096habmcncyfadly4zflydjayifklifjr4iqfpfg4hl43yq9a5q2"; depends=[cli commonmark crul desc gert gh jsonlite magrittr memoise pingr pkgbuild purrr remotes sessioninfo urltools xml2]; };
   codep = derive2 { name="codep"; version="0.9-1"; sha256="17jziwm56icswa4ngp51ah8w1ma7ij3cksbdaipk0ikqvb5kinkb"; depends=[]; };
-  codetools = derive2 { name="codetools"; version="0.2-16"; sha256="00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"; depends=[]; };
+  codetools = derive2 { name="codetools"; version="0.2-18"; sha256="0a2c115glq8jxixwfigrpvjabhxchn9r4mc40y41dg9dg6wsd7hs"; depends=[]; };
   codexcopd = derive2 { name="codexcopd"; version="0.1.0"; sha256="0pkl29fybflnj42xj8agyw6s3xif9vr5690vlkv5n3dxs8ji582h"; depends=[]; };
   codified = derive2 { name="codified"; version="0.2.0"; sha256="1hmw7yrw4qx8v9rkqqvqf4013s9whq5qlgwz7v882j4slpvm6gb1"; depends=[checkmate dplyr kableExtra knitr magrittr readr rlang tibble tidyr]; };
   codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; };
-  codyn = derive2 { name="codyn"; version="2.0.4"; sha256="0riq4v9pc8fbclzz2zx06264sa4k0lpfzv8cp2ng75a4qp63chwv"; depends=[assertthat permute vegan]; };
+  codyn = derive2 { name="codyn"; version="2.0.5"; sha256="1iqlh3ydnqi7s2b3fa2zgb05j763qgxriys4piawwmgrdrvd3d9q"; depends=[assertthat permute vegan]; };
   coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; };
   coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; };
   coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; };
@@ -6415,54 +6669,56 @@ in with self; {
   cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; };
   coga = derive2 { name="coga"; version="1.1.0"; sha256="0p2mdia89gj7w0j33qxil1l2zg6civj18i3pqym7aijzz1fgwnzp"; depends=[cubature Rcpp RcppGSL]; };
   cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; };
-  cognitoR = derive2 { name="cognitoR"; version="1.0.1"; sha256="1qd3hsblciqnjysx3hqdkwmzpl2zf72jiwywicjpbpv1i703c4wx"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; };
-  cohorttools = derive2 { name="cohorttools"; version="0.1.2"; sha256="0hfpl2dm5ykagwmmdmk0hpbkzzd0zqmf9andm510safjp4mlbcy0"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; };
-  coil = derive2 { name="coil"; version="1.2.1"; sha256="0s11v1hcksljpxnlkmrlnnamx4mlsck45hsjm4xlhc1zb7x9kqf5"; depends=[ape aphid seqinr]; };
+  cognitoR = derive2 { name="cognitoR"; version="1.0.2"; sha256="1pz4wk7vdc1nhm76kz912hyyc9c408qsldfr9dygqvran4xvqm9g"; depends=[base64enc config dplyr httr jsonlite paws shiny shinyjs yaml]; };
+  cohorttools = derive2 { name="cohorttools"; version="0.1.4"; sha256="1zpf3qgzkn34wc36r89ymzfx4fvlgl7x1yiwdwzzd20xv3nx2b5h"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; };
+  coil = derive2 { name="coil"; version="1.2.2"; sha256="0shnvk886q9mp2z0cl87s01k5fpkx5ccncx3882wvnk4iyjnaxw9"; depends=[ape aphid seqinr]; };
   coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; };
-  coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; };
   coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3.2"; sha256="0n62kcw7yxpvxd2bzki432cis5rvfw8b8syfvgv5wpq53bavq3px"; depends=[cli crayon curl data_table ggplot2 jsonlite]; };
   cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; };
   cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; };
   cold = derive2 { name="cold"; version="2.0-1"; sha256="143zmccaiijz4cfiwh1a48h95bqa0ypa9ivv43qkx9y55911a05x"; depends=[cubature MASS]; };
   colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; };
   collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; };
-  collapse = derive2 { name="collapse"; version="1.3.0"; sha256="0vpqiqqqcyr017cvapwyhmzv2yd65yn6l77q2i0d7bf06rgmw1yn"; depends=[lfe Rcpp]; };
   collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; };
   collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; };
   collections = derive2 { name="collections"; version="0.3.5"; sha256="053ig88pva78wxxwya3v7cz853k563dkpgxrf2xvd0l0d9fanxmz"; depends=[]; };
   collector = derive2 { name="collector"; version="0.1.3"; sha256="1yn6gzccdbp7n4qnwqpv66617qldjabzrlww41v6wqn9b7qyr0ii"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; };
-  collidr = derive2 { name="collidr"; version="0.1.2"; sha256="1b8yy0p1r4gs6azcl1aqkny3hws5hhl9bvsrkrhgk2r2xni9sk6f"; depends=[dplyr jsonlite stringr]; };
+  collidr = derive2 { name="collidr"; version="0.1.3"; sha256="18ki8mwf5ihbgfbhdbbk9ljs44js3rqgl1g6g3ch6dynz61sr6hn"; depends=[dplyr jsonlite stringr]; };
   collpcm = derive2 { name="collpcm"; version="1.1"; sha256="14rlipdww5sm1ijp2ggpnd23m14qh10zm99cfq1w0kky9jfl0fkn"; depends=[latentnet network vegan]; };
   colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; };
   coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; };
+  colocalization = derive2 { name="colocalization"; version="1.0.2"; sha256="0jrrh9nxjl3261rp1fnjfnydpxwpi7v0d20kzd0xc6awf52gydbb"; depends=[ggplot2]; };
   colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; };
   colocr = derive2 { name="colocr"; version="0.1.1"; sha256="0ijykza6fdmwbr5zbyfjf382anrxh0lb9hlallyawfi6z076fv7j"; depends=[imager magick magrittr scales shiny]; };
   colorBlindness = derive2 { name="colorBlindness"; version="0.1.6"; sha256="18922caddz7c5dj5mbyl7qihgsnk384w31k17rwngm5hckz2d5yi"; depends=[colorspace cowplot ggplot2 gridGraphics gtable]; };
-  colorDF = derive2 { name="colorDF"; version="0.1.2"; sha256="1rag13z0h7jyzdq3cm40vxjvm29jk1jim907rsphnasybrf8wa48"; depends=[crayon purrr]; };
+  colorDF = derive2 { name="colorDF"; version="0.1.4"; sha256="1q1xfa0h7mbihbv1bpw94rsh6mp4l2v2d2spqwh6r3iy0hf9yk1c"; depends=[crayon purrr]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
   colorSpec = derive2 { name="colorSpec"; version="1.2-1"; sha256="1y6wq4g4rf2carqi387v94502nb5jmw7f6f7grbdzbkixs77bkg2"; depends=[MASS spacesXYZ]; };
-  colordistance = derive2 { name="colordistance"; version="1.1.0"; sha256="0aiqvx0mlraczkcfhzfcaavmqqmxiffnghhw266f84bphxw6b5q2"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scales scatterplot3d spatstat]; };
+  colordistance = derive2 { name="colordistance"; version="1.1.1"; sha256="00bckfwr3kzq91cpd9k2rk2d0wmqjkr05nlfs9937c0wvn7s2xgw"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png qpdf scales scatterplot3d spatstat]; };
   coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
   colorednoise = derive2 { name="colorednoise"; version="1.1.0"; sha256="0x6l9civgqr6lbvdxnhzm30ykx9i6k1q3n6skhnq9b6b52zwrcx4"; depends=[data_table purrr Rcpp RcppArmadillo]; };
   colorfindr = derive2 { name="colorfindr"; version="0.1.4"; sha256="175h476dzq1f2x25vdd268xj4ja4lv8fhfj9vld85waqi0sq515g"; depends=[bmp dplyr jpeg magrittr pixmap plotly plotwidgets png purrr rsvg stringr tibble tiff treemap]; };
   colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
   colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; };
-  colorist = derive2 { name="colorist"; version="0.1.1"; sha256="1f7hdwivpg76dwns58jabdv4ybavd2pxpx43aqh7lp9whi7jqgk0"; depends=[colorspace ggplot2 magrittr raster scales tidyr]; };
+  colorist = derive2 { name="colorist"; version="0.1.2"; sha256="0vakfv8rq0l55qzb8cj78zbyvcrh9j7ixjap95d144g3b617h6x3"; depends=[colorspace ggplot2 magrittr raster scales tidyr]; };
+  colorizer = derive2 { name="colorizer"; version="0.1.0"; sha256="1c0rgjxzjwkaxdnkmcgn9f0mmcxna724cq60q79hzjindbl4r6bk"; depends=[dplyr httr magick magrittr purrr stringr tibble]; };
   colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; };
   colorpatch = derive2 { name="colorpatch"; version="0.1.2"; sha256="18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf"; depends=[colorspace ggplot2 gridExtra TSP]; };
   colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; };
   colorscience = derive2 { name="colorscience"; version="1.0.8"; sha256="11fy8545g93b8dn2imihsb031lnf5g5z17km8q07q4y6g96xdbdv"; depends=[Hmisc pracma sp]; };
-  colorspace = derive2 { name="colorspace"; version="1.4-1"; sha256="0wyny3ah2d74hqv80s6imrarpna09gq3j9rjnz6zx2qg0lx72gb9"; depends=[]; };
+  colorspace = derive2 { name="colorspace"; version="2.0-0"; sha256="13h1hara0s6xn16bgkrbd0flszah1yiylwfwxwn2inqqk6pm6sjf"; depends=[]; };
   colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
-  colourlovers = derive2 { name="colourlovers"; version="0.3.5"; sha256="172ny0w9n2ys8pa7zxkfjsl7lv6fa59bmmbkzlwfx59wamxahmky"; depends=[httr jsonlite png XML]; };
-  colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; };
-  colourvalues = derive2 { name="colourvalues"; version="0.3.5"; sha256="1mj3pc00fc7ifn6w6jhk5yda6iq5jmx92ypl2qxaad6n4s18s6nr"; depends=[BH Rcpp]; };
+  colourlovers = derive2 { name="colourlovers"; version="0.3.6"; sha256="13fqn6hbqjk3d8krpqb3hmsq06qrbks8a9ia5441hd6m7m8wjjkc"; depends=[httr jsonlite png XML]; };
+  colourpicker = derive2 { name="colourpicker"; version="1.1.0"; sha256="1qjispj7i12m02js5cm5xlgn5lyff0kc5ybz6lbknz8q5lkbdyrd"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; };
+  colourvalues = derive2 { name="colourvalues"; version="0.3.7"; sha256="1xpdxqx328l6rjmys7gqrq9pyla7sfmb3xzjrhyksx7i4ncmndpr"; depends=[BH Rcpp]; };
   colourvision = derive2 { name="colourvision"; version="2.0.2"; sha256="15ndhqpp5fi9jgiri9ysl68nf4rdamh9c25svf5nvh2wvv8shrd9"; depends=[Matrix rgl]; };
   colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; };
   colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; };
-  comat = derive2 { name="comat"; version="0.8.2"; sha256="0yhldgbz992pplxpsmkyhw54b35yr3x9fdd05iprnnq1r04hsr09"; depends=[Rcpp RcppArmadillo]; };
+  comFuncs = derive2 { name="comFuncs"; version="0.0.5"; sha256="1n17s28rf6jbii8cffzxylp5dr47x4my7chvf2j1zh4vrkml0n1n"; depends=[rstudioapi shiny]; };
+  comat = derive2 { name="comat"; version="0.9.0"; sha256="1s9ca06wdwars0manjknl8mpsylcj89zap77plng5k8yzlyshjm1"; depends=[Rcpp RcppArmadillo]; };
   comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
   combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
+  combinedevents = derive2 { name="combinedevents"; version="0.1.0"; sha256="0y840y5051a9i8jivw1vanigg762axj6disjghq1skpkhkx70178"; depends=[lubridate magrittr rlang stringr]; };
   combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; };
   comclim = derive2 { name="comclim"; version="0.9.5"; sha256="1s6zh16j0q2n7gkvhd4bym9w3hyg4b9n5lpgspqp2nlygdl6jxxb"; depends=[]; };
   cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; };
@@ -6475,10 +6731,11 @@ in with self; {
   comorbidity = derive2 { name="comorbidity"; version="0.5.3"; sha256="10zlq1586abngdrw5hgba78ridn3xj4q68f34slxpk0gxwa94n7p"; depends=[checkmate data_table]; };
   compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
+  comparator = derive2 { name="comparator"; version="0.1.1"; sha256="02j36dm9vg53v224djy6v7jicd1d5sdx148r8qh096zb942wpvp6"; depends=[clue proxy Rcpp]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
   compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
-  compareDF = derive2 { name="compareDF"; version="2.2.0"; sha256="039s75dzm9dwy31svvvqvbxdh58j2ph00fngshnidxis8l3fn47i"; depends=[dplyr htmlTable magrittr openxlsx stringr tibble tidyr]; };
-  compareGroups = derive2 { name="compareGroups"; version="4.4.3"; sha256="1y2gpakqizv8inqaf4a8dcpy35wkhggjik804sm9k9fq1m189xwi"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; };
+  compareDF = derive2 { name="compareDF"; version="2.3.0"; sha256="1phpw7zw6yh4r3b792rpja3bww6niblaqgcmpnfm0aqapmazr4k5"; depends=[data_table dplyr htmlTable magrittr openxlsx stringr tibble tidyr]; };
+  compareGroups = derive2 { name="compareGroups"; version="4.4.6"; sha256="0ywj7jgj6shkmjb309k38hzzp23gvrwrhq7mbk6bq0s919fcp8wi"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown survival writexl]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
   comparer = derive2 { name="comparer"; version="0.2.1"; sha256="1ric6niwx9718qrdkiclmjbrx4vjbg7jwvd6917hihzyjgbsi9fj"; depends=[R6]; };
   comparison = derive2 { name="comparison"; version="1.0-5"; sha256="0vg8s9j2xjzv7bidd59givxgcqzhdd29q84dj4ww2a6vkmq269r7"; depends=[isotone]; };
@@ -6486,17 +6743,19 @@ in with self; {
   compboost = derive2 { name="compboost"; version="0.1.0"; sha256="0q7jfj5yc2jvddyyhnzv8fnlmngjfws7cg2blxai76s2fw6bmgxp"; depends=[checkmate glue R6 Rcpp RcppArmadillo]; };
   compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; };
   comperank = derive2 { name="comperank"; version="0.1.1"; sha256="0wz46rkpx1cjjng3i03pms2x27cik9wbx7al5r289ym3664zb83m"; depends=[comperes dplyr Rcpp rlang tibble]; };
-  comperes = derive2 { name="comperes"; version="0.2.4"; sha256="051fn21pzizhv1wlf9nk59cyirvv3jxdnq8mrp9l81zvxlwb7qf5"; depends=[dplyr magrittr rlang tibble tidyr]; };
+  comperes = derive2 { name="comperes"; version="0.2.5"; sha256="0pfpbnbnpln3srn2m248v0n72mw72fh0rvqpvswi1qmjcpkfkd7v"; depends=[dplyr magrittr rlang tibble tidyr]; };
   competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.1.3"; sha256="0yqrnbg2chyh9idqpiq5v6wc2708a6r4z7vvlwkpnxp19saa8s06"; depends=[antitrust ggplot2 rhandsontable shiny trade]; };
   completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; };
   complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; };
   complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; };
   complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; };
   compositions = derive2 { name="compositions"; version="2.0-0"; sha256="0xsx4n699q2r4pk2jrvifi3wi49lih7d1j3j6qgqqd31brg53jqr"; depends=[bayesm MASS robustbase tensorA]; };
+  composits = derive2 { name="composits"; version="0.1.0"; sha256="1j2bbl0p7dhlf18n1164qdbch2qa5nzk66qh4xlrrhr36zip88y4"; depends=[anomalize dobin dplyr fastICA forecast ggplot2 gridExtra ICS kableExtra otsad pracma rlang tibble tidyr tsoutliers]; };
   compound_Cox = derive2 { name="compound.Cox"; version="3.20"; sha256="18fgc58jqrjls1rkzrpy338m3yyxaqkv7dfv31a2sf551ynajcfy"; depends=[numDeriv survival]; };
   comprehenr = derive2 { name="comprehenr"; version="0.6.8"; sha256="18gw9ni9cqlkxf6hhgnwankwa09lv8jmzgk7xxs3n0gqd6kbbgw3"; depends=[]; };
   compstatr = derive2 { name="compstatr"; version="0.2.1"; sha256="0pg8yacfb7jvg9xr0gmis8a4g339isd77h6wr8dd6w900q47xac0"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; };
   compute_es = derive2 { name="compute.es"; version="0.2-5"; sha256="00133s3l3g70xrfnxgxhvbjr8izvaj9h0c73iaiyjmlgj84x69m8"; depends=[]; };
+  comsimitv = derive2 { name="comsimitv"; version="0.1.4"; sha256="1b7yh9rnp7h4642sk0yngqy68iwl2kjzfcidmpy6l8lakfnmshin"; depends=[MASS vegan]; };
   comtradr = derive2 { name="comtradr"; version="0.2.2"; sha256="177gnmgwqns65z5y9nw4xp8qmw5z70454zb54jw1879xrgfsrciz"; depends=[httr jsonlite magrittr purrr]; };
   con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; };
   conStruct = derive2 { name="conStruct"; version="1.0.4"; sha256="1klhzsxrkbz16dnm3r2qxyq2z02zqrps9kij2jy6241ni9qmnn2f"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; };
@@ -6504,27 +6763,28 @@ in with self; {
   concaveman = derive2 { name="concaveman"; version="1.1.0"; sha256="0b3fx3y60ibb73pqx5591jq1n86242qajfxbz3vzz6rxxspddlcz"; depends=[dplyr jsonlite magrittr sf V8]; };
   conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; };
   concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
-  concorR = derive2 { name="concorR"; version="0.2.0"; sha256="1rgsindjz2mysqzafq4r6gwzwpqcqr461al4bc5dyf05ypqvf9fz"; depends=[igraph sna]; };
+  concorR = derive2 { name="concorR"; version="0.2.1"; sha256="15pi24xka83p3hm33rfs9vnfkzywmvpz3hpncgqmc9ifwag0zgra"; depends=[igraph sna]; };
   concordance = derive2 { name="concordance"; version="2.0.0"; sha256="1xlm0c91bsbij8dr23fh781c6bg8l74kma6x7nnapkpm7jim279x"; depends=[dplyr purrr rlang stringr tibble tidyr]; };
-  concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; };
-  concurve = derive2 { name="concurve"; version="2.5.0"; sha256="1zmm3y1abm6gjvl9vjmsi2rn2vxgy4qp9crmlrhx3yzij58m15sq"; depends=[bcaboot boot cowplot dplyr flextable ggplot2 knitr lme4 MASS metafor officer patchwork pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; };
+  concreg = derive2 { name="concreg"; version="0.7"; sha256="0g4my3ra9p797vcky5hsgcicsdbmczgd8fklxrkw2jrgwc0xrkaf"; depends=[survival]; };
+  concurve = derive2 { name="concurve"; version="2.7.7"; sha256="185jwz7a33sc9gbkfbcxwzgzd39xn5x72d0nk6p045mq3xssk3j9"; depends=[bcaboot boot colorspace dplyr flextable ggplot2 knitr metafor officer pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; };
   cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; };
   condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
   condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; };
   condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; };
+  condTruncMVN = derive2 { name="condTruncMVN"; version="0.0.2"; sha256="1dicfa82yg8k83lnb5c17jnqwgkazpb8404kfzdf6ikmndwjn0zg"; depends=[condMVNorm matrixNormal tmvmixnorm tmvtnorm truncnorm]; };
   condformat = derive2 { name="condformat"; version="0.9.0"; sha256="151rpnrnbj5ilckf99m6k3c26r1sr94496kws9w91faxilvl180b"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr magrittr openxlsx rlang rmarkdown scales tibble tidyselect]; };
-  condir = derive2 { name="condir"; version="0.1.2"; sha256="1vd3nw2hhldy7igpx58p6if6q2h99d7ypb2ldxkssq6y79n8hq99"; depends=[BayesFactor effsize knitr psych shiny xtable]; };
+  condir = derive2 { name="condir"; version="0.1.3"; sha256="09b0nfdi39mq0531bjzmk8wnmzkyvcd2q5fyk8lnam3n6fz3dg2y"; depends=[BayesFactor effsize knitr psych shiny xtable]; };
   conditionz = derive2 { name="conditionz"; version="0.1.0"; sha256="0ijnsg6n3p3y8y9il012xg5if57hdzvrgxjcykfrrlil4m7ixn6c"; depends=[R6 uuid]; };
   condmixt = derive2 { name="condmixt"; version="1.1"; sha256="1x6n3ylaa9ywvz7v63i2pvd2lxm95wq19xy741g9hy73ld7hd7zn"; depends=[evd]; };
   condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; };
   condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; };
-  condvis2 = derive2 { name="condvis2"; version="0.1.0"; sha256="1xvxqr311wwi8ns31zqnxxb7bji3vl296j3qfq7vh0alxlhd4n4r"; depends=[cluster DendSer ggplot2 kmed plyr RColorBrewer scales shiny]; };
+  condvis2 = derive2 { name="condvis2"; version="0.1.1"; sha256="1al7dx1x4028m3aggblwxn9qsb69swh9nil9bx7d0z32cqakka04"; depends=[cluster colorspace DendSer ggplot2 gower plyr RColorBrewer scales shiny]; };
   coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; };
-  conf = derive2 { name="conf"; version="1.6.3"; sha256="0i8ayn47jli06d76y5a7n087zj7ag6hhjwq5xi109jbfynzxv1h0"; depends=[fitdistrplus pracma STAR statmod]; };
+  conf = derive2 { name="conf"; version="1.7.0"; sha256="1h9lc2k2h7h592a7gzr2jwvc4ifjsr41pygad2k7xy8ah3cnv7c1"; depends=[fitdistrplus pracma rootSolve STAR statmod]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; };
-  config = derive2 { name="config"; version="0.3"; sha256="0l67nfpm42ssnk0bl4jmq6bibz8hawgfgh2s14s5c8mnimv6mpjs"; depends=[yaml]; };
+  config = derive2 { name="config"; version="0.3.1"; sha256="0l2zp7v6qaz72dclcbjrlis633zlwp8rsi5azr7iw127iyz7i26l"; depends=[yaml]; };
   configr = derive2 { name="configr"; version="0.3.5"; sha256="1qlfza9fwqdhw37gxhgxgp4x2dg1qlvdw0rf9fn6a8hgjaj9z8a3"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
   configural = derive2 { name="configural"; version="0.1.1"; sha256="0xn52lg0fzd0m0k9sw90lv8vzhlp6knaya4crzl6rhfihyv9bq3m"; depends=[cli crayon dplyr stringr]; };
   confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; };
@@ -6533,32 +6793,32 @@ in with self; {
   conflr = derive2 { name="conflr"; version="0.1.1"; sha256="1bjdmvi0n8746g7dxwgzh3fi33sq4bgfr0nd3nqd2caj8ryi2gv9"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; };
   conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; };
   confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; };
-  confreq = derive2 { name="confreq"; version="1.5.5-1"; sha256="0hbr2vi5ala6w2igcyqp1nv573l9mragvjv2k1bymjksjb8b8nha"; depends=[gmp]; };
+  confreq = derive2 { name="confreq"; version="1.5.5-2"; sha256="0r6icz35vaxgl2jia1r5hmg0vp3aig417b3420zasjwd6k755i8f"; depends=[gmp]; };
   conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; };
   conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
   conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; };
-  conjurer = derive2 { name="conjurer"; version="1.1.1"; sha256="0rxbmr2s270sy7rbyb876sidbcjzv0g99s1n0w6pd6aymmf0715c"; depends=[]; };
+  conjurer = derive2 { name="conjurer"; version="1.2.0"; sha256="05j5y5d7zkv1aq0vcnfxl5l9lgg2z8avfqz8a4fmmgrq29mlblq2"; depends=[]; };
   connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; };
   conogive = derive2 { name="conogive"; version="1.0.0"; sha256="0a8v7v0fds0psfnbx9x45way8z1f1xn2ncgbrn5rb6fjq0a1zs4x"; depends=[assertthat checkmate mvtnorm psych]; };
   conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; };
-  conquer = derive2 { name="conquer"; version="1.0.1"; sha256="1c7id7wgspma5bdcirrhw7f9fp709zxpj31klivasdbvd4jgi4vb"; depends=[Matrix matrixStats Rcpp RcppArmadillo]; };
+  conquer = derive2 { name="conquer"; version="1.0.2"; sha256="1zvlsrbmrij011mcdi3qngs1al2lhrdiyknxnk0w1zhzrra62bsl"; depends=[Matrix matrixStats Rcpp RcppArmadillo]; };
   conquestr = derive2 { name="conquestr"; version="0.8.5"; sha256="1xh09a379g1msib5fvf72llvf2gwqb7ciacw7j7iqrkb2ddpaglk"; depends=[ggplot2 ggrepel Rcpp reshape rlang stringr]; };
-  constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; };
+  constants = derive2 { name="constants"; version="1.0.0"; sha256="1j9nj6nbcdi0j278mb49k8jlsb29a7gssdn2pz9vbcrixy9xh5m7"; depends=[]; };
   constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
-  contact = derive2 { name="contact"; version="1.2.4"; sha256="1xs234k1pszbjh00dpnj93ygmmrmpv86lnrsrhn4cn801s83yw2f"; depends=[ape data_table doParallel foreach igraph lubridate raster rgdal rgeos sp]; };
+  contact = derive2 { name="contact"; version="1.2.5"; sha256="05a6pwrmjlivglq837w4j8nsmadb4qz0mfhnam34r0z0iqyns334"; depends=[ape data_table doParallel foreach igraph lubridate raster rgdal rgeos sp]; };
+  contactdata = derive2 { name="contactdata"; version="0.1"; sha256="1rbq6k6m6lvwakxc472wxbsrl6wqm61b81fax7hnmjsrp2grqcnn"; depends=[]; };
   container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; };
-  contentid = derive2 { name="contentid"; version="0.0.4"; sha256="19ypac76gf8ajfaqr265411jhvr7wy4fa9zswfc5f2p7d3qxlhqn"; depends=[curl fs httr openssl rappdirs]; };
+  contentid = derive2 { name="contentid"; version="0.0.8"; sha256="1xyp77d7yml5i997xakwcl9r2s4l1ip3fnrzv6mmas0nhdpsvlml"; depends=[curl fs httr openssl rappdirs]; };
   contextual = derive2 { name="contextual"; version="0.9.8.4"; sha256="0lww36nymg2cla83jdvl7a42cwn0il20apciz0ddplq8rw2i0a91"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; };
   contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; };
   conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; };
-  contourPlot = derive2 { name="contourPlot"; version="0.1.4"; sha256="0m96y1nwnsk0xd05lgv553z9gagzzjf64z8zyyxvjlj53c6gmph1"; depends=[interp RColorBrewer]; };
+  contourPlot = derive2 { name="contourPlot"; version="0.2.0"; sha256="0bjwq3p57d6hadln8vwjkh7c9sbb466h3zcq9kpx7kd31z6x8gnz"; depends=[interp RColorBrewer]; };
   contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; };
   contrast = derive2 { name="contrast"; version="0.22"; sha256="11zz59dn63gpn455ryp0cmrx32li30yylf6ldrmw1wnn0zq702ww"; depends=[nlme rms sandwich]; };
-  contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; };
+  contribution = derive2 { name="contribution"; version="0.2.0"; sha256="0di6jhljdfvzpifnb3pvyn2la5h5r1dw03dx4zhpn4y10dg6898p"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; };
   control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; };
   controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; };
-  convergEU = derive2 { name="convergEU"; version="0.4.7"; sha256="05jagjfh2hy3khf8zfyyngfhm83s48pvhma2h7c99jhwa22vsw5n"; depends=[broom caTools dplyr eurostat ggplot2 ggpubr purrr rlang rmarkdown stringr tibble tidyr]; };
   convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; };
   convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; };
   convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; };
@@ -6577,12 +6837,13 @@ in with self; {
   coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; };
   coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; };
   cops = derive2 { name="cops"; version="1.0-2"; sha256="0ifp3cai490lw6dnyyjj4822x8g2mswhaamnw5ljwnxdbmjwhhrw"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud rgl Rsolnp scatterplot3d smacof subplex]; };
-  copula = derive2 { name="copula"; version="1.0-0"; sha256="1hk25qixg0wwnaz4bh2dz275apkdjqahdxixzq6al9k9gi5cr8si"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; };
+  copula = derive2 { name="copula"; version="1.0-1"; sha256="0hlpj1xiv21zx52cqmdgxgz05xdsharacalm025y8ybkzk7jr6yh"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; };
   copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; };
   copulaedas = derive2 { name="copulaedas"; version="1.4.3"; sha256="01wp8jnz7kndknj7lh9ia7mm41k1vbaksalyy9v19bb77yhgzmba"; depends=[copula mvtnorm truncnorm vines]; };
-  corHMM = derive2 { name="corHMM"; version="2.3"; sha256="11mxwxm1lgkiq1v0bynk51b7s8hndp1a6cn6hidjprck4v205im5"; depends=[ape corpcor expm GenSA igraph MASS nloptr nnet numDeriv phangorn phytools Rmpfr viridis]; };
-  corTest = derive2 { name="corTest"; version="1.0.4"; sha256="15mipyd7lv9l596h6gk7mywdnc9xw2kaz35bj9pw5q8rh91dfpsr"; depends=[MASS]; };
+  corHMM = derive2 { name="corHMM"; version="2.5"; sha256="04xr9s6950fcgxa0syzvk6dfsj44mf9msnkvd6mw99kfs13gbavw"; depends=[ape corpcor expm GenSA igraph MASS nloptr nnet numDeriv phangorn phytools Rmpfr viridis]; };
+  corTest = derive2 { name="corTest"; version="1.0.7"; sha256="1gip8rxvbhrckwmjwmxbmycndg4jrl75x8qda9l35znfv9r7p0nq"; depends=[Biobase clusterGeneration ggplot2 igraph MASS Matrix]; };
   corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
+  cora = derive2 { name="cora"; version="0.1.0"; sha256="0mx7dn05js8hqr3xgrbp2kv25y6qjlm86y6asy17hwbbvbsmama9"; depends=[]; };
   corazon = derive2 { name="corazon"; version="0.1.0"; sha256="1advzmbmnpq18ym2k8rcxhsdzfscl68jss8wbqcir68951x2aqi3"; depends=[htmltools]; };
   corclass = derive2 { name="corclass"; version="0.2"; sha256="0hsbbzzadj8yc4zmb88ncx90sfxpyfd9xmdwhb08m1z1jw96zhxp"; depends=[igraph]; };
   cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; };
@@ -6596,29 +6857,32 @@ in with self; {
   corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; };
   corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; };
   cornet = derive2 { name="cornet"; version="0.0.4"; sha256="0chp7ifcc0a9dz6ang4wjiwj7q309g9nsgyql6qmml985d8bazcy"; depends=[glmnet palasso]; };
+  coro = derive2 { name="coro"; version="1.0.1"; sha256="0r7id3dcf5rlksspsck2vv8jnisvrcc1vnkv6zpr8xh214794n3f"; depends=[rlang]; };
   coroICA = derive2 { name="coroICA"; version="1.0.2"; sha256="0pcz2256liczrn2gik8b5331rgzlxjrm7rzn1ialhifkiinifnva"; depends=[MASS]; };
+  corona = derive2 { name="corona"; version="0.3.0"; sha256="1hggsmvmbim7f6bybmdhxznmqib0k2plm370mjs7dp85i564sjkm"; depends=[gganimate ggplot2 gridExtra plyr qicharts2 reshape2]; };
   coronavirus = derive2 { name="coronavirus"; version="0.3.0"; sha256="0xcyl5b36hj522rgf7469aklrw6ld17jbbf1w3w9cl7x09bhmbck"; depends=[devtools]; };
   corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; };
   corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; };
-  corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.2"; sha256="14l64mcqfa2ayyl6d48s9fc2qh485wk02s23cy4nssn7sg1b3a5z"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; };
+  corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.3"; sha256="0371svq3y92ysnwnlprs1fjfzgy0sm52y2w3wl9ajas1fjnzmi0h"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; };
   corpus = derive2 { name="corpus"; version="0.10.1"; sha256="1mcjn6jsrvyxwcf8kx86fy7z0zsarvq6ccja3r27v7b8fjrb8mng"; depends=[utf8]; };
   corpustools = derive2 { name="corpustools"; version="0.4.2"; sha256="00v61i4c43s69mchy5zkbxgvxjx8kqlzm2vcb7snjblmd84w4id5"; depends=[data_table digest igraph Matrix quanteda R6 Rcpp RcppProgress RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; };
   corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; };
   corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; };
+  corrarray = derive2 { name="corrarray"; version="1.2.0"; sha256="1hsk425xjz9p3wwvia7h78dg24qsr5r977xm2ap5z40ah1bw7bzi"; depends=[Hmisc]; };
   corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
   corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; };
-  correlation = derive2 { name="correlation"; version="0.3.0"; sha256="0ai1accmjw8kqwnp5hx4zn4a115yzppcnczmvmhhr63dslff4rqv"; depends=[bayestestR effectsize insight parameters]; };
+  correlation = derive2 { name="correlation"; version="0.5.0"; sha256="1261kcanamk80ai2zlmjsg7mwzk6r3snivhwxcf9hil8d0sr0j1v"; depends=[bayestestR effectsize insight parameters]; };
   correlationfunnel = derive2 { name="correlationfunnel"; version="0.2.0"; sha256="0xil7cihqk7gzpy0q97sg5sw5z0gy7zqvx0f0bizcfks9gwp43cv"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; };
   correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; };
   corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; };
-  corrgrapher = derive2 { name="corrgrapher"; version="1.0.2"; sha256="0298wbkfs9kbiq3ilnqlcmd9qmk4ivhrdgdqcmfafymlja8376dc"; depends=[DALEX ggplot2 htmltools ingredients jsonlite knitr visNetwork]; };
+  corrgrapher = derive2 { name="corrgrapher"; version="1.0.4"; sha256="0s10n2av6dyjz6x4wvznpcbvpp63v6k3r9whkqsg7fiy9m3d4dr9"; depends=[ggplot2 htmltools ingredients knitr visNetwork]; };
   corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; };
-  corrr = derive2 { name="corrr"; version="0.4.2"; sha256="1mk6vvsmankrc6m5rm3y58wblsbyqar6js36c73x5g3fs95s58fj"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; };
+  corrr = derive2 { name="corrr"; version="0.4.3"; sha256="096j9y1i1g7wgvn15vpil63cnb24mm0fgklbsgygwwgnlx2j0rgg"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; };
   corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; };
-  cort = derive2 { name="cort"; version="0.3.1"; sha256="0gjvy426sn503kpxs4106ih02q7x0q5fygn0xwh3n2zj3pqlmyrn"; depends=[furrr nloptr osqp purrr Rcpp Rdpack]; };
-  corto = derive2 { name="corto"; version="1.1.0"; sha256="0kww1ij6km4qjgnp9xlg3q8wszcamdxd7ysdyhx6bskhr154g35w"; depends=[dplyr knitr pbapply plotrix rmarkdown]; };
+  cort = derive2 { name="cort"; version="0.3.2"; sha256="1iayvgwjmpmb96w5841jxhwivca7s4v5bpsdy0lrbk121saqq5z1"; depends=[furrr nloptr osqp purrr Rcpp Rdpack]; };
+  corto = derive2 { name="corto"; version="1.1.3"; sha256="03fvh33qpvkx1pcdjlsjs6dpm8qxajilj3s5q2gxr14nx6f6vzhy"; depends=[dplyr gplots knitr pbapply plotrix rmarkdown]; };
   corx = derive2 { name="corx"; version="1.0.6.1"; sha256="179fxjagbq33549zyk234kz9ajbifl7qpmdy0lrw9vzjc8aqbycf"; depends=[clipr crayon ggcorrplot ggplot2 ggpubr glue magrittr moments ppcor psych tidyselect]; };
   cosa = derive2 { name="cosa"; version="2.0.0"; sha256="1ra1m75ay829xlhjax82px4ffflnfgh2mrmzzj4i8ml545d9hmgr"; depends=[msm nloptr]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
@@ -6634,7 +6898,7 @@ in with self; {
   countToFPKM = derive2 { name="countToFPKM"; version="1.0"; sha256="0h89knii8zkbq0lw7yn3qzak30s7bifq53ga4vy6za6hqwc53x2j"; depends=[circlize ComplexHeatmap]; };
   countTransformers = derive2 { name="countTransformers"; version="0.0.6"; sha256="14n2sv7wqzslrzg0ag473ljj9mvha94161p5yh2h9l1vx7xliimf"; depends=[Biobase limma MASS]; };
   countcolors = derive2 { name="countcolors"; version="0.9.1"; sha256="1gnwmw3inh8asbk6qba34vzx1k2cnh4m9d1346gxhzhlxvl6xiza"; depends=[colordistance jpeg png]; };
-  countfitteR = derive2 { name="countfitteR"; version="1.2"; sha256="020jmhrkinzk1zv92my16jsqrq1s9iql9881nnly1nbb8a1iwf11"; depends=[ggplot2 MASS pscl shiny]; };
+  countfitteR = derive2 { name="countfitteR"; version="1.4"; sha256="1aq7v2fy24pf3r6fkmcwvs18r2xc2l1bqablp53xfc7b6kxq3vqn"; depends=[ggplot2 MASS pscl shiny]; };
   countgmifs = derive2 { name="countgmifs"; version="0.0.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; depends=[MASS]; };
   countrycode = derive2 { name="countrycode"; version="1.2.0"; sha256="0h6x578pci8rch52zan8sxzgwj0c9qpw254zz4pm2gf3vh15giij"; depends=[]; };
   countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; };
@@ -6646,32 +6910,35 @@ in with self; {
   covTestR = derive2 { name="covTestR"; version="0.1.4"; sha256="0j9kay8lwkhpdyg0fbfars1m58v0i58v1v5sm7m72s7kz8qh2yfs"; depends=[purrr Rcpp RcppArmadillo rlang]; };
   covafillr = derive2 { name="covafillr"; version="0.4.4"; sha256="1vsay0qlqcw3l6xp18rxrkhwsadsv9rpxwpj9f4d3vlr8inkiv4h"; depends=[Rcpp RcppEigen]; };
   covatest = derive2 { name="covatest"; version="1.1.3"; sha256="1vhdm8xhzy6mnd81lqqmv4zxwh3x7pc8nrnimcwgdgprlw2fhs0b"; depends=[gstat lubridate matrixcalc sp spacetime zoo]; };
-  coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.9"; sha256="1nz7r2fqmfgfg37dcnifljm22ifipjydfcvf2dl03d10av67c0cn"; depends=[colourpicker data_table dplyr egg ggplot2 ggstance markdown shiny shinyjs table1 tidyr]; };
+  coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.9.1"; sha256="0yklw2bnaz9abi92rgr14415s5lr23y3qnkj89q08hrkxj61jxmj"; depends=[colourpicker data_table dplyr egg ggplot2 markdown shiny shinyjs table1 tidyr]; };
   covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; };
   covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; };
   covglasso = derive2 { name="covglasso"; version="1.0.2"; sha256="1aq6x6bq24v1398kzw3ai4arjmma09y2p49wp6k77xsl32nkbhkz"; depends=[Rcpp RcppArmadillo]; };
-  covid19_analytics = derive2 { name="covid19.analytics"; version="1.1.1"; sha256="0qxvf2x8fb11hnb5ivyhi8isf7hax94qa9vm42b073vskdz85q9l"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly readxl]; };
-  covid19dbcand = derive2 { name="covid19dbcand"; version="0.1.0"; sha256="0dqi2qgwrvv83c19gxabz857hai571bwnpyb8v2ygr9m1srz26y6"; depends=[]; };
+  covid19_analytics = derive2 { name="covid19.analytics"; version="2.0"; sha256="06clhgx2i235s7zy6v0hiq2qnc9r9sn7b118h4xbcvjfw8wk4z6f"; depends=[ape collapsibleTree deSolve dplyr DT gplots htmlwidgets pheatmap plotly readxl rentrez shiny shinycssloaders shinydashboard]; };
+  covid19br = derive2 { name="covid19br"; version="0.1.1"; sha256="1rv4phvqndmjkrgm9q4kink42id95llwcvyimc8jcxdyz7xbs93c"; depends=[data_table dplyr httr lubridate rio rlang tidyr]; };
+  covid19dbcand = derive2 { name="covid19dbcand"; version="0.1.1"; sha256="0864xixdxzaj697al0c2gq3nk05q1pn0pc9lc2dyki71g5r67i7h"; depends=[]; };
   covid19france = derive2 { name="covid19france"; version="0.1.0"; sha256="11072mc794l0m84k2b08zhyfvxf6n6ym91i7kkm3cbirxp6bhnqy"; depends=[dplyr glue lubridate magrittr readr stringr tidyr]; };
   covid19italy = derive2 { name="covid19italy"; version="0.3.0"; sha256="1kqvpiy6ib3amx2cpkj99wm5m9y96b5snzyzhhd7qn31mn2l6hnf"; depends=[devtools]; };
   covid19mobility = derive2 { name="covid19mobility"; version="0.1.1"; sha256="1n8w1gkyz98r3svnwksl10ldmmfscyycl81xq9w8497cq6vj4gz1"; depends=[dplyr glue janitor jsonlite lubridate magrittr readr stringi tidyr tigris]; };
   covid19nytimes = derive2 { name="covid19nytimes"; version="0.1.3"; sha256="1j7frjl052pjping5s7cacvfi62i8hdfcmfmvmb02ijhl4gh5dnm"; depends=[dplyr magrittr readr rlang tibble tidyr]; };
-  covid19us = derive2 { name="covid19us"; version="0.1.6"; sha256="0zgz1iaj7g9aysklmb0fgv3ack7f134jhf4903vdfz5194w2p25l"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; };
-  covidregionaldata = derive2 { name="covidregionaldata"; version="0.5.0"; sha256="0cgq9xzs8zcxzz22cm5gs8l6ymjf19my4568zfl6ca65s5g9c8w7"; depends=[countrycode dplyr httr jsonlite lubridate magrittr memoise purrr readr readxl rvest stringr tibble tidyr xml2 yaml]; };
-  covr = derive2 { name="covr"; version="3.5.0"; sha256="1pvr95h7jg9hqq1qq1cccy323pkxldrwafl08151cc410499k4fb"; depends=[crayon digest httr jsonlite rex withr yaml]; };
+  covid19sf = derive2 { name="covid19sf"; version="0.1.0"; sha256="02n7v4qv2gw9dnc94hz58nzbfiq1ihf1r3g7vlv8sc826v8qw4bs"; depends=[devtools dplyr lubridate magrittr mapview plotly sf]; };
+  covid19swiss = derive2 { name="covid19swiss"; version="0.1.0"; sha256="083j4568j7yk7l4qj6097zp0ijq70ycvwvmbfqp3dwazmibamy34"; depends=[devtools]; };
+  covid19us = derive2 { name="covid19us"; version="0.1.7"; sha256="1gy3cbfq89mg0465n4vwqnknnv988i9l2fv6dara8hr1jysic2n3"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; };
+  covidregionaldata = derive2 { name="covidregionaldata"; version="0.8.2"; sha256="0c5jh2ap95h5snl5yfhg9d3xc75wzw9f2cmll8xp4dbva9hff433"; depends=[countrycode dplyr httr jsonlite lubridate magrittr memoise purrr readr readxl rvest stringr tibble tidyr xml2 yaml]; };
+  covr = derive2 { name="covr"; version="3.5.1"; sha256="0v5cv3cw2kpdr6wxmkbd3wclavr17zipypdcb10hhmpa4cvgqk55"; depends=[crayon digest httr jsonlite rex withr yaml]; };
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
   covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; };
   covsim = derive2 { name="covsim"; version="0.1.0"; sha256="1012fgxn7z85bk1a23v5zswa29njlbdnd9llikp1qy0mrraqlx2h"; depends=[gsl lavaan MASS nleqslv PearsonDS Rcpp rvinecopulib]; };
   cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; };
-  cowplot = derive2 { name="cowplot"; version="1.0.0"; sha256="19cqdhgfyr1wj0fz0c5ly8f0aiy9sfgzq6lzb78hkx0hdp2agybh"; depends=[ggplot2 gtable rlang scales]; };
+  cowplot = derive2 { name="cowplot"; version="1.1.1"; sha256="0j7d5vhzdxn1blrsfafx5z8lhq122rp8230hp9czrpsnnhjydp67"; depends=[ggplot2 gtable rlang scales]; };
   cowsay = derive2 { name="cowsay"; version="0.8.0"; sha256="12hximrdpikkczpwqjmah11nbwzyf7j1x7zcxa7igqwq8nfgv2yv"; depends=[crayon fortunes rmsfact]; };
   coxed = derive2 { name="coxed"; version="0.3.3"; sha256="09jnqza8wp2palayb0vsz43qmh8470gxil1l7g3b65lmxa7wpmnh"; depends=[dplyr ggplot2 gridExtra mediation mgcv PermAlgo rms survival tidyr]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
   coxme = derive2 { name="coxme"; version="2.2-16"; sha256="04aid8v0y2afwwbfm39np1pgdla4jw427gy2wazsphf495b4pkm0"; depends=[bdsmatrix Matrix nlme survival]; };
-  coxmeg = derive2 { name="coxmeg"; version="1.0.11"; sha256="03a0arzgh12ah62dxfdp3yb25xp0h1ia5hqb3gf3ywrdr78zp8fa"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; };
+  coxmeg = derive2 { name="coxmeg"; version="1.0.12"; sha256="18h3isgj7p5qvxdqnbjgdsykyy5lvml27rgkzx398571f0m6qrx1"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; };
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
   coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; };
-  coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; };
+  coxphf = derive2 { name="coxphf"; version="1.13.1"; sha256="06c83v3lrpzm81aclnl1pyqq2kfflbbmcg911blpr7dgynzk0zk5"; depends=[survival]; };
   coxphw = derive2 { name="coxphw"; version="4.0.2"; sha256="08bfl21608i5jkk993qjpnh36xbfsm2xx22rpff0v6ipalj9vmj2"; depends=[survival]; };
   coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
   coxrt = derive2 { name="coxrt"; version="1.0.3"; sha256="1xggczjx5psl4m4m83vh4y6swnh3pf9rngnzx3268iznfz1g43h2"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; };
@@ -6679,26 +6946,27 @@ in with self; {
   cp4p = derive2 { name="cp4p"; version="0.3.6"; sha256="1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd"; depends=[limma MESS multtest qvalue]; };
   cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
   cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
-  cpcens = derive2 { name="cpcens"; version="0.1.0"; sha256="18hv659021wmw4v69xf0k5bq4dvyjkz9gmad0a8fr1ym1qr0ip8i"; depends=[cents Rdpack tbart]; };
   cpd = derive2 { name="cpd"; version="0.1.0"; sha256="1qcyb7n69ppa0py7w31msim7gf2wdh94hmsilsdk8ivxljc1gv8n"; depends=[fAsianOptions Rdpack]; };
   cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
-  cplexAPI = derive2 { name="cplexAPI"; version="1.3.6"; sha256="1yj0ighr64v1wdz40ml8dmypa01r6r9lr59fc0mfq4n1l0df62gw"; depends=[]; };
-  cplm = derive2 { name="cplm"; version="0.7-8"; sha256="0gvl3xwqbyqgqd42l97ryy8qsf23njqfgvc16w21124s77wsixaw"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
-  cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
-  cpp11 = derive2 { name="cpp11"; version="0.2.1"; sha256="1113y61lj4cg1d2yjavdx9zih5rzb4pnxmj5v3sr4bhzlxz2scda"; depends=[]; };
+  cplexAPI = derive2 { name="cplexAPI"; version="1.4.0"; sha256="00h2zir1ffzjiglfyq8bsfmgq9z155jr0k0fxv8fsbfyw2x9dg10"; depends=[]; };
+  cplm = derive2 { name="cplm"; version="0.7-9"; sha256="057m61rq2hzb55imj3922zmc9kjxh053k3kgy54a4l0jlxb90lyj"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
+  cpm = derive2 { name="cpm"; version="2.3"; sha256="07zbvc5jkwv76lkzby6r073fxjsqgnrdl2w9lcph577knnip89jx"; depends=[]; };
+  cpp11 = derive2 { name="cpp11"; version="0.2.4"; sha256="08lrmpfkwh1w290a5ikhs9yn1vn32wbgvbzb4n3zb2indb8s5g69"; depends=[]; };
   cppRouting = derive2 { name="cppRouting"; version="2.0"; sha256="0yfiyg1clnl85lk5ah8dcchv71drk6r093vpl82xnczyan5z94sr"; depends=[data_table Rcpp RcppParallel RcppProgress]; };
   cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; };
   cprobit = derive2 { name="cprobit"; version="1.0.2"; sha256="16fnndpkd226paahmadsddakj4yhybw7lp3csr73fwv78zfl2fj9"; depends=[car ggplot2 gridExtra nortest]; };
   cprr = derive2 { name="cprr"; version="0.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; };
+  cpss = derive2 { name="cpss"; version="0.0.2"; sha256="1a6nphzf9y1p1ic51f0zll6g3j3flr7szrvzac1w4a023fj7301r"; depends=[dplyr ggplot2 gridExtra magrittr mvtnorm Rcpp RcppArmadillo Rfast rlang tibble tidyr]; };
   cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.0"; sha256="1fn88cqryji1syzhnx726m5svxnrlyynxk4jhp5ny8g3knai6nnk"; depends=[Hmisc knitr plyr]; };
+  cpsvote = derive2 { name="cpsvote"; version="0.1.0"; sha256="0nmg79isqwvxyg7zkfbshndfjb2fnc2ffg32hxvjvsy714lpljf6"; depends=[dplyr forcats magrittr readr rlang stringr]; };
   cpt = derive2 { name="cpt"; version="1.0.2"; sha256="0j9ns8qhcvwxnzl9rc59vmh5jdahnni5dxpmi38gxvvj5k9hd8p7"; depends=[glmnet MASS nnet randomForest]; };
-  cptcity = derive2 { name="cptcity"; version="1.0.4"; sha256="1agknys80m16xq0x285sdf1452a6dmghysrhy7s6zfcb59acb1nf"; depends=[]; };
+  cptcity = derive2 { name="cptcity"; version="1.0.6"; sha256="03g10pjpz7gb6daalinki7smfjhbadrsmnxf6qgygqdaxm3ah400"; depends=[]; };
   cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; };
   cqcr = derive2 { name="cqcr"; version="0.1.2"; sha256="11bcqr4bw11vjqdgddpfjb4dsk0dxdasddkp1g310l71vw7zaryg"; depends=[anytime dplyr httr jsonlite purrr rlang snakecase]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
-  cquad = derive2 { name="cquad"; version="2.1"; sha256="1cq57qd33cbzhgnnw4fk36xch0prwr9a404sxi7b4ijwgzw84d0h"; depends=[MASS plm]; };
+  cquad = derive2 { name="cquad"; version="2.2"; sha256="18r779w1c5ggm6qigkmwzk7rwm32fvd82zxw82xvzqj1c2akmfpj"; depends=[MASS plm]; };
   cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; };
-  crandep = derive2 { name="crandep"; version="0.1.0"; sha256="1dfm4vf3x67q9l10dh4bw6d75argqfhmfd0j3bjr7bv9bhn1m1a7"; depends=[dplyr igraph Rcpp RcppArmadillo RcppGSL rvest stringr xml2]; };
+  crandep = derive2 { name="crandep"; version="0.1.1"; sha256="1czv2n4zqmkryvb56pfzczj8m1qan6kq3q4hlm17a8kp3s9kvlcd"; depends=[dplyr igraph Rcpp RcppArmadillo RcppGSL rvest stringr xml2]; };
   crank = derive2 { name="crank"; version="1.1-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; };
   cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; };
   cranlogs = derive2 { name="cranlogs"; version="2.1.1"; sha256="02d9qrqyjj33naq3g7ykaw9dzzl1dq8qf13id6h7kfx1fvx9b7zd"; depends=[httr jsonlite]; };
@@ -6707,33 +6975,34 @@ in with self; {
   crassmat = derive2 { name="crassmat"; version="0.0.6"; sha256="1c4ii34vh8y5b3z2maby4cafb3n2m9bnxv3762cy0z12mbg7zk1s"; depends=[svMisc]; };
   crawl = derive2 { name="crawl"; version="2.2.1"; sha256="18mr7vp72jj5msj9mbq45jy3f6qhn45azsmkq07i2d30gwdj0c3a"; depends=[dplyr gdistance lubridate magrittr mvtnorm purrr raster Rcpp RcppArmadillo rmapshaper sf shiny sp tibble]; };
   crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; };
-  crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; };
   crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; };
   credentials = derive2 { name="credentials"; version="1.3.0"; sha256="1w9zj34xdwz9bszsvhv2cbgq96y5sgxbh7ndn31pgfcpzlkfq6f1"; depends=[askpass curl jsonlite openssl sys]; };
-  creditmodel = derive2 { name="creditmodel"; version="1.2.4"; sha256="0qp1z8bmr6pa2zsl28p5587y0kljadqsq9camkiplwg3rp4sg0ip"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; };
-  credsubs = derive2 { name="credsubs"; version="1.1.0"; sha256="0zbn6ifx48cf5b54lpp560vvvhxsa23xl815yvwi8n5xpy1ls13h"; depends=[]; };
+  creditmodel = derive2 { name="creditmodel"; version="1.2.7"; sha256="1cskm854ncbh1lxsv6idkilxrhx5gsffkz0jxbk8ppik0q45gpfm"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; };
+  credsubs = derive2 { name="credsubs"; version="1.1.1"; sha256="19l3vsjxd9lvaf67l61x9l0j4y124p93dfqzw7rl1ya5sxbdzs7a"; depends=[]; };
   credule = derive2 { name="credule"; version="0.1.4"; sha256="0kwjjkavch21grx845kdcansaj0g407v7z3wmhy4whra9ic12y76"; depends=[]; };
   cregg = derive2 { name="cregg"; version="0.4.0"; sha256="1a34jhdk4r9ywsrc5dc8wq5am3059cli60f6n2n8j04ls13fvlkd"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; };
-  crfsuite = derive2 { name="crfsuite"; version="0.3.2"; sha256="049hd6rh32315lhn5sjylx8k33r95ar04l3j7fs92cw6z16vva6n"; depends=[data_table Rcpp]; };
+  crfsuite = derive2 { name="crfsuite"; version="0.3.4"; sha256="1003y435hn30wws0ynlla1rz21kh3dp2ggkbyy9vhxgvjzii94n7"; depends=[data_table Rcpp]; };
   cricketr = derive2 { name="cricketr"; version="0.0.23"; sha256="0daxw2rdx4j1b4h557zhqlbbqbzdai5vzy3fal4mp6hgv350d5ks"; depends=[dplyr forecast ggplot2 httr lubridate plotrix scatterplot3d XML]; };
   crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; };
   crimedata = derive2 { name="crimedata"; version="0.2.0"; sha256="073zlk9b4saz72d33z73mc9qzfk49bxwjhph6zbw27nl38k74j7d"; depends=[digest dplyr httr magrittr purrr readr sf stringr tibble]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
+  crimeutils = derive2 { name="crimeutils"; version="0.2.0"; sha256="0hhghk4k3j72fxlz9wl9m2yqia9a24y61zp60d1ah0wk29n8blv4"; depends=[dplyr ggplot2 gridExtra gt magrittr scales tidyr]; };
   crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; };
   crispRdesignR = derive2 { name="crispRdesignR"; version="1.1.5"; sha256="1q2717xnmgq3937skwg8gvj7g4zdld9jyvckmih2b0aazrdhxr9p"; depends=[BiocGenerics Biostrings DT gbm GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors shiny stringr vtreat]; };
   crmPack = derive2 { name="crmPack"; version="1.0.0"; sha256="11zy1ci9d0zjbmc0gws9j9qrnfcqvky1ws9p41wjn0zifcckc5gi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
-  crmReg = derive2 { name="crmReg"; version="1.0.1"; sha256="1i3i4pd1ff7cmyd268p5kmncrk0lrq4q4cjhkhxbp2pah041q4wk"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; };
+  crmReg = derive2 { name="crmReg"; version="1.0.2"; sha256="0y6xb0sxhsqcmcwbkwvk70snwqhxgzl513ld9dp53cm88qdwaj1r"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; };
   crminer = derive2 { name="crminer"; version="0.4.0"; sha256="0yaaj6fxx7rhzcgr6l220qc0n3lf1zlw98m3liq7qw0bcwpnpcrg"; depends=[crul hoardr jsonlite pdftools xml2]; };
   crmn = derive2 { name="crmn"; version="0.0.21"; sha256="0wp99fsw7y859gp1x22f77r9rv1m0xspbzhzgshzf7hi86xb57k5"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
   crochet = derive2 { name="crochet"; version="2.3.0"; sha256="0zvjaf6cv0nrjb4l4llkr0mmgha7ig31p4ri2rlnqyjlxi5l8hyq"; depends=[]; };
   cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; };
-  cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; depends=[digest]; };
+  cronR = derive2 { name="cronR"; version="0.4.2"; sha256="0yydm8whwzb3iclg9a8xq0xh4l7vgi6d84r20yvkh6fqzl7vy2nm"; depends=[digest]; };
   crone = derive2 { name="crone"; version="0.1.1"; sha256="03qznxml940rl3kfxy4jkg9nsx9ss0gf2ck0ry000xglw6rm2s42"; depends=[]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
   cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; };
   crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
   crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
+  crossmap = derive2 { name="crossmap"; version="0.2.0"; sha256="1ml48vwk2kff7397135sl19blicc4bn1yh90bsyrhn3vd4wlhzvs"; depends=[purrr rlang]; };
   crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
   crossrun = derive2 { name="crossrun"; version="0.1.0"; sha256="0br57nraqhs5f1cpidc8kd31izm82wvhiw9pxcdj9v51l9vifbmx"; depends=[Rmpfr]; };
   crosstalk = derive2 { name="crosstalk"; version="1.1.0.1"; sha256="03ihj7cimkklrbad9zic78xsrfcisygmgy859hqnx0hiph80p9rn"; depends=[htmltools jsonlite lazyeval R6]; };
@@ -6742,20 +7011,19 @@ in with self; {
   crossword_r = derive2 { name="crossword.r"; version="0.3.6"; sha256="1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; };
   crov = derive2 { name="crov"; version="0.2.0"; sha256="1i3a5nagzinsla6p3wjyj3x12gyfqs6vapaqxgr3dh6m727jw5i5"; depends=[gtools VGAM]; };
   crplyr = derive2 { name="crplyr"; version="0.3.6"; sha256="0np4wy1wwkbzn2rq9mpirxzp5idrm2813mmqhflywa5wwlbckwy8"; depends=[crunch dplyr ggplot2 lazyeval lifecycle purrr rlang scales stringr tibble tidyselect viridisLite]; };
-  crqa = derive2 { name="crqa"; version="2.0"; sha256="1iivknva8xfcjhm43468ndli16gqwh13zm2apqp7vqb2xp3mrgw6"; depends=[gplots Matrix plot3D pracma rdist tseriesChaos]; };
+  crqa = derive2 { name="crqa"; version="2.0.1"; sha256="04qzg4i3w5wqk1mp9gi90149hfjc7mpqpdwljrafnrv5jfgpjmyi"; depends=[FSA gplots Matrix plot3D pracma rdist tseriesChaos]; };
   crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
   crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
   crs = derive2 { name="crs"; version="0.15-31.1"; sha256="1p16nnxskjf3fdrdm5y1n5zj0acyrmc73ff75rgry1b1fd4yk61x"; depends=[boot np quantreg rgl]; };
   crseEventStudy = derive2 { name="crseEventStudy"; version="1.2"; sha256="1fgjj78p54fk0bkvx0fq1h7c5j4c64g10cdjzmmqhhxlyjwp5z7y"; depends=[sandwich]; };
-  crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; };
   crsmeta = derive2 { name="crsmeta"; version="0.3.0"; sha256="19v0bq80cma74jjl0k42pmlpd5jfv6b0hr7j2iq0d47h50pvrd02"; depends=[]; };
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
   crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; };
   crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; };
   crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; };
   crul = derive2 { name="crul"; version="1.0.0"; sha256="09qhvcn67f7sv48avj9m5a06yzckz56qsss9m062v6zqdh7m1pia"; depends=[curl httpcode jsonlite mime R6 urltools]; };
-  crunch = derive2 { name="crunch"; version="1.27.0"; sha256="0r78nncr4pd6gir4pwxb4vwkw7i7s75fk8628xm0qy0lv9qhhi7n"; depends=[crayon curl httpcache httr jsonlite]; };
+  crunch = derive2 { name="crunch"; version="1.27.5"; sha256="1vklp4wkk04k945rd2s9in8w0g3y02jqb2m85nv5ks903bmswzg8"; depends=[crayon curl httpcache httr jsonlite]; };
   crunchy = derive2 { name="crunchy"; version="0.3.2"; sha256="1igrfjrvp60hxcsjf1hzfsnbm7ji478p2zfp8nzqi0ybpirrrcz3"; depends=[crunch httpcache miniUI rstudioapi shiny]; };
   cruts = derive2 { name="cruts"; version="1.1"; sha256="1ih6h9qk4yflzars00d61smjqj7s4bfvc2ikp6vlki9f6k012xcx"; depends=[lubridate ncdf4 raster sp stringr]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
@@ -6763,11 +7031,14 @@ in with self; {
   csa = derive2 { name="csa"; version="0.7.0"; sha256="0cmabcvfxfplnzx7mdsfas3jhgz44y86411amaphm75zmv8khcif"; depends=[data_table doParallel foreach ggplot2 ggpubr Lmoments moments raster reshape2 scales]; };
   csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; };
   csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; };
+  csci = derive2 { name="csci"; version="0.9.3"; sha256="00s1gx5h141w1vjw8j3k7bn71c4dy80m6wakd1c1z7rmx1jbfp6m"; depends=[exactci]; };
   cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; };
   csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; };
-  csodata = derive2 { name="csodata"; version="1.0.2"; sha256="0xwc9dn6zvq09z78x595kpbch985n4zpzaccl1wpdlr2pydqfmz2"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; };
+  csodata = derive2 { name="csodata"; version="1.1.1"; sha256="0h43psxas3js43p0qpvw225cxxfr444d91y282jvi7d9cs8mkxfg"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; };
   csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; };
   cspec = derive2 { name="cspec"; version="0.1.2"; sha256="049vynbffxyd5zwxwyz1jv05zgq7zrx1ypzv5j62ph64gl42m13p"; depends=[]; };
+  cspp = derive2 { name="cspp"; version="0.3.0"; sha256="06cn3x7m48kqs9av9m8rsifrl00q764bb63szfsxqwcng29p08x5"; depends=[dplyr ggplot2 haven mapproj purrr readr rlang stringr tidyselect]; };
+  csppData = derive2 { name="csppData"; version="0.1.1"; sha256="0qj109r1f9phxkcw7zcsmz9d20zr86mdmiqkyb2g2pg7ywwd4lgw"; depends=[]; };
   csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
   cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; };
   cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; };
@@ -6775,7 +7046,6 @@ in with self; {
   csv = derive2 { name="csv"; version="0.5.9"; sha256="1x2z1blb8rwnhl8nvx9y0c1qqca9402xpqc2wkbkz47lppgmvzfw"; depends=[data_table stringi]; };
   csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; };
   csvy = derive2 { name="csvy"; version="0.3.0"; sha256="0id015szw1c63vd1h0515jsqdhyn32sxpxm89f3sb1qkgq3yynmy"; depends=[data_table jsonlite yaml]; };
-  ctDNAtools = derive2 { name="ctDNAtools"; version="0.4.0"; sha256="0apdz3dv6snlshiq314clkpqycppd3mmyq4skyd1bdrbycnm5s96"; depends=[assertthat BiocGenerics Biostrings BSgenome dplyr ellipsis furrr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr purrr rlang Rsamtools tidyr VariantAnnotation]; };
   ctgdist = derive2 { name="ctgdist"; version="0.1.0"; sha256="1m3ryppfvd984n5xfphjqhi9i1sigl17v897mqaichj21dzaq62f"; depends=[mirt]; };
   ctgt = derive2 { name="ctgt"; version="1.0"; sha256="0iznqskyi80xs8xn2hrrlal9qz9cwq6m9ml6wfwyynbzgn7vmvvh"; depends=[BH Rcpp]; };
   cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; };
@@ -6785,14 +7055,14 @@ in with self; {
   ctmle = derive2 { name="ctmle"; version="0.1.2"; sha256="0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3"; depends=[glmnet SuperLearner tmle]; };
   ctmm = derive2 { name="ctmm"; version="0.5.10"; sha256="0rxcq3nb3b5p21wjbcranxjj4zas31lm293lv6bb26av2mlhc8xj"; depends=[data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; };
   ctqr = derive2 { name="ctqr"; version="1.1"; sha256="1iv6mms7p0xca91mpj61cj8kxv2bwqrpvwdsbx2lk6hgys8g70y2"; depends=[pch survival]; };
-  ctrdata = derive2 { name="ctrdata"; version="1.3.1"; sha256="06xayav8mk5v0y42isg84pqb0d2w204p7rqz45vhsfcqdf918nng"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; };
+  ctrdata = derive2 { name="ctrdata"; version="1.4.1"; sha256="1aijks80gaz5s4h5b32izk6n38payhypichy3k3pzc6zx388hl79"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; };
   ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; };
-  ctsem = derive2 { name="ctsem"; version="3.3.8"; sha256="1j0ibld37c34dhpi3gz3d90z0xpakabqf5rxwq5f0nnib6pwghfx"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm pkgbuild plyr Rcpp RcppEigen RcppParallel rstan StanHeaders tibble]; };
+  ctsem = derive2 { name="ctsem"; version="3.4.1"; sha256="06awy3dr7cwkd25fgxwd68pyvqfsz888fgia5kp2y0m34rhj0isi"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm pkgbuild plyr Rcpp RcppEigen RcppParallel rstan StanHeaders tibble]; };
   ctsemOMX = derive2 { name="ctsemOMX"; version="1.0.2"; sha256="1ln0ns2ff054m0zak0f6gbpa1q2zq2vpsf0zpd99m4m26ws1gzyw"; depends=[ctsem Matrix OpenMx plyr]; };
   ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; };
   cuRe = derive2 { name="cuRe"; version="1.0.1"; sha256="0vw2iv9inz8md7lz6f1p456wxjc07kap1mvqf58hixqxbrb23dgi"; depends=[date numDeriv relsurv rstpm2 statmod survival]; };
   cubature = derive2 { name="cubature"; version="2.0.4.1"; sha256="006la36gxdikvmdnq4ny7ik7r30id4z3b3fqsl57dpqwkpsbsgrq"; depends=[Rcpp]; };
-  cubelyr = derive2 { name="cubelyr"; version="1.0.0"; sha256="0h9s5j9q05bdzdv7dbghzfbhqf96kyxyrxx1mqf8phzc77w4yh25"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; };
+  cubelyr = derive2 { name="cubelyr"; version="1.0.1"; sha256="1g3pvam1fkqh63snibqcfaazvj7lrkfip8w9pjvwdclj0l8382kl"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; };
   cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; };
   cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; };
   cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; };
@@ -6801,6 +7071,7 @@ in with self; {
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
   cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; };
   cumulocityr = derive2 { name="cumulocityr"; version="0.1.0"; sha256="0ybvh5args3s1f3nra58bnfwgrlrdpw40by68az84s90v88bbz2q"; depends=[httr jsonlite]; };
+  curephEM = derive2 { name="curephEM"; version="0.1.6"; sha256="18lr4fq7nim9axxg9kvivgs3hvmkqnp15sn30vqdbl545a4h78yy"; depends=[Matrix survival]; };
   curl = derive2 { name="curl"; version="4.3"; sha256="1nrf6md41b37j424y6rvifdj9zb3j14f60fj7q71k9jhpf2x81kl"; depends=[]; };
   currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
   curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; };
@@ -6826,20 +7097,19 @@ in with self; {
   cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; };
   cvmdisc = derive2 { name="cvmdisc"; version="0.1.0"; sha256="19b9kxqgbk1d631l3jph87pzhk4zf3xd5q5j2xsrbqz8zmm96sn9"; depends=[CompQuadForm]; };
   cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; };
-  cvms = derive2 { name="cvms"; version="1.0.2"; sha256="1swx67ns0wamh9k2fybk86ywqp4pbg3vqwk2h5jphca2zpnmq5pw"; depends=[broom checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn plyr pROC purrr recipes rlang stringr tibble tidyr]; };
+  cvms = derive2 { name="cvms"; version="1.2.0"; sha256="1axc2gjscsi2mf6dqdwii7b9p46viq4jyv2vghdb3fs5vx7jqy4a"; depends=[broom broom_mixed checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn plyr pROC purrr recipes rlang stringr tibble tidyr]; };
   cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
   cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
-  cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
   cwbtools = derive2 { name="cwbtools"; version="0.3.1"; sha256="1q8mim1k5fbf23d506wg82f9i578jy99kzkhvydibb5apri77d7n"; depends=[cli curl data_table jsonlite pbapply R6 RcppCWB RCurl rstudioapi stringi xml2 zen4R]; };
   cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; };
   cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
   cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; };
   cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
-  cyanoFilter = derive2 { name="cyanoFilter"; version="0.1.3"; sha256="01qws6lqh14rl0mwsmgsimssvzjlnvzir56pd9xyx9p2k8s19f56"; depends=[Biobase flowCore flowDensity RColorBrewer Rdpack stringr]; };
   cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; };
-  cyclestreets = derive2 { name="cyclestreets"; version="0.1.5"; sha256="1wvg43wrnh0lz2pkkrbidzdsrkypdl2r4ccs9jhdsj8ixm158dvf"; depends=[httr jsonlite magrittr sf stringr]; };
+  cyclestreets = derive2 { name="cyclestreets"; version="0.3.0"; sha256="1hkmibl8dv99q6dl6xvzvjm96g4b9v364mbdffrxm6ncvzg6rfri"; depends=[geodist httr jsonlite magrittr sf stringr]; };
   cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; };
   cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
+  cyclomort = derive2 { name="cyclomort"; version="1.0.2"; sha256="0qmfwhrp7bq7av0yc95xnz2sd1jxfaiys9smrk1kpclnynnra9rr"; depends=[flexsurv lubridate magrittr mvtnorm plyr scales survival]; };
   cymruservices = derive2 { name="cymruservices"; version="0.5.0"; sha256="1xhdvijybdy7312qdbp50881yix587pmym0hchnwb3h0vhjv553v"; depends=[memoise pingr stringi]; };
   cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
   cyphr = derive2 { name="cyphr"; version="1.1.0"; sha256="03w26b5vvy9zwzp001g0lpwcndwqdsfsz80x11kik0cih1g8apsw"; depends=[getPass openssl sodium]; };
@@ -6848,41 +7118,44 @@ in with self; {
   cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; };
   cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; };
   cytominer = derive2 { name="cytominer"; version="0.2.2"; sha256="1n9yimjhdziv1vzjyni6ssi38nxcnfr5jpmzgxcn6vysffh5s9pz"; depends=[caret doParallel dplyr foreach futile_logger magrittr Matrix purrr rlang tibble tidyr]; };
-  czechrates = derive2 { name="czechrates"; version="0.1.8"; sha256="00zp6kwi6mgyr4dchkc8f7nz5hvyin7hcjbda8v94h220win1zxz"; depends=[curl dplyr httr magrittr readr tibble]; };
-  czso = derive2 { name="czso"; version="0.2.3"; sha256="1gaflfi1sq49vjaah8mnbydvyqwwkl1ca2ay399dn9gw1kjcq0fd"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi stringr tibble usethis]; };
+  czechrates = derive2 { name="czechrates"; version="0.1.10"; sha256="0xxp61bgb2knc0cnab0c3iq92i251iic9awih557phyljb1f2z8p"; depends=[curl dplyr httr magrittr readr tibble]; };
+  czso = derive2 { name="czso"; version="0.3.2"; sha256="0f47b8xgkm0w35xxzkwb708ql6rx6ay99njyc6yjvhqfcgybxq30"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi stringr tibble usethis]; };
   d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
-  d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
+  d3Tree = derive2 { name="d3Tree"; version="0.2.2"; sha256="142bc6gdmhzaikdfyxb1pq9nlybgkrgi2kjgk40w4wbxzx5mwkbh"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
   d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; };
-  d3r = derive2 { name="d3r"; version="0.9.0"; sha256="0vd1qk8yr18xdfkv5ybhqvf0mmccpi721wqa7c881nzm9nnlzc4y"; depends=[dplyr htmltools rlang tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.9.1"; sha256="0kc82vvyfxhxvqfalngn36prn3sxdiinsx04rn99ha6zdc27zp5k"; depends=[dplyr htmltools rlang tidyr]; };
   dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.2.0"; sha256="0c1hvawb9gw6vckims3g8kzn2c4f0as5x1vw39sdvkwc92xy26lv"; depends=[]; };
+  dCUR = derive2 { name="dCUR"; version="1.0.0"; sha256="12i2qcjq9i1ycs6z6g3yr1imv7v4g19kdhf1vg9xkvh43pagb6h7"; depends=[dplyr ggplot2 magrittr MASS mclust ppcor Rdpack stackoverflow]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; };
   dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; };
   dLagM = derive2 { name="dLagM"; version="1.1.4"; sha256="1qc8l6971khz76n9i3wvn6j9mkd9lp35qvnxw1chhprbl1ps4h4w"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll sandwich strucchange wavethresh]; };
   dMod = derive2 { name="dMod"; version="1.0.1"; sha256="1xw52kliyiv9vrw0m9y7baqdcpqz4706625if8b63nfr70i77a9p"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; };
+  dPCP = derive2 { name="dPCP"; version="1.0.3"; sha256="1gqd6a1kbzp1433k99l11gvxx11c475f33cpg7138yiiik2lp5s6"; depends=[dbscan e1071 exactci ggplot2 ggpubr raster rlist scales shiny shinyjs stringr]; };
   dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; };
   daarem = derive2 { name="daarem"; version="0.5"; sha256="167sqp7fnyhwgk7crl3b6m6i8mpn3hmsaqzi4v5ggi48fg19bis7"; depends=[]; };
   dabestr = derive2 { name="dabestr"; version="0.3.0"; sha256="0i4k8h46cw5ds1cammxxli8kpc82ill81xw3izi33lja7wl9vmnw"; depends=[boot cowplot dplyr effsize ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr RColorBrewer rlang simpleboot stringr tibble tidyr]; };
+  dabr = derive2 { name="dabr"; version="0.0.2"; sha256="0j6mmr2qvz51g7jjmysqy7sdshnm8y2q4k2zarl6ja6mvi9i65jv"; depends=[knitr RMariaDB]; };
   dad = derive2 { name="dad"; version="3.4.3"; sha256="0gcz1lbrjs6pjjlbxmfpq45drlqkghdqfswl2kcnpiqybl79wzb3"; depends=[DescTools e1071 ggplot2]; };
-  dae = derive2 { name="dae"; version="3.1-27"; sha256="14q3cxhcz0zqjdkas0dl71k2bp5qwvb60gha47s78hdr38r46kml"; depends=[ggplot2 plyr]; };
+  dadjoke = derive2 { name="dadjoke"; version="1.0"; sha256="118pacwc2qb3c5zbhr71zf4zj1ab2g4rs5h6bvrscjyd7a71jc3f"; depends=[]; };
+  dae = derive2 { name="dae"; version="3.1-32"; sha256="126w1lb9pz8mb2ajl2vz5dj798nbifp0dypnzfgcwixif5g5bpqi"; depends=[ggplot2 plyr]; };
   daewr = derive2 { name="daewr"; version="1.2-5"; sha256="0cfak3kmw8da7rh04d9qkqypxshj6wanac3318jbc5gvk0injbvd"; depends=[FrF2 lattice stringi]; };
   daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; };
   dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
   dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
   dagitty = derive2 { name="dagitty"; version="0.3-0"; sha256="0b1y81f019lhib2bsbs0rn0i7y0ah8ablsx73rynprrpxrp0fgnk"; depends=[boot jsonlite MASS V8]; };
-  dalmatian = derive2 { name="dalmatian"; version="0.3.0"; sha256="06j7ampp0hwjqgw2agplfc8mngxnb6g4yv3l08plg35769jxxz7f"; depends=[coda dglm gdata ggmcmc rjags]; };
   dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; };
-  damr = derive2 { name="damr"; version="0.3.4"; sha256="19rffdrgx9c03f66qgj1gwp5vra89n3jrrb54i9xl2rxsf28ry3h"; depends=[behavr data_table readr]; };
+  damr = derive2 { name="damr"; version="0.3.7"; sha256="12vr630m2az8xb8wndk8cyh7r8mwg3lvr7i3fcgqqxcq9rsgqm4r"; depends=[behavr data_table readr]; };
   dams = derive2 { name="dams"; version="0.3.0"; sha256="1jlx1b4cir1vwq75jnmk0pc6j95syfpi0hlnkx82g7pwfxwrdrib"; depends=[crul fauxpas janitor readxl]; };
-  dang = derive2 { name="dang"; version="0.0.11"; sha256="14bxzbkrqzs0ic7n4rlaa429lwdgldlcx97h8l7ma6jh8c0fx3qr"; depends=[]; };
+  dang = derive2 { name="dang"; version="0.0.12"; sha256="0vsj9ii6nnj419bk6vdc0czysb0liq244jnvfb13sk930b5h4j9j"; depends=[tidyCpp]; };
   dani = derive2 { name="dani"; version="0.1-1"; sha256="0ff0hcb5r8k6m6kv1zhjrpvl7gr1al3q0zlk4yjj89qd2j5byqp8"; depends=[Epi]; };
-  dann = derive2 { name="dann"; version="0.2.0"; sha256="18c9rx7qg76pnmg2h4zazqq7k0vxgqh70j85cb7cc8lf0qsj6l8i"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; };
+  dann = derive2 { name="dann"; version="0.2.1"; sha256="1bafd3qkzqgaji6ihhzp95qyzy9gjv75666qp6j6cxw75vp6x9ml"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; };
   danstat = derive2 { name="danstat"; version="0.1.0"; sha256="1wb4v4s9qc7qna7jgd1kk0xvyaqmxhnmjvr5wlk5jjl355lhjxbc"; depends=[httr jsonlite readr]; };
   dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; };
-  daqapo = derive2 { name="daqapo"; version="0.3.0"; sha256="1fyl95y57grqckyx1vp4x4f2mq8rk0l2vxh4cyr75cw23j6p4lsc"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; };
+  daqapo = derive2 { name="daqapo"; version="0.3.1"; sha256="09fmnpp4nl6n1z834dxzs2v56ba9sfb4mrmc1nrrixxhfsxshmb7"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; };
   darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; };
-  dartR = derive2 { name="dartR"; version="1.1.11"; sha256="0k768ppm4iw4fi72dp8f1684kizqp1spfb4cnnqxq1dy6w0qz5i8"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plyr PopGenReport qvalue reshape2 rgdal rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; };
+  dartR = derive2 { name="dartR"; version="1.8.3"; sha256="0rc4ipwy7xpnf9qih48clm2jva05rfdrjfzkpv25m2p44r1hnh19"; depends=[adegenet ape foreach ggplot2 gridExtra HardyWeinberg hierfstat MASS mmod plyr PopGenReport raster robustbase SNPRelate sp StAMPP stringr tidyr vegan]; };
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dash = derive2 { name="dash"; version="0.5.0"; sha256="1hzyxplq0fclyr8ahh0mhrx1ibf49y43889p8fi8kmvg0x24i1iz"; depends=[assertthat base64enc brotli crayon dashCoreComponents dashHtmlComponents dashTable digest fiery htmltools jsonlite mime plotly R6 reqres routr]; };
   dashCoreComponents = derive2 { name="dashCoreComponents"; version="1.10.0"; sha256="11jrlls6k6qlvi81741ga908aw22m05fhhr9jpzli982s611jrwl"; depends=[]; };
@@ -6890,44 +7163,44 @@ in with self; {
   dashPivottable = derive2 { name="dashPivottable"; version="0.0.2-1"; sha256="1fv5pnvimf7w1k1lsijh9y2zk4z1z00m6m640jxvqla5i1rqy8cq"; depends=[]; };
   dashTable = derive2 { name="dashTable"; version="4.7.0"; sha256="0iy07dxa90vsp3rfk8ij78j9ajz1mpxywmclxzkfj7axjyydxh5w"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
-  dashboardthemes = derive2 { name="dashboardthemes"; version="1.1.1"; sha256="134xn8xbfg2j32m85dagjp18s1qx5pl6799a015fbc4zvzd9irmh"; depends=[htmltools]; };
+  dashboardthemes = derive2 { name="dashboardthemes"; version="1.1.3"; sha256="0z2ar5q0ys5zbny2hfda0sxp29v76sc8xar1ah5hi5jlnas0iccz"; depends=[htmltools]; };
   dat = derive2 { name="dat"; version="0.5.0"; sha256="1d3q4bang6pm06rfzh6h947xy3wwqn3l6ri0h4hzklg5pzwpsajd"; depends=[aoos data_table Formula magrittr progress]; };
-  data_table = derive2 { name="data.table"; version="1.13.0"; sha256="0wihpg1syjxzsij2fmhwh30vvf2cghw2b2qi79w36qwil2s8w2gn"; depends=[]; };
+  data_table = derive2 { name="data.table"; version="1.13.6"; sha256="16ryrpzl86krww5nx7a97i09y5xqld4lw4d9pa1vzjl99x6ds36m"; depends=[]; };
   data_tree = derive2 { name="data.tree"; version="1.0.0"; sha256="0pizmx2312zsym4m42b97q2184bg3hibvbdrblcga05xln84qrs0"; depends=[R6 stringi]; };
   data360r = derive2 { name="data360r"; version="1.0.8"; sha256="0g3prfaqy7d5fdla4l31cj87vhzi945g22zr7pi2c2whlk4q4n09"; depends=[curl data_table jsonlite reshape2]; };
   dataCompareR = derive2 { name="dataCompareR"; version="0.1.3"; sha256="178293hk21qjczi7hyffhlwn0lxrz2k9nxsy7jykjdbsqalyxwli"; depends=[dplyr knitr markdown stringi]; };
   dataMaid = derive2 { name="dataMaid"; version="1.4.0"; sha256="133ipl06sc8iicvkbgjxfs0qia76r2p1qhi693vacgfdbd7cmak5"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; };
   dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; };
-  dataPreparation = derive2 { name="dataPreparation"; version="0.4.3"; sha256="1fchr68siq6vxz4qzlkrm2p6zld3s8mw7izmyzqffvrlqmrh0bdm"; depends=[data_table lubridate Matrix progress stringr]; };
+  dataPreparation = derive2 { name="dataPreparation"; version="1.0.1"; sha256="040k83pknzgq9nn0bhw9p960pdnd8nkcc5hdr4h6193axzp54dh7"; depends=[data_table lubridate Matrix progress stringr]; };
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
+  dataReporter = derive2 { name="dataReporter"; version="1.0.0"; sha256="12rwjd46h35cydvfx5qhb4rssqpm94b628zr06gy9nhwydnajn5x"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; };
   dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.6"; sha256="0375gqpj7xhbj7b2445984swcqhp6389w1jy3llvkdwzrf3pfvnc"; depends=[curl httr jsonlite lubridate readr xml2]; };
-  datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
+  datacleanr = derive2 { name="datacleanr"; version="1.0.0"; sha256="0vjzj6s6cj5r1hjnnyzqvb186jmvjxlvfgv9mkvsivapd3xb8bhi"; depends=[clipr dplyr DT formatR fs glue htmltools htmlwidgets lubridate magrittr plotly purrr RColorBrewer rlang rstudioapi shiny shinyFiles shinyWidgets summarytools]; };
   datadigest = derive2 { name="datadigest"; version="1.0.2"; sha256="1v4nwflrgjhwkrdlrjnqyq1spv1jkgxn1kmapml0zrvnvwf0r1a1"; depends=[haven Hmisc htmltools htmlwidgets jsonlite miniUI shiny tibble]; };
   datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; };
-  dataframeexplorer = derive2 { name="dataframeexplorer"; version="0.1.7"; sha256="0zbcaii21pic30x0b2i16qnmb2wh7br6g7jk4czs4mciclxldp4q"; depends=[data_table dplyr magrittr openxlsx plyr stringr tibble tidyr]; };
+  dataframeexplorer = derive2 { name="dataframeexplorer"; version="1.0.0"; sha256="1bl24z9hqhrs3k459b5hprwc7j639myvkx0qbfcyv3hmi7mbsd0q"; depends=[data_table dplyr magrittr openxlsx plyr stringr tibble tidyr]; };
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
   datafsm = derive2 { name="datafsm"; version="0.2.3"; sha256="18q6s8sz8bm2xlfvhj0x5sagpn363s3k21s428wd0bqzqlppwbmb"; depends=[caret GA Rcpp]; };
   datagovsgR = derive2 { name="datagovsgR"; version="0.3.2"; sha256="09bjcdalv7957kjzcv5ssjljgz437lk7bllmsbp49bv2riswh1fy"; depends=[curl data_table dplyr httr purrr stringr]; };
   datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
-  datamaps = derive2 { name="datamaps"; version="0.0.3"; sha256="00pvns98miq56z3prbb5qg608d5ns9wbp0711x3mmqg0bld1xwmp"; depends=[htmlwidgets magrittr]; };
   datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
   datanugget = derive2 { name="datanugget"; version="1.0.0"; sha256="1ki4kgz6y9a313f07jml39pdxhadgs287rkpnlwvcw6kgj5qxala"; depends=[doSNOW foreach]; };
   dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; };
-  dataone = derive2 { name="dataone"; version="2.1.4"; sha256="19v5c2xbdsz06dcx7xz4jld3dgp98k66cps2hnxpd33wbm8n7x6h"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
-  datapack = derive2 { name="datapack"; version="1.3.2"; sha256="0v9m7fbzi1w5p3arb0ywl4yglyw87civc59ndqsdm8rp84gbvnbl"; depends=[digest hash redland uuid XML]; };
+  dataone = derive2 { name="dataone"; version="2.2.1"; sha256="1gnzyjiwppx5mjwf38nm146vvmy6vlpqy9ibd2rc5f744pdvifxb"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringi stringr uuid XML]; };
+  datapack = derive2 { name="datapack"; version="1.4.0"; sha256="1n69ycca7f7igl9n6spdhn2s431vrljmd0v80q3s5jnyb4mf4xyd"; depends=[digest hash redland uuid XML]; };
   datapackage_r = derive2 { name="datapackage.r"; version="1.3.1"; sha256="0ch4d77pz5xjyl2ypbz0hjgl63259cnk5py79dc3ksalgxhrx9yj"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; };
   datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; };
-  dataresqc = derive2 { name="dataresqc"; version="1.0.3"; sha256="1b04lzb479p95iv7gzb5ds6c48l8kcps857qjy3wqkhr67jhd0dc"; depends=[]; };
+  dataresqc = derive2 { name="dataresqc"; version="1.1.0"; sha256="1m7c93yk3dp1l5ysgscjvmv7z0xnmgaz4bkci4ljmmmn5a9v6r3c"; depends=[]; };
   datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; };
   datarobot = derive2 { name="datarobot"; version="2.17.1"; sha256="1kfd4xfpwglh05xj67gi14j1c4fwfcrf4kj0w077wk1vzyvz3n37"; depends=[httr jsonlite yaml]; };
-  datasailr = derive2 { name="datasailr"; version="0.8.5"; sha256="083d06gk03kwknanflxr66rbahjna4ycdj8p0n7xcancgikky9sq"; depends=[Rcpp]; };
+  datasailr = derive2 { name="datasailr"; version="0.8.7"; sha256="1qkq7qdsw7rzl6bk8h9l1nhcbi0j57n8hby4wj9p16y7cw4knxvc"; depends=[Rcpp]; };
   datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; };
   dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; };
   datasets_load = derive2 { name="datasets.load"; version="1.4.0"; sha256="1gs7dvd6r7h3n55b33mdhf0kcvsrddbvl2f3f65k274ygza2j3r7"; depends=[DT miniUI shiny]; };
   datasetsICR = derive2 { name="datasetsICR"; version="1.0"; sha256="1iw8am7y6r6j21rp6r6iw1ri4c2yrgza7aw3ams4xbx6mcz3746y"; depends=[]; };
+  dataspice = derive2 { name="dataspice"; version="1.0.0"; sha256="1r97wsm32rqscjcaq9bbixhpddnx6j2ghi7l4vgx17gcfka29sj6"; depends=[dplyr EML fs ggplot2 jsonlite magrittr purrr readr rhandsontable shiny stringr tibble tidyr whisker]; };
   datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; };
   datastructures = derive2 { name="datastructures"; version="0.2.9"; sha256="0prw24iy1af02g1nzw588dv085bdnl6pzvizpxspmwzj6vrfbaav"; depends=[BH purrr Rcpp]; };
-  datasus = derive2 { name="datasus"; version="0.4.1.1"; sha256="1vcyn0iia71c58959d3wcdqlh6336p3lsxbvwsj0fd9sll0a605s"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; };
   dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; };
   date = derive2 { name="date"; version="1.2-39"; sha256="0mwp1619rxqyyyyxk224fh0x6g4rgyvr97q0kj076cxp71b97cdm"; depends=[]; };
   daterangepicker = derive2 { name="daterangepicker"; version="0.1.0"; sha256="1605ch84ad3nmmad0yy3id0izv0nz536lxwib6rkdkjik5761gqk"; depends=[htmltools jsonify shiny]; };
@@ -6946,15 +7219,15 @@ in with self; {
   dbflobr = derive2 { name="dbflobr"; version="0.1.0"; sha256="0sh14lf6qnj3z4lwkw27vv1s57jf5lfmw9lmz0hvd6nbfgmcr9rg"; depends=[chk clisymbols crayon DBI flobr glue rlang RSQLite]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; };
-  dbmss = derive2 { name="dbmss"; version="2.7-1"; sha256="0gasvpgmmpq8x776qmfrv4xiniz2fi1zxywzi7rm8xgmwr5q9kp3"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils tibble]; };
-  dbnR = derive2 { name="dbnR"; version="0.4.5"; sha256="1kq5c4n69zr7srp4jfyif061sc1da4zbvnj8c1fdr65nm6c2dgzz"; depends=[bnlearn data_table magrittr Rcpp]; };
+  dbmss = derive2 { name="dbmss"; version="2.7-3"; sha256="1cby9gx502j4bpvbwa7fan4cypxhj9wbwm7asvrmnh85yr7jsdzr"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils tibble]; };
+  dbnR = derive2 { name="dbnR"; version="0.5.3"; sha256="0ypdzd1idkzwm9yawx576mcf5b2rq7m0q71zmmkjygks8g7a0jz6"; depends=[bnlearn data_table magrittr R6 Rcpp]; };
   dbnlearn = derive2 { name="dbnlearn"; version="0.1.0"; sha256="0kmyiad7v96mnfi24d2pn3dqmk3g82sx348m1vhhqwijfnj53brb"; depends=[bnlearn bnviewer ggplot2]; };
-  dbparser = derive2 { name="dbparser"; version="1.1.2"; sha256="0hfvlfi5w7i0ylgfa4vv84j5mc8z4xjfaxl2ky8n1688mimx9lrb"; depends=[DBI dplyr odbc purrr readr RMariaDB RSQLite tibble XML]; };
+  dbparser = derive2 { name="dbparser"; version="1.2.0"; sha256="06yk6i80xlvrjgi8lpzz82rhhmkbj980vpmpil57acjkfvaznwj6"; depends=[DBI dplyr odbc progress purrr readr RMariaDB RSQLite tibble XML]; };
   dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; };
-  dbplyr = derive2 { name="dbplyr"; version="1.4.4"; sha256="1v0p0557n6bz84nq9jc4182k00mdd1hvz7h4w3bbg81z0fmpj0d8"; depends=[assertthat blob DBI dplyr glue lifecycle magrittr purrr R6 rlang tibble tidyselect]; };
+  dbplyr = derive2 { name="dbplyr"; version="2.0.0"; sha256="0sa0ggirvfn8j9y4cvhj04z93h6979jm4knjzahdvyzyxhv1kmzc"; depends=[assertthat blob DBI dplyr glue lifecycle magrittr purrr R6 rlang tibble tidyselect withr]; };
   dbscan = derive2 { name="dbscan"; version="1.1-5"; sha256="1vh29nmmana2755zcy15i1mhj3amwc2r84cq9d71wqr7ygzynphk"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; };
-  dbx = derive2 { name="dbx"; version="0.2.6"; sha256="0bc1pbyarfhr5v41msk9kdzj608nijmpj9lyp03ya6z6rbfnvbkd"; depends=[DBI]; };
+  dbx = derive2 { name="dbx"; version="0.2.7"; sha256="1qv28fkvpvjhpsar33r2h2yzybsqwwzs91bimg17lww2058zv1p6"; depends=[DBI]; };
   dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; };
   dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
   dccvalidator = derive2 { name="dccvalidator"; version="0.3.0"; sha256="1l74pqvac0n7dyfzkz2m0m6j19c8icymbwcifp2g5qvrpznfhxjb"; depends=[config ggplot2 glue golem htmltools knitr markdown purrr reactable readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr tibble visdat]; };
@@ -6964,7 +7237,7 @@ in with self; {
   dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; };
   dcmodify = derive2 { name="dcmodify"; version="0.1.2"; sha256="093rh3r3n0wjdpx861xiqd1zqd5v1v9rzxgcynz4awr7jbm5xszi"; depends=[settings validate yaml]; };
   dcov = derive2 { name="dcov"; version="0.1.1"; sha256="0c3a5dzpizsxlsh723pcd0d7n0mgfc9y35vrfhmskp3c1x639mh3"; depends=[Rcpp RcppArmadillo]; };
-  dcurver = derive2 { name="dcurver"; version="0.9.1"; sha256="1cfy0j3rmi3laszrgd3i59cfy4xfs2p6h9dcwbkwq6wnshrpypfn"; depends=[Rcpp RcppArmadillo]; };
+  dcurver = derive2 { name="dcurver"; version="0.9.2"; sha256="1v4h480lff1cyjjwb80dksiffh0y4b3s07lq2l2r21rn1l4mav6c"; depends=[Rcpp RcppArmadillo]; };
   dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
   ddalpha = derive2 { name="ddalpha"; version="1.3.11"; sha256="1sdnb47r534nh138zk3a6b2mgi74nvshc7p5m304vjs9jlx4l2y3"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
   dde = derive2 { name="dde"; version="1.0.1"; sha256="0qgnxb27a2wnrbfk5v22i985mqhjp4hp05vl1ccsapbxkpf0gqcv"; depends=[ring]; };
@@ -6980,7 +7253,7 @@ in with self; {
   deSolve = derive2 { name="deSolve"; version="1.28"; sha256="0jasvdzig0pzhzspmy20089az19r91xjfb9q6h8gj7c4mr6fymac"; depends=[]; };
   deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; };
   deTestSet = derive2 { name="deTestSet"; version="1.1.7.2"; sha256="0ra7686zkyaj61fd6s2mm6blzpqhplw9icwzfczk9aagg8nc4s72"; depends=[deSolve]; };
-  deaR = derive2 { name="deaR"; version="1.2.1"; sha256="16rhpdw3fyc2fyrm0yfmq0im5r4svhs4v52gjh9y6lx4n8pmncph"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; };
+  deaR = derive2 { name="deaR"; version="1.2.2"; sha256="0bagm10ia525vyghf55kygb237ldbql9cwsywxl5nj910w8w64fm"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; };
   deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; };
   deal = derive2 { name="deal"; version="1.2-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; };
   deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
@@ -6997,7 +7270,7 @@ in with self; {
   decompr = derive2 { name="decompr"; version="4.5.0"; sha256="1kbk4z1pr1j4i1sgfkjxzjy2j2fcmrf3vacnrpv1fba2ib10619k"; depends=[]; };
   decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
   deconstructSigs = derive2 { name="deconstructSigs"; version="1.8.0"; sha256="014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb reshape2]; };
-  deconvolveR = derive2 { name="deconvolveR"; version="1.1"; sha256="0iz8phshbzr0xpp3i305dyz75l95w4lh547lvw2fdvjqg6i0c6sv"; depends=[]; };
+  deconvolveR = derive2 { name="deconvolveR"; version="1.2-1"; sha256="191bgncgwjhb13i27bf8072a0z3mkpjbbp06ys3nri0ggsv5r108"; depends=[]; };
   decor = derive2 { name="decor"; version="1.0.0"; sha256="1vk1szw267mcs9q7saffkrlnlncnw9k70g9lhj81iwkwfx8ir962"; depends=[tibble vctrs]; };
   deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; };
   deductive = derive2 { name="deductive"; version="0.1.3"; sha256="19h41a20c27gmky9xrgqkf0n2s8fzn2hiivs5dg71kl9gc4m1jhn"; depends=[lintools stringdist validate]; };
@@ -7006,8 +7279,10 @@ in with self; {
   deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; };
   deepdep = derive2 { name="deepdep"; version="0.2.1"; sha256="08v2pxbk1w5ajf3zfnkksbwgc29fj7j2znrrix83nyaxmyz8yajn"; depends=[cranlogs ggforce ggplot2 ggraph graphlayouts httr igraph jsonlite scales]; };
   deepdive = derive2 { name="deepdive"; version="1.0.1"; sha256="1385pxkcdaf3rs2br1dghm7d7zd94mfgmqjns4z09mryv72n7cl0"; depends=[data_table fastDummies plyr rpart stringr treeClust]; };
-  deepgmm = derive2 { name="deepgmm"; version="0.1.59"; sha256="1kmvk0vmfzs49n67j2cd1d46fi9gvmxklcqghgmwfw25k4xmpgkb"; depends=[corpcor mvtnorm]; };
+  deepgmm = derive2 { name="deepgmm"; version="0.1.62"; sha256="1cllbq87xxzgba3a1prkjg7hdfkxjnmi8fgizqrlsvbxdhpg61yh"; depends=[corpcor mclust mvtnorm]; };
+  deepgp = derive2 { name="deepgp"; version="0.2.0"; sha256="0svbgng854qw8ar18ypd94jx38gjk9j33dqq0wxdjg7flqm8bi7w"; depends=[doParallel foreach]; };
   deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
+  deepredeff = derive2 { name="deepredeff"; version="0.1.0"; sha256="0bfjkq46nds4xhbqvjd1ng36s3x41hv90w6lvdh04m7kbx5yx9sz"; depends=[Biostrings dplyr ggplot2 ggthemes keras magrittr purrr reticulate rlang seqinr tensorflow]; };
   default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; };
   define = derive2 { name="define"; version="0.2.9"; sha256="0sq7ryiz1py0yw7g2bncd834zsdiy1y7rck8k4grrx2ips5gv2jy"; depends=[encode Hmisc latexpdf SASxport spec]; };
   deflateBR = derive2 { name="deflateBR"; version="1.1.2"; sha256="17zsy10k12gmffbk7nagi60xj347q0bf7wr885fiylqz2xiy9fl9"; depends=[dplyr httr lubridate]; };
@@ -7015,7 +7290,7 @@ in with self; {
   degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; };
   deisotoper = derive2 { name="deisotoper"; version="0.0.7"; sha256="0lpmx3qy44xjlil4nsbvcbczxq22vr8xn6v9a5bdx7cd31qwm2l3"; depends=[rJava]; };
   delayed = derive2 { name="delayed"; version="0.3.0"; sha256="04f4k683jzb763sb9knb81lw8df56y1378g4i3c1x8m83bvj1mhs"; depends=[assertthat BBmisc data_table future igraph progress R6 rlang rstackdeque uuid visNetwork]; };
-  deldir = derive2 { name="deldir"; version="0.1-28"; sha256="12ys8jdcrgzhf9m2yirlqfars397qb0q0pbypahmfa66lgr6wdx5"; depends=[]; };
+  deldir = derive2 { name="deldir"; version="0.2-3"; sha256="0kin1hsd6dj36kkg7n328mzp21wwn9jm69lvgg2rvbf6bq7q091d"; depends=[]; };
   delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; };
   deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; };
   deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; };
@@ -7027,8 +7302,8 @@ in with self; {
   demography = derive2 { name="demography"; version="1.22"; sha256="1m15capbfknr4rqxmfgj1vb7rmgambk6r9ic37149525sg7wn3j6"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
   demu = derive2 { name="demu"; version="0.3.0"; sha256="1mp5iz8mg0d6cyqi3f6fdhk6x5xxvng5bi13b7jnlp60wpjrq0il"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; };
   dendRoAnalyst = derive2 { name="dendRoAnalyst"; version="0.1.1"; sha256="0pdhd89kn9ndc9xdqwpjb1h49zwgya8whjfhpjvlc7cwb3112xj1"; depends=[boot pspline zoo]; };
-  dendextend = derive2 { name="dendextend"; version="1.13.4"; sha256="1pjbz6sb4pgh3d5pm53vmf3q8y6lq3hrgjd6547xxs3m63sb8mn4"; depends=[ggplot2 magrittr viridis]; };
-  dendroTools = derive2 { name="dendroTools"; version="1.0.7"; sha256="052957wbrwgnm5lab3ynwlziih4d0hhm7agaa907zfbrz2xl6nr0"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; };
+  dendextend = derive2 { name="dendextend"; version="1.14.0"; sha256="0n3qg76apgbqbvxv2yp5qwpy6nx03xmmc9mdfyq4dqblqhdld29p"; depends=[ggplot2 magrittr viridis]; };
+  dendroTools = derive2 { name="dendroTools"; version="1.1.1"; sha256="0wcl5jsyvj12id6khdrlzxb23bhs7bxqdaf0gfry927zdbzjvmpa"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; };
   dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; };
   dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; };
   dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; };
@@ -7036,6 +7311,7 @@ in with self; {
   denoiseR = derive2 { name="denoiseR"; version="1.0.2"; sha256="1q5kxiwfkrf2k0gpidzhl4hyzyjcm33rwlw4dan9nkx1181naw9l"; depends=[FactoMineR irlba Matrix]; };
   denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; };
   denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; };
+  densEstBayes = derive2 { name="densEstBayes"; version="1.0-1"; sha256="16dk5fibfcflkjafhard11i1lhnxsh61m65gdbsa2jzan8kb6r21"; depends=[BH MASS nlme Rcpp RcppArmadillo RcppEigen RcppParallel rstan StanHeaders]; };
   denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; };
   densitr = derive2 { name="densitr"; version="0.1.0"; sha256="1vqdvfka6wdfxqfy2qcacss0h6wxykmwyijr5blpvlpafjdmngaq"; depends=[changepoint]; };
   densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; };
@@ -7044,12 +7320,12 @@ in with self; {
   denvax = derive2 { name="denvax"; version="0.1.2"; sha256="0a8x7z7jagshc5h6xy24xrvqv0gm08f78ik6y8ki4i0mhl8c5fyx"; depends=[]; };
   depcoeff = derive2 { name="depcoeff"; version="0.0.1"; sha256="08vs0yzfvd4ahcs5rz4i4spp8l6fg45bm0m22gn5rzxc4759mzac"; depends=[copula Rcpp]; };
   depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; };
-  depigner = derive2 { name="depigner"; version="0.8.1"; sha256="0cw4biz8p1bavni59djsfrbv59wnw256ikykjmlpjpf1xcwr1g9r"; depends=[broom desc dplyr fs ggplot2 Hmisc magrittr progress purrr rlang rprojroot stringr telegram_bot tibble tidyr usethis]; };
+  depigner = derive2 { name="depigner"; version="0.8.3"; sha256="1bx4z5xfh0hrx38dj10gl6jq2rv2rabc18xm2sj98bv7b16fzvpq"; depends=[desc dplyr fs ggplot2 Hmisc magrittr progress purrr rlang rprojroot stringr telegram_bot tibble tidyr usethis]; };
   depmix = derive2 { name="depmix"; version="0.9.16"; sha256="1vi9fi131ni34z9p3x6pdp6y9v0y0nx71zg1q8898frhqwbwhd9c"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.4-2"; sha256="07d4fxwnbl3jqczrylbvdch9q87az37jrjsmvilhl9h98z31wzaq"; depends=[MASS nlme nnet Rsolnp]; };
   depth = derive2 { name="depth"; version="2.1-1.1"; sha256="0szy0027nh4ps1z919i740i50app5q7cfyg1fj7pdyl45nbl8k6m"; depends=[abind circular rgl]; };
   depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; };
-  depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
+  depthTools = derive2 { name="depthTools"; version="0.5"; sha256="0980w80vc25dwrkrsfyx84g8dxz94hwzx0j7x4y2jx4k3nflbmqv"; depends=[]; };
   dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; };
   derivmkts = derive2 { name="derivmkts"; version="0.2.4"; sha256="1ncqhi6f69jv75dad1l9wsrfxi5m2wizywikkbg7i9qmh42xkh8w"; depends=[mnormt]; };
   desc = derive2 { name="desc"; version="1.2.0"; sha256="1s6s13fk6sxwcj8wzkwxl9vr33153xx11p5wi9avqx3rzkabavz6"; depends=[assertthat crayon R6 rprojroot]; };
@@ -7057,9 +7333,10 @@ in with self; {
   descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; };
   describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; };
   describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; };
-  descriptr = derive2 { name="descriptr"; version="0.5.1"; sha256="0s4zjh5vw73sj5pxq6v4nnrprbdxz470hnw8m2hzx6n04abbkzd1"; depends=[cli dplyr ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; };
+  descriptr = derive2 { name="descriptr"; version="0.5.2"; sha256="1shqcykp8ahgarsam56zv4gcbj0mmfm7jy1i9fgbmy5ddksnific"; depends=[dplyr ggplot2 magrittr rlang scales tibble tidyr]; };
+  descstat = derive2 { name="descstat"; version="0.1-0"; sha256="0whggzbh8wwbhvv26hzkc7kdh609b7ziln3px4rdxwbzdrdf70nz"; depends=[dplyr purrr rlang tidyr]; };
   descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; };
-  desctable = derive2 { name="desctable"; version="0.1.7"; sha256="12axy5knsvzh2pxzax9k9zl69vasvabchcspy6ssirfbln660z1f"; depends=[dplyr DT htmltools pander purrr]; };
+  desctable = derive2 { name="desctable"; version="0.1.9"; sha256="0ixakd5rs9csq7rm6h8id44qkdg2gn0cg6hwdcwvbvshflbg4jxx"; depends=[dplyr DT htmltools pander]; };
   deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
   desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; };
   designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
@@ -7067,7 +7344,7 @@ in with self; {
   designr = derive2 { name="designr"; version="0.1.10"; sha256="1x7aixhz5cgjh44m2w2zgz5gmilbs2vj78hyg1sqjb483g36x224"; depends=[crossdes dplyr MASS tibble]; };
   desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
-  desplot = derive2 { name="desplot"; version="1.7"; sha256="0fb3scmclqmgnjxhmvgbd2zszw9ywis9vhwmfizhwrrz8klxiily"; depends=[ggplot2 lattice reshape2]; };
+  desplot = derive2 { name="desplot"; version="1.8"; sha256="0i3vwg0v3snan6rvgc2v3i01fdi3xbw3k407zrxdai27i0mjanx8"; depends=[ggplot2 lattice reshape2]; };
   details = derive2 { name="details"; version="0.2.1"; sha256="03fw3jbf1a34w9c205wwjkqnw6ic1gylsf36qw33mx4ba252s2hy"; depends=[clipr desc httr knitr magrittr png withr xml2]; };
   detect = derive2 { name="detect"; version="0.4-4"; sha256="1gzd98b4kg5rw0kpgznrb1wmr3iavdq5983n6wqx33lga1lqq9d6"; depends=[Formula Matrix pbapply]; };
   detectRUNS = derive2 { name="detectRUNS"; version="0.9.6"; sha256="0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; };
@@ -7075,14 +7352,14 @@ in with self; {
   detectseparation = derive2 { name="detectseparation"; version="0.1"; sha256="0y0d1irw3pzvyvc7smii0ikx7dv376s2cdixjcs5c3jsw0iqxyim"; depends=[lpSolveAPI pkgload ROI ROI_plugin_lpsolve]; };
   detpack = derive2 { name="detpack"; version="1.1.3"; sha256="1mk2k9akagz7knd4n5p8nxkmnm2mdv9izk4i5yl2v9nv5v39mc4h"; depends=[]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
-  detrendr = derive2 { name="detrendr"; version="0.6.8"; sha256="00arl6jzgz6m6dgivxmsqwhp2mw5rvmz5z94mai80gi0vr36drwa"; depends=[arrayhelpers autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr withr]; };
+  detrendr = derive2 { name="detrendr"; version="0.6.9"; sha256="0wajxgcw348pd78apa3fx2b8qvc9lzga5ld975b1h0dxb9iqkc1a"; depends=[arrayhelpers autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr withr]; };
   detzrcr = derive2 { name="detzrcr"; version="0.3.1"; sha256="0afi1ir8il5xmzkpmbc2m5mvmgzlqw8qdn04gbnwl74a03yaxxmj"; depends=[DT ggplot2 MASS shiny]; };
-  devEMF = derive2 { name="devEMF"; version="3.8"; sha256="1dw1zz0dichkcmyav7ibi6rviamfnsqf2am23n53zz2yjgikvhpj"; depends=[]; };
+  devEMF = derive2 { name="devEMF"; version="4.0-2"; sha256="1wpziix6g1lr7qq728dfxvd0dyynnliilk029pl861mzx2dgdr6l"; depends=[]; };
   devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; };
-  devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; };
+  devRate = derive2 { name="devRate"; version="0.2.1"; sha256="1wq32igzc0xk0vmddrn1zk8m7zxy0gpvpswlgjjmxflslp3yszjf"; depends=[]; };
   devoid = derive2 { name="devoid"; version="0.1.1"; sha256="14cf75wih7401vmrfmswc9cihgmbyn90wg2vjkzv628mm5fgg01h"; depends=[]; };
-  devtools = derive2 { name="devtools"; version="2.3.1"; sha256="100mgighf6vqsfwv2qw5rlnd5sfvcji9l9jrmx9ii28r9fd2gyas"; depends=[callr cli covr desc DT ellipsis httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; };
-  dexter = derive2 { name="dexter"; version="1.0.8"; sha256="1jnizhcv284nmp6rc2dgy26b2iwb0hbjy9c1i0ky7k78g24r5679"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; };
+  devtools = derive2 { name="devtools"; version="2.3.2"; sha256="0vcqs4c5dfjs2ddkclv3z7zzix2zrnrxvzax8hjvjszgp8362275"; depends=[callr cli covr desc DT ellipsis httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; };
+  dexter = derive2 { name="dexter"; version="1.1.1"; sha256="0crm9vwjr5hidagn45ndd478b56622rmqryy4cj5ayh2177d6n64"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; };
   dexterMST = derive2 { name="dexterMST"; version="0.9.0"; sha256="0lawpqz7jrfshc16fjx6f44z6mqy3b9nl56h1nzm4jkp4kv9lizr"; depends=[crayon DBI dexter dplyr igraph Rcpp RcppArmadillo rlang RSQLite tidyr]; };
   dextergui = derive2 { name="dextergui"; version="0.2.2"; sha256="1g6qxjmxkrna10lahsdfilpjw587kk6zh8vs1saw9l27i3izpbi9"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; };
   dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; };
@@ -7094,17 +7371,17 @@ in with self; {
   dfidx = derive2 { name="dfidx"; version="0.0-3"; sha256="01dgd0nbx9gs4l45lmlkilw8l4pympyh3xrsjfds3610417zgmw1"; depends=[dplyr Formula]; };
   dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; };
   dfmta = derive2 { name="dfmta"; version="1.7-1"; sha256="13i4ck32z2p4plmy7lz2y4zakc1w915f5h6d9s6vj71212rrg9qm"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
-  dfoliatR = derive2 { name="dfoliatR"; version="0.1.0"; sha256="1vgcz763fvapwh98453040yddyka83p9bhgqssx9c0n69z20ylix"; depends=[dplR dplyr forcats ggplot2 ggpubr MASS plyr reshape2 rlang]; };
-  dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; };
+  dfoliatR = derive2 { name="dfoliatR"; version="0.2.0"; sha256="0z78nbb2m6qn2xj09j4wgpmid5va1jppdkknhl2l7v3yx8fmmk9i"; depends=[dplR dplyr forcats ggplot2 ggpubr magrittr MASS plyr purrr rlang tidyr]; };
+  dfoptim = derive2 { name="dfoptim"; version="2020.10-1"; sha256="0gy3wnvwvi9sydcbix226jds88n43r5nchvzrhqdag0j1bwpr9gy"; depends=[]; };
   dformula = derive2 { name="dformula"; version="0.1"; sha256="0028qm3wsfpjbkpza5nb87pcm8cg0075jclcy6s4wfflizgfs6n4"; depends=[formula_tools]; };
   dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; };
   dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; };
   dfpk = derive2 { name="dfpk"; version="3.5.1"; sha256="010rlxj66ar3y61fnm7ys3p6aimlr8ylqq4q4flzr9m88klz8701"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
+  dfrr = derive2 { name="dfrr"; version="0.1.4"; sha256="02hldg31pgicpqffvh61j83d0vcg84mjicirzqhn988wi8gps42r"; depends=[fda ggplot2 MASS plotly tmvtnorm]; };
   dfvad = derive2 { name="dfvad"; version="0.3.0"; sha256="1n6hwpgnpd8vlv187ajl6js8z3yvl60h87q3kzgi9hvn9v73ip5z"; depends=[]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
-  dggridR = derive2 { name="dggridR"; version="2.0.4"; sha256="11n07k3fpk6yysy72az68pnkaf6pf8msfzgllsx54hcvgkmg5ac3"; depends=[dplyr ggplot2 Rcpp rgdal sp]; };
   dglars = derive2 { name="dglars"; version="2.1.6"; sha256="13bnvinqgpmkisjri0sjsyzsh9nqplpry3n3galkv8dqhgpncq4w"; depends=[Matrix]; };
-  dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
+  dglm = derive2 { name="dglm"; version="1.8.4"; sha256="09b74s7xdqv6y2qrlk67c7nfi7sw6azmpyvnan2rpbvxqlky9xgd"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
   dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; };
   dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
@@ -7117,34 +7394,36 @@ in with self; {
   diagis = derive2 { name="diagis"; version="0.1.5"; sha256="1vjj27nn1fjx7wpqpn5x7pir4kd7b4pz9y6mz8a4jby9imc5ypnk"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; };
   diagmeta = derive2 { name="diagmeta"; version="0.4-0"; sha256="1z7h1sxcqn53121m33d2w196lyzkrgj1afc8i8h9iab99fgqvpk7"; depends=[lme4 meta]; };
   diagonals = derive2 { name="diagonals"; version="5.2.0"; sha256="0la1w9frnz5znljzcs9np4cn32rhb6zw6bc1cbnfq8n8nnrviy10"; depends=[]; };
-  diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
+  diagram = derive2 { name="diagram"; version="1.6.5"; sha256="1r3lyl0h7mk9cfg8smr3jydfkjdawaphnxibkxfjqa7029vkxh79"; depends=[shape]; };
   dialr = derive2 { name="dialr"; version="0.3.2"; sha256="0b0dbk25j5ixwn8gxf651bj2akjcy1rjr3c191h8wddn9y99ip06"; depends=[dialrjars rJava]; };
   dialrjars = derive2 { name="dialrjars"; version="8.12.6"; sha256="10sbhm8n48d2d0php3cm6yx5cssr2gk34pplvi9adv662214pmhx"; depends=[rJava]; };
-  dials = derive2 { name="dials"; version="0.0.8"; sha256="0jxmlcy20y57chflx91fqz6c4pbdckzr7jirq4s72vp723avrr4p"; depends=[DiceDesign dplyr glue purrr rlang scales tibble vctrs withr]; };
+  dials = derive2 { name="dials"; version="0.0.9"; sha256="0g9wj2py4wz703rh4p7hk8qxqnkm7zyrypv4qz4vaqziazjsmxks"; depends=[DiceDesign dplyr glue purrr rlang scales tibble vctrs withr]; };
   diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; };
+  diathor = derive2 { name="diathor"; version="0.0.1"; sha256="1p9mx2ckz1l0fc9wman6m5mxn2inbv4qvqb4i0ab4j7a5nchz4l4"; depends=[ggplot2 stringdist tidyr vegan]; };
   dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
   diceR = derive2 { name="diceR"; version="1.0.0"; sha256="0x0ck76qx0w35pmbbalm8xqrscc4nhvcnzwk9viczn8qh9km7xq6"; depends=[abind assertthat class clue clusterCrit clValid dplyr ggplot2 infotheo klaR magrittr mclust NMF purrr RankAggreg Rcpp stringr tibble tidyr yardstick]; };
   dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
-  did = derive2 { name="did"; version="1.2.3"; sha256="05xc41491mq0v9gm841m8l3cdjhjip3z1aqjqaqpaz05rwp3bngx"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; };
+  did = derive2 { name="did"; version="2.0.0"; sha256="11jfdh2c31dynajahrs0rncl8s8gb3lcdah0a0jvrsj5dh5m4yms"; depends=[BMisc DRDID ggplot2 ggpubr knitr Matrix pbapply]; };
   didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; };
   dief = derive2 { name="dief"; version="1.2"; sha256="1i4icdfqvw7imaj1fh392zmzfyz8aqlv9s5naqxm1pm0lqfxl6ca"; depends=[flux fmsb ggplot2 plyr]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
   dietr = derive2 { name="dietr"; version="1.1.0"; sha256="0mfp1zqmx34q09k5nbx3nlra06jpd9sym4avafxkaqsxd92avrcm"; depends=[rfishbase]; };
   diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; };
-  difNLR = derive2 { name="difNLR"; version="1.3.3"; sha256="0r6h0rm0g1719qv2xjmynkvgb1vd3zcbrbkjjd1x8ry5gc58gxk2"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; };
+  difNLR = derive2 { name="difNLR"; version="1.3.5"; sha256="0yhxgz3gdksxmi24l2jqg0kbjpi3rxwxi42aga38l7hhxzxjjxyd"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; };
   difR = derive2 { name="difR"; version="5.1"; sha256="1cd5kaal5mjrbj1l9ki2wbqasdxphgc2yhaf4xwgbh1nr2zkhr02"; depends=[deltaPlotR lme4 ltm mirt]; };
   difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; };
   diffEnrich = derive2 { name="diffEnrich"; version="0.1.1"; sha256="19bq2frd2h8gh6mdy3pcwd54zzv170c0m1m3wnp5c4gadb9424qf"; depends=[dplyr ggnewscale ggplot2 here reshape2 rlang stringr]; };
   diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; };
   diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; };
+  diffcor = derive2 { name="diffcor"; version="0.6.2"; sha256="0p56p7740f8dnnb60zmh94pmq2pcgp70m88hz0029ai4wwsd4llr"; depends=[]; };
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
   diffdf = derive2 { name="diffdf"; version="1.0.4"; sha256="03cr0gvspchdj49kiggsm6i9h5d9z07aswggj4n46lnyz52ihivj"; depends=[tibble]; };
   diffeR = derive2 { name="diffeR"; version="0.0-6"; sha256="0ivdcfirs3jbd6m3rryq590szkhplm2kr9chjgcgd88ar5nrqfg7"; depends=[ggplot2 raster reshape2 rgdal]; };
   diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; };
-  diffeqr = derive2 { name="diffeqr"; version="0.1.3"; sha256="1696bxh916688zlfxbm6jaqk245xw51ar7rqz7m2nla0ibka86sj"; depends=[JuliaCall stringr]; };
+  diffeqr = derive2 { name="diffeqr"; version="1.0.0"; sha256="13ingj2afi2ckgqslk3jqgnqas5crwwdbmkv811ap2ys4cxka26p"; depends=[JuliaCall stringr]; };
   diffman = derive2 { name="diffman"; version="0.1.1"; sha256="08b4kqxfg8pmyl2xg8flb581s9wnkdcy5rrmrxp8a89y265qmirx"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; };
-  diffobj = derive2 { name="diffobj"; version="0.3.0"; sha256="12kij8qjr3qv6fagyn35vrrmc5hy3g11r6gmgkgi58971cylrj6m"; depends=[crayon]; };
+  diffobj = derive2 { name="diffobj"; version="0.3.2"; sha256="0v18zz14g8ppzmj1d997rdmsfh327ml4wvpmfx168lravdsk5ym2"; depends=[crayon]; };
   diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
   diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
@@ -7152,24 +7431,28 @@ in with self; {
   diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; };
   diffusionMap = derive2 { name="diffusionMap"; version="1.2.0"; sha256="1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"; depends=[igraph Matrix scatterplot3d]; };
   diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; };
-  digest = derive2 { name="digest"; version="0.6.25"; sha256="1r9dkq0kxkps54gkmgcdngsd068p054va2vhnqhs5jmwp2vsvk0m"; depends=[]; };
+  diffviewer = derive2 { name="diffviewer"; version="0.1.0"; sha256="1z6ri24sjqkm2rvih9ysx019pwpd1hv15rs96k4qqdspl0fms5a7"; depends=[htmlwidgets jsonlite]; };
+  digest = derive2 { name="digest"; version="0.6.27"; sha256="0gr503pinailfglpfbzxprqw7w1jla8jr9nl856a4zch498zg1gl"; depends=[]; };
   digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; };
   digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; };
   dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
   dimRed = derive2 { name="dimRed"; version="0.2.3"; sha256="110d6y83ib1nfpxzmvkvb3fn3brskwkdbsk4dqrdrswrd4znxrg6"; depends=[DRR magrittr]; };
-  dimensionsR = derive2 { name="dimensionsR"; version="0.0.1"; sha256="1g0jwf3lvv3zaarrcvqh3a8fgzm4p8d7g73hqg29lgmb6q8shb8d"; depends=[httr jsonlite]; };
+  dimensionsR = derive2 { name="dimensionsR"; version="0.0.2"; sha256="1g9yjrq7xnqh427kzmhhmdavykzxidv51i2wx2w0kwhl6fqdd2fk"; depends=[httr jsonlite]; };
   dina = derive2 { name="dina"; version="2.0.0"; sha256="1sq7998xc5qhvd8clc8r32ch7axinh2a2dc7i1w2p148wv130yhd"; depends=[Rcpp RcppArmadillo rgen simcdm]; };
   dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
   dineq = derive2 { name="dineq"; version="0.1.0"; sha256="1xrhrdc970f7hm9xng9z7xmshnmmz89cn3gmnyabzprx44ccr9sl"; depends=[boot Hmisc]; };
   dint = derive2 { name="dint"; version="2.1.3"; sha256="0nxppn7gx4sjwn7jns5bwbqfid3jkbsx2lxi0rjdkbsawy77fc85"; depends=[]; };
-  dipsaus = derive2 { name="dipsaus"; version="0.1.0"; sha256="0rf8sjwarmyv39awviswj9mqjmb4h2a39lm55zcwfm0in10hrmnr"; depends=[base64enc base64url cli digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang rstudioapi shiny startup stringr synchronicity]; };
+  diproperm = derive2 { name="diproperm"; version="0.1.0"; sha256="0vk4c64nfp5km6xnpbw0x4mxnlkqa1hi80pa5lcmimgjymqm56sa"; depends=[dplyr DWDLargeR ggplot2 gridExtra lemon Matrix sampling SparseM usethis]; };
+  dipsaus = derive2 { name="dipsaus"; version="0.1.1"; sha256="174fkbv22ncb806f7jhyrxc70issly3xma80gzqf2ghp9jsk41n0"; depends=[base64enc base64url cli digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang rstudioapi shiny startup stringr synchronicity]; };
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
-  directPA = derive2 { name="directPA"; version="1.4"; sha256="0rbdygdslr2gvg4mvnp09lc9rv0sg9jwdf5a5ks50v67n25x6y5d"; depends=[calibrate rgl]; };
+  dipw = derive2 { name="dipw"; version="0.1.0"; sha256="0nxjwiffi1ivafzha3c35kjk36ai7na0nbfl6x3gpsi2km7b84nd"; depends=[glmnet Matrix Rmosek]; };
+  directPA = derive2 { name="directPA"; version="1.5"; sha256="0k66x64fi26zlm82v59ya7x6l7ba3hpa5v9dq2ykb20a8zl6spla"; depends=[calibrate plotly]; };
   directlabels = derive2 { name="directlabels"; version="2020.6.17"; sha256="1b6v206kizz5rjw03chjvn40a7cqihjpk80h1h79z2x27hp1qi3f"; depends=[quadprog]; };
   directotree = derive2 { name="directotree"; version="1.0.0"; sha256="1yv703mb3fnvjxr2rrxvb8x869hbbjx4l94qbbsmy0ssknayq60y"; depends=[collapsibleTree data_tree]; };
   dirichletprocess = derive2 { name="dirichletprocess"; version="0.4.0"; sha256="1gspaynxq5czvnpni57swcqqy17lryjlh3cn9x0mghl527rkbpna"; depends=[ggplot2 gtools mvtnorm]; };
   dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
+  disaggR = derive2 { name="disaggR"; version="0.1.11"; sha256="1gcckjjbhi83hrx8y5r5nqlh93hakpq6friiz8p5gsngvsnb1k3l"; depends=[ggplot2 Rcpp]; };
   disaggregation = derive2 { name="disaggregation"; version="0.1.3"; sha256="04wmwwhmcgi1cdr8iyhilsphpzb7r5xs04vhqx5z01y7cgardivx"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; };
   discSurv = derive2 { name="discSurv"; version="1.4.1"; sha256="0xi016ah8xc8bv92qvyslvx30anncrki49ccg3qw79yh5vzns1wk"; depends=[data_table functional mgcv mvtnorm]; };
   discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; };
@@ -7179,19 +7462,22 @@ in with self; {
   disclapmix = derive2 { name="disclapmix"; version="1.7.3"; sha256="0hh20ff3szh9s9r1hdymk73ysn0v5lh2gfzgqpvfvdhcc5z8xjk7"; depends=[cluster disclap MASS Rcpp RcppProgress]; };
   discnorm = derive2 { name="discnorm"; version="0.1.0"; sha256="00dkdxvj0fmlmr9l34ajvfv1jzlnyr9sdnnpgik8lhcj5a7h8l6f"; depends=[arules lavaan MASS pbivnorm psych sirt]; };
   disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; };
-  discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; };
-  discourseGT = derive2 { name="discourseGT"; version="1.0.0"; sha256="1faq344prjmya13jxpxfdq1vh1gqkssjmsq62i8lhmk8kwkp6nax"; depends=[GGally ggplot2 ggpubr igraph network]; };
+  discord = derive2 { name="discord"; version="1.0.0"; sha256="1rxmc8jzifdyn8gf5z3xg5bfk9jv961dx0fcjf3axmzbw54h5s09"; depends=[broom dplyr janitor magrittr purrr rlang]; };
+  discourseGT = derive2 { name="discourseGT"; version="1.1.2"; sha256="01f24n2ndjcjigxd61yhgrwq4c4ydlma45vviymavmpmyj0s9c48"; depends=[dplyr GGally ggplot2 ggpubr ggrepel igraph network]; };
   discoveR = derive2 { name="discoveR"; version="1.2.9"; sha256="0zvhg9vc5bawkfsf7sxky4zddyyjqrl741sjhlqzzmlwid7481p5"; depends=[colourpicker DT factoextra ggplot2 rmarkdown rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyjs stringi zip]; };
+  discoverableresearch = derive2 { name="discoverableresearch"; version="0.0.1"; sha256="0gw9fpmsqj1cj2qr7hqr86j28kjn3qfykdkkxrazj3dnv981xhhy"; depends=[dplyr magrittr ngram readr stopwords stringdist stringi synthesisr tm]; };
   discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
   discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; };
   discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.7"; sha256="01x3qfjj7dwv0m9q8zdhfrpbj9ys9y5p7d3z8ywjrqy4jw88svjs"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; };
   discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
-  discrim = derive2 { name="discrim"; version="0.1.0"; sha256="16mmx499jb9ys3qn9qzg58w0v6rj2ndsgr62qv5i5jxl31sdj58w"; depends=[dials parsnip purrr rlang tibble withr]; };
+  discrim = derive2 { name="discrim"; version="0.1.1"; sha256="1la96y8wy04p414njnzjsk5zx199qdix5hqbb0pv5k74mr1g2cqv"; depends=[dials parsnip purrr rlang tibble withr]; };
+  disdat = derive2 { name="disdat"; version="1.0-0"; sha256="1q8v40m0vjni3kx0f04qb99adxcx783p9lfixvvq6viz13v1ygcw"; depends=[]; };
   diseasemapping = derive2 { name="diseasemapping"; version="1.4.9"; sha256="0mhi3v52s57pd85li27cb5krvy40icghkayalhihg5k7zxqkgssv"; depends=[sp]; };
+  diseq = derive2 { name="diseq"; version="0.0.14"; sha256="1h54crj6w0q9zwwrf7rgr6d9blmy3i9agq03dwzvzmpymgd5m1j7"; depends=[bbmle dplyr magrittr MASS rlang systemfit tibble tidyr]; };
   disk_frame = derive2 { name="disk.frame"; version="0.3.7"; sha256="12g9anjy04km8iyypf56nsq6v8mqfp99j0gfi9v8pc3sd6k9vnfn"; depends=[benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; };
   diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; };
-  dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; };
-  dispRity = derive2 { name="dispRity"; version="1.4.1"; sha256="17q8w25dm7rmnh42rwpiygbpsqqpz462snc28zrabakjm16gdd4d"; depends=[ade4 ape castor Claddis geiger geometry geoscale mnormt phangorn phyclust vegan]; };
+  dismo = derive2 { name="dismo"; version="1.3-3"; sha256="1jj9d78f251bxgrwbv1ycn677qnhvl40bfan12x8fhlaq4d36rgx"; depends=[raster Rcpp sp]; };
+  dispRity = derive2 { name="dispRity"; version="1.5.0"; sha256="0synpjy8n7kzmv9drszj31067smi5s8672lvf07k02qkdhavhqgh"; depends=[ade4 ape castor Claddis geiger geometry geoscale mnormt phangorn phyclust scales vegan]; };
   disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; };
   displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
   dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; };
@@ -7207,12 +7493,12 @@ in with self; {
   distdichoR = derive2 { name="distdichoR"; version="0.1-1"; sha256="0v19m3n1jgipg65yrv75rm4v27b5aq58cbsmbp7lxvfxmj5ra328"; depends=[boot emmeans nlme sn]; };
   distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; };
   distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; };
-  distill = derive2 { name="distill"; version="0.8"; sha256="0crih4x2745aq0w2fqrzcnbw82yi2pxcx8j2hv0fi5yfvgjjsi86"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime openssl png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; };
-  distillery = derive2 { name="distillery"; version="1.1"; sha256="15qhvhg6wmvlxrvvw70sk8pv76z5pd04vyasgczvxa0599ih7bzh"; depends=[]; };
+  distill = derive2 { name="distill"; version="1.1"; sha256="14j08i960kkj03p6qv0q6x68fm4zahzj7l88ada257n1ywxvbawa"; depends=[base64enc bookdown digest downlit htmltools jsonlite knitr lubridate mime openssl png rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; };
+  distillery = derive2 { name="distillery"; version="1.2"; sha256="10nhh9p0hp294pp4aav0y0zsmir2qbn05sf3k52rmzmm36q2kc8y"; depends=[]; };
   disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; };
   distory = derive2 { name="distory"; version="1.4.4"; sha256="1ljrs91h4v1h5lb295hjki8bmra2lg3d1bn5x731pnv43pf3ck06"; depends=[ape]; };
   distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; };
-  distr6 = derive2 { name="distr6"; version="1.4.2"; sha256="13l7rg1c2lj1yrnzm813cma1c7hj23dbmlf0cv7bmwh48m3xjdck"; depends=[checkmate data_table R6 R62S3 Rcpp set6]; };
+  distr6 = derive2 { name="distr6"; version="1.4.8"; sha256="1rkr7cb7mgyykvkr12mkq4j5ipx7sjfjfwfic0l20xzw8p5x1gfy"; depends=[checkmate data_table R6 R62S3 Rcpp set6]; };
   distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; };
   distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; };
   distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; };
@@ -7222,64 +7508,64 @@ in with self; {
   distrTEst = derive2 { name="distrTEst"; version="2.8.0"; sha256="06rdcwfgbhc81zqisg414nj0kji59xvhm782b63hk54a8b2zwhh5"; depends=[distrSim setRNG startupmsg]; };
   distrTeach = derive2 { name="distrTeach"; version="2.8.0"; sha256="1qgkd4yipk29q8k334fz97n6dxlxnsback7v5a05m6ragc37wzag"; depends=[distr distrEx startupmsg]; };
   distreg_vis = derive2 { name="distreg.vis"; version="1.7.0"; sha256="1rfv4ifhai6ig0x2xwca1pjin8vqp8k8jvbmj45rxdzg8b384zly"; depends=[bamlss betareg formatR gamlss gamlss_dist ggplot2 magrittr rhandsontable shiny]; };
-  distributional = derive2 { name="distributional"; version="0.2.0"; sha256="1l192mc7fwyzvm6ykbbnv0rvk6b29wxsgnshv4zfi9dgz5hwgj4l"; depends=[digest ellipsis farver generics ggplot2 lifecycle numDeriv rlang scales vctrs]; };
+  distributional = derive2 { name="distributional"; version="0.2.1"; sha256="0nxiiyr2nk80ac9x0fz2p3b8izrrmah708k9gmkihbi4bnspqhqx"; depends=[digest ellipsis farver generics ggplot2 lifecycle numDeriv rlang scales vctrs]; };
   distributions3 = derive2 { name="distributions3"; version="0.1.1"; sha256="06wfyn37x2r00szfzgjpcxy5fhx72p2pf44llpymcsjyp8k790na"; depends=[ellipsis glue]; };
   distributionsrd = derive2 { name="distributionsrd"; version="0.0.6"; sha256="0ykzxcxh5l9l5z3546iqlllryw2xyixz1hiynx19k8bsn8k7dxyp"; depends=[flexmix modeltools Rdpack]; };
+  distro = derive2 { name="distro"; version="0.1.0"; sha256="03b8mkjhxxh93675mmj443a83mgfwhkdar7dfbf3agf6aqnadn2g"; depends=[]; };
   distrom = derive2 { name="distrom"; version="1.0"; sha256="0wylw7yaylf5j8cy8g45jrw91mwx6w0i7vf9ysnj5kxyznq1gl6y"; depends=[gamlr Matrix]; };
   distrr = derive2 { name="distrr"; version="0.0.6"; sha256="04lhrc92y6dqnfpqlmynjvn2dndzkknnvwsr5pf73dfpgv7n3s1f"; depends=[dplyr magrittr rlang tidyr]; };
   disttools = derive2 { name="disttools"; version="0.1.7"; sha256="1wdcggphyxy58zyqdsyz2z3q4rb69wady63l79s1ivjwzgjrsxmi"; depends=[]; };
-  dittodb = derive2 { name="dittodb"; version="0.1.1"; sha256="16lp6h6612lk8cp65wm9ajbmr441xn7qhp9cff9kpy223zkdxfsf"; depends=[DBI digest glue testthat]; };
+  dittodb = derive2 { name="dittodb"; version="0.1.3"; sha256="0wkiy3vgqrpmc34hxw30rfgg01d941gxz8fr2h9i9gvddnxnywdc"; depends=[DBI digest glue lifecycle testthat]; };
   divDyn = derive2 { name="divDyn"; version="0.8.0"; sha256="11crhrcx38kn5d8ap2ijrn305369adg73iz5i7a4a7gmgizmmwyd"; depends=[Rcpp]; };
   divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
-  diveMove = derive2 { name="diveMove"; version="1.4.6"; sha256="1208syawp3g4w7jn17zlhqbmpcgbni1b8xpsjh6ml0b1dmb40blj"; depends=[geosphere KernSmooth quantreg uniReg]; };
+  diveMove = derive2 { name="diveMove"; version="1.5.2"; sha256="10dj4ipd2yq1yg1x80vqrhzsgcn612jly85ciilyxl77479xj0x5"; depends=[geosphere KernSmooth plotly quantreg uniReg]; };
   diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; };
   diverge = derive2 { name="diverge"; version="1.0.4"; sha256="18abm3348rkd4k2hyf8nykpis1m0ga16d4nprdc5xjj2ciaf2xa5"; depends=[truncnorm]; };
   diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; };
-  diversitree = derive2 { name="diversitree"; version="0.9-13"; sha256="00vi4klywi35hd170ksjv3xja3hqqbkcidcnrrlpgv4179k0azix"; depends=[ape deSolve Rcpp subplex]; };
+  diversitree = derive2 { name="diversitree"; version="0.9-15"; sha256="1sk3sgn5hi04978s5s7gy6pzp28g3v9rglmiamlgs96c9wyyyff7"; depends=[ape deSolve Rcpp subplex]; };
   diversityForest = derive2 { name="diversityForest"; version="0.2.0"; sha256="16qwmz6fmh7jxypp5myj55fx6fwzzm2mq59v30spp2c2zd89aya7"; depends=[Matrix Rcpp RcppEigen]; };
-  divest = derive2 { name="divest"; version="0.8.2"; sha256="0kzl3niscd88kzlpnx75xx6mk1jkwxwn7gm2a6vnhpvniyyk6rs8"; depends=[Rcpp RNifti]; };
+  divest = derive2 { name="divest"; version="0.9.0"; sha256="0cx47xdh8g6b3kbpn22qhs07cak27dc5mjr7d45xjn5qs3xddjh5"; depends=[Rcpp RNifti]; };
   divo = derive2 { name="divo"; version="1.0.1"; sha256="06c4kjl6llvvdr2gk480jcmj2abmqwph7x4vk5nflxm7piimvg7v"; depends=[cluster]; };
   dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; };
   dixonTest = derive2 { name="dixonTest"; version="1.0.2"; sha256="04d66nf47mllk5madqn6k36vc1gq2syp7kbif8cnf6imxr98xx50"; depends=[]; };
-  diyar = derive2 { name="diyar"; version="0.1.0"; sha256="0cpxilixbdqzmq8lyh4iilccsjg07x7bl6x93cria0rivm9aqb92"; depends=[dplyr]; };
+  diyar = derive2 { name="diyar"; version="0.2.0"; sha256="1vabx0vxb08ybpkidw4fch5sb79b9lhjpxm9sc6x7lywdfj3345w"; depends=[Rfast]; };
   dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
   dkanr = derive2 { name="dkanr"; version="0.1.3"; sha256="1zic7qhwq3s9w70zi1f6qyf7pzm69k5a1p5fd4n3z4nbga54njxd"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
   dlbayes = derive2 { name="dlbayes"; version="0.1.0"; sha256="058kkh67npai2ffrjdpjn4pzj8f233znl16nj6yx8wz8lkb17cb0"; depends=[expm GIGrvg glmnet LaplacesDemon MASS]; };
-  dlib = derive2 { name="dlib"; version="1.0.3"; sha256="1is8j1gwf22n7yixg40rb6p4mrnbzijwfjl6vsniq8qkyy7z8k32"; depends=[Rcpp]; };
+  dlib = derive2 { name="dlib"; version="1.0.3.1"; sha256="1rchl4f3zj0azz8d4n139daba2gz6vnm60jq45vgc9gphk2mrnnb"; depends=[Rcpp]; };
   dlm = derive2 { name="dlm"; version="1.1-5"; sha256="1aksm66sfa7ipl5xgs4j5giac7q2m744wjl40mva56xn6i674h4r"; depends=[]; };
-  dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
   dlnm = derive2 { name="dlnm"; version="2.4.2"; sha256="1phn8xci456zx3jcjvy99ycki3gkzc4id0c45c37mdddxvk1bwmg"; depends=[mgcv nlme tsModel]; };
-  dlookr = derive2 { name="dlookr"; version="0.3.13"; sha256="1i1aiy4v3bvlrz0w0hc5qlv5flqgzbgavqmaql6bc8nz5s9p071s"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
+  dlookr = derive2 { name="dlookr"; version="0.3.14"; sha256="19aiwky40yj0xv3pwlbndw04d03hzw56zv60lxmzrm3bw1359fx2"; depends=[broom car classInt cli corrplot DMwR dplyr forcats ggplot2 gridExtra kableExtra knitr magrittr mice prettydoc purrr RcmdrMisc RColorBrewer reshape2 rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
   dlsem = derive2 { name="dlsem"; version="2.4.6"; sha256="1h3bwqqpfjkl41b2mbfhsj0pi9kri0h0i28wiid6arjrmm87nsf8"; depends=[graph Rgraphviz]; };
   dlstats = derive2 { name="dlstats"; version="0.1.3"; sha256="0inij1rzw8i683lyzvnjhfzrng7zx727y9wcijv6ny2fw64cdd6n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; };
-  dm = derive2 { name="dm"; version="0.1.6"; sha256="0cc153d5kl9qx2nazc0k85xj5kww63xjkppkj0nj0gag22bsscg7"; depends=[backports cli DBI dplyr ellipsis glue igraph lifecycle magrittr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; };
+  dm = derive2 { name="dm"; version="0.1.9"; sha256="0wla1rccs75igmqakkj9rsb3v0j1v2rax4rxvg9jr6vcrs4dzz7d"; depends=[backports cli DBI dplyr ellipsis glue igraph lifecycle magrittr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; };
   dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; };
   dmacs = derive2 { name="dmacs"; version="0.1.0"; sha256="1prw6h8sj6fcpajg6xwqhi8v5jfl74mbjdjrdy524miw56fh9h0r"; depends=[lavaan MplusAutomation]; };
   dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; };
   dmbc = derive2 { name="dmbc"; version="0.4.0"; sha256="1m8zwy18phlxpmlp8rf07d615fjg15gqs5wdfm78d49266032jay"; depends=[abind bayesplot coda ggplot2 ggrepel MCMCpack modeltools pcaPP Rcpp RcppArmadillo RcppProgress robustbase]; };
-  dmdScheme = derive2 { name="dmdScheme"; version="1.2"; sha256="13yfpjl6qmvrwvyvymkcp1yppicghwcw1lddz68w6l9ncsjr4fbi"; depends=[digest EML knitr magrittr openxlsx rappdirs readxl rlang rmarkdown stringr writexl xml2 yaml]; };
+  dmdScheme = derive2 { name="dmdScheme"; version="1.2.6"; sha256="093v2ypqmk6p23a8arl49c4fd60c8mgg6ns0daikjmp9qdm880aa"; depends=[digest EML knitr magrittr rappdirs readxl rlang rmarkdown stringr writexl xml2 yaml]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
   dmm = derive2 { name="dmm"; version="2.1-6"; sha256="0y955dlfdpr6shfjwa96p4f9i9z9bq5jahp3k75fzyzyl7d9lvsj"; depends=[MASS Matrix nadiv pls robustbase]; };
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
-  dmtools = derive2 { name="dmtools"; version="0.2.4"; sha256="0dyyl5lx4m2nwcvj2xzx12bl6sclsxmkas70k2s9zx4z1zrmsfh0"; depends=[dplyr lubridate magrittr purrr readxl]; };
+  dmtools = derive2 { name="dmtools"; version="0.2.6"; sha256="0z77whal18sxmfqalv39w85vnc84c838yh3dp144v7w198n095fy"; depends=[dplyr httr lubridate magrittr progress purrr readxl tibble tidyr]; };
   dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; };
   dna = derive2 { name="dna"; version="2.1-2"; sha256="0l7i9640yd25cbxd3vbmlsqgk3pi2f7v6g5q0lrgycxl7jla9v1k"; depends=[]; };
-  dnapath = derive2 { name="dnapath"; version="0.6.4"; sha256="0vhqpy8ps8id6vv6bdhc80kwnqzwffq1hbc5vxnxr9iqf1a1rg39"; depends=[biomaRt corpcor curl dplyr ggplot2 igraph Rcpp RcppArmadillo Rdpack reactome_db SeqNet tibble]; };
   dnet = derive2 { name="dnet"; version="1.1.7"; sha256="05mqgp8x2h6vjf8j9466kpng7bbga134c2y808qgdmjdnv9fcaxc"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
   dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; };
-  dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; };
-  do = derive2 { name="do"; version="1.4.0.0"; sha256="0hcwv8vrn7a1k8f7i9izyc84150jp5rndbzfa1fa8fnn34nb8vb3"; depends=[data_table plyr tmcn]; };
-  doBy = derive2 { name="doBy"; version="4.6.7"; sha256="16vg1aa272sfzyqxfb63fyis9hv6g5m3nmxxa6mk1gy0irqnl3jk"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix pbkrtest tibble]; };
-  doFuture = derive2 { name="doFuture"; version="0.9.0"; sha256="1sfymhgjph1xrw49dxyc2slxxgal7v4yanklr4zql7r4vqinhk19"; depends=[foreach future globals iterators]; };
-  doMC = derive2 { name="doMC"; version="1.3.6"; sha256="1cn9gxavhvjswip8pwvkpi7q6wpzdllcsdjabga8akf55nggqxr9"; depends=[foreach iterators]; };
+  dnr = derive2 { name="dnr"; version="0.3.5"; sha256="16s06jvwmvhxgvrmfav1xfszjrn7j2cm4jw5xyx6w5lb5434kzcq"; depends=[arm ergm glmnet igraph network sna]; };
+  do = derive2 { name="do"; version="1.6.0.0"; sha256="0iv69vkdcs7mppmq5l0yxn2bq63j479gzya8bg7yhpqyr76lzyfv"; depends=[data_table plyr reshape2 tidyr tidyselect tmcn]; };
+  doBy = derive2 { name="doBy"; version="4.6.8"; sha256="0r97kwsj6g87m7shgnjc5c9y71jkhiq4xd9q0s2bxl0vl92qqwvg"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix pbkrtest tibble]; };
+  doFuture = derive2 { name="doFuture"; version="0.11.0"; sha256="1r1mdrrrjaj733rgminic4ihkmrn93mx2km26i684dszs3mx32f1"; depends=[foreach future globals iterators]; };
+  doMC = derive2 { name="doMC"; version="1.3.7"; sha256="0kdmfhp5m1wisjbfyl9d040jrmjmhcgjb0vdi536g2i9vixb5yny"; depends=[foreach iterators]; };
   doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; };
-  doParallel = derive2 { name="doParallel"; version="1.0.15"; sha256="0vnqbha3gig3awbfvsfx3ni5jir398md1n7xmsb8jihnjsk7xbbi"; depends=[foreach iterators]; };
+  doParallel = derive2 { name="doParallel"; version="1.0.16"; sha256="1cjf0mxrxgls5pl7aj22fv9j488craib1wkc9np4f3gkckwjdfzi"; depends=[foreach iterators]; };
   doRNG = derive2 { name="doRNG"; version="1.8.2"; sha256="1jff27zzrvd1fd61x2m9468h8xn3s1c9f6wibviy5zdhj5dx9s9k"; depends=[foreach iterators rngtools]; };
   doRedis = derive2 { name="doRedis"; version="2.0.0"; sha256="0lw8j339az2dgcrahmkhp7k5dpvy1dalk1sfsjp2hzfhm3xqabc8"; depends=[foreach iterators redux]; };
-  doSNOW = derive2 { name="doSNOW"; version="1.0.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; };
+  doSNOW = derive2 { name="doSNOW"; version="1.0.19"; sha256="0f07b38cl7s61vwzkyqkzzsic9g4sw9k6ndbxk3g90l4ca0d1ljc"; depends=[foreach iterators snow]; };
   dobin = derive2 { name="dobin"; version="1.0.2"; sha256="1vhvwdl7a8bf4q64jz8a6afm3smdn3jgxvs17jjlilarpdazl3p5"; depends=[pracma RANN]; };
   dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; };
-  doc2concrete = derive2 { name="doc2concrete"; version="0.4.6"; sha256="1a3j8bm9n40jiahc60wviblw1yry2rgc34jpr5qp54gfpjr1bigm"; depends=[dplyr english ggplot2 glmnet quanteda SnowballC stringr textclean textstem tm]; };
+  doc2concrete = derive2 { name="doc2concrete"; version="0.5.0"; sha256="0lcqqvzmab6s30crfvz9y67qx9lw7gywx2nrbbzpksvcz2y3ir7a"; depends=[dplyr english ggplot2 glmnet quanteda SnowballC stringr textclean textstem tm]; };
+  doc2vec = derive2 { name="doc2vec"; version="0.1.0"; sha256="03m2ys16n45iz88iw1rva6jc4yxp381bjg8k69f81a71fg013473"; depends=[Rcpp]; };
   docdescriptR = derive2 { name="docdescriptR"; version="2020.1.0"; sha256="02sgbzhvjayf39r5lrx3krihzm263fnvwpjqm0jsqrq4d8pps3hb"; depends=[broom DescTools dplyr flextable magrittr nortest officer plotrix Rdpack tictoc]; };
   docinfeR = derive2 { name="docinfeR"; version="2020.1.0"; sha256="08xa3f27giad3fikk8jywpm2p843zlb8a9znq3x47x6ivwybfllp"; depends=[broom flextable nortest officer Rdpack tictoc]; };
   dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; };
@@ -7289,30 +7575,31 @@ in with self; {
   docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; };
   docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; };
   documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-  document = derive2 { name="document"; version="3.2.0"; sha256="0k1sqh9sn9lvv8r05byicrhg07jfnas8h9pyij42pgdvy93rinvy"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
+  document = derive2 { name="document"; version="3.3.0"; sha256="13m61a2q044q6iqcg0zjh2xjy530f7igjd3z0832iwks747s9rii"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
   documenter = derive2 { name="documenter"; version="0.1.1"; sha256="0y6zrvmb9bhc1ni4v89h9pq5ara8p2v4b35ylasia5s9x1y93mcp"; depends=[htmltools magrittr officer xml2 yaml]; };
   docxtools = derive2 { name="docxtools"; version="0.2.2"; sha256="0ds8qy21x7cq9qmnn6gggzf8kxdphq7nf2mx5gqx829zgkripsfq"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.6.5"; sha256="1kki49g0sfhbx2d4swrkv21akws8ayrsd4h3v148xmzdlsrvhhiw"; depends=[dplyr httr magrittr purrr xml2]; };
   dodgr = derive2 { name="dodgr"; version="0.2.7"; sha256="0484bcbgzciwhb5afpcnygqr2pmf7wq9kxm73y137gjwgijqgg0g"; depends=[callr digest magrittr osmdata Rcpp RcppParallel RcppThread]; };
   doebioresearch = derive2 { name="doebioresearch"; version="0.1.0"; sha256="1rmvb6pa71frvjszpsjaw3ahm70kyykrq6zfjqk8smgcg397k9pi"; depends=[agricolae]; };
   doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; };
-  dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.3.0"; sha256="0850z2ppdgbfwbv8l40ngl00n4mdj4ciky1g918zazd3jrg88s38"; depends=[]; };
+  dominanceanalysis = derive2 { name="dominanceanalysis"; version="2.0.0"; sha256="0qxldvlgbysy9j17kb0a9p132a04a4j12h4m0r70zv2752fj24c0"; depends=[]; };
   domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; };
   donut = derive2 { name="donut"; version="1.0.1"; sha256="17qiy9j0qm2q2gcysd5717bdl9nmkd7pd5z22pcj3icvxcpssval"; depends=[]; };
-  doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; };
-  dosearch = derive2 { name="dosearch"; version="1.0.4"; sha256="1hq85jym0plf8hj77bfd623nhyjgfqqzm1w92n3lii3j5lv9vrwg"; depends=[Rcpp]; };
+  dosearch = derive2 { name="dosearch"; version="1.0.6"; sha256="0ba3yrnysj29yrk9yah2xms56kg1qnkgajm74waixp8d3qazdfvg"; depends=[dagitty igraph Rcpp]; };
   dosedesignR = derive2 { name="dosedesignR"; version="0.2.4"; sha256="0c8rilx4afih457f9gafgijm569g366lp4wms0vhc0f9kgr1z8h3"; depends=[DoseFinding DT ggplot2 lattice latticeExtra shiny shinyjs]; };
   dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; };
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
   dotCall64 = derive2 { name="dotCall64"; version="1.0-0"; sha256="1b8p7m3w0m7bp977c6jz74xkd611cxg11j49yza59k5fp338scb9"; depends=[]; };
   dotdot = derive2 { name="dotdot"; version="0.1.0"; sha256="0d8inv2m7pkk6dnv9j9zai4lhghcg656l46d00rhp604rbhzlmw9"; depends=[]; };
   dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; };
+  dotgen = derive2 { name="dotgen"; version="0.1.0"; sha256="12dvn52ggmkj2q6whi8s2hh9fpg7jcg20bgx32jxzh4cb1zxnksz"; depends=[mvtnorm]; };
   dotwhisker = derive2 { name="dotwhisker"; version="0.5.0"; sha256="034pvkc59jdjl27wirgb2cv84ajw5y2if20njzzp87nd4f9bb6br"; depends=[broom dplyr ggplot2 ggstance gtable purrr rlang stringr]; };
   doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; };
-  double_truncation = derive2 { name="double.truncation"; version="1.5"; sha256="09r3f11fi8c9kc9fzgzq6k4kjc82r3s0sgzp3ffdqrc47jhyl279"; depends=[]; };
+  double_truncation = derive2 { name="double.truncation"; version="1.7"; sha256="0hrb1qli7i4jhc705rb02zbq2nyk0i406bb8gpy4jrzygjjbq3g0"; depends=[]; };
   doubt = derive2 { name="doubt"; version="0.1.0"; sha256="16avp0f7ks2zd4ckakvfm57zng2jk0fg3fz6vbm05lzhqymh6y30"; depends=[unglue]; };
+  downlit = derive2 { name="downlit"; version="0.2.1"; sha256="0z4fz7c9kyd9v72wl3iqs2wxspi975d6b0rgjr9lvg8a18maa9z6"; depends=[brio digest evaluate fansi rlang vctrs yaml]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
-  downloadthis = derive2 { name="downloadthis"; version="0.2.0"; sha256="0xvkznvk21gpycsnrra9af31apiv36g4s6c9r0c9vdsq4c93dpxd"; depends=[base64enc bsplus fs htmltools magrittr mime readr writexl zip]; };
+  downloadthis = derive2 { name="downloadthis"; version="0.2.1"; sha256="12df3cxg1x84f3sibllykd5wqs11mr4nlyv8hj8bh9d6wjvwj2li"; depends=[base64enc bsplus fs ggplot2 htmltools magrittr mime readr writexl zip]; };
   downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; };
   downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; };
   dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
@@ -7321,7 +7608,7 @@ in with self; {
   dplR = derive2 { name="dplR"; version="1.7.1"; sha256="1df4g9zz47h0flx5ww6bvlm364q81l2c5flzpa985sv87rq6cz4j"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
   dplyr = derive2 { name="dplyr"; version="1.0.2"; sha256="0jnw18nw20gw3jvq3kvkf9mqn6b7mvgmys8g6350k5jwpygk5cbw"; depends=[ellipsis generics glue lifecycle magrittr R6 rlang tibble tidyselect vctrs]; };
-  dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.2"; sha256="1pq630hlvpfrhaxqn6yh0kgapgibrnbic78g130d40visak60j1p"; depends=[bit64 DBI dbplyr dplyr odbc rstudioapi]; };
+  dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.4.1"; sha256="0ygn8cq4dnmzzxfskcir7g0bksgby5sw2j135gvrk599z3v6avg1"; depends=[bit64 DBI dbplyr dplyr odbc]; };
   dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; };
   dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; };
   dppmix = derive2 { name="dppmix"; version="0.1.1"; sha256="1gq51kix0jln25gr6bffzdy24fhn6cd3gmyl3jlmvqvni4vwswy7"; depends=[mvtnorm]; };
@@ -7330,35 +7617,41 @@ in with self; {
   dqrng = derive2 { name="dqrng"; version="0.2.1"; sha256="0rp8q5zijlvaqmpnkwr314w9w40sj4fz7sqsdgsffcfvn42w2jg1"; depends=[BH Rcpp sitmo]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
   dr4pl = derive2 { name="dr4pl"; version="1.1.11"; sha256="0vv3h4sxw38grhr70s28sxkca20adnqdmpp8qqwlbr3dw950yaa3"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; };
-  dracor = derive2 { name="dracor"; version="0.2.2"; sha256="1l3972q7blif2jgya1lmppzg5nrs78wghqqj857mzgdw4k8pizs5"; depends=[Rcpp]; };
-  dragon = derive2 { name="dragon"; version="1.0.1"; sha256="1y5ymnc5aacbf69zayxzwdvkw8gxi08rai4mgdrvmqnr5mkxw1c6"; depends=[broom colorspace colourpicker config cowplot curl dplyr DT future ggforce ggplot2 golem htmltools igraph lubridate magrittr openxlsx promises purrr RColorBrewer readr rvest shiny shinydashboard shinyWidgets stringr tibble tidyr tidyselect visNetwork xml2]; };
+  dracor = derive2 { name="dracor"; version="0.2.4"; sha256="0q7kwv60q32gj1b48r3ha0d539ddhw9jz3n62wvc8jr1na1v52lh"; depends=[Rcpp]; };
+  dragon = derive2 { name="dragon"; version="1.1.0"; sha256="1cb5k0k4mimndy5xlfq813lg4acrl0lrv0q2hakll61lrqqxbykd"; depends=[broom colorspace colourpicker config cowplot curl dplyr DT future ggforce ggplot2 golem htmltools igraph lubridate magrittr openxlsx promises purrr RColorBrewer readr rlang rvest shiny shinydashboard shinyWidgets stringr tibble tidyr tidyselect visNetwork xml2]; };
   dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; };
+  dragracer = derive2 { name="dragracer"; version="0.1.5"; sha256="19qvr01wxzw5ihgpy7lz13f3hylnmprziwnr50gkwj6p3zhc0swa"; depends=[]; };
   dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; };
-  drake = derive2 { name="drake"; version="7.12.4"; sha256="02pq2xy0s8kdhd018rwvpgpaq839y7zhzrv6fp64h3cnrc00xcym"; depends=[base64url digest igraph rlang storr tidyselect txtq vctrs]; };
+  drake = derive2 { name="drake"; version="7.12.7"; sha256="0ajvzw8j4pg5c8wji0d5jsdpk49mv7m4fh278mhdh2v972nfvkji"; depends=[base64url digest igraph rlang storr tidyselect txtq vctrs]; };
   drat = derive2 { name="drat"; version="0.1.8"; sha256="0dl52xxfy07ha3c945da1cna9m5cnidm9y4n46h6ysvcrq75wsyk"; depends=[]; };
   draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; };
+  drawsample = derive2 { name="drawsample"; version="0.1.1"; sha256="0kynj8wcaxpni39fn172f0wk1p65ilj3x0a949sgq4v3zzw3zqxb"; depends=[dplyr lattice psych tibble]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
-  dreamerr = derive2 { name="dreamerr"; version="1.2.0"; sha256="00p8vq3zhqdwk3pyg7vx848c9k8rby2v2j7jkv445gj9wjy6ylbd"; depends=[Formula]; };
+  dreamerr = derive2 { name="dreamerr"; version="1.2.3"; sha256="0g3gl4nzfw02alhyjw9flylfr2awyijjim50j1jdnp677zqlxkmf"; depends=[Formula]; };
   drf = derive2 { name="drf"; version="1.0.0"; sha256="1ja9f1g5afijcdp480zj6l0ffmixfsrcvxgdy5vrk6342hr229ks"; depends=[fastDummies Matrix Rcpp RcppEigen spatstat]; };
   drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; };
   drgee = derive2 { name="drgee"; version="1.1.10"; sha256="0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
+  drhur = derive2 { name="drhur"; version="0.1.0"; sha256="1a13fpczvq0a93q2ldh2h42hk7firmcbr478vkli8y6d1bwlj567"; depends=[arm car dotwhisker gapminder ggeffects ggthemes gt interplot kableExtra knitr learnr likert modelsummary moments nnet ordinal performance scales summarytools tibble tidyverse]; };
   drifter = derive2 { name="drifter"; version="0.2.1"; sha256="1xsp8cm02wd8zink0jqrdaii7s2dh0rw96rs6k8zr2g0341wmfba"; depends=[DALEX dplyr ingredients tidyr]; };
+  driveR = derive2 { name="driveR"; version="0.2.1"; sha256="1zc14j7aarxbw11p5gardqkwrab71b8wfrpd1q2g6r9dg98w146i"; depends=[caret GenomeInfoDb GenomicFeatures GenomicRanges org_Hs_eg_db randomForest rlang S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; };
   drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
   dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
   droptest = derive2 { name="droptest"; version="0.1.3"; sha256="1wlfhj6c4pb5mcybyd2bcn55y3azk7dv7d7il97qwbhl8kf59csl"; depends=[data_table]; };
+  drord = derive2 { name="drord"; version="1.0.0"; sha256="1mkawx21dyj5vgiba598ilpas0vmi5qypi0aa9489yrsl40ls7xn"; depends=[ggplot2 MASS ordinal VGAM]; };
+  drought = derive2 { name="drought"; version="1.0"; sha256="1rj3aycvkb0f85p12l356rlhid4zfzqkhks20x2hhwvpk8nhri8h"; depends=[copula]; };
   drtmle = derive2 { name="drtmle"; version="1.0.5"; sha256="1gnzprdjs4aws5q92a0dmlfzpwi3in3rsylbwr0r6cnghymgs69s"; depends=[doFuture future future_apply future_batchtools np SuperLearner]; };
   drugCombo = derive2 { name="drugCombo"; version="1.1.1"; sha256="0f4akxmj5jd89jm7kzkmqksxmb6fqj7jawvm3hpw6limyry3mp4z"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; };
   drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; };
   ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; };
-  ds4psy = derive2 { name="ds4psy"; version="0.4.0"; sha256="10w6hwkc6f63ri2hkck53w5nxp9qxr24r1w6ir9zql3a84sbvgva"; depends=[cowplot ggplot2 unikn]; };
+  ds4psy = derive2 { name="ds4psy"; version="0.5.0"; sha256="0a8x3kji1divizl5wqidsy6wx8viyqx2gsi1s686dh4zdqfcw5rh"; depends=[cowplot ggplot2 unikn]; };
   dsa = derive2 { name="dsa"; version="0.74.18"; sha256="17pyr5jn6mjcch5cl22z8mg31anirmgdjs6k9vjmz5ar35fcb1vi"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; };
   dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; };
-  dscore = derive2 { name="dscore"; version="1.3.0"; sha256="04msklbnbxzzvyky4k91l1mp0nws1j36basrp3yalld3da7dzvdb"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr tidyselect]; };
+  dscore = derive2 { name="dscore"; version="1.4.0"; sha256="0vjrxdgss79pmd8vkarvgqqm465byz17r7r93k5i3923xm02kavr"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr tidyselect]; };
   dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; };
   dslabs = derive2 { name="dslabs"; version="0.7.3"; sha256="0fhd6zwa4lmgrrybywvj1vxd98a483yca605dj2pwipqifh1x6ka"; depends=[ggplot2]; };
   dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; };
   dsm = derive2 { name="dsm"; version="2.3.0"; sha256="0b7jdhfrpkyjhxxlkgxsnnidmmpbb3jkx41iqmp08bxipbjyw4kr"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; };
-  dsr = derive2 { name="dsr"; version="0.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; };
+  dsmisc = derive2 { name="dsmisc"; version="0.3.3"; sha256="19760hcb5154rayhj72r48r7glh2qyaf178zkxplywmsw338kws4"; depends=[Rcpp stringr]; };
   dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; };
   dssd = derive2 { name="dssd"; version="0.2.1"; sha256="0lfr3bb3nba6pkg13d3kiblbp4naqxcdkvdqsa0y1zlhak74cgcj"; depends=[plot3D rgdal sf]; };
   dst = derive2 { name="dst"; version="1.4.1"; sha256="1cz1fcyxpyv0ywmwlqdhgj3nzidnzcaxc1nkh8y5mph9wm612c25"; depends=[]; };
@@ -7369,16 +7662,18 @@ in with self; {
   dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; };
   dtpcrm = derive2 { name="dtpcrm"; version="0.1.1"; sha256="0k25fm0z3snpx1v2kwd50svgnkjhn5c0hy1gnlw2lif6rjz1fzd9"; depends=[dfcrm diagram]; };
   dtplyr = derive2 { name="dtplyr"; version="1.0.1"; sha256="0jgisglpaj1n6jhwqwsa1583i4ifazqdd9hh581w5akx5p0f05mp"; depends=[crayon data_table dplyr rlang tibble tidyselect]; };
+  dtrSurv = derive2 { name="dtrSurv"; version="1.1"; sha256="1wklfgzlvwv8c3rpff29w2liy4ahds61zrcig8bzjbifi6inqnq0"; depends=[survival]; };
   dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; };
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dttr2 = derive2 { name="dttr2"; version="0.3.0"; sha256="1irr0cpkls2fkck07az24yqc8llgw7q1nh7km0cm31dr4zxnj0hf"; depends=[chk hms lifecycle]; };
-  dtw = derive2 { name="dtw"; version="1.21-3"; sha256="02hyhx1sy5h3vzh9zixy18a7d47df4k5d0wyflcvlcbsbcl6p90s"; depends=[proxy]; };
+  dtw = derive2 { name="dtw"; version="1.22-3"; sha256="004gm4mzgdzdj807j3bwqsv5lizmnmz5jq514bdjshhkysnzjz6z"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.2.6"; sha256="1mx3xxhf2ywi6cia47sn77wzxd8rg9wir7r8dx92k5dvawr425ki"; depends=[caret data_table dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; };
   dtwclust = derive2 { name="dtwclust"; version="5.5.6"; sha256="05dszmj89id2hk9apxa7721737s6292w2l7vazj7aqwk1jyghjpm"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; };
   dual = derive2 { name="dual"; version="0.0.3"; sha256="1alxh9mj610m7wgr6a97mpzy5ia9vzckhz6wmxyix7xh9mzbn1gw"; depends=[]; };
   dualtrees = derive2 { name="dualtrees"; version="0.1.4"; sha256="05mxwiwnv48jf6ya5qmfc7g2w8wkzhk56k9g0gr2m4cpfab7d5h2"; depends=[]; };
   duawranglr = derive2 { name="duawranglr"; version="0.6.5"; sha256="04w8ll6p8m0ljcp96sfp028afgxddk4wyncfdwiywi0ps34zh084"; depends=[digest dplyr haven readr readxl]; };
   dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; };
+  duckdb = derive2 { name="duckdb"; version="0.2.3"; sha256="0nks1916kan1gpkk85gfcm7zklk100msfb83620j4i8szsbmz42d"; depends=[DBI]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
   dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
   dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
@@ -7391,26 +7686,25 @@ in with self; {
   dvqcc = derive2 { name="dvqcc"; version="0.1.0"; sha256="011mwdwh046wninfjdy00wxn312ykzn90nz9fz3l7c5cw9gzzfkg"; depends=[ggplot2 tsDyn]; };
   dwdradar = derive2 { name="dwdradar"; version="0.2.3"; sha256="01xk058d5sfgknyplg65xplkhqi79mn3p5p5fjrv4vis0mq0dsvq"; depends=[]; };
   dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; };
-  dyads = derive2 { name="dyads"; version="1.1.2"; sha256="014gphxkn0wkdq5zgd71vv9dmzyswgpari59w5mf2070c0rr56n5"; depends=[MASS mvtnorm]; };
+  dyads = derive2 { name="dyads"; version="1.1.3"; sha256="1spkypcm92pipz36rqswca50gihj3vpv0y34rjyaqwfx88b3dwp6"; depends=[CholWishart MASS mvtnorm RcppZiggurat Rfast]; };
+  dycdtools = derive2 { name="dycdtools"; version="0.2.0"; sha256="16aiv0f6rsrpl8vym490w67had3isn9xbcyfiaa8vpgy8p80ymyr"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 R_utils RColorBrewer tidyr]; };
   dydea = derive2 { name="dydea"; version="0.1.0"; sha256="15alr3f6wkkpjd5wmcjazi58yc8gwcqr662mjwlfg15r94fzqrlg"; depends=[Chaos01]; };
   dygraphs = derive2 { name="dygraphs"; version="1.1.1.6"; sha256="022j007mzfa9k2n31yg4aizcsf571vv3jip092h23rqj03rk3ly3"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
   dyn = derive2 { name="dyn"; version="0.2-9.6"; sha256="16fqv9k7yxdgybwzafjkyqm16qpgqz13lcjpi6a1nc8xbzlzh0gb"; depends=[zoo]; };
-  dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; };
+  dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.6"; sha256="04026jz4vdyj2a2kry5kk5k84cy4vqqrcn328hxwnwh7r8i7klvn"; depends=[tcltk2]; };
   dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; };
-  dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; };
   dynRB = derive2 { name="dynRB"; version="0.15"; sha256="0fa6g4aj2cncg6mi0yc2yn6321qi7fz9d9cvqrnxhcnbbghdyzq9"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; };
   dynaSpec = derive2 { name="dynaSpec"; version="1.0.0"; sha256="153pwzznkj0cm2kfh4s7k4k6yqj4rp0lvbrcb81rvqv2kvxg6i7m"; depends=[ggplot2 NatureSounds pbapply png seewave tuneR]; };
   dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; };
   dynamac = derive2 { name="dynamac"; version="0.1.11"; sha256="0dzw4h128z53vwdpkikhxqil0xjrcjrp1zmz0fy2qhq0n74sdyar"; depends=[lmtest MASS]; };
   dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; };
-  dynamichazard = derive2 { name="dynamichazard"; version="0.6.6"; sha256="1ad4ymi28yx6vh3x8p4pm4ph81fb9fkhk4zfhbl60522d4kjbsjq"; depends=[boot Rcpp RcppArmadillo survival]; };
-  dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; };
+  dynamichazard = derive2 { name="dynamichazard"; version="0.6.7"; sha256="17zsn11b7gf8hx13f8sy88hdkbdzc1a1hszhbwfllpipd9pwzsyb"; depends=[boot Rcpp RcppArmadillo survival]; };
   dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; };
   dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; };
   dyndimred = derive2 { name="dyndimred"; version="1.0.3"; sha256="03znghb5nygggwfmy9id07fn1wfkhwyzyzahdrlx68pg03dhlbg5"; depends=[dynutils irlba lmds]; };
   dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; };
-  dynfrail = derive2 { name="dynfrail"; version="0.5.2"; sha256="1q7ml24j0ycy2bwpa14vl96315ni7x9rfp0qmf36w00mylgc3ry6"; depends=[dplyr magrittr Rcpp RcppArmadillo survival tibble tidyr]; };
+  dyngen = derive2 { name="dyngen"; version="0.4.0"; sha256="1qc701m52852xmbpldpxljbfjsljnba4dwap80ibqil4cl8l66px"; depends=[assertthat dplyr dynutils furrr ggplot2 ggraph ggrepel GillespieSSA2 igraph lmds Matrix patchwork pbapply purrr rlang tibble tidygraph tidyr viridis]; };
   dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
   dynlm = derive2 { name="dynlm"; version="0.3-6"; sha256="1g8qsb5m69yn35sm0shd97vbnbpqfkjkd7lbkwch1gpfxkld53zq"; depends=[car lmtest zoo]; };
   dynmix = derive2 { name="dynmix"; version="1.0"; sha256="0rv787yn264dsp6hpyzwfrgc3p0rp2vhklkdszs9fwy3s4x5177w"; depends=[MASS Rcpp RcppArmadillo zoo]; };
@@ -7421,32 +7715,32 @@ in with self; {
   dynr = derive2 { name="dynr"; version="0.1.15-25"; sha256="1kwrx1wg7hwgwkdgws8pvdv2yj5m77xp7fnpxlj50c7xm3chjm78"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; };
   dynsbm = derive2 { name="dynsbm"; version="0.7"; sha256="169yk539vynjbn89q6vs3l3fx7hk8n3i1msa4jws5vypgljc2rir"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
-  dynsurv = derive2 { name="dynsurv"; version="0.3-7"; sha256="0ar8n84fpfy68cx321syg8hvjxjnh00mw0a9sid9dw58f956phf8"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
+  dynsurv = derive2 { name="dynsurv"; version="0.4-2"; sha256="0gy9q7l7k37bxm3d37adpvqa45lvr048a309jqc052f179v38mlb"; depends=[BH data_table ggplot2 nleqslv splines2 survival]; };
   dynutils = derive2 { name="dynutils"; version="1.0.5"; sha256="1vcnz0yrss64i8pw459z2kp17b0fqgw41rpxbzpixhsqsz9sy22x"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; };
   dynwrap = derive2 { name="dynwrap"; version="1.2.1"; sha256="1hcc2svsw52nvhyp9zw4iwrn88rpvjk424ckin0g6fyp5afdyfsk"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils glue igraph magrittr Matrix processx purrr readr reshape2 stringr testthat tibble tidyr yaml]; };
-  e1071 = derive2 { name="e1071"; version="1.7-3"; sha256="0pf2pjb590z0jikgv1037xcp7dq06mg3dzmyffjw6gk7dd9blbdv"; depends=[class]; };
+  e1071 = derive2 { name="e1071"; version="1.7-4"; sha256="02935xcscjhb0jmnvh44hxlpjcgladrcr0gpz1jxq07m0qdqgaz6"; depends=[class]; };
   eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; };
+  eBsc = derive2 { name="eBsc"; version="4.12"; sha256="0mvvw9z9qivzwkk6gwblavj175jc2a96zsplcifil2rgsr165ni8"; depends=[Brobdingnag MASS Matrix nlme Rcpp RcppArmadillo]; };
   eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; };
   eDMA = derive2 { name="eDMA"; version="1.5-3"; sha256="0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j"; depends=[Rcpp RcppArmadillo xts zoo]; };
   eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; };
   eHOF = derive2 { name="eHOF"; version="1.9"; sha256="13m64vdbcr6ify7p6zj0dh5rsy87c9r7m4sslmgh0afbglszzrcs"; depends=[lattice mgcv]; };
   eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; };
   eNchange = derive2 { name="eNchange"; version="1.0"; sha256="07vdi05fr6mynb86haas21izdcjiagw14p1h8n0qr1hb3klvs8n5"; depends=[ACDm doParallel foreach hawkes iterators Rcpp]; };
-  eNetXplorer = derive2 { name="eNetXplorer"; version="1.1.1"; sha256="0z1k8dhvvzbhdmvj754hxmgc0g1fv5df7fv2hq8sil0yv9v1rvny"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer survcomp survival survivalROC]; };
   ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; };
   eRTG3D = derive2 { name="eRTG3D"; version="0.6.3"; sha256="1fa2wcipjym3vz53zxb6dz2i52b963yxrq5h1k7wydpj53xwk5jm"; depends=[CircStats ggplot2 pbapply plotly raster rasterVis tiff]; };
   eRm = derive2 { name="eRm"; version="1.0-1"; sha256="0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9"; depends=[colorspace lattice MASS Matrix psych]; };
-  eSDM = derive2 { name="eSDM"; version="0.3.4"; sha256="169kxw1krrsqkrwm9zg9h0sczhc6r0y1rsw39m60kfbzqdhk57vk"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; };
+  eSDM = derive2 { name="eSDM"; version="0.3.5"; sha256="1x0w47jmcdqx4i8vm3pbmqjilzbgjp0qvp2qx2k7plczwb824shb"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; };
   eadrm = derive2 { name="eadrm"; version="0.1.3"; sha256="0bb9glwqkzr1px03l4dxvgzm7zkrp3349l5fwfmw6jp0fxdl98ij"; depends=[]; };
   eaf = derive2 { name="eaf"; version="1.9-1"; sha256="0h7nilqa11s4casalilmk4ssgcl1lqn1w4033zxgc20y7f9rxhsg"; depends=[modeltools]; };
-  earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; };
+  earlyR = derive2 { name="earlyR"; version="0.0.5"; sha256="0978vv48sj1hs61rdb3xv02s8qz03jcm1c8q1mbb3d033x1q7k22"; depends=[distcrete EpiEstim epitrix ggplot2]; };
   earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; };
   earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
-  earth = derive2 { name="earth"; version="5.1.2"; sha256="13a8qfv94bqnjkacnr0nz1g8yd99cnyz4k2qslyclrckqbl9hvrj"; depends=[Formula plotmo TeachingDemos]; };
+  earth = derive2 { name="earth"; version="5.3.0"; sha256="0dr4w2jvvh3rh1zxissrhq55ba72gwir72kiz3fv6x0s4w3fib05"; depends=[Formula plotmo TeachingDemos]; };
   earthtide = derive2 { name="earthtide"; version="0.0.10"; sha256="09cd4vwkl33zgdwvhvi9jl6za9w61zjj9fyq3x2cxz4hgj346fbm"; depends=[BH R6 Rcpp RcppArmadillo RcppParallel]; };
   earthtones = derive2 { name="earthtones"; version="0.1.1"; sha256="17biiw0ig8i8ihc2f8csp0bqryygg27ic2v1vrf81ax3qzhngy4l"; depends=[ggmap]; };
   easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; };
-  easyCODA = derive2 { name="easyCODA"; version="0.31.1"; sha256="1g3k8a06zsif5a7xma4dz5zcdbxyc6i58jf5rnnyypxhj6xm5abc"; depends=[ca ellipse vegan]; };
+  easyCODA = derive2 { name="easyCODA"; version="0.34.3"; sha256="1s1zjjvswl3444m84n6c5sznva4y19kcm171xkcy1zdx3wqmd2m3"; depends=[ca ellipse vegan]; };
   easyDes = derive2 { name="easyDes"; version="5.0"; sha256="1msybgv4b7xlvp93lk64mdrqprr5qqc9ma1bz7glchhlkyyl8c21"; depends=[multcomp PMCMRplus]; };
   easyNCDF = derive2 { name="easyNCDF"; version="0.1.0"; sha256="1p6b1lcbw2ix6hqqghgfid5yd58yqg1cqnj99r5svli3ivr7x6js"; depends=[abind ClimProjDiags ncdf4]; };
   easyPSID = derive2 { name="easyPSID"; version="0.1.1"; sha256="07m560j8bpzifik305ix33b26xg7w4xjn7lz9g9gp120cqs765dx"; depends=[foreign LaF stringr]; };
@@ -7460,47 +7754,56 @@ in with self; {
   easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; };
   easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; };
   easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; };
-  easyr = derive2 { name="easyr"; version="0.5-0"; sha256="0b10l1qw0hjqz7mn7wrhzk5kj09j16p2yd5znlh59v85hsdvn21l"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl rlang rprojroot stringr XML]; };
+  easyr = derive2 { name="easyr"; version="0.5-2"; sha256="0payiz7ai6wf5pr0v983bnm7fmnjxcj1r4dhw3bnh6ic43kdd386"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl rlang rprojroot stringr XML]; };
   easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; };
+  eatATA = derive2 { name="eatATA"; version="0.9.1"; sha256="0p94wg3y466mna6aqsgljv2rm7gix3zx4jpb1z8jw5zfy2r0xn1y"; depends=[lpSolve Matrix Rglpk]; };
   eatDB = derive2 { name="eatDB"; version="0.4.1"; sha256="1p0dfdfa8409mdpr10ifj9vwskrypda9k02f7j6axcdnsfff6nha"; depends=[DBI RSQLite]; };
+  eatGADS = derive2 { name="eatGADS"; version="0.15.2"; sha256="163wq5dsj6w3ax3fhz8y267vk77i8dknbsg9l08mw4dlh7bdyrm2"; depends=[data_table eatDB eatTools haven hms plyr tibble]; };
+  eatTools = derive2 { name="eatTools"; version="0.3.8"; sha256="044pd0h8fvah2g8kdvja5c2j9qxw7r0203k2n80yfafc84k6k1ix"; depends=[data_table]; };
   ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; };
   ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
-  eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; };
+  eba = derive2 { name="eba"; version="1.10-0"; sha256="03jr54xq109x9bf8kcs8mi7am17l9ya3xdkdppd8imwd2paqrssk"; depends=[nlme psychotools]; };
   ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
   ebdbNet = derive2 { name="ebdbNet"; version="1.2.5"; sha256="0kal4sqx12y04696ilwnwkmss4rn16dkbnalgqimz6i4jhz8n23h"; depends=[igraph]; };
   ebirdst = derive2 { name="ebirdst"; version="0.2.1"; sha256="1cmi0hdh6363hcbqwglald3bn22rlvl4yqg4l3by6005mirjgx2i"; depends=[car data_table dplyr ggplot2 gridExtra magrittr mgcv PresenceAbsence rappdirs raster rgdal rlang scales sf stringr tidyr viridisLite xml2]; };
   ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; };
+  ebmstate = derive2 { name="ebmstate"; version="0.1.1"; sha256="02vg0iha3sr5wil3ngpyrm084mz7xrm11h7y9blwd3p2fbzm9rpv"; depends=[HDInterval mstate Rcpp survival]; };
   ebreg = derive2 { name="ebreg"; version="0.1.2"; sha256="1azs6dh2c7qacmql9kyssxp3gdk7i3fyaq9k8jnagzlmmkzmxddf"; depends=[lars Rdpack]; };
+  ec50estimator = derive2 { name="ec50estimator"; version="0.1.0"; sha256="1zg4p1734q2jzifzfi2lf9wz3687s3cdn0yzkiwbc6w49mgdw877"; depends=[dplyr drc magrittr tibble tidyr]; };
   ecap = derive2 { name="ecap"; version="0.1.2"; sha256="0d260y4phh1a7zlj2lgvdf7xd2z14l9djv7nrwa84pwqqyijc7rl"; depends=[ggplot2 quadprog]; };
   ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; };
   ecce = derive2 { name="ecce"; version="1.0.7"; sha256="03p64l9krnpzdgqyj1fygqq36llsv4jc4bal1qvvgaf652w8fqwy"; depends=[RCurl rjson stringr]; };
   ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; };
   ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; };
-  ecespa = derive2 { name="ecespa"; version="1.1-11"; sha256="154zny4ny5cbba9wpm2wmgvsi7wl77aiagc660xpwfvpiwmbxsmk"; depends=[spatstat]; };
-  echarts4r = derive2 { name="echarts4r"; version="0.3.2"; sha256="0ifjwxydi2an8m5jfp0l9bd34cm9572b2j4w1wka3i1jc7q1r3ff"; depends=[broom corrplot countrycode d3r data_tree dplyr htmltools htmlwidgets jsonlite magrittr purrr rstudioapi scales shiny]; };
+  ecespa = derive2 { name="ecespa"; version="1.1-12"; sha256="09af1331y147lrfn1zks7lv93vfwfzc1r7zy82336jqx2idh6hvb"; depends=[spatstat]; };
+  echarts4r = derive2 { name="echarts4r"; version="0.3.3"; sha256="0k12j804a4qv0my7dvypi5s9nr249cpfl6arfbaz7a6rbpxb8zam"; depends=[broom corrplot countrycode dplyr htmltools htmlwidgets jsonlite magrittr purrr rstudioapi scales shiny]; };
   echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; };
   echo_find = derive2 { name="echo.find"; version="4.0.1"; sha256="1nadqqpxgx2ck16nzjp5ajm6714452qzllg5cq1jpisv1yb31db2"; depends=[boot minpack_lm]; };
   echogram = derive2 { name="echogram"; version="0.1.2"; sha256="0kir7x32fk3fc63kr3b2j0hfkmivs2pwrlxyjvdg7xqc59hjp3ma"; depends=[geosphere readHAC]; };
   echor = derive2 { name="echor"; version="0.1.5"; sha256="0knvvrpw5icyb02jrj8jhlj8ql1j145gxg6wagb458j7kjchqnan"; depends=[dplyr geojsonsf httr plyr purrr readr rlang tibble tidyr]; };
   ecipex = derive2 { name="ecipex"; version="1.1"; sha256="16iyi6n0pnyfmy47b0ranjbh3spvq8cgkmcamzhgjfj7qn0ix184"; depends=[CHNOSZ]; };
   eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; };
-  ecm = derive2 { name="ecm"; version="4.5.0"; sha256="1h24c0g0r8rwz76yx4hzazdbzbrjv5yqlaxpjbm3zsxp624mrsim"; depends=[car]; };
+  ecm = derive2 { name="ecm"; version="5.0.0"; sha256="0vf6wcw0flqhngn712qf9ahaprizzv46af5qlrixqwgwn4q4kp9m"; depends=[car]; };
   ecmwfr = derive2 { name="ecmwfr"; version="1.3.0"; sha256="0xwbcgd590vk4civa4s039avvvxsazzh9y05lw591mpm79lz19mj"; depends=[curl getPass httr keyring memoise]; };
-  ecodist = derive2 { name="ecodist"; version="2.0.5"; sha256="1kijyik0fnjhl69j230mkkdnkknmrbzj43mcj3xv7jy61i2sy0by"; depends=[]; };
+  ecoCopula = derive2 { name="ecoCopula"; version="1.0.1"; sha256="18gkib3m4p7vi9jgzyrnznl9kcjizlh77icqrv8xjpi40ksw9m2r"; depends=[betareg doParallel foreach glasso glm2 igraph MASS mgcv mvabund ordinal plyr sna tweedie]; };
+  ecochange = derive2 { name="ecochange"; version="1.3"; sha256="16dpp887nv7afpvcgmpli0iv4jaz060vj0w63asfz04ix95jmcnl"; depends=[curl dplyr forcats gdalUtils getPass ggplot2 httr landscapemetrics lattice R_utils raster rasterVis readr rgdal rgeos rlang rvest sf sp tibble viridis xml2]; };
+  ecodist = derive2 { name="ecodist"; version="2.0.7"; sha256="1dkf2m6glry5wzwfjiyw6sac89v6g0frbagr9cyfp2hcp0y5g4n2"; depends=[]; };
   ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; };
   ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; };
-  econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; };
-  economiccomplexity = derive2 { name="economiccomplexity"; version="1.0"; sha256="1bqayzpfz26lb985l66j27qybyqx0148fiikb8diamq0mbx3picc"; depends=[igraph Matrix]; };
+  econet = derive2 { name="econet"; version="0.1.92"; sha256="1csnsl9n5wvij9ach13m40cd92y60algj10fsljla6z3pv9vg0cg"; depends=[bbmle doParallel dplyr foreach igraph intergraph MASS Matrix minpack_lm plyr progressr sna spatstat_utils]; };
+  econetwork = derive2 { name="econetwork"; version="0.4.1"; sha256="15x5x75y30zyk2k4bjbn44diwvxkl8j5dnzg6ln6czvzd1hy191w"; depends=[bipartite blockmodels igraph Matrix_utils rdiversity]; };
+  economiccomplexity = derive2 { name="economiccomplexity"; version="1.1"; sha256="0ms5jr3d0hgch4di26wcaxrbl7q6iq2k53m2xwk0lxv6s1p373mp"; depends=[igraph Matrix Rdpack]; };
   ecoreg = derive2 { name="ecoreg"; version="0.2.3"; sha256="1bhh4bnvrvgz49wim5r0b4awfsn9l23wvl4kl0vny0s4hm7cgahc"; depends=[]; };
   ecorest = derive2 { name="ecorest"; version="1.0.0"; sha256="13x95z99yqld1fvfgzbm6ahrnvfvcqwlb23yjr187yg83iynh79v"; depends=[viridis]; };
   ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; };
   ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; };
   ecospace = derive2 { name="ecospace"; version="1.4.2"; sha256="0vfaf27bv687ypxg5apzv63rl495rxyflqw33j17i4h0s7cjkgrm"; depends=[FD]; };
   ecospat = derive2 { name="ecospat"; version="3.1"; sha256="17mxny0m0pl0b4vn7slc2qqabjp3i91nz0yjwfvrd827s2hhcra9"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maps maptools matrixStats poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; };
+  ecostats = derive2 { name="ecostats"; version="0.1.4"; sha256="0xkhkcc6psgvvwhys9azhxisnqw0azd7brp0rg60d725jqvwhbyp"; depends=[GET mgcv mvtnorm]; };
   ecotox = derive2 { name="ecotox"; version="1.4.2"; sha256="0i4wjarg8gj4hfr0d4fqk74ymhkzrq3vkklpv5v1511ci19hpv16"; depends=[tibble]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
   ecoval = derive2 { name="ecoval"; version="1.2.7"; sha256="1hnryk9y3074iy7hv40jr00lpg2w99l7halwv6bj14v6ygddj2k7"; depends=[jpeg rivernet utility]; };
-  ecp = derive2 { name="ecp"; version="3.1.2"; sha256="11f9p869xr0zg779i46gmflxlq4xclk9wxbab0nj2fan26pn4sfy"; depends=[Rcpp]; };
+  ecp = derive2 { name="ecp"; version="3.1.3"; sha256="0n602jssl6rf596nwm6hbl7s9vdlqi20w8mrhxicj373mw5v22m8"; depends=[Rcpp]; };
   ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; };
   ectotemp = derive2 { name="ectotemp"; version="0.2.0"; sha256="172rij0mmk7dd10lpbsxm4yy7072nz1fh7jfiyqmagzs5hwa31jv"; depends=[dplyr psych]; };
   ed50 = derive2 { name="ed50"; version="0.1.1"; sha256="058p1750ba5hp4rczi26grgwjia2ny1880v1vfp6wxad13r459pq"; depends=[boot]; };
@@ -7513,11 +7816,12 @@ in with self; {
   eddi = derive2 { name="eddi"; version="0.0.1"; sha256="19cgrqdcji509igb6rmlwb75xyyvrh34nv6zyjjfcsc31p5nvf95"; depends=[raster rgdal]; };
   eddington = derive2 { name="eddington"; version="2.1.1"; sha256="0v88v2xmvirnj661jsg2qh7n8afaw71mqks9csnmmz3c16agp7b6"; depends=[Rcpp]; };
   edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
-  edeaR = derive2 { name="edeaR"; version="0.8.5"; sha256="0f9isfcpzc4r6z06hagnvrxfv1wizwv2ab59bv86df4c1l7sxz2c"; depends=[bupaR data_table dplyr forcats ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; };
+  edeaR = derive2 { name="edeaR"; version="0.8.6"; sha256="13hzb7m2rb6crxsia3d5szyz59kyd3506j8avbr51a7cps1bqaj0"; depends=[bupaR data_table dplyr forcats ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; };
   edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; };
   edfReader = derive2 { name="edfReader"; version="1.2.1"; sha256="076far4fhd6rpa6fwffad4cgchjvar135yblvlrm33s9pd5bf0hn"; depends=[]; };
   edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; };
   edgar = derive2 { name="edgar"; version="2.0.3"; sha256="129q32bnpcx0l2ffnids87692hc7nbg4hw3r117aamp835i12gri"; depends=[qdapRegex R_utils stringi stringr tm XML]; };
+  edgarWebR = derive2 { name="edgarWebR"; version="1.0.3"; sha256="00whhcb57b23id2gsvfijschjdwvk0fjhh8pv4jhgfiadsjljkfx"; depends=[httr xml2]; };
   edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; };
   edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
   edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; };
@@ -7531,19 +7835,21 @@ in with self; {
   educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; };
   edwards97 = derive2 { name="edwards97"; version="0.1.0"; sha256="1ybksvrp7pd78ncmzdn67q9w3baxx6kf886214cqa5yfbi8jsc4z"; depends=[broom cli glue rlang tibble withr]; };
   eechidna = derive2 { name="eechidna"; version="1.4.0"; sha256="07537brbdinkrmygbd2galyl6acbcbg2pkjafkdhxdgklpxv7j9m"; depends=[colourpicker dplyr ggplot2 ggthemes magrittr plotly purrr rgdal rgeos shiny sp stringi tibble tidyr tidyselect]; };
+  eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.8"; sha256="14wxba97nd64xh6lnpdbap3zcrj5iblrqc75izblcvl4sligc0sx"; depends=[lme4 metafor mvtnorm rstanarm]; };
   eegkit = derive2 { name="eegkit"; version="1.0-4"; sha256="1r1lack4ps9hwqq56rq37431rcxf3x79zgvda6vrmh4s0ziy6v4x"; depends=[bigsplines eegkitdata ica rgl signal]; };
   eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
   eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; };
   eemR = derive2 { name="eemR"; version="1.0.1"; sha256="1w3nwlrbxm7z4c3acx991zk5drgs67qys7kgl0qakh5vrdsrxw3v"; depends=[assertthat dplyr pracma purrr R_matlab rlist stringr viridis]; };
   eeptools = derive2 { name="eeptools"; version="1.2.4"; sha256="048gz26dqgfsnxhp4r99j7p4s4d5pxsjci5zw8wjvv35lizij573"; depends=[arm data_table ggplot2 maptools vcd]; };
   eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; };
+  ef = derive2 { name="ef"; version="1.2.0"; sha256="1ic26mwjv221yyjj16v9xcdxsg3pl6wsp82iaprihdcndswccvzi"; depends=[dplyr Matrix mgcv RcppEigen TMB]; };
   effectFusion = derive2 { name="effectFusion"; version="1.1.2"; sha256="0m392wrkmgvys7a2bk2w1swfkjikkllng8sy8wb8s2j9y6c3wanp"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; };
   effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; };
   effects = derive2 { name="effects"; version="4.2-0"; sha256="0iks79rd4knrd81x4kvcpgpclr69l0m0v6sfla8k3wzkcnydycv8"; depends=[carData colorspace estimability insight lattice lme4 nnet survey]; };
-  effectsize = derive2 { name="effectsize"; version="0.3.2"; sha256="0h9f260gb8707pcssf8dq7dakpq1ggkxr5kpbrbl8sn8h3qbvws9"; depends=[bayestestR insight parameters]; };
+  effectsize = derive2 { name="effectsize"; version="0.4.1"; sha256="1rbl63b1c7z9llznnwvclqrcgdd4hfmc7y66v7raqqf2a4nadqa5"; depends=[bayestestR insight parameters]; };
   effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
-  effsize = derive2 { name="effsize"; version="0.8.0"; sha256="129g9nv6qmbh6z7gazx4vxs5myvcgdhszi28396gsvzrlzi0ik8b"; depends=[]; };
+  effsize = derive2 { name="effsize"; version="0.8.1"; sha256="1m5ch2g77f4ldbxhzp2ls1pga8hq7ggkz1xs8a90h0s09rj0gd7w"; depends=[]; };
   efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; };
   efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; };
   ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; };
@@ -7551,23 +7857,24 @@ in with self; {
   egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; };
   eggCounts = derive2 { name="eggCounts"; version="2.3"; sha256="0y74dd8s406yz6nhwlb09hgarw90a68wji2vykxpqcrfll814g7q"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; };
   egor = derive2 { name="egor"; version="0.20.06"; sha256="1fpx5bf0cqkclk91d45hglr2bmksbf2sf5g3mc7l0n872z2xdhjp"; depends=[dplyr igraph network purrr rlang shiny srvyr tibble tidygraph tidyr]; };
-  eha = derive2 { name="eha"; version="2.8.1"; sha256="00sny5wm415drcsvvzq6gk9r4fc4z7f7y9lix61hnf8ibqfv7bb1"; depends=[survival]; };
+  eha = derive2 { name="eha"; version="2.8.4"; sha256="03yg2pkypjksq6jh30ji4665j40r69d0bjff35kngy8kdfby5dr8"; depends=[survival]; };
   ehaGoF = derive2 { name="ehaGoF"; version="0.1.1"; sha256="15hpzj3ridl6w3pd5z86d88cc88jw09qpqhsdwkar4dby8lgxhi0"; depends=[]; };
   ehelp = derive2 { name="ehelp"; version="1.2"; sha256="0264nx4bidrbwhlxx9llarvh4zb3xnzln8km14823q1hclkpm2fq"; depends=[]; };
   ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; };
+  eiCompare = derive2 { name="eiCompare"; version="3.0.0"; sha256="0cpllc4aq52mga2cc8ms1q4qf633r13i5j6267vnvqyb6zq0r47y"; depends=[bayestestR censusxy coda data_table doParallel dplyr ei eiPack foreach ggplot2 leaflet magrittr mcmcse overlapping purrr rlang sf stringr tidyr tidyselect wru]; };
   eiPack = derive2 { name="eiPack"; version="0.2-1"; sha256="0xcgl9pr6d960zhp8fd944ba5p5ybp520lp2a4jgsj1lcvqf8xbn"; depends=[coda MASS msm]; };
   eia = derive2 { name="eia"; version="0.3.6"; sha256="1fyvm2j53m0mq53ld6kgr8nmf020vcp9jcafsbk7xaymgxncvmqr"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr readxl tibble]; };
-  eicm = derive2 { name="eicm"; version="1.0.0"; sha256="1xa4rfwq64zf5zkdxqslzmph3qc99mfrb8gvf00mqx6qvdzj3475"; depends=[doSNOW foreach GA iterators pso snow ucminf]; };
+  eicm = derive2 { name="eicm"; version="1.0.1"; sha256="0gil445xrsd1hhi5l6i3mn7kf4mbfwwhfkgmyja62dj68m4akwfz"; depends=[doSNOW foreach GA iterators optimParallel pso snow ucminf]; };
   eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
   eigenmodel = derive2 { name="eigenmodel"; version="1.11"; sha256="1l3n0z736xf3x6cyxzmmq1jb2glxi2b75z7v39y4471knh6nbb4d"; depends=[]; };
   eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
   eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; };
   eimpute = derive2 { name="eimpute"; version="0.1.1"; sha256="1ipm6v4irk4d4qxld09h8r0kknjmbikvn27y68wq7r02qhcvj4nv"; depends=[Rcpp RcppEigen]; };
   einet = derive2 { name="einet"; version="0.1.0"; sha256="02v4k6031q2bcjkhbypzkgdj1lyvqbsi1nb0y40zb26bk2381ycq"; depends=[assertthat entropy igraph magrittr shiny]; };
+  eirm = derive2 { name="eirm"; version="0.2.0"; sha256="1cd5ig79lr3zwydf89bhpqj86b757z74m3w7ca2yw7n6zhxy8qy5"; depends=[lme4 optimx reshape2]; };
   eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; };
   eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; };
-  eixport = derive2 { name="eixport"; version="0.4.7"; sha256="10jfyagwc0g2qaxw1asyw906m0g9llyfjsn457hb8h06p31gbi89"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; };
-  elaborator = derive2 { name="elaborator"; version="1.0"; sha256="1jhs1hiwlww0sr3yacg5amr1mhwjwa10b374klrkkvzzw2y20p1x"; depends=[bsplus dendextend dplyr forcats gclus haven plotly purrr RColorBrewer reshape2 rlang seriation shape shiny shinyBS shinycssloaders shinydashboard shinyjs shinyWidgets tidyr V8]; };
+  eixport = derive2 { name="eixport"; version="0.5.0"; sha256="1k5p9v5jmw5cs31sn69fjdfhh5yyzk85828aljsmsyx1ycibnwmg"; depends=[cptcity data_table ncdf4 raster sf sp]; };
   elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; };
   elastic = derive2 { name="elastic"; version="1.1.0"; sha256="1xg8gqa0maasx85fbff4vid2r8s0fgzj4iswyayybzik99zb26ly"; depends=[crul curl jsonlite R6]; };
   elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; };
@@ -7580,8 +7887,8 @@ in with self; {
   electionsBR = derive2 { name="electionsBR"; version="0.3.1"; sha256="0yxaxd84d13mb6xbixgm9rd56alrh5qnrmh54n1h94mna89jb103"; depends=[data_table dplyr haven magrittr readr]; };
   electivity = derive2 { name="electivity"; version="1.0.2"; sha256="0clxsn9zkpdlq9jgq029ag310ji0hd0l23wfyqh8gkkj0091ip5a"; depends=[]; };
   electoral = derive2 { name="electoral"; version="0.1.2"; sha256="1kf5ix0bmrh7zwgg87zf10s8pvq32fpqlmyw2dq1kf9gv3s91p04"; depends=[dplyr ineq tibble]; };
-  elementR = derive2 { name="elementR"; version="1.3.6"; sha256="12gg2x6xzms2ni80qdm04bfajg55ff6zkki0y2cz47kq70wzfkmg"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
-  elevatr = derive2 { name="elevatr"; version="0.2.0"; sha256="0721w28pb07ndw24k4zssh5r90fd4mf33yxigricnz23z29ql120"; depends=[httr jsonlite progress raster sf sp]; };
+  elementR = derive2 { name="elementR"; version="1.3.7"; sha256="01xbqargzc0bp1l5rcvxikr95ghj9w7w5byhrjbgwbia6y7zhxa2"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
+  elevatr = derive2 { name="elevatr"; version="0.3.1"; sha256="0sjmzcbq5445fcxzwhcxni2wdajhaa4p56yyr034bphkmbissq6i"; depends=[httr jsonlite progress raster sf sp]; };
   elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; };
   elfDistr = derive2 { name="elfDistr"; version="1.0.0"; sha256="11h91mwiw2pr0c8zvyzqql275falpiajv784n2rd5xs9azprqdd0"; depends=[Rcpp]; };
   elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; };
@@ -7590,23 +7897,24 @@ in with self; {
   ellipse = derive2 { name="ellipse"; version="0.4.2"; sha256="1wm5v7zdv2drgdba7z96jwsx74mqhlq80qgrvdb4vb5r02dcw68p"; depends=[]; };
   ellipsis = derive2 { name="ellipsis"; version="0.3.1"; sha256="1nvmkcca57d9067rcggw1gby80ibx5hplk2myz0cs9zwilaib2jg"; depends=[rlang]; };
   elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; };
+  ellipticalsymmetry = derive2 { name="ellipticalsymmetry"; version="0.1"; sha256="10i656dg4ld7i5b21g528knirkl0lqk96rx5v32lm5zzf4axsl76"; depends=[ICSNP]; };
   elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.2"; sha256="1labr1a9r563wg2m3insrpf98wcq5fdkql5fi58c9k8lg5b1knl3"; depends=[KernelKnn Rcpp RcppArmadillo]; };
   elo = derive2 { name="elo"; version="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; };
   elsa = derive2 { name="elsa"; version="1.1-28"; sha256="01sj2a4yhv5m6qj6ih26zw4yzd8s27lll7yp0yysjjrwz79a0fbq"; depends=[raster sp]; };
   emIRT = derive2 { name="emIRT"; version="0.0.11"; sha256="1h91q9vi9cv14bmkaakyynw2z9sx51w0c2kw2in0x91wx7scmd0p"; depends=[pscl Rcpp RcppArmadillo]; };
-  emayili = derive2 { name="emayili"; version="0.4.0"; sha256="087h50pzk0nsj7y639yb5rsar26x0rc722m1ryrjfsn21xap82x1"; depends=[base64enc curl glue httr magrittr mime stringi]; };
-  emba = derive2 { name="emba"; version="0.1.6"; sha256="175r1gxaqcvdqr1jil95f6kcl28rsvai9yb4z5hbg2jh68hfxr0b"; depends=[Ckmeans_1d_dp dplyr igraph purrr readr rje stringr tibble tidyr tidyselect usefun visNetwork]; };
-  embed = derive2 { name="embed"; version="0.1.1"; sha256="0prwm787d0l48hzdwwfsn4ly6mkjxls4vrpbh44lrmym6dl4kvcq"; depends=[dplyr generics keras lme4 purrr recipes rlang rsample rstanarm tensorflow tibble tidyr uwot withr]; };
-  embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; };
+  emayili = derive2 { name="emayili"; version="0.4.4"; sha256="181zdr7wj7r4z8crd81dncgil2dka0cnwqmhw5cpwyrgczl1fmkf"; depends=[base64enc curl glue httr magrittr mime stringi]; };
+  emba = derive2 { name="emba"; version="0.1.7"; sha256="1pc72xfjsl4x63k7dw8f4pp8as6jlqdpwkgdw27znc9n4ffvmdpm"; depends=[Ckmeans_1d_dp dplyr igraph purrr readr rje stringr tibble tidyr tidyselect usefun visNetwork]; };
+  embed = derive2 { name="embed"; version="0.1.3"; sha256="0mhk992mq3lpwc6xrhx080lr4ljqkx5vpf674gzbyxwkk26gyivy"; depends=[dplyr generics keras lme4 purrr recipes rlang rsample rstanarm tensorflow tibble tidyr uwot withr]; };
+  embryogrowth = derive2 { name="embryogrowth"; version="8.0"; sha256="0nz4zw3qr9a93cq1aliqa7m01xll8qg00m7rqgy85j905wmv8i1c"; depends=[deSolve HelpersMG numDeriv optimx]; };
   emdbook = derive2 { name="emdbook"; version="1.3.12"; sha256="0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6"; depends=[bbmle coda lattice MASS plyr]; };
   emdi = derive2 { name="emdi"; version="2.0.1"; sha256="1yvfw06c569lwb6z54xa1j7fm6fqkxw0cdxi9g6hnf9qf1f2xw9z"; depends=[boot formula_tools ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos saeRobust spdep]; };
   emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
   emg = derive2 { name="emg"; version="1.0.9"; sha256="04sm05xnjns7wcvpk35ywkxy6g0mm84r060mkmzh64wq58c2q06l"; depends=[moments]; };
   emhawkes = derive2 { name="emhawkes"; version="0.9.0"; sha256="1h6map6w66q91s6g1qr9wfk589cbvva1banqrxzzf29g7ihl15vh"; depends=[maxLik]; };
-  emld = derive2 { name="emld"; version="0.5.0"; sha256="0b1jr69qafn3jn7yvngiyqfzmfqc7pn67p3dxwypi9dl3ygqv24s"; depends=[jsonld jsonlite xml2 yaml]; };
+  emld = derive2 { name="emld"; version="0.5.1"; sha256="0cvnfvzskvpcqzs6fwrpjcqrc6yrfciliy9jj0c9h4iyag0g0b9b"; depends=[jsonld jsonlite xml2 yaml]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
-  emmeans = derive2 { name="emmeans"; version="1.5.0"; sha256="09nap4aazpbsswqzk0d4kjngwd8sib222s31yd08sd1sqw432c6k"; depends=[estimability mvtnorm numDeriv plyr xtable]; };
+  emmeans = derive2 { name="emmeans"; version="1.5.3"; sha256="11x7bn260v91gb7qri1pq54l339zm4msa5frc8saqb9ykbg4dby5"; depends=[estimability mvtnorm numDeriv plyr xtable]; };
   emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; };
   emojifont = derive2 { name="emojifont"; version="0.5.3"; sha256="1cdrrl3hvrs8rskyy6zgr7q2mmg8yb9k8sld1m64zsp7y009g19k"; depends=[ggplot2 proto showtext sysfonts]; };
   emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
@@ -7616,13 +7924,13 @@ in with self; {
   emplik = derive2 { name="emplik"; version="1.1-1"; sha256="1kw8g8j075bsicdvgkjf4870rfv5c30gvmw6qkkaz3ki22x74w77"; depends=[quantreg]; };
   emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; };
   ems = derive2 { name="ems"; version="1.3.2"; sha256="1ambmd183f9959kwms71q3ks187y2ngpab45xlclpm2108n5j3pb"; depends=[boot rms survival]; };
-  emstreeR = derive2 { name="emstreeR"; version="2.2.0"; sha256="1qbv61j2ya6zvyp8494xi8dhjlb58jmqil9cm5z0pr7p2sr6l32r"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; };
-  emuR = derive2 { name="emuR"; version="2.1.0"; sha256="12virgawhgbmpg37w64ncwghfiarj9zr7njy5az6klgny422fj87"; depends=[base64enc DBI dplyr git2r httpuv httr jsonlite mime purrr readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; };
+  emstreeR = derive2 { name="emstreeR"; version="2.2.2"; sha256="0lchkkn6s265xnk25bprijlc6nl62nwcp0l9nwplyw7q492ysg0q"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; };
+  emuR = derive2 { name="emuR"; version="2.1.1"; sha256="1b6fzipnlx17ycy4nvprjk2lqmnjpi07v02bz86kas9j750xlnd2"; depends=[base64enc DBI dplyr git2r httpuv httr jsonlite mime purrr readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; };
   emulator = derive2 { name="emulator"; version="1.2-20"; sha256="11z25iqyzck0s4hw0i86i9jsi52w9bjxx3zdpafssyfqfk7z5avw"; depends=[mvtnorm]; };
   enRich = derive2 { name="enRich"; version="3.1"; sha256="0xl9rhz6mflzp1g5d51xz74dsm8qp16jbkflhzrha3vfirn2jh8q"; depends=[]; };
   enc = derive2 { name="enc"; version="0.2.2"; sha256="16x8cckw0ah2yfczvv4j1jy4f8m23fkac38fz068964sv4l8z645"; depends=[]; };
   encode = derive2 { name="encode"; version="0.3.6"; sha256="04zwclmqasbx54m77wqfr9jg4axhkkqnykaxv3if8lnr46fl3zyc"; depends=[]; };
-  encryptedRmd = derive2 { name="encryptedRmd"; version="0.2.0"; sha256="0fvh2fs7az02gxl169cvfx4i9cl8hk4vc8fz2v21pym7nq8c8y3k"; depends=[readr rmarkdown sodium]; };
+  encryptedRmd = derive2 { name="encryptedRmd"; version="0.2.1"; sha256="0agd5lqrmdi50r9fl25njwsvg91nqsvj4h6c639vfhxx7p9y9nfk"; depends=[readr rmarkdown sodium]; };
   encryptr = derive2 { name="encryptr"; version="0.1.3"; sha256="01gsimhrb9c7k5d9h5dbvm4h9i7fc9vzi8wgqb5f191ki27fsw9w"; depends=[dplyr knitr openssl purrr readr rlang]; };
   endoSwitch = derive2 { name="endoSwitch"; version="1.0.0"; sha256="1cj4skk317ppnayk1ph63vll49vs74fljc25cn1iviwgjq64ly0k"; depends=[data_table maxLik msm]; };
   endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
@@ -7634,6 +7942,7 @@ in with self; {
   enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; };
   english = derive2 { name="english"; version="1.2-5"; sha256="0d6rin40wy2y6k75x8d5qvf03rfy139f309wrl8xwbdb1h8fjkd1"; depends=[]; };
   engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; };
+  ennet = derive2 { name="ennet"; version="0.1.0"; sha256="07kcf3lz4jjikl94q5mgrs95xbiqiaa35kh1cc4nfk79l1fvydkg"; depends=[dplyr lubridate magrittr rvest stringr tibble xml2]; };
   enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
   enrichR = derive2 { name="enrichR"; version="2.1"; sha256="0ymhzs9d2wl0s9rvbqc1hqb78mlzwhlc7mmijpfqkm5r720pf6m1"; depends=[httr rjson]; };
   enrichwith = derive2 { name="enrichwith"; version="0.3.1"; sha256="05fhx323ani86wdxbjp8dgw4d1iq4kr1887646w072a6iq93bwhm"; depends=[]; };
@@ -7644,21 +7953,23 @@ in with self; {
   ensr = derive2 { name="ensr"; version="0.1.0"; sha256="18b81iswvby7k5akbfdyc6a8j1621d4d35hxmgjip5kyvf5cb3p8"; depends=[data_table ggplot2 glmnet]; };
   ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
   entcn = derive2 { name="entcn"; version="0.1.0"; sha256="0wpa1293d1bdlx8pikzfh4vqhw7p45bi140aj3x4m8p21h5b4gd6"; depends=[bitops RCurl rjson RYoudaoTranslate stringr]; };
-  entropart = derive2 { name="entropart"; version="1.6-4"; sha256="1wr3pkn786crklsjzg1kq3dm1ks230jp391g31cgf5hfm537c3qb"; depends=[ade4 ape EntropyEstimation ggplot2 ggpubr reshape2 SPECIES vegan]; };
+  entropart = derive2 { name="entropart"; version="1.6-6"; sha256="0i1zmzhvjb070frc37mw13w1cq3n78j62a98yw0s12fd9vz5c6yc"; depends=[ade4 ape EntropyEstimation ggplot2 ggpubr reshape2 SPECIES vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   entrymodels = derive2 { name="entrymodels"; version="0.2.1"; sha256="0fz7jzax12pzw47iry4amgg9z4z3z94kig6r5dhcqa84kq02294v"; depends=[dplyr magrittr readr]; };
   envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; };
   envalysis = derive2 { name="envalysis"; version="0.4"; sha256="1qfg8z63qc6n8agv0g7n3qjcwid32axwkyyjjxa271by335aplha"; depends=[drc ggplot2]; };
   enveomics_R = derive2 { name="enveomics.R"; version="1.8.0"; sha256="00akdhqs7jabk7g33rwmxs92jcr39shy9s456nqxk6x4244d2vb3"; depends=[fitdistrplus investr sn]; };
+  envi = derive2 { name="envi"; version="0.1.3"; sha256="09w5733gnicmylxp7asac2f0597js0yh657fzcp0rxf1p29gwcm9"; depends=[concaveman cvAUC doParallel fields foreach maptools pls raster rgeos ROCR sp sparr spatstat]; };
   enviGCMS = derive2 { name="enviGCMS"; version="0.6.6"; sha256="01y3qqh99aclarglpdg8mb9iikzkm1w62mv93m22lm8ami25a372"; depends=[animation BiocParallel data_table mixtools RColorBrewer Rdisop]; };
   enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
+  envir = derive2 { name="envir"; version="0.1.0"; sha256="1mxjccqgak0x1kq2vb8g6avjxnar8n5jyckk4r5qbn7fhvmnrrhc"; depends=[]; };
   envirem = derive2 { name="envirem"; version="2.2"; sha256="061p76w76hhs201p3l4wvbfbrcd9h8bigkn5xpsz5pmvhd2hrdkn"; depends=[knitr palinsol raster RSAGA sf]; };
   envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; };
-  envnames = derive2 { name="envnames"; version="0.4.0"; sha256="12mfbcksrp733jycasaiavlsmx138xmjpywly1wha4ds6bfw93hr"; depends=[]; };
+  envnames = derive2 { name="envnames"; version="0.4.1"; sha256="1fkbid2x60m63dnrxrdq7im49spn8m70g1gd8nqjq3xlv642ianm"; depends=[]; };
   envoutliers = derive2 { name="envoutliers"; version="1.1.0"; sha256="1wgrrkkpkmf300qb56mq6nxigwnpq551sjxlk05lk3ckawx66srf"; depends=[car changepoint ecp ismev lokern MASS robustbase]; };
   eoR = derive2 { name="eoR"; version="0.4.0"; sha256="0vn4s4af94n9h6x7z14qwpz94rgsd5m3mv55wva7x3h99ryhm83s"; depends=[data_table]; };
-  eoffice = derive2 { name="eoffice"; version="0.1.9"; sha256="019z09jml67ymc2y8y853nflcsvibkligvnngar8f9qv3k2j5k7j"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify htmlwidgets magick magrittr officer plotly R_devices rvg]; };
+  eoffice = derive2 { name="eoffice"; version="0.2.1"; sha256="03g8r3xnsnnlyj7y07jm3qjhlv3pkf8v2lxpqzd24ncncxmbcxmi"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify htmlwidgets magick magrittr officer plotly R_devices rvg]; };
   epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
   epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; };
@@ -7666,14 +7977,17 @@ in with self; {
   eph = derive2 { name="eph"; version="0.4.0"; sha256="0yznfhsp6sgymq02m4g477pnqlmmbdvwv32sidaa2giaf3nr4izj"; depends=[assertthat attempt curl dplyr expss glue htmltools janitor leaflet magrittr purrr questionr readr readxl rlang rvest stringr tibble tidyr tidyverse xml2 zoo]; };
   epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; };
   epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; };
-  epiR = derive2 { name="epiR"; version="1.0-15"; sha256="0hbnqrkrrdn7v661gh088fsnx18ljbg0jgr649lij3w14xqvv6bi"; depends=[BiasedUrn survival]; };
+  epiR = derive2 { name="epiR"; version="2.0.17"; sha256="0ssf56z81abdwkznyx73imh86k98mz69hv78agpc4wbqsq6pazmh"; depends=[BiasedUrn lubridate pander survival]; };
   epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; };
   epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; };
-  epidata = derive2 { name="epidata"; version="0.3.0"; sha256="1b00k086wiwhhrlh4348wqqza1v0whakwy5h7q95rmgxz7lppiim"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
+  epidata = derive2 { name="epidata"; version="0.4.0"; sha256="0v3s1vrf2iqh03rkkwrlz6mhpbsbjxkayrqdx04vrnja4i9ljshk"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr tinytest xml2]; };
+  epifitter = derive2 { name="epifitter"; version="0.2.0"; sha256="158llnpbqrmgg238ax1ciyfa30rq4mxyjyg61gs82d0d36rhb93i"; depends=[DescTools deSolve dplyr ggplot2 knitr magrittr minpack_lm tibble tidyr]; };
   epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; };
-  epikit = derive2 { name="epikit"; version="0.1.1"; sha256="0wa7lfkkwygqmbyfjmwr4si2cdi7s1hd1bwsk1jaip1d3r0hyyrb"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; };
+  epigraphdb = derive2 { name="epigraphdb"; version="0.2.1"; sha256="0c8qpnf9rbhxzwvphci37dfxi9vbc5vlh31ckvwp12y9kwyxylvc"; depends=[glue httr jsonlite magrittr purrr tibble]; };
+  epikit = derive2 { name="epikit"; version="0.1.2"; sha256="0b9kc7qr7nkafmak60pyj7hln19w4zp33pk5y48qmfsxgarl6pv3"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; };
   epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; };
   epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; };
+  epinetr = derive2 { name="epinetr"; version="0.93"; sha256="05q6mdgl1c24i3cfjh5bgb7x75yhg4ll45p7kzl77q8lsp26z8b6"; depends=[GA ggplot2 igraph Rcpp RcppAlgos reshape2 vcfR]; };
   epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; };
   episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; };
   episensr = derive2 { name="episensr"; version="0.9.6"; sha256="193abdngrvxriv1dxjv0panf0whczli637xfs2fr05p588lljpr6"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; };
@@ -7682,26 +7996,26 @@ in with self; {
   epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; };
   epitools = derive2 { name="epitools"; version="0.5-10.1"; sha256="0jqn3pas4lsans50jwakmvpyc7m7x0kxq6dzyckd3vgww56qa65l"; depends=[]; };
   epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; };
-  eplusr = derive2 { name="eplusr"; version="0.12.0"; sha256="1h8adyh1cjy3giqc3vj5gdx77h5fqfx44abw816k640h758lkjmp"; depends=[callr cli crayon data_table lubridate processx progress R6 RSQLite stringi units]; };
+  epitweetr = derive2 { name="epitweetr"; version="0.1.24"; sha256="0x80av928kcf9n0ipbyy1ww7rlknc5y2j79cgha11f998xbcxv3q"; depends=[bit64 dplyr DT emayili ggplot2 httpuv httr jsonlite keyring magrittr plotly plyr readxl rgdal rgeos rmarkdown rnaturalearthdata rtweet shiny sp stringr tidytext tidyverse tokenizers xml2 xtable]; };
+  eplusr = derive2 { name="eplusr"; version="0.13.0"; sha256="011il56agqv4d9xd3qgh1pkxfvxr10knx5h3q8s13237x3f42241"; depends=[callr checkmate cli crayon data_table decido hms lubridate processx progress R6 rgl RSQLite stringi units]; };
   eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; };
   epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; };
   eponge = derive2 { name="eponge"; version="0.1.0"; sha256="19wd80l35acij793spxglcwz346i2iivk6n0q2304wjcca6qzds7"; depends=[rlang]; };
-  epos = derive2 { name="epos"; version="0.1.1"; sha256="0spaf6v9mmi9rmxip3aa2d1s31as973nc7ai3nlcp4qxgnp965dm"; depends=[dplyr ggplot2 gridExtra hash stringr testthat tidyr TopKLists xtable]; };
+  epos = derive2 { name="epos"; version="0.1.3"; sha256="0b1i7v1h253viawgv789ch5hi6xmwg7svwrlk9l1mpwzvig9r27a"; depends=[ggplot2 gridExtra hash mongolite stringr testthat TopKLists xtable]; };
   epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; };
   epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; };
-  epuR = derive2 { name="epuR"; version="0.1"; sha256="0dx808dq78c1s78fv0my79ar7h20fyxa0gpfdv85zi80v9g82g4z"; depends=[data_table lubridate openxlsx stringr xts zoo]; };
   epubr = derive2 { name="epubr"; version="0.6.1"; sha256="0rp9q6hriilps5h6nc1226w5dvzws1g78pg3ldrq2r4dakpvsmjj"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; };
   epwshiftr = derive2 { name="epwshiftr"; version="0.1.1"; sha256="1cyb46i3kml6zzn12hs9lpcsgxkwp5pslfy0nw8i4wydl2bgk0sa"; depends=[checkmate data_table eplusr fst future_apply jsonlite progressr psychrolib rappdirs RNetCDF units]; };
   epxToR = derive2 { name="epxToR"; version="0.4-1"; sha256="00m64ham9fd9dsw37ic2m62fy4pvmwfwmjx8cg6n4rwbgq9q49sg"; depends=[httr XML]; };
-  eq5d = derive2 { name="eq5d"; version="0.7.2"; sha256="0nnvs8ashxwam5r8v2lyrwmxdr55n17whc6sxxlaj7v08dz3ndmk"; depends=[]; };
+  eq5d = derive2 { name="eq5d"; version="0.8.0"; sha256="0cx5v4wmqyqwkyinblcgxkp59fx7laiqzw2d5h7c0cagah1iq7a4"; depends=[]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
-  equSA = derive2 { name="equSA"; version="1.2.1"; sha256="0gbv7jvjivnril3cmvknzmqlmpb4mv0rhqwk1i87wqxsvrgplik1"; depends=[bnlearn doParallel foreach huge igraph mvtnorm ncvreg SIS speedglm survival XMRF ZIM]; };
   equalCovs = derive2 { name="equalCovs"; version="1.0"; sha256="18w7panyd6mhdr3x1iz9fkrw7min22rishs4xhkxgxs3nnyglkrn"; depends=[]; };
   equaltestMI = derive2 { name="equaltestMI"; version="0.6.0"; sha256="1qlm28144fidc56czvd0kg4i9wrmb8x1ll0sb1m4lvdxvh4gh66m"; depends=[lavaan]; };
   equate = derive2 { name="equate"; version="2.0.7"; sha256="07cji0z139fk70d4wvrpk5m34fq1pfnqrsw336lgnp5a7zp3jz7n"; depends=[]; };
   equateIRT = derive2 { name="equateIRT"; version="2.1.0"; sha256="1g8gs00ralh5zw1fv3xd4c2xrb8gxgb7srcp0hgbpr0f7hw53fjm"; depends=[mirt statmod]; };
-  equateMultiple = derive2 { name="equateMultiple"; version="0.0.0"; sha256="0q29bv8bb0c3sprhnkbbpn31phw37dwgk23v5ny4abzvlcgwncdb"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; };
+  equateMultiple = derive2 { name="equateMultiple"; version="0.0.1"; sha256="1bs0svnipfbix5zrjb59i2kzzfah8267yyw2mh9bxfzli7gbwfha"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; };
+  equatiomatic = derive2 { name="equatiomatic"; version="0.1.0"; sha256="1w5v1l9807d5hgxm0yj5lfgb7k7w8jbzkii5bla42x9fvjycqfzh"; depends=[broom]; };
   equivUMP = derive2 { name="equivUMP"; version="0.1.1"; sha256="05ihbr6dd9qv89ll90ynk4g3d3xy2w5q0m696djfa63f1x92c01w"; depends=[]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
   equivalenceTest = derive2 { name="equivalenceTest"; version="0.0.1.1"; sha256="1lr1qc4mv8f9hwqidj1rwhxqm1fb8cf1hnb1k32xpdqwzsxbfa47"; depends=[cubature polynom Rdpack rootSolve]; };
@@ -7709,10 +8023,9 @@ in with self; {
   erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; };
   ercv = derive2 { name="ercv"; version="1.0.1"; sha256="0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l"; depends=[]; };
   erer = derive2 { name="erer"; version="3.0"; sha256="143ygibzjsxlmf3p5ldcc4dpr3mcm873g4rwgb55q912bdhsn725"; depends=[lmtest systemfit tseries urca]; };
-  ergMargins = derive2 { name="ergMargins"; version="0.1.1"; sha256="090j5l23qvmvwbk6dqyby78vn4myhidqfy3ac1pfwwj73jf6c7p2"; depends=[btergm ergm Matrix network numDeriv sna statnet xergm_common]; };
-  ergm = derive2 { name="ergm"; version="3.10.4"; sha256="08hzhc06sfchbq8kq5yvs7gxz0v6nvx0qdb2g6ac38n54cd0npw8"; depends=[coda dplyr lpSolve MASS Matrix network purrr rlang robustbase statnet_common tibble trust]; };
+  ergm = derive2 { name="ergm"; version="3.11.0"; sha256="1wp93y0sjw2ybaflkzw7q7blf6x5pkrcnyk5wcxk9hmd9fs0cmaf"; depends=[coda lpSolve MASS Matrix network purrr rlang rle robustbase statnet_common tibble trust]; };
   ergm_count = derive2 { name="ergm.count"; version="3.4.0"; sha256="1bvbqckssqj91q56nz17mrvadk1i2mm301z9rj8qkh8116fwf93w"; depends=[ergm network statnet_common]; };
-  ergm_ego = derive2 { name="ergm.ego"; version="0.5"; sha256="1vvyfjvkddc1qr189wqbp8sbqmd317y71ml9jjjjns3znahriqv3"; depends=[coda ergm network purrr RColorBrewer rlang statnet_common tibble]; };
+  ergm_ego = derive2 { name="ergm.ego"; version="0.6.1"; sha256="1khmlx0s8v5dhl38b1bqdb6lpfp7adrfs7r0lcg5hrczlxsy293f"; depends=[coda ergm network purrr RColorBrewer statnet_common tibble]; };
   ergm_rank = derive2 { name="ergm.rank"; version="1.2.0"; sha256="1vc96rjsqvs6ybnzkpv12h0hsrx2s96k4hjilzjpjnhbazh5vynz"; depends=[ergm network statnet_common]; };
   ergm_userterms = derive2 { name="ergm.userterms"; version="3.10.0"; sha256="1aqrgdayh73dkr71gf8vawlj6qgv66pxr4klxgqb6ffan66b5p8g"; depends=[ergm network statnet_common]; };
   ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
@@ -7720,11 +8033,12 @@ in with self; {
   erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; };
   erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
   err = derive2 { name="err"; version="0.2.0"; sha256="1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs"; depends=[]; };
+  erratum = derive2 { name="erratum"; version="2.0.0"; sha256="0640igaixqmfg5y8af6rn6gq92sh1mq0wyjqh2rhihnbgf6y0wic"; depends=[R6 rlang]; };
   errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
   errorist = derive2 { name="errorist"; version="0.1.0"; sha256="0zq5h2wffn9d3f3blzh736478k91smlvz5hxy55hcjqffpxcp4ah"; depends=[searcher]; };
   errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; };
-  errorlocate = derive2 { name="errorlocate"; version="0.3.0"; sha256="04vr2ll3mdy1znm11lv739drckv82n45qbpda3qyjyzlffvgkmhg"; depends=[lpSolveAPI validate]; };
-  errors = derive2 { name="errors"; version="0.3.4"; sha256="1f43pn900nvaqbxfgq30zxq0y1cxywxxcziv20yhj4hvgbn0527r"; depends=[]; };
+  errorlocate = derive2 { name="errorlocate"; version="0.5.1"; sha256="057v19917dqcw3qfcw2mwwsxcahl4dhid3252bhvl5qgbnj1dxfs"; depends=[lpSolveAPI validate]; };
+  errors = derive2 { name="errors"; version="0.3.6"; sha256="1404314glbqnicrwnfzmxxf7l97pgrb2gjkgkwn100p0sj83kjdg"; depends=[]; };
   errum = derive2 { name="errum"; version="0.0.3"; sha256="18frrfnhnmg4fjlpfwj8aklzfwafpwqvagm0aschkqc8mz6wnjbz"; depends=[Rcpp RcppArmadillo]; };
   es_dif = derive2 { name="es.dif"; version="1.0.2"; sha256="1swxg8mdp9jj9f0x0cawhhbx8gmmpsgqlbifx2v04a2vkgdkigqf"; depends=[]; };
   esDesign = derive2 { name="esDesign"; version="1.0.2"; sha256="16dhddw4gp210bb1mmx5df1ziffadiz06s4i3znnzac8rv5564hp"; depends=[]; };
@@ -7733,19 +8047,19 @@ in with self; {
   esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; };
   esback = derive2 { name="esback"; version="0.3.0"; sha256="09k895028hqa62m8fhbg5b33ry0in6kbrw0lnphn0rgjhlifxp4z"; depends=[esreg]; };
   esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; };
-  escalation = derive2 { name="escalation"; version="0.1.3"; sha256="0ch5888p4zvpr8wny74pajmk4m0smvp901v3jzhhrqvadwg04wgy"; depends=[BOIN dfcrm DiagrammeR dplyr gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect viridis]; };
+  escalation = derive2 { name="escalation"; version="0.1.4"; sha256="1iyjp20rzz3lrgn183jvjcf7vvmk66f3rgyv22s2ja4b98598ha4"; depends=[binom BOIN dfcrm DiagrammeR dplyr gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect trialr viridis]; };
   eseis = derive2 { name="eseis"; version="0.5.0"; sha256="03pjcms3aj7sm2wrld64v1dw53bqn9pmsayndma03abjh66rblii"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp reticulate rgdal rmarkdown shiny signal sp XML]; };
-  eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; };
+  eshrink = derive2 { name="eshrink"; version="0.1.2"; sha256="0min4j1dyd08i0fyn9a4iasjlhq08bn74bjz8vj1gq9l114v795k"; depends=[glmnet MASS]; };
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
   esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; };
-  esquisse = derive2 { name="esquisse"; version="0.3.0"; sha256="1cb30qmsxpkx62rjaasly13l00bvz03i9jq5apsr4fk26vw7gfrk"; depends=[ggplot2 htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; };
+  esquisse = derive2 { name="esquisse"; version="0.3.1"; sha256="1fkh3zmhx4g9sl7ykmrqvghjjz66g2mg0646sdvhq8yyb63fpir3"; depends=[ggplot2 htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; };
   esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; };
   ess = derive2 { name="ess"; version="1.0"; sha256="0nqmpih9iyny4ss6llhjq08lfc8n0znz0fdmsjn1js48r85rcqxb"; depends=[igraph Matrix Rcpp]; };
   essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; };
   essurvey = derive2 { name="essurvey"; version="1.0.5"; sha256="078bm5knrhij4rdv7hqv5ci0dfdci7lw4yrqbikp8miapivv88vp"; depends=[haven httr rvest tibble xml2]; };
   estatapi = derive2 { name="estatapi"; version="0.4.0"; sha256="0wp5w9w0b832fnl7kchjqmychnf5896q50grw8hwdc1km14dfzkg"; depends=[dplyr httr purrr readr rlang tibble]; };
   estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; };
-  estimatr = derive2 { name="estimatr"; version="0.22.0"; sha256="1kfih2fak7w9zqbhjgfrysdzrk4lpcx9p23x0gys4f9hxl9j1pm2"; depends=[Formula generics Rcpp RcppEigen rlang]; };
+  estimatr = derive2 { name="estimatr"; version="0.28.0"; sha256="1gv5k21xw4id4r4aylhg9ym5isn3v2yrzrd4slwz9a9mf7gxc2ij"; depends=[Formula generics Rcpp RcppEigen rlang]; };
   estimraw = derive2 { name="estimraw"; version="1.0.0"; sha256="0z591mblbzc3qv9pyv8zn0r5r3d8f1l02sxdc649gl1lb40kalz0"; depends=[dplyr]; };
   estmeansd = derive2 { name="estmeansd"; version="0.2.1"; sha256="053mf9yq095dvlz2cj5haav6yabvgj78qpp411xd9nr1ac17jxz9"; depends=[metaBLUE]; };
   estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
@@ -7757,17 +8071,20 @@ in with self; {
   ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; };
   ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.7"; sha256="13xbiywrw6ixby9s1ipwb45p9c96d75vw906fpzy6axdv2c4pp70"; depends=[circlize cowplot dplyr ggplot2 ggridges magrittr reshape]; };
   etl = derive2 { name="etl"; version="0.3.9"; sha256="133kas3pf863dlgxjhl2x61xkjl5vndsav69zskj9ngz875avjm2"; depends=[DBI downloader dplyr fs janitor lubridate readr rlang rvest stringr tibble usethis xml2]; };
-  etm = derive2 { name="etm"; version="1.1"; sha256="02yvh473l5qajaymhsxwb235a9r7q3nsig9a9mrfca68xih8yvgd"; depends=[data_table lattice Rcpp RcppArmadillo survival]; };
+  etm = derive2 { name="etm"; version="1.1.1"; sha256="1hvrplmdpjjpjji663rw0vjbbrzj2nvr04d1nkc8bf46p4ixyxgy"; depends=[data_table lattice Rcpp RcppArmadillo survival]; };
   etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; };
+  etrader = derive2 { name="etrader"; version="0.1.2"; sha256="1ynwhcyzba4v1vyhgws1fiyzkaiqgv7bhzjf4kszc0x7jh2sbdn5"; depends=[dplyr httr jsonlite magrittr purrr rvest urltools]; };
   etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; };
   eudract = derive2 { name="eudract"; version="0.9.2"; sha256="1yl72vhfaqq005h00bxafdqxpbm0qf9349gd9fq80h5vy20qrm3q"; depends=[dplyr magrittr tidyr xml2 xslt]; };
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
   eulerr = derive2 { name="eulerr"; version="6.1.0"; sha256="1r7y01vj293r1lhxk4anqqq6k2gnflzx2a2sfsyf7ccqmw95w0cj"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; };
+  eurlex = derive2 { name="eurlex"; version="0.3.4"; sha256="067kfjsmagmsjcmzg8lg5f324ngclb6d8i8d16wjsn6kah82nfak"; depends=[antiword dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; };
   europepmc = derive2 { name="europepmc"; version="0.4"; sha256="174nnyc2mbgqxb5kgqabn1vf71c2mps7ig2bclq4is0f7nb64pym"; depends=[dplyr httr jsonlite plyr progress purrr rlang tibble tidyr urltools xml2]; };
   europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
-  eurostat = derive2 { name="eurostat"; version="3.6.1"; sha256="1l2j9fdq33ivb3wns5bdr1dccaf494vwbyya3f2gz2g8mc2qpn0a"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr tidyselect]; };
+  eurostat = derive2 { name="eurostat"; version="3.6.84"; sha256="03mfjjc3jjdrg4plb31dm4s4fv8cfmwpa3vkbcjjzz7jy8zyn7yq"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr tidyselect]; };
+  eva = derive2 { name="eva"; version="0.2.6"; sha256="1b5hrwgdbw19c63ywhkvxlz3843c0mgvsxlmab6zv6r2lrrdkf62"; depends=[EnvStats Matrix]; };
   evabic = derive2 { name="evabic"; version="0.0.3"; sha256="0wd5wjsj9gbvbncaa97g1sp0211aq3nn5jc91lvhka6h34wxkcgc"; depends=[]; };
-  evalITR = derive2 { name="evalITR"; version="0.1.0"; sha256="05nqcy9x3f2ks9xvzd3cd000q2kybdycgrlvz5pv7ipw1dlysgg2"; depends=[]; };
+  evalITR = derive2 { name="evalITR"; version="0.2.0"; sha256="0kkvkbq8w4d04sgb0x0wbrq4ilc5p4cwywrsv7dlzyjb4a59rczl"; depends=[]; };
   evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; };
   evaluator = derive2 { name="evaluator"; version="0.4.2"; sha256="0k2fwim023lbnxq67hhv03cds824x8n374pnqsk67ajgahxwh3by"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; };
   evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; };
@@ -7777,11 +8094,12 @@ in with self; {
   event = derive2 { name="event"; version="1.1.1"; sha256="0w3v8j61y7vr0cjl8a1rkvi4pyjlfhmzzn1n4dgkivac4iafzqjj"; depends=[rmutil]; };
   eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; };
   eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; };
+  eventglm = derive2 { name="eventglm"; version="1.0.2"; sha256="1bpr5xjziwh20xvmmh5rch6pqd2pfiirmzffp4lhkfz43ll278nr"; depends=[sandwich survival]; };
   eventr = derive2 { name="eventr"; version="1.0.0"; sha256="08ljjvfrnfmi49b9bgizvvswxydln8ny901grn5j288pq0djjqyk"; depends=[dplyr magrittr purrr]; };
   events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
   eventstream = derive2 { name="eventstream"; version="0.1.0"; sha256="0imrs872b6fjvw74smniiiicvizyign6wmwwybljk704cshzcy2f"; depends=[abind AtmRay changepoint dbscan glmnet MASS tensorA]; };
   eventstudies = derive2 { name="eventstudies"; version="1.2.2"; sha256="01vpd0gnxaibxn3nq6618rxlwapm86idz86n0wj5kfz4a9kj7lsx"; depends=[boot sandwich testthat xts zoo]; };
-  evgam = derive2 { name="evgam"; version="0.1.2"; sha256="0wnyrvfg1pj1adwmsvqwpnz31pfhj6vdsivj2mmdzqh4milf9l22"; depends=[mgcv Rcpp RcppArmadillo]; };
+  evgam = derive2 { name="evgam"; version="0.1.4"; sha256="0xdmqhg77dbb47pwzgj2hxs83a9yscknz9pmh9a33snaba9llc6r"; depends=[mgcv Rcpp RcppArmadillo]; };
   evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; depends=[doParallel foreach ProfileLikelihood sandwich]; };
   evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
   evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; };
@@ -7789,7 +8107,7 @@ in with self; {
   evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; };
   evmix = derive2 { name="evmix"; version="2.12"; sha256="02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf"; depends=[gsl MASS SparseM]; };
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
-  evolqg = derive2 { name="evolqg"; version="0.2-7"; sha256="1ib39whfx1hpjgy8g9pfcix1ki7w6bf2ka8z15avcmj32jl8ns6f"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; };
+  evolqg = derive2 { name="evolqg"; version="0.2-8"; sha256="1zcpm7bpw5zpafbj7lv7kfpaqknqyhlss5343ps14lqc73kq70wc"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; };
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
   evoper = derive2 { name="evoper"; version="0.5.0"; sha256="064fcpd04ws8v6sl0bakiw34jmmfpg1w5pkq94y2gh1c576x4vwz"; depends=[boot data_table deSolve futile_logger ggplot2 plot3D plyr reshape RNetLogo rrepast]; };
   evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
@@ -7797,16 +8115,15 @@ in with self; {
   evtree = derive2 { name="evtree"; version="1.0-8"; sha256="1dmzbsyrg8wwzzqcxzqmgm7yai37lh9lkjhizhr2h0k03s5xdv1k"; depends=[partykit]; };
   ewoc = derive2 { name="ewoc"; version="0.3.0"; sha256="0r8b5vq0qzp3f0dasxmrngldqlymca90sj019rzs1a0qf28wlgbr"; depends=[coda doParallel doRNG foreach Formula ggplot2 rjags]; };
   exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; };
-  exPrior = derive2 { name="exPrior"; version="1.0.1"; sha256="05z7dx1qfwcagadlw8wrf30071ssawv8njm2q6jaa4r4in0i5l1s"; depends=[coda ggplot2 gtable nimble plyr reshape2]; };
   exact2x2 = derive2 { name="exact2x2"; version="1.6.5"; sha256="05xkzyyk1dfxq2f6aczwiyinznaxfd6ipd680zsbcd0iq44n7wd1"; depends=[exactci ssanv]; };
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-31"; sha256="1154dkcid3njhamdp87qs9bnx7l8bdqkcjsds9q9f2xmizs9x8gw"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; };
-  exactextractr = derive2 { name="exactextractr"; version="0.4.0"; sha256="0r4276f95cxpy1df5m8z99nqmp1kpa7yps2g2yjnhawnajg6bcxn"; depends=[raster Rcpp sf]; };
+  exactextractr = derive2 { name="exactextractr"; version="0.5.1"; sha256="0vb142gwh6ry0nmd6bnipv2dfy3rcmfp871vw1bnks22kr5zppa7"; depends=[raster Rcpp sf]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-  exampletestr = derive2 { name="exampletestr"; version="1.6.1"; sha256="1szkx35wn24yi6iw6hkl85hzwqd8glvjq69hsypsxg1k4r1i99wg"; depends=[checkmate filesstrings fs magrittr ore purrr readr rlang roxygen2 rstudioapi stringr styler usethis withr]; };
+  exampletestr = derive2 { name="exampletestr"; version="1.6.2"; sha256="0mzxllh73lzqmkvv7ib8j472k4ppi3kw8flmzha5jw92dn9yql8p"; depends=[checkmate fs magrittr ore purrr readr rlang roxygen2 rstudioapi strex stringr styler usethis withr]; };
   exams = derive2 { name="exams"; version="2.3-6"; sha256="1cn0gmaayv857zl7l7zmnblmpx84qkjxqrigrymy578y04qjc4zx"; depends=[]; };
-  exams_mylearn = derive2 { name="exams.mylearn"; version="1.1"; sha256="0smsa22sm4xdjwsdyzicbznkhx980n72syihx04gxhn50w9495ky"; depends=[exams glue stringi stringr xml2]; };
+  exams_mylearn = derive2 { name="exams.mylearn"; version="1.2"; sha256="1vc2rqabavxfrr18ifjjd9am646rvbhxcjrkiq71i0y2idpppg9y"; depends=[exams glue stringi stringr xml2]; };
   exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; };
   excelR = derive2 { name="excelR"; version="0.4.0"; sha256="1pb4sy54zjv5vrh7gjjv7qlpab74km6mfsmfyl0yhmr0jx01hrw0"; depends=[htmlwidgets jsonlite]; };
   excerptr = derive2 { name="excerptr"; version="2.0.0"; sha256="1xglpg9i45dd103ahj46lin42x9c8lgff2b5c4k3799gaki9sjzz"; depends=[checkmate reticulate]; };
@@ -7814,28 +8131,30 @@ in with self; {
   exdex = derive2 { name="exdex"; version="1.0.1"; sha256="15wdi24fq8q4ja4527k1adv6lkzyhylp8nwlsrb91q0sbmmprrqs"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
   exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; };
-  exiftoolr = derive2 { name="exiftoolr"; version="0.1.3"; sha256="1gjdw9bdk3f9s29wd0657pmlv2mhblqmvxqq79q4s470abh0bbin"; depends=[curl jsonlite zip]; };
+  exiftoolr = derive2 { name="exiftoolr"; version="0.1.5"; sha256="0amfv2avnyvlz8mhmzmklpqykshdxrcxivans6j9hnimj0ygw6ad"; depends=[curl data_table jsonlite zip]; };
   exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; };
   expSBM = derive2 { name="expSBM"; version="1.3.5"; sha256="0k8nkwqrcmmhv0x8a2np1rm5cyc9glyvndwdbnp03v0wrg8121sw"; depends=[blockmodels gtools mclust Rcpp RcppArmadillo]; };
   expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; };
   expands = derive2 { name="expands"; version="2.1.2"; sha256="15r5wld63kwk3kcl5x09dj0n1mgcl076lcjsmf0vbh10x4n0avrk"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
+  experDesign = derive2 { name="experDesign"; version="0.0.4"; sha256="1hdr0hj55lgzs88m26qijhh3sx8m1zv0lb10hhgwb00dmij5s3rh"; depends=[]; };
   experiment = derive2 { name="experiment"; version="1.2.0"; sha256="0f8h4pj2y7cd2s1q44q4mrg9cirnpz0bkn4xm04hz1rpjxb4xlv1"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
   expint = derive2 { name="expint"; version="0.1-6"; sha256="0iai25cglcdnf44d2d1fz1xpw4q600my4zq4493fk4cs5673mlf7"; depends=[]; };
-  explor = derive2 { name="explor"; version="0.3.6"; sha256="02kqma7qi6jabmbcp4fmplrh0xix3r729qc299rghcxvd4s9cplv"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; };
-  explore = derive2 { name="explore"; version="0.5.5"; sha256="0xivjnbic4jnbr21l1rvs2799qhkk3jrwsgdlgnmr6s6ddnqiif7"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble]; };
+  explor = derive2 { name="explor"; version="0.3.7"; sha256="0g3a1x3nf4m5pvc46j77jkqqm7z2radcswmy2kvspwj0l6dg6z04"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; };
+  explore = derive2 { name="explore"; version="0.6.2"; sha256="0bn49pcidxsnypcb70j81by4lq0lypzbvb16qpkcxyiyfhapxakh"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble tidyr]; };
   exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; };
   expm = derive2 { name="expm"; version="0.999-5"; sha256="0y98ya8rhy891nysjlzzy7kcm13dsz8gvxwzvbkmcp1xx0vicxc7"; depends=[Matrix]; };
   expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; };
   expp = derive2 { name="expp"; version="1.2.4"; sha256="00r5f80wnz91n0ksp1dvrxpd6zyfis2v3rizsnm7qqnnwj3d4q1c"; depends=[deldir rgeos sp spatstat spdep]; };
   expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; };
   expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
-  expss = derive2 { name="expss"; version="0.10.6"; sha256="03182c9ispbk52akczcm9h5fkgmvxk7d8166dpmdgamzb2s55fyr"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
+  expss = derive2 { name="expss"; version="0.10.7"; sha256="0br10ydhv7xz297nzz3qql3cvs1950g1szshywcnxnf58limsw1y"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
-  extRC = derive2 { name="extRC"; version="1.1"; sha256="1zjm1wxd51r10q324xbjmmyk4rhhih9ajmvgnjsc7glfcpzr0rp5"; depends=[MASS]; };
-  extRemes = derive2 { name="extRemes"; version="2.0-12"; sha256="0wldzvj1h93jksq31dw9zgnr1wrqwmfr9qwmg7qk7nznsn2yy1h2"; depends=[distillery Lmoments]; };
+  extRC = derive2 { name="extRC"; version="1.2"; sha256="0mkvic9nr0asd0g04nlfiy81d7am9a3i65ibxyvbdwsxnf92p8ya"; depends=[MASS]; };
+  extRatum = derive2 { name="extRatum"; version="1.0.0"; sha256="1ng27a2rl0yd41mbq70f0p1a2jg82n623b7hhdlnla3pd893ywk5"; depends=[dplyr sf tidyr]; };
+  extRemes = derive2 { name="extRemes"; version="2.1"; sha256="1b69r3mzl6hp3g3rqxyc77m8r40jyq7c2d87q85af7xqkn6hnxid"; depends=[distillery Lmoments]; };
   extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
   extdplyr = derive2 { name="extdplyr"; version="0.1.5"; sha256="1zbnp0h0lv1dr40dhdw6ii8rmc5lxcq4wjsm83xpd3y8x9xpglnl"; depends=[dplyr lazyeval tidyr]; };
   extendedFamily = derive2 { name="extendedFamily"; version="0.1.1"; sha256="02cl7i3hvk9r5aq0ahj59lghmlbh28avh4fama9ixhz5zb95l3w1"; depends=[assertthat]; };
@@ -7843,37 +8162,39 @@ in with self; {
   extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
   extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
   extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
-  extraDistr = derive2 { name="extraDistr"; version="1.8.11"; sha256="1vvqv1d4hxa025gmm8cbiph63qsqy87l3ri5idd524gyz3chbcl3"; depends=[Rcpp]; };
+  extraDistr = derive2 { name="extraDistr"; version="1.9.1"; sha256="1gypnbvdzczl0mvznvy8r7hzsvc5gvdvi2mmzj21cqdw9n63944r"; depends=[Rcpp]; };
   extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
   extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
   extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
   extraoperators = derive2 { name="extraoperators"; version="0.1.1"; sha256="1clyp97ssmdq9ggbv3w5yskx7khnlm4ji7ym3k3b4bx1pazcw4q4"; depends=[]; };
-  extras = derive2 { name="extras"; version="0.0.1"; sha256="0pzb8mfi0x82apxmz1ncx3dmn0bc5bdklvgcfsxcab9k7q1xl6fa"; depends=[chk]; };
+  extras = derive2 { name="extras"; version="0.1.0"; sha256="05cr9k1cfc2j08lwpnhhc6i9nymmbbcd0l861430qqf146lksx5g"; depends=[chk]; };
   extraterrestrial = derive2 { name="extraterrestrial"; version="0.1.0"; sha256="0clss1zwgw1497n2xif82kplr1w1ajs4xs02041ads3l8craj7y1"; depends=[]; };
   extremeIndex = derive2 { name="extremeIndex"; version="0.0.2"; sha256="1zdw6ik2jh1fir01ay3ynw1l756ba05d5vqqcphnawvg0jkvhxvk"; depends=[boot evd evir gmm goftest]; };
   extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; };
   extremefit = derive2 { name="extremefit"; version="1.0.2"; sha256="07gx6dp0kz4y1jn90hsfvkhn6k7i4flh7ghdz9v5nwda86f55q2s"; depends=[]; };
   extremevalues = derive2 { name="extremevalues"; version="2.3.3"; sha256="0ijha5zzmv3qr0czm4qxk28kg3ql5jh3nk9fr0flzl8d9n3z0jx6"; depends=[gWidgets2 gWidgets2tcltk]; };
-  extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; };
+  extremis = derive2 { name="extremis"; version="1.2"; sha256="1gvizxv1ay788a21qjslrmi7qdbr8s2ryibyri6sp7xdkaqiixsn"; depends=[emplik evd MASS]; };
   extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; };
-  exuber = derive2 { name="exuber"; version="0.4.1"; sha256="1k55mx595v0alvwm7fi5vhw3kf0rhqjaf7431pnjcqc4n050zwx8"; depends=[cli doRNG doSNOW dplyr foreach generics ggplot2 glue lubridate purrr Rcpp RcppArmadillo rlang tibble tidyr vctrs]; };
+  exuber = derive2 { name="exuber"; version="0.4.2"; sha256="1kd06x4j9aibmf1arh652rcvdyhz4p0p3j1l241j78z7jrk417cj"; depends=[cli doRNG doSNOW dplyr foreach generics ggplot2 glue lubridate progress purrr Rcpp RcppArmadillo rlang tibble tidyr vctrs]; };
   eye = derive2 { name="eye"; version="0.1.0"; sha256="08kvjbr6lmhawd8zxipyz0js4r6mnbknr8cgz6951d8zynfg0426"; depends=[cli dplyr english lubridate magrittr purrr rlang stringr tibble tidyr tidyselect]; };
   eyeRead = derive2 { name="eyeRead"; version="0.0.4"; sha256="0f6knzr4fdipbrvcsk0q9yjvkjjyc4wc252lq2s41gdvj3hv575d"; depends=[data_table tibble tidyr]; };
   eyeTrackR = derive2 { name="eyeTrackR"; version="1.0.1"; sha256="14m7l8v0ry1ami1jl0xjp743m1ycklgfwi06vk5amppdp5w3w3qr"; depends=[data_table plyr stringr]; };
+  eyedata = derive2 { name="eyedata"; version="0.1.0"; sha256="1xnll3x1sm0rv6hq2w22wa9n5qm8r827m7sr3dj54xb1i8j75gj3"; depends=[dplyr]; };
   eyelinker = derive2 { name="eyelinker"; version="0.2.0"; sha256="14rfcdxad9iazwd46q6bm8gg1ryh6s8kf7arj00hhb7xz3gvk9c2"; depends=[intervals readr stringi stringr tibble]; };
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
   ezCutoffs = derive2 { name="ezCutoffs"; version="1.0.1"; sha256="04ah9dbfwl89xi0di0dslaf8a39nynxymm8lbacgd88al5dg7y1n"; depends=[doSNOW foreach ggplot2 lavaan moments progress]; };
   ezEDA = derive2 { name="ezEDA"; version="0.1.0"; sha256="1qxifszjfjm1smvl9igpjjjfncb690mim3bwfak5wp0yzjxcrvab"; depends=[dplyr GGally ggplot2 magrittr purrr rlang scales tidyr]; };
-  ezcox = derive2 { name="ezcox"; version="0.7.0"; sha256="0z6605gz79pxax08z3s66gkzvdgpcl6c0q4ds0a6ar1afcmhn4ja"; depends=[dplyr forestmodel ggplot2 magrittr purrr rlang survival]; };
+  ezcox = derive2 { name="ezcox"; version="0.8.0"; sha256="0zk6pq9b1jdgjjknhpynap7cnigimvpzgi8hdx79v39h334bmwfp"; depends=[dplyr forestmodel ggplot2 magrittr purrr rlang survival]; };
   ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; };
   ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
   ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; };
-  ezmmek = derive2 { name="ezmmek"; version="0.2.1"; sha256="06cjp0hbq4blg7jj0jzp372xi1vgd1nwp27nzfsbchszn3j85lgf"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr scales tidyr]; };
-  ezpickr = derive2 { name="ezpickr"; version="2.0.0"; sha256="1x7v7zsr8hjrwi48dkryqryp607550gs77b058qcdgcdznlqwzp2"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble vroom writexl]; };
-  ezplot = derive2 { name="ezplot"; version="0.6.2"; sha256="078iyzs3qlc6g1hn72ikcz209cr07y11pf43w5x6hiaa7ppmszg7"; depends=[dplyr forcats ggplot2 lubridate rlang tsibble]; };
+  ezmmek = derive2 { name="ezmmek"; version="0.2.4"; sha256="0x62nzs1kayv95a6ldav732v79gahrri2khy1w678rxbzfx5wkqy"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr rlang tidyr]; };
+  ezpickr = derive2 { name="ezpickr"; version="2.1.0"; sha256="0jcbmd2bsrq8h6z1zmscph5zvv99gj4n2k1ddrl18wj7cx5mzsii"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble tidyr vroom writexl]; };
+  ezplot = derive2 { name="ezplot"; version="0.6.6"; sha256="1mzhf3sp0ynwnzaalip22m0kpjl7g89y9x6lx5bvqw43manxpywy"; depends=[dplyr forcats ggplot2 lubridate rlang tsibble]; };
+  ezr = derive2 { name="ezr"; version="0.1.5"; sha256="0r4zq0864xpnmczg1zpaasi348j1fllrn0rqfa5fmjh245chcpd4"; depends=[data_table DT ggplot2 ggridges moments shiny shinydashboard weights]; };
   ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
-  fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
+  fANCOVA = derive2 { name="fANCOVA"; version="0.6-1"; sha256="04mw0blgpwdk6wdg8llrig43psgc0vb42cbimvzbnym8v503dsn3"; depends=[]; };
   fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; };
   fAssets = derive2 { name="fAssets"; version="3042.84"; sha256="0aj3gjd54ajviikwh075bympw7dx2dcsgj5p8j96vx2qbbwjmgvb"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; };
   fBasics = derive2 { name="fBasics"; version="3042.89.1"; sha256="1m8x1f9kvsbdcn3ys24hw0vgbxrzdrcp11ai0s3pilp7q91j095d"; depends=[gss MASS spatial stabledist timeDate timeSeries]; };
@@ -7893,13 +8214,13 @@ in with self; {
   fPortfolio = derive2 { name="fPortfolio"; version="3042.83.1"; sha256="1knyrjgfzwf4ppvnb5n325p5f6sidr6q53ss0zw8binhj22gli4y"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; };
   fRLR = derive2 { name="fRLR"; version="1.1"; sha256="005bmljxgvx8v87nz4l3ycg09sahyd34pg8arjz5gdc17d4mjjfc"; depends=[Rcpp]; };
   fRegression = derive2 { name="fRegression"; version="3042.82"; sha256="0pi777xfk101g0r2qpcd0qxqqfnvck3sii990d946ljw6366mamc"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; };
-  fSRM = derive2 { name="fSRM"; version="0.6.4"; sha256="1n91gzjx9r3r3xl400w38miva0b69c0f23h2056kq9p1bax2nm86"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; };
   fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; };
   fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; };
   fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; };
   fabMix = derive2 { name="fabMix"; version="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; };
   fable = derive2 { name="fable"; version="0.2.1"; sha256="1gbzi0g71vdp5yp70msg4qxs45fp8wa2x4byfa8jw67v4gl4xx8y"; depends=[distributional dplyr fabletools Rcpp rlang tibble tidyr tsibble]; };
-  fabletools = derive2 { name="fabletools"; version="0.2.0"; sha256="0zgvq3fg6dnj9jv2ksm2zlk0zw1wyna8rww1arz92pnmhgmprwvn"; depends=[distributional dplyr generics ggplot2 lifecycle progressr R6 rlang tibble tidyr tidyselect tsibble vctrs]; };
+  fable_prophet = derive2 { name="fable.prophet"; version="0.1.0"; sha256="12y2k05plg6d6lgqk6617q6z5m6xz33zdsjh56k86h230qqw68rp"; depends=[distributional dplyr fabletools lubridate prophet Rcpp rlang tsibble]; };
+  fabletools = derive2 { name="fabletools"; version="0.2.1"; sha256="014avk78nrihp83zqfwb73nrl3bgpa4rzzx9azp2h0jca8klyy4b"; depends=[distributional dplyr generics ggplot2 lifecycle progressr R6 rlang tibble tidyr tidyselect tsibble vctrs]; };
   fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; depends=[rlang]; };
   fabricerin = derive2 { name="fabricerin"; version="0.1.2"; sha256="0ynvnxzxx1iybyy5pvwfsj5y9jjixyrpji9vcl5fq5mjnpg8mpqk"; depends=[glue htmltools]; };
   face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; };
@@ -7914,7 +8235,7 @@ in with self; {
   factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; };
   factorial2x2 = derive2 { name="factorial2x2"; version="0.2.0"; sha256="045887hwknwm92wlrp0jlvxj5aal50vpnc7ddbh7c8smawmrdwfd"; depends=[mvtnorm survival]; };
   factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
-  factorstochvol = derive2 { name="factorstochvol"; version="0.9.3"; sha256="15gamzznss9vfmbvbk61sgabxfsra2i49bs142jl1ahk7wchiskw"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; };
+  factorstochvol = derive2 { name="factorstochvol"; version="0.10.1"; sha256="1cd2dw26bvgy0qxbva5hmpxki6qxql71bgir58yjgp7fjzfbw0b7"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; };
   factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr rlang]; };
   factset_analyticsapi_engines = derive2 { name="factset.analyticsapi.engines"; version="3.0.1"; sha256="0v96z837dii1q7mbpd48zwpl2qjzqnhignb80g0xkc4iygsnrrms"; depends=[caTools httr jsonlite R6 rlang]; };
   factset_protobuf_stach = derive2 { name="factset.protobuf.stach"; version="1.0.2"; sha256="0qdvgq0w58pb0bn4x5v25i8pvij3lc8l9x9bj68s9zb29ankl3ss"; depends=[R6 RProtoBuf]; };
@@ -7922,11 +8243,13 @@ in with self; {
   fad = derive2 { name="fad"; version="0.2-1"; sha256="09lbakil37fyji3bwydspzvrnwm0992x8783zyyv2jk37y0wr1ip"; depends=[Matrix Rcpp RSpectra]; };
   fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; };
   fairadapt = derive2 { name="fairadapt"; version="0.1.0"; sha256="01ing7mm1asfgh4w8cc7f7fpv13lja97vv5skk5bri00zycwcqfd"; depends=[ranger]; };
-  fairml = derive2 { name="fairml"; version="0.2"; sha256="07b1gxzxpjc36pic0ayjmdizpkcnrv9rra1h5r75hy8lkf554qqd"; depends=[optiSolve]; };
-  fairness = derive2 { name="fairness"; version="1.1.1"; sha256="05fimbxikippgad3h0glvlwy6745gyakv2hnhp4v58jbzy79yz7q"; depends=[caret devtools e1071 ggplot2 pROC]; };
+  fairml = derive2 { name="fairml"; version="0.3"; sha256="0513x52caw6sa3jizi66fhfksdigla72bxj45jakyai2xgvwq28b"; depends=[optiSolve]; };
+  fairmodels = derive2 { name="fairmodels"; version="0.2.4"; sha256="0zqflf2zmpg9nx2lvigdr3vy62sxxmif3d6h7r0iqzhf9i1ix8wq"; depends=[DALEX ggdendro ggplot2 ggrepel patchwork scales]; };
+  fairness = derive2 { name="fairness"; version="1.2.0"; sha256="12inr7jhlc6rvfa2klzbgi5a1ch5cdqsa93kzdcjrijw8y1pfpzn"; depends=[caret devtools e1071 ggplot2 pROC]; };
+  fairsubset = derive2 { name="fairsubset"; version="1.0"; sha256="0iw16fs2mb9p14vr34izw3sirbndyy8w07df3scy7gkkcx2nz2bz"; depends=[matrixStats]; };
   faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
   fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; };
-  fakemake = derive2 { name="fakemake"; version="1.7.1"; sha256="0mckcgc12yxmpsgkcnmaf1pa634rz8x1zc97h023pnsd1cdwsp4l"; depends=[callr igraph MakefileR withr]; };
+  fakemake = derive2 { name="fakemake"; version="1.9.0"; sha256="0lwh9zb7jh10p30r0ajhvgh7a1airfw6kxn54620xc1b71f4116q"; depends=[igraph MakefileR]; };
   falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; };
   falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; };
   fam_recrisk = derive2 { name="fam.recrisk"; version="0.1"; sha256="1lyrq7bq7p7ijc2vf545nazw4akncz08548ya1dv3lsc5jmkgfzj"; depends=[]; };
@@ -7935,6 +8258,7 @@ in with self; {
   fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
   fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; };
   fancycut = derive2 { name="fancycut"; version="0.1.2"; sha256="1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2"; depends=[]; };
+  fanovaGraph = derive2 { name="fanovaGraph"; version="1.5"; sha256="1hffda52yk24slbgsfdgkpg3vsryfnhlw09r39cbyz483i7xd8d0"; depends=[DiceKriging igraph sensitivity]; };
   fanplot = derive2 { name="fanplot"; version="3.4.2"; sha256="169n9ghm4x6fhd97xz1mqjj0f5hldjkrp926iqk2qqanchnhfvh6"; depends=[]; };
   fansi = derive2 { name="fansi"; version="0.4.1"; sha256="028ywjy538psnmdnddvy5jr3idzffr4hikzr4x97x0m30g4fws9w"; depends=[]; };
   faoutlier = derive2 { name="faoutlier"; version="0.7.4"; sha256="07nnnyj0j5g72a0sa3v7hrnx900i8a1yhlp0wmiwabskikz36iw7"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; };
@@ -7942,26 +8266,26 @@ in with self; {
   far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
   faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; };
   farff = derive2 { name="farff"; version="1.1"; sha256="0d3d343jjjwsb132ph12h3r044j3bc4jp94ayikjyq1lmwwsfr4k"; depends=[BBmisc checkmate readr stringi]; };
-  farrell = derive2 { name="farrell"; version="0.2.0"; sha256="00scn4qmk8gc8m45bfl45swvz00fckwv53wxdynr3bxqcmyqgpkb"; depends=[Benchmarking data_table dplyr DT magrittr miniUI readr rlang shiny shinycssloaders shinyWidgets tibble]; };
+  farrell = derive2 { name="farrell"; version="0.2.1"; sha256="0i546w5p40j9wqiq7qvbxw0426msavbdpnh258jcg6bagc6bywh8"; depends=[Benchmarking data_table dplyr DT magrittr miniUI readr rlang shiny shinycssloaders shinyWidgets tibble]; };
   farver = derive2 { name="farver"; version="2.0.3"; sha256="1k75v07dsfkjra2gsgxg9s55cw3b46b1nh960kqphq7cg7gr058f"; depends=[]; };
   fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; };
-  fasstr = derive2 { name="fasstr"; version="0.3.1"; sha256="1msafxyx2xwgjw87yfbqqfn5ajfc6gla2nf41s6g4wjzg245n5zn"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; };
-  fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
+  fasstr = derive2 { name="fasstr"; version="0.3.2"; sha256="0krd6h9vz4y3kzz13w2lq5b59v6ajr61ngcpnnk71ijn7hhmaanh"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; };
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
-  fastDummies = derive2 { name="fastDummies"; version="1.6.1"; sha256="1vqpzrrahwabvpcfzzkgw98yxclsmjqrjzfa7jvd5dsz0bgil4r7"; depends=[data_table stringi tibble]; };
+  fastDummies = derive2 { name="fastDummies"; version="1.6.3"; sha256="1pw1bpp69sbs8yc1s5ffz11q249ljfwbgfrq6irg5pyp37z38fdx"; depends=[data_table stringr tibble]; };
   fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; };
   fastGraph = derive2 { name="fastGraph"; version="2.1"; sha256="0lz199607hqpwxzhff4jzhmjq6cbakd335iyclmlscllgfzgnhql"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
   fastICA = derive2 { name="fastICA"; version="1.2-2"; sha256="1zpijqcipm0aa3rxj0mys06lskqy4dbppjpxr1aby0j16y9ka8ij"; depends=[]; };
-  fastJT = derive2 { name="fastJT"; version="1.0.5"; sha256="1knk4zjrkkv1i3a8n68vdrpxkwdkf19zw75p93hygfmbbz6r88v4"; depends=[Rcpp]; };
+  fastJT = derive2 { name="fastJT"; version="1.0.6"; sha256="1vw9x00gslqgjfz55a60kizz8y02jifgf3fw7dv9lxm207vd2wxq"; depends=[Rcpp]; };
   fastLink = derive2 { name="fastLink"; version="0.6.0"; sha256="0xysif0v7l7iwnwpf5ydk7ns9azsgja5sm672wxybfqwrh6nx9xk"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
   fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; };
   fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="2.2.1"; sha256="04hv4jdhan1vbsixzbifa7hpmc531gv7c2dd1fx5700c2wlkja1n"; depends=[Matrix]; };
   fastR2 = derive2 { name="fastR2"; version="1.2.1"; sha256="15mqsdy79zvd4srrszdjp0kh9lfcq3yxp7j5d4xcqbjbwsgy68il"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; };
   fastSOM = derive2 { name="fastSOM"; version="1.0.1"; sha256="1fzy7lfx1fn9993h0qh6vbwq0w4gfgbdrprmzb1z3aqq6nqvmngm"; depends=[]; };
-  fastStat = derive2 { name="fastStat"; version="1.3"; sha256="1f4554p487l7cig2xihfbgl55x7w04xbazd01pic0l8819mgmy5n"; depends=[car do e1071 ggplot2 ggrepel plyr reshape2 set survival tseries]; };
-  fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; };
+  fastStat = derive2 { name="fastStat"; version="1.4"; sha256="1sgk41v07rjh6dq52mxbiryjcwmyl71cmm51r8gwf8k14zgl500s"; depends=[car do e1071 ggplot2 ggrepel plyr PredictABEL reshape2 set survC1 survIDINRI survival tseries]; };
+  fastTextR = derive2 { name="fastTextR"; version="2.0.0"; sha256="1ggmwsw2qnq8v3s8iaxi8q66c898pc15wfgpsp6h0mc761qih5lf"; depends=[Rcpp slam]; };
   fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; };
+  fastai = derive2 { name="fastai"; version="2.0.2"; sha256="0m6wj2zdc1gjyf6dqpmci2yn0ps2gzx65dk02cb9qr8yzcc7bdgk"; depends=[generics ggplot2 ggpubr glue png reticulate]; };
   fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; };
   fastcluster = derive2 { name="fastcluster"; version="1.1.25"; sha256="01a2xnhhvv1swd4g8p4lzyn7ww7kg49jlnzc7kfz60jqjzpisrpk"; depends=[]; };
   fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; };
@@ -7972,92 +8296,93 @@ in with self; {
   fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; };
   fasterize = derive2 { name="fasterize"; version="1.0.3"; sha256="10bzl77c1b9jhcn1xp467qzp2n8c7s3wpxn53qjh1nwvbri5kd32"; depends=[raster Rcpp RcppArmadillo sp]; };
   fastglm = derive2 { name="fastglm"; version="0.0.1"; sha256="1vqw02j4y28mngki87r42f1mhlkvajqp2gpbvk0l2adrkz70l0bn"; depends=[Rcpp RcppEigen]; };
+  fastlogitME = derive2 { name="fastlogitME"; version="0.1.0"; sha256="1wpbcjb3ncxl904492alikslnqg53zgx6psxx7qllspd43s8ymv7"; depends=[]; };
   fastlogranktest = derive2 { name="fastlogranktest"; version="0.2.1"; sha256="1j5mgvi3nwnlarj31cknx2cikypql370qds2h0877vmm80942z25"; depends=[BH Rcpp]; };
   fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; };
   fastmap = derive2 { name="fastmap"; version="1.0.1"; sha256="1v7sp56xiha0bh78g3w92k52p9vkp7ryzpw0z66nyddxzrfv0y27"; depends=[]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
-  fastmatrix = derive2 { name="fastmatrix"; version="0.2"; sha256="00az0mhzwh1wxx5r1ivx4irgx95nh9r5ll6lpwp16zg50l2fhd66"; depends=[]; };
+  fastmatrix = derive2 { name="fastmatrix"; version="0.3"; sha256="08bw3qrsdfb5y9x44rxi6kzmagaz4k9f08svdxgxnad1aja7hbnr"; depends=[]; };
   fastmit = derive2 { name="fastmit"; version="0.1.1"; sha256="13hczsfbzssd272kpbq8l2l64lqrkmi2j6f3xyp9jvvxdd506kq0"; depends=[Rcpp RcppArmadillo]; };
-  fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; };
-  fastpos = derive2 { name="fastpos"; version="0.4.0"; sha256="0j27xbjjz5d9892vgy3ph9xmfnn7gjgjdiy9zh2cl3hsq31w06fd"; depends=[future MASS plyr Rcpp RcppArmadillo RcppProgress]; };
+  fastnet = derive2 { name="fastnet"; version="1.0.0"; sha256="1c07msypxj8ilpa1il9jjbgylwpdxv8j8gak362xdmbm4b1bwlm6"; depends=[doParallel foreach igraph tidygraph]; };
+  fastpos = derive2 { name="fastpos"; version="0.4.1"; sha256="0h6drzzc3f1dc5ydi5x9c7wday18sgzi8zn4pf5wxlzsc4qj0pzf"; depends=[future MASS plyr Rcpp RcppArmadillo RcppProgress]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
   fastqcr = derive2 { name="fastqcr"; version="0.1.2"; sha256="12x3lkg5zc4ckyg4x3xxqb779yhrr0fys7asf5b8shz49f86fmm9"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; };
-  fastquant = derive2 { name="fastquant"; version="0.1.2"; sha256="0s6ylf3mjbd1w3mjmlw6fxmsj87yi339g439nf5alx87zm5f04v3"; depends=[assertthat dplyr httr lubridate magrittr purrr quantmod stringr tibble tidyr]; };
   fastshap = derive2 { name="fastshap"; version="0.0.5"; sha256="08f25ib5mry6h8lvj0g3clc9kfl5g2wdd8x8bw455wwmbcm6x5vg"; depends=[abind ggplot2 gridExtra matrixStats plyr Rcpp RcppArmadillo tibble]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
   fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.4"; sha256="01a9d6b2f6g858vg64kr0w0qmv2jqhk9kk3hb6jdr2rly4j8p14x"; depends=[kinship2 multgee]; };
-  fauxnaif = derive2 { name="fauxnaif"; version="0.6.0"; sha256="0c7fx3kyiqp63p64j0bssbw96h21cwg42qz4nab85wrmn1va7fs4"; depends=[dplyr glue lifecycle magrittr rlang]; };
+  faux = derive2 { name="faux"; version="0.0.1.5"; sha256="1fkl2zmsfqc5rjbfik94pywy6rbvmkwk192m8xbihmgirdwjg726"; depends=[dplyr ggplot2 jsonlite lme4 truncnorm]; };
+  fauxnaif = derive2 { name="fauxnaif"; version="0.6.1"; sha256="1hw6lkxvxd65wajr0mpmbg8lvx0sd84py1apzqfnr7xpb4r1hi85"; depends=[glue lifecycle rlang]; };
   fauxpas = derive2 { name="fauxpas"; version="0.5.0"; sha256="129fzqb7wsskbn50s8x0marr4wm8jrns6hiycqcsk166k3dnyyy8"; depends=[httpcode R6 whisker]; };
   favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
   fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; };
   fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
-  fbar = derive2 { name="fbar"; version="0.5.2"; sha256="0scfcr5k71fl0b0sibxchhcwpwk7ll68ks4nrpvsqgv5z48hlvsl"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; };
+  fbar = derive2 { name="fbar"; version="0.6.0"; sha256="005725xiz6k868hrj12ryq3xlyin2r94n0yychimjzhfsppx2zba"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; };
   fbati = derive2 { name="fbati"; version="1.0-4"; sha256="0vqn73zcqgg89zkfgf0ika0s87f4gb6nxds1dmliiq36p28dhv2c"; depends=[fgui pbatR rootSolve]; };
   fbroc = derive2 { name="fbroc"; version="0.4.1"; sha256="1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3"; depends=[ggplot2 Rcpp]; };
-  fbst = derive2 { name="fbst"; version="1.0"; sha256="06bdsmmw5kbzrz5vgs6n572c8l9p62p7mi12gs4l1zncmh99qc1b"; depends=[bayestestR coda Matrix]; };
+  fbst = derive2 { name="fbst"; version="1.3"; sha256="13qc2mcjncw1iginyrlbzw0l7r426730apkwvh6yf0cqby1z9ad9"; depends=[bayestestR]; };
   fc = derive2 { name="fc"; version="0.1.0"; sha256="0x41xfchy499kz0qi7fp12vpkbcddprv19mmk48lxzavv4f5avfh"; depends=[codetools]; };
-  fcaR = derive2 { name="fcaR"; version="1.0.4"; sha256="0kbhmbr4skr6xfhaamrk8v015ac8qf9i8a1ssjdjqrzq5s50pfch"; depends=[arules fractional hasseDiagram knitr Matrix RColorBrewer Rcpp scales stringr tictoc tikzDevice]; };
+  fcaR = derive2 { name="fcaR"; version="1.0.7"; sha256="0hvwd8gpx7akci96c78cw8v4qlh46zabbcxv9bl5dlgp5spxppng"; depends=[fractional magrittr Matrix R6 Rcpp registry stringr tictoc tikzDevice]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
   fclust = derive2 { name="fclust"; version="2.1.1"; sha256="11dsf7mb075m1m1ilqsacc0s4907wq6alvdfh6nizsyr01wiqw3b"; depends=[MASS Rcpp RcppArmadillo]; };
   fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; };
   fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; };
   fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; };
+  fctbases = derive2 { name="fctbases"; version="1.0.0"; sha256="01nwnlvaq7qna166d5s71p3pvx1gnlhpz0macwfqd8ryg6ccid7x"; depends=[Rcpp RcppArmadillo]; };
   fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; };
   fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; };
-  fda = derive2 { name="fda"; version="5.1.5.1"; sha256="0zi001cw5536x6rgr4l0skva7fk53663zf6ggnsa8znml090sihm"; depends=[Matrix]; };
+  fda = derive2 { name="fda"; version="5.1.9"; sha256="0yjrjsv55bcwqn2yxjgj3hn17wfvjvgngfw9xv3w802i52yz9gf8"; depends=[fds Matrix]; };
   fda_usc = derive2 { name="fda.usc"; version="2.0.2"; sha256="0z44vkzjm2h6r5af0k1iic1szvw82rbwjrm541zlwn2jycj4q96a"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; };
-  fdaACF = derive2 { name="fdaACF"; version="0.2.0"; sha256="1kpvd2hkmszfrdwbcm1a586pv1kpy162263bcq371hv5mx450lhj"; depends=[CompQuadForm fda Matrix pracma vars]; };
+  fdaACF = derive2 { name="fdaACF"; version="1.0.0"; sha256="0qrsj25p6h2xg25v0ayk8x31d4whyy0mpf2xdpw3hcwhb71mbfhn"; depends=[CompQuadForm fda pracma vars]; };
   fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; };
   fdaPDE = derive2 { name="fdaPDE"; version="1.0-9"; sha256="06hm1f30rpy37xz9ybvhk759y10p8ijy7slnl9cvp4gqwzy2i8b7"; depends=[geometry Matrix plot3D plot3Drgl RcppEigen rgl]; };
   fdadensity = derive2 { name="fdadensity"; version="0.1.2"; sha256="1i2xzchlsixgjzyfmbv547sy6mq90xrnyc2kpd11wwfgfrpj1ix3"; depends=[fdapace Rcpp]; };
   fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
+  fdaoutlier = derive2 { name="fdaoutlier"; version="0.1.1"; sha256="05n22xp2v90f73h1zdjb3fzw3gx6cw9x19lxcw8873xza43ywvg3"; depends=[MASS]; };
   fdapace = derive2 { name="fdapace"; version="0.5.5"; sha256="1icc4wxglqr7qyyv2bh94j9jzcf8l03a701y69703rq9pzylq91s"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; };
-  fdasrvf = derive2 { name="fdasrvf"; version="1.9.3"; sha256="148rkidnflrdjmid9p2m08qz0li21mibyr0ahqzhry14dcw24g01"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; };
+  fdasrvf = derive2 { name="fdasrvf"; version="1.9.4"; sha256="0psqxmznb2qimci2g8p0qy5fc5mal8gilwbmshlmb57ws71c3pkc"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; };
   fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
   fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; };
-  fddm = derive2 { name="fddm"; version="0.1-1"; sha256="12cm2ffjmsii1271k011yi2rn9qrjfqhqz1g75hywgr8vgl90g70"; depends=[Rcpp]; };
+  fddm = derive2 { name="fddm"; version="0.2-2"; sha256="1kaqnk6z0f1m3sp2dfw1nl0wpdm0xj4grip62zaqwisi0vjk91w9"; depends=[Rcpp]; };
   fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; };
-  fdm2id = derive2 { name="fdm2id"; version="0.9.3"; sha256="0ylr8843hdilzj2c38csxw98pvib9pgw25j7kbgw8531931xqls0"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; };
   fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; };
   fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.4"; sha256="1lwznpwfnhhv0h7qwy9jc7li752bq7hgmkh86qzyqz7k18zgx4iw"; depends=[MCMCpack qvalue]; };
   fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; };
   fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; };
   fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; };
   fdth = derive2 { name="fdth"; version="1.2-5"; sha256="01phrn8x245kplljjajqlsma7847j058spbxajnklamywf002qzr"; depends=[xtable]; };
-  feasts = derive2 { name="feasts"; version="0.1.4"; sha256="11ldjnqikwnrlj279hm27fidmkjvf8z1rr0kypjd7vl6h5g5c0gx"; depends=[dplyr fabletools ggplot2 lubridate rlang scales slider tibble tidyr tsibble vctrs]; };
+  feasts = derive2 { name="feasts"; version="0.1.6"; sha256="18d9x9arbzv8b6c38fw0snvklgyzh8qr26vhayf4kxd06j5bbd6n"; depends=[dplyr fabletools ggplot2 lifecycle lubridate rlang scales slider tibble tidyr tsibble vctrs]; };
   feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; };
-  feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
+  feature = derive2 { name="feature"; version="1.2.14"; sha256="1c12rny9nx8dynzxbcf49h76a7wlmsk1m131wh0jiyqx3c3y41y1"; depends=[ks]; };
   featureCorMatrix = derive2 { name="featureCorMatrix"; version="0.4.0"; sha256="1gq3g351z3fbrx6ys28iymv9j07p2siav8jr3k07r06w314dk1q6"; depends=[]; };
   featurefinder = derive2 { name="featurefinder"; version="1.1"; sha256="024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld"; depends=[plyr rpart rpart_plot]; };
   features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; };
   featuretoolsR = derive2 { name="featuretoolsR"; version="0.4.4"; sha256="0zrb3hb9axcfqc1b5cyhasm3p6jvgh7hd3085w7zag66pizqjwws"; depends=[caret cli dplyr magrittr purrr reticulate rstudioapi stringr testthat tibble]; };
   featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; };
-  febr = derive2 { name="febr"; version="1.1.0"; sha256="12580kbssixrgpr147vw52h88i0wvvpj44pp1n0ivxzmmzbvpqrv"; depends=[dplyr glue pedometrics sf stringr]; };
-  fec16 = derive2 { name="fec16"; version="0.1.0"; sha256="0jmyf35ypniicpam3yihgpsnp4bbhrw0mdgbkkchcbvm9ncngrn4"; depends=[dplyr readr]; };
+  fec16 = derive2 { name="fec16"; version="0.1.3"; sha256="0azvrg98li535mqa2awhmfisfyfr4d8dw0ynikxmp0z1w9l3dx1p"; depends=[dplyr readr vroom]; };
   fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; };
   federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
   fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; };
-  fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; };
-  feedeR = derive2 { name="feedeR"; version="0.0.8"; sha256="15fl3xb7mp7as2hl97l2vvl2k8cp48dnzy17jgrw5g1hg4yk1wgh"; depends=[digest dplyr lubridate readr stringr tibble xml2]; };
+  feedeR = derive2 { name="feedeR"; version="0.0.10"; sha256="1p64c7ibwn6k5k3vsjxrcjr84czild7g8bqw0yv4axk52vk5jfkx"; depends=[digest dplyr lubridate readr stringr tibble xml2]; };
   feisr = derive2 { name="feisr"; version="1.1.1"; sha256="0kbmivia8mfn3l3g45aliz2hid28gx7mka06m2kb6kpkf77kjrbd"; depends=[aod dplyr Formula plm Rdpack]; };
   fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; };
-  felp = derive2 { name="felp"; version="0.2.2"; sha256="1kd2619cj8697l1zpigz78vshc5gd8yvrg7zmw3mik7pjafz1k32"; depends=[prettycode]; };
+  felp = derive2 { name="felp"; version="0.2.3"; sha256="05380225n0l2p8x4yr41frgvfzfl8x5b18v7qn8a4j9afki9y1g5"; depends=[curl prettycode]; };
   fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; };
   fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; };
   fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; };
-  ff = derive2 { name="ff"; version="4.0.2"; sha256="1qbfmhk4v76q145yalqaiaffklvkfs615b5m0imxyjyjcvx1nbn0"; depends=[bit]; };
-  ffbase = derive2 { name="ffbase"; version="0.12.8"; sha256="0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq"; depends=[bit fastmatch ff]; };
+  ff = derive2 { name="ff"; version="4.0.4"; sha256="1rfj2ff5cxzdp9nvfnbgmswc1jvxz5vkxqgpv6gprwk32a0z3v12"; depends=[bit]; };
+  ffbase = derive2 { name="ffbase"; version="0.13.1"; sha256="0knl0vnh8w4q3ry24gp4fd55ipnaj9hb1rwm31fs119kgmh3gd8x"; depends=[bit fastmatch ff]; };
+  fflr = derive2 { name="fflr"; version="0.3.13"; sha256="0kvbrc02iybb416mg6vz4ci1qq31v48jgynklh6xbcxyj8369j0f"; depends=[httr jsonlite tibble]; };
   ffmanova = derive2 { name="ffmanova"; version="1.1.0"; sha256="0019m9vxnh5yxr5k7zflzyhd533a842cjjkcpqyannshnrbfndvy"; depends=[]; };
   ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; };
-  ffscrapr = derive2 { name="ffscrapr"; version="1.0.0"; sha256="0nn07dpvcy5p5kyhjmy1jiypbjn5x6dfimkp0lxqpwvm4arvskkx"; depends=[dplyr glue httr jsonlite lubridate magrittr memoise purrr ratelimitr rlang stringr tibble tidyr]; };
+  ffscrapr = derive2 { name="ffscrapr"; version="1.2.1"; sha256="06gv309729xf5qp2k5y58v9wk8w19ldqpm0zxsbv2i6aq6lc40va"; depends=[dplyr glue httr jsonlite lubridate magrittr memoise purrr rappdirs ratelimitr rlang stringr tibble tidyr]; };
   ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; };
   fftw = derive2 { name="fftw"; version="1.0-6"; sha256="1kkhn79x3akp2v28aqmif0dd2fn1pw145fjgyy29i4ab6pngazir"; depends=[]; };
-  fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; };
+  fftwtools = derive2 { name="fftwtools"; version="0.9-9"; sha256="0h8lyl2i6zq16ir7xnfj9dhyivxvwikm8lml19s8s8jx95z3n9x9"; depends=[]; };
   fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; };
-  fgdr = derive2 { name="fgdr"; version="1.0.1"; sha256="1413aghmyzlpm6zz974ynfinvj3ic4zx6b262n78n51flgrvym3p"; depends=[jpmesh magrittr purrr raster readr rlang sf sp stars stringr tibble xml2]; };
+  fgdr = derive2 { name="fgdr"; version="1.1.0"; sha256="0xllws7z3crbwibyhm3w06zagvlbmn3rcy8ccgkdhl0am3q7dz0a"; depends=[data_table jpmesh magrittr purrr raster readr rlang sf stars stringr terra tibble units xml2]; };
   fgeo = derive2 { name="fgeo"; version="1.1.4"; sha256="0axglmk05li3plb79rccskhddjzq3pdx3mgxr8yqysymf1nscrq6"; depends=[cli crayon dplyr fgeo_analyze fgeo_plot fgeo_tool fgeo_x glue magrittr purrr rlang rstudioapi]; };
-  fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.13"; sha256="1cj4bazggpic0i5sq9iqq0y0j2xvp01i9ccv0pchg82xlgis33gw"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; };
-  fgeo_plot = derive2 { name="fgeo.plot"; version="1.1.9"; sha256="18zw4bsqdqdpy103kdyl40162mii6s1lp2w4cpi50svx7g7xhgh5"; depends=[dplyr fgeo_tool ggplot2 ggrepel glue magrittr purrr rlang stringr]; };
+  fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.14"; sha256="0pnmvq6imnffvr4qlmygmmw18g33s81f5jrrs7n4ahwi0qmf5qaj"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; };
+  fgeo_plot = derive2 { name="fgeo.plot"; version="1.1.10"; sha256="0lg74ckdm3nn91526cg6gly3lpsv315n2kfmf4bsmprj8k0zj31s"; depends=[dplyr fgeo_tool ggplot2 ggrepel glue magrittr purrr rlang stringr]; };
   fgeo_tool = derive2 { name="fgeo.tool"; version="1.2.6"; sha256="0di1alxmxh47akbhy75b7vpix674xg4iynac4ga859nia56fisz1"; depends=[dplyr glue magrittr purrr readr rlang tibble tidyselect]; };
   fgeo_x = derive2 { name="fgeo.x"; version="1.1.4"; sha256="0swps9rli74fmfb2j4kf55kw39gxz0q49m74ad4vcs0ylyp0sxrb"; depends=[memoise]; };
   fgm = derive2 { name="fgm"; version="1.0"; sha256="0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m"; depends=[fdapace JGL]; };
@@ -8065,31 +8390,31 @@ in with self; {
   fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
   fgui = derive2 { name="fgui"; version="1.0-8"; sha256="024fzd1c7iwqprn26hwjb9l2qlvvyzl449d7iixy0x69djwsrysv"; depends=[]; };
   fhidata = derive2 { name="fhidata"; version="2019.8.27"; sha256="0cm8ixpr3gjzprjcv43zdnysw8qhv72pf3fd2vckql01mlk16p42"; depends=[data_table]; };
-  fhircrackr = derive2 { name="fhircrackr"; version="0.1.1"; sha256="14jbyx3hr4bgyyny51b222afsirskfpc6vbdpnrpaqvz82ifbv3c"; depends=[dplyr httr stringr xml2]; };
+  fhircrackr = derive2 { name="fhircrackr"; version="0.2.1"; sha256="04a4rnv2r5q4069xv6wcfslw3rnacxjcgy1k258xkjx39bwsjzwa"; depends=[data_table dplyr httr plyr stringr xml2]; };
   fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; };
   fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; };
   fieldRS = derive2 { name="fieldRS"; version="0.2.3"; sha256="0jr2l5cnrawd6wibmb6r0sngd851z9mbz4mwprnbbqbv3hzzrpm9"; depends=[caret concaveman geosphere ggplot2 raster rgeos sp stringdist vegan]; };
-  fields = derive2 { name="fields"; version="10.3"; sha256="12k97vfjlz5h8vynirnvik1nyj1iw25n8xl7awmx9mpd6wvgy2s9"; depends=[maps spam]; };
-  fiery = derive2 { name="fiery"; version="1.1.2"; sha256="01ahdvcag8ifpp6jl6cgjjrchwxbr9fzvzqysj77kg3n5dcqm6cl"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; };
+  fields = derive2 { name="fields"; version="11.6"; sha256="1nsrgkw9w3mwd3sajyzc06h49gg1s0bkq6xh5b66h1n4jbcx2046"; depends=[maps spam]; };
+  fiery = derive2 { name="fiery"; version="1.1.3"; sha256="1rwnmm4n59wdsvb57bj8mx1qhz93jbvfb73sl111nwqazphrhid1"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; };
   filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; };
   filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; };
   filelock = derive2 { name="filelock"; version="1.0.2"; sha256="00ql5fw1hidpfnm0szaavf43ahmsnvdbi8i5lr1nrcc90yaiaadc"; depends=[]; };
   filematrix = derive2 { name="filematrix"; version="1.3"; sha256="1v3aj1ng742msb0sfdnjsbqb508mqjf8jlq2v33vxldhradw5w0b"; depends=[]; };
   filenamer = derive2 { name="filenamer"; version="0.2.3"; sha256="19gavhh5q7dziv0yc000w06qp58wk2cm52cxjl33p1q4cjk6gg3m"; depends=[]; };
   files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; };
-  filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; };
+  filesstrings = derive2 { name="filesstrings"; version="3.2.1"; sha256="03vy2dnsqfaljxdb3qv2xih83qz7ck64pb6pcp887kmr6ca3iw3w"; depends=[checkmate magrittr purrr rlang strex stringi stringr withr]; };
   filling = derive2 { name="filling"; version="0.2.2"; sha256="02s2q8wsnxrl3914516r6z0vksbsfmcv7y8hqjl92h4cqqr7023w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
   fillr = derive2 { name="fillr"; version="1.0.0"; sha256="1gx1ihp8j90ywmm6mmmfq4jd6apxawk9s5dfw3jq0wm1c290zqpv"; depends=[]; };
   finalfit = derive2 { name="finalfit"; version="1.0.2"; sha256="118ja2san73341m4vn9xmsazak4w6z6290rai4fl1jwf9amk2jnq"; depends=[bdsmatrix boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; };
-  finbif = derive2 { name="finbif"; version="0.3.0"; sha256="0f5mkwinnfqhv0kgywbzi1lhfdhnh5mhhh8kj5pyxfwncbg109z4"; depends=[digest httr jsonlite lubridate lutz]; };
+  finbif = derive2 { name="finbif"; version="0.4.0"; sha256="1p29b2vvlk0nqblhqzgxi60kaz0k0agr3dgr08801qhqha8jd5jx"; depends=[digest httr jsonlite lubridate lutz]; };
   finch = derive2 { name="finch"; version="0.4.0"; sha256="0q7riaxms460c6z2gb8i0q4pb348bnvry46bjd7pb9mh8fnl1i8b"; depends=[data_table digest EML hoardr xml2]; };
+  findInFiles = derive2 { name="findInFiles"; version="0.1.2"; sha256="0ihvk7ml4ry8pahvh1ikldvnsa3h6rs8lq0cc4z85r2n71p982mk"; depends=[htmlwidgets]; };
   findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; };
   findpython = derive2 { name="findpython"; version="1.0.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
+  finetune = derive2 { name="finetune"; version="0.0.1"; sha256="0gxsm8axq15pkbsq6cnxnh3cpmqfy4jx8hk54yyx27r0x342fl0g"; depends=[cli dials dplyr ggplot2 purrr rlang tibble tidyr tidyselect tune workflows yardstick]; };
   fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; };
   fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; };
-  fingertipsR = derive2 { name="fingertipsR"; version="1.0.4"; sha256="1li5l273nw5v9gld4g5i4xsfv2rndsnfrg9cw01q20k3kba4jngj"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; };
-  fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.11"; sha256="1xni93m9d3r08crgbk1g660g6mr9d01cjvqcca5mpm8n2cbhq634"; depends=[dplyr geojsonio ggplot2 httr leaflet purrr rlang scales sf stringr tibble tidyr]; };
   finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; };
   finity = derive2 { name="finity"; version="0.1.4.1"; sha256="0xs3vx0vj165hj4dq8ivrdf6fcvj23zhp2ai79rgpyb5rr5ndkvc"; depends=[BH Rcpp RcppArmadillo stabledist]; };
   finreportr = derive2 { name="finreportr"; version="1.0.2"; sha256="0xkkrgmwkasxgaf3lvvxl5azwbphk83fpa2asgva86qml7vwznlc"; depends=[curl dplyr httr rvest XBRL xml2]; };
@@ -8097,14 +8422,14 @@ in with self; {
   firebase = derive2 { name="firebase"; version="0.1.0"; sha256="154a386ga9bjgam9rxp0y9033hx55p7f3294z52r6dz2y87h3lz2"; depends=[cli R6 shiny]; };
   firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; };
   fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; };
-  fishbc = derive2 { name="fishbc"; version="0.0.1"; sha256="041yq17s9my4fn15mn01bjjp6n1sxkdg1jzdnf5y68vc7ysynmwx"; depends=[]; };
+  fishbc = derive2 { name="fishbc"; version="0.1.0"; sha256="1hfm8w6wyzci2hmgzlji9c3d6qjlm8ka2srkn3aigrlx2ll1lnx3"; depends=[]; };
   fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; };
   fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
-  fishflux = derive2 { name="fishflux"; version="0.0.1.1"; sha256="06f0w0g2kmqwjhaj631a242qp2c0m4xiv5xxfbv4wbjl7ffh4qn3"; depends=[BH dplyr fishualize ggplot2 plyr Rcpp RcppEigen RcppParallel rfishbase rstan rstantools StanHeaders tidybayes tidyr]; };
+  fishflux = derive2 { name="fishflux"; version="0.0.1.3"; sha256="0l1drcjkvamw4849n2d8jk4ay3mfwqaya2vabm80hglfy4wqkca4"; depends=[BH curl dplyr fishualize ggplot2 httr plyr Rcpp RcppEigen RcppParallel rfishbase rstan rstantools StanHeaders tidybayes tidyr]; };
   fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; };
   fishmethods = derive2 { name="fishmethods"; version="1.11-1"; sha256="049a25rwxqy6a8jfm0irjka3bl7vkask32f9h7fsr5ddlyzvg5pz"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; };
   fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; };
-  fishtree = derive2 { name="fishtree"; version="0.3.2"; sha256="19kq38l4cm7g2frvf2zdlk1j636k2f5k0bf6v7wn2zcmivy0xzsw"; depends=[ape jsonlite memoise rlang]; };
+  fishtree = derive2 { name="fishtree"; version="0.3.3"; sha256="0wrns88zzwvmnw22268638ddllr4mn0dnvim5nmb7h1fsmx0ic3m"; depends=[ape jsonlite memoise rlang]; };
   fishualize = derive2 { name="fishualize"; version="0.2.0"; sha256="13z6n62fpans1fxjxlpz2xqqpq0ng5via67vk4nkvp0nxmlrlhky"; depends=[downloader dplyr ggplot2 gridExtra httr magrittr png rlang scales stringr tidyr]; };
   fit_models = derive2 { name="fit.models"; version="0.64"; sha256="1nk4x2q8cv79zcls61saf627ac0fci6jcrd6lmzk61asm2zhc27p"; depends=[lattice]; };
   fitConic = derive2 { name="fitConic"; version="1.1"; sha256="0xlyv60r4fqvg3qhy4s9zkm2w65y4pg5nzl7a3k2z3fdpfcvkinz"; depends=[pracma]; };
@@ -8115,7 +8440,7 @@ in with self; {
   fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
   fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; };
   fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; };
-  fitdistrplus = derive2 { name="fitdistrplus"; version="1.1-1"; sha256="1rnfnwmxa495fql7q0h9018cnwygwhj8gfh6ryz1vbf474570vjl"; depends=[MASS survival]; };
+  fitdistrplus = derive2 { name="fitdistrplus"; version="1.1-3"; sha256="1pjnqx0j26dai2fa4ip56wspmfsrcm9dpmxkg15y9623w5b58vbp"; depends=[MASS survival]; };
   fitplc = derive2 { name="fitplc"; version="1.2-3"; sha256="1yg3ch907c4gk7q8hxgwqxgngkmy125j3ni917nkzi7hn59krd1n"; depends=[car nlme]; };
   fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; };
   fitur = derive2 { name="fitur"; version="0.6.1"; sha256="04lr717lsbb4731nlzgscraj30knik4q68jzrl4i5f27912159r9"; depends=[actuar DT e1071 fitdistrplus ggplot2 goftest miniUI rstudioapi shiny]; };
@@ -8123,7 +8448,7 @@ in with self; {
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.6.1"; sha256="1c59jaj2jz498mw2by6yss3nqmhxwn25j9ah89x2540pq4r1zifx"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
   fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; };
-  fixest = derive2 { name="fixest"; version="0.6.0"; sha256="1g1xcg51sjrq6i8q5il4njg3238g5ky7k4yav3rk25fyx9xxqrf2"; depends=[dreamerr Formula nlme numDeriv Rcpp sandwich]; };
+  fixest = derive2 { name="fixest"; version="0.8.0"; sha256="1w8vdipg54q5mks3z91l2f0sycnw0rh91icljwb3d367pz6gbblp"; depends=[dreamerr nlme numDeriv Rcpp sandwich]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
   flacco = derive2 { name="flacco"; version="1.8"; sha256="15h2q9xgddy7gw6r52c2nk618f3z1mjn4xz9pzdvhm1d3kqggwa4"; depends=[BBmisc checkmate mlr]; };
   flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; };
@@ -8131,40 +8456,41 @@ in with self; {
   flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; };
   flamingos = derive2 { name="flamingos"; version="0.1.0"; sha256="0gic6y8wpxffpyi3zy0wh7apy4z6argxbz284n80k2mzh6lh029k"; depends=[Rcpp RcppArmadillo]; };
   flan = derive2 { name="flan"; version="0.8"; sha256="0v7xjx72zaa5g9xn82x694r9k35vc1n36dv5nbnxz46px0pczsd6"; depends=[Rcpp RcppArmadillo RcppGSL]; };
+  flare = derive2 { name="flare"; version="1.7.0"; sha256="0f992dmgnr6s8g3386i9bjfyf08q8srgw7sjz2yx7snj8znq7251"; depends=[igraph lattice MASS Matrix]; };
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashCard = derive2 { name="flashCard"; version="0.1.0"; sha256="1l1g3hy0gchsmdj04d065rl71hkvxydyqsmav5qwxyz2mdkknkhi"; depends=[htmlwidgets jsonlite]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
   flashlight = derive2 { name="flashlight"; version="0.7.3"; sha256="0mkza0q5w87ayp6yhkb53xw4vfbbbryzsl4bs0s063390qwhn7sp"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rpart rpart_plot tidyr tidyselect]; };
   flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; };
-  flattabler = derive2 { name="flattabler"; version="1.1.0"; sha256="007pk1qjd4qf70008jlfvvvlczgyhwncglyzs5mw7j5kxca4hnis"; depends=[dplyr stringr tibble tidyr xlsx]; };
-  flatxml = derive2 { name="flatxml"; version="0.1.0"; sha256="0nc44g6ghk8wh2cdlszkj52js2glakmd20dnisp8wsb6immix9gg"; depends=[httr RCurl xml2]; };
+  flattabler = derive2 { name="flattabler"; version="1.2.0"; sha256="156q3af7bmqcaxvl35634ph8dzs6gdjxqqkgwi214kj2pywpqg2a"; depends=[dplyr readxl stringr tibble tidyr]; };
+  flatxml = derive2 { name="flatxml"; version="0.1.1"; sha256="1qsiqi8aszk9djlhysf6lcm41dq4pcw5jv6mdvb1mgxni7g3sgfv"; depends=[crayon httr RCurl xml2]; };
   flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; };
   flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; };
   flexdashboard = derive2 { name="flexdashboard"; version="0.5.2"; sha256="1bh759llp15fxrx2rwvxd8p3w84vjmkid32ism7zg49a127fjib4"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
+  flexiblas = derive2 { name="flexiblas"; version="3.0.0"; sha256="1nlddwqnqkq5lv0bnsg0rbci6sjwkplqp71zdxn6pqyysyq036gb"; depends=[]; };
   flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; };
-  flexmix = derive2 { name="flexmix"; version="2.3-15"; sha256="0hrz2axp2c9548b1r0bmrl57219nn030qndb83a8garkzq5lqi5s"; depends=[lattice modeltools nnet]; };
+  flexmix = derive2 { name="flexmix"; version="2.3-17"; sha256="0jangf89174p0idh9afbicfiln2sz8jxc3bjc6n0j9036dw9n09n"; depends=[lattice modeltools nnet]; };
   flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; };
-  flexpolyline = derive2 { name="flexpolyline"; version="0.1.1"; sha256="1yi9h8zdi2hmk1zn06sl4krzxfnr0vbpz3xphh1n3l5smd88n1vb"; depends=[Rcpp sf]; };
+  flexpolyline = derive2 { name="flexpolyline"; version="0.2.0"; sha256="1drnyad83267z80k73min3kxcf2casvlwb1kciz07ck8qnndvdkv"; depends=[Rcpp sf]; };
   flexrsurv = derive2 { name="flexrsurv"; version="1.4.5"; sha256="1xwh6fj854hr5j1mdh4cbp3hbrbdl4nb2ili876rq08wb9wq5pkf"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; };
   flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; };
-  flexsurvcure = derive2 { name="flexsurvcure"; version="1.1.0"; sha256="0q77cc2l4xa7jkmx5sl9qwsxsdaf688ckp7j6pprv0nkzv8js16r"; depends=[flexsurv gtools survival]; };
-  flextable = derive2 { name="flextable"; version="0.5.10"; sha256="1j7yvjiavar21ywck6nyz0p6bd66fnj99bq8lljdz4rrl3314yb8"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown uuid xml2]; };
+  flexsurvcure = derive2 { name="flexsurvcure"; version="1.2.0"; sha256="06qppcjml380drd6brc60j1swasqrmdx82h6x69xpb65zn9wpa3c"; depends=[flexsurv gtools survival]; };
+  flextable = derive2 { name="flextable"; version="0.6.1"; sha256="06nzyd2a9yaf9hmn740xrgxw0448z5dvlplcj3kizz9sm23aw9li"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown uuid xml2]; };
   flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; };
-  flightplanning = derive2 { name="flightplanning"; version="0.8.0"; sha256="0q5xdjgjj9j73djpvzc34ig2gk43xan5jg9pn195m1x8lz41yvk9"; depends=[rgdal rgeos sp]; };
+  flightplanning = derive2 { name="flightplanning"; version="0.8.3"; sha256="18w28z2asb8jv7jpw6qzwcw9fm06h3z814xl8vssfd1p7bq5nfx8"; depends=[rgdal rgeos sp]; };
   flightplot = derive2 { name="flightplot"; version="0.1.0"; sha256="1276lsahr9kdsvp1ismm3b5syvhfr7ifizzd79f8w1h2rjblva8x"; depends=[dplyr geosphere ggplot2 ggrepel magrittr rlang sf tibble]; };
   flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; };
+  flipdownr = derive2 { name="flipdownr"; version="0.1.1"; sha256="18z6y9anwg264gwqpxvm8mmv7xvc4m323mkg9db424vd1ji560f3"; depends=[checkmate glue htmltools jsonlite]; };
   flipscores = derive2 { name="flipscores"; version="1.1.0"; sha256="0pznbv8gq6jx0hd9dq6yjxyz4p75h8x0jznfa02yh4xdzjmamiw6"; depends=[car flip MASS plyr]; };
   float = derive2 { name="float"; version="0.2-4"; sha256="1wf1dfybgbhvh9sa5z41xkh8liwp5n9gyydfq2mpg6bag0r457z1"; depends=[]; };
   flobr = derive2 { name="flobr"; version="0.2.1"; sha256="16qxsvpdznw0wlmcxc6jwf550hx7yx1rifds00lq0kxly1pc4aak"; depends=[blob chk lifecycle]; };
   flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; };
   flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; };
   flora = derive2 { name="flora"; version="0.3.4"; sha256="17drlfvvrndal4cf5nw20xb9viybagvb4vll1kxdrhvsvfz5yap6"; depends=[dplyr httr jsonlite stringdist]; };
-  florestal = derive2 { name="florestal"; version="0.1.1"; sha256="0a86m2d8d9g5hw1pyx8hin3j52prq2x1yf1jfwn6g5rvjwbd91xx"; depends=[BiodiversityR cowplot data_table dplyr flextable ggplot2 officer tidyr]; };
-  flowDiv = derive2 { name="flowDiv"; version="2.0"; sha256="1p89l8q1i610bl1bvx6lmkygb094pvydgbmd8kx0640a11rblx8v"; depends=[flowCore flowWorkspace ggplot2 gridExtra vegan]; };
+  florestal = derive2 { name="florestal"; version="0.1.3"; sha256="12d3mfcix0rbkdn25c6fi0g91dlf92fv58g7bzal3118shrdgyjg"; depends=[BiodiversityR cowplot data_table dplyr flextable ggplot2 officer tidyr]; };
   flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
   flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
   flowr = derive2 { name="flowr"; version="0.9.10"; sha256="18mjshfg3827b26b8nz52pl04ph7n887vw0ym5fybjm8gy5wwpdg"; depends=[diagram params whisker]; };
-  flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; };
   flsa = derive2 { name="flsa"; version="1.5.2"; sha256="0c6cdf3hkl3s5yqwbn1qhqhyaw5pgd83a5bc30wbzq03hk7rh9ks"; depends=[]; };
   fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; };
   fluspect = derive2 { name="fluspect"; version="1.0.0"; sha256="0j80wx00s8ljqg1qaqw66rj7kxhhk438hb0syv0lr9vld03cxy2w"; depends=[pracma]; };
@@ -8173,15 +8499,16 @@ in with self; {
   flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; };
   fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
-  fmcmc = derive2 { name="fmcmc"; version="0.3-0"; sha256="1r019pzk5h00s6ki897gbzsyhlnwljxklzqnfz87gbg1n5dvhqp4"; depends=[coda MASS]; };
+  fmcmc = derive2 { name="fmcmc"; version="0.4-0"; sha256="10dr9zm92a7av43i3d03ni44f71c6vh6v5pznny8f47p8bzfhzih"; depends=[coda MASS Matrix]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
+  fmf = derive2 { name="fmf"; version="1.1.1"; sha256="0b26040a39jys1z3h9mq9k7rjr0iyiialq442ir8vgzvmrh383cs"; depends=[C50 caret dplyr e1071 factoextra FactoMineR ggplot2 kernlab Rcpp RcppArmadillo solitude]; };
+  fmpcloudr = derive2 { name="fmpcloudr"; version="0.1.1"; sha256="0w7fki96pzp8lvjmy3hy0qh1rvkds6sajig7bmy0a55pd36bcgvj"; depends=[dplyr httr jsonlite lubridate magrittr tidyr]; };
   fmri = derive2 { name="fmri"; version="1.9.3"; sha256="0is9lgp27g8dv3rmxn4mlf9m53izx5j7h974cy3ls3lq0pdp99va"; depends=[aws metafor nlme]; };
   fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; };
   fmsb = derive2 { name="fmsb"; version="0.7.0"; sha256="0x1wkzfdvv4s5xmr0whcwjz4aac71gacwymj2c3mzj2bbswwlw45"; depends=[]; };
-  fmtr = derive2 { name="fmtr"; version="1.0.1"; sha256="1kb0i3llg2jdals31awgv5frxbflf1h4mghblkl32spjilad48mk"; depends=[tibble]; };
-  foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
+  fmtr = derive2 { name="fmtr"; version="1.3.0"; sha256="17ns21xn0kc12y2vj8whkih71415sb4pgj50s6x8f4pv8zqrc1kg"; depends=[crayon tibble]; };
   focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; };
-  foghorn = derive2 { name="foghorn"; version="1.2.3"; sha256="0rm03566b7vcjphddihq32fy127cc458b8pm0rgw2h190czpgkr3"; depends=[clisymbols crayon curl httr jsonlite rlang rvest tibble xml2]; };
+  foghorn = derive2 { name="foghorn"; version="1.3.2"; sha256="0rnrwd94ym893fqrfxw8lkyj3zn72kqnxk9yvzxgv8w0c4hn1pj3"; depends=[clisymbols crayon curl httr jsonlite rlang rvest tibble xml2]; };
   foieGras = derive2 { name="foieGras"; version="0.6-9"; sha256="19jjq71bxjrc2mx6wjx6z00dcwrhcslcdx383bg02h9g48z7046k"; depends=[assertthat dplyr furrr future ggplot2 lubridate patchwork purrr RcppEigen rworldmap sf stringr tibble tidyr TMB trip wesanderson]; };
   folderfun = derive2 { name="folderfun"; version="0.1.4"; sha256="0rns8590r1897lj0gyrlj0zbaxjw2gjaxwnwdxiiw2kvyq7mjkis"; depends=[]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
@@ -8195,17 +8522,16 @@ in with self; {
   foolbox = derive2 { name="foolbox"; version="0.1.1"; sha256="06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3"; depends=[magrittr rlang]; };
   forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
   forcats = derive2 { name="forcats"; version="0.5.0"; sha256="1i4hblsjgwkrcwgvgsb5yj33pw1hwdj3lr9dvxymkv1kjdw0x5lg"; depends=[ellipsis magrittr rlang tibble]; };
-  foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.81"; sha256="1p3w5cs52ph79p2l78apvibr82w7sfbwf8436jfbb4gcahjhmrnk"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
-  foreach = derive2 { name="foreach"; version="1.5.0"; sha256="0584nv49x8d8m1cak5drb54sxs3y594gd521kjsdwk4c849sgy8s"; depends=[codetools iterators]; };
+  foreSIGHT = derive2 { name="foreSIGHT"; version="1.0.0"; sha256="0f1wy7iy3189890qi0gfqwbif3qlp9bfnzzqlg1yvwxi5pw55ikm"; depends=[cowplot directlabels doParallel fields GA ggplot2 jsonlite moments progress RColorBrewer rcorpora Rcpp rlang scales viridisLite zoo]; };
+  foreach = derive2 { name="foreach"; version="1.5.1"; sha256="1qb83b1jvpmk8d6kfibkm5q2hiki0x5gipy758mwa62n56gdcnpv"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
-  forecast = derive2 { name="forecast"; version="8.12"; sha256="1ycj5z4wd5a16nlcjy07dqm8jkih240xa02cn4wvysnnhkapyq7b"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; };
-  forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.18"; sha256="0sgz50dl2939jl3azkxpv8kd00jcbkcgd5s6cng3kivrbrfslahp"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; };
+  forecast = derive2 { name="forecast"; version="8.13"; sha256="0vrql5d4v28890np2m6ws1nr1fcl6frs1bz74vfkihkixcmkl3j9"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; };
+  forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.19"; sha256="1pg3wbmlagr01j3nikfh4dvh5lvbdfp7069wx9h9xsl7d4481ly1"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; };
   forecastML = derive2 { name="forecastML"; version="0.9.0"; sha256="01lqbmdmd6sk5xka19i9d466bzihxgp652v0kr13r82b591f67vq"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; };
-  foreign = derive2 { name="foreign"; version="0.8-80"; sha256="0wjdi3qn9famsxmpdyyahidaid0yhxlpx4ad9k8vrxhxd6xspasp"; depends=[]; };
+  foreign = derive2 { name="foreign"; version="0.8-81"; sha256="0b4rca1bl8xxna05057hchbwfmgjgx0n140szabpc0raizqzks0s"; depends=[]; };
   forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-  forestChange = derive2 { name="forestChange"; version="1.0"; sha256="1d9qza1f16sz8pyafn3q7cyg9hw0ix4nqcgb9ipcnvmkyrc00f1a"; depends=[curl dplyr gdalUtils ggplot2 landscapemetrics raster rgdal rvest sp tibble xml2]; };
   forestControl = derive2 { name="forestControl"; version="0.2.1"; sha256="1m75s98bs8n3qad8gp6a333dh3mbi0rbbic9iwnsqyklzkhmx1nr"; depends=[dplyr magrittr purrr Rcpp tibble]; };
   forestError = derive2 { name="forestError"; version="0.2.0"; sha256="093qf50b4isiba4dcv06c1h0fy4db06605fiazwqd2cyd2gar46p"; depends=[data_table purrr]; };
   forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; };
@@ -8214,7 +8540,7 @@ in with self; {
   forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; };
   forestmangr = derive2 { name="forestmangr"; version="0.9.2"; sha256="0f65yb4kixbvr8jp6063rgd8hxd5pycsx1dx9477222rmhp6f723"; depends=[broom car dplyr FinCal forcats formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr tidyselect]; };
   forestmodel = derive2 { name="forestmodel"; version="0.6.2"; sha256="0pl9r8j2qd00b9kl585b4k54kic5fvzc56i8cn3hm5yp2hrrwyws"; depends=[broom dplyr ggplot2 rlang tibble]; };
-  forestplot = derive2 { name="forestplot"; version="1.10"; sha256="0sv86yn8fs912yaigi9ig43vnyrqkx1jpy5qhpnjl3kqiviqzr6s"; depends=[checkmate magrittr]; };
+  forestplot = derive2 { name="forestplot"; version="1.10.1"; sha256="1vibb1vwf0fhnwbjlfc64b5q84vibpmgpylzjvdpykrrvsk26w1n"; depends=[checkmate magrittr]; };
   forestr = derive2 { name="forestr"; version="2.0.2"; sha256="1kz8f3x2dmsprj2r23gz61fpwg7n14nbjxr16x4cpixvnk427p94"; depends=[dplyr ggplot2 moments plyr tibble tidyr viridis]; };
   forestry = derive2 { name="forestry"; version="0.1.0"; sha256="0q7m0mrig8z2b2z2fng58qlqa6g58xlhfzchil2dvjh6xf3qvsh8"; depends=[data_tree]; };
   foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; };
@@ -8224,17 +8550,18 @@ in with self; {
   formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; };
   formulaic = derive2 { name="formulaic"; version="0.0.7"; sha256="1nyqxkjp21ygzqybp770863gn1h1s20bc4yakl7q9wnd4j8xkp57"; depends=[data_table]; };
   formulops = derive2 { name="formulops"; version="0.5.0"; sha256="1mkpv5xjykrhgknq0gh4yg2a3j4xb8q2d6dh0wv8zd9h59hvrzda"; depends=[]; };
-  forrel = derive2 { name="forrel"; version="1.0.1"; sha256="0apx62cwg3xb64gmflgq500h8vclqbwazd9aj0s6c7ix0j0phs73"; depends=[glue maxLik pedmut pedprobr pedtools]; };
+  forrel = derive2 { name="forrel"; version="1.2.0"; sha256="0h2d73i28fzr4v2hxiq1gk03jhvm612rzp4zj18sy56z464pj9bn"; depends=[glue maxLik pedmut pedprobr pedtools ribd]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.5"; sha256="0cc0s534s32b9ark2zazwqhgy0zsxb2p63r6503v82784rpqv2yv"; depends=[MASS]; };
   forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; };
   fossil = derive2 { name="fossil"; version="0.4.0"; sha256="1hbls9m8yapnfzpv9s850ixakmnan8min1ynk7dqkbpb2px85h1p"; depends=[maps shapefiles sp]; };
+  foster = derive2 { name="foster"; version="0.1.0"; sha256="0b6ys2y3d2yj07q1q7wbgh7ichg617yza53jrpaqwh3190nm9s5r"; depends=[caret data_table dplyr randomForest raster reshape2 rgdal RStoolbox sp spatstat trend yaImpute]; };
   foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; };
   fourPNO = derive2 { name="fourPNO"; version="1.1.0"; sha256="0a0z2403kdh3fjb0ypjjk3m6fg77bg6m7hwb5jhlymcy2rwkay7w"; depends=[Rcpp RcppArmadillo]; };
   fourierin = derive2 { name="fourierin"; version="0.2.4"; sha256="140721p4h5mjr7r25ckv8wfhbj88xw6v47b613r5bpalg8gw650l"; depends=[Rcpp RcppArmadillo]; };
   fpCompare = derive2 { name="fpCompare"; version="0.2.3"; sha256="1pyv52rvbqd5v6ns86pc119q019ps070bd819x7a98s4hmbf76zq"; depends=[]; };
   fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; };
-  fpc = derive2 { name="fpc"; version="2.2-7"; sha256="1xnp3j36hggfg675v39mnr6rgvp7i11pfng7nmyy3k2ldgklz0j9"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; };
+  fpc = derive2 { name="fpc"; version="2.2-9"; sha256="0f7sfmpcycr9y7cy5gasyjm2ardxa62kglqms92mcr68jrp01c19"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; };
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
   fpeek = derive2 { name="fpeek"; version="0.1.1"; sha256="0x7q5rl02ih0zmjfzvsc1vmn7s7yzdkf2gbmzc3mh7qadwpnf89p"; depends=[Rcpp]; };
   fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; };
@@ -8244,28 +8571,31 @@ in with self; {
   fpop = derive2 { name="fpop"; version="2019.08.26"; sha256="1gz5db9hlkvzkp5y7zzn9h57qz7ilpdyxyf05vy9kxbj36kgc19n"; depends=[]; };
   fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
   fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; };
-  fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; };
+  fpp2 = derive2 { name="fpp2"; version="2.4"; sha256="15s4isc1l8759868n228r3wb1aw0psicas1ggsf1md2rjq0hq7n5"; depends=[cli crayon expsmooth fma forecast ggplot2 magrittr purrr rstudioapi]; };
   fpp3 = derive2 { name="fpp3"; version="0.3"; sha256="0nwjr3hi3ijf44iqwx769hcfzp1kccw7w0lqakdv499k6gybky1b"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata urca]; };
   fptdApprox = derive2 { name="fptdApprox"; version="2.2"; sha256="10f9n6cx5n6djblj97a2zw4khaj3phchmq4l8gk2fy535jjqaqlr"; depends=[]; };
   fracdiff = derive2 { name="fracdiff"; version="1.5-1"; sha256="1dhfjlhr9sb38qgpsx0sm73l9lgc13d0fk32l7fmjfnalhr3n45q"; depends=[]; };
   fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; };
   fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
   fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; };
+  fracture = derive2 { name="fracture"; version="0.1.2"; sha256="1ankyzasm73ijniq9f70ca9j5my60rhkp5hy9mzf64rxnll1mpsi"; depends=[Rcpp]; };
   fragility = derive2 { name="fragility"; version="1.1"; sha256="0gjxc4bykqjmj54mxjh27bzkbf8ydrzzzlb7xnq9jljmr139zhyk"; depends=[metafor netmeta plotrix]; };
   frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
   frailtyHL = derive2 { name="frailtyHL"; version="2.3"; sha256="115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g"; depends=[cmprsk Matrix survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="3.3.0"; sha256="15930514k9mq6v43lk4bzbrp7n1n7kn0fpsi6qch0379kzl3lba3"; depends=[boot doBy jsonlite MASS nlme rhandsontable rootSolve shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; };
+  frailtypack = derive2 { name="frailtypack"; version="3.3.2"; sha256="1prj0y4skavzjh3w9zxf3vcmcdlkvg2ysshgr65ln9hzn281zqn0"; depends=[boot doBy MASS nlme rootSolve shiny statmod survC1 survival]; };
   frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; };
   frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; };
   franc = derive2 { name="franc"; version="1.1.2"; sha256="1bhszr0g0blx0jmdwxkicn1zz1fhfgyhzsncgy3181i987429gdg"; depends=[jsonlite]; };
   frapplot = derive2 { name="frapplot"; version="0.1.3"; sha256="12924szk2p0582nv97gi8pxrbv41zqpjryc6jqgg4llhp7ydz7xf"; depends=[]; };
   frbs = derive2 { name="frbs"; version="3.2-0"; sha256="0biv6j31qi0f4i063ygmbp6v6ws1nxijn5kyhg5sz1rnbr0msl28"; depends=[]; };
-  frechet = derive2 { name="frechet"; version="0.1.0"; sha256="1x5wmq704pxvsp22y6k12c2s46hhrd6finiy2q8hgvd9ss10r1b7"; depends=[corrplot fdadensity fdapace Matrix pracma rosqp]; };
+  frechet = derive2 { name="frechet"; version="0.2.0"; sha256="1006mgy9avwkwy0666maac59xp4j27wq5yy3pwc3h1r05myxw379"; depends=[corrplot fdadensity fdapace Matrix osqp pracma]; };
+  fredr = derive2 { name="fredr"; version="2.0.0"; sha256="1x5bw5zpippcxbxn2nv5925fbx5992hkmmzg8bcdxs2vff3mrpag"; depends=[httr jsonlite rlang tibble]; };
   freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; };
+  freedom = derive2 { name="freedom"; version="1.0.1"; sha256="1mrdl2cqdm2c68lx7lyixgiqw6xzwnx9c8j5q4annhiz107i9i22"; depends=[]; };
   freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; };
-  freesurfer = derive2 { name="freesurfer"; version="1.6.7"; sha256="1wk0xjx0a99zm7gdn7i5z92wmqnlzng6n6g8w9whxvmy0rq6i19j"; depends=[neurobase R_utils reshape2]; };
-  freesurferformats = derive2 { name="freesurferformats"; version="0.1.11"; sha256="0n5spc021dr15qz1prg76xfn814x9bgfczxc69qdpjz8q4f0cacg"; depends=[pkgfilecache xml2]; };
+  freesurfer = derive2 { name="freesurfer"; version="1.6.8"; sha256="0ks6ms5vp38pykcg66w960nmfgq383iprrbbzw5dlx9xnrx4yhbh"; depends=[neurobase R_utils reshape2]; };
+  freesurferformats = derive2 { name="freesurferformats"; version="0.1.13"; sha256="17lfrcjfbw3v2n04q0xxrpp17fy4iqhm469vd89j8j7cnbsnk5yl"; depends=[pkgfilecache xml2]; };
   freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; };
   frenchCurve = derive2 { name="frenchCurve"; version="0.1.0"; sha256="1b8lkmhydz4jq8h5p117fwaygbsillzcfx0p7w0ljj8b8v57r6l9"; depends=[sp]; };
   freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; };
@@ -8274,9 +8604,10 @@ in with self; {
   freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; };
   freqtables = derive2 { name="freqtables"; version="0.1.0"; sha256="0d2yibb8689786icfladxfm51sqng909wigvqmwij9lkqq14rd80"; depends=[dplyr rlang stringr]; };
   frequency = derive2 { name="frequency"; version="0.4.0"; sha256="1m3hrbkspnmcl956f7m4fpfd980qdxmyagsm5kd79dzh3qka2xly"; depends=[DT ggplot2 gtools knitr rmarkdown]; };
-  frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.2"; sha256="1mn20isy146ya4i33xxszmhvdwqkkg0cd18002mq8bvnkb65fxd2"; depends=[knitr pbapply urca vars]; };
+  frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.3"; sha256="1yzpgflldcdsd5kj0jpyj0vwx25f3l0x344glbrwvlwgdax9dkg8"; depends=[knitr pbapply urca vars]; };
   frequentdirections = derive2 { name="frequentdirections"; version="0.1.0"; sha256="0rmifh221c8z3cqyqg0bfxnih9f64hvv98jz44i6grnlablfwwgw"; depends=[ggplot2]; };
   fresh = derive2 { name="fresh"; version="0.2.0"; sha256="1787mm6w2s5x9scxy7r9cb77rgpmy4ngwkn4z8g3gs48mrab4bd9"; depends=[htmltools rstudioapi sass shiny]; };
+  friends = derive2 { name="friends"; version="0.1.0"; sha256="164p9g07vq3xs2lgg250yvzca4b0mp81pqbnjfdkzcqh5hmahsan"; depends=[tibble]; };
   frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; };
   frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; };
   frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; };
@@ -8287,62 +8618,67 @@ in with self; {
   frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; };
   frostr = derive2 { name="frostr"; version="0.2.0"; sha256="1bsgdskdbyryq7jvhnb4z4xb1m5vadqv00qjlkgp41xh71wp2brs"; depends=[httr jsonlite tibble tidyr]; };
   frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
+  fruclimadapt = derive2 { name="fruclimadapt"; version="0.4.4"; sha256="19siwjjcjh0kh2wpbabgzjwrfgg2al0g7d4z91wdcp3spwx308vk"; depends=[data_table lubridate tidyverse zoo]; };
   fs = derive2 { name="fs"; version="1.5.0"; sha256="15rqc3ljmcmgfvadj1j1kq7kvibagxic8sgplhlcdqqxax9idprn"; depends=[]; };
   fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; };
-  fsbrain = derive2 { name="fsbrain"; version="0.3.0"; sha256="01jvlml8id64c7n4zr3ggkknv0nky8fap4cd3xi54rvdknhqsjwa"; depends=[data_table fields freesurferformats pkgfilecache reshape rgl squash]; };
+  fsbrain = derive2 { name="fsbrain"; version="0.4.0"; sha256="1cq9hq7q11di3a967bsdj43mkmywvzxsacv4ndqm1dz6gn9dww5q"; depends=[data_table fields freesurferformats pkgfilecache reshape rgl squash]; };
   fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; };
   fsdaR = derive2 { name="fsdaR"; version="0.4-9"; sha256="1iaqqdwhh29fhq4r64adfrjmsyzq4v60bz9111vkazj4kr45wxxv"; depends=[ggplot2 rJava rrcov]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
   fslr = derive2 { name="fslr"; version="2.24.1"; sha256="1psjqvjv8krlkj7dcfwygz563a4cpn7h21z330hxh5q10rwhabi8"; depends=[neurobase oro_nifti R_utils]; };
+  fsn = derive2 { name="fsn"; version="0.1"; sha256="1a5vsrk9l19rh46kxrfmgcv07l0pr4zn1q2f0chivq43pwmfm194"; depends=[Rfast]; };
   fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; };
   fssemR = derive2 { name="fssemR"; version="0.1.6"; sha256="1l80anvlf21kvwb95w5mn0i2q773z0vbznx1lqvgsawprhcdiv20"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; };
-  fst = derive2 { name="fst"; version="0.9.2"; sha256="11r35v8irv6a4gnbw06wrlipsrqq2m86dmcfijp5k07n59hgipi3"; depends=[Rcpp]; };
+  fst = derive2 { name="fst"; version="0.9.4"; sha256="0vwclzxww8mw9nnpyj29bn71mrr8jjg7ka03979h9rbzw6d9bjrr"; depends=[Rcpp]; };
   fstcore = derive2 { name="fstcore"; version="0.9.4"; sha256="1gdjwkq7i3hrnazsj8sqsalkfiz35397azlprngmn2n704ql0vch"; depends=[Rcpp]; };
   fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; };
   ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; };
-  ftExtra = derive2 { name="ftExtra"; version="0.0.1"; sha256="0zgz4sjxx6ls27afb9djmxvwq46pp5jwxxbb87wnjc9fn5vvnnxy"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tidyr tidyselect]; };
+  ftExtra = derive2 { name="ftExtra"; version="0.1.0"; sha256="00kldzc0r41hsd3s8403l3z1r7frnl09y7q33wjzwkq4s89h5q48"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tibble tidyr tidyselect xfun yaml]; };
   ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
+  ftrCOOL = derive2 { name="ftrCOOL"; version="1.1.0"; sha256="0agl01djp1zkzgiqlpnmrpd7qgysabbmclw2vv5a52x0hgk9iqgy"; depends=[]; };
   fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; };
-  ftsa = derive2 { name="ftsa"; version="5.8"; sha256="1mzhzc2x8xqlzf3qchjf94dwhnig0y23900iyh2bzjpy5wi8c58d"; depends=[colorspace e1071 ecp fda forecast MASS pcaPP pdfCluster rainbow sde strucchange]; };
+  ftsa = derive2 { name="ftsa"; version="6.0"; sha256="06g6qmz7qagm0izvq5d85h0hy851idpk7wi1hapw8xcl596irgf6"; depends=[colorspace e1071 ecp fda forecast MASS pcaPP pdfCluster rainbow sde strucchange]; };
   ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; };
   fuel = derive2 { name="fuel"; version="1.2.0"; sha256="0pzb77g6l8cz5p7y6czck23kp7hs5zp78k87b5yh0avjlr7ads74"; depends=[]; };
   fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; };
   fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
   fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; };
   fullfact = derive2 { name="fullfact"; version="1.3"; sha256="1dy5ppa22i9axqcwx2184qv2vjcbml0yh5b89zx9rg2zsnv4ygym"; depends=[afex lme4]; };
-  fulltext = derive2 { name="fulltext"; version="1.5.0"; sha256="0yxy37c7xpp86jqpa9k8i23pa0hqww5q10jd3k1gn2m0va702yz7"; depends=[aRxiv crminer crul data_table digest hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; };
-  fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; };
+  fulltext = derive2 { name="fulltext"; version="1.6.0"; sha256="1zbfzyr5icwrgrb6zpng16z46ain6rf91j9sxw99p2ha4mkj200r"; depends=[aRxiv crminer crul data_table digest fauxpas hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; };
+  fun = derive2 { name="fun"; version="0.3"; sha256="09601ma4irmpkgjspq6zmr383m1pbgyfdkf7gw8w8gp0q7ab89aq"; depends=[]; };
   funData = derive2 { name="funData"; version="1.3-5"; sha256="0qz6kywd6xp292yvzf5znpw0qd02zadmp29jd1kchnydbf3sk0mh"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
-  funGp = derive2 { name="funGp"; version="0.1.0"; sha256="03khkwdq2kc7wxr7jr50kms4w63w6iz90431d960dg4s0gff29h8"; depends=[doFuture foreach future knitr microbenchmark progressr qdapRegex scales]; };
+  funGp = derive2 { name="funGp"; version="0.2.1"; sha256="0rby13vna776ffkdsc5pnci54k7g4493lz7f0d66g72siylxxy9c"; depends=[doFuture foreach future knitr microbenchmark progressr qdapRegex scales]; };
   funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; };
   funLBM = derive2 { name="funLBM"; version="2.1"; sha256="1phxqjri4pb65lfx6nbldvqq61cw1n0gjq5pckry3sjzylsmz5bi"; depends=[abind fda funFEM ggplot2]; };
   funModeling = derive2 { name="funModeling"; version="1.9.4"; sha256="1zhmazw77phcdwj9wwxpwjfhwd8wyjc538acqiwq9f6sz8fw1cbb"; depends=[cli dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales stringr]; };
-  funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; };
   func2vis = derive2 { name="func2vis"; version="1.0-1"; sha256="1d2dy7icrgp47szmizhk9x5azsynsv1qp6igxia2mlzkfbk27ffz"; depends=[devtools ggplot2 ggrepel igraph]; };
   funchir = derive2 { name="funchir"; version="0.2.0"; sha256="1rj5khv1xcaaip5xh8kcsp2jgmbmnc9q5kwr46l4mxvxyndndi1k"; depends=[data_table]; };
+  functClust = derive2 { name="functClust"; version="0.1.6"; sha256="0mdfxvrx3wk497a9bbkwnzbm6hm2s4wqs3h09m3hj48ybpqmhz9i"; depends=[clusterCrit multcompView]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
+  functiondepends = derive2 { name="functiondepends"; version="0.2.1"; sha256="0i6ppm5xz1m3m29lvz4nqm31k33w18j8af160lalgc01i1n4n11c"; depends=[dplyr magrittr purrr stringr tibble tidyr tidyselect]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
   funest = derive2 { name="funest"; version="0.0.1.3"; sha256="1pi556klfnbmrsx5c0f3v4hdn5m4dxxm71ijivanpwfqnfls8xh3"; depends=[funData MFPCA pec prodlim purrr ranger Rdpack survival tdROC]; };
   fungible = derive2 { name="fungible"; version="1.96.3"; sha256="1c8yc7mazvir42vq27f5bascbaswqx84qhf1r7kwkm72cxg4m1j2"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; };
   funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; };
   funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; };
   funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; };
-  funprog = derive2 { name="funprog"; version="0.2.0"; sha256="1gs0mahvzgnv5pfvz32acq0jk3rnssg6bxqzlqpyqg0r3g4m80mf"; depends=[]; };
+  funprog = derive2 { name="funprog"; version="0.3.0"; sha256="1n064gf03z70iapwscrrzhl71qh7cgnb3ch1r04h3b944b4yiain"; depends=[]; };
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
   funrar = derive2 { name="funrar"; version="1.4.1"; sha256="0xqccch59f8cz4a7ybjdr6k625bir5nsjrp4iyfirrb877d17m5z"; depends=[cluster]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
-  funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; };
+  funtimes = derive2 { name="funtimes"; version="7.0"; sha256="0p0j9xsxz8fl4n0y6dchm0xr2gwc6v657wqx9qhbvb0r2wljizc6"; depends=[dbscan Jmisc Kendall Rdpack]; };
   furniture = derive2 { name="furniture"; version="1.9.7"; sha256="1czc1ayfpqf6h7n5fjzx1vwkzm9vg1dr62hl5k511b9kdc8lfsfh"; depends=[dplyr knitr magrittr]; };
-  furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; };
+  furrr = derive2 { name="furrr"; version="0.2.1"; sha256="16s6sgfgh1ayzhf3kvpy9vhsd5h6p57waj1xgbksgdmf4j1wkcq7"; depends=[ellipsis future globals lifecycle purrr rlang vctrs]; };
   fusedest = derive2 { name="fusedest"; version="1.3.1"; sha256="1nz5bkvn8y9f8h0ya6wblryg7bwj1vnz1vyqmd1hfr85bxfgl83c"; depends=[igraph Matrix Rcpp RcppEigen]; };
   fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
+  fusionchartsR = derive2 { name="fusionchartsR"; version="0.0.1"; sha256="1dfn4c1fyrzyi9pn30ha41sybabcr9ss5z2s3jgg4gs4kn2s6bak"; depends=[htmlwidgets jsonlite magrittr]; };
   fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; };
   futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; };
   futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; };
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
   futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; };
-  future = derive2 { name="future"; version="1.18.0"; sha256="01fp8kgjf0k6c83q1w3dy9z90g72cc9d0004d1qw6n1j65nwxg4f"; depends=[digest globals listenv]; };
+  future = derive2 { name="future"; version="1.21.0"; sha256="0bfiy17n5rghxw0702k0vgpjkk13268lniifdlx59flf0q16d7lh"; depends=[digest globals listenv parallelly]; };
   future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.2"; sha256="08lh1sp0v1vagi34s218a1ygj63whkf3s9w0kyf25v64gsdavkzc"; depends=[BatchJobs future R_utils]; };
   future_apply = derive2 { name="future.apply"; version="1.6.0"; sha256="1zbfycjfvxnrigm6l2fd2zgnw96g0apiw426c73gkv3xv7bdy6ms"; depends=[future globals]; };
   future_batchtools = derive2 { name="future.batchtools"; version="0.9.0"; sha256="1srcc4vv9nm49nq8llxik9ys4f45lz2shwlc4l9wp0zmxinzi3sr"; depends=[batchtools future]; };
@@ -8359,20 +8695,20 @@ in with self; {
   fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; };
   fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; };
   fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; };
+  fxTWAPLS = derive2 { name="fxTWAPLS"; version="0.0.4"; sha256="1rf16rl3g71i8fr5gvv7nizvhbafw4ip8x4b2i6m3vxgf10wl293"; depends=[doParallel foreach geosphere ggplot2 MASS tictoc]; };
   fxregime = derive2 { name="fxregime"; version="1.0-4"; sha256="0ml1q0xp90jfng6a60pfkp6j7wajk6pz4p4wm08rfqikgsdvp0m4"; depends=[car sandwich strucchange zoo]; };
   fxtract = derive2 { name="fxtract"; version="0.9.4"; sha256="0nhgk68rbk05sz8knyy6f2rj7bnbiq8mfchl5j8jin36nvxbzls9"; depends=[checkmate data_table dplyr future_apply magrittr R6]; };
-  fy = derive2 { name="fy"; version="0.2.0"; sha256="0s8wqzzdd3sw5nfzap482382p252h5l0fx2bm6vi48zhg4pkgkc1"; depends=[data_table fastmatch hutils]; };
+  fy = derive2 { name="fy"; version="0.3.0"; sha256="13803ld4b59ly5h3zlianag9901jyw6p70bsyz5dj7k62hg7ha3s"; depends=[data_table fastmatch hutils]; };
   g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
   g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; };
-  g3viz = derive2 { name="g3viz"; version="1.1.2"; sha256="1rra2n8b6mimwpsdpjnvpfl3hh0nv1xyzmggpz9xydilv7lybinz"; depends=[cgdsr htmlwidgets jsonlite stringr]; };
+  g3viz = derive2 { name="g3viz"; version="1.1.3"; sha256="0nng2534kr8qpqxlyji093fc7929f1ra9gib8hjvh5y6xdgjzavm"; depends=[cgdsr htmlwidgets jsonlite stringr]; };
   gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
-  gDefrag = derive2 { name="gDefrag"; version="0.2"; sha256="0z2jbb53x0knxajap1f2w25s732xqy1fyayxh2mzlbhm0zf3pjjw"; depends=[igraph maptools rgdal rgeos sp]; };
+  gDefrag = derive2 { name="gDefrag"; version="0.3"; sha256="016vpj03drygxsa06jin225rfgjvjm938x65990ms15xcwrgv8nb"; depends=[igraph maptools rgdal rgeos sp]; };
   gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; };
   gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; };
   gMCP = derive2 { name="gMCP"; version="0.8-15"; sha256="01048j9489rrhv9syqrbw4c5i5gsll41ysm27awxw6l1rshbqsqn"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; };
   gMOIP = derive2 { name="gMOIP"; version="1.4.3"; sha256="0zk2m81kbsb40bjgvv29cl7azr2kfa528ph1lhrp88zsiv3hv3py"; depends=[dplyr geometry ggplot2 ggrepel MASS Matrix plyr purrr Rfast rgl rlang]; };
   gMWT = derive2 { name="gMWT"; version="1.1.1"; sha256="1vbw548fyrf012ry54p3gybdsil8c9llg2r9njhsiy7rb0gz2613"; depends=[clinfun Rcpp RcppArmadillo]; };
-  gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
   gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
   gProfileR = derive2 { name="gProfileR"; version="0.7.0"; sha256="1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k"; depends=[plyr RCurl]; };
   gRain = derive2 { name="gRain"; version="1.3-6"; sha256="0l95yvv3ig11k71xkvh0ivvkan4hvpmjsa12yg1laaaqiaqzzxnm"; depends=[graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; };
@@ -8381,14 +8717,14 @@ in with self; {
   gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; };
   gRim = derive2 { name="gRim"; version="0.2.5"; sha256="0m3lc42r6qd6kps3y7jz11ry4886cc87ld1s1phypna98qjy6gky"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; };
   gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
-  gSeg = derive2 { name="gSeg"; version="0.7"; sha256="0np15vsnnksd59gzwk64fyjcawmrjq1n0rbjiw56zhsn19gkjx25"; depends=[]; };
+  gSeg = derive2 { name="gSeg"; version="1.0"; sha256="0lixlirisnxk29zlrragi3l8j1abb5cl7zh6vhx7l5hjdvh8ldq9"; depends=[]; };
   gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; };
   gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; };
-  gWQS = derive2 { name="gWQS"; version="3.0.0"; sha256="0q7kr564jm1sv8kcp9mx2q5v7083zp25fsbndmdpkd1pw2jxhgd3"; depends=[broom cowplot dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC pscl reshape2 rlist]; };
+  gWQS = derive2 { name="gWQS"; version="3.0.1"; sha256="0nmzd17yqsazkszsz3nqmc8minvq1myw5rxal45rhgdh71l8iwrn"; depends=[broom cowplot dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC pscl reshape2 rlist]; };
   gWidgets2 = derive2 { name="gWidgets2"; version="1.0-8"; sha256="0p6lav6lrwgsw29sl8vshzgi8j2smcavx047qq31s9bsn2dcw58n"; depends=[digest]; };
   gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; };
   gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-6"; sha256="0arh0yxx63m4df1ccrv0q3vkjncwv3ink8vkalp6ashi2932yfma"; depends=[digest gWidgets2 memoise]; };
-  gadget2 = derive2 { name="gadget2"; version="2.3.5"; sha256="1v1qg6rj3q09vkwhj5l3ijzyrgdp36fxkpv55q7l22b47b2krv17"; depends=[]; };
+  gadget2 = derive2 { name="gadget2"; version="2.3.7"; sha256="1p7jpwy65gdl6kli1h2m9yi5p5ah1vm23xs03sm9l42fcbn7ffdw"; depends=[]; };
   gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; };
   gaiah = derive2 { name="gaiah"; version="0.0.4"; sha256="1ibsbmmpagr7ix1c3bszrglqx95w44qyfy80vcq3w2dprs8vrrw6"; depends=[dplyr geosphere magrittr maptools raster rlang sp]; };
   gainML = derive2 { name="gainML"; version="0.1.0"; sha256="1mqhrdjdmc2n7dxilxkqn6xq7z0qnxpigw5bbffnjvvsmdamah0n"; depends=[fields FNN]; };
@@ -8402,11 +8738,12 @@ in with self; {
   gambin = derive2 { name="gambin"; version="2.4.4"; sha256="1kxxc17hva0r9wibh14w1r7g67q1nj71vrpdx4vkbsjz0lj67nzm"; depends=[doParallel foreach gtools]; };
   gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1.1"; sha256="1zrmn2r9814q37nmc29p9lyvpgrz6q7pwby5h37ldsxzzwxqz1ig"; depends=[mboost stabs]; };
   gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
+  gamclass = derive2 { name="gamclass"; version="0.62.3"; sha256="0i2nynl4b46rdl8f2zashcg0dvlhcq9paq8hx5y40xpxm8iljqab"; depends=[lattice latticeExtra randomForest rpart]; };
   gameofthrones = derive2 { name="gameofthrones"; version="1.0.2"; sha256="10ns4yl1s8adlf334gl8yararj1fpxbg3gy7h69s554m4h878awk"; depends=[ggplot2 gridExtra MASS]; };
   games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
   gamesGA = derive2 { name="gamesGA"; version="1.1.3.7"; sha256="0km0z2haqgykl01xkzsbkpwibavgqfjygx7cg08ni68gw501689l"; depends=[shiny]; };
   gamlr = derive2 { name="gamlr"; version="1.13-6"; sha256="1b2vpqwr63nh3slpm3ha8w2mxnzhg5yv8f5afja58k9db77kciad"; depends=[Matrix]; };
-  gamlss = derive2 { name="gamlss"; version="5.1-7"; sha256="0ywqwsp4k6jgnicp1gdsglji61l5cnackl52700v8kmkk83bq4c8"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
+  gamlss = derive2 { name="gamlss"; version="5.2-0"; sha256="1q82md0439si0n7vqbbbdk45sjr0ad7i8mgrn3kwnr4h213pb4nk"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
   gamlss_add = derive2 { name="gamlss.add"; version="5.1-6"; sha256="0g80bn0nszs2nmka6dypyvqnsgxp7mzhf5nd82n5x4jm3ca3dbdj"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
   gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; };
   gamlss_countKinf = derive2 { name="gamlss.countKinf"; version="3.5.1"; sha256="1xalp909gxxhyhh4chlr1ssyfhydhw1w3szzbynajji98576zaqv"; depends=[gamlss gamlss_dist]; };
@@ -8414,15 +8751,15 @@ in with self; {
   gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; };
   gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-7"; sha256="0nzgq3rnziy0i2zxn88hqy3pakpyin2m2csk9j3zg39si66c6wcq"; depends=[MASS]; };
   gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-1"; sha256="0m091zxjm5wvhm6mzbpzkr275n3qnlb3v4099k0a1jymahk4w7vr"; depends=[gamlss gamlss_dist]; };
-  gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; };
+  gamlss_mx = derive2 { name="gamlss.mx"; version="6.0-0"; sha256="0b06nb6nq36ay0p5z57j5d4hrly5917wcsal7986mp1270iwnpip"; depends=[gamlss gamlss_dist nnet]; };
   gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
   gamlss_spatial = derive2 { name="gamlss.spatial"; version="2.0.0"; sha256="1pgmlc6i7p5mjb1pc7b861yjl2gwr37bbzj3j2dl0qzybrs742mx"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; };
   gamlss_tr = derive2 { name="gamlss.tr"; version="5.1-7"; sha256="0drimqfy22v3lbb6wclia9dkij2r1r4syz9i74fhn07qxay7b6cg"; depends=[gamlss gamlss_dist]; };
-  gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; };
   gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; };
   gamm4 = derive2 { name="gamm4"; version="0.2-6"; sha256="128c725y9s07c1m9cvd9hgi9hldrymcs5divd8pw7bdjh9jvdiap"; depends=[lme4 Matrix mgcv]; };
   gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; };
   gammSlice = derive2 { name="gammSlice"; version="2.0-2"; sha256="1klxg1yhmfaz1zjnw1kxl1lm5plkakqh014rpkak2lj8zgf8qnyy"; depends=[KernSmooth lattice mgcv]; };
+  gamma = derive2 { name="gamma"; version="1.0.0"; sha256="19cqg8c3x89xydkf91vk3k13mi9nw82xhv6zc4naiwjxnvrwfi16"; depends=[ggplot2 IsoplotR rlang rxylib]; };
   gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; };
   gamsel = derive2 { name="gamsel"; version="1.8-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; };
   ganalytics = derive2 { name="ganalytics"; version="0.10.7"; sha256="03jf7325cgg5p6lzcrzzzx0b40vf3l5vhw95lih098kpmlr1zadf"; depends=[assertthat googleAnalyticsR httpuv httr jsonlite lazyeval lubridate plyr R6 rvest scales selectr stringr tibble XML xml2]; };
@@ -8432,22 +8769,27 @@ in with self; {
   gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; };
   garchx = derive2 { name="garchx"; version="1.1"; sha256="1pw8igjimralggkcfynnp4fcc0wqb5rhkk7x3ymj9ysgif8fnfgj"; depends=[zoo]; };
   gargle = derive2 { name="gargle"; version="0.5.0"; sha256="1fykmiv3x8c9ai31r9wr7qcca51h6kqn9cgwbxvxfj15fhwskh4n"; depends=[fs glue httr jsonlite rlang withr]; };
-  garma = derive2 { name="garma"; version="0.9.2"; sha256="0mln1v0qz588jv8k0v3jy0b5lw3pz7mysdcnmkihqs7zd1f7vkgs"; depends=[assertthat FKF forecast ggplot2 lubridate nloptr pracma Rdpack Rsolnp signal zoo]; };
+  garma = derive2 { name="garma"; version="0.9.6"; sha256="03nf6nncikva8yw8hmmrsh9wy2ncr2v2dq1pr4xb360sqds5d028"; depends=[crayon FKF forecast ggplot2 lubridate nloptr pracma Rsolnp signal zoo]; };
   garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; };
   gaselect = derive2 { name="gaselect"; version="1.0.9"; sha256="089gyllcmq5rgf5yffclifc7rc8rmq4wk1dhznigxkij4zap67hx"; depends=[Rcpp RcppArmadillo]; };
   gasfluxes = derive2 { name="gasfluxes"; version="0.4-4"; sha256="0gi0zk0h5rw75n6znada0cwa9qzy8higsiiqwgdm3q827j1x8iva"; depends=[AICcmodavg data_table MASS sfsmisc]; };
   gasper = derive2 { name="gasper"; version="1.0.1"; sha256="1dyrf1i1algzaafjs374xi3j787id6nqx7f0ha2wmisd2ax92jw0"; depends=[ggplot2 Rcpp RcppArmadillo rwavelet scatterplot3d]; };
   gastempt = derive2 { name="gastempt"; version="0.5.1"; sha256="1ycyk1a643vd4cdxinjvb194mxjp5p1hwmlda6x8qy0yhky0ibhw"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen rstan shiny StanHeaders stringr tibble]; };
-  gaston = derive2 { name="gaston"; version="1.5.6"; sha256="1bx6iqfjb9lf3vn0z7v8wjv9m7issvqsnymm4qsgl3622s6qz6rg"; depends=[Rcpp RcppEigen RcppParallel]; };
+  gaston = derive2 { name="gaston"; version="1.5.7"; sha256="14z94dpln4dvgrv2w7w9ik7h6rpvbf02qhq1hqzx8c2cndzxr21i"; depends=[Rcpp RcppEigen RcppParallel]; };
+  gateR = derive2 { name="gateR"; version="0.1.4"; sha256="1ify8baw5n10bbb66q7lz60m036p846msrh2hiysg6xs7fvxdayf"; depends=[fields maptools pgirmess raster sp sparr spatstat tibble]; };
   gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; };
+  gauseR = derive2 { name="gauseR"; version="1.0"; sha256="125jjd7s9wkx93isgrr3d6bkdmdf1x7000pbj9y634wd1jx8akgd"; depends=[deSolve]; };
   gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
-  gausscov = derive2 { name="gausscov"; version="0.0.4"; sha256="1fq2r7ibhnq26xa3hqyshr0m85a7gzkfagi6lsr36di26ixipwh8"; depends=[]; };
+  gausscov = derive2 { name="gausscov"; version="0.0.10"; sha256="05xs8wj9yak6mrp1381z0safwlm1p84dc36dc0mjbranmisxf675"; depends=[]; };
   gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; };
+  gaussplotR = derive2 { name="gaussplotR"; version="0.2.0"; sha256="12kz9qb78wss1lfijd3vw54i0fr8k2smsidmm2hw2d5vwzrf0bwi"; depends=[ggplot2 metR]; };
   gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; };
+  gawdis = derive2 { name="gawdis"; version="0.1.2"; sha256="0x9g8949ik4065l46k3lssnyadk0wyw816skpfqg0nv8z4hq77cz"; depends=[FD GA]; };
   gazepath = derive2 { name="gazepath"; version="1.3"; sha256="1sv0vdwzmvpnj2k8lphnf4y12fi5md0j2725fjkv1n7a3dkd6faa"; depends=[jpeg scales shiny sp zoo]; };
   gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; };
   gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
-  gbfs = derive2 { name="gbfs"; version="1.3.3"; sha256="14xpsbk9lcmpwf5dmwkcjdd07y2c7jb1m9c031scrzhw4p4gd71h"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; };
+  gbeta = derive2 { name="gbeta"; version="0.1.0"; sha256="0611rynyybmiq6pj5jvwijdgx3hnr6mscv20lrqzlfplbmvmz0bj"; depends=[gsl Rcpp RcppEigen RcppNumerical Runuran]; };
+  gbfs = derive2 { name="gbfs"; version="1.3.5"; sha256="0n8wjzq2ip4skipvca1sxh8wxag5fm2gd70dsjbz73gik06fdx70"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; };
   gbm = derive2 { name="gbm"; version="2.1.8"; sha256="1h9f4ww9yc3nsvghgr2q7jjrlz29ibabxjbax1sk5wmqh2wy6pbx"; depends=[lattice survival]; };
   gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; };
   gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; };
@@ -8464,13 +8806,14 @@ in with self; {
   gclus = derive2 { name="gclus"; version="1.3.2"; sha256="1cz0g0i972955hhaji30rx8448x7f3as7z1sww9i5h86ybgirilw"; depends=[cluster]; };
   gcmr = derive2 { name="gcmr"; version="1.0.2"; sha256="0mh542na2byb4aha548lfkzllfnk4rmzcm23jm6642pndvxpnfmj"; depends=[betareg car Formula lmtest nlme sandwich sp]; };
   gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
+  gconsensus = derive2 { name="gconsensus"; version="0.3.0"; sha256="19xfxmnxqlxbziblpr318zix0i3h84498i5vgzz5ynwdi89xyjxl"; depends=[coda MASS rjags]; };
   gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; };
   gdalUtilities = derive2 { name="gdalUtilities"; version="1.1.1"; sha256="11i97ahbqggd5zgr4w57ys3xmwhymbbfmd2w2yrg4riwhsbpxwyy"; depends=[raster sf]; };
   gdalUtils = derive2 { name="gdalUtils"; version="2.0.3.2"; sha256="0krapdy50nd5dvcdflz39dzxpig3zklng3hgxavqg2nvwazalvsc"; depends=[foreach R_utils raster rgdal sp]; };
-  gdalcubes = derive2 { name="gdalcubes"; version="0.3.0"; sha256="0qwn6hdd2f84n10vgawgfv4lkpb91ywqmzi2b945r3nbfh8d5pbl"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; };
+  gdalcubes = derive2 { name="gdalcubes"; version="0.3.1"; sha256="0yng7ixfwyry8f6v6zdkd1f1z8ac35n7mxwyb8ngrkb5jd6h2mcc"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; };
   gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; };
+  gde = derive2 { name="gde"; version="0.1.4"; sha256="1ypax1gwi8f9fkfmbm5qb845b70ch44m19rw8spi34fn3yrbb17l"; depends=[data_table DBI dplyr DT ggplot2 httr jsonlite leaflet odbc progress R_utils readr rgbif shiny shinycssloaders shinyWidgets stringr XML]; };
   gdiff = derive2 { name="gdiff"; version="0.2-1"; sha256="11p3xx0gmqfjyl08znmnganhif0zi1c5kbbv9qkqayjbi3j79z86"; depends=[magick pdftools]; };
-  gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
   gdistance = derive2 { name="gdistance"; version="1.3-6"; sha256="093a29yb544gxldwxgkyfc9bhmz3by0pknnj1c666i6gz2rbxjic"; depends=[igraph Matrix raster sp]; };
   gdm = derive2 { name="gdm"; version="1.4.2"; sha256="1q2bmqrxlac72jdmaldf4m6cwv60aaxxqws518dcn83bs788mbcm"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
   gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; };
@@ -8482,23 +8825,23 @@ in with self; {
   gear = derive2 { name="gear"; version="0.3.4"; sha256="0ibn2kr0rjj546cbcqhr6x69s25xh7si5fri59055j42g62mdnxy"; depends=[autoimage optimx Rcpp]; };
   gee = derive2 { name="gee"; version="4.13-20"; sha256="167pzgnmj4cjc41ykps1mfwi6s7y32zxyycn5z17vn4v0pp4q0ak"; depends=[]; };
   gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; };
+  geeCRT = derive2 { name="geeCRT"; version="0.0.1"; sha256="1ldmpc3hakk1lcikrd45v7y7a7iaf7bbnqsrp4jc80pkw7y739vi"; depends=[MASS mvtnorm rootSolve]; };
   geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; };
   geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; };
-  geepack = derive2 { name="geepack"; version="1.3-1"; sha256="1pyn50pn18ffnraqjb6ncgh3a70c91wq4xyy8n5bva7153556cc2"; depends=[broom magrittr MASS]; };
+  geepack = derive2 { name="geepack"; version="1.3-2"; sha256="19kh0rvc961y836rfjmh1j42ygji2vp6yghl5d1agzg5yx03xdcr"; depends=[broom magrittr MASS]; };
   geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; };
   geex = derive2 { name="geex"; version="1.0.12"; sha256="0zqfd416wl6inr423xzxrnc0as0yrxfqy7fdjyc39i60kghfqyh3"; depends=[lme4 Matrix numDeriv rootSolve]; };
   geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; };
   geiger = derive2 { name="geiger"; version="2.0.7"; sha256="15lmgr1slak9sh35gka5wa4fszywdl9d1rqkbb2lpvfp99n7606j"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit phytools Rcpp subplex]; };
   gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; };
   gemlog = derive2 { name="gemlog"; version="0.41"; sha256="16pdhpx21avxjrawj7i47dxzz2wfhabzz5x3nln2pwaz5b147syz"; depends=[signal]; };
-  gemma2 = derive2 { name="gemma2"; version="0.1.1"; sha256="1kbjb5cjgrbdf695nz916w40a78zy5xjmr99l835iy27k3i2p61i"; depends=[Matrix readr]; };
+  gemma2 = derive2 { name="gemma2"; version="0.1.3"; sha256="1l5axji33abrkm2b32ziilhfqssbq4ypv7kimd16fak6xjz50m0k"; depends=[Matrix]; };
   gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; };
-  gemtc = derive2 { name="gemtc"; version="0.8-7"; sha256="1lwafhn99ndvs9skjwn8j910fjphl6pbhmbw1ni37aikgfnsdzpl"; depends=[coda forcats igraph meta plyr Rglpk rjags truncnorm]; };
+  gemtc = derive2 { name="gemtc"; version="0.8-8"; sha256="1bklrfpb6aqpk9rzlzfz8gx0hfvxpdqc5xb26pw0d6vcng9vmq2v"; depends=[coda forcats igraph meta plyr Rglpk rjags truncnorm]; };
   gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; };
-  gen3sis = derive2 { name="gen3sis"; version="1.0"; sha256="0sfdk8sr12br4r5jw4dx5biv3ss3bgnwlin9a34zx007d0dk1b03"; depends=[BH gdistance Matrix raster Rcpp sp stringr]; };
+  gen3sis = derive2 { name="gen3sis"; version="1.2"; sha256="0fkcgicyr1ahsgpnmfz6pwppbxzx5yaiswgb5nk4djxla3qf10k2"; depends=[BH gdistance Matrix raster Rcpp sp stringr]; };
   gen5helper = derive2 { name="gen5helper"; version="1.0.1"; sha256="0z7hisn57md18vcfb6f44hy6zzp9dirrjyxi4x1id3mqa3mligb6"; depends=[dplyr ggplot2 minpack_lm naturalsort plyr pracma rlang tidyr]; };
-  genBaRcode = derive2 { name="genBaRcode"; version="1.2.3"; sha256="0vhbf0hm9b414afwvdg5w4c1x8skz3idmz9hs45hqixabkqkkfpa"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; };
-  genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; };
+  genBaRcode = derive2 { name="genBaRcode"; version="1.2.4"; sha256="1y7rq2fvv2s7x054ribp2x6vsp8dh49dm43rhn9cp2fn4qf05f7r"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; };
   genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; };
   genTS = derive2 { name="genTS"; version="0.1.3"; sha256="1ky8h8yzqfkb91ny9z08gr7irzvjqr1b42k89ahcrmk458hjwgqr"; depends=[shiny]; };
   genalg = derive2 { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; };
@@ -8508,6 +8851,7 @@ in with self; {
   gender = derive2 { name="gender"; version="0.5.4"; sha256="0z8in0hgzkqngv2x3630lbbdw9in1qgirr01kag35bdqrdffh3d4"; depends=[dplyr httr jsonlite]; };
   genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; };
   gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; };
+  geneExpressionFromGEO = derive2 { name="geneExpressionFromGEO"; version="0.3"; sha256="010149xrnaxkmsxh44gjlmhrgg0b41nj10fzgqi21q1w98cks9kw"; depends=[annotate Biobase GEOquery]; };
   geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; };
   geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
   geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; };
@@ -8515,10 +8859,10 @@ in with self; {
   genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; };
   genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
   genepop = derive2 { name="genepop"; version="1.1.7"; sha256="0b36nspq3kkad52k0viw1pdsf7h9h5ivi0ix7zg8i0z7vkhnm0cy"; depends=[Rcpp RcppProgress stringr]; };
-  generalCorr = derive2 { name="generalCorr"; version="1.1.5"; sha256="1kjmg9paxhpd6csia69k169qgm8s388iysrjnm4bqv9zxn21zwwg"; depends=[lattice meboot np psych xtable]; };
+  generalCorr = derive2 { name="generalCorr"; version="1.1.8"; sha256="008r2jrcbcm11g4klcz3qjcfqhp6grzl8l2p8kfivyygkp29h7zh"; depends=[lattice meboot np psych xtable]; };
   generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; };
   generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; };
-  generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; };
+  generics = derive2 { name="generics"; version="0.1.0"; sha256="0qw7r0d2qvlj1pvrlpv30d6akml624ydxkk19hv85iv6pfyx2wdb"; depends=[]; };
   genero = derive2 { name="genero"; version="0.1.0"; sha256="0akwwy5xbh7s40v8dr1zr7jfglv0iyh4zn0sb0rnz4r57qr6nh8w"; depends=[]; };
   genesysr = derive2 { name="genesysr"; version="1.0.0"; sha256="05jp8z7313r5wi9a5yw7fh198l7nd2ywzwg4f23yp4kfrkkgawn5"; depends=[dplyr httr jsonlite]; };
   genetics = derive2 { name="genetics"; version="1.3.8.1.2"; sha256="1v0ylnia6c44v356dsmnkx6054vcxazpzsrdh3yph5ch5vg6gjrh"; depends=[combinat gdata gtools MASS mvtnorm]; };
@@ -8530,52 +8874,58 @@ in with self; {
   genlasso = derive2 { name="genlasso"; version="1.5"; sha256="07f0gqvngiyd3x01qxbqz7xrz10ck1cbypp51ldg8lg8ln1zw76y"; depends=[igraph Matrix]; };
   genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; };
   geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; };
-  genoPlotR = derive2 { name="genoPlotR"; version="0.8.9"; sha256="07901qv2lzzflda0p8qxmla6syvq2c9y230xipvn1i0p4izdqk5s"; depends=[ade4]; };
+  genoPlotR = derive2 { name="genoPlotR"; version="0.8.10"; sha256="17vlzp84vas7m9fcrjp5z6ys782kgvdljbfk559war8sgbbn4hb1"; depends=[ade4]; };
   genodds = derive2 { name="genodds"; version="1.0.0"; sha256="00sh561qcabcz5igcfvkjjila0qi2i5imj8cn0msa1gvqf27ps4d"; depends=[Rcpp]; };
   genogeographer = derive2 { name="genogeographer"; version="0.1.19"; sha256="0q56ysv5333i27iv1gmd9ilbgn3rw8sb9yq7z76gmn1fak5aqci8"; depends=[dplyr DT forcats ggplot2 knitr leaflet magrittr maps purrr readr rio rlang rmarkdown shiny shinycssloaders shinyjs shinyWidgets tibble tidyr]; };
   genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; };
   genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; };
   genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; };
   genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; };
-  genpathmox = derive2 { name="genpathmox"; version="0.4"; sha256="1d5mwci52qdnkfg9pxccc5fijzpc0q80zw76sjdfsf9lixxhwk4h"; depends=[diagram mice quantreg]; };
+  genpathmox = derive2 { name="genpathmox"; version="0.5"; sha256="06h8bwx2jzwc4jr4jvsjcph2svfg3s78vjmwjrliq3jynychd9mh"; depends=[diagram quantreg]; };
   genpwr = derive2 { name="genpwr"; version="1.0.2"; sha256="0k05l0d2qk2g3ic6f46xkhgy8ziwalrfx4nc0qi2k7i44kz720mg"; depends=[ggplot2 MASS nleqslv]; };
   genridge = derive2 { name="genridge"; version="0.6.7"; sha256="07mdkkq4j8i5x8d4yfsp2rfpf7gkcgdcsw9b2ng5f7gdnblrw0dr"; depends=[car]; };
   genscore = derive2 { name="genscore"; version="1.0.2"; sha256="0i1wg65cpyc7x1h8dbq0i6q8979lw15zhmn7zn1r8gj3nxl7my0b"; depends=[mvtnorm Rdpack stringr tmvtnorm]; };
-  gensemble = derive2 { name="gensemble"; version="1.0.1"; sha256="03ql1qxrxixr70hs9mwiqw92qyrg9pj4046pb42g435yncw321ad"; depends=[]; };
+  genset = derive2 { name="genset"; version="0.1.0"; sha256="02zldi136sfnq1i8pwb3b97zd44pjdgnfadk4bqp36wm8x95phwi"; depends=[]; };
   gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; };
-  gensvm = derive2 { name="gensvm"; version="0.1.3"; sha256="1r9vd6h3divmjd73p3541mngv452v1dkxc41q7mbkd5qhy34km74"; depends=[]; };
+  gensvm = derive2 { name="gensvm"; version="0.1.5"; sha256="1r0f3l6df1sn3vx5sjssx8p35lw100q0qz6v1fckdfw04z53g4im"; depends=[]; };
   geoBayes = derive2 { name="geoBayes"; version="0.6.3"; sha256="153a7kp73wxm5hzzq038p3mnykhakv0c9qa8fpbjijccmbi89970"; depends=[coda optimr sp]; };
+  geoFKF = derive2 { name="geoFKF"; version="0.1.0"; sha256="0fapxfckyhgs1lzaviicnrhmjzdlkxfg2ccn46zcrybqq995g9js"; depends=[numDeriv Rcpp RcppArmadillo]; };
   geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; };
   geoR = derive2 { name="geoR"; version="1.8-1"; sha256="1lvgkpvv4a05lsb1dgphpv733lxbpcj7p2bj1yjjbfch8n04f1lr"; depends=[MASS RandomFields sp splancs]; };
   geoSpectral = derive2 { name="geoSpectral"; version="0.17.5"; sha256="0bw8mv1kq27hql37zcalz3zjj57bhs7g724wfpvzav2rlzvs8n7f"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; };
   geoTS = derive2 { name="geoTS"; version="0.1.3"; sha256="12v50r2ym3nb21sskq7h4xsk6nzci06l9iync2ny91iwl7c9nrjc"; depends=[doParallel ff foreach iterators raster sp]; };
   geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; };
-  geobr = derive2 { name="geobr"; version="1.3"; sha256="0xgjlpxpdkh46gv4pz91hq1q6hxz1ikbfqh5g3xrzwf58hw6mz7h"; depends=[httr readr sf]; };
+  geobr = derive2 { name="geobr"; version="1.4"; sha256="0507p6iy8jry6yic4ijiqymk92har6585z6qd7lp6g8rr48r94ws"; depends=[httr readr sf]; };
   geocacheR = derive2 { name="geocacheR"; version="0.1.0"; sha256="04ckxmird6n179xvsx50cjdz046igjxxqdnz5pfxi8pdklnky20c"; depends=[dplyr magrittr stringr threewords tibble]; };
   geodaData = derive2 { name="geodaData"; version="0.1.0"; sha256="003m5wff0q4fdlg64qispmhj2aw83isxg3ijxwkwhvi33bpwpq4z"; depends=[]; };
   geodetector = derive2 { name="geodetector"; version="1.0-4"; sha256="00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l"; depends=[maptools rgdal rgeos sp]; };
-  geodist = derive2 { name="geodist"; version="0.0.4"; sha256="1hgc5dhb8knharx1v09rw1cppkvc1sc0w8wjf4d17b6nw3b3j9gq"; depends=[]; };
-  geodiv = derive2 { name="geodiv"; version="0.1.1"; sha256="0vww273947isk9ds6hjg9k47k8kbsbgyjap6iqgqyd9bl9437yrm"; depends=[dplyr e1071 phonTools pracma raster Rcpp RcppArmadillo rgdal rgeos sf sp spatial tibble zoo]; };
-  geodrawr = derive2 { name="geodrawr"; version="1.0.1"; sha256="1kbhbdmzp6gc861592xs9kbi1qrsfwq9lk2hbmlavajvil8zv445"; depends=[leaflet sf shiny shinydashboard]; };
+  geodimension = derive2 { name="geodimension"; version="1.0.0"; sha256="0mh16cdac7vi8zv98g3s06109fpadan441zd80x9yfsypx75sdz0"; depends=[dplyr generics magrittr pander readr rlang sf tibble tidyr tidyselect]; };
+  geodist = derive2 { name="geodist"; version="0.0.6"; sha256="1fc5gi8076j0hylcbbcwgf7syqgnqsj1p9sn655paixjsipm5ixq"; depends=[]; };
+  geodiv = derive2 { name="geodiv"; version="0.2.0"; sha256="173vi6zix358i06dimj8p16ph3jq0ddzi1ls4pv9qh0lk7x3a9ky"; depends=[dplyr e1071 phonTools pracma raster Rcpp RcppArmadillo rgdal rgeos sf sp spatial tibble zoo]; };
+  geodrawr = derive2 { name="geodrawr"; version="2.0.0"; sha256="05irfyfpk5lgsh0wax8dqdyfw4prynxz1bhs9k1nrz8yn2dd0imn"; depends=[leaflet sf shiny shinydashboard]; };
   geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; };
+  geofabrik = derive2 { name="geofabrik"; version="0.1.0"; sha256="0k92gmivccw3kbgkb9bjw7pxc4zc3zdj35x0cbzmjq0k3qxq8ad0"; depends=[]; };
   geofacet = derive2 { name="geofacet"; version="0.2.0"; sha256="1aylx2hwqk75y73az1zf0s5mjww77d7i9kafbkzw383f0i5qx42w"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sf sp]; };
   geofd = derive2 { name="geofd"; version="2.0"; sha256="1rsgy4nxfp1gi4vwh8zfzksr6sr2ga31kmd56q5m56gw530570ra"; depends=[fda]; };
+  geogenr = derive2 { name="geogenr"; version="1.0.0"; sha256="1qik37ns50pq4dvlj6irmls0pwgsw1dl54azdwfkqybkx95g0n7m"; depends=[data_table dplyr generics geomultistar httr magrittr pander purrr readr rlang sf snakecase starschemar stringr tibble tidyr tidyselect tm]; };
   geogrid = derive2 { name="geogrid"; version="0.1.1"; sha256="0b8afwgj9x56z6zh525y7qkiwbv77mjcw3v19kfba0426jn4vi87"; depends=[Rcpp RcppArmadillo rgeos sf sp]; };
   geohashTools = derive2 { name="geohashTools"; version="0.3.1"; sha256="0ks6ga1vsp5z7sy0xcq9nacffmfsx6yqdlnhqflsb8zb9qbygazf"; depends=[]; };
   geojson = derive2 { name="geojson"; version="0.3.4"; sha256="0fvlw06hjb7z0mfsf8vhv1dchdjlvklyzjqlaydjzbwb1kvbhpq7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
   geojsonR = derive2 { name="geojsonR"; version="1.0.8"; sha256="015g1xpvbwgng5vh79q8gx6900skv3p7s2v3xbka08qllvsg5by1"; depends=[R6 Rcpp RcppArmadillo]; };
   geojsonio = derive2 { name="geojsonio"; version="0.9.2"; sha256="1m315vr0vw60g6j5i7x293szhji3d4p7f54hxmz1aqw4y7fkr8f6"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; };
-  geojsonsf = derive2 { name="geojsonsf"; version="2.0.0"; sha256="12b3kj63ah9hq4h69qky53iajj3i28h8b9gsw7dz7ykpli275bml"; depends=[jsonify rapidjsonr Rcpp sfheaders]; };
+  geojsonsf = derive2 { name="geojsonsf"; version="2.0.1"; sha256="1gxzi0wqmrif6bkw7z21aa2j8i0bd7a5nyyrkjiybv7v7d1l1ps2"; depends=[geometries jsonify rapidjsonr Rcpp sfheaders]; };
   geoknife = derive2 { name="geoknife"; version="1.6.4"; sha256="026lgxklrf73zfc9j4x4as8f0dbyq5j2prnkg2r570i6xic70bsy"; depends=[curl httr progress sp whisker xml2]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
   geomedb = derive2 { name="geomedb"; version="2.0.1"; sha256="1l35c9x1mhqd7z5ragd7w3ay8v2fdnbmbfx9grwi622j8yz1fbmq"; depends=[ape httr jsonlite]; };
   geomerge = derive2 { name="geomerge"; version="0.3.2"; sha256="1i6n88k8icwihr9w7ipjb50f68zad602dipb3hd887y4kyf14wni"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; };
   geometa = derive2 { name="geometa"; version="0.6-3"; sha256="0bj1yg1wfcvq24w85cim6hx8qpi2hj7frdz1fwzhlnxnwkwyk8ip"; depends=[httr jsonlite R6 XML]; };
   geometr = derive2 { name="geometr"; version="0.2.5"; sha256="1rsymlszy452bips1rfpr8crsbw4wlm7m83j68n1f5i3m70qp1d1"; depends=[checkmate crayon deldir dplyr raster Rcpp readr rgdal rlang sf sp spatstat tibble]; };
-  geometries = derive2 { name="geometries"; version="0.1.0"; sha256="07gkr4ajbvhgf2b4smcm4aqngprsfqmpb2zqgpw18627q1bwx5z6"; depends=[Rcpp]; };
+  geometries = derive2 { name="geometries"; version="0.2.0"; sha256="05036q4dccmmd955g4n2s5ncc9zxd9v9qyamszszwn147i7hkxcc"; depends=[Rcpp]; };
   geometry = derive2 { name="geometry"; version="0.4.5"; sha256="1n10l8ax3783v3lgaacb15qsn8b3f0wpmhg3k39j31s6ciyd3vcg"; depends=[linprog lpSolve magic Rcpp RcppProgress]; };
+  geomnet = derive2 { name="geomnet"; version="0.3.1"; sha256="0m5qkbxbrx39v9pwh74c01g8abqwbmphk38h3yxgslyqsrpnpn4l"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
   geomorph = derive2 { name="geomorph"; version="3.3.1"; sha256="1pj67f329j4zaan4paa9xp0d3cfd00bvs1al8356niz9sc373l4l"; depends=[ape jpeg rgl RRPP]; };
+  geomultistar = derive2 { name="geomultistar"; version="1.1.0"; sha256="1cgka5gx5hkj0y6mdkl2hn13x508nn8xkw2jn5d41nr6xii3axp0"; depends=[dplyr magrittr pander rgdal rlang RSQLite sf snakecase starschemar stringr tibble tidyr tidyselect]; };
   geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; };
   geonapi = derive2 { name="geonapi"; version="0.4"; sha256="045lrj5qmd3m2ja8i9446d7vz8lmdz8wvm4f3a72cm18xaan1m2p"; depends=[geometa httr keyring openssl R6 XML]; };
   geonetwork = derive2 { name="geonetwork"; version="0.3"; sha256="0qjnv91rcxzw44fmbgm4qpcrbj5qgz1lgmyw53imyhxgyv55awxv"; depends=[geosphere igraph rgdal sf sp]; };
@@ -8595,40 +8945,49 @@ in with self; {
   geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
   geotoolsR = derive2 { name="geotoolsR"; version="1.1"; sha256="162s37j7wh14h91b6acn453bvgpk3cakfi7mgrdvr5bjdqqn7j7v"; depends=[dplyr geoR ggplot2 tidyr]; };
   geotopbricks = derive2 { name="geotopbricks"; version="1.5.4"; sha256="1mn15mchxkv9qqjrcsyx0pf56sdz0ba7i5jd1ci1ilr6rig81ckz"; depends=[raster rgdal stringr zoo]; };
-  geouy = derive2 { name="geouy"; version="0.2.2"; sha256="1wpa6sc4xgf6lwq5a7804fb07fgpx6d5k323dqkaj1nyaaf7mq5c"; depends=[assertthat dplyr fs ggplot2 ggspatial ggthemes glue magrittr RCurl rlang sf stringr testthat viridis]; };
+  geouy = derive2 { name="geouy"; version="0.2.3"; sha256="11jxy73f53wlwnnzhm3d3yfvf3kbh6lnpl5c94amfqvf79k9m9vi"; depends=[assertthat dplyr fs ggplot2 ggspatial ggthemes glue magrittr RCurl rlang sf stringr testthat viridis]; };
   geoviz = derive2 { name="geoviz"; version="0.2.2"; sha256="1wx1p72532xpg6y3rlrvaiwx57xad3d9fvy9mbadvj418xwxnmim"; depends=[abind chron curl dplyr ggplot2 glue magrittr png progress purrr raster readr rgdal rgeos rgl rlang sf slippymath sp stringr tibble tidyr]; };
   geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; };
   geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; };
   gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; };
   germanpolls = derive2 { name="germanpolls"; version="0.3"; sha256="1ck3klc8925mpnrplxpvz376avivil1w0jzcrrlgssawyvfbhgc8"; depends=[dplyr magrittr purrr RCurl readr xml2]; };
   germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.4"; sha256="17183i7nylvrh8rz916q7xg1k9c8z7z03knpisnrcasa49s07mqq"; depends=[broom data_table ggplot2 ggrepel mathjaxr minpack_lm plyr Rdpack]; };
-  gert = derive2 { name="gert"; version="0.3"; sha256="0caxjcdc2karsxasivkh5sasjkzlif25pw0whdjyq6zh3bvmdlkp"; depends=[askpass credentials openssl]; };
+  gert = derive2 { name="gert"; version="1.0.2"; sha256="1lq4hgv2727lwcv8vha5af26nslj99rjxjrgflshmmcihawpls1n"; depends=[askpass credentials openssl rstudioapi zip]; };
   gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; };
   gesisdata = derive2 { name="gesisdata"; version="0.1.0"; sha256="02xjpw41gm3778lj01kcwjx0lr1i95a0wlrfvs0r5xlajq13jr67"; depends=[dplyr magrittr rio RSelenium stringr]; };
   gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; };
   gestate = derive2 { name="gestate"; version="1.4.0"; sha256="1ybwi1733w8z97sdj38l66mb8ynhqhl68ijns6rvwqxphac6v5x8"; depends=[doParallel foreach shiny shinythemes survival]; };
-  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.1"; sha256="1961w8vpgamna5a9m367mc9szl3vlv8wgmbhfjc0yxp818p07g3a"; depends=[curl data_table hoardr raster tibble]; };
+  gesttools = derive2 { name="gesttools"; version="1.0.1"; sha256="1kyhmzdzviyx2d52342xnblikvpv04q71fjix9mx2ysb1xbb4yxa"; depends=[DataCombine geeM magrittr nnet rsample tibble tidyr tidyselect]; };
+  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.2"; sha256="1z7j4zypxlj17q0qjpzhmrcg6qv848nbbfz1m0rhv1b1bd3qwgsq"; depends=[curl data_table hoardr raster tibble]; };
+  getDTeval = derive2 { name="getDTeval"; version="0.0.1"; sha256="0viifs5n6hrns313ihgdbxcmsnl666bqbd0x30i4y6qmc2wqn2fs"; depends=[data_table microbenchmark]; };
   getLattes = derive2 { name="getLattes"; version="0.1.1"; sha256="0c6sbvpk3gy0x9d3pxk1z98q6jid5xdylp8zg2f6ba7nw6yyv5cm"; depends=[dplyr pipeR rlang rlist stringi stringr tibble XML]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
   getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; };
   getProxy = derive2 { name="getProxy"; version="1.12"; sha256="0qcxihgwy3h2b98z2hwjszwqbz117d89xjys7fy0f8m9hv7rf6ph"; depends=[bitops data_table dplyr httr jsonlite RCurl]; };
-  getTBinR = derive2 { name="getTBinR"; version="0.7.1"; sha256="0hmqx6cqkp8k6i2mvky6i1iqxgflyr0mdf8lnl9ss4m15h38l5w3"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr rlang scales tibble tidyr viridis]; };
+  getable = derive2 { name="getable"; version="1.0.3"; sha256="0v45nqpx55vbj68gj4wxr0bdlrl897ayac78rxjd2lkkjx49hlyh"; depends=[knitr]; };
   gethr = derive2 { name="gethr"; version="0.1.0"; sha256="0kpi9b9yg2nh332zkml24pmj6vgjfh8mrfjjg5a636s2rg98g5g7"; depends=[httr jsonlite]; };
   getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.2.1"; sha256="0jbg668kwkvnzgk6678w000mijch28ni9rr5b9c1l9icwcsphmlc"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; };
-  gets = derive2 { name="gets"; version="0.25"; sha256="1l4girvj3f0m9d1f06m4rrfh2ysyjcibhhi7yqv5jj60mbyplf0d"; depends=[zoo]; };
+  gets = derive2 { name="gets"; version="0.26"; sha256="1y24d2div0nky53qprac1aq4y0i1bnvn16wqslam1r04lzzjcg21"; depends=[zoo]; };
   getspres = derive2 { name="getspres"; version="0.1.1"; sha256="1k69b7by1398pc9knp97r3k6pv8hixzianqal71ggdrwsb3n1gis"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; };
   gettz = derive2 { name="gettz"; version="0.0.4"; sha256="1j83pdny3phfflkdjwiflyfvighn73pysw5bac4hx079dda8k25g"; depends=[]; };
   gexp = derive2 { name="gexp"; version="1.0-1"; sha256="1i3sarsawax1landjbm8gxrcrimwzdgrbybzipqwxdrmlgvxslqk"; depends=[jpeg mvtnorm png]; };
+  gfboost = derive2 { name="gfboost"; version="0.1.0"; sha256="07rdgf2i908ihqzq0gjp414gwvikbxfyj6j4nvz8l4krs32avl87"; depends=[mboost mvtnorm pcaPP]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.6.0"; sha256="0w0r4w570dp7n5ixm7qv3x1pw478dghqbyfvfxfi99f5453jdma1"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
   gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
+  gfiExtremes = derive2 { name="gfiExtremes"; version="1.0.0"; sha256="1ys7vrd5kpyqj42m384r2b91w53rlx6hcznpb0a0mnniqj4wc61r"; depends=[BH coda doParallel foreach Rcpp RcppArmadillo]; };
+  gfiUltra = derive2 { name="gfiUltra"; version="1.0.0"; sha256="1n6sp7h0ys92mqixznrs2j8kmban3mx8swrwdpxgxc6vxycky8d8"; depends=[lazyeval mvtnorm SIS]; };
+  gfilinreg = derive2 { name="gfilinreg"; version="1.0.0"; sha256="18mmnaj8x2l0qy4b4gy2ia56532qpz34b5g21sraz1jg6q07xrfq"; depends=[arrangements BH data_table EigenR lazyeval Rcpp RcppEigen spatstat]; };
+  gfilmm = derive2 { name="gfilmm"; version="2.0.2"; sha256="1zjm2cfbc103k7hk2q3cdv8xsdpgad7byd24zqlxj9h60pjrwhcb"; depends=[forcats lazyeval Matrix Rcpp RcppEigen rgr spatstat]; };
   gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; };
   gfoRmula = derive2 { name="gfoRmula"; version="0.3.1"; sha256="1y1k5zwv06kc6qk7ki7x7c1618irvwd6iw26gs5n8lv8z3cifqmy"; depends=[data_table ggplot2 ggpubr nnet progress stringr survival truncnorm truncreg]; };
   gfonts = derive2 { name="gfonts"; version="0.1.1"; sha256="1nkg4mfmgysk0ibzyb4h3qqxwhb5m84n8ykk6v5hz087yarac32x"; depends=[crul glue htmltools jsonlite shiny usethis]; };
+  gfpop = derive2 { name="gfpop"; version="1.0.2"; sha256="1qypzrgfpwh4wbk3x1l8jv64i684v5y0dbwjg8f3kbd0xmhjb4aw"; depends=[Rcpp]; };
   gg_gap = derive2 { name="gg.gap"; version="1.3"; sha256="0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h"; depends=[cowplot ggplot2]; };
   ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; };
   ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; };
+  ggDCA = derive2 { name="ggDCA"; version="1.1"; sha256="0jpg7n6nk2jgq668ff0l9zk26zk39abc74f6w5x8gf4zsb8y0zp9"; depends=[base_rms do ggplot2 rms set survival]; };
   ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; };
   ggPMX = derive2 { name="ggPMX"; version="1.1.2"; sha256="1lcfjj6k4y69zs0zr3xf3l2hz8mdjw0wqbw5p8mqjm24qkynqb9a"; depends=[assertthat data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; };
   ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; };
@@ -8640,10 +8999,10 @@ in with self; {
   ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; };
   ggVennDiagram = derive2 { name="ggVennDiagram"; version="0.3"; sha256="1jgxzb3iffhx6xyn14nldljkaangdvzrxzfkibsb6g787fgv8ng9"; depends=[dplyr ggplot2 sf VennDiagram]; };
   ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; };
-  ggalluvial = derive2 { name="ggalluvial"; version="0.12.1"; sha256="0i3bbv841rpad1n45jd34n4vgh7w70m2njhcyx136y1r72z7nz0n"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; };
+  ggalluvial = derive2 { name="ggalluvial"; version="0.12.3"; sha256="0mkan9gxg3yxjism22yxbhvlh2lh7wpbrqpb355za790prcmjbh3"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; };
   ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; };
   ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; };
-  gganimate = derive2 { name="gganimate"; version="1.0.6"; sha256="0xpa18k7v5k284g7hcpyc1hi2q6962i1j7i3j4g4b5c259gz4crn"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; };
+  gganimate = derive2 { name="gganimate"; version="1.0.7"; sha256="046v6j92xxgaghsnh88dy5h8x040qsfa8csvhp4dmsfmrrf0dz0f"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; };
   ggasym = derive2 { name="ggasym"; version="0.1.5"; sha256="1fc0vrkg57h9qqyrfwwippq7yy172g1w79cdb672myjxfjpnxwp4"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; };
   ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; };
   ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; };
@@ -8653,14 +9012,14 @@ in with self; {
   ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; };
   ggdag = derive2 { name="ggdag"; version="0.2.2"; sha256="0gv7gf2bbrd0m1hjvk6j39ckyvxn5lj749q4fzlzzc5mxr3qdfyz"; depends=[dagitty dplyr forcats ggplot2 ggraph ggrepel igraph magrittr pillar purrr stringr tibble tidygraph]; };
   ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; };
-  ggdemetra = derive2 { name="ggdemetra"; version="0.2.1"; sha256="1d5adnamv2gnnj3q8779brl827d2zbqpkgfz2r097jndy5ng1021"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; };
-  ggdendro = derive2 { name="ggdendro"; version="0.1.21"; sha256="0jcjdkhd3wirjgv4v3gb9rw8idyymwhwnxplg3wi8wa3mwr9rhq2"; depends=[ggplot2 MASS]; };
-  ggdist = derive2 { name="ggdist"; version="2.2.0"; sha256="1crncf4zi00c42n8f83psqz4avrw83madq5z0gxc8014nm069183"; depends=[distributional dplyr forcats ggplot2 HDInterval purrr rlang scales tibble tidyr vctrs]; };
+  ggdemetra = derive2 { name="ggdemetra"; version="0.2.2"; sha256="1j0nwmv2acyrkpn230jj6yf5nnl40kpqdqaglrnrfqw5rp357krp"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; };
+  ggdendro = derive2 { name="ggdendro"; version="0.1.22"; sha256="0skbj487b6f6pj2iz4yq2b9gbgb39cv5dyzhdl3w7ay1k0s5z9ph"; depends=[ggplot2 MASS]; };
+  ggdist = derive2 { name="ggdist"; version="2.3.0"; sha256="1lsmja1plrwf1wl87wj8czjr2217mzvs6amd9pxgagrbw8qrqf0h"; depends=[distributional dplyr fda forcats ggplot2 HDInterval purrr rlang scales tibble tidyr tidyselect vctrs]; };
   ggdmc = derive2 { name="ggdmc"; version="0.2.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; };
-  gge = derive2 { name="gge"; version="1.5"; sha256="19jh769yy8dm0z2gw6kqi08rpbbdc4rsb2l9lfh5g3ma7yk0ija9"; depends=[nipals reshape2 rgl]; };
+  gge = derive2 { name="gge"; version="1.6"; sha256="0l5xhbn3wdvsmr8gavj8r3yn8mcfw21pmzdfy4wygqa6jamcsr59"; depends=[nipals reshape2]; };
   ggeasy = derive2 { name="ggeasy"; version="0.1.2"; sha256="06rynzv6vqngay5cjrig550dfada66075qs69l4rpfqci0vh05km"; depends=[ggplot2 rlang]; };
   ggedit = derive2 { name="ggedit"; version="0.3.1"; sha256="10fbjqq6l7wfibi65mq423w7v8gymr541if749qhsnd9b2jyhaj5"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; };
-  ggeffects = derive2 { name="ggeffects"; version="0.15.1"; sha256="12z58casz0yl1w7nfs64bz4miz0mmc300ap3rz4d2cc4z0rg0r47"; depends=[insight MASS sjlabelled]; };
+  ggeffects = derive2 { name="ggeffects"; version="1.0.1"; sha256="1c5rvycaqp7zp1j6j17c84v8nlpi0w7bhfxmcha4n37m0snk1kgy"; depends=[insight MASS sjlabelled]; };
   ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
   ggetho = derive2 { name="ggetho"; version="0.3.6"; sha256="1iv0vad8y85bvz8rx0flqyrb38d79j9fhmd6ay5siyccigi88clj"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; };
   ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; };
@@ -8668,35 +9027,38 @@ in with self; {
   ggfocus = derive2 { name="ggfocus"; version="1.0.0"; sha256="03q0rz7flm8sc8hrlkcm5fz66qiyxb8z8q4bh9dglhw0jc8q1fvb"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; };
   ggforce = derive2 { name="ggforce"; version="0.3.2"; sha256="1lplxyq5bgx90dgaimhynpcywag1gp6vlsy7q52ay1nfc35qmkjc"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tidyselect tweenr withr]; };
   ggformula = derive2 { name="ggformula"; version="0.9.4"; sha256="04vdhg1bbc1psrx9ggaphz7cx4fw5xsmhkqpqfcg2w4ba2bjy46f"; depends=[ggforce ggplot2 ggstance magrittr mosaicCore rlang stringr tibble]; };
-  ggfortify = derive2 { name="ggfortify"; version="0.4.10"; sha256="0wmcwp63h90v3f00ixszvis4z28im621jickvc0wgi6qvjvnayq0"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
-  gggenes = derive2 { name="gggenes"; version="0.4.0"; sha256="13hrjh80rlri8vm736p85v2jwwpck8gc5jfps1qrqcq86kv2xgkn"; depends=[ggfittext ggplot2 rlang]; };
+  ggfortify = derive2 { name="ggfortify"; version="0.4.11"; sha256="1wfm7l9bz6msh7rflgfv9dgbxh1ikz2ay0v7sgk9nkc24y6lhbpk"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
+  gggap = derive2 { name="gggap"; version="1.0.1"; sha256="1iidxm7qcrg0isw2q27cmjbfb3pkfj5jcg1nj8lgy6xmydw3vrw3"; depends=[cowplot ggplot2]; };
+  gggenes = derive2 { name="gggenes"; version="0.4.1"; sha256="1s4knz2g06w46jbi037l9ii0kkxvl7gnljp54s4z36hnswsrv8jk"; depends=[ggfittext ggplot2 rlang]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
   gggibbous = derive2 { name="gggibbous"; version="0.1.0"; sha256="1g6igmj2nh4b516p1wcs1cwgzdnawvf3snxzwxjkmdc4yqbzyz24"; depends=[ggplot2 scales]; };
   ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; };
   gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; };
-  gghalves = derive2 { name="gghalves"; version="0.1.0"; sha256="17adlc7p8visbjn2camia6z4mnxxkiij16lbqrjbkrxb8j8m3b78"; depends=[ggplot2 gtable]; };
-  gghighlight = derive2 { name="gghighlight"; version="0.3.0"; sha256="13zs3wy1zm1h1zdh0lpp19fw54giswnqbxxcimz9iyzbpg3da9va"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; };
+  gghalves = derive2 { name="gghalves"; version="0.1.1"; sha256="1w4j8grir1i8ar7fdsk4f6czkl5j2wwn67y746mis2diwnzhcil3"; depends=[ggplot2 gtable]; };
+  gghighlight = derive2 { name="gghighlight"; version="0.3.1"; sha256="1w15g67bh5cz0y12lb115bppmff9ayyrk76alxd6aznz534sbc5i"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; };
   ggimage = derive2 { name="ggimage"; version="0.2.8"; sha256="0p2bbcw1fwzpfnmdq2h9h18xka9jrzfd2v705rbniv8nas0ga14d"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; };
   ggimg = derive2 { name="ggimg"; version="0.1.0"; sha256="0lgak04690xvy0j1g8rgbj9x81ychkx6hp1f8d92piz432wb1z71"; depends=[abind ggplot2 jpeg png]; };
-  gginference = derive2 { name="gginference"; version="0.1.1"; sha256="1nla93arkq68j6w56y4p6mj4i8j6rg8rpl0p2yhdzcq8bgzkqym8"; depends=[ggplot2 rlang]; };
+  gginference = derive2 { name="gginference"; version="0.1.3"; sha256="1r960cglnkii8xih4r1r7wd857jqn53f08zi9dnj54bpqrs374zx"; depends=[ggplot2 rlang]; };
   gginnards = derive2 { name="gginnards"; version="0.0.3"; sha256="15ly88wjsd2fqvp483376rm2fczcbmj1s1vagb70z9z7968407xy"; depends=[ggplot2 magrittr rlang stringr tibble]; };
+  ggip = derive2 { name="ggip"; version="0.2.0"; sha256="0jfh6sr34nbqwqypx6qdjggl2q6qbmpl17cmy45v6zdr5phrzhrx"; depends=[dplyr ggplot2 glue ipaddress Rcpp rlang tidyr vctrs]; };
   ggiraph = derive2 { name="ggiraph"; version="0.7.8"; sha256="0iz2v73m8sm80k2vb62ajrirsh00g680938gp6haybq4s61imdki"; depends=[gdtools ggplot2 htmltools htmlwidgets purrr Rcpp rlang uuid]; };
-  ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.2.9"; sha256="1qmw7z10h1x6xnlpq7shafg6w2bal8ni02c07fyy9f7hm02xfnzs"; depends=[dplyr ggforce ggiraph ggplot2 magrittr mgcv mycor plyr ppcor purrr RColorBrewer reshape2 scales sjlabelled sjmisc stringr tidyr webshot ztable]; };
+  ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.3.0"; sha256="0q8ppixw5i1hpphmswpw6lvq7gx8rx4gfs2b8d31wbn32ziiv2rk"; depends=[dplyr ggiraph ggplot2 magrittr mgcv mycor plyr ppcor purrr RColorBrewer reshape2 scales sjlabelled sjmisc stringr tidyr]; };
   ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; };
   gglasso = derive2 { name="gglasso"; version="1.5"; sha256="12l0ac1n54z41yw7c00fm6q2mjmhp9blk4f8vp7q2my2xxwh1fmj"; depends=[]; };
+  gglm = derive2 { name="gglm"; version="0.1.0"; sha256="12bqqh9614v0cv45czqh6w0in4hbhwmicvcw8l07zdhrn9aq7y9m"; depends=[ggplot2 patchwork rlang]; };
   gglogo = derive2 { name="gglogo"; version="0.1.5"; sha256="08wg0svcksdzchp6bdllmsnklxia3d0ygqwzgmqb2sga8nbkf5hl"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2 rlang tidyr]; };
   ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; };
   gglorenz = derive2 { name="gglorenz"; version="0.0.2"; sha256="1kag8p2chd0sbn8affpxzi4aawpm71ls97dwdgx7mxxfwkdb2q0y"; depends=[ggplot2 ineq]; };
   ggm = derive2 { name="ggm"; version="2.5"; sha256="11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di"; depends=[graph igraph]; };
   ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; };
-  ggmcmc = derive2 { name="ggmcmc"; version="1.4.1"; sha256="05dsxp5694hljbjz13gpb4f9sxv5jphsihza101ck08yzgn6kpvf"; depends=[dplyr GGally ggplot2 tidyr]; };
+  ggmcmc = derive2 { name="ggmcmc"; version="1.5.0"; sha256="0ywh7bzva5b5svgqgxq2ni59g3xcbvcm2rlgs1plsi1djx2jwsn5"; depends=[dplyr GGally ggplot2 tidyr]; };
   ggmix = derive2 { name="ggmix"; version="0.0.1"; sha256="19dp4ic3mxrqdzr0hi44fm2axfi2b693k4xfs28h664123c9kyvn"; depends=[glmnet MASS Matrix]; };
   ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; };
   ggmr = derive2 { name="ggmr"; version="0.1.1"; sha256="0941rvh7m5knlhp0m0mhm4j8spmch0pyvwhzs3bycq3vzlvzv1w7"; depends=[MASS]; };
   ggmsa = derive2 { name="ggmsa"; version="0.0.4"; sha256="1sxnzr39ns6r1h5xr5mwnqbksva156cyx3gc1yq5g3568l2kmx3j"; depends=[Biostrings ggplot2 magrittr stringr tidyr]; };
   ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; depends=[ape dplyr ggplot2]; };
   ggnetwork = derive2 { name="ggnetwork"; version="0.5.8"; sha256="1gdvywx2n4ph0dr8q1c5gfsmv4jjy0g41cnhjn68kkmg5fdc3ix8"; depends=[ggplot2 ggrepel igraph network sna]; };
-  ggnewscale = derive2 { name="ggnewscale"; version="0.4.2"; sha256="15555xh0iahczxhp85ki45qvrp7nrnpv1hag4dy55ja4rcbfzb36"; depends=[ggplot2]; };
+  ggnewscale = derive2 { name="ggnewscale"; version="0.4.4"; sha256="0dazwhq1yjv3vdc0b0blzqfkic905w7fq8gnrixc9nwid9xc9cfg"; depends=[ggplot2]; };
   ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; };
   ggnuplot = derive2 { name="ggnuplot"; version="0.1.0"; sha256="0i09ybmxdjyr15z1a651k3bkbqskri4ipcyjap93020zbfv05r9c"; depends=[ggplot2]; };
   ggpacman = derive2 { name="ggpacman"; version="0.1.0"; sha256="1040d6aciyllrpszh7l7y55fw4dx8cya2yvj0x4i2fibvygz83p6"; depends=[dplyr gganimate ggforce ggplot2 magrittr purrr rlang tidyr]; };
@@ -8704,27 +9066,27 @@ in with self; {
   ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; };
   ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; };
   ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; };
-  ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; };
+  ggperiodic = derive2 { name="ggperiodic"; version="1.0.1"; sha256="084n37jwldnhqx61ayq9b55bi4dp2iqyrj2qbp67w0ps1xn5jm6b"; depends=[data_table dplyr ggplot2 sticky tidyselect]; };
   ggplot_multistats = derive2 { name="ggplot.multistats"; version="1.0.0"; sha256="1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il"; depends=[ggplot2 hexbin rlang scales]; };
-  ggplot2 = derive2 { name="ggplot2"; version="3.3.2"; sha256="0wsib5qpzn4d0w1ss3x158xmrawkms8vvsfvr3mh40pvd8g2ibad"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; };
+  ggplot2 = derive2 { name="ggplot2"; version="3.3.3"; sha256="1k136k1sr6dq1xvx6gs6gzji6hbnnwnsb5qivsxrblfv90irxhj5"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
   ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; };
   ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; };
   ggplotify = derive2 { name="ggplotify"; version="0.0.5"; sha256="0pfnp4lrissf21z7867kdm6slr979kchyva8iaf83i1302kscph3"; depends=[ggplot2 gridGraphics rvcheck]; };
   ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; };
-  ggpmisc = derive2 { name="ggpmisc"; version="0.3.5"; sha256="0ma2d3a3v8n85sghxr9anl6vgbs8gi82i1dllw99n81gsm59wgin"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; };
+  ggpmisc = derive2 { name="ggpmisc"; version="0.3.7"; sha256="121s6c9k4fn3rcz2myc1kxczllq2826c8zllaii58q8lica7dsyn"; depends=[broom dplyr ggplot2 glue gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; };
   ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; };
-  ggpol = derive2 { name="ggpol"; version="0.0.6"; sha256="1316g0y0i4nm4nsa422pbrv4w3g0rv1jxy6m7qasarq2mml9lxjs"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; };
+  ggpol = derive2 { name="ggpol"; version="0.0.7"; sha256="11xr26kwmkjjb51wm44ydv0vcinc6k6faqwx4s2faj4iwidlys1m"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
   ggpubr = derive2 { name="ggpubr"; version="0.4.0"; sha256="0x86lmghr25k8w90yrp360dn42dhp5cjvjpdiv2s2gxfn701xcmb"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang rstatix scales tibble tidyr]; };
-  ggpval = derive2 { name="ggpval"; version="0.2.3"; sha256="04s0pwi0pljdd8r6wnjyb3i3php6qgvpc1mdvhywcx2i2zqip2qx"; depends=[data_table ggplot2]; };
-  ggquickeda = derive2 { name="ggquickeda"; version="0.1.7"; sha256="1vzxqd9djfbipsals5h6h64hxr4qcmv8j562ycbm0q566bm8ff2i"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjqui shinyjs stringr survival survminer table1 tidyr]; };
+  ggpval = derive2 { name="ggpval"; version="0.2.4"; sha256="0zi3k79iy8pwnrgi9r9l4r9ghv1db9cxsagif8wsrlak4nr8akza"; depends=[data_table ggplot2]; };
+  ggquickeda = derive2 { name="ggquickeda"; version="0.1.9"; sha256="1z9dmiyxmbryr4hzndanz72k57z469fbsxpfaaqzfrc3wx5yp30a"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang RPostgres scales shiny shinyFiles shinyjqui shinyjs stringr survival survminer table1 tidyr]; };
   ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; };
-  ggraph = derive2 { name="ggraph"; version="2.0.3"; sha256="1pz06j0za4p6dc3fqjzcw8bpym70bmnfcvpv1q34r74rnwzjdyvq"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; };
+  ggraph = derive2 { name="ggraph"; version="2.0.4"; sha256="1j3xf4fsv0i0gbppdrw4yprfyk53wx6s8nvnkipi2ywbm7cr4q4w"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis withr]; };
   ggraptR = derive2 { name="ggraptR"; version="1.3"; sha256="1i6jp0n1sz5b4sv3d4h5624zhlknih2qp6p2m2ri6s3gsh1pl9zz"; depends=[dplyr ggplot2 pacman purrr shiny]; };
   ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; };
-  ggrastr = derive2 { name="ggrastr"; version="0.1.9"; sha256="12iam75hg5mgqi9wbpyyvr6arj7jxy0g5s5niz70j8zy06jji6rn"; depends=[Cairo ggbeeswarm ggplot2]; };
-  ggrepel = derive2 { name="ggrepel"; version="0.8.2"; sha256="1qaifn3dazdqbqlii210xhw7yf142iw7g9p2axmmxbz90p0by08d"; depends=[ggplot2 Rcpp scales]; };
+  ggrastr = derive2 { name="ggrastr"; version="0.2.1"; sha256="0dip813s2ba706qwr2xxz4grj67a7g2cn9h6i1nv70yp7258jp30"; depends=[Cairo ggbeeswarm ggplot2 png ragg]; };
+  ggrepel = derive2 { name="ggrepel"; version="0.9.0"; sha256="1nigyj05ag7z0gilrk5b60y2c5imyjg5674ngi4052f0gpda6z2g"; depends=[ggplot2 Rcpp rlang scales]; };
   ggridges = derive2 { name="ggridges"; version="0.5.2"; sha256="03pz257aw0mkh5k75rby9givkc1ky3n5scvhjhjiz9vry9fpffmh"; depends=[ggplot2 plyr scales withr]; };
   ggrisk = derive2 { name="ggrisk"; version="1.2"; sha256="1zcqpddv02hr77s8gw17gr7yww7h9yma0279rxnckxhxlfi88ym5"; depends=[cutoff do egg fastStat ggplot2 nomogramFormula rms set survival]; };
   ggroups = derive2 { name="ggroups"; version="2.0.3"; sha256="1qlx1jfmmpygswwbrqs7pxm426zggxgvd4q3jp9abfaq9aczs10p"; depends=[]; };
@@ -8737,48 +9099,52 @@ in with self; {
   ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.2"; sha256="0jzj4iglgzwp6pfs5zr7mirdiqrrmbwdvl245b1fwf42rnxbqrq6"; depends=[dplyr ggplot2 magrittr tidyr]; };
   ggsom = derive2 { name="ggsom"; version="0.4.0"; sha256="0qsih00rm3ng2zh6p2s7a35rh1qlvbkn82s53v765w60fjmhwkwf"; depends=[assertthat data_table dplyr entropy ggplot2 kohonen magrittr tibble tidyr]; };
   ggspatial = derive2 { name="ggspatial"; version="1.1.4"; sha256="0l77c6h845if5hfsjzvbdpysk04qbnpbb19g6zggrg3fxrqp1wh8"; depends=[abind ggplot2 glue rlang rosm scales sf tibble tidyr]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.3.6"; sha256="0zxw8fc8kaadklyyhm1j6qajgq79hjskj1c0chlinkvsg417c5hl"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
-  ggstance = derive2 { name="ggstance"; version="0.3.4"; sha256="0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1"; depends=[ggplot2 plyr rlang withr]; };
+  ggspectra = derive2 { name="ggspectra"; version="0.3.7"; sha256="0xd8g2m73qa5bd4wk1a81ayy48agqm4h9nadafs3qrcg8wszk8nm"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tibble tidyr]; };
+  ggstance = derive2 { name="ggstance"; version="0.3.5"; sha256="0jz9vvnmcc6a38n8nzr458r65sna23bgn5r8mxdhzdlyqibihr7d"; depends=[ggplot2 plyr rlang withr]; };
   ggstar = derive2 { name="ggstar"; version="0.0.9"; sha256="1yixq9384h7m8xqkl8gcr0iai8f3a3yfa0yd34ahjzjs893x34vy"; depends=[ggplot2 gridExtra scales]; };
-  ggstatsplot = derive2 { name="ggstatsplot"; version="0.5.0"; sha256="06zl57pbd3szbkbx6qpp4cwl9r5xbq73vvhnckf6c2dy5f8i1m29"; depends=[broomExtra correlation cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer parameters purrr rlang statsExpressions tidyr]; };
+  ggstatsplot = derive2 { name="ggstatsplot"; version="0.6.6"; sha256="0kii730q1hljiqvi8zm5m4c0vwdjh30wwc0hv85b00jr4i83vk00"; depends=[cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif insight ipmisc pairwiseComparisons paletteer parameters performance purrr rlang statsExpressions tidyr]; };
   ggstudent = derive2 { name="ggstudent"; version="0.1.1-1"; sha256="0qs27b4lksaaaspavkycbzf8cfjxjli7xrfjby71sl0lca3fwm1g"; depends=[dplyr ggplot2]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
   ggtern = derive2 { name="ggtern"; version="3.3.0"; sha256="12lxmql9zspglp0baqp419l0vgilrf8lyxsza142bfyvmdbhh6d3"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; };
-  ggtext = derive2 { name="ggtext"; version="0.1.0"; sha256="1jwj1kp5v78xij3mh0q96mvrccdkv81fzcfb9xdp3yysdz2pr2vr"; depends=[ggplot2 gridtext rlang scales]; };
+  ggtext = derive2 { name="ggtext"; version="0.1.1"; sha256="0n19dlcys8v7myfyckr6dnq0kx79k3sbh8nwx1jsx8pgzfbi8a2b"; depends=[ggplot2 gridtext rlang scales]; };
   ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; };
   ggupset = derive2 { name="ggupset"; version="0.3.0"; sha256="079a1fghhbxhkx42ac0n5chmh07i60m2pkdk76frqbbmwrw7inx4"; depends=[ggplot2 gtable rlang scales tibble]; };
   ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; };
-  ggvis = derive2 { name="ggvis"; version="0.4.5"; sha256="091i9f17912j8qcyxppjgwzjnyqj7769ixs9d2gjg6f2clskqdw2"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
+  ggvis = derive2 { name="ggvis"; version="0.4.7"; sha256="1qv512pd4x5vmx15y9nvqmabbbw14h75fmi1sjbcg5yl25z0cswy"; depends=[assertthat dplyr htmltools jsonlite magrittr rlang shiny]; };
   ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.3"; sha256="04dv33vnip0rrli1diq43v7vhr86bmxjdyxjbxz5x4371kbb312j"; depends=[deldir ggplot2 raster rgeos sp]; };
   ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; };
-  gh = derive2 { name="gh"; version="1.1.0"; sha256="1bc9bn1078s664hc806dh0y1ncxif77q479rfmxfir9z7hwaz7yy"; depends=[cli httr ini jsonlite]; };
+  gh = derive2 { name="gh"; version="1.2.0"; sha256="1zvy3ylxvni10lhvmbm9h14mg4wlsbdbzbzviwf28jxss8749219"; depends=[cli gitcreds httr ini jsonlite]; };
   ghibli = derive2 { name="ghibli"; version="0.3.2"; sha256="0762dy3x7w0q1swag2lh33cpqdr9bbqw0963ymdpnchawdh5m50z"; depends=[prismatic]; };
   ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; };
   ghyp = derive2 { name="ghyp"; version="1.6.1"; sha256="02xiznl1v0fksqwyvjg8075qbiy29y1h1q8cr3lsbr95h8iyzqfh"; depends=[MASS numDeriv]; };
-  ghypernet = derive2 { name="ghypernet"; version="1.0.0"; sha256="1c2zphpyrjhvzsqnqshj1z955h69k4qpd7a3x174r72y47pqw5yx"; depends=[dplyr extraDistr numbers plyr purrr reshape2 rlang rootSolve]; };
+  ghypernet = derive2 { name="ghypernet"; version="1.0.1"; sha256="0pzgmpnvgskfk0z7if4a4ifinbrw60fgaz8ksbfzqx5snym6qrf7"; depends=[dplyr extraDistr numbers pbmcapply plyr purrr reshape2 rlang rootSolve texreg]; };
   gibble = derive2 { name="gibble"; version="0.4.0"; sha256="19il4si7ch5jr7plr8qwv7jrc5kfkxmh5jrcdvbn688gxcnv7bs0"; depends=[dplyr rlang tibble]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
   gif = derive2 { name="gif"; version="0.1.0"; sha256="119d7q9xs6xpncv1r2w008kld9z07ckyj1kja9b8n2lnlb8532pk"; depends=[MASS Matrix Rcpp RcppEigen]; };
   gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; };
-  gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; };
+  gifti = derive2 { name="gifti"; version="0.8.0"; sha256="1gb3x4rln9vayjd9fgzb434mm3dwcqgrvlv6rmh4b39mjfm73sly"; depends=[base64enc R_utils xml2]; };
+  giftwrap = derive2 { name="giftwrap"; version="0.0.4"; sha256="1zsw529h69x9yaq2csfws4iqn3mm39z34kwzj0b2y850wzbn2dvp"; depends=[namespace processx readr tibble]; };
   gim = derive2 { name="gim"; version="0.33.1"; sha256="1km8pyr1qfzffm33ihhlgvc0qxgxxfi161vkrz77d1b7jkpdyxjj"; depends=[numDeriv]; };
-  gimme = derive2 { name="gimme"; version="0.7-1"; sha256="117157nyyyzb102cs2in7s44dl3v6d0aqbfyybq4rqb5cqqmfsvj"; depends=[data_tree igraph imputeTS lavaan MIIVsem nloptr qgraph]; };
+  gimme = derive2 { name="gimme"; version="0.7-4"; sha256="113g71g7pnjg3bcpviiyxqfmhwqihxi9kmrs28mg77p0rd9gjhg6"; depends=[data_tree igraph imputeTS lavaan MIIVsem nloptr qgraph]; };
   gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; };
   gimms = derive2 { name="gimms"; version="1.1.3"; sha256="0ij252zz75nfngh5idzznrdi4jn1ymbn24s6qilpf2qf8zilh89i"; depends=[curl Kendall ncdf4 raster zyp]; };
   giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; };
+  giscoR = derive2 { name="giscoR"; version="0.2.2"; sha256="1nqqq6zpi6f1bn3vx1666fsz7jgf0ijn8d28j97ld8qsvaaaw6k9"; depends=[countrycode geojsonsf sf]; };
   gistr = derive2 { name="gistr"; version="0.9.0"; sha256="0ac9ikrdg6i8xvlma0gizvsdva46408lk7hvsgkqirhy2ljy02hp"; depends=[assertthat crul dplyr httr jsonlite knitr magrittr rmarkdown]; };
   git2r = derive2 { name="git2r"; version="0.27.1"; sha256="1h1vfzym6hi1fqs9p5z5v0f4xldggr425frw8k6dsidah3qhg4h9"; depends=[]; };
   git2rdata = derive2 { name="git2rdata"; version="0.2.1"; sha256="11mdalfgarqscb6yg0p9g4mwzwnbkq40migpv5sk0i3vdz0xpapp"; depends=[assertthat git2r yaml]; };
-  gitgadget = derive2 { name="gitgadget"; version="0.5.2"; sha256="0la0x3p50wk5wv2p4vkf3rh72psz3k18lcymxn354nqb7m1xdggs"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; };
+  gitcreds = derive2 { name="gitcreds"; version="0.1.1"; sha256="1snzn7nxy0rwz0bzjsg6k04c0n811dgn8gn9cmn2v78aj57ayjmi"; depends=[]; };
+  gitear = derive2 { name="gitear"; version="1.0.0"; sha256="139h19yyi7bpkps2vskdnga43ggpgb9fg8jdr7n8vgadxjamv98p"; depends=[dplyr httr jsonlite magrittr mockery Rcpp stringr tibble tidyr]; };
+  gitgadget = derive2 { name="gitgadget"; version="0.6.0"; sha256="1rqjzlfnwqqvad8q73akdir0rd48219mvh30yg9k7lp7rnm2wpmz"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; };
   githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; };
-  gitignore = derive2 { name="gitignore"; version="0.1.3"; sha256="0ckvl5i99k9sjvlk3cfjyclhmchrlqdz4379nmlckh4jpmnckzk0"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; };
+  gitignore = derive2 { name="gitignore"; version="0.1.4"; sha256="15rpzb3szx6k5xwf89p3fyzdbk44ahyxgx35jza4ln3pl16hldz1"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; };
   gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
   gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; };
   givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; };
   gjam = derive2 { name="gjam"; version="2.3.2"; sha256="0zlx4q4w09c4gcjjw3niy61nrfdrqb4h9f3x2sg33lqnhwkdddwk"; depends=[MASS RANN Rcpp RcppArmadillo]; };
   gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; };
   gkgraphR = derive2 { name="gkgraphR"; version="1.0.1"; sha256="05bwcsg5w4231h4y0p4grkswgjnd3ygcnfsj72y2cxcjsnladylx"; depends=[httr ISOcodes jsonlite]; };
-  gkmSVM = derive2 { name="gkmSVM"; version="0.80.0"; sha256="0ljcga246ad0ql8x3drvrdsyp0f20mgp3p6lnl79xb76qgfdnm0p"; depends=[kernlab Rcpp ROCR seqinr]; };
+  gkmSVM = derive2 { name="gkmSVM"; version="0.81.0"; sha256="119g5rhc7ffyviz04r04aj5z1g6abnj3ddd01g7db505sdr6lapj"; depends=[kernlab Rcpp ROCR seqinr]; };
   glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; };
   glamlasso = derive2 { name="glamlasso"; version="3.0"; sha256="1ynhl868kh25l8m04ln6ix31z9r26lrbr5ajprpq9yfhqs4l9ddc"; depends=[Rcpp RcppArmadillo]; };
   glancedata = derive2 { name="glancedata"; version="1.0.1"; sha256="01j7syjn33pc7hq032nmyak38wn35yv3n7is9g2ggs14kj3xqb0c"; depends=[dplyr forcats GGally ggplot2 gridExtra openxlsx purrr tibble tidyr]; };
@@ -8787,21 +9153,21 @@ in with self; {
   glasso = derive2 { name="glasso"; version="1.11"; sha256="02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"; depends=[]; };
   glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; };
   glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
-  glca = derive2 { name="glca"; version="0.1.1"; sha256="0xm67c0rizhm0rhhllr3jawzgsngvzgkcagankpklf035hk5wgrv"; depends=[MASS Rcpp]; };
+  glca = derive2 { name="glca"; version="1.1.0"; sha256="0digyha69l02h9bgapvnfxxa8q97z3amq8qc93nm3a3acw5cq4ig"; depends=[MASS Rcpp]; };
   glcm = derive2 { name="glcm"; version="1.6.5"; sha256="13my6y9jqd86cg5n74p4b8mqbdgwnanxx4qf1rrhm5jxf6sa31qm"; depends=[raster Rcpp RcppArmadillo]; };
   gld = derive2 { name="gld"; version="2.6.2"; sha256="1wrw7i5bq7rb2ahadm57y9fmr697r7lp9ln7ajcd592b0nn60n4i"; depends=[e1071 lmom]; };
   gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; };
-  glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; };
+  glinternet = derive2 { name="glinternet"; version="1.0.11"; sha256="1lqph2hj0h826gcfyk290ahkfalpnrd6jzymm60xi2qxia14lzk5"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; };
-  gllvm = derive2 { name="gllvm"; version="1.2.2"; sha256="194rm0zfrk8klgbpiv4rcfn57rvnwg6dafq91w9wy1vljp69xyjy"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; };
+  gllvm = derive2 { name="gllvm"; version="1.2.3"; sha256="0jqfijmkz2rzwfzg03q4cdd9cr4nz0m7yaka0d0nh62jakkgfjqm"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; };
   glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; };
-  glm_predict = derive2 { name="glm.predict"; version="3.1-0"; sha256="16ahl6jvydmx48hzixv8whsr55w527k0a1xbic20crinblx0ncb4"; depends=[MASS nnet]; };
+  glm_predict = derive2 { name="glm.predict"; version="4.0-0"; sha256="12k8rrjvcb5nss5bh1wrh1pfcpcsj635xgksz7lsi3xbryk007ci"; depends=[AER MASS nnet survival]; };
   glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; };
   glmBfp = derive2 { name="glmBfp"; version="0.0-60"; sha256="1yv6db80k8lbchd35lqpf7jjn2ss9x6rrw4r04j3xz9y246lfvxz"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
   glmaag = derive2 { name="glmaag"; version="0.0.6"; sha256="1yk5bx1gyj97b5qjy30q1gsjlp9amklwf070i0129f8dj7vjyaf0"; depends=[data_table foreach ggplot2 gridExtra huge Matrix maxstat OptimalCutpoints plotROC pROC Rcpp RcppArmadillo shiny survival survminer]; };
-  glmbb = derive2 { name="glmbb"; version="0.4"; sha256="15w80lj3kdgbkp6k6g0jgxgg2q0i5sd57n0d3v56sm43cd2kcgqf"; depends=[digest]; };
+  glmbb = derive2 { name="glmbb"; version="0.5-1"; sha256="1jy77z5fr781rm5mx6kszwi2zlvnpfwi24fn9vw1kza4jzcw9pjw"; depends=[digest]; };
   glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; };
-  glmdisc = derive2 { name="glmdisc"; version="0.5"; sha256="0985j4gh4069pwcf3spsi8czq6xn9vhajliprxjwlv3xbisjcf8s"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; };
+  glmdisc = derive2 { name="glmdisc"; version="0.6"; sha256="031rz3s5d7hz9fzmsj7aqhzwrn05rnfvk9292k2r0qpr6k02mk3b"; depends=[caret dplyr gam magrittr MASS nnet Rcpp RcppEigen RcppNumerical]; };
   glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
   glmertree = derive2 { name="glmertree"; version="0.2-0"; sha256="0lfn6dap38i6cnfy4gdap13aq81h9cm3bip7ci57q9br9b00x7ib"; depends=[Formula lme4 partykit]; };
   glmglrt = derive2 { name="glmglrt"; version="0.2.2"; sha256="1954ywshnqzr7h77wshf63y3zx3ra8mrfabg5dqjhkgv4rsk3h1y"; depends=[MASS parameters]; };
@@ -8816,48 +9182,53 @@ in with self; {
   glmmfields = derive2 { name="glmmfields"; version="0.1.4"; sha256="0gnb2s34xz7cjyaa2w2wq7n6c5016a14mc03kalvwdv3f7b98zan"; depends=[assertthat BH broom broom_mixed cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders tibble]; };
   glmmsr = derive2 { name="glmmsr"; version="0.2.3"; sha256="1fbg5zji0xjr9q1yc6phsp37nsrj7nfs8yiri0j9s84wzgwjili1"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; };
   glmnet = derive2 { name="glmnet"; version="4.0-2"; sha256="0qdswxvdwjcnw0by15p9yfzw8laq4f2j0ivpma6q8c5zywldpxxc"; depends=[foreach Matrix shape survival]; };
-  glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.5"; sha256="0q8h3pniblcgvghffsiz0qqipq8cpln4dg8nwg0k4m1j2n6h582h"; depends=[glmnet Matrix]; };
+  glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.6"; sha256="1an9vg8kih1fq73av2yw21zamsnly9h47bcajbpblhpljrixh1ic"; depends=[glmnet Matrix]; };
   glmnetcr = derive2 { name="glmnetcr"; version="1.0.6"; sha256="0cs0yj2js0920iggcw2vci5y9hnsm3hd7wpd7mwnx8mszwrklawg"; depends=[glmnet]; };
   glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; };
   glmpathcr = derive2 { name="glmpathcr"; version="1.0.8"; sha256="00hbgp1kdbvihqvx03vv6gq32whrkcfq3n32bbj3cda85dnivlwq"; depends=[glmpath]; };
   glmpca = derive2 { name="glmpca"; version="0.2.0"; sha256="02xjf0gg52925hw9nw2j0znfmzfzfwbv0fxjl9d2fy9j63drr2h4"; depends=[MASS]; };
   glmtlp = derive2 { name="glmtlp"; version="1.1"; sha256="01kyw0xipyr9z7x9z41wz7rqargzqd8s8ri34ffdvd3ggrdznl0p"; depends=[glmnet]; };
-  glmtree = derive2 { name="glmtree"; version="0.1"; sha256="03baxmabfpyl89a5dqk16fhvcgw58daji3fkqc35yy6hzsiwg04q"; depends=[caret dplyr magrittr partykit]; };
+  glmtree = derive2 { name="glmtree"; version="0.2"; sha256="07b7ma38r5cjv6c33q1n2f8xvzn3lj004i8v947pqdhg3fi9wlc6"; depends=[caret dplyr magrittr partykit]; };
   glmulti = derive2 { name="glmulti"; version="1.0.8"; sha256="0zviahj99645s1xs2f9z7rnv95x4rdz7mfwzy3qjfw46yqpfj5cn"; depends=[leaps rJava]; };
   glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; };
   glmx = derive2 { name="glmx"; version="0.1-1"; sha256="06v2qxgr16w0qnfhjr9vdqcad5v475pwg2yhw0i236yzqbnsssh6"; depends=[Formula lmtest MASS sandwich]; };
   globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
+  globalKinhom = derive2 { name="globalKinhom"; version="0.1.2"; sha256="1hvl2lhaxpzgdii5jcays2yvpxvrid5njninfn8px4ymf7h597zw"; depends=[spatstat]; };
   globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
   globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
-  globals = derive2 { name="globals"; version="0.12.5"; sha256="1ha8iasgijp4q3v2b0b17y1wh7cd3nvzd9b03w49qm2bidkaf68m"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.14.0"; sha256="1wrjiiif6rpc268zz79pvpw33si6n6ffgxdnxmmcracwhb5vqg90"; depends=[codetools]; };
   globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; };
   glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; };
+  glow = derive2 { name="glow"; version="0.10.1"; sha256="1br29hy5j30k5q4xk1dglxlhqalhm76hnx8xg73v6whcg5j11392"; depends=[ggplot2 R6 Rcpp RcppEigen RcppParallel scales]; };
   glpkAPI = derive2 { name="glpkAPI"; version="1.3.2"; sha256="1qwq6vbx1symly6k72xgj5qzqw7j6wdsgiflm649pdxnisfgzh00"; depends=[]; };
   glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
-  glue = derive2 { name="glue"; version="1.4.1"; sha256="1j1va4vi3g9sl0cyjdwxvh5lvh10x8k9qvnsr9zyxddcbk9qgdpq"; depends=[]; };
+  glue = derive2 { name="glue"; version="1.4.2"; sha256="1bgpirdvjrf0da734clrixawvpdap4lpda4g89vais96589m8wwz"; depends=[]; };
   gluedown = derive2 { name="gluedown"; version="1.0.2"; sha256="1vq5zgwlwj5rzdwj7z9ypnvj2fw9m653bdbivb2hx2z2hl8qwfp9"; depends=[glue]; };
   gluvarpro = derive2 { name="gluvarpro"; version="4.0"; sha256="09l9yincr1k5j9wnj3zvfzsffjh3r54aa8fn0ik8vhlbq13ag8kp"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; };
+  glvmfit = derive2 { name="glvmfit"; version="0.0.0"; sha256="1mdxscvpc0cfmzpmswpml28b7kl254awl86mgv0nkgrs8rgrb05k"; depends=[]; };
   gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; };
+  gmGeostats = derive2 { name="gmGeostats"; version="0.10-7"; sha256="19rpv7dac7gqal7fxk79xa74ifrqqf1wxpzky11ham3pck242rhw"; depends=[boot compositions foreach gstat RColorBrewer sp]; };
   gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; };
   gmailr = derive2 { name="gmailr"; version="1.0.0"; sha256="0wgh428qrwn6rxkcv9xmpya4ygrmc5pblxp0fw0ddgwbl99dhhi5"; depends=[base64enc crayon gargle httr jsonlite lifecycle magrittr mime rematch2]; };
   gmapsdistance = derive2 { name="gmapsdistance"; version="3.4"; sha256="1hazf6xb4ja6h2lrl63kbd78wzny9sljiid9rq1r3szn3l1mc7dn"; depends=[RCurl XML]; };
-  gmat = derive2 { name="gmat"; version="0.2.1"; sha256="035x8b982qk3ik9qhxa9jhkczmafix6nbpbz0r5smby6q6bhj6jz"; depends=[gRbase igraph]; };
+  gmat = derive2 { name="gmat"; version="0.2.2"; sha256="0iq2b3s60fyam45ykk67xyi2yhr8ma1s2vw4059357j1948525p2"; depends=[gRbase igraph]; };
   gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; };
+  gmgm = derive2 { name="gmgm"; version="1.0.1"; sha256="0pkv4q4w2bxkf9pqqllzjbbyqvax3w97rlmgaf5d6pwjq4lvk9hf"; depends=[dplyr ggplot2 purrr rlang stringr tidyr visNetwork]; };
   gmm = derive2 { name="gmm"; version="1.6-5"; sha256="12lzgrrir2hlnqlq42s2ddj8yvra78br3icmz03ngyk14a4r0w5i"; depends=[sandwich]; };
   gmnl = derive2 { name="gmnl"; version="1.1-3.2"; sha256="01pviab3gyvjdlv5jy7wzp33909znhpn47kar55bwkm6gm3bdlg8"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
   gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; };
-  gmp = derive2 { name="gmp"; version="0.6-0"; sha256="1c9vpr6j6h5f6dm9l535nscl66rvr8sba5az2kswjhmzwb9xpjxc"; depends=[]; };
+  gmp = derive2 { name="gmp"; version="0.6-1"; sha256="11rl7qmfrpp1974f0vzsi3zjyx147wlb82ydxak2b60khfvhrn90"; depends=[]; };
   gms = derive2 { name="gms"; version="0.4.0"; sha256="1m7bhy4vsz6l09pal9ibjlskmbyjmc29hqwjim1x8yansd5bxpzv"; depends=[dplyr rlang stringr yaml]; };
-  gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; };
-  gmvarkit = derive2 { name="gmvarkit"; version="1.1.3"; sha256="08vfyad8fs6zpwgvxs2qrvnbii824fx4yxghrvcqx25x1j71vvnl"; depends=[Brobdingnag mvnfast pbapply]; };
+  gmt = derive2 { name="gmt"; version="2.0.2"; sha256="0z5abh0kw97y90nxkkxxg2xgv1avxijf71v88lwhy25jgv8r7b38"; depends=[]; };
+  gmvarkit = derive2 { name="gmvarkit"; version="1.3.1"; sha256="0zz68prwi3whfclz6av9d8spb7c17zcadx0wpwp1vll4zxxlx08c"; depends=[Brobdingnag mvnfast pbapply]; };
   gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; };
   gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; };
   gnm = derive2 { name="gnm"; version="1.1-1"; sha256="1lddsdsg43wpg681s906i4xqqfbjdd1qb9ml5dfprb02i1806aa2"; depends=[MASS Matrix nnet qvcalc relimp]; };
   gnn = derive2 { name="gnn"; version="0.0-2"; sha256="0sh9b6d0zvrml7d1bnirxld2lwrgrd7ma3ky7xl71kis0x3fjdq9"; depends=[keras qrng tensorflow]; };
+  gnomonicM = derive2 { name="gnomonicM"; version="1.0.0"; sha256="1g4849rbqbc9ybip2qwmjajxsd4ayd3jv9hgfv60dygqdnscl166"; depends=[minqa triangle]; };
   gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; };
   gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; };
   goeveg = derive2 { name="goeveg"; version="0.4.2"; sha256="0k9pyph065x8wp452x8kz28ikhsbrm80ln4yssmcgqm7085dyyya"; depends=[cluster fields Hmisc mgcv vegan]; };
-  gof = derive2 { name="gof"; version="1.0.1"; sha256="0m9g3g5aw8wiz6am56ms2a5ipyk68gxd00bgs840lprgfdd4iw1n"; depends=[lava mets Rcpp RcppArmadillo]; };
   gofCopula = derive2 { name="gofCopula"; version="0.3-3"; sha256="1hqna4m9b2kcksfc7r0rmi1wqw6p4a1miinm2548gpbiz5ai7ni2"; depends=[copula crayon doSNOW foreach MASS numDeriv progress R_utils SparseGrid VineCopula yarrr]; };
   gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; };
   goffda = derive2 { name="goffda"; version="0.0.7"; sha256="183hz0x0d9qh8v2k2qa5ii1g8hpmgl9bpd3dvb9f5v58zmxhgl8h"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; };
@@ -8868,42 +9239,45 @@ in with self; {
   goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; };
   golem = derive2 { name="golem"; version="0.2.1"; sha256="07g5sagdq1n5i24bc8pnx9y303adraqppq1j9lyd4n5q0phbgh2y"; depends=[attempt cli config crayon desc dockerfiler fs here htmltools jsonlite pkgload remotes rlang roxygen2 rstudioapi shiny testthat usethis yaml]; };
   gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; };
+  gontr = derive2 { name="gontr"; version="1.1.0"; sha256="0asvpc3nizcn7cqdxr1j9hvhprmrazd8c7a2svhmln4vg9x1zzkp"; depends=[]; };
   goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; };
   googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.8.0"; sha256="0zpnix2ql7p9l57iyv43yz1z4y5v7d5zi7yvs0z4i4yi5zgwqh60"; depends=[assertthat cli dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tibble tidyr]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="1.3.0"; sha256="0csycg3d8pk01rsnpvxjs7as7dwapladfjj4v170gwzskhjmfbg9"; depends=[assertthat cli digest gargle httr jsonlite memoise rlang]; };
-  googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.2.0"; sha256="00m1kwm4qr2xw7p8y3qal1si6yvlmhin0xsn9s0c8spjsrppb94l"; depends=[assertthat cli googleAuthR googleCloudStorageR httr jsonlite openssl usethis yaml]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="1.3.1"; sha256="0mm591z5zqsy6cdzr8s24msghpr1sia7n75h21axnh59m2m7md95"; depends=[assertthat cli digest gargle httr jsonlite memoise rlang]; };
+  googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.3.0"; sha256="1q2q449dkkwck1asi4a0gqxa1l3by6dqk73aj1lsn7299b9p7c9z"; depends=[assertthat cli googleAuthR googleCloudStorageR httr jsonlite openssl progress usethis yaml]; };
   googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.1"; sha256="0sd6ca1ksv22avr5rcvkf5089f9igb8gqa83kidlc4xklaj6g92m"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; };
   googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.2.0"; sha256="1n4gkmnwp9wadxz1izggxnpcpm4bz3imhq5y3i2szr8zwafcqqjv"; depends=[data_table glue googleAuthR jsonlite purrr]; };
   googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; };
   googleLanguageR = derive2 { name="googleLanguageR"; version="0.3.0"; sha256="0lm50g3gshp18nvygi6is2rayzhcx0rw2rvb4lvm0jlx5m96xgxb"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; };
-  googlePolylines = derive2 { name="googlePolylines"; version="0.7.2"; sha256="0czfsmf8gv38g950l9xkk67q9v53pk9xk9yr2flbdpm8nlrdpjz7"; depends=[BH Rcpp]; };
+  googlePolylines = derive2 { name="googlePolylines"; version="0.8.2"; sha256="1z8ml0xiyqy1ygairgs9w10q4a7msd6gkzjv7kf6r8xv4bpc02pd"; depends=[BH Rcpp]; };
   googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; };
   googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; };
-  googleVis = derive2 { name="googleVis"; version="0.6.6"; sha256="0zp21zj7mpdshvh5ah60nqdys2iapqk58ib93zpr8155fshwdxqn"; depends=[jsonlite]; };
+  googleTagManageR = derive2 { name="googleTagManageR"; version="0.1.6"; sha256="1y2avhgvzrpmpyx341di8ml2pdj10y8sdhn7zwjpxgzrxkmf4xxi"; depends=[assertthat dplyr future googleAuthR httr jsonlite purrr]; };
+  googleVis = derive2 { name="googleVis"; version="0.6.9"; sha256="1smp85xjs0pda705m1d5kmfd138r57inz6pznljahwra72ix0f87"; depends=[jsonlite]; };
   googledrive = derive2 { name="googledrive"; version="1.0.1"; sha256="0qbyl0wyrxmwn9jg0d2s7c1kmmvmx61qbyx3qby4js8dks70f1ls"; depends=[curl gargle glue httr jsonlite magrittr purrr rlang tibble uuid]; };
   googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; };
   googlenlp = derive2 { name="googlenlp"; version="0.2.0"; sha256="0d0g18i3im2s5f14k69ym3vwf9a7zkaval3nwrip97xcl6kf4x9h"; depends=[dplyr httr jsonlite purrr readr rlang]; };
   googler = derive2 { name="googler"; version="0.0.1"; sha256="1aayji3ncqxl58k29d93dbx05s9rp9bc63fl2cpl1cys7gilblxx"; depends=[jsonlite tibble]; };
   googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; };
   googlesheets4 = derive2 { name="googlesheets4"; version="0.2.0"; sha256="0nkhhh4jg03f2d0iy1lmy6c8mfc3a7k6ixd8h3ngmcxw1g4pagbj"; depends=[cellranger curl gargle glue googledrive httr ids lifecycle magrittr purrr rematch2 rlang tibble vctrs]; };
-  googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; };
+  googleway = derive2 { name="googleway"; version="2.7.3"; sha256="0n2ybkjwwhq7kpyv0ryz4mp5w06psbcm2gyfwk0d3wp1i43ajsn4"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; };
   goric = derive2 { name="goric"; version="1.1-1"; sha256="0cqgcgsh3hc2zzyrczw66bbb4gg5xfkjslmrszwxbbn4zl9rkhpn"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
   gorica = derive2 { name="gorica"; version="0.1.0"; sha256="09b5i6r2s449gvk0vagvf7kd6y0pgr4cz7hdwplq01x246bhjs6q"; depends=[bain lavaan lme4 MASS mvtnorm quadprog]; };
-  gotop = derive2 { name="gotop"; version="0.1.1"; sha256="0jlybfhxjdv92mxm6r47yplnjy6h19sikbgr9n3nsiymcnz8q7ss"; depends=[htmltools jsonlite]; };
+  gotop = derive2 { name="gotop"; version="0.1.2"; sha256="1dvcgz7ha637ixjqmgcwhvl3f9kpx4fdq8im40iz8xwnxqwmrlgx"; depends=[htmltools jsonlite]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
   govdown = derive2 { name="govdown"; version="0.10.0"; sha256="0zkalxbalbaakyrxwd29yyfmzvdmpb9nfaqyqwj52v64nxgz1v4m"; depends=[rmarkdown]; };
   gower = derive2 { name="gower"; version="0.2.2"; sha256="0c9n921wn4hhlvjq96r4nkk96s5788376cbldr7y7bwz348200iz"; depends=[]; };
   goxygen = derive2 { name="goxygen"; version="1.0.3"; sha256="0825zl16ap0k3jqhrjw4hfsw97ils77jmf4yqq347k3bb8i3dm79"; depends=[citation gms pander stringi yaml]; };
   gpairs = derive2 { name="gpairs"; version="1.3.3"; sha256="08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27"; depends=[barcode colorspace lattice MASS vcd]; };
+  gpbStat = derive2 { name="gpbStat"; version="0.3.0"; sha256="1mnmhjcnikjsxdvcb5kkh91zhlvj0h40ypazlkafd1z0yfmv52s4"; depends=[]; };
   gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; };
   gpg = derive2 { name="gpg"; version="1.2.2"; sha256="1qc7w4d6frp0j4yk0q7slkj1mps80bv78lixcpw1shgx48rp41kh"; depends=[askpass curl]; };
-  gpindex = derive2 { name="gpindex"; version="0.1.2"; sha256="072f0l40j54b15wxla577rbg6basjzck5qmvmcbvbqfd2jmsm3cw"; depends=[]; };
+  gpindex = derive2 { name="gpindex"; version="0.2.3"; sha256="14glwrlkka9izg43wi82q8acsw2fii5i5iw81nyigzkycrix5yj2"; depends=[]; };
   gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
   gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; };
-  gplots = derive2 { name="gplots"; version="3.0.4"; sha256="15ip3v4xiqzbanf8bc5fj90cbwdgixr72aj5jrp34jfdzdx0gxwg"; depends=[caTools gdata gtools KernSmooth]; };
+  gplots = derive2 { name="gplots"; version="3.1.1"; sha256="0f8khaymz383w2ksnk80d4kpnvgmdk37pbycpsnl2vabaz11kbpr"; depends=[caTools gtools KernSmooth]; };
   gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; };
   gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; };
-  gprofiler2 = derive2 { name="gprofiler2"; version="0.1.9"; sha256="112hmmvdwg8xz90w1bsbzc55y4xi9jj4dqy0q4bsgp49x58r92rb"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; };
+  gprofiler2 = derive2 { name="gprofiler2"; version="0.2.0"; sha256="0q8hl3gdxy34c0181ql405fdklz82nfvmwdcafd5mzf935rjpyjg"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; };
   gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
   gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; };
   gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; };
@@ -8912,30 +9286,31 @@ in with self; {
   grabsampling = derive2 { name="grabsampling"; version="1.0.0"; sha256="031a4ak84k2mbhrmjbai3q8qnf2z3d9rp0xra67x74a99av9lzs9"; depends=[extraDistr ggplot2 ggthemes plyr reshape2]; };
   gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
-  gradeR = derive2 { name="gradeR"; version="1.0.7"; sha256="063l3wipfzdmh5mphs09f070pif36xp1ma1jvvn83385w3y2b9vd"; depends=[jsonlite testthat]; };
+  gradeR = derive2 { name="gradeR"; version="1.0.9"; sha256="052ficcrflplvm79v47hbqlh3z5b4kjq7zjms7i6hv2c3mmvbarr"; depends=[callr jsonlite testthat]; };
   gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; };
-  grainscape = derive2 { name="grainscape"; version="0.4.2"; sha256="0njwhjg1xz6cbibcdc00qpvii97rri0bm12g1cqf5yvrnax1wyh5"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; };
+  grainscape = derive2 { name="grainscape"; version="0.4.3"; sha256="0mc9mgc70ysqal8pjslmr7dzig3d08jcdpba348hmgyh0w9b6s07"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; };
   gramEvol = derive2 { name="gramEvol"; version="2.1-4"; sha256="1am5nlnyawi4lybi10ag4fdhddvbwsdzrmr6f66bzspdpl4s26g9"; depends=[]; };
   grangers = derive2 { name="grangers"; version="0.1.0"; sha256="15q8hv7p5g5m7v6lx6nq5394fa6p05xgawnsrn1v5aslmmbbzyvl"; depends=[tseries vars]; };
   granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
   granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; };
-  graph3d = derive2 { name="graph3d"; version="0.1.0"; sha256="0l0a8zrjync34zjxp84ng8vmhlmfcirygqd2n4ydpxj690wravps"; depends=[htmlwidgets lazyeval]; };
-  graph4lg = derive2 { name="graph4lg"; version="1.0.0"; sha256="0xc7g8b58wgz219g7fhy3jf0glb41vws9lx8bg21jqndzjmrql8h"; depends=[adegenet diveRsity ecodist foreign gdistance ggplot2 igraph MASS Matrix pegas rappdirs raster sf sp spatstat stringr tidyr vegan]; };
+  graph3d = derive2 { name="graph3d"; version="0.2.0"; sha256="1c4pmx37nf4nm6svrn9dqr50gb2fckx8635zg0n4gnzgdca1iyv4"; depends=[htmlwidgets lazyeval]; };
+  graph4lg = derive2 { name="graph4lg"; version="1.0.1"; sha256="1nx2wws6rxb3rqjzfk0jim1kfgidfvghal51rjrbfknk585k1iaj"; depends=[adegenet diveRsity ecodist foreign gdistance ggplot2 igraph knitr MASS Matrix pegas rappdirs raster Rdpack rmarkdown sf sp spatstat stringr tidyr vegan]; };
   graphTweets = derive2 { name="graphTweets"; version="0.5.3"; sha256="0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07"; depends=[combinat dplyr igraph magrittr purrr rlang tidyr zeallot]; };
   grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; };
   graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; };
+  graphhopper = derive2 { name="graphhopper"; version="0.1.1"; sha256="192m008kj1nw6jwank709icgswx316pdwiv4jcffx744kjhxkgh8"; depends=[dplyr googlePolylines httr jsonlite magrittr tibble]; };
   graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.1.0"; sha256="1cc4xcb72yci2gq2zn3g1nh3ba802anpymm0hajdbz3kb0wz1gyn"; depends=[igraph matrixcalc mvtnorm Rdpack]; };
-  graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.3"; sha256="1xd98irbh67a7vbj6a4arl51dnkj5c0c1mcmh1c1hsac8mdj29w0"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
+  graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.4"; sha256="0hfldvw60cac0qdjfdpmx1kbdhhyqw2k0yscyyh886fwr4rvj800"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; };
-  graphlayouts = derive2 { name="graphlayouts"; version="0.7.0"; sha256="17lc75k8i3c696hfj44zj7j1a5sb0nap8spc5r98v7vd6xh4nii0"; depends=[igraph Rcpp RcppArmadillo]; };
+  graphlayouts = derive2 { name="graphlayouts"; version="0.7.1"; sha256="05v7ss18bflhqa4ipsca8iw2ln8ddbaiyrizx2a5cwq81g5qq3rq"; depends=[igraph Rcpp RcppArmadillo]; };
   graphon = derive2 { name="graphon"; version="0.3.4"; sha256="06y8hz0z6rx6ii4p36js8f85vya3v2834pnghng8adk2ibdlsc1s"; depends=[Rdpack ROptSpace]; };
   graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; };
   graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; };
   graphsim = derive2 { name="graphsim"; version="1.0.1"; sha256="05v5jhb3fpd5vpb12b203mvs9lx25yhwfg5qavw6rc7pgj5z974i"; depends=[gplots igraph Matrix matrixcalc mvtnorm]; };
   gratia = derive2 { name="gratia"; version="0.4.1"; sha256="0gxqmnmcz1nlmmlhshfsz7cwjxcp2ha73bjgkb9s5wgwlflpng43"; depends=[cowplot dplyr ggplot2 mgcv mvnfast patchwork purrr rlang tibble tidyr vctrs]; };
   graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; };
-  gratis = derive2 { name="gratis"; version="0.2.0"; sha256="1bbj1b9kamhbd3v8nxwipv5iz7vlhziqn77pzkzndm68dgkdi3bj"; depends=[doRNG dplyr foreach forecast GA magrittr mvtnorm polynom purrr rlang shiny shinydashboard tibble tsfeatures]; };
+  gratis = derive2 { name="gratis"; version="0.2.1"; sha256="035jk2nc8xs0n3ak6k6i42h5gw2n57rrrarb1xwb17khg05dzk25"; depends=[doRNG dplyr foreach forecast GA magrittr mvtnorm polynom purrr shiny tibble tsfeatures tsibble]; };
   grattan = derive2 { name="grattan"; version="1.9.0.0"; sha256="12vjqlmnymidkapa9zzbk1hcq6cac9669sdsrcaaqn3si0hq0i7l"; depends=[assertthat data_table fastmatch forecast fy hutils ineq magrittr Rcpp zoo]; };
   gravitas = derive2 { name="gravitas"; version="0.1.3"; sha256="11n85bdmigqasbq8c1amj1k7manfvs3gnax2ihsf2vp56s9c463p"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; };
   gravity = derive2 { name="gravity"; version="0.9.9"; sha256="1x912mg7cnday7lji48mw9f5drd732qlnrq4d6d75s5pgfps91p6"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; };
@@ -8949,7 +9324,7 @@ in with self; {
   gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; };
   gretlR = derive2 { name="gretlR"; version="0.1.0"; sha256="0lpznicpjlvp5kkhmlfr4as7px545k416i3f54900jnc7xa7fm8p"; depends=[knitr]; };
   grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; };
-  greybox = derive2 { name="greybox"; version="0.6.1"; sha256="0k50fa0s9bs763qk367sl5a4q524dwim8vvj4zxrqa805rqf561r"; depends=[forecast gnorm lamW Matrix nloptr pracma Rcpp statmod zoo]; };
+  greybox = derive2 { name="greybox"; version="0.6.4"; sha256="0h9m7xzaknfkbgykj9xrb778pa86yaawh99a0m7fvzbspgig65dw"; depends=[forecast lamW Matrix nloptr pracma Rcpp statmod texreg zoo]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
   grf = derive2 { name="grf"; version="1.2.0"; sha256="1i12a5sa1kg0jh50y0r77qy4fca3j1vqrnlblbh8ldpjy07sln47"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
@@ -8957,32 +9332,36 @@ in with self; {
   gridDebug = derive2 { name="gridDebug"; version="0.5-1"; sha256="1x1bbyfbyyn13sw5pvnzns6mq57fyq2fywj8hx5k9rhqclzjqxyr"; depends=[graph gridGraphviz gridSVG]; };
   gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; };
   gridGeometry = derive2 { name="gridGeometry"; version="0.2-0"; sha256="0y7y1ld03cqpibmjssid6n3n8gf98hi9ngcfbkh6acyzck812bc7"; depends=[polyclip]; };
-  gridGraphics = derive2 { name="gridGraphics"; version="0.5-0"; sha256="0rlyc3xk8kfrfzbfd8n4javq3yxqd7lsfmi4q5n6s61srnrl6c1r"; depends=[]; };
+  gridGraphics = derive2 { name="gridGraphics"; version="0.5-1"; sha256="12yswy02j3h5wir7m5jnkhpjmb0sa4snn61vjd68i49qwsa6w219"; depends=[]; };
   gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
   gridSVG = derive2 { name="gridSVG"; version="1.7-2"; sha256="0vxhdz6a759q6q9lpmyjwkvrjr52dfz609jbwrd0pnfyffmmpzh0"; depends=[jsonlite XML]; };
   gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; };
-  gridtext = derive2 { name="gridtext"; version="0.1.1"; sha256="06rb3xn8zf9m1v8kam39a7cp6iaw4xpirwjvp0y99gx3q5ijf5d7"; depends=[jpeg markdown png Rcpp RCurl rlang stringr testthat xml2]; };
+  gridtext = derive2 { name="gridtext"; version="0.1.4"; sha256="131kw7nkfwksviwfifd2kk7lyvhxzzzv1nnj8rahkr3dik3akk61"; depends=[jpeg markdown png Rcpp RCurl rlang stringr xml2]; };
   gripp = derive2 { name="gripp"; version="0.2.20"; sha256="0rshipm8rdynl19a4dsvvvlhkd0n4vjfkidwnv5iilc5ini7c4qr"; depends=[GA GenSA usethis]; };
-  grizbayr = derive2 { name="grizbayr"; version="1.3.0"; sha256="13gwah8s47cybc8pm9vkxm35sbdblmi2p49qw0kr56mk2sfrglf8"; depends=[dplyr magrittr purrr rlang tibble tidyr]; };
+  grizbayr = derive2 { name="grizbayr"; version="1.3.1"; sha256="1bsvk52r1zba553x20xkfdjyasyd6r3xrssqb6hrrmkaw6h2qg2m"; depends=[dplyr magrittr purrr rlang tibble tidyr]; };
   grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
-  grobblR = derive2 { name="grobblR"; version="0.1.0"; sha256="186sawp9yd5idzs4wsk66szy0v6h5dc5kpq72539dck23isb6dsa"; depends=[dplyr ggplot2 glue gridExtra magrittr png purrr RCurl stringr tibble]; };
-  groc = derive2 { name="groc"; version="1.0.7"; sha256="1qi16br426z90d58130n47riy7q1lcq19zl585a001av4lrmmqzv"; depends=[MASS mgcv pls robustbase rrcov]; };
+  grobblR = derive2 { name="grobblR"; version="0.2.0"; sha256="0zx2lj7m873v5lkvv521q3vsrdqhzkw0zha63qiicqk896gy7isj"; depends=[dplyr ggplot2 glue gridExtra magrittr png purrr RCurl stringr tibble]; };
+  groc = derive2 { name="groc"; version="1.0.8"; sha256="0zxwq3ha3sa58v8fhb2s41nqqpsgr3q9j7arlww1zz295mrlrs5i"; depends=[MASS mgcv pls robustbase rrcov]; };
   gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; };
+  groundhog = derive2 { name="groundhog"; version="1.0.0"; sha256="0laxdm52fbii50h3s01kk1frkprq24rn0z03ss54lriq6q4a9swr"; depends=[]; };
   groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; };
   groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
   groupWQS = derive2 { name="groupWQS"; version="0.0.3"; sha256="1c5yrsfgkhbg1fcjbrilfmf0phjry5z34536yfizc8wbc7mmmj0c"; depends=[glm2 MASS rjags Rsolnp]; };
   groupdata2 = derive2 { name="groupdata2"; version="1.3.0"; sha256="01bp7y78vzli178cikkaj48yvik690irxgni77if9dg3rz63gxg5"; depends=[checkmate dplyr lifecycle numbers plyr purrr rlang tibble]; };
   grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
-  groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.1"; sha256="1kapz07hswpcvm9mmgc06l71f7ymx7aq816mzwca6cvccvqnrl5n"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; };
-  groupedstats = derive2 { name="groupedstats"; version="1.0.1"; sha256="1sry6ccvygx6whg1ls2bx4aqc056z1lil2f5hn5rh20hlsryv186"; depends=[broomExtra dplyr effectsize glue haven ipmisc lme4 parameters purrr rlang skimr tibble tidyr]; };
+  groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.2"; sha256="015av2087i0vxh3axl91crwvparhpc4w2p2j9fq7wylg1gsarraa"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; };
+  groupedstats = derive2 { name="groupedstats"; version="2.0.0"; sha256="1n8g5nhk71yq96hkb9159zmcizby4gcvi875jj745fyf3l01xwd1"; depends=[broomExtra dplyr effectsize glue lme4 magrittr parameters purrr rlang skimr tibble tidyr]; };
+  groupr = derive2 { name="groupr"; version="0.1.0"; sha256="1gych92dpyxg2vfm3h6djw61d9z2n6q2kvbz1xpq1p0zcyiw16gy"; depends=[dplyr purrr rlang tibble tidyr vctrs]; };
   groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; };
   grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; };
   growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
   growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; };
-  growthPheno = derive2 { name="growthPheno"; version="1.0-26"; sha256="1niwlwrzz3d0r274nlk0fyx3hx6i7n7xg3ibd8s7cl2q4d2f8ic9"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape stringi]; };
+  growthPheno = derive2 { name="growthPheno"; version="1.0-30"; sha256="1bvhrnams0x8p9ck1cfm9a1c7m9x80xhw9y24mafzparc2wljyxx"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape stringi]; };
+  growthcurver = derive2 { name="growthcurver"; version="0.3.1"; sha256="1l3dqcl395nh406s7d5554r5ynk1a7v5ba5kmnv9r7lj7h9nfdjj"; depends=[minpack_lm]; };
   growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
   growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; };
-  growthrates = derive2 { name="growthrates"; version="0.8.1"; sha256="1ivids4qfyhi3k5l6mvi6bhajnbxhiqmm4qdcmmfrmzs8c59cvvm"; depends=[deSolve FME lattice]; };
+  growthrates = derive2 { name="growthrates"; version="0.8.2"; sha256="0skhjmqkl456l325346qi5vc7h4dmk3mqk4z1cm33ycynnnacsc2"; depends=[deSolve FME lattice]; };
+  grpCox = derive2 { name="grpCox"; version="1.0.1"; sha256="07l0gv8yc5yqp7zwqawc71kkdab6fsfrb25mp2gynlb7vabh8isy"; depends=[colorspace MASS Matrix Rcpp RcppEigen]; };
   grpSLOPE = derive2 { name="grpSLOPE"; version="0.3.0"; sha256="0v20v3rdjmz517rl86nkrsaa1dl2p49kdkgk7ynv92p2ib37wwga"; depends=[Rcpp]; };
   grplasso = derive2 { name="grplasso"; version="0.4-7"; sha256="0jf48ahc6d6biwx235dlvbk1papxkqbcnvxsr93p5047pjm02y3a"; depends=[]; };
   grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; };
@@ -8992,14 +9371,14 @@ in with self; {
   gsDesign = derive2 { name="gsDesign"; version="3.1.1"; sha256="17sm1rqvp39apjxb35mhq7rjv70nanqsihv4h5m7cyx8nkxmviyj"; depends=[dplyr ggplot2 mvtnorm plyr rlang tibble xtable]; };
   gsEasy = derive2 { name="gsEasy"; version="1.3"; sha256="00471kfjb6zw3n4nbx3a91xjn748hw3xpl9pq5sgbrf6xg9gcf7c"; depends=[ontologyIndex Rcpp]; };
   gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
-  gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
+  gsarima = derive2 { name="gsarima"; version="0.1-5"; sha256="0nmn4hlvhl8dw7pkpf010x9qjd6w8drdlcj47qv0sap8wngrwhzg"; depends=[MASS]; };
   gsbDesign = derive2 { name="gsbDesign"; version="1.0-1"; sha256="0wb62y4fcca1qq27kgk59qxm1nx5njcs94cr8x1bsnk88z945p9p"; depends=[gsDesign lattice]; };
-  gsbm = derive2 { name="gsbm"; version="0.1.1"; sha256="1d8hg4xb5siy4x5vkl6ijblzm1lghhypd2mpg0msf5g0ximqsnpk"; depends=[RSpectra softImpute]; };
+  gsbm = derive2 { name="gsbm"; version="0.2.1"; sha256="16j4g0wl9phmx85dbrzxsdjcv0nnipgj214fvbz9m6n66khr5pkp"; depends=[doParallel foreach Matrix RSpectra softImpute]; };
   gscaLCA = derive2 { name="gscaLCA"; version="0.0.5"; sha256="12zksjp0wh95qg7vxh22z652hk35r9sp0qxrms4y1laixa8vr71x"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS nnet progress psych stringr]; };
   gscounts = derive2 { name="gscounts"; version="0.1-3"; sha256="1xcsvnam858l9am30mmqb6m0vcflijhli22ix8g56rcvfsh208q1"; depends=[Rcpp]; };
   gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; };
   gsheet = derive2 { name="gsheet"; version="0.4.5"; sha256="0b8q44cqkjfy6vnffm94czq4ag8xfbxik52026ahq95kcf9v2j91"; depends=[httr stringr]; };
-  gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
+  gsisdecoder = derive2 { name="gsisdecoder"; version="0.0.1"; sha256="1h7a9j4gsdk8nasfkzfizlarx335ra0j0yz98a2000v2qzm2a5qy"; depends=[Rcpp]; };
   gsl = derive2 { name="gsl"; version="2.1-6"; sha256="0p4rh7npp6qbfc5sxjq86xjn7c9ivf3pd60qf1hldwckjqin7m7m"; depends=[]; };
   gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; };
   gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
@@ -9016,13 +9395,13 @@ in with self; {
   gtable = derive2 { name="gtable"; version="0.3.0"; sha256="1lyncxf2dqdjgw1071cn9c8zwzkz6sldnd5cgmicf70bc726qf7x"; depends=[]; };
   gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
   gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; };
-  gtfs2gps = derive2 { name="gtfs2gps"; version="1.2-1"; sha256="1b3l81898yqgr6x0lcc7anw35yvmy5c08qfv9n0445yfyazjwczm"; depends=[data_table furrr future lwgeom magrittr pbapply raster Rcpp rgdal rgeos sf sfheaders sp units]; };
-  gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.1"; sha256="0znr0hw6f8wxy3vj944lrlsb0a70w2p20gw50jr2ij9xikawh2ih"; depends=[data_table Rcpp]; };
+  gtfs2gps = derive2 { name="gtfs2gps"; version="1.3-2"; sha256="0vw4ccvszwiwklj9z50cjmvv1yaw2mm3npfgw2gvi2w10bv6z3fv"; depends=[data_table furrr future lwgeom magrittr pbapply progressr raster Rcpp rgdal rgeos sf sfheaders sp units zip]; };
+  gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.4"; sha256="1hzln0a8lmsk5ia37w75dcbcfc61ykf39qd5b0xyfzhkm3fih0cv"; depends=[cli data_table Rcpp]; };
   gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; };
   gtools = derive2 { name="gtools"; version="3.8.2"; sha256="1pnwy412wvhhvnnx8qg6s9hrgcnsfhnfcpf2560ipipk845acfsh"; depends=[]; };
   gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
-  gtrendsR = derive2 { name="gtrendsR"; version="1.4.6"; sha256="0v46j1k7yzqhl6x6axq96rv4icwfvvscdzkd6wpl3si8qy3m4dp9"; depends=[anytime curl ggplot2 jsonlite]; };
-  gtsummary = derive2 { name="gtsummary"; version="1.3.3"; sha256="1c3fzvb0y9jfzkaq86fjlm2kfdxin8ny1xc2hi88cy720bimaldq"; depends=[broom broom_mixed dplyr forcats glue gt knitr lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect usethis]; };
+  gtrendsR = derive2 { name="gtrendsR"; version="1.4.7"; sha256="1w0b8xcnkx8lnn2a9cc6z7jxbpyfk3lrysf0rz299yykgb6iczc6"; depends=[anytime curl ggplot2 jsonlite]; };
+  gtsummary = derive2 { name="gtsummary"; version="1.3.5"; sha256="01yzv1n1l60q1p8psxxwwbmszh9q691h1nkyv0kaqmni6y9jk8gy"; depends=[broom broom_mixed dplyr forcats glue gt knitr lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect usethis]; };
   guaguas = derive2 { name="guaguas"; version="0.1.0"; sha256="10f5kbd03szx2pmmcm2zjjv8zkm0hdf0lk3s91yk40x80s2bxccs"; depends=[tibble]; };
   guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; };
   guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; };
@@ -9032,57 +9411,57 @@ in with self; {
   gunit = derive2 { name="gunit"; version="1.0.0"; sha256="0vmm47f21n9f334aj38gzrmv1c4sp76njk95ld9gv6fcfxgsipyh"; depends=[magrittr stringr tibble units]; };
   gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; };
   gustave = derive2 { name="gustave"; version="0.4.1"; sha256="1sdfx3zmnamdwgnyvs3rn38wmwiyww1a620jyfc984b9r2zqvd1w"; depends=[Matrix]; };
-  gutenbergr = derive2 { name="gutenbergr"; version="0.1.5"; sha256="1c6n2vj38srqmlcl0d2yp749rhn9n5mmz31x98fij4x55km53sci"; depends=[dplyr lazyeval purrr readr stringr urltools]; };
+  gutenbergr = derive2 { name="gutenbergr"; version="0.2.0"; sha256="0m7j68zcm0aikjpavmw1yfdph68jqhm1665bl64n276675m98i3w"; depends=[dplyr lazyeval purrr readr stringr urltools]; };
   gvc = derive2 { name="gvc"; version="5.2.0"; sha256="15z4r8xkz0alabh3z278hylz042f2r5cqdllc5n3hfx5q3ch19xx"; depends=[decompr diagonals]; };
   gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; };
   gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
   gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; };
+  gwasforest = derive2 { name="gwasforest"; version="1.0.0"; sha256="122fg4pc409lvw4yvrc8ijm6d6j29b4aacd319a16caxkkydgwlb"; depends=[colorspace data_table dplyr ggplot2 ggrepel glue]; };
   gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; };
-  gwer = derive2 { name="gwer"; version="2.0"; sha256="05wz3ayhplmjwbdb6mg8m5mj6gw0n8rh55lw208wbdm6c8jmjywc"; depends=[assertthat glogis maptools Matrix sp spData spdep spgwr]; };
+  gwer = derive2 { name="gwer"; version="2.1"; sha256="0vhqw12qk5a21nzs4x2cvl2hzwcbmbzghnxajda9pz5r3vcvl8v2"; depends=[assertthat glogis maptools Matrix sp spData spdep spgwr]; };
   gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
   gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; };
   gwrpvr = derive2 { name="gwrpvr"; version="1.0"; sha256="0x15nv2pfv99c04lgs6q6hgczarld34xc4aqw9bn179m7j02v6m3"; depends=[]; };
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
-  gwsem = derive2 { name="gwsem"; version="2.0.5"; sha256="104inkhim42wrnrbx9kbg0cbdlwj07k9j5m8xd9nhkrbyn4lnyzn"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; };
+  gwsem = derive2 { name="gwsem"; version="2.0.7"; sha256="0pzg0fzxkf2i8br57yfdz05xjkb3cvag7whya1skhnxgi4w4wkhz"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; };
   gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; };
-  h2o = derive2 { name="h2o"; version="3.30.0.1"; sha256="1xdhd0h0hncg7s5nsrb97arqiyd9r3cxv1in36lx7pyplxcfy4fb"; depends=[jsonlite RCurl]; };
+  h2o = derive2 { name="h2o"; version="3.32.0.1"; sha256="0rmba0yn1ghh9201rn8q948bkx3wi0gwvavwn51h5kxfwj0in5l6"; depends=[jsonlite RCurl]; };
   h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; };
   hBayesDM = derive2 { name="hBayesDM"; version="1.0.2"; sha256="04p4d0hy2l6bmxyh2k5q0g19b7fbpsl9frmcvrf5rxkaasxyxwn6"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; };
   hIRT = derive2 { name="hIRT"; version="0.3.0"; sha256="0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c"; depends=[ltm Matrix pryr rms]; };
   hJAM = derive2 { name="hJAM"; version="1.0.0"; sha256="1pnjcn54zi4d7h9zc9wr1gv51dzb0vasfcrw4c1kqymhxsq2yfh3"; depends=[dplyr ggplot2 ggpubr reshape2]; };
-  hNMF = derive2 { name="hNMF"; version="0.9"; sha256="0qavavgiqah4dv0gz8v5ssz637sd341n9s0pyc232n2jhqpzl0cz"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
-  hR = derive2 { name="hR"; version="0.2.2"; sha256="01yrhxy6jw97fsvw4g0r2nz5112gpi62zcazxzi2576hvbwafpdv"; depends=[data_table data_tree knitr rhandsontable shiny]; };
+  hNMF = derive2 { name="hNMF"; version="1.0"; sha256="08xn9i24dcykvbcsqzmk33li5fm1alkvcmq2fp0a2ysw4lvwfwqs"; depends=[MASS NMF nnls oro_nifti rasterImage]; };
+  hR = derive2 { name="hR"; version="0.2.41"; sha256="0xy4m6dibdmjvh81amp81cq6aa0ffsry9gjrkpm476mchsym2ip7"; depends=[data_table knitr rhandsontable shiny]; };
   hSDM = derive2 { name="hSDM"; version="1.4.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hablar = derive2 { name="hablar"; version="0.3.0"; sha256="12gm5n3p2kmjwhkf60n4bjn3lrj7lrs5sgmvads9sfp2ckhaiysk"; depends=[dplyr lubridate purrr]; };
   hackeRnews = derive2 { name="hackeRnews"; version="0.1.0"; sha256="0vrdbk4dxbykb3hs35nxkl3s2ds92gs5qz66p85w8j5zjmwbw2x6"; depends=[future_apply httr jsonlite tibble]; };
-  hacksaw = derive2 { name="hacksaw"; version="0.0.1"; sha256="0w00kws8gwwmqbrrhhavh3n011dhicz7fz9qmnj74016srzzvddw"; depends=[dplyr magrittr purrr rlang tibble tidyselect zeallot]; };
-  hadron = derive2 { name="hadron"; version="3.1.0"; sha256="0fcl7mgw61jcpyn1m4l1n4hm01addza9pnb7l7xbhq6kx524kzcs"; depends=[abind boot R6 Rcpp stringr]; };
-  hagis = derive2 { name="hagis"; version="3.0.1"; sha256="1bljpva3j7x87hdmy8s9sh37r5vd8wkjzjqbk57akl654x6b0gfv"; depends=[data_table ggplot2 pander]; };
+  hacksaw = derive2 { name="hacksaw"; version="0.0.2"; sha256="1ls4l53bsaxyd6lwka9z9sb6ypa2ymbxpfxhsj9k966031jv2vk3"; depends=[dplyr magrittr purrr rlang tibble tidyselect zeallot]; };
+  hadron = derive2 { name="hadron"; version="3.1.2"; sha256="04qd3lb6im5shf24ss88jkskab1rwn7m2d94x0ybbmfcg3l5dhm0"; depends=[abind boot dplyr R6 Rcpp stringr]; };
+  hagis = derive2 { name="hagis"; version="3.1.1"; sha256="15hv1ib516i4bkjr5d6xqagzjs9vd8hv7nylq29h57kxms0mddzl"; depends=[data_table ggplot2 pander]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
   hal9001 = derive2 { name="hal9001"; version="0.2.6"; sha256="1yzxskv4bvawss4vlcb2gh2v43jcnx799xnqrx37zhjd34wpm2w4"; depends=[assertthat glmnet Matrix origami Rcpp RcppEigen]; };
-  haldensify = derive2 { name="haldensify"; version="0.0.5"; sha256="02bmch7impx5cyv7nifhqln2ppk1qyyzr8w6my77p18wx52h1d4l"; depends=[assertthat data_table future_apply ggplot2 hal9001 origami Rdpack]; };
+  haldensify = derive2 { name="haldensify"; version="0.0.6"; sha256="086p3an0m3mccf14p6bl6s01xvh24wkb4p39vgdyrsf83318d0h8"; depends=[assertthat data_table future_apply ggplot2 hal9001 matrixStats origami Rdpack]; };
   halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; };
   hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; };
-  handlr = derive2 { name="handlr"; version="0.2.0"; sha256="1p14q9swvy8yvd52wcms777vfcb9vandi0pd4cmqmyz1hpsi31d8"; depends=[crul jsonlite mime RefManageR urltools xml2]; };
+  handlr = derive2 { name="handlr"; version="0.3.0"; sha256="0l0jwlslz2pyg7q447k56acfhgmx5njsriqdrwd02zzbsc3g6wm5"; depends=[crul jsonlite mime urltools xml2 yaml]; };
   handyplots = derive2 { name="handyplots"; version="1.1.3"; sha256="0pcl0iichdw2lkv8y00mv6n6c0rvrnsk75ka5lwm2g7b64pphsvk"; depends=[]; };
   hans = derive2 { name="hans"; version="0.1"; sha256="0hh2nlzxs2kj93yb7yfm873m6nymjw5qmkin3qqn3acza6dr0k6q"; depends=[Rcpp]; };
   hansard = derive2 { name="hansard"; version="0.8.0"; sha256="00mcy58nhlphb0v0wchbaw1qamm0435s09nxxw6rr5z872rhyf5a"; depends=[dplyr jsonlite lubridate snakecase tibble tidyr]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
-  haplo_stats = derive2 { name="haplo.stats"; version="1.8.2"; sha256="13gc980jk1pas7mz9b4nmwqd64qhh2c0xhq1z06z67jgv7k8n7dc"; depends=[arsenal rms]; };
-  haploR = derive2 { name="haploR"; version="4.0.1"; sha256="0qaykwlid1q03ba2qlvg51y1lghwqqwrv8glsqg5wfyqk34n2gs0"; depends=[DT httr plyr RCurl RJSONIO RUnit tibble XML]; };
+  haplo_stats = derive2 { name="haplo.stats"; version="1.8.6"; sha256="1imz4gs0n57vixwwbirrihpgvn2pyj5da4rgjcjk14n2xkk0nay7"; depends=[arsenal rms]; };
+  haploR = derive2 { name="haploR"; version="4.0.2"; sha256="1s9019683fgp6sxxjigr5rkpkdj3lxn576a8w067sh6k66138w31"; depends=[DT httr plyr RCurl RJSONIO RUnit tibble XML]; };
   haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; };
   haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; };
   haplotypes = derive2 { name="haplotypes"; version="1.1.2"; sha256="07grdwli0kxnnnf7mg8z7gjpny88h71vf867g50f08yybgb46y70"; depends=[ape network phangorn plotrix sna]; };
   happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; };
   happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; };
   hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; };
-  hardhat = derive2 { name="hardhat"; version="0.1.4"; sha256="0gaj4hr4dj27jaasp7v0hzaivipplvq746ajsyz4yd1in03hfjvs"; depends=[glue rlang tibble vctrs]; };
+  hardhat = derive2 { name="hardhat"; version="0.1.5"; sha256="1b7f9i9fy39j9n03g40vd6nzgq9fgq914xg3svf84najlknvjzly"; depends=[glue rlang tibble vctrs]; };
   harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; };
   harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; };
   harrypotter = derive2 { name="harrypotter"; version="2.1.1"; sha256="1j3sv0rpp4lcrf09j4a3an4lkwi2x1z18iv62fk6c2kpp9b14b8r"; depends=[ggplot2 gridExtra]; };
   hash = derive2 { name="hash"; version="2.2.6.1"; sha256="0b3fl0rvgwb992knl81vm99lsldg5clvaqjh6mamm6zqmb6dz056"; depends=[]; };
-  hashFunction = derive2 { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
   hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; };
   hashr = derive2 { name="hashr"; version="0.1.3"; sha256="0xbwzhvg77ch4na9ylb8y8nghmpy38dxcvn4g6g6adarm3lbm4ck"; depends=[]; };
   hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; };
@@ -9110,25 +9489,30 @@ in with self; {
   hdf5r = derive2 { name="hdf5r"; version="1.3.3"; sha256="0i8m4yjxggrs05slq2afvz2ckl1yc9wq7gd1s7dq2gjn46zkry50"; depends=[bit64 R6]; };
   hdfqlr = derive2 { name="hdfqlr"; version="0.6-1"; sha256="1z8sylaaki8ab9k7m4hp3530rnkxjh39zvw4n962fw5fb9a11dx3"; depends=[]; };
   hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; };
+  hdiVAR = derive2 { name="hdiVAR"; version="1.0.1"; sha256="0rq5vsi0s3y9rkkzijkicrlg55vjqklniizmx4dqs3ib18jbh94l"; depends=[abind lpSolve]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
   hdm = derive2 { name="hdm"; version="0.3.1"; sha256="1kibfc1fc94y1vk06nn0yfvpdzcm30a1jn89lqqfma70x5jpa25s"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
   hdme = derive2 { name="hdme"; version="0.3.3"; sha256="1i6ixzl8kkj7jlj5q40xhbblw5a64fq0gfy6z6174fn2h8f4dqkj"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; };
   hdnom = derive2 { name="hdnom"; version="6.0.0"; sha256="0wszxxfz5xkyqd3xgc9g3d5iwwsfkq9517bgp416h6l31ynxxrwn"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized survAUC survival]; };
+  hdpGLM = derive2 { name="hdpGLM"; version="1.0.0"; sha256="04mn0cbbx66218rsd273yh29h28f1xl8k0whwlyn6hrg035mlk0x"; depends=[coda data_table dplyr formula_tools ggjoy ggplot2 ggpubr ggridges Hmisc isotone LaplacesDemon magrittr MASS MCMCpack mvtnorm purrr questionr Rcpp RcppArmadillo rprojroot stringr tibble tidyr tidyverse]; };
   hdpca = derive2 { name="hdpca"; version="1.1.3"; sha256="09h96wm6r6w1imkm4k9bg5l0vcq2yvbp6iqx786x99ds8jzppsb9"; depends=[boot lpSolve]; };
   hdrcde = derive2 { name="hdrcde"; version="3.3"; sha256="0c2qbw4c3mq1cb068kjs72rxlbibz8svwcrx853jyr8ybs23z7ab"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; };
   hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; };
   healthcareai = derive2 { name="healthcareai"; version="2.5.0"; sha256="05qsmgrnaagnavlrs9c6j01j9c3lcc9j7cmbrx3y6lb6pf4zs195"; depends=[caret cowplot data_table dplyr e1071 generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; };
+  healthfinance = derive2 { name="healthfinance"; version="0.1.0"; sha256="163zhdd5mqp0q872dmr3xzw2ppapnwp46rr7vkkfnglz635nxvpz"; depends=[ggplot2 lubridate readr scales shiny tibble]; };
   healthforum = derive2 { name="healthforum"; version="0.1.0"; sha256="13ih00amv9hrpngm6pxc8vzqzhx8c0yqgaprxdcp5li90lg5r3av"; depends=[magrittr purrr rvest stringr tokenizers xml2]; };
+  healthyR = derive2 { name="healthyR"; version="0.1.1"; sha256="18id31pb0ja0d41fklzv4zbbly2rk4yfwx8r5mb1g270dccadr6s"; depends=[cowplot dplyr ggplot2 lubridate magrittr purrr rlang scales stringr tibble timetk writexl]; };
+  healthyR_data = derive2 { name="healthyR.data"; version="1.0.0"; sha256="1xsbvv21s01wrkag4njbh428019nl47pp7722b6gazqd9a855yhp"; depends=[]; };
   heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
   heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heatmap3 = derive2 { name="heatmap3"; version="1.1.7"; sha256="1gdjc5b4f4nf5zpfdl0ch352p3bwbcw5hkd5vlarxvb2qkf9pcxs"; depends=[fastcluster]; };
   heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; };
-  heatmaply = derive2 { name="heatmaply"; version="1.1.0"; sha256="133q8ir45vhfxs2lnd96k97g21ihg2arfhp349kmk339pk32fcxz"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
+  heatmaply = derive2 { name="heatmaply"; version="1.1.1"; sha256="02fv66h61y55bn5wrnlvhj7v6xwqs3pddyp3jgk554s1zv4qs2fr"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
   heatwaveR = derive2 { name="heatwaveR"; version="0.4.4"; sha256="0d2j2qmfm5q0g57hrfkmd5mf5n4cinldh5l234nfk1ykf8s2aak3"; depends=[data_table dplyr ggplot2 lubridate plotly plyr Rcpp RcppArmadillo RcppRoll tibble zoo]; };
   heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; };
   heddlr = derive2 { name="heddlr"; version="0.6.0"; sha256="0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23"; depends=[rlang utf8 yaml]; };
   hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; };
-  heemod = derive2 { name="heemod"; version="0.13.0"; sha256="0jig4ba1szgn8x6fivjlr9ns2lryip2nr68q64bsdvvhjsmv1k4s"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr purrr rlang tibble]; };
+  heemod = derive2 { name="heemod"; version="0.14.0"; sha256="0b520v7lgmj0vvp42997dknjvn7sa9zkbgkc634b859pbsc0h192"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr purrr rlang tibble]; };
   heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; };
   helda = derive2 { name="helda"; version="1.1.3"; sha256="0ffy1cy6p98r23gz0avqbwpr7q3b76mmgic6y8dipfkbs7zqcdv6"; depends=[dplyr ggplot2 rlang sqldf stringr]; };
   helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; };
@@ -9136,22 +9520,24 @@ in with self; {
   helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
   helminthR = derive2 { name="helminthR"; version="1.0.7"; sha256="16dkmxs94h48d07c73jznjgg368j9291m98xi7fbbjn4d4cqm7mm"; depends=[httr knitr magrittr plyr rmarkdown rvest xml2]; };
   helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; };
-  heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; };
-  here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; };
-  hereR = derive2 { name="hereR"; version="0.4.0"; sha256="0plyxjs2lbniw8dc0agfga9lzx5czd0g9mxhllkajshmk3502fja"; depends=[curl data_table flexpolyline jsonlite sf stringr]; };
+  heplots = derive2 { name="heplots"; version="1.3-7"; sha256="1p98gvp3q71qphd3hgr79y7l4mgq2kyyqwrbykcnckjz2a9xsfmy"; depends=[car MASS]; };
+  here = derive2 { name="here"; version="1.0.1"; sha256="0srlr8h8qmr0wrmp7gs4g2ry5dni2hx8n947bik3s3a26f091v88"; depends=[rprojroot]; };
+  hereR = derive2 { name="hereR"; version="0.5.2"; sha256="1sb0v3qyd6s4kibsq8by4fy291px6zg10hnzg6dqs9xm5h94yhhg"; depends=[curl data_table flexpolyline jsonlite sf stringr]; };
   heritEWAS = derive2 { name="heritEWAS"; version="0.2.0"; sha256="0yss9vf2m9szq8xi5i2nhf85mfvzvhv6c1f4kvvb2z9lmaicjni5"; depends=[]; };
   heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; };
   hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; };
+  hermiter = derive2 { name="hermiter"; version="2.0.0"; sha256="0dnk3n9cd4s14iwvgdj68qq0kqsfsspj1zbimv1v90prm42nb6b4"; depends=[BH Rcpp]; };
   hero = derive2 { name="hero"; version="0.4.7"; sha256="129v2pjbxm5aalr5lfx0kh20rhwksnb80pc459pxg0xkwxvy1l3d"; depends=[fields Matrix optimx pbapply rgeos sp]; };
-  hesim = derive2 { name="hesim"; version="0.3.1"; sha256="1jp703b4xn8s0maja1vmb5ca4fw96g83f3nfm6i2qd250d3sx705"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; };
+  hesim = derive2 { name="hesim"; version="0.4.2"; sha256="14m0svdrgdcmm9vwnhmwiavzz9m1hi52s627mk456a9zjns07041"; depends=[data_table flexsurv MASS msm R6 Rcpp RcppArmadillo survival]; };
   het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
   hetGP = derive2 { name="hetGP"; version="1.1.2"; sha256="0r7hzw6ccyrqpq51adljd2ljv9dl00c0dr8frjrhibpzpc68z3sz"; depends=[DiceDesign MASS Rcpp]; };
-  hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; };
+  hett = derive2 { name="hett"; version="0.3-3"; sha256="0i7q28nc67m62vi1ipfg035yqjh691fb1mp33dp1b68g5wjysphh"; depends=[lattice MASS]; };
   hettreatreg = derive2 { name="hettreatreg"; version="0.1.0"; sha256="092xd2yndg5n5shxmcyn2gh6a6w1i1497cvj009ih3ax8hk3crf0"; depends=[]; };
   hettx = derive2 { name="hettx"; version="0.1.1"; sha256="0zfxg88l83pzj37c5khpv4vi0v28fdnp0p8yz39scm8d8lya1dkm"; depends=[doParallel dplyr foreach formula_tools MASS moments mvtnorm plyr purrr quantreg tidyverse]; };
+  hetu = derive2 { name="hetu"; version="1.0.1"; sha256="1blxfvi3cy6w8m72lrgz81s90aw3h01visgi2ghg3abyh1qq4an2"; depends=[]; };
   heuristica = derive2 { name="heuristica"; version="1.0.2"; sha256="1wqdwggnma6p667ivr0xja4vvn3jgzbkc5whkkijmdmxpjzg1wz6"; depends=[Hmisc]; };
   heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.2.4"; sha256="0dp85yvn0fr22l174ff34pv9xfxh3d7na9dxim2z7f4ialdnialw"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales stringr tidyr]; };
-  hexSticker = derive2 { name="hexSticker"; version="0.4.7"; sha256="17qrprl0y6p4yp38rv9ndy7s8205jy3zjfwsjzxlk42pk504ifp1"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; };
+  hexSticker = derive2 { name="hexSticker"; version="0.4.9"; sha256="0d9sz2cshn4lq18kd9fkgvjm3v29h0k22b6228rq2q3zhxi97ra0"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; };
   hexView = derive2 { name="hexView"; version="0.3-4"; sha256="01hiqyibsd4as7jcklzg09pl12la341mg561vn16z4jzdarfvkfc"; depends=[]; };
   hexbin = derive2 { name="hexbin"; version="1.28.1"; sha256="1ry6jm3lqz3mj0s5rzbs6mpkz2hxpnvbw8c1vwc4pj7b173r5l22"; depends=[lattice]; };
   hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; };
@@ -9179,7 +9565,7 @@ in with self; {
   highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; };
   highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
   highcharter = derive2 { name="highcharter"; version="0.8.2"; sha256="1hwiifpm60kqgxlvp8zd6mhgbzc4mkcz9s9yc6byrm9i6daiqs8r"; depends=[assertthat broom dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rjson rlang rlist stringr tibble tidyr xts yaml zoo]; };
-  highfrequency = derive2 { name="highfrequency"; version="0.6.5"; sha256="1j7wn75xql6pw7inmvh9729l320wd3ss68jhz7y8cp4c60w2mkww"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; };
+  highfrequency = derive2 { name="highfrequency"; version="0.7.0.1"; sha256="13avypm8pq73zizrqknb060s2cj31bbhywz8z8x9vxlckhs393r2"; depends=[cubature data_table mvtnorm quantmod Rcpp RcppArmadillo RcppRoll robustbase sandwich xts zoo]; };
   highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; };
   highlightHTML = derive2 { name="highlightHTML"; version="0.2.5"; sha256="0j3zrvil7k5wfsbgfj2b4nbx77qsj3b4makv5angcf8s59p7q80r"; depends=[]; };
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
@@ -9188,15 +9574,16 @@ in with self; {
   higlasso = derive2 { name="higlasso"; version="0.9.0"; sha256="09d500jsxlrv658i90xnb2wj1ad89v1iwb6y7vascyvg3cff104h"; depends=[gcdnet gglasso purrr Rcpp RcppArmadillo]; };
   higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; };
   hilbertSimilarity = derive2 { name="hilbertSimilarity"; version="0.4.3"; sha256="1251df3q7c7c69f8q9y9bxj210bk2dh80c8ca4s58isf0hr2x7zp"; depends=[entropy Rcpp]; };
-  hildareadR = derive2 { name="hildareadR"; version="0.1.0"; sha256="0xvwpp9cb2bvy91081v0pvk778bbcginlnlq3dfv2cg7xnrhy0cn"; depends=[dplyr haven]; };
+  hildareadR = derive2 { name="hildareadR"; version="0.2.0"; sha256="0hay1r6lxnyzjp97456d9wra7myrmifyx8cywzc85wclm355yc9b"; depends=[dplyr haven]; };
   hillR = derive2 { name="hillR"; version="0.5.0"; sha256="00ms1clypd52w921l9ny73kqwim80chjfmbxjsxxgyj9pfardl2d"; depends=[ade4 ape FD geiger plyr tibble]; };
   hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   hindex = derive2 { name="hindex"; version="0.2.0"; sha256="01mcd2br33qqkfcyxl584f3l6kyb2cgzpd207p0mynzdaallgxgc"; depends=[foreach ggplot2 purrr]; };
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
   hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
+  hiphop = derive2 { name="hiphop"; version="0.0.1"; sha256="0k071kxf04b95f3z5y2h9dhnqrvzwgyhi3q26ghn3s76c155f1k1"; depends=[]; };
   hipread = derive2 { name="hipread"; version="0.2.2"; sha256="1y51yif2spl6brqjvb20k9r6xwkr5f6brv08qcl4g9xg561yngff"; depends=[BH R6 Rcpp rlang tibble]; };
-  hisse = derive2 { name="hisse"; version="1.9.8"; sha256="07b199jijfvssg9r22nknp0zhhr11k0lf2kaqi2xws27j1b2cw0h"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; };
+  hisse = derive2 { name="hisse"; version="1.9.10"; sha256="0sic9f0h4wdyai8vcl6lpkz4ris02xf64f0lw77zcmfmn29cp139"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; };
   histmdl = derive2 { name="histmdl"; version="0.7-1"; sha256="0k6l3pfjzlgpxv55vy8dg4sl8zhh0460xcfszwp2k9sbzanwaamp"; depends=[]; };
   histogram = derive2 { name="histogram"; version="0.0-25"; sha256="0yymc7fw4qkbigr8jiw2nzjyrw0ikkipz62pdn3bpz1f7nb7mi93"; depends=[]; };
   historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
@@ -9205,12 +9592,13 @@ in with self; {
   hitandrun = derive2 { name="hitandrun"; version="0.5-5"; sha256="18zbyv7y7sv7g075swwbx6gmxf468vyl41d2cvq3am5c1rwhw1d4"; depends=[rcdd]; };
   hive = derive2 { name="hive"; version="0.2-2"; sha256="0ihghpfsk73lndrfrk5907kdsih9s0a7xq23zcyfaa05nk98510n"; depends=[rJava XML]; };
   hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; };
+  hkdatasets = derive2 { name="hkdatasets"; version="0.0.3"; sha256="0sfgqr6g9nk3v6df9hssavk4pn7ax837xflg1kgyxpvqssn8iiyl"; depends=[]; };
   hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; };
   hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; };
-  hmclearn = derive2 { name="hmclearn"; version="0.0.4"; sha256="04q0lhi619zlm1j4cq6jfj0zj6f6vdsk3659h4r2963hk2rs95qk"; depends=[bayesplot MASS mvtnorm]; };
+  hmclearn = derive2 { name="hmclearn"; version="0.0.5"; sha256="0zalvgnibd1kygryqcah5d008y6a0nxpy61yyiqsriw89r01jyjk"; depends=[bayesplot MASS mvtnorm]; };
   hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; };
-  hmgm = derive2 { name="hmgm"; version="1.0.2"; sha256="1sln43c8f40kxa9gx0iykgv434km7gsldn748ilsdcxg566ayvzj"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; };
-  hmi = derive2 { name="hmi"; version="0.9.19"; sha256="03bshnql53isqjdzv8qkvdyxy9i9av92g0vfbkx06x4bbc4a8msf"; depends=[boot broom_mixed coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm]; };
+  hmgm = derive2 { name="hmgm"; version="1.0.3"; sha256="12gaz2pi9ny7y772yzrfvl02p3n89cq1l5dzmcksd172gv9ayyz1"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; };
+  hmi = derive2 { name="hmi"; version="1.0.0"; sha256="0fjcw13mkxza6nkq3fhp188ga1sjspq1sc6wjm4hy13xh7vdjpqq"; depends=[boot broom_mixed coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm]; };
   hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; };
   hmm_discnp = derive2 { name="hmm.discnp"; version="3.0-6"; sha256="0jb4ga50d0qy9kz13qjsbwbvyhn8qiqsjsai2m6kvxb7qzd33g26"; depends=[nnet]; };
   hmma = derive2 { name="hmma"; version="1.1.0"; sha256="1qsvczqq44h46z0nfblv4rarbg64imz8m0jhxdhva27kbzdvqf97"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; };
@@ -9235,12 +9623,14 @@ in with self; {
   hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
   horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; };
   horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; };
+  horseshoenlm = derive2 { name="horseshoenlm"; version="0.0.6"; sha256="1m3n12wgmb1wnxc40bzpna261das8hy47l7hmvhfbzhmp7v803v5"; depends=[msm survival]; };
   hot_deck = derive2 { name="hot.deck"; version="1.1-2"; sha256="089sfkpl9m1xxpxxxa9kpc99lcswsz90dhq1k7iji2f7wby5i905"; depends=[mice]; };
   hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; };
   hotspots = derive2 { name="hotspots"; version="1.0.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; };
   housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; };
+  hover = derive2 { name="hover"; version="0.1.0"; sha256="04jq9rpj7ni6l7qfxxvv5pm5dadcd711q08dvjhngcksrxzx2zi2"; depends=[htmltools shiny]; };
   howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
-  hpa = derive2 { name="hpa"; version="1.1.1"; sha256="00121j701cyinakicy991nknaydhdpw6fm7knxq1vrmm2mc358vv"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  hpa = derive2 { name="hpa"; version="1.1.3"; sha256="1dq7jvgr3i0k43fzy2bd16ld0k9ficm2ypkbzj25pii95nx0rr6n"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   hpackedbubble = derive2 { name="hpackedbubble"; version="0.1.0"; sha256="1br7q4958f1zgvisglsaf41nz2ahnqi3bzazvlfnmk3nq03cb1ri"; depends=[htmlwidgets]; };
   hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
   hpiR = derive2 { name="hpiR"; version="0.3.2"; sha256="0gz9ngnjgys7hzijsma2iyywwiv7vjar5gls28ds11wq8pmsv96n"; depends=[dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger rlang robustbase zoo]; };
@@ -9252,23 +9642,27 @@ in with self; {
   hrcomprisk = derive2 { name="hrcomprisk"; version="0.1.1"; sha256="0w0ij2yqgg6gkn3pdaism1xqw3dfnm670j2pmsd85qk1ybxzq9l5"; depends=[survival]; };
   hscovar = derive2 { name="hscovar"; version="0.4.0"; sha256="087q3mx6zb5rpycq86v6g3d4x8m24r2ma2s1f4532frl3pg8xcj5"; depends=[foreach Matrix pwr rlist]; };
   hsdar = derive2 { name="hsdar"; version="1.0.3"; sha256="1slb2m62j86hn1kvpv72fvp48sxl7zb2znrr70jqqbrah8n1ynnl"; depends=[Boruta caret raster rgdal signal]; };
+  hse = derive2 { name="hse"; version="0.0-14"; sha256="0m0lk3a6f3vbvmdnallmzr85rap0hh9qvkx7x21jidn94sah9mbd"; depends=[]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
   hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; };
   hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
   hsphase = derive2 { name="hsphase"; version="2.0.2"; sha256="1b62k9sc6604djy37anslvqjpbrj9wsc9mvnfbrnmhqf4g0nnpdq"; depends=[Rcpp RcppArmadillo snowfall]; };
-  hsrecombi = derive2 { name="hsrecombi"; version="0.3.0"; sha256="0k4cb4b054gr7cr38v6h0l0m4rbafvls2qq425b167zjf99l567v"; depends=[data_table dplyr hsphase quadprog Rcpp rlist]; };
+  hsrecombi = derive2 { name="hsrecombi"; version="0.3.2"; sha256="132wmgr910d0gr9pd3pc9fm0wdzks085f32k5wag61xyfkpnjhvc"; depends=[data_table dplyr hsphase quadprog Rcpp rlist]; };
   hsstan = derive2 { name="hsstan"; version="0.8"; sha256="1milwygwn3djd5rv7x03wp6l02gdvaxnm4zhm56fwm64jbk5z3yg"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen rstan rstantools StanHeaders]; };
   htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; };
   htestClust = derive2 { name="htestClust"; version="0.2.0"; sha256="1nwj74w5hyz929jz2qci12x1zpk9gva75gn68k70l6xc5vya60qn"; depends=[bootstrap MASS]; };
   htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; };
-  htmlTable = derive2 { name="htmlTable"; version="2.0.1"; sha256="0ma52kajzxfg9w811d6ldhghzn9xhyr8bh7k5v265k82bzx7rac6"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
+  html2R = derive2 { name="html2R"; version="0.1.0"; sha256="1zdnwbqlpjh8r2xcl83da9pzh9cb8h908krnrs61vqhka7zb82ng"; depends=[glue shiny shinyAce shinyjqui shinythemes]; };
+  htmlTable = derive2 { name="htmlTable"; version="2.1.0"; sha256="1gzh0bdxi55p1ckxv4k0a41b1j0grwv2w3lkqz4c3gkw66dk6ja0"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
+  htmldf = derive2 { name="htmldf"; version="0.1.0"; sha256="0slsmb1cjbmn7m43xdvdjsvlr8qhqf5g72b5yml0yyh4hlw11cf1"; depends=[cld3 dplyr httr lubridate magrittr progress R_utils ranger rvest stringr tibble tidyr urltools xml2]; };
   htmltab = derive2 { name="htmltab"; version="0.7.1.1"; sha256="0nmb8zq6n13zj4rzgg74xpc6y8vkkwn8cqnyszq5h23gnn61inyl"; depends=[httr XML]; };
   htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.5.0"; sha256="07fjznax5sin563ddnzlb7iwc8b39wzf7ymjn66pbmxgskijq2pz"; depends=[base64enc digest rlang]; };
-  htmlwidgets = derive2 { name="htmlwidgets"; version="1.5.1"; sha256="10fp306l1nybkah6jrlrqwwdb6zvklbddp8i3w9v9naj8la5jbnl"; depends=[htmltools jsonlite yaml]; };
+  htmlwidgets = derive2 { name="htmlwidgets"; version="1.5.3"; sha256="0a8g7wqd3qxnhwkm9c9bkzg29db7gvjiaa5y038ln8nch8qq7981"; depends=[htmltools jsonlite yaml]; };
   htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; };
   hts = derive2 { name="hts"; version="6.0.1"; sha256="0bbg7p9iqi3azl7m2vh9ggfdi90c9hy31fm5p0w9ixmvvavwhny6"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
-  httk = derive2 { name="httk"; version="2.0.2"; sha256="1j48swmnmsjsza31k7b55bakhy7j6sbf3gsv7qn5apxs0j9jdjki"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; };
+  htsr = derive2 { name="htsr"; version="1.1.0"; sha256="0dndsdd8k5jfqgq1h9s58iw7ddqw09g9liyc06ahgykx8pfj9lcy"; depends=[DBI directlabels dplyr editData ggplot2 lubridate openair purrr raster RColorBrewer readr readxl RODBC RSQLite shiny stringr tibble WriteXLS zoo]; };
+  httk = derive2 { name="httk"; version="2.0.3"; sha256="1lkwlxrq9gj3m65il2jib3sh4dvl2xf276h9j6nlyg69mpz8i591"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
   httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; };
   httpcode = derive2 { name="httpcode"; version="0.3.0"; sha256="0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr"; depends=[]; };
@@ -9283,12 +9677,12 @@ in with self; {
   humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; };
   humanleague = derive2 { name="humanleague"; version="2.1.2"; sha256="181gz1plz9g8bbjaf67ndhfd2qz5ksnd2l212wm1a383ddc58pmr"; depends=[Rcpp]; };
   humidity = derive2 { name="humidity"; version="0.1.5"; sha256="143pn8jjinlda76b94qh5zw2sfajw0ifcx774x6adr2il5a5wm99"; depends=[]; };
-  hunspell = derive2 { name="hunspell"; version="3.0"; sha256="0mwqw5p0ph083plm2hr2hqr50bjg2dw862dpsfm4l2fgyy3rryq1"; depends=[digest Rcpp]; };
+  hunspell = derive2 { name="hunspell"; version="3.0.1"; sha256="0ql6y05d4xxpm468rslb0wxdp1x9l3flxzmb5w6pjg617f8vpv8z"; depends=[digest Rcpp]; };
   hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; };
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.1"; sha256="0a8xy71dkq2bzdnc90irxmbcxhi0anh87ic22x7b22c3m5605w6s"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; };
-  hutils = derive2 { name="hutils"; version="1.5.1"; sha256="1x2x8gg2hdwxj1gz81pjls4y3yilssksirsbjnjd665rjs3jx7fj"; depends=[data_table fastmatch magrittr]; };
-  hutilscpp = derive2 { name="hutilscpp"; version="0.3.0"; sha256="1x7h1fq6qyylda8k3a1v6s0cx7pf169k86akb6ccwgiikqqsp51h"; depends=[data_table hutils Rcpp]; };
-  huxtable = derive2 { name="huxtable"; version="5.0.0"; sha256="0b9aznqnf3jmyxqgc23v2pp4sixikqrpiqnmaxvn1rhn2l8n7bh1"; depends=[assertthat commonmark generics glue memoise rlang stringr tidyselect]; };
+  hutils = derive2 { name="hutils"; version="1.6.0"; sha256="17q9ndsb11k66y0c0sz0qq9nm9b4xl6ijjwlim7qbm6z69qv2krc"; depends=[data_table fastmatch magrittr]; };
+  hutilscpp = derive2 { name="hutilscpp"; version="0.5.2"; sha256="1d25csrn9mrnvzdjamn7zrmsz8mc3qp8841n7kjrifdav42s4y32"; depends=[data_table glue hutils magrittr Rcpp]; };
+  huxtable = derive2 { name="huxtable"; version="5.1.1"; sha256="09wwmz0yhxdb8d2qd56i2bbwn8mpfsxb9hfad5gkp5n29kchass1"; depends=[assertthat commonmark generics glue memoise R6 rlang stringr tidyselect xml2]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
@@ -9297,7 +9691,7 @@ in with self; {
   hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
   hybridModels = derive2 { name="hybridModels"; version="0.3.7"; sha256="0fj3dvv7s1hlicvlb077pkhbj894brzgdxhp67jck9zpy2qymzxq"; depends=[doParallel doRNG foreach ggplot2 GillespieSSA reshape2 stringr]; };
   hydra = derive2 { name="hydra"; version="0.1.0"; sha256="0r3r8cds4h15narawxhzkrvgnf00vlgrgqdgnmbzjyyb1dmry8wn"; depends=[]; };
-  hydraulics = derive2 { name="hydraulics"; version="0.2.1"; sha256="08xqq9f0rzl64n61l7xjcm1s096vgvqb5s7hj1lds6rzww8gbljg"; depends=[ggplot2 reshape2]; };
+  hydraulics = derive2 { name="hydraulics"; version="0.2.3"; sha256="1ci81831ypbax7n661s3w2ad89ijv816khkg9kxlidyynhrg78fl"; depends=[ggplot2 reshape2 units]; };
   hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
   hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; };
   hydroPSO = derive2 { name="hydroPSO"; version="0.5-1"; sha256="16gdv19yqla80s9fjmvahfn21jv62zivirzs5ch4zm9db54g6bry"; depends=[data_table Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; };
@@ -9307,32 +9701,34 @@ in with self; {
   hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; };
   hydroscoper = derive2 { name="hydroscoper"; version="1.3"; sha256="03g841a1sbhp2kcdl39b9577lyd9i1241smn41578dcyrxshc2in"; depends=[jsonlite pingr readr stringi stringr tibble]; };
   hydrostats = derive2 { name="hydrostats"; version="0.2.7"; sha256="16xrl94289kk1fb6pj0j8q8b40rmsm86fz2msmrmxh7mdp6hmxx9"; depends=[]; };
-  hyfo = derive2 { name="hyfo"; version="1.4.2"; sha256="1wpncjrp6ks5s939csf2grcndgg8gkhh9513s1bsqkymf3nq57rk"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
+  hyfo = derive2 { name="hyfo"; version="1.4.3"; sha256="012akh96qwafhgjba1gjwy0r14a6shcsk5b7n1hvw230s07zxd8r"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
   hyper_fit = derive2 { name="hyper.fit"; version="1.1.1"; sha256="1xibiydfkhzsw0yqfc0xfzj4yz8xyxqlvnfpyxg33v5fwp9wap3v"; depends=[LaplacesDemon magicaxis MASS rgl]; };
   hyper2 = derive2 { name="hyper2"; version="1.0-7"; sha256="155ycb26mgk0ic899ji1pv1k2mmwfzwaa0zj38a9v6fwdgw87rpl"; depends=[cubature magrittr partitions Rcpp]; };
   hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; };
-  hyperSpec = derive2 { name="hyperSpec"; version="0.99-20200527"; sha256="0j3k8akb1v4sxjjhws2yd50jjg36k1yxb9vvvy2wabdba9v6y9r9"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat xml2]; };
+  hyperSpec = derive2 { name="hyperSpec"; version="0.99-20201127"; sha256="1mflkygqz2x63d7bwiyfkdc1bndz73bfzmbdjh2fg8x15kbpm2r6"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat xml2]; };
   hypercube = derive2 { name="hypercube"; version="0.2.1"; sha256="0m0n64rl5fnhvhfdknrza8a0h5lw8vbgakaqbyfx77ixhwqhjn1l"; depends=[dplyr plotly stringr]; };
   hypergate = derive2 { name="hypergate"; version="0.8.3"; sha256="0h36wi4bdxinv7p9alyb7jv1902vdanxx7yvyaw2dcqkdjlzzj49"; depends=[]; };
-  hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; };
   hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; };
+  hyperoverlap = derive2 { name="hyperoverlap"; version="1.0"; sha256="0ak7z4dxdbh85mliqbykiiv6j31skmrxy0xirdn19gsgkfcws90f"; depends=[e1071 ggplot2 MASS matlib misc3d rgl]; };
   hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; };
   hypervolume = derive2 { name="hypervolume"; version="2.0.12"; sha256="0jd49jncmg23vm9rkcy6sd4zjwlw75hwps7wahpb36zs9kb63ssq"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; };
   hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
   hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; };
-  hypr = derive2 { name="hypr"; version="0.1.9"; sha256="0sai8bbrxll8sbmgp3jxzk543gcr9clvxga7bzrfsp5kxkclsjak"; depends=[MASS pracma]; };
+  hypr = derive2 { name="hypr"; version="0.1.11"; sha256="1bhdxnj1h2whq33hw3cxdi4bhrhx48nifqfbcyaqimr8ips4hpwr"; depends=[MASS pracma]; };
   hystReet = derive2 { name="hystReet"; version="0.0.2"; sha256="01nrbk48r1hf1yc953yf1pzryzrjjckwdqhb3pbnwfza8q0aqsfq"; depends=[httr jsonlite lubridate]; };
   hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; };
   hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; };
-  i2dash = derive2 { name="i2dash"; version="0.2.1"; sha256="0hb0ggwm8q0w01isvayb1q4bdl3dvdxixsfjzhqcwh6jp2rn8yaa"; depends=[assertive_sets assertive_types flexdashboard glue knitr magrittr rmarkdown stringi stringr yaml ymlthis]; };
-  iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; };
-  iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; };
+  i2dash = derive2 { name="i2dash"; version="0.2.2"; sha256="16f9snbp3ann303x41yg52mfs9rgzsn5kibhddyxqh61g3l0w60n"; depends=[assertive_sets assertive_types flexdashboard glue knitr magrittr rmarkdown stringi stringr yaml ymlthis]; };
+  i2extras = derive2 { name="i2extras"; version="0.0.2"; sha256="005ydg4p8sb7l2s2g520ky9n7pissai9isvxzbbiajqxajbk41h6"; depends=[dplyr ellipsis ggplot2 incidence2 MASS rlang tibble tidyr trending vctrs]; };
+  iAdapt = derive2 { name="iAdapt"; version="2.0.0"; sha256="1c49dc6hny034fgkdpvry99mz4z2n2daih32sh5jmk2xpqk1zzmw"; depends=[Matrix shiny shinydashboard]; };
+  iBATCGH = derive2 { name="iBATCGH"; version="1.3.1"; sha256="0xq4q4kc2f0whrxz1vmi2gca9pxqix2qm4sfkwbch85if2k8l8fj"; depends=[msm Rcpp RcppArmadillo]; };
   iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; };
   iBreakDown = derive2 { name="iBreakDown"; version="1.3.1"; sha256="1bfl5bh0x6z5a0cmdmx68sap9zdxa3kwdnyk57csxapc362yz108"; depends=[ggplot2]; };
   iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; };
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; };
-  iCARH = derive2 { name="iCARH"; version="2.0.2.0"; sha256="04wwdkxql104k223hvmhs0if062ryzcf4w4dciz1pd2d4dnljpxf"; depends=[abind ggplot2 glue igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; };
-  iCellR = derive2 { name="iCellR"; version="1.5.5"; sha256="0y801yjzwcrmf8arndbwqw3fkbmbgwx4kla6pdy1lvnz693h7s67"; depends=[ape data_table ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph knitr Matrix NbClust pheatmap plotly plyr progress RANN RColorBrewer Rcpp reshape Rtsne scatterplot3d shiny uwot]; };
+  iCAMP = derive2 { name="iCAMP"; version="1.2.9"; sha256="05j8n5bl8gzb978m5l930k12sh4fwnskbk6y4hhnl0j528l7ilb7"; depends=[ape bigmemory Hmisc minpack_lm nortest permute vegan]; };
+  iCARH = derive2 { name="iCARH"; version="2.0.2.1"; sha256="1x703ydssmgb7j0hgqn3d5sh9457jgj7s2m8i12x2b9wvkh0fz8j"; depends=[abind ggplot2 glue igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; };
+  iCellR = derive2 { name="iCellR"; version="1.5.8"; sha256="0nsb4yhgva779gs1ifavxcp3jy400y0q9nsh07hw5ppirfbnvrk0"; depends=[ape data_table ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph knitr Matrix NbClust pheatmap plotly plyr progress RANN RColorBrewer Rcpp reshape Rtsne scatterplot3d shiny uwot]; };
   iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; };
   iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
@@ -9340,6 +9736,7 @@ in with self; {
   iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; };
   iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; };
   iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; };
+  iForecast = derive2 { name="iForecast"; version="1.0.1"; sha256="0fqa2sb8kna16vwb73va00q3rzd5s3gd2h862wqpi24wj1d50dww"; depends=[caret magrittr zoo]; };
   iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; };
   iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; };
   iIneq = derive2 { name="iIneq"; version="1.0.1"; sha256="1mcr084ik1dc5fndj6ci7px4l1y8jz9kr59riqkf0bm6hras5rfg"; depends=[doParallel foreach]; };
@@ -9347,8 +9744,10 @@ in with self; {
   iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; };
   iNEXT = derive2 { name="iNEXT"; version="2.0.20"; sha256="14bagsb0ja3j53i0g4a2ax2gj7lyc6sjcc7isdjx94clbnc2zcsg"; depends=[ggplot2 reshape2]; };
   iNZightMR = derive2 { name="iNZightMR"; version="2.2.5"; sha256="1zxvlz0wyf4n2kpyk82grlww71agvfqp3apswbrimpvi13c9nzhl"; depends=[]; };
-  iNZightTS = derive2 { name="iNZightTS"; version="1.5.2"; sha256="08c79rs1iigdbkbkcfaffs92ci27igd0rbh3z4472811819dyg9x"; depends=[dplyr egg forcats ggplot2 gridExtra magrittr rlang tidyr]; };
-  iNZightTools = derive2 { name="iNZightTools"; version="1.9.0"; sha256="0wyywxsyig50g3k6jragiv9zqzdsiqwybc997w3ah1bmv6vds7rz"; depends=[chron dplyr forcats haven lubridate magrittr readr readxl stringr survey tibble tidyr validate zoo]; };
+  iNZightPlots = derive2 { name="iNZightPlots"; version="2.12.4"; sha256="1zrx961danqhymk81mlfj29hd26iq5224k8zyjg6scgj71z1vjaz"; depends=[boot chron colorspace dichromat hexbin iNZightMR iNZightTools lubridate magrittr quantreg rlang s20x scales survey]; };
+  iNZightRegression = derive2 { name="iNZightRegression"; version="1.3.0"; sha256="0q4w935ckqciw46vvqqwn50bq30qgzq8g4pag8zf00vs4v4rzmxm"; depends=[car dplyr ggplot2 ggrepel ggtext iNZightPlots iNZightTools magrittr multcomp patchwork]; };
+  iNZightTS = derive2 { name="iNZightTS"; version="1.5.7"; sha256="0x11ar2smm3am55k0pzxdx8q64l7vfbm6bbp4zs9q64q7069yrr1"; depends=[colorspace dplyr egg forcats ggplot2 ggtext glue gridExtra magrittr patchwork rlang tidyr]; };
+  iNZightTools = derive2 { name="iNZightTools"; version="1.10"; sha256="1383004794jk4kvzz7k3c0ndz8fjf6chhck4ha2cadr8hqay80if"; depends=[chron dplyr forcats glue haven lubridate magrittr RcppTOML readr readxl stringr survey tibble tidyr validate zoo]; };
   iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; };
   iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; };
   iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; };
@@ -9360,16 +9759,18 @@ in with self; {
   iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; };
   iadf = derive2 { name="iadf"; version="0.1.1"; sha256="0ys8rd05s0j6cs7snmp1car7lp7k4awvs8gnlqaw9zcd7w7k9r06"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; };
-  iai = derive2 { name="iai"; version="1.3.0"; sha256="0xp3j3w7aazcqnrix1qh5iwjsias61fxw5bhhsm2d93arfnd27d5"; depends=[JuliaCall lifecycle rlang stringr]; };
-  iarm = derive2 { name="iarm"; version="0.4.1"; sha256="1z0k970sk8qliknfsz88yij1aigf0dxk43h92iwg17xi64hvjs11"; depends=[eRm ggplot2 gridExtra Hmisc PP psychotools vcdExtra]; };
+  iai = derive2 { name="iai"; version="1.4.0"; sha256="0a4dvx440glynl74xiviq8frb6khr1fp9xcb1ckf0dx5p16vbpsp"; depends=[JuliaCall lifecycle rlang stringr]; };
+  ialiquor = derive2 { name="ialiquor"; version="0.1.0"; sha256="0nrp75lzb49lhkxspvaq6wx5c48ny6fq9m3r1bz0v5f2fd5ilrdx"; depends=[]; };
+  iarm = derive2 { name="iarm"; version="0.4.2"; sha256="0scf1ad87sn4s7ki6hpgk4isy1k3qkdvs18bkwdflsarcx437ms2"; depends=[eRm ggplot2 gridExtra Hmisc PP psychotools vcdExtra]; };
+  ib = derive2 { name="ib"; version="0.1.0"; sha256="1rzgpgmg7bzg60dyxmmprcsri5wdbarqgp4ya5h418hnnmh8hg0n"; depends=[lme4 MASS Matrix Rdpack VGAM]; };
   ibb = derive2 { name="ibb"; version="0.0.1"; sha256="0k2k2qsf11jcn12qm6823hv5ilnf70r0mdskgzjww4mi66kr5lzx"; depends=[dplyr httr jsonlite xml2]; };
   ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; };
   ibdreg = derive2 { name="ibdreg"; version="0.3.1"; sha256="0kgx9iavgm6d6njhki7bm82d6lw2c7kcch2pryd339js2hm0l5gq"; depends=[]; };
-  ibdsim2 = derive2 { name="ibdsim2"; version="1.2"; sha256="15780iz0pijlmx0pzwkvwkyqd0nkgyxqlsm9wiln45fdwz6gbj32"; depends=[ggplot2 glue pedtools Rcpp ribd]; };
+  ibdsim2 = derive2 { name="ibdsim2"; version="1.3.0"; sha256="00i2aakrs5rjp1vjlrg9khjfj9haw07v4yi54m49nkmvnjfyfixg"; depends=[ggplot2 glue pedtools Rcpp ribd]; };
   ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
   ibelief = derive2 { name="ibelief"; version="1.3"; sha256="15jafk5b954hsl5kkbiyr8pi385c92il05jls33lyf4i25q5aqk3"; depends=[]; };
   ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; };
-  ibmAcousticR = derive2 { name="ibmAcousticR"; version="0.1.2"; sha256="06b7p6bqr5clbwghkqlz669nj6slblx4wqxhjpnr4rb690wbcy16"; depends=[httr jsonlite XML]; };
+  ibmAcousticR = derive2 { name="ibmAcousticR"; version="0.2.1"; sha256="1hrd2273n9fgi3hgjissjn4syw914mxm4wr98ij819yahsi9aj42"; depends=[httr jsonlite XML]; };
   ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; };
   ibmdbR = derive2 { name="ibmdbR"; version="1.50.0"; sha256="151gg05gcy5wpyvyflr4mc0jq1npxzq9pc4spjc81x2igd14c370"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
   ibmsunburst = derive2 { name="ibmsunburst"; version="0.1.1"; sha256="0dxsdsimqgs7lbbfx7h8l2r6xpwgy2r7cf2y1v8hkgapf6n5kjnk"; depends=[htmlwidgets jsonlite]; };
@@ -9383,16 +9784,16 @@ in with self; {
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
   icarus = derive2 { name="icarus"; version="0.3.1"; sha256="0ipbhzvwdn1cnzgdw33cwv901768srxfi588bimjx2ssl80mqn3a"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.2.0"; sha256="03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak"; depends=[lme4 Rcpp RcppArmadillo]; };
-  icd = derive2 { name="icd"; version="4.0.9"; sha256="177wwya4fcb2jc33j9xd838ayyqwxgd77a9fi2hd9h8afxz3g12c"; depends=[Rcpp RcppEigen]; };
+  iccde = derive2 { name="iccde"; version="0.2.0"; sha256="13b5hq7h1x87g4dwk50xczyiwrdk3ksr51cll9a2j2ak1cyaf3g4"; depends=[]; };
   icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; };
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
   icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; };
-  icenReg = derive2 { name="icenReg"; version="2.0.14"; sha256="0xszlq8kqb2bf5mv7kxrm5s7wla89ns3gizs3x5cyq710aqdla26"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
+  icenReg = derive2 { name="icenReg"; version="2.0.15"; sha256="1cjlvj4i5bir5769a22w8bb9477h04d8rpxk9ks72jp6zjjkq5qa"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
   icensBKL = derive2 { name="icensBKL"; version="1.2"; sha256="1zzv80jnn8ilnc1gv4nj24l2fl8805rjhqjgkb0xx4y9zhpg1jkp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; };
-  icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
+  icensmis = derive2 { name="icensmis"; version="1.4.0"; sha256="1rfsciac7lj6649a0lrmipjnhdlz615bd9hsvcy8mis0yv8k5y93"; depends=[Rcpp]; };
   icesAdvice = derive2 { name="icesAdvice"; version="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.3-0"; sha256="0yaqlximxa3rcjxgrd0mii02mm9gpcxgw3i8pymp00bk8zixvj30"; depends=[]; };
-  icesTAF = derive2 { name="icesTAF"; version="3.5-0"; sha256="1rirpwnr0z6y3yswb3v2w280a2lj2rn4xln0jxakxbrkjg87sin2"; depends=[bibtex lattice]; };
+  icesTAF = derive2 { name="icesTAF"; version="3.6.0"; sha256="1g2qlpbi94731vvzdnc16f1gpgn49sxzlsljzzapfgk14dcm96b1"; depends=[glue jsonlite lattice purrr roxygen2]; };
   icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; };
   icosa = derive2 { name="icosa"; version="0.10.0"; sha256="1vd1qn1070rml7mygj9k13b96zrc77bw90g8f44s7wmhabn6214q"; depends=[igraph Rcpp sp]; };
   icpsrdata = derive2 { name="icpsrdata"; version="0.5.0"; sha256="024lda7619j8nxcj0d0myaqjsmyl9mqdyghd6imr29jxa2qhcm8y"; depends=[httr purrr rvest]; };
@@ -9403,13 +9804,12 @@ in with self; {
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
   idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; };
   ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; };
-  idefix = derive2 { name="idefix"; version="0.4.3"; sha256="1kpan1499n9paibrr5gc0n5s05ls64fx8raiwckc7hfzsnh1fb26"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; };
-  idem = derive2 { name="idem"; version="5.0"; sha256="083vhr61ivr2a5xyrr1l1b52vlpm6fkjm3b6rbpkrn7qw6b4mv8c"; depends=[BH mice Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; };
+  idefix = derive2 { name="idefix"; version="1.0.1"; sha256="1hqq9w0hssczmy8kvpp438fz0r5wdrxzxpkhrljz50rqazr61asy"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   ideq = derive2 { name="ideq"; version="0.1.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; };
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
-  idiogramFISH = derive2 { name="idiogramFISH"; version="1.16.1"; sha256="0qg27v8c26fz3dkzddc7fc1dpgc2csh7vh6rj5lc2kk4m3mjd3k4"; depends=[crayon dplyr tidyr]; };
+  idiogramFISH = derive2 { name="idiogramFISH"; version="1.16.8"; sha256="1mla0djkzqx1r2587niy800ar96qx14d8fxi6q156jr7049whn0w"; depends=[crayon dplyr tidyr]; };
   idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
   idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; };
   idmodelr = derive2 { name="idmodelr"; version="0.3.2"; sha256="02hvlmk38rs0iavwz0qa3ryvyw1ixhjf9bksmadlhxl5pd18016j"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; };
@@ -9422,21 +9822,21 @@ in with self; {
   iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; };
   iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; };
   ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
-  ifaTools = derive2 { name="ifaTools"; version="0.21"; sha256="1vnrf67d0b83nmvk91sw1w2lgjlldp7dslxnrxh7lb94h3z6jigd"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
+  ifaTools = derive2 { name="ifaTools"; version="0.22"; sha256="16wgq7b4xffgrmy10f58kwqd3m3p3lwa4ck92jb6gb8gml1n9g82"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
   ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; };
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
+  ifultools = derive2 { name="ifultools"; version="2.0-22"; sha256="0f95vqc47dgssqngznk0rclr72ndbyxc7gdq2cmbksvq7qpn3gg1"; depends=[MASS splus2R]; };
   ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
   igate = derive2 { name="igate"; version="0.3.3"; sha256="0b8dk976z0764cmxwcq6w2f3akv7iivivharinq029p90b600qza"; depends=[dplyr ggplot2 kableExtra knitr rmarkdown stringr xtable]; };
-  iglu = derive2 { name="iglu"; version="1.0.2"; sha256="1xs0qw0msqiajz1gpdv7q49iwbwyf3wrqjrs82mwidwpcdgzlkry"; depends=[caTools dplyr ggplot2 lubridate magrittr scales shiny tibble tidyr]; };
-  igraph = derive2 { name="igraph"; version="1.2.5"; sha256="126z1ygbmi3g7hk97snf22rnx680dyi30idssm5zacba5rdngp8c"; depends=[magrittr Matrix pkgconfig]; };
+  iglu = derive2 { name="iglu"; version="2.0.1"; sha256="0vc1n3a00116dg4wnd38rnxragif98jvhj23192jxxmgnvcv43sg"; depends=[caTools dplyr ggplot2 lubridate magrittr scales shiny tibble tidyr]; };
+  igraph = derive2 { name="igraph"; version="1.2.6"; sha256="0vf7wrx77cdiav8724cw8gchrn0y9wvywphf5km4pa7xcqhsf3b4"; depends=[magrittr Matrix pkgconfig]; };
   igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
   igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; };
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
-  iheatmapr = derive2 { name="iheatmapr"; version="0.5.0"; sha256="0s2lc088rq2siy2wzmg1y6nss68rs33mf7w2izqqmg6kbx6d7y9h"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; };
+  iheatmapr = derive2 { name="iheatmapr"; version="0.5.1"; sha256="1pwkwh7ljlpr6zyz6j8knpz3iw60xzkw8amc98x4pc2mw148jvzx"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; };
   ihpdr = derive2 { name="ihpdr"; version="1.2.1"; sha256="1qa9ndb5aqbmlqbl0ivh10ddah2rbhsc6928dml20fjgz7lggdww"; depends=[curl dplyr httr lubridate magrittr purrr readxl rlang rvest tidyr xml2]; };
-  ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
   iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; };
-  ijtiff = derive2 { name="ijtiff"; version="2.2.0"; sha256="13ahpbrfn1jla7v38wxlmhy617m2dipzipsf5b8f6zyajl5mywjz"; depends=[checkmate cli dplyr filesstrings fs magrittr purrr readr rlang stringr withr zeallot]; };
+  ijtiff = derive2 { name="ijtiff"; version="2.2.4"; sha256="1v0gv9z4rbyn80swmka0jdbyz26q0fbzwwfjghmcxm542ijcm98g"; depends=[checkmate cli dplyr fs magrittr purrr readr rlang strex stringr withr zeallot]; };
   ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
   image_CannyEdges = derive2 { name="image.CannyEdges"; version="0.1.0"; sha256="0c8pvk91xyys6d2i03yy88kylb3jli5jkpq2s069n7p0yl3z7rr1"; depends=[Rcpp]; };
   image_ContourDetector = derive2 { name="image.ContourDetector"; version="0.1.0"; sha256="1z3713paqw86yq45sq1b4gi3nq3y21wcg3pxh7vsciqs669lpv1q"; depends=[Rcpp sp]; };
@@ -9447,6 +9847,7 @@ in with self; {
   image_binarization = derive2 { name="image.binarization"; version="0.1.1"; sha256="1dajmffxali1kj54lfvapgb0vv5bbxxy7wxdsr4p5dv29gjwbl7i"; depends=[magick Rcpp]; };
   image_dlib = derive2 { name="image.dlib"; version="0.1.0"; sha256="118zwalpxcnn2fgjv8xsp763yvbqcyv81p6fblxizlnimyrjva71"; depends=[Rcpp]; };
   image_libfacedetection = derive2 { name="image.libfacedetection"; version="0.1"; sha256="0mr7zrqd73mhvs918615lwsf2bgg63x3wh16wdpwhb2zd7ybm87a"; depends=[Rcpp]; };
+  image_textlinedetector = derive2 { name="image.textlinedetector"; version="0.1.2"; sha256="15w0mfr2qby6plpgwz7vhj7bn9szzcyp7cmfd7z60477yp8bx1ld"; depends=[magick Rcpp]; };
   imageData = derive2 { name="imageData"; version="0.1-60"; sha256="1ry4l45az9az8wk1k16jxbszxwh0m9s3g838w7dad0midr2hs8qr"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; };
   imagefluency = derive2 { name="imagefluency"; version="0.2.3"; sha256="0f4kizxc86q6pgx5dbp14y6866b1ldyf7zgpfikd2iqhvxbs7qwa"; depends=[magick OpenImageR pracma R_utils readbitmap]; };
   imagefx = derive2 { name="imagefx"; version="0.4.1"; sha256="1mxd33y8zbq8kig6m6xihb5w8wrjppgmpyjspvaxjwk7si9a09k1"; depends=[moments signal]; };
@@ -9455,13 +9856,14 @@ in with self; {
   imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; };
   imagine = derive2 { name="imagine"; version="1.5.3"; sha256="1ss0gm769s8cmma3hnah15vmc2c5wxn0l3s4vas7jbvkwi62am6h"; depends=[Rcpp]; };
   imbalance = derive2 { name="imbalance"; version="1.0.2.1"; sha256="14f7p3x8818b1asfynp3w4sxdacsd14dzs7r166s1jdadwwfwi1s"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; };
+  imbibe = derive2 { name="imbibe"; version="0.1.0"; sha256="0l7wn7vcbb466a4i3w302ficdy0jvy2jh5qizfn7ahpcs7lpx6hr"; depends=[magrittr Rcpp RNifti]; };
   imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; };
-  imfr = derive2 { name="imfr"; version="0.1.8"; sha256="1kdchi0lzr9qgmz3d1f5rcr9cgz19m2k5bchbyknx7055d09yh1q"; depends=[dplyr httr jsonlite]; };
+  imfr = derive2 { name="imfr"; version="0.1.9.1"; sha256="1l1lvzvz9hsqwk60k2w8ry8mvgzj7wrd6ycfhgwv39xid9vk70g7"; depends=[dplyr httr jsonlite]; };
   imgpalr = derive2 { name="imgpalr"; version="0.3.0"; sha256="1kb1ggrlkrh086nwq47sf2y20r7ydk4ww2j3gq0s4iz00aa34pxg"; depends=[downloader dplyr farver jpeg magrittr tibble]; };
   imgrec = derive2 { name="imgrec"; version="0.1.0"; sha256="1v4q2hxil7f0jnj4nql44d9dssh8kz1mnj8ah5slndnn1fbymy8f"; depends=[base64enc dplyr httr jsonlite knitr rlang]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
-  iml = derive2 { name="iml"; version="0.10.0"; sha256="0xm3q42qahq798ilgg050df0mahhbdfd3fx3i7cpx606h38si0x7"; depends=[checkmate data_table Formula future future_apply ggplot2 gridExtra Metrics prediction R6]; };
-  immcp = derive2 { name="immcp"; version="0.9.1"; sha256="0pvb62ac1c48cklgcv10f6x986a14x8mz3gpsnfg1di21jk1xbcc"; depends=[Boruta clusterProfiler corrr ggplot2 GSEABase GSVA igraph magrittr Matrix pbapply proxyC reshape2 RobustRankAggreg visNetwork]; };
+  iml = derive2 { name="iml"; version="0.10.1"; sha256="1wz6xqhvqkzj723nw7qrlwb1171wvvpxhv3pa8cq7vcbkiflq37r"; depends=[checkmate data_table Formula future future_apply ggplot2 keras Metrics prediction R6]; };
+  immcp = derive2 { name="immcp"; version="0.9.2"; sha256="07q5dhz12pvy631jxans6q62kzqx9pil3ra72pgqlcxpndvv6f4w"; depends=[Boruta clusterProfiler corrr ggplot2 GSEABase GSVA igraph limma magrittr Matrix pbapply proxyC reshape2 RobustRankAggreg visNetwork]; };
   immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; };
   immunarch = derive2 { name="immunarch"; version="0.6.5"; sha256="0vy1m4333k4v24qgcb0ra154hf35mp1f8m10hqnmy2qk00ksd01c"; depends=[airr circlize data_table dbplyr dplyr dtplyr factoextra fpc ggalluvial ggplot2 ggpubr ggrepel ggseqlogo magrittr MASS patchwork pheatmap plyr Rcpp readr readxl reshape2 rlang Rtsne scales shiny shinythemes stringr tibble UpSetR]; };
   immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; };
@@ -9471,7 +9873,7 @@ in with self; {
   implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.0"; sha256="0w0dwnzfhw5v5j7q3zpfsca4ydmq7b9fzspvyf9sibyh587isb9c"; depends=[ggplot2 stringr tidyr xtable]; };
   implied = derive2 { name="implied"; version="0.3.1"; sha256="11mrvpsh9qc5a5s5mpbsksri6vx36ij1gvpli6lyz6dkg48a9kdn"; depends=[]; };
   implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
-  r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
+  r_import = derive2 { name="r_import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; };
   importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; };
   importinegi = derive2 { name="importinegi"; version="1.1.2"; sha256="11mr3kw7y015w6892cz73qm77rhcsm86b4hlb34aqcbcqqqxlxrv"; depends=[data_table dplyr foreign haven rgdal]; };
   impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; };
@@ -9494,10 +9896,14 @@ in with self; {
   incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; };
   inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; };
   incadata = derive2 { name="incadata"; version="0.9.1"; sha256="0987zazkp3cxvk88i3yqb70s2i1cg108vc8wyhh2867s3rqdrpgh"; depends=[decoder rvest sweidnumbr xml2]; };
+  incase = derive2 { name="incase"; version="0.2.0"; sha256="0ja00xhiq92sm00gmfkgziqkqhqb3pkf2vkf2c1mggfxp3pa9aqf"; depends=[magrittr plu rlang]; };
   incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; };
-  incidence = derive2 { name="incidence"; version="1.7.2"; sha256="02q672fb5wji4wnlk3fjsgz2hy5hx0nn9xq5hlw7aqb24lh4fifm"; depends=[aweek ggplot2]; };
+  incidence = derive2 { name="incidence"; version="1.7.3"; sha256="1wdxh2p7scm419fqki0i7vsz45rd7557h5n3zf9fshb8x1fdf2z7"; depends=[aweek ggplot2]; };
+  incidence2 = derive2 { name="incidence2"; version="0.2.2"; sha256="1rmz0v091x90m8q834qnfifbyc6bmn8f538y1qv7scx043f5rb1s"; depends=[aweek data_table dplyr ellipsis ggplot2 magrittr pillar tibble vctrs]; };
+  incidental = derive2 { name="incidental"; version="0.1"; sha256="012pdwrkzlbnrrkvy67l6nvs1lrjgrzhfh3v4rqzk2ypdvfm3wmx"; depends=[dlnm ggplot2 MASS matrixStats numDeriv]; };
   inctools = derive2 { name="inctools"; version="1.0.15"; sha256="0ikldiwgizs2p9vcalk5729dr6krysnyr4ni0ybg9gljw7iafdlf"; depends=[binom cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; };
   indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; };
+  independence = derive2 { name="independence"; version="1.0.1"; sha256="0yln5wd8m5fgh4h7k80vq22byf06k4d6574zxyqcig63hls7v568"; depends=[Rcpp]; };
   indicspecies = derive2 { name="indicspecies"; version="1.7.9"; sha256="1xza0ha42frz5wizf268j49y3201vpsm4kgj0czsw9wygzjl008f"; depends=[permute]; };
   indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; };
   inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; };
@@ -9514,7 +9920,7 @@ in with self; {
   influence_SEM = derive2 { name="influence.SEM"; version="2.2"; sha256="1cabl6486mlrmk0418s18wii3n6nl1ckv6w9281wdk4fy27y9qk2"; depends=[lavaan]; };
   influenceAUC = derive2 { name="influenceAUC"; version="0.1.2"; sha256="0pscwfxs2y780lzd5sxldnnkzzs2lsjdwz71z44kn7884wqmikpm"; depends=[dplyr geigen ggplot2 ggrepel ROCR]; };
   influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; };
-  influential = derive2 { name="influential"; version="1.1.2"; sha256="195219khnphz7z15za82l1pdh8c2qbn81jwkrsr2q0pax8xjbc5z"; depends=[coop igraph ranger reshape2]; };
+  influential = derive2 { name="influential"; version="2.0.1"; sha256="1ry439k88i59znvssv0x831ixlhblsqxnwd7pwdsr15yj2xqc28q"; depends=[coop ggplot2 igraph ranger reshape2]; };
   influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; };
   infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.2"; sha256="0r1capiv4zr31dsy0sqly9zb00i86zq2ihbgsmb5g4cy0f04xlqz"; depends=[MASS]; };
   informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
@@ -9522,62 +9928,63 @@ in with self; {
   infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
   infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; };
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
-  ingredients = derive2 { name="ingredients"; version="1.3.1"; sha256="0l0dqrm9am6wk8jcf8cdhc6xnrna9cqr5wz6lsnczq2gf6ybhjg1"; depends=[ggplot2 gridExtra scales]; };
+  ingredients = derive2 { name="ingredients"; version="2.0"; sha256="084ywbq0dwnf075bazz40n23wh7r1fwl6zs7xqkcg07kfzqkzb2w"; depends=[ggplot2 gridExtra scales]; };
   ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; };
   injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; };
   inlabru = derive2 { name="inlabru"; version="2.1.13"; sha256="1khsfhays6xna060f4h0rc7yjsq89xl42d36fy33ixgk0rh9vlnc"; depends=[ggplot2 Matrix rgdal rgeos sp]; };
-  inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; };
+  inldata = derive2 { name="inldata"; version="1.0.3"; sha256="0iz3dlmaw6p81lj406nq4sg4qvl289mn95by10r3zrikf39l0jq2"; depends=[raster sp]; };
+  inline = derive2 { name="inline"; version="0.3.17"; sha256="1wslsn60q959yrr27cwanba43qlpfaxzdli46i9dc26lxfr5fa3r"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2019.12.5"; sha256="11d8cnrzgq95w7hn234rcwrr1mmrv63f69807pnzxizxbgnp7wz3"; depends=[]; };
-  inlmisc = derive2 { name="inlmisc"; version="0.5.0"; sha256="061gd6mcabi5ydwzdcl5wiw3nfkzlh00i1vf60x81jgzi6d2rclb"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex xtable yaml]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.5.2"; sha256="1jg92fy9dg9rv0sdzzcc7vylkx6z3l0b2q7rba63dpkdb1vqrwls"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex webshot wordcloud2 xtable yaml]; };
   inops = derive2 { name="inops"; version="0.0.1"; sha256="1y402a9r542hpwd1nfdc07mbgnf9alpnykl9di1v8fy0qly8s0an"; depends=[]; };
   inpdfr = derive2 { name="inpdfr"; version="0.1.11"; sha256="1wnz73ggc7xcgynvdlvgz26qkfjmxxy0xg8gkf1far5346g4qd9y"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; };
-  inplace = derive2 { name="inplace"; version="0.1.1"; sha256="0baiwpd92aa2v3h9srqc2ri0b6ys7hqfb5wxax7whrmdad0dy7hf"; depends=[Rcpp]; };
+  inplace = derive2 { name="inplace"; version="0.1.2"; sha256="06jb8xzjqywdww8j2i59c8663dfbrhnvj0lh3xm73j39sig6vh7l"; depends=[Rcpp]; };
+  insane = derive2 { name="insane"; version="0.1.0"; sha256="144fq1lys6wy78vnmz1vd4ghs8agraj1hgg0vwlxcnbykmf50i95"; depends=[broom dplyr DT ggbeeswarm ggplot2 ggpubr ggthemes glue patchwork purrr readxl shiny tidyr]; };
   insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; };
-  insee = derive2 { name="insee"; version="0.8.0"; sha256="09gymkvf8zmbiiyb1f38w5ckajz07050nhq2vim3kyvljkl2yrw4"; depends=[dplyr httr lubridate rlang rsdmx stringr tibble tidyr tidyselect xml2]; };
+  insee = derive2 { name="insee"; version="0.9.0"; sha256="16dx6d8k78v89443q7pq63zj9cr8856mq1qs7lg945ha2c8k75sn"; depends=[crayon dplyr httr lubridate openssl readsdmx rlang stringr tibble tidyselect xml2]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
-  insight = derive2 { name="insight"; version="0.9.0"; sha256="1ajc8c5mi3ma5411lmlqp2ihkk5n0h8a1c0r3j07wk33p31c1qvl"; depends=[]; };
+  insight = derive2 { name="insight"; version="0.11.1"; sha256="1m95xfvai1kbzqxdggjvdbk6ax2dg4v2lrfpqn7v607g2n77n2k0"; depends=[]; };
   insol = derive2 { name="insol"; version="1.2.1"; sha256="1d2vqmbp94ff80mfkmq4a8y12r6ryym8hh1568ip9qbn7snc64v1"; depends=[raster]; };
-  inspectdf = derive2 { name="inspectdf"; version="0.0.8"; sha256="1ixdsxmclcpjn3ipvk9h9k7fdif9835ayhbd24nsaadby5ymmsfh"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; };
+  inspectdf = derive2 { name="inspectdf"; version="0.0.9"; sha256="1hf7xha6nbb3ysj9y7vp7x6pcyvnlq67di7ns0pxgjgb7b9qipdd"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; };
+  inspector = derive2 { name="inspector"; version="1.0.2"; sha256="08dx800dikssljjvwzv6fji6pp7k7lkzjl7y1y6r1j5qxpn7z5mw"; depends=[Rdpack]; };
   instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; };
   install_load = derive2 { name="install.load"; version="1.2.3"; sha256="0z4klcpwdlmhwvk41z9q4c4382z8glad27h0gai93zyciy44sdyx"; depends=[assertthat checkmate fastmatch]; };
   insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
-  insurancerating = derive2 { name="insurancerating"; version="0.6.2"; sha256="165zl1qchd23yq520hipc4ckdihbv0clfnm1jzqis6lla5k2pi56"; depends=[ciTools classInt data_table DHARMa dplyr evtree ggplot2 insight lubridate magrittr mgcv patchwork stringr tidyr]; };
+  insurancerating = derive2 { name="insurancerating"; version="0.6.3"; sha256="076xpgxqc9m5chd3wjr0k7xhcx8zffynz89yqjqrw9yv8cx0lhk6"; depends=[ciTools classInt data_table DHARMa dplyr evtree ggplot2 insight lubridate magrittr mgcv patchwork stringr tidyr]; };
   intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; };
   intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; };
   intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; };
   intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; };
   intccr = derive2 { name="intccr"; version="3.0.2"; sha256="1v2zhyap414w41dgy2jjz3fnrvk0vawf02dvb1nprrid7fqsnf9i"; depends=[alabama doParallel foreach MASS]; };
-  intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; };
-  intcure = derive2 { name="intcure"; version="2.1"; sha256="13p9z5ar0hn6m4b7rz6qg20blfyk9h9bq55rkj1g736iky6vn7q2"; depends=[cubature mvtnorm survival]; };
+  intcensROC = derive2 { name="intcensROC"; version="0.1.2"; sha256="0f1yf7wn0qd0xa9x2lsdicwjisy39bvyrbayjl8m6hb7h0ng0v2m"; depends=[pracma Rcpp RcppEigen]; };
   intdag = derive2 { name="intdag"; version="1.0.1"; sha256="0mb0a1ccc67clfa75b4hl901zdmx7fxw713c4ybx3i5wc2ldl8ph"; depends=[]; };
-  intePareto = derive2 { name="intePareto"; version="0.0.1"; sha256="0mynqvmdb39zqx1z2y6bscfjkwf880b7pd149xsdbc6f49hlnfw6"; depends=[apeglm biomaRt DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges rPref Rsamtools]; };
   integIRTy = derive2 { name="integIRTy"; version="1.0.6"; sha256="0nyp9nixwyz1n2nydkh64lmd5z4qjcabwa1pyzv69rgw5gx60020"; depends=[abind doParallel foreach ltm MASS mclust]; };
   integr = derive2 { name="integr"; version="1.0.0"; sha256="172vj29bdk42ibgwj7dl06wslpg2dccp1i8iscbz1yd0j5kw36sq"; depends=[DiagrammeR DiagrammeRsvg dplyr gtools rsvg]; };
+  intensegRid = derive2 { name="intensegRid"; version="0.1.0"; sha256="0frdrkfpqd8zbl8zawr1xrgs4ylsdir88mqb8w502zf7ishg624m"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang tibble tidyr]; };
   intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; };
-  interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
   interactionR = derive2 { name="interactionR"; version="0.1.1"; sha256="1gw1kvv76rrfsq67dyhm5ydpb1y5fxp6jqfcqdw50f4k0m76z55k"; depends=[car flextable msm officer]; };
   interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; };
   interactions = derive2 { name="interactions"; version="1.1.3"; sha256="11nn3w4qsnh0idf7cwnrclg9h8vdjfl9rbvfk1c4l65pm4f61xrv"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; };
   interep = derive2 { name="interep"; version="0.3.1"; sha256="0j5mpbx0h1p7si3n532fpzsq5d2ris77vmvqabz1vdzlv4dzlmk8"; depends=[MASS Rcpp RcppArmadillo]; };
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
-  interflex = derive2 { name="interflex"; version="1.1.3"; sha256="1ga6m3f3dr70db5xkpbdx2vmv09cd2da8ky785dpl69chmxrcmhp"; depends=[caret doParallel foreach ggplot2 ggplotify gridExtra gtable lfe Lmoments lmtest mgcv pcse RColorBrewer Rcpp RcppArmadillo sandwich]; };
   interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
   interim = derive2 { name="interim"; version="0.8.0"; sha256="1hcq1cx6fv4ivvyd3ww3gsbw12g6rw83qqqbrcgzlnjl1q0jh3nf"; depends=[]; };
   interimApp = derive2 { name="interimApp"; version="0.0.1"; sha256="1g2f1plsgzqf277jy2afhchjlcamr9znm02rj4rvky7nnp63gph0"; depends=[interim shiny shinyBS]; };
+  interleave = derive2 { name="interleave"; version="0.1.0"; sha256="1ppbryy3awymkg9fhwddfzfygvda3wmrw5lff3rjsirk7q1wimlx"; depends=[geometries Rcpp]; };
   interlineaR = derive2 { name="interlineaR"; version="1.0"; sha256="0y1ym6iwly8sv94pdzwv2qy1g7z4hpqlrbcrpb1ds5a62a6axqj5"; depends=[reshape2 xml2]; };
-  internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
   interp = derive2 { name="interp"; version="1.0-33"; sha256="115yz7vvlga24m5dz3kirr2vzh59ki3gypvxwvaab8zy2mqr47v6"; depends=[deldir Rcpp RcppEigen]; };
   interplot = derive2 { name="interplot"; version="0.2.2"; sha256="10licnz1x97ky7plq3j5gf23lg14jcx7bavv9mwib7p39ls5lagq"; depends=[abind arm dplyr ggplot2 gridExtra interactionTest purrr]; };
-  interpret = derive2 { name="interpret"; version="0.1.24"; sha256="0nhxxcdw21qi356nxs0abp2fv87izs3667rw774251r9sbpq5vn1"; depends=[]; };
+  interpret = derive2 { name="interpret"; version="0.1.26"; sha256="0f7bhz5gj0f5dxjcc9xlrx4y474akn6q0d7z71yypyw6bawvqkbn"; depends=[]; };
   interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; };
-  interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
+  interval = derive2 { name="interval"; version="1.1-0.7"; sha256="1b31lh0sv7lzy76230djipahxa10lblbr37kdiigr6hp3dd1xmz9"; depends=[Icens MLEcens perm survival]; };
   intervalaverage = derive2 { name="intervalaverage"; version="0.8.0"; sha256="07p9r358q3jxm8n7nypxmvpfnh61njivcwaplgzzxrlcbway6fq9"; depends=[data_table Rcpp]; };
   intervals = derive2 { name="intervals"; version="0.15.2"; sha256="0mvwfwc03ifb30a3dzbmkv9adwqb8ajxhcw24d8xip8px063plhb"; depends=[]; };
   intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; };
   interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
+  inti = derive2 { name="inti"; version="0.1.2"; sha256="09v91nvd9gq5i5dy4xi9jm4vgd0zr6ydk5fhs200x1nqlhxyfzp5"; depends=[agricolae dplyr DT emmeans FactoMineR ggplot2 lme4 purrr shiny stringr tibble tidyr]; };
   intkrige = derive2 { name="intkrige"; version="1.0.1"; sha256="1p3fn5nzn1iliy025187k590qrsw3z3d47p67gzwwd6h050yrl86"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; };
-  intmed = derive2 { name="intmed"; version="0.1.1"; sha256="1y9ryz7sxhal4s35cbplfs67596dh57kqy10wyg49x8aq80gpgnr"; depends=[doParallel dplyr EValue foreach MASS mice stringr tibble tidyverse]; };
+  intmed = derive2 { name="intmed"; version="0.1.2"; sha256="0amcqzinj35yvb9nfy808bz098dqmnds13z335lgqm6sykriyjpl"; depends=[doParallel dplyr foreach MASS mice stringr tibble]; };
   intoo = derive2 { name="intoo"; version="0.4.0"; sha256="0s4jii34cgvyi573z569l1827yf90vj4ih9krsgvpbvk7lfdbagg"; depends=[]; };
   intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; depends=[yaImpute]; };
   introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
@@ -9589,24 +9996,25 @@ in with self; {
   inum = derive2 { name="inum"; version="1.0-1"; sha256="16d09391l65w557dkzhhx1aqn1ljamcmjj3yh42pwq037k0r8brw"; depends=[libcoin]; };
   invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
   invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; };
+  invacost = derive2 { name="invacost"; version="1.0"; sha256="1qy7a59ml1bxfsg161qhhz5iw5kcml4l31la44ippyiail32vn3m"; depends=[dplyr earth ggplot2 lmtest mgcv quantreg robustbase sandwich scales]; };
   invctr = derive2 { name="invctr"; version="0.1.0"; sha256="0jrbr53kvwrf800z18vz9df9bk7swpd4avnyf59ggz2bc0z2ijwk"; depends=[plyr rlang]; };
   inventorize = derive2 { name="inventorize"; version="1.0.6"; sha256="01rwqqljmlk5bwnvlx0qy6n67q2swjcxp90fp2wipyvl1f46h3m1"; depends=[dplyr ggplot2 magrittr plotly plyr tidyr]; };
   inverseRegex = derive2 { name="inverseRegex"; version="0.1.0"; sha256="1wk3ac2rfy0m8442sa2m75s6l3wadx4d4cwas6c8n2xqkrphci87"; depends=[]; };
   investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; };
   invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; };
   io = derive2 { name="io"; version="0.3.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; };
-  ioanalysis = derive2 { name="ioanalysis"; version="0.3.3"; sha256="11nrvqnwj51cfc1gxf6wsmiwmqrcd4h1q6ya9qqvkrf3fwfg7mi7"; depends=[ggplot2 lpSolve plot3D]; };
+  ioanalysis = derive2 { name="ioanalysis"; version="0.3.4"; sha256="0nprfqhwy5j11f5xgzaz8iw991cvgdcdmfca8sdvw8mci0cwkh5m"; depends=[ggplot2 lpSolve plot3D]; };
   ioncopy = derive2 { name="ioncopy"; version="2.2.2"; sha256="133ay7xvdigs4q9yx5bcwdgsgrgzk2n6xn412dkq3bg95pp1angr"; depends=[shiny zip]; };
   ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
   ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; };
   iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; };
   iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; };
-  iotables = derive2 { name="iotables"; version="0.4.3"; sha256="1dmp7bwrwz7l33vnfmqqp5mfzikp3gif3rr8gq2fgnzmlw05wwc3"; depends=[dplyr eurostat forcats kableExtra knitr lubridate magrittr plyr purrr readxl tibble tidyr tidyselect]; };
   iotools = derive2 { name="iotools"; version="0.3-1"; sha256="0x24s38shvgqvxpx57qjf86g6f9p9y201yymdl61n5yw439pg88f"; depends=[]; };
   ip2location = derive2 { name="ip2location"; version="8.0.0"; sha256="1rhy3jlcl4hcynhjgy3gjx9g9kyn30gq1jwfpll23jixvmrx64by"; depends=[jsonlite reticulate stringr]; };
+  ip2proxy = derive2 { name="ip2proxy"; version="1.0.0"; sha256="1l27v616qrz0n9i4s1vjbffwqy12cq4jklck83cd0503c86621d5"; depends=[jsonlite reticulate stringr]; };
   ipADMIXTURE = derive2 { name="ipADMIXTURE"; version="0.1.0"; sha256="1fl7nyxg7gakjdggdc311wf037zaxwpqsw3ax7liq1pvw6flb9h7"; depends=[ape treemap]; };
   ipa = derive2 { name="ipa"; version="0.1.0"; sha256="029vz7pb37vnqm7x6h53p0y7z0nx2s36yklyfn9sz21gknsi983j"; depends=[stringi]; };
-  ipaddress = derive2 { name="ipaddress"; version="0.4.0"; sha256="105z02lmlvlf9rxb1ki0izdg687imjzs4wfz8v5vbqb1dp66mzss"; depends=[AsioHeaders BH blob Rcpp rlang vctrs]; };
+  ipaddress = derive2 { name="ipaddress"; version="0.5.1"; sha256="128r4nbqrmmnxb85hvs32xybp32svn4c5096p3s052jhc30bj273"; depends=[AsioHeaders BH Rcpp rlang vctrs]; };
   ipc = derive2 { name="ipc"; version="0.1.3"; sha256="10h54j83l7khk1lkpdwn6hwaz31i3v6svg4q1lxzvr2aqdsj7hy0"; depends=[R6 shiny txtq]; };
   ipcwswitch = derive2 { name="ipcwswitch"; version="1.0.3"; sha256="1pqlfkglgsahzsw7z9wsx7k0i9n0kx77g9p1j7i9dz7j74s6g09r"; depends=[survival]; };
   ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
@@ -9618,7 +10026,7 @@ in with self; {
   ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
   ipify = derive2 { name="ipify"; version="0.2.0"; sha256="05mi8i839iadpz4apkxpxx86zphkgv748mwvdgjxnz82c7s10q9k"; depends=[httr]; };
   iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; };
-  ipmisc = derive2 { name="ipmisc"; version="3.1.0"; sha256="10a1qyjv1zzjhjirycq4y3zxp78dki1gafbh0zpjkw4ynfbzxgz2"; depends=[crayon dplyr magrittr rlang rstudioapi tibble tidyr zeallot]; };
+  ipmisc = derive2 { name="ipmisc"; version="5.0.1"; sha256="1fwhahhbpclr0xvnrb6hb78n9afv36jacgbsk3jfpvs10bf2np0f"; depends=[crayon dplyr magrittr rlang tibble tidyr zeallot]; };
   ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; };
   ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; };
   ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; };
@@ -9635,40 +10043,42 @@ in with self; {
   irace = derive2 { name="irace"; version="3.4.1"; sha256="1dhlspv1gqg7cm7j95zhl0k2zr0s159krjmxm07k5fp68ax95sky"; depends=[R6]; };
   ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; };
   irg = derive2 { name="irg"; version="0.1.1"; sha256="0g5rhahiq2k269n8ip4yj6ncra07j7flraphzxmis931sfpdsvam"; depends=[data_table RcppRoll]; };
+  iriR = derive2 { name="iriR"; version="0.1.0"; sha256="07f7xdyssjbrlkvy33v8764hfn8jh1d3byvmky2wpmpa8qn1xmkw"; depends=[dplyr ggplot2 ggsci gsheet reshape2 scales WDI]; };
   irlba = derive2 { name="irlba"; version="2.3.3"; sha256="1h7mzrqdjc41814cf6c93sbyl7nxwvsf3x8apl9rhmydgdlk7qkf"; depends=[Matrix]; };
   irr = derive2 { name="irr"; version="0.84.1"; sha256="1hs4ylqm51smrmgsph7z9arwkz5px2a320acar324fkjdd3yifp7"; depends=[lpSolve]; };
   irrCAC = derive2 { name="irrCAC"; version="1.0"; sha256="1j9z8vz5zcl51a8qq6maf9sw0dqaknkrai7gp31mzag7b6vwms06"; depends=[]; };
   irrICC = derive2 { name="irrICC"; version="1.0"; sha256="0vi5g97kbyhwxz242d1hpqf11izd3kmlzh3997v07md1llcsp6s3"; depends=[]; };
   irrNA = derive2 { name="irrNA"; version="0.1.4"; sha256="1i7s4c285dw1s2kiq01a81cfpd2v40y26yklr06xlmqp28iwslbr"; depends=[irr]; };
-  irregulAR1 = derive2 { name="irregulAR1"; version="1.0.0"; sha256="0pccasqcya99j4n0qdcjjnvmigj53axji9ddxbpmrgvzsyamb8ja"; depends=[Matrix Rcpp RcppArmadillo]; };
+  irt = derive2 { name="irt"; version="0.1.3"; sha256="01hr3c9by13cif55xn6z4b9zi3k99lx8pf5qzrwj0hard0a6m936"; depends=[ggplot2 Rcpp]; };
   irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; };
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
   irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; };
-  irtplay = derive2 { name="irtplay"; version="1.6.1"; sha256="0j44czx46whqvp9a61wisxa6sy6qqm9i2fjhvjq3k8l7i4dz9hy3"; depends=[dplyr ggplot2 gridExtra Matrix pbapply purrr reshape2 rlang statmod tidyr]; };
+  irtplay = derive2 { name="irtplay"; version="1.6.2"; sha256="05jqghz30lfbl4ac5p2dnqd3aphkzyy1j382qjyvcw629gahybbp"; depends=[dplyr ggplot2 gridExtra Matrix pbapply purrr reshape2 rlang statmod tidyr]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
   irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; };
   isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; };
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
   isdparser = derive2 { name="isdparser"; version="0.4.0"; sha256="05xkffmiiyhas5hzdjdylbrvh6fjc2fjh7s00iwjxkp4ba7rwq3g"; depends=[data_table lubridate tibble]; };
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
-  island = derive2 { name="island"; version="0.2.5"; sha256="0kmrdxpfybmc9l3rqr1b7r1k0js2ri8r2rlg0zk1nd5m14p7c4l2"; depends=[]; };
+  island = derive2 { name="island"; version="0.2.6"; sha256="06y2a9d6qqzkh5p205k1wc2i0qcmkqgabhpk76d63pkz0ilsha6q"; depends=[]; };
   islasso = derive2 { name="islasso"; version="1.1.1"; sha256="1jqshk18g6fj51ppz8fxi2a2hydcqf469ff0h9k7lha7a46h26ff"; depends=[glmnet Matrix]; };
   ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; };
   isni = derive2 { name="isni"; version="1.2"; sha256="1nw7i20fli3sg1g1dl17g8rz5bpx49gcmlyw4nvfyhdxqr38nb0r"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; };
   isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; };
   isoSurv = derive2 { name="isoSurv"; version="0.1.0"; sha256="00dbrblqdylh2z636hwxr79lk2f8sa15wqcm7m6vd5m2jdhw4xay"; depends=[Iso survival]; };
-  isoband = derive2 { name="isoband"; version="0.2.2"; sha256="044fg014gb6v6v11gm7ivfipz45iqw9cpahjhaacw6kyahyb66zx"; depends=[testthat]; };
+  isoband = derive2 { name="isoband"; version="0.2.3"; sha256="1zkzdc39dpw2z59bjck27nimz9a2vskmw0f7wb17s53dvy7k3lzr"; depends=[testthat]; };
   isoboost = derive2 { name="isoboost"; version="1.0.0"; sha256="0arah62y2gyjhrwjyf4hbzlzyvnx3594436pvk8jjcjyfk7bzr6c"; depends=[Iso isotone rpart]; };
   isocat = derive2 { name="isocat"; version="0.2.6"; sha256="1d6pi2l1lfi4226890lsfa02v0df1mc8gi214icsbk4fid4jygsx"; depends=[foreach magrittr plyr raster sp]; };
   isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
   isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
+  isoreader = derive2 { name="isoreader"; version="1.2.7"; sha256="0nk63hylm0dkisi7mpq3k5zf8bxmh8wfx3wqlxcm5dscx0k76qnd"; depends=[dplyr feather future glue lubridate magrittr openxlsx progress purrr R_utils readr rhdf5 rlang stringr tibble tidyr tidyselect UNF vctrs xml2]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
-  isotree = derive2 { name="isotree"; version="0.1.18"; sha256="1821hs6xxim1jx2akpvs9vk157zc0iq88i5zw5wka1kip041b8x0"; depends=[Rcereal Rcpp]; };
+  isotree = derive2 { name="isotree"; version="0.1.24"; sha256="0ggx7ydiyrcng21k44pjfgsikdmmaqgk28xdi25sbp2fa0b5qbds"; depends=[Rcereal Rcpp]; };
   ispd = derive2 { name="ispd"; version="0.2"; sha256="06h4z342d17rkpr2wwck4sq79kprdq6fgqf10jg8cs1f52q6pq0h"; depends=[ibd]; };
   isqg = derive2 { name="isqg"; version="1.3"; sha256="1988bc5n4b5mgxrfl1774vfgaw7rxm9vlaxnkx26phjzhlr1ix9h"; depends=[BH R6 Rcpp Rdpack]; };
-  istacr = derive2 { name="istacr"; version="0.1.1"; sha256="0mpsy9pc0hi1mpyc3jx2wzpijzrzlla5yxhi6vciwlfibdgi8dhk"; depends=[curl jsonlite]; };
+  istacr = derive2 { name="istacr"; version="0.1.3"; sha256="14nhd3v8l827mb1fxfhsxklzxbf4316ijp2qkc99qp7ydmxbk0rd"; depends=[curl jsonlite]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
   italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; };
   itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
@@ -9676,7 +10086,7 @@ in with self; {
   iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
   itemanalysis = derive2 { name="itemanalysis"; version="1.0"; sha256="1ksbd69mca45jlr2gpars87cf4jfm5rx6sz009sv6a83x831x5rq"; depends=[car ggplot2 polycor]; };
   iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; };
-  iterators = derive2 { name="iterators"; version="1.0.12"; sha256="0jwzxaa3jm1xzgfv5pn0xqkk7rhm0xwvgn85w7xaw8xx1vb33gwn"; depends=[]; };
+  iterators = derive2 { name="iterators"; version="1.0.13"; sha256="190i1y2493v5c9z8978rb3idlwsjymy67k1assa9znljqbj313kp"; depends=[]; };
   iterpc = derive2 { name="iterpc"; version="0.4.2"; sha256="06q7l8mz8ws4nn6gb0whnlqs8my2n8z2d2g8fvv3cxd28904dg9q"; depends=[arrangements gmp iterators]; };
   itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
   itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
@@ -9688,14 +10098,17 @@ in with self; {
   ivdesign = derive2 { name="ivdesign"; version="0.1.0"; sha256="02v2cnljz3gk7mb8q3p1i54rj6l02r4pirznnrshy092zvrvr26m"; depends=[]; };
   ivdoctr = derive2 { name="ivdoctr"; version="1.0.0"; sha256="18pca08cww4x13j3ks0mr84c3jkigf09s7wrh5y8pc11ypyxbgp1"; depends=[AER coda data_table MASS Rcpp RcppArmadillo rgl sandwich]; };
   ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
+  ivitr = derive2 { name="ivitr"; version="0.1.0"; sha256="0fc5svmkxv0s20ipwbvkvmmh1w5gb1g6va496fa9qbf99wifnmrx"; depends=[dplyr nnet randomForest rlang]; };
   ivmodel = derive2 { name="ivmodel"; version="1.8.1"; sha256="0c0lzjvp9dzj92p65v5lqmr701ksklx06lf6fcylj2w9hczf5klw"; depends=[Formula ggplot2 Matrix reshape2]; };
   ivmte = derive2 { name="ivmte"; version="1.2.0"; sha256="19jcydb5n950av2c9j89sakjkq1jbwnarrl0hwmdy573jqh4d8a5"; depends=[Formula]; };
   ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
   ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
   ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; };
+  ivreg = derive2 { name="ivreg"; version="0.5-0"; sha256="168ra48blb4wi9f9jqnaz6914s8sz8c147mkhqvim155bd0h4s00"; depends=[car Formula lmtest]; };
   ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; };
+  ivsacim = derive2 { name="ivsacim"; version="1.0"; sha256="1ay2x91vam0iv62vyl2ygx7lyh52jl9mixy6hya19hjbdshh7m5j"; depends=[lava Rcpp survival timereg]; };
   ivtools = derive2 { name="ivtools"; version="2.3.0"; sha256="1wv0r9dy893hafbbrjcjrphb8dgql71ya4zfbkl5dfp7d4ncfxl0"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; };
-  ivx = derive2 { name="ivx"; version="1.0.0"; sha256="0gxq0w9cmgg17y7kdjxfzaq8nr4knashfav0vjpq6ba9jh5grk9l"; depends=[magrittr Rcpp RcppArmadillo tibble]; };
+  ivx = derive2 { name="ivx"; version="1.1.0"; sha256="1dg09aajk9rqmrlwq4xw7qd5ra1z8wjxipy5l85sl1nzii250drq"; depends=[Rcpp RcppArmadillo]; };
   jSDM = derive2 { name="jSDM"; version="0.1.0"; sha256="0lkapg6v5lh53vnsg5hcr9qis8qimb6ilds23dqcyhi6w3dys9nb"; depends=[coda corrplot Rcpp RcppArmadillo RcppGSL]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
   jaatha = derive2 { name="jaatha"; version="3.2.1"; sha256="0zqvylknvymggw5jl40cfyahfjy64wb25f0qymh78xbamv1hc85w"; depends=[assertthat R6]; };
@@ -9712,19 +10125,19 @@ in with self; {
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
   janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; };
   janitor = derive2 { name="janitor"; version="2.0.1"; sha256="1dy8dlvnxg057qxpd5lk30wcxa15vw95888ccd99sqra789llm3n"; depends=[dplyr lifecycle lubridate magrittr purrr rlang snakecase stringi stringr tidyr tidyselect]; };
-  jaod = derive2 { name="jaod"; version="0.2.0"; sha256="0cphwfmv5pbkf9hvz9w25gncldycgdfxmg6ajbvj9mdl46z3jddw"; depends=[crul jsonlite tibble]; };
+  jaod = derive2 { name="jaod"; version="0.3.0"; sha256="071j3xqk7gzsic1sk8v0pwmqv6pav0nj9vvbskss3l1gczy80dfr"; depends=[crul jsonlite tibble]; };
   jarbes = derive2 { name="jarbes"; version="1.7.2"; sha256="0qjnx0m65f6a8r6y5mwplaq518lrsf73k8zbf728v857nbjlhf2l"; depends=[ggExtra ggplot2 gridExtra MASS mcmcplots R2jags rjags]; };
   jcext = derive2 { name="jcext"; version="0.1.1"; sha256="02zppiyq3gy551zi1g00gam1w4y1wgzn5zi9wrcz8yw915dla0ix"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; };
   jcolors = derive2 { name="jcolors"; version="0.0.4"; sha256="18dmjcrci0z1xy2kglrarzm0idr9g3nhbbw7f1ijls3i0piqdri6"; depends=[ggplot2 scales]; };
-  jcp = derive2 { name="jcp"; version="1.0"; sha256="1p3bjn3m7mw8rxcmd79ss23v9sb1ad28qcirj5czpj274glnj26k"; depends=[]; };
+  jcp = derive2 { name="jcp"; version="1.1"; sha256="1b4z1h4ygf39cg870q08ahzi4ccrlrxp6g97y1qiff5pf9xyp1jc"; depends=[]; };
   jdx = derive2 { name="jdx"; version="0.1.4"; sha256="0jqf0nkdyv9g4rifzlkls0n64fdcma2yphwl478772jlgfmxm2jb"; depends=[rJava]; };
   jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; };
   jetpack = derive2 { name="jetpack"; version="0.4.3"; sha256="16l4wkrkf4ihhhpwzd62gvz30n8lxyvail70vmcg41gzdyw76hbl"; depends=[crayon desc docopt packrat remotes]; };
   jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  jfa = derive2 { name="jfa"; version="0.2.0"; sha256="13s55nxs5yq9y034h4cbacbchfa855wcbq67ajiihmy10aj4smlp"; depends=[]; };
+  jfa = derive2 { name="jfa"; version="0.4.0"; sha256="17k77jvlvyk5dkf6r1srzggm1gcayrzmds62v99hb43a7iq83i41"; depends=[]; };
   jiebaR = derive2 { name="jiebaR"; version="0.11"; sha256="08v64xwr9jp4vh88x7y935khh4cmj8rwsjaxfd2c67n0445qppmd"; depends=[jiebaRD Rcpp]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
-  jipApprox = derive2 { name="jipApprox"; version="0.1.2"; sha256="09xvcf9sjf5xzrwpzicgln57ldv6kh1algsiq4kc0hnshmfvk56g"; depends=[sampling]; };
+  jipApprox = derive2 { name="jipApprox"; version="0.1.3"; sha256="1dgawgvkpswv1mxjlqz4ip7vy2856fqvs24hkfl338jgap60grhp"; depends=[sampling]; };
   jjb = derive2 { name="jjb"; version="0.1.1"; sha256="0y9yvnzg6xngz1fvzl5jm4yb1pg6wrp3id0gysv214wcznf3gna9"; depends=[]; };
   jlctree = derive2 { name="jlctree"; version="0.0.1"; sha256="17n39jc7cwv6hiayy7h1859prdwy2j3pz1vhi6jqnzm4wy6p8a9a"; depends=[lme4 rpart survival]; };
   jmcm = derive2 { name="jmcm"; version="0.2.2"; sha256="0bpvvnb7lgf6lfhhshq31yyvyhacfh208b70brm0cdvizj962mvz"; depends=[Formula lattice Rcpp RcppArmadillo roptim]; };
@@ -9734,6 +10147,7 @@ in with self; {
   jmotif = derive2 { name="jmotif"; version="1.1.1"; sha256="0b2qllpfgs6q5fwfhxl5b4xdyzbvnja7ld766akf0xxznxvglkrg"; depends=[Rcpp RcppArmadillo]; };
   jmuOutlier = derive2 { name="jmuOutlier"; version="2.2"; sha256="1vj9n1hsf780f7l0a22kmi3qm84j4dzjybjkh5zwh6bhwfjnjws3"; depends=[]; };
   jmv = derive2 { name="jmv"; version="1.2.23"; sha256="01c8wln3g9fx0pp4jx2wg6g5qzvs13y8n89rhm6s9yfczq7ljc0p"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
+  jmvReadWrite = derive2 { name="jmvReadWrite"; version="0.1.0"; sha256="016qc1dgw21223r8bszh6800lw2srckdvnnzlica9vlj673428h0"; depends=[rjson]; };
   jmvconnect = derive2 { name="jmvconnect"; version="1.2.18"; sha256="1lc9jb98rfrn3rq65l2zgd72qjgg0f6jmk3nxxwd3birkg8mjf9j"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; };
   jmvcore = derive2 { name="jmvcore"; version="1.2.23"; sha256="1bms2fbcvnacwg4vahj20iz3b6w22xcjz6zyzdihr5ai0318cjz8"; depends=[base64enc jsonlite R6 rlang stringi]; };
   jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; };
@@ -9741,9 +10155,9 @@ in with self; {
   joineR = derive2 { name="joineR"; version="1.2.5"; sha256="07rsxqvy62w2z48fkgbhfk5b3q9qwkmz11n8j8qkhipqs0h1zwwq"; depends=[lattice MASS nlme statmod survival]; };
   joineRML = derive2 { name="joineRML"; version="0.4.4"; sha256="1h4js01zp627b5z5c5daz2a2cz38f3m2a1bijcpmbg17qskv6wp0"; depends=[cobs doParallel foreach generics ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival tibble]; };
   joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; };
-  joinet = derive2 { name="joinet"; version="0.0.3"; sha256="01rql7nidmzhrz6agy5kphsln5nl4lpyrqdrfmf5w98zjr8yqkpr"; depends=[cornet glmnet palasso]; };
-  joint_Cox = derive2 { name="joint.Cox"; version="3.8"; sha256="15l37a3ds5mp68812bq60xpacw4k2ndf1fh9ygdjd2dsp4rv6s3q"; depends=[survival]; };
-  jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; };
+  joinet = derive2 { name="joinet"; version="0.0.6"; sha256="0xhn12mkylpn5330qmrlqg29vn89ia03h31472hp9av370mqvzbn"; depends=[cornet glmnet palasso]; };
+  joint_Cox = derive2 { name="joint.Cox"; version="3.10"; sha256="08dx2f36drx81sf6fk29zncv9176nh48f7wfihxx28cn49zr5cxa"; depends=[survival]; };
+  jointDiag = derive2 { name="jointDiag"; version="0.4"; sha256="18x6rxaxhz9hcp6rfmjlanbfsc5q61p6xcxixnc8ayyxbdq7q6rf"; depends=[]; };
   jointMeanCov = derive2 { name="jointMeanCov"; version="0.1.0"; sha256="1cai5g63n11dirn9fldzkqxcnkxc20ndr9ygrr9rk0s1qz8x63pb"; depends=[glasso]; };
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
   jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
@@ -9753,42 +10167,42 @@ in with self; {
   jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; };
   journalabbr = derive2 { name="journalabbr"; version="0.2.2"; sha256="0r88cxqd2w1gqc5l5i140sjw56ry554p9n2vjvb3a969dfv510wh"; depends=[dplyr httr purrr rlang shiny stringi stringr tibble usethis]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8.1"; sha256="1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"; depends=[]; };
-  jpmesh = derive2 { name="jpmesh"; version="1.2.1"; sha256="138ysjc2swz2vph6i0h14l6bnii2zg3sfhms2186wmvl9lhlxca6"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; };
-  jpndistrict = derive2 { name="jpndistrict"; version="0.3.7"; sha256="0qzjcnq0c4d2hh4qxglkaq2qmnqk790ibmr00j5f9x494q74ccfr"; depends=[curl dplyr googlePolylines jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; };
-  jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; };
-  jquerylib = derive2 { name="jquerylib"; version="0.1.1"; sha256="1yix68mv2y2gl6vq2da6mhn264zn5cd8mlmqf9kzdvr81pdm0gnp"; depends=[htmltools]; };
-  jrc = derive2 { name="jrc"; version="0.3.1"; sha256="0vzmmzblwx055jvd90bz6s5iy901kqanbrs64c3wpaxvjigwf87z"; depends=[httpuv jsonlite mime R6 stringi stringr]; };
+  jpmesh = derive2 { name="jpmesh"; version="2.0.0"; sha256="1fawpcxz31rb3vv9x6dxhcgx1xz758xfsxrc8wa59a6qbrdxqzqh"; depends=[leaflet magrittr memoise miniUI purrr rlang sf shiny tibble units vctrs]; };
+  jqr = derive2 { name="jqr"; version="1.2.0"; sha256="0c5wbi6hv50q6bvbvnzwwj42lm67isi66iwdha4fc9a6w0c9h5vi"; depends=[lazyeval magrittr]; };
+  jquerylib = derive2 { name="jquerylib"; version="0.1.3"; sha256="1s0d6mws13hwkx07jqmry7vp30a05b2p9w7ir68bmkhasidwkzdq"; depends=[htmltools]; };
+  jrc = derive2 { name="jrc"; version="0.4.0"; sha256="0jmwjh5zia1q1kma09ngxg2c198a0vy6qhnymcbw8n44lfab25gp"; depends=[httpuv jsonlite mime R_utils R6 stringi stringr]; };
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
   jrt = derive2 { name="jrt"; version="1.0.1"; sha256="023i0xqz8mhnjnii92vjw64mjnnlf8jaji99i4c2vxcr7m83jm0r"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; };
   jrvFinance = derive2 { name="jrvFinance"; version="1.4.1"; sha256="1gkivmvc0njm32w7yhbh02h9p212xa3m4cvrwcy7yray8g6phdxp"; depends=[]; };
   js = derive2 { name="js"; version="1.2"; sha256="0s5rj845255a4fzv4h76gcnnqyl5cg3c03r2ay3f00jxnxvvigcg"; depends=[V8]; };
-  jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; };
-  jskm = derive2 { name="jskm"; version="0.3.9"; sha256="1v49ibwxdw7kcabqngnsvgjpwh97qdsm1ab8vnr4mzznfyfyngyv"; depends=[ggplot2 gridExtra plyr scales survey survival]; };
-  jsmodule = derive2 { name="jsmodule"; version="1.1.0"; sha256="0yhzij4m3n3zwxna9cb9gixnjvpdjmj5dy1yz88jwrcx415vnb5w"; depends=[Cairo data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; };
+  jsTree = derive2 { name="jsTree"; version="1.2"; sha256="06mmz55brm6w19vnlk1w8qaz0n3czlyl4fs62nzgdlsdjn8pad1h"; depends=[data_table htmltools htmlwidgets jsonlite]; };
+  jsTreeR = derive2 { name="jsTreeR"; version="1.1.0"; sha256="0517jm8ql9ml4n4gdcp0hwzqax7nl0xpwplgi6dbvd6lfbhrqrcf"; depends=[base64enc htmltools htmlwidgets miniUI R_utils rstudioapi shiny shinyAce]; };
+  jskm = derive2 { name="jskm"; version="0.4.2"; sha256="0yn81fyz8ij2jkys7c5qhfkakqw5nmb458rmd879ns7j7m31nvf0"; depends=[ggplot2 gridExtra scales survey survival]; };
+  jsmodule = derive2 { name="jsmodule"; version="1.1.4"; sha256="00jmrsbx52hzfk7nk107lzgxd5d1hl0crvvvibaimm5ldfsz45kn"; depends=[Cairo data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; };
   json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; };
   jsonify = derive2 { name="jsonify"; version="1.2.1"; sha256="1kpv6whi6bggi0ij7krzfr0fly6c2j9y54fr5ahgcjp36amr34cj"; depends=[rapidjsonr Rcpp]; };
   jsonld = derive2 { name="jsonld"; version="2.2"; sha256="0bplz2s97wl9yp383jazykh5647iw6kbr1zanqai2s0sxp1xbwn8"; depends=[curl jsonlite V8]; };
-  jsonlite = derive2 { name="jsonlite"; version="1.7.0"; sha256="1izfrk5yahsz6s69wanfspn72qdffjglbr5305akj72ig9fnladq"; depends=[]; };
+  jsonlite = derive2 { name="jsonlite"; version="1.7.2"; sha256="1lhzcpz9clwq04i5m6jzkvw9x03pwlqrixv4l9xzchjr8d84nd86"; depends=[]; };
   jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; };
   jsr223 = derive2 { name="jsr223"; version="0.3.4"; sha256="0rir9v0qhnbl2rgkx1qz2ydj68ba9ccbdzsg6y1acczdhpl03j51"; depends=[curl jdx R6 rJava]; };
-  jstable = derive2 { name="jstable"; version="0.9.5"; sha256="0mqq7a9l3jmcvkxfpyxip6i13zkib8ggg0ci8fpwzrxv8lk0n628"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
+  jstable = derive2 { name="jstable"; version="1.0.1"; sha256="1p2wkkcsnm143b39q30wl9kjs8k9774szynham33wdd2ckigqk1f"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
   jstor = derive2 { name="jstor"; version="0.3.9"; sha256="1rfi02i9j5v2zaz1sganp4rn2bm7yadlq0s4fragyy2jpgs0mnnv"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; };
-  jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; };
-  jtools = derive2 { name="jtools"; version="2.1.0"; sha256="00ssbpqvzymi264lcig4rv152kffw544d2ccgsyxkhkaq114g0kq"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; };
+  jti = derive2 { name="jti"; version="0.6.0"; sha256="1bx241f6bmq1jx1r6a8vkr9yryhhgg83d4ya83z45rjwqdz4y4sd"; depends=[igraph Rcpp RcppArmadillo sparta]; };
+  jtools = derive2 { name="jtools"; version="2.1.1"; sha256="06xm6mz4n9c4b62kzqghavj80amivjq41mhmcnz94lp4ci648f9k"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
   jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; };
   junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; };
   justifier = derive2 { name="justifier"; version="0.1.0"; sha256="14795pf94bzcnnaf5w0xqzy06vqvs76gdvr1rn4ihqh2az00l6n7"; depends=[data_tree DiagrammeR purrr ufs yum]; };
   jvcoords = derive2 { name="jvcoords"; version="1.0.2"; sha256="1mlamzg0qz5l23v2w08imrlbnzc3b3amr6yz5hbaf8vc3k3cff5f"; depends=[]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
-  jwutil = derive2 { name="jwutil"; version="1.2.3"; sha256="1cqqbz6n26gmv9jbsf8d2lmzcbyppc8hs882ms56d8fkv3ism4zl"; depends=[Rcpp testthat]; };
   kSamples = derive2 { name="kSamples"; version="1.2-9"; sha256="1zs22p68d6320kcylisnk0b5wmpapxkyz15py09czxzw7npw8gms"; depends=[SuppDists]; };
   kStatistics = derive2 { name="kStatistics"; version="2.0"; sha256="1mmj8mighaxmh0a2naimyv66iffjfhxh0mzbva7y3cx6bwvsfm83"; depends=[]; };
-  kableExtra = derive2 { name="kableExtra"; version="1.1.0"; sha256="1nicvw06xsf3a1f5c10mih07b76m2v5s5h165vmz0qx6n1a3492i"; depends=[digest glue htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; };
+  kableExtra = derive2 { name="kableExtra"; version="1.3.1"; sha256="1zixccpgy9x95fgzfgxc43pm020c80c21flch71klc3zzzsq53gf"; depends=[digest glue htmltools knitr magrittr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; };
   kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; };
   kamila = derive2 { name="kamila"; version="0.1.2"; sha256="01rwalv2qigxl3j3jyhrdbxlarwf0xdc8xa6c42sgcl6qpna5vn7"; depends=[abind gtools KernSmooth plyr Rcpp]; };
   kangar00 = derive2 { name="kangar00"; version="1.4"; sha256="0cgyxvgk6bxvh77y9vl0p024dya9ffr9fhmwlcxbysbr4p3kyiaj"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; };
+  kantorovich = derive2 { name="kantorovich"; version="3.0.0"; sha256="1iwbxj2c1085pc57zkb5lklkd0bvx0i27a94r526zv7bxaf0kgrd"; depends=[CVXR gmp lpSolve rcdd Rglpk slam]; };
   kaos = derive2 { name="kaos"; version="0.1.2"; sha256="0hzzb8ldydl4g3cl1579q8jv835q4cdmn8agafp6qqdhwi1xxw8k"; depends=[ggplot2 reshape2]; };
   kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; };
   kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; };
@@ -9800,9 +10214,9 @@ in with self; {
   kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
   kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; };
   kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; };
-  kde1d = derive2 { name="kde1d"; version="1.0.2"; sha256="0m6y1anzl5agb8xpywn2pv6hx4l7k0352bxnzxcs23iksbimxx13"; depends=[BH randtoolbox Rcpp RcppEigen]; };
+  kde1d = derive2 { name="kde1d"; version="1.0.3"; sha256="03h5xd0mwpj8gs5bwf6xhlc1kfd99l1l3w79gfrix67i14nnaifn"; depends=[BH randtoolbox Rcpp RcppEigen]; };
   kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
-  kdensity = derive2 { name="kdensity"; version="1.0.1"; sha256="1iinwbyn3d10gsh7i43sm9hf93baqla3gd5s10kiik76r7d97pdc"; depends=[assertthat]; };
+  kdensity = derive2 { name="kdensity"; version="1.1.0"; sha256="07d1p3ysdm66a9sf0gih5xjb3wfab44c3sr8aaraz22s2a9q9b55"; depends=[assertthat EQL univariateML]; };
   kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kdevine = derive2 { name="kdevine"; version="0.4.2"; sha256="15hw27y4rlifz3kyirm7yacca38xqdwr42k21gg67dhmbdplbnz0"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; };
   kdist = derive2 { name="kdist"; version="0.2"; sha256="18q7njvsb9sbm412c6ms4b4nxg768z9qahws5rnin06gvb25nfcx"; depends=[]; };
@@ -9813,11 +10227,13 @@ in with self; {
   kelvin = derive2 { name="kelvin"; version="2.0-2"; sha256="0hjycqga3yjrzpgc911nk64nsjrpim4v7219f7iwi1snx0ydhqzf"; depends=[Bessel]; };
   kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.4"; sha256="1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa"; depends=[actuar dplyr ggplot2 tibble]; };
   kequate = derive2 { name="kequate"; version="1.6.3"; sha256="1ii3wlypm2qqkfxr3z1sdnmgc43h2zzlw6v4h2xxjdlznzxkp3mr"; depends=[equateIRT ltm mirt]; };
+  kerTests = derive2 { name="kerTests"; version="0.1.2"; sha256="0gn0wjybaixwv8fkpn6wqz0cywzyscvv2dgnnl3idai1zr1fzjn1"; depends=[]; };
   keras = derive2 { name="keras"; version="2.3.0.0"; sha256="0byzg6qpcfj852qlbav8cwhrqvkpkg0zig9brhw2sibljwy8x5ik"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
-  kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.2"; sha256="0qfagzyid7g89hy8w7hgccp6pm78b5d8857q2zn2ixq6s9rp16kj"; depends=[crayon data_table dplyr echarts4r keras magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; };
+  kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.3"; sha256="1lky84mgppsbn2wn0livx2j18x5vg92mskhb3pyf4ig9qyfxgjkk"; depends=[crayon data_table dplyr echarts4r keras magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
   kergp = derive2 { name="kergp"; version="0.5.1"; sha256="16zb7gsbp3bg4kpn7lszw8rn24i40f6jmxcf751vca1f7pfn38pj"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; };
+  kerndwd = derive2 { name="kerndwd"; version="2.0.3"; sha256="0lvm007wzhyagyafmq47819hn66riwdcpymn56clc1sgch9i933m"; depends=[]; };
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
   kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; };
   kernelTDA = derive2 { name="kernelTDA"; version="1.0.0"; sha256="0nzb2z10c3pqj8p47w663mrnmk3g8x61zz99ka8fwcspw1wq3g8m"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; };
@@ -9827,17 +10243,21 @@ in with self; {
   kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; };
   kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; };
   keyATM = derive2 { name="keyATM"; version="0.3.1"; sha256="1bi7hs1d70y5xpf3rh3g0vnn558y6fvxknyl491h737ps87rd77i"; depends=[dplyr fastmap ggplot2 ggrepel magrittr Matrix purrr quanteda Rcpp RcppEigen RcppProgress rlang stringr tibble tidyr]; };
+  keyToEnglish = derive2 { name="keyToEnglish"; version="0.2.0"; sha256="169iclygyk3qxzl8gii5lndwfzz8a7fir2kf7vrasxbknvkvlfij"; depends=[jsonlite openssl stringr]; };
   keyholder = derive2 { name="keyholder"; version="0.1.5"; sha256="0sr0rcchvwflqf2xj9j8j35ng52ichgvp1ix57v4ah91dlpj9i5s"; depends=[dplyr rlang tibble]; };
   keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
   keypress = derive2 { name="keypress"; version="1.2.0"; sha256="19l33519f726i3q20y34v1aavrn4fpj3zn5caij3l9q2asw2kqk2"; depends=[]; };
   keyring = derive2 { name="keyring"; version="1.1.0"; sha256="1hpfd4hbx43i39l995rg86kfxi7wlyla1gv8mwcdr4xx7z122zzq"; depends=[assertthat filelock getPass openssl R6 rappdirs sodium yaml]; };
   keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; };
+  keys = derive2 { name="keys"; version="0.1.0"; sha256="0r4qrd9xbc1pwl6dqr89inrlwwfhayymga1mf1nwb47203fbz02l"; depends=[htmltools jsonlite shiny]; };
   kfda = derive2 { name="kfda"; version="1.0.0"; sha256="0861hzry55gj8ykdd8cwil1wb7234pkmipp4v1749fpmzggq1xgi"; depends=[kernlab MASS]; };
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
   kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; };
   kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; };
-  khroma = derive2 { name="khroma"; version="1.3.0"; sha256="1bpap5ljnsjwj0d6r90zhxvgs87j6v2pwxxd6ny14jzn402f1zp8"; depends=[]; };
+  khroma = derive2 { name="khroma"; version="1.4.0"; sha256="116c39f3vf9pb018wavdc8n1hcysmgbc0w058fv11mzlb4g68xrp"; depends=[ggplot2 scales spacesXYZ]; };
+  kibior = derive2 { name="kibior"; version="0.1.0"; sha256="06ff9iqhvl7wvxjy45s526dr30wq0n6jh417073gj94zi0wmv7n4"; depends=[Biostrings data_table dplyr elastic jsonlite magrittr purrr R6 rio Rsamtools rtracklayer stringr tibble tidyr]; };
   kidney_epi = derive2 { name="kidney.epi"; version="1.2.0"; sha256="1hd6w7kxim5slmmqalf5sfjg8jcvhyzn5g4gf6h0lmaprsfszhja"; depends=[]; };
+  kim = derive2 { name="kim"; version="0.2.20"; sha256="15z8vwrj8rvq0l2ycpxazns3w3mxn0x7458w9d20fgfj5898wzdx"; depends=[boot car data_table devtools dplyr effsize ggplot2 ggridges lm_beta mediation moments paran rstudioapi weights WRS2]; };
   kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; };
   kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; };
   kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
@@ -9846,19 +10266,19 @@ in with self; {
   kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.7.0"; sha256="1z2l6bn53mwkll9ki4169lqlz6wcfp29xzdrqyw606j2xrs4wc22"; depends=[kirby21_base]; };
   kirby21_t1 = derive2 { name="kirby21.t1"; version="1.7.0"; sha256="0bv8rrk9jh02h3gill1g2w246j4zv98cjchz7i2c092lvqps8szs"; depends=[kirby21_base]; };
   kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
-  kit = derive2 { name="kit"; version="0.0.4"; sha256="1gjp8r1qhmwf65c5mr94fx5v2h7hgczn47b2glrahzfyh6g5796s"; depends=[]; };
+  kit = derive2 { name="kit"; version="0.0.5"; sha256="0zwa7fk9v3gxl91hqf6jb85pcbf83mjbnzv80wlgwq13mwa9ifax"; depends=[]; };
   kitagawa = derive2 { name="kitagawa"; version="3.1.0"; sha256="190xi88zc3vybpyawayh8m78sgcn951n3axmc2fc67sic458r02s"; depends=[Bessel kelvin psd]; };
   kiwisR = derive2 { name="kiwisR"; version="0.2.0"; sha256="14fzf72swy221jcbiplss9dh7g03idrpbbyvbxp4bcqpxwr6hbsa"; depends=[dplyr httr jsonlite lubridate purrr tibble]; };
   kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; };
   klaR = derive2 { name="klaR"; version="0.6-15"; sha256="1bhgkq6spjawy5lsh663rnby4fzrx4k2qwqp4ci4p9pq8g35pzjv"; depends=[combinat MASS questionr]; };
-  klassR = derive2 { name="klassR"; version="0.1.2"; sha256="1wfgqy4pfbaikm0qqf6dirjw0imbl6si9i0nwn8l17i7c8g8g55s"; depends=[httr jsonlite tm]; };
+  klassR = derive2 { name="klassR"; version="0.1.3"; sha256="0njsmmcrx57v084kcgm1x99cqzzjpjpzli1b0vsv02hmv7n3rxn4"; depends=[httr jsonlite tm]; };
   klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
-  klexdatr = derive2 { name="klexdatr"; version="0.1.0"; sha256="1ffcpiy1h92rn9nbysq6cca75varnam95s7li4dp7f58ibbhmxqc"; depends=[]; };
+  klexdatr = derive2 { name="klexdatr"; version="0.1.1"; sha256="0y951lsafh80x7ya17jw8hmhrcxvqh4qwzik7w42bvams3sbf75k"; depends=[]; };
   klic = derive2 { name="klic"; version="1.0.4"; sha256="1ggsdq8xcg6hi12rq356myhngx3j475gpwlvpynm1581r4z0lkbk"; depends=[cluster coca Matrix pheatmap RColorBrewer]; };
+  klsh = derive2 { name="klsh"; version="0.1.0"; sha256="1r354fd5da6mp7v3048ii09hnghhfwdg6pvmx2ib0cr88ql431sy"; depends=[blink plyr Rcpp SnowballC stringi]; };
   klustR = derive2 { name="klustR"; version="0.1.0"; sha256="1g2q6h3cbm8v3gqz0f6v8bl5na9972k38d94czjfxmx4cv7wfgx8"; depends=[htmlwidgets jsonlite]; };
   km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; };
   kmc = derive2 { name="kmc"; version="0.2-4"; sha256="0y8bdgdxsz53fiqc2yr39agndxs4zxj7mmplj273map9k0slnnqk"; depends=[emplik Rcpp rootSolve]; };
-  kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
   kmcudaR = derive2 { name="kmcudaR"; version="1.1.0"; sha256="16dkv9ag5375zc23nqakbg7v6knxvh1pips9rjsls0d7rw2bg1bs"; depends=[Rcpp RcppEigen]; };
   kmeRs = derive2 { name="kmeRs"; version="1.1.0"; sha256="1wafa9wgqlwrk6jwmbn34n3rmvbc9s6s235z8mscbqgw67snwcq6"; depends=[Biostrings rDNAse tcR]; };
   kmed = derive2 { name="kmed"; version="0.3.0"; sha256="0d32pcczkyx3dw4bnqrzd36lvw5xf2ilr8f1h32z3rq092m53mrx"; depends=[ggplot2]; };
@@ -9870,11 +10290,10 @@ in with self; {
   kmlcov = derive2 { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
   kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
-  knitcitations = derive2 { name="knitcitations"; version="1.0.10"; sha256="0d73qr1zhkx0255vzzf7fs8vpmfnzl91ni4zp5y0l42h8p98vdn5"; depends=[digest httr RefManageR]; };
-  knitr = derive2 { name="knitr"; version="1.29"; sha256="00rcwiq8znmk5h4qgrwd0639xyb38iwbjykqjk3disz3kvrcvbn1"; depends=[evaluate highr markdown stringr xfun yaml]; };
+  knitr = derive2 { name="knitr"; version="1.30"; sha256="0gn9qwc5762a6j0iywfwhalni52g228dcy4bl4di6d52cqsv3ars"; depends=[evaluate highr markdown stringr xfun yaml]; };
   knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; };
   knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; };
-  knitrdata = derive2 { name="knitrdata"; version="0.5.0"; sha256="1p7bfs7k6dd18mly4l830flrw1fbn6y8wigpvs2phl585jf4c7av"; depends=[base64enc knitr]; };
+  knitrdata = derive2 { name="knitrdata"; version="0.6.1"; sha256="1am79r4rkrw7vjmyzc0cq4p52l2ypdw99rfhrvdsaq11yllx08mx"; depends=[knitr xfun]; };
   knn_covertree = derive2 { name="knn.covertree"; version="1.0"; sha256="0msfcmwydws7q7m5jdb0dxab0nkbl7mq5llg6v3r4qrnlvrdggvz"; depends=[Matrix Rcpp RcppEigen]; };
   knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
   knnp = derive2 { name="knnp"; version="2.0.0"; sha256="0qgq8la3zndlb1wwqv9b2kw52y9ns36pi4ds68pkm81bhzq5nqis"; depends=[doParallel foreach forecast parallelDist plyr]; };
@@ -9882,22 +10301,22 @@ in with self; {
   knor = derive2 { name="knor"; version="0.0-7"; sha256="1xxv210sjj9w06pf36q7haz9fkqdc17jyqdsiqsxj3q8zj585qfc"; depends=[Rcpp]; };
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.4"; sha256="1af5qhj82dixf1qcbz3sfj52pzgy8gnafzifwxnhrp7vpn4rnv6m"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; };
-  koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; };
-  koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-3"; sha256="013zxm5x5hwdx1hqgb7mh3zmn8dri3fhq1brmzg936gddhxap6is"; depends=[koRpus sylly_en]; };
-  kofdata = derive2 { name="kofdata"; version="0.1.3.4"; sha256="036d3mvhdlpaisms3vg6v35lvy48w8yld7mz3rdd3dw6bszzrg5k"; depends=[httr jsonlite xts zoo]; };
+  koRpus = derive2 { name="koRpus"; version="0.13-4"; sha256="1bg8q67hp3rs9373zmw0jxg9vclfdj0z7cnks6g8fwdnrimk6p6w"; depends=[data_table Matrix sylly]; };
+  koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-4"; sha256="1faj065wjj7a68i57y7zmrrj4ckp01gvq8qknf6a56idi8kzr732"; depends=[koRpus sylly_en]; };
+  kofdata = derive2 { name="kofdata"; version="0.1.4"; sha256="1vqixanprlfmqjcj3543m4mhq37imd9qnnif2mbh6wr1rcrs1zs9"; depends=[httr jsonlite xts zoo]; };
   kofnGA = derive2 { name="kofnGA"; version="1.3"; sha256="0w0881ydnqdah04sifi25ypzxdwnsiqxfq1xam4yhr670bdak1vm"; depends=[bigmemory]; };
   kohonen = derive2 { name="kohonen"; version="3.0.10"; sha256="1ck7j13x701g67bx81x7plszz804jfhl1yg42krcj9x88vm5cscr"; depends=[Rcpp]; };
   kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
   komaletter = derive2 { name="komaletter"; version="0.4"; sha256="0l9xd28vsy5xs27s8mxvj24fpx6s0c36cka9z3x09rdzdp6gwqn8"; depends=[rmarkdown]; };
-  konfound = derive2 { name="konfound"; version="0.2.2"; sha256="0nz09wg0ia11q7hrnjxgvw8xzv25z7hi1sa35cwl7xa8rz5yi1gk"; depends=[broom broom_mixed crayon dplyr ggplot2 mice purrr rlang tidyr]; };
+  konfound = derive2 { name="konfound"; version="0.3.0"; sha256="0ggckxmq63wl1578mv090bdzzbbnhl3dvffrj8xz2p0852rcb6pb"; depends=[broom broom_mixed crayon dplyr ggplot2 mice purrr rlang tibble tidyr]; };
   kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
   kpeaks = derive2 { name="kpeaks"; version="1.1.0"; sha256="057xfqn08lqczgrj1r63d7vbncg24x9va9lnk8c47nwzl1x8aphd"; depends=[]; };
   kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; };
   kpodclustr = derive2 { name="kpodclustr"; version="1.1"; sha256="1gwy59sh4gp06hr3il3hz0iiwdrzrlya5b026qxvz5q62msf6q5a"; depends=[]; };
   kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; };
-  krige = derive2 { name="krige"; version="0.5.6"; sha256="04y9am0jj0crybpr7p4qzdh158r1imllvy6697iakgzjlcqm5xd2"; depends=[Rcpp]; };
+  krige = derive2 { name="krige"; version="0.6.1"; sha256="0xcx7glarqjb25bchs3wflw5lyy9xrbksirrdm35vdsxgif62ydz"; depends=[coda Rcpp]; };
   kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
   krippendorffsalpha = derive2 { name="krippendorffsalpha"; version="1.0"; sha256="137x6y7ks9pan2zwqcpyap5f7d1pwa580aq29cynfimxacmgb5si"; depends=[]; };
   krm = derive2 { name="krm"; version="2020.5-20"; sha256="1b6477cjv5k30djvrlbmwn91ghgwk24cfd58cb0q80xqhgiqvrzb"; depends=[kyotil]; };
@@ -9911,7 +10330,6 @@ in with self; {
   kstMatrix = derive2 { name="kstMatrix"; version="0.1-2"; sha256="1z5gs0x80dq549mba2sy1nfhsphrpkrydalj2jiwqb7fmwqknm3r"; depends=[]; };
   ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; };
   ktsolve = derive2 { name="ktsolve"; version="1.3"; sha256="0brxqb60m1lyqhsmds1c3c6cmbcxlzk2nwvi0fhkc8ziwzlfmd09"; depends=[BB nleqslv]; };
-  ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
   kubik = derive2 { name="kubik"; version="0.2.0"; sha256="1f5v88pfm9szkshbnkkd0pdphqwrbblfmmys7j8k60y919lwgv0z"; depends=[]; };
   kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; };
   kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
@@ -9919,7 +10337,7 @@ in with self; {
   kutils = derive2 { name="kutils"; version="1.70"; sha256="06jk66wbq3jmdf2jdhqns6r3yk36l2x7c907x977zv80sqxa1l37"; depends=[foreign openxlsx plyr RUnit xtable]; };
   kvh = derive2 { name="kvh"; version="1.4.1"; sha256="0hnqlybphx8qnx98ynykxpz4ys4prp9zbmkak02qlvmnxwc2cqg0"; depends=[Rcpp]; };
   kwb_hantush = derive2 { name="kwb.hantush"; version="0.3.0"; sha256="1rlm7i95yw66asgkag93phig2y9lic4xl2fv3cbnr3v751f6a59m"; depends=[hydroGOF lattice]; };
-  kyotil = derive2 { name="kyotil"; version="2019.11-22"; sha256="13ihijshgzi3lg07p24yzyxjsrfy9nsf6r5vcssz19y9w26scaj2"; depends=[]; };
+  kyotil = derive2 { name="kyotil"; version="2020.10-12"; sha256="1dqh753fcjdrj81rpaf1jc4wgd0svm7y9j5yq76iyd2q8pp1q2y1"; depends=[]; };
   kza = derive2 { name="kza"; version="4.1.0.1"; sha256="1vx7wc8iwmr9d6ff2kcy6y3nyfj6jfzv4hxkv1fsas0rbjgfick4"; depends=[]; };
   kzfs = derive2 { name="kzfs"; version="1.5.0.2"; sha256="0x0fc807p0pwsjkhjq51ymwr9nhs6cb0m82029cz8bbn3yf6cymq"; depends=[digest kzft]; };
   kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; };
@@ -9933,17 +10351,18 @@ in with self; {
   label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; };
   labelVector = derive2 { name="labelVector"; version="0.1.1"; sha256="156066jbsmqal1q4xwwkyrqfzq0as6r2add0x240y21zak6i8x9q"; depends=[]; };
   labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
-  labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
-  labelled = derive2 { name="labelled"; version="2.5.0"; sha256="0hxkig9y12rclzhk7ly7bdmysnxz0jymbbwz1apwb61frdswgb5h"; depends=[dplyr haven]; };
+  labeling = derive2 { name="labeling"; version="0.4.2"; sha256="0rfikd9gy70b8qz87q9axcwv8nmn9mbxfdwypxi0sghpfs9df8p0"; depends=[]; };
+  labelled = derive2 { name="labelled"; version="2.7.0"; sha256="1nsb0mh0jg7gggc41b6v55nmfq07g0qn9fy55x4jws5dscs6pdmi"; depends=[dplyr haven lifecycle pillar rlang tidyr vctrs]; };
   labelmachine = derive2 { name="labelmachine"; version="1.0.0"; sha256="18l7argmf7d60cv34w7acjg4bk08nhi2cc5p61sx2zmq28v8nndr"; depends=[yaml]; };
   labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; };
   labourR = derive2 { name="labourR"; version="1.0.0"; sha256="0skr8qr1m849l3gpcsn5bjxyjczlzzmsm2j6xcmxv33lf95qg6gi"; depends=[cld2 data_table magrittr stopwords stringdist]; };
   labsimplex = derive2 { name="labsimplex"; version="0.1.2"; sha256="07is5vi1y7qw9fjhhjf65z6fm77v26qgy908zhhp2581qqyn0b5s"; depends=[ggplot2 scatterplot3d]; };
-  labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; };
+  labstatR = derive2 { name="labstatR"; version="1.0.11"; sha256="0blyx2k4za0af72javswmpag2nks1cvgpyp1zabx8vzk38k0si1n"; depends=[]; };
   labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; };
   lacm = derive2 { name="lacm"; version="0.1.1"; sha256="01zd4zsas60kzxx4wsnxs6qqc72i4djwj8m7ryjyx5nrxgpjaixc"; depends=[numDeriv statmod]; };
+  lacrmr = derive2 { name="lacrmr"; version="1.0.3"; sha256="0zpfc4a7krwkwbf31idpmdzks4qassqnhxk1f9fcq1qjzqzhjkvi"; depends=[dplyr httr janitor jsonlite magrittr sjmisc stringr]; };
   lactcurves = derive2 { name="lactcurves"; version="1.0.0"; sha256="06dj8ajg6ndnyakywy16wbqjjr2jkidvnjv33vxcacwijympaqqy"; depends=[orthopolynom]; };
-  lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-13"; sha256="041vldak0s24hci4fm2k1vwm5nvv1nxld94psiaz1v1fh4k781jm"; depends=[RcppRoll spatstat]; };
+  lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.1-0"; sha256="059khrvjiirwd0p61lb1xjy1hz0hfazs9fqv9arpiq1q5cksx9hg"; depends=[RcppRoll spatstat]; };
   laeken = derive2 { name="laeken"; version="0.5.1"; sha256="199rjkhjjygpr6cjzab87as46acb5npi44m4yycvk7lnd0blma8s"; depends=[boot MASS]; };
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
   lagged = derive2 { name="lagged"; version="0.3-0"; sha256="0bm3d6pgb25rw1njarki60j4d7mx7rni25a21iw1l650slg7sscm"; depends=[]; };
@@ -9954,37 +10373,39 @@ in with self; {
   lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; };
   lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; };
   landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; };
+  landmap = derive2 { name="landmap"; version="0.0.6"; sha256="05g9q64ia6gycdld10hl4aplfgdm2qiwp16w5k8q14izm1q2pwld"; depends=[gdalUtils glmnet matrixStats mlr parallelMap ranger raster rgdal sp]; };
   landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
   landsat = derive2 { name="landsat"; version="1.1.0"; sha256="15ymmwhkgw0lqyy2sryss3nsmkrjf4cc0bzlsr41vh5c2636srfd"; depends=[lmodel2 mgcv rgdal sp]; };
   landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
   landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
-  landscapemetrics = derive2 { name="landscapemetrics"; version="1.4.6"; sha256="1ggczpxkm94x2b0vgjnnlmqykmqbin8w0m6bkffp1bmcwsx7pdl2"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
+  landscapemetrics = derive2 { name="landscapemetrics"; version="1.5.1"; sha256="0mw7wivxg9vmx4qj3adwagm49ibrmckbibw58l70irwvcy8fp68p"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
   landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; };
-  landsepi = derive2 { name="landsepi"; version="1.0.1"; sha256="1g6f7sa87jdkg5fi0jk58pwrv764ajm18jblymjjky5laczv5acf"; depends=[DBI doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; };
+  landsepi = derive2 { name="landsepi"; version="1.0.2"; sha256="0pyajgl9zy5s3yb7lvj0dmjbk2li4bacidqv7m1jdgfgqwdjrs0n"; depends=[DBI doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; };
   languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; };
-  languageserver = derive2 { name="languageserver"; version="0.3.6"; sha256="0kmpjz1f4lji477l40qjii889z4vy4z837ryc01p1i957ca0gyr2"; depends=[callr collections desc fs jsonlite lintr R6 repr stringi styler xml2 xmlparsedata]; };
+  languageserver = derive2 { name="languageserver"; version="0.3.9"; sha256="1acjzc8ar3y0g8prwnsp7k3mgvg01h73mnyb4q2s3r7wkb4aqhrv"; depends=[callr collections desc fs jsonlite lintr R6 repr roxygen2 stringi styler xml2 xmlparsedata]; };
   languageserversetup = derive2 { name="languageserversetup"; version="0.1.2"; sha256="05i8kcp1zpbkrqpq5vxxvxk9p7phyngxl0q6v76va0i7qnmy1v7a"; depends=[]; };
   lans2r = derive2 { name="lans2r"; version="1.1.0"; sha256="0svqaz1j8vhfnm31bfp4gqshdj73wmljva4kxcv2qajmcdiqbd2s"; depends=[dplyr ggplot2 R_matlab reshape2 rlang tidyr]; };
   lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
   largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; };
   lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
   lass0 = derive2 { name="lass0"; version="1.1.0"; sha256="01fafgyhi3fw8ldjw2gf0z9w1si7il3ailwm197fxmw4wqgys9fl"; depends=[doRNG foreach ismev lpSolve]; };
-  lasso2 = derive2 { name="lasso2"; version="1.2-20"; sha256="0wgby86i5jphl1nxhzf6733lknry843qrqiyp4km10s2nlpbls0c"; depends=[]; };
+  lasso2 = derive2 { name="lasso2"; version="1.2-21.1"; sha256="0pp92n6db21q7ifykqjy19pcscrbbwgz5p57zdk2acrnsjf49j47"; depends=[]; };
   lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; };
   lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
   latdiag = derive2 { name="latdiag"; version="0.3"; sha256="13wk8vhiwr9drcx5f4wlgbin6hc83zv54yr4h3qhjagm3hxcxbw0"; depends=[Rdpack]; };
+  latentgraph = derive2 { name="latentgraph"; version="1.1"; sha256="11h7nrd81licvdikiwwfkz4x9i7drz09w5ns672b7fw0pj4qqgsr"; depends=[glmnet MASS pracma Rcpp RcppArmadillo]; };
   latentnet = derive2 { name="latentnet"; version="2.10.5"; sha256="05yjf7a16imv1p2lg5dmfk183xll49crnkg0mbz4c4b39nksy85v"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
   later = derive2 { name="later"; version="1.1.0.1"; sha256="1k9n2j7zxw9gfclnx8zfqp6w64c5d6apn7g02yhkajkpmszagfki"; depends=[BH Rcpp rlang]; };
   latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
   latexpdf = derive2 { name="latexpdf"; version="0.1.6"; sha256="07g33z5lyxinlrzpk6pd41m4c4bbfql611yqcqxasf8wra9bb0jr"; depends=[]; };
+  latrend = derive2 { name="latrend"; version="1.0.1"; sha256="01m9zwp3gnl9msmsn5bxic29n36vgvhxxf8b8q9i233n1m772jh9"; depends=[assertthat caret clusterCrit data_table foreach ggplot2 lme4 longitudinalData magrittr matrixStats mclust mclustcomp plyr R_utils scales stackoverflow]; };
   latte = derive2 { name="latte"; version="0.2.1"; sha256="1dcwxxj3yran5a3a8vvdfmx4ap69ql2jncxvmci4p4vcw4ki9j9g"; depends=[dplyr ggplot2 glue magrittr memoise mpoly stringr usethis]; };
   lattice = derive2 { name="lattice"; version="0.20-41"; sha256="1dapkmh4jlb9sxfrpvapvlfhczl4s8p3r20bn47gcgdk1izmbjjl"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.1.6"; sha256="1s93zhdmncaa5c42wjmrar2f95rxjsdf1qphgdzb7g4f61vijxy9"; depends=[sp spam spatialreg spatstat spdep splancs]; };
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-29"; sha256="04fzwcqs594rk5qp98yilh3kdh3sw4xf8wld5rp94ggpaqfw7bbc"; depends=[jpeg lattice png RColorBrewer]; };
-  lava = derive2 { name="lava"; version="1.6.7"; sha256="0ffzxbb8pvfh1m6j61az4ga37snyhylq2941fyc76w7w9i2sixv3"; depends=[numDeriv SQUAREM survival]; };
-  lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; };
+  lava = derive2 { name="lava"; version="1.6.8.1"; sha256="1yiz8y3jhxkszgz9m9fialp9r27hy97xh0imfvs8ziv7dk43y93d"; depends=[numDeriv SQUAREM survival]; };
   lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.6"; sha256="0m5dwfmpcmicrpasx2raac2zylss416bxxgb3mg3abpll89iw9fx"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; };
   lavaan = derive2 { name="lavaan"; version="0.6-7"; sha256="0ks62wrwghbm1brzmqvr92h5n1295dpc87m1g3xrfx0mkdaqdcdk"; depends=[MASS mnormt numDeriv pbivnorm]; };
   lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; };
@@ -9999,16 +10420,18 @@ in with self; {
   lazyarray = derive2 { name="lazyarray"; version="1.1.0"; sha256="1bj1a8ab2479cl3d15h9f1fr1hh5d1p3sxpq8y84yzw0rrsxcldd"; depends=[fstcore R6 Rcpp yaml]; };
   lazybar = derive2 { name="lazybar"; version="0.1.0"; sha256="1hv9ciznbxv7xnaijfjqisq3lx8nd4vkdkj9clxpdsspi3inlf53"; depends=[R6]; };
   lazyeval = derive2 { name="lazyeval"; version="0.2.2"; sha256="1m10i059csrcqkcn59a8wspn784alxsq3symzhn24mhhl894346n"; depends=[]; };
+  lazygreedy = derive2 { name="lazygreedy"; version="1.0"; sha256="18q4hsls0yrmdcyd6ws4gcvvjdmipcaxprfk65j17jfxqgyzp2yf"; depends=[Rcpp RcppArmadillo]; };
   lazyraster = derive2 { name="lazyraster"; version="0.5.0"; sha256="0zf9xlxyzmgxy1nl2kg7fvpfamjz04gf4yxjn3r9j7fjkik35cnp"; depends=[quadmesh raster vapour]; };
+  lazysf = derive2 { name="lazysf"; version="0.1.0"; sha256="19g0qzm0dxsa8m4dj4zmz8r674dw43pqs5gg6n3xfgm5dl9772jb"; depends=[DBI dbplyr dplyr magrittr sf tibble]; };
   lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; };
-  lazytrade = derive2 { name="lazytrade"; version="0.3.11"; sha256="153rfx7725azbaa5i68dhzpqgzyshzv4w4fqqi5faymnwk2ncf2l"; depends=[dplyr ggplot2 h2o lubridate openssl readr ReinforcementLearning stringr]; };
+  lazytrade = derive2 { name="lazytrade"; version="0.4.3"; sha256="02qmfqgzdprc6cxm21zq46p5ybwrwyndb4ysf2fj55y7wi73vzmj"; depends=[dplyr ggplot2 h2o lubridate openssl readr ReinforcementLearning stringr]; };
   lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; };
   lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
   lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; };
   lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
   lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; };
-  lcars = derive2 { name="lcars"; version="0.3.1"; sha256="14h6p4cbvx586zmaw480cy8gnjc6w7081dps9imvmf5lwcag66mb"; depends=[ggplot2 shiny trekcolors]; };
-  lcc = derive2 { name="lcc"; version="1.1.0"; sha256="1wdxzmrsnrw7x4sfm95292i1q4v6xafzak2w46lf8d6s4qh1drsj"; depends=[doRNG doSNOW foreach gdata ggplot2 gridExtra hnp nlme]; };
+  lcars = derive2 { name="lcars"; version="0.3.6"; sha256="008dw30x4la3l2lq520c55sxfr4pflx3ii4xrkafrq17pndx3hmy"; depends=[ggplot2 shiny trekcolors]; };
+  lcc = derive2 { name="lcc"; version="1.1.1"; sha256="0353k1ah0pwvvfqf9jlk0n6iw88rndm01r19l4q23ajg24n67jr4"; depends=[doRNG doSNOW foreach ggplot2 hnp nlme]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
   lchemix = derive2 { name="lchemix"; version="0.1.0"; sha256="1g2w57fi6kvsyir14hnxh0v6xwjdnbisafvjxvn1g6a4h55dg9i0"; depends=[MCMCpack mvtnorm]; };
   lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; };
@@ -10021,7 +10444,7 @@ in with self; {
   lctools = derive2 { name="lctools"; version="0.2-8"; sha256="03k6d78lzc8jxndnwh39h6fagr6ibhr9354vzvsw873912sxs8c9"; depends=[MASS pscl reshape sp weights]; };
   lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.4"; sha256="0pwr6r8nbvmppqwd9gxap6v49l7iaq5syaq11spxp5yc2h3pa2rg"; depends=[quantmod TTR xts zoo]; };
   lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; };
-  ldaPrototype = derive2 { name="ldaPrototype"; version="0.2.0"; sha256="19ls6ilirqdk4wbk8nf1jw6bd152z5ydchlp28wx5yrrjr694q9n"; depends=[batchtools checkmate colorspace data_table dendextend fs future lda parallelMap progress]; };
+  ldaPrototype = derive2 { name="ldaPrototype"; version="0.3.0"; sha256="1789wvl3c7h4as3sy1lkraqbhvnzcmcncyva7mjjh4p3vsgi1zdd"; depends=[batchtools checkmate colorspace data_table dendextend fs future lda parallelMap progress]; };
   ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; };
   ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; };
   ldatuning = derive2 { name="ldatuning"; version="1.0.2"; sha256="0367y6k5i4sccwfcm89xyc62qblrlwnm6hsa2jf346rnrfz9hkkc"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
@@ -10029,7 +10452,7 @@ in with self; {
   ldbounds = derive2 { name="ldbounds"; version="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; };
   ldhmm = derive2 { name="ldhmm"; version="0.5.1"; sha256="1jwgxwzz56n6hhpp1qks1x0jsfbrjgfsl6h5sp7498l4d2f279ij"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
   ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
-  ldsep = derive2 { name="ldsep"; version="1.0.0"; sha256="0h3gwjylmi0fx3gf7hqwjd58n9grmnv1phwqcj8dr0x6bn56bqy3"; depends=[ashr corrplot doParallel foreach lpSolve Rcpp RcppArmadillo]; };
+  ldsep = derive2 { name="ldsep"; version="1.1.0"; sha256="172iyx08kf5gq8ynbd9pkc4xyw0z2dyr8sjrpp9as0qb0y50kih1"; depends=[ashr corrplot doParallel foreach lpSolve Rcpp RcppArmadillo]; };
   ldsr = derive2 { name="ldsr"; version="0.0.2"; sha256="0wmxpglad1mk2c1gi9kxmh149r8ad0l8i2xlfs1hdjb6a4wxsklr"; depends=[data_table foreach MASS Rcpp RcppArmadillo]; };
   leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; };
   leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
@@ -10040,14 +10463,15 @@ in with self; {
   leaflet = derive2 { name="leaflet"; version="2.0.3"; sha256="053kn4a2lbhzq2c68c4q782yrbyx4a7zw7j1s6p7k2d75chk1aja"; depends=[base64enc crosstalk htmltools htmlwidgets leaflet_providers magrittr markdown png raster RColorBrewer scales sp viridis]; };
   leaflet_esri = derive2 { name="leaflet.esri"; version="1.0.0"; sha256="01bwzxh2rdhpvvazaxsji8axl765q1ix1fdxla6i61nvqkpw3dz1"; depends=[htmltools leaflet leaflet_extras]; };
   leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; };
-  leaflet_extras2 = derive2 { name="leaflet.extras2"; version="1.0.0"; sha256="1g75n6rz7zbr2jyh5qc1a3418l8jcm25d6av9yc9jf2yagbqlh28"; depends=[htmltools htmlwidgets leaflet magrittr]; };
+  leaflet_extras2 = derive2 { name="leaflet.extras2"; version="1.1.0"; sha256="138d2ajma3fkz7nsh50z4gw5zaflas39gsy7k5l120hxr7nmzgfk"; depends=[htmltools leaflet magrittr]; };
   leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.6.0"; sha256="175zxyvgjbhhp5fl8fz8nr7n9y34ldhs9pnz602x1hk7vpyf3cjc"; depends=[htmltools leaflet]; };
+  leaflet_multiopacity = derive2 { name="leaflet.multiopacity"; version="0.1.1"; sha256="0ynbqjs4gdnjsygzwlczrirhazpq2gl9grzyxvnyl4jcpb3yg7y2"; depends=[htmltools htmlwidgets]; };
   leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; };
   leaflet_providers = derive2 { name="leaflet.providers"; version="1.9.0"; sha256="0yynrwv4xd5cdh49cwvfxm4ranarah9iiry2cd3b4fiihdfcg3wy"; depends=[]; };
   leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; };
   leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; };
   leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; };
-  leafpop = derive2 { name="leafpop"; version="0.0.5"; sha256="0mv04inb7glv69baq6xwdm2rnk9mihjz0rgd4zw6qyxnf03lhh06"; depends=[base64enc brew htmltools htmlwidgets sf svglite uuid]; };
+  leafpop = derive2 { name="leafpop"; version="0.0.6"; sha256="0bvj9s3wf8v6l99qqq5g8csq6pyy1f28c1vrhw559s0w10fs771x"; depends=[base64enc brew htmltools htmlwidgets sf svglite uuid]; };
   leafsync = derive2 { name="leafsync"; version="0.1.0"; sha256="0p6pb7w5yz2wj33kdh7ixii9f6b8zv018psp6b7ifr7npgdxi3vx"; depends=[htmltools htmlwidgets leaflet]; };
   leaftime = derive2 { name="leaftime"; version="0.2.0"; sha256="10ij06rq7kmfnzfa629l2kskwj96lh87m00wi9b1aq15b5h7bxls"; depends=[htmltools htmlwidgets leaflet]; };
   leanpubr = derive2 { name="leanpubr"; version="0.3.1"; sha256="0c8pmzn25cwv0wccf30zrrqrs5amlk8iqyyva9vp9976wzwgbxrx"; depends=[httr jsonlite xml2]; };
@@ -10057,50 +10481,52 @@ in with self; {
   learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; };
   learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; };
   learnr = derive2 { name="learnr"; version="0.10.1"; sha256="08xwmms6x58y3dsfbl9c6d03145hb4ij97nqr1cc9dxxilmr6x31"; depends=[checkmate ellipsis evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs renv rmarkdown rprojroot shiny withr]; };
-  learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; };
+  learnrbook = derive2 { name="learnrbook"; version="1.0.1"; sha256="1yijkwy2v0qh1r3irx7bwyasw938lclsawdam2dkap76qavfrli9"; depends=[]; };
   learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
   leastcostpath = derive2 { name="leastcostpath"; version="1.7.4"; sha256="1m8n8pliwm2bp03fqyrhwlq4ij90hvq1hg44mi6dc9m4qz36vfls"; depends=[gdistance pbapply raster rgdal rgeos sp]; };
   ledger = derive2 { name="ledger"; version="2.0.7"; sha256="07shnvawahm9bvwz37fynkp7sd69y9gc1mjhn7x8883jz8k4mjic"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; };
   leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; };
-  lefko3 = derive2 { name="lefko3"; version="2.2.2"; sha256="1wzlz9f4admhy4ps72gc89zjrjbn5z8ld9y6y95kcx41mr258r26"; depends=[glmmTMB lme4 MASS MuMIn Rcpp RcppArmadillo RSpectra stringr]; };
+  lefko3 = derive2 { name="lefko3"; version="3.1.2"; sha256="1bfbiiwq4sjv44gr20i0anazgsf6g9sla0iif8g36xr8km9mjaf4"; depends=[glmmTMB lme4 MASS MuMIn pscl Rcpp RcppArmadillo stringr]; };
   legco = derive2 { name="legco"; version="0.1.3"; sha256="1615whdqihpzfhp5ll3x3jg4py04l52dc87kbdmgln4ygxyy5sqh"; depends=[httr jsonlite]; };
   legislatoR = derive2 { name="legislatoR"; version="1.0"; sha256="1553hpb2cmv3hw6v4c7qwgg8n18jwx101yaqnmaaiv8gfyh6j43m"; depends=[curl dplyr]; };
   legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; };
-  leiden = derive2 { name="leiden"; version="0.3.3"; sha256="1hh6bmbz6cpqwl4i94gxylgv9x92zbqdg81r8r4ymfy8c70f3df2"; depends=[igraph Matrix reticulate]; };
+  leiden = derive2 { name="leiden"; version="0.3.6"; sha256="1k1250bjgf2cb1whp2sl1r6b88156qwi2zkamw5iy2q1qhw6w2d7"; depends=[igraph Matrix reticulate]; };
+  leidenAlg = derive2 { name="leidenAlg"; version="0.1.0"; sha256="0i6vfd4sa6bb3v47zz0mj90kppkzngbf180qczka99pyfhzfy4a2"; depends=[igraph Matrix Matrix_utils Rcpp RcppArmadillo RcppEigen sccore]; };
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
   lemon = derive2 { name="lemon"; version="0.4.5"; sha256="1y3ljidhqdakxlya2npj2w0az820g8kw6gl1cfm4f0cxvzgd1ly4"; depends=[ggplot2 gridExtra gtable knitr lattice plyr rlang scales]; };
   lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; };
+  leontief = derive2 { name="leontief"; version="0.2"; sha256="1gy23047c6gci9m83yrb662d5685x1kky6m94w68swms59gdc6yp"; depends=[Rcpp RcppArmadillo]; };
   leri = derive2 { name="leri"; version="0.0.1"; sha256="1309v58xdw3p6y2wpnl64vgsds5kvfiary2a3fa041kz23jzbp3c"; depends=[ncdf4 raster]; };
   lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; };
-  lessR = derive2 { name="lessR"; version="3.9.6"; sha256="0987s8r4z62cgvc4sixnyxsr5yaf1j0s532ini77f18zxxzn7g3h"; depends=[colorspace ellipse knitr lattice latticeExtra leaps openxlsx robustbase triangle viridisLite]; };
+  lessR = derive2 { name="lessR"; version="3.9.8"; sha256="10gh0bbpyzf33vz00mzhw7zk7ha9njwif7xdasczk0lghdacwy8d"; depends=[colorspace ellipse knitr lattice latticeExtra leaps openxlsx robustbase triangle viridisLite]; };
   lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; };
   lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; };
-  letsR = derive2 { name="letsR"; version="3.2"; sha256="1ahmm290vgmdqnm7wz1fif1g31nsvqszkf921dpddv291xqmbksp"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
+  letsR = derive2 { name="letsR"; version="4.0"; sha256="07l1wgwnkqnvh47ssg62vj88vgml52n0934w00pjxdk90kk3c5zs"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
   lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; };
   lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; depends=[data_table syuzhet]; };
   lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; };
   lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; };
   lfda = derive2 { name="lfda"; version="1.1.3"; sha256="0sk409jx4chs2wzhpfw7rlg9pwpdqg32ncfl3w243ypq73jq0qv3"; depends=[plyr rARPACK]; };
-  lfe = derive2 { name="lfe"; version="2.8-5.1"; sha256="14yjgwjpz6rdj9pf345wxs2n0419gjwzl2gi87b4nvirjh5431wy"; depends=[Formula Matrix sandwich xtable]; };
-  lfl = derive2 { name="lfl"; version="2.0.1"; sha256="1pbrm8zlpz1d057q5mgcz8kf3br925zsfsxir37l6raz83679q9i"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
+  lfl = derive2 { name="lfl"; version="2.1.1"; sha256="1xark6il5986vsp24vzc6668g0hb177d5wh45gw102644jnq64y9"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
   lfmm = derive2 { name="lfmm"; version="1.0"; sha256="0n7whmqxybv02k7nc0w5g2ncs43dyq3zdcnnn27vanq9mfxvhbjc"; depends=[foreach ggplot2 knitr MASS purrr Rcpp RcppEigen readr rmarkdown RSpectra]; };
   lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; };
   lg = derive2 { name="lg"; version="0.4.1"; sha256="1srlklq6hkb4yd3lbbazswj866i3wzk2524hhj1v45yr7d5qhxv0"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; };
   lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; };
   lgcp = derive2 { name="lgcp"; version="1.6"; sha256="1bsf69l81w7182ay4lrq1miqdr4f4jv5ppcalrqhqjcwhkq1nlkb"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; };
-  lgr = derive2 { name="lgr"; version="0.3.4"; sha256="14qq2q526iv2wxdssddv0sqqaz8vj7xgw1rrqspjvqnl8l6bckab"; depends=[R6]; };
+  lgr = derive2 { name="lgr"; version="0.4.1"; sha256="196553hmni1ha9y6494f4g3ds0lwcl81v7k4r8wwap4a6acdrgd9"; depends=[R6]; };
   lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; };
   lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; };
   lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; };
-  lhs = derive2 { name="lhs"; version="1.0.2"; sha256="0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572"; depends=[Rcpp]; };
+  lhs = derive2 { name="lhs"; version="1.1.1"; sha256="1p4h03qlijs2a59wfd4rlvdlb9i87pw2zm8xsjd6yzz8vlm9yglh"; depends=[Rcpp]; };
   liayson = derive2 { name="liayson"; version="1.0.3"; sha256="10xkzy4vlszcdclrdv0d6nyzgh3ldr5rk59ml8bxx06dbh5c0h99"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; };
   libcoin = derive2 { name="libcoin"; version="1.0-6"; sha256="0njfdbz4mkyasxm80p0fb0qibvzz7kdzddn8ybj2k6y8bx0w3bs8"; depends=[mvtnorm]; };
   libgeos = derive2 { name="libgeos"; version="3.8.1-3"; sha256="159mx1dlimfajpv8r34bc6pv1lxagi4b5jk08csy7qpbgvr8hg3c"; depends=[]; };
+  libr = derive2 { name="libr"; version="1.0.1"; sha256="1nqwiifrsw242yyqwaq80zl2ykz50is2yrssyp35jd1mf39r35lm"; depends=[crayon dplyr haven openxlsx readr readxl tibble]; };
   librarian = derive2 { name="librarian"; version="1.7.0"; sha256="0n3q2ppa3p0w8ypgx9s738pmprfbqi9qg8n58xzplp809p903dj9"; depends=[BiocManager remotes]; };
   librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; };
   libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; };
   libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; };
-  lidR = derive2 { name="lidR"; version="3.0.3"; sha256="0y1dh3s71y6g4289zprvxq9b1klayak9swiwnbp1rlylk89da8bs"; depends=[BH data_table future gdalUtils geometry glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; };
+  lidR = derive2 { name="lidR"; version="3.0.4"; sha256="0d0r381kxbj9cswjpgyhh1ggzyv25fqp5qq676cggxmxqy74znki"; depends=[BH data_table future gdalUtils geometry glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; };
   lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lifecycle = derive2 { name="lifecycle"; version="0.2.0"; sha256="0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19"; depends=[glue rlang]; };
@@ -10110,6 +10536,7 @@ in with self; {
   liftr = derive2 { name="liftr"; version="0.9.2"; sha256="0azi831c4f0vcq27a3q86vj90zvwrzcy4plhj9hqkk4qz8xw113x"; depends=[knitr rmarkdown rstudioapi stringr yaml]; };
   lifx = derive2 { name="lifx"; version="0.2.0"; sha256="0p9ljd3s3lc1rkhzpp801izy9y52f0yc1dsrsxwx5gi89cnib596"; depends=[assertthat crayon curl httr jsonlite]; };
   liger = derive2 { name="liger"; version="1.1.2"; sha256="0jfjvqg5bk7hlk58c0ywq2i4dvn3jv8fnrq4nzsv2hkb77hl45vh"; depends=[matrixStats Rcpp RcppArmadillo]; };
+  lightgbm = derive2 { name="lightgbm"; version="3.1.1"; sha256="1pwsh6j9ksahh58b15j5ij56bsc6syy3z4k4a5zhy5n7829rz555"; depends=[data_table jsonlite Matrix R6]; };
   lightr = derive2 { name="lightr"; version="1.3"; sha256="11z1n88cs0knpicpxfkzmh20p49g07syfv32sizjap2cnn7l4q3a"; depends=[future_apply progressr xml2]; };
   lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; };
   likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
@@ -10117,7 +10544,8 @@ in with self; {
   likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.51"; sha256="0qxwdf6npyj926zd2pbfscgz1z01hwgm6099h882d2l1sim2j9g7"; depends=[alabama cond digest nleqslv pracma Rsolnp]; };
   likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; };
   likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; };
-  lillies = derive2 { name="lillies"; version="0.2.7"; sha256="167hlqj9ivsjxhlfv3z1c017iqbj08aig86ncrk9inpqj3zvkyxy"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; };
+  lilikoi = derive2 { name="lilikoi"; version="2.0.3"; sha256="1sk98bmwdh9a4c07b3sbmyqrgcsgnz13x6id6irv47dr298qs07a"; depends=[car caret dplyr gbm ggplot2 glmnet h2o impute infotheo limma M3C Metrics MLmetrics pathifier pathview plyr preprocessCore pROC RCy3 reshape reticulate RWeka scales stringr survival survminer]; };
+  lillies = derive2 { name="lillies"; version="0.2.8"; sha256="154xjnd64icgjjlp68h6fv8fx8z15kdp2frgdqw5cxpchh3jw6pp"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; };
   limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; };
   lime = derive2 { name="lime"; version="0.5.1"; sha256="021wz43dfc3f2k275c98hcnnx7dyyjj18dm2zf8vh7rbk9bnf0sj"; depends=[assertthat ggplot2 glmnet gower htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringi]; };
   limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
@@ -10132,16 +10560,17 @@ in with self; {
   lineartestr = derive2 { name="lineartestr"; version="1.0.0"; sha256="0bzsywk97j2mmsi7pj9267za1q2601crynh9kszwj6xjbg08nvsm"; depends=[dplyr forecast ggplot2 Matrix readr sandwich tidyr viridis]; };
   linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; };
   lineqGPR = derive2 { name="lineqGPR"; version="0.1.1"; sha256="180rvmpasdw8r3w5lw6dxg5jkj875dklvifi2msyp0vaq1nbpbwp"; depends=[broom ggplot2 MASS Matrix mvtnorm nloptr plot3D purrr quadprog tmg TruncatedNormal]; };
-  lineup = derive2 { name="lineup"; version="0.37-11"; sha256="0lk2wm8wsaaxw3j7yvmg6qif0r0s1jlwqyg73d3xjnjhxgy03zp4"; depends=[class qtl]; };
-  lingtypology = derive2 { name="lingtypology"; version="1.1.3"; sha256="15l9c51xikhkykcmbnkaahlcpmd9gzyjwvnpz6dg75sh5lgpx5lp"; depends=[leaflet leaflet_minicharts stringdist]; };
+  lineup = derive2 { name="lineup"; version="0.38-3"; sha256="15m90cg700lq1w54adkmld876fpr41nhv1y0vqwbhwwfjgfxj700"; depends=[class qtl]; };
+  lineup2 = derive2 { name="lineup2"; version="0.2-5"; sha256="0yb7nh86gzjwr44prsg50zgdh9sac2zcnf6fiksdisqsc7v21b5q"; depends=[Rcpp]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.1.4"; sha256="04pfgnwfywfwzw3xgi0xd5mi9dgjgj65i32hm5b8zjj5pamk9hcv"; depends=[leaflet leaflet_minicharts stringdist]; };
   linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; };
-  link2GI = derive2 { name="link2GI"; version="0.4.3"; sha256="1f6pp8cw2cgg669dwgbsmcbq870y5v5qjbdkrrxzfxbyk4j24fqx"; depends=[devtools R_utils raster roxygen2 sf stringr]; };
-  linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
-  linkcomm = derive2 { name="linkcomm"; version="1.0-12"; sha256="04725prwikkzqjq8say8b7f1k5z2c5qzsmsflynp1my893dlal0j"; depends=[dynamicTreeCut igraph RColorBrewer]; };
+  link2GI = derive2 { name="link2GI"; version="0.4-5"; sha256="0vmmhalxazny0j871fwbh0z21b63wang69l2wkpw3awkn3fsaqz4"; depends=[devtools R_utils raster roxygen2 sf stringr]; };
+  linkcomm = derive2 { name="linkcomm"; version="1.0-13"; sha256="1247pjx7dnlghhgm5jj1ck2hp44z1i0syfk62h8dslx19pwaznb3"; depends=[dynamicTreeCut igraph RColorBrewer]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
   linkprediction = derive2 { name="linkprediction"; version="1.0-0"; sha256="0p2abdq6ad689236w2d0khlycpjgy6j7xrlb96ngl6csgxwm07bl"; depends=[igraph intergraph]; };
   linkspotter = derive2 { name="linkspotter"; version="1.3.0"; sha256="0fwkbz84vq0v5n5xgv1n99ph7qdz08hjj46ac4q293zarg1xk328"; depends=[dplyr energy ggplot2 infotheo mclust minerva pbapply rAmCharts shiny shinybusy tidyr visNetwork]; };
   linl = derive2 { name="linl"; version="0.0.4"; sha256="1wq0wm3k12sfvg0nzdsdxb4qc79kny7qvckxplfgaj6y62vcjxxl"; depends=[knitr rmarkdown]; };
+  linne = derive2 { name="linne"; version="0.0.2"; sha256="19x13hf3skvxihlpa8wy05vlc94yv7nfs8b1pr8br76wk1xdkjvx"; depends=[cli magrittr purrr R6 rlang shiny]; };
   linpk = derive2 { name="linpk"; version="1.0"; sha256="14l3vv507z7x63ziynp07902599syah0icvzq4rxfjf48bf96l63"; depends=[mvtnorm]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
   lintools = derive2 { name="lintools"; version="0.1.3"; sha256="1wv94j0j89zq15b80x0cylfxar5ajrdrcdn62mkgjij3m8zqs7fa"; depends=[]; };
@@ -10150,24 +10579,25 @@ in with self; {
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
   liquidSVM = derive2 { name="liquidSVM"; version="1.2.4"; sha256="1fka0jbc200n0il1qbp5nb9819afi11b1ndwqpsd6bhfjgrcga8m"; depends=[]; };
   lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; };
-  lisa = derive2 { name="lisa"; version="0.1.1"; sha256="1i5fbcac24rp8s7z2v23aqy7xv0p610zj5xfb6vscsvhdlvg4w1a"; depends=[]; };
+  lisa = derive2 { name="lisa"; version="0.1.2"; sha256="05hijs66jfyr68yvmm1dn262p1k6y4q7f2zvqkfagcb483rhwi53"; depends=[tibble]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
   lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
   list = derive2 { name="list"; version="9.2"; sha256="1gn0g4qq9rr6vwnwq6525hx7iy3q3vmy3g2v3ba69v4jcdc0a0mx"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
+  listArray = derive2 { name="listArray"; version="0.1.1"; sha256="0j8hdsda7p6m1q06mi32yh3wqsdjr77kb8js42nm63dgpfy7mvv5"; depends=[]; };
   listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; };
   listarrays = derive2 { name="listarrays"; version="0.3.1"; sha256="0nfpqywq9pl9yj566y0jw0h89g0ppsc614538ns1jc3l5r2myils"; depends=[]; };
   listcomp = derive2 { name="listcomp"; version="0.3.0"; sha256="09dazc1s06f2pk696jc64lnhs007hqrjjx6z2m6rrswp8yq1p2p2"; depends=[digest rlang]; };
-  listdown = derive2 { name="listdown"; version="0.2.21"; sha256="0cv8vf4v35xkcsj3r8h6vx8y292qs3pjndhbgbb4lx78mfapcw1b"; depends=[crayon yaml]; };
+  listdown = derive2 { name="listdown"; version="0.4.1"; sha256="1i7vx71nc3vig73kxwaccdgjr91pa3sbl886qppqz4i3ns3z5vgr"; depends=[crayon yaml]; };
   listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; };
   listenv = derive2 { name="listenv"; version="0.8.0"; sha256="0ps8bk7zlhbviawrw7vw25skjq81hkk3ijyi6g74dmfqy8zsyapx"; depends=[]; };
   listviewer = derive2 { name="listviewer"; version="3.0.0"; sha256="0zirxdj58h43062f68h6nqcgmpnvdglxx3kjbs4i4k0z9wvqhx8r"; depends=[htmltools htmlwidgets shiny]; };
   liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; };
-  litteR = derive2 { name="litteR"; version="0.8.1"; sha256="1q10v7gpnpk6g35rw5sd50fj3syg0hmipv7cgmq456h48by5ffrx"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr tidyselect yaml]; };
-  littler = derive2 { name="littler"; version="0.3.11"; sha256="1n3qps9hs9a00z0gksxskbl7ii678wpgjf348gb39a6y7rp4qdk7"; depends=[]; };
+  litteR = derive2 { name="litteR"; version="0.8.2"; sha256="07ap8nw703d260n559p455lrxgrkp2j7wy03alxhxm60mni82183"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr tidyselect yaml]; };
+  littler = derive2 { name="littler"; version="0.3.12"; sha256="1vyppxfk7wi9ncv7ms1pcmwi8l1h4panqkbkmyc1q5vv47jq6fai"; depends=[]; };
   liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; };
   live = derive2 { name="live"; version="1.5.13"; sha256="1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; };
   livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; };
-  liver = derive2 { name="liver"; version="1.0"; sha256="1czya4rn4bcvdzy7jajzgg765xzskmib9cvis2llk9ca9agwg4hg"; depends=[]; };
+  liver = derive2 { name="liver"; version="1.3"; sha256="0xf5r3yknxk7xwjxc9izif0ah6j5kqvn3jghx839h3zh08ral9fg"; depends=[class]; };
   ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; };
   llama = derive2 { name="llama"; version="0.9.3"; sha256="1jfypycivih5rps7gik6wk3zqlz2rl14kdib7j513ahs4l261hbx"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
   llbayesireg = derive2 { name="llbayesireg"; version="1.0.0"; sha256="0jhkmrjkqfm1flwsbpv6060j6g7cj4ngm0drvrlvsiqpni0k96mh"; depends=[coda ggplot2 llogistic MASS MCMCpack Rcpp rstan StanHeaders]; };
@@ -10181,22 +10611,22 @@ in with self; {
   lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; };
   lmboot = derive2 { name="lmboot"; version="0.0.1"; sha256="1v7a3vlv0187mpg3y3pj7f3pbk1v5n6amw732chy10vdw5nmfkwd"; depends=[evd]; };
   lmds = derive2 { name="lmds"; version="0.1.0"; sha256="130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65"; depends=[assertthat dynutils irlba Matrix]; };
-  lme4 = derive2 { name="lme4"; version="1.1-23"; sha256="0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen statmod]; };
-  lmeInfo = derive2 { name="lmeInfo"; version="0.1.1"; sha256="0d6r7vgsm603xg3bf8jwdbwk6kypkzyzlgzwkpif92m0nd4378bi"; depends=[nlme]; };
+  lme4 = derive2 { name="lme4"; version="1.1-26"; sha256="0ls2krph4pfjn45vf9fn3ln3x98s85wxrkvm5pnxyx55n1pnsjrn"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen statmod]; };
+  lmeInfo = derive2 { name="lmeInfo"; version="0.1.2"; sha256="0f9q2wqp0qxmrnh3whx4dcb4wd7lj275jx7yb0f5wcv0n0sksfpp"; depends=[nlme]; };
   lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
   lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
   lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
   lmeVarComp = derive2 { name="lmeVarComp"; version="1.1"; sha256="0m6syydy89c52hhi0w503l5vkgya2d5ps70z5wmdd39nm4jna68w"; depends=[]; };
   lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
   lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; };
-  lmerTest = derive2 { name="lmerTest"; version="3.1-2"; sha256="1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q"; depends=[ggplot2 lme4 MASS numDeriv]; };
+  lmerTest = derive2 { name="lmerTest"; version="3.1-3"; sha256="1zd8gqjkazhxgpnnr484xwsq30p62fq8592nzyc171zjyplpbaim"; depends=[ggplot2 lme4 MASS numDeriv]; };
   lmeresampler = derive2 { name="lmeresampler"; version="0.1.1"; sha256="13i0crk6agw5pcj3znvxj60jfsmncnir7ahwdczgm7kh08hk0f6l"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; };
   lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
   lmfor = derive2 { name="lmfor"; version="1.5"; sha256="1r301ajcp9ag23n0nw1rgwg8ss5cvinwqargbdg0jpqbhdrgaq7y"; depends=[magic nlme spatstat]; };
+  lmkCHK = derive2 { name="lmkCHK"; version="1.0.0"; sha256="0ipz8xvwrw285cdwjpqd1ax7hq180l5npdfarr2qc394jb2rgb1w"; depends=[geomorph Morpho rgl shiny]; };
   lmm = derive2 { name="lmm"; version="1.3"; sha256="13b5rvdbzljir1fn4zxv2lshbga64vwzn6884izif9v5dkd5b29j"; depends=[]; };
   lmmot = derive2 { name="lmmot"; version="0.1.4"; sha256="1a8msh9yvvd7cv1zxlxdv8arlfvxqghxzcxls23v6ifl5jf4d1p3"; depends=[MASS maxLik]; };
   lmmpar = derive2 { name="lmmpar"; version="0.1.0"; sha256="1l3zjmlfjfn2wv4yayqzv6qrwaxk2sgx3hjx371b5fs54zspdj20"; depends=[bigmemory doParallel MASS matrixcalc mnormt plyr]; };
-  lmms = derive2 { name="lmms"; version="1.3.3"; sha256="1gralhk9plmpmdya7cfzgzwzr8ab47pz4f76kvlp03sp5gcy4063"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; };
   lmodel2 = derive2 { name="lmodel2"; version="1.7-3"; sha256="1fiin2nkffbihz1s8ixmw9lgf8mn3j9krr8iiflizk10mdv54hnb"; depends=[]; };
   lmom = derive2 { name="lmom"; version="2.8"; sha256="1lnj41gynaar5isyijg5nbll64qdxa12dnqvz7lxhaclqcjskqna"; depends=[]; };
   lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; };
@@ -10204,20 +10634,22 @@ in with self; {
   lmomco = derive2 { name="lmomco"; version="2.3.6"; sha256="18qpkx601gzy33d9kfrpf6mxxb9z6rkz030cx3drb4w5n6langjb"; depends=[goftest Lmoments MASS]; };
   lmreg = derive2 { name="lmreg"; version="1.2"; sha256="02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18"; depends=[MASS]; };
   lmridge = derive2 { name="lmridge"; version="1.2"; sha256="091rznzh77bmsv7sw9xmsq6s9pnljyq7qyl74kgcxss718134jr3"; depends=[]; };
-  lmtest = derive2 { name="lmtest"; version="0.9-37"; sha256="02nasm0j2vwkhz11dxqixs23msy1s3yj0jps6949fmgh9gwjkjfx"; depends=[zoo]; };
+  lmtest = derive2 { name="lmtest"; version="0.9-38"; sha256="0sr19bmw2cpagfvwg772m79wvl1i2hww1xfr69bzr3rr8pm2r8ij"; depends=[zoo]; };
   lmtp = derive2 { name="lmtp"; version="0.0.5"; sha256="1bw6sr9hg770w3v26in4hhayi1ghqpxk7za005h65dy6krwkrfhn"; depends=[cli future generics nnls origami progressr R6 slider]; };
   lmvar = derive2 { name="lmvar"; version="1.5.2"; sha256="0wrny8yzk5y4mzpri6xv5wibbnbaxm0195lcbk5jrl5l5gs99bn6"; depends=[Matrix matrixcalc maxLik]; };
-  lmviz = derive2 { name="lmviz"; version="0.1.2"; sha256="06pl0gzsbpk6l7l5np2c2rv37d2b3mr7qhxd7z4yiqiaffdrmrpz"; depends=[lmtest mgcv shiny shinyjs]; };
+  lmviz = derive2 { name="lmviz"; version="0.2.0"; sha256="0sl2k02m5bxkb4jg8y666ln0xxhr4dhsfz9hlp55p9smlhycl5s2"; depends=[car lmtest MASS mgcv rgl scatterplot3d shiny shinyjs]; };
   lncDIFF = derive2 { name="lncDIFF"; version="1.0.0"; sha256="012dwrcp0pny59hvzj7mnyyc3nijcjgxc0dyx7ab2fknp9bhs5w8"; depends=[]; };
   loa = derive2 { name="loa"; version="0.2.45.4"; sha256="0dcpadv453885a2s8l064zn1xswi2v819154j822jr22kd7bj57v"; depends=[lattice MASS mgcv plyr png RColorBrewer rgdal RgoogleMaps sp]; };
   loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; };
   lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; };
-  locStra = derive2 { name="locStra"; version="1.4"; sha256="0a9470cf78w0js7i93zgrih0vcb0kxf2vjj0a0p87zpr0h0xd9p6"; depends=[Matrix Rcpp RcppEigen Rdpack]; };
+  locStra = derive2 { name="locStra"; version="1.6"; sha256="1jwxhfghis2k9pckqdnaffm10y9nv80ns7jpbfmhgmcava16ilsf"; depends=[Matrix Rcpp RcppEigen Rdpack RSpectra]; };
+  localFDA = derive2 { name="localFDA"; version="1.0.0"; sha256="099hqnd0q4ylg03qi7icc6a9w1x7p76vlv5wxk8f53l7y9pp27b3"; depends=[]; };
   localICE = derive2 { name="localICE"; version="0.1.1"; sha256="1pyq6kdahsy9qa0jzmring48r0i9h4rkp8lxpf9afksgm1qn0c5z"; depends=[checkmate ggplot2]; };
   localIV = derive2 { name="localIV"; version="0.3.1"; sha256="1z3q5hk6qfc1pzqdrxwm8y3am27648lfz66lm84bf8abifw4kk60"; depends=[KernSmooth mgcv rlang sampleSelection]; };
   localModel = derive2 { name="localModel"; version="0.3.12"; sha256="1yg61zia8gqgzbg33k6q43ni04cj6y9l3k8vdcw8j1qzasnhz0b2"; depends=[ggplot2 glmnet ingredients partykit]; };
   localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; };
   localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
+  locationgamer = derive2 { name="locationgamer"; version="0.1.0"; sha256="0y99m003s177x57m4ynxd8jd2xzl5zb4bj7jnbc04h22ffdl6m6f"; depends=[]; };
   locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; };
   locfit = derive2 { name="locfit"; version="1.5-9.4"; sha256="1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr"; depends=[lattice]; };
   locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; };
@@ -10241,16 +10673,17 @@ in with self; {
   logging = derive2 { name="logging"; version="0.10-108"; sha256="13gd40ygx586vs6xcp6clg69a92aj8zxlk1rn3xzkx8klfjimjc5"; depends=[]; };
   loggit = derive2 { name="loggit"; version="2.1.0"; sha256="1ikzrzqsmn8436dimr88mdmvpqmq5wxfjdiy4hj5939wjnx4jnnm"; depends=[]; };
   logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; };
+  logib = derive2 { name="logib"; version="0.1.0"; sha256="0n15rsqlnqnwx9wc5wr78c6qpzwwnp8xcdlyffjqv56gjdqa1420"; depends=[lubridate readxl]; };
   logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; };
-  logistf = derive2 { name="logistf"; version="1.23"; sha256="0f1qn7q3h0qg2qdiz69ab03qvl4xhizqg304vjak72390nj25nss"; depends=[mgcv mice]; };
+  logistf = derive2 { name="logistf"; version="1.24"; sha256="0syrg4v1cik0vn2h7452n84nbpdbhs5h0g5k9jaqkdr1zq8x6qb5"; depends=[formula_tools mgcv mice]; };
   logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; };
   logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; };
   logisticRR = derive2 { name="logisticRR"; version="0.3.0"; sha256="0i9x7rynxcybdnjqbjsny8jsl96mivzdazdgmcg72qrv8qfwpszl"; depends=[nnet]; };
   logitnorm = derive2 { name="logitnorm"; version="0.8.37"; sha256="1a9plxsxy29j9xpvwsznbbj150h9daay5zfzlmkh5y0f7f15w3a9"; depends=[]; };
   loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
-  logmult = derive2 { name="logmult"; version="0.7.1"; sha256="0y9z5l93hm8p3r1rd6g11miqg1a02b9hy5mgcxv2q0hm1pg2vh0q"; depends=[gnm qvcalc]; };
+  logmult = derive2 { name="logmult"; version="0.7.3"; sha256="10dmvvwlaw8dn6h0343d8apn7rlc2b8nys3f38x9wlvd9xhhlwxm"; depends=[gnm qvcalc]; };
   lognorm = derive2 { name="lognorm"; version="0.1.6"; sha256="05a6djz06jblnx51x2r5gwb57l4wq6giz6kknsslzsl64xj275z1"; depends=[Matrix]; };
-  logr = derive2 { name="logr"; version="1.1.0"; sha256="1cbh73yfmdb2mg3y111ranb9p9ac30xlril3fspj2i2nv3svjivm"; depends=[]; };
+  logr = derive2 { name="logr"; version="1.1.1"; sha256="0a0hpcs26byj3fgssk4v06na066jqfrdgr7zwamxj3z243106y8h"; depends=[]; };
   logspline = derive2 { name="logspline"; version="2.1.16"; sha256="12hkdi77vkic05p2vhap025xdcg1n53ywm239v18713pihdlj63l"; depends=[]; };
   lokern = derive2 { name="lokern"; version="1.1-8.1"; sha256="1z9bg10ppj0gpsazdh2mcbbd374075bm30p9dmr71mb87vxrk2r3"; depends=[sfsmisc]; };
   lolR = derive2 { name="lolR"; version="2.1"; sha256="0lrmn9lzyyfr1y0i7qp6xfpdxyisbkajwg0jkrqkiw687psnh2rc"; depends=[abind ggplot2 irlba MASS pls robust robustbase]; };
@@ -10266,18 +10699,18 @@ in with self; {
   longmemo = derive2 { name="longmemo"; version="1.1-2"; sha256="01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r"; depends=[]; };
   longpower = derive2 { name="longpower"; version="1.0-21"; sha256="0095jml46lchyp17gsqpjabq80xjddlvd4ir8y2jsg8sgd3pc8vs"; depends=[lme4 nlme]; };
   longurl = derive2 { name="longurl"; version="0.3.3"; sha256="16r6gzyfy7aq8sqdzvc6wqinfp0yj46bsz4yg8n3jf0jdyx0zrc8"; depends=[httr]; };
-  loo = derive2 { name="loo"; version="2.3.1"; sha256="12z0k8lhz0rxygs5lc7076nw6qhk0pda8nxf65hkinfrf4dy53fr"; depends=[checkmate matrixStats]; };
+  loo = derive2 { name="loo"; version="2.4.1"; sha256="0l2v8zpashqbnck3qx5lp1gqjcfphzky8mxyw5gfk9wk99mzn8dw"; depends=[checkmate matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
   loon = derive2 { name="loon"; version="1.3.1"; sha256="0l9cz4cw8i329rajz9vlm54ajxwx899h9jp9yqjr92ijh2x3il6d"; depends=[gridExtra]; };
-  loon_data = derive2 { name="loon.data"; version="0.1.0"; sha256="197lmwmlkmmhyn16himc3cdpiqznqr2sg5vz1a00ipypxnhax1pl"; depends=[]; };
+  loon_data = derive2 { name="loon.data"; version="0.1.1"; sha256="0gcplk8qx6qm36cnxvvka1rfsjd38bhlnjvx405h0z9ivwlidsc5"; depends=[]; };
   loon_ggplot = derive2 { name="loon.ggplot"; version="1.0.1"; sha256="161i99nm5csfq7wvr941a4dr544b1qwma0zlnrlcsbsnixyk3a0w"; depends=[dplyr GGally ggplot2 gridExtra loon magrittr rlang stringr]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
-  loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
   loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; };
   lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; };
   lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
-  lorentz = derive2 { name="lorentz"; version="1.0-2"; sha256="0napn1j6gwilskjnv2hjrxzrbcbh7cvfj578h0la9bpkm1xhi7di"; depends=[emulator magrittr tensor]; };
-  lori = derive2 { name="lori"; version="2.2.0"; sha256="1jsnfrkn6zn20gs8qhw5znfzaqp9j274yfqajcgfvy916j50acac"; depends=[data_table rARPACK svd]; };
+  lorentz = derive2 { name="lorentz"; version="1.0-5"; sha256="1py2s4x6vnlyyf5fnwbhws00dmf5qyzmx8wza337w3nzxkr6ns6b"; depends=[emulator magic magrittr tensor]; };
+  lorenz = derive2 { name="lorenz"; version="0.1.0"; sha256="1zclxjr1ya4rc48hm8a1s6ayr4yvjydgwwsi4fwg3qqf4mspa2dl"; depends=[dineq magrittr]; };
+  lori = derive2 { name="lori"; version="2.2.2"; sha256="1153ilp1i849rwbbms4vfc6c1mxgpav04zfqm2sdj7s63nvknx6r"; depends=[data_table rARPACK svd]; };
   lotri = derive2 { name="lotri"; version="0.2.2"; sha256="069by47cw38pwa70fjy7p1pi1pany04p1idjkifdyblmqqdhw0rh"; depends=[]; };
   lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; };
   lowpassFilter = derive2 { name="lowpassFilter"; version="1.0-0"; sha256="1f05z18nn3184rksmsarfz79bxn3gj760f1z9h5h3agqc180krm3"; depends=[Rcpp]; };
@@ -10285,7 +10718,7 @@ in with self; {
   lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.7"; sha256="1fsmipb97gglihrf424mz063fn67bf55jjahnbh53svkmm2qxg4y"; depends=[]; };
   lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; };
   lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; };
-  lpdensity = derive2 { name="lpdensity"; version="2.0"; sha256="0zqrpps909x00sm9bhg1xh4sqy4lamn5qmad37v6zn0hw1hjvcpi"; depends=[ggplot2 MASS]; };
+  lpdensity = derive2 { name="lpdensity"; version="2.1"; sha256="1i3b2c64kfn3k0cflygfnahwr31g0095s5x5zyw8afj7pnmnl94f"; depends=[ggplot2 MASS]; };
   lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
   lpirfs = derive2 { name="lpirfs"; version="0.1.9"; sha256="102r6avaliw1a8cj8zjn74i40gqfbxwjizplqlp2y9ik5q32g2yg"; depends=[doParallel dplyr foreach ggplot2 ggpubr gridExtra lmtest plm Rcpp RcppArmadillo sandwich]; };
   lplyr = derive2 { name="lplyr"; version="0.1.12"; sha256="1wcab8wwdzpgb61q83gfn2d34vsrd3qa4xyb9sqna6krss1ii1in"; depends=[bazar dplyr lazyeval magrittr]; };
@@ -10293,16 +10726,17 @@ in with self; {
   lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
   lpridge = derive2 { name="lpridge"; version="1.0-8"; sha256="0jk4l95z9rcdqkc8lpp4sf1mg2dqj67rhqw1iafrxy5lx4jfaqqx"; depends=[]; };
   lqmm = derive2 { name="lqmm"; version="1.5.5"; sha256="15kyfpbvdgyxl6gjqinx79zq03axg36qgaqfc6zq4blyjlhj6i3c"; depends=[nlme SparseGrid]; };
-  lqr = derive2 { name="lqr"; version="2.11"; sha256="1h82031cq4h4syjx33zk2a2fixqa2bmrcnmh28knhm8agvb9yyxv"; depends=[numDeriv spatstat]; };
+  lqr = derive2 { name="lqr"; version="3.31"; sha256="0c7ah2sacgyinzpsffng47zfg27izgjcmvdw4qvbllxgk5kb3jfm"; depends=[MomTrunc numDeriv quantreg spatstat]; };
   lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; };
   lrgs = derive2 { name="lrgs"; version="0.5.4"; sha256="0mf6wqlv21z68w81hvpmhgngvdsklf3x2678d9c9lxfmqmpv4a7y"; depends=[mvtnorm]; };
   lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; };
   lsa = derive2 { name="lsa"; version="0.73.2"; sha256="1a33irqa6qvbc02z12rgbgv8kxq2gmahy7j5bg8b23lvvaxif06b"; depends=[SnowballC]; };
-  lsasim = derive2 { name="lsasim"; version="2.0.1"; sha256="0nbffcgn8wkz07qs8ai3xwx11wfq6qcf95hjqmy4kdkf2k603mm5"; depends=[mvtnorm]; };
+  lsasim = derive2 { name="lsasim"; version="2.0.2"; sha256="12v5g7nhip46647al5l1k968yxp474988ja90v0s3p0rrh02l1rq"; depends=[mvtnorm]; };
   lsbclust = derive2 { name="lsbclust"; version="1.1"; sha256="1pbai58pfvhfcrd0nj13d54vrn9wrx2xapqhgqa1pkrjwbk5amj7"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; };
   lsbs = derive2 { name="lsbs"; version="0.1"; sha256="14aq80zg89lq7hffv1v1m4n7hbzqzxkazcga4y2fq40ij3v7kv6n"; depends=[ks Matrix numDeriv]; };
   lsdbc = derive2 { name="lsdbc"; version="0.1.0"; sha256="1dk07zlvwwfhlll21ql264gx94v3jvgidy3yvxidwmhnyc1vx80x"; depends=[]; };
   lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
+  lsei = derive2 { name="lsei"; version="1.3-0"; sha256="1dka0rigfw4vj809qma2dkiwjb3nw5635ynnba5cm299cn7hb2b2"; depends=[]; };
   lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
   lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; };
   lslx = derive2 { name="lslx"; version="0.6.10"; sha256="189gpp1ikcp5ld4avipwckdz997v1cx2zas5a8b54nv246kb5hmd"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
@@ -10324,7 +10758,8 @@ in with self; {
   ltsk = derive2 { name="ltsk"; version="1.0.8"; sha256="1ykgz5cas924kmq9ak2j8vhr7gg9s458qarqkmyg9wdfj1srqi7p"; depends=[fields gstat sp]; };
   ltsspca = derive2 { name="ltsspca"; version="0.1.0"; sha256="0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs"; depends=[pracma Rcpp RcppArmadillo]; };
   ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; };
-  lubridate = derive2 { name="lubridate"; version="1.7.9"; sha256="0wnjzvfkrgp2hkr8g5r5vcgcxmsq8bhdmkzkk0m93wr3fgh5xyfb"; depends=[generics Rcpp]; };
+  lubridate = derive2 { name="lubridate"; version="1.7.9.2"; sha256="0yfvlgksasmia7rsp83lsipjpgvlly5qkldcfxj68lfaz9l2sspf"; depends=[generics Rcpp]; };
+  lucas = derive2 { name="lucas"; version="1.0"; sha256="1ws35f2pq2y7nnik40nj4qpz1d499gfc5isr1409pwy6r5knb78q"; depends=[DBI plyr rpostgis RPostgreSQL]; };
   lucid = derive2 { name="lucid"; version="1.7"; sha256="0hrb8qlm8g4h1ziwxq7m53pf7g8fxhcb2xryavm6rniqpcx8yb7g"; depends=[nlme]; };
   ludic = derive2 { name="ludic"; version="0.1.8"; sha256="1yvv3h7arm8hp89j9nr5vdl8ahxcpggi2qq431l7xbw9jka41qdp"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
   lue = derive2 { name="lue"; version="0.2.1"; sha256="0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq"; depends=[ncdf4 raster]; };
@@ -10355,18 +10790,19 @@ in with self; {
   mMPA = derive2 { name="mMPA"; version="1.2.0"; sha256="0g4zjknz52fpk7f436j95aw93aa8q2jwcrb1pqkm294kr276nnd9"; depends=[]; };
   mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
   mRMRe = derive2 { name="mRMRe"; version="2.1.0"; sha256="1m41859sa0nd4hdnsq3ir337834cpmgg564f6ph57dmmwz0wa8zy"; depends=[igraph survival]; };
-  mRpostman = derive2 { name="mRpostman"; version="0.3.1"; sha256="0jghbqszf56xp3kvx9rcf11bj0j46hh3xgzvaihbpb67lcj8mvyw"; depends=[assertthat base64enc curl magrittr stringr]; };
+  mRpostman = derive2 { name="mRpostman"; version="1.0.0"; sha256="1zcfkzsqfhlxmqyvz3n4lssvi2pg3q7x84y6khqlgwncg3bhp56x"; depends=[assertthat base64enc curl magrittr R6 rvest stringi stringr xml2]; };
   mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; };
   mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; };
-  mStats = derive2 { name="mStats"; version="3.2.2"; sha256="0bvv2133813qfqbqx45x7g3h82jkz8b322ldjj89x2wxc7alwmhs"; depends=[]; };
-  maGUI = derive2 { name="maGUI"; version="2.4"; sha256="0wzg6fsig51q0mh5cd3kkshz45sqn8qcw0zf3pnq58x9ml9hc59l"; depends=[affy amap annotate beadarray Biobase BiocManager Biostrings cairoDevice Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets2 gWidgets2RGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; };
-  maSAE = derive2 { name="maSAE"; version="2.0.1"; sha256="0c7vs0pc4yva726g2vly07r1dnf4ahdkdkq6y6ni0d1hgz296w87"; depends=[]; };
+  mStats = derive2 { name="mStats"; version="3.4.0"; sha256="196fjnld26dmirga4mghlvsrj4fgnw08wdg77masxm15kpvm1x1d"; depends=[]; };
+  maGUI = derive2 { name="maGUI"; version="3.0"; sha256="1ak2sa6y766v5zh54bf7j9hklmkia40nsdchyw834ybb9ijjyjsm"; depends=[Biobase gWidgets2 gWidgets2RGtk2 impute limma Rgraphviz RGtk2 ssize]; };
+  maSAE = derive2 { name="maSAE"; version="2.0.2"; sha256="0vdbcifg0ilhrayamf7khdfmxzpns8rx5a3i8dsa2iwhsn7kwg5m"; depends=[]; };
   mable = derive2 { name="mable"; version="2.1.1"; sha256="14bjyij9m86bha1g79aay6x127aq6pqw3hgdklf943inggqb3ava"; depends=[aftgee icenReg survival]; };
   maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; };
   macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; };
   machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; };
   machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; };
   macleish = derive2 { name="macleish"; version="0.3.6"; sha256="0n33di2f42b2gn8qhs49j8f99l8qgxzb9lqnv50hc9zxgli5ds1v"; depends=[dplyr etl lubridate readr sf]; };
+  maczic = derive2 { name="maczic"; version="0.1.0"; sha256="1wa63j718jd4k11x5fhgbnn9f2wayvpvg5670r8911qmciy5n5lw"; depends=[BB emplik MASS mathjaxr mediation pscl sandwich survival]; };
   mada = derive2 { name="mada"; version="0.5.10"; sha256="1hllv371dm307nkpld0aszjyxfgnajr7gb9zwh40pyzw4q4a2rqb"; depends=[ellipse mvmeta mvtnorm]; };
   maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; };
   maditr = derive2 { name="maditr"; version="0.7.4"; sha256="1b7vvg03xfcmizahlnjbxk67xmmgqi96bvp16d135jqgfijmg35f"; depends=[data_table magrittr]; };
@@ -10375,16 +10811,15 @@ in with self; {
   madrat = derive2 { name="madrat"; version="1.64.5"; sha256="1gccfpzbm5cq9q288k86mq0madh8x9nhw06hrrcfjj5waqhi30lj"; depends=[assertthat digest magclass rlang spam stringr]; };
   mads = derive2 { name="mads"; version="0.1.6"; sha256="0nz1fg3gyj72k6dpkjnwqjvps0inv1qgk5vlc8ycj3k720qcsd81"; depends=[mrds]; };
   madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; };
-  mafs = derive2 { name="mafs"; version="0.0.3"; sha256="1apacrk8y5b5ids62vd1kn2k28bya9pydxxmdw2dhjyzkgrakdhn"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; };
-  magclass = derive2 { name="magclass"; version="5.7.3"; sha256="072hcp9m80c1r2vdhk6xp9gpbmiljpslalzh1i9hh7h7hgvp0bj7"; depends=[abind maptools reshape2 sp]; };
+  magclass = derive2 { name="magclass"; version="5.15.6"; sha256="020m4782f0an10d16qqzv1wmh4gz6cnfhcs7k0qlvflhbij25jw5"; depends=[abind data_table forcats maptools sp]; };
   magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; };
   magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; };
-  magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; };
+  magicaxis = derive2 { name="magicaxis"; version="2.2.1"; sha256="1ba8psg3ja8b69s1afywsjz5sfljryhk5vvq1n4dzm1gsz6c772l"; depends=[celestial mapproj MASS plotrix RANN RColorBrewer sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="2.4.0"; sha256="1y1p2blkg0h6061ay7mdwssxbswgrc25raffp6d8d9cqhdmsa72s"; depends=[curl magrittr Rcpp]; };
+  magick = derive2 { name="magick"; version="2.5.2"; sha256="0myvryya7b4bbw0hs4jqflrbdffmg78kz28gbybw3yc7zwc7sqxx"; depends=[curl magrittr Rcpp]; };
   magickGUI = derive2 { name="magickGUI"; version="1.2.0"; sha256="0mwfdh7jgi2apcdvrp7mmfr85i8qrx7n9dqymz09x0pl120kfy11"; depends=[magick]; };
-  magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
-  magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
+  magree = derive2 { name="magree"; version="1.1"; sha256="0q0v1mx4k1hry0l21611z9jx967l89xpjddvw2v1v9c3kl11kfi6"; depends=[]; };
+  magrittr = derive2 { name="magrittr"; version="2.0.1"; sha256="0pxd99fvg406whqsk9wh756rayrwh84xn3h44zmlpcy23kanbhkm"; depends=[]; };
   maic = derive2 { name="maic"; version="0.1.2"; sha256="0cvb3s67skzkqkh1hm007wvzgx9zg27bwwzw39sq4z0kyafjvg28"; depends=[Hmisc matrixStats weights]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
   mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; };
@@ -10393,7 +10828,7 @@ in with self; {
   makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; };
   makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
   makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; };
-  maketools = derive2 { name="maketools"; version="1.0.0"; sha256="1yrqmn42hachq1zbagyqbhxn88fbnq5iix23pliinp0i50yrjgj5"; depends=[sys]; };
+  maketools = derive2 { name="maketools"; version="1.2.0"; sha256="1i2s48s0qfk9nwkkbx5hr0q7b0c8xziyrsg1klianmk9jqfngg36"; depends=[sys]; };
   malan = derive2 { name="malan"; version="1.0.2"; sha256="0qwf0r2gwpb93gzvyp8vaw7j6rhghr6nbrfp8xw876n5j5b9jhj3"; depends=[dplyr igraph magrittr Rcpp RcppArmadillo RcppProgress tibble tidygraph]; };
   malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
   malariaAtlas = derive2 { name="malariaAtlas"; version="1.0.1"; sha256="0k0406pn65ars4d6zlirfdd7z3rl2z82vsx5p97gmxnjjp6gjdpa"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; };
@@ -10405,33 +10840,39 @@ in with self; {
   mangoTraining = derive2 { name="mangoTraining"; version="1.1"; sha256="128ysvyqkddl035v3w2zm98y1ykly3pwjpyas7vhqi953by98hyk"; depends=[tibble]; };
   manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; };
   manhplot = derive2 { name="manhplot"; version="1.1"; sha256="17yw10gpfp6bqmilb09v61jd2amz6cv1z38si4nqnhbvmac065qd"; depends=[ggplot2 ggrepel gridExtra reshape2]; };
-  manifestoR = derive2 { name="manifestoR"; version="1.4.0"; sha256="1rnqm9s91q6kff951402zxl3cmnl8j19ybg9vmcmcm7bjbv5w2l0"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; };
+  manifestoR = derive2 { name="manifestoR"; version="1.5.0"; sha256="0b4x4ampzmxcmlcyvl683rwynzwjg1cyx5zpamgy8027fh376zcp"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych purrr readr tibble tidyselect tm zoo]; };
   manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
   manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.1"; sha256="1vi71sjh7z1a880wffk8qqw7iysvk42q78giqxmm2sqz2a912qlx"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; };
   manymodelr = derive2 { name="manymodelr"; version="0.3.2"; sha256="1z1ds6h7g3vq8jg1vlv4n7gkpy7bka0b2mzmr46nzjr71cffr8dv"; depends=[caret dplyr e1071 ggplot2 lme4 Metrics]; };
-  maotai = derive2 { name="maotai"; version="0.1.6"; sha256="1rw2qx6p7wawwhznqrq195v76w381qg33rfhsm1wc5sazg8bzvly"; depends=[cluster labdsv Matrix nabor Rcpp RcppArmadillo RcppDist Rdpack RSpectra Rtsne shapes]; };
+  maotai = derive2 { name="maotai"; version="0.1.8"; sha256="03p5y6k4dgbb7kqhrrdi0k1pgxrk27jinrdbchszb7zd8z9v4qkl"; depends=[cluster dbscan fastcluster labdsv Matrix nabor Rcpp RcppArmadillo RcppDist Rdpack reticulate RSpectra Rtsne shapes]; };
   mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; };
+  mapSpain = derive2 { name="mapSpain"; version="0.1.1"; sha256="1dcf3nvxc0msczcgv8kvxnvzzifb0xh5a6057qmwq7q5zwx6gmad"; depends=[countrycode giscoR leaflet png raster sf slippymath]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
+  mapboxapi = derive2 { name="mapboxapi"; version="0.2"; sha256="0rqpynin27vvwyjjv0c22mhrpsq4cgkkvhfhf24aqbkzfay92905"; depends=[aws_s3 curl dplyr geojsonsf httr jsonlite leaflet magick protolite purrr rlang sf slippymath stringi tidyr]; };
+  mapboxer = derive2 { name="mapboxer"; version="0.4.0"; sha256="0f873js87dgk8nqnhpxh88svvsbnk81vkm7gycb62mkr4xqsgqs7"; depends=[geojsonsf htmltools htmlwidgets magrittr purrr yaml]; };
   mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; };
+  mapchina = derive2 { name="mapchina"; version="0.1.0"; sha256="0f6ayq4izqxcj0hi2vfg0pc239hxgg7abb5476v5mfjjyi156mni"; depends=[sf]; };
   mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; };
-  mapdeck = derive2 { name="mapdeck"; version="0.3.3"; sha256="0mkrqsc8jhand6d70gz9y17j43cs2dikdl2x2rv2sla353yyh8a8"; depends=[BH colourvalues geojsonsf googlePolylines htmlwidgets jsonify magrittr rapidjsonr Rcpp sfheaders shiny spatialwidget]; };
+  mapdeck = derive2 { name="mapdeck"; version="0.3.4"; sha256="0agbf6bs3z7gwx1dj9jqlq6cllq5b65x89lkplm5mwhr20lzwvhr"; depends=[BH colourvalues geojsonsf geometries googlePolylines htmlwidgets jsonify magrittr rapidjsonr Rcpp sfheaders shiny spatialwidget]; };
   mapedit = derive2 { name="mapedit"; version="0.6.0"; sha256="1ix0sjsqb6646xyi73am9ic97plw9y9p4pl8mrkpzvqzm0pxdhxx"; depends=[dplyr htmltools htmlwidgets jsonlite leafem leaflet leaflet_extras leafpm mapview miniUI raster scales sf shiny sp]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
   mapi = derive2 { name="mapi"; version="1.0.1"; sha256="0qfwxrd0ya5amw7f96pfxf3f8m97s7vhaz62clqn083mw8ddaz2l"; depends=[data_table pbapply Rcpp sf]; };
   mapmisc = derive2 { name="mapmisc"; version="1.7.9"; sha256="0dq360jdhbaq3i0vylvxcgrvw9pmp2k5as72lahyvl7v7bv4079d"; depends=[raster sp]; };
   mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; };
+  mappoly = derive2 { name="mappoly"; version="0.2.1"; sha256="168g79qb1f26yvnnfb931pvk1m919rq371aksdby9nrai6fbi91d"; depends=[cli crayon dendextend dplyr fields ggplot2 ggpubr ggsci magrittr plotly princurve Rcpp RCurl reshape2 rstudioapi scatterplot3d smacof vcfR zoo]; };
   mapproj = derive2 { name="mapproj"; version="1.2.7"; sha256="0nscsfq8md6ri9258xz57c3dj81wdl6kdwf4a9qcrwwbn20i427h"; depends=[maps]; };
-  mapr = derive2 { name="mapr"; version="0.5.0"; sha256="1dxvnkb4a2i5afqjjc94xdzc18znhdrgsj9a4wjsggrzwvy94215"; depends=[data_table ggplot2 gistr jsonlite leaflet maps RColorBrewer sp spocc]; };
+  mapr = derive2 { name="mapr"; version="0.5.2"; sha256="0qc1zqa2yqgy777wbm6lj37vzaaxaz0gdimr62wv9fyddkbkshk4"; depends=[data_table ggplot2 gistr jsonlite leaflet maps RColorBrewer sp spocc]; };
   maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; };
   mapsFinland = derive2 { name="mapsFinland"; version="0.1.1"; sha256="0kx9r28lvc6bbl478i9gyy58kbp5hi7akysyld87fxk5x0601j19"; depends=[]; };
-  mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.0"; sha256="0lpmizhaan7zp201wjaq544wadizwpswch7sn6m3sjwn8rswg6av"; depends=[gstat raster rgdal rgeos sp]; };
-  mapsapi = derive2 { name="mapsapi"; version="0.4.6"; sha256="0s66ws50jp5fgl3c0lgilnzqm4chyn73wm7c29873bxr2p40gfr9"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; };
-  maptools = derive2 { name="maptools"; version="1.0-1"; sha256="0fs1y3cbymcq4f76wd27h5a7ihdmxii3ca8x29x32xgxhmasni4l"; depends=[foreign lattice sp]; };
+  mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.1"; sha256="03x5mza9y5kdqshma0k7bynmd3fffayy1j243m5bhw7ln85ws73x"; depends=[gstat raster rgdal rgeos sp]; };
+  mapsapi = derive2 { name="mapsapi"; version="0.4.8"; sha256="13v2hgngbxs6v7cxb8nnsa3i96a0rldvcx9xrx5l6l584vvs8j9f"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; };
+  maptiles = derive2 { name="maptiles"; version="0.1.1"; sha256="0ppg74r0ccl97aqh2w9mzvpqqg3v873k0k0pig3fac02vgdsfsgh"; depends=[curl png sf slippymath terra]; };
+  maptools = derive2 { name="maptools"; version="1.0-2"; sha256="0jgf3wg47jdnznxb3ncv4is9ackwviy4lzcyggqwzw3wh6jnvb6s"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-7"; sha256="0f85i3vwr5rvz261z6j7x15gsahxrq4qqddfb0qyhypgihvwh857"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
   mapview = derive2 { name="mapview"; version="2.9.0"; sha256="145n1shc8bjvm2awvnxd8884mi5bxjqymlkvz1vv3gkwwssv430p"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales sf sp webshot]; };
   mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; };
-  march = derive2 { name="march"; version="3.1"; sha256="1y3ndnkxrqxavp7b5dwhn1mijhhn06k5b6iickzjr4bfmpfnk340"; depends=[]; };
+  march = derive2 { name="march"; version="3.3.2"; sha256="1qdjajb5mkq2r7p224kbxhf01s75hry5c5hx1cnsb48dfzd2s5xg"; depends=[]; };
   marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; };
   marelac = derive2 { name="marelac"; version="2.1.10"; sha256="08phsghzvi0z78pkb5lkamni83fsw0bqfri99j6bjf6y14aygif9"; depends=[seacarb shape]; };
   marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; };
@@ -10441,51 +10882,52 @@ in with self; {
   markdown = derive2 { name="markdown"; version="1.1"; sha256="06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"; depends=[mime xfun]; };
   markdownInput = derive2 { name="markdownInput"; version="0.1.2"; sha256="1qxil2liikbbn6w8niyc03fwqvwvdv6wiy98ip8j77729i7g2hln"; depends=[markdown shiny shinyAce]; };
   marked = derive2 { name="marked"; version="1.2.6"; sha256="0k367sjyac1w894rndz5m0drmbd56nzyx5mr7mvhsqzq3gnv4dw5"; depends=[bookdown coda data_table expm kableExtra knitr lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
-  marketr = derive2 { name="marketr"; version="0.0.1"; sha256="0pchyfhim18m88r9m9dhihj89isvjwgmka9bdi64n0hnmv0qv8ds"; depends=[dplyr magrittr rlang tibble tidyr]; };
-  markmyassignment = derive2 { name="markmyassignment"; version="0.8.2"; sha256="1jrx72k3glwv5nci3h3qbqbs0x9mqld92v4irw2sfjzcmb7qyma3"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; };
+  marketr = derive2 { name="marketr"; version="0.0.2"; sha256="12nhlz40n80i6zg7y5w9zknq9qpk9qwd3wbvvya1ff8gq195147w"; depends=[dplyr magrittr tibble tidyr]; };
+  markmyassignment = derive2 { name="markmyassignment"; version="0.8.3"; sha256="1fslp5fzs79gbw9ydbzxldpclrbdj3qrzmm1b61xji3qzif6r4la"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.8"; sha256="05hfykjzx4wf2p1d6dvyx5lizfxmq3zprvnfg74r7l1izp7wpl38"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
-  markovchain = derive2 { name="markovchain"; version="0.8.5"; sha256="1bsvp2cpqc70rlxnpjk938yscl8hn1phpsvc8nc9g9166x4mqy17"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.8.5-3"; sha256="14yrhxnfrq9rhsy6vhiq933g7a39vfmfzsai9jdy6pzykjxmrmf5"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
-  marmap = derive2 { name="marmap"; version="1.0.4"; sha256="1yhnh311wzy6klyds6l0rldk6kw89rylxnwqrj5y6bpws9sac0za"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
-  marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.2"; sha256="0q3whfhi17qa8dfd5hjyqxc7a7p8hdfkkmvccdigfbqvksf24fxs"; depends=[doParallel foreach]; };
+  marmap = derive2 { name="marmap"; version="1.0.5"; sha256="0aqir3daf154n6qqmy48snsgiz9ixdkrfck67x4pmasxj9w5wgl9"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
+  marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.4"; sha256="0jizmnd2g1vgy48wbqn112ip8vygnx17fmidynrgi8q99ia21mbp"; depends=[doParallel foreach]; };
   mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; };
   mashr = derive2 { name="mashr"; version="0.2.38"; sha256="1w1ipkwixq8mr25v7w8vdyi6rwbkgsd0a69w05l0r6bms7dviki8"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta]; };
   mason = derive2 { name="mason"; version="0.3.0"; sha256="1x5wiagb1sy5gkp0xkbr1jzhrjg1c2bqdh4hy6igwcnws2cbhxyr"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; };
+  mastif = derive2 { name="mastif"; version="1.0.1"; sha256="1jw7dz4qxyj848qm7lwg0klcw028260nizdi5gdwf7wd5a2nis9c"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; };
   matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; };
   matahari = derive2 { name="matahari"; version="0.1.3"; sha256="03mhn4qh1vcz2hr0mxp6gijwgrzvbpfb8dq7lqhchbk5gq5g3fnh"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; };
   match2C = derive2 { name="match2C"; version="0.1.0"; sha256="04sbsnbp2qmklfify7a2bdrx7y8r836qhwvklxi4nns5ivj51hqv"; depends=[mvnfast rcbalance Rcpp]; };
   matchMulti = derive2 { name="matchMulti"; version="1.1.7"; sha256="0k5psmjzcyr7pm603vni7w2hvslck05r81cngm26pql2prdrv5yk"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; };
   matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; };
   matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-2"; sha256="1jj5hzxiivqinkpddmkqdxgi83jm6blann9wgv4g8prn3lvp0i85"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
-  matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; };
+  matchingR = derive2 { name="matchingR"; version="1.3.2"; sha256="03imvgasiahcnzmc8kr2ywwv93fhg50qrqmvm6ifiz0g9d3xh8rr"; depends=[Rcpp RcppArmadillo]; };
   matchmaker = derive2 { name="matchmaker"; version="0.1.1"; sha256="1sa2cah8gjvg0159rv1sfw9p0aljg66xmij31mz2vfk5683r4b00"; depends=[cli forcats rlang]; };
   matconv = derive2 { name="matconv"; version="0.4.0"; sha256="0kl0647m45mrk13fyr0mkx1x9v3im66ciky8k8nmy4ahkffyasi4"; depends=[]; };
-  mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; };
-  mathgraph = derive2 { name="mathgraph"; version="0.9-14"; sha256="11wcnjligjc0m0ibi7v5f9w4j2g0fmw33za8407d9fqdb0i5pf60"; depends=[]; };
   mathjaxr = derive2 { name="mathjaxr"; version="1.0-1"; sha256="0j1124f7sb6r7fjfhrlara2402qpa2pf1m21amnpqz0c9l63fg8d"; depends=[]; };
   mathpix = derive2 { name="mathpix"; version="0.4.0"; sha256="0wwagf8v7awgiyi8vrfay5m2pbl1czn62g5bkg037wwy0c68n8va"; depends=[base64enc httr magick purrr rstudioapi texPreview]; };
   matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
   matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
   matlabr = derive2 { name="matlabr"; version="1.5.2"; sha256="1ba6cajnzldb1gmn7rf0b198h6mdh58r3frm0z0cmvbinspwz3x7"; depends=[stringr]; };
-  matlib = derive2 { name="matlib"; version="0.9.3"; sha256="09fndv9dpc48s1i263amhgk7bjhz0wzksbhkzkl392v85r84bj6x"; depends=[car MASS rgl xtable]; };
-  matman = derive2 { name="matman"; version="1.1.0"; sha256="0ky10i2qbsd6vqsxrcbdimpwbn1yjz56lxmpsa48450r2dbmijwm"; depends=[data_table dplyr DT forecast ISOweek plotly shiny shinydashboard shinyWidgets tidyr tidyverse]; };
+  matlib = derive2 { name="matlib"; version="0.9.4"; sha256="1myc00mggfxm0p2h2blyn3qa399dldbbq4x6hv7a486gmf03lnrn"; depends=[car MASS rgl xtable]; };
+  matman = derive2 { name="matman"; version="1.1.2"; sha256="08qafqz566d03zaxlxi32ir73rl0kxag257vi15kmw61sd57rrgm"; depends=[data_table dplyr DT forecast ISOweek plotly shiny shinydashboard shinyWidgets tidyr tidyverse]; };
   matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
   matricks = derive2 { name="matricks"; version="0.8.2"; sha256="0ik61jxd4hpw149dbbmis3wsfsim60mw9d0qjwh047qfg6sm1vsc"; depends=[ggplot2 Rcpp reshape2 rlang]; };
   matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; };
-  matrixNormal = derive2 { name="matrixNormal"; version="0.0.1"; sha256="1nvsgcp8x691pa2rjz2fgknybwpni6fppm16l5bjkrg47ka0pbcd"; depends=[mvtnorm]; };
+  matrixNormal = derive2 { name="matrixNormal"; version="0.0.4"; sha256="1x59n907d9846m5iwzdghs9s4nndrsf75spfs8b1zl21jpa7i2nv"; depends=[mvtnorm]; };
   matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; };
-  matrixStats = derive2 { name="matrixStats"; version="0.56.0"; sha256="09qgfv9x32x6ncgf19iy7yjp26fwy6p5wm8spc2xzfc0qhylmqrr"; depends=[]; };
+  matrixStats = derive2 { name="matrixStats"; version="0.57.0"; sha256="0hzkx7yi9ira476izsgw7r2bhv72ra4z2m9zr1i1f4ivrn3ihs7r"; depends=[]; };
   matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; };
   matrixTests = derive2 { name="matrixTests"; version="0.1.9"; sha256="128h8krc7n6lrh6njyj650ma5gr549p8cyps6dxij6bm0p3n7r62"; depends=[matrixStats]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
   matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; };
-  matsbyname = derive2 { name="matsbyname"; version="0.4.15"; sha256="0hkzfagmrws7vz0sn0fn0a14vmlpfr77clhrqms9cbijx7da3wz3"; depends=[assertthat dplyr Hmisc magrittr purrr rlang stringi tibble]; };
-  matsindf = derive2 { name="matsindf"; version="0.3.4"; sha256="0r8hs53c4xv7lldz8mzh3hy5jq64c3cza9yifjjzpwvlw42y631l"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; };
+  matsbyname = derive2 { name="matsbyname"; version="0.4.16"; sha256="13gl1jkpw3dpv93fvgg84sv4kbg4qv5hzz5z35fsxhqj5m5qrgl3"; depends=[assertthat dplyr Hmisc magrittr purrr rlang stringi tibble]; };
+  matsindf = derive2 { name="matsindf"; version="0.3.6"; sha256="1h0hlr2vvqj1jfkn6i7x137xlxsawnnhkg88kl7fga4wfznzyms3"; depends=[dplyr magrittr matsbyname purrr rlang tibble tidyr]; };
+  matuR = derive2 { name="matuR"; version="0.0.1.0"; sha256="01nxs4czzs1kcxk63nwr2gnvffmlnx3yfllrhi8khdkj498s6sx1"; depends=[dplyr ggplot2 ggrepel lubridate magrittr tidyr]; };
   mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; };
-  mauricer = derive2 { name="mauricer"; version="2.1"; sha256="1llqcz6iimb96cfkpjkwwdplfv6s36c634rczxpzrid6vizls0sh"; depends=[beastier curl stringr]; };
-  maxLik = derive2 { name="maxLik"; version="1.4-0"; sha256="0glbd19icibl24pqgn1247s8gqbgb72bppvs9k7r8z2hcqws0005"; depends=[miscTools sandwich]; };
+  mauricer = derive2 { name="mauricer"; version="2.3"; sha256="0cbrxvlpw89rrdnnsxbl1jmmkn4gccp2xaipnarhk5qd9wp6zm6c"; depends=[beastier curl stringr]; };
+  maxLik = derive2 { name="maxLik"; version="1.4-6"; sha256="1syskb0zfqqnhb2g1dcf28lnfccgnjqbm93x5zxxf9x4wwh3liq6"; depends=[miscTools sandwich]; };
   maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; };
   maxadjAUC = derive2 { name="maxadjAUC"; version="0.1.0"; sha256="04zdaqmavhhrj63s2k5pqncvlzbfnxan7r0fagfka9dypwwcl5qm"; depends=[aucm Hmisc Rsolnp survival]; };
+  maxcombo = derive2 { name="maxcombo"; version="1.0"; sha256="1hwv38a07ry5fv53r2vizifj83xf98znix8nx4zshqyk38vblgp5"; depends=[dplyr magrittr MCMCpack mstate mvtnorm purrr rlang survival]; };
   maximin = derive2 { name="maximin"; version="1.0-3"; sha256="1wfhpgk149aw6gkdlr8g29icj0l0xa8fczxkz4hbdr91dqmnxvp3"; depends=[plgp]; };
   maxlike = derive2 { name="maxlike"; version="0.1-8"; sha256="0lbj212dbx8lbkw808xlhniw5864bh86xs8zwvxcnngj0abapalh"; depends=[raster]; };
   maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; };
@@ -10495,24 +10937,25 @@ in with self; {
   mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; };
   mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; };
   mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; };
-  mbbefd = derive2 { name="mbbefd"; version="0.8.8.5"; sha256="1bnbavhii2wm9944l4j5x21y9b3kp0sdshz32r1k7cy1y569zd6r"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
+  mbbefd = derive2 { name="mbbefd"; version="0.8.9.1"; sha256="0902dhfjrnkd9wmy2nglrycnjmn4sh0qbsmh91cd3g1wh673rpak"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
   mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; };
-  mbend = derive2 { name="mbend"; version="1.3.0"; sha256="011csf2zigv0778d1mkwq13dayj4zkpnlsy2a0s8n71hbyhra0v6"; depends=[]; };
+  mbend = derive2 { name="mbend"; version="1.3.1"; sha256="0g7hqjdhaj99rd2jqfb6x7k7gsfcvhdibai3093qcvhv6grb3v7m"; depends=[]; };
   mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; };
   mbir = derive2 { name="mbir"; version="1.3.5"; sha256="10sd5gk2k94cmi49nbpywqvh9bxj9q3psa3d00zmw1a7d6c0jjpd"; depends=[effsize psych]; };
   mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; };
-  mboost = derive2 { name="mboost"; version="2.9-3"; sha256="1qp5c43kc0939sss5w3hhn794lbi69wgfsa31sq4c8vzh35pjqmf"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; };
+  mbmixture = derive2 { name="mbmixture"; version="0.2-5"; sha256="0w6a77lavdsrg9sf6jmi3xyxgx4d0v2nf85fh9bnrjdp51g6d0zi"; depends=[numDeriv]; };
+  mboost = derive2 { name="mboost"; version="2.9-4"; sha256="1dgyc38axfk2a430wsdnnk76xikizkyxf5r0l1kbp6cacrx6idz0"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; };
   mboxr = derive2 { name="mboxr"; version="0.2.0"; sha256="1d11fpz17k65dzw9sjc7zfs1jpajzrh2pvr2s435p83g3mpf40vz"; depends=[dplyr lubridate magrittr purrr reticulate stringr tibble tidyr]; };
   mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; };
   mbsts = derive2 { name="mbsts"; version="1.0"; sha256="0wkglh1g0kdlgw4afqxvwb26difnqhf6g5jsbf8y39mpipxla365"; depends=[KFAS MASS Matrix MCMCpack pscl]; };
-  mc_heterogeneity = derive2 { name="mc.heterogeneity"; version="0.1.1"; sha256="076naz0p2kqn9dlbzllcqv7rki3vxybzhpq8fsw9wslsznmm9r1w"; depends=[boot_heterogeneity metafor]; };
+  mc_heterogeneity = derive2 { name="mc.heterogeneity"; version="0.1.2"; sha256="1nsqbc4cqyg6g3s6ish3fbhqygy1kay68smbv0rhivp0x0dv7can"; depends=[boot_heterogeneity metafor]; };
   mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; };
   mcBFtest = derive2 { name="mcBFtest"; version="0.1.0"; sha256="1fmn9pzbvk508ljspksppqxdvggx5bvipgs54nz9605y6p8zzmi5"; depends=[MASS]; };
   mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
   mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; };
-  mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; };
   mcStats = derive2 { name="mcStats"; version="0.1.2"; sha256="1r8dxdfcvznl2968xr6fbany1rh7wq5z1p7fhdf5g4b5l28j8pf9"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; };
   mcb = derive2 { name="mcb"; version="0.1.15"; sha256="0k986m2vyvfqxw3jmlyvf6r5bq68y92fymy03lffq5lmiqhypixj"; depends=[ggplot2 glmnet lars leaps MASS ncvreg reshape2 smoothmest]; };
+  mcbette = derive2 { name="mcbette"; version="1.13"; sha256="1f5kfbyla4qmx3zin6dgcq6fhzd8rwaqg5jfv39bdp6g3srf2805"; depends=[babette beastier beautier curl devtools mauricer Rmpfr testit txtplot]; };
   mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; };
   mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
   mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; };
@@ -10523,22 +10966,23 @@ in with self; {
   mcemGLM = derive2 { name="mcemGLM"; version="1.1.1"; sha256="0p6z32c69ik8wjjn50vzjmr4plsfbxr2p0hr50wknkwwb7i20hp6"; depends=[Rcpp RcppArmadillo trust]; };
   mcen = derive2 { name="mcen"; version="1.2"; sha256="1j0fy0ccbx85znvsxpd72pcgk3qg6r1ngpjjgr04mg9bwlfzpxm2"; depends=[faraway flexclust glmnet Matrix]; };
   mcga = derive2 { name="mcga"; version="3.0.3"; sha256="109m01mab5awjf8zjzwl9j7hzac15dyq3x6zba9hsy5i02k5d5w4"; depends=[GA Rcpp]; };
-  mcgfa = derive2 { name="mcgfa"; version="2.2.1"; sha256="19z5008274pwlwv47imixnfd4nxwnrhdhsq2m3grjzndxp41i4xz"; depends=[]; };
   mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; };
   mcglm = derive2 { name="mcglm"; version="0.6.0"; sha256="0p06bibckkq7aynhp8livsyvvy3abwswwvwl5ps4fxqsgncfng5f"; depends=[assertthat Matrix Rcpp RcppArmadillo]; };
   mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
   mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; };
   mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
-  mclogit = derive2 { name="mclogit"; version="0.8.5.1"; sha256="19lhymixycm1xyj7k9ywswvvsl6pbqyhrzjsayrcjkcsdv58cf44"; depends=[Matrix memisc]; };
-  mclust = derive2 { name="mclust"; version="5.4.6"; sha256="1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl"; depends=[]; };
+  mclogit = derive2 { name="mclogit"; version="0.8.6.4"; sha256="09n5kn3ylcml73pkyw2b97wp3xay75qjsfb588hs5j4rls0wj1qc"; depends=[Matrix memisc]; };
+  mclust = derive2 { name="mclust"; version="5.4.7"; sha256="08scl72llpinfijiyx14yqvmx8lma9jvh8h92v9ynnzfr9kadxa5"; depends=[]; };
   mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; };
   mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; };
   mcmcOutput = derive2 { name="mcmcOutput"; version="0.1.1"; sha256="0nw33xb7x695g8i91hfj2apgywbyzf2k587drzridqnfmbm26pni"; depends=[coda HDInterval MASS]; };
   mcmcderive = derive2 { name="mcmcderive"; version="0.1.0"; sha256="1q26fnkm8ysfgbn1f0i2qajm1jrfslplx6jdg76bdc83iqwblpd6"; depends=[abind chk extras mcmcr nlist purrr term universals]; };
+  mcmcensemble = derive2 { name="mcmcensemble"; version="2.0"; sha256="06aw2l94pxihv80rrs7dq2b2kvdpy0zpxxzvp7jlp3aky1n30vih"; depends=[]; };
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; };
-  mcmcr = derive2 { name="mcmcr"; version="0.3.0"; sha256="1jk1hdrbxfh0dqhvjxm8ml6mxrdg1qjhm6b3q745qnn03psp4qgy"; depends=[abind chk coda extras lifecycle nlist purrr term universals]; };
+  mcmcr = derive2 { name="mcmcr"; version="0.4.0"; sha256="1g839n1x359rqf6p521s0ipzdnc5wg4wdxhjs9r879vmmv8xf766"; depends=[abind chk coda extras lifecycle nlist purrr term universals]; };
+  mcmcsae = derive2 { name="mcmcsae"; version="0.5.0"; sha256="0ai1m2kxspk5c5pcn5vxca26dyvrhiaaqmq6h56qy18q4lrq700h"; depends=[GIGrvg loo Matrix matrixStats Rcpp RcppEigen]; };
   mcmcse = derive2 { name="mcmcse"; version="1.4-1"; sha256="05sxz2bjb1y389vrmykcn6hwhgpykzpnh94aq34mbpqdsrb1y63b"; depends=[ellipse Rcpp RcppArmadillo]; };
-  mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
+  mco = derive2 { name="mco"; version="1.15.6"; sha256="10h5d2lw6ybyva44nn5wml6v3ljpnv9m1b2lh36vg2cwrdwy5sqp"; depends=[]; };
   mcompanion = derive2 { name="mcompanion"; version="0.5-3"; sha256="0051agyzbhrsxi9wpfpqcq98h7y25627s2czf30qxcq80m7xbhj0"; depends=[gbutils MASS Matrix Rdpack]; };
   mcp = derive2 { name="mcp"; version="0.3.0"; sha256="1dgdhspbqc6w7rcplryjy9jjzdpm480rwngn6ri7kjl8bk70hll2"; depends=[bayesplot coda dplyr future future_apply ggplot2 loo magrittr patchwork rjags rlang stringr tibble tidybayes tidyr tidyselect]; };
   mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; };
@@ -10547,12 +10991,13 @@ in with self; {
   mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; };
   mctest = derive2 { name="mctest"; version="1.3.1"; sha256="1d248r9ifwl1xhvka6z69l943rvbq7s7ag6vqp9lljkcybvg75f2"; depends=[]; };
   mcunit = derive2 { name="mcunit"; version="0.3.1"; sha256="12zlm14gcfid7h9szrggwmhy54d0wk57r8w8l3p3x3yp49144v67"; depends=[Rdpack rlang simctest testthat]; };
-  mcvis = derive2 { name="mcvis"; version="1.0.4"; sha256="0r95pnl3ar7w046wyrc39mr8mf6z5rnzqqfhgz2cpn3bgli0v9sj"; depends=[assertthat dplyr ggplot2 igraph magrittr psych purrr reshape2 rlang shiny]; };
+  mcvis = derive2 { name="mcvis"; version="1.0.6"; sha256="14vx9nrdsggkwp3c1jamhxx20h3byamhb8bamf04fvycvwsgibf3"; depends=[assertthat dplyr ggplot2 igraph magrittr psych purrr reshape2 rlang shiny]; };
   md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; };
   md_log = derive2 { name="md.log"; version="0.1.1"; sha256="0ix5nz38xzlhrga40hfhlfss938mrfbni2wysvz2qbpm59qxrhg0"; depends=[futile_logger]; };
   mda = derive2 { name="mda"; version="0.5-2"; sha256="1hq0zhhz9klmp4zcr1w8hyn7s1h9kfg57d2l2mfm7psx459j0krl"; depends=[class]; };
   mdapack = derive2 { name="mdapack"; version="0.0.2"; sha256="1dfcjh8yax06m890ql0kc2rn539z4xbhw7bq9a8cbrm7jnkq03iq"; depends=[covr curl devtools FactoMineR ggplot2 gh git2r httr knitr mice openssl pkgbuild reshape2 rlang rmarkdown roxygen2 spelling testthat VIM]; };
-  mdatools = derive2 { name="mdatools"; version="0.11.1"; sha256="1wp2rpfh11zlxq06yb3n6p5ig6arw8iladb08qnv472ddza14707"; depends=[Matrix]; };
+  mdatools = derive2 { name="mdatools"; version="0.11.2"; sha256="0nggnhp191hyjva8bkr8ixxwn32chgbshl8g6ak1vqnijr9jrrlp"; depends=[Matrix]; };
+  mdbr = derive2 { name="mdbr"; version="0.1.2"; sha256="1c33v2dqz1jjh730p486bi07h9m9clpcfrbvhbvwb8fslqxg76qd"; depends=[readr]; };
   mde = derive2 { name="mde"; version="0.2.1"; sha256="0d28nhj36v6v40ylg575cjw5qqizfn9ch1yc4hffd6gzk35q441q"; depends=[dplyr tidyr]; };
   mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
   mdendro = derive2 { name="mdendro"; version="1.0.1"; sha256="0pk7b7zn9afc947parkj1qa4d85gq16lalg07fjfripxjnmvjahw"; depends=[rJava]; };
@@ -10565,7 +11010,7 @@ in with self; {
   mdsOpt = derive2 { name="mdsOpt"; version="0.5-1"; sha256="01gcrlmcgi1phz4952bkbf2xzd2j06lq1d6cn3nf3jz9sy5xy7f8"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
-  mdsr = derive2 { name="mdsr"; version="0.1.7"; sha256="1angy75nyhzwfhmb4axs14yl0jsxjaiqh5nz2jpmi5j890y32zda"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 mosaic RMySQL]; };
+  mdsr = derive2 { name="mdsr"; version="0.2.3"; sha256="0hwv4jgxd3pjczd7zppp16k0pc0z5ifdfk5gx73f0x21gpcf3k0n"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 htmlwidgets kableExtra RMySQL skimr stringr tibble webshot]; };
   mdthemes = derive2 { name="mdthemes"; version="0.1.0"; sha256="1k0fylg8jz0xdfwq85wap6lgrb9zi219vhmry4lysqssx2szkngk"; depends=[cowplot ggplot2 ggtext ggthemes hrbrthemes tvthemes]; };
   mdw = derive2 { name="mdw"; version="2020.6-17"; sha256="0jjajgb1w3vx7vqn2z90xq39hvbcrrd2ky8p31g5absqwwm7lwpa"; depends=[kyotil MASS Matrix]; };
   meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; };
@@ -10578,7 +11023,7 @@ in with self; {
   meboot = derive2 { name="meboot"; version="1.4-8"; sha256="10kii09v1nm7m3sqn1wsszc5m0zn0bkip9zjpvn84xdf3nz9kp8b"; depends=[dynlm nlme tdigest]; };
   medExtractR = derive2 { name="medExtractR"; version="0.2"; sha256="17fc54w1jizqji27xsyiq6v31q8r86sps1nl6mgqsi5h7mzni98g"; depends=[stringr]; };
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
-  medfate = derive2 { name="medfate"; version="1.0.0"; sha256="1rm1m3skma21d0r7pg5bk7v9cywpb2hjlib8xyrir6bi505lkfbq"; depends=[ggplot2 meteoland Rcpp sp spdep]; };
+  medfate = derive2 { name="medfate"; version="1.1.0"; sha256="1cq83phvbirw7q8ik9jiv7y1jk59yjjs2r09qcj7jqsy7gb5qa6j"; depends=[ggplot2 httr jsonlite meteoland Rcpp sp spdep]; };
   medflex = derive2 { name="medflex"; version="0.6-7"; sha256="171vp0wmmmbz42xcwjy065vhvig49s4ac2hzawfww2mvpfj0g0fj"; depends=[boot car Matrix multcomp sandwich]; };
   mediacloudr = derive2 { name="mediacloudr"; version="0.1.0"; sha256="1r11mpz44msla71lqw45r9s8z7rwvbnqi026l0ljx6crby183h0w"; depends=[httr jsonlite rvest xml2]; };
   mediation = derive2 { name="mediation"; version="4.5.0"; sha256="0i88wvqqw8cmxmh9i78rqzp4s16zhf12dgl9fsk9bhw7hxhhc0i1"; depends=[boot Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
@@ -10588,25 +11033,26 @@ in with self; {
   meditate = derive2 { name="meditate"; version="0.1.3"; sha256="02mgnbxlvi73zpnghlcx89jvri8144cf0bzq0hrbhh2nq2c1sdjg"; depends=[audio checkmate deldir wesanderson]; };
   meditations = derive2 { name="meditations"; version="1.0.1"; sha256="0wnx3zadpngfch0sb0ifqvsmzl613639f1yazwsgvhk29mycx4ss"; depends=[]; };
   medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; };
+  medrxivr = derive2 { name="medrxivr"; version="0.0.4"; sha256="0jsfak1kp06j8n4d6y3d3dhnj25kxwns1l38an6gkm3dgmc5a30r"; depends=[bib2df curl dplyr httr jsonlite lubridate progress rlang stringr tibble vroom]; };
   meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; };
   mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; };
   mefa4 = derive2 { name="mefa4"; version="0.3-7"; sha256="0iq3n77gbl3zbplaqp1nwb72y9w797m938albx27727pkzyanxf1"; depends=[Matrix]; };
   meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; };
   mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; };
   meltt = derive2 { name="meltt"; version="0.4.1"; sha256="1113rdw0jglwkcd3g31llhgzqmwpxfz2bp60m3x2zdbdrvwc1z9n"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; };
-  mem = derive2 { name="mem"; version="2.15"; sha256="1q8h6mbpzybg1vzi2pgp8fpxfrp4d729n5ghh0a54wjdwdjgkpq1"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll sm tidyr]; };
-  memapp = derive2 { name="memapp"; version="2.13"; sha256="0n4awpxsz34rrz53bp4dyfgs9zssrxd4f8zyj6zw89j6ahkz85w6"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringi stringr tidyr]; };
+  mem = derive2 { name="mem"; version="2.16"; sha256="16xm9hai1aqhrbpxln6az4qbwz3kk2izmq39nzpzjc3ardpq1ljr"; depends=[boot dplyr EnvStats ggplot2 mclust purrr RColorBrewer RcppRoll sm tidyr]; };
+  memapp = derive2 { name="memapp"; version="2.14"; sha256="0w2lbypz0bc50s6yrvidz96wpz53cxpk5a9yhbq7rp8chr9r8cm3"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringi stringr tidyr]; };
   meme = derive2 { name="meme"; version="0.2.2"; sha256="1q78q8080vvqni8ncqp326pidfjfia0f2b6pis08m7fr1q1gcqca"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; };
   memery = derive2 { name="memery"; version="0.5.2"; sha256="1hr52g69lr2n84yczm8i8yxh7rys5nr8jk1hcmv548p5y79l8k9s"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
   memgene = derive2 { name="memgene"; version="1.0.1"; sha256="1x3vf2f1yh40xw5vqcjlrn07zn9zh3sx4kc9dijxzygd9crl5a29"; depends=[ade4 gdistance raster vegan]; };
-  memisc = derive2 { name="memisc"; version="0.99.25.6"; sha256="1cb74gl205f6rhlj5hk433glba89ljrn5fzypgb5fngks7jsxawl"; depends=[data_table lattice MASS repr]; };
+  memisc = derive2 { name="memisc"; version="0.99.27.3"; sha256="0cv8pv1852p2mkxxzyzfqp9l2yr2nyrzzqbj22rxk01za1gjcg32"; depends=[data_table lattice MASS repr]; };
   memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; };
   memochange = derive2 { name="memochange"; version="1.1.1"; sha256="144134kpchb7ps8b2g7pyga5add0iqphzcwygf11aybmbzmp90x7"; depends=[forecast fracdiff longmemo LongMemoryTS sandwich strucchange urca]; };
   memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; };
   memor = derive2 { name="memor"; version="0.2.2"; sha256="0b386l4aclj86rhzzhmi8dmkkbcd1pwaj3as0lc11q0nj2gjrs7i"; depends=[knitr rmarkdown yaml]; };
   memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; };
   memuse = derive2 { name="memuse"; version="4.1-0"; sha256="1bbjp8y0ji71956fbaxiil7ynq2nkmmgz7i9xps83m3bbp5d3mjq"; depends=[]; };
-  merDeriv = derive2 { name="merDeriv"; version="0.1-9"; sha256="1zp9w79pm3n8673h3h7ic9zx6p5i0cd6kpmbyfs365flgvcbdmsg"; depends=[lavaan lme4 Matrix matrixcalc nonnest2 numDeriv sandwich]; };
+  merDeriv = derive2 { name="merDeriv"; version="0.2-2"; sha256="0n4crlxgjp58w5jb8fm01k4b9i8yflr875xajr4dayc6764wiism"; depends=[lavaan lme4 Matrix nonnest2 numDeriv sandwich]; };
   merTools = derive2 { name="merTools"; version="0.5.2"; sha256="1ka9aa3fgs1kqfqhi1sz6v6g5mbbbzxyb7c0n8s981g8d04vsi00"; depends=[abind arm blme broom_mixed dplyr foreach ggplot2 lme4 mvtnorm shiny]; };
   mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; };
   mergedblocks = derive2 { name="mergedblocks"; version="1.0.0"; sha256="0g209f9vr5gjgsljnb6i8jr48azv982dbfc1anggfip82qivicqn"; depends=[randomizeR]; };
@@ -10614,23 +11060,25 @@ in with self; {
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
   messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; };
   met = derive2 { name="met"; version="0.1.0"; sha256="0714103xzc4n178307czxmcv7ygjiigjr9b6xnj240ljp7qmln19"; depends=[DiPs]; };
-  metR = derive2 { name="metR"; version="0.7.0"; sha256="0zdnsggvmkyxq0a6n7rhzp82n4hciayzajs4svw504i30ij5q5db"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr RCurl scales sp stringr]; };
+  metR = derive2 { name="metR"; version="0.9.0"; sha256="0s8gnjlc9h0y4dlkj9jk4z4d182spf37mlzykiz4gqxl19sfbbri"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable isoband lubridate memoise plyr purrr RCurl scales sp stringr]; };
   metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; };
   metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; };
-  meta = derive2 { name="meta"; version="4.13-0"; sha256="1aiazqirgz7mnpwg0g0m9x5rbdpvdpmbx6q7hpqjih66qjn2hlfh"; depends=[CompQuadForm lme4 metafor]; };
+  meta = derive2 { name="meta"; version="4.15-1"; sha256="1hggaw1nlyvsz5w8rhj305b2qm2jc183bmv76nimcdsbk7hvcsqb"; depends=[CompQuadForm lme4 metafor xml2]; };
   meta4diag = derive2 { name="meta4diag"; version="2.0.8"; sha256="1ila8x9r1rdmlwfpzfx1zj5yx1m4yrbhyb74db4wqbh1dswn7zsm"; depends=[caTools shiny shinyBS sp]; };
   metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; };
-  metaBMA = derive2 { name="metaBMA"; version="0.6.3"; sha256="1q9mb72p4bccl79hpj01fa3bs3n9hbcf63nzpni3ba9limiizb82"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  metaBMA = derive2 { name="metaBMA"; version="0.6.5"; sha256="1fx5xn2in4zbjrjakgfhmf298xz7z0afyl9arfzf0ii777mkc453"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; };
   metaDigitise = derive2 { name="metaDigitise"; version="1.0.1"; sha256="1cwvb6b4a1pfixbknbjjylsmpkccgi163h0kbf7zfjaqjg2y9mzh"; depends=[magick purrr]; };
+  metaEnsembleR = derive2 { name="metaEnsembleR"; version="0.1.0"; sha256="1vxrzdm4j3h91h0fvps36a8xhs1b8cylw2cw2mhvg20lpcjjdsdv"; depends=[caret e1071 gbm ggplot2 gridExtra randomForest]; };
   metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
   metaMix = derive2 { name="metaMix"; version="0.3"; sha256="17qkwg9iz5v63ybyvqppbf044l0pi0ym5pw283174dlx8lfac60q"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
   metaRMST = derive2 { name="metaRMST"; version="1.0.0"; sha256="1mq9j7iczjh7d3cps9g1bh0f8k388bdn8d5lkjs2s8y9fq1kxzmx"; depends=[meta mvmeta rstpm2 survival survRM2]; };
-  metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
-  metaSDTreg = derive2 { name="metaSDTreg"; version="0.2.0"; sha256="08q2llzqakrrxab73a63s4bpqq461m4q1dl60za9826yxl3g86b8"; depends=[Matrix maxLik ordinal truncnorm]; };
-  metaSEM = derive2 { name="metaSEM"; version="1.2.4"; sha256="0dhdp9wm5idblf6z18a192c4zz0r993y6nqgs22icmmc4ags73q6"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
-  metaboGSE = derive2 { name="metaboGSE"; version="1.2.4"; sha256="1blgadhlvc6bsy6dj0lw8gp7j5gbbv2rqwzav1bmcgvn4fv6asw8"; depends=[AnnotationDbi ape Matrix sybil]; };
-  metabolighteR = derive2 { name="metabolighteR"; version="0.1.0"; sha256="1kbwxwcx5f836bhwx32a41c6753832wigx0b6gi9zblc4qsnqvlq"; depends=[dplyr httr magrittr purrr]; };
+  metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.3"; sha256="1zby60kw1kdsc06g3xx5ck20nfm1yavvg5w7gq0m2d2hd1nhlim6"; depends=[]; };
+  metaSDTreg = derive2 { name="metaSDTreg"; version="0.2.1"; sha256="0nqnb0isjz2czvih6zr4jglrwfmf9ahm9a3nwkvr2cwbmdh5clq2"; depends=[Matrix maxLik ordinal truncnorm]; };
+  metaSEM = derive2 { name="metaSEM"; version="1.2.5"; sha256="05lmangh8fggyfiad2qnrfh1mw3za3xjac5d5dcffimqlbm8hmb3"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
+  metaSurvival = derive2 { name="metaSurvival"; version="0.1.0"; sha256="05f103fi287y64gys73a55snw54bnph69q8dykfii10dykd44g0y"; depends=[mvtnorm survival]; };
+  metabolic = derive2 { name="metabolic"; version="0.1.0"; sha256="1bk8d0sxlgc17d7x02zmx23fdqz39c9zpin16bzhcj602kjcq0y8"; depends=[cli dplyr forcats ggfittext ggimage ggplot2 glue magrittr meta patchwork purrr rmarkdown scales stringr tibble tidyr usethis]; };
+  metabolighteR = derive2 { name="metabolighteR"; version="0.1.1"; sha256="0mldfmkq1600h17qxfwy7llpijwdgal8n8nf4ya1ria3nvyvjl3k"; depends=[crayon dplyr httr magrittr purrr]; };
   metacart = derive2 { name="metacart"; version="2.0-3"; sha256="1wim72fvhx6cyc16c9gl8cwzbhlpzilk7q8gi4jnzzazqmc1kb5n"; depends=[ggplot2 gridExtra Rcpp rpart]; };
   metacoder = derive2 { name="metacoder"; version="0.3.4"; sha256="0qnsn6zpk9vf5p4jj0pdkldi0p7a1rjccdrk68qswy04dlsq15vg"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; };
   metacom = derive2 { name="metacom"; version="1.5.3"; sha256="0c0gzn28cl2sl52wx2n36jm9c18d9s3yqjyx88kgbmd9069z1nvk"; depends=[vegan]; };
@@ -10641,25 +11089,27 @@ in with self; {
   metafor = derive2 { name="metafor"; version="2.4-0"; sha256="1b599fxk7s0brkchmx698fr5k4g1kzkia2rnlvhg349ffs5nfjmn"; depends=[Matrix nlme]; };
   metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; };
   metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; };
-  metagam = derive2 { name="metagam"; version="0.1.2"; sha256="0vh78fzj7c6f4xca5wx2q9x33046wajriia103nwbdacrp48hpki"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tidyr]; };
+  metagam = derive2 { name="metagam"; version="0.2.0"; sha256="0il5m02v3fv5gl9pf3ggkv0kwaycmvvaxzxda20rg30cbhma27vy"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tidyr]; };
   metagear = derive2 { name="metagear"; version="0.6"; sha256="1xfpjqawnwsg2djnygzyg6ak7gylj60wlhfkkipnrpy8bbpvc8j2"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; };
   metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; };
+  metajam = derive2 { name="metajam"; version="0.2.3"; sha256="0ryzsnwfhapsyz40ckjj6gn2chf37m62z3l7xv703878bghpdqwc"; depends=[dataone dplyr EML emld lubridate purrr readr rlang stringr tibble tidyr]; };
   metamedian = derive2 { name="metamedian"; version="0.1.5"; sha256="1v2nha2qc9vs2s9nfvbia033ppprkwxj5fadlrpy20fj2lr8z7z6"; depends=[estmeansd Hmisc metafor]; };
   metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; };
-  metamisc = derive2 { name="metamisc"; version="0.2.2"; sha256="0ll245a3f442n7jyjshcn87l725mgk132ri73kynrwh0z8g2r7i5"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; };
-  metan = derive2 { name="metan"; version="1.7.0"; sha256="1lk9x83c7v8njv71dr0lvcz6376w6q5wc0wphndvy364lg8c7i37"; depends=[ade4 cowplot dplyr FWDselect GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr progress purrr rlang tibble tidyr tidyselect]; };
+  metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.2"; sha256="0fgdjy2s47pqmb9x79a4sf0kn4hbc49rd41jnzw0d3ll1l9kwy7f"; depends=[compositions dplyr gamlss gdata ggplot2 gridExtra lme4 lmerTest matrixStats meta plyr tidyr zCompositions]; };
+  metamisc = derive2 { name="metamisc"; version="0.2.3"; sha256="13hcjl0z22dfl12nip0ni5fd9jqgr2569l5300g7mhsnd45k6ijp"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; };
+  metan = derive2 { name="metan"; version="1.11.0"; sha256="0rkaanwdjg11q4k3qw5indxpbpdisb6hx87awjsxb2360zqqxd2k"; depends=[dplyr GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr mathjaxr patchwork progress purrr rlang tibble tidyr tidyselect]; };
   metansue = derive2 { name="metansue"; version="2.4"; sha256="1ja7a3z4d764a1rcf256kmzf8xc6d8x7mqq12vzznw5ks8r2p9hk"; depends=[]; };
   metap = derive2 { name="metap"; version="1.4"; sha256="19c51fa5kh4yq3v7jd8cilgv9xr59qv20xprqgmlxbfh4gc27b2z"; depends=[lattice mathjaxr mutoss Rdpack TFisher]; };
   metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; };
   metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; };
   metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
   metapost = derive2 { name="metapost"; version="1.0-6"; sha256="098f7sifg814mc4sb1nb4d6dlr1xms5hwyp08ksxg0i4ayf9jf3c"; depends=[gridBezier]; };
-  metapower = derive2 { name="metapower"; version="0.1.0"; sha256="0y1s7szljpx763dm38nnm5q54x7paq0hn7l47c3vyjha99fpzzjw"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang rmarkdown testthat tidyr]; };
+  metapower = derive2 { name="metapower"; version="0.2.1"; sha256="04hkv1v2wh92rg8izpw0g99cbhln110zdh6cijacf0lgflh2gza0"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang testthat tidyr]; };
   metapro = derive2 { name="metapro"; version="1.5.8"; sha256="0ymbqzm317fiywzxaizddhvjzwp2wyx9y7zgbg4nrz11l3r2bp2n"; depends=[metap rSymPy]; };
   metarep = derive2 { name="metarep"; version="1.0.1"; sha256="0jnxx11jxj63ry0bkjlh9g2x2pr2qi24nql99iibz2ckbx8344p3"; depends=[meta]; };
-  metasens = derive2 { name="metasens"; version="0.4-1"; sha256="158lv7knybfhavnfra9f6dyhc7zska70rv06aq5mvzzj1mw4m4mj"; depends=[meta]; };
+  metasens = derive2 { name="metasens"; version="0.5-0"; sha256="1kyfhhwxfyrkr93jbzy73g0rscymdyi1a58knaw5cm7lb7gxqg1s"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; };
-  metathis = derive2 { name="metathis"; version="1.0.2"; sha256="07aha4j401zlm6abfmq70vqc215bpsi5hqi50npz33rpb1m3r9rq"; depends=[htmltools knitr magrittr purrr]; };
+  metathis = derive2 { name="metathis"; version="1.0.3"; sha256="12vn0b5mmf3i5cn44zh901i6dlgd95xa09vray644lz5nmllh7l8"; depends=[htmltools knitr magrittr purrr]; };
   metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
   metaviz = derive2 { name="metaviz"; version="0.3.1"; sha256="0jvv49rw66v7saj2y1q88rp6fyzq7473af5d3k77ymvjbpqyrbyz"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; };
   metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; };
@@ -10667,18 +11117,18 @@ in with self; {
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
   meteoForecast = derive2 { name="meteoForecast"; version="0.53"; sha256="15bjhkcn4zcll3cfgpzcdj0zv753x29qsjndy3h2zzqn83qywx9s"; depends=[ncdf4 raster sp XML zoo]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
-  meteoland = derive2 { name="meteoland"; version="0.9.3"; sha256="1zij805zrakdyf3yy52fsgz28ww5c5a7yip7w9xn2vf6d9w70k5m"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; };
+  meteoland = derive2 { name="meteoland"; version="0.9.7"; sha256="0m2q451zgvimd3xx3h66c3blzp7r5waj8ddb9p8hg5aj3drq2l8p"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; };
   meteor = derive2 { name="meteor"; version="0.3-4"; sha256="01009d9wpxybig4n82m48hqqg1k4x4shcjxfy8y0kk7cgfdb4naw"; depends=[Rcpp]; };
   meteorits = derive2 { name="meteorits"; version="0.1.1"; sha256="1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx"; depends=[MASS pracma Rcpp RcppArmadillo]; };
   methcon5 = derive2 { name="methcon5"; version="0.1.0"; sha256="08xsi6j65izxqcrlh37f2d7m3pwna1v6zvdv96mqylsjqgqmbk5x"; depends=[dplyr magrittr purrr rlang]; };
   metools = derive2 { name="metools"; version="1.0.0"; sha256="05l49ifx2nnlbdxh2qhdb0islf95fc67720rm5in7mrlida4khnq"; depends=[ggplot2 lubridate scales stringr tibble tidyr]; };
   metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
-  metropolis = derive2 { name="metropolis"; version="0.1.5"; sha256="0nhkzy1miycqa2jqh9gh1l48n03nig99q19f46dm8qqci7a90vlp"; depends=[coda]; };
-  mets = derive2 { name="mets"; version="1.2.7.1"; sha256="1b3bsxdwzl5rilnsga9cgzb7dafcfk2q39582rif34wim8xxzzv7"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; };
+  metropolis = derive2 { name="metropolis"; version="0.1.8"; sha256="031fcy0v13bvy7gg26988fvpqdsfndx2rynkhb1jvirnrf0fngy4"; depends=[coda]; };
+  mets = derive2 { name="mets"; version="1.2.8.1"; sha256="0prhnjqgrvw650f89sy7wj52wsd7h7gc4iqinv17j54ag8xrnhcq"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; };
   metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; };
   mev = derive2 { name="mev"; version="1.13.1"; sha256="1zbr5f8w56c9z0lp4ak47fxnnfrdm74liqcjvij0n4ajqs6glaak"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
-  mexhaz = derive2 { name="mexhaz"; version="1.8"; sha256="1lgv626a6b2k0ccprzfr671ldyqprn17fi5bsaj63vsi10gdd503"; depends=[lamW MASS numDeriv statmod survival]; };
+  mexhaz = derive2 { name="mexhaz"; version="1.10"; sha256="0bgnixbl3birn1xdbxdahs9204manr64afwy8wxhz3b2qpa3fhyi"; depends=[lamW MASS numDeriv statmod survival]; };
   mfGARCH = derive2 { name="mfGARCH"; version="0.2.0"; sha256="19v0kqn70h42vsyg4ldi5qivhwh97zk8shvahdzxbcqjjig6lylh"; depends=[maxLik numDeriv Rcpp zoo]; };
   mfbvar = derive2 { name="mfbvar"; version="0.5.4"; sha256="1rarmlfb8fpc8zwydzf198w8z5wrw7gnr4j93rnbr9y5c0z0pmh5"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble zoo]; };
   mfdb = derive2 { name="mfdb"; version="6.2-0"; sha256="11xi915plc90awasmny9ynwmz0yw18frfp1q2xv7bqk4v96fcxgp"; depends=[DBI getPass logging RPostgreSQL]; };
@@ -10688,21 +11138,24 @@ in with self; {
   mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
   mgc = derive2 { name="mgc"; version="2.0.2"; sha256="1l9qs4nz1rn56qp569nh26yz3c7i4zh3r43c209zh7kvizpagx0i"; depends=[abind boot energy MASS raster]; };
   mgcViz = derive2 { name="mgcViz"; version="0.1.6"; sha256="12isaqpbhdg2qhw76wj6hqi233dw3md061bbirkgzr5clrb8kxlk"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; };
-  mgcv = derive2 { name="mgcv"; version="1.8-31"; sha256="1if34mqsn9r7g0l82lxvvx0wjhi9paqdymyd73nschxcl1if8vbk"; depends=[Matrix nlme]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-33"; sha256="1x1bdzz2b2f05626xygwqp30b4rhblgg76hs15j9ab4fjan7pjwq"; depends=[Matrix nlme]; };
+  mgee2 = derive2 { name="mgee2"; version="0.1"; sha256="1j5s5b00pm49ds6zps0cysxmv76zvjimyr6p631awvdww84az00g"; depends=[ggplot2 MASS Matrix]; };
   mglmn = derive2 { name="mglmn"; version="0.1.0"; sha256="1g642hhs28q6x34xgrfrmmsb2jsn9zy4jxad0x5ai3px48zzdb4r"; depends=[mvabund snowfall]; };
   mgm = derive2 { name="mgm"; version="1.2-10"; sha256="1paiarr7g1p214k7x19njpf5xkhfpcsm5ds28l4y7qrj0jdvb5i6"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; };
   mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
   mgsub = derive2 { name="mgsub"; version="1.7.2"; sha256="02l1b96zv36ia0c97wgcwfhi037mbn3wy9c64hcw0n0w67yj77rr"; depends=[]; };
   mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; };
   mhazard = derive2 { name="mhazard"; version="0.1.2"; sha256="0axapk7rw8vhgmkkr4q9avmlmwi1cdyy0q70447hdp6hx9xg1fd6"; depends=[boot plot3D Rcpp RcppArmadillo rootSolve survival]; };
+  mhcnuggetsr = derive2 { name="mhcnuggetsr"; version="1.1"; sha256="0fq0niigf4lb6jqcy0w4mkfy65pxrw4brf3pg2nvmgnv3c91lgsb"; depends=[rappdirs reticulate stringr tibble]; };
   mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; };
   mhtboot = derive2 { name="mhtboot"; version="1.3.3"; sha256="1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn"; depends=[ggplot2 reshape2]; };
   mhurdle = derive2 { name="mhurdle"; version="1.1-8"; sha256="0nnzhcp9ghx2ifaj8lvhvv1acb3dpwi8m9n1al8zjvfg35wmxwwm"; depends=[Formula maxLik survival texreg truncreg]; };
   mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; };
-  miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; };
+  miCoPTCM = derive2 { name="miCoPTCM"; version="1.1"; sha256="0bmb06rb53fq8ylcvz693akmz7nkjj50c6ypxsjbfp4crllpi5v9"; depends=[distr MASS nleqslv survival]; };
   miLineage = derive2 { name="miLineage"; version="2.1"; sha256="0660vk44ywmj0q2cw7pa2z1r039ncw693dnz7zlgc0ipwak3b0ry"; depends=[data_table geepack MASS]; };
-  miRNAss = derive2 { name="miRNAss"; version="1.4"; sha256="0p852vyn44g84i4hzm7b02m5cxyqajnczx0s9x9373rn7fi6r98c"; depends=[CORElearn Matrix Rcpp RSpectra]; };
+  miRNAss = derive2 { name="miRNAss"; version="1.5"; sha256="0j4yvd0j7r98m2msllszlzkzrx67a2z4xpx00zpq90hbr5jykxc4"; depends=[CORElearn Matrix Rcpp RSpectra]; };
   miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
+  miRecSurv = derive2 { name="miRecSurv"; version="0.0.1"; sha256="0i6ac566ldlmzrk91lv7is24fvbcxzc4pgcjfq3vazap01x9xv2k"; depends=[COMPoissonReg matrixStats stringi survival]; };
   miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; };
   miWQS = derive2 { name="miWQS"; version="0.2.0"; sha256="1api75d3jr4hh8b049jllnfb3kxlllziwbvvgxjhcbcr5kv2k4j8"; depends=[coda ggplot2 glm2 Hmisc invgamma MASS matrixNormal purrr rlist Rsolnp survival tidyr truncnorm]; };
   micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; };
@@ -10711,8 +11164,8 @@ in with self; {
   micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; };
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-8"; sha256="183hg4iap97is8cdaqxmnj9z8yybvpfnhg2kf85nfy1nl7b30xl2"; depends=[MASS miscTools systemfit]; };
   micar = derive2 { name="micar"; version="1.1.1"; sha256="09vpijva39fwpvdpfglwr3xmz469pnmz371ms7z5av6w2193ls5n"; depends=[httr jsonlite]; };
-  mice = derive2 { name="mice"; version="3.11.0"; sha256="1gawccw32l00rcriyxys0mzbxh44x04rziy0cbycc3i1qm39d4fq"; depends=[broom dplyr generics lattice Rcpp tidyr]; };
-  miceFast = derive2 { name="miceFast"; version="0.6.2"; sha256="109j98gs3b08zrg4ndc142360ilk0l2gp1b4g0vgg7143dgg2dia"; depends=[data_table dplyr lifecycle magrittr Rcpp RcppArmadillo]; };
+  mice = derive2 { name="mice"; version="3.12.0"; sha256="0i7i9r0ipn7fypzp5xv1dnr54l30b7kg38mmq1kcvj2z1mjrwpap"; depends=[broom cpp11 dplyr generics lattice Rcpp rlang tidyr]; };
+  miceFast = derive2 { name="miceFast"; version="0.6.9"; sha256="1qk9l6fk8b3wq855ai616bdzfbc6kc2jf4kns0g1p22zv7185dgm"; depends=[assertthat data_table dplyr ggplot2 magrittr Rcpp RcppArmadillo tidyr UpSetR]; };
   miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
   miceRanger = derive2 { name="miceRanger"; version="1.3.5"; sha256="07h3ah2z2nnwcs63mhlxvli9a9fsv9pnjbl5d0khgwpn7w4gmyxj"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; };
   miceadds = derive2 { name="miceadds"; version="3.10-28"; sha256="099kadyaj57hk1zfkzgs4ncdc5waa2lp7pq8mjm20zgmjrqrx73h"; depends=[mice mitools Rcpp RcppArmadillo]; };
@@ -10722,13 +11175,17 @@ in with self; {
   microPop = derive2 { name="microPop"; version="1.5"; sha256="1gikp20n2b50fkybbg2hmlfjdcm0imjwygjsjnyv3wrjzypm2i78"; depends=[deSolve]; };
   microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; };
   microbenchmark = derive2 { name="microbenchmark"; version="1.4-7"; sha256="1xl4m4yl4h2zcjiz8wsa7f3sh55qg2xr3sgpvz18rlix6b3173r6"; depends=[]; };
+  microbial = derive2 { name="microbial"; version="0.0.17"; sha256="1wxzsy2gpk0ykhp5hkx4k69jy3mc49rx4x6i694w6z6ghix2z45w"; depends=[Biostrings broom dada2 DECIPHER DESeq2 dplyr edgeR ggplot2 ggpubr knitr magrittr MASS phangorn phyloseq plyr randomForest rlang rstatix S4Vectors SummarizedExperiment tidyr vegan]; };
+  microclass = derive2 { name="microclass"; version="1.2"; sha256="0q6mn1hbi6nk29x2x5a1wcdqp06mjggbrpglk5i8pp4gkqlzhl8q"; depends=[dplyr microcontax microseq Rcpp RcppEigen RcppParallel rlang stringr tibble]; };
+  microclustr = derive2 { name="microclustr"; version="0.1.0"; sha256="04xn8p4wgmxq1jbxawq0rhx6l7y1kddlbdfid8zsi4x4arkz7hvp"; depends=[Rcpp]; };
   microcontax = derive2 { name="microcontax"; version="1.2"; sha256="004g979hyg0asbah7hxr445fidil4ibw1b8pqpjdbgmpm1qgvw7y"; depends=[microseq]; };
-  microdemic = derive2 { name="microdemic"; version="0.5.0"; sha256="1i89vq3b7gq0pdh8hf92jzh0fyghhhxf8hmb72naz0vpl6xa301a"; depends=[crul data_table httpcode jsonlite tibble]; };
+  microdemic = derive2 { name="microdemic"; version="0.6.0"; sha256="1w4zh0vagnar95l5b8cgmcvp8q7vk2iba5g8d8g2ywynqiqcx5fc"; depends=[crul data_table httpcode jsonlite tibble]; };
+  microeco = derive2 { name="microeco"; version="0.3.1"; sha256="1a3fb6n2wp4pkvjgkaxq42za2k9vvnf6im7dzwfak8x40l19s1l4"; depends=[ape data_table dplyr ggplot2 magrittr R6 RColorBrewer rlang scales tibble vegan]; };
   microhaplot = derive2 { name="microhaplot"; version="1.0.1"; sha256="0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i"; depends=[dplyr DT ggiraph ggplot2 gtools magrittr scales shiny shinyBS shinyWidgets tidyr]; };
-  micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
+  micromap = derive2 { name="micromap"; version="1.9.4"; sha256="0j3g6fbb6838k8p90x5krq7h82xsafid9yzpqgbdvzg1z3gpvjyq"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
   micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; };
   micropan = derive2 { name="micropan"; version="2.1"; sha256="16zs6sqi2c5lwzhd5gbyddp8q4gx5r5sg0pbpk7924i8x4hh081h"; depends=[dplyr igraph microseq rlang stringr tibble]; };
-  microplot = derive2 { name="microplot"; version="1.0-42"; sha256="062dd4k6ryyl44lwbc2qgdsfcs1fiv9j2n6lx9driw6vng533b6q"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; };
+  microplot = derive2 { name="microplot"; version="1.0-44"; sha256="1sx3544yvv5dxpgqw1582574z1vcxh9rc82x1z37ad7ayzxyyb1v"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; };
   microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.7"; sha256="1cd9h331gvapa6p72mlyddrixb0jzka7q10i78fmpc2mcdl7alw0"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; };
   microseq = derive2 { name="microseq"; version="2.1.2"; sha256="04xsvwwbpxsqdg31w2kgydrnyxbw611blgwgly8cqvny74jgkkcg"; depends=[data_table dplyr Rcpp rlang stringr tibble]; };
   microsynth = derive2 { name="microsynth"; version="2.0.13"; sha256="1ijv7kbxl087m0wzdbzl9p74116dfwid03dlamy4b1l308azc4ag"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; };
@@ -10736,13 +11193,15 @@ in with self; {
   midasml = derive2 { name="midasml"; version="0.0.5"; sha256="1y591m0h1872i3bg40fzy5vgqv92v42sshb5pq0rbddp94kb4fm8"; depends=[doSNOW foreach lubridate optimx quantreg Rcpp RcppArmadillo]; };
   midasr = derive2 { name="midasr"; version="0.7"; sha256="02kjyzbznmy0362ambnnh8vc7ywbgikk3n7705sww9p0k0pywrrx"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; };
   midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; };
-  midrangeMCP = derive2 { name="midrangeMCP"; version="3.1"; sha256="1d5x86xzs3b0g7ibg6i9dwg4w5kgjas3i2llrhvjk6h3w9knm0m4"; depends=[SMR tkrplot writexl xtable]; };
-  migest = derive2 { name="migest"; version="1.8.2"; sha256="19rsh2hff003rpql1fxhykhdmsmkdyx28y9ld8p1686spy6m4n74"; depends=[dplyr magrittr purrr stringr tibble tidyr]; };
+  midrangeMCP = derive2 { name="midrangeMCP"; version="3.1.1"; sha256="1yfwyglyxxk4i914m8n148cjydlcg7r16zl8acb1w8h963svirk9"; depends=[SMR writexl xtable]; };
+  migrate = derive2 { name="migrate"; version="0.3.0"; sha256="064f2bmhl0f841pkgdzpcn9k50192vmbfngdy7wg9a0h0jb40ga4"; depends=[crayon dplyr magrittr rlang stringr tibble tidyr]; };
   migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
   migrbc = derive2 { name="migrbc"; version="2.0.9"; sha256="1nbxdm70a9lvbp4sw78719hdpbqnziw1y7r4xk8i390q2c195am1"; depends=[dplyr futile_logger lubridate Rcpp stringr]; };
   migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; };
+  miic = derive2 { name="miic"; version="1.5.3"; sha256="1wrvgzi91jirn5n5fvvbhhpcga7l75h149sz1g1r1wbci181l3bg"; depends=[ppcor Rcpp scales]; };
+  mikropml = derive2 { name="mikropml"; version="0.0.2"; sha256="0qgycgk0rw2bp3kbv4n42nidgkhjgd2114cc23lk178qm28r17nd"; depends=[caret dplyr e1071 glmnet kernlab MLmetrics randomForest rlang rpart xgboost]; };
   milorGWAS = derive2 { name="milorGWAS"; version="0.3"; sha256="1z44sbs3lmrx32wagk5rr3rc2k8iqq860fz0bi983llmgmhaqdxn"; depends=[gaston Rcpp RcppEigen]; };
-  milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; };
+  milr = derive2 { name="milr"; version="0.3.1"; sha256="03hihr1w5j0mlvi5vm9m5vb9i6nyb6lsji3xmv0chpczabd85mzy"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; };
   mime = derive2 { name="mime"; version="0.9"; sha256="107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc"; depends=[]; };
   mimi = derive2 { name="mimi"; version="0.2.0"; sha256="1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh"; depends=[data_table doParallel FactoMineR foreach glmnet rARPACK softImpute]; };
   mimsy = derive2 { name="mimsy"; version="0.6.2"; sha256="01dy1fryrgq07jdfnxcnks97h0gq632dvqk7hnfs0f5fnx0k0vvf"; depends=[dplyr lubridate magrittr openxlsx]; };
@@ -10752,15 +11211,14 @@ in with self; {
   mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; };
   mined = derive2 { name="mined"; version="1.0-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; };
   minerva = derive2 { name="minerva"; version="1.5.8"; sha256="0k4ww3qfqrsnkccxk9dyq39xrc42g8gvj5g8drglg4fyci7jfs9h"; depends=[Rcpp RcppArmadillo]; };
-  miniCRAN = derive2 { name="miniCRAN"; version="0.2.13"; sha256="1pi474kphicflr45rbvy4dha7wjiq9zy39dyagf9xmwp6y5qivsi"; depends=[assertthat httr igraph]; };
+  miniCRAN = derive2 { name="miniCRAN"; version="0.2.14"; sha256="1i1rf97m7c8x65rfy8c26l0kbl4zq7ha1f9yi413fk9jlngxajj3"; depends=[assertthat httr igraph]; };
   miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; };
   miniMeta = derive2 { name="miniMeta"; version="0.2"; sha256="03r6xwcgchw42irqr8jy5hsbv8brk6f77h4zi9qhhz3zmkryjbw2"; depends=[colourpicker jsonlite markdown meta metafor readxl rhandsontable shiny shinyjs shinyWidgets WriteXLS]; };
   miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; };
-  minidown = derive2 { name="minidown"; version="0.0.1"; sha256="13f2liyq3yqc6n066dkbjc08viiirn4ksnpjcs1crmn8pkdmbl3s"; depends=[htmltools rmarkdown]; };
+  minidown = derive2 { name="minidown"; version="0.0.2"; sha256="1id4fnnxhaiva5jb44cmabdz376sy4322y81lrimp2n9q34r0yfh"; depends=[htmltools knitr rmarkdown xfun]; };
   minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; };
   minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; };
   minimax = derive2 { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
-  minimaxdesign = derive2 { name="minimaxdesign"; version="0.1.4"; sha256="0ylr3i0c5d9apk6ggpy1jjfjkk8qlqm0s4qxiq56r2mf3p44yzl6"; depends=[conf_design DiceDesign DoE_base doParallel doSNOW foreach FrF2 gmp gtools jpeg MaxPro nloptr pdist randtoolbox Rcpp RcppArmadillo]; };
   minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; };
   minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; };
   minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
@@ -10770,11 +11228,11 @@ in with self; {
   mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; };
   mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; };
   miraculix = derive2 { name="miraculix"; version="0.9.20"; sha256="0s5r7ikym3s85706wznfc3lh3ap95pv1p2796bi1n19ivd671myc"; depends=[RandomFieldsUtils]; };
-  mirt = derive2 { name="mirt"; version="1.32.1"; sha256="023mik3s61f452v6kk639jxp53pzg1qg2aar7azfd3jx4szppz3m"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
+  mirt = derive2 { name="mirt"; version="1.33.2"; sha256="06m76xcfyffhfxk8wjyfaqnhb56bxhr19brm3556kfds2v75wnlm"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
   mirtCAT = derive2 { name="mirtCAT"; version="1.10"; sha256="1wf4m4m3lyd57hy0v5jsci2k8cgzl087svpccmhxvp1chfjn7iw2"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   mirtjml = derive2 { name="mirtjml"; version="1.4.0"; sha256="1zvm8acywpzi87lz0hpxmr8c9kyqkbx0490q3vlwxd90ffcdp9ml"; depends=[GPArotation Rcpp RcppArmadillo]; };
-  misaem = derive2 { name="misaem"; version="1.0.0"; sha256="0vylcfqwngbyli88ba63nxf2gqlcbfmjyrghkz34zdch7cdz75rk"; depends=[MASS mice mvtnorm norm]; };
-  misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
+  mirtsvd = derive2 { name="mirtsvd"; version="1.0"; sha256="0c06dpg0jr15hmk03s96fyp2rb6z4svihjzfs316nkl3dd03ami1"; depends=[GPArotation mirtjml]; };
+  misc3d = derive2 { name="misc3d"; version="0.9-0"; sha256="10jf5r1x588vi54bzaqgi9mgcqlkiga2c3jvmqmk3lavc8fjksd1"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-5"; sha256="0g6wk2zxqq6j949hnbvwmfd72y25zjfbrfrfxsj21q84w41fgjkb"; depends=[MASS MCMCpack mvtnorm R2jags]; };
   miscFuncs = derive2 { name="miscFuncs"; version="1.3"; sha256="0wn7i9656km53wlml360qgpzqxlv1jsjnh4swhqgf5dyjva8i141"; depends=[mvtnorm roxygen2]; };
   miscIC = derive2 { name="miscIC"; version="0.1.0"; sha256="0pnwc3b318xxnmb7scrj4qkqlvqfyczspdg496kl0ixsiaafr1ad"; depends=[nnls]; };
@@ -10786,24 +11244,27 @@ in with self; {
   miselect = derive2 { name="miselect"; version="0.9.0"; sha256="0dfqni7r5zwdvwmrmvqhycmxhazivz6vnz2ccjy0hyfad29g0v7s"; depends=[]; };
   mispr = derive2 { name="mispr"; version="1.0.0"; sha256="166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx"; depends=[e1071 MASS penalized]; };
   misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; };
-  missDeaths = derive2 { name="missDeaths"; version="2.6"; sha256="0biynl5n04yz0dr5r4py4a3f5l9faaxfb1bhy2pk6k8l2ayl060q"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; };
+  missCompare = derive2 { name="missCompare"; version="1.0.3"; sha256="03j69xw54d076znx19dplw4xznvgky90hxh3wgypg0g5pjg63y53"; depends=[Amelia data_table dplyr ggdendro ggplot2 Hmisc ltm magrittr MASS Matrix mi mice missForest missMDA pcaMethods plyr rlang tidyr VIM]; };
+  missDeaths = derive2 { name="missDeaths"; version="2.7"; sha256="1c8vbc7r1g4dkngmal6iqg7piw656h1vc6cmpkv16vjn4j0w2n2c"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; };
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
-  missMDA = derive2 { name="missMDA"; version="1.17"; sha256="1bpl55kwkwnq4d5dy6q2ckr9074viirmc2x9k9mf83nky8z0pmz6"; depends=[doParallel FactoMineR foreach ggplot2 mice mvtnorm]; };
+  missMDA = derive2 { name="missMDA"; version="1.18"; sha256="1s7ph89y0mrksdi73nnjnxl2354401ny8ziijzf036rcsiyvl8m5"; depends=[doParallel FactoMineR foreach ggplot2 mice mvtnorm]; };
   missMethods = derive2 { name="missMethods"; version="0.2.0"; sha256="0rsx7fdg0k8ajpj81ybl2jc9s8sprc2si6zx7mkvcqgw9iacrdik"; depends=[]; };
   missRanger = derive2 { name="missRanger"; version="2.1.0"; sha256="06ic99zg91ikzvmwbj05ma46rc4ayfwylv8cnj21sbr5nxw0qpz9"; depends=[FNN ranger]; };
-  missSBM = derive2 { name="missSBM"; version="0.2.1"; sha256="00jxj1f7hr78srlm49finf9j2q14y1cl66rwdkm1i81l8db5fvcp"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo]; };
+  missSBM = derive2 { name="missSBM"; version="0.3.0"; sha256="0dmmci35nriy0rxkrcn2rz93nndz836dbil9yfpdz3zvp1pyihdj"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo rlang sbm]; };
   missingHE = derive2 { name="missingHE"; version="1.4.1"; sha256="1bxpp88rwnv4fc9lm606cczj1dx63p507sqsr71dblgsfw3aw7xy"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggpubr ggthemes gridExtra loo mcmcplots mcmcr R2jags]; };
   mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; };
-  mistr = derive2 { name="mistr"; version="0.0.3"; sha256="00pq56zlp27wsa88830pwqx1s2m3x7klzaw96jan8mp3r7hwskr4"; depends=[bbmle]; };
+  mistr = derive2 { name="mistr"; version="0.0.4"; sha256="0jb0qmraghn8gy1bxmfh0jnbfp0b38bxidl0cxkxg9lbfmi0irlq"; depends=[bbmle]; };
   mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
   misty = derive2 { name="misty"; version="0.3.2"; sha256="17fqkxl9kmkjzl6axgrgk17j5ah8l1f29mf399ak3vhaccvblaqi"; depends=[haven lavaan lme4 readxl]; };
   mitml = derive2 { name="mitml"; version="0.3-7"; sha256="0yqyxkyi1kmv5k63wxj5kkg5g8igk1axk2csb4xhj6wz0p89dxy6"; depends=[haven jomo pan]; };
   mitools = derive2 { name="mitools"; version="2.4"; sha256="0c2x2n1p53lcw0vx4vmy5j7m2f95i7g2iwbryl89imr99rvz617j"; depends=[DBI]; };
+  mitre = derive2 { name="mitre"; version="0.1.1"; sha256="1vcagpj1pibnzl66x4hppx9lhawssv869pfdgsm43sspvg63z3gr"; depends=[curl dplyr jsonlite plyr visNetwork]; };
   mix = derive2 { name="mix"; version="1.0-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; };
   mixAK = derive2 { name="mixAK"; version="5.3"; sha256="12vhg3qaz39hcc581gn0wfmcxj1yhggcsqic4ngy4gpmrg27yls0"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
   mixAR = derive2 { name="mixAR"; version="0.22.4"; sha256="1pd6885113i9d2vwxmcvls6q8lpcjbajm88s5zvdrm0rqri5kahk"; depends=[BB combinat e1071 fGarch gbutils MCMCpack mvtnorm permute Rdpack timeDate]; };
+  mixComp = derive2 { name="mixComp"; version="0.1-1"; sha256="1mcpjsvdzklzlvnnw9gi0vzz0awmahgvda0vf90v4ixggy64mncg"; depends=[boot cluster expm kdensity matrixcalc Rsolnp]; };
   mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; };
-  mixIndependR = derive2 { name="mixIndependR"; version="0.2.1"; sha256="0m858jjspkacfyxikisqij4d5ipz6fklgcczxzh7i4kv248p43w3"; depends=[stringr]; };
+  mixIndependR = derive2 { name="mixIndependR"; version="0.4.3"; sha256="0kx7fh0gmxcvq27c6c40s5k2wsg84fxckqnw5aknr7v2mj8rbpcg"; depends=[data_table]; };
   mixKernel = derive2 { name="mixKernel"; version="0.4"; sha256="0bqa4inim7819pl3dr2kfzdvv7phqkjqfx3zal8mmxcjpkpxs4mf"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog reticulate vegan]; };
   mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
   mixR = derive2 { name="mixR"; version="0.1.1"; sha256="1xd3v5rk59380zh7r6l5blmcy4gib9xp44j5dcrk6ivs6fgycsxh"; depends=[ggplot2 Rcpp]; };
@@ -10812,30 +11273,31 @@ in with self; {
   mixSPE = derive2 { name="mixSPE"; version="0.1.1"; sha256="103lr74wryrk7sakss9cn774fjwy5xqc4hrcr7ig6m0dzyx4gqzl"; depends=[mvtnorm]; };
   mixcat = derive2 { name="mixcat"; version="1.0-4"; sha256="19v6y981js18xz9q49slclkhcf6w53iar55ynjs0lvhn1y1b2517"; depends=[statmod]; };
   mixchar = derive2 { name="mixchar"; version="0.1.0"; sha256="1az2gggwipkzg86pvn9w2csgfgrpdc88kca51f5qcw0zk4wx5hlx"; depends=[minpack_lm nloptr tmvtnorm zoo]; };
+  mixcure = derive2 { name="mixcure"; version="2.0"; sha256="0jjbamn53iqrrx658wk3cz43grsbn1275p81256h4lia35s7cww3"; depends=[boot flexsurv gam survey survival timereg]; };
   mixdir = derive2 { name="mixdir"; version="0.3.0"; sha256="1vgxxzsrl660agk4cjw4q4gx28fv5mkzpjy4qanq5c9mqpcxbxkc"; depends=[extraDistr Rcpp]; };
   mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; };
-  mixedClust = derive2 { name="mixedClust"; version="1.0.1"; sha256="1izbij6l3rnq8gvv5b53jcvdpi42kwwybdqak43y0nlb2rhvdq95"; depends=[fda Rcpp RcppArmadillo RcppProgress]; };
-  mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; };
+  mixedCCA = derive2 { name="mixedCCA"; version="1.4.3"; sha256="0gpnds4rngl02q709igz1nh2zsfw2rnjflanrh0850ncidjld1zq"; depends=[chebpol fMultivar irlba MASS Matrix mnormt pcaPP Rcpp RcppArmadillo]; };
+  mixedMem = derive2 { name="mixedMem"; version="1.1.2"; sha256="1p0gplfcn663xp40dk0yg70qffn1fwa9gxv7bppflgm9wkn8g3l5"; depends=[BH gtools Rcpp RcppArmadillo]; };
   mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; };
   mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; };
   mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; };
-  mixl = derive2 { name="mixl"; version="1.2.2"; sha256="05xljpr09dmqbp6rm9bj84677sh8n7v718xq0g16d2z1lazll3ri"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; };
+  mixl = derive2 { name="mixl"; version="1.2.3"; sha256="1wy88lxkxd7fhchfqbciccj3ag5sks0iwhlfpqk2ddqviibar3nd"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; };
   mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
   mixlm = derive2 { name="mixlm"; version="1.2.4"; sha256="0jwz918qnz1p71y82ayrgir9rpij8zk3jgmn63nq5xrlf0jbjcdd"; depends=[car leaps multcomp pls pracma]; };
-  mixmeta = derive2 { name="mixmeta"; version="1.0.8"; sha256="1wx95pgd096d359n5mrl98hpwc2c1r2jw3pzvilkawx0y8lw68na"; depends=[]; };
+  mixmeta = derive2 { name="mixmeta"; version="1.1.0"; sha256="08llrd7pj8grz2hhvsyjf8r0qw9534bg327ls27g2kzm475b5kny"; depends=[]; };
   mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; };
   mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
-  mixsmsn = derive2 { name="mixsmsn"; version="1.1-7"; sha256="1xw8bxkivp50ax0ygsravmzmksdqqg9fdm3hwpl39ikhj0cpa7zr"; depends=[mvtnorm]; };
+  mixsmsn = derive2 { name="mixsmsn"; version="1.1-8"; sha256="102lsr55bqfvv389wd07k3jqc5kpzvfmm5rpx23rb8rqw42wkffh"; depends=[mvtnorm]; };
   mixsqp = derive2 { name="mixsqp"; version="0.3-43"; sha256="1qics04w0swyp216d6g8dmsph8q2kpadpacp66h2qih3521js12q"; depends=[irlba Rcpp RcppArmadillo]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
   mixtools = derive2 { name="mixtools"; version="1.2.0"; sha256="08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg"; depends=[kernlab MASS segmented survival]; };
   mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; };
-  mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; };
-  mize = derive2 { name="mize"; version="0.2.3"; sha256="1rc3mhcwidmfbkfyxwldm9hg25lh7a81jlj2zv45vsj5hbrmvk6c"; depends=[]; };
-  mizer = derive2 { name="mizer"; version="2.0.3"; sha256="1m7gh9gi0y0492dlcyr283r6ccw5v0yfikbby8jlmg0d6lq9jj2s"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; };
+  mixture = derive2 { name="mixture"; version="1.5.1"; sha256="11b2a5kik70g9v4hx9v8j90crjfqhlxghgc12isnk79jh86v3myk"; depends=[]; };
+  mize = derive2 { name="mize"; version="0.2.4"; sha256="1dfhldxsm1il9avfxvaiir9r878dp7swyc9c8ilm6llx208sd5d5"; depends=[]; };
+  mizer = derive2 { name="mizer"; version="2.0.4"; sha256="0wkysh21a2msi3z1vl9fbrnvvad3jqhjyc7jgb438vqcqdrsszr0"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; };
   mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
-  mkin = derive2 { name="mkin"; version="0.9.50.2"; sha256="10c729r9q896ryjbjv2lccsajlrz4nyf28ahpzgkagl9rcwwwhiz"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; };
+  mkin = derive2 { name="mkin"; version="0.9.50.3"; sha256="0vycbky2gyqpyf6avk47l8lcmc8pfzjimd6iprh3lnl0j7p133lg"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; };
   mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; };
   mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
   mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
@@ -10848,55 +11310,63 @@ in with self; {
   mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; };
   mleap = derive2 { name="mleap"; version="1.0.0"; sha256="1abdab96wgybfgfbcai657hrbkn3kprxqw3ww415vpg2xhi8p905"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
-  mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; };
-  mlergm = derive2 { name="mlergm"; version="0.6"; sha256="10pg2jbh4g764hl2wzscml5lrnw1hxbsj6ggyj2dnf6igz7naaxh"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; };
+  mlegp = derive2 { name="mlegp"; version="3.1.8"; sha256="1sbdk3pybzhv2jycl56s6m86pp3qbfh8q0kmhn153130b84dzhga"; depends=[]; };
+  mlergm = derive2 { name="mlergm"; version="0.7"; sha256="1z757h5n8npl57c0wvh8njqbn0qdbwlc4c4gi03wzrn94vklb9ql"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
   mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; };
-  mlflow = derive2 { name="mlflow"; version="1.10.0"; sha256="028ckirgv8ncqgfyvydyz2llhlgdlidm5xz326akqxiq44j7j55m"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; };
+  mlflow = derive2 { name="mlflow"; version="1.12.1"; sha256="1pj27zpfhac7cf7hi313az1ygfpnhffc4424f8ncdfb721i57chr"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; };
   mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
   mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
   mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; };
-  mlma = derive2 { name="mlma"; version="5.1-0"; sha256="0y1xyjxr8gx67096sifam4ls5qrgvxvnh1rrg6myyrdzgxf9c0sa"; depends=[abind car gplots lme4]; };
+  mlma = derive2 { name="mlma"; version="6.0-0"; sha256="1hgfdlrk19ywdz36k55mmb8km185rnl96wykbb19gahgyp4bny1p"; depends=[abind car coxme gplots lme4 survival]; };
   mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; };
   mlmi = derive2 { name="mlmi"; version="1.0.0"; sha256="08sm836y40af3jd5gcl5pnyv1gqpx4ngkkw4xfp82h1j4yk47sy5"; depends=[cat gsl MASS Matrix mix norm]; };
   mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.6"; sha256="14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1"; depends=[coxme Matrix multcomp multcompView sommer]; };
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
-  mlogit = derive2 { name="mlogit"; version="1.1-0"; sha256="19ibklkjc1cqi7fyi8hsmzb317c8pxmh9689zpyfgwc39cwb48j6"; depends=[dfidx Formula lmtest MASS Rdpack statmod zoo]; };
+  mlogit = derive2 { name="mlogit"; version="1.1-1"; sha256="0hyi6gi03n895iydrfr1ba2ifbsd6lyjyhkq62d95ghhniysjgkg"; depends=[dfidx Formula lmtest MASS Rdpack statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
-  mlr = derive2 { name="mlr"; version="2.17.1"; sha256="0fwjl5dy516vrh2lx5rgps85q0jz8ka5dx61bz7lfxk21k8bjw8b"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
-  mlr3 = derive2 { name="mlr3"; version="0.5.0"; sha256="0prrc8v60wf4493srshwj87ll6c2g582k6v6ax3mir1dsgrrphyf"; depends=[backports checkmate data_table digest future_apply lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; };
-  mlr3data = derive2 { name="mlr3data"; version="0.2.0"; sha256="01bgbzszplay0miphlfxw6xbr0kgj2919zgfnd1zq21fm5b7qzi5"; depends=[]; };
-  mlr3db = derive2 { name="mlr3db"; version="0.1.5"; sha256="09hins00pc569vz26mkyg3736vhl01szl8hbwp2vyrh3mdn21c9m"; depends=[backports checkmate data_table digest dplyr mlr3 R6]; };
-  mlr3filters = derive2 { name="mlr3filters"; version="0.3.0"; sha256="1yr3mdjv9yg9xgf3hq0p2ymhrphfckjxmgda9cyv3d0p6hgvx9ll"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; };
-  mlr3learners = derive2 { name="mlr3learners"; version="0.2.0"; sha256="1r9f31wlhqwpslb2sgj6x3akggqdmnglb3s44zfhy6mqi1fwdgxn"; depends=[data_table mlr3 mlr3misc paradox R6]; };
-  mlr3measures = derive2 { name="mlr3measures"; version="0.2.0"; sha256="1dw8w1g92zq66daf1argl27983yfl6ijdl4dy2ihc05nld8n860s"; depends=[checkmate]; };
-  mlr3misc = derive2 { name="mlr3misc"; version="0.5.0"; sha256="0pyk3hgmrrkgza840pwi2yfk06xs0qqp481wwf62knzjs8jbbc16"; depends=[backports checkmate data_table R6]; };
-  mlr3oml = derive2 { name="mlr3oml"; version="0.1.0"; sha256="1k694ilgp09cxcs69rc6lg9i5pss7vskb400fjyakbxl7isb8xy2"; depends=[backports checkmate curl data_table jsonlite lgr mlr3 mlr3misc R6 stringi]; };
-  mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.2.1"; sha256="1dzq6yb6amk1xhg4345inkcl253pwdr5zs2l0kpycw3qv5kr00n7"; depends=[backports checkmate data_table digest lgr mlr3 mlr3misc paradox R6 withr]; };
-  mlr3proba = derive2 { name="mlr3proba"; version="0.2.0"; sha256="1mync64qzqqndyvzfqz3llhp39dmphx5xa6j8zv2yzh4w5dmxwjw"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 Rcpp survival]; };
+  mlpack = derive2 { name="mlpack"; version="3.4.2.1"; sha256="0fqpajcmqn9rijzjg7qj0zd2lik4xmhp5dmhbm3mdc9ssdg0axbr"; depends=[BH Rcpp RcppArmadillo RcppEnsmallen]; };
+  mlquantify = derive2 { name="mlquantify"; version="0.1.4"; sha256="1k2f8h3rcjrmk8y1zaxjh0kvcvcvqjjyn1m6mabsya2jiqhgcxmi"; depends=[caret randomForest]; };
+  mlr = derive2 { name="mlr"; version="2.18.0"; sha256="1lzqqypzbl6sim0ds4igvf3qss2i41sa228cpd65ybnk1vlp9zn2"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
+  mlr3 = derive2 { name="mlr3"; version="0.9.0"; sha256="0gg7rrzxwrnpg6sgm0aa6bmfwmqv3d3za0ghnqrnibg33p9ynpgb"; depends=[backports checkmate data_table digest future_apply lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; };
+  mlr3benchmark = derive2 { name="mlr3benchmark"; version="0.1.1"; sha256="05jwjf8l157kbhgyajzllbwjf7869gr4ncvzvqz834j5iymkwwx8"; depends=[checkmate data_table ggplot2 mlr3misc R6]; };
+  mlr3cluster = derive2 { name="mlr3cluster"; version="0.1.1"; sha256="15jaydpsdwpz6mmqqilx9vzz7ycs8h6cyw18i2hz8ikhwwp9nsbi"; depends=[backports checkmate clue clusterCrit data_table mlr3 mlr3misc paradox R6]; };
+  mlr3data = derive2 { name="mlr3data"; version="0.3.0"; sha256="0r62h0a1hlbgvm2y0dghh978n28b0ydj4az26hixmy5m7dv00b66"; depends=[]; };
+  mlr3db = derive2 { name="mlr3db"; version="0.3.0"; sha256="15ksnln8lvrfbs9k3apvczsvlq727x7q4f7r6ajl0590w8ka2ms4"; depends=[backports checkmate data_table digest mlr3 mlr3misc R6]; };
+  mlr3filters = derive2 { name="mlr3filters"; version="0.4.0"; sha256="05j35hlc2w4x3cv59qw35qcamp7smvki898nhhryiybwyyv4d464"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; };
+  mlr3fselect = derive2 { name="mlr3fselect"; version="0.4.1"; sha256="15zxkfp95f6yjzcw4gvp0jbzc9fncrxbzj3g5i1ivr7c9wzhjmwq"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3pipelines paradox R6]; };
+  mlr3hyperband = derive2 { name="mlr3hyperband"; version="0.1.1"; sha256="0h0mxfnibpc3ch7x0nqyirh994nmjs150mmmxdkmwiqzks9snc94"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6]; };
+  mlr3learners = derive2 { name="mlr3learners"; version="0.4.3"; sha256="1wxlpzz3hpkn77n4ag1v868dmp140j1pmrhynsv5xfgk9fg0w7ri"; depends=[data_table mlr3 mlr3misc paradox R6]; };
+  mlr3measures = derive2 { name="mlr3measures"; version="0.3.0"; sha256="106lfaxphz0kh96ddq14hic7wvxjqp871zdp9kkkfk1kwfg35abw"; depends=[checkmate PRROC]; };
+  mlr3misc = derive2 { name="mlr3misc"; version="0.6.0"; sha256="1q63i2059bf7cf61kwm0dqnk5vd60i0j4flziswwdk07fjxqh8xr"; depends=[backports checkmate data_table R6]; };
+  mlr3oml = derive2 { name="mlr3oml"; version="0.4.0"; sha256="1z5hn7a7sg7xs4d155rn3ikb7h9d6z0zj1j3c3kmnx7qp2mlcvgq"; depends=[backports checkmate curl data_table jsonlite lgr mlr3 mlr3misc R6 stringi]; };
+  mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.3.2"; sha256="1x738b312mcvb0dif88sv4nlh3y6i47q0wagc5ggyh1hnqjiz71y"; depends=[backports checkmate data_table digest lgr mlr3 mlr3misc paradox R6 withr]; };
+  mlr3proba = derive2 { name="mlr3proba"; version="0.2.6"; sha256="1ig6vr8iq0cnx4jx9v7dnvzyr68cxw0vwf97g86m09psxda6pzss"; depends=[checkmate data_table distr6 mlr3 mlr3misc paradox R6 Rcpp survival]; };
   mlr3shiny = derive2 { name="mlr3shiny"; version="0.1.1"; sha256="0jn5n6k1dq59g5m6pvpp964pcjv1mjbdbdz7dag7gs26g8c215jb"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; };
-  mlr3tuning = derive2 { name="mlr3tuning"; version="0.2.0"; sha256="1pm7glhc8a8syifa850hpac836ks3bi2kfcbw3d8zhmjk1g31l53"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; };
+  mlr3spatiotempcv = derive2 { name="mlr3spatiotempcv"; version="0.1.0"; sha256="0pj9ch76ljg4bsqsmd7gs1smldf38zv978vh8yiqljc3fbj8p40p"; depends=[checkmate data_table ggplot2 mlr3 mlr3misc paradox R6 testthat]; };
+  mlr3tuning = derive2 { name="mlr3tuning"; version="0.5.0"; sha256="1pn80qjxzj2pivgs6qgairci6yh1bdnl2zbgl9ykdip2rqzv6r6m"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; };
   mlr3verse = derive2 { name="mlr3verse"; version="0.1.3"; sha256="0hbzfcr1xwdyyf1jrxdrj4r1rzx15bj9s0pw5386zjwkvmdhp5c1"; depends=[mlr3 mlr3data mlr3filters mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3viz paradox]; };
-  mlr3viz = derive2 { name="mlr3viz"; version="0.2.0"; sha256="168q8lrjgwk51bxcc5njcvca3nkcn7q1yhfjx99zcnlbsd1zi4rr"; depends=[checkmate data_table ggplot2 mlr3misc]; };
-  mlrCPO = derive2 { name="mlrCPO"; version="0.3.6"; sha256="1z9s52y318wp43q7n28h89m5s58bcfawzj9zx03ji1adf68sk9ah"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
-  mlrMBO = derive2 { name="mlrMBO"; version="1.1.4"; sha256="007944cb6hz7rah0bk66mpfa22jinz9i224wljgnj0w51lpipbjv"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
+  mlr3viz = derive2 { name="mlr3viz"; version="0.5.0"; sha256="15yqzqk0wrd3vxv2m6rbv74j65nsl6xf46axi6ldcwzb2f25v6ml"; depends=[checkmate data_table ggplot2 mlr3misc]; };
+  mlrCPO = derive2 { name="mlrCPO"; version="0.3.7"; sha256="08gn57nvj6zvqqs4l686x8pc55dbp9i60shaq74y2br9diavaf9z"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
+  mlrMBO = derive2 { name="mlrMBO"; version="1.1.5"; sha256="1f2ryd0mrlnnwxgwiria2sxqkb09kskfqjzsh32cbxh6ml4d3fbs"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
   mlt = derive2 { name="mlt"; version="1.2-0"; sha256="0mjbnxkmv2pzwmwn249x21nfqb1v1ls3jah9a0vh6ndhz8c4gz7x"; depends=[alabama basefun BB coneproj nloptr numDeriv sandwich survival variables]; };
-  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-5"; sha256="1dp5h86bcga9lkc1hy5sbc3as0piyzxlz6z5iwli2a33ssyihxql"; depends=[mlt numDeriv]; };
+  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-9"; sha256="0jm6g4rk505ki3lasrrsq8lczb8wlyyd1phap3mqdh169rlacmah"; depends=[eha flexsurv lattice mlt multcomp np numDeriv survival truncreg]; };
   mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; };
   mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; };
   mlxR = derive2 { name="mlxR"; version="4.1.3"; sha256="1ma4kw4db9iyylly8y7kkz4bv2qfmqyy9ychv4yhra6123n4001x"; depends=[ggplot2]; };
-  mma = derive2 { name="mma"; version="10.3-2"; sha256="1r04x1dykq305d83xvxx5lbgvqfkspx0r4krqsg78av0njf4knqk"; depends=[car gbm gplots lattice plotrix survival]; };
+  mma = derive2 { name="mma"; version="10.5-0"; sha256="1n4p67s8vyaz3vj8f24lccg2mr4lmbqka6aj862bnzai9vljrjvq"; depends=[car gbm gplots lattice plotrix survival]; };
+  mmabig = derive2 { name="mmabig"; version="3.0-0"; sha256="032xphcrcwp9n3i8rcn4ipvvjmgh9qwmkdml40rx9fhg43qr31n1"; depends=[car glmnet gplots mma survival]; };
   mmand = derive2 { name="mmand"; version="1.6.1"; sha256="19s6v083iry95akhc2ccj617sjcddalb6dp87j3lqjlgybxws62q"; depends=[Rcpp]; };
   mmap = derive2 { name="mmap"; version="0.6-19"; sha256="0s3vlwdcwifl2a2byr0f2cc4vmbdparc55x889a3h115ga7k91w2"; depends=[]; };
   mmapcharr = derive2 { name="mmapcharr"; version="0.3.0"; sha256="175qb6ay6zlcdcxzc86lmlddfzjc8j8i1b8cvi2q0j6nbl2kl50r"; depends=[Rcpp rmio]; };
   mmaqshiny = derive2 { name="mmaqshiny"; version="1.0.0"; sha256="0v44hd7h9d8hdd2avwwwwc0a8rzm5ij3yhryxkrw7bwvr12zsp17"; depends=[Cairo caTools data_table dplyr DT ggplot2 htmltools leaflet lubridate plotly shiny shinyjs stringr XML xts zoo]; };
+  mmb = derive2 { name="mmb"; version="0.13.3"; sha256="07nni04fb0gprma368axzz303db12hp22fz1a0xwh3bbh6n7zb9g"; depends=[doParallel foreach Rdpack]; };
   mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; };
   mmcm = derive2 { name="mmcm"; version="1.2-8"; sha256="09xcvgzgg5x890jibmmbcd3rr8q8vmwxwk6s8zgn9a8hfdwqny9a"; depends=[mvtnorm]; };
   mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; };
   mmeln = derive2 { name="mmeln"; version="1.4"; sha256="0q5w3ajc1v798dyvryny2a0c52hzhxrjm4md08mqvww65pdzhqc4"; depends=[]; };
   mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; };
-  mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
   mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
   mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; };
   mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; };
@@ -10913,16 +11383,18 @@ in with self; {
   mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; };
   mnonr = derive2 { name="mnonr"; version="1.0.0"; sha256="143qkn3bx37a6r7kgmspqh55l2r8k9f93jgxr6qpg51w411k5ilb"; depends=[]; };
   mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
-  mnormt = derive2 { name="mnormt"; version="2.0.1"; sha256="00nn0b6nksn2jbpg0np5wphryp4f9v95vqxf5v628yysnawgkcwq"; depends=[tmvnsim]; };
+  mnormt = derive2 { name="mnormt"; version="2.0.2"; sha256="0d7ka4l4fl1wi77r2r81dc91n6cbj2xrb3lsizz5y0ziscva0sjw"; depends=[tmvnsim]; };
   mnreadR = derive2 { name="mnreadR"; version="2.1.4"; sha256="11mfpf12pjpgvcih6q8l9fwspj2gy78fcirimzv7gn061nr4v7sg"; depends=[dplyr ggplot2 nlme tibble tidyr]; };
   mnt = derive2 { name="mnt"; version="1.3"; sha256="1wf2mq4zdhznv589j7snw0gpnfrlvq6lhfihi2n20qlwm3lb9naa"; depends=[MASS pracma]; };
-  mob = derive2 { name="mob"; version="0.2.1"; sha256="12nzdp1d8qfisc5jqahb83jgif4zzbh9i0sblzs2knb87w886q95"; depends=[gbm Rborist]; };
+  mob = derive2 { name="mob"; version="0.3"; sha256="1hy7sj1qs6x6y066c1dpzqhs78bwf9dj7miiihvmkp5m4bd1h4wm"; depends=[gbm Rborist]; };
   mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; };
+  mobr = derive2 { name="mobr"; version="2.0.0"; sha256="09an5xwqkk95xn4fd1jpx0808y411rk6w05ni1w9l0n1zj407a45"; depends=[dplyr egg geosphere ggplot2 pbapply plotrix purrr rlang scales tibble tidyr vctrs]; };
   mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; };
   moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; };
   moc_gapbk = derive2 { name="moc.gapbk"; version="0.1.0"; sha256="0gg64srdb17dx712hilnlrii9i5vi9vjrk17acaynaz307akdw08"; depends=[amap doMPI doParallel doSNOW fields foreach matrixStats mco miscTools nsga2R plyr reshape2 Rmisc]; };
   mockery = derive2 { name="mockery"; version="0.4.2"; sha256="16zayzi2qdmiy513hvlci9f4p8jwry24006yfzrgmrvf6sf293lq"; depends=[testthat]; };
   mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; };
+  mockthat = derive2 { name="mockthat"; version="0.2.4"; sha256="1x0zvg8i9ryaj5g4cjh87l4w0d2a8gvskrzp2y382xy0lpq353m5"; depends=[]; };
   mod = derive2 { name="mod"; version="0.1.3"; sha256="0z5a6ps2m0cbw0n9kn44767m5jnbf1dl077i2p40fipv8xali9fb"; depends=[]; };
   mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; };
   modEvA = derive2 { name="modEvA"; version="2.0"; sha256="1vkg7x48k0xl1ngqwk6waggidva924j8mv7wfbzfcyj36yv8ggdw"; depends=[]; };
@@ -10934,21 +11406,24 @@ in with self; {
   modeLLtest = derive2 { name="modeLLtest"; version="1.0.3"; sha256="0hf7y78yp3jb0af9df3df6n1z66y2iyhhmgyfz12c4iadly0v6x1"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; };
   modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; };
   modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
-  model4you = derive2 { name="model4you"; version="0.9-5"; sha256="1l94196x594ff61f8iaywpmw9ra3g27bnlchjl14hb9h0l21vbgm"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
+  model4you = derive2 { name="model4you"; version="0.9-6"; sha256="1bz01hnk8lh1vsa6wnhzfhpznz3znzyljz7xp28x638s01l2fw4y"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
   modelDown = derive2 { name="modelDown"; version="1.1"; sha256="1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; };
   modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; };
-  modelStudio = derive2 { name="modelStudio"; version="1.2.0"; sha256="1r13c145g4jki1jspnab1jcaqxflkad376w5bd15q25r69n7svb2"; depends=[digest iBreakDown ingredients jsonlite progress r2d3]; };
-  modelbased = derive2 { name="modelbased"; version="0.1.2"; sha256="0440pckpw9vfbvvhxsikayb0b6k479icr2m9ps0yr0xph240x9hw"; depends=[bayestestR emmeans insight parameters]; };
+  modelStudio = derive2 { name="modelStudio"; version="2.1.0"; sha256="0cvr09av1c4z2j1qdic49j6cygrfcdahppdfr7d2avxmhswx1mhk"; depends=[DALEX digest iBreakDown ingredients jsonlite progress r2d3]; };
+  modelbased = derive2 { name="modelbased"; version="0.4.0"; sha256="1ihhg2xi94rzzvrlfzymf0q5hzxgd58s37jy7syqcv1yjrdpsawh"; depends=[bayestestR emmeans insight parameters]; };
   modelc = derive2 { name="modelc"; version="1.0.0.0"; sha256="0xz1zgv5yyvq0yfnhm1kvb4wvlyn4ccd0lkwji55vq8hndvjvk98"; depends=[]; };
-  modeldata = derive2 { name="modeldata"; version="0.0.2"; sha256="13q6hhbwqbwnjvg8bz6iwwfx96p1saqq3r34cjrbnpgzmr1nn11l"; depends=[]; };
+  modeldata = derive2 { name="modeldata"; version="0.1.0"; sha256="0lbvmicvhw560jn9qk5dywrl6mgj1rf7zh7p86lf97c6bmz0zp2r"; depends=[]; };
   modeldb = derive2 { name="modeldb"; version="0.2.2"; sha256="14s8xh05qxv414xcnww1b3s0jqwnjb3l1dqf7q1qbw33ilwcmsfb"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; };
   modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
   modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; };
-  modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; };
+  modelplotr = derive2 { name="modelplotr"; version="1.1.0"; sha256="0i1ssfcyl97zaxc9khdngrmsq9ydrmgv2nd7c6kc6i9z93jbkk4k"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; };
   modelr = derive2 { name="modelr"; version="0.1.8"; sha256="1i31nff7bqibk6r4hhd4j1vzwbyaf8493v0bjaagn36njmysfnw2"; depends=[broom magrittr purrr rlang tibble tidyr tidyselect vctrs]; };
-  modelsummary = derive2 { name="modelsummary"; version="0.5.1"; sha256="16d4626sr9xyhvs8pbls336drccy18sl8pa33f9gh0hqw9iwxcij"; depends=[broom checkmate dplyr generics ggplot2 gt Hmisc kableExtra knitr magrittr purrr rmarkdown stringr tables tibble tidyr]; };
-  modeltests = derive2 { name="modeltests"; version="0.1.2"; sha256="0m56awji87v710gx0rwgd2cgmnq78slfxarr05qy0piq4q9h7pqr"; depends=[dplyr generics purrr testthat tibble]; };
-  modeltime = derive2 { name="modeltime"; version="0.0.2"; sha256="0y52v5n0cv9x3ck25kgdf8sad02v2gida982ahrcm0vjxqxqm5ma"; depends=[dials dplyr forcats forecast ggplot2 glue gt hardhat janitor magrittr parsnip plotly progressr prophet purrr reactable rlang scales stringr tibble tidyr timetk workflows xgboost yardstick]; };
+  modelsummary = derive2 { name="modelsummary"; version="0.6.4"; sha256="1m8ab6fnq400vrf1mw96ry9d0bg34z3495f4z6blykpr49a5d2ng"; depends=[broom checkmate generics glue insight kableExtra parameters performance tables]; };
+  modeltests = derive2 { name="modeltests"; version="0.1.3"; sha256="1d5d53rp9aw426lhc10w6r60jmw6kdc66im6lmkps214pdy5crib"; depends=[dplyr generics purrr testthat tibble]; };
+  modeltime = derive2 { name="modeltime"; version="0.4.0"; sha256="1wxx5vf3x2las1pyq0pbfifcv6zf0b5gv6z3a7j0bj9cg9pb8mgm"; depends=[cli dials dplyr forcats forecast ggplot2 glue gt hardhat janitor magrittr parsnip plotly progressr prophet purrr reactable rlang scales slider StanHeaders stringr tibble tidyr timetk workflows xgboost yardstick]; };
+  modeltime_ensemble = derive2 { name="modeltime.ensemble"; version="0.3.0"; sha256="0masfnv1yi61aqlrgamwdrglgnqqd955fr4lpyjbrv9qvdiklm90"; depends=[cli crayon dials dplyr generics glmnet glue magrittr modeltime modeltime_resample parsnip progressr purrr recipes rlang rsample stringr tibble tictoc tidyr timetk tune workflows yardstick]; };
+  modeltime_gluonts = derive2 { name="modeltime.gluonts"; version="0.1.0"; sha256="1nivqpdyr2s6q70bixna0a18gbhrf1r20vm0gj8b51idjignwpp7"; depends=[dplyr forcats fs glue magrittr modeltime parsnip purrr reticulate rlang stringr tibble tidyr timetk]; };
+  modeltime_resample = derive2 { name="modeltime.resample"; version="0.1.0"; sha256="0qj6s0a2q6627vjfrh8k9fb4xq8dylvdnc4zyqdgpplrgypjqf9k"; depends=[cli crayon dials dplyr forcats ggplot2 glue magrittr modeltime parsnip plotly progressr purrr recipes rlang rsample stringr tibble tictoc tidyr timetk tune workflows yardstick]; };
   modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; };
   modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; };
   modernVA = derive2 { name="modernVA"; version="0.1.1"; sha256="1kjfgr7fcf0w27gx1wwapxcw5wisfv75mq9qc5hjnaivmsnkwsv3"; depends=[]; };
@@ -10959,28 +11434,30 @@ in with self; {
   modi = derive2 { name="modi"; version="0.1.0"; sha256="0v78vzb22v2h2qlfhsyi0d2j3c2gj3wgv67p6gv74269kiaglf92"; depends=[MASS norm]; };
   modifiedmk = derive2 { name="modifiedmk"; version="1.5.0"; sha256="171l3ls7icaanqf6jb64jabwq0mis2g1fswr0jfkpkrw5iw1c66q"; depends=[boot]; };
   modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
+  modmarg = derive2 { name="modmarg"; version="0.9.6"; sha256="1l57sqhv1xm5g3z9rdlhkkq6gpbn7a3z8bk4dhvzm44xcfv8hi3i"; depends=[]; };
   modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; };
   moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
   modules = derive2 { name="modules"; version="0.8.0"; sha256="1xzlnnl4ka9h4qwq4gg65pzhacq9ip6v347yrhms14c86a851k8k"; depends=[]; };
   modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; };
   moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; };
   mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; };
-  mokken = derive2 { name="mokken"; version="3.0.2"; sha256="16rgjnwvq397zxypacllpyhwz76i4b0m3jg6kzhr3zgsag1g62z3"; depends=[poLCA Rcpp]; };
+  mokken = derive2 { name="mokken"; version="3.0.4"; sha256="11j8zvb3l5fvp42kal4yn3rgm71r2jf9h8fr7aapbpd7j3j73pg0"; depends=[poLCA Rcpp]; };
   moko = derive2 { name="moko"; version="1.0.3"; sha256="1igrz0k9gfs4lmwh20bvmx8176d22g8gha7iv36mrpqgcynfdzh0"; depends=[DiceKriging emoa GenSA GPareto mco]; };
   molaR = derive2 { name="molaR"; version="4.5"; sha256="1mfb05cfg0jh60yxnmwhja6m38185r58kbz2ak0ikgaqd9lls07s"; depends=[alphahull rgl Rvcg]; };
   molic = derive2 { name="molic"; version="2.0.1"; sha256="0ling6rbccp0r3y3g8mlxd39hx8qgb3z1y82rjzsaamqwbzx7biz"; depends=[doParallel ess foreach ggplot2 ggridges Rcpp]; };
-  mombf = derive2 { name="mombf"; version="2.2.9"; sha256="0z7crgvl1c15s0pn6isa9i4phfsbhl6msc1jdbk88ckh09ilx0z7"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; };
+  mombf = derive2 { name="mombf"; version="3.0.1"; sha256="1a6rhjr8r0h80dp90q0vdmaszvl2wr6yid8yx9af4sxymh33lspr"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; };
   momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; };
-  momentfit = derive2 { name="momentfit"; version="0.1-1"; sha256="0nyfb8hg2akd0arla6qrz1f1lnlm0b30j945kfvbi8jjkbh2rpa2"; depends=[sandwich]; };
+  momentfit = derive2 { name="momentfit"; version="0.2"; sha256="1xh3w3bwr2k4a79vma5cmz0l995nwbih0j7sgv3bjqdv4fn463d1"; depends=[sandwich]; };
   moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
   momentuHMM = derive2 { name="momentuHMM"; version="1.5.1"; sha256="01s0nv37w7nzg4jpm94sxi2m9kxlswcr00l1fm1y1c6x1asx4hpq"; depends=[argosfilter Brobdingnag car CircStats conicfit crawl data_tree doParallel doRNG dplyr extraDistr foreach geosphere ggmap ggplot2 lubridate magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo rlang scatterplot3d sp survival]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
+  monaco = derive2 { name="monaco"; version="0.2.0"; sha256="0b49g5vn3g0i1c9h9yswnydp6lw4pl80q0c2mncca2n6rwr4wzxk"; depends=[htmltools htmlwidgets rstudioapi shiny]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-  mongolite = derive2 { name="mongolite"; version="2.2.0"; sha256="1q9vj5jhvwvzjjcaanyj6zhmplyk7rmibp4hvyabp9lpig2clnsm"; depends=[jsonlite mime openssl]; };
+  mongolite = derive2 { name="mongolite"; version="2.2.1"; sha256="05qshdd9f5kpsas84khnawbin89k6xi54mayynqjgdy7xcy5wx8b"; depends=[jsonlite mime openssl]; };
   monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; };
-  monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; };
   monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; };
-  monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; };
+  monoClust = derive2 { name="monoClust"; version="1.2.0"; sha256="01gg2ppqy0pfdnl20lkkmiiz4k34r3nwr5zzcl3gq2vci887777l"; depends=[cluster doParallel dplyr foreach ggplot2 permute purrr rlang stringr tibble tidyr]; };
+  monographaR = derive2 { name="monographaR"; version="1.2.1"; sha256="09fkcw13h7dx7j5vyp48fk6yzv9n64568zf2zvmm2c008jw3gkbm"; depends=[circular maptools png raster rmarkdown sp]; };
   monomvn = derive2 { name="monomvn"; version="1.9-13"; sha256="1hm5qf28bh0q7f4zcjqx1qxw3l8hzkx349c1y3nwyfg7436vff6a"; depends=[lars MASS mvtnorm pls quadprog]; };
   monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; };
   monotonicity = derive2 { name="monotonicity"; version="1.3.1"; sha256="0bb6sl8yykry25a86qfggi36ggr1xrxcqsnzp6rb6na228hbwa2z"; depends=[lmtest MASS sandwich]; };
@@ -10990,38 +11467,38 @@ in with self; {
   moreparty = derive2 { name="moreparty"; version="0.2.0"; sha256="0wds0223aqpflzmid9mdzszh1yrylqq68cqw5fj4yz0c1vwvfixh"; depends=[foreach ggplot2 iml MASS measures party partykit pdp plyr rlang varImp vip]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
   morpheus = derive2 { name="morpheus"; version="1.0-1"; sha256="1zfx24ndlky0b6vg6an9vcjw955ms749dwb51x9gsj2m8vgrbpnn"; depends=[jointDiag MASS pracma]; };
-  morphomap = derive2 { name="morphomap"; version="1.2"; sha256="1c01vs0jd171cbs0s6x67cjdla49bzhjbb704slbqili413wlxfm"; depends=[Arothron colorRamps DescTools geometry lattice mgcv Morpho oce raster rgdal rgl Rvcg sp]; };
-  morse = derive2 { name="morse"; version="3.2.5"; sha256="1y3daw8ccn0n61kj6lj6m3m4pfj936k786d385lyq05211rkdgqr"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
-  mortAAR = derive2 { name="mortAAR"; version="1.0.2"; sha256="047xagjmqj6sla0zlz0ljdivggkv04i45yn7637a33ni1pmb83al"; depends=[magrittr Rdpack reshape2]; };
-  mosaic = derive2 { name="mosaic"; version="1.7.0"; sha256="19v5z0sd9zilzhzx6vqzfav3s743h93f13cz06qrafyvdgl2ic93"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra leaflet MASS Matrix mosaicCore mosaicData readr rlang tidyr]; };
-  mosaic_find = derive2 { name="mosaic.find"; version="0.1.1"; sha256="03ls5kd6f02rrj44kmdf4a70zflxz27m7hcxgh8lzhkp8dn0sgkn"; depends=[minpack_lm]; };
+  morphomap = derive2 { name="morphomap"; version="1.3"; sha256="12jqrabx8vgkrfwcv4845jbf79ibg5iqzzzr4x4vybb4b2p2wd2i"; depends=[Arothron colorRamps DescTools geometry lattice mgcv Morpho oce raster rgdal rgl Rvcg sp]; };
+  morse = derive2 { name="morse"; version="3.2.7"; sha256="1dqh5wjjdi0mskrig755dsfmcabd95zmck4d18g3ir07jq7w4zh8"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
+  mortAAR = derive2 { name="mortAAR"; version="1.1.0"; sha256="0xdiipxyfninknagn19xm1p4aqmwrz9c5zkxi49bbgrvv0742cfq"; depends=[crayon magrittr Rdpack reshape2 tibble]; };
+  mosaic = derive2 { name="mosaic"; version="1.8.2"; sha256="08jrdi8y2xk5fjp2zdwfbj2cymd0m70kjjyyx57dsdgzppqajhcf"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel ggridges ggstance glue gridExtra lattice latticeExtra leaflet MASS Matrix mosaicCore mosaicData readr rlang tidyr]; };
+  mosaic_find = derive2 { name="mosaic.find"; version="0.1.2"; sha256="1fzgksh8sp701qjfrvjl2bg967qjkjpilxsfkrazhw71cgmzjgjl"; depends=[minpack_lm]; };
   mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.1"; sha256="0w5j7q314hzfzaw24ych2dhn255lnn3w0x4xr47qc1zclbmbny91"; depends=[ggformula magrittr MASS mosaic mosaicCore rlang]; };
-  mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; };
-  mosaicData = derive2 { name="mosaicData"; version="0.18.0"; sha256="0cx5dg26ha7nzkdyghkbbd6ikncj60qv1538az77lfgn2jylvkbz"; depends=[]; };
+  mosaicCore = derive2 { name="mosaicCore"; version="0.8.0"; sha256="00va6x1i8d3wkm1bgsms9dsjfn5a1l43prpl9pqirgq3zm85hrqj"; depends=[dplyr MASS rlang tidyr]; };
+  mosaicData = derive2 { name="mosaicData"; version="0.20.1"; sha256="05mrwvs7awhpv2gvk0jjva74gndfgh2cl17slxcjhwlpga8nmxji"; depends=[]; };
   mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; };
   mosmafs = derive2 { name="mosmafs"; version="0.1.2"; sha256="04syr5qr91hyv1m5hfrjsriq0qgidaln06m7f3jgc1qyrni930rw"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; };
   mosqcontrol = derive2 { name="mosqcontrol"; version="0.1.0"; sha256="199rkfisagr4kfx358f8yrbls00fng0kq8siyrbfwwf8qrba9fla"; depends=[assertthat magrittr NlcOptim nloptr pracma sfsmisc]; };
   mosum = derive2 { name="mosum"; version="1.2.3"; sha256="1xrrx0gaby5gbqssvhwracm8wny31lqzd64hkmr81s41z8srkxx9"; depends=[plot3D RColorBrewer Rcpp]; };
   motifcluster = derive2 { name="motifcluster"; version="0.1.1"; sha256="1a123djc476hf528h68f1l1sh47ljxh23hmp8j22fypiaci1a3av"; depends=[igraph LICORS Matrix RSpectra]; };
+  motifr = derive2 { name="motifr"; version="1.0.0"; sha256="01synariq39mzhx12jbcpwn982piakakl97sgs33xa8xrbwzcxgm"; depends=[dplyr ggplot2 ggraph igraph intergraph network purrr RColorBrewer reshape2 reticulate rlang scales tibble tidygraph]; };
   motmot = derive2 { name="motmot"; version="2.1.3"; sha256="09qsyc4ifdl316kjqqkarmflpjcd0ivkhx5fzi3502anj6dxpjnq"; depends=[ape caper coda ks mvtnorm Rcpp]; };
   motoRneuron = derive2 { name="motoRneuron"; version="1.0.0"; sha256="1hdsf4c1v5hfaqpi5y1v60zqq5fdmlqdvzpsq77diclp9vzdshja"; depends=[dygraphs ggplot2]; };
   moult = derive2 { name="moult"; version="2.1.0"; sha256="0k0969fwy648x25xw42w5ncimyw2cbq305rzf4m77p3pf0k50m9b"; depends=[Formula Matrix]; };
   mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; };
   mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
-  mousetrap = derive2 { name="mousetrap"; version="3.1.4"; sha256="1iizlcq6ak9hfqwaz8d0zmijfnw2v7fwgksxng9mxiqiva98is8a"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
-  movMF = derive2 { name="movMF"; version="0.2-4"; sha256="0j5gp1l374479lsijw1hz00pxs09zzh7hapljv80lsvr24vfscpa"; depends=[clue skmeans slam]; };
-  move = derive2 { name="move"; version="4.0.2"; sha256="131s66vmlpfkmcp0s68m8ckaagh157pnhz76q5n9b2asznmi5fd0"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; };
+  mousetrap = derive2 { name="mousetrap"; version="3.1.5"; sha256="0q89k4hb6lv65b71qivvahpblpcgnd5jmmq9z5m8jvp1ksp49vqz"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp rlang scales tidyr]; };
+  movMF = derive2 { name="movMF"; version="0.2-5"; sha256="1k790g1h17vv4ails4jhdnqiwj3b2zpas13x8wzkabwf4k0n1g91"; depends=[clue skmeans slam]; };
+  move = derive2 { name="move"; version="4.0.6"; sha256="0fjq9msscxpkyzvd7vnz9g8r8f8sv0clnps2bkk9jhk8jscwvjhp"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; };
   moveHMM = derive2 { name="moveHMM"; version="1.7"; sha256="031msh427hgjyr37imalr7smd79yqscw9xq5rjrixxc2w5qly9jj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; };
   moveVis = derive2 { name="moveVis"; version="0.10.5"; sha256="1lj22yr6v3vg795r72gkbhyabycppxbjsaldqiqgckhkdfh3lziw"; depends=[av cowplot curl ggplot2 gifski lubridate lwgeom magick magrittr move pbapply raster sf slippymath]; };
   moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.3"; sha256="14a2iymn4j831xlh42z5qxmhnh7xpp5bxasgpkhnb3v0b5ldyilh"; depends=[move Rcpp]; };
   movecost = derive2 { name="movecost"; version="0.5"; sha256="1rhmm2xk4f9kjanyaxpn0h6p7ka5pn7z6wlax6d6yhi9w9km75sp"; depends=[gdistance raster rgdal rgeos sp]; };
   mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; };
   mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; };
-  mpMap2 = derive2 { name="mpMap2"; version="1.0.3"; sha256="0fa89sbqd22h4px9lizmsl7f5xmd1g56i6n1x0x418qvlmgrnn6j"; depends=[car fastcluster ggplot2 igraph jsonlite Matrix nnls progress pryr qtl RColorBrewer Rcpp sn]; };
   mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-  mpath = derive2 { name="mpath"; version="0.3-26"; sha256="0yigcf9zdlr9nqdwb8bxcgfqs3l4xzzw65hj8ba3sybwzlwva7xw"; depends=[bst doParallel foreach MASS numDeriv pscl]; };
+  mpath = derive2 { name="mpath"; version="0.4-2.17"; sha256="0zs6551g8blzp3dj06k34vbp8gw5jv5h9hkys3n9mrc767nfs9sf"; depends=[bst doParallel foreach glmnet MASS numDeriv pamr pscl WeightSVM]; };
   mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; };
-  mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; };
+  mpcmp = derive2 { name="mpcmp"; version="0.3.6"; sha256="1jzrmaxm133zy4wi5pzjlj6gnh89nx4j69dnwm4s4y3i7ixch908"; depends=[dplyr generics ggplot2 ggpubr purrr Rcpp rlang stringr tibble]; };
   mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
   mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; };
   mplot = derive2 { name="mplot"; version="1.0.4"; sha256="1f3llh1599q8259la02nvdigrs4p4j1l4qsp5bxi19my6gff0l10"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; };
@@ -11036,59 +11513,63 @@ in with self; {
   mpt = derive2 { name="mpt"; version="0.6-2"; sha256="19nkkpxd250xzk0il60psvhcikxfn9yqvfv9d21wilc9n2h79ad2"; depends=[]; };
   mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; };
   mr_raps = derive2 { name="mr.raps"; version="0.2"; sha256="069vyvsdgc5m7n2fd0h7jrllz789zvsxka7h5wiy36dc7lagd6f8"; depends=[nortest]; };
-  mrMLM = derive2 { name="mrMLM"; version="4.0"; sha256="03y8gsnz1xwjb5imzgs0iv7hfyajfxag2fjyg1s8qwbvl1s6w04c"; depends=[coin data_table doParallel foreach ggplot2 lars ncvreg qqman sampling sbl]; };
-  mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="4.0"; sha256="0jl61rc642mqg9gmil6vdfc9296srvs2vmfm43ds0f46ysbh8wpx"; depends=[bigmemory coin data_table doParallel foreach ggplot2 lars mrMLM ncvreg openxlsx qqman sampling sbl shiny shinyjs]; };
+  mrMLM = derive2 { name="mrMLM"; version="4.0.2"; sha256="0v2vmzylaqk836xqpyjy5cccnpsacyy2b334cay3pdlr8qdmrqky"; depends=[coin data_table doParallel foreach lars ncvreg Rcpp RcppEigen sampling sbl]; };
+  mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="4.0.2"; sha256="0ywxaw164czfgbnqfkh5zw06006clisbc780w2h4z71wfvj56dsi"; depends=[bigmemory coin data_table doParallel foreach lars mrMLM ncvreg Rcpp RcppEigen sampling sbl shiny shinyjs]; };
   mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; };
   mratios = derive2 { name="mratios"; version="1.4.2"; sha256="18pi0dks0qmw0gv76yqm4gvxdqrcvr25j1vb8k4mkp5p35kzkzff"; depends=[multcomp mvtnorm survival survPresmooth]; };
   mrbayes = derive2 { name="mrbayes"; version="0.2.0"; sha256="1g5p2w65kkvhcsxzx59zqlc1f26zajmcbprf2bznvcl200qbypg5"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; };
-  mrbin = derive2 { name="mrbin"; version="1.4.2"; sha256="05rfqpx26j7j2ncmskvk1q9950rf38gwkw7li4qjrilq13301mq7"; depends=[]; };
+  mrbin = derive2 { name="mrbin"; version="1.4.4"; sha256="1n793xhjvwkxm4jg0fr81laznbbhay6dhl3dcsi9h5nj8rax4bza"; depends=[]; };
   mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1.1"; sha256="0v06sd5sh7ghlr8lgrv6l4glmv7chj3951pw4ssxrly4hz2rh6i0"; depends=[fields maps Rcpp]; };
-  mrds = derive2 { name="mrds"; version="2.2.3"; sha256="0bfkxl3y61abqyzlsm32222kp4zld2h7nkhpvzlsriqwp0pff20c"; depends=[mgcv numDeriv optimx Rsolnp]; };
+  mrds = derive2 { name="mrds"; version="2.2.4"; sha256="0c432vi2b82078nzmwkchrazjaf6bjs4hgvndn03s2ja76sxnd1m"; depends=[mgcv numDeriv optimx Rsolnp]; };
   mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; };
-  mrf2d = derive2 { name="mrf2d"; version="0.4.0"; sha256="19ldfcfw779ksi7byfz5dk0lyhkjg67zhxj3nhw9kim41wmkrk4h"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack reshape2 tidyr]; };
-  mrfDepth = derive2 { name="mrfDepth"; version="1.0.12"; sha256="14kc0rjrdgh1zyiibiq79gd1npdxydml6lcxyf4pwdzipaa1yrg4"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
+  mrf2d = derive2 { name="mrf2d"; version="0.5"; sha256="0vp5rcmrsyfsnh5rmv130081yzrxf7g0pdvydrlvfabsx9his6pl"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack tidyr]; };
+  mrfDepth = derive2 { name="mrfDepth"; version="1.0.13"; sha256="177331j30n707mcl1ghxjc53xjs9qsal15kccc71b0rabkjdq2wv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
   mrfse = derive2 { name="mrfse"; version="0.2"; sha256="1dx21m54jsprlngj20q1bgvbw1bbm0sm8i01xanj68bx796ng14j"; depends=[]; };
   mrgsim_parallel = derive2 { name="mrgsim.parallel"; version="0.1.1"; sha256="0xsq7538z8rw4b5q3bcrspgfjw965yr5v7f8k3za04ksx775nfy2"; depends=[dplyr future_apply mrgsolve]; };
-  mrgsolve = derive2 { name="mrgsolve"; version="0.10.4"; sha256="1zz1nw87y1h9rp715zvlsd4phdnr4lp6mk4wd149cnvzc10wk6f8"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; };
+  mrgsim_sa = derive2 { name="mrgsim.sa"; version="0.1.0"; sha256="199m6ygwnw6fbld5fqsw1j5jz9x6l1ayrpsc0r51q4fr7nmmpfj2"; depends=[assertthat dplyr ggplot2 mrgsolve patchwork purrr rlang tibble tidyr tidyselect withr]; };
+  mrgsolve = derive2 { name="mrgsolve"; version="0.10.7"; sha256="1b9yyqnwq7asbvmb19ddn0lhdglv1xcpxrgvmbdafzlngjx767n7"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; };
   mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; };
   mritc = derive2 { name="mritc"; version="0.5-2"; sha256="07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2"; depends=[lattice misc3d oro_nifti]; };
   mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; };
+  mrregression = derive2 { name="mrregression"; version="1.0.0"; sha256="1yy2sjs0b67bqyggzypp2g7x4fdmi86jx2nbcp2n7hcf9cdacysi"; depends=[data_table Rcpp]; };
   ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; };
   msBP = derive2 { name="msBP"; version="1.4"; sha256="17hsnfipb6mgwhbc9rxzx5azc57ravz7zfnbc8r73sn1b270ydpb"; depends=[]; };
+  msSPChelpR = derive2 { name="msSPChelpR"; version="0.8.6"; sha256="0254riap3lxp929c7isj2665wvziiy2lskhhyzw50kyd768bvb60"; depends=[data_table dplyr lubridate magrittr progress purrr rlang sjlabelled stringr tidyr tidyselect tidytable]; };
   msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; };
   msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; };
   msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; };
   msae = derive2 { name="msae"; version="0.1.2"; sha256="0xdyym4zmm9znr89qgy1sl7bw84nddn1jv3wh66igkxbczf542ih"; depends=[magic]; };
   msaenet = derive2 { name="msaenet"; version="3.1"; sha256="067p97z54dwhxy0w4ihi8dddcbvglh8ssynbh29fl9jyxfwjr1ms"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
   msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
+  msce = derive2 { name="msce"; version="1.0.1"; sha256="1x9ivc2bjp07pdn15p3qds00m1m00amcg2dfcdjsgbkx9x1kkfab"; depends=[Rcpp RcppParallel]; };
   mschart = derive2 { name="mschart"; version="0.2.5"; sha256="08j342slv4ca6qkd12hh7jmmv5wv6kfxamw34dr6sd89kzrfdj0p"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; };
   mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; };
-  mscstts = derive2 { name="mscstts"; version="0.5.6"; sha256="1kqja12v00s9fwh9skx9p7pyk2nbyb76cvqp00g7qgi0w5d5gq8j"; depends=[httr jsonlite tuneR]; };
+  mscstts = derive2 { name="mscstts"; version="0.6.2"; sha256="0mf3hs150gz39s0lh2fqbpg632n7rmmb8ns5swgx2wi3svhrk5lm"; depends=[httr jsonlite tuneR]; };
   mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; };
-  msd = derive2 { name="msd"; version="0.2.0"; sha256="13g4ykzn5ny05js0msmax12yx3lchs8qnfdw8bw76gd8hlvibhlq"; depends=[]; };
+  msd = derive2 { name="msd"; version="0.3.0"; sha256="0wk1llhl70hwgd900vfzj5a4w71ynca01vqlvv2yds5zy0bplalx"; depends=[]; };
   msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; };
   msde = derive2 { name="msde"; version="1.0.4"; sha256="1jyvsadkha4976vdf8nn2dbrsymr4n932cqrkmhawmy6pxa2c45g"; depends=[Rcpp RcppArmadillo RcppProgress]; };
   msgl = derive2 { name="msgl"; version="2.3.9"; sha256="0793d12cd1mcnr97byhfwpnvm329w78f56n7dcs4116hlizp8l9h"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive2 { name="msgps"; version="1.3.1"; sha256="0r8i0sw412jr148bid8sfpjcfbkf5589dqcqyvf5cm84cj7axnpz"; depends=[]; };
   msgr = derive2 { name="msgr"; version="1.1.2"; sha256="15s3d77xqczjydgcfx4jlsq408hgsm8yzqk5248v58vm6zy36mh0"; depends=[purrr rlang]; };
-  msigdbr = derive2 { name="msigdbr"; version="7.1.1"; sha256="0jvi49qa7616s58p0rx66pcw7h12rc8kgcg9225jk7pc3934hnzh"; depends=[dplyr magrittr rlang tibble]; };
-  msir = derive2 { name="msir"; version="1.3.2"; sha256="0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb"; depends=[mclust]; };
+  msigdbr = derive2 { name="msigdbr"; version="7.2.1"; sha256="1rc2p9vw57pn4prmfgay4w18qd53ggq7wxfsi9kp7w25ciip1dq1"; depends=[dplyr magrittr rlang tibble tidyselect]; };
+  msir = derive2 { name="msir"; version="1.3.3"; sha256="1wm83m3cqd6llxb9p2jwim0wb81v84pgdmgcznygzaaq6kbn3n84"; depends=[mclust]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.8"; sha256="1d32y8f0vb2dfv3999liigpns788j145nrvd1xpxb9i2lsg8mwgk"; depends=[expm mvtnorm survival]; };
   msma = derive2 { name="msma"; version="2.1"; sha256="1k1xfbwyapwjs7bp9v0vrdfrz54hsyxh562xni1n8m61l4gwkvzx"; depends=[mvtnorm]; };
   msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; };
   msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; };
-  msos = derive2 { name="msos"; version="1.1.1"; sha256="0jp4xw03iwc6dkk93kkky9k6xd285ylzp1x7jxkl3h0884jvyjyf"; depends=[mclust tree]; };
-  mssm = derive2 { name="mssm"; version="0.1.3"; sha256="1d1iksvm97g42p4y3jfzrk0xf4bbw8n237dcmy9jjyaw9vlxw61h"; depends=[nloptr Rcpp RcppArmadillo testthat]; };
+  msos = derive2 { name="msos"; version="1.2.0"; sha256="1fg9q6269cckn4g6isv22k22mzglxhjxjg5npqsikmisribmr9kb"; depends=[mclust tree]; };
+  mssm = derive2 { name="mssm"; version="0.1.4"; sha256="10qv0dylh1q1jlk6j28bsp819h0pjzvaynhrbsnl0d0yha657yrp"; depends=[nloptr Rcpp RcppArmadillo testthat]; };
   mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; };
   mstDIF = derive2 { name="mstDIF"; version="0.1.6"; sha256="0zhslqzvvk8wbgqvcipmzhy94awwfmkv5yfl812m8wmwgpkcqzpb"; depends=[eRm expm Matrix mirt PP scDIFtest]; };
   mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; };
-  mstate = derive2 { name="mstate"; version="0.2.12"; sha256="0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv"; depends=[RColorBrewer survival]; };
+  mstate = derive2 { name="mstate"; version="0.3.1"; sha256="11i3p7fph8nbnfis1m7rdrq32qryaajv2wrkxk1x6k17zkh4rq6i"; depends=[data_table lattice magrittr RColorBrewer rlang survival viridis]; };
   mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; };
-  mstknnclust = derive2 { name="mstknnclust"; version="0.3.0"; sha256="0ym5v36kjw7s6ff3yxlxbkd0764jgv5a1pabx6acwp7pv80l4vl1"; depends=[igraph]; };
-  mstrio = derive2 { name="mstrio"; version="11.2.2.1"; sha256="02xcrpgywnhnx9bqpcxb5yc352765s26jnyrqfm5x269w8lalx6z"; depends=[crul data_table httr jsonlite openssl R6 rstudioapi shiny shinyjs]; };
+  mstknnclust = derive2 { name="mstknnclust"; version="0.3.1"; sha256="0bg38gnaf2jjva8l2wk862ch2cpqvw7szvvvpb2bnz02fp795p3g"; depends=[igraph]; };
+  mstrio = derive2 { name="mstrio"; version="11.3.0.1"; sha256="1qjqxrgy2amm0ikfixkqjix3d6jzh1y3abnbzq41ibl5qiz8pjxy"; depends=[crul data_table httr jsonlite openssl R6 rstudioapi shiny shinyjs]; };
   msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; };
   mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; };
   mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; };
@@ -11105,10 +11586,11 @@ in with self; {
   mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6.1"; sha256="08qh43zx6h3yby44q2vxphfvmfdmqxpgyp0734yn341sy9n8pkkk"; depends=[survival]; };
   muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
+  mully = derive2 { name="mully"; version="2.1.30"; sha256="0ifi4i4y8rgn1mfzaggibq9wkaf8xl3qk6l5sgjxxfcymmq4vzf0"; depends=[igraph randomcoloR rgl shape]; };
   mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; };
   multDM = derive2 { name="multDM"; version="1.1.3"; sha256="16bvr62lxmrq79z856iigwz5cjhk327x4hhd0cg3adgabqcz04yp"; depends=[MTS]; };
   multbxxc = derive2 { name="multbxxc"; version="1.0.1"; sha256="1ip5awjc2ljpy6nsr4y42x0yg4n7lyaxp9kzfjvwp41k9lriz4gm"; depends=[Rcpp RcppArmadillo rmumps]; };
-  multcomp = derive2 { name="multcomp"; version="1.4-13"; sha256="1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk"; depends=[codetools mvtnorm sandwich survival TH_data]; };
+  multcomp = derive2 { name="multcomp"; version="1.4-15"; sha256="1klvn4a1rlrzwhy1cjrkbbh6jspgzbrdm0jxsb1lmf1yzdz609wr"; depends=[codetools mvtnorm sandwich survival TH_data]; };
   multcompView = derive2 { name="multcompView"; version="0.1-8"; sha256="1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"; depends=[]; };
   multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; };
@@ -11118,7 +11600,7 @@ in with self; {
   multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; };
   multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; };
   multiDimBio = derive2 { name="multiDimBio"; version="1.2.2"; sha256="0xadpvnyghpqh2q1gp1fqwv591sm3icmx60x4g8gn1vybi51k5rx"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
-  multiMarker = derive2 { name="multiMarker"; version="1.0"; sha256="1qay05mqacdy0psqrmd2a0sgy6az1a27k8204yh51b69p8zckym4"; depends=[ordinalNet truncnorm]; };
+  multiMarker = derive2 { name="multiMarker"; version="1.0.1"; sha256="1kj29m1bzqmsj63drad4gvq9glwbnyca68df8sycpi7h4b8zirgq"; depends=[ordinalNet truncnorm]; };
   multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
   multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; };
   multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; };
@@ -11126,6 +11608,7 @@ in with self; {
   multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; };
   multicastR = derive2 { name="multicastR"; version="1.3.0"; sha256="07y3a7apk6pjnfqki52jc5vbzb1w53fla7wcpc184f4zpqfc783q"; depends=[curl data_table gsubfn stringi XML xml2 xtable]; };
   multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; };
+  multiclassPairs = derive2 { name="multiclassPairs"; version="0.4.0"; sha256="0s1c0bkzrg8viv152ylqjighbqbrpcwsg51w7l9gn7mjjdshavny"; depends=[Boruta caret dunn_test e1071 ranger rdist]; };
   multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; };
   multicolor = derive2 { name="multicolor"; version="0.1.4"; sha256="1yswpqm62cvpfj6zxrprbvamjah3zxhsvn19qgpqmha0098lx5g2"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; };
   multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
@@ -11145,7 +11628,7 @@ in with self; {
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
   multinet = derive2 { name="multinet"; version="3.3.1"; sha256="0sbzaadcln3ml4lsdd2ry0il6cppaxz48q5vj8g41rns2ifjspna"; depends=[igraph RColorBrewer Rcpp]; };
   multinets = derive2 { name="multinets"; version="0.2.2"; sha256="1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c"; depends=[igraph Rcpp]; };
-  multinma = derive2 { name="multinma"; version="0.1.3"; sha256="1pg49gz7cq8cjhqg8pvs17lv0z46bgrn897xpdc6cjlp9qdgmzg5"; depends=[bayesplot BH copula dplyr forcats ggdist ggplot2 ggraph glue igraph Matrix purrr randtoolbox Rcpp RcppEigen Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr truncdist]; };
+  multinma = derive2 { name="multinma"; version="0.2.0"; sha256="0lnhbgcb5dn0h6vjbkg86cklq5k1nfwc71fp0azm7vmkzgiqya1i"; depends=[bayesplot BH copula dplyr forcats ggdist ggplot2 ggraph glue igraph Matrix purrr randtoolbox Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr truncdist]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
   multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; };
   multipanelfigure = derive2 { name="multipanelfigure"; version="2.1.2"; sha256="0cm5bd7k0fx6d3gybcll6vvh14byanyk6dj4civqij7psa48iagc"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; };
@@ -11157,9 +11640,9 @@ in with self; {
   multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; };
   multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; };
   multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
-  multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; };
+  multitaper = derive2 { name="multitaper"; version="1.0-15"; sha256="1gm3wr8xqpqiby7q1dr3zxim77v0bvvrqi0hlazf5g3gnkrp2zc3"; depends=[]; };
   multivar = derive2 { name="multivar"; version="0.0.2"; sha256="0ijv7zsznqsf8g6lgnaccfi76j04ycxd0zgjw5wbf03in5vxzlpc"; depends=[MASS Rcpp RcppArmadillo]; };
-  multivariance = derive2 { name="multivariance"; version="2.3.0"; sha256="00hvsia4xcs2r2lj9qqnlj4klivvpx58fmhr4dgy3waq8pp5a0dv"; depends=[igraph microbenchmark Rcpp]; };
+  multivariance = derive2 { name="multivariance"; version="2.4.0"; sha256="0bnhcmpkavac8m2bdn8yb4nimxna2480inqxw3jm0j5j2fpdgfh9"; depends=[igraph microbenchmark Rcpp]; };
   multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; };
   multiviewtest = derive2 { name="multiviewtest"; version="2.0.0"; sha256="09svd9jbvn92vkaifr33vg5scyh6311kpkr0lgsdj6lycz9cb4q7"; depends=[doParallel foreach irlba Matrix matrixStats mclust randnet]; };
   multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; };
@@ -11177,18 +11660,19 @@ in with self; {
   musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; };
   mustashe = derive2 { name="mustashe"; version="0.1.2"; sha256="0ihngnjay9zg8570za2rja0m2hxjy1ygc4zaif862sqflza68kdp"; depends=[digest formatR qs tibble]; };
   mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; };
-  mutSignatures = derive2 { name="mutSignatures"; version="2.0.1"; sha256="1rpg1ms33kc5dvcrjldd6fbg4rlnyp0lb0g7c1yxr42zndc613yh"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
+  mutSignatures = derive2 { name="mutSignatures"; version="2.1.1"; sha256="0skw92633mwckkkgkncfv09wvnr910nf4wdbqz0a61cl7mxlsr25"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
   mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
+  mvGPS = derive2 { name="mvGPS"; version="1.0.2"; sha256="0ym940q2spqjcvkrm58mm3mcxkj2zz7l9giz2filq5r0xikvqir7"; depends=[CBPS cobalt gbm geometry MASS matrixNormal Rdpack sp WeightIt]; };
   mvLSW = derive2 { name="mvLSW"; version="1.2.3"; sha256="05g6v4jbg1km2215lxbwzx8frr4in7xal9pai3y6l23d66lvh1iz"; depends=[fields wavethresh xts zoo]; };
   mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; };
   mvMORPH = derive2 { name="mvMORPH"; version="1.1.3"; sha256="0ilfq67vl4kjn3qz2wmyqsiymb4x9bry56hii4whw3an23r25plc"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; };
   mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; };
   mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; };
   mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; };
-  mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.5"; sha256="0ysmns0vcraak53a0lf8g4sl36g2nhvk8pp45nx8qbjbbj8w6ib6"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; };
+  mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.6.1"; sha256="1sm7yyvqjj9wljd0wz1qjw59n271fbvanzly82sflm28ikq5xdm9"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; };
   mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
-  mvabund = derive2 { name="mvabund"; version="4.1.3"; sha256="1z58h4dk3mc2hfnfvc7pghk471cbp7ah2s1z2ria5igw4s80962b"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
+  mvabund = derive2 { name="mvabund"; version="4.1.6"; sha256="0aisvax9d7bk6aykrcdcn1ji618r520mcrkr1i3jnck1qs31z41f"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
   mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; depends=[]; };
   mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
   mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; };
@@ -11200,23 +11684,23 @@ in with self; {
   mvmeta = derive2 { name="mvmeta"; version="1.0.3"; sha256="08zki4bxd7l5hpa9dly9jw796kn4rfv6v6gmx21yvfppyryrvmvd"; depends=[mixmeta]; };
   mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; };
   mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; };
-  mvnfast = derive2 { name="mvnfast"; version="0.2.5"; sha256="122zjzr0v4943cax10lp6flwfv479mncvalaj09kb173s5rgmf91"; depends=[BH Rcpp RcppArmadillo]; };
+  mvnfast = derive2 { name="mvnfast"; version="0.2.5.1"; sha256="193hi0vwc3p7dpac0y4ynm0c5sc3kcq20lwp6gbc4zpnqg9g94v3"; depends=[BH Rcpp RcppArmadillo]; };
   mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; };
   mvnormalTest = derive2 { name="mvnormalTest"; version="1.0.0"; sha256="1hbapcmj1rzrdzlbkay94f3r2388sk60zizh48vbbkc83qlm7xbr"; depends=[copula moments nortest]; };
   mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
   mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; };
-  mvord = derive2 { name="mvord"; version="1.0.1"; sha256="0gca25zaxbkmqa444bh16p1qc1np80882b5w3jg0w0ss5p4zhxyc"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; };
+  mvord = derive2 { name="mvord"; version="1.1.0"; sha256="1jgm2z6ad10xnihw30syw4rcxbgv849z898mj2n65bmncn147rqp"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; };
   mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; };
   mvp = derive2 { name="mvp"; version="1.0-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; };
   mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
-  mvrsquared = derive2 { name="mvrsquared"; version="0.1.0"; sha256="0k0jrwqmlmy7sdxpaziri0vmy1mvxsx6mmvhy1gr86x5rp4r3nsl"; depends=[Matrix Rcpp RcppArmadillo RcppThread]; };
+  mvrsquared = derive2 { name="mvrsquared"; version="0.1.1"; sha256="1bvq5m33ff4igvg7b1wdp8g393qxswlhbpr3gm05fnbsxzlna10p"; depends=[Matrix Rcpp RcppArmadillo RcppThread]; };
   mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
   mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; };
   mvst = derive2 { name="mvst"; version="1.1.0"; sha256="03q0kdychsmn4wcn50b6dqhxn4f2mjvrr5rac942xdv75w8qklc9"; depends=[MCMCpack mnormt mvtnorm]; };
   mvtmeta = derive2 { name="mvtmeta"; version="1.1"; sha256="0s0s5922c5rs8cqk100nci3akqnhbvibm2n2gn8049v3qcyfajyb"; depends=[gtools]; };
   mvtnorm = derive2 { name="mvtnorm"; version="1.1-1"; sha256="1pj51mi0g6ip7a2nhzc93yv9289kaayvspjvsbgbgarvx7axlrg9"; depends=[]; };
   mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
-  mwa = derive2 { name="mwa"; version="0.4.2"; sha256="18qrj3v99y1rykz82xmkbhzfjrm54dr620p8hm1s1pxjmlysyyc8"; depends=[cem MASS rJava]; };
+  mwa = derive2 { name="mwa"; version="0.4.3"; sha256="100d3c1070ir64iv848kws5fna141gcq5p66ip873cr632a042qs"; depends=[cem MASS rJava]; };
   mwaved = derive2 { name="mwaved"; version="1.1.7"; sha256="0g0yddsgdfyvqaj59qi6k3sknpbppdmgvq0rgnil5q8ki5skvgis"; depends=[Rcpp shiny]; };
   mwshiny = derive2 { name="mwshiny"; version="2.1.0"; sha256="0c1a0d9qnaszffhzanmk31mdxqi7j3rn6bk7a3dwg4bq1da3rlgl"; depends=[htmltools shiny]; };
   mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
@@ -11226,9 +11710,9 @@ in with self; {
   mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; };
   myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
   mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; };
-  n1qn1 = derive2 { name="n1qn1"; version="6.0.1-9"; sha256="11kp80nlxcg6vl5afnm8c0fgr2pha25p65gh7cjwlkbxs58iqm50"; depends=[Rcpp RcppArmadillo]; };
+  n1qn1 = derive2 { name="n1qn1"; version="6.0.1-10"; sha256="1diwhw636cnwjlw291vfp1z53xaxhmhafbqfzk2m0yqs0ih0pm09"; depends=[Rcpp RcppArmadillo]; };
   nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; };
-  nCal = derive2 { name="nCal"; version="2020.5-21"; sha256="1gg0dkpsqw1nwi27iccn8d0c768gjlj0p6fr4260pvg5l03sz80n"; depends=[drc gdata gWidgets2 kyotil]; };
+  nCal = derive2 { name="nCal"; version="2020.9-10"; sha256="1m3d2fskd1vlmwwrhdqs9040fjnjc7jsdsxs0y3m9db7kd1n84iw"; depends=[drc gdata gWidgets2 kyotil]; };
   nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; };
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
   nFactors = derive2 { name="nFactors"; version="2.4.1"; sha256="1diybai7pwaj9adn60b7nhvvpjjkwg3jimwp2ahgca9askmv93h2"; depends=[lattice MASS psych]; };
@@ -11239,29 +11723,29 @@ in with self; {
   naaccr = derive2 { name="naaccr"; version="1.0.0"; sha256="1hw74a2gjm3gxq0s0qlndhqw0vij6p31walz1ic741z7hqsffqq7"; depends=[data_table stringi]; };
   nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; };
   nadiv = derive2 { name="nadiv"; version="2.16.2.0"; sha256="0gvpl8jrczk9afc7qg6w8w0gn28nia5mh3vanlsp7j0kj3vzqqc5"; depends=[Matrix]; };
-  naijR = derive2 { name="naijR"; version="0.1.3"; sha256="1zdifi0wf5v7gjfg7vp64i34fmlh7mg6bw71sli38cz3p52pmksr"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang]; };
+  naijR = derive2 { name="naijR"; version="0.1.4"; sha256="0yb5g2qp7ascri7sq0pbfg4ii27w5js75s64y5515cv57x2fwfwp"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang]; };
   naivebayes = derive2 { name="naivebayes"; version="0.9.7"; sha256="070m78d8hsbqfbapb6g8vvh91gyznqfdpqsaq6z3raps8zlybsag"; depends=[]; };
   naivereg = derive2 { name="naivereg"; version="1.0.5"; sha256="1cxfl419pp7xh1xrad29gvpn6hm0rhk40vylj97ypndh6gmnynzz"; depends=[glmnet gmm grpreg ncvreg]; };
   nakagami = derive2 { name="nakagami"; version="1.0.0"; sha256="1i9m1nlqfdk9k3bzf8qlfc11spzfqly49n1pk7phvykzjgd1c1s4"; depends=[assertthat]; };
   namedCapture = derive2 { name="namedCapture"; version="2020.4.1"; sha256="0zdw3h3n4qjv9cpidb3g523ld6rrh49l2c1yhfqhk5wb7vddrs46"; depends=[]; };
   namer = derive2 { name="namer"; version="0.1.5"; sha256="1687x6rc46bp2bmqkixzry5cc7lxjqwjk8ngrbg2fk7mzb4pwvnq"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-  nametagger = derive2 { name="nametagger"; version="0.1.0"; sha256="0n7nskl2nk3j9zh8l2xqq026rwnk278n6ldcij0vb1nxxzcgdzf7"; depends=[Rcpp udpipe]; };
+  nametagger = derive2 { name="nametagger"; version="0.1.1"; sha256="17g8y7x83p1pkgj5hgildndchxsp70va25h93p7r1yjllm56zqv8"; depends=[Rcpp]; };
   nandb = derive2 { name="nandb"; version="2.0.7"; sha256="0l71dj1v6skqq2ir2sgfrvrq2bijzgac9s220g2zacijsisn2j4v"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; };
-  naniar = derive2 { name="naniar"; version="0.5.2"; sha256="02b4mmb69k2scbr7lq83ymv782x1kd5i1z3b2863c2c6zwgilngb"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; };
+  naniar = derive2 { name="naniar"; version="0.6.0"; sha256="0m3y9rh3qx8k66h8by0jvg4927k5azppdhihr413136xa57wd4ww"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; };
   nanny = derive2 { name="nanny"; version="0.1.8"; sha256="0pfh4vs81z1bcjgjnsdwz62qn66ag9fgqw87imsbs0naw7niyi67"; depends=[dplyr gtools knitr lifecycle lme4 magrittr purrr rlang Rtsne tibble tidyr tidyselect widyr]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanostringr = derive2 { name="nanostringr"; version="0.1.4"; sha256="1g1hm5kz2bl3qqs2cz4nhvmak7mbh5pry34lp6lwnbxrgi97i1iz"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; };
-  nanotime = derive2 { name="nanotime"; version="0.3.1"; sha256="1spdvr0vg9af5i2qka6947iyby6rqkm75shylv0h4dx1wgv5g5bb"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; };
+  nanotime = derive2 { name="nanotime"; version="0.3.2"; sha256="079bybkizlq51g4hfw1jclwfcw71i1wi344ia6lhbdh1r8xkrxcy"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; };
   naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
   nardl = derive2 { name="nardl"; version="0.1.5"; sha256="1xi1fkwgkfc1b8qsgi4lrjx419778qk0vxzl23azcziwa6fha5p8"; depends=[Formula gtools strucchange tseries]; };
   narray = derive2 { name="narray"; version="0.4.1"; sha256="09n50shk2gy1m85kmvq8g3zh2nrikpllv8gph9x2id1p62rbqf1y"; depends=[progress stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
-  nasapower = derive2 { name="nasapower"; version="1.1.3"; sha256="1grfbj68vxsy50a0zylgfddwgr3ilrk2v60755vra9ckpmnf31zi"; depends=[APSIM crul curl jsonlite lubridate readr tibble]; };
+  nasapower = derive2 { name="nasapower"; version="3.0.1"; sha256="012z2q3fzb7834g3axnw9ivwyq073kll14gds64ks0nlj2z3gcgl"; depends=[crul curl jsonlite lubridate readr tibble]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
-  nat = derive2 { name="nat"; version="1.8.14"; sha256="02v1hvxsp3z7rday2mr5f52kkyszcl3ind3p8vllyl705s3ci2ll"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
+  nat = derive2 { name="nat"; version="1.8.16"; sha256="0m60ysh02f7mg8rfjxn3vbyir4hnl3wpz56pnkjqq9clrnl145a9"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
   nat_nblast = derive2 { name="nat.nblast"; version="1.6.5"; sha256="0fp01rrvz7n84sdmfhi0wzd9mvg7wi682l4qg5dj82cm98v80l3p"; depends=[dendroextras nabor nat plyr rgl spam]; };
-  nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.9"; sha256="0r0ydhxnax4x4gwp60bgarhgp59g4sis7msa3rq4kddv8qdi3gix"; depends=[digest igraph memoise nat rappdirs rgl]; };
+  nat_templatebrains = derive2 { name="nat.templatebrains"; version="1.0"; sha256="0bjib2brsq389b1rlznhwd81y9awk9qz57s4z5ai45gnsc7cfcgw"; depends=[digest igraph memoise nat rappdirs rgl]; };
   nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
   nationwider = derive2 { name="nationwider"; version="1.1.1"; sha256="1crflv2wvrsyrhl612f7awvm0yfhl381q7pq190n3ydg093y32r6"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; };
   natmanager = derive2 { name="natmanager"; version="0.4.6"; sha256="0vd8aipjk0dd8924g4sm3b33pf4af71d0vkm7vnwasmcgb15ki0v"; depends=[curl gh remotes usethis withr]; };
@@ -11282,7 +11766,7 @@ in with self; {
   ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; };
   ncf = derive2 { name="ncf"; version="1.2-9"; sha256="0wxn004jn4wba2zqnfrd513pw4mjxkmk4n1xj829nxadn1zbkcax"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
-  ncmeta = derive2 { name="ncmeta"; version="0.2.5"; sha256="09vw94q9lxwi4iq74xy3jll7h97rmr9ppf4dv1hwqc9w1ad6fk7d"; depends=[dplyr rlang RNetCDF tibble tidyr]; };
+  ncmeta = derive2 { name="ncmeta"; version="0.3.0"; sha256="0rip0lb1sccwy94jcr84pimnz5a55gnqf0xwvxyyibmzlwkzsd2b"; depends=[dplyr rlang RNetCDF tibble tidyr]; };
   ncodeR = derive2 { name="ncodeR"; version="0.2.0.1"; sha256="1pxiqxhq2rxs8rxxhw1hbds7z2qkf7ws26a8wsbw815yn6jm10n8"; depends=[cli R6 rhoR]; };
   ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; };
   ncvreg = derive2 { name="ncvreg"; version="3.12.0"; sha256="1xy2jbb4q9wdahwffjl6lmmlhg2x7s7d0vbv4d50ddq92gd528mv"; depends=[]; };
@@ -11291,9 +11775,9 @@ in with self; {
   ndtv = derive2 { name="ndtv"; version="0.13.0"; sha256="1qfjvq5wch256gmg7pw9jwda33r4963a8p8jmp27cmpzdwycvnzy"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
   nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; };
   neariso = derive2 { name="neariso"; version="1.0.1"; sha256="1b2gnws75kkqsi8mg9n0zzdaawx57a6zz47cswabj5m6nb09ikh8"; depends=[]; };
-  neat = derive2 { name="neat"; version="1.2.1"; sha256="0ifx2qbr8g6myz380rwayas26vg13wkblssvma4kbgfksw7cccgj"; depends=[igraph]; };
+  neat = derive2 { name="neat"; version="1.2.2"; sha256="17nwdmx5l87cxljl1h8iksc2f8fp5a5xnf6xrnla7v19c1wjmw0p"; depends=[igraph]; };
   neatRanges = derive2 { name="neatRanges"; version="0.1.3"; sha256="1zfp6f1q7m0bks0shvzr120nd5jxba28xhi7vrd55qfy7g72167g"; depends=[data_table Rcpp]; };
-  neatStats = derive2 { name="neatStats"; version="1.4.2"; sha256="0x7013lfcxk1agxkxw8ap3wwk9ziwaick817q5460ig3j0pq4r3q"; depends=[BayesFactor bayestestR Exact ez ggplot2 logspline MBESS pROC]; };
+  neatStats = derive2 { name="neatStats"; version="1.5.1"; sha256="1cyfm9mq691iyi0890gp1kszc98544fhjl35mn3varjbddm64a5p"; depends=[BayesFactor bayestestR car Exact ez ggplot2 ggpubr logspline MBESS plyr PoweR pROC]; };
   neatmaps = derive2 { name="neatmaps"; version="2.1.0"; sha256="1kz1na3fzpd8vkxmpp5rz8ksyf8q2wk456csiii82winv9a2zxc9"; depends=[ConsensusClusterPlus dplyr ggplot2 heatmaply igraph]; };
   needmining = derive2 { name="needmining"; version="0.1.1"; sha256="0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p"; depends=[randomForest rtweet SnowballC SparseM stringr tau tm]; };
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
@@ -11304,15 +11788,15 @@ in with self; {
   neo2R = derive2 { name="neo2R"; version="2.1.0"; sha256="1fhi74d4730pxrmv1p2gz8ylvnilxn4l837nha6ndyhy00xfgkk6"; depends=[base64enc jsonlite RCurl]; };
   neo4jshell = derive2 { name="neo4jshell"; version="0.1.1"; sha256="03qnv5xf7dvlzq259brfwk7vfr05q7labakv9mj27x70yhxq1z7m"; depends=[fs magrittr R_utils ssh sys]; };
   neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; };
-  neonUtilities = derive2 { name="neonUtilities"; version="1.3.6"; sha256="15vkgc1mr1qarcy0f11a962iz0v6bds497b0qdcyw2smzdm4i0in"; depends=[curl data_table downloader dplyr gdata httr jsonlite lubridate pbapply plyr readr stringr tidyr]; };
-  neonstore = derive2 { name="neonstore"; version="0.2.0"; sha256="1ndf26f278li5gs7c7vk0020pfgffcnf9i00xhb4ic582kw666xx"; depends=[curl digest httr jsonlite openssl progress rappdirs tibble vroom zip]; };
+  neonUtilities = derive2 { name="neonUtilities"; version="1.3.8"; sha256="0a52pjxf528s70nn0fzpyvp4aj1591mrp8gy4vafjhlbywrxxv4x"; depends=[curl data_table downloader dplyr httr jsonlite lubridate pbapply plyr R_utils readr stringr tidyr]; };
+  neonstore = derive2 { name="neonstore"; version="0.3.3"; sha256="098xnkjfwk02vz2jgdbabjn6vw91rvha8vrc87lw91sqadhijva4"; depends=[curl DBI digest duckdb httr jsonlite openssl progress R_utils rappdirs tibble vroom zip]; };
   neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; };
   nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; };
   neptune = derive2 { name="neptune"; version="0.1.0"; sha256="0nynxvkzcdsmznyviw18gqky1kw7dxgc13nrsbf6999lr3s3shkj"; depends=[reticulate]; };
   nesRdata = derive2 { name="nesRdata"; version="0.3.1"; sha256="1lxvg11g8nizfn8sghirq2749fs9i4w1wiaz3v1djqbkzqcqfrcj"; depends=[dataone dplyr purrr rappdirs readr]; };
   nestfs = derive2 { name="nestfs"; version="1.0"; sha256="0lzbjj287s5kmw9635gfyl3jdgfh5mxbwxqxmnwynbwccixk0akc"; depends=[dgof pROC]; };
   netClust = derive2 { name="netClust"; version="1.0.1"; sha256="1h58ispdx8ddsnqrrmcxn2rbqb0hb89gpjg4p14mr7vhxw5c9zva"; depends=[Rcpp RcppArmadillo]; };
-  netCoin = derive2 { name="netCoin"; version="1.1.25"; sha256="0l0sqzx369h3d7x4w4irl6zvmn0n1acayc4ih6vcpq6lyzvysyc7"; depends=[haven igraph Matrix]; };
+  netCoin = derive2 { name="netCoin"; version="1.1.26"; sha256="1ripd7d8jb4wn59kgbwng3mzd3lla8013y5v59qk074mwl4pa75r"; depends=[haven igraph Matrix]; };
   netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; };
   netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; };
   netchain = derive2 { name="netchain"; version="0.2.0"; sha256="1skpf1n6a17mjkcxqpl6vrskk04yvqa0v4n2zw9x5r1h46q9m6qk"; depends=[gtools igraph Matrix Rcpp stringr]; };
@@ -11322,14 +11806,15 @@ in with self; {
   netdiffuseR = derive2 { name="netdiffuseR"; version="1.22.0"; sha256="1cmnrqsgxh391pm2jz4yg20hpsbhjrfx8w1qnydk5lyj44kzf4fc"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; };
   netgen = derive2 { name="netgen"; version="1.3.2"; sha256="1yqi4rb6w9ipxgbl1j1s2s81cg7nzrn65irn5gs82hsq94d6vv2j"; depends=[BBmisc checkmate ggplot2 igraph lhs mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; };
-  netgwas = derive2 { name="netgwas"; version="1.11"; sha256="13d889ji6x0v5pmqlr1gs9yskm3262fzb5i2l9lw6y6bc72q3l06"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; };
+  netgwas = derive2 { name="netgwas"; version="1.13"; sha256="156axkl61z0s3zm8plkcc3s46x0881mqnk94azl3p0nphblhmhcv"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; };
   netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; };
   netmeta = derive2 { name="netmeta"; version="1.2-1"; sha256="11yigmk11a9gi3qg3gcszmnp11729qap8yv5pvsss5qfhahfs4qa"; depends=[ggplot2 magic MASS meta]; };
-  netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; };
+  netmhc2pan = derive2 { name="netmhc2pan"; version="1.3.1"; sha256="0q98rar7iglwxmf1274wrjcr7kp544ayrjhd286x68jmf51cqyrg"; depends=[assertive devtools dplyr rappdirs readr seqinr stringr testit tibble]; };
+  netrankr = derive2 { name="netrankr"; version="0.3.0"; sha256="0siyvd4psr2mh1bd1gr33q569f814bfd8sbnkhvq50h6lj4n51p9"; depends=[igraph Rcpp RcppArmadillo]; };
   netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; };
-  nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; };
+  nets = derive2 { name="nets"; version="0.9.1"; sha256="00adkyd2hm8aynpnk4avzss8fxkbaai74n5cf03vpwyc306jq0d7"; depends=[igraph]; };
   netstat = derive2 { name="netstat"; version="0.1.1"; sha256="1h87cl3ry5hwwqxza3n24zpvwn89hhclsa2400sw4ijdy2ivpn2j"; depends=[]; };
-  network = derive2 { name="network"; version="1.16.0"; sha256="0dnf1wl3za2lhx2lwd8smhlijl1cfhckgr8zz9piiirrfi2m2kx2"; depends=[magrittr tibble]; };
+  network = derive2 { name="network"; version="1.16.1"; sha256="1cgy7vlbinyndl0zkzvnpcmi240wry6iwfb42sz1mj5c9iwkar7b"; depends=[magrittr tibble]; };
   networkABC = derive2 { name="networkABC"; version="0.7-0"; sha256="0vn5hgry4i1dzgp34vdfa6wifsz54jh05avs9xrbzg6zmf1y2cif"; depends=[network RColorBrewer sna]; };
   networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; };
   networkDynamic = derive2 { name="networkDynamic"; version="0.10.1"; sha256="183cnxbcly887vmxcvyvwcn19i8s7yyb57k1q5vhimx8vvcxivi2"; depends=[network statnet_common]; };
@@ -11340,14 +11825,14 @@ in with self; {
   networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; };
   networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; };
   networktools = derive2 { name="networktools"; version="1.2.3"; sha256="0jj5cbp036vjjfj10i1lxzj4yi06xbdy1j20j6a035s8l2wc57pl"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; };
-  networktree = derive2 { name="networktree"; version="0.2.2"; sha256="0dlci3sqdh6f3w82h0p6c2pn15d170m9ls8zllgscd1sbyry4k4x"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; };
+  networktree = derive2 { name="networktree"; version="1.0.0"; sha256="0yabs2fzbcvmizr659zpr3mzf69jai3kfz67qcr2lgrkavprzw86"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; };
   neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
   neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
   neuralnet = derive2 { name="neuralnet"; version="1.44.2"; sha256="09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz"; depends=[Deriv MASS]; };
   neurobase = derive2 { name="neurobase"; version="1.29.0"; sha256="16y1d4qg4d57l43080vlpn5jnh462qnv9z0w6dv0zwlk74psm9ha"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
   neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
   neurocInstall = derive2 { name="neurocInstall"; version="0.12.0"; sha256="1fkb6ji9gigqdjl50hbgdgfidqpjgqlh1aidf6vn4qnfr92bsvqf"; depends=[devtools]; };
-  neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; };
+  neurohcp = derive2 { name="neurohcp"; version="0.9.0"; sha256="02z0lhmw2mr2fk8d8wp7nfcrfl8izds68zskm5j0xfabfb4dwkbx"; depends=[aws_s3 base64enc digest httr xml2]; };
   neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; };
   neuromplex = derive2 { name="neuromplex"; version="0.0-8"; sha256="1bc1kasyibpbfjjy19pmvb9lj61yqx536rgaadkislsxrnisxggs"; depends=[BayesLogit dplyr ggplot2 gridExtra magrittr tidyr]; };
   neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.2"; sha256="1p1zjc3fiphkxflsyzrxx8af98aa0gp9pvby63mmrsjb0z7ps948"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; };
@@ -11356,27 +11841,34 @@ in with self; {
   newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; };
   newsanchor = derive2 { name="newsanchor"; version="0.1.1"; sha256="1s8qhq9jk5gnsimnvy7kdayya0ks0ly309l7zxm5rafj5x7k5vwn"; depends=[askpass devtools httr jsonlite lubridate tidyr xml2]; };
   newscatcheR = derive2 { name="newscatcheR"; version="0.1.0"; sha256="0rm91dfzfjhi51gk65gvq2z7aywg6y8ay3hrjnp6frlmyvh661sp"; depends=[tidyRSS]; };
-  newsmap = derive2 { name="newsmap"; version="0.7.2"; sha256="109zljiz69l4kjld9xlhs05bkbbpazx3a1whl6nmx75zaljhhbs0"; depends=[Matrix quanteda stringi]; };
+  newsmap = derive2 { name="newsmap"; version="0.7.3"; sha256="0189vw51sdz981fy3k7rns61imgil3vcjyrw3bhr5lyqp00zaicf"; depends=[Matrix quanteda quanteda_textstats stringi]; };
+  nflfastR = derive2 { name="nflfastR"; version="3.2.0"; sha256="0hpmji2di826q1hkfjjk9ihcbdss3qhq3mmirjv16v6wa5w0clqm"; depends=[cli crayon dplyr glue gsisdecoder httr janitor jsonlite lubridate magrittr mgcv progressr purrr rlang stringr tibble tidyr tidyselect usethis xgboost]; };
   ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; };
+  ngramr = derive2 { name="ngramr"; version="1.7.2"; sha256="10jm8gjr2fjyr1xvgn6g5w2l7p7xn33jgvy53hhkdlhksfsmlfis"; depends=[cli dplyr ggplot2 httr lifecycle RCurl rjson rlang scales stringr textutils tibble tidyr xml2]; };
   ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; };
   ngspatial = derive2 { name="ngspatial"; version="1.2-2"; sha256="09hdvmbna4m62zv18k5kj9718wzw7p43wnal2j6aa0m5sd2rx9rz"; depends=[batchmeans Rcpp RcppArmadillo]; };
   nhanesA = derive2 { name="nhanesA"; version="0.6.5"; sha256="0bb53s379qrm8xqp4bsi5vgk6v6hvwadzjv09pvdp1n45z7rqj86"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
   nhdR = derive2 { name="nhdR"; version="0.5.3"; sha256="0zd10zy9kn97nm2i0y8h5wjdmzxblv5azybycwf08aqr0x6axh3n"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; };
-  nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.14"; sha256="127bk97rlnh46gdns0s7rpk3s9nbqkb12znf8ddrfbrbbzz2cjb7"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; };
+  nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.16"; sha256="12vyqk341gy6bprln62lf3w2y1rbl24gf132005p8h2j3lmnjg3i"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; };
   nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; };
   nhlapi = derive2 { name="nhlapi"; version="0.1.2"; sha256="13zzy0z2vw8f3q2jy67690w9p71y3rf34xccy5ir49iaflmy4i89"; depends=[jsonlite]; };
   nhlscrape = derive2 { name="nhlscrape"; version="0.1.3"; sha256="0x6y747j6lha3jw4v2wavgd12xw5nx4m8biv9rmq9z0qy53vncjc"; depends=[DBI httr jsonlite RSQLite rvest xml2]; };
   nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; };
-  nhs_predict = derive2 { name="nhs.predict"; version="1.2.0"; sha256="0p5ab9jkwpd6m28jmgx68lpny4mlid71kjxh2sasp2qghq6sxaj4"; depends=[]; };
+  nhs_predict = derive2 { name="nhs.predict"; version="1.4.0"; sha256="0lgyi1v940pjqfpwligw5ml6vagiz8wwsxbr9kfd1j70b5i0kjwd"; depends=[]; };
+  nhsnumber = derive2 { name="nhsnumber"; version="0.1.1"; sha256="1dprhla2wwpgapsrmzjfr131gjpxl0nqri4qibaij0ndpqyfzxmg"; depends=[]; };
   nhstplot = derive2 { name="nhstplot"; version="1.1.0"; sha256="1yk7q731a4y9mhngdsb8xdw2id6m1q78329ja19hdpi6nnd7nhgn"; depends=[ggplot2]; };
   nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
   nichevol = derive2 { name="nichevol"; version="0.1.19"; sha256="0qj5cb0fyw0x1bczl6l0kl6jqir4yg8sb9fsfkd3h64d0ls2arl5"; depends=[ape castor concaveman geiger raster rgdal rgeos sf sp stringr]; };
+  nightmares = derive2 { name="nightmares"; version="0.0.2"; sha256="1dmqrb17ncwazy1nb0zzfy7fq51ah7rz0xmhmmx6d30paaix2vc7"; depends=[raster rgdal sp]; };
   nilde = derive2 { name="nilde"; version="1.1-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; depends=[]; };
   nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; };
-  nimble = derive2 { name="nimble"; version="0.9.1"; sha256="0msp6f633iy5s4d10l51670lab23ji7irxlbwrr03jwk24bqlpmd"; depends=[coda igraph R6]; };
-  nimbleEcology = derive2 { name="nimbleEcology"; version="0.3.0"; sha256="10jkvwbfqg605svfay7f3vcp0k3rp450kgsfggwd3j21y415g3rl"; depends=[nimble]; };
+  nimble = derive2 { name="nimble"; version="0.10.1"; sha256="00p7f0xv079rld2wwvdndwp4p6qw73cyyh06b71k7wj2lkyliqhi"; depends=[coda igraph R6]; };
+  nimbleEcology = derive2 { name="nimbleEcology"; version="0.3.1"; sha256="1bny7srs1cixvqpmqw3wdcc41d88y3yiiy6mmxa2hsmjzcryw3bs"; depends=[nimble]; };
+  nimbleSCR = derive2 { name="nimbleSCR"; version="0.1.0"; sha256="0bnbg774ncmdyclgskywwrbnyj99gk57p0v1cms1b2bgv8ww03wj"; depends=[nimble]; };
+  nimbleSMC = derive2 { name="nimbleSMC"; version="0.10.0"; sha256="15abjhgq8mi8c079hfzwjyl5glchx606hciq2lsirkrbyvc7b23n"; depends=[nimble]; };
   nipals = derive2 { name="nipals"; version="0.7"; sha256="14rq54qy4gc4l9f5h48vrsrh7sb0wzzxbvjn0zax82pz2fw6nybx"; depends=[]; };
+  nipnTK = derive2 { name="nipnTK"; version="0.1.0"; sha256="0imy2x1h9d842ssw7hmmh21c4mj7s6y05mmjin1270skbnrk2zmr"; depends=[bbw withr]; };
   nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; };
   nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; };
   nixmass = derive2 { name="nixmass"; version="1.0-1"; sha256="0yiqmgps9zi46059l0vrqmxp27mv3nn5agand51v3b3x1xz2sq1p"; depends=[lubridate zoo]; };
@@ -11387,20 +11879,20 @@ in with self; {
   nleqslv = derive2 { name="nleqslv"; version="3.3.2"; sha256="1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"; depends=[]; };
   nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; };
   nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; };
-  nlist = derive2 { name="nlist"; version="0.2.0"; sha256="1ahs0gwxxg9lqxwhy19jmqmhsvpk116mp779sg4sqirsqkf0x1zl"; depends=[abind chk coda extras generics lifecycle purrr term tibble universals]; };
-  nlme = derive2 { name="nlme"; version="3.1-148"; sha256="1cmf43r82kar1hpj9dhqfi3rbjka0z5s6cbdy7fklwh99xj3phkp"; depends=[lattice]; };
+  nlist = derive2 { name="nlist"; version="0.3.0"; sha256="0kfd6nw4lyhd6qsq4pwk1sysh1p00ikzygrz5ywwgnwdqjwcj3dw"; depends=[abind chk coda extras generics lifecycle purrr term tibble universals]; };
+  nlme = derive2 { name="nlme"; version="3.1-151"; sha256="1jl6x0glpyszy6bkbcggm3f10jl4kldhs5q561k85xcbssx2dim2"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
-  nlmixr = derive2 { name="nlmixr"; version="1.1.1-9"; sha256="1ykhaww5fyx8vzbw2qpsfazanjw8icb2yf0259gx548lp71jqd7c"; depends=[BH brew cli dparser fastGHQuad flextable generics ggplot2 lbfgsb3c magrittr Matrix memoise n1qn1 nlme Rcpp RcppArmadillo RcppEigen RxODE StanHeaders stringr tidyr yaml]; };
   nlmm = derive2 { name="nlmm"; version="1.0.1"; sha256="0q5vz4xqdb510i26zbcq4djcribn7h477akh8f56nzjgq231vhcq"; depends=[BH HI lqmm MASS Matrix mvtnorm nlme numDeriv Qtools Rcpp RcppArmadillo statmod]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
+  nlnet = derive2 { name="nlnet"; version="1.4"; sha256="13lv4b6chsjrhimny3wc1y9ljgbxmm1byj4j04n4vj8icn87gyfd"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; };
   nloptr = derive2 { name="nloptr"; version="1.2.2.2"; sha256="0whkilb85k4wixvr3k7rygfw1rcs1fs9h8c18kz4p3y1k9hsj3p8"; depends=[]; };
   nlpred = derive2 { name="nlpred"; version="1.0.1"; sha256="05jna8hzd5v36a0dwag6zr8ms1pkryas3qarwb946bkxlslffp27"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; };
-  nlraa = derive2 { name="nlraa"; version="0.73"; sha256="0dbjs0wd0rvnh8nzzy5b4kl83x5b0b1n5maxn0wx0i60xcykxhy0"; depends=[boot knitr MASS Matrix mgcv nlme]; };
+  nlraa = derive2 { name="nlraa"; version="0.76"; sha256="0pyyi7w5xm17rq4zzs9pj9bvn0rwvxlfx3wvqcs7nmmmiasimbcz"; depends=[boot knitr MASS Matrix mgcv nlme]; };
   nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; };
   nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; };
-  nlrx = derive2 { name="nlrx"; version="0.4.1"; sha256="1p29x6ayf3daahn8addh6xfrwl45rsllf4vx1k8l7hqwgxfa73rl"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; };
-  nls_multstart = derive2 { name="nls.multstart"; version="1.1.0"; sha256="1xm2jq1k1s3f403mddfrgx1h5120a49gwkqwfphbfa09qjwvlpjw"; depends=[dplyr minpack_lm purrr tibble tidyr]; };
+  nlrx = derive2 { name="nlrx"; version="0.4.2"; sha256="1knaf7ba8r8va0i8w1r3qqrzvc1zb42sv7j5hbk2jraydbxpbmd6"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr progressr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; };
+  nls_multstart = derive2 { name="nls.multstart"; version="1.2.0"; sha256="1aichzwg54jhw1y3csv2bx40cszbgzfa60hr17jb5133nxb99gwh"; depends=[dplyr minpack_lm purrr tibble tidyr]; };
   nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
   nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
   nlsem = derive2 { name="nlsem"; version="0.8"; sha256="0q3wk7x67mh2447ah807djyklia2x2d45krsskffynazm83msnj9"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; };
@@ -11409,14 +11901,16 @@ in with self; {
   nlsmsn = derive2 { name="nlsmsn"; version="0.0-5"; sha256="1awslzwvv4d3kqw01p7qcqkq5shby29gprzbzxfwnvb5v86dn6ka"; depends=[]; };
   nlsr = derive2 { name="nlsr"; version="2019.9.7"; sha256="1zhfnv09khd2k236jzka9znc0nlps452gwl7db0grb0ylfyxbqg4"; depends=[digest]; };
   nlsrk = derive2 { name="nlsrk"; version="1.1"; sha256="0yqcsz5pdhqsrd86g0yx8bdac13fbmvg89phj3v4qvla2jfznjba"; depends=[]; };
+  nlstac = derive2 { name="nlstac"; version="0.1.0"; sha256="0ag9zzzcadgwa43j16ff30r7g8jfihkwi76shv43igp52a11jr72"; depends=[Deriv doParallel foreach stringr]; };
+  nlstimedist = derive2 { name="nlstimedist"; version="2.0.0"; sha256="0mlg8b6qg3yas828wsjbnwj2dksvsq6pdkyzh31r9mjkj9a4vvrf"; depends=[ggplot2 minpack_lm nlstools poorman]; };
   nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
   nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; };
   nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; };
   nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; };
   nmaINLA = derive2 { name="nmaINLA"; version="0.2.0"; sha256="0z3iln81dj0sg64hi7dxypcslff5yl6nlx0hkra1kc24rhxfzhh2"; depends=[]; };
   nmadb = derive2 { name="nmadb"; version="1.2.0"; sha256="17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40"; depends=[devtools jsonlite RCurl readxl]; };
+  nmaplateplot = derive2 { name="nmaplateplot"; version="1.0.0"; sha256="00cs2c5qryd04y5qc0fb3pmv6fz017jvp3cbxacjy1rl93iyfpwh"; depends=[ggplot2]; };
   nmathresh = derive2 { name="nmathresh"; version="0.1.6"; sha256="1jrf7k7an5y867k40aj28ib7vrjyqky2cslwzmfx28snp8ns1vd3"; depends=[ggplot2 gridExtra gtable Matrix nnls]; };
-  nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; };
   nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; };
   nmslibR = derive2 { name="nmslibR"; version="1.0.4"; sha256="1fw565n4128nswl2qx248ab60is98iqijq5blwskxc9hjddf95a4"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; };
   nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; };
@@ -11426,7 +11920,7 @@ in with self; {
   nnet = derive2 { name="nnet"; version="7.3-14"; sha256="1bzl62p5awva5kxcncs6lrdrkqp9ljd993zia731ckfpcjbrw6sx"; depends=[]; };
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnfor = derive2 { name="nnfor"; version="0.9.6"; sha256="0bciy6k79g7abvj3pmmdc4wzg5mp11zgmdbx17x4by993p2clhw9"; depends=[forecast glmnet MASS neuralnet plotrix tsutils uroot]; };
-  nngeo = derive2 { name="nngeo"; version="0.3.9"; sha256="1dq3gwz0bhvxvfzcnnw4jcjs8zvg9jf5f7k89cz2vd9waw6s6w1d"; depends=[lwgeom RANN s2 sf units]; };
+  nngeo = derive2 { name="nngeo"; version="0.4.0"; sha256="08yrgdpxf47ag1c8jmvgg5gl8gz0glplrdn7h1bipwywbsqjl4yi"; depends=[lwgeom nabor s2 sf units]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnlib2Rcpp = derive2 { name="nnlib2Rcpp"; version="0.1.4"; sha256="0cg2sh0pvkfcmsp76c2biz84lqh4zrspshrvhlsxgziavhcmr4wc"; depends=[Rcpp]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
@@ -11434,18 +11928,19 @@ in with self; {
   nntrf = derive2 { name="nntrf"; version="0.1.3"; sha256="1b9610wy7s1gnvi9x34nm50ijkgfa98xfrdymww019gq2nib7q2g"; depends=[FNN NeuralNetTools nnet pracma]; };
   noaaoceans = derive2 { name="noaaoceans"; version="0.2.0"; sha256="1hvjkma14kl8f69ichk27ddxlg9cqnzif8x43ckxyny6h341bbkf"; depends=[httr jsonlite rvest xml2]; };
   noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; };
-  noctua = derive2 { name="noctua"; version="1.8.0"; sha256="0md9yhqgikaqhack9b72hds68a0x647y7phkn4mgirzf2cihakly"; depends=[data_table DBI paws]; };
+  noctua = derive2 { name="noctua"; version="1.9.1"; sha256="0in6abza87z68ndlcci7gywfq1z4v5izd8vx0gbm5mgp8a7h828k"; depends=[data_table DBI paws uuid]; };
   nodbi = derive2 { name="nodbi"; version="0.4.0"; sha256="1jlqzj9lv9wnsb8hwy8y91369i6ykp8av35abakfpxg0302svay9"; depends=[data_table jsonlite]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
   nodiv = derive2 { name="nodiv"; version="1.4.0"; sha256="1k7pr9d1mgxw3szxcmnkkz498x7629wf2z65qlclywka3xgzpkxc"; depends=[ape picante raster sp vegan]; };
   nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
-  noisyCE2 = derive2 { name="noisyCE2"; version="1.0.0"; sha256="11cf7b472i6lsb4kh04rhp5mhj7l8ig0kxmkz05kazkr6cs41s6i"; depends=[magrittr]; };
-  nombre = derive2 { name="nombre"; version="0.2.0"; sha256="1ybrd052mvgx3pwf7kknvx9hvxa5y26hy44cgcjdqq35kxl50xlp"; depends=[]; };
-  nomclust = derive2 { name="nomclust"; version="2.1.6"; sha256="1jgb2bd9wc7hvvnkzh9jfcw3biiqfx9mi6qrw2qslab4r48binzs"; depends=[cluster plyr]; };
+  noisyCE2 = derive2 { name="noisyCE2"; version="1.1.0"; sha256="02zkkyys9qknwm39gz4j4pvlvkd5qlvxqaprklzsd40dgz39cwq4"; depends=[magrittr]; };
+  noisySBM = derive2 { name="noisySBM"; version="0.1.4"; sha256="1zdkxr48kvpqs49figxxznq3d45nalja92lyal71m066s1blc6dg"; depends=[ggplot2 gtools RColorBrewer]; };
+  nombre = derive2 { name="nombre"; version="0.3.0"; sha256="0ssi0xk3f327zs7zvyhcm20v537y6ikjnfjarjsz22dvn05dblma"; depends=[fracture pkgconfig]; };
+  nomclust = derive2 { name="nomclust"; version="2.2.1"; sha256="1034j5y7dppm4xkap1h3ywl77fz3dsm3g15njjgzcszr3p0z4vxn"; depends=[cluster plyr]; };
   nomisr = derive2 { name="nomisr"; version="0.4.3"; sha256="0p1vc6qzs7lyflw9jndimylv614dny27nz18xkmay2419vwh463f"; depends=[dplyr httr jsonlite readr rlang rsdmx snakecase tibble]; };
-  nomnoml = derive2 { name="nomnoml"; version="0.2.0"; sha256="10xy9738jqx45qx27lzlqairirs122c5n3dx7kbsq1b6ilmalqbp"; depends=[htmlwidgets png webshot]; };
+  nomnoml = derive2 { name="nomnoml"; version="0.2.3"; sha256="08zraip0v4jc51zv2zsvka6k8d1ry2ac9d70xpavfggbgmrmz987"; depends=[htmlwidgets lifecycle png rlang webshot]; };
   nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; };
   nomogramFormula = derive2 { name="nomogramFormula"; version="1.2.0.0"; sha256="1j6g5kndl0n2g8acwq8pn09sk0bjcsphbcd77ha1j5dnwdmy73c0"; depends=[do Hmisc rms]; };
   noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; };
@@ -11453,8 +11948,8 @@ in with self; {
   nonet = derive2 { name="nonet"; version="0.4.0"; sha256="1043vplj8libbzll172h82dfwnz2lsdba5na2g9liryg8p08h4v8"; depends=[caret dplyr e1071 ggplot2 glmnet pROC purrr randomForest rlang rlist tidyverse]; };
   nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; };
   nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.10"; sha256="1zhp06az5pz7133253h18wwy77vpky4g0gi636v42p9dh0dzzvbm"; depends=[Matrix Rcpp RcppArmadillo rgl tseries zoo]; };
-  nonmem2R = derive2 { name="nonmem2R"; version="0.2.1"; sha256="0a7h9wb8dqjgzyk4hd9ivhy90n80wrrp4zkrxnvgfvza1619qd52"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; };
-  nonmemica = derive2 { name="nonmemica"; version="0.9.1"; sha256="0hhrg29wjqhb5pk13scg2zgqzzhf5azvfbph0rrfdb5qkj585awd"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; };
+  nonmem2R = derive2 { name="nonmem2R"; version="0.2.2"; sha256="07ycldcbjap1ay9msmlf9jz4sk1p02di108zsz5x45yxd3fb6r93"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; };
+  nonmemica = derive2 { name="nonmemica"; version="0.9.7"; sha256="12760lvbifzakzq7wjzqavqicrp2pzyq333glmafm9v73lx97pa7"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; };
   nonneg_cg = derive2 { name="nonneg.cg"; version="0.1.6"; sha256="15361k0kjy1465s8pr9jb5jy22mibi37zcnza7mbfh5l66hr29kh"; depends=[Rcpp]; };
   nonnest2 = derive2 { name="nonnest2"; version="0.5-5"; sha256="1ddaqwx8i3ygwvxf11mc8xhgk4nkvnail99nr5szq8i168752zq2"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
   nonpar = derive2 { name="nonpar"; version="1.0.2"; sha256="0gflldd3kjbpdlvbwi073igj6shcqr9g5x6zcp5gfa12404qpflq"; depends=[]; };
@@ -11471,7 +11966,6 @@ in with self; {
   normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; };
   normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
   normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
-  norris = derive2 { name="norris"; version="0.1.1"; sha256="07pflm5nc9rxi5zvi394c9y8h9hmhsvn4ya4ghlr9y6yxzwrz0l1"; depends=[dplyr httr jsonlite stringr]; };
   nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; };
   nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; };
   nortsTest = derive2 { name="nortsTest"; version="1.0.0"; sha256="15s7shl7gxhfyi5qc86wbwggkk3axhglbc15ba1wk8r40fwhjv2s"; depends=[forecast ggplot2 gridExtra MASS nortest tseries uroot zoo]; };
@@ -11504,21 +11998,21 @@ in with self; {
   npmr = derive2 { name="npmr"; version="1.2"; sha256="073i9zcnyp8l5fxblx2sfyn0b4lr6i595q6kl6ispvzmylwqj8na"; depends=[]; };
   npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; };
   npordtests = derive2 { name="npordtests"; version="1.2"; sha256="1axzcyy45h3rs67m0i3cvwbmza1mnmraxan9j4zlpxdd5x9nz4h8"; depends=[]; };
-  nppbib = derive2 { name="nppbib"; version="1.1-0"; sha256="1dcqcf2jhlz3n4d2kjix8wray9c7yaawfdbdg9lcrih1m7b8gmsy"; depends=[]; };
+  nppbib = derive2 { name="nppbib"; version="1.2-0"; sha256="1nn6wf89jhr3gy4rcd6px0cd5b1bsr7pbaxng4adba8n3yrss7vs"; depends=[]; };
   npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; };
   nprcgenekeepr = derive2 { name="nprcgenekeepr"; version="1.0.3"; sha256="148fq935x7dmw754qgkkgka5hd2xdmh2cn1d5g2azzgx974zndzv"; depends=[anytime futile_logger htmlTable lubridate Matrix plotrix readxl Rlabkey shiny shinyBS stringi WriteXLS]; };
-  npreg = derive2 { name="npreg"; version="1.0-4"; sha256="1fa2lna6l49x08f61d7y4qxv9bw0vml19zilfnl253djsqf7q37s"; depends=[]; };
+  npreg = derive2 { name="npreg"; version="1.0-5"; sha256="1ddr3iapx1zzl72bygjy3gf50cr8pkf1ap5hzr5ci4rg4bmdjznw"; depends=[]; };
   npregderiv = derive2 { name="npregderiv"; version="1.0"; sha256="1k873cs3rs15l13z8017n4anacandx7di6yk1zlamcc5p3vlh59n"; depends=[]; };
   npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; };
-  nprobust = derive2 { name="nprobust"; version="0.3.0"; sha256="0nb2ca6ljg1c2jmjhxrpfynrvmjzp5zr8dxwyhdhzl0smrkjybj4"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+  nprobust = derive2 { name="nprobust"; version="0.4.0"; sha256="1vry64r3xms6xls6bqq918prjyhs5svhl2yjvq0jxycaaqw2sgyp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   nproc = derive2 { name="nproc"; version="2.1.5"; sha256="1p5wjz0rafg27fsl48l9pmki3px1k0pav3ignz4swik5i1nhnc8w"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
   nprotreg = derive2 { name="nprotreg"; version="1.0.1"; sha256="1bjrnbfzs7h3q424d1kxlvb29ppnxf0dw7hsx2gn5bygz1zgm54h"; depends=[]; };
-  npsf = derive2 { name="npsf"; version="0.7.1"; sha256="03rfcnkfk1magcjvrjc96qxngw840sgiasl5yklhgiigz4nnqvi5"; depends=[Formula Rcpp]; };
-  npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; };
+  npsf = derive2 { name="npsf"; version="0.8.0"; sha256="011y8k3sdhhgzf4yn0wdxx55yv4kdpgyhj0bbm6krjdpphnr9557"; depends=[Formula Rcpp]; };
   npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; };
   npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
+  npsurv = derive2 { name="npsurv"; version="0.5-0"; sha256="1ihxhb42cga1hssj2jv4ah0f4hlwsky899ij5261fzh1wxvdp1xw"; depends=[lsei]; };
   npsurvSS = derive2 { name="npsurvSS"; version="1.0.1"; sha256="0k9xvxii5527vynf7yy50j7z4jhxgk5ydhdcaaygm9ynx5yq14ip"; depends=[]; };
-  nptest = derive2 { name="nptest"; version="1.0-0"; sha256="13h93sx5fsbfiy3q88j4bl0p3hwqzi8l4ab0r0qha78dzd6skq2v"; depends=[]; };
+  nptest = derive2 { name="nptest"; version="1.0-2"; sha256="1h1bmv7yj2nzwivk1z11a67z3xkamh0ljfr0nlimyr6qx32hr5s9"; depends=[]; };
   nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; };
   nsRFA = derive2 { name="nsRFA"; version="0.7-15"; sha256="004dm143v032b80knpz7pj3z71lci7vgd6hz1zz22rpfg27ghgdd"; depends=[]; };
   nsROC = derive2 { name="nsROC"; version="1.1"; sha256="1fi7k61fja98kpn528jprjdycwz01rnqm368m82anxh21k7q4s1m"; depends=[sde survival]; };
@@ -11526,13 +12020,15 @@ in with self; {
   nsarfima = derive2 { name="nsarfima"; version="0.2.0.0"; sha256="0sv63anrsh0ajfvvkb44zsvc7sxws3xpsgwxqa951gy98w8h58g5"; depends=[]; };
   nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; };
   nse = derive2 { name="nse"; version="1.19"; sha256="107ri9325ga4kgvs5a3j3698dc3m4v28cb02ypc4dan6f3fa9h8i"; depends=[coda mcmc mcmcse np Rcpp sandwich]; };
-  nse2r = derive2 { name="nse2r"; version="0.1.2"; sha256="1rbcqz8zighy0vqi04lh93f2ggwlqhjvvn7f0627m5gp6ph2bdyh"; depends=[jsonlite magrittr rvest xml2]; };
+  nse2r = derive2 { name="nse2r"; version="0.1.3"; sha256="18zchh830b546lmy64l94l4lq89bk6jb49x2asw9f07i60plbwyi"; depends=[jsonlite magrittr rvest xml2]; };
   nseval = derive2 { name="nseval"; version="0.4"; sha256="18avir5zllvm2sbi9616k7dlb8yxhvnbji7xshr4kcfvy1fvn2ia"; depends=[]; };
   nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
   nsga3 = derive2 { name="nsga3"; version="0.0.3"; sha256="1jv3kw22jw24n7lnwhq3857mygr2yfv8c5xp3lbqqgz5840cdfa1"; depends=[mlr parallelMap rPref xgboost]; };
   nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
+  nspmix = derive2 { name="nspmix"; version="1.5-0"; sha256="1jaaw5ibn614yhlid0csnzj31npdx5zivm2nhnvyghzcmvyxavr8"; depends=[lsei]; };
   nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; };
   nsrr = derive2 { name="nsrr"; version="0.2.0"; sha256="1x1c7pvyfvzmaymxcz6ghr5002wz48796c3hsihwbx6951w623sq"; depends=[digest httr jsonlite]; };
+  nsyllable = derive2 { name="nsyllable"; version="1.0"; sha256="004qb43j8ygr9ay63b38w0fwm24bhlzd206sxg88hh5ia69fw8ms"; depends=[]; };
   nucim = derive2 { name="nucim"; version="1.0.9"; sha256="19vj1xkzw1b02lyfsf7c9s37jcv95bs30larlzj3074jdf4jznsm"; depends=[bioimagetools EBImage fields stringr]; };
   nullabor = derive2 { name="nullabor"; version="0.3.9"; sha256="19nfmsnzndg9pdjg7m9w4vm4c3209ny52cpjdhmmhggvf7dxaiyg"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tsibble viridis]; };
   numDeriv = derive2 { name="numDeriv"; version="2016.8-1.1"; sha256="0idk02pqkziik932bd8k72d1q775g1is3m4bc861pcxfz6gx3i6q"; depends=[]; };
@@ -11541,24 +12037,24 @@ in with self; {
   numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; };
   numbers = derive2 { name="numbers"; version="0.7-5"; sha256="1dz23rmjzdns4av28kk8bc9psj71q2bpcgm1m7sxnyzcxpm8hczc"; depends=[]; };
   numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; };
-  numform = derive2 { name="numform"; version="0.6.0"; sha256="0v19dcr5xwi0bf4s0qwipxpmxbw42l2li1h9i73kdrigznhlqq8h"; depends=[glue]; };
+  numform = derive2 { name="numform"; version="0.6.4"; sha256="034dmrhp3d0r4hspy8490wjpknc83dsiyjhl3nha0b4w8vbcalsz"; depends=[glue]; };
   nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; };
-  nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; };
-  nvmix = derive2 { name="nvmix"; version="0.0-4"; sha256="0srgf7zczy2bp8qqhr15mrccd6v0bksx2nkgizdh4ipr17vqzgrp"; depends=[Matrix qrng]; };
+  nvctr = derive2 { name="nvctr"; version="0.1.4"; sha256="1r7q9snr9ya1586fwbyvnk8rlb9yikl4yp3bn9kni0sw820npk1d"; depends=[magrittr pracma]; };
+  nvmix = derive2 { name="nvmix"; version="0.0-5"; sha256="15nipvfb92r1dx4shvix8hhjg0mzvrwprgzgdzkdmhvxk9d8rswd"; depends=[copula Matrix pcaPP qrng]; };
   nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
   nycflights13 = derive2 { name="nycflights13"; version="1.0.1"; sha256="0h4jzg4q5qpvjp5b2wlk3a2mh0jhyz9c1acdjcmg70pap7fyh0fj"; depends=[tibble]; };
   nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; };
-  nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.5-1"; sha256="0rshf4d0xi0cfwnpvb73d39f7zcw4ilh065lzm8gbx1ri7v64rgn"; depends=[httr jsonlite rstudioapi stringr]; };
+  nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.6-3"; sha256="19ys3l40xmqmkhhpq3l7hz8ni4wqn1j8h23hqic8r1arf4ci9b89"; depends=[httr jsonlite rstudioapi stringr]; };
   nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; };
+  o2geosocial = derive2 { name="o2geosocial"; version="1.0.1"; sha256="1q4y606cpyfjik56zw019xscrshm4s9n0y0g37izmd02cv17a4ik"; depends=[data_table geosphere ggplot2 outbreaker2 Rcpp visNetwork]; };
   oRus = derive2 { name="oRus"; version="1.0.0"; sha256="0q6hgiidcpm95pyisndihxjg78v6k1zycdqd72309aankdk0g5h4"; depends=[dplyr knitr rmarkdown stringr tibble tidytext tm topicmodels xlsx]; };
   oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; };
   oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; };
   oai = derive2 { name="oai"; version="0.3.0"; sha256="1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g"; depends=[httr plyr stringr tibble xml2]; };
   oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; };
-  oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; };
   oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; };
   obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; };
-  obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.0"; sha256="01j3bvmnqlajkwqz01f5zfmwgfbnmhcxa41gqnzq7k41xzm7q8vk"; depends=[crayon matrixStats readr Rfast stringr tibble]; };
+  obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.1"; sha256="1pnlbfsp5fjvhwn2yl495v38g1wjg5l4ry79i1a2jznq2l91hn4p"; depends=[crayon matrixStats readr Rfast stringr tibble]; };
   objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
   objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
   objectremover = derive2 { name="objectremover"; version="0.7.0"; sha256="0mspnnks04s8w6q2g0nffd0675g07hkaql44kz6zrc5329qx7jpi"; depends=[miniUI shiny shinyalert]; };
@@ -11569,7 +12065,8 @@ in with self; {
   observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; };
   oc = derive2 { name="oc"; version="1.2"; sha256="0cw1gvz6gk8j718zmywqp03h9cnzn132nwbv45gr00xg2s9h7dk7"; depends=[pscl]; };
   occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; };
-  ocd = derive2 { name="ocd"; version="1.0"; sha256="0r14w09wzyxp685jbzqj3dirnhsq106d23igl1jd5xpwbj2192n5"; depends=[]; };
+  occCite = derive2 { name="occCite"; version="0.4.5"; sha256="1409mzhkgw9m6nfdj3q7cz95js3db1whad8ns2pkwmg5i9nl8h4n"; depends=[ape bib2df BIEN bit64 DBI dplyr ggplot2 htmltools knitr leaflet lubridate magrittr rgbif rlang RPostgreSQL stringr taxize tidyr waffle]; };
+  ocd = derive2 { name="ocd"; version="1.1"; sha256="06pyc352pvn85k76z9797gwk0ksbb3snvh6krysp68k3lcygq872"; depends=[]; };
   oce = derive2 { name="oce"; version="1.2-0"; sha256="18ls8c8ia00dn9f9lxk01mvwqmxd1ilx1d7y59d1nixd40mjy1wr"; depends=[gsw Rcpp testthat]; };
   oceanis = derive2 { name="oceanis"; version="1.7.5"; sha256="1mb9jrrgbkawiwa20xqy7im56gjcn0nmq4vi9mnrzrgizfid25dx"; depends=[classInt dplyr DT ggplot2 leaflet leaflet_extras lwgeom mapview sf shiny shinyBS shinyjs shinythemes stringr units]; };
   oceanmap = derive2 { name="oceanmap"; version="0.1.1"; sha256="06h4yxqcn3rjr3m2n82w128z110a4k5rg6msrbd0gcqksxc4vd2v"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; };
@@ -11580,27 +12077,28 @@ in with self; {
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
   ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; };
   ocs4R = derive2 { name="ocs4R"; version="0.1"; sha256="1sm2fl503ky4pxv9873zykidb56f7dygq1xckjsh0d7m78n4gzx5"; depends=[curl httr jsonlite openssl R6 XML]; };
-  odbc = derive2 { name="odbc"; version="1.2.3"; sha256="04b9qlpycr771xip11wd2zhb1yiz7x1bl3jhqj6p4daq553snvhy"; depends=[bit64 blob DBI hms Rcpp rlang]; };
+  od = derive2 { name="od"; version="0.0.1"; sha256="1w65jynv28vfbgp4ln6mrhgymis2098mcfy6mpax3sx4a5s7yyaq"; depends=[sfheaders]; };
+  odbc = derive2 { name="odbc"; version="1.3.0"; sha256="1m2ljaw44gl78i34c52jiyzzskqak9p5zddai5ijjfc2afkvldfg"; depends=[bit64 blob DBI hms Rcpp rlang]; };
   odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; };
   odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.1"; sha256="0kgdv4m14h4a16b0k2s2qjyjn0kxk5sf4qkbi6ikm6kqdh5ashp4"; depends=[MASS]; };
   oddsratio = derive2 { name="oddsratio"; version="2.0.1"; sha256="1db0pxi5j18rvi8dyc2xx1im3l269775vpjjavapjcv2pylfg5r0"; depends=[ggplot2 mgcv]; };
   oddstream = derive2 { name="oddstream"; version="0.5.0"; sha256="1nwjw7fq6b4jdq4m2w0a7xgmzjg5a6pbma1d3r9msiz8rnhb0c54"; depends=[dplyr ggplot2 kernlab ks magrittr MASS mgcv moments mvtsplot pcaPP RColorBrewer RcppRoll reshape tibble tidyr]; };
   odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; };
-  odin = derive2 { name="odin"; version="1.0.1"; sha256="1m1rqlh9z6hpna6qhyxhavqph3j66hbd2b5md5ha2hrbjq93yynm"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; };
+  odin = derive2 { name="odin"; version="1.0.8"; sha256="1wpkyaig81kwbq08cbn02kf6c8sfcq49kd7d66ibrd93ai239f26"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; };
   odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; };
-  odpc = derive2 { name="odpc"; version="2.0.3"; sha256="1lv8kn4dvwibnhzhq0safgmm6abffmjw1279acawzf3ik308m3cm"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; };
+  odpc = derive2 { name="odpc"; version="2.0.4"; sha256="1525apa5x4jqf8ijdc9xl60fgxsi5xsirhd35cmnc362sd7k2jjd"; depends=[doParallel foreach forecast MASS Rcpp RcppArmadillo]; };
   odr = derive2 { name="odr"; version="1.0.2"; sha256="0dj5piyd6h92q6agv8yvzky3qpxjn6zpgvf502hf0n6k9gx6kdpl"; depends=[]; };
   oem = derive2 { name="oem"; version="2.0.10"; sha256="1nf9ja4l7b9gnnvv216dz9siy02432qgyg930vcrqq3l8g05r6zc"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
   oenb = derive2 { name="oenb"; version="0.0.1"; sha256="1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz"; depends=[dplyr XML]; };
   ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; };
   officedown = derive2 { name="officedown"; version="0.2.0"; sha256="0v7bhcgfk8xra3w9fjrcm7vra2hjq9wm1wj2mbsa3xdknicv9yrs"; depends=[knitr memoise officer rlang rmarkdown rvg uuid xml2 yaml]; };
-  officer = derive2 { name="officer"; version="0.3.12"; sha256="1wk9h6bz77s5j6lgksmlrmi1vyaa35c766gq6hgb1dp0dz0x342x"; depends=[magrittr R6 uuid xml2 zip]; };
+  officer = derive2 { name="officer"; version="0.3.15"; sha256="1s9hrkdx105c1plpxywv68bmp8hvvxbdizhwx81fxr79fhj62x5j"; depends=[magrittr R6 uuid xml2 zip]; };
   offlineChange = derive2 { name="offlineChange"; version="0.0.4"; sha256="005afrm4ki4zz3zkgrf8c1v9gf5cjhc5g50mjkqya3r8npaccwq2"; depends=[Rcpp]; };
   oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; };
   ohenery = derive2 { name="ohenery"; version="0.1.1"; sha256="0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq"; depends=[dplyr magrittr maxLik Rcpp]; };
   ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; };
   oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; };
-  ojsr = derive2 { name="ojsr"; version="0.1.1"; sha256="0bf0bmnqwfd7x2ggx8mkq4zkfgv9j0l2fb3k728cwg2h5nfqn9c9"; depends=[dplyr magrittr oai purrr rlang rvest stringr tidyr urltools xml2]; };
+  ojsr = derive2 { name="ojsr"; version="0.1.2"; sha256="0nwdws9kqnya9qjc939b7ksrf7ri6d25zzcdxhyhabirhnrqdg7m"; depends=[dplyr magrittr purrr rlang rvest tidyr urltools xml2]; };
   okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; };
   okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
   olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; };
@@ -11609,13 +12107,14 @@ in with self; {
   olsrr = derive2 { name="olsrr"; version="0.5.3"; sha256="0rh1jb0z0ypspzcp4vbpzjz960yj76myk2j4zb1vi9gnnj3clw8y"; depends=[car data_table ggplot2 goftest gridExtra nortest Rcpp]; };
   omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
   omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; };
-  omicwas = derive2 { name="omicwas"; version="0.7.0"; sha256="0i3d6qkcv6xsmb2fq0sf9dn7mqh4rzq01326zbzf5p5y2f5gfipp"; depends=[broom data_table dplyr ff glmnet magrittr MASS matrixStats PCDimension rlang sva tidyr]; };
+  omicwas = derive2 { name="omicwas"; version="0.8.0"; sha256="03l53vbsard0hpaffcaa9l1aa3nh3w16j00k2jz2jqrrg02z0d7h"; depends=[broom data_table dplyr ff glmnet magrittr MASS matrixStats purrr rlang tidyr]; };
   omopr = derive2 { name="omopr"; version="0.2"; sha256="1ng94jnarj7pszxzvdlnrr2dbcvv5p5yrscjw6ihqkskpraw9f7w"; depends=[DBI dbplyr dplyr RSQLite]; };
-  ompr = derive2 { name="ompr"; version="0.8.0"; sha256="1nmd5wa1g2xzmwqfqf882bxcrmkxbb5b414cbbzvmqzfs34yk6bl"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; };
+  ompr = derive2 { name="ompr"; version="0.8.1"; sha256="10q6p1j7y22w82b73806ixcwvmpf5cffn1d84p7zqlgxcj6sk24w"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; };
   ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; };
   omu = derive2 { name="omu"; version="1.0.4"; sha256="03dvbgxf5d181wka0gpf3sr008fzzva57xvdniynbgqskgcn4qi3"; depends=[dplyr ggfortify ggplot2 KEGGREST magrittr plyr reshape2 stringr tidyr]; };
   oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
   oncrawlR = derive2 { name="oncrawlR"; version="0.2.0"; sha256="0cm26diaf3jlzfrpgh13q0hakakmj6vy41wk9z0w81az4jcg9sn9"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rjson rlang rlist scales sparkline tidyr webshot xgboost]; };
+  oneclust = derive2 { name="oneclust"; version="0.2.1"; sha256="04nafy0bv3g5vjd5k7858lvs9rc141kzpblsdcb7sl4kfw76s11z"; depends=[magrittr Rcpp]; };
   onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; };
   onelogin = derive2 { name="onelogin"; version="0.2.0"; sha256="06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl"; depends=[glue jsonlite magrittr R6 safer tibble]; };
   onemap = derive2 { name="onemap"; version="2.1.3"; sha256="0fwkr845zz0j8ccrwpksb28lly1rsgj3603ak1aqqgmlx6481p08"; depends=[ggplot2 MDSMap plotly Rcpp reshape2]; };
@@ -11625,36 +12124,40 @@ in with self; {
   onlineCOV = derive2 { name="onlineCOV"; version="1.3"; sha256="04ikvsd76f6xhja7djyv433m88lfj2vf0y9qi6x1s4i9kh8xkbz9"; depends=[]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; };
   onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; };
+  onlineforecast = derive2 { name="onlineforecast"; version="0.9.3"; sha256="1bsdw4z651ld3p6k2ajahql0ixv65vppqyn6kd9xmcvw6xqys4m1"; depends=[digest pbs R6 Rcpp RcppArmadillo]; };
+  onlineretail = derive2 { name="onlineretail"; version="0.1.0"; sha256="0br4az2s4s7wh32cx324wpwhh7xfa9y1skyga349pbyhbgqwiq50"; depends=[]; };
   onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; };
   onnx = derive2 { name="onnx"; version="0.0.2"; sha256="0gyyaplq20cb0bilnmx0k2cm7yzrfvwsawdzs0bha1p5b83l003v"; depends=[reticulate]; };
   ontologyIndex = derive2 { name="ontologyIndex"; version="2.5"; sha256="127hlf0z5fmbgnq4p9h8nvn6p72d2fpcn846zzb99s213421jnry"; depends=[]; };
   ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; };
   ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.3"; sha256="1rh3cpj3r82xp4gqvspvgwwi3a29gyi0azrf4r1nshhi8qdx9avw"; depends=[ontologyIndex Rcpp]; };
-  oolong = derive2 { name="oolong"; version="0.3.4"; sha256="1zhgk9y1iy90kn6kwx2r80jy6fymgkd59c03xx936sijk0wnpwrq"; depends=[cowplot digest dplyr ggplot2 irr miniUI purrr quanteda R6 shiny stm text2vec tibble]; };
+  oolong = derive2 { name="oolong"; version="0.3.11"; sha256="0yv3xqzyyl81d1xii2b66akmibn1l35lxcv8yr2nflz4b89qcyhd"; depends=[cowplot digest dplyr ggplot2 irr miniUI purrr quanteda R6 shiny stm text2vec tibble]; };
   oompaBase = derive2 { name="oompaBase"; version="3.2.9"; sha256="1cmw2s5dznmv675484jgvkzgvi6vhg0zbxsq6zhpqsisf672pjhl"; depends=[cluster]; };
   oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
-  opalr = derive2 { name="opalr"; version="1.4.1"; sha256="0rvk36mpgpw9lmx0jiyvzg04mrmdhv7v88akjihj0dfr23wf48gp"; depends=[httr jsonlite mime progress xml2]; };
-  openCR = derive2 { name="openCR"; version="1.4.1"; sha256="046ijw5ss8nb0m11p7r682zi7242m0ljydnsrr3gwrnmc4ayk6xv"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; };
+  opalr = derive2 { name="opalr"; version="1.5.1"; sha256="0vma7iyb3zj6kq8w7ggr5xhpxfddqd8mx8yfnp0hjbd5nw7a10c7"; depends=[httr jsonlite mime progress]; };
+  openCR = derive2 { name="openCR"; version="1.5.0"; sha256="0im2r9f6n0a7wxzdrrmzydiwy5c55bxhr4f9pxxccgz1k596q5yq"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; };
   openEBGM = derive2 { name="openEBGM"; version="0.8.3"; sha256="120lp7fy6abj6f8g6naq4018d0dfzz6bq3dlh0xdhd4iclb7pplv"; depends=[data_table ggplot2]; };
   openNLP = derive2 { name="openNLP"; version="0.2-7"; sha256="15yl74wv6w1d2wwpn1xlkkpam3c62977gnqal651fv623v29gg35"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; };
-  openSTARS = derive2 { name="openSTARS"; version="1.2.0"; sha256="1pyxllnzwfn9x5lz07inknl56jhmwliai8bmacfzcv3ksn19ndic"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; };
+  openSTARS = derive2 { name="openSTARS"; version="1.2.2"; sha256="0f3nv6b33r3m7xlh2adbi0wlzr2dw6jfsrmz8fjrlh0l7xakf1hz"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; };
+  openSkies = derive2 { name="openSkies"; version="0.99.8"; sha256="1s1821yykhc182wkncw0afhysmv46ihp2as0ynznkl74ijms0qyv"; depends=[httr xml2]; };
   openVA = derive2 { name="openVA"; version="1.0.11"; sha256="0yzq462rf4vfr2xmczb6mks8xp7n3mli95ld8mf1xkj6a2sz584q"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; };
   openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; };
-  openair = derive2 { name="openair"; version="2.7-4"; sha256="1d5ylsj8spslrv8pflvblzkdfdbv4iz8c5qh73zs4d70k5ma9nwy"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; };
+  openair = derive2 { name="openair"; version="2.8-1"; sha256="02jw0zcf9sms341f3bylhqbdyz3whgwyqij951dvznayix91bn1k"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; };
   openblender = derive2 { name="openblender"; version="0.5.81"; sha256="01akixxj04kgrxhv04icrivfpnipnpg9j62i3y19q3jkl9846lh1"; depends=[httr jsonlite]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
   opencastR = derive2 { name="opencastR"; version="0.1.3"; sha256="1ljn7bzrqc2sgah1a6q2g9hi38nm8davhdc2vyzx7d40z7ysfpas"; depends=[httr jsonlite]; };
-  opencpu = derive2 { name="opencpu"; version="2.2.0"; sha256="1isbl9szkh1vax29czvg8b8nyw0l6f3zyj24vhkm3y7ppavj5xdw"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; };
-  opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; };
-  opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.3"; sha256="1rcdv2zk3ckrp2fig71lgzw5i06767qqlrdj80r4b522nxx7npyn"; depends=[ckanr curl magrittr readxl sf tibble xml2]; };
+  opencpu = derive2 { name="opencpu"; version="2.2.1"; sha256="0qv0w52xrvq5i819lrd6yf1bzjz95xi697yzsszh563dvwksxnhs"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; };
+  opencv = derive2 { name="opencv"; version="0.2.0"; sha256="0lilsw46sp217vybn793md1kcc09z426qf9dc9rmkmvfb86q8k8v"; depends=[magrittr Rcpp]; };
+  opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.4"; sha256="0ggf25ry31xz69fl95cglg45ld8w7rc83wci609fmb63bhj8dzlg"; depends=[ckanr curl magrittr readxl sf tibble xml2]; };
   opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; };
   openintro = derive2 { name="openintro"; version="2.0.0"; sha256="1pr24cph9vxp0d0k1pmyk3kwzbj5jb96nkvsm6n1ky79msiax9fm"; depends=[airports cherryblossom ggplot2 rmarkdown tibble usdata]; };
-  openmetrics = derive2 { name="openmetrics"; version="0.2.0"; sha256="0ia33f0p7k1zl22b9kqsggaakdr3npfm0q0jabk0s1ih9bxpv15h"; depends=[R6]; };
-  openssl = derive2 { name="openssl"; version="1.4.2"; sha256="17fkc6pr8w5z3rpadg692a689p1v4j7xl5ak0y64is7c74cxgljx"; depends=[askpass]; };
+  openmetrics = derive2 { name="openmetrics"; version="0.3.0"; sha256="0bcljsirlkxn0h87j2g2jb6spcik84h7nms06mcj40ckx188yr82"; depends=[R6]; };
+  openssl = derive2 { name="openssl"; version="1.4.3"; sha256="0sc2skh1nz7jj65p0pq4a6bl8jza6lyi4zvmvwndzxfgivgh281l"; depends=[askpass]; };
+  opentimsr = derive2 { name="opentimsr"; version="1.0.2"; sha256="07z36a1avrz31dhlg7pzfbazwdp0dqhxr7kk2i9mrw26qcwkl095"; depends=[DBI Rcpp RSQLite]; };
   opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
-  opentripplanner = derive2 { name="opentripplanner"; version="0.2.3.0"; sha256="10vhwpsvn6470878r3xp80pw8rx8mxjznbfrh0c0s3f11wnkdmdn"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf vctrs]; };
-  openxlsx = derive2 { name="openxlsx"; version="4.1.5"; sha256="0wkpa3wsd8rs0pib7cp67iv0s6jn99frcrw7clypqxmvvdwyb9kq"; depends=[Rcpp stringi zip]; };
+  opentripplanner = derive2 { name="opentripplanner"; version="0.3.1"; sha256="1bavs7k27zicsjvz65va45cpmmviddxsgqir0hvpl9z40ml1gnp0"; depends=[checkmate curl data_table geodist googlePolylines lubridate pbapply rjson sf sfheaders tibble]; };
+  openxlsx = derive2 { name="openxlsx"; version="4.2.3"; sha256="0vz4nlrwgsiifrgza8kfd9i1c0ya6plymrgk59vyy2z54vc8kvyd"; depends=[Rcpp stringi zip]; };
   opera = derive2 { name="opera"; version="1.1"; sha256="1nvm7a1g0pzzlpyk7g5plys1byl4xq2wz59hqys5gxiq0y5sgqwm"; depends=[]; };
   operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; };
   operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
@@ -11678,7 +12181,7 @@ in with self; {
   optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; };
   optimCheck = derive2 { name="optimCheck"; version="1.0"; sha256="1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n"; depends=[]; };
   optimParallel = derive2 { name="optimParallel"; version="1.0-1"; sha256="0ck6a1lv5as98hzww7cjkzwrggq7bzmdhd0djkzvkwmx8h35chy6"; depends=[]; };
-  optimStrat = derive2 { name="optimStrat"; version="2.1"; sha256="0splvrnrs8ayiycyxs02vcs5m0s2r68sblmcdlbi49fmxgw48di9"; depends=[cubature mvtnorm shiny]; };
+  optimStrat = derive2 { name="optimStrat"; version="2.3"; sha256="1jkwhgpw7nknd7h8c01z25x566bw2qb388i6g5nwcygxsshdgpri"; depends=[cubature mvtnorm shiny]; };
   optimalThreshold = derive2 { name="optimalThreshold"; version="1.0"; sha256="1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n"; depends=[ars coda HDInterval mgcv rjags]; };
   optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
   optimization = derive2 { name="optimization"; version="1.0-7"; sha256="09s62ax3w8zijfp2cmh2lvdqbl3nijbjkwq4n3icasi53lzg2179"; depends=[colorspace Rcpp]; };
@@ -11710,12 +12213,12 @@ in with self; {
   orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; };
   ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; };
   orderly = derive2 { name="orderly"; version="1.0.4"; sha256="0z83aha45nhi7mym1mygp60jim8znyknmc254gd2cvmg7cmifzb7"; depends=[DBI digest docopt fs ids R6 RSQLite withr yaml zip]; };
-  orders = derive2 { name="orders"; version="0.1.3"; sha256="14p0wk7y9hbhxwifr4fjp3h9dll0sin8q88an6a536d4f2045j7c"; depends=[Newdistns]; };
+  orders = derive2 { name="orders"; version="0.1.4"; sha256="1ixm3w3kbzaas3is3gdw5hx6vp4a9azaly2zd35rgpqrxk9zb2kk"; depends=[gamlss_dist Newdistns]; };
   orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; };
   ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; };
   ordinal = derive2 { name="ordinal"; version="2019.12-10"; sha256="09bpmjmbf4x82kgf6bm4bkncq2apdv9mk20zj4zgma2jx2vyfhbs"; depends=[MASS Matrix numDeriv ucminf]; };
-  ordinalClust = derive2 { name="ordinalClust"; version="1.3.4"; sha256="0r1g23ddhsszl7a52pdw3wnwipk4pikkg7p256jxls777wcyla3f"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
-  ordinalCont = derive2 { name="ordinalCont"; version="2.0.1"; sha256="18li100drg54sfsp1qzxpfk7dqkdslrg6q4v7lqpysw9p7q0wpfp"; depends=[boot Deriv]; };
+  ordinalClust = derive2 { name="ordinalClust"; version="1.3.5"; sha256="0hmqvhrmijgzanh08z5v82a07zl7xm69wl8zzj99fksahyrgxjdc"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
+  ordinalCont = derive2 { name="ordinalCont"; version="2.0.2"; sha256="1azwcr1si3b8dxf2y59d3rxw4msfq79khzg7zgqd0kbzyka4ygl8"; depends=[boot Deriv]; };
   ordinalForest = derive2 { name="ordinalForest"; version="2.4-1"; sha256="00w8jiz0260z4min2xxbg9dx2jiw99wyhgcxa11zhzzh91qvlf78"; depends=[combinat nnet Rcpp verification]; };
   ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; };
   ordinalNet = derive2 { name="ordinalNet"; version="2.9"; sha256="0jnyhm6appggywva2jx39xhk4967qkzc2q71fikm9c78p9znw2an"; depends=[]; };
@@ -11723,7 +12226,7 @@ in with self; {
   ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.6"; sha256="0axpndyyns649mwifq8f16l8n8x9nic8cv8l71ljyr2gwlm0nqz0"; depends=[survival]; };
   ordinalpattern = derive2 { name="ordinalpattern"; version="0.2.0"; sha256="0nf7323wd8wm4qxlhr6cvm1l87rwfdr5c4qivhncy0m2n5vknc1c"; depends=[gtools mvtnorm]; };
   ore = derive2 { name="ore"; version="1.6.3"; sha256="1vh6w3arrhgkfjjjw7ci91xmz4wpfr3cmwd5zkqch89dgn07skkv"; depends=[]; };
-  ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; };
+  ores = derive2 { name="ores"; version="0.3.2"; sha256="0xzc0d38z7h5ghab3kqsv0r2cl3888j7vn94p51xlwcbhnq10kip"; depends=[httr]; };
   orf = derive2 { name="orf"; version="0.1.3"; sha256="19drrxvnh9y33p0g8pv9bhl6i8jpsdc7nkcpbpxbrsc5hs96dycp"; depends=[ggplot2 ranger Rcpp xtable]; };
   org = derive2 { name="org"; version="2019.4.2"; sha256="0jrnr22slgzwsdb4a1jb1l878smhvfb680cgmgb3a88jqj4jfscl"; depends=[]; };
   orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
@@ -11731,60 +12234,63 @@ in with self; {
   orientlib = derive2 { name="orientlib"; version="0.10.4"; sha256="0lds3y05byag466asi8hmv1yfllsdx7z5i8hq21r6dx3w4n4f46x"; depends=[]; };
   origami = derive2 { name="origami"; version="1.0.3"; sha256="034h9dnllzllqd0pzx2if69x17gaxfjrfi4ini6gh23asr3krls3"; depends=[abind assertthat data_table future future_apply listenv]; };
   originr = derive2 { name="originr"; version="0.4.0"; sha256="0r5aqy5vc3d5r3ln07qs6jbyiglcn4wymljmmrlxflpjw8arw9sn"; depends=[crul data_table jsonlite taxize xml2]; };
-  orloca = derive2 { name="orloca"; version="4.9"; sha256="02fqak8s68q522kgvrqqz9rfhpzby0ln032cisjwgk7nlcx4wbjk"; depends=[knitr png rmarkdown ucminf]; };
+  orloca = derive2 { name="orloca"; version="4.10"; sha256="113y76gyhslpfyq7n1nnbgnxhxgr213f28vnc3n3b9pghkkr0p4z"; depends=[knitr png rmarkdown ucminf]; };
   orloca_es = derive2 { name="orloca.es"; version="4.9"; sha256="00zb08dqcsh1ljl4f2djm1pwbrfbaddgapn3v8nascmwxlhb2hkw"; depends=[orloca]; };
-  ormPlot = derive2 { name="ormPlot"; version="0.3.2"; sha256="0sdn7vrc35pl763snfrrcn0fa6i3agr57sjayjz93friijddkcp6"; depends=[ggplot2 gtable rms]; };
+  ormPlot = derive2 { name="ormPlot"; version="0.3.4"; sha256="1s38alb602javkizxp3gqkmsq6zvl983gv4bcgd8752fvvddbf4s"; depends=[ggplot2 gtable rms]; };
   oro_dicom = derive2 { name="oro.dicom"; version="0.5.3"; sha256="1ar70xk2bqk7jgckfivgp4np3dxaynmgdg41n8x0sg9cpxl2lc38"; depends=[oro_nifti]; };
-  oro_nifti = derive2 { name="oro.nifti"; version="0.10.3"; sha256="1w8b7pib0mziz5wpfr9a30aki37b1v5alqmlkxd3fmbhiaygv9cx"; depends=[abind bitops RNifti rticles]; };
+  oro_nifti = derive2 { name="oro.nifti"; version="0.11.0"; sha256="1kmlc82gp02v4p62kaxvv55rizbs6znphr0dpka8fl4addgld4si"; depends=[abind bitops RNifti]; };
   oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; };
   orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; };
   orsk = derive2 { name="orsk"; version="1.0-5"; sha256="19bpvsdjwjm62a2kfh3xjpqnn39kls656kh832frkqa08bdd7zjk"; depends=[BB BHH2]; };
   orthoDr = derive2 { name="orthoDr"; version="0.6.4"; sha256="1h2djq1s67yx1mkc5hl81471q4qwv8z71hmyl5rvbwy8kfyxfc6b"; depends=[dr MASS plot3D pracma Rcpp RcppArmadillo rgl survival]; };
   orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
   orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
-  osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
+  osDesign = derive2 { name="osDesign"; version="1.8"; sha256="0l5dq8rj4rg4v324610kj2j5nv7py6z1jcplhb6br1gvldj7ng1d"; depends=[]; };
   osc = derive2 { name="osc"; version="1.0.5"; sha256="00a0ys5ni0hg5zxi0sr5ak3n4c252vhvd6gynnx1b0lqna7bz9qi"; depends=[raster]; };
   osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; };
   osfr = derive2 { name="osfr"; version="0.2.8"; sha256="1yzi8k6ddr8kfgsliigbwzaiqapqa65ismbvxn30ny6raa4rf2xx"; depends=[crul fs httr jsonlite memoise purrr rlang stringi tibble]; };
   oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; };
+  oskeyring = derive2 { name="oskeyring"; version="0.1.1"; sha256="04i5nbgwwwsi0g94kyyhh29jsfn9jzjn6ihpj0ah8vj6yama152b"; depends=[]; };
   osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
-  osmdata = derive2 { name="osmdata"; version="0.1.3"; sha256="1a57fg8j7ski050l17hv137mlb5ir7qx7212y9d49arbwlh9bpcq"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; };
+  osmdata = derive2 { name="osmdata"; version="0.1.4"; sha256="019d8yb83w8r67ryd0zi02w0rppm4mv0a8z3wb4vkl58n2xs777m"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; };
   osmose = derive2 { name="osmose"; version="3.3.4"; sha256="144mklbish59amzz7j95qmn98yqlz3bqzd2rp03wg9f5s69bxjj6"; depends=[fields knitr mgcv ncdf4 rlist rmarkdown stringr]; };
   osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; };
   osqp = derive2 { name="osqp"; version="0.6.0.3"; sha256="1266n04c8zsv4ixf7y25jkccv9lx3rvmd7bnkxynbwga9psd3l0j"; depends=[Matrix R6 Rcpp]; };
-  osrm = derive2 { name="osrm"; version="3.3.3"; sha256="1kiy3ij2fkvaxsgbhwn1lvhqav6prsqfi5ipzkihi2piw2gfns2r"; depends=[gepaf isoband jsonlite RCurl sf sp]; };
+  osrm = derive2 { name="osrm"; version="3.4.0"; sha256="15gfbjc3iz8vk03i3vqlk0yqvg75vfgjvhw8w561k0s0vx9677l7"; depends=[gepaf isoband jsonlite RCurl sf sp]; };
   osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; };
   ot = derive2 { name="ot"; version="0.2.0"; sha256="0lym92hsxhfjdkh738rxlpkq084454055vgxm2b4wdhqw00jwf5y"; depends=[]; };
   otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
   otp = derive2 { name="otp"; version="0.1.0"; sha256="0l0r56kn8jmjxhzz646fimi91blpgpynrrgfd03rh3dbifd5xhdz"; depends=[base64url openssl R6]; };
-  otpr = derive2 { name="otpr"; version="0.4.1"; sha256="1b91c83f3061vd2j6ld7pkqdwzdk8hbmrc3lp8f9xjxyfj0krc9n"; depends=[checkmate geojsonsf httr janitor jsonlite sf]; };
-  otrimle = derive2 { name="otrimle"; version="1.3"; sha256="1vq2sm3g32cr8x0nzxq9g3zk0qhcd2syzrcvrfx5ncf3i3f9gq5n"; depends=[doParallel foreach mclust]; };
+  otpr = derive2 { name="otpr"; version="0.4.2"; sha256="1j4phnx64526ql0wj0lv2jypqs9xx8h3x7xgrlwwn59xhshmghq9"; depends=[checkmate geojsonsf httr janitor jsonlite sf urltools]; };
+  otrimle = derive2 { name="otrimle"; version="1.6"; sha256="08s46d5mjkrr2wc91hyrjymay34283vi6pz9lrr09dn0870vrhmw"; depends=[doParallel foreach mclust]; };
   otsad = derive2 { name="otsad"; version="0.2.0"; sha256="1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs"; depends=[ggplot2 plotly reticulate sigmoid]; };
   otuSummary = derive2 { name="otuSummary"; version="0.1.1"; sha256="04l667qmp7wqkbdsk87j92gf89s13090kzs8cjlmxsp6i69r34z2"; depends=[reshape2 vegan]; };
   otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; };
   ouch = derive2 { name="ouch"; version="2.14-1"; sha256="0ddf9bw5lhj8vb0ja78jf99i0smq4rgmm842k4a4ygap41vdyn2b"; depends=[subplex]; };
   outForest = derive2 { name="outForest"; version="0.1.0"; sha256="0wkji836xrf7izx3ibrf1ylcm4ph766ih3qd7wqjsjfx2cz5bpjr"; depends=[FNN missRanger ranger]; };
   outbreaker2 = derive2 { name="outbreaker2"; version="1.1.1"; sha256="01i8abwg3g352nbrpaf8iahsjc4cbpph993x867yyvgj12nvsgs3"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; };
-  outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; };
+  outbreaks = derive2 { name="outbreaks"; version="1.9.0"; sha256="0x6r4rzcvd1rp8j4brq9c0zl2xsl5jfi18dny20an7aqk310p11v"; depends=[]; };
   outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
-  outliertree = derive2 { name="outliertree"; version="1.3.0"; sha256="03wj3fv3ar8yhgh79jlm83psiqbjgc491fslgmh8a23ic3s2q51i"; depends=[Rcereal Rcpp]; };
+  outliertree = derive2 { name="outliertree"; version="1.3.1"; sha256="00pllbw9qr15bsv2dbzdx4iqy8yknilwy374il8ygyhx4j7wbgas"; depends=[Rcereal Rcpp]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
+  outsider = derive2 { name="outsider"; version="0.1.1"; sha256="082yygvjs31clz8b3p59gkc26249gqp8hl1071gm6zi4vi2ng43x"; depends=[crayon curl jsonlite outsider_base remotes tibble yaml]; };
   outsider_base = derive2 { name="outsider.base"; version="0.1.3"; sha256="1ai7rm3y2zamg03l7mrhbpa93l5y33g70k5vqyqbhmgx3h3ayj6c"; depends=[callr cli crayon devtools jsonlite praise sys tibble withr yaml]; };
   ouxy = derive2 { name="ouxy"; version="2.1"; sha256="0mdjxg7wm68882hbwl0gg15dld6f90xyf0s6hk2z90r34bvyky0i"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; };
-  overdisp = derive2 { name="overdisp"; version="0.1.0"; sha256="0j1rr9grzhlma9hgljxhn70ia268pc6f3gbinrlqky3pg73xjg2k"; depends=[]; };
+  overdisp = derive2 { name="overdisp"; version="0.1.1"; sha256="0gncmirpiqyxsgpsdrv875i6a9bagpz76vcbqxsaql537m1fd99r"; depends=[]; };
   overlap = derive2 { name="overlap"; version="0.3.3"; sha256="17cnr4qin1qy0df4k491267acna12gpbbps6w3gi8nccqxfrb1pd"; depends=[]; };
   overlapping = derive2 { name="overlapping"; version="1.6"; sha256="0qy5jw4nn4l6rb36sxd9waz7x4g18q42dsk12hvsnan5jyzcdwfn"; depends=[ggplot2 testthat]; };
   overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; };
   overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; };
-  overviewR = derive2 { name="overviewR"; version="0.0.4"; sha256="0ccs0zc7bhz1i29f6fv5i32zxl5yrmazyknf7h4i9r0l1xkiixxy"; depends=[dplyr]; };
+  overviewR = derive2 { name="overviewR"; version="0.0.7"; sha256="1y8iqgyhppl2w9z59azi3h1kgzrw5a1zqw09zyjp0ghlvpjbn9cn"; depends=[dplyr ggplot2 tibble]; };
   owd = derive2 { name="owd"; version="1.0.6"; sha256="08f1zzlnkfdzm5rlw14qm6yvn68j2yas21zjsy31pc59rh3lzkyh"; depends=[]; };
   owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; };
   owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; };
   ows4R = derive2 { name="ows4R"; version="0.1-5"; sha256="0zl6nvcrzjcaz43ji2a6ym3mvfzfvf8lyb29hg8sidribr6js3nk"; depends=[geometa httr openssl R6 rgdal sf XML]; };
   oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; };
-  oxcovid19 = derive2 { name="oxcovid19"; version="0.1.1"; sha256="13l500giwpzkfv4dss7glzmpkk8iv8dzn0znjmrkplvfq7bv8bqz"; depends=[DBI dbplyr dplyr RPostgres sf]; };
-  oysteR = derive2 { name="oysteR"; version="0.0.3"; sha256="1a701jpylk1f55dwrgribf598z1nlk7c0axhx683wjzq50mvgyfm"; depends=[cli dplyr glue httr purrr rjson tibble tidyr]; };
+  oxcgrt = derive2 { name="oxcgrt"; version="0.1.0"; sha256="006kdggqdy7nkllln5p7fsapmmn5wlampyw2ifc4ls9jbz0p5h16"; depends=[countrycode dplyr jsonlite magrittr stringr tibble tidyr]; };
+  oxcovid19 = derive2 { name="oxcovid19"; version="0.1.2"; sha256="0ax6vg1mcgj03zy47d8pcmlbn538lxhx0l4n9cpqknd7g76l018i"; depends=[countrycode DBI dbplyr dplyr lubridate magrittr RPostgres sf]; };
+  oysteR = derive2 { name="oysteR"; version="0.1.0"; sha256="1az9z5daf525bw4hk9qri5n1qfsgnbbm2m2apgpcv479iqgdd4zr"; depends=[cli dplyr glue httr jsonlite purrr rjson rlang stringr tibble tidyr yaml]; };
   oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; };
   ozmaps = derive2 { name="ozmaps"; version="0.3.6"; sha256="17lh5lgblyryvgk2cman1xwqz5hc0v4s58f3xz36z5qjrcs1599r"; depends=[oz sf tibble]; };
   p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; };
@@ -11797,32 +12303,35 @@ in with self; {
   pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; };
   pGPx = derive2 { name="pGPx"; version="0.1.1"; sha256="0b3pjrk7496nlw1cv5m6yfp02c663452z67y21yhhm26b17nrldv"; depends=[DiceKriging KrigInv pbivnorm pracma randtoolbox Rcpp RcppArmadillo rgenoud]; };
   pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; };
-  pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; };
   pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; };
   pROC = derive2 { name="pROC"; version="1.16.2"; sha256="0apwa5zzqh74pjnvf5a1s5qf6i9r5h44jdllfrwymkd2v479d2xn"; depends=[plyr Rcpp]; };
   pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; };
-  pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
   pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
   pacbpred = derive2 { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; };
   pack = derive2 { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; };
   packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; };
+  packDAMipd = derive2 { name="packDAMipd"; version="0.1.2"; sha256="0fqpkwajxr4fl484c3yxjb0rzy41rxgz8lnvbcgybvm7alm9ysj9"; depends=[broom car data_table effects flexsurv ggplot2 gvlma IPDFileCheck lme4 lmtest MASS nlme relaimpo reshape2 rlang stringr survival survminer SurvRegCensCov systemfit tm valueEQ5D]; };
   packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; };
   packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.8.0"; sha256="0jn47zhcfssa2rwjh8jc2zc93g766pslxx8vjm0bsnzyzjl2yqb9"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; };
   packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
   packageDiff = derive2 { name="packageDiff"; version="0.1"; sha256="0qxgx2ac0x7p9j9clj7hgjahf7xwzcjkcw0d2n6w0r9c4g0mw9w2"; depends=[diffr htmlwidgets]; };
   packageRank = derive2 { name="packageRank"; version="0.3.5"; sha256="03yixgi5xj288fpjdgkywlpxl8d6llry0ppgavxrmm3w3nazwx5h"; depends=[cranlogs data_table ggplot2 memoise pkgsearch R_utils RCurl rversions]; };
-  packagefinder = derive2 { name="packagefinder"; version="0.2.1"; sha256="01nfh9han9k6gg59c6qhahfkwl9bi45ncs7mhrp0fkmxw6z21fyh"; depends=[crayon formattable htmlTable httr jsonlite lubridate pander stringr textutils tidyr]; };
+  packagefinder = derive2 { name="packagefinder"; version="0.3.2"; sha256="1jskq7w26bjpam1hvyjcmmw08wz2qfzbyhxi5cdkfiiwqy15xkc1"; depends=[clipr crayon formattable htmlTable httr jsonlite lubridate pander reactable rstudioapi shiny shinybusy shinyjs stringr textutils tidyr]; };
+  packager = derive2 { name="packager"; version="1.8.0"; sha256="0q93pv6sy9s852mnkzlp96dfpgxf1kbbm2yifq62ldifbmbncfaf"; depends=[callr checkmate codetools crayon cyclocomp desc fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rhub rprojroot usethis whisker whoami withr]; };
   packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; };
-  packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; };
+  packcircles = derive2 { name="packcircles"; version="0.3.4"; sha256="05pv5c4k4njkr0xw6i6ksiy34hcyx2lbiqpv5gxw81yrkm0rxfyk"; depends=[Rcpp]; };
+  packer = derive2 { name="packer"; version="0.0.6"; sha256="0kskfkvpb5x6k3xjljlxjgzymarjsld8gmxq1pxkzmqwydxm1jx8"; depends=[assertthat cli fs htmlwidgets jsonlite rprojroot rstudioapi usethis]; };
   packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; };
   pacman = derive2 { name="pacman"; version="0.5.1"; sha256="0z7gngd6h83cpjhq1vg75wvzhdjbgjh7gj5d4zvvi9gd2lmagjcy"; depends=[remotes]; };
-  paco = derive2 { name="paco"; version="0.4.1"; sha256="0vlvvmkx2yhm28vly68gapzi2rjf7zilnl96hvysip9n8hq4w71d"; depends=[ape plyr vegan]; };
-  pacotest = derive2 { name="pacotest"; version="0.3.1"; sha256="0mpdgd8pr7clh5ickz245kqlhh197cnmm8kzxp84fddjb3i1m011"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
+  paco = derive2 { name="paco"; version="0.4.2"; sha256="0p02fdc5f7d7sbdvxill8jln76p1ndiw95k6s9j41slfriq647vd"; depends=[ape plyr vegan]; };
+  pacotest = derive2 { name="pacotest"; version="0.4.0"; sha256="1m52spl856agk5y00s6d7n07sjv775calgpksajdsn1ipjfxs5nk"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
   pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; };
-  padr = derive2 { name="padr"; version="0.5.2"; sha256="0cnsycwd9zpz4apk7rizgyjrg072kqyk4p4q5grdlfzv73ivr7ab"; depends=[dplyr lubridate Rcpp rlang]; };
+  padr = derive2 { name="padr"; version="0.5.3"; sha256="1kf457yrdwyl3vkc1y6bzlg8ag11pfzsrjqjnbp3v1vlx2ib4vz7"; depends=[dplyr lubridate Rcpp rlang]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
   pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; };
-  pagedown = derive2 { name="pagedown"; version="0.10"; sha256="15szz0lr5sj8fnxw9pc091m09szdrd4a89vriv07wyblkp6ndpgi"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; };
+  pafr = derive2 { name="pafr"; version="0.0.2"; sha256="0ali4m1pv73y88x1dk5rvmg1ysy48janjnc1hnqfcndszfz2b0wm"; depends=[dplyr ggplot2 rlang stringr tibble]; };
+  pagedown = derive2 { name="pagedown"; version="0.13"; sha256="0vr6bd2zbghn1v8fflwby59zc1rkya58g86jdrhy4vgpjcqf2wy0"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; };
+  pagemap = derive2 { name="pagemap"; version="0.1.1"; sha256="1lf1ppifnnr7j63ii8ihi0x1rw1h7ls8nzxqnkmwnzha3dkhs4nz"; depends=[htmlwidgets]; };
   pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; };
   pageviews = derive2 { name="pageviews"; version="0.5.0"; sha256="1fhlm2y288wx625y0glxybjb0xv9sqvvln35jqlwqq38h3grcpqd"; depends=[curl httr jsonlite]; };
   painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; };
@@ -11830,10 +12339,10 @@ in with self; {
   pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
   pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
-  pairwise = derive2 { name="pairwise"; version="0.4.5-1"; sha256="01gyr1jiz1v7g1a3gjxsydfr0ff53j5miw8cxj2rdv5yyyy4nvkm"; depends=[]; };
+  pairwise = derive2 { name="pairwise"; version="0.5.0-1"; sha256="09knyw09qxccjjrywrk7bvqds4xpim77gsl9hs1hbfa641g82z1c"; depends=[]; };
   pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; };
-  pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="1.1.2"; sha256="1p9i7kzsc0n98yii8sar5jl8jywy66555fghhxs9hh45gxrkbfgr"; depends=[broomExtra dplyr dunn_test forcats ipmisc PMCMRplus purrr rlang tidyBF tidyr WRS2]; };
-  pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; };
+  pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="3.1.1"; sha256="13x870ld98s9dsbzi39y4yc9h550a1nhmh2qcz82a4iqi6x1v14n"; depends=[BayesFactor dplyr ipmisc parameters PMCMRplus purrr rlang WRS2]; };
+  pak = derive2 { name="pak"; version="0.1.2.1"; sha256="07x5wa7mkhlzyl6hih9wv91ykjanhh35ng3p439wmxgz6dcdv6sp"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; };
   palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; };
   palasso = derive2 { name="palasso"; version="0.0.7"; sha256="1r7kcx0i1xqvqpqwvh5khsv3g0hj3j8f56q9jbya18scywk2ivzg"; depends=[glmnet Matrix survival]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
@@ -11846,14 +12355,14 @@ in with self; {
   palettesForR = derive2 { name="palettesForR"; version="0.1.2"; sha256="0nkb0dszj3a9ba7w6kfyn8lxacqsjw60i87p3g2gyl098kjwv7qv"; depends=[]; };
   palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; };
   palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; };
-  palm = derive2 { name="palm"; version="1.1.3"; sha256="1w13a1517h9dqfkc0863fsb08mapx8cafypk3b61djh69hcpbl0v"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; };
+  palm = derive2 { name="palm"; version="1.1.4"; sha256="1h323py9dgdymih9j2wk4r1kib767z7z84h2c3albxxf9b2hvq4f"; depends=[gsl minqa mvtnorm R6 Rcpp]; };
   palmerpenguins = derive2 { name="palmerpenguins"; version="0.1.0"; sha256="0q1k3cdkliq7kwrg1n0vs9b6cjwyfarhlgdijhp9c6riy6y5ik7x"; depends=[]; };
   palmtree = derive2 { name="palmtree"; version="0.9-1"; sha256="06438wla5zm2s8vgip15lfy5gmhwh3wkiak8hsylc8zzkvn698cn"; depends=[Formula partykit]; };
   palr = derive2 { name="palr"; version="0.2.0"; sha256="0c9fg3kbl2n6m01ck2pmavgxbk953vdxqsc3cw6phnnav93kr5cf"; depends=[]; };
   pals = derive2 { name="pals"; version="1.6"; sha256="18bl15figc9mhlvxz71da6s2mzyja6rdb2cpm6h5vya1lpv3snmk"; depends=[colorspace dichromat mapproj maps]; };
   pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; };
   pamm = derive2 { name="pamm"; version="1.121"; sha256="191f0g90s1m3w68mszmdsdv5yw7xd1vsdbwsfvmyydgxn4261pwk"; depends=[lattice lme4 lmerTest mvtnorm]; };
-  pammtools = derive2 { name="pammtools"; version="0.2.4"; sha256="1i1pa2p0n3n2lp5bp75i5z9cs05gh2p83hshcp21j76ji6mrdfc5"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr vctrs]; };
+  pammtools = derive2 { name="pammtools"; version="0.5.4"; sha256="013flafl4h7j52jmp0l9sf6s3bp149xfa1r302ywgclxfkknif9w"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr vctrs]; };
   pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; };
   pamr = derive2 { name="pamr"; version="1.56.1"; sha256="0ycpgkk23y3zzkb42n2skcyl35ps1n7jmyzfj7pbxr3f6gr2grfh"; depends=[cluster survival]; };
   pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; };
@@ -11863,7 +12372,6 @@ in with self; {
   panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; };
   panelWranglR = derive2 { name="panelWranglR"; version="1.2.13"; sha256="0zj0m08518zi6xsa7qik61ys1qqa2lqiar4l7acclkw58w5zrmbc"; depends=[caret data_table Hmisc]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
-  panelr = derive2 { name="panelr"; version="0.7.3"; sha256="00ark2hcwvjijm6hyy78lz9992v4i0a8jr0zj336qz8g1nbpsk17"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; };
   panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; };
   pangaear = derive2 { name="pangaear"; version="1.0.0"; sha256="0i7k1sdhslw33dzpnrmajynq52svg8ri4mxz6aww2cah9y8vxlzl"; depends=[crul hoardr jsonlite oai png tibble xml2]; };
   papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; };
@@ -11871,20 +12379,21 @@ in with self; {
   paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; };
   parSim = derive2 { name="parSim"; version="0.1.4"; sha256="0iswcw52skx1hxb9bv9ihhwwyybprsk2615pmijsxp0bkzgsjc88"; depends=[dplyr pbapply snow]; };
   parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; };
-  paradox = derive2 { name="paradox"; version="0.4.0"; sha256="1k6xd97781ybldrm0zpnrdg8dal98k5w9psv4vn1s53sla83k1lz"; depends=[backports checkmate data_table mlr3misc R6]; };
+  paradox = derive2 { name="paradox"; version="0.6.0"; sha256="1zv0q411wcwigkf4yggs3w2gz48lvv3jhnrddrv40qih8b70ywi3"; depends=[backports checkmate data_table mlr3misc R6]; };
   parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; };
   parallelMap = derive2 { name="parallelMap"; version="1.5.0"; sha256="0kjyskwvkqvsyjq55rhypif6z92r33llb7krrhc9f9w68xzp5yja"; depends=[BBmisc checkmate]; };
   parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
+  parallelly = derive2 { name="parallelly"; version="1.22.0"; sha256="1nms5zaa83274qz98g03s0w6qch7ibjzz8h7b2p5irbqw61cwwgd"; depends=[]; };
   paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; };
-  parameters = derive2 { name="parameters"; version="0.8.2"; sha256="0kamszscywvdh4gikl5mmma7s5p7spmhirq3wrgf7x7f4gppbbmh"; depends=[bayestestR insight]; };
+  parameters = derive2 { name="parameters"; version="0.10.1"; sha256="1xvjvsdd0hql209f7v2l1nw7gy8jkj5qp0699p5m2h55a01jl778"; depends=[bayestestR insight]; };
   paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; };
   paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; };
   params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; };
   paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; };
   paran = derive2 { name="paran"; version="1.5.2"; sha256="0d9la83mxfpfgdfrqa40ck5fcp3j2b70d8c8nl9wmdsgvgqrl23s"; depends=[MASS]; };
   parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
-  parcats = derive2 { name="parcats"; version="0.0.1"; sha256="0bf1kqg3954z47cb4n4wv6pf55f1801qlsj1523ac0j3l3i39xn5"; depends=[dplyr easyalluvial forcats htmlwidgets magrittr purrr stringr tibble tidyr]; };
+  parcats = derive2 { name="parcats"; version="0.0.2"; sha256="0qh0644a97rvxlz6xlj4210y55m98v6047bp1bmhxsn8m1n21c80"; depends=[dplyr easyalluvial forcats htmlwidgets magrittr purrr stringr tibble tidyr]; };
   parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; };
   parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; };
   parglm = derive2 { name="parglm"; version="0.1.6"; sha256="1264ai64hm3sx3prmy6m24llml3za271w7vrcn7a0xcn1lwmp562"; depends=[Matrix Rcpp RcppArmadillo]; };
@@ -11895,9 +12404,8 @@ in with self; {
   paropt = derive2 { name="paropt"; version="0.1"; sha256="0934apc1paxsdahf7zywj4aaii7zmgfff7crpjvlmjg4x0pq390v"; depends=[Rcpp RcppArmadillo]; };
   parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; };
   parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; };
-  parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; };
   parsetools = derive2 { name="parsetools"; version="0.1.3"; sha256="1d18cdaw90g3362218d5i1j8n30p46drjygfri79sqgxhidb25sz"; depends=[]; };
-  parsnip = derive2 { name="parsnip"; version="0.1.3"; sha256="12121qj1800i7g3km5kqzlb7hms55crmp6il575c2i475h5qx8d3"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; };
+  parsnip = derive2 { name="parsnip"; version="0.1.4"; sha256="1134840xisvkkrbkh5kvx24vxp7sx06124svy573a9m4h8c492sr"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
   partialAR = derive2 { name="partialAR"; version="1.0.12"; sha256="0fv1ffgqdbl04b4cmfmvzwah8ms9cxx3dsdralkk92bxxhybcjsl"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; };
   partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; };
@@ -11910,13 +12418,13 @@ in with self; {
   partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
   partitions = derive2 { name="partitions"; version="1.9-22"; sha256="1qqy4df28wy4q0g572azrj171jlhvrnzbh7x0wr2g7v6gr20y0ns"; depends=[gmp polynom sets]; };
   partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; };
-  partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
+  partsm = derive2 { name="partsm"; version="1.1-3"; sha256="17md3j41knscllckiqnvkqvf2v0fgsig101vgg6z5ic1yzvzfxgs"; depends=[]; };
   party = derive2 { name="party"; version="1.3-5"; sha256="0r0kslgynfzir7rpc6zsm0a1qmi64gg84drbaihq6janzv9kafhw"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
-  partykit = derive2 { name="partykit"; version="1.2-9"; sha256="18nc6vvj1cy8ly2hqixg544sbg8vbpzwsr1cdlzrqfykd0pzgkvf"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
+  partykit = derive2 { name="partykit"; version="1.2-11"; sha256="00n6a74x257m2jk7jadjfxaclihxqpqwh356bgxmq8rag0nk70rs"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
-  parzer = derive2 { name="parzer"; version="0.1.4"; sha256="09rlqz4vhlg6zl48y2xpm6hdmwc74lcpid3qyha9bvy0gnimz5f4"; depends=[Rcpp]; };
+  parzer = derive2 { name="parzer"; version="0.3.0"; sha256="1rqig00a98dg1sn0h133js345hpcxbg93p6drc16a15an39rkkjr"; depends=[Rcpp]; };
   pass_lme = derive2 { name="pass.lme"; version="0.9.0"; sha256="1rxm509vnkdvdxii4jwniirdb2pv90rjkf6wjc9zrjh88jrl678k"; depends=[]; };
-  passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; };
+  passport = derive2 { name="passport"; version="0.3.0"; sha256="176pkc7x76339bawdwywdcmiynzzlrwr91fgf5q0rq7asd9nc7d1"; depends=[]; };
   passt = derive2 { name="passt"; version="0.1.1"; sha256="03ymx1bvbz2qwlkxb5iis6k3d3d5fivhcz1w23fwqhgq976zrdj2"; depends=[dplyr magrittr rlang tidyr]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
   pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; };
@@ -11924,26 +12432,27 @@ in with self; {
   patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   patchDVI = derive2 { name="patchDVI"; version="1.10.1"; sha256="14zhl2skj20gc09ycrycdq2slqrpbh6nf0lcsxf55kvshnwnmknc"; depends=[]; };
   patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; };
-  patchwork = derive2 { name="patchwork"; version="1.0.1"; sha256="0wm93a40idrkzn5hpnykhznvh7hdbfqw0dkzzn0zk83qlwyc9g02"; depends=[ggplot2 gtable]; };
+  patchwork = derive2 { name="patchwork"; version="1.1.1"; sha256="10glgkf58lcykcwda1hj6xdps02m3i247qynk6s2jmwljagps3fg"; depends=[ggplot2 gtable]; };
   patentsview = derive2 { name="patentsview"; version="0.2.2"; sha256="003pcddz6adsh893xvlb9d72r316z14nlp3fwm1vbc50hpa24w6z"; depends=[httr jsonlite]; };
+  path_chain = derive2 { name="path.chain"; version="0.2.0"; sha256="1p28mcar4krgvkgn02xrlwcpzchnppn2l2k2iwh511c3qrfpy653"; depends=[logger rlang stringi]; };
   pathdiagram = derive2 { name="pathdiagram"; version="0.1.9.1"; sha256="018frv1n3x0bf1682jibnm5k2dlkg85xa9mps28l22a0z8bplbv5"; depends=[shape]; };
-  pathfindR = derive2 { name="pathfindR"; version="1.5.0"; sha256="1wiqhzqcygd6qy1wpjfnbpbczis4y0bf91r2rgbwxs26cysd5zrb"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph ggupset igraph KEGGgraph KEGGREST knitr magick msigdbr org_Hs_eg_db pathfindR_data R_utils rmarkdown]; };
-  pathfindR_data = derive2 { name="pathfindR.data"; version="1.0.0"; sha256="0yh96rsx6ra5n4mmll3jfshvr3jm91pvlvc4k2igj0ij9xgzsfyy"; depends=[]; };
+  pathfindR = derive2 { name="pathfindR"; version="1.6.0"; sha256="0v3474dq26f9nax1mdcqhdka9g7wn5qb8frpdn4lp5mgbwhki9i1"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph ggupset igraph KEGGgraph KEGGREST knitr magick msigdbr org_Hs_eg_db pathfindR_data R_utils rmarkdown]; };
+  pathfindR_data = derive2 { name="pathfindR.data"; version="1.1.1"; sha256="1f4lp3m4c92dks14nxj5h8z609jgx5fhnyy1ng9n842rxry4s9ks"; depends=[]; };
   pathlibr = derive2 { name="pathlibr"; version="0.1.0"; sha256="0z8iz765fi1s2770p7dwwv2anihfw86kb5dwg081wb6474wiq6v8"; depends=[glue logging magrittr purrr R6 rlang]; };
   pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; };
-  pathmodelfit = derive2 { name="pathmodelfit"; version="1.0.4"; sha256="1g791z33289ggwa0dwirdwwl16qddlnm2riijwbcfabfkl7shg6x"; depends=[lavaan]; };
+  pathmodelfit = derive2 { name="pathmodelfit"; version="1.0.5"; sha256="1nxcnmz9r99znqmwibvvix7h3acp22cs6wp1jmp21p862ncabll8"; depends=[lavaan]; };
   paths = derive2 { name="paths"; version="0.1.0"; sha256="0yyllrcq7p22xj9b60l7pgjsvwqqz9k5mfsa1nmm745sqh3fbahr"; depends=[BART boot gbm ggplot2 metR pryr tidyr twang]; };
-  patrick = derive2 { name="patrick"; version="0.0.1"; sha256="16r0q3d9bq06393v46gabn9y9w2w7nqjcl65b7y2ryp35nv0aqsi"; depends=[dplyr purrr rlang testthat tibble]; };
+  patrick = derive2 { name="patrick"; version="0.0.3"; sha256="10mmjzn1vi23lcdz3ss0m5yhgln58gbzvq9jzs6lqn9dwy9m3gi0"; depends=[dplyr purrr rlang testthat tibble]; };
   patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; };
   patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; };
   patternplot = derive2 { name="patternplot"; version="1.0.0"; sha256="0n4y23g894amwi62lx10k15i28rsmiaw52bds8dzmvkykkp9mm8q"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; };
   pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
-  pavo = derive2 { name="pavo"; version="2.4.0"; sha256="1f71plrm5j5k66lw0za1a16rfjbl1gq4cwczybrc9rpzz6a0i6li"; depends=[cluster future_apply geometry lightr magick plot3D progressr sp viridisLite]; };
+  pavo = derive2 { name="pavo"; version="2.6.1"; sha256="1qpdgj0jn64rp9z7hhki52zs6309lpxdibbciwwnx77fys91l3v6"; depends=[cluster future_apply geometry lightr magick plot3D progressr sp viridisLite]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
   paws = derive2 { name="paws"; version="0.1.9"; sha256="1z7brgfja55ahn9wlsbj2lyb1x12x9ac7j4w81gmkwrm1pmjqldw"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; };
   paws_analytics = derive2 { name="paws.analytics"; version="0.1.9"; sha256="03pjswa2xxm693wm2q2gqyl57i2hs8vzvklwd0qxac1mz3hylsg0"; depends=[paws_common]; };
   paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.9"; sha256="1y9q4sswl8c3amj2rvgzc3xbvyjfd9b9n7ixmkig078bvi4rg4gw"; depends=[paws_common]; };
-  paws_common = derive2 { name="paws.common"; version="0.3.3"; sha256="0yjg6rilm11j2d5x3zyq9nq9x5mpxr4yj4vr4lmv8v3wbjirb6cl"; depends=[base64enc digest httr ini jsonlite xml2]; };
+  paws_common = derive2 { name="paws.common"; version="0.3.6"; sha256="08hib48lrk5siv5drrc8c3pah9vcajv75nfmzcv69q28vng8h1yk"; depends=[base64enc digest httr ini jsonlite xml2]; };
   paws_compute = derive2 { name="paws.compute"; version="0.1.9"; sha256="1ha8jbz13vzr6qgz28sazfnm0f34wgllmns97zzm2wi4z6x8dqr6"; depends=[paws_common]; };
   paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.9"; sha256="0dwk73i1xg0i0kn6vyzl880c18imwj57jhhjwklfa95x4p5cf0mr"; depends=[paws_common]; };
   paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.9"; sha256="0vljkfj133q5mdvmq9dm8yvk8f4mgxhs8pz7shc9ym2bvd7nlffn"; depends=[paws_common]; };
@@ -11957,28 +12466,29 @@ in with self; {
   pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; };
   pbdBASE = derive2 { name="pbdBASE"; version="0.5-3"; sha256="1f90bk1mp1s03177b9g5w5ni77jzrzc1pl3bjx0w0fjbjs1myn79"; depends=[pbdMPI pbdSLAP]; };
   pbdMPI = derive2 { name="pbdMPI"; version="0.4-3"; sha256="1mxikhr0qfqksr62v5dxvzgqx07391p7ikjk9g2w4xzrzmxs8fc3"; depends=[float rlecuyer]; };
-  pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
   pbdPROF = derive2 { name="pbdPROF"; version="0.4-0"; sha256="174jwrkvw5qz1430y6id01w1czlw45j1yw8a8dyw36knrmvmdz10"; depends=[]; };
   pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; };
   pbdSLAP = derive2 { name="pbdSLAP"; version="0.3-0"; sha256="1jxpgsxkzi3s1qf3g01xma9mqwgi1b22x5lh5xnr78wa0764dyd3"; depends=[pbdMPI rlecuyer]; };
-  pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-3"; sha256="1jkfcfhspvqra7vbllrvkz3jx8j7d0ang6zzcdjgpb7200sc29mf"; depends=[]; };
+  pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-4"; sha256="0adiac53yq305ymhrds1gas4jm0rn1ddv7c7df5ky2cfhpb4ny87"; depends=[]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
-  pbixr = derive2 { name="pbixr"; version="0.1.3"; sha256="01nzi44l1n29sgc19zj33ki7lbrw0zw7ckvap1w0v27h2byg670x"; depends=[dplyr formatR jsonlite stringr textclean xml2 zip]; };
-  pbkrtest = derive2 { name="pbkrtest"; version="0.4-8.6"; sha256="0s5xhhrhv5i9680lw6af9lj2x4jc3fygmzzk0jjpxnb8g4b3p1jz"; depends=[lme4 magrittr MASS Matrix]; };
+  pbixr = derive2 { name="pbixr"; version="0.1.4"; sha256="098fwmar56l8w5r58grirqypdmc2c4hil7bi11z18llja62fncnw"; depends=[dplyr formatR jsonlite stringr textclean xml2 zip]; };
+  pbkrtest = derive2 { name="pbkrtest"; version="0.5-0.1"; sha256="0sgl8r74cknmp8lnq5jvc1w181274ylgk6w4pxf4mzkfii42argm"; depends=[broom dplyr knitr lme4 magrittr MASS Matrix numDeriv]; };
   pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; };
   pbmcapply = derive2 { name="pbmcapply"; version="1.5.0"; sha256="0i58gcqpnbyvc448qfgm45b7rpbmrnagsvk1h1hsqchbbicfslnz"; depends=[]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   pbv = derive2 { name="pbv"; version="0.4-22"; sha256="0658k8ql78y756l15wx0i6gpicgkbczwc6g7dg15i81xy1hg49qb"; depends=[Rcpp RcppArmadillo]; };
-  pcFactorStan = derive2 { name="pcFactorStan"; version="1.5.1"; sha256="1g2cxzpq2hqf6mpg4fdzkn009rj4i7r7kkbnabbbmwiay0kvaxg8"; depends=[BH igraph lifecycle loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; };
+  pcFactorStan = derive2 { name="pcFactorStan"; version="1.5.2"; sha256="0hd042bli63mvgxalagxzhxh5z1gd9vblvih4zx9jcc7jk00g6y9"; depends=[BH igraph lifecycle loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; };
   pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; };
-  pca3d = derive2 { name="pca3d"; version="0.10.1"; sha256="1fz7p95hhvgzlh1vxlifyzbqccv4rsm7yldzca5p0dwm4rgsdkd4"; depends=[ellipse rgl]; };
+  pcLasso = derive2 { name="pcLasso"; version="1.2"; sha256="1gkr1kvm4lrd63jcarv9b7gjjcyyny6z49gvy2rcqg17zfqdxysv"; depends=[svd]; };
+  pcSteiner = derive2 { name="pcSteiner"; version="1.0.0"; sha256="14rw7xb6n46ddiyara4i0296p4c16bljrj0j7g3rlnspb95vzvwr"; depends=[igraph]; };
+  pca3d = derive2 { name="pca3d"; version="0.10.2"; sha256="0xpln78zdh6q7xff6pj2jaq2kafrijmlikmpnsfar2fzgkaw7jx6"; depends=[ellipse rgl]; };
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
   pcaL1 = derive2 { name="pcaL1"; version="1.5.4"; sha256="1myl12537bxwmyicm8v891rflq8g6bhz9j0gcjcqgf9z80y52ayc"; depends=[]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; };
   pcadapt = derive2 { name="pcadapt"; version="4.3.3"; sha256="01wvcflfsnlsq23vq03n870fxsab3ab29k26nqlqxw82lbvx99s3"; depends=[bigutilsr data_table ggplot2 magrittr mmapcharr Rcpp rmio RSpectra]; };
   pcal = derive2 { name="pcal"; version="1.0.0"; sha256="07119k5f4h9jc48bicl4q5i7bdrkha3rz22r6g44c8ilnkvjhw6j"; depends=[Rdpack]; };
-  pcalg = derive2 { name="pcalg"; version="2.6-11"; sha256="1ljwwwrvv3m3qbg33fizr6ykhnfsmdn25xrr4w0rgb4i7l53kgak"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+  pcalg = derive2 { name="pcalg"; version="2.7-0"; sha256="0n2876jbp4ivrjrv15j31f0rd83xn6g7wfnszzq3q011s0vx5hxs"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
   pcalls = derive2 { name="pcalls"; version="1.0"; sha256="1vdgvrzfv69p3p5zc9i6gxq53f36s0mia4idzrbsda661f1bhmxk"; depends=[]; };
   pccc = derive2 { name="pccc"; version="1.0.5"; sha256="0jh8yadks76ip9jmgvld9nycdm74f5gllkyhfmnrir8vi6xwvbad"; depends=[dplyr Rcpp]; };
   pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; };
@@ -11988,16 +12498,17 @@ in with self; {
   pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
   pcgen = derive2 { name="pcgen"; version="0.2.0"; sha256="1v2fmxbj9gz5sg0hizw03ad8cfm9v25708h7fvnf6gb42b2mmyb3"; depends=[ggm graph Hmisc lme4 MASS Matrix pcalg sommer]; };
   pch = derive2 { name="pch"; version="1.4"; sha256="0vfx0jirmfcy47l6xw1yvss68624605378cpqc58ygllwddcqz1y"; depends=[survival]; };
-  pchc = derive2 { name="pchc"; version="0.1"; sha256="02q5vlj7qrv76ja92kdg0cl47vdfdda3r8d2qz86d2vvpz4qnfv8"; depends=[bnlearn Rfast robustbase]; };
+  pchc = derive2 { name="pchc"; version="0.3"; sha256="14vlj4y996nakl830sr932lrlbj32a6abk25d3snv5gfagqjjbx2"; depends=[bigmemory bigstatsr bnlearn Rfast Rfast2 robustbase]; };
   pcmabc = derive2 { name="pcmabc"; version="1.1"; sha256="1x4qvs5v134z93j1r3zg08kynqyhgd2yc3y2vk0vif8mabvx3zv4"; depends=[ape mvSLOUCH phangorn TreeSim yuima]; };
-  pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; };
+  pcnetmeta = derive2 { name="pcnetmeta"; version="2.7"; sha256="0jibi4wylxkisgj740xbibjqs60d5xg9my4sx7vshgfl941y9wcv"; depends=[coda rjags]; };
   pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
   pcr = derive2 { name="pcr"; version="1.2.2"; sha256="1lmgm8k3s7780ivrdj0zk1ninx7b5jffir6q5p2p47h62qqjmp5d"; depends=[ggplot2]; };
   pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; };
-  pct = derive2 { name="pct"; version="0.4.1"; sha256="0j554xrb8pd1lsxc10d75k21q5yvfr3l9xawl4vzj1gw3cs2axpx"; depends=[boot readr sf stplanr]; };
-  pcts = derive2 { name="pcts"; version="0.14-4"; sha256="0c5r71d6c08g5v5cwvy93fwp1lhmqh99azq8nn1ikfxadi7kndln"; depends=[BB gbutils lagged ltsa lubridate Matrix mcompanion PolynomF Rdpack sarima zoo]; };
+  pct = derive2 { name="pct"; version="0.7.0"; sha256="1q4y4zyz6z1rq43b92f1nbaq54kr15bzi29wxp3xq07w9kfvc3p4"; depends=[boot readr sf stplanr]; };
+  pcts = derive2 { name="pcts"; version="0.15"; sha256="1wl3hgj0sn9128vwcqin37jn5ww3na4g7r1isj39j6m2v76s3ndk"; depends=[BB gbutils lagged lubridate Matrix mcompanion PolynomF Rdpack sarima xts zoo]; };
   pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
   pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.4"; sha256="1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; };
+  pda = derive2 { name="pda"; version="1.0-2"; sha256="1y067d3v9qlirawy01nmsh4fdynfh80mvg9r55kkban2z7xhql9j"; depends=[data_table httr jsonlite Rcpp RcppArmadillo rvest survival]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
   pder = derive2 { name="pder"; version="1.0-1"; sha256="147fc5swmh0qrg7k3q3gpnvl9f7hhjjzwi8f5dc4fkyj14qi5bm5"; depends=[]; };
   pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; };
@@ -12006,21 +12517,22 @@ in with self; {
   pdfsearch = derive2 { name="pdfsearch"; version="0.3.0"; sha256="0mk1s8b7cdz025xn9kg5xnw388sndhjm80ckf71daxviknrzcscf"; depends=[pdftools stringi tibble tokenizers]; };
   pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; };
   pdftools = derive2 { name="pdftools"; version="2.3.1"; sha256="01i5g2mjkshis0zlm7lrvi7kkzl4dn3if1hzwkgzf9n2mi33ndsx"; depends=[qpdf Rcpp]; };
+  pdi = derive2 { name="pdi"; version="0.4.1"; sha256="1az6q407x9src6j0ax9q228s764knrlv5rnllvl8s3z9q071315q"; depends=[dplyr magrittr purrr randomForest readxl stringr tibble tidyr tidyselect]; };
   pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; };
   pdp = derive2 { name="pdp"; version="0.7.0"; sha256="0wcszaq4c14f9a2r1gd32mzhs035jlg2w8mkfklzigcj7fv9xmi8"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; };
   pdqr = derive2 { name="pdqr"; version="0.2.1"; sha256="1444r51lh66kmhvkp8ivr95zlnxfgv28whl0axwb56hf5vi44lp9"; depends=[]; };
   pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; };
   pdxTrees = derive2 { name="pdxTrees"; version="0.4.0"; sha256="0cw1zrkawc2wnbd2pif8732kl92qvklxvx6hnikx3siz22psvbl8"; depends=[dplyr magrittr rlang]; };
-  pdynmc = derive2 { name="pdynmc"; version="0.9.1"; sha256="168kicv1h93qhyzvbr681pbnysz1b42sj2ivzsfnfg711w0bp935"; depends=[data_table MASS Matrix optimx qlcMatrix Rdpack]; };
+  pdynmc = derive2 { name="pdynmc"; version="0.9.3"; sha256="07376gf5i98sf4k8dmd1yrw0h7nhdd39qdjbrz1916dwm45psmga"; depends=[data_table MASS Matrix optimx qlcMatrix Rdpack]; };
   peRiodiCS = derive2 { name="peRiodiCS"; version="0.5.0"; sha256="1366gmn6qfciwcjsfnbl3hfa16ffn11g00fm0kv74ilvm3nnawk3"; depends=[Hmisc rms]; };
   peRspective = derive2 { name="peRspective"; version="0.1.0"; sha256="1zz3znzaa80k60jddys5fhxwx4c8lyqymx5fw2zvj654rnk0mmzc"; depends=[crayon dplyr glue httr jsonlite magrittr purrr rlang rlist stringr tibble]; };
+  peacesciencer = derive2 { name="peacesciencer"; version="0.1.0"; sha256="12sqpqcljhls899d7mnlma1iqbqhg815nkjxb9zwjhjljynxh1i9"; depends=[countrycode dplyr geosphere lubridate magrittr rlang stringr tibble tidyr]; };
   peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; };
   peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; };
   peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; };
-  pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
   pearson7 = derive2 { name="pearson7"; version="1.0-3"; sha256="0vdhhds1lngaff7dkx4b1az3syqw8b22w2jskcrw0m49wp1dbbha"; depends=[]; };
-  pec = derive2 { name="pec"; version="2019.11.03"; sha256="1h6fk3k9w61a9xqhvkm1zdv75nsl06n78036qvcxkcf0bkfxl360"; depends=[foreach prodlim rms survival timereg]; };
+  pec = derive2 { name="pec"; version="2020.11.17"; sha256="1g2mmnw4i5bm4r1krn7fmjbijx8fawmxmzcjh1l8qd8f79bxzh42"; depends=[foreach lava prodlim riskRegression rms survival timereg]; };
   pedSimulate = derive2 { name="pedSimulate"; version="0.0.4"; sha256="0dz92cwnkb6vwkr18rkxil6cizfib522wxs1agbhz6dx0kv9xbhn"; depends=[]; };
   pedgene = derive2 { name="pedgene"; version="3.3"; sha256="0y6kr5ad4fmxljsj0czs9h1dkz63wvqiira9ibgsf0707xb0vh7f"; depends=[CompQuadForm kinship2 Matrix survey]; };
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
@@ -12028,10 +12540,10 @@ in with self; {
   pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
   pedmut = derive2 { name="pedmut"; version="0.2.0"; sha256="0851r4yl5n1mf8pk3nik5kcnv12ffxc1hl1wxp6b81qz5lbfwxaf"; depends=[]; };
   pedometrics = derive2 { name="pedometrics"; version="0.7.0"; sha256="0rqldc67yrcg16i5q9wrmfmh3lw3qrfdxwdb4mxkjxx18v4fv737"; depends=[lattice latticeExtra Rcpp]; };
-  pedprobr = derive2 { name="pedprobr"; version="0.3"; sha256="0inxlspq2khcv7r60rgavjh6ajyxbafddmwdgpn39klwp7h6yzcb"; depends=[pedmut pedtools]; };
-  pedquant = derive2 { name="pedquant"; version="0.1.5"; sha256="01kmagaapx5qlvar0l862rl8s1caqzdld3qjygxi9zl232042x89"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; };
-  pedtools = derive2 { name="pedtools"; version="0.9.5"; sha256="1h43jpxxyzmjh8acqcqfx7m2xdxnwqy92ph93hqwng4fqvfpva39"; depends=[kinship2]; };
-  pegas = derive2 { name="pegas"; version="0.13"; sha256="002i7s4g0nhnq0v05gs0yssqiyhpq2f7rw2rhn31hsbgxc86frvy"; depends=[adegenet ape]; };
+  pedprobr = derive2 { name="pedprobr"; version="0.4.0"; sha256="0hsz7pdj6hkr91m5x5as0dyv6gn2swf2ld3rangk55z58pngcbr0"; depends=[pedmut pedtools]; };
+  pedquant = derive2 { name="pedquant"; version="0.1.6"; sha256="1hjiqsbdcca4pk36rapndpa3awcv2jlql0g1qk66vplnlg5d6zwl"; depends=[curl data_table ggplot2 gridExtra httr jsonlite plotly readr readxl rvest scales stringi TTR xml2 zoo]; };
+  pedtools = derive2 { name="pedtools"; version="0.9.6"; sha256="0rjr2d1qml7y5sl3mppy40ncx5hzf0kazrxcflssv922vxb4h565"; depends=[kinship2]; };
+  pegas = derive2 { name="pegas"; version="0.14"; sha256="0lr06gajzdanj8ax91kgpxsj863m367v2s1z5gnxps3999n0xybx"; depends=[adegenet ape]; };
   pems_utils = derive2 { name="pems.utils"; version="0.2.26.4"; sha256="13d5cg2wdz84inby017bra6xzwhkp5qcy1b213r387fq771h2xrx"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; };
   penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
   penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
@@ -12040,23 +12552,24 @@ in with self; {
   penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; };
   penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.2"; sha256="03zw95bc6svbnzak9x72s3b8l9gh581mxn2di1fl89gxlh864amd"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
   penaltyLearning = derive2 { name="penaltyLearning"; version="2020.5.13"; sha256="0297rp5zn6d0axl44i3baq2vqvhrx6s8irrysvqdcx1rkishf4j0"; depends=[data_table ggplot2]; };
+  pencal = derive2 { name="pencal"; version="0.1.2"; sha256="03z3yz5n8ds6lhx8qh4mxy34hxv3csv1iwwv214lrg92dpzz9ns4"; depends=[doParallel dplyr foreach glmnet MASS nlme ptmixed survcomp survival survivalROC]; };
   pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; };
   pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; };
-  pense = derive2 { name="pense"; version="1.2.9"; sha256="0ls573kx3z09v848fi5pvidc5l2dhmqv9vvyjspzzfiff3z6w09i"; depends=[Matrix Rcpp RcppArmadillo robustbase]; };
+  pense = derive2 { name="pense"; version="2.0.2"; sha256="0xfpb23wzjiqzcn391y9h5f9jlzi8jfpps5y77sy689lkcazmm3r"; depends=[lifecycle Matrix Rcpp RcppArmadillo rlang]; };
   pensim = derive2 { name="pensim"; version="1.3.2"; sha256="12rh9n6jjnlzjsdjjw60ams7l0n05skwkbql5d0jqrmpbxrca6rp"; depends=[MASS penalized]; };
   peperr = derive2 { name="peperr"; version="1.1-7.1"; sha256="12k9crhsv3p4zrcbyr85cfwp68z3r1w2kb62g7jb7h311c7zykjx"; depends=[snowfall survival]; };
   peppm = derive2 { name="peppm"; version="0.0.1"; sha256="1lvk1rjsx39mb93s9pclriw4fmf1sx05s59qqx5m3aqb4q8ffxkg"; depends=[Rcpp]; };
-  pepr = derive2 { name="pepr"; version="0.3.2"; sha256="1mfs31d050z6yq3gm5gnh3z3pngjm9nin16629s96wj5h0q9q58k"; depends=[data_table pryr stringr yaml]; };
+  pepr = derive2 { name="pepr"; version="0.4.0"; sha256="0mnigx4lpl397k526sxp7ckrnp59hfrnm9gqcq0nx6j5d7379sp9"; depends=[data_table pryr stringr yaml]; };
   peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; };
   pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; };
   perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; };
   perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; };
   perccalc = derive2 { name="perccalc"; version="1.0.5"; sha256="14557k7khc3l5m0vlam0fvbsb6p78v9gfcnx5ksxcvrab28xj7p3"; depends=[multcomp tibble]; };
   perfectphyloR = derive2 { name="perfectphyloR"; version="0.2.0"; sha256="00gvmn66lb9hfli7yc3l5913xpngib1vksg5zjnxqxiwdibjfqx8"; depends=[ape phytools Rcpp RcppArmadillo]; };
-  performance = derive2 { name="performance"; version="0.4.8"; sha256="1gl3m1pw0wrj9m9cgd0vzbj9swfwjg4aa40gpliplb9y7dcmgi4l"; depends=[bayestestR insight]; };
+  performance = derive2 { name="performance"; version="0.6.1"; sha256="0wz2zc98r99pg6r4l09qxxzv1fwxwp1md6wmhay401568kd8h5zn"; depends=[bayestestR insight]; };
   performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; };
   pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; };
-  periscope = derive2 { name="periscope"; version="0.5.1"; sha256="1l9ryvj7spvl63c99flwj8k1mf4jksg7030hr3cv8xvr7830lf41"; depends=[DT ggplot2 lubridate openxlsx shiny shinyBS shinydashboard shinydashboardPlus]; };
+  periscope = derive2 { name="periscope"; version="0.5.2"; sha256="0w8yjmvmfp9pakcbc3cjjgszy13py50fadpzslrjfwzmdx7d5vvl"; depends=[DT ggplot2 lubridate shiny shinyBS shinydashboard shinydashboardPlus writexl]; };
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
   permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; };
   permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; };
@@ -12064,25 +12577,29 @@ in with self; {
   permimp = derive2 { name="permimp"; version="1.0-0"; sha256="0nkl5xga2w79mb7p2zyvznhkmjai1k5zsf1kpfjz1p44xd8ypn13"; depends=[ipred party randomForest survival]; };
   permubiome = derive2 { name="permubiome"; version="1.3.1"; sha256="0a4swfkmqqr8a1psc6rlnxnpm43fj42gjkikcqy8d84wrfz2wrr9"; depends=[dabestr ggplot2 gridExtra Matrix rlang]; };
   permuco = derive2 { name="permuco"; version="1.1.0"; sha256="1mp3yp4p1b382c31a3jcmq1n90zvb1lggacb3zdblpmz1yrj4v1c"; depends=[Matrix permute]; };
-  permutations = derive2 { name="permutations"; version="1.0-6"; sha256="1bygr2fa2qjka4bbx9i6l1iiy15anz427y3zh8hdq0r21aygmi7v"; depends=[magic numbers partitions]; };
+  permutations = derive2 { name="permutations"; version="1.0-9"; sha256="1701jah8i9frw3cbqlri2l56lansw54l3pp9h1fy36a8ahhcllkg"; depends=[magic numbers partitions]; };
   permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; };
   permutes = derive2 { name="permutes"; version="1.0"; sha256="1lrhlqwv1y2vgklgwp16jw90vmgifnp4rlxw55hhj8gs97agv5y8"; depends=[ggplot2 lmPerm plyr viridis]; };
   perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
   persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
   personalized = derive2 { name="personalized"; version="0.2.5"; sha256="073mi3g0khba1s8wz01h1xc0zxq0yr05nflf15nss2rv7lh2qazb"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
+  personalized2part = derive2 { name="personalized2part"; version="0.0.1"; sha256="104flqjyf0x0619msyc0vlkg61znvhf0v86fsdpksdxkgwb7wv7j"; depends=[foreach HDtweedie personalized Rcpp RcppEigen]; };
+  personalr = derive2 { name="personalr"; version="1.0.1"; sha256="119askhfcb7jb5zvckk4vq51jsnzrqxrang7i2lgvszqwd9s35f1"; depends=[desc devtools fs glue magrittr purrr rprojroot rstudioapi usethis withr xfun]; };
   personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; };
   personr = derive2 { name="personr"; version="1.0.0"; sha256="12iyzdc2kksy74npzdgy19lnhm9l9c7f4lkwshmsp6by09kb2dm3"; depends=[ggplot2 rlang rmarkdown shiny whisker]; };
   perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; };
-  perturb = derive2 { name="perturb"; version="2.10"; sha256="07c84x67hzyr70zkmd00f4gxqzcrpizc7w7h2hs22xy6p719a5i2"; depends=[gdata]; };
   perturbR = derive2 { name="perturbR"; version="0.1.3"; sha256="1sdk5ls8x66lds4cy40xbl383px4xmrh21cw4bgy83rzbjjzwp2h"; depends=[ggplot2 igraph]; };
+  peruse = derive2 { name="peruse"; version="0.1.0"; sha256="04bg6pcljqcm4y8yv9yans99rl02ij2ffk7zk5gpfykcwdzrdrmc"; depends=[magrittr purrr R6 rlang]; };
   pesel = derive2 { name="pesel"; version="0.7.3"; sha256="125rgbar1aiw7x3ywfb09s3gh3k0zal0p44h4928d854mn4m986s"; depends=[]; };
   petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; };
   petrinetR = derive2 { name="petrinetR"; version="0.2.1"; sha256="0h9nsjsj87b6qvvkg81kn0j2c4xkzq89sddp9l6pjh636bdqwf8i"; depends=[DiagrammeR dplyr purrr visNetwork xml2]; };
   petro_One = derive2 { name="petro.One"; version="0.2.3"; sha256="1xky85vfk2mpj8xxdqggismzirm3rx2wr51g12zr80i1dx5wak4i"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka SnowballC tibble tm urltools wordcloud xml2]; };
   pewdata = derive2 { name="pewdata"; version="0.3.1"; sha256="1dn6v41kwrs8dj66063y7l6vryih2q49qcfvmhaiaxzvbpzymiyc"; depends=[foreign magrittr purrr rio RSelenium stringr]; };
   pexm = derive2 { name="pexm"; version="1.0.0"; sha256="1043pqn4irpmjv2ywqfpmp45lmx6ad2rr15cnr5sizxg9bjl1vjv"; depends=[coda msm rjags]; };
-  pez = derive2 { name="pez"; version="1.2-1"; sha256="1wnnyxxg1b8ay96wfb5dfq3kbikgcmxa48pgidj8cb54mjlw8nyg"; depends=[ade4 animation ape apTreeshape caper FD Matrix mvtnorm phytools picante quantreg vegan]; };
+  pez = derive2 { name="pez"; version="1.2-2"; sha256="1c9gicg1g85x29y5kh2fkp0c2r923wc00hdw1b9rzfv0hgscbcxb"; depends=[ade4 animation ape caper FD Matrix mvtnorm phytools picante quantreg vegan]; };
   pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; };
+  pfica = derive2 { name="pfica"; version="0.1.1"; sha256="04gq5zwsqf33gv73k4mh74cn149jqzk1qq922zv2bpd2dva1xdn2"; depends=[corpcor fda moments]; };
+  pflamelet = derive2 { name="pflamelet"; version="0.1.1"; sha256="0yprydhz30r2ysp7i4n3g3vriln3094c7yablnfwb8dkiz3032fl"; depends=[abind pbapply plotly TDA viridis]; };
   pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; };
   pgdraw = derive2 { name="pgdraw"; version="1.1"; sha256="1s1b1izpgryrqsjkdh3yvr137054sipj3kwdkzlx2af8xjr53f85"; depends=[Rcpp]; };
   pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; };
@@ -12110,35 +12627,33 @@ in with self; {
   phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
   pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
   phenoCDM = derive2 { name="phenoCDM"; version="0.1.3"; sha256="1cyqwc36zwa2a4ljy0xnqz0hhw0r98qk2an5y002lrchkqydplwp"; depends=[rjags]; };
-  phenocamapi = derive2 { name="phenocamapi"; version="0.1.5"; sha256="1kvb7lsixhh2sqdd5r9si0wbnrzfg3fbs29pb2nvl3086hnshl9i"; depends=[data_table RCurl rjson]; };
   phenocamr = derive2 { name="phenocamr"; version="1.1.4"; sha256="1abcwbds406m1dncn188n8y3fqwxx2h7g7xrca8j6bw2ld69jswd"; depends=[changepoint daymetr httr jsonlite memoise MODISTools zoo]; };
   phenofit = derive2 { name="phenofit"; version="0.2.7"; sha256="0159jn606hm9mzrfhfnjl9dab9k8118x8g6pg3y86l31mwri6skv"; depends=[data_table dplyr foreach ggplot2 gridExtra iterators jsonlite JuliaCall lubridate magrittr numDeriv optimx plyr purrr Rcpp RcppArmadillo reshape2 shiny spam stringr tibble tidyr ucminf zoo]; };
-  phenology = derive2 { name="phenology"; version="7.3"; sha256="0hklk5k0i6vv733dm3npphg0zrhlb14ps6j6wwvsx50sqr3xl9jg"; depends=[HelpersMG lmf numDeriv optimx]; };
+  phenology = derive2 { name="phenology"; version="7.6"; sha256="0i2w2xkfp0c8r3wjrh5rr8a92dmpw7nvq4fvcacp9glap9qj4pcr"; depends=[HelpersMG lmf numDeriv optimx]; };
   phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; };
-  phenopix = derive2 { name="phenopix"; version="2.4.1"; sha256="1h4yr54mg8xj31dp7p6sxj8ra55dqw4a5ksw6ka53id6vnl964lk"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; };
+  phenopix = derive2 { name="phenopix"; version="2.4.2"; sha256="0rrp4ch32hzlm727xpwsvfsw7d4qypv7iiq8hrg9az6nb39pbvp7"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; };
   phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; };
   phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; };
   philentropy = derive2 { name="philentropy"; version="0.4.0"; sha256="09vi6mfcig397226kq2fgymwg5ng8iysi6b2f616masscgshplxz"; depends=[dplyr KernSmooth Rcpp]; };
+  phillydaodata = derive2 { name="phillydaodata"; version="1.0.0"; sha256="000qc9222ww083v2gkrvhr52y2gg9c0f1zslbagy7nya64yrckvj"; depends=[data_table janitor]; };
   phm = derive2 { name="phm"; version="0.1.2"; sha256="0jm4w2rj80jz24134y8sj6w7f2icdizs644zfbiq77vzfj1mg8i6"; depends=[data_table shiny slam tm]; };
   phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; };
   phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
   phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; };
-  phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.7"; sha256="18279656226c3pgyz2i5jn8ibvh6m6jzkcqq3cl4ivjfldabc3h7"; depends=[phonTools rmarkdown tuneR xml2]; };
-  phonics = derive2 { name="phonics"; version="1.3.6"; sha256="1vyflc7v65z4mxpzz5mxych1hhi0j6v4dy19azkwgyapvhbisdxq"; depends=[BH data_table Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.10.4"; sha256="0vbv499g39xbcqd904226hz189favbfn5fzknp9bl2dcnnzd3fq3"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; };
-  photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.1"; sha256="02xknpq8bv55zp7njd7pdi9gg1gmd4l6j6jlxi94a8nwpnfm2cxv"; depends=[photobiology]; };
+  phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.10"; sha256="11hxmshcmwjrvncqj1i37iqsddqah1q23jqzcvq4dqb97vw4z5p3"; depends=[phonTools rmarkdown tuneR uchardet xml2]; };
+  phonics = derive2 { name="phonics"; version="1.3.9"; sha256="1625jysaf1r06bicz5zyzq6lawr8b0yylaj9v314b0mcgkvn8i12"; depends=[BH data_table Rcpp]; };
+  photobiology = derive2 { name="photobiology"; version="0.10.5"; sha256="0nh1bqzwlajmdgd1ckhai5ky3zhlgvhp4l1hzlkihl5w480qpl4p"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble tidyr zoo]; };
+  photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.2"; sha256="0n987klwyj06xikmvg9cvsjzrxll1d7p358jw4ls0j46byki98s5"; depends=[photobiology]; };
   photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22-1"; sha256="1dqjlcra3vqydxjf6rwha6y1bykkpqwf8bqjkljs4kb89642qbv1"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; };
   photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; };
   photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; };
   photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; };
-  photobiologySensors = derive2 { name="photobiologySensors"; version="0.4.0"; sha256="1d0rphlx6k2hqvmhndbw143djsfr4fmwjih3s37bhksc2dn7nh2v"; depends=[photobiology]; };
+  photobiologySensors = derive2 { name="photobiologySensors"; version="0.5.0"; sha256="122cfy6nsxngd8hnbq5frkgnzrb9fxw83l7mfwk0wy6gx7zsfx5s"; depends=[photobiology]; };
   photobiologySun = derive2 { name="photobiologySun"; version="0.4.1"; sha256="15wp8q29m5c4qplind9098ikxmm1r60lw8cm0pa48lmh33638ia3"; depends=[photobiology]; };
   photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.4"; sha256="04bl72jaxm7vfvzss3wxjqf7p4l6rrqv11a7gqyfg0xqy18clnhx"; depends=[photobiology]; };
-  photosynthesis = derive2 { name="photosynthesis"; version="1.0.2"; sha256="0804a91fv99qmsjj8km65cqqvk807mscd915aafchr27xwirfh9b"; depends=[checkmate crayon dplyr furrr future glue gunit magrittr purrr rlang stringr tealeaves tidyselect units]; };
+  photosynthesis = derive2 { name="photosynthesis"; version="2.0.0"; sha256="1q6wcl2fl7mwf27v5yljk8alrz4jvbhybxxrqgi1c41qbs6581yz"; depends=[checkmate crayon dplyr furrr future ggplot2 glue gunit magrittr minpack_lm nlme pkgnet purrr rlang stringr tealeaves tidyselect units]; };
   phreeqc = derive2 { name="phreeqc"; version="3.6.3"; sha256="0z20gj1kqhnbvx33sswz5ivj7nk2p4hia4gr2npscs94nc50b5j4"; depends=[]; };
   phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; };
-  phuse = derive2 { name="phuse"; version="0.2.2"; sha256="0aihiz0gkvs7bq9f9fmfxsv7wk5yifcnmgnjl3y9qf2dzl5787bb"; depends=[git2r httr jsonlite RCurl rlist SASxport shiny stringr yaml]; };
-  phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; };
   phyclust = derive2 { name="phyclust"; version="0.1-29"; sha256="0jy2ylz6znsn5fsxrlv7fasmbfw3drbvvf68vd1cf5hz50p7i543"; depends=[ape]; };
   phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
   phylin = derive2 { name="phylin"; version="2.0.2"; sha256="0v6fyk2prja448vdi7ipwzws28fjfi188pfncjf9mhn8jrgpfxl6"; depends=[]; };
@@ -12157,19 +12672,19 @@ in with self; {
   phylosignal = derive2 { name="phylosignal"; version="1.3"; sha256="1h73wwczwak5v89mybq16lmmfr0fxfv5mx347ffipy6q9vgvwqx5"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; };
   phylotate = derive2 { name="phylotate"; version="1.3"; sha256="092kvn32j06vm8ilwjkgidcz11r3qhsmi0cb0g0nnykw0a0vii4p"; depends=[]; };
   phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; };
-  phyr = derive2 { name="phyr"; version="1.0.2"; sha256="1qk4mbchi5dcz6vsmwb93gj5ihp2ygvm1ya63mkw11vkyy2nv67c"; depends=[ape dplyr gridExtra latticeExtra lme4 Matrix mvtnorm nloptr Rcpp RcppArmadillo]; };
+  phyr = derive2 { name="phyr"; version="1.1.0"; sha256="0jvjxvxx2nz9ra9vp00bmm3dxr2am4zs8cvxij8w4jjyskznxc96"; depends=[ape dplyr gridExtra latticeExtra lme4 Matrix mvtnorm nloptr Rcpp RcppArmadillo tidyr]; };
   phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; };
   physiology = derive2 { name="physiology"; version="1.2.1"; sha256="1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb"; depends=[Rcpp]; };
-  phytools = derive2 { name="phytools"; version="0.7-47"; sha256="18scm5p9g4ivkg108r21lxhaailc3h91nblxrfwjfah88bqb1cgy"; depends=[animation ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; };
+  phytools = derive2 { name="phytools"; version="0.7-70"; sha256="1lzhk7mkixwp6ixd5hsn3zglw110phgdisrb57qwcp3f00xjqhz3"; depends=[ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; };
   phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
   piRF = derive2 { name="piRF"; version="0.1.0"; sha256="04k09ylc6hqw57dlv7sfnisn1167dr550y1j9xl7prvlf3jksg06"; depends=[Rdpack]; };
   picante = derive2 { name="picante"; version="1.8.2"; sha256="19savjzj44b7ifdxcp02ynj22z4n4ikq2aipc74ljzy3yykmqmjn"; depends=[ape nlme vegan]; };
   picasso = derive2 { name="picasso"; version="1.3.1"; sha256="1z7zm88wjp7fia7054l7i55f152iddrjj9wbcpcskhc8s6kfg53c"; depends=[MASS Matrix]; };
   pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; };
-  piecepackr = derive2 { name="piecepackr"; version="1.5.1"; sha256="03dk1y195q0qzg9apkx1nvaj2db0cd6drqlm9y41z2vhhjnxijav"; depends=[gridGeometry grImport2 jpeg png purrr R6 stringr tibble]; };
-  piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.0"; sha256="1dpl3kyph0ry9g9321cknznjdizh03klg0s6hx56g6h8ygb0ar6h"; depends=[car DiagrammeR emmeans igraph lme4 MASS nlme]; };
+  piecepackr = derive2 { name="piecepackr"; version="1.6.3"; sha256="1h0f3n85ayk44dqldcw6in39vl1gcldvv3w3nks7jn8cmr16h9b8"; depends=[backports gridGeometry grImport2 jpeg png purrr R6 stringr tibble]; };
+  piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.2"; sha256="1qxwc1drx26p4cgymrfjmg5i7ypl7gddv40virkpmc0qaag9pq36"; depends=[car DiagrammeR emmeans igraph lme4 MASS multcomp nlme]; };
   piggyback = derive2 { name="piggyback"; version="0.0.11"; sha256="17cmkzp4g5gcapab3g5jxpabsmw4s3zsizqd99bh36xyw76v1jds"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; };
-  pillar = derive2 { name="pillar"; version="1.4.6"; sha256="01ck8ziqzjc9ibbj3g88siz1iw263dgl8jx6ryw2v50rjrr3y7fj"; depends=[cli crayon ellipsis fansi lifecycle rlang utf8 vctrs]; };
+  pillar = derive2 { name="pillar"; version="1.4.7"; sha256="167ji21fx04s2niw5pjq9vzxgagxzsg3gimh8dzr2kl5ljrb5vfd"; depends=[cli crayon ellipsis fansi lifecycle rlang utf8 vctrs]; };
   pim = derive2 { name="pim"; version="2.0.2"; sha256="0kwlm6n23ccs0jz4plsqprg6inj3qv74zhvg9gpxyj3ksvdxp58i"; depends=[BB nleqslv]; };
   pimeta = derive2 { name="pimeta"; version="1.1.3"; sha256="1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q"; depends=[ggplot2 Rcpp RcppEigen scales]; };
   pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
@@ -12179,8 +12694,8 @@ in with self; {
   pinnacle_API = derive2 { name="pinnacle.API"; version="2.3.3"; sha256="1b6adns1xr3cgcj2mdjvl16cm2vjjgsj2l8m2c47plyc5jh05qmb"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; };
   pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; };
   pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; };
-  pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; };
-  pins = derive2 { name="pins"; version="0.4.3"; sha256="0bzfj7nxc7ll43ws2r3f7fm55pjn9nf7nmx7w40kvn9h5cafsays"; depends=[backports base64enc crayon digest filelock httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; };
+  pinp = derive2 { name="pinp"; version="0.0.10"; sha256="1qah1b9chn237pfxisjsn6rr4h9h9zdqrk323c0k1qds7vm0xpra"; depends=[knitr rmarkdown]; };
+  pins = derive2 { name="pins"; version="0.4.4"; sha256="19fd7i88f8wg6c8bn3n4s8jfjgbnpbraw0qxqks5ssg9xc8m0cdz"; depends=[backports base64enc crayon digest filelock fs httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; };
   pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; };
   pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; };
   pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; };
@@ -12189,28 +12704,29 @@ in with self; {
   pipeliner = derive2 { name="pipeliner"; version="0.1.1"; sha256="1cyyd1bin89dh0zrhic3i541bj8nnaphg6jq2jqkhnxn2nvax11g"; depends=[]; };
   pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; };
   piratings = derive2 { name="piratings"; version="0.1.9"; sha256="0krrcf2bwicdf9fn657vkcjg5zliwi82hw3xmaqi46mdix8896gh"; depends=[ggplot2]; };
-  pisaRT = derive2 { name="pisaRT"; version="1.0.0"; sha256="02r9xgh57scc6j9cp8aaw3c3r8cpr91xvcmkzkag5i4nxjzq9lbd"; depends=[]; };
+  pisaRT = derive2 { name="pisaRT"; version="2.0.1"; sha256="0g4z4ixg7bsig1rjhsymncmzpl135r6mr3pqlb60gmz11851bw9w"; depends=[]; };
   pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
-  piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; };
+  piton = derive2 { name="piton"; version="1.0.0"; sha256="1krf6zi238m275nxjlpyayv8y2drbgs2kg19dpkqm0lmlz5y5ar8"; depends=[Rcpp]; };
   pivmet = derive2 { name="pivmet"; version="0.3.0"; sha256="04awr5sj3x79hwzqd4hv43gfy7w6lpl2hbbny72vvjwc6g0z574p"; depends=[bayesmix bayesplot cluster corpcor MASS mclust mvtnorm RcmdrMisc rjags rstan runjags]; };
   pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; };
   pivottabler = derive2 { name="pivottabler"; version="1.5.0"; sha256="0b3zh7qwvwvy0d2svnvpdbqwc8w2mb1s9g3acf883dhy3cnxq4ly"; depends=[data_table dplyr htmltools htmlwidgets R6]; };
-  pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; };
+  pixels = derive2 { name="pixels"; version="0.1.1"; sha256="1vvahrajm8ys5vgfc0iyzj2a6vzvgaakkj6i0m2sy40l2w44dn0q"; depends=[htmlwidgets miniUI shiny]; };
   pixiedust = derive2 { name="pixiedust"; version="0.9.0"; sha256="01qcd8rsph3i65p9w4asqb1x6a671vbihzsby19ravp22lqzfmxg"; depends=[broom checkmate htmltools knitr labelVector magrittr reshape2 scales]; };
   pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
-  pkgKitten = derive2 { name="pkgKitten"; version="0.1.5"; sha256="0nnib0gv9g22b9p01xigsgj04jv29fv7f444invfphfh9cc866m4"; depends=[]; };
-  pkgbuild = derive2 { name="pkgbuild"; version="1.1.0"; sha256="1gdbrjq4kiwm45c6pb23mp327qyjvslhyf72ca4zhlzwc5vgp6xk"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; };
-  pkgcache = derive2 { name="pkgcache"; version="1.1.0"; sha256="1fqrb2bfx4l3vwkvrfbadzamiknn62cyn8bj8q8np83klc926fkb"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; };
+  pkdata = derive2 { name="pkdata"; version="0.1.0"; sha256="1kmcalidw2zidd6i8ds0k057b3187by2k8z6764va43d5garbbcv"; depends=[lubridate]; };
+  pkgKitten = derive2 { name="pkgKitten"; version="0.2.0"; sha256="1pp7143d1kxv9rn544xavlsjx334kb0b315s0y18vrnf6mzn7vlp"; depends=[]; };
+  pkgbuild = derive2 { name="pkgbuild"; version="1.2.0"; sha256="0qx920h2viwjg10va81nj0xja495d8ni6vcc25ggvzki6a6k069f"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; };
+  pkgcache = derive2 { name="pkgcache"; version="1.1.1"; sha256="11hvd43bg78alpb5ipvwh9s8qzvvqr0ss7x24zq10i7754mfs9iy"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; };
   pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; };
   pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; };
-  pkgdown = derive2 { name="pkgdown"; version="1.5.1"; sha256="0sy7f4bzbdzh2z8m30hq2i5yx9vrpmridrg4l85qpvwm5j7yhd88"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; };
+  pkgdown = derive2 { name="pkgdown"; version="1.6.1"; sha256="1k31biyvxkv3xjc1yy3nzb9wfza3vbx97fv17nly5a6vlv7zqbs4"; depends=[callr crayon desc digest downlit fs httr magrittr memoise openssl purrr ragg rematch2 rlang rmarkdown tibble whisker withr xml2 yaml]; };
   pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.2"; sha256="07x63w19fg7sl547501r2dx2ds5sfdfb29xvqrvjibf8265x25fw"; depends=[downloader rappdirs]; };
   pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; };
   pkgload = derive2 { name="pkgload"; version="1.1.0"; sha256="03bv8xq4s6s7m34y1kjs99jzlb95vwrfi76mbnhmzcx2pc6ld78q"; depends=[cli crayon desc pkgbuild rlang rprojroot rstudioapi withr]; };
-  pkgmaker = derive2 { name="pkgmaker"; version="0.31.1"; sha256="0r0ga20dy25v9y5gjbds4y6kaa5a7qknh503qdkzllcpzbibh0hp"; depends=[assertthat bibtex codetools digest magrittr registry stringi stringr withr xtable]; };
-  pkgndep = derive2 { name="pkgndep"; version="1.0.0"; sha256="0icqvka2yssz9ri9yncb725fm8vfcaf602bqz8l25mgk2hh6zamf"; depends=[callr ComplexHeatmap crayon GetoptLong]; };
+  pkgmaker = derive2 { name="pkgmaker"; version="0.32.2"; sha256="14ggsd24n5g5rvn0wl4w90ipxzmywqikh28llj89q6kpxwnv4iff"; depends=[assertthat codetools digest registry stringr withr xtable]; };
+  pkgndep = derive2 { name="pkgndep"; version="1.0.1"; sha256="18j8yrbzk80yamqqcyhbl6y7dla684hvqffv6l83d5fvhzadscz6"; depends=[callr ComplexHeatmap crayon GetoptLong]; };
   pkgnet = derive2 { name="pkgnet"; version="0.4.1"; sha256="194ynbhq6k7gp8l4ccq6m37qhhf791ynbppjh77cc0q50w2jz387"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; };
-  pkgsearch = derive2 { name="pkgsearch"; version="3.0.2"; sha256="1dvlqav7hp43x30rmwr8h3dscc0hc01i6mfc7hxvf7ny1rzckfv0"; depends=[assertthat httr jsonlite parsedate prettyunits tibble]; };
+  pkgsearch = derive2 { name="pkgsearch"; version="3.0.3"; sha256="1icn8qw6jpcgbmidqpml4ifpv1i5z2i4hp6b0gpb1xk9dlf6mnl2"; depends=[assertthat curl jsonlite parsedate prettyunits tibble]; };
   pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; };
   pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; };
   pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; };
@@ -12229,36 +12745,37 @@ in with self; {
   plater = derive2 { name="plater"; version="1.0.2"; sha256="0z3s33xpfkd1ln37bpsgycbb35hgjq23yi151imdxyv80493vy4w"; depends=[dplyr]; };
   platetools = derive2 { name="platetools"; version="0.1.3"; sha256="1c0bxgfa31sgb6mg8nnqx6pp18262walar1lxcg2dpjhzqlgzn0c"; depends=[ggplot2 RColorBrewer]; };
   plde = derive2 { name="plde"; version="0.1.2"; sha256="1g1b1sgyfxgfkjcr3sdkan8jd6r7yyi0izc83vyj11bdk08jx22h"; depends=[]; };
-  pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; };
+  pleiades = derive2 { name="pleiades"; version="0.3.0"; sha256="17lg0yr5mfz5wky7lia1gkq15805p3zsy444cf477spz2rb06zgc"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; };
   pleio = derive2 { name="pleio"; version="1.6"; sha256="0av1sl0fdn2ia7ddalbvidhcnsvs36iq618s1bknjw29y5yyq020"; depends=[Matrix rms]; };
-  plethem = derive2 { name="plethem"; version="1.0.1"; sha256="14yphprg34szwhwg7ksh1zmyskrcx8qqd4ycqxl4fy6l8cr3y0fg"; depends=[data_table deSolve devtools doParallel dplyr DT foreach formatR gdata ggplot2 httk magrittr miniUI NonCompart plotly pracma readxl reshape2 rhandsontable RSQLite rstudioapi shiny shinyBS shinybusy shinydashboard shinyjs shinythemes shinyWidgets sqldf stringr truncdist V8]; };
+  plethem = derive2 { name="plethem"; version="1.1.0"; sha256="03pa7vsiah5sic0gzb61ipc3166qfjrx0yjzwd448l1qvm2vl1qa"; depends=[data_table deSolve devEMF devtools DiagrammeR DiagrammeRsvg doParallel dplyr DT foreach formatR gdata ggplot2 httk magrittr miniUI NonCompart officer plotly pracma readxl reshape2 rhandsontable RSQLite rstudioapi rsvg shiny shinyalert shinyBS shinybusy shinydashboard shinyFiles shinyjs shinythemes shinyWidgets sqldf stringr tidyr truncdist V8]; };
+  plfMA = derive2 { name="plfMA"; version="1.0.5"; sha256="13hs06n4b28vlik9bzqdx6j85q05bsd6hb10cr39581a3m33rv5m"; depends=[cairoDevice gWidgets2 gWidgets2RGtk2 limma RGtk2]; };
   plfm = derive2 { name="plfm"; version="2.2.2"; sha256="1jgf3jrkdpsf77i4lf68s6sxax95c9is4nryhnzanq9i5f23j24v"; depends=[abind sfsmisc]; };
   plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
   plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; };
   plinkFile = derive2 { name="plinkFile"; version="0.1.0"; sha256="0803hp822v9rqh4h437q2nmab19yamc4dbyi6iimm67ykp0d5xss"; depends=[]; };
   plinkQC = derive2 { name="plinkQC"; version="0.3.2"; sha256="1dmx2r5d77nhma5xdy4i7jj2hjqhaz0hxj5ym70v0ac907vpy9zb"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel igraph optparse R_utils sys UpSetR]; };
-  plm = derive2 { name="plm"; version="2.2-3"; sha256="10bwd5xpim12038bxs8bmlaf33smlqy5f0cn7p3j6ipfygdwryld"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; };
+  plm = derive2 { name="plm"; version="2.2-5"; sha256="00s4jhida9chzbnl6fdbaw29w7xyc7hnm5wkqm0hlrhdjkqp2g8m"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-2"; sha256="03jjmfr1dwz6p652y917g9rv2alyam9ws6xh9ig02d3w78b0rsv9"; depends=[]; };
   plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; };
-  plot_matrix = derive2 { name="plot.matrix"; version="1.4"; sha256="0szrh83fc7x9kcz9caj3pwqrgrlq718v28j63j2mi2bvxbc8406l"; depends=[]; };
+  plot_matrix = derive2 { name="plot.matrix"; version="1.5.2"; sha256="02srx9a3xyfdm66305s9nafpzcah2ixaiw8hzw86bw2jd5d4rzrl"; depends=[]; };
   plot3D = derive2 { name="plot3D"; version="1.3"; sha256="1jfzndnlci9a975qbcv66jiy2l46hs3f2049654x4jp3i4kyrr5r"; depends=[misc3d]; };
   plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; };
-  plot3logit = derive2 { name="plot3logit"; version="2.2.0"; sha256="079pandh3kcw2fp5ih1rmksfs64aznw080s86ida8l4jfb0rvb6l"; depends=[dplyr ellipse forcats generics ggplot2 ggtern lifecycle magrittr purrr Rdpack Ternary tibble tidyr tidyselect]; };
+  plot3logit = derive2 { name="plot3logit"; version="3.0.0"; sha256="1g8q32lff1cghjsfkcv8rmahilwy9amrlyn7xwzq5lcxpmzkvmq9"; depends=[dplyr ellipse forcats generics ggplot2 ggtern lifecycle magrittr purrr Rdpack stringr Ternary tibble tidyr tidyselect]; };
   plotGMM = derive2 { name="plotGMM"; version="0.2.2"; sha256="1cgjajw3dprdlq9ri0gllbxcy33x311mbp9xdds8fgq6cs42ggyb"; depends=[amerika ggplot2 wesanderson]; };
   plotKML = derive2 { name="plotKML"; version="0.6-1"; sha256="1k5bfajgzcj912ja8s3ashsvfqz0sx10746x4ggyknyp17qrlbzw"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
-  plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
+  plotMCMC = derive2 { name="plotMCMC"; version="2.0.1"; sha256="0vxw6kbs1xvzi3sklxac9q1j4cbr8alr9c8fwifwyvpzpdk48ihf"; depends=[coda gplots lattice]; };
   plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; };
   plotROC = derive2 { name="plotROC"; version="2.2.1"; sha256="0bk8j2lp80zcz4kkig1y5a1ig8vbjh7b4inzc46bn07ns1rdjgzg"; depends=[ggplot2 gridSVG plyr rlang shiny]; };
   plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
-  plotdap = derive2 { name="plotdap"; version="0.0.7"; sha256="1zwf4s2myw20klbc0jnfrbg0hll9528m8vcxnc419nsgm3m2nskb"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; };
+  plotdap = derive2 { name="plotdap"; version="0.0.9"; sha256="1jzdlklnl1q32iyspky8k94rgm15nsm4p270q829ljqzq0c7z8z1"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; };
   plotfunctions = derive2 { name="plotfunctions"; version="1.4"; sha256="0asmxw8283fpvl83h478j5nyg59xqifqaa8f2f6l199gvvswhhg2"; depends=[]; };
   plothelper = derive2 { name="plothelper"; version="0.1.9"; sha256="1ibznjqs4gpbq1vx79gg0fkm842xfqgpmmgqji2m6s712j3bdn5k"; depends=[farver ggfittext ggplot2 gridExtra magick plyr scales]; };
   plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
-  plotly = derive2 { name="plotly"; version="4.9.2.1"; sha256="1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; };
+  plotly = derive2 { name="plotly"; version="4.9.2.2"; sha256="09zl4i8q917x4hwgyjcxpwmj11dc6zlq3dz0268lzl33jvjw94lw"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; };
   plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; };
   plotmm = derive2 { name="plotmm"; version="0.1.0"; sha256="01mi9znl471myq1yhfr8kdxpy0l67wgb3fid8gf2rzj5ph72b8hp"; depends=[amerika dplyr ggplot2 patchwork wesanderson]; };
-  plotmo = derive2 { name="plotmo"; version="3.5.7"; sha256="135k643vf2np0y20zrhfy4id1bjg7bi285csg5fzvarwlr4nldma"; depends=[Formula plotrix TeachingDemos]; };
+  plotmo = derive2 { name="plotmo"; version="3.6.0"; sha256="1qs1q98cfaqy59dp4hhwnvwlkc4kzd03qp7aprl2hm7r8b2gqnn0"; depends=[Formula plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
   plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; };
   plotrix = derive2 { name="plotrix"; version="3.7-8"; sha256="104llmr6dvlcnfpmd8zbdlv63k79djc4qqgadjavj4v4cmz1zkcc"; depends=[]; };
@@ -12274,13 +12791,13 @@ in with self; {
   plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
   plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; };
   plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; };
-  plsmod = derive2 { name="plsmod"; version="0.0.1"; sha256="16yc8ydkc054is0f17nly4kwakfh410i3hqwas0479v1qywcszxb"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; };
+  plsmod = derive2 { name="plsmod"; version="0.1.1"; sha256="0jkwmr6lgy2kdxpypzks6fcqxgrgzji5navmbip2qrgnk2c0vfjk"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; };
   plsmselect = derive2 { name="plsmselect"; version="0.2.0"; sha256="044mwdqv5vw0apmx3yhn6xkdmw6baalvb8c6hhmawcs279kwi1m9"; depends=[dplyr glmnet mgcv survival]; };
   plsr = derive2 { name="plsr"; version="0.0.1"; sha256="0l413m49zjpb35v0zw8dlxn53nh7fghinbmwfmldl3jgdvay2s7x"; depends=[boot ggplot2 reshape2 shiny]; };
   pltesim = derive2 { name="pltesim"; version="1.0"; sha256="0mvqp8di2gwhd9wc9kvnnpxd3hkr9b9lj6g5qlkqcbrgkq6fjahs"; depends=[coreSim ggplot2]; };
-  plu = derive2 { name="plu"; version="0.1.0"; sha256="0k46in8x70dxipcll0mjadqbzgg30s6x8xg4kb6ldh2lqbkqpgss"; depends=[]; };
+  plu = derive2 { name="plu"; version="0.1.1"; sha256="1ri3665kvflpfnjnx8zicjyw1aliy4kdfv97xj5g041j3bii88lh"; depends=[]; };
   plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
-  plumber = derive2 { name="plumber"; version="0.4.6"; sha256="1c5pryslly2ibbfc65qlavbnnaksp3p18xr1cghwbw00kz4ig147"; depends=[crayon httpuv jsonlite R6 stringi]; };
+  plumber = derive2 { name="plumber"; version="1.0.0"; sha256="07hz7qm74p6703qm4xqr239ndbv9xyms13h1rsag2d853kki0r8h"; depends=[crayon httpuv jsonlite lifecycle magrittr mime promises R6 sodium stringi swagger webutils]; };
   plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
   pluralize = derive2 { name="pluralize"; version="0.2.0"; sha256="1s3jp41j8c03qb5zisj6m12ky7cz3n71d6p5apz0r0yn35inrhah"; depends=[V8]; };
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
@@ -12292,50 +12809,55 @@ in with self; {
   pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
   pmd = derive2 { name="pmd"; version="0.1.9"; sha256="1bwanvxlh4jayr86rs3kpif9m7zqj09w11h7j0pl2mgzxglb4fms"; depends=[enviGCMS igraph RColorBrewer]; };
   pmdplyr = derive2 { name="pmdplyr"; version="0.3.3"; sha256="1grnqqydi84hnig1522lv4xbh9ds32wnq7sha7jn1q4186wlz1qa"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; };
+  pmetar = derive2 { name="pmetar"; version="0.2.7.0"; sha256="1madn5bw4cxsjrz2v39jyp3vj5y7fyi5i6rzgxwp6fg4ydfn233n"; depends=[dplyr lubridate magrittr RCurl stringr tidyr]; };
   pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; };
+  pmlbr = derive2 { name="pmlbr"; version="0.2.0"; sha256="1f0i52ws8ywkz4c0s3ax3qa3qinqhv1k9qlghkama3b027zkl9zn"; depends=[FNN]; };
   pmml = derive2 { name="pmml"; version="2.3.1"; sha256="1qsrpbmwgmq9s45f30657cpfzkrvva8h1hqq1g3fd69p5g735rwp"; depends=[stringr XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; };
   pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
   pmsampsize = derive2 { name="pmsampsize"; version="1.0.3"; sha256="0i6yqxdrjlwdaghh9lzivqrszy6zfs06kjdfn88yyizy5d7z2k4s"; depends=[]; };
   pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; };
-  pmxTools = derive2 { name="pmxTools"; version="1.0"; sha256="02qv455jysnf218zsa494x1hwlsymil9p1ysdmhx26wdja6dwb6m"; depends=[chron ggplot2 ggrepel gridExtra MASS stringr XML]; };
+  pmwg = derive2 { name="pmwg"; version="0.1.9"; sha256="0ilv7spwd4l44aa66yc346swns9aprmxxx9p3zpgr6kdn8p0ncaz"; depends=[coda condMVNorm MASS MCMCpack mvtnorm]; };
+  pmxTools = derive2 { name="pmxTools"; version="1.2.1"; sha256="0r5y09ab6k31d7fbd5pn8lzaafq1ix2lrjci1bsvg0wwcxmdipw6"; depends=[chron data_tree DiagrammeR dplyr ggplot2 ggrepel gridExtra magrittr MASS stringr xml2]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
   poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
+  pocketapi = derive2 { name="pocketapi"; version="0.1"; sha256="0n4fyx4ldm14zy3pz7gygwhahi3p25misvxlmy8l9kqqr51fg26a"; depends=[dplyr glue httr jsonlite magrittr purrr tibble usethis]; };
   pocrm = derive2 { name="pocrm"; version="0.12"; sha256="0ilh19vqy3lqnb4j6jw61az39swmca8za3ig3k1cjc9gwdyn1f8r"; depends=[dfcrm nnet]; };
+  podr = derive2 { name="podr"; version="0.0.5"; sha256="135nq0dw1x6ngf6mxy3yds3xsxhaf5rnv1cmhavlrklhdfygc0a4"; depends=[assertthat DBI dplyr lubridate magrittr odbc plogr RPostgres rstudioapi shiny stringr tibble]; };
   pogit = derive2 { name="pogit"; version="1.2.0"; sha256="1kap1cpfp0k2vm7w4kjfja37n9z3j7ppiwvsdxl6bgpkf7kcnkp2"; depends=[ggplot2 logistf plyr]; };
   poibin = derive2 { name="poibin"; version="1.5"; sha256="1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"; depends=[]; };
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
   pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
-  pointblank = derive2 { name="pointblank"; version="0.5.0"; sha256="1h6qmzglpxa7qy5vwdjysmjizszg6nqscq7ps4gb5808k7r0xb5b"; depends=[base64enc blastula cli DBI dbplyr digest dplyr fs ggforce ggplot2 glue gt htmltools knitr log4r magrittr rlang scales testthat tibble tidyselect yaml]; };
-  pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; };
+  pointblank = derive2 { name="pointblank"; version="0.6.0"; sha256="07hafgzyfg9r5xp9pilc9zdnk214db8ixv1ghspmrsprb9cr6qv8"; depends=[base64enc blastula cli DBI dbplyr digest dplyr fs ggforce ggplot2 glue gt htmltools knitr log4r magrittr rlang scales testthat tibble tidyselect yaml]; };
+  pointdensityP = derive2 { name="pointdensityP"; version="0.3.5"; sha256="0n7p3b77m47avbr7n85knf31m9rlp43mdl3748ysj6wvxvhnivx4"; depends=[data_table]; };
   pointr = derive2 { name="pointr"; version="0.1.0"; sha256="0gdzm80r7jdwg1lv8qh902kqpqbz5b38w8lg3b9qr9k9wbir1cl9"; depends=[stringr]; };
   poio = derive2 { name="poio"; version="0.0-4"; sha256="12d47hn9rsx2n0fl107dpswfklnh8nkm0kspcxf7yfljayvxr474"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr purrr R6 stringi tibble whoami]; };
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
   poisFErobust = derive2 { name="poisFErobust"; version="2.0.0"; sha256="1i6y3745i385y3r45i0xk7ciw1k6brmn709k5qhx8xphq0k4an5n"; depends=[data_table glmmML]; };
   poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; };
-  poismf = derive2 { name="poismf"; version="0.2.3"; sha256="1jkds8ywvph4v27b2jxid2z5100bps6vjxa6w91w3342b8x9s293"; depends=[Matrix]; };
+  poismf = derive2 { name="poismf"; version="0.2.6"; sha256="04fs4yl7zl3hr8qjzmn7kldkfgqak38x2ryjx1byxv0q5rf5m27f"; depends=[Matrix]; };
   poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; };
   poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
   poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; };
-  poissonreg = derive2 { name="poissonreg"; version="0.0.1"; sha256="04qika4k0hak8kp6z4jqdzslymy7wklw4bx6kcmz3932avlwyym9"; depends=[dplyr glue parsnip purrr rlang tibble tidyr]; };
+  poissonreg = derive2 { name="poissonreg"; version="0.1.0"; sha256="0s907j8s1s78944ik2r0qpppj1q58crkz73c9jyalkbd169578fx"; depends=[dplyr glue parsnip purrr rlang tibble tidyr]; };
   poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
   poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; };
-  polAr = derive2 { name="polAr"; version="0.1.3"; sha256="1m32kylb8klv8znfkzdapjvwn7p73mc18q0r7xc21vqbbjqaad8f"; depends=[assertthat attempt curl dplyr DT forcats formattable geofacet ggplot2 ggthemes glue gt magrittr purrr RColorBrewer readr rlang rvest scales stringr tibble tidyr xml2]; };
+  polAr = derive2 { name="polAr"; version="0.2.0"; sha256="0xk8bnb381k3x93wp29rfzb4iwvp3bkn9zfw82cbwynkfc0vyv4c"; depends=[assertthat attempt cowplot curl dplyr DT forcats formattable geofacet ggparliament ggplot2 ggtext ggthemes glue gt jsonlite lubridate magrittr purrr RColorBrewer readr rlang rvest scales sf stringr tibble tidyr wordcloud2 xml2]; };
   polaroid = derive2 { name="polaroid"; version="0.0.1"; sha256="0m3jbiz4n7mgbbdkd28m6dqsclyjcgshpxd6ws8df7zchx7fch07"; depends=[argonDash argonR colourpicker ggplot2 hexSticker png shiny shinyWidgets]; };
-  policytree = derive2 { name="policytree"; version="1.0.1"; sha256="0nsfspy0pvw0yfwkhd5c5wz7jr2iv12d6m3bw5ff9v2sbhd93piw"; depends=[BH grf Rcpp]; };
+  policytree = derive2 { name="policytree"; version="1.0.3"; sha256="1vwsimk3kirk7wlwc7b885fflbg9czzjxr4f8h20vhcm8mcz8ay8"; depends=[BH grf Rcpp]; };
   poliscidata = derive2 { name="poliscidata"; version="2.3.0"; sha256="1ywfhksc6gcc2xk5lp6s8nn4wib92sv7p3wq92dzabf75q6mscix"; depends=[abind car descr gplots Hmisc plotrix plyr survey weights xtable]; };
-  polished = derive2 { name="polished"; version="0.1.0"; sha256="0sibgvhws0z9jlaxvdsfgc8yz6b8p83fcf4aj1ysa2ghjf7pw9c9"; depends=[apexcharter digest dplyr DT htmltools htmlwidgets httr jose jsonlite lubridate purrr R6 rlang shiny shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid xts]; };
+  polished = derive2 { name="polished"; version="0.2.0"; sha256="1850is9rv08wad5rh8i0pqiwdaqx82pmificmzrk8ysirddildpn"; depends=[digest dplyr DT htmltools httr jose jsonlite lubridate purrr R6 rlang shiny shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid]; };
   polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; };
-  politeness = derive2 { name="politeness"; version="0.6.1"; sha256="06nq7pibz4q8pfg6lmrjyx5hfq8g9lmnjnqin9dpkag8wwm71b8y"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; };
+  politeness = derive2 { name="politeness"; version="0.7.5"; sha256="0j9rnms23gqymv6q1il7d2d7pmglj0g3i4dbq7d6jdwxh8y5dp11"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; };
   politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; };
   pollen = derive2 { name="pollen"; version="0.72.0"; sha256="0plxc7rys5q4c1dwammv3b2pnys1hdh5ic0b2ndmv5cbyspf2h0y"; depends=[dplyr lubridate purrr]; };
   pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; };
   pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; };
-  pollster = derive2 { name="pollster"; version="0.1.2"; sha256="03wfd9j8cyfbpjp9nphyvkn0csriymcidllb6s8744bb1s7vb9hv"; depends=[dplyr forcats labelled rlang stringr tidyr]; };
-  polmineR = derive2 { name="polmineR"; version="0.8.4"; sha256="0b72m381flrdjfdc3qk9kkf1yfxpnr15qqn7ghl930n4457qanm1"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply RcppCWB slam stringi tm xml2]; };
+  pollster = derive2 { name="pollster"; version="0.1.3"; sha256="1b5m5g9v8xbs3zz6as4xvzwaqr39477adi4vzxmjvxjsaij6ih5h"; depends=[dplyr forcats labelled rlang stringr tidyr]; };
+  polmineR = derive2 { name="polmineR"; version="0.8.5"; sha256="1jb6j0rmcwzszympzfia8vml55fw2rybj2qcv3f54v3cr9hw13ga"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply RcppCWB slam stringi tm xml2]; };
   polspline = derive2 { name="polspline"; version="1.1.19"; sha256="0rhzf735hmbqfn2xbgcln4sqx7m9far72g5gq9mghgkw016kqglm"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.7.1"; sha256="0ln1n5w64vgq63gm4mm9wzl9lbp7ppgaxg0ba0yw0xsr5cmkyp37"; depends=[sp]; };
   polyMatrix = derive2 { name="polyMatrix"; version="0.3.1"; sha256="0k62cidsmryg64vbs1ar24m1dknxpddzqvdxbyk3n85r9cx3sqcv"; depends=[MTS polynom]; };
@@ -12350,23 +12872,24 @@ in with self; {
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
   polyglot = derive2 { name="polyglot"; version="0.3.0"; sha256="1mmmdqaq882qys41lmm009ncg9s9h5x1q8psv0v3pwpar0d7vgff"; depends=[magick pins]; };
   polylabelr = derive2 { name="polylabelr"; version="0.2.0"; sha256="01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"; depends=[Rcpp]; };
-  polymapR = derive2 { name="polymapR"; version="1.1.0"; sha256="01yvp5xsbwya63rjrcirplfvryk14yzap6nxf24qfcw93hm3rl81"; depends=[doParallel foreach igraph knitr MDSMap]; };
+  polymapR = derive2 { name="polymapR"; version="1.1.1"; sha256="058xx8h660kckd7xcwv6i60dfjbhcid6kqhbckq5s37d549givbx"; depends=[doParallel foreach igraph knitr MDSMap]; };
   polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; };
   polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; };
+  polyqtlR = derive2 { name="polyqtlR"; version="0.0.4"; sha256="1ac1pr11b5aaa2f1kw7qxh4ikx2wwb477sm20rpppjqzkfzsi6hj"; depends=[abind doParallel foreach Hmisc knitr nlme RColorBrewer Rcpp RcppArmadillo reshape2 rmarkdown]; };
   polyreg = derive2 { name="polyreg"; version="0.6.7"; sha256="1znl46m4zfd0f4qwg3r2anz3nyn8hk607772pzxiwj5w3xc96g56"; depends=[dummies nnet partools regtools RSpectra]; };
   polysat = derive2 { name="polysat"; version="1.7-4"; sha256="08jmkik4s2171znp3w4i0v0g0k2s0di3xqwr9sf9hyd0sf8af8dp"; depends=[Rcpp]; };
   polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
   pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
   pomdp = derive2 { name="pomdp"; version="0.99.0"; sha256="0plqmxzq46vgyg7365rp1m36ih5lll1kmj195iycwvsa1qaadw92"; depends=[igraph Ternary visNetwork]; };
-  pomp = derive2 { name="pomp"; version="3.1"; sha256="07811rg0ixp7b7wqrhw6bm670s4s84cf7i43l5icfjqnq4xjldib"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; };
+  pomp = derive2 { name="pomp"; version="3.2"; sha256="0lnw7i35z5k0p5r4nm8xx2iszvrv21q7cp3wav45r6vg7via708j"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; };
   pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; };
   pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
-  pool = derive2 { name="pool"; version="0.1.4.3"; sha256="065pbvhgvvgv00df4kj4zn7mlbrv2iqa1583k0hlgavn15gfm6d2"; depends=[DBI dbplyr dplyr later R6]; };
+  pool = derive2 { name="pool"; version="0.1.5"; sha256="0h3mnz6211q16jw8bv8w9948x45wy12w1dsxn97cc4y841qa5hp5"; depends=[DBI later R6]; };
   poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; };
-  poolfstat = derive2 { name="poolfstat"; version="1.1.1"; sha256="12iwhfj1a87mbis7whgp4z3qg97xkj90rw8b9jsqnfmzhz6fn0yp"; depends=[doParallel foreach]; };
+  poolfstat = derive2 { name="poolfstat"; version="1.2.0"; sha256="064arw174kn919qv5bvfyiva0gc21rx163yabrrnli3fkpvaf57q"; depends=[doParallel foreach Rcpp]; };
   pooling = derive2 { name="pooling"; version="1.1.2"; sha256="19mrzax3k35fhgjpnlrigf0nscsdl3xb7k82s5q472k4bcz7ya5b"; depends=[cubature data_table dplyr dvmisc ggplot2 ggrepel mvtnorm numDeriv]; };
   poolr = derive2 { name="poolr"; version="0.8-2"; sha256="1rkfnrz5x7f9kqpivj0gvs3fxfb9agnm8sybb7wmvvcsmshzrpkf"; depends=[Matrix]; };
-  poorman = derive2 { name="poorman"; version="0.2.1"; sha256="0amrhjxld49p3mhlp10ym5pljw8gxamw2drvq8qrpwdzd3687z4w"; depends=[]; };
+  poorman = derive2 { name="poorman"; version="0.2.4"; sha256="12s1pw1cy60hha3cspzxra8xw70wfwa2827yg2sy4jpn81xnacc8"; depends=[]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; };
   popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
@@ -12375,34 +12898,38 @@ in with self; {
   popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; };
   popgenr = derive2 { name="popgenr"; version="0.1"; sha256="1lidddf8p1z4bja9dabzmak6rzfyqwch046h79yc96c11rv36l4j"; depends=[]; };
   popkin = derive2 { name="popkin"; version="1.3.0"; sha256="1gr2glyavvf2r89zwiama3qhmq32rdzjsqkhv70afmsapk6f4dhr"; depends=[RColorBrewer Rcpp RcppEigen]; };
-  poplite = derive2 { name="poplite"; version="0.99.23"; sha256="0kf5k4iz4cvzd3avq753jn1gkpnhzi9m4148lq7rgv7h433qydwn"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; };
   poppr = derive2 { name="poppr"; version="2.8.6"; sha256="0c1blca4bcimqpsfl9xrdwhmyxrasg8yb7xgrwl4hk8f3av3i25l"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat progressr rlang shiny vegan]; };
   popprxl = derive2 { name="popprxl"; version="0.1.4"; sha256="076aia4qbq5yw2nxafq2ys5n5c7wv77i8k1nmzb3all193vjf203"; depends=[poppr readxl]; };
-  popsom = derive2 { name="popsom"; version="4.3.0"; sha256="144h04mrj86z7cb7bbk4zg7bg1l4vvpi1sc0f6968lgcr8swfips"; depends=[class fields ggplot2 som]; };
+  popsom = derive2 { name="popsom"; version="5.0"; sha256="0598qzqn1yws96628azn3q56804vlwq6b28ydfrr3pf5nds71krd"; depends=[fields ggplot2 hash]; };
   poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; };
   populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; };
   porridge = derive2 { name="porridge"; version="0.1.0"; sha256="1c71bgq868gw4a8xsfj0qbvcw9bnm6vvbrsbzr31r30fbixjy2j6"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; };
+  portalr = derive2 { name="portalr"; version="0.3.6"; sha256="1zvhnwayib78sjvldl1ydafj0f9k0nzhq1gamfaki45vhn7hpasf"; depends=[clipr clisymbols crayon dplyr forecast gh httr lubridate lunar magrittr rlang tidyr tidyselect zoo]; };
+  portes = derive2 { name="portes"; version="5.0"; sha256="1iarvgz23979lipqyyvh8h0nd978p1nzbbjf020q11yqpl863502"; depends=[forecast]; };
   portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; };
   portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.2.2"; sha256="095f84d448dwh9ycp64ngn1pfm72n2b8d61w2vyd6mk3gh24361i"; depends=[digest doSNOW evaluate foreach ggplot2 PerformanceAnalytics quadprog quantmod R_utils rlang snow xts zoo]; };
   portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; };
   postDoubleR = derive2 { name="postDoubleR"; version="1.4.12"; sha256="19z8wisi16g7a78gw16r72dkxh3x5qh888qz260ih5naq0p8vy71"; depends=[doParallel ggplot2 glmnet grf neuralnet progress]; };
   postGIStools = derive2 { name="postGIStools"; version="0.2.4"; sha256="04d6iqnk7j2lgv1h5c94j6y89jk75pmv26sxa51s5iwkjq7rchym"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
   postHoc = derive2 { name="postHoc"; version="0.1.3"; sha256="1l7r9md9iyav5vvjykpsnqv9whspzcmnppfpqm6qy5s5vk6b8zfd"; depends=[igraph multcomp]; };
+  postcards = derive2 { name="postcards"; version="0.1.0"; sha256="0y1hvjwf85hiaffqwv8pk9yyazn01ch311c84nd5qr5f39cm4l4v"; depends=[rmarkdown]; };
   posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; };
   postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; };
   postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; };
   postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; };
+  postpack = derive2 { name="postpack"; version="0.5.2"; sha256="1iwy7yx60aqpm5jjvjsx15kcc44mzx5qij3gwx8kb1hc4bys4wka"; depends=[abind coda matrixcalc mcmcse stringr]; };
+  potential = derive2 { name="potential"; version="0.1.0"; sha256="0j7l60j8x59l28223f3m3cdifd9hvcpsmfz6aharcygmpha77i8p"; depends=[doParallel foreach isoband sf]; };
   potts = derive2 { name="potts"; version="0.5-9"; sha256="1kiha209w9nyyx4qqsdp51q2y7ny67nzqkdanlrh2106lcab3hj8"; depends=[]; };
-  pould = derive2 { name="pould"; version="1.0.0"; sha256="03338c61njhrb1dyxndyci1kdalzc38h0l7a1majv8nf82k40l62"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; };
+  pould = derive2 { name="pould"; version="1.0.1"; sha256="0hr6j08whbc1jydz20rg0cphfiwx4pyrav49w9qs9dkcaqrpid7l"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; };
   povcalnetR = derive2 { name="povcalnetR"; version="0.1.1"; sha256="0ah6n3wpjiwyh0mancqqpvyknx25dxr13p0nqnrfzmhfwyaywar0"; depends=[dplyr httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; };
-  powdR = derive2 { name="powdR"; version="1.2.2"; sha256="16zcywsqi25fjw01khqsx2lsm3zrgqi0jyc38b6n3yaw7p0x7n31"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; };
+  powdR = derive2 { name="powdR"; version="1.2.4"; sha256="177gzp60fvx0sk4a2vhpi37785qwn8gb6s2h9i8abys6z2qmlmg0"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; };
   powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; };
   poweRlaw = derive2 { name="poweRlaw"; version="0.70.6"; sha256="14d1myxllvm1grnfiszzzxaiqpb2jpmsi19wq70r8r2wki293h7g"; depends=[pracma]; };
   powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; };
   powerCompRisk = derive2 { name="powerCompRisk"; version="1.0.1"; sha256="11xprjn9hzi8gxrsi7wivwgchg9h2apgxa63fp466ngjfy5ybxf4"; depends=[mvtnorm]; };
-  powerEQTL = derive2 { name="powerEQTL"; version="0.1.7"; sha256="1hbj1s02cybcshxlflv0icx6g4528i40kk106cd3id0g6hmdmvrz"; depends=[powerMediation]; };
+  powerEQTL = derive2 { name="powerEQTL"; version="0.2.2"; sha256="0n36hclwqphc5fjyj9adah25w2x0mc1fg2k7480xwmrcx5d6h47y"; depends=[]; };
   powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; };
-  powerLATE = derive2 { name="powerLATE"; version="0.1.0"; sha256="16hllyrigsp2zfiklx8lnh63kbidlyycza19iz94y5f8gwx3hrg2"; depends=[]; };
+  powerLATE = derive2 { name="powerLATE"; version="0.1.1"; sha256="1dmvvh7ynvr8krl5p1qbg8ib1s595vqci2r80zmwsm28jhv8ka4w"; depends=[]; };
   powerMediation = derive2 { name="powerMediation"; version="0.3.2"; sha256="06liw58hwvd5n55axwldrngwfqckmi5yh2i9b2c75cghqdnihvby"; depends=[]; };
   powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; };
   powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; };
@@ -12416,13 +12943,15 @@ in with self; {
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
   ppgam = derive2 { name="ppgam"; version="1.0.1"; sha256="0w2jci5k0y8m7rapj8w6xq849y59m7y4fp9n3f5l6q954mbc6bv0"; depends=[evgam MASS mgcv]; };
   ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; };
-  ppitables = derive2 { name="ppitables"; version="0.5.2"; sha256="1fwl2mscnfkbdpdjb0vkyv6xrbi73rfkxlbpri35hfqscaxlzk98"; depends=[tibble tidyr]; };
+  ppitables = derive2 { name="ppitables"; version="0.5.4"; sha256="0hssk8yf8f15x7m03x71v9yrshrzgkww8xfacbbsw5mpqcghc9zl"; depends=[tibble tidyr]; };
   ppmHR = derive2 { name="ppmHR"; version="1.0"; sha256="1fc9rrk3ir3dq5d518ih67dvknhz1ln6668wy2mzsdndaysgm12g"; depends=[nleqslv]; };
+  ppmSuite = derive2 { name="ppmSuite"; version="0.1.1"; sha256="0n26nfx5wkyrqvrdl4swvxb3pp4cr8kci7inkikwq7pssxgzlfpj"; depends=[]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
   pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
   ppsbm = derive2 { name="ppsbm"; version="0.2.2"; sha256="0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4"; depends=[clue gtools Rfast]; };
   pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
   prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
+  prWarp = derive2 { name="prWarp"; version="1.0.0"; sha256="1rx9yby7xwa2bgqa6a1zllan6qfchgfrg2waadmwfmjhcp8qb1mj"; depends=[Morpho]; };
   prabclus = derive2 { name="prabclus"; version="2.3-2"; sha256="0hg4d7y1w18jpgvw10z8833bbbcnlkwiasx0wh6iwa2pnnybq8gl"; depends=[MASS mclust]; };
   pracma = derive2 { name="pracma"; version="2.2.9"; sha256="07mzhzz73wsjjw1q05l024gcd13hwnzsxf873q9dyhw6x3shzshc"; depends=[]; };
   pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
@@ -12430,15 +12959,14 @@ in with self; {
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
   praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
   praznik = derive2 { name="praznik"; version="8.0.0"; sha256="037lcic87b6136b5fi9g557idd3rvglw995b94xadcdaqcpy906z"; depends=[]; };
-  prc = derive2 { name="prc"; version="2019.1-23"; sha256="1aw02sj7kkzzkrxs1jpm2skfz2jrd7fyqlfc1mvkqwac39c6a9ma"; depends=[kyotil nlme]; };
   prcbench = derive2 { name="prcbench"; version="0.8.2"; sha256="1b8dmahkymbnf3xxaprzkpizpibnyhjynv352qf4c7l5gvg0d7nq"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; };
   prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; };
   prcr = derive2 { name="prcr"; version="0.2.1"; sha256="0k5vl14akqf8qvak6h7a19qxn4wzpyxq7lyvdhxfh8l4gs4ca2l6"; depends=[class dplyr forcats ggplot2 irr lpSolve magrittr purrr tibble tidyr]; };
   pre = derive2 { name="pre"; version="1.0.0"; sha256="07iai8vkxmx0dhnqy28gwh1hwc2iqg7bb0mwm8c68qpp8ffxwplm"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; };
-  precautionary = derive2 { name="precautionary"; version="0.1-2"; sha256="0fn8wapkvv5az0khj8gifs4b2hdvznsajqqnbisj2scdbk6p03hr"; depends=[data_table dplyr escalation kableExtra knitr magrittr rlang stringr]; };
+  precautionary = derive2 { name="precautionary"; version="0.2-0"; sha256="13gh1h6inqzhxz3jzq4fha1g4xpyljjk6a2ng5l1jbv3jrqhm53p"; depends=[data_table dplyr escalation kableExtra knitr magrittr rlang stringr]; };
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
   precisely = derive2 { name="precisely"; version="0.1.0"; sha256="0c44qwk1w1qic6iqkjv7sxd47x9x1ikjnvd2870izzklwv2yq2ly"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinycssloaders shinythemes tidyr]; };
-  precommit = derive2 { name="precommit"; version="0.1.2"; sha256="1p00f0mn9vgij9y4bf3ryd80wirf9brmxdv1njz19cv5vgcvgz0z"; depends=[docopt fs here magrittr purrr R_cache rlang rprojroot rstudioapi usethis withr yaml]; };
+  precommit = derive2 { name="precommit"; version="0.1.3"; sha256="1rmzz99wvjk0wv5csi4xmf2rc23dh3y3h3jwrd13mzs2ss5kjsq3"; depends=[docopt fs here magrittr purrr R_cache rlang rprojroot rstudioapi usethis withr yaml]; };
   precrec = derive2 { name="precrec"; version="0.11.2"; sha256="1j8k48sg49qrw7ib2sv96961nmyvc4a732x20qrvs3y65d8zl1m1"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
   predReliability = derive2 { name="predReliability"; version="0.1.0"; sha256="18s9ijg3fcg6qb0y6pnwngmv69ajm93z0xjdzkq3fp5bxk1qylyb"; depends=[cluster rpart]; };
   predhy = derive2 { name="predhy"; version="0.2.0"; sha256="0l3x9ivrlb43x3qbrpw5gjyfc3n3b4bbsav1r4hl96znypwi7j9f"; depends=[]; };
@@ -12446,23 +12974,25 @@ in with self; {
   prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
   predictmeans = derive2 { name="predictmeans"; version="1.0.4"; sha256="11282jzmlkbawsh1k4582a7yh4xxfh01sn6zp5nbdsr9c9p6vqfz"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; };
-  predictoR = derive2 { name="predictoR"; version="1.1.3"; sha256="18abvns6yi9vyrcgb1dfcnb4p1qvk7q3rg0vqc95fvhq604fcxj6"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet plyr randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; };
-  predictrace = derive2 { name="predictrace"; version="1.1.1"; sha256="1bcjp3y7n0ycnw9cfgkxzc0zmdv9zdadwi6i16hbnc52jrc0kfpk"; depends=[dplyr here tidyr]; };
+  predictoR = derive2 { name="predictoR"; version="1.1.4"; sha256="1ar1qv4w4a0sw9q1n27x8lqx4n2ipfrhsz9pnd90jxk8rgx7p4jg"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet plyr randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; };
+  predictrace = derive2 { name="predictrace"; version="1.2.1"; sha256="1lbqyhhc3bkbfypjaxl0a96rhb596xkbmlm0ip0f3z9g6jyxcl0a"; depends=[dplyr here tidyr]; };
   predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; };
   predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
   predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.1"; sha256="0f9fapw9yjdzj6pwcskbyfwjsvg09ahn20vrv4bgi0dx8am291rl"; depends=[caret forecast Metrics tseries TSPred]; };
   prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; };
-  preference = derive2 { name="preference"; version="1.1.3"; sha256="1m28hj0524mp08fqbrir1bm93i2slpc0rc6frkgvydrkr4sm7vzw"; depends=[ggplot2 tidyr]; };
+  preference = derive2 { name="preference"; version="1.1.6"; sha256="12gpiwd69ik4r2l67fvad0jmp78w919nhly4drxhfiizl3mw4jdn"; depends=[ggplot2 tidyr]; };
   prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; };
   prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; };
   prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; };
   preputils = derive2 { name="preputils"; version="1.0.3"; sha256="1ryrxmcm9vxhblk9r1vaay8ihff6nnd87dzd3375lfcla2fr9jzv"; depends=[data_table]; };
-  prereg = derive2 { name="prereg"; version="0.4.0"; sha256="1jhlgp7ajq6mx7gn4kf3b7wqzs3v0678pa1r6p4mgvvynic8rnqj"; depends=[rmarkdown]; };
+  prereg = derive2 { name="prereg"; version="0.5.0"; sha256="0bck13iiaxwpqh0rd45mp1s5d8z62ggg0wa7rmyi8a65aywiypsi"; depends=[rmarkdown]; };
   presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; };
   presentes = derive2 { name="presentes"; version="0.1.0"; sha256="0d6zhishc7wxcvvglgw44pc6c172qpxb8i4iw3lqbmji7ash5zpx"; depends=[]; };
   preseqR = derive2 { name="preseqR"; version="4.0.0"; sha256="1g2rnnmi45649vpy6z45v5i3wxm54s138ajqrzwi3a5r7x3xnhq1"; depends=[polynom]; };
+  presize = derive2 { name="presize"; version="0.1.3"; sha256="0sqaivllmiwn8qhii03xv1rnh7ddbvb1psif5ixdyfrc1z2ws0yv"; depends=[ggplot2 kappaSize shiny shinydashboard]; };
   presmTP = derive2 { name="presmTP"; version="1.1.0"; sha256="134p58zzk8i0whscvl5qdfn4niksypyxavq1m15cvw4zzk4dk6fw"; depends=[mgcv survPresmooth]; };
   presser = derive2 { name="presser"; version="1.1.0"; sha256="1slkdfh0wq242adp6a60612sjz117bii3pbahn00bfmnpa9g1wya"; depends=[]; };
+  prettifyAddins = derive2 { name="prettifyAddins"; version="2.0.3"; sha256="0kyvc1z5dykkrb4cnvlscjnm6xzzzsc2lg1bs012zw5x1qg5gp01"; depends=[httr rstudioapi shiny webdriver xml2 XRJulia]; };
   prettyB = derive2 { name="prettyB"; version="0.2.1"; sha256="1qpqr490bpvmj1ybjbh4lhiznqa0n3chn09m7bhn9wfm3ic56s0p"; depends=[]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.6"; sha256="0yjpwxdy9mkj2k33zvd5klyv4ava46i19yls87n0bvf79y90ikpy"; depends=[]; };
   prettyR = derive2 { name="prettyR"; version="2.2-3"; sha256="1rs90cmr5dyry724php90mp41qwzzk1z3gxfwcj1k157qawacyhr"; depends=[]; };
@@ -12470,26 +13000,26 @@ in with self; {
   prettydoc = derive2 { name="prettydoc"; version="0.4.0"; sha256="0c2kxc60z9mz1wk04mdz64j3bfk0s7n6h9fjf82f31vyfmh74ikz"; depends=[rmarkdown]; };
   prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; depends=[digest httr plyr rjson]; };
   prettyunits = derive2 { name="prettyunits"; version="1.1.1"; sha256="1ibmzgknw5896q2i6r59jz2izblxwgb29ivvjzx50pkd1jl9l6cs"; depends=[]; };
-  prevR = derive2 { name="prevR"; version="3.4.0"; sha256="1y61ggqjf3b2a5f9zprbp9ylfkcfk0jiqfymkyqci9figsnahdy1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
+  prevR = derive2 { name="prevR"; version="3.4.1"; sha256="02qfyc5j7rgvwl7a5pr1l41jmgjxxsrc674xfm08hcydwda5clq1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
   prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
   prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; };
   prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; };
-  priceR = derive2 { name="priceR"; version="0.1.4"; sha256="1c0692gahf6zhyvj3wjjcw6ffl4w7cx3kbqgv6vj2wncrjdl4548"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr]; };
+  priceR = derive2 { name="priceR"; version="0.1.5"; sha256="0cky3l0ycyq42dmmipvd8dbnfcblnhnywbb8dvpma96jq76b4czv"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr]; };
   pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.1.1"; sha256="0zlvrzrqndnrwawwzqwpj7c7r86mb80njhv7dcm8l5qygnc4xz3b"; depends=[survey]; };
-  prim = derive2 { name="prim"; version="1.0.17"; sha256="037gfs6ibkk7rjv21vi2k5jx24plss0jsxkn12arvfg5p6xan08k"; depends=[misc3d rgl]; };
+  prim = derive2 { name="prim"; version="1.0.19"; sha256="1y09w4rad2x2lm6xzwb89cc2y3b274fl3d4l8w22dq3yphnaqsnx"; depends=[misc3d rgl scales]; };
   primePCA = derive2 { name="primePCA"; version="1.0"; sha256="0kpyqv3l58xcyd98a7c7ggsna30j6k62aliidlyxgv2ya0g0dshv"; depends=[MASS Matrix softImpute]; };
   primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; };
   primer = derive2 { name="primer"; version="1.1.1"; sha256="1hw7qd0xq3bvzk5ms9q568a3nkj3ws4jnzbmlypy8c5x3ly6pl1d"; depends=[deSolve lattice]; };
   primerTree = derive2 { name="primerTree"; version="1.0.5"; sha256="1ymj4y0a8pd0r15bsqilm03b2n0a633ibzzp2h0qkv880xqbikz4"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr RCurl reshape2 scales stringr XML]; };
-  primes = derive2 { name="primes"; version="1.0.0"; sha256="130awf214lwhjb4jpi05by35z2w18x4f6pzn3ics1scz82jvfm56"; depends=[Rcpp]; };
-  princurve = derive2 { name="princurve"; version="2.1.4"; sha256="1b3grra328wkfsmqkkwp3lwdzhbdiwyq380qi5pl9r2jc6arnppj"; depends=[Rcpp]; };
+  primes = derive2 { name="primes"; version="1.1.0"; sha256="0dy0pir88mblcm8g8mrgxs6fynayqgkcr4g40ghqincwzjd97xlv"; depends=[Rcpp]; };
+  princurve = derive2 { name="princurve"; version="2.1.5"; sha256="0ifjwdpvydhn60aya84f5j0ymsq427j89j9a3g8pbigk6qnxj0g5"; depends=[Rcpp]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; };
   prioGene = derive2 { name="prioGene"; version="1.0.1"; sha256="0k1rlvmfhj1m2zp5zaac8wcwjypd6f4dd8fxxsyrzsafp9aw189l"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  prioritizr = derive2 { name="prioritizr"; version="5.0.2"; sha256="1m7f974h0fi9xigf551wgwrb09p6laddhqxsllb72vqhjkp5bw5k"; depends=[ape assertthat BH data_table doParallel exactextractr fasterize igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sf sp tibble uuid]; };
+  prioritizr = derive2 { name="prioritizr"; version="5.0.3"; sha256="1syp4mk1jnsyx9qlygl6pnqwxz3lhq8gk18jk8hpfdqha7as9lcb"; depends=[ape assertthat BH data_table doParallel exactextractr fasterize igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sf sp tibble uuid withr]; };
   prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.4"; sha256="0027nbkvp8b2w4cciabiqjdyxhjwh47k7dc36p79mkqfarh04rgv"; depends=[raster sp]; };
-  prioritylasso = derive2 { name="prioritylasso"; version="0.2.3"; sha256="1hmf81vcri0sfaphc0221skpvb2gz0zvxlmlhv7k8rhs1pvnqi8g"; depends=[glmnet survival]; };
-  prism = derive2 { name="prism"; version="0.1.0"; sha256="0d2llrpw5y0svrdzbk52pjrfp76lknrw4r8ciqq0cq3l6kbynh9r"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; };
+  prioritylasso = derive2 { name="prioritylasso"; version="0.2.5"; sha256="1myci7akab1fg7p72q1hrchkixs7q5lagdsfpmdbvd13yy4q3h5z"; depends=[glmnet survival]; };
+  prism = derive2 { name="prism"; version="0.2.0"; sha256="0gl6qmpgfdxn90aw10z4xj4ijcwj9mr0s9ahm28niinr9y89gzxk"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; };
   prismadiagramR = derive2 { name="prismadiagramR"; version="1.0.0"; sha256="13x3y4rv9b2d013jd6853zkq8rbxq88wlffmdnjs1rca0fnfrn4f"; depends=[DiagrammeR dplyr]; };
   prismatic = derive2 { name="prismatic"; version="0.2.0"; sha256="0j077khvagzs9lxrryi4q1czk1129r93cqf1i1hiz0b3wij2bwsg"; depends=[farver]; };
   prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; };
@@ -12509,7 +13039,8 @@ in with self; {
   processcheckR = derive2 { name="processcheckR"; version="0.1.3"; sha256="14d8148zcnyh9ycqy5nyszrafq3mgck87w80kx2apg52gkdaq18g"; depends=[bupaR dplyr edeaR glue rlang stringr]; };
   processmapR = derive2 { name="processmapR"; version="0.3.4"; sha256="0kq940j8frmbal1nqxwv7wshkyv7y3vhax6zr0ngkf18xv73y76z"; depends=[BH bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms htmltools miniUI plotly purrr RColorBrewer Rcpp rlang scales shiny stringr tidyr]; };
   processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; };
-  processx = derive2 { name="processx"; version="3.4.3"; sha256="07dhzijqnj2zkm3qrk4ppsv8wscn8ysdsjbidlg9zrbj1wcg4izj"; depends=[ps R6]; };
+  processx = derive2 { name="processx"; version="3.4.5"; sha256="055v2gdrgqsfy8s672wsq79bqr44b4jjmcbqivx4p2d6lqx10s73"; depends=[ps R6]; };
+  procmaps = derive2 { name="procmaps"; version="0.0.3"; sha256="14vbrsj37hjraskqpagr56r3rax20zszs58yag2gwiib6da1wkpj"; depends=[]; };
   prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; };
   prodigenr = derive2 { name="prodigenr"; version="0.5.0"; sha256="1h15fwd4rclja0q80y119sah1qbyjlbaqxg360ywq9ig151lxsjq"; depends=[fs git2r rmarkdown rprojroot usethis withr]; };
   prodlim = derive2 { name="prodlim"; version="2019.11.13"; sha256="03wvh3kirp1prac5nky6a5whs97rvaf4hc27x0fnh51sa17r42b8"; depends=[KernSmooth lava Rcpp survival]; };
@@ -12521,19 +13052,20 @@ in with self; {
   profile = derive2 { name="profile"; version="1.0.2"; sha256="0yaxc846bvc29qx0q8jag7llsgiwhzx59nhnrad1v5sqyp3slk5r"; depends=[rlang tibble withr]; };
   profileModel = derive2 { name="profileModel"; version="0.6.0"; sha256="0yq8hy43h62hlz8bbf9ila4a3xcwizi1if27b78xc5y857ncwad8"; depends=[]; };
   profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
-  profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; };
+  profmem = derive2 { name="profmem"; version="0.6.0"; sha256="0gg6ja0ifwn9jj42rw1gnyil55sl9r2y5rjb6yjcvqwd5arajp3l"; depends=[]; };
   profr = derive2 { name="profr"; version="0.3.3"; sha256="00bv1q0qn46nz4zjfs0l2yfh3hk71rajlp2rrlwg442z11k79ap9"; depends=[plyr stringr]; };
   proftools = derive2 { name="proftools"; version="0.99-3"; sha256="095pxyyv6k818qwcjygbz1h24k0xkqi1agns8cqh2m5g64aynd70"; depends=[]; };
-  profvis = derive2 { name="profvis"; version="0.3.6"; sha256="0fbgd65b5n7bnvn2hab1w2hfzgj3ilxmpjnhrw2lj6g873x1m9b0"; depends=[htmlwidgets stringr]; };
+  profvis = derive2 { name="profvis"; version="0.3.7"; sha256="1f86m426pcf90l29hf4hkirzf8f38dihk52bxbdq2gvrrdili5s3"; depends=[htmlwidgets stringr]; };
   progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; };
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
   progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; };
-  progressr = derive2 { name="progressr"; version="0.6.0"; sha256="1cvb1llxz7ys4535dfl6hl3j07g24mcvkg0kl46v4nnl7ka4jx67"; depends=[digest]; };
+  progressr = derive2 { name="progressr"; version="0.7.0"; sha256="0drbb5zrk5yiypbkwrz3yqiwaik77d6w7qgqzv684ycdwc3nar4h"; depends=[digest]; };
   proj4 = derive2 { name="proj4"; version="1.0-10"; sha256="1l6i4735ki6y2qhmg1gmrj93rzrvgpzi23rr3a1akkqp58bnyfaz"; depends=[]; };
-  projections = derive2 { name="projections"; version="0.5.1"; sha256="1wfsrrqfqi9hhxs2v4ahlb208wrs7xmvz7r6yqkd28msk0yfhmrg"; depends=[ggplot2 incidence]; };
+  projections = derive2 { name="projections"; version="0.5.2"; sha256="04jblb98smn5z4jfkyqiasvii5shfa4pp69d73l20jkbfkm7bs1m"; depends=[ggplot2 incidence]; };
   projects = derive2 { name="projects"; version="2.1.1"; sha256="04jlvvb8hln9i7b52yqj3f4qcdkzfrhsvjy7j2q7i60wlpdfy1in"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble vctrs zip]; };
   projmgr = derive2 { name="projmgr"; version="0.1.0"; sha256="1iysxcl6awvp7zbm04zyq4d9659fcz3sy711jnycsxhsk8hsvmc2"; depends=[gh magrittr]; };
-  projpred = derive2 { name="projpred"; version="1.1.6"; sha256="07bixjpnvj9i5hsr9bfycnxryzsw2vg27z1lw86aj7948wdjgar1"; depends=[ggplot2 loo Rcpp RcppArmadillo]; };
+  projpred = derive2 { name="projpred"; version="2.0.2"; sha256="0nx514mrfh3gv854pr71w5x3zgdnn0kinf5nh7z90q3h7ysry2mg"; depends=[dplyr gamm4 ggplot2 lme4 loo magrittr MASS mgcv optimx Rcpp RcppArmadillo rngtools rstantools tidyverse]; };
+  promethee123 = derive2 { name="promethee123"; version="0.1.0"; sha256="0s1wkcrvm32dpqg9ahn10kni1xv3ll7akqz4y6yn1d36km81bf21"; depends=[cowplot ggplot2]; };
   promises = derive2 { name="promises"; version="1.1.1"; sha256="002qkhcn3ri6a3w5fizjvdvrjgvqiw8i7rl9jglcnqik5kmwc61p"; depends=[later magrittr R6 Rcpp rlang]; };
   promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; };
   promotionImpact = derive2 { name="promotionImpact"; version="0.1.4"; sha256="0v0qk9rifhv6xkc0iqhriswnm2lwlpgrk3gqhvd4pkkn2gx4cn3s"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; };
@@ -12544,7 +13076,7 @@ in with self; {
   prophet = derive2 { name="prophet"; version="0.6.1"; sha256="08b5h4c83143q33slsa7x46bxa98rm5dg251zsb7ixvn2v0zkhk1"; depends=[BH dplyr dygraphs extraDistr ggplot2 Rcpp RcppEigen rlang rstan rstantools scales StanHeaders tidyr xts]; };
   proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; };
   propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; };
-  prospectr = derive2 { name="prospectr"; version="0.2.0"; sha256="16ba2dmg1v2gsd66s25c28s413vg5xcbhicb75qwpijlgmjvfpgi"; depends=[foreach iterators Rcpp RcppArmadillo]; };
+  prospectr = derive2 { name="prospectr"; version="0.2.1"; sha256="0yg2ip33548mily51hgpiiasp67pcc3x1ksmbaxcg1mpp48algyz"; depends=[foreach iterators lifecycle mathjaxr Rcpp RcppArmadillo]; };
   protViz = derive2 { name="protViz"; version="0.6.8"; sha256="0rn8fjg7791a4j2k1kk1jwx40xz20bfaavvflmhyzpl398vmmy3a"; depends=[Rcpp]; };
   protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
@@ -12557,6 +13089,7 @@ in with self; {
   prototest = derive2 { name="prototest"; version="1.2"; sha256="07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; };
   protr = derive2 { name="protr"; version="1.6-2"; sha256="13vgiqkqqq1w2yj5f6i6scag0mr189zmisyvi6fgaw8g9dgxpxan"; depends=[]; };
   proustr = derive2 { name="proustr"; version="0.4.0"; sha256="1qp4v4vb1qh137qn7zi1d2g999z17kq6kpyxy9355mj8c49iy8pn"; depends=[attempt rlang SnowballC stringr tidyr tokenizers]; };
+  provExplainR = derive2 { name="provExplainR"; version="1.0"; sha256="0vzab23q2847q1qljgjxfdg3q7s8z1szfbmgg7sksc10zk4450d3"; depends=[diffobj digest dplyr provParseR stringr]; };
   provGraphR = derive2 { name="provGraphR"; version="1.0"; sha256="0s2hj8j3rjig37wpjlr2fgw2klwr6a26mxrnk1lq5d9262x6v3aa"; depends=[igraph Matrix provParseR]; };
   provParseR = derive2 { name="provParseR"; version="0.3"; sha256="0cmyb6da9l0822xrzni19r1ha6zzya385hk2ym9rmchvb34lax53"; depends=[jsonlite]; };
   provSummarizeR = derive2 { name="provSummarizeR"; version="1.4.2"; sha256="1pfnrvgqzpdhrsyh0y75idwj13zgcdj7ql6frpjmc0f5cggv7q1q"; depends=[dplyr provParseR]; };
@@ -12567,9 +13100,9 @@ in with self; {
   proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; };
   prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; };
   prrd = derive2 { name="prrd"; version="0.0.3"; sha256="1j1hcs5h6h9nz3pdjnw9p2y837706k9yxxjgiv0mgnwyh8pmz425"; depends=[config crayon data_table DBI liteq RSQLite]; };
-  prt = derive2 { name="prt"; version="0.1.0"; sha256="11idf3x5a1lv7wqfyayknvqy7crcy8w62ysziw0idwjhh0hr13kr"; depends=[assertthat backports cli crayon data_table fansi fst knitr pillar rlang tibble vctrs]; };
+  prt = derive2 { name="prt"; version="0.1.2"; sha256="010y3hwjlrja24xwkwvigcf8sq9ic7ykq1q9h9nhc5cxn3768w3w"; depends=[assertthat backports cli crayon data_table fansi fst knitr pillar rlang tibble vctrs]; };
   pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; };
-  ps = derive2 { name="ps"; version="1.3.4"; sha256="1cxfhnff22fbsr9vynhql0rhhrqfxvkb6kv11h2m740r9scwcs44"; depends=[]; };
+  ps = derive2 { name="ps"; version="1.5.0"; sha256="15pyz94b0z6ibrjp25np5nd4z20whnnr35wsavdgwmsmynba2qbl"; depends=[]; };
   psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; };
   psSubpathway = derive2 { name="psSubpathway"; version="0.1.1"; sha256="1jzymhh1dy5w735fppqza7ilspsvyidkrdpq2yd3j5xfjckzfh5w"; depends=[GSVA igraph mpmi pheatmap]; };
   psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; };
@@ -12579,9 +13112,9 @@ in with self; {
   psda = derive2 { name="psda"; version="1.4.0"; sha256="0if42szf0gkgdl7d02x43i0fdb6hp47j918vx06aw7qcw6a8j3k2"; depends=[ggplot2 plyr raster rgeos sp]; };
   pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; };
   pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; };
-  pseudorank = derive2 { name="pseudorank"; version="0.3.8"; sha256="1nj2cq8v8gj8wg23yrn8v21jwgd572gbz1wplpaxhk5v2ckhf1p0"; depends=[doBy Rcpp]; };
+  pseudorank = derive2 { name="pseudorank"; version="1.0.1"; sha256="1hjcvl38di1digkqg7nysd7bkljz1v7y54z2rz10fyk9lyp9mpmy"; depends=[doBy Rcpp]; };
   pseval = derive2 { name="pseval"; version="1.3.1"; sha256="1jgnv1l9adhwrmkmp6wkzz7jf7w1hyqy47ajr29l21p4g037py45"; depends=[survival]; };
-  psfmi = derive2 { name="psfmi"; version="0.2.0"; sha256="11gmc48frayyn9w5hnjfis1v92mg1v640s69dzkdvqxdkrzh50bg"; depends=[car dplyr foreign ggplot2 lme4 magrittr mice miceadds mitml mitools norm pROC purrr ResourceSelection rms rsample survival tibble tidyr]; };
+  psfmi = derive2 { name="psfmi"; version="0.5.0"; sha256="06v2wdrsinp721nm8qqhjs2xzqnv22yw0365x1y9gx3mahwjzk6r"; depends=[car cvAUC dplyr ggplot2 lme4 magrittr mice miceadds mitml mitools norm pROC purrr ResourceSelection rms rsample stringr survival tibble tidyr]; };
   psgp = derive2 { name="psgp"; version="0.3-19"; sha256="0yaf69zk4zkpgx5zyksdxb2g4az0ci8v6r23phzcis9fd21y70ds"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; };
   psica = derive2 { name="psica"; version="1.0.2"; sha256="1cnrd1p8ikv0hl97jwypw8np1ypa0d8k2mizwd1clkv7inbb264g"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; };
   psidR = derive2 { name="psidR"; version="2.0"; sha256="033bi61l9jslz4xhii19i23c10n4irqbzsfm5n54nzznwg85i6d9"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; };
@@ -12590,82 +13123,89 @@ in with self; {
   pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
   pspline = derive2 { name="pspline"; version="1.0-18"; sha256="1iwsw52miil1v1yl99mzl28qi8gdjr56rlasmh8faqjlpn9z477p"; depends=[]; };
   pspline_inference = derive2 { name="pspline.inference"; version="1.0.2"; sha256="0va16flm7ls2ypkbyamxz9qcdwn3wj62f5s12rci5i3x34hmmxg8"; depends=[assertthat dplyr magrittr mgcv plotrix plyr reshape2 rlang]; };
+  psqn = derive2 { name="psqn"; version="0.1.4"; sha256="0pvyd2w99jssqil3rli5gml6paq6nad9jaxh6qxvyggk10g16843"; depends=[Rcpp testthat]; };
+  psrwe = derive2 { name="psrwe"; version="1.2"; sha256="0p0462jmr0d992fbmj8f5xsmmwb5nx6x44a4sjq5zfs0rpi31g4l"; depends=[BH cowplot dplyr ggplot2 randomForest Rcpp RcppEigen rstan StanHeaders]; };
   pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; };
-  pssmooth = derive2 { name="pssmooth"; version="1.0.2"; sha256="09x5dhwx40j1fy7bzj0z0lj7sbjlwrqn2b8ph0387prbbp9q2lxs"; depends=[chngpt MASS np osDesign]; };
+  pssmooth = derive2 { name="pssmooth"; version="1.0.3"; sha256="08syh52gjaf72kq01v6b5dljmwi29nvmjmkkgmjb97zsi15z1wd3"; depends=[chngpt MASS np osDesign]; };
   pstest = derive2 { name="pstest"; version="0.1.3.900"; sha256="1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z"; depends=[glmx MASS]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-  psych = derive2 { name="psych"; version="2.0.7"; sha256="13z26yk9nrgviyakkij3jc7mja8wy7al9ripab07mvy21kli79bc"; depends=[lattice mnormt nlme]; };
-  psychReport = derive2 { name="psychReport"; version="1.1.0"; sha256="1vwx4qyk74zxddfhyzhi0fzp0ya9278891c8k3asp49lhy8889d0"; depends=[broom cli dplyr ez xtable]; };
+  psych = derive2 { name="psych"; version="2.0.12"; sha256="0k5dw5nb7kx7f21b0z01dry99qcpnk7iaicv7xq9d35wv2hx8wca"; depends=[lattice mnormt nlme]; };
+  psychReport = derive2 { name="psychReport"; version="2.0.0"; sha256="0xz401c931js3rk2c346f15im82lgahdkh3f6ls6lnb2s6q33z8p"; depends=[broom cli dplyr ez xtable]; };
   psychTools = derive2 { name="psychTools"; version="2.0.8"; sha256="1g7c8mrwsy0wi0zdqy6l74mvpwlbsigyqnic5fqbx5yfvgd8b645"; depends=[foreign psych]; };
-  psychmeta = derive2 { name="psychmeta"; version="2.4.0"; sha256="1l1sl7gbn370pchahwf89b97y1ylj4b2ml9vj386gla7dm0lsv2s"; depends=[boot curl data_table dplyr ggplot2 metafor progress purrr reshape2 rlang stringi stringr tibble tidyr]; };
+  psychmeta = derive2 { name="psychmeta"; version="2.4.2"; sha256="0qrr4s9anap4xn8hrsz06h3k7x6hxpn8k7h5yic3mkq46qbwlg7x"; depends=[boot curl data_table dplyr ggplot2 metafor progress purrr reshape2 rlang stringi stringr tibble tidyr]; };
   psycho = derive2 { name="psycho"; version="0.5.0"; sha256="0vcabk9j1yf7nz8fh3xg5rr2ia97mfkka23vbv9jya75dhgd84h2"; depends=[bayestestR dplyr effectsize ggplot2 insight parameters performance scales stringr tidyr]; };
   psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
   psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; };
-  psychonetrics = derive2 { name="psychonetrics"; version="0.7.2"; sha256="0kq445bwnv89vrlgwxaakija1hd60d4iy80ws334fjm7hci9793p"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; };
-  psychotools = derive2 { name="psychotools"; version="0.5-1"; sha256="0nm5ngdkyskkj5akbqavdz8njsa8mr61kzknnn1kkdz6bn6zy6lq"; depends=[]; };
+  psychonetrics = derive2 { name="psychonetrics"; version="0.8"; sha256="1xnjkbg3vqwn32q6qqk7kam34f0w6pghxanxr1qjp2sk7hd15hg2"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; };
+  psychotools = derive2 { name="psychotools"; version="0.6-0"; sha256="1qw5nfw3ww4y283rwqm0v4p2vyan4xjvjhjg8f3j6d7xprx5z8aj"; depends=[]; };
   psychotree = derive2 { name="psychotree"; version="0.15-3"; sha256="18lr9dlv5l5fw88n61ch251ddgy1cv6klcj7ba3fg109b86p3bgf"; depends=[Formula partykit psychotools]; };
   psychrolib = derive2 { name="psychrolib"; version="2.5.0"; sha256="154bv16fyyyp5zgcrl2ncyqy15ybjnhqmim75pba11sbww7jdfbw"; depends=[Rcpp]; };
   psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; };
   psyosphere = derive2 { name="psyosphere"; version="0.1.6"; sha256="1hcas3jk2n11lyw1ysmci0sysxf7qg9h2msqqg7q9nqp5gbf90np"; depends=[geosphere ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; };
-  psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
+  psyphy = derive2 { name="psyphy"; version="0.2-2"; sha256="1i9fayfbndn65hk16mlgxrnpw18gwa46rp0iqsj1m1ggq6pscjp1"; depends=[]; };
   psyverse = derive2 { name="psyverse"; version="0.1.0"; sha256="0q402z884fwnd812bs44xqbsank89risli13v3njhjc337lj29wx"; depends=[yaml yum]; };
   pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; };
   ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; };
   ptinpoly = derive2 { name="ptinpoly"; version="2.8"; sha256="126chp92ha48agx5i819bzdij79zbgj32msijvaid3zhxjx7qy1j"; depends=[misc3d]; };
-  ptmixed = derive2 { name="ptmixed"; version="0.5.4"; sha256="1qr53wn6c3ha8zp51arm7vky35cppr188f345nddgma2m7b06j9x"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv rstudioapi tweeDEseq]; };
+  ptm = derive2 { name="ptm"; version="0.2.2"; sha256="16ldvgndijp55s698053psxdin3lmsqi2ah5zs46g5s8szzhixwk"; depends=[bio3d Biostrings httr igraph jsonlite muscle RCurl seqinr XML xml2]; };
+  ptmixed = derive2 { name="ptmixed"; version="1.0.1"; sha256="05k17sczzy7w13v43699bm74nyqz1y9vzylrqbwbdlm8926fjz69"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; };
   pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; };
   ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; };
-  ptvapi = derive2 { name="ptvapi"; version="1.1.2"; sha256="16qb1avn3hb7yrmn2nal2l47xrq4i01rn6xa2w26h18x6mfrsw9y"; depends=[assertthat digest glue httr jsonlite purrr tibble]; };
+  ptvapi = derive2 { name="ptvapi"; version="1.1.3"; sha256="1wd6801vv5xpg5nglzwsr06lcsml1kr863bibpz8dp9rds7zgbzk"; depends=[assertthat digest glue httr jsonlite purrr tibble]; };
   ptw = derive2 { name="ptw"; version="1.9-15"; sha256="0ikvzc5vfcs50jl5n49mhk39pcijyfdxd26adgs01h0b50zh1yi2"; depends=[nloptr]; };
   ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; };
   ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; };
-  pubchunks = derive2 { name="pubchunks"; version="0.2.2"; sha256="0mbyyx8c5pz1z8lj22sk82c5khcp8b536g6qsqqlm772fd28zwc5"; depends=[data_table rcrossref xml2]; };
-  pubh = derive2 { name="pubh"; version="1.1.16"; sha256="1ic3qkrr6z22gvyv7xd8f7ji50asb2pmnc9y4c5qd79pzhphd7vx"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 Hmisc huxtable lmtest magrittr moonBook sandwich sjlabelled sjmisc sjPlot survival tibble tidyselect]; };
+  pubchunks = derive2 { name="pubchunks"; version="0.3.0"; sha256="14jzl0ra0d68s246a9jhfgp1wyy9g7d0rzahvl97crkklld1crvx"; depends=[data_table rcrossref xml2]; };
+  pubh = derive2 { name="pubh"; version="1.1.19"; sha256="08zckmic0ysfcf16phz2dcwqj6nnh2aahl5y762xri5fb6pfdxwa"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 Hmisc huxtable lmtest magrittr moonBook sandwich sjlabelled sjmisc sjPlot survival tibble tidyselect]; };
   publipha = derive2 { name="publipha"; version="0.1.1"; sha256="0ssmkz4bbrp5yvqb2da0i6shzm59ydw2sqkmqkid039782sibjch"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders truncnorm]; };
   pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; };
   pubmedR = derive2 { name="pubmedR"; version="0.0.3"; sha256="153br94iqayrvvgzrzx0r3ilcrmnznfdnzk8yaii01s8i1g1wxcd"; depends=[rentrez XML]; };
   pubtatordb = derive2 { name="pubtatordb"; version="0.1.4"; sha256="0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
+  puls = derive2 { name="puls"; version="0.1.1"; sha256="1mx8m3h4wlggjp12dlwbn9qhxlyy9hi70kpkn3v707wnlxqsl9vb"; depends=[cluster dplyr fda fda_usc ggplot2 monoClust purrr rlang tibble tidyr]; };
   pulsar = derive2 { name="pulsar"; version="0.3.7"; sha256="0gafp8mcp34c1j93sixy3413c32vn0xy8vhxm0b8v2mznbizgjbq"; depends=[Matrix]; };
   pulseTD = derive2 { name="pulseTD"; version="0.1.0"; sha256="0sdnswinpnm0vvplrh5gl9gx4p03dx175mqxzg5r52rkzd3rfbsr"; depends=[AnnotationDbi Biobase GenomicAlignments GenomicFeatures ggplot2 Rsamtools S4Vectors SummarizedExperiment]; };
   pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
-  puniform = derive2 { name="puniform"; version="0.2.2"; sha256="05bh66k6za5ch9x7k5hvsix88wwciabljx7har7a38y39kzavx6p"; depends=[ADGofTest metafor Rcpp RcppArmadillo]; };
+  puniform = derive2 { name="puniform"; version="0.2.3"; sha256="1y47y6s76pjvp10m8rvdh7y1iidjw96a4wrr920w0js3rn4fi1fz"; depends=[ADGofTest metafor Rcpp RcppArmadillo]; };
   pureseqtmr = derive2 { name="pureseqtmr"; version="1.2"; sha256="1c2pcci3s949hi8hh0h03mr3m6qw3kvihfglwavx578kjm2qw0xz"; depends=[ggplot2 plyr rappdirs stringr tibble]; };
   purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
   purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; };
   purrr = derive2 { name="purrr"; version="0.3.4"; sha256="1cj091rsjdj2xz16qhynyw72gh5cyhznifcfbrbygndfr4xwksr3"; depends=[magrittr rlang]; };
-  purrrlyr = derive2 { name="purrrlyr"; version="0.0.6"; sha256="0simzpzm3w9sclg7spnyk4h1r9bxi76z3hmw7m9wv3yiwlp5f6pq"; depends=[BH dplyr magrittr purrr Rcpp]; };
+  purrrlyr = derive2 { name="purrrlyr"; version="0.0.7"; sha256="03472xz0q30vjg45xv24zkd9b1w8ggi33vchxrimfnppdiqi3x0m"; depends=[BH dplyr magrittr purrr Rcpp]; };
   pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; };
   pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; };
   puzzle = derive2 { name="puzzle"; version="0.0.1"; sha256="073n074irsvn4w1jy5xmr6l24a209kn0ypvf1d2zn3p6yd93wzss"; depends=[dplyr kableExtra lubridate plyr readr readxl reshape reshape2 sqldf tidyverse]; };
-  pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.6.0"; sha256="15hv2vgcgz79mbca17px15n5qy22fsrm5dirdp7s0sv6w03k03sk"; depends=[ggplot2 pracma scales zipfR]; };
+  pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.6.1"; sha256="0p1hgrab8yallxri1z2q3cv26q6nydzykcvc6bcv9r00wjjfh966"; depends=[ggplot2 pracma scales zipfR]; };
   pvar = derive2 { name="pvar"; version="2.2.5"; sha256="1a5dxhki5nd5s1d5wwnc1dkg7mdib2s8w1i0l8mdg3f1g3l00klz"; depends=[Rcpp]; };
   pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; };
   pvclust = derive2 { name="pvclust"; version="2.2-0"; sha256="0082icm54k2yq60k06qpr92a626k39j2jr0046lva4ylmhxqb4kq"; depends=[]; };
+  pvldcurve = derive2 { name="pvldcurve"; version="1.2.6"; sha256="0vyrrgbj955jkir25svq59h8darvaf33m985mcy1dx6836zqwgap"; depends=[ggplot2]; };
   pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
   pwr = derive2 { name="pwr"; version="1.3-0"; sha256="1kfzy73v3z6ipc3kdfkcjrp4b4p5k54nwk796gqi36srm93hgc2v"; depends=[]; };
   pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; };
   pwr2ppl = derive2 { name="pwr2ppl"; version="0.1.2"; sha256="1d6rlgmwpnbnxjjpfxrxp0iwaqh1vgp8jpnd7iwf76xw30d3gv0v"; depends=[afex car dplyr ez lavaan MASS MBESS nlme phia tidyr]; };
   pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; };
-  pwrFDR = derive2 { name="pwrFDR"; version="1.95"; sha256="0xphr4zrn7cav66kw6g52nhc8vvxacvmflvzy32gqy5l7jc89f4q"; depends=[]; };
+  pwrFDR = derive2 { name="pwrFDR"; version="2.8.6"; sha256="1k4r9mca35ddfj2dpcrz4k8wfsf15p084iwmk75s18akrin2lzmp"; depends=[]; };
   pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; };
   pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
   pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; };
   pwt9 = derive2 { name="pwt9"; version="9.1-0"; sha256="0m2df89lali9945avcv4gdjpxch9in7vdd042nx0q8nv0alb4ijd"; depends=[]; };
   pxR = derive2 { name="pxR"; version="0.42.4"; sha256="1r0ffr5wxf67i1jh67v06vcmifw4hhhasd4aivic94bkvq4sqmn5"; depends=[plyr reshape2 RJSONIO stringr]; };
   pxweb = derive2 { name="pxweb"; version="0.9.1"; sha256="00xp7idhsirmpl970yxnxp6xn128jm5kwsmdwhys32wlbd9kzspc"; depends=[checkmate httr jsonlite]; };
-  pyMTurkR = derive2 { name="pyMTurkR"; version="1.1.4"; sha256="1dv8v01gd79jvqr54rb7k9x8i7v279f82slbmpvsd5r0k9zg2bfq"; depends=[curl reticulate XML]; };
   pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
-  pyinit = derive2 { name="pyinit"; version="1.0.3"; sha256="0sj7r52a53x57ff8b34s6p2y638b85fin0cxrndhpsk392sds0ki"; depends=[robustbase]; };
+  pyinit = derive2 { name="pyinit"; version="1.1.1"; sha256="122cgww99icdchr20qyn62q8pv1r817iyrfd6bj7zsq900x9gkxs"; depends=[robustbase]; };
   pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; };
   pysd2r = derive2 { name="pysd2r"; version="0.1.0"; sha256="1dqvgdxj6m683wkjyjhv685xnhl9328bm921zphm1i9p70fahs0n"; depends=[knitr reticulate tibble]; };
   pzfx = derive2 { name="pzfx"; version="0.3.0"; sha256="0f8bvwnk44wq8j58rw80b9bclknrh4a3iqdl3p4y26q100cpisgr"; depends=[xml2]; };
+  qCBA = derive2 { name="qCBA"; version="0.5.1"; sha256="1r9khpmdxjcnlbx4ccg26vsyp3wdc06bvlx9yl9zm4kwfi68aj9y"; depends=[arc arules rJava]; };
   qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; };
   qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
   qMRI = derive2 { name="qMRI"; version="1.2"; sha256="10x59g8awxjib5j5mc1yd5wsibk3z6ki6zifxsg8azl0zblxbscf"; depends=[adimpro aws awsMethods oro_nifti stringr]; };
   qad = derive2 { name="qad"; version="0.2.0"; sha256="13yz1aw394n4l4ys5bmmynm821ph4ggxdviv6ky3hq45y494rdvh"; depends=[copula data_table doParallel dplyr foreach ggExtra ggplot2 viridis]; };
   qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; };
+  qape = derive2 { name="qape"; version="1.0"; sha256="15zw02wx9cyn3m9kz64wl0vl9573lml3wr6f1gf949ll2jidhd7c"; depends=[dplyr lme4 Matrix mvtnorm plyr]; };
   qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; };
+  qbld = derive2 { name="qbld"; version="1.0.1"; sha256="0agx32f2pf1hzs3and40zd7kfkjml7qjbnn0im4dr2v10h1jz6c0"; depends=[knitr mcmcse Rcpp RcppArmadillo RcppDist rmarkdown stableGR]; };
   qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; };
   qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; };
   qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; };
@@ -12673,21 +13213,21 @@ in with self; {
   qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; };
   qcr = derive2 { name="qcr"; version="1.2"; sha256="10770a1rijhl2mhri8vgcdp9k17vbn93z0kiv1fsdd8z48ywbwx4"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; };
   qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; };
-  qdap = derive2 { name="qdap"; version="2.4.1"; sha256="136vmcsnclcc1bgvfrsxq5f7vqpsf3590bx8j9770xfw9gx27ynw"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
+  qdap = derive2 { name="qdap"; version="2.4.3"; sha256="1fadzq7afavxfhcd8q6xy3g8d7jwy24zz1da2ig9bd8vrk5zjmnx"; depends=[chron dplyr gender ggplot2 gridExtra igraph NLP openNLP openxlsx plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud XML]; };
   qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; };
   qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; };
   qdapTools = derive2 { name="qdapTools"; version="1.3.5"; sha256="09byvv39qmdcavlykpcvk248l2f7sw0pq64ynq2xffmnga3ji24c"; depends=[chron data_table RCurl XML]; };
   qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
   qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; };
   qgam = derive2 { name="qgam"; version="1.3.2"; sha256="0lks2cj0p7irp1i01756v1l7i26d7alax1fbkc20qd6wpz840fi7"; depends=[doParallel mgcv plyr shiny]; };
-  qgcomp = derive2 { name="qgcomp"; version="2.4.0"; sha256="0ddivv3y8y1984pkiw8346qy6ca90vazir3rvrmzvl88xz6ydvg1"; depends=[arm future future_apply generics ggplot2 gridExtra markdown pscl survival tibble]; };
+  qgcomp = derive2 { name="qgcomp"; version="2.6.0"; sha256="0cvjic0xjhling8411s559ph27ss379ywrf70qyj9acskfhy5p8s"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; };
   qgg = derive2 { name="qgg"; version="1.0.4"; sha256="1xyviy73jl76bpv5izlkgf171qrypgv2wm5mi3s06cb7md8psrkb"; depends=[data_table MASS MCMCpack statmod]; };
   qgraph = derive2 { name="qgraph"; version="1.6.5"; sha256="0pwys9irxvp0ap158drplyypkplbmwqinv0fmlsblk7q875cr592"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; };
   qgshiny = derive2 { name="qgshiny"; version="0.1.0"; sha256="0ydhwg4abn8n9pwnjnwf1n1k854zw31z8f2splzdm5j279lsjg3r"; depends=[rmarkdown shiny]; };
   qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; };
   qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; };
   qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; };
-  qicharts2 = derive2 { name="qicharts2"; version="0.6.1"; sha256="14s8fji9hmsi3675n6nsy0mh1myj54bm18fssax2h0s96742lz79"; depends=[ggplot2 scales]; };
+  qicharts2 = derive2 { name="qicharts2"; version="0.7.1"; sha256="1n6a5v6i3cqh3lib875rlc612a1h21zn39lsnn4kgfxsp2chcz62"; depends=[ggplot2 scales]; };
   qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; };
   qiitr = derive2 { name="qiitr"; version="0.1.1"; sha256="0qbqx7g4np2ygyxiqmq5cww1az6ijjx6na6b1mp4ywmyxkjg3k29"; depends=[httr jsonlite purrr rstudioapi]; };
   qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; };
@@ -12702,12 +13242,13 @@ in with self; {
   qpmadr = derive2 { name="qpmadr"; version="0.1.0"; sha256="19q9xwkaklkvxvwmnhn3dm2rzcpwl9swygmzlcqa8008m019film"; depends=[checkmate Rcpp RcppEigen]; };
   qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; };
   qqplotr = derive2 { name="qqplotr"; version="0.0.4"; sha256="1zy7mlnll0infr2las5c28vi5da04rm869dpccwcws1467mhys3k"; depends=[dplyr ggplot2 knitr MASS robustbase]; };
+  qqr = derive2 { name="qqr"; version="0.0.1"; sha256="1vi4nbm356vahm4hnvy686nysbn4n63p9cjd4i9dm73lhsf9ilmn"; depends=[dplyr rvest stringr tidyverse xml2]; };
   qqtest = derive2 { name="qqtest"; version="1.2.0"; sha256="1v0qbbp2dpqflpg7yif7hipwdbz27isfyfwcia1ln7z0nnvkjm8c"; depends=[]; };
   qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; };
   qrLMM = derive2 { name="qrLMM"; version="2.1"; sha256="1viyllsd08dwgd5z930ml1nrcc9saaa18i5sx0bska8b0s7qh414"; depends=[ald lqr mvtnorm psych quantreg]; };
   qrNLMM = derive2 { name="qrNLMM"; version="2.0"; sha256="0j69zhs1v4546xrkwra9c2q3kmhf593vi05yjn3b3s5nzh2k0i1x"; depends=[ald lqr mvtnorm psych quantreg]; };
   qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
-  qrandom = derive2 { name="qrandom"; version="1.2.2"; sha256="1s0frb3qjaraigx79g0sm60dj216jrmp1lgzcvjk3rh7xdjhjrkn"; depends=[curl jsonlite Rmpfr]; };
+  qrandom = derive2 { name="qrandom"; version="1.2.3"; sha256="0ddk1841viqbyzn292i30a73nswdkhq032lxsphh0j6hp7zsppz4"; depends=[curl jsonlite Rmpfr]; };
   qrcm = derive2 { name="qrcm"; version="2.2"; sha256="04cd78vqqp7pprrfpcza03g4pcffgl42qsax1285fbmxjqhb3yks"; depends=[pch survival]; };
   qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; };
   qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; };
@@ -12715,21 +13256,23 @@ in with self; {
   qrmdata = derive2 { name="qrmdata"; version="2019-12-03-1"; sha256="0738wiac0dgani0yy61kvpra7zj8qj5ak627i8cjd42zf1yjziz5"; depends=[xts]; };
   qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; };
   qrmtools = derive2 { name="qrmtools"; version="0.0-13"; sha256="1pr0q0wh3xjy3y59nkbpqfkakagbank3b31150rlxy72hkf52g1y"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; };
-  qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; };
+  qrng = derive2 { name="qrng"; version="0.0-8"; sha256="1yagh7llrg208mdmwyq7gy4c7h20hj4s5ikp6nc3q8pl7avmq3jc"; depends=[copula randtoolbox]; };
   qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; };
-  qs = derive2 { name="qs"; version="0.23.2"; sha256="06cc9qnnsdc5w76ip3326zcmny4sli7n10yc4pkcv7x5l6r96ddz"; depends=[RApiSerialize Rcpp stringfish]; };
+  qs = derive2 { name="qs"; version="0.23.4"; sha256="0rvklaawyg4d48x559zj59sk34afhms7ajn90dqdvvrqhj7fbbq6"; depends=[RApiSerialize Rcpp stringfish]; };
+  qsimulatR = derive2 { name="qsimulatR"; version="1.0"; sha256="0d2al6rnsyj58jhwczn2rx09b007s2yjihpk7i65law7v8dmxiaf"; depends=[]; };
   qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; };
+  qst = derive2 { name="qst"; version="0.1.2"; sha256="0f5c4088y9c5fxyy2dyfkp049lnzvys3zyizazxsa82xwkwsbc8a"; depends=[DBI dbplyr dplyr magrittr RSQLite tibble]; };
   qsub = derive2 { name="qsub"; version="1.1.0"; sha256="0i52bibc782k09f5hp3ic9ll14fsrwjnkdxlb0mhkjvsqm7m5hc5"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; };
   qte = derive2 { name="qte"; version="1.3.0"; sha256="0x65n2qyq1py0nrachxkqd273mywkw433ai5x6ni3ak4ckbp3g66"; depends=[BMisc formula_tools ggplot2 Hmisc knitr msm pbapply quantreg texreg]; };
   qtl = derive2 { name="qtl"; version="1.46-2"; sha256="0rbwcnvyy96gq1dsgpxx03pv423qya26h6ws5y0blj3blfdmj83a"; depends=[]; };
-  qtl2 = derive2 { name="qtl2"; version="0.22-11"; sha256="0dfdzjylqzc92dcszawc8cyinxccjm3p36v9vcq9ma818pqcanmr"; depends=[data_table jsonlite Rcpp RcppEigen RSQLite yaml]; };
+  qtl2 = derive2 { name="qtl2"; version="0.24"; sha256="1558khh0zkwm0rdk87krv9836krvwv5h7ymlz9bsrgcvypyr9186"; depends=[data_table jsonlite Rcpp RcppEigen RSQLite yaml]; };
   qtl2convert = derive2 { name="qtl2convert"; version="0.22-7"; sha256="0i2s4hsab5fvxdjapgwchs1shi658ir06i1dqlqi79q0avdjw4l0"; depends=[qtl qtl2 Rcpp]; };
   qtl2fst = derive2 { name="qtl2fst"; version="0.22-7"; sha256="121rf6bqva7rk6ab3fxlil131fb7p0bffq6yq4vgs50qjlayxyd2"; depends=[fst qtl2]; };
-  qtl2pleio = derive2 { name="qtl2pleio"; version="1.3.0"; sha256="07dx8fslsl6x5841dxnmhmi9ra806gnjr4inc7n13hpy8iwpcsrb"; depends=[dplyr furrr gemma2 ggplot2 magrittr MASS Matrix Rcpp RcppEigen rlang testthat tibble]; };
+  qtl2pleio = derive2 { name="qtl2pleio"; version="1.4.3"; sha256="0az71vgj1gv7rfz0hnc9rysh49ak2pnkvmih5mwmymr4an84c34k"; depends=[dplyr gemma2 ggplot2 magrittr MASS Rcpp RcppEigen rlang tibble]; };
   qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
   qtlbook = derive2 { name="qtlbook"; version="0.18-8"; sha256="1c849xy2ki7niddajv5wnsm0zdp5381w8zm9lc8rvkdbs2v6rhf4"; depends=[]; };
   qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; };
-  qtlcharts = derive2 { name="qtlcharts"; version="0.11-6"; sha256="114h19d741abyz7c0w0lir7m7816hw92lnd4shb3d9m94a9dwxqp"; depends=[htmlwidgets qtl]; };
+  qtlcharts = derive2 { name="qtlcharts"; version="0.12-10"; sha256="1s7kbjiacjqi6sm5jaxmip3vp8hmqqypllgsidbxnhi6ycr19804"; depends=[htmlwidgets qtl]; };
   qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; };
   qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; };
   qtlnet = derive2 { name="qtlnet"; version="1.5.4"; sha256="0jdf3hyzas0lyv2v4gqai9mhh7218a1mvm0nlwv9hfdbij0hi84v"; depends=[graph igraph pcalg qtl sem]; };
@@ -12739,7 +13282,7 @@ in with self; {
   quadmesh = derive2 { name="quadmesh"; version="0.4.5"; sha256="0wppxi8g3dq7x4f6dsv7843fhdb43rx45lky4aanqa2im81qa7l8"; depends=[geometry gridBase png raster reproj scales sp viridis]; };
   quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; };
   quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; };
-  quadrupen = derive2 { name="quadrupen"; version="0.2-7"; sha256="05yn9cnnc1481k8yqc6dg5hcv0ll4v3h2yw3qyaarwhgyxiips11"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
+  quadrupen = derive2 { name="quadrupen"; version="0.2-8"; sha256="1n3wqbdfwkrajhdkng6f8ixdz94znpqdfss872wrk0rz9bhpa03l"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
   qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
   qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; };
   qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; };
@@ -12750,16 +13293,19 @@ in with self; {
   qualypsoss = derive2 { name="qualypsoss"; version="1.0.0"; sha256="1pvf9b9yw8317wnh1x1jkmwl4cl0r9q7npfw0xzgbs8mfpl9j2ah"; depends=[doParallel foreach MASS mvtnorm]; };
   quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; };
   quantdates = derive2 { name="quantdates"; version="1.0"; sha256="1hyds8rwr1yg740aq4w5fqjrwdf3dl4phf8mj8qsgbb7i0wbbf3q"; depends=[lubridate]; };
-  quanteda = derive2 { name="quanteda"; version="2.1.1"; sha256="1wlrd7g2b459pnkqhihxhn74f37py1c9pxrdzp5xzp4mnbdxcsj8"; depends=[data_table digest extrafont fastmatch ggplot2 ggrepel jsonlite magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel sna SnowballC stopwords stringi xml2 yaml]; };
-  quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.1"; sha256="04c43hk6yx06m11s01aw0sqjd2yip7l7wzlbif600hvwxgs74knn"; depends=[ggplot2 LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra RSSL SparseM stringi]; };
+  quantdr = derive2 { name="quantdr"; version="1.1.0"; sha256="0ziqms7xdyrkxddniq1h7p2zb1ppi1mxqj78ml8bdpzw5f7yn6ml"; depends=[dr KernSmooth MTS mvtnorm quantreg]; };
+  quanteda = derive2 { name="quanteda"; version="2.1.2"; sha256="13rjwgmg5v1dbryrs9ifyy76s5ib6wrbrm2y5af44vhf1h6p9cvy"; depends=[data_table digest extrafont fastmatch ggplot2 ggrepel jsonlite magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel sna SnowballC stopwords stringi xml2 yaml]; };
+  quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.2"; sha256="0wf5gvq9lndhl5z70qknqs7svxs60c1na584siv5pvm1a4irz60d"; depends=[ggplot2 glmnet LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra SparseM stringi]; };
+  quanteda_textplots = derive2 { name="quanteda.textplots"; version="0.90"; sha256="1adbyfnhmxx8p0xi962nha6g4n1kqs0z0zbkhva3c8frw669l5mg"; depends=[data_table extrafont ggplot2 ggrepel igraph Matrix network quanteda quanteda_textmodels quanteda_textstats RColorBrewer Rcpp sna stringi]; };
+  quanteda_textstats = derive2 { name="quanteda.textstats"; version="0.91"; sha256="12k7ahzijsxgbqrxzdfqfhj0m6xxrf8j7n04ln01c2m2mvnrm03z"; depends=[data_table digest Matrix nsyllable proxyC quanteda Rcpp RcppArmadillo RcppParallel stringi]; };
   quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; };
   quantilogram = derive2 { name="quantilogram"; version="2.1.1"; sha256="07mvgbk5qhkaihk2dn5c8cfac2xd9hfglh284sg4jkrkq0cfgrl8"; depends=[np quantreg SparseM]; };
   quantities = derive2 { name="quantities"; version="0.1.5"; sha256="1ic44xm7mqj428nd3hqv80nhdzsda87yp9ifxayf46yrxi8p6khf"; depends=[errors Rcpp units]; };
   quantkriging = derive2 { name="quantkriging"; version="0.1.0"; sha256="0v6kckgzhgsn3158sc06xszdhmk8sfny10j1qyppxsl2hk89n8jf"; depends=[ggplot2 hetGP Matrix reshape2]; };
-  quantmod = derive2 { name="quantmod"; version="0.4.17"; sha256="1ss441rwlr88kz212m0wgx0hwgwi41rhy1jncg2lgqzqfvr5dzqa"; depends=[curl TTR xts zoo]; };
+  quantmod = derive2 { name="quantmod"; version="0.4.18"; sha256="0dbcrncv06iqcbkky95dd7l32xq0hhbnkb0kj8wwzym1jf748h5a"; depends=[curl TTR xts zoo]; };
   quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; };
-  quantreg = derive2 { name="quantreg"; version="5.61"; sha256="0kby1crnzkdg5sczwqapfpkr58apyzrrx85khigcqggmhhwl44wk"; depends=[conquer Matrix MatrixModels SparseM]; };
+  quantreg = derive2 { name="quantreg"; version="5.75"; sha256="05mb1qmwah5sdgg2z7m36lqkh479phvb1cx4sjnv1ykvmi9alxv5"; depends=[conquer Matrix MatrixModels SparseM]; };
   quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; };
   quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; };
   quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; };
@@ -12767,13 +13313,14 @@ in with self; {
   quantspec = derive2 { name="quantspec"; version="1.2-3"; sha256="0ifwq2jmvxhpijz9yd9hffkff6ixcliaqkp9ispp9k1b8icwi8zn"; depends=[abind quantreg Rcpp snowfall zoo]; };
   quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; };
   queryparser = derive2 { name="queryparser"; version="0.3.0"; sha256="10p81cr1zzq4bna8x302280v5n8ddm454zybzh8mi2jd3sh4rmbz"; depends=[]; };
-  questionr = derive2 { name="questionr"; version="0.7.1"; sha256="1rhb4kj6x6ngryqyj68zglcb7nmrmsq9ikndyxqpbmqx2s67b22c"; depends=[classInt haven highr htmltools labelled miniUI rstudioapi shiny styler]; };
-  queuecomputer = derive2 { name="queuecomputer"; version="0.8.3"; sha256="0ravk2bxzq3zhk6mmh6iv11ql3bkpp2318vvrl39ghm5bh6pp6mg"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
+  questionr = derive2 { name="questionr"; version="0.7.4"; sha256="0p2mshhmm4kk629rm38w6im7xxxphsg9qqrsdd3bwzma4dvxi2l1"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny styler]; };
+  queuecomputer = derive2 { name="queuecomputer"; version="1.0.0"; sha256="004apzgd58agl5w0nn3nba0idhb13hpvcw6aw4h2nmbp2r1bm32y"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
   queueing = derive2 { name="queueing"; version="0.2.12"; sha256="0hw1ykm24cjpfwh7ac7fjf7mhc59mq8wy2g07aacpy5ibwi8bbsf"; depends=[]; };
   quhomology = derive2 { name="quhomology"; version="1.1.1"; sha256="0wiih00zk4682wy1r4nyifh76h5bnvl3f785wjzmrwylnfy951l3"; depends=[MASS numbers]; };
   quickPlot = derive2 { name="quickPlot"; version="0.1.6"; sha256="0mffialxdim8f5s0bw9bb7p8dbrfdgq1wqih441x27lnmrvhlsa8"; depends=[backports data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; };
   quickReg = derive2 { name="quickReg"; version="1.5.0"; sha256="1l1v3k8albxlaz18l2b2x2ryifq4pbdq6n4q7555hnfcik9rqmw5"; depends=[dplyr ggplot2 nortest psych rlang survival]; };
   quickblock = derive2 { name="quickblock"; version="0.2.0"; sha256="0ij4ivpnkjzdixbq7pg4g1xkb031qawadr22qhzp0q210qhmhc0m"; depends=[distances scclust]; };
+  quickerstats = derive2 { name="quickerstats"; version="0.0.1"; sha256="0jlczz042701p6j4m60k425m9x3q88m27mmf62ngz80dylcl2fdx"; depends=[curl httr readr tibble]; };
   quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; };
   quickmatch = derive2 { name="quickmatch"; version="0.2.1"; sha256="1qfslhjlbjpzigz8n6b7w41g8pwdiwri091ivd5igp1xy5pv8a3w"; depends=[distances sandwich scclust]; };
   quickpsy = derive2 { name="quickpsy"; version="0.1.5.1"; sha256="0dfqlpghnw79idw3ir03cxx9n88sqs5p14jz7jgpkdwvjpw1y4q9"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
@@ -12784,52 +13331,58 @@ in with self; {
   quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; };
   quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; };
   qvcalc = derive2 { name="qvcalc"; version="1.0.2"; sha256="0banzv78kb53ybfbh1hmgx7kxvpbbdxzg4dsn7vrwhmxs72srkch"; depends=[]; };
-  qwraps2 = derive2 { name="qwraps2"; version="0.4.2"; sha256="14h9xwv6x5lci17hg048a6n0cp3d2rif4v0g7dr05w504h157kw9"; depends=[dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; };
+  qwraps2 = derive2 { name="qwraps2"; version="0.5.0"; sha256="1gsn7k8dxv48wszlvakzanndj402c5nbz3rj1mg0zrin3q2r3jik"; depends=[dplyr ggplot2 knitr Rcpp RcppArmadillo rlang xfun]; };
   r_blip = derive2 { name="r.blip"; version="1.1"; sha256="1p33g6i6fq9c27d5ix9nd8prv90i4hrf91x34bldlw8041sjqxm0"; depends=[bnlearn foreign]; };
+  r_jive = derive2 { name="r.jive"; version="2.4"; sha256="12zjzjjy1dwhr1gxb5029p5l3wjhwaysja4zf6insdnx1fd0ybxd"; depends=[abind gplots]; };
   r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
-  r2d3 = derive2 { name="r2d3"; version="0.2.3"; sha256="0v612mbzdjr8cq1ffall9hagbwxfv7fh963x8f0w5r84v1m3y2bl"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; };
+  r2d3 = derive2 { name="r2d3"; version="0.2.5"; sha256="1wfr5qnywrvps25z9iwn04n6wwvam4340jwpszxbbawby48kjppn"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; };
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
   r2dictionary = derive2 { name="r2dictionary"; version="0.1"; sha256="0assylz2ih96l4jily76hp524h5xbnc27ln8yjvk9c4q88yr8xfy"; depends=[rstudioapi stringr]; };
-  r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.0.1"; sha256="03czv6rql2id74qawjcvc4b9wj3bxci6hg5lq4r37w6xn7y7ls19"; depends=[dplyr magrittr rlang tidyr]; };
-  r2dii_data = derive2 { name="r2dii.data"; version="0.1.2"; sha256="0qrpvjf1brf2am2bjddnlvhwc9kj3vwphg5nmal29m1pfc59z36g"; depends=[]; };
-  r2dii_match = derive2 { name="r2dii.match"; version="0.0.4"; sha256="01h65la79cqcpmwkwm2sb1kivqz7qy200zagd8g5ajy6vk8dy2ch"; depends=[data_table dplyr glue magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; };
+  r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.1.3"; sha256="12d0kcgk7yais27aggi5x901yrnvpz0dndswr5akkg8yzny7xq96"; depends=[dplyr glue magrittr r2dii_data rlang tidyr tidyselect zoo]; };
+  r2dii_data = derive2 { name="r2dii.data"; version="0.1.6"; sha256="1bsa65wvs1by9h5zmi0v2silpxp497qsqnx4bji1vp1f2g46kj5p"; depends=[]; };
+  r2dii_match = derive2 { name="r2dii.match"; version="0.0.7"; sha256="0halwyak97csjpyfwyz1zhjlrqmcq8fi9d9jgxnh2rj4if3qc0s9"; depends=[data_table dplyr glue magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; };
   r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
+  r2mlm = derive2 { name="r2mlm"; version="0.2.0"; sha256="0c6qhjhxfapqx5aiq54msbhda5c8pazpdp2wxdqh8l2gjffvwc4p"; depends=[broomExtra dplyr lme4 magrittr nlme rlang stringr tidyselect]; };
   r2pmml = derive2 { name="r2pmml"; version="0.24.0"; sha256="0fl2kh1b7rvghschadsdp12za0r16xpak29f0w7dh38i5sw5scrk"; depends=[]; };
-  r2rtf = derive2 { name="r2rtf"; version="0.1.1"; sha256="04612jnmqrdl3ps66zxj515fbnvaxzcw8bl9dg2gjqh7lr23a0dj"; depends=[stringr]; };
+  r2rtf = derive2 { name="r2rtf"; version="0.2.0"; sha256="1bp37kz5alcc5ddf8kdyprn6srn4cwj1xf7lqa6x2a0kc3f7hp71"; depends=[]; };
   r2shortcode = derive2 { name="r2shortcode"; version="0.1"; sha256="03djy8m146k31xgvwcbrd1nzwj4wdlvvwzgviv80kskgr6ld9jrj"; depends=[magrittr stringr]; };
   r2sundials = derive2 { name="r2sundials"; version="5.0.0-7"; sha256="11l8z7h0gm71yqns2blrd26p084gcdc4x1xwv0knp8830xqjdsmw"; depends=[Rcpp RcppArmadillo rmumps]; };
+  r2symbols = derive2 { name="r2symbols"; version="0.1"; sha256="1i4sd015dgkv5i89d0cphp3jmn4jn4wqfazklfglysf85b2cm4iw"; depends=[]; };
   r3PG = derive2 { name="r3PG"; version="0.1.2"; sha256="1awmxs0173x09rrqbn7h4ni068kxzb09jr70zyh0659jnf4zx4dd"; depends=[]; };
+  r3dmol = derive2 { name="r3dmol"; version="0.1.0"; sha256="059ya67jrqfcvmp295rynxxsbnyxhlr84cqlvwqzylyzi5hkgmz3"; depends=[htmlwidgets magrittr]; };
   r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; };
   r4ss = derive2 { name="r4ss"; version="1.36.1"; sha256="03xin7avdbg5ayrcdbw5rx9sh6ingjq2kv3405h01vqf1jhkfsxk"; depends=[coda corpcor gdata gplots gtools kableExtra pso truncnorm]; };
   r511 = derive2 { name="r511"; version="0.1.1"; sha256="1njsnjf0746cv6x7fznq4cg556fczqcfawwb869r3w9zv0zj1iy9"; depends=[assertthat dplyr httr tibble xml2]; };
+  r5r = derive2 { name="r5r"; version="0.2-1"; sha256="1f6plxidvsj989hmr7gw8crvlmynxbcj1362hidw3zfixx9yjbvf"; depends=[checkmate data_table jdx rJava sf sfheaders]; };
   r6extended = derive2 { name="r6extended"; version="0.1.2"; sha256="1kq1j5rx57053mslj8jx1s0wjvhis7x3y264zw44q4k2x48q9wxs"; depends=[digest hellno magrittr R6]; };
   rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; };
   rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; };
   rAmCharts = derive2 { name="rAmCharts"; version="2.1.13"; sha256="1c9gz7jmkh8gfaq8lmcb66kavdldnlc3x1mc1c72di8zxcpgzprc"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
+  rAmCharts4 = derive2 { name="rAmCharts4"; version="1.2.0"; sha256="1jp70sdgr5jsdvha2l4n5msdqkcl2f4y5prd2kddfh1dnr58qni4"; depends=[base64enc htmltools htmlwidgets jsonlite lubridate minpack_lm reactR shiny stringr xml2]; };
   rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBMF = derive2 { name="rBMF"; version="1.0"; sha256="10dg47yzn696aqx4192nrs5m92z8kkkpk0z1j8pak33c6s2swc51"; depends=[Matrix Rcpp]; };
   rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; };
   rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
-  rBiasCorrection = derive2 { name="rBiasCorrection"; version="0.2.1"; sha256="1408fiiv9q807yarm40dzybq8p8y1fhkfs8hpimszkcljp2h8hqg"; depends=[data_table future future_apply ggplot2 ggpubr magrittr nls2 polynom]; };
+  rBiasCorrection = derive2 { name="rBiasCorrection"; version="0.2.5"; sha256="02jg5fw4glg3hnms7r52s3b9syss5g9ynqz125k5830zaz1q4px3"; depends=[data_table future future_apply ggplot2 ggpubr magrittr nls2 polynom]; };
   rCAT = derive2 { name="rCAT"; version="0.1.6"; sha256="09jyjjbhpm44wrism3zgg56m01yimlcm3xks8g0cq36lsrclcigp"; depends=[pracma rgdal sp]; };
   rCBA = derive2 { name="rCBA"; version="0.4.3"; sha256="10rc08gwsf15f4lci8bbgwpwj8n7k1m23hxk633v68g9amla5nvx"; depends=[arules R_utils rJava TunePareto]; };
   rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
-  rCRM = derive2 { name="rCRM"; version="0.1"; sha256="01xxkrwd0iwhmq8dshgbn84qi6kky757y01alqrk0pkq2n8ghms4"; depends=[Rcpp RcppEigen]; };
+  rCRM = derive2 { name="rCRM"; version="0.1.1"; sha256="03p2v1wb7hsvfhdcgawaz8vd2i8kh30dj8mjydlaywxyks6i5caz"; depends=[Rcpp RcppEigen]; };
   rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
   rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
   rDEA = derive2 { name="rDEA"; version="1.2-6"; sha256="0045crn7azsy3ggzr28vw5jd4f5aw5nj16cjnjxy2md3skfbc3zw"; depends=[maxLik slam truncnorm truncreg]; };
   rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; };
   rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; };
   rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; };
-  rEDM = derive2 { name="rEDM"; version="1.5.0"; sha256="0mrmh4c95p0h8rf8npc4cs3q5dkcsw5wziwz3mkcynbkvnn8v2n1"; depends=[Rcpp RcppThread]; };
+  rEDM = derive2 { name="rEDM"; version="1.7.1"; sha256="0x89sybm9q47iwfncph0s213cypkpvrjivxdl496s9ys22j9fdnh"; depends=[Rcpp RcppThread]; };
   rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
-  rENA = derive2 { name="rENA"; version="0.2.0.1"; sha256="0sljnrhc710xbcdbsjx1rqrivbklgcnh7l4nqpnxdknvrxz6ky5y"; depends=[data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; };
+  rENA = derive2 { name="rENA"; version="0.2.1.2"; sha256="1achyvdc658la2fhdsjb2jbhcgsv8zgdiis7wkg9nlpchfwlgma9"; depends=[concatenate data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; };
   rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
-  rFIA = derive2 { name="rFIA"; version="0.2.3"; sha256="1y9bl9bsljlx2bmxp5z1hzr534r4igx1i3xgbap7y39xvsv9ihml"; depends=[bit64 data_table dplyr gganimate ggplot2 progress purrr sf sp stringr tidyr tidyselect]; };
+  rFIA = derive2 { name="rFIA"; version="0.3.0"; sha256="126kgwnaf6x2wj732rzxm6v07ysgj5ys5yq4q6xmr0kiqmbcr7lh"; depends=[bit64 data_table dplyr dtplyr ggplot2 lifecycle rlang sf stringr tidyr tidyselect]; };
   rFSA = derive2 { name="rFSA"; version="0.9.6"; sha256="1fxd194iq8jnlsnj76mjq2f6db7ln641qwfsf5v63kx3qqhn8x5s"; depends=[hash rPref tibble tidyr]; };
   rFerns = derive2 { name="rFerns"; version="4.0.0"; sha256="0a4i918xb3r602lxrgk8gm9jjvxzsm49gxdh1zdza2rrjc4fm36c"; depends=[]; };
-  rGEDI = derive2 { name="rGEDI"; version="0.1.8"; sha256="0smxzws730sjn8kxnmhgc0lg8v4qig53cv8nbwqhig7dlw6djfml"; depends=[bit64 curl data_table fs getPass ggplot2 hdf5r jsonlite lazyeval raster RColorBrewer sp]; };
+  rGEDI = derive2 { name="rGEDI"; version="0.1.9"; sha256="0alr9vnl6qbhy5gsj9chg7igpbr6czzgamqmhjxcxiwb3f7abcz9"; depends=[bit64 curl data_table fs getPass ggplot2 hdf5r jsonlite lazyeval raster RColorBrewer sp]; };
   rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
   rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; };
   rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; };
@@ -12842,22 +13395,22 @@ in with self; {
   rJava = derive2 { name="rJava"; version="0.9-13"; sha256="1x3mihyqzr61j52rwaqciw43mkjzmhib4s6qf57v6xj40ksqh5jv"; depends=[]; };
   rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
   rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; };
-  rKolada = derive2 { name="rKolada"; version="0.1.3"; sha256="1ay9zm5gxs09dwpp1lwx76j432rfk7a7ly6zwqk31clyi2ldi6mn"; depends=[dplyr ggplot2 glue httr jsonlite magrittr purrr rlang stringi stringr tibble tidyr]; };
   rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; };
   rLFT = derive2 { name="rLFT"; version="1.0.0"; sha256="0r5zyzwb9lzcbwllsblwhmzs4891jvpvzbifv93m75zm6bd5w69p"; depends=[Rcpp sf]; };
   rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; };
   rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4.1"; sha256="1bwg8mzddsc39km85b41bxp2hwqmb4g5a3010f6yp1qlgcb9rmj1"; depends=[plyr]; };
   rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
-  rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rMEA = derive2 { name="rMEA"; version="1.2.0"; sha256="1h5flmysyxv668si4ycfkkgairy7balk3nm0dsm91gns9xhvjqs0"; depends=[]; };
+  rMIDAS = derive2 { name="rMIDAS"; version="0.2.0"; sha256="0pgjbzxai6m7jarr07vfibwd9sk0rlihrj2hycp99vblnfyxcay4"; depends=[data_table mltools reticulate]; };
   rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; };
-  rMVP = derive2 { name="rMVP"; version="1.0.3"; sha256="02ll7mwxix96jas1xp7gb7nm29fdq2ym6b3wmy7246ral2j11pwf"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; };
+  rMVP = derive2 { name="rMVP"; version="1.0.4"; sha256="172zcimqh824xapm9gri81c275wp4fn35nibl31api3yldqpp4hn"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; };
+  rMisbeta = derive2 { name="rMisbeta"; version="1.0"; sha256="1h4vilnndl0gnz9z0sgbywp4zy44718zpiqcqigbjbd4lymi0y61"; depends=[ROC]; };
   rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; };
   rMorningStar = derive2 { name="rMorningStar"; version="1.0.6"; sha256="1xa68yqzyg3szk1g3hhyvi6bxz83nr18wzk5z75g77ndw3k8jyji"; depends=[dplyr ggplot2 PerformanceAnalytics purrr quantmod readr rvest stringi stringr tidyr xml2 xts]; };
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
-  rNOMADS = derive2 { name="rNOMADS"; version="2.4.2"; sha256="0mir7b2693s27gll5j6fsgy7wq0fg48ddx6h78j7cgg7md75756f"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; };
-  rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.2.1"; sha256="1dsl8zspndy13yykxrjh4dflp7hl45dw3mggkhz15ap6knvv8hdz"; depends=[gaston Matrix RcppParallel]; };
-  rNeighborQTL = derive2 { name="rNeighborQTL"; version="1.1.0"; sha256="01c535q09cnmlb41cjh4907wp60v2pvi4vagc1ichbmqgfw7xp8r"; depends=[gaston Matrix qtl]; };
+  rNOMADS = derive2 { name="rNOMADS"; version="2.5.0"; sha256="1symwz83v5lwl651lcyky2v4a13am4hhr1wmvliyvd9zyifkxsnq"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; };
+  rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.2.2"; sha256="14w75p1x41gfcapn7xnyml8dh0lif14z4y950hw9a41ikbrn62r7"; depends=[gaston Matrix RcppParallel]; };
+  rNeighborQTL = derive2 { name="rNeighborQTL"; version="1.1.1"; sha256="0h5xw3pndm964rvd3723s9cmzmxdqlq9kfzlzpd1w9z7izmw9wxg"; depends=[gaston Matrix qtl]; };
   rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; };
   rPACI = derive2 { name="rPACI"; version="0.1.2"; sha256="1lk2971590ivw5g65kj99qjn6zdsz9jb7zk0hggf82jmz4rfa175"; depends=[bnlearn]; };
   rPAex = derive2 { name="rPAex"; version="1.0.1"; sha256="1v85qy8fg6vf1fqqqawzw4i9sfaihdqzbs0h91hpqbzkc4v7n2bb"; depends=[agricolae raster]; };
@@ -12872,7 +13425,7 @@ in with self; {
   rSEA = derive2 { name="rSEA"; version="2.1.1"; sha256="18108ds65ykxygbw1s4i5rb1ngzwymv1x3dhcv1lcwkmqplnaar9"; depends=[ggplot2 hommel]; };
   rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
   rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; };
-  rSPARCS = derive2 { name="rSPARCS"; version="0.0.9"; sha256="0dk9xs1b9zhsbdqva1wc0gs1rvcc3wvclwnxvc0r4i7fbfn2an8i"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; };
+  rSPARCS = derive2 { name="rSPARCS"; version="0.1.0"; sha256="0k46nhkdn68c7h7bbbdfwl02bldi1m3m62zbp20kh8np9bxy1rnk"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; };
   rSPDE = derive2 { name="rSPDE"; version="0.4.8"; sha256="1m8ys6k3f1jy9iiby36sw0gvz282bhpzgnwa801hv59k411wrh2g"; depends=[Matrix]; };
   rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; };
   rSymPy = derive2 { name="rSymPy"; version="0.2-1.2"; sha256="0jdl8ss3dbgjqrmmppb0ix1gqk9g28pbh6w5sybil046ic83s13i"; depends=[rJython]; };
@@ -12880,7 +13433,7 @@ in with self; {
   rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; };
   rTensor = derive2 { name="rTensor"; version="1.4.1"; sha256="1ir2zqs3bvcfi9xwhj1l29qhnh5qvagz9cpw99lb2w73i28x47vz"; depends=[]; };
   rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; };
-  rTorch = derive2 { name="rTorch"; version="0.0.3"; sha256="1v7zvjkbllcjria7slv958bpwv1r0p3li2i8wq55hgm7g7iyfz1j"; depends=[data_table jsonlite logging R6 reticulate rstudioapi]; };
+  rTorch = derive2 { name="rTorch"; version="0.4.2"; sha256="03a9vls09mgd77xm1q1h1pqw4q026rdibbjr218706h4iqphrqm7"; depends=[jsonlite reticulate rstudioapi]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
   rWind = derive2 { name="rWind"; version="1.1.5"; sha256="1fdnbh6yprgbysv6j6i108q9z6b7r17kb2hg4i4sa97c2jlcb39s"; depends=[gdistance lubridate Matrix raster]; };
@@ -12888,26 +13441,27 @@ in with self; {
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   rabhit = derive2 { name="rabhit"; version="0.1.5"; sha256="0dqzcv241g2b2slygq87w4qkdxalr58zs61k7485b8745xansxmv"; depends=[alakazam cowplot data_table dendextend dplyr fastmatch ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly plyr RColorBrewer reshape2 rlang splitstackshape stringi tidyr tigger]; };
   rabi = derive2 { name="rabi"; version="1.0.2"; sha256="0jndx1gvsnsv1xrx3ismgvjp7d4kj3436zcawvw32c5klvxx0y4j"; depends=[numbers polynom shiny stringdist]; };
-  raceland = derive2 { name="raceland"; version="1.1.0"; sha256="1bhgzr8wq693c9djyvramc9cljzdhgkbga6p9785azpvn7hc6gd5"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; };
+  raceland = derive2 { name="raceland"; version="1.1.1"; sha256="1sb56id7h1nm34a7kf6abfxwh4kmnnzc51x23cijq6fd3jm4ggnr"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; };
   racir = derive2 { name="racir"; version="2.0.0"; sha256="0qpjnaifx4z1jvyrc8p5jny0ci20w2ri1rs68sv9b93nkaiixnps"; depends=[]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
   radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; };
   radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; };
   radiant = derive2 { name="radiant"; version="1.3.2"; sha256="02qc7s64ryfn0l88kfj61kdnrg8gl6dmrxzscgqh85fc1yaipjcf"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; };
   radiant_basics = derive2 { name="radiant.basics"; version="1.3.4"; sha256="0y4s3zhphkaxlgwmiz96nwxq1s87i2i1mnph062xghlm7x92bwc3"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data scales shiny tidyr]; };
-  radiant_data = derive2 { name="radiant.data"; version="1.3.10"; sha256="09a3wn3gl1zjq5zsc5zaxyq71dg5qnpk57bmwd6qy8w99g2clm8c"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; };
+  radiant_data = derive2 { name="radiant.data"; version="1.3.12"; sha256="08bqqrfvpgyf613ikihwfnzb23l23f5nfs7zynnxbjxc1zfhbpny"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; };
   radiant_design = derive2 { name="radiant.design"; version="1.3.5"; sha256="1514s21jybyvpi2sx06xsxfrzgg07x7xxhwsazc61v3w1mllj2xw"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; };
-  radiant_model = derive2 { name="radiant.model"; version="1.3.13"; sha256="18j6yyrqf8yiix6nhx89n4s78vs0559b3j58srdkpcncd99s6451"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich shiny stringr tidyr xgboost yaml]; };
+  radiant_model = derive2 { name="radiant.model"; version="1.3.14"; sha256="1z44p1bd1s7pfyx63sfy4akmcbs9wxkq297hpixpy4yy0ba3llpz"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich shiny stringr tidyr xgboost yaml]; };
   radiant_multivariate = derive2 { name="radiant.multivariate"; version="1.3.5"; sha256="1khgy3zj0q155dyky1bd2wfdj6r8jgw8aa6a2nj0rbnwa5zam913"; depends=[car clustMixType dplyr ggplot2 ggrepel gower GPArotation lubridate magrittr MASS patchwork polycor psych r_import radiant_data radiant_model rlang scales shiny]; };
   radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; };
   radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; };
   radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; };
   radlibs = derive2 { name="radlibs"; version="0.2.0"; sha256="1xl7pacqgiv68ay7mkr6bkx3rqqr7z8b9yh42n4zm7ybqfxbx6dr"; depends=[data_table lexicon stringr]; };
   radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; };
-  radsafer = derive2 { name="radsafer"; version="2.2.2"; sha256="1i0qbj8bx6gqr70c178lsaihaiapcmnij7clqci57g304ig59afr"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang scatterplot3d stringr]; };
+  radous = derive2 { name="radous"; version="0.1.0"; sha256="0vny1dw67xqp9wsrmqr4l7nphjf3jnzrhwx5qwjb16bnsfzcnjfd"; depends=[glue httr janitor readr]; };
+  radsafer = derive2 { name="radsafer"; version="2.2.3"; sha256="0cb5s6wgx5yp8500vn42b5ryv8vwax7pq9x1wipn6p6lkn4c573z"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang scatterplot3d stringr]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
-  ragg = derive2 { name="ragg"; version="0.3.1"; sha256="1ww1fwzzpj5zdzldrlydll89nlmqr13angdak6fzjin16sfmvhhj"; depends=[systemfonts]; };
-  rags2ridges = derive2 { name="rags2ridges"; version="2.2.2"; sha256="1xayfj9ac1czl6pipfnr3a3r0jrdfvsqiksf9w4blavpp9xv9dbp"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; };
+  ragg = derive2 { name="ragg"; version="0.4.0"; sha256="01513bxcf77qiivzjg13z7j2yigcrl4w0hb6ss8dmhm3fjbd631q"; depends=[systemfonts textshaping]; };
+  rags2ridges = derive2 { name="rags2ridges"; version="2.2.4"; sha256="1xdk39jk357g6i2aav4c236xpcm7i7836y0zfm68gyw00jrbl6hq"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; };
   ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.4"; sha256="17i3z0p3a4dqa0bch5l1r830w5nlxhdg71y82jipp6cfiwli588z"; depends=[abind Biobase CGHbase expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; };
   ragtop = derive2 { name="ragtop"; version="1.1.1"; sha256="0vgc2q71g8ysccq19kbk9a4swxgd5qj91xm4bshfgdg5chxqnb50"; depends=[futile_logger limSolve]; };
   rai = derive2 { name="rai"; version="1.0.0"; sha256="0qimfzchbrarkwmv3mxxbdgvqzk16sc8m1h140zm0cnfgr2pvi5p"; depends=[dplyr ggplot2 readr rlang]; };
@@ -12917,9 +13471,10 @@ in with self; {
   rainette = derive2 { name="rainette"; version="0.1.1"; sha256="1s9xwc5mw5m3ax3wyjnwjgh18glbhr1wzsp867fpk7s9bdzfxl9s"; depends=[dendextend dplyr formatR future future_apply ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda RColorBrewer Rcpp rlang RSpectra shiny stringr tidyr]; };
   rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; };
   rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; };
-  ralger = derive2 { name="ralger"; version="2.0.1"; sha256="1y6zrd1r331fpwdx0hghqn2d389fpdxj2fny58n415knvzc2g1gw"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; };
+  ralger = derive2 { name="ralger"; version="2.2.0"; sha256="1gcs1yqdk0814q48sfjnhm409n86iliz4fkjg70d57a79gqrldfc"; depends=[crayon curl dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; };
   ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; };
-  ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; };
+  ramcmc = derive2 { name="ramcmc"; version="0.1.0-1.1"; sha256="15bgjr2m4zx95bkwak1v87rjzcybsaa9hr21bjrpdn2zxw3jp3pk"; depends=[Rcpp RcppArmadillo]; };
+  rameritrade = derive2 { name="rameritrade"; version="0.1.4"; sha256="1znm0cifc8rp696l45zgqd8qwkam0br2j6fqnr642ciciyrl8lk7"; depends=[dplyr httr jsonlite lubridate magrittr urltools]; };
   ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; };
   ramlegacy = derive2 { name="ramlegacy"; version="0.2.0"; sha256="0q8qks8qapar12dzlkxlbvw4rj7qxmfw64cph834ckm4z7sis873"; depends=[cli crayon httr rappdirs readxl]; };
   ramps = derive2 { name="ramps"; version="0.6.16"; sha256="1az2wp1jrf4yszcgq9l18g4b9bi2hkg0q6nymdaksbn20jkhwg32"; depends=[coda fields maps Matrix nlme]; };
@@ -12961,27 +13516,28 @@ in with self; {
   rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; };
   rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; };
   rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; };
+  rapsimng = derive2 { name="rapsimng"; version="0.1.0"; sha256="087qjx5p0z4gv6zp52k4k49gnyxl1b6m0iy5337is5fv6r6rknsl"; depends=[dplyr jsonlite magrittr rlang tibble tidyr xml2]; };
   raptr = derive2 { name="raptr"; version="0.1.7"; sha256="1gm99nnvn3b9xz6216masv7ji8j8vrkprzprkba5y1h22gzwxd3n"; depends=[adehabitatHR assertthat BH boot doParallel ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; };
   rare = derive2 { name="rare"; version="0.1.1"; sha256="0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss"; depends=[glmnet Matrix Rcpp RcppArmadillo]; };
   rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
   rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
   rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; };
-  rasciidoc = derive2 { name="rasciidoc"; version="2.1.3"; sha256="12ylvzjfxrqy3yv8nw95z0mx9v9gv94v4ifiblss5r73kdgdbgs5"; depends=[document git2r highr knitr xfun]; };
+  rasciidoc = derive2 { name="rasciidoc"; version="3.0.0"; sha256="17k812ly2iagdy29c29iqn9yxg60zvsq330vcbwxqilgnm3h9kkc"; depends=[checkmate document git2r highr knitr reticulate xfun]; };
   rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; };
-  rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; };
-  raster = derive2 { name="raster"; version="3.3-13"; sha256="1s6457rq94qvm3s2lqscs2c2gn5kzcpxa13i8nhlgb1klx5kams7"; depends=[Rcpp sp]; };
+  raster = derive2 { name="raster"; version="3.4-5"; sha256="19g4chd0nyhnz6hc2j0v9ahjcgz64vvja4y3mrj1pfis1dwhsqn6"; depends=[Rcpp sp]; };
   rasterDT = derive2 { name="rasterDT"; version="0.3.1"; sha256="1dl083jm4x0shl7lq4in2alksgi63hp1p7j2cnsvkmwjaxygzm9v"; depends=[data_table fasterize raster sf]; };
   rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
   rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; };
-  rasterVis = derive2 { name="rasterVis"; version="0.48"; sha256="09mcdvhz3x5vsazd8xvm2z4jy69272ia0gsc8r94rnchcxl415wj"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
-  rasterdiv = derive2 { name="rasterdiv"; version="0.2-1"; sha256="0zd5phvkrx5hhl77kyisrqy5in8psjanpp1yw39a79kcs0dyqk2y"; depends=[doParallel foreach pbapply pbmcapply proxy raster svMisc]; };
+  rasterVis = derive2 { name="rasterVis"; version="0.49"; sha256="0d12h7xqcwy1wps6yya9nzfppbnsxpmbkqmy3a8pvxpg81l632kk"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
+  rasterdiv = derive2 { name="rasterdiv"; version="0.2-2"; sha256="1sqsxjpjwv20nphga8bbjc904bl4j7fiwfrz5q3b1m81xjnkj7rv"; depends=[foreach progress proxy raster svMisc]; };
   rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; };
   rasterly = derive2 { name="rasterly"; version="0.2.0"; sha256="1fv0ayh8r78qss7ikcwnj0i5x8iyz4c3icsfb554zji9bw30x7qr"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; };
   rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; };
   ratPASTA = derive2 { name="ratPASTA"; version="0.1.2"; sha256="1ddxryccsq0v3lvnjyl8x4z1yxw59zq5g4lwh5pnn1cykl0z7q1f"; depends=[dplyr ggplot2 ggpubr ggsci hms lubridate magrittr plyr rjson stringr tidyr]; };
   ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; };
   ratematrix = derive2 { name="ratematrix"; version="1.2.2"; sha256="08zc3yacgmd7y50nykbdqwq655jn3gz4x1ywrhvz8fymsdhdd39g"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; };
+  rater = derive2 { name="rater"; version="1.0.0"; sha256="1z0da2x85gb5qizgqaki55yyvilcbcwz5f5lmap1iv6l3qs3475n"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
   raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
   ratesci = derive2 { name="ratesci"; version="0.3-0"; sha256="1mdx47xpgjrjbb3lybajdmxb87dqr6cvv3fsvwfx0n629mjbih4z"; depends=[]; };
@@ -12998,15 +13554,18 @@ in with self; {
   rayimage = derive2 { name="rayimage"; version="0.3.1"; sha256="0xqasgyk4ws79325p6gxdkr0mf3lzd097bmzhizsxdp1gjma0r52"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; };
   rayrender = derive2 { name="rayrender"; version="0.14.0"; sha256="0vikd5ahap7aahsv66xwkysj82hnhqgwf4dqfjrk82akagyznzg3"; depends=[assertthat decido magrittr png progress purrr raster rayimage Rcpp RcppThread tibble]; };
   rayshader = derive2 { name="rayshader"; version="0.19.2"; sha256="0qhv1wxgkkgksmfq19c894lgiiw4i22w7cwjs2x1r8n2b7xgb178"; depends=[doParallel foreach magrittr png progress raster rayimage Rcpp RcppArmadillo rgl scales terrainmeshr]; };
-  rbacon = derive2 { name="rbacon"; version="2.4.3"; sha256="124iraj28ydjwky6j77h1sj5640l09gwwnr1xdz7fjjp8w0yhhiv"; depends=[coda Rcpp]; };
+  raytracing = derive2 { name="raytracing"; version="0.1.0"; sha256="052j053l4104pk7cbkkqrj3kkiip9lv2lf0xl2xsray62n6p07m4"; depends=[ncdf4 sf units]; };
+  rbace = derive2 { name="rbace"; version="0.2.2"; sha256="04jcbrcp0l1v2q8hhwr5w72spdja8r0fw71v68kx39yigy7m1sgp"; depends=[crul data_table tibble xml2]; };
+  rbacon = derive2 { name="rbacon"; version="2.5.0"; sha256="1ivxa71gc7hxb8qqlf84afq0a4yzwb3ya77lifssplhfdajrn58a"; depends=[coda IntCal Rcpp]; };
   rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; };
   rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
   rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
+  rbenvo = derive2 { name="rbenvo"; version="1.0.5"; sha256="0clg2cxyi60yz2mdp95v0hd5gqhk8h2xgmx68852jcpbjf76xasa"; depends=[dplyr forcats ggplot2 lme4 lubridate magrittr Matrix purrr rlang sf stringr tidyr]; };
   rbgm = derive2 { name="rbgm"; version="0.1.0"; sha256="0jw7p6l0il0fz5rq7ra731xzj06aqqvm9s1r0hwa4rd74lkg198n"; depends=[dplyr geosphere raster reproj rlang sfheaders sp]; };
   rbhl = derive2 { name="rbhl"; version="0.9.0"; sha256="0n9jxyrpq1s0yq13ylkhm0qcjlm8b25p19vpxv2s4wxan758zypd"; depends=[crul jsonlite plyr tibble xml2]; };
   rbi = derive2 { name="rbi"; version="0.10.3"; sha256="09hqv235fry60nqvd1is8n7szkq96w160xpw2pdxqdxvlh52cf2r"; depends=[data_table ncdf4 processx reshape2]; };
   rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.2"; sha256="1inbf3kpl4y46m7v36akrr24112y4sd3d8yqia16i32wxf53wql5"; depends=[data_table lubridate Matrix rbi reshape2]; };
-  rbibutils = derive2 { name="rbibutils"; version="1.0.3"; sha256="04q43sjysy4f946d6zw303m7aqywl7x2s6xfljvw7p4i4za9vn4n"; depends=[xml2]; };
+  rbibutils = derive2 { name="rbibutils"; version="2.0"; sha256="1vfg2188i4dyhrmvnwpsh2la8qkd4wkryz2fpj4cppi1wfz3ml83"; depends=[]; };
   rbin = derive2 { name="rbin"; version="0.2.0"; sha256="18g6s4m0yc1bzrymk8km553kcwi4vj16b6mxw2lmv48z7243iq87"; depends=[data_table ggplot2]; };
   rbiom = derive2 { name="rbiom"; version="1.0.2"; sha256="0zg1ibxz3h9mmb4s2gwlliahni6dgqqn849pcxcyhpzyc81av85y"; depends=[magrittr openxlsx plyr R_utils Rcpp RcppParallel rjson slam]; };
   rbiorxiv = derive2 { name="rbiorxiv"; version="0.2.0"; sha256="1xb0ndwfnk26qifnc7fy6jy6sm30p5264w1lk8mayj90nf9b1aks"; depends=[httr jsonlite]; };
@@ -13018,7 +13577,6 @@ in with self; {
   rbmn = derive2 { name="rbmn"; version="0.9-3"; sha256="08rcxvxi1wav2ysnp5ydkyinykcjw3vwb56g8zdx9ziqbd7cwkgv"; depends=[MASS]; };
   rbokeh = derive2 { name="rbokeh"; version="0.5.1"; sha256="122slyj1a4v7ph1zdcradzkr4hjncg34i2ld82mbk8nf72ra7ss8"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; };
   rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
-  rbraries = derive2 { name="rbraries"; version="0.2.0"; sha256="00fl1vr8m1lalib1j35d7g0ybm4wv6qvy0gzl37ij2cc844ij6jd"; depends=[crul data_table fauxpas jsonlite tibble]; };
   rbridge = derive2 { name="rbridge"; version="1.0.2"; sha256="0m4c61rdrhq1jw3rwq2ld29g5dchbk4sfpnq0wmwbvzhdjq76plc"; depends=[dplyr Matrix Rcpp RcppArmadillo]; };
   rbscCI = derive2 { name="rbscCI"; version="0.1.0"; sha256="12r1f4yy5hx0sx1q77yzq3wxhbx8zgj9d1jfpa1hagvwcyd8bdxb"; depends=[BH Rcpp]; };
   rbtc = derive2 { name="rbtc"; version="0.1-6"; sha256="1z5p1jn5b0hzwcbdpiwj224h45x01bbsgkskllir5j13l416561p"; depends=[gmp httr openssl rjson]; };
@@ -13028,7 +13586,7 @@ in with self; {
   rbw = derive2 { name="rbw"; version="0.2.0"; sha256="01y33gbljb6bvbdsr42vgfi75sywhwn313y5jv1y4kkc4iqzag1r"; depends=[rlang]; };
   rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; };
   rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; };
-  rcarbon = derive2 { name="rcarbon"; version="1.3.3"; sha256="11qdqzxjjawxxkkamamb82wf6kdqgfvxcjbbmbzhg948dj4rfccv"; depends=[doSNOW foreach iterators knitr snow sp spatstat]; };
+  rcarbon = derive2 { name="rcarbon"; version="1.4.1"; sha256="1l73ki1vziglin814dxp32n3pd1agbgs7h4b6mm3a9s98a32k2hf"; depends=[doSNOW foreach iterators knitr snow sp spatstat]; };
   rcartocolor = derive2 { name="rcartocolor"; version="2.0.0"; sha256="08ljaag2mnhz2671zvwji1sp003z94lz30vjidmybm9fp8piqw5g"; depends=[ggplot2 scales]; };
   rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; };
   rcbsubset = derive2 { name="rcbsubset"; version="1.1.4"; sha256="0sfsmnxs4c8blzg0bb2ffb2xcsjv7pp39arnda988f7b2aas59wj"; depends=[MASS plyr]; };
@@ -13039,7 +13597,7 @@ in with self; {
   rcdk = derive2 { name="rcdk"; version="3.5.0"; sha256="05bz2pnvfci8sd9l4i0jay8rwvfnw87r9xqzvq5306mfbhik20fy"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
   rcdklibs = derive2 { name="rcdklibs"; version="2.3"; sha256="16ijvzsc1irpz1z2xd82i2saafsvpn0x5lr54c5gx9bfb35gacyp"; depends=[rJava]; };
   rchallenge = derive2 { name="rchallenge"; version="1.3.2"; sha256="1qib09vlajw62zdhx8gkmmhlgc8k0dqdxx8ai8zdwxhfff253glc"; depends=[knitr rmarkdown]; };
-  rcheology = derive2 { name="rcheology"; version="4.0.2.0"; sha256="08345syv8cca5fhxcs8g0vifrvz1ii5pb5djlklcyqnw7ly52i9h"; depends=[]; };
+  rcheology = derive2 { name="rcheology"; version="4.0.3.0"; sha256="00qv9778k4w8ciz9kgycnkmamp91qbz1bsv835qshnvi0p54rkmw"; depends=[]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
@@ -13048,40 +13606,39 @@ in with self; {
   rclipboard = derive2 { name="rclipboard"; version="0.1.2"; sha256="04vkxz2wqb3q3igjqgaaim3sb71h046c2b8rhvg51hkp1win8s5w"; depends=[shiny]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.3"; sha256="1d4kzgfqy72r6b7bn1j4znyksrycgypx1jjvpv9lrmvn37mpkdhs"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; };
   rco = derive2 { name="rco"; version="1.0.1"; sha256="0sjfgblvrnd1jmvqgxc9xm94c46kmr9syxynx9zdd9gsqcwc6hza"; depends=[]; };
-  rcompanion = derive2 { name="rcompanion"; version="2.3.25"; sha256="10x2ps110a849qgr7pggdz5436a2bzzfv774xic34fnpki32zvzs"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
+  rcompanion = derive2 { name="rcompanion"; version="2.3.26"; sha256="1ic2rmp00kf3sr04jmvlx602jkqgvj46xfjdi45f4z201vli9ihd"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.4.0"; sha256="0q5dprz0ag04w265bk7isd2lr61nahf223qza47m0izd9nyi9h8a"; depends=[crul hoardr jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; };
   rcosmo = derive2 { name="rcosmo"; version="1.1.2"; sha256="01a8g81ld0dy2bn0mqmpdz2bpd7g52jn67136hhvpxndnnlh384k"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; };
-  rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; };
   rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.4.2"; sha256="1b41f636bkr0mr72klyad4fyx5zf129c9h1523rkfkyxrlf527yx"; depends=[dplyr forecast ggmap htmltools igraph KernSmooth leaflet leafsync lubridate pals raster Rcpp rgdal sp]; };
-  rcrossref = derive2 { name="rcrossref"; version="1.0.0"; sha256="1743qy5q0n2ij7x88nkk99w59vnl7g9fwpkwgb3a3s235f6lb4df"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; };
-  rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; };
+  rcrossref = derive2 { name="rcrossref"; version="1.1.0"; sha256="1n33skb3mwcn9xfd49p8m72z3kqz8n6dj48d286xdpd0zlcahqbh"; depends=[crul dplyr DT jsonlite miniUI plyr R6 shiny stringr tibble xml2]; };
   rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; };
+  rct3 = derive2 { name="rct3"; version="1.0.4"; sha256="1xm5kni2mnpzby8basmwbm1abg615i4mlf6fn9jr5il94q1bdgly"; depends=[]; };
   rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; depends=[magrittr]; };
+  rdacca_hp = derive2 { name="rdacca.hp"; version="0.1.0"; sha256="0cnf46xs7q0bgwi4s3qdyqsq21nas2sas9vkn8i555h39snpp41v"; depends=[vegan]; };
   rdatacite = derive2 { name="rdatacite"; version="0.5.2"; sha256="07zbxr89fxx9nlp5w7n60rjm3prck08h0fjrq0pnpkbnnkx9cv9a"; depends=[crul jsonlite tibble]; };
-  rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; };
-  rdbnomics = derive2 { name="rdbnomics"; version="0.6.2"; sha256="1a63nghiy2hlxx12fr5lnmv7zjqpb1bbl4iq89p66k42cpyn8v9l"; depends=[curl data_table jsonlite]; };
+  rdataretriever = derive2 { name="rdataretriever"; version="3.0.0"; sha256="1a01lrzn7gcxid01r0l8nnbpbryvs07z9nf43l1143w2n9bvgn24"; depends=[reticulate semver]; };
+  rdbnomics = derive2 { name="rdbnomics"; version="0.6.4"; sha256="1h32wxjykz9y3k48rx31cvy485gsx8ix3194r2zgxlwdza3rl3lb"; depends=[curl data_table jsonlite]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
-  rddensity = derive2 { name="rddensity"; version="2.0"; sha256="1fsc3b6h09y3648p8dwdbdlncj1vii7ljvgrdjb4mkq3bl1x137j"; depends=[ggplot2 lpdensity]; };
-  rddtools = derive2 { name="rddtools"; version="1.4.0"; sha256="04xxrhfxhamzjprbr5g538h4yb0n10mm48pi8ak4m6y7b1gd5a7s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd rdrobust rmarkdown sandwich]; };
+  rddensity = derive2 { name="rddensity"; version="2.1"; sha256="1zdzsz5xca3y05h4jd3z30s0521xxz6z96ns887pdi96xxsgdila"; depends=[ggplot2 lpdensity]; };
   rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; };
   rdefra = derive2 { name="rdefra"; version="0.3.8"; sha256="00wgcc0mzjvinvj767mzrx8idq8w7b7bi4d82hvldbki9hadjh7d"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
   rdflib = derive2 { name="rdflib"; version="0.2.3"; sha256="1hc6a0spmbd42lf7zjkwjv4glagfzsdilv5hm8c76cj36incg6qg"; depends=[dplyr jsonld readr redland stringi tidyr]; };
   rdfp = derive2 { name="rdfp"; version="0.1.4"; sha256="1490227hhfjjscfmd8p897v1ijs61pk5sc0a2vr9yjnfmsnxpqrl"; depends=[curl data_table dplyr httr lubridate plyr purrr readr XML xml2]; };
-  rdhs = derive2 { name="rdhs"; version="0.6.3"; sha256="01pjb9wjad22rv85z0rxrh06wyzksy0xgd656xd3lck0ixpr88hx"; depends=[digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; };
+  rdhs = derive2 { name="rdhs"; version="0.7.1"; sha256="1np8d78rwfcylplbjzj4vhd3acganarllabgbiyk6wby04g0qdd7"; depends=[brio digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; };
   rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; };
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
   rdist = derive2 { name="rdist"; version="0.0.5"; sha256="1jb6dgp1f3307h96v20pjxpkxfz08ij98w0yj5cdx1g2kwfl0h0w"; depends=[Rcpp RcppArmadillo]; };
   rdiversity = derive2 { name="rdiversity"; version="2.0"; sha256="1x9500iq9dkqpq79m1fzl2f1c7bbhrq2v0kqz8wx6dd6dlkgkpqn"; depends=[binaryLogic reshape2]; };
-  rdlocrand = derive2 { name="rdlocrand"; version="0.7"; sha256="0sbb5ba1w6qc5m33kpb5mgskvp8wz82zr1w58qfazs90pvksv13z"; depends=[AER sandwich]; };
-  rdmulti = derive2 { name="rdmulti"; version="0.5"; sha256="138ikxs1jg6w0h0xha60h7c0k1aj40f8qix3qhbyhk3dxgqi11dz"; depends=[ggplot2 rdrobust]; };
+  rdlocrand = derive2 { name="rdlocrand"; version="0.7.1"; sha256="0qgah3izq9zcqk945ambfm79n5zxb9p9ykpqnsi68d50xyy1qs8k"; depends=[AER sandwich]; };
+  rdmulti = derive2 { name="rdmulti"; version="0.6"; sha256="09jk9a4dkzrmibg48qa2m2dd2a5aq18biqck9smxyrwpcibin2n8"; depends=[ggplot2 rdrobust]; };
   rdnb = derive2 { name="rdnb"; version="0.1-3"; sha256="0g85masa1a2c26l12i6ck1hdjvm2saqdlqnwb2p29rm9spmc04qg"; depends=[brew httr stringr xml2]; };
   rdoc = derive2 { name="rdoc"; version="0.1.0"; sha256="0ac6413jyrr7m25z30n3bpiafsvjx38ik6rrjzsiqxrfp41j6l9x"; depends=[cli crayon prettycode R6]; };
   rdomains = derive2 { name="rdomains"; version="0.1.9"; sha256="0pfz438qiz8mqh391nlhz2q2r8830y5i0sg1ajhppj1hq2cgqqbg"; depends=[aws_alexa curl devtools glmnet httr jsonlite Matrix rlang urltools virustotal XML xml2]; };
   rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; };
-  rdpower = derive2 { name="rdpower"; version="0.5"; sha256="1kqfxh2g9dar130d0wld64iyd6iq51s2zrsjrprg1s3ssgi9xmb6"; depends=[rdrobust]; };
-  rdrobust = derive2 { name="rdrobust"; version="0.99.8"; sha256="0ihaz24xqky78jl5w17x71bbndh2ldhhqkk2cifhil4m4hn2cs38"; depends=[ggplot2]; };
+  rdpower = derive2 { name="rdpower"; version="2.0"; sha256="1yw563nz7dc24ba7vh0w85gp3rhr2ddx3qkpfdr1iwq8a8g1hg01"; depends=[rdrobust]; };
+  rdrobust = derive2 { name="rdrobust"; version="0.99.9"; sha256="1sx1mqjk3927kpn0567ia1rch4kmg9zwrc7mgcpds60nbfb8wcl7"; depends=[ggplot2]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.8.2.1"; sha256="02rhcq1vn349ddjkqamxb0wjb3z3m4wzkvin1mprcz4fzrjxgbdr"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; };
   rdryad = derive2 { name="rdryad"; version="1.0.0"; sha256="00f1qwsbwg5jggm5b83nhk1lxyw272rv2kg77bcwqvlf3074c3mz"; depends=[crul curl hoardr jsonlite mime tibble zip]; };
   rdtLite = derive2 { name="rdtLite"; version="1.3"; sha256="1njn6x2k03qxmb96d5sl7jz0xq5wabbixn9xy55ypw8g1k0cgmd1"; depends=[curl digest gtools jsonlite knitr provSummarizeR provViz rlang rmarkdown sessioninfo stringi XML]; };
@@ -13089,8 +13646,8 @@ in with self; {
   rdwplus = derive2 { name="rdwplus"; version="0.1.0"; sha256="1y4dnm2bb0w6pim4h79mv2km88s78vhsn5fhs7z45m0564hgk0x2"; depends=[raster rgrass7]; };
   reReg = derive2 { name="reReg"; version="1.3.0"; sha256="0nj1zvl3hyh5g1ql9d8afax84dsdfc340j1b74wsknriyx4izzvg"; depends=[BB ggplot2 MASS nleqslv Rcpp RcppArmadillo reda rootSolve scam SQUAREM survival]; };
   reactR = derive2 { name="reactR"; version="0.4.3"; sha256="0wwqyvgvzp6q3zzd4l6s0jz6z7jm3khlcxp0ahhv5xm07z3ygk2w"; depends=[htmltools]; };
-  reactable = derive2 { name="reactable"; version="0.2.0"; sha256="037d3za9r9pa5isn7aqi4jzw43ki6i8aq9vir3fmhzwn6lja3z72"; depends=[digest htmltools htmlwidgets jsonlite reactR]; };
-  reactlog = derive2 { name="reactlog"; version="1.0.0"; sha256="1pajxd9k208s06sava2gqip22pzwlyslnfvkbkfw47mp4wb7zmk9"; depends=[jsonlite]; };
+  reactable = derive2 { name="reactable"; version="0.2.3"; sha256="17wl75cblm0rgq3chl96vj7wmbcmszss1zjppfccz1hcimfmlrpx"; depends=[digest htmltools htmlwidgets jsonlite reactR]; };
+  reactlog = derive2 { name="reactlog"; version="1.1.0"; sha256="0vngy7fixiighhaa0db8xfr6962jmrfn3675qrn3hj7rfh7siagz"; depends=[jsonlite]; };
   read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; };
   read_gb = derive2 { name="read.gb"; version="2.0.1"; sha256="049515v9pyxmarzy51m5wpbxdzp7iq5m5m20ilmywfrig7hz8jpl"; depends=[]; };
   readABF = derive2 { name="readABF"; version="1.0.2"; sha256="1lyjl3j62nrsml9vmgwbach9qm8mh2d2pxjj8sfbkkw79krvdnsd"; depends=[]; };
@@ -13101,25 +13658,28 @@ in with self; {
   readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; };
   readODS = derive2 { name="readODS"; version="1.7.0"; sha256="1hi217ab7hp15jsbzi5ak57cqf8jn2rv78bnn74q72gn9mrfra7n"; depends=[cellranger readr stringi xml2]; };
   readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; };
-  readabs = derive2 { name="readabs"; version="0.4.3"; sha256="11v34683d1c8dxkd3v4h67bxpzjkgp9xw06fa6ijhw1z8hsgmmy6"; depends=[curl dplyr fst hutils purrr readxl rsdmx stringi stringr tibble tidyr XML]; };
+  readabs = derive2 { name="readabs"; version="0.4.6.900"; sha256="12hhm5cdjh3rmzfq78r274mfxqmkbrdb3lk4c8992iic74a1ylr0"; depends=[curl dplyr fst glue httr hutils purrr readxl rlang rsdmx rvest stringi tidyr xml2]; };
   readbitmap = derive2 { name="readbitmap"; version="0.1.5"; sha256="14825906l326w59g6apy00j55jg3h5kx2r6s031f4gdkbrc7szbk"; depends=[bmp jpeg png tiff]; };
-  readbulk = derive2 { name="readbulk"; version="1.1.2"; sha256="0341sp9jqqci62zx6my4r50dwrysgjppjasx2lf1dj8w5bv559rd"; depends=[jsonlite plyr]; };
+  readbulk = derive2 { name="readbulk"; version="1.1.3"; sha256="0rqz0r5ygwgfqkzv2130sciz3j2p888c2005wsk1m5403syi78an"; depends=[jsonlite plyr]; };
   reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; };
   readit = derive2 { name="readit"; version="1.0.0"; sha256="1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9"; depends=[crayon haven jsonlite readr readxl]; };
   readmnist = derive2 { name="readmnist"; version="1.0.6"; sha256="0f2kp5r04k47gpvbj8x13c47zsis3bw3y8f5f37sh6jggblqr004"; depends=[]; };
   readobj = derive2 { name="readobj"; version="0.3.2"; sha256="0n25n02f5kn8zv90n2xzdasjnrqisl4n5szb667jw57v40b726cw"; depends=[Rcpp]; };
-  readr = derive2 { name="readr"; version="1.3.1"; sha256="1wz496rw0ah433p755n3xac8gh7yzid4xgdjzd1a7wmpkgilvy9k"; depends=[BH clipr crayon hms R6 Rcpp tibble]; };
+  readr = derive2 { name="readr"; version="1.4.0"; sha256="1fa67h4l9d30ig460xizgzl115i9pm3bk9dvsbrw6awbmf51ic82"; depends=[BH cli clipr cpp11 crayon hms lifecycle R6 rlang tibble]; };
+  readrba = derive2 { name="readrba"; version="0.1.0"; sha256="1bf7mnvswdyf62ip6xsl87kmgzz79y29p520spf374y75iclpb50"; depends=[curl dplyr httr lubridate purrr readxl rlang rvest stringr tidyr xml2]; };
   readroper = derive2 { name="readroper"; version="0.9.3"; sha256="00l731hryx0igj0x7knljs9xq4gaczmsgw2hh05ngrl9y5s528dc"; depends=[readr]; };
   readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; };
   readsdr = derive2 { name="readsdr"; version="0.1.0"; sha256="0qwjndbhpww3xlmppc9lmvmj2w4qd0yihj053fcp7ch81dimyins"; depends=[deSolve dplyr magrittr purrr rlang stringi stringr xml2]; };
   readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; };
-  readtext = derive2 { name="readtext"; version="0.76"; sha256="1k79db2aay15gdb52cqd87wnwk0pn27y45c65741rk8rgddk7lwj"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; };
+  readtext = derive2 { name="readtext"; version="0.80"; sha256="0q8ajnp99fwvh14ppkm2z3gqwdwmjrvxvsfb4q7ad0dhkqric05y"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; };
   readtextgrid = derive2 { name="readtextgrid"; version="0.1.1"; sha256="03qrbmlpbjwx4ia0ydv6m9lwzalsas9pdhds82mg5f8ir0cd0qi6"; depends=[magrittr plyr purrr readr stringr tibble]; };
   readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; };
   readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.2"; sha256="1nnakxj4jsh8wcwzciksa2s1pxjwa407lzmjy4fk82f68ir9jh51"; depends=[chk DBI hms lifecycle RSQLite tibble]; };
   readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; };
-  readxlsb = derive2 { name="readxlsb"; version="0.1.3"; sha256="1n3j2g18n908z7n275mjjha9l358z1dvyg3p8gpymb66vaz55ims"; depends=[cellranger Rcpp xml2]; };
+  readxlsb = derive2 { name="readxlsb"; version="0.1.4"; sha256="1qnfijspx8zwsmr1i6qb7vgaxazmvshq5mcxn79y0r2spszq419i"; depends=[cellranger Rcpp xml2]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
+  rearrr = derive2 { name="rearrr"; version="0.2.0"; sha256="0vgwmapngfibdfc0xyg93q63iijicay8yfvp3fi0yqjdzr4as1lq"; depends=[checkmate dplyr lifecycle plyr purrr rlang tibble]; };
+  reasonabletools = derive2 { name="reasonabletools"; version="0.1"; sha256="08i7wy4jic5v9ka7j716lj6p9r55sv46sqrxsy7ad6sgjvrzn0ss"; depends=[]; };
   rebird = derive2 { name="rebird"; version="1.1.0"; sha256="0l1wignhs4hsy0yshr9gh9mwy8h794injkl5f7flkl1m4c39rz8w"; depends=[assertthat dplyr httr jsonlite]; };
   rebmix = derive2 { name="rebmix"; version="2.12.0"; sha256="173b11183hlpazzs70c3zzsg3qakswkvhq63d2bihmy2qbn680zz"; depends=[mvtnorm]; };
   rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
@@ -13130,7 +13690,7 @@ in with self; {
   recapr = derive2 { name="recapr"; version="0.4.3"; sha256="1ypmjm92mzcmn29cl4zhp1vrgan6sdqqsl3x6dbr4nypfd1dx4f9"; depends=[MASS]; };
   recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
-  recipes = derive2 { name="recipes"; version="0.1.13"; sha256="1d3pmprkiz60w7lq5q4lpl5zlwf7fg7qghf7sq6xs1294w54gzbs"; depends=[dplyr generics glue gower ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; };
+  recipes = derive2 { name="recipes"; version="0.1.15"; sha256="0xif0ak3w90xmfzlxvb5pnzc3scpfl1pyhrjffi3mq4asvsd52l0"; depends=[dplyr generics glue gower ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; };
   reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; };
   recluster = derive2 { name="recluster"; version="2.9"; sha256="1nz5w4v5hhb3qjwxixc526gqsmr1imw582l9gj2acwar4z9mixjp"; depends=[ape cluster phangorn phytools picante plotrix vegan]; };
   recmap = derive2 { name="recmap"; version="1.0.7"; sha256="14mqc6kzwhcsbnkpl4hy2592rxgwpcpxwawq4x0kakbdjcskbfv8"; depends=[GA Rcpp sp]; };
@@ -13139,6 +13699,7 @@ in with self; {
   recommenderlab = derive2 { name="recommenderlab"; version="0.2-6"; sha256="19v3f0iggvwdmi8jw2k50w9b68wnzvdcwi0d727aqlhp3w760hfj"; depends=[arules irlba Matrix proxy recosystem registry]; };
   recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; };
+  reconstructKM = derive2 { name="reconstructKM"; version="0.3.0"; sha256="0fxdmvkm68g114nx2r2r8gy2lwqc5wkfcls7fpdfdfg0aazqqxwq"; depends=[dplyr magrittr rlang survival survminer]; };
   reconstructr = derive2 { name="reconstructr"; version="2.0.2"; sha256="0pzpd2l1b6y1b1lnd95lpc5s8niz7p56vkmxgyi6g6b25vh9c2vi"; depends=[openssl Rcpp]; };
   recorder = derive2 { name="recorder"; version="0.8.2"; sha256="1j3fqqp5vi8z3hxqgb887v9r8x0cl5jikiyx3c7arwna7k89215a"; depends=[crayon data_table]; };
   recosystem = derive2 { name="recosystem"; version="0.4.3"; sha256="122z5vd9yrbysyf4akkk9kfm0mcqv97g7zrp66mg47fkz8v6ak20"; depends=[Rcpp RcppProgress]; };
@@ -13148,8 +13709,8 @@ in with self; {
   reda = derive2 { name="reda"; version="0.5.2"; sha256="0anaxiskqq0lmdjaa8ac3nh772gwl6iwwzawdqpaiv571wj10s5h"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; };
   redcapAPI = derive2 { name="redcapAPI"; version="2.3"; sha256="1myycwdrlw1405fxc82zd8ps8bhdvf2ffsb91pia5ijf6952v8pf"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; };
   reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; };
-  redist = derive2 { name="redist"; version="1.3-3"; sha256="18asjam8hvayvnfysyjzbazjn27ds7163qhdq0p9aqlx03v89aa9"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
-  redland = derive2 { name="redland"; version="1.0.17-11"; sha256="1xbzz6iv4yal1gwplnb9d4z0xzrv25hnqmr6ima2aq9mirwr1l5b"; depends=[roxygen2]; };
+  redist = derive2 { name="redist"; version="2.0.2"; sha256="0qmhywm8yqa9myrm8h4w96nr5hdp13njca5mi3dg3fx5l6l74wz3"; depends=[BH coda doParallel dplyr foreach ggplot2 lwgeom magrittr Rcpp RcppArmadillo RcppEigen readr servr sf sp spdep stringr sys tibble]; };
+  redland = derive2 { name="redland"; version="1.0.17-14"; sha256="1fd79clxkn85ywvdsyy0j6mw057ir9202qw2962j8iqbvqai99qk"; depends=[roxygen2]; };
   redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; };
   redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; };
   ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; };
@@ -13158,20 +13719,19 @@ in with self; {
   refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; };
   refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; };
   refuge = derive2 { name="refuge"; version="0.3.2"; sha256="0ksznc72yvcscviqq6iysjkbkklqxff04q0rsh2l8gyy7g7m9415"; depends=[dplyr httr jsonlite tibble]; };
-  refund = derive2 { name="refund"; version="0.1-21"; sha256="09lbiyr642c3mgdgcy0j5j64s8k7nai4x7grzlh93apkaj8yrm44"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
-  refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; };
+  refund = derive2 { name="refund"; version="0.1-23"; sha256="1vax9dqaypjs7hdbdwadr7i275wqij115fdv81cjz3rfm8s9qiks"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
   regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; };
   regclass = derive2 { name="regclass"; version="1.6"; sha256="0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; };
   regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; };
   regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; };
   regexTestR = derive2 { name="regexTestR"; version="0.1.0"; sha256="1nfzzifqvhz3cjdr93pd4iyz5hb8v42v94r89b2ikc8ycc48k75g"; depends=[config data_table DT golem htmltools pkgload processx purrr RColorBrewer rvest shiny shinyBS shinythemes stringr tidyr xml2]; };
-  reghelper = derive2 { name="reghelper"; version="0.3.6"; sha256="0m90q6iq2y5fjdwwplvpjymzhc8kr2cdfb2gghfrzfzxnd3m4fg7"; depends=[ggplot2 lme4 nlme]; };
+  reghelper = derive2 { name="reghelper"; version="1.0.1"; sha256="16q3f1my5r2s7v4l7mpql86vmsw6w364zn8g97ccp2brqlpzfhd5"; depends=[ggplot2 lme4 nlme]; };
   regions = derive2 { name="regions"; version="0.1.5"; sha256="007pgqyphl5nq0ym1bgz89li2pnps2kcfn7h8jkvpi36pmig5zpn"; depends=[countrycode dplyr glue magrittr purrr readxl rlang stringr testthat tidyr tidyselect]; };
   registr = derive2 { name="registr"; version="1.0.0"; sha256="1ysj2ab69w6g71d1kpcwyq0py71w6h7lfhk4nzgn2dhh6k8whwbn"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp RcppArmadillo tidyr]; };
   registry = derive2 { name="registry"; version="0.5-1"; sha256="1k3j6dx350awamr0dwwgkhfs46vsnj4nf08iw5byq0x7n3nkdsnz"; depends=[]; };
   reglogit = derive2 { name="reglogit"; version="1.2-6"; sha256="1nnn8n5sqhbd3nzmwnpmcsmaxxxaqwbna7xm7q9vk4cqz9cm9b9s"; depends=[boot Matrix mvtnorm]; };
   regmed = derive2 { name="regmed"; version="1.1.0"; sha256="17s6q36l5jnp1klpw7qb4ab80zhc31jfccr96sy2vx6qx9rr9zw9"; depends=[glasso knitr Rcpp RcppArmadillo]; };
-  regmedint = derive2 { name="regmedint"; version="0.1.0"; sha256="0bd5ml9y8cxcrkkihy20n2h0g4b64w4kdzyb9caxwagvw6307sav"; depends=[assertthat Deriv MASS Matrix sandwich survival]; };
+  regmedint = derive2 { name="regmedint"; version="0.2.0"; sha256="1l9f6biqjc59lpcvmmvg5rikcqs0liaj0y3ivqgv3wldq0yzl5pg"; depends=[assertthat Deriv MASS Matrix sandwich survival]; };
   regnet = derive2 { name="regnet"; version="0.4.0"; sha256="0qb7sp464fyxn0bslkapjni3pzk7l6fdgabfbzja08flsr63r4mh"; depends=[glmnet Rcpp RcppArmadillo]; };
   regplot = derive2 { name="regplot"; version="1.1"; sha256="048w0hnd2y8k27msjhw2g4ygck6i09698qk24sz7563z82gvj52w"; depends=[beanplot lme4 sm survival vioplot]; };
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
@@ -13179,20 +13739,19 @@ in with self; {
   regress = derive2 { name="regress"; version="1.3-21"; sha256="0mkf1dyg0r09ifdvmc3g6b0q0h819j0kfh1cb33r1vsr8yfjvgbz"; depends=[]; };
   regressoR = derive2 { name="regressoR"; version="1.1.9"; sha256="021ld511hazlqycgp5jyrcdabk5m5n6m4jx85h91agnrm7j2n9lm"; depends=[colourpicker corrplot dplyr DT e1071 flexdashboard gbm ggplot2 glmnet htmltools kknn neuralnet pls randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets xgboost zip]; };
   regrrr = derive2 { name="regrrr"; version="0.1.1"; sha256="1ibmfxw0akkrz4r0fipfqbbw4153cghj8k2xsy73lgw799ybylfk"; depends=[dplyr ggplot2 lspline magrittr MuMIn purrr robustbase scales stringr tidyr usdm]; };
-  regsem = derive2 { name="regsem"; version="1.5.2"; sha256="0ch057010xfsw0nqcsarzakdbiplvxaldyqlbbacspqs65ax1yk7"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; };
+  regsem = derive2 { name="regsem"; version="1.6.2"; sha256="14nrzyrkrijdrr4jwkri5zra2wh36w68wy6xs600l2z1633h2lmn"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; };
   regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; };
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
   regtools = derive2 { name="regtools"; version="1.1.0"; sha256="1kia4h4bwjjfq7jm57ihdgspbqfn683ssbzngp5r069ki931h3nb"; depends=[dummies FNN mvtnorm sandwich]; };
-  rehh = derive2 { name="rehh"; version="3.1.2"; sha256="1bkfgsf2y3hrcbvpllyrri420mqg3r6n6fy2jhh7whi7vpz83zw9"; depends=[rehh_data]; };
+  rehh = derive2 { name="rehh"; version="3.2.1"; sha256="10187p0qyqxplj5kh1ngnc56ajhfl2fgszs9qghfc43f7m00qwsh"; depends=[rehh_data]; };
   rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; };
   rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; };
-  reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.1"; sha256="0lf3lznzvckqg04446pvq35p31fv9ix93rxwv51zq9azk0sx42vs"; depends=[glmnet MASS refund]; };
   reinforcelearn = derive2 { name="reinforcelearn"; version="0.2.1"; sha256="176z2q69p24i29a8sh19xxn2zl3h1z2ixdssr5i6m4yvkvdrvv3b"; depends=[checkmate nnet purrr R6]; };
   reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; };
   reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; };
   rel = derive2 { name="rel"; version="1.4.2"; sha256="0h0146b8pnd7ai17y58agsk9kaym7fhiagl34gggaak0j1qa32wh"; depends=[]; };
-  relMix = derive2 { name="relMix"; version="1.3.1"; sha256="1grapx5ayjncxxnjjxwi971g34hlvx0d06xnpn72b4f235sh4alq"; depends=[Familias gWidgets2 gWidgets2tcltk tkrplot]; };
+  relMix = derive2 { name="relMix"; version="1.3.3"; sha256="03zzmsx2i7ib1mhdfk5igvr1winl9g2dfjqz2kzvcx3rl7l6hjym"; depends=[Familias gWidgets2 gWidgets2tcltk]; };
   relSim = derive2 { name="relSim"; version="0.3-1"; sha256="1d6yihapfyjlfw87l370wyfyby7ivvykx04qljffdv3hi801gn7f"; depends=[multicool Rcpp rvest stringr xml2 xtable]; };
   rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
   relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; };
@@ -13205,6 +13764,7 @@ in with self; {
   relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; };
   relgam = derive2 { name="relgam"; version="1.0"; sha256="0bfsk2pc3vdk8wgdfpz80x0f9p0z37sq114swqn6z11p298hwf2x"; depends=[foreach glmnet]; };
   reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
+  reliabilitydiag = derive2 { name="reliabilitydiag"; version="0.1.3"; sha256="06g2p7a47yc8kcd3g2jg08jf9x3xa0byp56w7jgfknv80m4d9mk0"; depends=[bde dplyr ggExtra ggplot2 magrittr purrr rlang tibble tidyr vctrs]; };
   relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; };
   relsurv = derive2 { name="relsurv"; version="2.2-3"; sha256="0jiky939n8vi44n8xg9kag67xjvf1dpywyjrn4bpdfrvfmkrr0l9"; depends=[date survival]; };
   rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; };
@@ -13218,10 +13778,11 @@ in with self; {
   remotes = derive2 { name="remotes"; version="2.2.0"; sha256="1f1kdw9j1wald3fs8b3n68x1kljy07j60g3aw1aarx26ikyk9whj"; depends=[]; };
   remss = derive2 { name="remss"; version="1.0.0"; sha256="0dl7iqg65qgafq7s1srcymqzvplkpzplpn6g68lb1mqirqzvgpqw"; depends=[survival]; };
   renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; };
-  rentrez = derive2 { name="rentrez"; version="1.2.2"; sha256="0ghrvh1czf2kbz7p5fh5c20wiwppg6x6fdns247fvlh6zmjl5jz5"; depends=[httr jsonlite XML]; };
-  renv = derive2 { name="renv"; version="0.11.0"; sha256="0dd63jr240pg95a6p058s5kcclfmscihdy89v212msihmwvylwh3"; depends=[]; };
+  rentrez = derive2 { name="rentrez"; version="1.2.3"; sha256="0x1g2f6hvkqqlb39z8m5qxhcvsizddic5i7rpqw0wy77xfbna9gv"; depends=[httr jsonlite XML]; };
+  renv = derive2 { name="renv"; version="0.12.3"; sha256="0k31x19gzpffb701c76p840cip10c0dh8yv3wcs30gqi0ag1g77l"; depends=[]; };
   repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; };
   repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; };
+  repello = derive2 { name="repello"; version="1.0.0"; sha256="0mn6dbv582akw5mkbznjmfn8prdd4r9wkm4c4d2amnssmv7554nx"; depends=[dplyr httr stringr]; };
   repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; };
   replicateBE = derive2 { name="replicateBE"; version="1.0.15"; sha256="0al23s1mb3l7z3jypan3v34bs09hlspjxwb672na6p60nmz2mfm5"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; };
   replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; };
@@ -13231,137 +13792,146 @@ in with self; {
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
   reportROC = derive2 { name="reportROC"; version="3.5"; sha256="1f3vdxz45bhks1pm3b41pmh8g8vr2czfr1pn4ddy4kgw5h1x3n8n"; depends=[pROC]; };
   reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; };
+  reporter = derive2 { name="reporter"; version="1.0.6"; sha256="0m4kix8s02csgxf85bk1q6bpi2p7rdrbv49ypwcf6fi644x11rs8"; depends=[crayon fmtr stringi]; };
   reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; };
   reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
   repr = derive2 { name="repr"; version="1.1.0"; sha256="15jz780w4nd9qjd1g3gq8f5lkh60p2v3ig3hm5kl1rg3z4cf0gvl"; depends=[base64enc htmltools jsonlite pillar]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
+  representr = derive2 { name="representr"; version="0.1.1"; sha256="0ni8kw6bklphflrnynmsbjzx2zr4nc20qqhiivn7dyny95ij2m85"; depends=[doParallel dplyr foreach]; };
   represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; };
   reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; };
-  reproducer = derive2 { name="reproducer"; version="0.3.1"; sha256="0clgbwfv24fjx6hj0km1nwy508dqbga8q8lyzqg801yrr8gidizd"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; };
-  reproducible = derive2 { name="reproducible"; version="1.2.1"; sha256="060f2b2rkmmscg7l0m6mzzgy6z245f97msvxphwkw9q4dh0ghiji"; depends=[data_table DBI digest fpCompare glue magrittr raster Require rlang RSQLite sp]; };
+  reproducer = derive2 { name="reproducer"; version="0.4.0"; sha256="1hyfx9ynq0xw4mm36alm1dq8vgdpayfncdnlphy7d46sghwzzbsc"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; };
+  reproducible = derive2 { name="reproducible"; version="1.2.4"; sha256="0jgi28s8bd03cn30ivzjxcmkbmk2kx9gr2ysw8zkqwd0lvpxw985"; depends=[data_table DBI digest fpCompare glue magrittr raster Require rlang RSQLite sp]; };
   reproj = derive2 { name="reproj"; version="0.4.2"; sha256="0lxd1vsxcf0r96jkl5jrh3kyklf90wcs4a27cs6ck93x1cxjnnni"; depends=[crsmeta PROJ proj4]; };
   repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; };
   reqres = derive2 { name="reqres"; version="0.2.3"; sha256="0dly09h8dpjlmvrd1wfg1gqcqhm03ax97qr0nd1p0fg9y0pdapya"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
   request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
   requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; };
-  rerddap = derive2 { name="rerddap"; version="0.6.5"; sha256="1pmpf9jdgp71ganzslwlp5qhkxhy7snaxgbrrym7swx6v2jnwhmv"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; };
-  rerddapXtracto = derive2 { name="rerddapXtracto"; version="1.0.0"; sha256="1xngmdhv5qf6idag6pb04p8snbrsxbrpydzqsc6lgg5035zhw96m"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; };
-  rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; };
+  rerddap = derive2 { name="rerddap"; version="0.7.0"; sha256="0dszvpxg1mmvcwki194nijzd8xbs910syplf993zgx9idcn0lz2n"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; };
+  rerddapXtracto = derive2 { name="rerddapXtracto"; version="1.0.2"; sha256="0jbkaq6wd4k0j3x2jmkd0v0c1lgn3b6b27m0pbvhhi2k24wqwbcx"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; };
   resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
   resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; };
   rescue = derive2 { name="rescue"; version="1.0.3"; sha256="0wq4ka1a7yhbjwr99ngykhn2r3czn3rqi63r6jn46pz15vnicwad"; depends=[data_table dbscan igraph irlba Matrix reticulate]; };
+  resemble = derive2 { name="resemble"; version="2.0.0"; sha256="1vr4aydwyipspkw662qw50219r30ms05i567j66yv1ccs574dw6a"; depends=[data_table foreach iterators lifecycle magrittr mathjaxr Rcpp RcppArmadillo]; };
   reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; };
   reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; };
   reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; };
-  resourcer = derive2 { name="resourcer"; version="1.0.1"; sha256="1bq5shdnwlg7j3z43ji7qj2ax598zmszaf2cp5374rir4ggvjdni"; depends=[httr R6]; };
-  respirometry = derive2 { name="respirometry"; version="1.1.0"; sha256="16p7hx1rwwc0yr35yv8padq2a8f70mzha6jam2h4c6g90hxll3x0"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; };
-  restatapi = derive2 { name="restatapi"; version="0.8.6"; sha256="0350p58wbpkwp86hc6akvxmq3w5bd3qlmb7dhfh8ygiah2f8ziil"; depends=[data_table rjson xml2]; };
+  resourcer = derive2 { name="resourcer"; version="1.1.0"; sha256="1mdmwi0yfvsjsny2amwk34ry6vmaw3kqf2l39w49bd7yi4n2hjxr"; depends=[httr R6]; };
+  respirometry = derive2 { name="respirometry"; version="1.2.1"; sha256="1lhgynij6akn5fkrl5112avhj0w3p9qmbgww7xvawp8hyk16f1x2"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; };
+  restatapi = derive2 { name="restatapi"; version="0.8.10"; sha256="0sczzxnzwlgb6jyby0x05kips1svsapj4qzflswd94n811fwrz21"; depends=[data_table rjson xml2]; };
+  restaurant = derive2 { name="restaurant"; version="0.1.0"; sha256="1dr9nw5xkll1wnra2xi8dg2yiv85nibdg1i9lsn44v7cgr9vb32j"; depends=[]; };
   restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; };
   restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; };
-  restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; };
   restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; };
   restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; };
   restriktor = derive2 { name="restriktor"; version="0.2-800"; sha256="0v7304912xhjz5bsngndvwi0y1qnk55xk9ariw2wi9msah1nm4d9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
-  resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; };
   rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; };
-  reticulate = derive2 { name="reticulate"; version="1.16"; sha256="0ddx3xrlw55d8d3w7pxap618w2c5pd1n2jw4xsa185s8mf1zifkl"; depends=[jsonlite Matrix rappdirs Rcpp]; };
+  reticulate = derive2 { name="reticulate"; version="1.18"; sha256="04w5c9jfxakb4rr2qjynxgagb42khsja3y4dwgxywiplb1d8agxk"; depends=[jsonlite Matrix rappdirs Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
   retistruct = derive2 { name="retistruct"; version="0.6.3"; sha256="1zij37n2ja3yx6n1agdkb3lj42p01parcg6djv60bng9c2qq0wsl"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; };
   retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; };
   retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; };
-  retrosheet = derive2 { name="retrosheet"; version="1.1.2"; sha256="05i7p59w9rjnbw8rdfsm4vjg6c0k9hhgl1iz4r5ksfdpablwb4xb"; depends=[httr lubridate purrr readr rvest stringi stringr tibble xml2]; };
+  retroharmonize = derive2 { name="retroharmonize"; version="0.1.13"; sha256="0zc60vkkzhdm8bp1ivxgbn7z910jh6xgv10n0agfq0hq08ca5cxr"; depends=[assertthat dplyr fs haven here labelled magrittr pillar purrr rlang snakecase tibble tidyr tidyselect vctrs]; };
+  retrosheet = derive2 { name="retrosheet"; version="1.1.3"; sha256="0zqwqv1j56116n9j4gg23j5dv88gfx7df6czj1idns1apxjqr283"; depends=[httr rvest stringi stringr xml2]; };
   retry = derive2 { name="retry"; version="0.1.0"; sha256="1yfcfvszfjnvvnjcywgchyiyj3jk9nmvk3h40g6bc24xapfkfl2p"; depends=[later rlang]; };
   reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; };
   reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
-  revdbayes = derive2 { name="revdbayes"; version="1.3.7"; sha256="1p86xw7mv0jkl5wgkvpnh21nvx62cyr963iv94sc56mgkx4g8pac"; depends=[bayesplot Rcpp RcppArmadillo rust]; };
+  revdbayes = derive2 { name="revdbayes"; version="1.3.9"; sha256="0j29hp21dab2fnsb6d41ykvyhfkfz1hf0qjpsz4lypc2rnbc3mpm"; depends=[bayesplot Rcpp RcppArmadillo rust]; };
   revealedPrefs = derive2 { name="revealedPrefs"; version="0.4.1"; sha256="1m8y1mj39bnf9q0n9mi0ashvb79lksx5dfkxb04qj2h5kkyxg49g"; depends=[pso Rcpp RcppArmadillo]; };
   revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
   revengc = derive2 { name="revengc"; version="1.0.4"; sha256="1nipkff9zmkdi509qfdrmvsq5c643xd7bzzw5bchxd8nmfqb412i"; depends=[dplyr mipfp stringr truncdist]; };
   reverseR = derive2 { name="reverseR"; version="0.1"; sha256="0pzk97q1zs5g1v4ngqd6bkwwxcp89j890nycpc99ipycbgm2r9yw"; depends=[DT knitr markdown shiny]; };
   revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; };
-  revss = derive2 { name="revss"; version="0.0.2"; sha256="1fymqmv546hs6bkcx6vjhxxywzbsccir6b6n1h3la41zskz0a6w2"; depends=[]; };
+  revss = derive2 { name="revss"; version="1.0.1"; sha256="02v39vvszzikscl8211l5xr0nyqwg28vdlg8vsyad6rnmgy8xd4f"; depends=[]; };
   revtools = derive2 { name="revtools"; version="0.4.1"; sha256="0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0"; depends=[ade4 modeltools ngram plotly shiny shinydashboard slam SnowballC stringdist tm topicmodels viridisLite]; };
-  revulyticsR = derive2 { name="revulyticsR"; version="0.0.1"; sha256="19c911c81r6ny9c2x8va626wsfr021g58lx0iridhc3g10cd14xy"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; };
+  revulyticsR = derive2 { name="revulyticsR"; version="0.0.3"; sha256="0dz9c26qwasgpp6a5fqh1rgq0hp9dhsrcm1h2hbp0cisri8iwsjf"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rewie = derive2 { name="rewie"; version="0.1.0"; sha256="1ysrpd2cqmz27sjj3dh0wpg86685d708kjwiqybwjlw9ap55jb06"; depends=[lme4 MASS plm rockchalk]; };
   rex = derive2 { name="rex"; version="1.2.0"; sha256="0m7bq8db3m5dhf01rw7xc7xy1ciq3m7dfgsl80p8cy4h8vqr3d06"; depends=[lazyeval]; };
   rexpokit = derive2 { name="rexpokit"; version="0.26.6.7"; sha256="13zrr5qj96vh50mknlc2pl7gq1kx5ahwk3n9ij4xr67734x3mx1r"; depends=[Rcpp]; };
   rfPermute = derive2 { name="rfPermute"; version="2.1.81"; sha256="0mak4r3j5vbjjkcsbxj0yg2xrbipq4rz873b02drkb769nh3d16a"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; };
   rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; };
-  rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; };
-  rfacebookstat = derive2 { name="rfacebookstat"; version="2.1.1"; sha256="0cza2nlpggnx0kqlyn9n0nh1appgvggm6fv97nmm5v4kyanjan50"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; };
+  rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0.1"; sha256="16ivcnnzrgqzfzcbdyi10rwn8r8r0yyxyfpx25lxafb6pj3kxpvf"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; };
+  rfacebookstat = derive2 { name="rfacebookstat"; version="2.1.9"; sha256="15g56zxr15z48fzsqb57dij9ki70faaspc5ga5dyjshw0s79xcna"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; };
+  rfacts = derive2 { name="rfacts"; version="0.0.2"; sha256="0g19j0y2q63f0vyf3ijgvx2m514m9d5ainq706s6bfdhqqsd00ww"; depends=[tibble xml2]; };
+  rfieldclimate = derive2 { name="rfieldclimate"; version="0.1.0"; sha256="1s7awczna9dxdq97sr5fsbs4qv7rx4wi2z3inwdp33md1bvyq4i7"; depends=[digest dplyr httr jsonlite lubridate magrittr purrr tidyr]; };
   rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
   rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; };
   rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; };
   rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; };
   rfishnet2 = derive2 { name="rfishnet2"; version="0.2.0"; sha256="0g90h4353kp7szv3971kb4l5x3x08qx4f9ln85n5g3b3zdg77dkz"; depends=[dplyr ggplot2 pracma rworldmap sf]; };
-  rflexscan = derive2 { name="rflexscan"; version="0.3.0"; sha256="12fgpfzx86sci9hmb4sa5ip0j3n63nv0xx4ylwcjx0rg1dx9366d"; depends=[igraph Rcpp rgdal sp]; };
+  rflexscan = derive2 { name="rflexscan"; version="0.3.1"; sha256="0kfibdwgjjzl4pnw5kzchba624g5z8bca30jy3zfwhd6d9r8n07j"; depends=[igraph Rcpp rgdal sp]; };
   rflights = derive2 { name="rflights"; version="0.1.103"; sha256="1gxfsc3dhlzy6bpqjdxk5x309jmjgvxr8d9amnhrjdygzj6icf18"; depends=[httr]; };
   rfm = derive2 { name="rfm"; version="0.2.2"; sha256="1s8h9ll4l5xq3m7ib83zrab49p5q4wclk8qiy2hgjr2hq1sb7wak"; depends=[dplyr ggplot2 ggthemes lubridate magrittr RColorBrewer rlang tibble tidyr xplorerr]; };
   rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; };
   rfoaas = derive2 { name="rfoaas"; version="2.1.0"; sha256="0w6m3lvfb60a2zfvyc0ksnfllb2ndy45b301vk9f3nr27lxdz6dm"; depends=[httr]; };
-  rfordummies = derive2 { name="rfordummies"; version="0.1.4"; sha256="03y4kzf18xwk41dm1nzqqqk0aflwh1mcgfnh0lbr0r7hnsy3a77x"; depends=[openxlsx]; };
+  rfordummies = derive2 { name="rfordummies"; version="0.1.5"; sha256="1glzc20sbv90fbazy3wh6drqd5dkh47s3fjqzgm78dkmj6gp9hdv"; depends=[openxlsx]; };
   rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; };
   rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
-  rgbif = derive2 { name="rgbif"; version="3.2.0"; sha256="0k94yk6irrm4w99dlnr8hka09110b5b3kdxvw10vna3b5ca9pncc"; depends=[conditionz crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wicket xml2]; };
-  rgdal = derive2 { name="rgdal"; version="1.5-16"; sha256="0rwlsafqxgqflfid4ciaa9qz3f75fgw8hilhaqj558gdxg8bzigp"; depends=[sp]; };
+  rgbif = derive2 { name="rgbif"; version="3.4.0"; sha256="0p08sbr5mgw8zdzvfiijcg78px4kgf21zdg5jr2y0qg797mbg6hk"; depends=[conditionz crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wicket xml2]; };
+  rgdal = derive2 { name="rgdal"; version="1.5-18"; sha256="1pr267sh0v6cympdg12yny51cmn4r20s5sjq2hqymn4kphcpqijk"; depends=[sp]; };
   rgdax = derive2 { name="rgdax"; version="1.0.0"; sha256="16ph6n1nyl2v2w51ih6wzkpw0j0hfa3f60q1g6p9zis59j0rh7d9"; depends=[digest httr jsonlite RCurl]; };
   rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; };
+  rgenie = derive2 { name="rgenie"; version="1.0.0"; sha256="1gsq9pkah5fnhjsxbyidngcs0362p8jnpvxycpkb9jaf5ykpq56m"; depends=[cowplot dplyr egg FNN forcats ggdendro ggplot2 gridExtra IRanges magrittr readr Rsamtools stringr tibble tidyr variancePartition]; };
   rgenius = derive2 { name="rgenius"; version="0.1.0"; sha256="1gpglnhicyv16ym224wzaw52w9xr63slm75wvidl3z14izzyy7ga"; depends=[doParallel dplyr foreach httr purrr rvest stringr tibble]; };
   rgenoud = derive2 { name="rgenoud"; version="5.8-3.0"; sha256="0p93wf6ghgz2nifxbscb6bhahh5jd2ba7nh1c2mb6fmbxnsi3swv"; depends=[]; };
   rgeolocate = derive2 { name="rgeolocate"; version="1.3.1"; sha256="1ikharp5f0ddh5wx1a8xf46fcwpz9xc4vl7s386h0jmkph1s0072"; depends=[httr Rcpp]; };
   rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; };
   rgeoprofile = derive2 { name="rgeoprofile"; version="0.2.0"; sha256="1k5nxvdl46b77sshzvzqhgl0s38ng63z53z17jmfdyf4wwzrnhah"; depends=[aspace geosphere leaflet pals RANN raster sp spatstat splancs]; };
-  rgeos = derive2 { name="rgeos"; version="0.5-3"; sha256="02v0d2dw4ra3c7f3imkdarqp8b8dcxyzspxgsmjsc6df23hm8x1m"; depends=[sp]; };
+  rgeos = derive2 { name="rgeos"; version="0.5-5"; sha256="086l0qk3p4jq23bs91c4a65x4qz99z0hy0vsnvfqfvppdzz0vajb"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.16.0"; sha256="1vj5ha1qx0xzflchxf25ycys6clfn9y32m1717afzkvhmkwisrra"; depends=[igraph servr XML]; };
-  rgho = derive2 { name="rgho"; version="2.0.0"; sha256="18vsd40wrzm8h8xv7mngyndw18wasb5b868ihczvzrqfnf5bq758"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; };
-  rgl = derive2 { name="rgl"; version="0.100.54"; sha256="1mgs2d8igmcdzzymfwbqdrypmaidd4pra5n5gnhsn9pm6pqzidqp"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
+  rgho = derive2 { name="rgho"; version="2.0.1"; sha256="1byvq2swn2j9v0zy5smjklv7bkncrclhli62cf1f2wiah5qg8sv2"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr rlang tibble tidyr]; };
+  rgl = derive2 { name="rgl"; version="0.103.5"; sha256="1vf3ggg4w6g870hkcf39qskh5pxyphv1lf2mdjdwx2j00gk8wwdy"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget mathjaxr shiny]; };
   rglobi = derive2 { name="rglobi"; version="0.2.21"; sha256="12v6g1ja4rrw0vcrrzgd1llxfk64g9z4f0c90rkbd9cknvnn0id9"; depends=[curl RCurl readr rjson]; };
   rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
+  rgnparser = derive2 { name="rgnparser"; version="0.1.0"; sha256="0gpwj1z1n5ckc4gh81zmpaibdg0frb776xq1v74v9vhc96vl9hjg"; depends=[jsonlite readr sys tibble]; };
   rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; };
   rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; };
-  rgrass7 = derive2 { name="rgrass7"; version="0.2-1"; sha256="0rhizda58hmglgr4aq6sr5y11y615w0pwpgdk3mylm9pjgj5i5vn"; depends=[XML]; };
+  rgrass7 = derive2 { name="rgrass7"; version="0.2-3"; sha256="0y9iydn6hxb0dhm050amhg72y7ygg4d3f7ryymkvl3hasa0md8nz"; depends=[XML]; };
   rgsp = derive2 { name="rgsp"; version="0.2.0"; sha256="1fk0k479srfr0f4a5abyzcrzwy9hr1v5xf0jgs36fbim9bh7njlc"; depends=[dplyr magrittr tibble]; };
+  rgugik = derive2 { name="rgugik"; version="0.2.1"; sha256="08kjz4mh9m9r3fw3sdvzfm1l0ar1zxl8my0v64g18mc9j1b3jsq3"; depends=[jsonlite openssl sf]; };
   rgw = derive2 { name="rgw"; version="0.3.0"; sha256="0hzkajmvqkmv6c238rdgyc6g16h96d5a0lnajnn5m87j0gwsl6wa"; depends=[]; };
   rhandsontable = derive2 { name="rhandsontable"; version="0.3.7"; sha256="1y6dlpzid5apjx0gphkym7gq3lhwp0bxan8ca274pg170xyb33h8"; depends=[htmlwidgets jsonlite magrittr]; };
+  rhcoclust = derive2 { name="rhcoclust"; version="1.0.0"; sha256="1m2nvwjc8wpwc0dc06f83x91m3dmwm5mjinsrg4i0krlmrig75z9"; depends=[fields igraph tcR]; };
   rhierbaps = derive2 { name="rhierbaps"; version="1.1.3"; sha256="0i4sr2wwzzl8vki5zihnd8v4ia2kji09cmf4ld07b6k099g5xprr"; depends=[ape ggplot2 matrixStats patchwork purrr]; };
   rhli = derive2 { name="rhli"; version="0.0.2"; sha256="1mb6bizqkg7zd8nc5a81fw7d0y0vcv6zh6y28k9vikqmc5l1n21q"; depends=[]; };
   rhmc = derive2 { name="rhmc"; version="1.0.0"; sha256="1m79f1hx404y0k8lk3n6jnzhr6wwrk83xiym68sq1zvj0wjqiqmw"; depends=[]; };
   rhmmer = derive2 { name="rhmmer"; version="0.1.0"; sha256="0875b29i8rl9iypxp7vw514avq0ac4abdlfq3861cdd3kgycw8jh"; depends=[dplyr magrittr readr rlang tidyr]; };
   rhnerm = derive2 { name="rhnerm"; version="1.1"; sha256="1fkh2pr4kzvqvagdyjlyab7p591s913104gyq05q170gmvlpmiww"; depends=[]; };
-  rhoR = derive2 { name="rhoR"; version="1.3.0.2"; sha256="1hzykkvzwv2mb759m9rw32dd1wgmksizqyr6grqf6a2z77k7w197"; depends=[Rcpp RcppArmadillo]; };
+  rhoR = derive2 { name="rhoR"; version="1.3.0.3"; sha256="0l387m6l2x3djn1liag4m49835m2mny006sjzqbravb1famrvawi"; depends=[Rcpp RcppArmadillo]; };
   rhosa = derive2 { name="rhosa"; version="0.1.0"; sha256="0aygdp7xp5hvr4i1s0isgbbr3pd164aj1px9bns6vdh0svq533qg"; depends=[]; };
   rhosp = derive2 { name="rhosp"; version="1.10"; sha256="1k0rb4fchjlzinky6ysdvyk0xjsx5986aqwn3yc6s7m3v7y9wb9m"; depends=[]; };
   rhub = derive2 { name="rhub"; version="1.1.1"; sha256="05b4phrny85fshismspjbaz1h0klg1fpy4b309si94pnqffxaqx6"; depends=[assertthat callr cli crayon desc digest httr jsonlite parsedate pillar prettyunits processx R6 rappdirs rcmdcheck rematch tibble uuid whoami withr]; };
   rhymer = derive2 { name="rhymer"; version="1.1.0"; sha256="00piml975chmmm3ipskzhfbbp5sq47yg5a78hsisssbzwwxsmbs0"; depends=[httr jsonlite]; };
   ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
-  ri2 = derive2 { name="ri2"; version="0.1.2"; sha256="0z6mbhrda7fh7a4y2kx3mf1zc1p0k4d76phw3187w50kwvkpb737"; depends=[estimatr generics ggplot2 pbapply randomizr]; };
+  ri2 = derive2 { name="ri2"; version="0.2.0"; sha256="0zadczx7awymn420hf15sci5z1hq5rpid866gpa1wmrhcyh177nh"; depends=[estimatr generics ggplot2 pbapply randomizr]; };
   ribd = derive2 { name="ribd"; version="1.2.0"; sha256="0pqy2a4zb9idmib9is5xk1qavannrij3f6765nrlprr13w4x3vm4"; depends=[glue kinship2 pedtools slam]; };
-  ribiosUtils = derive2 { name="ribiosUtils"; version="1.5-6"; sha256="1cfkzqbscj01pjqw7yjqf8gnvjacb13y8fc7nax4cb7gnk4fadc2"; depends=[]; };
   ricegeneann = derive2 { name="ricegeneann"; version="1.0.2"; sha256="0wxqp4pfdhvq4mwzjrqi3m9jiayk5bp1ha222mpm4qz1pl41cy9w"; depends=[riceidconverter]; };
   riceidconverter = derive2 { name="riceidconverter"; version="1.1.1"; sha256="143f76v3k2q9ddcxf2nzvd04pjgy7p120ln0zkmxpal20c81dwq6"; depends=[dplyr]; };
   riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
   rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; };
-  ridge = derive2 { name="ridge"; version="2.5"; sha256="0v84glz2436a1n6wqrc46x2lya2f3vn94b83cv0rqlvqygqhyz8r"; depends=[]; };
+  ricu = derive2 { name="ricu"; version="0.1.2"; sha256="1x8hdmafd83zxnvzwci53hrd0nryym2zf8zx61hvx8pj50qfnw8p"; depends=[assertthat backports cli curl data_table fansi fst glue jsonlite prt readr rlang tibble vctrs]; };
+  ridge = derive2 { name="ridge"; version="2.7"; sha256="1xqk574zw0wf4jzjrnycn2jmln5sg93ki02d70hwaidmbmsiii84"; depends=[]; };
   ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; };
   ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; };
   riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; };
-  rif = derive2 { name="rif"; version="0.2.0"; sha256="0vk3dmg3qzw3i27wbpfih66rx8sdxq033l7h59h3hy960av4hawh"; depends=[crul data_table jsonlite tibble]; };
   rifle = derive2 { name="rifle"; version="1.0"; sha256="1r0cfj3vzndgiarl9sb38zmpnpm4p8v9l5cm9c1m6g2q9kvpgpbs"; depends=[MASS]; };
-  riingo = derive2 { name="riingo"; version="0.3.0"; sha256="1aw8w9s5bfd22fjhi7mrzcshpb5vrbakjc1fvcaq3qw2ssj383fp"; depends=[crayon glue httr jsonlite purrr rlang tibble vctrs]; };
+  riingo = derive2 { name="riingo"; version="0.3.1"; sha256="1ww9ps0v1yga9dwb68crbhf56xw2svl7az95ifrdrswyyikj02vj"; depends=[crayon glue httr jsonlite purrr rlang tibble vctrs]; };
   rijkspalette = derive2 { name="rijkspalette"; version="1.0.1"; sha256="0al5niymn6k6px6fh1pk3rvk3a3b2966bdfh0hprcjjl75a9mgvq"; depends=[crayon curl imager jsonlite]; };
+  rinat = derive2 { name="rinat"; version="0.1.6"; sha256="089mjbpnp1b06qbxjh733brf9nz04rgh2spqngxs2kvd5d11jk9p"; depends=[ggplot2 httr jsonlite maps plyr sp]; };
   ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; };
+  rintimg = derive2 { name="rintimg"; version="0.1.0"; sha256="0jzs4mdwpzbpl0wchyhl3cpywk25ayaxalr12p4cnjl7vnmdm7dp"; depends=[glue htmltools]; };
   rintrojs = derive2 { name="rintrojs"; version="0.2.2"; sha256="0vyqb3pyrh12saddar71ac9csn2vkd2j8ln6ygpqys8ky1lc3427"; depends=[jsonlite shiny]; };
   rio = derive2 { name="rio"; version="0.5.16"; sha256="0rfl56fdawlhc98451a9lcb6a6m56kw0i7dvd5hx58z025d8vsyk"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
-  rioja = derive2 { name="rioja"; version="0.9-21"; sha256="01vc7zfw13zdri0rx93adx86gprzcmw9d454848ach95hdkwipk5"; depends=[mgcv vegan]; };
-  ripe = derive2 { name="ripe"; version="0.1.0"; sha256="0dmf8i8l9ja590fakpgi6lf128wd7cd49g4ihm02cbsn8h5ha27s"; depends=[magrittr]; };
+  rioja = derive2 { name="rioja"; version="0.9-26"; sha256="02af6is38nakzr1hf9688n32m5glk1jyp2d9p4irn0mzk7r6r976"; depends=[mgcv vegan]; };
+  ripserr = derive2 { name="ripserr"; version="0.1.1"; sha256="1rwsd1yi5vrzdscjgr27fw0d1a6nkc8g2w5hqgqijiwm25h4wl17"; depends=[Rcpp]; };
   rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; };
   riskCommunicator = derive2 { name="riskCommunicator"; version="0.1.0"; sha256="1f8nfha6sgn52f3qvb2bkawv6c8ivrm5n6sy1ggx9337xjl35baz"; depends=[boot dplyr ggplot2 gridExtra magrittr purrr rlang tidyr tidyselect tidyverse]; };
   riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.1"; sha256="0l51spflm7wwwz5yrkw1i5534d1840wyyh2w3mz8apaxac76l0xz"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; };
   riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; };
   riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
-  riskRegression = derive2 { name="riskRegression"; version="2020.02.05"; sha256="1m02aap91hn1gaaadc9qk3ij33l613b03biw52l79dp32yfwzdmm"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; };
+  riskRegression = derive2 { name="riskRegression"; version="2020.12.08"; sha256="0xa603fcpjd8kgcn1ldwzqpll7h6x738lknjjb5gbly84wbhv6aw"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava mets mvtnorm plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; };
   riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
   riskclustr = derive2 { name="riskclustr"; version="0.3"; sha256="13fl00g0hzcl4vqvl8zl4m5bpp14948yvd4i4dbdrg1h8ym30ir5"; depends=[aod Matrix mlogit stringr]; };
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
@@ -13376,28 +13946,30 @@ in with self; {
   rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
   rjags = derive2 { name="rjags"; version="4-10"; sha256="1nhaim84ww8fd6m8xlpmngqcnp2qpql29ahc38366fxja3ghngmx"; depends=[coda]; };
   rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; };
-  rjdmarkdown = derive2 { name="rjdmarkdown"; version="0.1.0"; sha256="1zfb4w0z3wpv8c13rwkf6fzn4l1p6jkxvawkikv80xa8w3nab7iy"; depends=[kableExtra knitr magrittr RJDemetra]; };
+  rjdmarkdown = derive2 { name="rjdmarkdown"; version="0.2.0"; sha256="14ndhhxxx7jb9ljhfjxmdrl3kgb1zsrv00kznl2k50fwxx4z66f2"; depends=[kableExtra knitr magrittr RJDemetra]; };
   rjdqa = derive2 { name="rjdqa"; version="0.1.1"; sha256="0d7jv3a2a7p7h6jnr5znln06x6m4mksb6cy44xdxir1pwcd1z6br"; depends=[plotrix RJDemetra XLConnect]; };
   rje = derive2 { name="rje"; version="1.10.16"; sha256="1a9lxikc5n4sb5fzlw8w8ys65npvlvqfail3mq5zi46smd1s9qp8"; depends=[knitr]; };
   rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; };
+  rjpdmp = derive2 { name="rjpdmp"; version="0.1.0"; sha256="1amkvg75jp0pz39smhb60wryxhwzl0fv4870lhldlp8w6pv672kg"; depends=[data_table Rcpp RcppArmadillo]; };
+  rjqpd = derive2 { name="rjqpd"; version="0.2.3"; sha256="14vbp9s2859h4n3m3bq830nvxvk58h3mvvdnb27qsalbcfwd94v5"; depends=[]; };
   rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; };
-  rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; };
   rjstat = derive2 { name="rjstat"; version="0.4.1"; sha256="0kqnl4wizmain70ady982aldhscf24870shvf3sviknplshhgk8j"; depends=[checkmate jsonlite]; };
   rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.0"; sha256="0pbf3yl7cnx8vv07x9nwgrglv5h8r135fc840pxvapi099nr7ijl"; depends=[XML]; };
   rkafka = derive2 { name="rkafka"; version="1.1"; sha256="0c0hszsmmd876jcfamjcfb7bxw7869zgy99j4i6ksb8za232nmmw"; depends=[rJava rkafkajars RUnit]; };
   rkafkajars = derive2 { name="rkafkajars"; version="1.1"; sha256="121qnzxhipgv145lhmr6h356jpdd6knsx7f21cv9a8r5r009d42z"; depends=[rJava RUnit]; };
-  rkeops = derive2 { name="rkeops"; version="1.4.1"; sha256="1ihkrm3l3pvjp4k9zqrrgb5szma6hvw55rlnj0vpyff6ir18mzr4"; depends=[openssl Rcpp RcppEigen stringr]; };
+  rkeops = derive2 { name="rkeops"; version="1.4.1.1"; sha256="1k5j7j0yxk3azvkafhmpzgk87iwmjir9l1mq6pk5sdvn9ykyj85g"; depends=[openssl Rcpp RcppEigen stringr]; };
   rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
   rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
-  rlang = derive2 { name="rlang"; version="0.4.7"; sha256="0f4rhnhyhgrv874l0yzm80ij6vcqdykfd7bzmnqs0wbgyhkxk8vq"; depends=[]; };
-  rlas = derive2 { name="rlas"; version="1.3.6"; sha256="141pq0bw27iplsyai90xnikba6anv14nx46grk0jp380cv5m6xd2"; depends=[BH data_table Rcpp]; };
-  rlc = derive2 { name="rlc"; version="0.2.0"; sha256="083pkajxshckk3hqg7q87jdmiqg9a1jp5lwar6f5r4nqna4kf3xa"; depends=[hwriter jrc jsonlite plyr R6 stringr]; };
+  rlang = derive2 { name="rlang"; version="0.4.10"; sha256="0ximv89f6zymnwms121k1jfvvflrdm3pmmf5xyvz56f1qiq04lq7"; depends=[]; };
+  rlas = derive2 { name="rlas"; version="1.3.8"; sha256="0ry2khz6xjs6jr3j5jspmm0mvxbgp00f4klkangqspxzakgfw3k2"; depends=[BH data_table Rcpp]; };
+  rlc = derive2 { name="rlc"; version="0.3.0"; sha256="187nm0hl71yhnsp9cp9s33sv8jhzrmy36s62fpd8kh8yrmh5dkz8"; depends=[hwriter jrc jsonlite plyr R6 stringr]; };
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
+  rle = derive2 { name="rle"; version="0.9.2"; sha256="0sagl0jggg40lihzy7pfq4593rfvc3b3f7g6ggi85s7n18qvwg40"; depends=[]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
   rlecuyer = derive2 { name="rlecuyer"; version="0.3-5"; sha256="09mniai7v8gapr6hd3zm8sm3vi1zcyhgym389904ykb2yx7l68s7"; depends=[]; };
   rless = derive2 { name="rless"; version="0.1.1"; sha256="0ham8kf2hbswrcnc5i5b3svywdwq3kwp9n66n4k9sllahl4x9jdn"; depends=[V8]; };
-  rlfsm = derive2 { name="rlfsm"; version="1.0.0"; sha256="06dar7hfxpah3dm8zlfq5g0n2gwr9wjch1dy08f8dj22600spbya"; depends=[doParallel foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
+  rlfsm = derive2 { name="rlfsm"; version="1.0.1"; sha256="114afkycgn6ny6npzgb2qx6wc8ikyymsgxxb4jb3h5makdz6bi27"; depends=[doParallel foreach ggplot2 plyr Rcpp Rdpack reshape2 stabledist]; };
   rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; };
   rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; };
   rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
@@ -13406,33 +13978,34 @@ in with self; {
   rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
   rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; };
-  rmangal = derive2 { name="rmangal"; version="2.0.0"; sha256="0vn5i6hwi64kzi481m3y696cqdxz6frv1n7xxm72a3vbz1jsqcrf"; depends=[httr igraph jsonlite memoise purrr]; };
   rmapshaper = derive2 { name="rmapshaper"; version="0.4.4"; sha256="11diajgz8jkfa2d725n0iy0psiw3x4d7kbdvdrd1prwdjsyh7i5d"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
   rmapzen = derive2 { name="rmapzen"; version="0.4.2"; sha256="1vybg3lmrqghvd23jwpfmypvqz2b65bc0m2pwbpizwkkg35iza70"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
   rmargint = derive2 { name="rmargint"; version="2.0.2"; sha256="0irq5114dd8pngl6k13r2rrsivijiqfldm6mby0q5a9wrj2vmwc9"; depends=[]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="2.3"; sha256="0vdjq4kcyxkr2m27588kk6yi5g53symjshj4jz4n0j18wz53shji"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="2.6"; sha256="1c7nrpnv2v43msv7nia90rjh6s5x9m5wlb3mpiwy04fyfb29krz6"; depends=[evaluate htmltools jsonlite knitr stringr tinytex xfun yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; };
   rmcfs = derive2 { name="rmcfs"; version="1.3.1"; sha256="1y59r4n2ywinfpkb7zn7gygl97w6p0rvr90sjqy4vdhi60ka16kf"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; };
-  rmcorr = derive2 { name="rmcorr"; version="0.4.0"; sha256="1iv3wr92w162mkxc1bxix36s542h63krbimx5lpcsl4jflralqhr"; depends=[psych RColorBrewer]; };
-  rmd = derive2 { name="rmd"; version="0.1.5"; sha256="00fsssd4hnk00wsrials4lwxrjnr84ppnk7094bfswpfc0iawc3z"; depends=[blogdown bookdown bookdownplus citr cli crayon curl devtools dplyr DT magrittr mindr miniUI pagedown purrr rappdirs rmarkdown rstudioapi rticles rvest shiny shinyjs tibble tinytex xaringan xml2]; };
+  rmcorr = derive2 { name="rmcorr"; version="0.4.1"; sha256="0mg9i9nb3qycl1q66y6lsvlqiri2n6v32f18js6z6n7z0wb6dgp3"; depends=[psych RColorBrewer]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
   rmda = derive2 { name="rmda"; version="1.6"; sha256="1m7j79jwii9la47w34ka3yl1n7nql8pfn32if0aycn4yw5sy8dmc"; depends=[caret MASS pander reshape]; };
-  rmdcev = derive2 { name="rmdcev"; version="1.2.0"; sha256="09ikc8nw60a8gcq45vhqzqf4wbqp0w65qalgkn212k70y0hvq3w6"; depends=[BH dplyr Formula purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr tibble tidyr tidyselect]; };
-  rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.2"; sha256="1hj4lhwyz47hznyqjgghp852fkzhk5k7dfp7cxabg8h49qzswcgx"; depends=[assertthat rmarkdown]; };
-  rmdformats = derive2 { name="rmdformats"; version="0.3.7"; sha256="1pwd4z175dmz4fpg094rba48gq6sir8ys7ln7pfdsnwmgf79sj9k"; depends=[bookdown htmltools knitr rmarkdown]; };
+  rmdcev = derive2 { name="rmdcev"; version="1.2.4"; sha256="0pdw390fknivnfkrzlk1rcv34prgnang50rfgmfpm2g9l6kjckxp"; depends=[BH dplyr Formula purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tibble tidyr]; };
+  rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.3"; sha256="0llnn4pdfznidalm4f7fpyxbhzsqv1096fkbsl1pgf4f7ll6w7a7"; depends=[assertthat rmarkdown]; };
+  rmdformats = derive2 { name="rmdformats"; version="1.0.0"; sha256="1xpzs369wpwkv9mqh91v93s7l0pya4mrjycm3panwv65pdcy9698"; depends=[bookdown htmltools knitr rmarkdown]; };
   rmdpartials = derive2 { name="rmdpartials"; version="0.5.8"; sha256="15dw0pk1hdif839k60swna4li04inf7fzsiq9bxbw2wk5pdkqirn"; depends=[digest knitr rlang]; };
   rmdplugr = derive2 { name="rmdplugr"; version="0.4.1"; sha256="16wmrya8wdipqcrh34k4v4iq05aqd0jwf7rg6w1wsvx2i9211xg6"; depends=[bookdown rmarkdown]; };
   rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; };
+  rmdwc = derive2 { name="rmdwc"; version="0.1.1"; sha256="0qbh3i44l6zqcqcnqv5lyf3lqdr10sahpykvg8p0bry8nscgv2hv"; depends=[knitr]; };
   rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; };
   rmetalog = derive2 { name="rmetalog"; version="1.0.2"; sha256="00ln3wl23ybjgs44h9x388p56x8jymd54vbcfpzidbhz2im1ilbf"; depends=[ggplot2 lpSolve]; };
   rmetasim = derive2 { name="rmetasim"; version="3.1.14"; sha256="0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0"; depends=[ade4 adegenet gtools pegas]; };
   rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
   rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; };
-  rminer = derive2 { name="rminer"; version="1.4.5"; sha256="0xwlayzmn4z6g9l93mj0vjsh31mhpxcmccvjm0dr802cjiv3phjj"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
+  rminer = derive2 { name="rminer"; version="1.4.6"; sha256="1xydc43is756cy4vsm4k4micj88hhqgyrhb8cmvgv1y8zfrzg2qz"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
+  rminizinc = derive2 { name="rminizinc"; version="0.0.2"; sha256="1hxzrzxixyl2440jgxy8sd3d0z6d04sxaxqx86pa79fv20wqri04"; depends=[checkmate R6 Rcpp rjson rlang rlist]; };
   rmio = derive2 { name="rmio"; version="0.2.0"; sha256="0g1sb5av8mw1b4absd5ydxrh93cp5k5x31kl6ghamx8i8irr1ngk"; depends=[]; };
   rmonad = derive2 { name="rmonad"; version="0.7.0"; sha256="1vjx8kk57xk7c2a05c6kn75n17842ya7j41hqj3wmgq8yvaxrngx"; depends=[digest glue igraph magrittr pryr]; };
+  rmoo = derive2 { name="rmoo"; version="0.1.5"; sha256="0yy8vvwfwhc15lsz0b7zh4rk5s1qh1lvgl3k2fa9nk9arascb22w"; depends=[ecr rgl]; };
   rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; };
-  rms = derive2 { name="rms"; version="6.0-1"; sha256="1zkcsqcvldfj4kyn0346vi51igq951qrnpxlv2pfvap6n2v5wbxq"; depends=[cluster digest ggplot2 Hmisc htmlTable htmltools lattice MASS multcomp nlme polspline quantreg rpart SparseM survival]; };
+  rms = derive2 { name="rms"; version="6.1-0"; sha256="0llz519rgnc7v2jqhfrjgixkpkmmi5wi1a52hgz3n28s46ww77mq"; depends=[cluster digest ggplot2 Hmisc htmlTable htmltools lattice MASS multcomp nlme polspline quantreg rpart SparseM survival]; };
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   rmsb = derive2 { name="rmsb"; version="0.0.1"; sha256="16bgr9w92y7fjp418g2mvfgh0hn444in4q7pd94k5s1kmv6232h5"; depends=[BH cluster digest ggplot2 Hmisc knitr loo MASS Rcpp RcppEigen RcppParallel rms rstan rstantools StanHeaders survival]; };
   rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; };
@@ -13441,7 +14014,6 @@ in with self; {
   rmutil = derive2 { name="rmutil"; version="1.1.5"; sha256="1xmjmzws4wb0ksg4z4srzyk6mk2l1cr2ina9rznsdsyssr1ycxv0"; depends=[]; };
   rmweather = derive2 { name="rmweather"; version="0.1.51"; sha256="0qd49lr12hc39dwg348b021aqxw57pfcb9xxhp51fvnw6gw6bgqd"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; };
   rmytarget = derive2 { name="rmytarget"; version="2.1.8"; sha256="1sn1pncxnv2jgxhmbm4zlq6zyi8nsz90x8b7697qlqf2la837v96"; depends=[dplyr httr lubridate purrr stringr]; };
-  rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
   rnassqs = derive2 { name="rnassqs"; version="0.5.0"; sha256="1mbkv32zidax9i6km93bbi3m7xpnsy805cz4ikdrid84qg94an09"; depends=[httr jsonlite]; };
   rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; };
   rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; };
@@ -13454,12 +14026,13 @@ in with self; {
   rngtools = derive2 { name="rngtools"; version="1.5"; sha256="0xgmg3qb6insc157as47mcm9sdjdpy9jirh7w06bxb7pfcxqfx42"; depends=[digest]; };
   rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
   rnn = derive2 { name="rnn"; version="1.4.0"; sha256="0k960jylbvg8r453430d8dpdzydkk3yr5np8rxkay79533ikrcgy"; depends=[shiny sigmoid]; };
-  rnoaa = derive2 { name="rnoaa"; version="1.1.0"; sha256="09cixjs25pkr4glww54yjdnkvpcm01v48fn4f6cy78sykk4cibnp"; depends=[crul data_table dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; };
-  rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; };
+  rnoaa = derive2 { name="rnoaa"; version="1.2.0"; sha256="19vdb0hs3vww2w9c7j7m7yy33h7cscrd143xiqkikwxmgwjlf2f1"; depends=[crul data_table dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; };
+  rnpn = derive2 { name="rnpn"; version="1.1.1"; sha256="1wll9yn85nb43hq3ngycaznqai03akns47q9x806d7v95ln90x34"; depends=[curl data_table httr jsonlite magrittr plyr raster rgdal sp tibble XML]; };
   rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; };
   rnrfa = derive2 { name="rnrfa"; version="2.0.3"; sha256="0c7yrnj65dvfa1rc062y9w25k4nqfa0j8mnid7dz7fzf567x56k3"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble zoo]; };
   roadoi = derive2 { name="roadoi"; version="0.6"; sha256="1mlf63018qpgyqma51fas1nvags7qcrsw11hm6c1idnxjh0sz82z"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
-  robCompositions = derive2 { name="robCompositions"; version="2.2.1"; sha256="18p0rb04fzmwqsxcap5mxhhmhav6qs05icdaq3msmbp0n9iwrpz6"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; };
+  roahd = derive2 { name="roahd"; version="1.4.2"; sha256="1lq4aafag5cd9h6jffk6gv4m7v4p4y7wkdyxazw6fdwiqy8g4wvn"; depends=[dplyr magrittr robustbase scales]; };
+  robCompositions = derive2 { name="robCompositions"; version="2.3.0"; sha256="0pzvcshjjjfwlzfbqyw0i1wm4lj4s227wnb7nx3z9aa0g3iqd89d"; depends=[car cluster cvTools data_table e1071 fda fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; };
   robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; };
   robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
@@ -13468,18 +14041,20 @@ in with self; {
   robeth = derive2 { name="robeth"; version="2.7-6"; sha256="1x0hzgq7jwl83wwmy581ia8009v0j95aksnr5ywpflnqm76rj6v2"; depends=[]; };
   robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1.2"; sha256="0mvpaf6g694b7175bl3yr6lxbwla4pwp7g4y34qb4klgl5n3nw03"; depends=[lattice MASS robustbase]; };
-  robin = derive2 { name="robin"; version="1.0.1"; sha256="0zbhv9vs5ccsz6xz0i8hps8431va1kk8jqpr66yiz8nb404z1813"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; };
+  robin = derive2 { name="robin"; version="1.0.2"; sha256="0jgy8rhwhgm2xim2aj4m671n0ld2q58kq4afbnn8db0g2l7gx7s9"; depends=[DescTools fdatest ggplot2 gprege gridExtra igraph networkD3 qpdf]; };
   robis = derive2 { name="robis"; version="2.3.9"; sha256="1pz8904zhif1d02q6ar7winf313j3bjzxlaqsnbczxjjchs6j2g3"; depends=[dplyr ggplot2 httpcache httr jsonlite leaflet mapedit rlang sf tibble tidyr]; };
   robmed = derive2 { name="robmed"; version="0.7.0"; sha256="0j868y52fx1c85pw5bng278ybbh3b7h2bvmdrlj9irwgdvqphv9x"; depends=[boot ggplot2 quantreg robustbase shiny sn]; };
-  robmixglm = derive2 { name="robmixglm"; version="1.1-1"; sha256="0ri1jfq9017585447imvfqn4g9sgyya5p72ainzzx9i7k0hib3dw"; depends=[actuar bbmle boot doParallel doRNG fastGHQuad foreach MASS numDeriv Rcpp VGAM]; };
-  robotstxt = derive2 { name="robotstxt"; version="0.7.8"; sha256="176jrgg1jiz6jrpvw3lafnm4b2dcf7gl8j0hvk7yn5xbsfzc9iac"; depends=[future future_apply httr magrittr spiderbar stringr]; };
+  robmixglm = derive2 { name="robmixglm"; version="1.2-0"; sha256="10nlkllzwzbzzvddxa29gc21p9lzsmdxzwr2lzylz66m8j9cgbda"; depends=[actuar bbmle boot doParallel doRNG fastGHQuad foreach MASS numDeriv Rcpp VGAM]; };
+  robomit = derive2 { name="robomit"; version="1.0.3"; sha256="1ri9x9c3dmib7si8anjg9k4sxzkjvlwpc5b6lw8ib9kp97frw32l"; depends=[broom dplyr ggplot2 plm tibble tidyr]; };
+  robotstxt = derive2 { name="robotstxt"; version="0.7.13"; sha256="1x5sachf7g5c2aj1mg3z2lf60723k1ad80bdr89szkgi92jkfal7"; depends=[future future_apply httr magrittr spiderbar stringr]; };
   robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
   robregcc = derive2 { name="robregcc"; version="1.1"; sha256="06fapmc3jfrfdqvz02jr12dk1d5iw6s3mcb13jz1nm2bybw6r04a"; depends=[magrittr MASS Rcpp RcppArmadillo]; };
+  robservable = derive2 { name="robservable"; version="0.2.0"; sha256="05j65ds1yclsa3d7s632wcaylh5ig9w5pwz71ffz5h0f4wgf87jz"; depends=[htmlwidgets jsonlite]; };
   robsurvey = derive2 { name="robsurvey"; version="0.1.1"; sha256="0rf2sd7maz565hlgpyhvkswqyck01hif4mg5isbnnky9n3nc98pi"; depends=[survey]; };
   robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; };
   robust = derive2 { name="robust"; version="0.5-0.0"; sha256="1ks5scp8bnicl9j1r8yrmz668fjs6ifdmi540zw6d2ck500bbw42"; depends=[fit_models lattice MASS robustbase rrcov]; };
   robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; };
-  robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
+  robustDA = derive2 { name="robustDA"; version="1.2"; sha256="0kxdqvv17dgnlqp0hkazwfqsg3h4g9gw1w57blwpay67xp4d1jyx"; depends=[MASS mclust Rsolnp]; };
   robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; };
   robustHD = derive2 { name="robustHD"; version="0.6.1"; sha256="0h2kdw8xkyflczwfq48cfdal0ccvil8dsq4xpnw7qfmjyvkycnxp"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
   robustMVMR = derive2 { name="robustMVMR"; version="0.1.0"; sha256="10cidj5q707xy2x2g0vynbdhz84k6amc3svk3x7rgx4jcv55yr6a"; depends=[ggplot2 lmtest robustbase]; };
@@ -13499,7 +14074,7 @@ in with self; {
   rocTree = derive2 { name="rocTree"; version="1.1.1"; sha256="1hd5v47gymffg5829swpd38xscm4vq75d46fibwkrr7jp9iy37ra"; depends=[data_tree DiagrammeR flexsurv ggplot2 MASS Rcpp RcppArmadillo survival]; };
   rocc = derive2 { name="rocc"; version="1.3"; sha256="1j15l28c7kv7x850ycjprqi5gpbsl6wfv97h9lbrx11q5l4r9ivb"; depends=[ROCR]; };
   roccv = derive2 { name="roccv"; version="1.2"; sha256="18kq2gzcbz97dw168xppql8k3slpkfl8yv1d8ac48damlhvipif1"; depends=[glmnet pROC]; };
-  rock = derive2 { name="rock"; version="0.1.0"; sha256="0plyn9n3ngbdakdv98ywakr5xgkwqkwspla3pdmsi6w12zsvkak8"; depends=[data_tree DiagrammeR dplyr glue purrr yum]; };
+  rock = derive2 { name="rock"; version="0.1.1"; sha256="04g831pjbcy2w7lhj0nhqf20ndhywhcafff3gd6inlfkxc3mw33m"; depends=[data_tree DiagrammeR dplyr glue purrr yum]; };
   rockchalk = derive2 { name="rockchalk"; version="1.8.144"; sha256="07dp1n155b9gfvk8l30h6bhjbhbylsjxfzns08mryn4mxj3nqpnb"; depends=[carData kutils lme4 MASS]; };
   rococo = derive2 { name="rococo"; version="1.1.7"; sha256="1fp3kk5j9kc0vyr50rlbsxjc9p3qz5137sifxsbd297p7zj1fcs2"; depends=[Rcpp]; };
   rocsvm_path = derive2 { name="rocsvm.path"; version="0.1.0"; sha256="1pd59bzcz96sxpp725pqa7pjh2gdrfapbilp4wccjkf5290zw56v"; depends=[quadprog svmpath]; };
@@ -13519,8 +14094,8 @@ in with self; {
   rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; };
   roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; };
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
-  ropenaq = derive2 { name="ropenaq"; version="0.2.10"; sha256="0sjc5p3wp4x4k86dsxiz68xzyfj9xiz67qc5hsld6zy92vyc0pw2"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; };
-  ropenblas = derive2 { name="ropenblas"; version="0.2.7"; sha256="1d6zkgfsbai13697i14h1m6hbf859lmcl9n4x1wg517zrhh7iv1a"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rlang rstudioapi stringr withr XML]; };
+  ropenaq = derive2 { name="ropenaq"; version="0.2.11"; sha256="1zqj1bp0rm82znc92kjh1n427n8navjvsc30axay7bpk3gqbxn70"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; };
+  ropenblas = derive2 { name="ropenblas"; version="0.2.8"; sha256="19rnycan5wv6skjjy8dxxh5sn4ngrq9cicz5xzv787ms725nrcby"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rlang rstudioapi stringr withr XML]; };
   ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; };
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
   roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; };
@@ -13531,30 +14106,28 @@ in with self; {
   rorcid = derive2 { name="rorcid"; version="0.6.4"; sha256="0v8h1d5dwx5aafw1dq64b8clhzc0ksnqpy5pfbid9c1f290xk907"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; };
   rorqual_morpho = derive2 { name="rorqual.morpho"; version="0.1.1"; sha256="1475yhb5qwj4zpsc4gqqpzs7qvyddxwc63i1f4rhnv6id2hi4msp"; depends=[dplyr magrittr]; };
   rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
-  rosetta = derive2 { name="rosetta"; version="0.2.0"; sha256="0b5xcy9gzw8d71m2pyx1m71mnbdggckhd42c7pzhkivkl79n5wdz"; depends=[car ggplot2 ggrepel gridExtra lavaan lme4 multcompView pander plyr psych pwr rio ufs]; };
+  rosetta = derive2 { name="rosetta"; version="0.3.1"; sha256="1vx9x5wqbm3mrw6qfb1ayqsx9qkk59mrx4f2y6s0xg0znqyczxfn"; depends=[car diptest ggplot2 ggrepel gridExtra kableExtra knitr lavaan lme4 multcompView pander plyr psych pwr rio rmdpartials ufs]; };
   rosetteApi = derive2 { name="rosetteApi"; version="1.14.4"; sha256="166p3dvib0xpvhkb92b3imassv1b9mrblz2m05jai2nzlz0q7hzk"; depends=[httr jsonlite]; };
   rosm = derive2 { name="rosm"; version="0.2.5"; sha256="10n3yzhk29i3mzbcg6nkjqgvwc9n53ax0d7imn9l4a9msa06as07"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; };
   rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
-  rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; };
-  rosr = derive2 { name="rosr"; version="0.0.10"; sha256="0z0l9m4avif2v33a7rilibpcyj4yfqbrw857kbdzf9pa7xph0i7d"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets knitr mindr rmarkdown rstudioapi shiny tinytex]; };
-  rotasym = derive2 { name="rotasym"; version="1.0.8"; sha256="098zf928h1iy5m599gdlyqd5xhk5ng2i1ng8vlyg19xa0aqrl7j0"; depends=[Rcpp RcppArmadillo]; };
+  rotasym = derive2 { name="rotasym"; version="1.0.9"; sha256="06z8faj61ylb8x898yqx8g8n784hb26cgrwb7yscqc68wd042bwg"; depends=[Rcpp RcppArmadillo]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.6.1"; sha256="175bbwj1bf58gwsw3721dsh8lsika5aqv787kfyjx041m4lar4zv"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo rgl sphereplot]; };
-  rotl = derive2 { name="rotl"; version="3.0.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
-  rotor = derive2 { name="rotor"; version="0.2.4"; sha256="0m947mihnxjzsb64p5dgi4v1y1g3c172xlhdg08nzb2z21qg4r73"; depends=[dint R6]; };
+  rotl = derive2 { name="rotl"; version="3.0.11"; sha256="0b0wr795qicb8k1m4ng0kx9alc88davhdr3kar4ynjblaavz16rk"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
+  rotor = derive2 { name="rotor"; version="0.3.5"; sha256="0rpa24yh72r6sv5xxyia9p8f8c51cfblprb4srrjk2y0fgz5h33i"; depends=[dint R6]; };
   round = derive2 { name="round"; version="0.12-2"; sha256="1kq06q2mbjid8icwahm02za2zp7519cwllx76ch76jyxhmrypcgg"; depends=[]; };
-  roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; };
+  roundhouse = derive2 { name="roundhouse"; version="0.0.2"; sha256="0xx2wai9pdq0g7x8xmwlf48wxv4v18c7ymzvzxpvw1gggppmbk69"; depends=[]; };
   routr = derive2 { name="routr"; version="0.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; };
   roxut = derive2 { name="roxut"; version="0.2.23"; sha256="1pn2invp7brmdvxzi21hi1pc5nss6d02k2nqps73i0yq7brzc7m2"; depends=[roxygen2]; };
   roxygen2 = derive2 { name="roxygen2"; version="7.1.1"; sha256="0qc8akwfwmaqsjaza87f5fi0zk6sh3l6j3assbs6chvx0gnmvidx"; depends=[brew commonmark desc digest knitr pkgload purrr R6 Rcpp rlang stringi stringr xml2]; };
   roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; };
   roxytest = derive2 { name="roxytest"; version="0.0.1"; sha256="166m0pklgryh3vildg0bvzh9gs3p71sf61ivgkvkvyy9vhvnp3jf"; depends=[roxygen2]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
-  rpact = derive2 { name="rpact"; version="2.0.6"; sha256="09ikjcvz6jisbl387j5idypwxqn2ir55cq8f19klwc0p0d113wg4"; depends=[Rcpp]; };
+  rpact = derive2 { name="rpact"; version="3.0.3"; sha256="04hv2lzh0b49is9n2kwjbfh2jm6723n2lf132n0gijxc510mbdxi"; depends=[Rcpp]; };
   rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; };
   rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; };
   rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.2"; sha256="1v1arv5b02n0jvyifb5km9w3z3wxg9x9g3g4xck4s319z5g6lp7n"; depends=[Rcpp rpart]; };
-  rpart_plot = derive2 { name="rpart.plot"; version="3.0.8"; sha256="0y8054jw44jkjg8ijp3p2grsqwrmsdfzk8vps9ksgm7mgfq5732d"; depends=[rpart]; };
+  rpart_plot = derive2 { name="rpart.plot"; version="3.0.9"; sha256="190mh2ia78x7cj925sqs6v441lrskkcpqqb0f6qk2fwvi7lzal0i"; depends=[rpart]; };
   rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
   rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
   rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
@@ -13562,7 +14135,7 @@ in with self; {
   rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
   rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; };
   rpdo = derive2 { name="rpdo"; version="0.3.1"; sha256="0yhg858i5a6s68000a74l4gldycbfmcwcvkk5zhjqzpxzdm7pqb2"; depends=[chk lifecycle]; };
-  rpf = derive2 { name="rpf"; version="1.0.4"; sha256="17crcgsbcsh0c00n7bgdqfnd7n1vzz7drfxjs7d18253yl5x44pl"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; };
+  rpf = derive2 { name="rpf"; version="1.0.5"; sha256="0kz7i7g3l16irz6bxgnkxdmmd931m1fk6rl72dvs21ir5brr010l"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; };
   rphylopic = derive2 { name="rphylopic"; version="0.3.0"; sha256="088aafylypsaxfl903qhi8kigkchmdzndibxic4sgiycry6xvxrz"; depends=[crul ggplot2 gridBase jsonlite png]; };
   rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; };
@@ -13578,25 +14151,25 @@ in with self; {
   rportfolio = derive2 { name="rportfolio"; version="0.0.3"; sha256="1pj08qz1qmdcyxp629lyfggbgzr36wrjir0fj6hpgf5zm588bqiy"; depends=[xts zoo]; };
   rportfolios = derive2 { name="rportfolios"; version="1.0-1"; sha256="00xxh85jpl0rw8fv84i7zmq0psc92pq7hharnr4szbmhgz8kbc35"; depends=[truncdist]; };
   rpostgis = derive2 { name="rpostgis"; version="1.4.3"; sha256="04x5qdz0kznxnp9kygp0m2rjxyhqfz3mc81mcr4aw6cy5p4zp9aq"; depends=[DBI raster rgeos RPostgreSQL sp]; };
-  rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; };
+  rppo = derive2 { name="rppo"; version="1.0.1"; sha256="182na7mcvgjqbna3v5hw58z6q9k8n0987b8ipz0d138zxaq45474"; depends=[httr jsonlite plyr readr]; };
   rpql = derive2 { name="rpql"; version="0.8"; sha256="0iljs08pjnk4b08mgryzn70rxva723bk1hi3wyizx05lls2n8ly7"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
   rpredictit = derive2 { name="rpredictit"; version="0.0.2"; sha256="1gsfcs5l83p4x0glhnq5hidh5rxwipklsj0nzkxaim65w9kqgx30"; depends=[dplyr DT dygraphs httr jsonlite magrittr quantmod shiny stringr xts]; };
   rprev = derive2 { name="rprev"; version="1.0.4"; sha256="1dzqbvfx3fcgfz3b18wwaaprvp0szjfshm8dgmj3r4vyzx71v9lv"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; };
-  rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
+  rprime = derive2 { name="rprime"; version="0.1.2"; sha256="1h54vclc800pir3vxqcq4cmmxy9fcar1fydqmba2dzpj8dvlad7v"; depends=[assertthat plyr stringi stringr]; };
   rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; };
-  rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; };
+  rprojroot = derive2 { name="rprojroot"; version="2.0.2"; sha256="07wy07yhms8zln9qb0iwx69dq08h4lrdi8kavjcplfxcskq638az"; depends=[]; };
   rpsftm = derive2 { name="rpsftm"; version="1.2.7"; sha256="0ncf9ci39pd7p048cgvhl6phhk975xwyjm4aqs1b4hjy1nml4iz2"; depends=[ggplot2 survival]; };
   rpst = derive2 { name="rpst"; version="1.0.0"; sha256="10cbgj67lqgh5bawwa0nwj9kfl3jg4vdm121kc61q199v8dw7nrz"; depends=[plotrix survival]; };
   rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
   rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; };
   rpubs = derive2 { name="rpubs"; version="0.2.2"; sha256="18cnzhcvm7gx4k01ysqay53smrf8xqlbaszq41mny5c7qqh1fvpz"; depends=[rvest xml2]; };
   rqPen = derive2 { name="rqPen"; version="2.2.2"; sha256="077kdvfdyp5h8630k8jigbz8mfyby8vkjiqxpqv0wfi6cqcjlaf2"; depends=[quantreg regpro]; };
-  rqdatatable = derive2 { name="rqdatatable"; version="1.2.8"; sha256="0xz56svv7aqikvk2jlbwf6qlawnv1ylxs5pr9yhmzfr671c85rqp"; depends=[data_table rquery wrapr]; };
-  rquery = derive2 { name="rquery"; version="1.4.5"; sha256="0ha7v7h8f84ml4bsr5hcgghpjim332zlr3ng364qmxdif81z6v98"; depends=[wrapr]; };
+  rqdatatable = derive2 { name="rqdatatable"; version="1.2.9"; sha256="0152df81bsqvbxz0g16bk3j2m0vjxli58yi3191mnlx7ff587ac6"; depends=[data_table rquery wrapr]; };
+  rquery = derive2 { name="rquery"; version="1.4.6"; sha256="1a0rwhjcf93i48pg8zjnp3xwv0mawk2fcir03w9bqgqz290cq3n5"; depends=[wrapr]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.6.1"; sha256="1ny48ra25rzx3k69pmzpd31ka2zhqyqiq1v7ann862j3ris0w8z9"; depends=[]; };
-  rrapply = derive2 { name="rrapply"; version="1.1.0"; sha256="1h6bf7rf5s9smnj8gw7scaj60gnqwzwis1ak8r6pragzpgjkgiqm"; depends=[]; };
+  rrapply = derive2 { name="rrapply"; version="1.2.1"; sha256="0f5b96bhisksdxiy7d1ph9ff7k85qdzd5xb2y6m19q0k14mkxini"; depends=[]; };
   rrat = derive2 { name="rrat"; version="1.0.0"; sha256="1j1jd32pgggn5cqv66l63sw5p4hblgpznf33wd0zdbfapwy8rx4r"; depends=[quantreg]; };
   rrcov = derive2 { name="rrcov"; version="1.5-5"; sha256="0ag6q16ajkqwj28dk9vp4xkvqw26fqqqdxnz38gpszilirahfzqz"; depends=[lattice mvtnorm pcaPP robustbase]; };
   rrcov3way = derive2 { name="rrcov3way"; version="0.1-18"; sha256="1gpjmmdca2waqks0qykj59p50v6pf1zgl81m5lhbrhpcr4rdr63l"; depends=[nnls robustbase rrcov]; };
@@ -13605,8 +14178,8 @@ in with self; {
   rrd = derive2 { name="rrd"; version="0.2.2"; sha256="104iz2y49vzm92a8nrvgzrjyljxl467mp1hjnjmzl4rhf9kl809y"; depends=[assertthat tibble]; };
   rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; };
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
-  rredlist = derive2 { name="rredlist"; version="0.6.0"; sha256="0cl3wbhx96a118f7yld7jf2jq8wimqqvd1apglshyvz3yj03dlxy"; depends=[crul jsonlite]; };
-  rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; };
+  rredlist = derive2 { name="rredlist"; version="0.7.0"; sha256="1w77cnfrybmqnadsmfkpjv5m49kkr7yc6kcqq165lmj3bijnprnj"; depends=[crul jsonlite]; };
+  rrefine = derive2 { name="rrefine"; version="1.1.0"; sha256="0hbpblvabvv8z539dy2v93j3glnp3zsfzlg7m0k5b797l1z8xb46"; depends=[httr readr rlist]; };
   rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; };
   rrepast = derive2 { name="rrepast"; version="0.8.0"; sha256="1x8xda9cndxri2hhd2ihxmjjy0x74r0dh3953dfh7gvj4slaf0rl"; depends=[digest doSNOW foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; };
   rres = derive2 { name="rres"; version="1.1"; sha256="138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60"; depends=[kernlab Rcpp]; };
@@ -13620,40 +14193,44 @@ in with self; {
   rrtable = derive2 { name="rrtable"; version="0.2.1"; sha256="1hblrxn7vixcp32j3cij0xrkzvk31agi9dqgxrimcrzs7gjcd1j5"; depends=[devEMF editData flextable ggplot2 ggpubr magrittr moonBook officer purrr readr rlang rmarkdown rvg shiny shinyWidgets stringr ztable]; };
   rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; };
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
-  rsample = derive2 { name="rsample"; version="0.0.7"; sha256="0s6hgq0rcv3ianyidq3n9z34y5ww51gaggqkwmwns9yyxmwfjcm8"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect vctrs]; };
+  rsample = derive2 { name="rsample"; version="0.0.8"; sha256="1psmxk16d4bz1v05x0gb9hn4brkdjxw8hjbxmj62snichnix3q3i"; depends=[dplyr ellipsis furrr generics modeldata purrr rlang slider tibble tidyr tidyselect vctrs]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
+  rsbp = derive2 { name="rsbp"; version="0.1.0"; sha256="0aardngvj9apn8q5vhfpv67rf7d5iqb7xdq7rh8xmgr8341fvbgc"; depends=[dplyr lubridate magrittr purrr reshape2 tibble tidyr xml2]; };
   rscala = derive2 { name="rscala"; version="3.2.19"; sha256="1wq0wrdbh0gi0bx4m9526qlbjm7nxxqgc17ikdx5mrhcy2f61hjk"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
   rsconnect = derive2 { name="rsconnect"; version="0.8.16"; sha256="05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz"; depends=[curl digest jsonlite openssl packrat rstudioapi yaml]; };
-  rscontract = derive2 { name="rscontract"; version="0.1.1"; sha256="1s19p9cga0qm1diblqf3rmcbm3agiimq4lhfgk004cg7rhaa1lyh"; depends=[]; };
+  rscontract = derive2 { name="rscontract"; version="0.1.2"; sha256="0gn0xcvg9nj6m97g4si6bgmgaj6hxpicz8yig7n84jnczh6w510x"; depends=[]; };
   rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; };
-  rscorecard = derive2 { name="rscorecard"; version="0.16.0"; sha256="0lnxwwf2km9y527k173c8jiy4ijlcj27ykwnnwzbjd3xvkjj0ldb"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; };
+  rscorecard = derive2 { name="rscorecard"; version="0.17.0"; sha256="0h574fvqfx3i23xh454xg6fk75m9pzpqhpk87c22qs3jvxv757sv"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   rsdmx = derive2 { name="rsdmx"; version="0.5-14"; sha256="1b4x87h8kfw8yhmfsjf9l1i0afr7bgvyp5a369m5gn6m07dvlbp9"; depends=[plyr RCurl XML]; };
   rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
   rsem = derive2 { name="rsem"; version="0.5.0"; sha256="1xlk83ivmk8wm6mdmmwvv2z39r6scswgmsmy6dd4qbc3kiqn8cqm"; depends=[lavaan MASS]; };
+  rsetse = derive2 { name="rsetse"; version="0.4.0"; sha256="1mas970p93r0jhxnm1q0sb080k2hh5sxq5q5vrwbj5csxg3c029a"; depends=[dplyr igraph magrittr Matrix minpack_lm purrr rlang tibble]; };
   rsf = derive2 { name="rsf"; version="0.2.2"; sha256="016q6yly2vl6q9mkff2krri2rmzsm9gc9gippd8l38h5c8ri6cdl"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; };
-  rsimsum = derive2 { name="rsimsum"; version="0.9.0"; sha256="02bnb6rr5dzvbywp88sp81lb6ibxlfqiba5vsgp5manx1zmbgjy0"; depends=[checkmate ggplot2 ggridges knitr rlang scales]; };
+  rsimsum = derive2 { name="rsimsum"; version="0.9.1"; sha256="147qn67kwkzgrvg74rdjmck95p2pnq8xxd91f3m801r0gxlz2zr7"; depends=[checkmate ggplot2 ggridges knitr rlang scales]; };
   rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; };
   rskey = derive2 { name="rskey"; version="0.4.4"; sha256="1la3apypp1kk425r753vqwm3nk9zmynp9gix6db0ckkssw0fjxpw"; depends=[berryFunctions rstudioapi]; };
   rsleep = derive2 { name="rsleep"; version="1.0.3"; sha256="11r32xxqdi0cvx67x8yrb4c36c73mgdy18sayg18cnsqb9qhxvyz"; depends=[edfReader ggplot2 jsonlite phonTools psd signal]; };
   rslp = derive2 { name="rslp"; version="0.2.0"; sha256="186k1gngirqhvhii4ysq77wjf5gf75c7gya73minb0pfg9fn16l7"; depends=[magrittr plyr stringi stringr tokenizers]; };
   rslurm = derive2 { name="rslurm"; version="0.5.0"; sha256="0dpxglcsqa2k0nak10515ga13c46rb4mrbpbr3gv7xckg6347zqg"; depends=[whisker]; };
-  rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; };
-  rsnps = derive2 { name="rsnps"; version="0.3.0"; sha256="1ym58gqpvn708228pbkq1klvl60a60bwxwm0arzzad3wh1wansxj"; depends=[crul data_table jsonlite plyr stringr XML xml2]; };
+  rsm = derive2 { name="rsm"; version="2.10.2"; sha256="0709jbhliajll3cw0g0dj368mxmpv0n1yv98pq3b7wcq8bxnqi36"; depends=[estimability]; };
+  rsmatrix = derive2 { name="rsmatrix"; version="0.1.1"; sha256="1g3s1mbv3fvy42cszf33v9kjxl2zxcnjkrmdg5i55fl478x9jfpi"; depends=[Matrix]; };
+  rsnps = derive2 { name="rsnps"; version="0.4.0"; sha256="0ppv64yj1nh13q4lks6djrjc37b32qj5pyddy1lfcy066ah63km6"; depends=[crul data_table httr jsonlite plyr RJSONIO stringr]; };
   rsoi = derive2 { name="rsoi"; version="0.5.4"; sha256="1gchznfshp91i3if8077qph26flxzwa2xrw3q488ah50725d63hw"; depends=[curl memoise]; };
-  rsolr = derive2 { name="rsolr"; version="0.0.9"; sha256="1mxvzb7wvm1agv35r82pr1hxa3fimixcwf36j98qjlxj9p7valrw"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
+  rsolr = derive2 { name="rsolr"; version="0.0.10"; sha256="0dmn35j3m7aw9x70x5ngs6jrb3d1jamlajr4wz46xgfdl1c3y7gz"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
   rspa = derive2 { name="rspa"; version="0.2.5"; sha256="0jvrr3jaw66zqi5pal9dycpac24dn9v7lf2m63q01wmd8m3mlnv9"; depends=[lintools validate]; };
   rsparkling = derive2 { name="rsparkling"; version="0.2.19"; sha256="1rb43lslhlg8jpniirzch8gnl86x6d3shcfp9fpxm0qd3fqrlm6z"; depends=[h2o sparklyr]; };
   rsparse = derive2 { name="rsparse"; version="0.4.0"; sha256="1blg59gsidh0sn6yy761pisz2phml0hzgqc24s5s8q9q903rddr9"; depends=[data_table float lgr Matrix Rcpp RcppArmadillo RhpcBLASctl]; };
   rspiro = derive2 { name="rspiro"; version="0.2"; sha256="1gjil39ib9p86a7r3i03h01x2dsc9y283rnp65xvavrzmmgz87b4"; depends=[]; };
   rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; };
-  rsq = derive2 { name="rsq"; version="2.0"; sha256="1sqajp7fhj918s8qzijijs3srf7qc3cixxwljr61715q4p6m7wzw"; depends=[lme4 MASS Matrix nlme numDeriv]; };
+  rsq = derive2 { name="rsq"; version="2.1"; sha256="1k1p21p9511vxv5zxcv4j7dvrd8f7z7wlsv7zpn961i9d18z75y2"; depends=[Deriv lme4 MASS Matrix nlme]; };
+  rstac = derive2 { name="rstac"; version="0.9.0"; sha256="1qz1pc054fc2adgl1ih0z6fs4wfnw8a9sycyrw4ag7990ibz606p"; depends=[crayon httr jsonlite magrittr]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
   rstan = derive2 { name="rstan"; version="2.21.2"; sha256="0jh58qfrksd2j9w2zy4bajryivgp36m3xdb9mjrjqbk1ib9h83p3"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen RcppParallel StanHeaders V8 withr]; };
   rstanarm = derive2 { name="rstanarm"; version="2.21.1"; sha256="04ggzak3f7jaxza3dxyrmxp5b48qcgyspy22ykbhr03g4hzp7jk8"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen RcppParallel rstan rstantools shinystan StanHeaders survival]; };
-  rstanemax = derive2 { name="rstanemax"; version="0.1.2"; sha256="1k3ng4sh17q69iar03cg6lkw0mfpka9vlv5djih0n3wb2lfsz2k2"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; };
+  rstanemax = derive2 { name="rstanemax"; version="0.1.3"; sha256="0myxcqwpk4zq5y1ri14rbsbb19kr8g7fd3mfdsn8vh2yi5xlcqk1"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; };
   rstantools = derive2 { name="rstantools"; version="2.1.1"; sha256="0b9x8rzj3dr4m7yjx476nn42z22xd1xnw85m9frfwxy5ivg1any9"; depends=[desc Rcpp RcppParallel]; };
   rstap = derive2 { name="rstap"; version="1.0.3"; sha256="176z39k54l5r60md6wziz828c46alv2pmqivvmhvb358crrb8x7n"; depends=[abind bayesplot BH dplyr ggplot2 lme4 loo Matrix nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders]; };
   rstatix = derive2 { name="rstatix"; version="0.6.0"; sha256="0nwwvxwr4z3j4n9z8cnvwghppc836g47n0ia98chk272qwh8xcpb"; depends=[broom car corrplot dplyr generics magrittr purrr rlang tibble tidyr tidyselect]; };
@@ -13661,28 +14238,28 @@ in with self; {
   rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; };
   rstpm2 = derive2 { name="rstpm2"; version="1.5.1"; sha256="0p1zqqjss8i5wca4qvr56d6p9ak20ki4cfbxja1wrhkp4kii29r6"; depends=[bbmle deSolve fastGHQuad mgcv Rcpp RcppArmadillo survival]; };
   rstream = derive2 { name="rstream"; version="1.3.6"; sha256="1mr869hff5wdpw6a7x71366y8dxf9vljbb11fssfkhcf7hm2ipnj"; depends=[]; };
-  rstudioapi = derive2 { name="rstudioapi"; version="0.11"; sha256="0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k"; depends=[]; };
+  rstudioapi = derive2 { name="rstudioapi"; version="0.13"; sha256="12vdfzzjc6mv4h105l8cp108j3hjk0mqmg23m6mqr3jarfymphxa"; depends=[]; };
   rsubgroup = derive2 { name="rsubgroup"; version="1.0"; sha256="1151w8lzsj3w7k56gdry44g9a8a1iqh5m0srd6mydzdxaj90q2pc"; depends=[foreign rJava]; };
   rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; };
   rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; };
   rsvd = derive2 { name="rsvd"; version="1.0.3"; sha256="1fvrw46fl5xb2akaa4mp8nja4h7nn4bdhnjdrk22fsdfqc7hwmhk"; depends=[Matrix]; };
   rsvg = derive2 { name="rsvg"; version="2.1"; sha256="0bxnwa9sbzx6jlxrzh3ymjq81vkxil2qx7kk7wp13a0cql7dhxcn"; depends=[]; };
   rsyncrosim = derive2 { name="rsyncrosim"; version="1.2.4"; sha256="1m8nmw5jq69zgzgjvr7f03skvrry0w4lcf1yg64viaggvm9qyysf"; depends=[DBI raster RSQLite]; };
-  rsyntax = derive2 { name="rsyntax"; version="0.1.0"; sha256="177f6hy3qzbr865ws3afs3ahg3h841ig06crbl0vdjcr02y71mwv"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; };
+  rsyntax = derive2 { name="rsyntax"; version="0.1.1"; sha256="1z0wy1rfqdb9nfmrprqjsdjx1isn484r8ahp7x24ncql9snngia8"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; };
   rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; };
-  rt = derive2 { name="rt"; version="1.0.0"; sha256="1fhi3qnb2y3p96nksbsz49v0q38hg3zfjm7hyk3mpkxn24a188hp"; depends=[httr stringr]; };
+  rt = derive2 { name="rt"; version="1.0.1"; sha256="1l04rx5cvg3sxff4i22bnckljq0rr6jld7dd3kpirdj8psak70id"; depends=[httr stringr]; };
   rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; };
   rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; };
   rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
   rtdists = derive2 { name="rtdists"; version="0.11-2"; sha256="0fap15bkxn2azd5a4j3q9mxpif5ff3y2vb8rm4xnh8l0sl1lw7cs"; depends=[evd gsl msm Rcpp]; };
   rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
-  rtemps = derive2 { name="rtemps"; version="0.7.0"; sha256="0a7f4503zjcwl92xy59f82k6y3fwxkhm8dgpds8bh9x3154x7ryx"; depends=[bookdown DT ggplot2 knitr rmarkdown xfun]; };
+  rtemps = derive2 { name="rtemps"; version="0.8.0"; sha256="1x64j13g1lv0s7yy1b4453l7xnscgf079hkgkp8dv9c38g0mfx98"; depends=[bookdown DT ggplot2 knitr rmarkdown xfun]; };
   rtext = derive2 { name="rtext"; version="0.1.21"; sha256="0j2jfz0mz9552dwa78d527lxipmj5ql8q8np8qq5jw4ka6wj5lbs"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; };
   rtf = derive2 { name="rtf"; version="0.4-14.1"; sha256="032ff0yavqmd2d9svgwkmvxwh0cxjbac6pj48v4cshi898f02rhh"; depends=[R_methodsS3 R_oo]; };
-  rticles = derive2 { name="rticles"; version="0.14"; sha256="1377fib4asazhhki4aajvld0wa35vd3zjvyl3lf2hjm2qk3vyak7"; depends=[knitr rmarkdown tinytex xfun yaml]; };
+  rticles = derive2 { name="rticles"; version="0.17"; sha256="1wbwva5n88dw3vvhcrlzkr58cv03hyx0dqgfmxj7d0dgf4ichr3c"; depends=[knitr rmarkdown tinytex xfun yaml]; };
   rtide = derive2 { name="rtide"; version="0.0.8"; sha256="0q3fcxxlipj12128p25h5hg92snimlpan86q9bncp20sz1skrwzx"; depends=[abind chk dttr2 tibble]; };
   rties = derive2 { name="rties"; version="5.0.0"; sha256="1mxgzrlf41hhawab2664az151fmmhm8ivnnimmzm538yliilc0b7"; depends=[DataCombine DescTools deSolve dplyr ggplot2 gridExtra interactions lattice lme4 MASS mclust nlme nnet plyr zoo]; };
-  rtiff = derive2 { name="rtiff"; version="1.4.7"; sha256="0l0chjbn8kipnhi37zshphxmxga6id39rm5gzz5gjrv8bnaaxxqb"; depends=[pixmap]; };
+  rtiff = derive2 { name="rtiff"; version="1.4.8"; sha256="1jphdq8j646gymgyz39cvm7byvcyg00z5b8nmndx3nb270dsl1gd"; depends=[pixmap]; };
   rtika = derive2 { name="rtika"; version="1.24.1"; sha256="12r9br3pn3llaixa5dn6g5468nsy5adajgdnnvfyhhbkrr0jwpi5"; depends=[curl digest rappdirs sys]; };
   rtimicropem = derive2 { name="rtimicropem"; version="1.4.0"; sha256="0z6bnzks8mcb871m3z5b3cd883hj1i17swjgly005hvwbvi9h61f"; depends=[changepoint dplyr fs ggplot2 knitr lazyeval lubridate R6 rbokeh readr stringr tibble tidyr]; };
   rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; };
@@ -13692,7 +14269,7 @@ in with self; {
   rtmpt = derive2 { name="rtmpt"; version="0.1-19"; sha256="1cpakgy0rmy27b14krmgdrf1fi0mar4k5rklnvmphivid8150gzn"; depends=[coda data_table loo matrixcalc stringr truncnorm]; };
   rtodoist = derive2 { name="rtodoist"; version="0.1.0"; sha256="12lh14ps4snlyykhc65nvn8ipic8is8ssmgcx73snmifhrzxgdyb"; depends=[digest dplyr getPass glue httr keyring magrittr purrr]; };
   rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; };
-  rtrek = derive2 { name="rtrek"; version="0.3.0"; sha256="0nfkmcyrb1gbgjjy62ffjlg6x93zy4s4qg6ii98gjbn0jp6pcj1j"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; };
+  rtrek = derive2 { name="rtrek"; version="0.3.2"; sha256="0yvl1l9ynvpd2p2qksb65fz4cvx36lwdvvh8gp0j280qs78cclq8"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
   rtrim = derive2 { name="rtrim"; version="2.1.1"; sha256="1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2"; depends=[]; };
   rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; depends=[raster RCurl sp xts zoo]; };
@@ -13701,15 +14278,16 @@ in with self; {
   rtsplot = derive2 { name="rtsplot"; version="0.1.3"; sha256="0va6ir0bmpnw4ibvfh2j4z01flg72dpxn7q10sdsdj304hb0g4in"; depends=[quantmod RColorBrewer xts zoo]; };
   rtweet = derive2 { name="rtweet"; version="0.7.0"; sha256="05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n"; depends=[httpuv httr jsonlite magrittr progress Rcpp tibble]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
-  rtypeform = derive2 { name="rtypeform"; version="2.0.1"; sha256="09lcfdkwk274zxkbvg4l1v62xcb9p98qix6rg8ksniz35230f6f0"; depends=[assertthat dplyr glue httr jsonlite lubridate purrr tibble tidyr]; };
+  rtypeform = derive2 { name="rtypeform"; version="2.1.0"; sha256="02qnsw2nd3fnyr0gbmx3690b78k899dxf04g4bqpjlg9y38g1cnr"; depends=[assertthat dplyr glue httr jsonlite lubridate purrr rlang tibble tidyr]; };
   rubias = derive2 { name="rubias"; version="0.3.1"; sha256="1x7h38lsdq03cd72ffawr8mpnf1c1a16sxgmz3c52fn3b9n28jxm"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr tibble tidyr]; };
   rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; };
   rucrdtw = derive2 { name="rucrdtw"; version="0.1.4"; sha256="0865x8i2n63xjbq0pzalm4gd6rpg72yrcsm4rw40a3kzy2svvnlm"; depends=[Rcpp]; };
   rugarch = derive2 { name="rugarch"; version="1.4-4"; sha256="06zmii3wncxndd4hhdk7h4d4s2lj5clrrs10zzz4856g9zjzmbq6"; depends=[chron ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
-  ruimtehol = derive2 { name="ruimtehol"; version="0.2.3"; sha256="073qb7g9j6zkk6hxf78y7ymnmc1s4hbjxxlymjhxpvjfbg4xpslw"; depends=[BH Rcpp]; };
+  ruimtehol = derive2 { name="ruimtehol"; version="0.3"; sha256="1qscaj28xrrqccav0y82mn5nzkc8zfgmx2axg7bxrrhqaibfpy5j"; depends=[BH Rcpp]; };
   ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; };
-  ruler = derive2 { name="ruler"; version="0.2.3"; sha256="0ik9cbr0nc97xady1xm6y9yvms3ckckmjkb8sxxi2in1ip6rvzw2"; depends=[dplyr keyholder rlang tibble tidyr]; };
-  rules = derive2 { name="rules"; version="0.0.2"; sha256="0sj8zfarm2az9zsbr6kg6fv7q76ll5ma3n4rfncsafw1z6n22iw7"; depends=[dials dplyr parsnip purrr rlang tibble tidyr]; };
+  ruler = derive2 { name="ruler"; version="0.2.4"; sha256="159k7453jb37zgjg9rcgz566mz2827dpfq5gm40r6zgkia4z3apx"; depends=[dplyr keyholder magrittr rlang tibble tidyr]; };
+  rules = derive2 { name="rules"; version="0.1.0"; sha256="12xqhay5ghg02yyqz8v6z2284sg9y7jin45v2b5d9s7a81ci2dq9"; depends=[dials dplyr parsnip purrr rlang tibble tidyr]; };
+  rumidas = derive2 { name="rumidas"; version="0.1.0"; sha256="0lfc7d3z1ixgagwznq29spkz3xlzd6yq6q79rapcm4qcz3vljr0v"; depends=[highfrequency lubridate maxLik Rdpack roll tseries xts zoo]; };
   runes = derive2 { name="runes"; version="0.1.0"; sha256="1s2vhwya434q70j4aq4qbds8wivscc5cyldr5pch7p41nqj0j7aw"; depends=[]; };
   runjags = derive2 { name="runjags"; version="2.0.4-6"; sha256="0w97s1j5v05fn4nclqwg56hl9vz6vi2l6sp042r6iyh024fsyg22"; depends=[coda lattice]; };
   runner = derive2 { name="runner"; version="0.3.7"; sha256="0480ndavxz9gldyvz8v9mxszfnysxf13vva2fw6qc49ikm88dry6"; depends=[Rcpp]; };
@@ -13717,7 +14295,7 @@ in with self; {
   runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; };
   rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; };
   rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; };
-  rust = derive2 { name="rust"; version="1.3.9"; sha256="1p81gm6jj2ancx2xbfag4hw5hf4vqbsx2rn3rqcxb4213n1c5f0s"; depends=[Rcpp RcppArmadillo]; };
+  rust = derive2 { name="rust"; version="1.3.10"; sha256="044945nyds1wyw1p4hfxdhhaj2yldjplc0zp1phxrq930s2fjhkv"; depends=[Rcpp RcppArmadillo]; };
   ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; };
   rutifier = derive2 { name="rutifier"; version="1.0.4"; sha256="045pr8apd105azs1glpwqrbamglqddxfpml9yrfrlaivz3fjd9l8"; depends=[R_utils]; };
   ruv = derive2 { name="ruv"; version="0.9.7.1"; sha256="1n4q9mrp9f644spbns6bbnzmlabrg90hwkdfg3hnm3rxp9b4xid0"; depends=[ggplot2 gridExtra scales]; };
@@ -13730,17 +14308,17 @@ in with self; {
   rvertnet = derive2 { name="rvertnet"; version="0.8.0"; sha256="1j8kgyzcn14yl44lnxc8f83wpmgpdzx5aiw91zjbjkajj6bgzrpn"; depends=[crul dplyr ggplot2 jsonlite maps]; };
   rvest = derive2 { name="rvest"; version="0.3.6"; sha256="1yh2p429a0zr8pqmlw5rzf6m797j20j5w6xwxlqq0wrdbnif6bka"; depends=[httr magrittr selectr xml2]; };
   rvg = derive2 { name="rvg"; version="0.2.5"; sha256="1i0alsr9ahl54gwszvaqz5qgiqs85wwzs5d31z97x315sk3n994j"; depends=[gdtools officer Rcpp rlang xml2]; };
-  rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
   rviewgraph = derive2 { name="rviewgraph"; version="1.3.1"; sha256="1jv6ldvzi1av093nqbdivhm0l0q7j1ipmvi486zcbsnwrcj15m91"; depends=[rJava]; };
-  rvinecopulib = derive2 { name="rvinecopulib"; version="0.5.3.1.0"; sha256="1pf2avxq2l8nd6vgp0b8xxy76ii0a3i6gdl895x8dgd6y5mi0z33"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; };
+  rvinecopulib = derive2 { name="rvinecopulib"; version="0.5.5.1.0"; sha256="1138w1jsqg0q9znzkln3d7iwnzvw3hbgykvw1gavlzxm627hglxv"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; };
   rvkstat = derive2 { name="rvkstat"; version="2.6.3"; sha256="0vh5gsvfs01f7mw0cl1wap1w1nsgr4fyv9fdays8b8ad3gc17a2r"; depends=[httr jsonlite RCurl tidyr]; };
   rvmethod = derive2 { name="rvmethod"; version="0.1.2"; sha256="1g2d5pvz5s1sj2kalxaz7nb8874m4113ly809zbimngi1lhg8zi1"; depends=[assertthat locfit]; };
+  rwa = derive2 { name="rwa"; version="0.0.3"; sha256="11irb6ayr1a1rbmhc9zqwyb1vjfc0fq7imji0lfa30zplwgf1mqh"; depends=[dplyr ggplot2 magrittr tidyr]; };
   rwalkr = derive2 { name="rwalkr"; version="0.5.3"; sha256="156834rfqmlb3ibwg9ys11276zhhqghazrpnv82pvd83gn48f3vq"; depends=[dplyr hms httr tidyr]; };
-  rwavelet = derive2 { name="rwavelet"; version="0.4.0"; sha256="0wb3kd97inyh985q1hspnzwxfawfdps43r3zzdpw0jd8sgd7zqxp"; depends=[signal]; };
+  rwavelet = derive2 { name="rwavelet"; version="0.4.1"; sha256="092c1h1xyyi2fwg99dgbn1b22cgf8mliizjpc2z7dnravznprr94"; depends=[signal]; };
   rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; };
   rwebstat = derive2 { name="rwebstat"; version="1.1.0"; sha256="106dkhlr33ii17q45c1hrmbslwsj1qlmx325skch2q71mv7ii0lj"; depends=[dplyr getPass htmltools httr jsonlite readr stringr]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
-  rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.2"; sha256="00cgczgim3ls5jjaklpwfyf24794zhpdjj9pl9fkw20fxhz91bpd"; depends=[stringi tibble]; };
+  rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.3"; sha256="029zzlp4pssnvxfd0ggry37f2k3yn78pqh6ghpd164fdy778l33b"; depends=[stringi tibble]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; };
   rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
   rwstats = derive2 { name="rwstats"; version="0.1"; sha256="10jj2lkilysz7mmysblj6l4jjc560rqsps0ivkvyr7caj8gfhdlb"; depends=[]; };
@@ -13748,16 +14326,17 @@ in with self; {
   rwty = derive2 { name="rwty"; version="1.0.2"; sha256="0p0bpq5dk8vjqx8ry364xhaq3rgxa49planapggicg7by2mhaacc"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; };
   rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; };
   rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; };
-  rxylib = derive2 { name="rxylib"; version="0.2.4"; sha256="0va7kw40nycjn8gh9blzpbph4z319r5a16yim8lwx3hi6rs9myhr"; depends=[BH Rcpp]; };
+  rxylib = derive2 { name="rxylib"; version="0.2.6"; sha256="0z0mfk5g7jdrw28f6jzifis2jsw35w7g1p0bv3b6a4rfmbnjhmwk"; depends=[BH Rcpp]; };
   ryandexdirect = derive2 { name="ryandexdirect"; version="3.6.0"; sha256="0f1z8gp1pxfqx694alj435ihzxvd9ban04b1clzipgdq9la1hza8"; depends=[bitops data_table dplyr httr jsonlite magrittr purrr readr stringr tidyr xml2]; };
   rym = derive2 { name="rym"; version="1.0.3"; sha256="0sxi9a4rx78kxcfvsmyzr138fhzb19pwvj29ryijlsfl7n2h4h16"; depends=[httr purrr stringr]; };
   ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; };
   rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
+  rzentra = derive2 { name="rzentra"; version="0.1.0"; sha256="1knp1616ck64wgf3r80s1nywdnljc1r9fjvgg531j0fxir04aqkl"; depends=[data_table dplyr httr jsonlite lubridate magrittr purrr]; };
   rzmq = derive2 { name="rzmq"; version="0.9.7"; sha256="0iasjaka3gx616l5bxyg2k0fi33hldaplvs0h03j6jpxfmxvcisz"; depends=[]; };
-  s2 = derive2 { name="s2"; version="1.0.2"; sha256="0z4cg61l1b90z7dcbbl6a4ja3zfmgkfvdg456y02gg5aqw5qqcd6"; depends=[Rcpp wk]; };
-  s20x = derive2 { name="s20x"; version="3.1-28"; sha256="1fx5206gy7cq4n0xrdxcvnd913i08yjjz39ldjm3a98sfz6xj636"; depends=[]; };
-  s2dv = derive2 { name="s2dv"; version="0.0.1"; sha256="06jn9f8fpkpi1qz0g7pjyszdwckg6llb2lnf0micj8v1js7phym8"; depends=[abind bigmemory ClimProjDiags GEOmap geomapdata mapproj maps multiApply ncdf4 plyr]; };
-  s2dverification = derive2 { name="s2dverification"; version="2.8.6"; sha256="1nvmc3mpdqrcnv17vk8rjd7mh55pj68y2ffiia09lc8h84r3zxil"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
+  s2 = derive2 { name="s2"; version="1.0.3"; sha256="0vm2rch4msv6s4lqsclkdyfgnyj936bf9znx74hs3zf9jpp93bfx"; depends=[Rcpp wk]; };
+  s20x = derive2 { name="s20x"; version="3.1-29"; sha256="12l0pygl0ca3dbxbsf2zfhhxwcbb5ci070ly3s8fz5hbzri3yyn4"; depends=[]; };
+  s2dv = derive2 { name="s2dv"; version="0.1.1"; sha256="18vb90a9kmdk861r3w99gx4ijmpws2f5xbxdbyll5gjj9nr3vx6k"; depends=[abind bigmemory ClimProjDiags GEOmap geomapdata mapproj maps multiApply ncdf4 plyr]; };
+  s2dverification = derive2 { name="s2dverification"; version="2.9.0"; sha256="0kynj8l39dswm2v6051ikgp0a0pi0c3gsdmhrxwjrxrpbgm7hrhn"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
   s2net = derive2 { name="s2net"; version="1.0.1"; sha256="1f6lc8azx8lax7jc5ggzirwnp5d9ka2plimfkg70vx783xf56zaw"; depends=[MASS Rcpp RcppArmadillo]; };
   s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; };
   sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; };
@@ -13765,7 +14344,7 @@ in with self; {
   sBIC = derive2 { name="sBIC"; version="0.2.0"; sha256="1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11"; depends=[combinat flexmix hash igraph mclust poLCA R_methodsS3 R_oo Rcpp]; };
   sFFLHD = derive2 { name="sFFLHD"; version="0.1.2"; sha256="014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq"; depends=[conf_design DoE_base R6]; };
   sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; };
-  sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; };
+  sNPLS = derive2 { name="sNPLS"; version="1.0.27"; sha256="0h05crdmwmzax4pwmyxb2z1dagyqb3kybpxc064y1kl8m84kcyvv"; depends=[clickR future future_apply ggplot2 ggrepel ks MASS Matrix pbapply]; };
   sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
@@ -13775,28 +14354,30 @@ in with self; {
   sabre = derive2 { name="sabre"; version="0.3.2"; sha256="14rvc8in8lfs9vg96jkqm3xg7bszwss5zd78vngp36x4yay007b6"; depends=[dplyr entropy raster rlang sf tibble tidyr]; };
   sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
   saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
+  sad = derive2 { name="sad"; version="0.1.3"; sha256="0wr4xdx68hrxaw5izy36gm10smk6s1gzrzwayhfp4lhvkn75qsww"; depends=[dualtrees emdist]; };
   sadists = derive2 { name="sadists"; version="0.2.4"; sha256="00iqgwqfia4mybg4v66kb368gydr103zmr8ka9y4j8rmwkg5j9kq"; depends=[hypergeo orthopolynom PDQutils]; };
   sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; };
   sae = derive2 { name="sae"; version="1.3"; sha256="1ncrlzgnga9pfa2j8x1y6axl2665rp08aff98zrim6gq6n6yap8z"; depends=[lme4 MASS]; };
-  saeME = derive2 { name="saeME"; version="1.0.1"; sha256="1w77ncha9xs5p3pzfd3y38q8kz2wjzh35zyn4cby0yp2cyw4xxd9"; depends=[expm MASS]; };
+  saeME = derive2 { name="saeME"; version="1.2.4"; sha256="02yf5rf2kavwl3icfnsjg0kxmifrcc7v4j5jsfrfa8ssfbwcivhn"; depends=[ClusterR dplyr expm MASS]; };
   saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; };
   saeSim = derive2 { name="saeSim"; version="0.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
   saeeb = derive2 { name="saeeb"; version="0.1.0"; sha256="04vjxmnqcgqcamgjd9qq1dbx0msm40mnn94jjy9pzvsj2gsbws39"; depends=[COUNT MASS]; };
   saemix = derive2 { name="saemix"; version="2.3"; sha256="08n1syv8wkf1nqz8i1n3ippyp63g56xf8xqgczxm630r6802yqab"; depends=[]; };
   saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; };
   safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
-  safedata = derive2 { name="safedata"; version="1.0.7"; sha256="0f7wbcghi35fr85gl5qsbpbri0w50kv8axx65cmamqzfkmp0mfr0"; depends=[chron curl igraph jsonlite readxl sf]; };
+  safedata = derive2 { name="safedata"; version="1.0.9"; sha256="0xcpgh4898rqdnnxx21vyxc8aqlwg26aywr591sllasrv1jzsmrc"; depends=[chron curl igraph jsonlite readxl sf]; };
   safer = derive2 { name="safer"; version="0.2.1"; sha256="1lmhaj9y0hi4ybxfkllxl99vsagcg73sy4kkcmlvn3bs69jky1r9"; depends=[assertthat base64enc sodium]; };
   safetyGraphics = derive2 { name="safetyGraphics"; version="1.1.0"; sha256="1s8xwx014nihn13v6rpwy11sb3yzfyj3alb88y47wp1kh39d7f0q"; depends=[dplyr DT haven htmlwidgets jsonlite magrittr purrr rlang rmarkdown shiny shinybusy shinyjs shinyWidgets stringr tibble tidyr]; };
   sail = derive2 { name="sail"; version="0.1.0"; sha256="1wrh2dam5lblascqd8gl76jks72ys1amz84c6p08y8ykdmn2saq1"; depends=[gglasso glmnet]; };
-  salesforcer = derive2 { name="salesforcer"; version="0.2.0"; sha256="154xyh04ldyz2l20v48ww5j965ylm55g1m8jsh6726ni1zp6x7kk"; depends=[base64enc curl dplyr httr jsonlite lifecycle lubridate mime purrr readr rlang rlist tibble vctrs XML xml2 zip]; };
-  salso = derive2 { name="salso"; version="0.1.16"; sha256="1xvzvy0s1718n9p71a6gb4dzg281drzzmpyda5j3b729aijni6bh"; depends=[]; };
+  salem = derive2 { name="salem"; version="0.2.0"; sha256="1pk27d57bmds0jvnvwai2scjy798lb7w6lb84yxl4ccgyn1ldh45"; depends=[]; };
+  salesforcer = derive2 { name="salesforcer"; version="0.2.2"; sha256="12s2knfyq4h33n7mfs1xjbvs1fh52dyw19y759z7l2bvmv27b71h"; depends=[base64enc curl data_table dplyr httr jsonlite lifecycle lubridate mime purrr readr rlang rlist tibble vctrs XML xml2 zip]; };
+  salso = derive2 { name="salso"; version="0.2.5"; sha256="0dc5bn78028yvfzffnfdl1m6jsb5ccc400ih5pwg5ikajf7mfs8v"; depends=[]; };
   salty = derive2 { name="salty"; version="0.1.0"; sha256="1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6"; depends=[assertthat purrr stringr]; };
   sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; };
-  samc = derive2 { name="samc"; version="1.1.0"; sha256="124mbbhq9ypn1jxyqsx7i6lkzr8qxq5qz0fn3i5gk4aax1l5f92l"; depends=[gdistance Matrix raster Rcpp RcppEigen]; };
+  samc = derive2 { name="samc"; version="1.2.1"; sha256="143dfslm4yrqrad8ddjq2fmv56zp11v2kjr5x01gnw6aic0c6ash"; depends=[gdistance Matrix raster Rcpp RcppEigen]; };
   samon = derive2 { name="samon"; version="4.0.1"; sha256="1zhnv7kdpd2zhp6il5x56v4yh5703n1nsnkrysygns4i7xhvcf6z"; depends=[]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-5"; sha256="0ks95d1w5dvxz4vb850hb5v0w8xg6sil0gvddmd1mrrjkjqkk96f"; depends=[boot lattice latticeExtra raster rasterVis sp]; };
-  sampleSelection = derive2 { name="sampleSelection"; version="1.2-6"; sha256="1ph26v78sy8341d9iir6243vmvnrnan7gj5mr31913kpgkblcwfj"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
+  sampleSelection = derive2 { name="sampleSelection"; version="1.2-12"; sha256="1am1w8c24f27gcdmrk3b4wp9j5awghnw9s9lphnkm10pl31881dy"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
   sampler = derive2 { name="sampler"; version="0.2.4"; sha256="12jjx3ci1yss8dj64bjdmz73cyjfkwb7b9zk4zm48lqv78k6wlv7"; depends=[dplyr purrr reshape tidyr]; };
   samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; };
   samplesize4surveys = derive2 { name="samplesize4surveys"; version="4.1.1"; sha256="0v332xb4vkkjr3nwf3231aqgzsj7mqld9ffkla1nj52lxay2ji75"; depends=[dplyr magrittr TeachingSampling timeDate]; };
@@ -13808,52 +14389,61 @@ in with self; {
   samplingVarEst = derive2 { name="samplingVarEst"; version="1.4"; sha256="0gzz0qz67h3vpdsi5g1w7fkyacj8789qxmj353q7pd0jm20q60l1"; depends=[]; };
   samplingbook = derive2 { name="samplingbook"; version="1.2.2"; sha256="1szx9bdlxxn2yhy9i362fcscn5cydvrkw9kggr7yqb715k5n1j6n"; depends=[pps sampling survey]; };
   samr = derive2 { name="samr"; version="3.0"; sha256="01km0f7qgm73x19vbvsxl083hs1dq4dj8qm5h64cxbf20b08my15"; depends=[GSA impute matrixStats openxlsx shiny shinyFiles]; };
+  sams = derive2 { name="sams"; version="0.4.0"; sha256="1h0sg2q8yklffllwddlnx4d18lkc8lab5zc3pkh6xiwr9xg1fqas"; depends=[]; };
   samurais = derive2 { name="samurais"; version="0.1.0"; sha256="0s00hd3ax4r662n8iqmd9i56sgyjxbgc59la7qvh3jwcnzcvmgz9"; depends=[MASS Rcpp RcppArmadillo]; };
   sand = derive2 { name="sand"; version="2.0.0"; sha256="0a8skj1wi1n9zlm7jb5cix1i4ssdzfpj4ym2854ala9jy6qj7g7n"; depends=[igraph igraphdata]; };
-  sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; };
+  sandwich = derive2 { name="sandwich"; version="3.0-0"; sha256="0afm6snak7r11dxyl3qirqdjah6d9pdv4afmxwam1nq9bqxyb3w2"; depends=[zoo]; };
+  sanic = derive2 { name="sanic"; version="0.0.1"; sha256="05fd7jpi7cf9klfh6dqf8wklrjh5q1b3xqddxhdihcsqvcqhg48l"; depends=[Matrix Rcpp RcppEigen]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sanityTracker = derive2 { name="sanityTracker"; version="0.1.0"; sha256="0y041x840sg5c05ksljb1y4xag1cib19q5ygp443k13ryfbcgs9k"; depends=[checkmate data_table]; };
   sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; };
   sankeywheel = derive2 { name="sankeywheel"; version="0.1.0"; sha256="1sigj4jz13qj4s8vxk0dl2xsddqgyfxabj8yggkasawm7pryvbyy"; depends=[htmlwidgets]; };
   sanon = derive2 { name="sanon"; version="1.6"; sha256="0h3l1dzgkddvb3vzg7pcgwrgidphy73jys2h49v84nbfvqr6l85z"; depends=[]; };
   santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; };
-  santoku = derive2 { name="santoku"; version="0.4.1"; sha256="1szcnxy4q8yp06mb72cy40fqdn9pvi07wnfa6z3p9z32zxn6mq1k"; depends=[assertthat lifecycle Rcpp vctrs]; };
+  santoku = derive2 { name="santoku"; version="0.5.0"; sha256="1l69jnlzcjkwr8wqmgf40nkf48a58m50c6cwn8sh0vd71bmi75qm"; depends=[assertthat lifecycle Rcpp vctrs]; };
   sanzo = derive2 { name="sanzo"; version="0.1.0"; sha256="1fqsx2mgjsy6vjvsp2avi2i5cw7cjs2p53l1z6hb3bzid3067s87"; depends=[]; };
-  sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.1.0"; sha256="1alcqndj7sd4c70qzixcwaw8yrl40arp8765845wxr7bamw1j8g5"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; };
-  saqgetr = derive2 { name="saqgetr"; version="0.2.0"; sha256="126wr1if6mqs1m17amjhx7iq5ypgdgphgl9rcb9iia29krlfcq00"; depends=[curl dplyr fs lubridate magrittr purrr readr stringr tidyr]; };
+  sapevom = derive2 { name="sapevom"; version="0.1.0"; sha256="0xlx14wrv28nc8ggh6dr486slnbx10irwb2yrgnxg5viw4pswwys"; depends=[]; };
+  sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.1.1"; sha256="00dywrfi6321v5xac7wll5yfwr7ffqhbscgv4akaijpqf44b5m2m"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; };
+  saqgetr = derive2 { name="saqgetr"; version="0.2.1"; sha256="014i3grbbvyndndm5qxqydkzfc2h2shzrvls1f4fm8l5vnx7yjc6"; depends=[curl dplyr fs lubridate magrittr purrr readr stringr tidyr]; };
   sara4r = derive2 { name="sara4r"; version="0.0.7"; sha256="1la02rq16c3hvfg4dygz6himvs88nmry8616fzgnsbxzpddl5aw3"; depends=[raster rgdal RGtk2 sp]; };
-  sarima = derive2 { name="sarima"; version="0.8.2"; sha256="0fyfba017p35g16b8xp9zvqp9dalhlgr7x5hpk10y29qh7k12z69"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; };
+  sarima = derive2 { name="sarima"; version="0.8.4"; sha256="0aysxgp34xn0gz9jxb2garprfzx61xmqnxlz2c2ay22llkc806dn"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; };
   sarp_snowprofile = derive2 { name="sarp.snowprofile"; version="1.0.0"; sha256="02g7d5kilfkhqxm02jkhkraqbamxaj1qzzi150k6m55d5bfy4wih"; depends=[data_table xml2]; };
-  sars = derive2 { name="sars"; version="1.2.3"; sha256="04dllvmwgmd06f8p99vhw8svgymc7v8n1dg13xzxmm8bpi1ww1ys"; depends=[cli crayon dplyr nortest numDeriv]; };
-  sarsop = derive2 { name="sarsop"; version="0.6.5"; sha256="1jvxx8l352slwaj6sn2344ivss27cvwnvc6k8i9dd7zmy1z85qn7"; depends=[BH digest Matrix processx xml2]; };
+  sarp_snowprofile_alignment = derive2 { name="sarp.snowprofile.alignment"; version="1.0.2"; sha256="1yh4ybnscjzps28ncqd46xzv88fjcn4bhcx6rwz8kl1m253c4wpl"; depends=[dtw sarp_snowprofile shiny]; };
+  sars = derive2 { name="sars"; version="1.3.0"; sha256="0zpwmyqjaxnx13n3vz10szl7iyvk40fpm8x2d6irmhbgfzhc2qvx"; depends=[cli crayon doParallel dplyr foreach nortest numDeriv]; };
+  sarsop = derive2 { name="sarsop"; version="0.6.6"; sha256="01rlhjfry8yj42mavvdl7maggz6z4sv8zlz51mxcrsqhndm1ijvc"; depends=[BH digest Matrix processx xml2]; };
   sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
-  sasLM = derive2 { name="sasLM"; version="0.1.4"; sha256="07gpcw77hp80i1rvz8pf5npib447zywigqx7df7i7r1w0vjzz0nc"; depends=[]; };
+  sasLM = derive2 { name="sasLM"; version="0.2.1"; sha256="19z842ayd6p5v2hpihmn1dhinyc14sh87ag5hiy56igi4rbb4iv5"; depends=[]; };
   sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; };
   sass = derive2 { name="sass"; version="0.2.0"; sha256="0qzrncsnp0zd8jyp4whss92m7llqsfccmp9p9r3gdc7hlq1amp3z"; depends=[digest fs htmltools rlang]; };
   sate = derive2 { name="sate"; version="1.1.0"; sha256="0d1b0gp5abh5g7a25ff40xdnncrl2afjnlcc56dbhqkk43gjah17"; depends=[MASS]; };
   satellite = derive2 { name="satellite"; version="1.0.2"; sha256="1ib9g4cplksf9ymp8hcv843lv5bpar31w8h4wnmya5hjsdmlfiv4"; depends=[plyr raster Rcpp]; };
+  satin = derive2 { name="satin"; version="1.0"; sha256="0ing5vhw8akrpy703fcwn5p0gadfabqb3abc9ircpgb6y2k5axzk"; depends=[geosphere lubridate maps maptools ncdf4 PBSmapping sp splancs]; };
   satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; };
   saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
   saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
+  savonliquide = derive2 { name="savonliquide"; version="0.1.0"; sha256="0jrgd8yfvq73ackq3i6hb4dx78wbvs93q1psdkk7g884wigb4gn7"; depends=[crayon glue httr]; };
   saws = derive2 { name="saws"; version="0.9-6.2"; sha256="1ikvky45inz65djv1c9v749a5lq4m0xlzhm4p12am25qyv08hgjz"; depends=[gee]; };
-  sazedR = derive2 { name="sazedR"; version="2.0.1"; sha256="1y8vlffvw7ff6j6pqwd0r2zxx1an846znajgcl8mdcbjimvf7fg5"; depends=[bspec dplyr fftwtools pracma zoo]; };
+  sazedR = derive2 { name="sazedR"; version="2.0.2"; sha256="0v8ap9ivwj5h4w2iwhww16v1jm6jpkkphvkh5vq06mv1a72p0inz"; depends=[bspec dplyr fftwtools pracma zoo]; };
   sbfc = derive2 { name="sbfc"; version="1.0.2"; sha256="1bwwy4yw8wfvmisiqwswd78dy4bjgmhcv0aki1x2sslzazmdy23y"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; };
   sbgcop = derive2 { name="sbgcop"; version="0.980"; sha256="0vmg8b4462qghlyx6hq0raf9xqvygzgwi5y0cbqcljhmbmqjrwxs"; depends=[]; };
   sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
   sbl = derive2 { name="sbl"; version="0.1.0"; sha256="1wxzscii0kp55sngmjccrqvc8zm1zamfh406r12irrz2wbxwqnkw"; depends=[]; };
-  sbm = derive2 { name="sbm"; version="0.2.1"; sha256="0x79gpl703icn7cd11z39f23kmk87ny47a5i24s7p3bm342s5mhg"; depends=[blockmodels ggplot2 magrittr R6 Rcpp RcppArmadillo]; };
+  sbm = derive2 { name="sbm"; version="0.2.2"; sha256="165c9032zy2ddzidqbaayx9ibf3njcwmv82rfdqg9nmrpcqrzblw"; depends=[blockmodels ggplot2 magrittr R6 Rcpp RcppArmadillo]; };
   sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; };
+  sbo = derive2 { name="sbo"; version="0.5.0"; sha256="00pnvpcl6441gf8npf6b6cvzxh0kq4qbfxggjiqdny6lq2nl0d47"; depends=[dplyr Rcpp rlang testthat tidyr]; };
   sboost = derive2 { name="sboost"; version="0.1.1"; sha256="126rqvpqwvwjxvsg1v04nkmd6af55j7sgx43jg2vnggyrlli9j9q"; depends=[dplyr Rcpp rlang]; };
-  sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; };
-  sbtools = derive2 { name="sbtools"; version="1.1.11"; sha256="06b27cxrfqps0lfgjcwxcal36dkf05y2lcmwrzjrm333zgnvcy6g"; depends=[curl httr jsonlite stringr]; };
+  sbtools = derive2 { name="sbtools"; version="1.1.12"; sha256="140xfs39s3x1zrwqpsh4fqswjpli6l1wz2v989vm9z6w4785hdq6"; depends=[curl httr jsonlite stringr]; };
   sbw = derive2 { name="sbw"; version="1.1.1"; sha256="1wlyhqwb07bb3g2ar16wk1wv541m7v4hfyncxgqd0fxsnb955pi8"; depends=[MASS Matrix quadprog slam spatstat]; };
   scBio = derive2 { name="scBio"; version="0.1.6"; sha256="1bpizxm9fbxd4sfapi1ayfg5csacb4dvqbvappd79jkq4mrsk12q"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; };
   scDIFtest = derive2 { name="scDIFtest"; version="0.1.1"; sha256="1hq68g7zf7372cach2qfc7l1l8gh5aqkp66k0cxjnrhmvvb1qcax"; depends=[mirt sandwich strucchange zoo]; };
-  scMappR = derive2 { name="scMappR"; version="0.1.3"; sha256="0rnpl6l4cipsx93swkci8pv59f9pwy4p596hg59vj6v57d5xga7s"; depends=[downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pbapply pcaMethods pheatmap Seurat]; };
+  scLink = derive2 { name="scLink"; version="1.0.1"; sha256="0gcwx8kfik1lv949r9d9rqqnvrfkr4bj5cj2i9h1r7l1b76kna74"; depends=[glasso]; };
+  scMappR = derive2 { name="scMappR"; version="0.1.5"; sha256="0l429nzwflaa50jlpr8rd7av2gnr8fhg59pbrbvziczf6r1jb5z8"; depends=[ADAPTS downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pbapply pcaMethods pheatmap reshape Seurat]; };
   scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; };
   scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; };
   scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; };
-  scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.2"; sha256="0shs8m98szr97s30byv4drd11nm3102s76yn501f9a91v0clp6wl"; depends=[MASS Matrix pbapply RSpectra]; };
+  scSorter = derive2 { name="scSorter"; version="0.0.1"; sha256="02zkq37zmi0rsr7m50xqpys56snazhzbp77hwld9jrav6jix4jjm"; depends=[]; };
+  scTenifoldKnk = derive2 { name="scTenifoldKnk"; version="1.0.0"; sha256="1p166fmpymyb2669n6npriz6kpsf66q398rjqdcr8zq4bvf4qswj"; depends=[MASS Matrix pbapply RSpectra scTenifoldNet]; };
+  scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.4"; sha256="1gnikgfaf74d4sjdjjl34lwy9lcws4haff6x59x8bnjj7k7q219q"; depends=[MASS Matrix pbapply RSpectra]; };
   scUtils = derive2 { name="scUtils"; version="0.1.0"; sha256="09c4vwrjj4r0nfcwb8q0a243m0v5wa3qisdlcy7ik58gyxp02zv8"; depends=[assertthat dplyr ggplot2 Matrix scales viridis viridisLite]; };
   scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
   scaffolder = derive2 { name="scaffolder"; version="0.0.1"; sha256="1va1mlhqv5qn0hm81ypdir9llr68222qxjp3jink69zpaskfbdib"; depends=[reticulate]; };
@@ -13863,47 +14453,47 @@ in with self; {
   scales = derive2 { name="scales"; version="1.1.1"; sha256="019ps0njjc0rzrjygqiyn8b9vp0c3c0jd56h1yi19wzi49jvdcj0"; depends=[farver labeling lifecycle munsell R6 RColorBrewer viridisLite]; };
   scalpel = derive2 { name="scalpel"; version="1.0.2"; sha256="1rwa1h24b0bzsiasjgj84rd5k5wpw6pnp463qaj624sra9wp9pw9"; depends=[gam igraph Matrix protoclust R_matlab]; };
   scalreg = derive2 { name="scalreg"; version="1.0.1"; sha256="0kfcgl9cpp6g1qx23s1yrjzn0hi74vmrw567vy9wpsmhk04a5bkx"; depends=[lars]; };
-  scam = derive2 { name="scam"; version="1.2-6"; sha256="1b57w583dx1dl437yrzap257kyfa5zipc4n57rbfn2laraqjw7dh"; depends=[Matrix mgcv]; };
+  scam = derive2 { name="scam"; version="1.2-9"; sha256="0y60qvm82x2gwxpqx1r976dxxdipzh4zcvjk4sj8kjv2i5q95z5c"; depends=[Matrix mgcv]; };
   scan = derive2 { name="scan"; version="0.40"; sha256="1khmg05dzs1va66bm26wxx440nlkl0r70wbh814fdlmij3py7m54"; depends=[car kableExtra knitr MASS mblm nlme readxl]; };
-  scanstatistics = derive2 { name="scanstatistics"; version="1.0.1"; sha256="147fhq34vqkq50bw0g3a112048s5jaxxcwm3iv5wykp8zl45msmz"; depends=[dplyr emdbook ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; };
-  scape = derive2 { name="scape"; version="2.3-2"; sha256="1i3k37r7lisrj1pblni5xn76kf6py52s4yd51fm78c3286yfaasf"; depends=[coda Hmisc lattice]; };
+  scape = derive2 { name="scape"; version="2.3.3"; sha256="1jb5c335qsbrpsgngs8c1qlibyb7zvvx6mwydfhm1plx4pkcq0n1"; depends=[coda Hmisc lattice]; };
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; };
-  scatterD3 = derive2 { name="scatterD3"; version="0.9.1"; sha256="0nlsy4z9m4kzm5m577nhysc17z9f3hc5anmig992x7mq4vnjnwxh"; depends=[digest ellipse htmlwidgets]; };
-  scattermore = derive2 { name="scattermore"; version="0.6"; sha256="0wa7vnw935320333ivr1k5kr1qxbxppy9ncsf2hp2a2gw885scn8"; depends=[ggplot2]; };
-  scatterpie = derive2 { name="scatterpie"; version="0.1.4"; sha256="0g5sn0iv6c1q7y51j4gbbbnil5089dgk1w4q94c7h5y3x7wfrzqb"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; };
+  scatterD3 = derive2 { name="scatterD3"; version="0.9.2"; sha256="1w4rr1v6capg4jkb1fj3ijvk6aj8nbw79kg731bcff1vjp8n04hy"; depends=[digest ellipse htmlwidgets]; };
+  scattermore = derive2 { name="scattermore"; version="0.7"; sha256="18nzlprmphkvjg946h10h2qq0wbkmv2526p8di6k2xl4gccq0qpk"; depends=[ggplot2 scales]; };
+  scatterpie = derive2 { name="scatterpie"; version="0.1.5"; sha256="0h48l0699lpfagv09f53yismir84945m56qwzk52lc7wxyvkfcp1"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; };
   scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; };
   scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; };
   scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; };
-  sccr = derive2 { name="sccr"; version="2.0"; sha256="1r5hmkij73l0z19smq080gr66nnlqk4v5sq0wcmidbxxsjpzwb45"; depends=[dplyr]; };
+  sccore = derive2 { name="sccore"; version="0.1.1"; sha256="0jc0cmz3vwbam2mxhj4768982g2bxnimx5j2kk27q8c75yl9pcyn"; depends=[dplyr ggplot2 ggrepel igraph magrittr Matrix pROC Rcpp RcppArmadillo RcppEigen RcppProgress rlang scales tibble uwot withr]; };
+  sccr = derive2 { name="sccr"; version="2.1"; sha256="0cjlzv92b5qrs43d3ry33zcggiqvsqaf8wq4k19ws9lvgh59b62v"; depends=[dplyr]; };
   scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; };
-  scdhlm = derive2 { name="scdhlm"; version="0.3.2"; sha256="1im2z8bfslvrk3y8hqk4snf42fb2iw6yh6nrhijih8qx3jmpwlmb"; depends=[nlme]; };
+  scdhlm = derive2 { name="scdhlm"; version="0.5.1"; sha256="134qwjikh58arw34298w9vd30i5madyqiqh8hs19jsv3h79g2f80"; depends=[lmeInfo nlme readxl]; };
   scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; };
   scgwr = derive2 { name="scgwr"; version="0.1.2-1"; sha256="1dv6lsdpv6gdgjkww3ljqqkwdy9ir82dzwiqrclbfp9vlzay4ybf"; depends=[dplyr FNN optimParallel spData]; };
-  schoRsch = derive2 { name="schoRsch"; version="1.7"; sha256="19h721v4a7rb1dlkbpb9s24x87fvz3q449ndi0rn0yc0m6mhmcvi"; depends=[]; };
+  schoRsch = derive2 { name="schoRsch"; version="1.9.1"; sha256="0f823z48s50jhcphqqivchrmkiwqg25nc01c17kjpzzryd2fi5zs"; depends=[]; };
   schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; };
   scholar = derive2 { name="scholar"; version="0.1.7"; sha256="142iwrips1589fa0g1178a6s1cz4dfcv9b0qs570q6b6ccfjxi6r"; depends=[dplyr ggplot2 ggraph httr R_cache rvest stringr tidygraph xml2]; };
   schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
   schrute = derive2 { name="schrute"; version="0.2.2"; sha256="1j1bb7inhxq355kvqmp45zgxz41d3rpbh2rxk9wkahsbiy0cdybn"; depends=[dplyr ggplot2 magrittr stringi stringr tibble tidyr tidytext]; };
   schumaker = derive2 { name="schumaker"; version="1.2"; sha256="1whfmnjmib7lh72src7cnbw3mswzaxq8vd50x5x9cv0031n0y6l7"; depends=[]; };
   scico = derive2 { name="scico"; version="1.2.0"; sha256="1l7vin8zjnv3zhgv81v6qrx6nysd2kx10na1pfn6mmxvr1bsj9jp"; depends=[]; };
-  scidb = derive2 { name="scidb"; version="3.0.0"; sha256="1shaw6g9s1z3vwclj7gfsp14vzqd8wvwkm5jsmmbif0bcrh43pfh"; depends=[bit64 curl data_table digest openssl]; };
   scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; };
   scifigure = derive2 { name="scifigure"; version="0.2"; sha256="1zc88r1lnb0cws130hq4rjc34rrp6zkmi8yhkwsm3vkznbhi4iba"; depends=[]; };
   sciplot = derive2 { name="sciplot"; version="1.2-0"; sha256="097zcgjsv54f6wd8fjwh2xb406j6yrw94v9pcxa0zln1q7fs93vk"; depends=[]; };
-  scipub = derive2 { name="scipub"; version="1.1.0"; sha256="0mnjnnd3bpiqi38x3mhl4isc4j1lln5hrjp2cx544h2abr8iw83b"; depends=[dplyr forcats purrr stringr tibble tidyr tidyselect]; };
+  scipub = derive2 { name="scipub"; version="1.2.1"; sha256="1hb4wwpyyx9np75q2d1vg86c0c29h8pyx2s3ffipkdgjaf9b6mjv"; depends=[dplyr forcats gghalves ggplot2 purrr stringr tibble tidyr tidyselect]; };
   sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; };
   sclr = derive2 { name="sclr"; version="0.3.1"; sha256="10pihx35889w509ijbyq5hzslk9n7kakjnfscg7p0dq198nbpyca"; depends=[broom dplyr purrr rlang tibble]; };
   scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
   scoper = derive2 { name="scoper"; version="1.1.0"; sha256="0ls1c4h7l5wk6y4yw8278rg3kyk96508pc9cd4k68kncj302xj26"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang scales shazam stringi tidyr]; };
   scopr = derive2 { name="scopr"; version="0.3.3"; sha256="1j45l5zcrpc4dnb6ik1v0jlqizpkijl0p656s869jhhvv55r6v2i"; depends=[behavr data_table memoise readr RSQLite stringr]; };
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
-  scorecard = derive2 { name="scorecard"; version="0.3.0"; sha256="08zf99xxvl27lin5xqf781l3lr4cjlr8gyw5vw4ps1fnsn844c63"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; };
+  scorecard = derive2 { name="scorecard"; version="0.3.1"; sha256="08xzgf8lbc1y44hsd3461n4pd3kc78nfr0vzlzx7ghfi4i7jh2c8"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; };
   scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; };
   scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; };
-  scoringRules = derive2 { name="scoringRules"; version="1.0.0"; sha256="1jksv22hy8kazqwy6yjdjl32k7i558vcn7i13wc7fmary7v500km"; depends=[knitr MASS Rcpp RcppArmadillo]; };
-  scoringutils = derive2 { name="scoringutils"; version="0.1.0"; sha256="1mqr2c1lgzmdcmv8lpk66xklln5d6p594q53c5pxh8akgg085i99"; depends=[data_table goftest scoringRules]; };
+  scoringRules = derive2 { name="scoringRules"; version="1.0.1"; sha256="0rc8nz68h56mzsr7hyga77n0i05rq3hjkzaqx78bihzcwqd9vji7"; depends=[knitr MASS Rcpp RcppArmadillo]; };
+  scoringTools = derive2 { name="scoringTools"; version="0.1.1"; sha256="0vd5d7qmkd5kyai70c0d46wp1qhgx267wrw3bdjhajz2ry05cir1"; depends=[discretization dplyr magrittr sqldf]; };
+  scoringutils = derive2 { name="scoringutils"; version="0.1.4"; sha256="0rm618rs395v5n5cbnkqb7l903c7hyxpy5hg55b8kfmzmv891liv"; depends=[data_table forcats ggplot2 goftest scoringRules]; };
   scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
   scpm = derive2 { name="scpm"; version="2.0.0"; sha256="1ib46m3i50annp90n2ih4qdxabxik4ngg9j0a5hgspsvk1i4hrvp"; depends=[interp lattice MASS Matrix mvtnorm RandomFields rgl]; };
   scraEP = derive2 { name="scraEP"; version="1.1"; sha256="0dimvdjlgaymjmd3gf60hxcavpr58bpffrfhlksnrfzbb7an65dd"; depends=[data_table RCurl XML]; };
@@ -13915,11 +14505,11 @@ in with self; {
   scriptuRs = derive2 { name="scriptuRs"; version="0.1.0"; sha256="1wbvfqcc0raazhdc6pyp93q859ilxfz9rz338p3sb7fjyxvparbl"; depends=[]; };
   scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; };
   scrobbler = derive2 { name="scrobbler"; version="0.2.15"; sha256="079ms94q2h8ciqi9b4w9i1md57x844jz464hk7rr564n9wcfp4gj"; depends=[httr jsonlite]; };
-  scrollrevealR = derive2 { name="scrollrevealR"; version="0.1.0"; sha256="052yicg9qbybyp74w4mavh9vbacyrv8im8l1a0qxcvlafhi1gjy8"; depends=[glue htmltools]; };
+  scrollrevealR = derive2 { name="scrollrevealR"; version="0.2.0"; sha256="0k8ffapwxpb25wphm76arma095hrh3wf0gpkx1z6g4rplahf4jxa"; depends=[glue htmltools]; };
   scrubr = derive2 { name="scrubr"; version="0.3.2"; sha256="1grh6gljxad2iig6vldv2j0wk83cj6v1pdqsldb6gp4kqyzbikq9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; };
   scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; };
   scs = derive2 { name="scs"; version="1.3-2"; sha256="10z5619gbnnygk8pkdx2qji56jlv1q6c1z4581pdkd9sfnhg1yp3"; depends=[]; };
-  sctransform = derive2 { name="sctransform"; version="0.2.1"; sha256="07v3lzccsrkh1glfxd1q20r8f8gl9ls5az0s1dvxm4vcls0hlhyn"; depends=[future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; };
+  sctransform = derive2 { name="sctransform"; version="0.3.2"; sha256="1p3m6i28nlxh6r609syn88cwlbdpl3dw44dy3gsijk2ibq20mfsx"; depends=[future future_apply ggplot2 gridExtra MASS Matrix matrixStats Rcpp RcppArmadillo reshape2]; };
   scuba = derive2 { name="scuba"; version="1.10-0"; sha256="1ckq8lc92wpb6rimi5n70qnxngvdl38nrwfwayn7c7jh40ywn9fk"; depends=[]; };
   sdPrior = derive2 { name="sdPrior"; version="1.0-0"; sha256="0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37"; depends=[doParallel GB2 MASS mgcv mvtnorm pscl]; };
   sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; };
@@ -13927,6 +14517,7 @@ in with self; {
   sdafilter = derive2 { name="sdafilter"; version="1.0.0"; sha256="0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq"; depends=[glasso glmnet huge POET]; };
   sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; };
   sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18.3"; sha256="0snsl790ivx21dynryscy9arc8bmfh4pigh6j9m3b8lls8alcpqz"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; };
+  sdcLog = derive2 { name="sdcLog"; version="0.1.0"; sha256="0pz461jcfgcahsyaacd953gqgniwxsm664a8pnsbdj6d04mrn56w"; depends=[broom checkmate crayon data_table]; };
   sdcMicro = derive2 { name="sdcMicro"; version="5.5.1"; sha256="1jabihj878w9wk7lmbnjh9v14jdb14w6ir10ram2bprlxah0bn07"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; };
   sdcSpatial = derive2 { name="sdcSpatial"; version="0.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; };
   sdcTable = derive2 { name="sdcTable"; version="0.31"; sha256="064aippj8p4mc1zazvkzcjz59hlfybsz6wz1ppwj6d9638ha1a96"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; };
@@ -13934,40 +14525,43 @@ in with self; {
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; };
   sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; };
+  sdetorus = derive2 { name="sdetorus"; version="0.1.7"; sha256="1ip9wi44m64qhyl5mcvpm5kk0j7qmkrh3fq572jkq8w0csg59p4b"; depends=[colorRamps mvtnorm Rcpp RcppArmadillo]; };
   sdglinkage = derive2 { name="sdglinkage"; version="0.1.0"; sha256="102li274s9jjxqabk8ggv9mrdd4014d5hp0hqsna4swly8zvdcyn"; depends=[arsenal bnlearn ggplot2 reshape synthpop visNetwork]; };
   sdm = derive2 { name="sdm"; version="1.0-89"; sha256="1qi2hc06wnyz9apfpbypngvs8w20r1jq3mr6l6xpjdyg6ks1m0rc"; depends=[raster sp]; };
-  sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; };
+  sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.9"; sha256="1hpypfzfn0vppwkfrd1bcf2qzwl81603sf3l8xg8md25f3x9gw91"; depends=[R_utils raster RCurl rgdal]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
-  sdols = derive2 { name="sdols"; version="2.0.0"; sha256="0rwdfb34g1l58ad02jf7wxidgqlccqvijdsvdxqdq8f5p15cl30m"; depends=[salso]; };
+  sdols = derive2 { name="sdols"; version="3.0.0"; sha256="1c96fsf807qf1ah4adi5agj87gmajv2hyxnzvcz53mpr2qc72g5y"; depends=[salso]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; };
   sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
-  seacarb = derive2 { name="seacarb"; version="3.2.13"; sha256="0ahnjz02px41q2xz3azqfs17wj5dx7ncnzsrlc89wvqngmyn2k1n"; depends=[gsw oce]; };
+  sdwd = derive2 { name="sdwd"; version="1.0.5"; sha256="14x5hjdbkr5lsh8x3wninxg88acqh6q50famf6qjlfm7727rdysc"; depends=[Matrix]; };
+  seacarb = derive2 { name="seacarb"; version="3.2.14"; sha256="0yal25d3n8m7p216rzg59g9a518zaf554yff3h806m88fiahlfxy"; depends=[gsw oce]; };
   seagull = derive2 { name="seagull"; version="1.0.6"; sha256="0bmmlxk2v82zhlxm8hj6p67capj4f4v6pdwlh09j75ca63jx36ry"; depends=[Rcpp RcppArmadillo]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
   searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; };
-  searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
   searcher = derive2 { name="searcher"; version="0.0.5"; sha256="1q12il35pfy34n669jzkjciln1ca8by7l1d8zkzv4297547i1qln"; depends=[]; };
   seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; };
-  season = derive2 { name="season"; version="0.3.11"; sha256="19awxbjcp1zb6y7b2ka4hcq21lv7y76akry53hbmmk9k5f30naj1"; depends=[ggplot2 MASS survival]; };
+  season = derive2 { name="season"; version="0.3.12"; sha256="0hv4qcparkfyvwqd583lqwy7djziwi0cyaycg9ds3jjsfypwp31a"; depends=[ggplot2 MASS survival]; };
   seasonal = derive2 { name="seasonal"; version="1.7.1"; sha256="09ydl0hi4zmxdm254m7kibfll1z5bqxs0y2lrqngb08rl33xgs19"; depends=[x13binary]; };
   seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; };
   seastests = derive2 { name="seastests"; version="0.14.2"; sha256="04kx4sijnpsarq4iaclxvckgr5y0gmz5a0fmkkqjmfi3hm1kvw3d"; depends=[forecast xts zoo]; };
-  seawaveQ = derive2 { name="seawaveQ"; version="2.0.1"; sha256="0p7yb4hha2xw96nwk342grmfc1721dqcbssx7ww7lqd29r9d0dzf"; depends=[lubridate plyr reshape2 rms survival]; };
-  secr = derive2 { name="secr"; version="4.3.0"; sha256="13p7v539zifan6n89al1b5hmfimj4n2dv2kaxb8kwrn23kwr6ywd"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; };
+  seawaveQ = derive2 { name="seawaveQ"; version="2.0.2"; sha256="1x4vvassal1lwb9xnwisrhlx2maaqxl84h7klfy8yg9x80fdrhsw"; depends=[lubridate plyr reshape2 rms survival]; };
+  secr = derive2 { name="secr"; version="4.3.3"; sha256="10m3gxjw976rc4h72aw6d0z2k7spcq14rlp5h5g1d3b06r5xpyxk"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; };
   secrdesign = derive2 { name="secrdesign"; version="2.5.11"; sha256="02fysbx6w1iw2ig54f9sgr74c40wfjwiwpdmxdjymsaynqnm9anl"; depends=[abind openCR secr]; };
   secret = derive2 { name="secret"; version="1.1.0"; sha256="063gpyc2s2l6zw1j8b8ppzsv9kjsf0s77s5wcn7ipmwkj8qr2g4b"; depends=[assertthat curl jsonlite openssl rprojroot]; };
   secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; };
   secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; };
   secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; };
-  secuTrialR = derive2 { name="secuTrialR"; version="1.0.3"; sha256="06lmm3hpspi3vd5wvzpj9skay823z4km5jbxg11sv4xqh16sh4qh"; depends=[dplyr haven igraph lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; };
-  secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; };
+  secuTrialR = derive2 { name="secuTrialR"; version="1.0.8"; sha256="0dlgm8v2k8b6smn84zmgscxcipw1yi18ksgdxg8zp3ckjiq7gdfn"; depends=[dplyr haven lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; };
   securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; };
-  see = derive2 { name="see"; version="0.5.2"; sha256="1wxbiipd5aqvw0ac0a1s8mg8ycghvakkc0wjnsdlrn9bjc82aik4"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; };
+  see = derive2 { name="see"; version="0.6.1"; sha256="0apdz66vax3n69a3vigmhy4p71ysg0yl2qh3ws69fbnhc7xs9s40"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; };
   seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; };
+  seecolor = derive2 { name="seecolor"; version="0.1.0"; sha256="1ijxyys8pwlm99ynmv86cgn8pzz1ivaxzh3rq1akzv17nz93jv61"; depends=[crayon dplyr fansi ggplot2 magrittr purrr rstudioapi stringr]; };
   seedCCA = derive2 { name="seedCCA"; version="3.0"; sha256="076pkv083dp71m6ifjzx9spfwmc1625r9d72spf0vhf8pwwsha4v"; depends=[CCA corpcor]; };
+  seededlda = derive2 { name="seededlda"; version="0.5.1"; sha256="18fidm7jz1vsa9as7grj3g7wnkvj50izah3yajwiap44bq45hpd6"; depends=[Matrix quanteda Rcpp RcppArmadillo RcppParallel]; };
+  seedr = derive2 { name="seedr"; version="0.3.0"; sha256="15drbc0iplb97a2sym6jnrwij7ak5qckcw98n3m65x45apjwdmhq"; depends=[binom data_table]; };
   seeds = derive2 { name="seeds"; version="0.9.1"; sha256="0adk7y5ripg78bwkdgnlfwq9w9h6mlpdrikgbnn5z8az2qahc0in"; depends=[callr coda Deriv deSolve dplyr ggplot2 Hmisc MASS matrixStats mvtnorm pracma R_utils Ryacas statmod tidyr]; };
-  seedwater = derive2 { name="seedwater"; version="1.0"; sha256="0qqhjax16lnyriv6q9n89g93bs1zy8xwx9jp0xbilba7djzjh33g"; depends=[rpanel tkrplot]; };
+  seedwater = derive2 { name="seedwater"; version="2.0"; sha256="1q6q612245hqqx89jzlp77f73vj2baxi0bghd9l8kpjz4ydh6rv8"; depends=[rpanel]; };
   seer = derive2 { name="seer"; version="1.1.5"; sha256="19p6gvi3g1fjzi3rb1xm4svff7nb0bcmbf4fzijvqpzkz0gpi10k"; depends=[dplyr forecast forecTheta furrr future magrittr MASS purrr randomForest stringr tibble tsfeatures urca]; };
   seewave = derive2 { name="seewave"; version="2.1.6"; sha256="123h3q0gps0vy9sikr7gjphnv9m3l4h4mykiydjllmrpaw1s1844"; depends=[tuneR]; };
   seg = derive2 { name="seg"; version="0.5-7"; sha256="165hl55vzyf3jqlykqji37p2syzhc8dxdjxd4wwr562qnlymzszx"; depends=[sp splancs]; };
@@ -13976,7 +14570,7 @@ in with self; {
   segclust2d = derive2 { name="segclust2d"; version="0.2.0"; sha256="1n5h92dza7wgfpfyzlfb7hbrqb0a8dhc38vml9645gym3a1riwn5"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; };
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   segmenTier = derive2 { name="segmenTier"; version="0.1.2"; sha256="01xbcddinjbkbqkwq2lnsxd3gw8fxys58p498dc2lw8psz3g2wgc"; depends=[Rcpp]; };
-  segmented = derive2 { name="segmented"; version="1.2-0"; sha256="0r83p36l6m5sy4lxfjbfajn4gcqb0wv9zh7arny02s6c7fb4756y"; depends=[]; };
+  segmented = derive2 { name="segmented"; version="1.3-1"; sha256="0g8l1i31zfqamvwc5j537k3ld6dr5z81p84grdlqq41gywmyidmr"; depends=[]; };
   segmentr = derive2 { name="segmentr"; version="0.2.0"; sha256="0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z"; depends=[foreach glue Rcpp]; };
   segregation = derive2 { name="segregation"; version="0.3.0"; sha256="0bx3w2dhbikx7vk5gs0b2jc4q4zvwlrj4crv6agmc2pn3ap7i88k"; depends=[data_table]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
@@ -13993,13 +14587,13 @@ in with self; {
   selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
   selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
   sem = derive2 { name="sem"; version="3.1-11"; sha256="03j3ig6fy34pi6nwfq9w8f5m555lilw5skr1vn6ay4yvjmvavc9k"; depends=[boot MASS matrixcalc mi]; };
-  semEff = derive2 { name="semEff"; version="0.3.0"; sha256="18wmxkk0wmk7y3g1r7fwif7f6mhcgrsb60iv20d8f7bkhwkvfnx4"; depends=[boot lme4]; };
+  semEff = derive2 { name="semEff"; version="0.4.0"; sha256="0czlsz6kfkka75radz4v30jsk7jg7rif8l0fi4zdmyzrls4fm35k"; depends=[boot lme4]; };
   semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
   semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; };
-  semPower = derive2 { name="semPower"; version="1.0.1"; sha256="0z7lrbl76ff8imldv6ibripdchg4f559lg2aw41zbqz9w3g2lpm4"; depends=[]; };
+  semPower = derive2 { name="semPower"; version="1.1.0"; sha256="091695q9s5hymnziz9sjbn0magxqb21m9z2yj97w1laaflc3m3z3"; depends=[]; };
   semTable = derive2 { name="semTable"; version="1.8"; sha256="0qr420rnz59q8arf6x05iy1zyh7pv31ldi2rsw1j2a00fbpp4ndf"; depends=[kutils lavaan plyr stationery xtable]; };
   semTools = derive2 { name="semTools"; version="0.5-3"; sha256="0k3w10fnq0l89inhxvnypyrfhlrm921mfn0kwyyfpndvbqizky1d"; depends=[lavaan]; };
-  semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.5"; sha256="0bazaznmxmks11zgb9npvkblhy0ym554fnvgqsa02rlxxzzzljib"; depends=[glue htmltools shiny shiny_semantic]; };
+  semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.8"; sha256="1d53947pfs30mdmidqpywii29i91nxqvrbjvy0qcfyd7r7al1q99"; depends=[glue htmltools shiny shiny_semantic]; };
   semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
   semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; };
   semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; };
@@ -14011,14 +14605,14 @@ in with self; {
   semtree = derive2 { name="semtree"; version="0.9.14"; sha256="1gyjrvqvqmm0dcbddjq90v3gsniiz9rl66nxiayvfbkhs4pih39z"; depends=[bitops cluster digest expm ggplot2 MASS matrixcalc matrixStats mvtnorm OpenMx plotrix rpart rpart_plot sets stringr tidyr]; };
   semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; };
   semverutils = derive2 { name="semverutils"; version="0.1.0"; sha256="0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw"; depends=[foreach R6]; };
-  sen2r = derive2 { name="sen2r"; version="1.3.7"; sha256="1w57hac7mn7447fifvmhk2fkrdvlczglq9nk317dh0pb2fzqlnvn"; depends=[data_table doParallel foreach geojsonio httr jsonlite raster RcppTOML rgdal sf stars XML]; };
+  sen2r = derive2 { name="sen2r"; version="1.3.9"; sha256="1p2zqm4m8r9cs4dlh4m1fznlxa5wf7rdgpkll106xhs3qkckkcdc"; depends=[data_table doParallel foreach geojsonio httr jsonlite raster RcppTOML rgdal sf stars XML]; };
   sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
   sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
   sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; };
   sensemakr = derive2 { name="sensemakr"; version="0.1.3"; sha256="1pgzmv72jsl359lni9z0fc7szyy9aiqyi2lwkmvnc8kmqd5dmk1f"; depends=[]; };
   sensiPhy = derive2 { name="sensiPhy"; version="0.8.5"; sha256="1kjkdklva5wzmw071gbn1v9g5cf0wzmvwgy5y0dgi530v6byaw8j"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
   sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; };
-  sensitivity = derive2 { name="sensitivity"; version="1.22.1"; sha256="15g4bxdi128x0yb81h225c8frcvbp99xf8qvncmycyzziz2cbdqi"; depends=[boot ggplot2 numbers Rcpp RcppArmadillo]; };
+  sensitivity = derive2 { name="sensitivity"; version="1.23.1"; sha256="0sdk5d94nq81xkawlkrv0kq4qixhlbn81wnf25c5ak4kzakfh3jy"; depends=[boot ggplot2 numbers Rcpp RcppArmadillo]; };
   sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; };
   sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; };
   sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
@@ -14035,7 +14629,7 @@ in with self; {
   sentometrics = derive2 { name="sentometrics"; version="0.8.2"; sha256="1yrcm3wqnlcd5r4h1zwiz2wv6xl751p9h0537z8x5npf8c4clxp8"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; };
   sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; };
   separationplot = derive2 { name="separationplot"; version="1.3"; sha256="0ggyr4asp86hvdp4bwdkljz9b2gzdxm2y9nbz2srlgh3m4hlz2cs"; depends=[foreign Hmisc MASS RColorBrewer]; };
-  seplyr = derive2 { name="seplyr"; version="1.0.0"; sha256="0m6dyg48npyw9dafqlffm1haivcs0qlpg81m3b99sjiwswxvx2lh"; depends=[dplyr rlang tidyr wrapr]; };
+  seplyr = derive2 { name="seplyr"; version="1.0.1"; sha256="0r40z0m1ixm1l6w6alhbfzkiyvayrvwwmn0ybcshrn8rqys56q21"; depends=[dplyr rlang tidyr wrapr]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.2"; sha256="10p8ldj83mvhpcz1yas4xns5qh8zbs533na8nv87phngi8dsb76m"; depends=[survival]; };
   seqHMM = derive2 { name="seqHMM"; version="1.0.14"; sha256="0ybdp5364jddakkd7rawrfk87hn30fgjpsirlz2440w600m69ydr"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
@@ -14044,10 +14638,10 @@ in with self; {
   seqest = derive2 { name="seqest"; version="1.0.1"; sha256="06zk87n26305m0hy6lg7v3bpxmsqvinwkvw3dvmzkqp5jdkhwikb"; depends=[foreach geepack MASS mvtnorm nnet Rcpp RcppArmadillo VGAM]; };
   seqgendiff = derive2 { name="seqgendiff"; version="1.2.2"; sha256="0vrmh4h2g4hvx8ix5jyc4bhp8vpr00fcqsfbf9r0808jqnlwgcnr"; depends=[assertthat cate clue irlba matchingR pdist sva]; };
   seqhandbook = derive2 { name="seqhandbook"; version="0.1.0"; sha256="0zncpjabazci92wzw126i491669gidkyiw7zjp7iw23m6jaf71l4"; depends=[TraMineR]; };
-  seqinr = derive2 { name="seqinr"; version="3.6-1"; sha256="0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"; depends=[ade4 segmented]; };
-  seqmagick = derive2 { name="seqmagick"; version="0.1.3"; sha256="0983k7fbcv4ai42cxxi4f854b9mqx68rgyvy0mjhpb6md7ba59jy"; depends=[Biostrings magrittr]; };
+  seqinr = derive2 { name="seqinr"; version="4.2-5"; sha256="1z1jipgrn9nrnxlx7bcf8c2chwpa3kfva0zgyb12xbr3kisn166y"; depends=[ade4 segmented]; };
+  seqmagick = derive2 { name="seqmagick"; version="0.1.4"; sha256="1m3j52mxam7kz9iqg4i43g8k2wmpbjfn06bz8bf1c98aj6zqal5s"; depends=[Biostrings magrittr]; };
   seqminer = derive2 { name="seqminer"; version="8.0"; sha256="00jzj8mwb0zaiwlifd41b26mrq9mzigj18nc29dydi0r42hxg16i"; depends=[]; };
-  seqmon = derive2 { name="seqmon"; version="2.3"; sha256="0lvjb3mx1h5nbbn3kmjwviy9gzsv9k1bs57jdfc09kid7kisaqmn"; depends=[]; };
+  seqmon = derive2 { name="seqmon"; version="2.4"; sha256="1aqrg9aqvsabg5mm9jfj5vaxxaapfs1qw3yyzbx7vsspcgjdhyca"; depends=[]; };
   seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; };
   sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; };
   sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
@@ -14055,139 +14649,151 @@ in with self; {
   sequoia = derive2 { name="sequoia"; version="2.0.7"; sha256="1lyzvxj7vdlb7p9df6lp67qn8zqn3sv5r2absrxikmxfbfdj3s09"; depends=[plyr]; };
   sergeant = derive2 { name="sergeant"; version="0.9.0"; sha256="1iyb0191hkkhhsr4507b1c6j7c7z7lz1v0m2y7flc50yfxicb1fb"; depends=[bit64 DBI dbplyr dplyr htmltools httr jsonlite magrittr purrr readr scales tibble]; };
   serial = derive2 { name="serial"; version="3.0"; sha256="1y1gj0lcdn5apiv6c6arks6pqhsbvnrfym6n2izjarx2c27ijrjj"; depends=[]; };
-  seriation = derive2 { name="seriation"; version="1.2-8"; sha256="1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
+  seriation = derive2 { name="seriation"; version="1.2-9"; sha256="1glxn098ar1v96xlwp85kjxzfd1nyfzp2f82x5z3fm87yv57k4lb"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
   serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; };
   seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; };
   serpstatr = derive2 { name="serpstatr"; version="0.0.2"; sha256="1qjaws8df157qz66x1389aacpddyawgc10fm8flx9kb0kvfp3ybb"; depends=[httr]; };
   serrsBayes = derive2 { name="serrsBayes"; version="0.4-1"; sha256="0618415n2izdgv85cnmlnpwy0lz7rnimspq8986w5w1ywhw2xpbm"; depends=[Matrix Rcpp RcppEigen truncnorm]; };
   servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; };
-  servr = derive2 { name="servr"; version="0.18"; sha256="0xfbf1a1w34hbsx4jrdr4rqf22v7gf1p37ngknglv1dyxih7ipja"; depends=[httpuv jsonlite mime xfun]; };
+  servr = derive2 { name="servr"; version="0.21"; sha256="12fk585hmz735v4hra8da9wld1fmd67byqnf95m7jjyh7l3dmh1z"; depends=[httpuv jsonlite mime xfun]; };
   sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
   sessioninfo = derive2 { name="sessioninfo"; version="1.1.1"; sha256="0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn"; depends=[cli withr]; };
   set = derive2 { name="set"; version="1.1"; sha256="0b6qzy3mqf2gfc5gjrn1k6k7ymprjzs2i948zsgcqdkgr8acasbm"; depends=[do]; };
-  set6 = derive2 { name="set6"; version="0.1.8"; sha256="03hmnqcj38aiqcnqrqjx4wpgar1z5pj5w5yc74153qm6vm076637"; depends=[checkmate R6 Rcpp]; };
+  set6 = derive2 { name="set6"; version="0.2.0"; sha256="1y8gs5nyjm5vm4kq9fx9xndwjp7n2xabxa1vdnzm77srlmhxdc7r"; depends=[checkmate R6 Rcpp]; };
   setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
   sets = derive2 { name="sets"; version="1.0-18"; sha256="16v7650p47khqrbbw0z98llmwmmhswqmhri0n7nrfhdqwmby1lbl"; depends=[]; };
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
-  sever = derive2 { name="sever"; version="0.0.4"; sha256="1wqmpn1i4kln0wcyxs8wcbary246fax0j454b22m07hi1fwr4mn8"; depends=[cli shiny]; };
+  sever = derive2 { name="sever"; version="0.0.6"; sha256="0za9xdzmp2hbiq83wp0gjrzb2k180mgmvjzh1jldhrjpz7cvdbnk"; depends=[cli shiny]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.9-5"; sha256="0c58asqrvz1pkdkb0lkzwz8cwb43pmxd39z0jp217hk7p7q3ngwf"; depends=[classInt DBI magrittr Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.9-6"; sha256="01yqlnx9v7lzb6g4ywjlncz67cnkizszarnf2dmd4fi8abhw4zs9"; depends=[classInt DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; };
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
   sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; };
-  sfheaders = derive2 { name="sfheaders"; version="0.2.2"; sha256="0dcpq5d2m49izwq9fnsd25gm95swmw2bns8ha9mq36c2s2x2nq0s"; depends=[Rcpp]; };
+  sfheaders = derive2 { name="sfheaders"; version="0.4.0"; sha256="0ig02nszrs6fkjkrkqibp23n4a8qr4i09yz7l741yjd0308ddg46"; depends=[geometries Rcpp]; };
   sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; };
+  sfo = derive2 { name="sfo"; version="0.1.0"; sha256="11d1h30zak494szxpi851k30bv7s38dic4ndh39q4k03lhl35bxz"; depends=[]; };
   sfsmisc = derive2 { name="sfsmisc"; version="1.1-7"; sha256="12g6m8sf17q3qmm133nm4fa296w5n5d9ly3fvb2nvc0w4llkif3l"; depends=[]; };
   sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; };
+  sftrack = derive2 { name="sftrack"; version="0.5.2"; sha256="1mh4m4z18wnhar88f5amkdwvfsbdx1qjyylf9jp4hm371a76sawg"; depends=[sf]; };
   sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; };
   sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; };
   sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; };
   sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; };
   sglOptim = derive2 { name="sglOptim"; version="1.3.8"; sha256="15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; };
   sglasso = derive2 { name="sglasso"; version="1.2.4"; sha256="0sdarn39857405ndmqyka5ksvwczb5ifl5aap96wpm625iz2a1pi"; depends=[igraph Matrix]; };
-  sglg = derive2 { name="sglg"; version="0.1.6"; sha256="1cm6s32bvs0ysh9q3b1da438q0asa7a10zd3nbj0v1ycg8k7ghcm"; depends=[AdequacyModel Formula ggplot2 gridExtra moments pracma ssym survival]; };
+  sglg = derive2 { name="sglg"; version="0.1.8"; sha256="0dh55164kbd83bd5k7qlla041s5wl7y33csdsp5vmrjwxs357hb2"; depends=[AdequacyModel Formula ggplot2 gridExtra moments pracma survival]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
   sgmcmc = derive2 { name="sgmcmc"; version="0.2.5"; sha256="0lq79c7i6bklh8c63wx3k6h9mk8s1abbr0hc41drcm96bbbg0aal"; depends=[reticulate tensorflow]; };
   sgmodel = derive2 { name="sgmodel"; version="0.1.1"; sha256="1i13vp91i8s61ylsyg0iij1sfclwif7v91slr2srl8ddz6lm23nx"; depends=[ggplot2 ramify Rtauchen]; };
   sgof = derive2 { name="sgof"; version="2.3.2"; sha256="020kc6h9iw4qhb9pdi7wk8vcy54dp10x0z3nlq3gwwbj1l9izc44"; depends=[poibin]; };
-  sgpv = derive2 { name="sgpv"; version="1.0.0"; sha256="14zcny43zz5ai63091pvc31x45nfjbps5p0vv2l1b5pjiwds2164"; depends=[]; };
+  sgpv = derive2 { name="sgpv"; version="1.1.0"; sha256="0w0slnnw239a34c0h7xr76c4m0rfwl0hq61g9n12vzxd6lfh3gqz"; depends=[]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
   shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; };
-  shadow = derive2 { name="shadow"; version="0.6.7"; sha256="062yp600a15pnc8r5b7bx0lbb2g3nyfjn07ayn189jl5jnhxip38"; depends=[raster rgeos sp]; };
+  shadow = derive2 { name="shadow"; version="0.7.0"; sha256="04lgl6np880i564sabz9s9sykijk0q0na0pnhgbnw1zqxznxl42i"; depends=[raster rgeos sp]; };
   shadowtext = derive2 { name="shadowtext"; version="0.0.7"; sha256="1s1ip8zfr684a3ld7hvf524bhn2j31k6d1wbhh1ni0flsggv2ckf"; depends=[ggplot2 scales]; };
-  shallot = derive2 { name="shallot"; version="0.4.9"; sha256="0zmai0h3xgdi1fmmfh7jcvzl5ibmj5c86p9rzfh3wdlyqrc3hz1a"; depends=[commonsMath rscala salso]; };
-  shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; };
+  shallot = derive2 { name="shallot"; version="0.4.10"; sha256="05ciafpahcrsh9kwg1yqwbmanvkbv1i1cjjpvq3w4cdqkhn4fam7"; depends=[commonsMath rscala]; };
+  shape = derive2 { name="shape"; version="1.4.5"; sha256="17qqhjyfhxv9la07ykaslb50c8g4d0cgfypx4y91h9i2yjw7jjh9"; depends=[]; };
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
   shapes = derive2 { name="shapes"; version="1.2.5"; sha256="0gfpdydfysp5mwg7qmkn73s67gvh2szb40mzqrx97h41ijgcgd8s"; depends=[MASS minpack_lm rgl scatterplot3d]; };
-  shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; };
+  shapper = derive2 { name="shapper"; version="0.1.3"; sha256="1jaj9j894md45611gdrz05n0kfakawf7vlcc3zxhwdh3f7kwz4lp"; depends=[DALEX ggplot2 reticulate]; };
+  shapr = derive2 { name="shapr"; version="0.1.3"; sha256="1v0zwmlycrq89g9i8pwa37m200pc2rmscvgqv1lkkigcy1i09h0g"; depends=[condMVNorm data_table Matrix mvnfast Rcpp RcppArmadillo]; };
   shar = derive2 { name="shar"; version="1.1"; sha256="157b1pia21qygb7pqb97v8b3bklnfq40xf8y7wg6p2ixkab0ws6c"; depends=[classInt raster Rcpp spatstat]; };
   sharpData = derive2 { name="sharpData"; version="1.2"; sha256="0pvaq8i1vrra3d0wf6yyqkbin0zgsd1kvdzh4bfnyps6pzn5k789"; depends=[KernSmooth quadprog]; };
   sharpeRratio = derive2 { name="sharpeRratio"; version="1.4.1"; sha256="1sh4lrgj3hmw0pfw5xvvfs2jd8f694vy3ad5krwz4rh76ywja7q0"; depends=[ghyp Rcpp]; };
   sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; };
-  sharpshootR = derive2 { name="sharpshootR"; version="1.6"; sha256="1kzgxg1w5ajirsif6pgdqyal4aidj6y0q29zhikds4pr9x5sqcs4"; depends=[ape aqp circular cluster curl digest e1071 Hmisc igraph lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; };
+  sharpshootR = derive2 { name="sharpshootR"; version="1.6.5"; sha256="00xwrkls4qlcxdzb6l7a268n6i96xp3ipn96nbc2y7n4cj2635xy"; depends=[ape aqp circular cluster curl digest e1071 Hmisc igraph lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
+  shattering = derive2 { name="shattering"; version="1.0.4"; sha256="1wafbmmx1xgiqb7zwm67z4868gmsyi1rg1mxlrgszvxalypqb6g7"; depends=[FNN pdist pracma rmarkdown Ryacas slam]; };
   shazam = derive2 { name="shazam"; version="1.0.2"; sha256="0v4a2i4fgdj6r2hlrnnn53xm22w9py4psf75i8iyx6nlbbbfbn4q"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales seqinr stringi tidyr tidyselect]; };
   shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; };
   shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; };
   shinipsum = derive2 { name="shinipsum"; version="0.1.0"; sha256="0d94189hmg0bl8x0s8fpba5gcvb95sr9k9lbp3kk8482fc5h147n"; depends=[attempt DT dygraphs ggplot2 magrittr plotly]; };
   shiny = derive2 { name="shiny"; version="1.5.0"; sha256="17lf56s2ycnz0amw8r32wrfhxy9zimz5xdysxxbc52c38kx8pjr3"; depends=[commonmark crayon digest fastmap glue htmltools httpuv jsonlite later mime promises R6 rlang sourcetools withr xtable]; };
-  shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; };
+  shiny_i18n = derive2 { name="shiny.i18n"; version="0.2.0"; sha256="0gwdrbdsibffq314pzws2gr74fp701kb3rwdiwxbzzg0pgqpiwp3"; depends=[glue jsonlite R6 rstudioapi shiny stringr yaml]; };
   shiny_info = derive2 { name="shiny.info"; version="0.2.0"; sha256="162wvb02z5h1y7xgsyl6wv88zlfmbm1jlnz48f56fyybs54baw41"; depends=[git2r glue shiny]; };
-  shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; };
-  shiny_semantic = derive2 { name="shiny.semantic"; version="0.3.0"; sha256="0kcwkl0rjll8b73g43hk2fclwchr6pl71p632b302zz44vbnvg15"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; };
+  shiny_pwa = derive2 { name="shiny.pwa"; version="0.2.0"; sha256="01nsvz40zazhycpj9kg0pvxink4p0j8iqcw1dzz8zbj54lw3sjk8"; depends=[htmltools readr shiny urltools]; };
+  shiny_router = derive2 { name="shiny.router"; version="0.2.0"; sha256="1gy1hk2v1b2zj0aql4f2wy4d3hy2zghd70v04iq9kig5n3qddj2d"; depends=[htmltools magrittr shiny]; };
+  shiny_semantic = derive2 { name="shiny.semantic"; version="0.4.0"; sha256="0lwmj0wg4fh92yk0zqjz60da6z5wbn2rxz6vaql3g8yx5djvmbc3"; depends=[glue htmltools htmlwidgets jsonlite magrittr purrr R6 shiny]; };
   shinyAce = derive2 { name="shinyAce"; version="0.4.1"; sha256="1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"; depends=[jsonlite shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
+  shinyChakraSlider = derive2 { name="shinyChakraSlider"; version="0.1.0"; sha256="1vsbw9dm8ai2w6mfdaksxh13ryh2awajqgkcwcxb99l47h17rvpy"; depends=[htmltools reactR shiny]; };
   shinyCyJS = derive2 { name="shinyCyJS"; version="0.0.11"; sha256="1wvrv5hdr74d2a68iwy76ffawmy4mpw0swrngw41zqpjd6hjiyxd"; depends=[htmlwidgets]; };
   shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; };
   shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; };
-  shinyEventLogger = derive2 { name="shinyEventLogger"; version="0.1.1"; sha256="1piycfg9j0dg3fgq9f88gs7zvhldmrzn7ggy2ijbh6r7iwipwgdm"; depends=[bupaR jsonlite mongolite purrr R_utils shiny stringr]; };
-  shinyFeedback = derive2 { name="shinyFeedback"; version="0.2.0"; sha256="1sg7nrcf55vjkh289x10ln9xbjv5ybhf8g5j6b9vybgcm4blvwyr"; depends=[htmltools jsonlite shiny]; };
-  shinyFiles = derive2 { name="shinyFiles"; version="0.8.0"; sha256="0gwyx37f2r86cldsyknws9pafpj8g5mg3mchlyl9ymgnk5f4b88w"; depends=[fs htmltools jsonlite shiny tibble]; };
+  shinyFeedback = derive2 { name="shinyFeedback"; version="0.3.0"; sha256="0cqp3a2nngbvrr04ajavnmpbr366zb11iwni4fs8v6ymx8v1wmd7"; depends=[htmltools jsonlite shiny]; };
+  shinyFiles = derive2 { name="shinyFiles"; version="0.9.0"; sha256="0rsijlx16vd74r7bd8s9zipy71kgpw19v9s85kxj5bmwc6njmbai"; depends=[fs htmltools jsonlite shiny tibble]; };
   shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; };
   shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; };
   shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; };
   shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; };
-  shinyML = derive2 { name="shinyML"; version="0.2.0"; sha256="1x7fshfq85cbaydhhqx1lcfybv6qlrc6rmajsbcvvnbnbp1m5ysb"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; };
-  shinyMatrix = derive2 { name="shinyMatrix"; version="0.3.0"; sha256="0gakbwfrqyxbm946rgxk3xc4qh4i3631hg8q37058ji63bxqzadc"; depends=[jsonlite shiny]; };
+  shinyML = derive2 { name="shinyML"; version="1.0.0"; sha256="157p75ba3xhgid5kbdph1fclvk0691n98rad4nwr5hdp8ahq7rcv"; depends=[argonDash argonR data_table dplyr DT dygraphs ggplot2 h2o lifecycle lubridate plotly shiny shinycssloaders shinydashboard shinyjs shinyWidgets sparklyr tidyr]; };
+  shinyMatrix = derive2 { name="shinyMatrix"; version="0.4.0"; sha256="1fyrh25d8x61dkgbxlgm70nlr77far34kf8af3phqnhmdxjjrpdj"; depends=[jsonlite shiny]; };
+  shinyMergely = derive2 { name="shinyMergely"; version="0.1.0"; sha256="04bzrg4n0s3izm3aa2jb141ikvf7gn3qmbjajqcms1i9zyw12y4s"; depends=[shiny]; };
   shinyMobile = derive2 { name="shinyMobile"; version="0.7.0"; sha256="1yrqwrz8ml6wssk0zi8wr4cpmff2d1g3msx0sv8k6mzyknl9d489"; depends=[htmltools jsonlite magrittr shiny]; };
   shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; };
+  shinyMonacoEditor = derive2 { name="shinyMonacoEditor"; version="1.1.0"; sha256="12inzz9vrxi1465l82fafjva198qxyzwailx1s0fm58cqzhnqxr6"; depends=[shiny]; };
   shinyNotes = derive2 { name="shinyNotes"; version="0.0.1"; sha256="1l0nw6xac410109jrr88a62a5fhv6h6xaql19bp0h8qxyc2fppjh"; depends=[DBI dbplyr dplyr magrittr RSQLite shiny shinyjs shinyWidgets stringr]; };
   shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
-  shinySIR = derive2 { name="shinySIR"; version="0.1.1"; sha256="0m8ff5535hy5b363l4xkrdsm3m7mnfdb23h2wgqmysdv4af1gm2i"; depends=[deSolve dplyr ggplot2 shiny tidyr]; };
+  shinySIR = derive2 { name="shinySIR"; version="0.1.2"; sha256="1g2xcm0n7chswrnw9zq3wz6mimzzf6avhkp1rcd24ga809346jcd"; depends=[deSolve dplyr ggplot2 shiny tidyr]; };
   shinySearchbar = derive2 { name="shinySearchbar"; version="1.0.0"; sha256="1v80380vym31aw0i1ghwlbdi2xkf3n59w2as62ywqi79025x3w6y"; depends=[jsonlite shiny]; };
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="1.0.1"; sha256="1d830wf7d5ki7frbr1vgy9d0vllyfcylq7pfkspjkz64b2xfhah3"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; };
-  shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.3"; sha256="16nbmyr1pz6splv7z56ampmxilg5qizzagg853pwh10ykdj8bczv"; depends=[htmltools jsonlite shiny]; };
+  shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.4"; sha256="107gqf5ijwyma7np736imkv1hg82n2hv9mnrfd2j08rhpgjny3q2"; depends=[htmltools jsonlite shiny]; };
   shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; };
-  shinyalert = derive2 { name="shinyalert"; version="1.1"; sha256="1pnvdwxpx05srll61l8af4b1l5kpcw4wmvjiiz14gsx3baflnwxm"; depends=[digest shiny]; };
+  shinyalert = derive2 { name="shinyalert"; version="2.0.0"; sha256="0b392nb6vknbc88dqbkymxs7gcjd5cm2312dw7jwvmmwh8949wm7"; depends=[htmltools shiny uuid]; };
   shinyanimate = derive2 { name="shinyanimate"; version="0.3.0"; sha256="0vshid5mfq006cprjj61d0g7ajyc3plc66x55c5jjmijwbp6pw7a"; depends=[shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
-  shinybrms = derive2 { name="shinybrms"; version="1.3.0"; sha256="1jkwwfls85n10hrsx6nlif8zbnxvvs4hmd6lr82gcqk4qclxy24k"; depends=[brms rstan shiny]; };
-  shinybusy = derive2 { name="shinybusy"; version="0.2.0"; sha256="1zhi4nfnwwxn25r47fa8c5dq0wfvxmmdzrr8vfiq3qjj46bi1alf"; depends=[htmltools htmlwidgets jsonlite shiny]; };
+  shinybrms = derive2 { name="shinybrms"; version="1.5.0"; sha256="0lyaqzlmg7msf72kpywjzpj7pqs6fnxklnl219csv47jy7wm1lk7"; depends=[brms rstan shiny]; };
+  shinybusy = derive2 { name="shinybusy"; version="0.2.2"; sha256="06vfkv382xcpjh30i7d4ym4vyravadp5vjsvrnw4npy0302pdmzl"; depends=[htmltools htmlwidgets jsonlite shiny]; };
   shinycssloaders = derive2 { name="shinycssloaders"; version="1.0.0"; sha256="0r3xm273lhdhzbs2mkgw1m2kwb7z1dh1pzya8yxy5vacda1l2ikl"; depends=[digest glue shiny]; };
   shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; };
   shinydashboard = derive2 { name="shinydashboard"; version="0.7.1"; sha256="0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"; depends=[htmltools promises shiny]; };
   shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.7.5"; sha256="0g0cw07z7dlpc7q2abis0cdgwk6vlya0im5lxai82v21r60i5biy"; depends=[htmltools shiny shinydashboard]; };
   shinydisconnect = derive2 { name="shinydisconnect"; version="0.1.0"; sha256="14m83y1iv7qvs1hilc0d18q46qnsciflypgm4dsj7vlvh7ilpdvm"; depends=[checkmate glue htmltools shiny]; };
+  shinydlplot = derive2 { name="shinydlplot"; version="0.1.3"; sha256="1mvhx8f5800d33vl9kgs5mib003aqshb8vgfy9h4qlgxyx35zssk"; depends=[htmltools htmlwidgets plotly shiny shinyBS shinyjs]; };
+  shinyfilter = derive2 { name="shinyfilter"; version="0.1.0"; sha256="0gsyfx13lc6a27jwxq3fkvl5szla4hs1rwjiwj13mz0rcc6ly836"; depends=[reactable shiny shinyBS shinyjs stringr]; };
+  shinyfullscreen = derive2 { name="shinyfullscreen"; version="1.0.0"; sha256="107np0i617ldw0iayw7wqcnrh7szva7zxl915qmj75kh8i7q1fn1"; depends=[jsonlite shiny]; };
   shinyglide = derive2 { name="shinyglide"; version="0.1.2"; sha256="0i98k3gl83kfzp3vs1his05idhwj1n0bw98ik7d62cgn4rqi6ar4"; depends=[htmltools shiny]; };
   shinyhelper = derive2 { name="shinyhelper"; version="0.3.2"; sha256="1c4hvf19j3yyh8r12nx85ldkxs89g98q74csnqs5ml5l79a65vgp"; depends=[markdown shiny]; };
   shinyhttr = derive2 { name="shinyhttr"; version="1.1.0"; sha256="1snrl7bg1bc5jxqs1c5a2ir6qnf1nq576aigk19k0ms4gb9hh66m"; depends=[httr shinyWidgets]; };
   shinyjqui = derive2 { name="shinyjqui"; version="0.3.3"; sha256="0n4ijxmkp8x6dwrsxwvx0zgd8b5129cmn6q6rrav38v1q5k8889x"; depends=[htmltools htmlwidgets jsonlite shiny]; };
-  shinyjs = derive2 { name="shinyjs"; version="1.1"; sha256="14k8y313ppj23m9rhlk8jc94x6sbn3qrsnx6xrijiyv8m8dii1l9"; depends=[digest htmltools jsonlite shiny]; };
+  shinyjs = derive2 { name="shinyjs"; version="2.0.0"; sha256="1zzq356dvd8ciajy6r5n4ybgx9xk7ydwv25j86xlcsqznkxdkkf2"; depends=[digest htmltools jsonlite shiny]; };
   shinyloadtest = derive2 { name="shinyloadtest"; version="1.0.1"; sha256="0k9b57wm2cv78qf9qryqr1s0p7gsncn8axd285f6rrayg4czb40l"; depends=[curl dplyr getPass ggplot2 glue gtable htmltools httpuv jsonlite lubridate magrittr progress R6 readr rlang rmarkdown scales stringr svglite tibble websocket xml2]; };
   shinylogs = derive2 { name="shinylogs"; version="0.1.7"; sha256="1b4p0g1vf9wn643rybf382mw6mrrl49qsykh7npa3agcarwznmgr"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; };
-  shinymanager = derive2 { name="shinymanager"; version="1.0.200"; sha256="00dvzcpba4awmdgy8wcn8h7qdc8mdrfaq3kp28h509xn3gax02wn"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; };
-  shinymaterial = derive2 { name="shinymaterial"; version="1.1.0"; sha256="1xrbwrw3h1lqqgbfpan6ijddglknc9akxi11yvviz29lxlfphjj8"; depends=[jsonlite sass shiny]; };
+  shinymanager = derive2 { name="shinymanager"; version="1.0.300"; sha256="1zv8rrplp3cknyk51m5cfmkr992k9cbjh89pmrbb8c24izqilq2a"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite scrypt shiny]; };
+  shinymaterial = derive2 { name="shinymaterial"; version="1.2.0"; sha256="0nqakim0cx722sydbv12kgva1nis7h2i0lrvi9c0h54733x7lbza"; depends=[jsonlite sass shiny]; };
   shinyobjects = derive2 { name="shinyobjects"; version="0.2.0"; sha256="0fg5gyssia2fqar635vrqgfwpfrk4pqachsgg10y13ljp09lcdm3"; depends=[dplyr glue knitr magrittr pander purrr readr rlang rstudioapi shiny stringr styler tibble tidyr]; };
+  shinypanel = derive2 { name="shinypanel"; version="0.1.2"; sha256="09wfn46z4n96696n7zlbvm5ai2ii2vyvmsjfswqv33sp8f3c4p95"; depends=[htmltools jsonlite shiny shinyBS shinyjs]; };
   shinypanels = derive2 { name="shinypanels"; version="0.5.0"; sha256="1rslz9wl3gx11dm6il77j4k5swxvcfy5mf0zffbs4zk8xjgpzzj6"; depends=[glue htmltools shiny shinyjs]; };
   shinyr = derive2 { name="shinyr"; version="0.2.6"; sha256="16bknhab23by0h1b6c9q6rzyzyqnrcjhpsgw0gv427jycap9b0vv"; depends=[caret corrplot DMwR dplyr e1071 knitr nnet plotly randomForest RColorBrewer shiny shinydashboard tm wordcloud]; };
   shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; };
   shinyrecipes = derive2 { name="shinyrecipes"; version="0.1.0"; sha256="1b4l27qsl1lpssh3jv1pqmw2mq8hanfj0m269yp5618nd5nxd2ck"; depends=[dplyr DT esquisse miniUI purrr recipes rstudioapi shiny shinyglide shinyWidgets sortable stringr tidyr]; };
   shinyreforms = derive2 { name="shinyreforms"; version="0.0.1"; sha256="1g1blc57c6zkca0m52bqkw8jwgpplabns07x1cwkk46dmv6sgqci"; depends=[htmltools R6 shiny]; };
+  shinyscreenshot = derive2 { name="shinyscreenshot"; version="0.1.0"; sha256="0s0rq6v6dkh6n5dvjzayjmh9jzjndf4d3zixaya9skv22z5gcj0y"; depends=[jsonlite shiny uuid]; };
   shinyservicebot = derive2 { name="shinyservicebot"; version="0.1.0"; sha256="18xbggiai6ssyl3q0nqhnszxb7zlbffaw0iy3r7vbzswzqx522la"; depends=[digest htmltools htmlwidgets shiny]; };
   shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
   shinytest = derive2 { name="shinytest"; version="1.4.0"; sha256="1kgj6izhj385vlw59agdgq1knvjyaawpghsnfmbixsmlzfr3jpzn"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rstudioapi shiny testthat webdriver withr]; };
   shinythemes = derive2 { name="shinythemes"; version="1.1.2"; sha256="12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"; depends=[shiny]; };
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
   shinyypr = derive2 { name="shinyypr"; version="0.0.2"; sha256="1k6jsw6gnpwk90hkpa9grki0b68cab57vbd0h6ldjqr11giwcz8z"; depends=[bsplus chk dplyr DT ggplot2 lifecycle magrittr purrr readr shiny shinyjs waiter ypr]; };
-  shipunov = derive2 { name="shipunov"; version="1.11"; sha256="00kd971ip0j7ind53qsm3vbdd6lffz8zwa4jfnivn24z9asrkama"; depends=[PBSmapping]; };
+  shipunov = derive2 { name="shipunov"; version="1.12"; sha256="13gzp3l06a3ayly4qrfjn70669vlm8rxsgx6iwhcm5qnmz3vi2xn"; depends=[PBSmapping]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
   shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; };
   shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; };
-  shorts = derive2 { name="shorts"; version="1.1.0"; sha256="1nnzi4im8qv45zyrsdp8la68rm98fmvral57kvpkbbs8kasa9mda"; depends=[LambertW nlme]; };
-  shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
+  shorts = derive2 { name="shorts"; version="1.1.4"; sha256="17wb6awfcvfx76cbrj67v7lklkf1dbwivy55cl83vy6xnbxiw4j1"; depends=[ggplot2 LambertW nlme tidyr]; };
+  shotGroups = derive2 { name="shotGroups"; version="0.7.5.2"; sha256="11l71difk2vyjb4ypp8y2yvfqxx57p0lvbxxzr6r3qwyr70aivln"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
   showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; };
-  showtext = derive2 { name="showtext"; version="0.9"; sha256="11fx2vv8jlvcnybh18y7v4bn2c67aqsqwfq7y8dpywbwr4zg8jid"; depends=[showtextdb sysfonts]; };
+  showtext = derive2 { name="showtext"; version="0.9-1"; sha256="1hq346k2lm7rv49hw7srn3ab5gcp6b0r4zc1kgsdmswyh3q1asra"; depends=[showtextdb sysfonts]; };
   showtextdb = derive2 { name="showtextdb"; version="3.0"; sha256="0hlnc3fhgrdkd46n7hb6id0gg1v0bf8s4679nrr7rchyp455szq2"; depends=[sysfonts]; };
   shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; };
   shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; };
-  shrinkTVP = derive2 { name="shrinkTVP"; version="1.1.1"; sha256="0dl6dpbjq6ykh813344qs3n6kp8xgif354wjz7lzv1ik4kl3a71s"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; };
+  shrinkTVP = derive2 { name="shrinkTVP"; version="2.0.1"; sha256="114b59lgn048sg5zs1shwgzh7q55dcgnhs3y1cd1wl77r3kpy3vs"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; };
   shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; };
   shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; };
   shutterstock = derive2 { name="shutterstock"; version="0.1.0"; sha256="1vqbrjbwl2gdcf607f51cdzkjbkmk11n08mzx01j7bwcd278ny8r"; depends=[httr jsonlite]; };
@@ -14205,17 +14811,17 @@ in with self; {
   sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
   sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; };
   sigmajs = derive2 { name="sigmajs"; version="0.1.5"; sha256="1d26llpgnj687b8rwgbyhw88zakp334n4a9gabf72qwrg4awm1v5"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr scales shiny]; };
-  sigminer = derive2 { name="sigminer"; version="1.0.7"; sha256="0ncxlj4z8hds7h4rj0nw6rvgjacgkqkhxh6y8m39rwalmdny6mlx"; depends=[cli cowplot data_table dplyr foreach furrr future ggplot2 ggpubr maftools magrittr NMF purrr rlang tidyr]; };
+  sigminer = derive2 { name="sigminer"; version="1.1.0"; sha256="1jw40x5bq2ra7jypid82hsf087vi7hdanc5pagl8y4ginhy929l1"; depends=[cli cowplot data_table dplyr foreach furrr future ggplot2 ggpubr maftools magrittr NMF purrr Rcpp rlang tidyr]; };
   sigmoid = derive2 { name="sigmoid"; version="0.3.0"; sha256="1sa6nmip3fizdk3r47pvx0h3qldn267arpmid0wa1pb7k5j2g682"; depends=[]; };
   signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
   signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
-  signnet = derive2 { name="signnet"; version="0.6.0"; sha256="0bwa58svkgf2z06m8kg4g37px57l1kmhx84ps5qshl4699a3v1gx"; depends=[igraph Matrix Rcpp RcppArmadillo]; };
+  signnet = derive2 { name="signnet"; version="0.7.0"; sha256="145wfpgxrx81rrx20nakf43wvhy3gzcshlr532y1idgba2kdw2fr"; depends=[igraph Matrix Rcpp RcppArmadillo]; };
   signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; };
   sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="1.0.8"; sha256="04a68rd5ywxbl4dca026criqr314y367lh6i7k7qnrbsgzhgsb4l"; depends=[wrapr]; };
-  siland = derive2 { name="siland"; version="2.0"; sha256="0g06adzydvrw7vq2a78m4lw1vc2k28mp2pj5q20629yknpv54ffr"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; };
-  silicate = derive2 { name="silicate"; version="0.6.1"; sha256="17jrnbh578l5dlp9ndxlxa7q91x3cwk3czix4613vgkrkdjjqwld"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; };
+  sigr = derive2 { name="sigr"; version="1.1.3"; sha256="19hcxk6iksfjyc4qch4sw0rgn54salirw7a0bap9c53nxzrj8bl4"; depends=[wrapr]; };
+  siland = derive2 { name="siland"; version="2.0.4"; sha256="02cj3hw755253p28sxzh92qj7jwl7dffs3kibis1ij52h7wlaw38"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; };
+  silicate = derive2 { name="silicate"; version="0.7.0"; sha256="1x8l6wvymx3scwzym9h6b5wgprjinzp6m2cs6r7xn9aqcr39499a"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; };
   sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; };
   sim2Dpredictr = derive2 { name="sim2Dpredictr"; version="0.1.0"; sha256="0q1l75h1dcxnd60lcmf4sny1ywidfmm0yv9ylkb3yc13v469167i"; depends=[car dplyr ggplot2 magrittr MASS matrixcalc Rdpack spam tibble tidyverse]; };
   simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; };
@@ -14227,14 +14833,14 @@ in with self; {
   simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; };
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
   simPATHy = derive2 { name="simPATHy"; version="0.4"; sha256="1blvgaadp7iz0mcgax2xc8wa7aa9f82q09qym1wl8xdv01m29b80"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
-  simPH = derive2 { name="simPH"; version="1.3.12"; sha256="08hyv1v197cdysrdxi9x9944hmypvw7zxw2f7qdd870sibsdxjda"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
-  simPop = derive2 { name="simPop"; version="1.2.0"; sha256="05f1azdz202bap4pkqxiacj7wqkbmw3naw6p7xgmvx8nlh5xl40h"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
+  simPop = derive2 { name="simPop"; version="1.2.1"; sha256="1rpjyffs7s40wlyv77ha6r282p08kp7x252nfiasbgxp5c7x17i0"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
   simTargetCov = derive2 { name="simTargetCov"; version="1.0.1"; sha256="0gdqqwg9i2hga6l4s5x7wbbsm20b3sgwrci1g6hc04x1h9aawiw2"; depends=[MASS]; };
-  simTool = derive2 { name="simTool"; version="1.1.6"; sha256="141bxad531s76pqlqxyzncaxf1z874vn5fl1263yg9qszi1cblzs"; depends=[dplyr purrr tibble tidyr vctrs]; };
+  simTool = derive2 { name="simTool"; version="1.1.7"; sha256="0q093dlfj23zq3w4schn1ycff79vgzr2s3wgbz2qz4s3b7fddk70"; depends=[dplyr purrr tibble tidyr vctrs]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
   simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; };
   simcdm = derive2 { name="simcdm"; version="0.1.1"; sha256="1qzxxpz3nvqf9801k6zgphv6vd8alf2sf6cvzggk7cz6x5jc3w1r"; depends=[Rcpp RcppArmadillo]; };
+  simcross = derive2 { name="simcross"; version="0.3-6"; sha256="1h0j28ah8dxylqjzwv6lfrisw8qm82a5mc5c7lp274fgvj8kr6jq"; depends=[Rcpp]; };
   simctest = derive2 { name="simctest"; version="2.6"; sha256="0igwn82zfx6ajv42gpyx6969aldygldkpdc9ik6601511sscvf2a"; depends=[]; };
   simdistr = derive2 { name="simdistr"; version="1.0.1"; sha256="16fsj42zr627i57q1q72l1nhin7g6rxq9hfy487hf1ywd6rvns18"; depends=[]; };
   simecol = derive2 { name="simecol"; version="0.8-13"; sha256="0641qh5ih1mkbdr0a5qg9i280qkzdvdjyzw56awlv66zqbjqvqq8"; depends=[deSolve minqa]; };
@@ -14242,6 +14848,7 @@ in with self; {
   simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; };
   simfinR = derive2 { name="simfinR"; version="0.2.2"; sha256="16ran6br8n7b7f74a7ayzhkmnhak5z1cwli3s1b1mzdii937k8bb"; depends=[crayon dplyr jsonlite lubridate magrittr memoise purrr]; };
+  simfinapi = derive2 { name="simfinapi"; version="0.1.0"; sha256="1g6zi4nj2rkwcd8wnnxc4riqdmf5aarry2jwwsm44i0s4s14z8s8"; depends=[checkmate data_table future_apply httr memoise RcppSimdJson]; };
   simglm = derive2 { name="simglm"; version="0.8.0"; sha256="18phhsq5i9xsx4m0qml8jls9zlcnf3nifn24a7mdbr8l7z1ykf04"; depends=[broom dplyr future_apply Matrix purrr rlang]; };
   simhelpers = derive2 { name="simhelpers"; version="0.1.0"; sha256="0imrp8zqdpyl466fywkjr4g3h9jzxfk96xrw8prlsvw1xlg6qrmm"; depends=[dplyr furrr future magrittr purrr Rdpack rlang rstudioapi tibble tidyr]; };
   simmer = derive2 { name="simmer"; version="4.4.2"; sha256="1zffksln9d77h59lbbqk8lbrjlhvic7ianw1912vj6bsvh5k6jjy"; depends=[BH codetools magrittr Rcpp]; };
@@ -14250,86 +14857,92 @@ in with self; {
   simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; };
   simmr = derive2 { name="simmr"; version="0.4.2"; sha256="0mvckg5jz3fhjrpr97zn4jrcv3pxay53f5cpqy0d92h2lqpsgaff"; depends=[bayesplot boot compositions ggplot2 MASS R2jags reshape2 viridis]; };
   simode = derive2 { name="simode"; version="1.2.0"; sha256="0wlnd01xfdqvjfvmkhkj6nvkrnv5ghjv4md5nhaqsjc8bycawyl0"; depends=[deSolve pracma quadprog]; };
-  simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; };
   simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.3"; sha256="01q04807qws870x1qhvlr3bp0dawy8q4bh00psakhln9j9dl1ljm"; depends=[]; };
   simplePHENOTYPES = derive2 { name="simplePHENOTYPES"; version="1.2.4"; sha256="08pkz6959zhfg7yd5qyfcwi4p4rzbq8gbm0jmkf15ynpica4kknj"; depends=[data_table gdsfmt lqmm mvtnorm SNPRelate]; };
   simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; };
   simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; };
   simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; };
-  simplecolors = derive2 { name="simplecolors"; version="0.1.0"; sha256="08xsha7v9k55fqi9f49j2sh2yz8dm5g99rqcjfd1yrlw2mkcrq6a"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; };
+  simplecolors = derive2 { name="simplecolors"; version="0.1.1"; sha256="1m0lrvkjqjqq7kynjl8j1cn7kqzfjx6gzgjpjk1gvar2g4ip0a8h"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; };
   simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; };
-  simplevis = derive2 { name="simplevis"; version="1.5.0"; sha256="05217g6y59xw53ncy7040jg45h0i0i8yjsv72fkpibc56lc5cn0q"; depends=[dplyr DT forcats ggplot2 htmltools janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; };
+  simplevis = derive2 { name="simplevis"; version="2.0.0"; sha256="00nyc9ql3c2072nfc4ai5g0grxnch2yb54m1qr7xvphjb4sdrr4k"; depends=[dplyr DT forcats ggplot2 htmltools janitor jsonlite leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; };
   simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; };
+  simplextree = derive2 { name="simplextree"; version="1.0.1"; sha256="18jvzcz4fdsi17j7qdqpjvx6zygvlcvpziikb8qxskaib5180l08"; depends=[magrittr Rcpp]; };
   simputation = derive2 { name="simputation"; version="0.2.4"; sha256="16adh97hfszvf934lf8mvwxvx71s7gwhzzhsbqz24zqik20pd6fq"; depends=[gower MASS rpart]; };
   simr = derive2 { name="simr"; version="1.0.5"; sha256="1j5w93iliykfnpxl9kzh1rp6d3iy26ksj3j7yjl348yvplh0iyjl"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; };
+  simrec = derive2 { name="simrec"; version="1.0.0"; sha256="17zzbzgdisp5qh0vlbmkjf6a3axnpwj2kw03wymfbb3z557pbxlr"; depends=[]; };
   simrel = derive2 { name="simrel"; version="2.0.2"; sha256="192yp6njvq9l6yznjhf69da5z1vxl0q3398laimndwnvrpx73pcj"; depends=[FrF2 ggplot2 gridExtra jsonlite magrittr miniUI purrr reshape2 rlang rstudioapi scales sfsmisc shiny testthat tibble tidyr]; };
   simsalapar = derive2 { name="simsalapar"; version="1.0-10"; sha256="1q7kh44xl7q48vpqbyrp85my6x97l4fqq36bry8vg3k5riihirzf"; depends=[colorspace gridBase sfsmisc]; };
   simsem = derive2 { name="simsem"; version="0.5-15"; sha256="183l6pysssxyhgw3s5gd0319snmvh439cy4xwfdjdwpavb8rrj06"; depends=[lavaan]; };
   simsl = derive2 { name="simsl"; version="0.1.0"; sha256="09d6k61c2m0n03xpqvig7310bpgddxl8vzfjgn6wbr21s73b9xis"; depends=[mgcv]; };
-  simstandard = derive2 { name="simstandard"; version="0.3.0"; sha256="0fg5y6n5ydn6qxbd5sdbxh3aqj4i7qk7h9c28i3s5z4s9rxgycdj"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; };
-  simstudy = derive2 { name="simstudy"; version="0.1.16"; sha256="0ykwkkhnywqhpnsw4vggxcaqmg2zk8m521p00az7vyavwjgw9289"; depends=[data_table mvnfast mvtnorm Rcpp]; };
+  simstandard = derive2 { name="simstandard"; version="0.6.0"; sha256="1kx7mxg2vc4g4grw5pg436haamj7kphqjaqhchrska9rfazqgmni"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; };
+  simstudy = derive2 { name="simstudy"; version="0.2.1"; sha256="0cczfby7l8s0kmb7jzn2bl67i55nwgc4h3vixg9gsfgds32pisfc"; depends=[backports data_table glue mvnfast mvtnorm Rcpp]; };
   simsurv = derive2 { name="simsurv"; version="0.2.3"; sha256="0jlacjgrnnlmcl6k83clfkdfb1kr2xbyz2zcmq1f3xg2z0zwypjq"; depends=[]; };
   simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; };
   simts = derive2 { name="simts"; version="0.1.1"; sha256="1b76grf7c14pgyhphplnil4lkzbwn3dih4pv4xdy721ih9n9llby"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; };
-  simukde = derive2 { name="simukde"; version="1.1.0"; sha256="0g4qb57q1g9ixl70zwiw8y934gcr421xmz4dl515lxzfzk0605fc"; depends=[ks MASS mvtnorm]; };
+  simukde = derive2 { name="simukde"; version="1.2.0"; sha256="0rjxamspq1csa08blfmif3lknnrwfcpszwzijp465vz1107si8ac"; depends=[ks MASS mvtnorm]; };
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
   simule = derive2 { name="simule"; version="1.3.0"; sha256="0jzyk1r2jfs7qivmy9x44c5bagy55jpy3hf0xpl9xnk409c3y2wd"; depends=[igraph lpSolve pcaPP]; };
   sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; };
+  sinar = derive2 { name="sinar"; version="0.1.0"; sha256="0dywgqmvbrsygyvnln2mc5p6gaxvphr5byx7hkf0nkil54f2jzdf"; depends=[MASS numDeriv]; };
   sindyr = derive2 { name="sindyr"; version="0.2.3"; sha256="0dk7zwj5hdr7fcxhdj9klml11sciyaj0v59dfgvnhhkxndwwdbrr"; depends=[arrangements crqa igraph matrixStats plot3D pracma]; };
   sinew = derive2 { name="sinew"; version="0.3.8"; sha256="1ggx7wgmgnsv69nnc55mg9g7rzjv5m23sygz7x8q68pybmjr7fc1"; depends=[cli crayon miniUI rematch2 rstudioapi shiny sos stringi yaml]; };
-  singleCellHaystack = derive2 { name="singleCellHaystack"; version="0.3.2"; sha256="1nzq7kz1vb3gra80hilmvdlyjy0qda60izrkqprr5bxn1iw8rdx0"; depends=[ggplot2 reshape2]; };
+  singcar = derive2 { name="singcar"; version="0.1.1"; sha256="0n3nv9v5nxb26a5idsdh7gyhy7yjw58ki2615d4j80nxx0a780bn"; depends=[CholWishart MASS withr]; };
+  singleCellHaystack = derive2 { name="singleCellHaystack"; version="0.3.3"; sha256="0rfs7a3xy70zkqfijy2cyvn16i8kkh2djp48nh7ifr51dkmkgjg1"; depends=[ggplot2 Matrix reshape2]; };
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
-  sinx = derive2 { name="sinx"; version="0.0.13"; sha256="0699fy1jbi9a7xjmwph4cj833750bw0xg3zvdpn8dwvh6y42m552"; depends=[bookdownplus clipr cowsay crayon jsonlite multicolor pagedown rmsfact rosr xaringan]; };
-  siplab = derive2 { name="siplab"; version="1.4"; sha256="1kayskawq9dqwwmk17akl68xw9kwllkmh4i251gdqkfcz61j3bb4"; depends=[spatstat]; };
+  siplab = derive2 { name="siplab"; version="1.5"; sha256="1gfncsqgwj7ljm7cik6kmcqynzppqlqlq1f9qpmvzfpf6fd1ccxp"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
   sirt = derive2 { name="sirt"; version="3.9-4"; sha256="1myj1dpmqzcyxhkyyvva3xwy1aq5d6l37zg9vhfnc3q4h1psc5hm"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; };
-  sirus = derive2 { name="sirus"; version="0.2.1"; sha256="04ln1i017qb94gz22in9w36b808a0gxbdildwyfzchf2c92wp5cp"; depends=[ggplot2 glmnet Matrix Rcpp ROCR]; };
+  sirus = derive2 { name="sirus"; version="0.3.1"; sha256="1rh36f8pd9kzsp499895jfcsfnrnzp3187y40djd67r2b4ibkd78"; depends=[ggplot2 glmnet Matrix Rcpp RcppEigen ROCR]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.48"; sha256="1fh35ndra58dryw222ng7ys3gx1izyk5789k30lyd4n8wqy6sjjd"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sismonr = derive2 { name="sismonr"; version="2.1.0"; sha256="1v4vfz6zc4f70fay8r9vaxj62pcp8gqnh4aczbqpym9874330vi9"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; };
-  sistec = derive2 { name="sistec"; version="0.1.0"; sha256="1prxqfyngfi21mnrx1s648vk80wk2ivia0kq5kqywdrrdxa3zpam"; depends=[dplyr openxlsx rlang shiny stringr]; };
+  sistec = derive2 { name="sistec"; version="0.2.0"; sha256="0y43anin9vybiivf3jrxg19i9z4smmhhjvp52gci6icpn839kr8x"; depends=[dplyr openxlsx rlang shiny stringi stringr]; };
   sitar = derive2 { name="sitar"; version="1.1.2"; sha256="0njnsamb9mrds3rjlwwv6sn980jl744mdp0b9d36sqws7wgnxrfq"; depends=[dplyr glue nlme purrr rlang rsample tibble tidyr]; };
   siteymlgen = derive2 { name="siteymlgen"; version="1.0.0"; sha256="1176fnf39ars5cdjvy5w2k6b92qv51hy86s71sl8ghr0lwdq9f59"; depends=[data_table dplyr lubridate magrittr purrr rlist rmarkdown stringr yaml ymlthis]; };
   sitmo = derive2 { name="sitmo"; version="2.0.1"; sha256="0apdhwy3kxs39agsbvx5vn3xsgb22bf3jrwmr2cmqk9kmxbx740c"; depends=[Rcpp]; };
   sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
   sitree = derive2 { name="sitree"; version="0.1-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; };
   sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; };
+  sivs = derive2 { name="sivs"; version="0.2.4"; sha256="0qks0kgagahm4mgd7nd5qqwihrlivlc8q4dk4pcdjb7f15z073j8"; depends=[doParallel foreach glmnet pROC varhandle]; };
   sizeMat = derive2 { name="sizeMat"; version="1.1.2"; sha256="1vbndadsn80ddrg471vp1qxf0gan38w6dkjk1p2npvfb47wdjj2h"; depends=[MASS matrixStats MCMCpack]; };
-  sjPlot = derive2 { name="sjPlot"; version="2.8.4"; sha256="0b7k0mshkk8k26w11xbxkb5v0klhq279zn2xdz83cn8k791xkqyd"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
+  sjPlot = derive2 { name="sjPlot"; version="2.8.6"; sha256="1dn9nvvp4jd45kwr4rpp2abf7xdpdmiv41rr3fkdb32a136bzx4b"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
-  sjlabelled = derive2 { name="sjlabelled"; version="1.1.6"; sha256="0xvb0yi7c7wiiqjbnbisyb2cjinm11i373jacfv1yzyc9cznzyzq"; depends=[insight]; };
+  sjlabelled = derive2 { name="sjlabelled"; version="1.1.7"; sha256="0d3fsjd2gxchv8mlx9l5pf8xvkmx4pgvizam83f3qss07bmvpzwg"; depends=[insight]; };
   sjmisc = derive2 { name="sjmisc"; version="2.8.5"; sha256="0xl0s56d13bia89ai619rcr0fzbvc2k8f7hjxik4qp0g4v87zzlk"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; };
   sjstats = derive2 { name="sjstats"; version="0.18.0"; sha256="17b1fcrhgjw66qa8zk2jj1bvz3vp5bnjn3p4y1wsg5ng5nxq8jz0"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
-  skedastic = derive2 { name="skedastic"; version="1.0.0"; sha256="11bz8ds8dgfn5dmr7psyszylhnz0why8ika327yk1v1j9z841k1q"; depends=[arrangements bazar berryFunctions boot broom CompQuadForm cubature data_table expm gmp magrittr MASS mvtnorm plm pracma qpdf quantreg Rdpack Rmpfr shiny tibble]; };
+  skedastic = derive2 { name="skedastic"; version="1.0.1"; sha256="04s5cvv2zcdwmkv06w79va8aaxb0vx6c8bmz8sjpblvsrgc9c7nv"; depends=[arrangements bazar berryFunctions boot broom CompQuadForm cubature data_table dplyr expm gmp MASS mvtnorm pracma qpdf quantreg Rdpack Rmpfr]; };
   skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; };
   skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; };
+  sketch = derive2 { name="sketch"; version="1.0.3"; sha256="0d2kcf6q2xpvxzf0js8qbw0apkj8lbx1znzqcnidsgwn5p7ni20a"; depends=[base64enc glue htmltools jsonlite magrittr purrr rlang rstudioapi shiny]; };
   sketcher = derive2 { name="sketcher"; version="0.1.3"; sha256="011lx15whrdj5q5h33h9brkzbn2fnpm1nx9ip1v9xl5xfkbj7952"; depends=[downloader dplyr imager jpeg magrittr png readbitmap stringr]; };
   skewlmm = derive2 { name="skewlmm"; version="0.2.2"; sha256="12lcim5k4q1g9n3nf1cyb1zyis2596jvwim286mifmwrxji0m20p"; depends=[dplyr ggplot2 moments mvtnorm nlme numDeriv purrr]; };
   skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
   skimr = derive2 { name="skimr"; version="2.1.2"; sha256="056cdf95hc1l19f5kjkyyxrnx6kl0lw0zzcin3xnblzbqvl0zrzh"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect withr]; };
   sklarsomega = derive2 { name="sklarsomega"; version="2.0-1"; sha256="0pk3dk0bsbby4wnj8sad8yllix48hq3ayv3709kglc97d8bhjzha"; depends=[extraDistr hash LaplacesDemon Matrix mcmcse numDeriv spam]; };
   skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
-  skmeans = derive2 { name="skmeans"; version="0.2-12"; sha256="0n6nvhpzhkrp5jg7d2yy6y95hsfi0sphg1792nr2ccxivqwgyy8l"; depends=[clue cluster slam]; };
+  skmeans = derive2 { name="skmeans"; version="0.2-13"; sha256="1nks9k910fc0m07wpi9ridpyvgnnjlgw821mnvpv8skr4i75zy1w"; depends=[clue cluster slam]; };
   skpr = derive2 { name="skpr"; version="0.64.2"; sha256="07fchgv0aqgw0hvcav08zzfzqg8nbw8ibbpd3bd11jx1fikx4vyr"; depends=[base64enc car crayon doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; };
-  skynet = derive2 { name="skynet"; version="1.3.8"; sha256="1aw4gkjziisq93cjzckb8hac24fmj30v78cln88hx2sydpgsbszg"; depends=[data_table dplyr geosphere ggplot2 ggrepel httr igraph leaflet maps stringr]; };
+  skynet = derive2 { name="skynet"; version="1.4.0"; sha256="1ir8sw99fvdy8zp7ncgdnggr8hv1ph21kvdi9my42vlsh2fqi5ja"; depends=[data_table dplyr geosphere ggplot2 ggrepel httr igraph leaflet maps stringr]; };
   slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
-  slam = derive2 { name="slam"; version="0.1-47"; sha256="12fggw2c7hz3bpvsaqm24g3r6lbpq6jgli24g7x5j859iak5cqv9"; depends=[]; };
+  slam = derive2 { name="slam"; version="0.1-48"; sha256="1ppsvkph4v1dffxgp12a4wnr9arj7pkmh4qv0and3f6nbz9k42qa"; depends=[]; };
+  slanter = derive2 { name="slanter"; version="0.1-0"; sha256="161ldggjrd7sbp38fip92br5izcqbwfmxcmmg95dm13sviabxb7k"; depends=[Matrix pheatmap pracma]; };
   sld = derive2 { name="sld"; version="0.3.3"; sha256="1ggvyx1nsfc1wwwzlqgvk6p5xxq6r6yx2rjv0290q7p06gc3i1ll"; depends=[lmom]; };
   sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; };
   sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; };
-  sleepwalk = derive2 { name="sleepwalk"; version="0.3.0"; sha256="00w5c7a1nzy6v0irpskkqyldknq9vdq97r9im1h042zm6lnxxrr6"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; };
+  sleepwalk = derive2 { name="sleepwalk"; version="0.3.1"; sha256="1dr6iaiq5ixh7daih1qnaxn4jyqlqvk326lnmynhw7if4z1hj9r6"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; };
   slfm = derive2 { name="slfm"; version="1.0.1"; sha256="0s7fdvr4fvsb4789f9ly2x820g4xvabl04wk7k6i8pd5ckj2xjhy"; depends=[coda lattice Rcpp RcppArmadillo]; };
   slga = derive2 { name="slga"; version="1.1.1"; sha256="0l8jfqmpc51fq4xil03lvgxxyqv08a5m4drfvrihfd6f1jkv6xkf"; depends=[httr raster sf xml2]; };
-  slickR = derive2 { name="slickR"; version="0.4.9"; sha256="1smlzl0gq01vhv4qqwgikzdwg0z9k5mjf956sf64ps8py1b8d5ry"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; };
+  slickR = derive2 { name="slickR"; version="0.5.0"; sha256="1zxj6ivdhi9wvqcrl0p8clwk8nxqmg1bijqamp0lhq82dpyrdngp"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; };
   slider = derive2 { name="slider"; version="0.1.5"; sha256="1x4jwfxam4czfkb1s5qds5krfw1h2p5a4rh6f5z4yvhsv0d81xck"; depends=[glue rlang vctrs warp]; };
   slideview = derive2 { name="slideview"; version="0.1.0"; sha256="0zq5s6qdxn6ri88pp0wf2kg2k4byrrsfvwh0ai892p4szqbc3w4v"; depends=[htmltools htmlwidgets lattice raster viridisLite]; };
   slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; };
   slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; };
   slippymath = derive2 { name="slippymath"; version="0.3.1"; sha256="0dqnv089mcfxvpsc1px7mblim6m77n59xpcysz75jrvpc5q4lsrg"; depends=[png purrr raster]; };
-  slm = derive2 { name="slm"; version="1.1.0"; sha256="1y9pw9lgxp2xz6smbhg0rayjszm83kxf2an9rk9pdhlmx6670bbf"; depends=[capushe expm ltsa sandwich]; };
+  slm = derive2 { name="slm"; version="1.2.0"; sha256="1kzqipwmqdcnv04r69c6fq95kbjdbhk5qi1b1n06bdr7xnyzm56b"; depends=[capushe expm ltsa sandwich]; };
   sloop = derive2 { name="sloop"; version="1.0.1"; sha256="00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j"; depends=[codetools crayon purrr rlang tibble]; };
+  slopeOP = derive2 { name="slopeOP"; version="1.0.1"; sha256="0rcxa2wdj57aj7n17sxv05dvwchhfsnhssmc372xjfgi72gdnv58"; depends=[Rcpp]; };
   slouch = derive2 { name="slouch"; version="2.1.4"; sha256="09ffx657hs913prv0rifhsz60h39lk0h4z28myx6yzxcfdk4f48d"; depends=[ape crayon memoise]; };
   slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; };
   slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; };
@@ -14339,7 +14952,7 @@ in with self; {
   smacof = derive2 { name="smacof"; version="2.1-1"; sha256="166acgllfwsdb28cjzb49f4b8gwcipqwzi9w45r4qmzyszf89xw3"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; };
   smacpod = derive2 { name="smacpod"; version="2.1"; sha256="1fi8v69xkm182nyaryz83kw55cdgv99cqglphlw82n4k7w0lfrk3"; depends=[abind pbapply plotrix sp spatstat]; };
   smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; };
-  smam = derive2 { name="smam"; version="0.5.3"; sha256="0hns3w6sm06fwxy3aybaz21j8bii5m5ps932ldilh0dj7rsqii6a"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; };
+  smam = derive2 { name="smam"; version="0.5.4"; sha256="0v7wd1jkacfzjcg4g44dl1d7qxn6as6vicsyafkmrczgdzmrx1md"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; };
   smapr = derive2 { name="smapr"; version="0.2.1"; sha256="1gcq66gs6968c5h303dqd2jyw2rcdwxv642ki1cmpdj6ix665dpr"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
   smartR = derive2 { name="smartR"; version="0.62.3"; sha256="0ardb4arhr7qmr30b3ahf7hkwlys9i420bm8h2688phahgfkk0y8"; depends=[caret chron cluster foreign ggplot2 ggrepel ggthemes gridExtra gstat gsubfn gWidgets2 gWidgets2RGtk2 igraph jpeg jsonlite lattice mapdata mapproj maps maptools marmap mtsdi nnls PBSmapping plyr R6 RColorBrewer reshape2 rgdal rgeos rjags ROCR rpart scales shape sp spdep sqldf vegan]; };
   smartdata = derive2 { name="smartdata"; version="1.0.3"; sha256="06hqpsr68dqm5544965g648267kkixf44bh0g5x6ik66vj6crkfm"; depends=[adaptiveGPCA Amelia Boruta checkmate class clusterSim denoiseR discretization DMwR FSelector functional imbalance infotheo lle magrittr mice missForest missMDA MVN NoiseFiltersR outliers RoughSets unbalanced VIM]; };
@@ -14347,25 +14960,27 @@ in with self; {
   smartsizer = derive2 { name="smartsizer"; version="1.0.2"; sha256="1w2vf6q3f7bywkvazgxn9gh7f2bqy4rg74mm4r6izw4gx7r81ls6"; depends=[MASS]; };
   smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; };
   smbinning = derive2 { name="smbinning"; version="0.9"; sha256="1sr0nsqqzxdf402g9qx1ycigbh330idl9n2cyli4x4zxj1nqm3yv"; depends=[Formula gsubfn partykit sqldf]; };
-  smcfcs = derive2 { name="smcfcs"; version="1.4.1"; sha256="0q5kg0yrmbw80097j66mp08pmqrw1s0wf8g377379s62p1f6sjwv"; depends=[MASS survival VGAM]; };
+  smcfcs = derive2 { name="smcfcs"; version="1.4.2"; sha256="1gr10jy6a5d4zlprrxl5102814746vhzb3q6v13f40dyfxkljdfl"; depends=[MASS rlang survival VGAM]; };
   smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
   smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; };
+  smd = derive2 { name="smd"; version="0.6.6"; sha256="1nvlka2prqh1hcj4ngpj2c2gmfryziijqwjyfy9fmq78skiq0jij"; depends=[MASS]; };
   smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; };
   smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; };
-  smerc = derive2 { name="smerc"; version="1.2"; sha256="0rl8pnpnrpvj49nb30i748yz7rkr6d4d1nkazyqj2lbp7sqdf51d"; depends=[pbapply randtoolbox sp]; };
+  smerc = derive2 { name="smerc"; version="1.3.3"; sha256="1nzql8dv817ll86ba9798pw2fndx9zvcsxxixh85c7gzyfj72m9b"; depends=[pbapply randtoolbox Rcpp RcppProgress sp]; };
+  smfishHmrf = derive2 { name="smfishHmrf"; version="0.1"; sha256="1k6mpyp11zv5rc3k98baymr903p2pf424nf9xng20q1li8s8y2ab"; depends=[fs pracma Rdpack]; };
   smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; };
   smicd = derive2 { name="smicd"; version="1.1.1"; sha256="187ydw50py67ha0z3xyk9hk988gszd8jfzkgsv4hjlbx80fzb2nv"; depends=[formula_tools Hmisc ineq laeken lme4 MuMIn mvtnorm truncnorm weights]; };
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
-  smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
+  smnet = derive2 { name="smnet"; version="2.1.2"; sha256="17zv02f1g86s55g81anhqrxfgy2biamsw606byxwh9kdc5l4vfv6"; depends=[RSQLite spam SSN]; };
   smog = derive2 { name="smog"; version="2.1.0"; sha256="1mnnvp6crjwwiym16q4hmn9zwna1gblwqjlan4x9zyvgp1j70k26"; depends=[doParallel dplyr foreach ggplot2 magrittr Rcpp RcppArmadillo Rdpack rmarkdown tidyr]; };
   smoke = derive2 { name="smoke"; version="2.0.0"; sha256="1jdl5swg66vqryd40rrqpsnkczmsiaf5x6vlfv774vbnrc6q2v2g"; depends=[Rdpack]; };
   smoof = derive2 { name="smoof"; version="1.6.0.2"; sha256="14zwrsyhbrwggwiaq8vxps8cgkp6glb14b2cp2ph1ppa0abvlbfq"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
-  smooth = derive2 { name="smooth"; version="2.6.0"; sha256="0q4bmyhf6qzqj4p340yrpqa0rbgdij38yg71yfajjzz9cbzf9nl0"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="3.0.0"; sha256="0gqmg0w2165fm0476lj0n1d9sb5p0f56v379vzj55s9313a94gf4"; depends=[forecast greybox MASS nloptr pracma Rcpp RcppArmadillo statmod zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; };
   smoothSurv = derive2 { name="smoothSurv"; version="2.3"; sha256="0rxgps184hl49g8gpa7hjvdl2i01qkghmvlv8blwwr9rfk19aq1s"; depends=[survival]; };
-  smoothedLasso = derive2 { name="smoothedLasso"; version="1.3"; sha256="0f11wdv0yn1nifrkq3k8amwdsf4j6acr0k9qc83awwkpil1z6x17"; depends=[Matrix Rdpack]; };
+  smoothedLasso = derive2 { name="smoothedLasso"; version="1.5"; sha256="13g55axzicfl7plhaax1vj1x57pfasyzzrw968rm305mmpavhzx9"; depends=[Matrix Rdpack]; };
   smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
   smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
   smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
@@ -14373,14 +14988,14 @@ in with self; {
   smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; };
   smoots = derive2 { name="smoots"; version="1.0.1"; sha256="1kk1hvfqxslg76gy8gzaidv3d55pflyvbv3ski6rkk0l9lwbb2q1"; depends=[]; };
   smotefamily = derive2 { name="smotefamily"; version="1.3.1"; sha256="062yps71bqnyff1hzqb7yvigvqg2lnc24r9gfp8m3zhvmyprk3cp"; depends=[dbscan FNN igraph]; };
-  smovie = derive2 { name="smovie"; version="1.1.2"; sha256="1z5mw8m67dqv2jfywgmnvvdac4qw89zj8nqzz9262jq8i5i9bfja"; depends=[rpanel]; };
+  smovie = derive2 { name="smovie"; version="1.1.3"; sha256="0gani6ywckvp4p72drl87vlvwcszzn5n71iqrwdgnyyr6r69ax7b"; depends=[rpanel]; };
   smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; };
   sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; };
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
-  smurf = derive2 { name="smurf"; version="1.0.6"; sha256="0629qbzi2n1zyf5pmbxfnxivnk9ppclbw0vmqcdhjjcwkfxir7nm"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; };
+  smurf = derive2 { name="smurf"; version="1.0.7"; sha256="16iy9cs2ng16lwprbff67lw099qwlrh65hvsxbl67d5wbg43wg2l"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; };
   sn = derive2 { name="sn"; version="1.6-2"; sha256="179xb7yb8br99aa5awm2yxsy0v5w1kdhv6a7ifaliz2y64677m1g"; depends=[mnormt numDeriv quantreg]; };
-  sna = derive2 { name="sna"; version="2.5"; sha256="1j3i6300m686qqfmyvadim377cd3mplzgj6mandygw8brg50id8k"; depends=[network statnet_common]; };
-  snahelper = derive2 { name="snahelper"; version="1.1.0"; sha256="0fc1xilbc7dr5gsrhlp8zgbjppxi44lifsj79kh79783w8nyfqm1"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; };
+  sna = derive2 { name="sna"; version="2.6"; sha256="0ai0v4538d30m4wks5s3lch1yfmx1ml0nnrz7ihs097lv586a09s"; depends=[network statnet_common]; };
+  snahelper = derive2 { name="snahelper"; version="1.2.0"; sha256="0pr4lb4606icxdvsraf5bcpaicwp1fvng9d5rymkwqizg4k5xqlk"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; };
   snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; };
   snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
@@ -14389,7 +15004,6 @@ in with self; {
   snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; };
   snipEM = derive2 { name="snipEM"; version="1.0.1"; sha256="1ls3c9f47lgrnja8p34iz2md2mf5jva9rn5n1h3a43zs29g019v8"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; };
   snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; };
-  snnR = derive2 { name="snnR"; version="1.0"; sha256="0qrl5ivpmipibszx8k9fvd8g462zzdcmzbjj1hb8apv4z79gzima"; depends=[]; };
   snotelr = derive2 { name="snotelr"; version="1.0.4"; sha256="0ni2hmlbxvhs9mwbf679yysd9gkj4fknfdwi7a6b32jsf0v6mg92"; depends=[httr magrittr memoise RSelenium rvest shiny wdman xml2]; };
   snow = derive2 { name="snow"; version="0.4-3"; sha256="1n3n8pva9s34fvlw32yng0x416lmbv7q1fsd0ywa4kikmxym64l5"; depends=[]; };
   snowFT = derive2 { name="snowFT"; version="1.6-0"; sha256="00rq2xibzhx7441v9jg138a4fkmx28hifs4yyj3pwi8najf0df4n"; depends=[rlecuyer snow]; };
@@ -14408,7 +15022,7 @@ in with self; {
   soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; };
   socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; };
   social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; };
-  socialmixr = derive2 { name="socialmixr"; version="0.1.7"; sha256="0j9bvl47m0j6fz6n6kxv3n76csd5bqg2vc3dp2wxl1h8afbpak6l"; depends=[countrycode curl data_table httr jsonlite lubridate oai stringr wpp2015 XML]; };
+  socialmixr = derive2 { name="socialmixr"; version="0.1.8"; sha256="0zhinhjv1ablhdyz41a1ii1s3mzqg8f2ns7xcjnlwa9fx364x5a2"; depends=[countrycode curl data_table httr jsonlite lubridate oai stringr wpp2015 XML]; };
   sociome = derive2 { name="sociome"; version="1.4.2"; sha256="14kcly2lningjpzf04xi59fb9nb7cahhbplqndsb34rzwbifa534"; depends=[censusapi dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; };
   socviz = derive2 { name="socviz"; version="1.2"; sha256="1294xwy26vshmaiw3pkx3f90j8g6fv64gygv88b7lnz6fhai1nq5"; depends=[dplyr fs magrittr rlang tibble]; };
   sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; };
@@ -14416,49 +15030,49 @@ in with self; {
   sofa = derive2 { name="sofa"; version="0.4.0"; sha256="1w78f8pnx4vh6znpwwcy9k4j795zji4bv88mi6ihdv09ar7if7yv"; depends=[crul jsonlite mime R6]; };
   softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
   softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; };
-  softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; };
-  soilDB = derive2 { name="soilDB"; version="2.5"; sha256="10jb49yiqvvcvl84r7xys5gyr710ypvai7fn5sp6nvcm1bqgrwkq"; depends=[aqp curl lattice plyr raster reshape2 sp xml2]; };
-  soilassessment = derive2 { name="soilassessment"; version="0.1.1"; sha256="0vxw0wzc2fw1asasnkfc7mzz616l243dh27vn2fqm8sw7d3509ji"; depends=[arm caret Cubist e1071 FuzzyAHP Hmisc kernlab maptools nnet randomForest raster rgdal rpart soiltexture sp]; };
+  soilDB = derive2 { name="soilDB"; version="2.5.8"; sha256="18kshc39rzh0lkmhhc062ww5pmi0wnr563647igvvk9bv2zrm8qy"; depends=[aqp curl data_table lattice plyr raster reshape2 sp xml2]; };
+  soilassessment = derive2 { name="soilassessment"; version="0.2.1"; sha256="14hqwxpqb19g5r7abar40kprfilzxi24mg083gypvxzs48pb6gn8"; depends=[arm caret Cubist deSolve e1071 FuzzyAHP Hmisc kernlab maptools nnet qrnn quantregForest randomForest ranger raster rgdal rpart soiltexture sp]; };
   soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; };
-  soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; };
+  soilphysics = derive2 { name="soilphysics"; version="4.0"; sha256="0b4fkc1plmafjdlad7s4pvca6lafmrswwpfddvsh73734s7cslmq"; depends=[boot fields MASS shiny shinydashboard]; };
   soiltexture = derive2 { name="soiltexture"; version="1.5.1"; sha256="1l9npvk910488qzd45ibc7ss557hnkb78lx1p6fs3nhl8sacgyxh"; depends=[MASS sp]; };
   soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; };
   sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; };
   solaR = derive2 { name="solaR"; version="0.45"; sha256="1vxpwaizjxy27r54anhf48pf97lm4ck750m0p4kmh716irmhp319"; depends=[lattice latticeExtra RColorBrewer zoo]; };
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solartime = derive2 { name="solartime"; version="0.0.1"; sha256="0q6la6d281zgf1kxhrdvi3b91na60szknq0fvldvlnszlqb5vkgs"; depends=[lubridate]; };
-  solitude = derive2 { name="solitude"; version="1.0.1"; sha256="0vgc1djimk6xa21r31lrjvpfz9j7d4pwmb8k2z7aw2vfh7kifz6a"; depends=[data_table future_apply igraph lgr R6 ranger]; };
+  solitude = derive2 { name="solitude"; version="1.1.1"; sha256="0cd3ppkydpak5sx49fd7wh1ha5lhphy51hfnsl480d88fx8cc6vf"; depends=[data_table future_apply igraph lgr R6 ranger]; };
   solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; };
   solrium = derive2 { name="solrium"; version="1.1.4"; sha256="0x83s83r4sr4r9cgk9fgcw6xz778m4gg14fzwib3qja6ax2xpk2z"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; };
-  solvebio = derive2 { name="solvebio"; version="2.8.0"; sha256="1561bx070wh4h1phkll8gwj45qi5xg047lanf8dn50w0ik60fwf8"; depends=[dplyr httr jsonlite mime]; };
+  solvebio = derive2 { name="solvebio"; version="2.9.0"; sha256="0wl5xffgw2gy3496wvkg0pvy4apd43p9bw7gv4bjrflc4m0fh10q"; depends=[dplyr httr jsonlite mime]; };
   som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
   som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="4.1.0"; sha256="0a8bjljg408fxxkyhnz5ycj0rvw4jjfpcaibp0jjja0jyfkpdwn9"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; };
+  sommer = derive2 { name="sommer"; version="4.1.1"; sha256="029kkry7sfmzi6dqql297815x7vyh3zxswn50zypsbkn4ki3bnfy"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
   sonicLength = derive2 { name="sonicLength"; version="1.4.6"; sha256="0jh9zk908afqxacccsph6477cc8sbcc1vxbv7jz8ppgc20imw932"; depends=[]; };
-  sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.1"; sha256="03v53blb8f67ybhqys4n0zxf7pk9g024ncq0g9rnj9qpr740zclb"; depends=[ggplot2 seewave tuneR]; };
+  sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.3"; sha256="1rdmpy0b3yng63r1nd0kgs75r8xf6f55prlzix9dhis8q1p0y6q1"; depends=[ggplot2 jsonlite seewave tuneR]; };
   sonify = derive2 { name="sonify"; version="0.0-1"; sha256="1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15"; depends=[tuneR]; };
   soobench = derive2 { name="soobench"; version="1.9.18"; sha256="06wzlxdw0l6jc1zqsgkn120ibprfalwqd38xh7dpi30vdqiqskcc"; depends=[]; };
   soptdmaeA = derive2 { name="soptdmaeA"; version="1.0.0"; sha256="03n1y82myq0rz14awjnx9nx1dz3dxqq58m13cw7a7ncap7fmw9r5"; depends=[igraph MASS Matrix]; };
   soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; };
   sorocs = derive2 { name="sorocs"; version="0.1.0"; sha256="0gy23rldhnlz6jmf9rdzl4mmfkn5gjcavq2jfcz6dgjafl3v9vgl"; depends=[MASS MCMCpack mvtnorm]; };
-  sortable = derive2 { name="sortable"; version="0.4.2"; sha256="08v78r0vibr0lk09lxm0s0vfkzpp03asqnqpl8jqa6rxcb484fri"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr shiny]; };
+  sortable = derive2 { name="sortable"; version="0.4.4"; sha256="15wn8xnvzawqxb97dlzd5v2qrxxizply6ah2ry0h6wrywdz2xppl"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr shiny]; };
   sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; };
-  sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; };
+  sos = derive2 { name="sos"; version="2.0-2"; sha256="0x8hs950s05ydh7vjjbpzfj1if01h1z9dz32xszik6fz94na279l"; depends=[brew]; };
   sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; };
   sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; };
   sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; };
-  soundcorrs = derive2 { name="soundcorrs"; version="0.1.1"; sha256="06d57ici4538mfw804vnqaf59n2zglqlxhdlmn9694v9q1xw24p6"; depends=[]; };
+  soundcorrs = derive2 { name="soundcorrs"; version="0.4.0"; sha256="1azvsv3bghlab8q24wbb6xwd5a4cydx1cagvhk8h0h5ib9957zab"; depends=[]; };
   soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; };
-  soundgen = derive2 { name="soundgen"; version="1.8.0"; sha256="1z60f5r1gpp89jcib4sy5qvsk5w25s4jhvbwmxndna3hnny8003h"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; };
+  soundgen = derive2 { name="soundgen"; version="1.8.2"; sha256="0ivx7039276x6nzpavynw4yr914r0cz1qsiqihfwm80pkpw6760q"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
+  sourceR = derive2 { name="sourceR"; version="1.1.0"; sha256="09mikl6rkigx2bdnwqsgxwksz40lspq27hsrhlnfyz5yhs31ssda"; depends=[assertthat cluster dplyr gplots gtools R6 Rcpp reshape2 SPIn tensorA]; };
   sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; };
-  sp = derive2 { name="sp"; version="1.4-2"; sha256="02jxsd30apzjbdbssirysq70d4svdwzn931jhxr0ladl72g9bqvk"; depends=[lattice]; };
+  sp = derive2 { name="sp"; version="1.4-4"; sha256="0zzw1gfic5b311vrbkmmmaap3yllgd192af067l5ymm885jqm1zs"; depends=[lattice]; };
   sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
   spANOVA = derive2 { name="spANOVA"; version="0.99.2"; sha256="0dlx9wwccq67g4yni3gbrv43f5pgm3mg715q2v8f09r1akhfg5by"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; };
   spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; };
@@ -14467,14 +15081,16 @@ in with self; {
   spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.4"; sha256="0mf5ql9a45dkq0dw1l0h03gcnhm6if10faj72jrhgrlcrgzzdfyn"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
   spCP = derive2 { name="spCP"; version="1.2"; sha256="0y00k96p96jgp84wbdhqfwsq2fg8c68gc5310rnzpiv3clws27fb"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
   spData = derive2 { name="spData"; version="0.3.8"; sha256="1mlsqy9cbilfc80cbdlbgsngvzdkrd9yjdkxnw2b1gzxnj6jcqbs"; depends=[raster sp]; };
+  spDates = derive2 { name="spDates"; version="1.0"; sha256="0bf9bwi26h26ms0lczk1dld3cwgnx49y6g56sqwrkagn7w6blsrn"; depends=[data_table dplyr gdistance ggplot2 gstat magrittr raster rcarbon rlang smatr sp viridisLite]; };
   spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; };
+  spGARCH = derive2 { name="spGARCH"; version="0.2.2"; sha256="1wrmk2ybgysvibfy8vvp7pyqda5apqp0jxjfp3hlb416fza52966"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; };
   spMC = derive2 { name="spMC"; version="0.3.10"; sha256="0p0s6w7sif02b91b73a0zb2i4i95a8m86dkqmgx6w1jk9h2mgqaz"; depends=[]; };
   spMaps = derive2 { name="spMaps"; version="0.4.0"; sha256="0n9693aam7gsclfhijq7cy61l0w4mm5vf3rjaz5w0jrz77lrkprh"; depends=[raster rgeos sp]; };
   spNNGP = derive2 { name="spNNGP"; version="0.1.4"; sha256="14mz5cgxm9ka7q7f7qs80hqrgbk2mjphyc28ih73lkhcknl2v1lp"; depends=[coda Formula RANN]; };
   spTDyn = derive2 { name="spTDyn"; version="2.0.1"; sha256="1wprn2adw4l5pkwkfzdpcr07jxgycx9kaf8w8mfv27nka5hacgqx"; depends=[coda sp spacetime spTimer]; };
   spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; };
   spTimer = derive2 { name="spTimer"; version="3.3.1"; sha256="0lf39n32ifsmbcf35h0g60xniw72mlrzvzax3k6kz5c5k1wszlba"; depends=[coda extraDistr sp spacetime]; };
-  spaMM = derive2 { name="spaMM"; version="3.4.1"; sha256="0iflz3a4wxkf072cmy2h9vzn71xgizpafwwhpw7xcs657i2irpms"; depends=[boot crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI]; };
+  spaMM = derive2 { name="spaMM"; version="3.5.0"; sha256="0q3ajxiqzcc1nxydiapr55mxrcvmr7nidvlg51rhkxxh6zhn2ah4"; depends=[boot crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI]; };
   spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; };
   space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; };
   spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; };
@@ -14483,39 +15099,40 @@ in with self; {
   spacetime = derive2 { name="spacetime"; version="1.2-3"; sha256="0nxjp78vdnr8m2nn9czf1rp7b61md4fjfnyqdlgp982x5nb0nz6a"; depends=[intervals lattice sp xts zoo]; };
   spacey = derive2 { name="spacey"; version="0.1.1"; sha256="1p8kx3d08q9kz1wb286m3d8ckwkhfm5n42m65m4w5gz5kpfx0xfz"; depends=[httr jsonlite magrittr png raster rayshader rgdal]; };
   spacyr = derive2 { name="spacyr"; version="1.2.1"; sha256="1b2ccgwsiqkvp7w37x8k7699c676q16vfrybkrfvyczyhki4s6nw"; depends=[data_table reticulate]; };
-  spaero = derive2 { name="spaero"; version="0.5.0"; sha256="1r3rgvmkcrkzm6ikbbmnm4rfdrnwgmn4wq21mxgjs2bzg2r72mw6"; depends=[]; };
+  spaero = derive2 { name="spaero"; version="0.6.0"; sha256="0xigwi6w21y2fwicml0s2gylwnwp2qvrqskr0v8rd3bn01hg9ja3"; depends=[]; };
   spagmix = derive2 { name="spagmix"; version="0.3-2"; sha256="18hffiknsx7z6w6p5dwqmg9fwghv1x6nzsxdlx0wjd6iixcf6a54"; depends=[abind mvtnorm RandomFields sparr spatstat]; };
-  spam = derive2 { name="spam"; version="2.5-1"; sha256="0ry0a76cljlmilrzcriiizcidxyhq1i7i9bqhvl1qda81ld8hifi"; depends=[dotCall64]; };
-  spam64 = derive2 { name="spam64"; version="2.5-1"; sha256="0fni9lwn51n0ax4qk1l1wslhbkfl44ryp5hgjprkql5a26nmv0nq"; depends=[]; };
+  spam = derive2 { name="spam"; version="2.6-0"; sha256="0p5ycvpry955ldrgbbq3syy91wx9425mddpn8r5m9xwlirjxv3v3"; depends=[dotCall64]; };
+  spam64 = derive2 { name="spam64"; version="2.6-0"; sha256="17i3s87hj3704al4shbjgp6fvai00xdx44wgfwgrfpbwya47q47n"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; };
-  spant = derive2 { name="spant"; version="1.7.0"; sha256="06lixkgxy1r7i43k7nzsl8vidqgdg7gz5myj3zjr5n83ziz8ah6q"; depends=[abind complexplus fields foreach irlba jsonlite magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; };
+  spant = derive2 { name="spant"; version="1.9.0"; sha256="0xzl6ay97sbmvr36pn7xb1r287a5cmdyf9g9inf2jl845xfh2g2b"; depends=[abind complexplus fields foreach irlba jsonlite magrittr MASS matrixcalc minpack_lm mmand nloptr nnls numDeriv plyr pracma ptw readr RNifti RNiftyReg signal smoother stringr tibble]; };
   sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; };
   spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; };
   sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; };
   sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; };
   sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="1.3.1"; sha256="1fql2msrrfw3kk9kf0pz36lpsbnppbnipd5c90wbzpyhdp3ki6zd"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals httr jsonlite openssl purrr r2d3 rappdirs rjson rlang rprojroot rstudioapi tibble tidyr uuid withr xml2]; };
+  sparklyr = derive2 { name="sparklyr"; version="1.5.2"; sha256="09l4hnz5p665w5fj38h0bhf2j9cr1rgl7a65yyihn9d7jncrmfsy"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals glue httr jsonlite lifecycle openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi stringr tibble tidyr tidyselect uuid vctrs withr xml2]; };
+  sparklyr_flint = derive2 { name="sparklyr.flint"; version="0.2.0"; sha256="1yzr89jza2ya4sym9ckmifg5q1cgix24x9x9pbkbiv3i29whi0pr"; depends=[dbplyr dplyr rlang sparklyr]; };
   sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; };
   sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; };
-  sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; };
+  sparkwarc = derive2 { name="sparkwarc"; version="0.1.5"; sha256="033clhl3pknjc7yzwa67l2l24sb2n61amc60zbvk2vc61yszl66f"; depends=[DBI Rcpp sparklyr]; };
   sparkxgb = derive2 { name="sparkxgb"; version="0.1.0"; sha256="1gyvmsm7q6w55p62cysrnkn69kq5rr4vwkd5vrcgbwdy3fbpl9xq"; depends=[forge sparklyr]; };
   sparr = derive2 { name="sparr"; version="2.2-13"; sha256="1cn8bzlfairfrxfwwdap0pnaa97rn9h13jz54il8cn9zacnzb8yc"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
   sparrpowR = derive2 { name="sparrpowR"; version="0.1.3"; sha256="18p8yym52cjb4pn7cw05f4ibzz1l9g48rq235g3wrmr552k839pi"; depends=[doParallel fields foreach raster sp sparr spatstat]; };
   sparseBC = derive2 { name="sparseBC"; version="1.2"; sha256="0a1siyi9kc805qji4alnw3c21spf4iw4wpsbfl50zvs52p8vl8w2"; depends=[fields glasso]; };
   sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; };
-  sparseFLMM = derive2 { name="sparseFLMM"; version="0.3.0"; sha256="0xl4zymdl9nxarn0nz8zhb1926lblb7jmyi7h1vp9cdl0hjwbiyy"; depends=[data_table MASS Matrix mgcv refund]; };
+  sparseFLMM = derive2 { name="sparseFLMM"; version="0.3.1"; sha256="1v500lfzcxjz8xbwds1hlz449fm35nw4yv3gqcwklx51k31vpshv"; depends=[data_table MASS Matrix mgcv refund]; };
   sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.4"; sha256="1vm853x5vvk745mm68wx0bkimmgwnbrdhj2rwy1nmgpk1lzi8vq6"; depends=[Matrix Rcpp RcppEigen]; };
   sparseIndexTracking = derive2 { name="sparseIndexTracking"; version="0.1.1"; sha256="0bgh29j22jm1yg2jp75xvv9jmqacb66vgv7ygf0xgnrwyrkxkm66"; depends=[]; };
   sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; };
-  sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; };
+  sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0.1"; sha256="08xhpm9hp9x9rmiys4fvh9y4z2xsdkzckzw3lq0vlzvjcaynvidq"; depends=[Rcpp RcppEigen robustHD]; };
   sparseMVN = derive2 { name="sparseMVN"; version="0.2.1.1"; sha256="0ikh1i4vid6r4sx9pdjqc5wbh4xdj966mr0b7jb1vjw18wrzad8q"; depends=[Matrix]; };
   sparseMatEst = derive2 { name="sparseMatEst"; version="1.0.0"; sha256="06y061zl6id7cfw3cqzvwykzlijmala8hj61i04mgc491ngybimv"; depends=[glasso]; };
   sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
   sparseSVM = derive2 { name="sparseSVM"; version="1.1-6"; sha256="0b0qiikjyyh9qfd4jl69zqnlp7adxq63mwsxvgwvyc0pv5ccg8i0"; depends=[]; };
-  sparsebn = derive2 { name="sparsebn"; version="0.1.0"; sha256="1f6b6wb5lg3avcgwcr2dbaikcrrvk0vb5ag5c1c30j0xckgl3n1v"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
+  sparsebn = derive2 { name="sparsebn"; version="0.1.2"; sha256="1b1601n3nmxck6a27xqxpsa79p4xnz7yyzdfqiddn9zd2b4v9wc5"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
   sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.7"; sha256="1a810wrjvgzqmlgcx1lnvxz8j1v8ycfqwk9acnm84c4lmb8rkyx0"; depends=[Matrix nnet]; };
   sparseinv = derive2 { name="sparseinv"; version="0.1.3"; sha256="06inzix9m7b5g7c97lyvyl2g7fdr4iz60791hl2w9mah7nd6bfja"; depends=[Matrix Rcpp spam]; };
   sparsenet = derive2 { name="sparsenet"; version="1.4"; sha256="1r7xmpn3r8dq1zm6ghygks3l014kqlrpfgsl8q23w7rly8ksw3m9"; depends=[Matrix shape]; };
@@ -14526,14 +15143,15 @@ in with self; {
   sparsesvd = derive2 { name="sparsesvd"; version="0.2"; sha256="1xm969fjq3fv1p2sqza2apz8picibj4s2agpwf1sx9nwn3b587qs"; depends=[Matrix]; };
   sparsevar = derive2 { name="sparsevar"; version="0.0.11"; sha256="18cylbi788ibpry6h9yphrwx2wwsaa25bq2s13h0dcfxyicl2f9p"; depends=[corpcor doParallel ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; };
   sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; };
+  sparta = derive2 { name="sparta"; version="0.7.0"; sha256="0x7lb6fng8xz1c53300aq62rpvksjmadk3pd0qz6n41yc68nmhwg"; depends=[Rcpp RcppArmadillo]; };
+  spass = derive2 { name="spass"; version="1.3"; sha256="1c148z0i3d185hnf54xmgppjrblv3b2s3sm0lmj78gvav04mj5s4"; depends=[geepack MASS multcomp mvtnorm Rcpp]; };
   spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; depends=[mvtnorm truncnorm]; };
   spatgraphs = derive2 { name="spatgraphs"; version="3.2-2"; sha256="09bbcqgmbg6a65mnxivr4pghsanj22x1j0l4hq8bzpwgbas7byhy"; depends=[Matrix Rcpp]; };
   spathial = derive2 { name="spathial"; version="0.1.2"; sha256="1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb"; depends=[class igraph irlba knitr MASS matrixStats pracma rmarkdown Rtsne]; };
   spatial = derive2 { name="spatial"; version="7.3-12"; sha256="0qrdhzd5r78iwi46nk8jr56dzz5l5imkflxjw64d0ys0wyg06fbn"; depends=[]; };
   spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; };
   spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; };
-  spatialEco = derive2 { name="spatialEco"; version="1.3-2"; sha256="0yp5fp34gki858425xahs39klvhaqjhkjrrgb1ml84mix1z45ylx"; depends=[MASS raster rgeos sf sp spatstat spdep]; };
-  spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; };
+  spatialEco = derive2 { name="spatialEco"; version="1.3-3"; sha256="0cddc69y90p9p6bdd82r3yi7ljjr1p813chvriqy2nahhg00yxia"; depends=[MASS raster rgeos sf sp spatstat spdep]; };
   spatialfusion = derive2 { name="spatialfusion"; version="0.6-2"; sha256="1vqv4424m8rnmyg463mvnk26q7dis4wd47swyyc8f8r4qd85agnz"; depends=[fields Rcpp rstan SDraw sp]; };
   spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
@@ -14541,17 +15159,17 @@ in with self; {
   spatialrisk = derive2 { name="spatialrisk"; version="0.6.7"; sha256="1vd90v55wy7b1aqhlr2b6x445nwghn94qyz39439pcmp5y9n8zb8"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; };
   spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; };
   spatialwarnings = derive2 { name="spatialwarnings"; version="2.0.0"; sha256="02dd4xyl3n6mfl201cmi0n2mq9j3p7mf0nn67nm6nnvgmkrpgxhg"; depends=[future future_apply ggplot2 gsl plyr Rcpp RcppArmadillo tidyr]; };
-  spatialwidget = derive2 { name="spatialwidget"; version="0.2.2"; sha256="082w44i9is0cn4kgbqlnzclyp4fj2is0r5kla29nvm4m2y83bdjj"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp sfheaders]; };
-  spatsoc = derive2 { name="spatsoc"; version="0.1.14"; sha256="0h9rrlansr2pk7n1jlq9pyn7d3q97q39c5zar4v9mdbyspfgbch1"; depends=[adehabitatHR data_table igraph rgeos sp]; };
+  spatialwidget = derive2 { name="spatialwidget"; version="0.2.3"; sha256="0j0v0cyqndlg9p7g03gp1br9b2i3p50abzpw67k3cawm96a87crj"; depends=[BH colourvalues geojsonsf geometries jsonify rapidjsonr Rcpp sfheaders]; };
+  spatsoc = derive2 { name="spatsoc"; version="0.1.15"; sha256="0w8bf2lh8p2823sx6mm8dyyhd3n2aiz1cn8f5bp3j26bg6q9gr2i"; depends=[adehabitatHR data_table igraph rgeos sp]; };
   spatstat = derive2 { name="spatstat"; version="1.64-1"; sha256="06jmxfs9kz9qqi3ichfgn8dglwb87kq2nl578p83za5psv8cfgya"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
   spatstat_Knet = derive2 { name="spatstat.Knet"; version="1.12-2"; sha256="01h01nqb18vjvr50xfn3zl7nwbs62gzjxdj6mjs3lxz3y9ljsmh1"; depends=[Matrix spatstat spatstat_utils]; };
-  spatstat_data = derive2 { name="spatstat.data"; version="1.4-3"; sha256="18lfj5vkwxgf5w9qz0g5al3zy8y2yi3bnd13w24hszfc82nbcmc9"; depends=[Matrix spatstat_utils]; };
+  spatstat_data = derive2 { name="spatstat.data"; version="1.7-0"; sha256="0by10dx72jjn6rvgrdj4xwh4zg6vxi4cp536aq4b6drb7za95hdv"; depends=[Matrix spatstat_utils]; };
   spatstat_gui = derive2 { name="spatstat.gui"; version="1.0-2"; sha256="07lk3xrg5cyvgvw2xwvi77s4ma8qbnmy4whsvm1wdfvw40c0mfrz"; depends=[rpanel spatstat spatstat_utils]; };
   spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; };
   spatstat_sparse = derive2 { name="spatstat.sparse"; version="1.1-0"; sha256="1iz6s1y765xi3n5x81n4fs52f4zr6r95mpg8263j0hjiqqg54vww"; depends=[abind Matrix spatstat_utils tensor]; };
   spatstat_utils = derive2 { name="spatstat.utils"; version="1.17-0"; sha256="08h9kzkkxvlnngxnv5mdylfali5jj4yhgbr8kvf8l7glswz6ik9r"; depends=[]; };
   spatsurv = derive2 { name="spatsurv"; version="1.5"; sha256="1l1yxh2ix13314z4mjpf9nz8ad8423v09vzwq95qlazc27hlhyyd"; depends=[fields iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat stringr survival]; };
-  spbabel = derive2 { name="spbabel"; version="0.5.1"; sha256="1q4y5has7yrsn1hv5nzm4imciv5sw5ycsvy5mpikrs1i670rbp6b"; depends=[dplyr rlang sp tibble]; };
+  spbabel = derive2 { name="spbabel"; version="0.5.5"; sha256="0yfkz28nfvl3rm0bxljb3y19zhnx7pabxy81d835pbfmjq5vvp51"; depends=[dplyr rlang sp tibble]; };
   spc = derive2 { name="spc"; version="0.6.4"; sha256="0r2ydj4mckpmf41kwn74xbd408xd3mx017l24cikx304n95a9j7y"; depends=[]; };
   spc4sts = derive2 { name="spc4sts"; version="0.5.2"; sha256="039z6dnry5c2brmh7jsnb6cvb7a8nig1rrf4d4i5bpifi2x1hf06"; depends=[gridExtra LS2Wstat rpart]; };
   spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; };
@@ -14570,7 +15188,8 @@ in with self; {
   spec = derive2 { name="spec"; version="0.1.7"; sha256="0zgs9yki11wysvjnx88gl8iv0mcsbrasg29sbasp0855x5l8cg8k"; depends=[csv encode magrittr]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
   specklestar = derive2 { name="specklestar"; version="0.0.1.7"; sha256="04vm989yi31vqnf5rs6cdyikm4jzfd9njxh0ls3dvjrg19ipsnmn"; depends=[Rcpp]; };
-  specmine = derive2 { name="specmine"; version="3.0.1"; sha256="0d6n94fsjzvrjad8br7878p857584my157rc6fbijqkwwrhfhp4x"; depends=[baseline caret compare e1071 ellipse gdata genefilter GGally ggplot2 hyperSpec impute MASS Metrics pcaPP pls RColorBrewer readJDX speaq]; };
+  specmine = derive2 { name="specmine"; version="3.0.3"; sha256="1ysw0nrv91xdwmcz7w8ngdfp83jmjj4ay0dj7mwvivn7g5456agz"; depends=[baseline caret compare e1071 ellipse genefilter GGally ggplot2 impute imputeTS MASS Metrics pcaPP pls RColorBrewer readJDX speaq specmine_datasets]; };
+  specmine_datasets = derive2 { name="specmine.datasets"; version="0.0.1"; sha256="1mr7cxr017lwxhdgw2kndjidxj4jj66ch6gxddjcplgq8wc158vx"; depends=[xcms]; };
   specr = derive2 { name="specr"; version="0.2.1"; sha256="17bc7f644g40zsfxv3sw542piqgg09w3m3q14jgrifc8sw0ljvdf"; depends=[broom cowplot dplyr ggplot2 ggraph glue igraph lme4 magrittr purrr rlang tibble tidyr]; };
   specs = derive2 { name="specs"; version="0.1.1"; sha256="0x5s7aikj5x1dgxygizh2mcni74hy6dm7084h1pqqbh5ans00c6n"; depends=[Rcpp RcppArmadillo]; };
   spectacles = derive2 { name="spectacles"; version="0.5-2-2"; sha256="0nr2s6mnnir7jwrv80s2vk8wffqd7dl7xj82ss1idshqxk0dliz3"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; };
@@ -14578,23 +15197,25 @@ in with self; {
   spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; };
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
   spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.2.0"; sha256="02j374zsz4ba8ldy52x43rih1p77b56cv5xlbycj5wmkzny2gzx1"; depends=[MASS Matrix progress Rcpp RcppArmadillo RcppEigen rlist]; };
-  spectrolab = derive2 { name="spectrolab"; version="0.0.9"; sha256="085c7kpc142bx4ah9wnfc9isfs6y4960rs0cg6cw36179s31d17g"; depends=[devtools prospectr RColorBrewer shiny shinyjs usethis]; };
+  spectrolab = derive2 { name="spectrolab"; version="0.0.10"; sha256="1hmz5a5x8xf2xw6qz6h21gzyswi0al4bnpygxf0rhg4i9wpfch9j"; depends=[prospectr RColorBrewer shiny shinyjs]; };
   sped = derive2 { name="sped"; version="0.2-1"; sha256="05igpk8szdcs6kjhpmd9dmjvqdg199pz3hi0rwkhdjglxivvjzjn"; depends=[pooh]; };
   speech = derive2 { name="speech"; version="0.1.0"; sha256="007s32w8qr45x1n40xdh85a329cgmm3809bi62ghnxzfny9vjb07"; depends=[dplyr lubridate magrittr pdftools purrr stringr tabulizer tibble tidyr tm]; };
   speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
   spef = derive2 { name="spef"; version="1.0.9"; sha256="115lmv2a21ws1mj22v1fbk72mqn3siqmw3frbg4nci96lnyr7qh6"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
   speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
   spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; };
-  spelling = derive2 { name="spelling"; version="2.1"; sha256="1j92brq29za3di1723xhmx240ya2v351dvcg0r1xr5yclw1kh3jp"; depends=[commonmark hunspell knitr xml2]; };
+  spelling = derive2 { name="spelling"; version="2.2"; sha256="179nj9w1v27qq9q5240ddvggp0795998sxyqjvbqjvq9dmach3bl"; depends=[commonmark hunspell knitr xml2]; };
   spemd = derive2 { name="spemd"; version="0.1-1"; sha256="1aw8dg2fm8qd95bgim2kjwp7ax4b2g78521llsxv7fhdj9hl7rgw"; depends=[MBA sp spdep]; };
   sperich = derive2 { name="sperich"; version="1.5-8"; sha256="0v4mnv9nl0dvmmfx10w03k02pwjjnip9526m3j1kpgn6c4wk1h93"; depends=[foreach rgdal sp]; };
   sperrorest = derive2 { name="sperrorest"; version="3.0.1"; sha256="0lj8iwl5x9krxw9ffbxxgi94imlhyc9zzl5p90xylk5dsn0gcb76"; depends=[future future_apply ROCR stringr]; };
   spex = derive2 { name="spex"; version="0.7.1"; sha256="0lsmh1sywd4si0v10aix44hybwph3gan8w8cxz956dcgkz60p41v"; depends=[crsmeta quadmesh raster reproj sp]; };
+  spfda = derive2 { name="spfda"; version="0.9.0"; sha256="156vs1f75x0wbf65fwzkhlbda649sryf58xixi7gbfjzn873w111"; depends=[mathjaxr]; };
+  spfilteR = derive2 { name="spfilteR"; version="1.0.0"; sha256="0pldarr2kdf7fkkdpmpx5azqzgfwzqbd6qb4fg7xjsj78bza6fif"; depends=[]; };
   spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; };
   spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; };
   spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; };
   spgs = derive2 { name="spgs"; version="1.0-3"; sha256="0a7zqih8q4imi49in8d2j9wa82savp7d2g4xy4wlwblwf6f2ggsh"; depends=[]; };
-  spgwr = derive2 { name="spgwr"; version="0.6-33"; sha256="1nbg4jacc4iimn79b60c6q9qf09j35yxa2nmlwwijmixa15gmqyd"; depends=[sp spData]; };
+  spgwr = derive2 { name="spgwr"; version="0.6-34"; sha256="1zmd7zp1h98y0xnxacym29b8kcp79yrsss1c49b5rfnml9ksdaqx"; depends=[sp spData]; };
   spherepc = derive2 { name="spherepc"; version="0.1.4"; sha256="0jyaanwb78gv3cb1ig86h8cjaw35pxwx7hq53kc9iwjfhkrmc2j3"; depends=[geosphere rgl sphereplot]; };
   sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
   sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; };
@@ -14607,8 +15228,8 @@ in with self; {
   spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; };
   spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
   spinBayes = derive2 { name="spinBayes"; version="0.1.0"; sha256="1qgqxxk4n17wj3q07irm2qj6lwc5188iwwbdkf588hvfy86lwpj8"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
-  spind = derive2 { name="spind"; version="2.2.0"; sha256="1qswvj8hcjds3mjffzlxq87g79gijsk3mw26lfr81vyf5zmwm4w4"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje rlang splancs stringr waveslim]; };
-  spinifex = derive2 { name="spinifex"; version="0.2.5"; sha256="0an9k3ygcq6pyryms6b04fzkl6wqh84g353apx07zr52qn32kycr"; depends=[gganimate ggplot2 plotly shiny tourr]; };
+  spind = derive2 { name="spind"; version="2.2.1"; sha256="1yasqy086h4dv348krisc024mic0dvdsncqys95l85924djlfipp"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje rlang splancs stringr waveslim]; };
+  spinifex = derive2 { name="spinifex"; version="0.2.7"; sha256="1adgkadwqb3k75gc1l5wwdkvhlx54wviskzw2776ln914kh2in7h"; depends=[dplyr gganimate ggplot2 plotly RColorBrewer shiny tourr]; };
   spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; };
   spiritR = derive2 { name="spiritR"; version="0.1.1"; sha256="1fjr63rl9hwqxzgm4lkb9v74cxxpi4lrlcgjixdm7zgccm8ihdvh"; depends=[httr magrittr xml2]; };
   splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; };
@@ -14616,13 +15237,14 @@ in with self; {
   splines2 = derive2 { name="splines2"; version="0.3.1"; sha256="03zh3v8z0030ivja4a08f0rrkn6k5g5kyaqnys81h3wja10gllyv"; depends=[Rcpp RcppArmadillo]; };
   splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; };
   splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; };
-  splitSelect = derive2 { name="splitSelect"; version="1.0.0"; sha256="044pmsdq1kvs3qjglrdpwq5kxvxfybpaqmqhnmwpw4xlql4afvyc"; depends=[caret doParallel foreach glmnet multicool mvnfast]; };
-  splitTools = derive2 { name="splitTools"; version="0.2.1"; sha256="09dpkrdfkhh7hqgf0r4c5qx74aghs2gqy47dyakkb19fbx66glhl"; depends=[]; };
+  splitSelect = derive2 { name="splitSelect"; version="1.0.1"; sha256="0pkiarjwjw8s3rspj2910lwrcy71qjx1i2fp1q98k05b39v8m5da"; depends=[caret doParallel foreach glmnet multicool]; };
+  splitTools = derive2 { name="splitTools"; version="0.3.1"; sha256="015vk8awxfc3zmcm3h51b6fy7si31g8w7mg4ig5fvpgsnm97h7rw"; depends=[]; };
   splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; };
   splithalf = derive2 { name="splithalf"; version="0.7.1"; sha256="0mpg6i6zh4s9sz10gs0h3y1cc1zva7vs805sb3qkghx857psgyw3"; depends=[dplyr ggplot2 patchwork plyr Rcpp robustbase tidyr]; };
   splithalfr = derive2 { name="splithalfr"; version="2.0.12"; sha256="0xcd0zjm8nvj1vq241m2y9gdygiwi0mzvyh4znq7biviwfkya3ag"; depends=[bcaboot dplyr psych rlang tibble]; };
   splitstackshape = derive2 { name="splitstackshape"; version="1.4.8"; sha256="0mpyf2kkfdl69pdc6brl1r6101vyc6pgr7z17s55ppg3y71k4q35"; depends=[data_table]; };
   splm = derive2 { name="splm"; version="1.4-11"; sha256="15app94mxs6xlmqqhpa0q041skc4n4l2wfi6pmmhwinrgcqgncln"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
+  splmm = derive2 { name="splmm"; version="1.1.2"; sha256="1ch9nm6h2l4s90dz0a8j6w77i1di5sf0glwayi84nanxad9q09i2"; depends=[emulator ggplot2 gridExtra MASS miscTools penalized plot3D Rcpp RcppArmadillo]; };
   splot = derive2 { name="splot"; version="0.5.1"; sha256="0m2cx5rrwfyznzn12z9xkyrs9i6qkwyyymbk3z28gjxw31kszlc9"; depends=[]; };
   spls = derive2 { name="spls"; version="2.2-3"; sha256="0bmb0ai5z80njhypd342i711x0bdkwcvlyn374lyyzj8h3d97mmv"; depends=[MASS nnet pls]; };
   splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; };
@@ -14641,8 +15263,8 @@ in with self; {
   sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; depends=[data_table ggplot2 Rcpp]; };
   spotGUI = derive2 { name="spotGUI"; version="0.2.1"; sha256="1z664ricdsn8c29ks6hslm89f0qq6ls94pz4k256427cs95pk3ay"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; };
   spp = derive2 { name="spp"; version="1.16.0"; sha256="08zxxgyp0h6733b08jmml7k4rhfd3mi5dda3jrzid0s184y0z29w"; depends=[BH caTools Rcpp Rsamtools]; };
-  sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
-  spray = derive2 { name="spray"; version="1.0-9"; sha256="06w97jd4sw2gyjw6m1gljx8mghyxvyrabhmai8ccjq1j9f28q8q3"; depends=[magic partitions Rcpp]; };
+  sppmix = derive2 { name="sppmix"; version="1.0.2.1"; sha256="0rgxaw7xqlrcmyq772afs2ymgbsc296g6c3jx9bi8hlfygb3lk09"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
+  spray = derive2 { name="spray"; version="1.0-10"; sha256="1iz704ym09rn3fdjymdmbiifvw5qn2bm50rmzxa8igkn66cgm163"; depends=[magic mathjaxr partitions Rcpp]; };
   spread = derive2 { name="spread"; version="2019.8.5"; sha256="1mc25abh1jxgis9p78pdy91a45kanr7y32xbqypyd514jjylnc52"; depends=[data_table fhidata Rcpp RcppProgress readxl stringr zoo]; };
   spreadr = derive2 { name="spreadr"; version="0.1.0"; sha256="1azf1543ijlgmry0f2sxivpy4hk9mcwnn5kqggzwwzwla2ql3lhj"; depends=[extrafont ggplot2 igraph Rcpp]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
@@ -14654,9 +15276,9 @@ in with self; {
   spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; };
   spsh = derive2 { name="spsh"; version="1.1.0"; sha256="1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1"; depends=[DEoptim FME hypergeo lhs pracma Rdpack]; };
   spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; };
-  spsur = derive2 { name="spsur"; version="1.0.1.5"; sha256="04vpal54d9b4r6g9cwxqyxh3kk8lyq30x7ki48i399d4k4ffhgz7"; depends=[car Formula ggplot2 gmodels gridExtra lmtest MASS Matrix minqa numDeriv rlang sparseMVN spatialreg spdep]; };
+  spsur = derive2 { name="spsur"; version="1.0.1.6"; sha256="1dllgnv2javrbmy4a5cg4n0rmr6igalr2xza39bqv3817p0mpaal"; depends=[car Formula ggplot2 gmodels gridExtra knitr lmtest MASS Matrix minqa numDeriv Rdpack rlang rmarkdown sparseMVN spatialreg spdep]; };
   spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
-  spsurvey = derive2 { name="spsurvey"; version="4.1.3"; sha256="1xpygn6wfkw9y5p1a9jmcky5asi1387bwh7wmlksn90zzn89wir2"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; };
+  spsurvey = derive2 { name="spsurvey"; version="4.1.4"; sha256="1dz6g0kb4gjsbkmj66926cxlfx7phx6mg483r0qz4wwmmba9qgbh"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; };
   spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; };
   sptm = derive2 { name="sptm"; version="2019.11-25"; sha256="1hdymzngdppmh56dqh0k88n9hg68pbx9rgmimbz4ihnfx2plvadh"; depends=[kyotil survey survival]; };
   sptotal = derive2 { name="sptotal"; version="0.1.0"; sha256="0fr2czqfrk8n3iza2v5vpr00zs4s3dk4ar4xzfsriw5542glhykv"; depends=[ggplot2 matrixcalc mvtnorm sp tibble viridis]; };
@@ -14669,19 +15291,21 @@ in with self; {
   sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; };
   sqp = derive2 { name="sqp"; version="0.5"; sha256="0l01zwcryv5bmzmd98gj0m5ip8nvr8lziq1awvfif1bzwvvd2kzx"; depends=[Matrix Rcpp RcppArmadillo RcppEigen Rdpack]; };
   squash = derive2 { name="squash"; version="1.0.9"; sha256="1x66iamj5pir6l9aqx4x7xylxxjpjrw8vcix9rbhfd0y0y2iqf7z"; depends=[]; };
-  squashinformr = derive2 { name="squashinformr"; version="0.1.2"; sha256="0983acs4h4ksdax89hy97l37rdwzwn40m3vimkrsfc1d586hvnv1"; depends=[dplyr Hmisc janitor lubridate naniar plyr polite rlang rvest stringr tibble tidyr xml2]; };
+  squashinformr = derive2 { name="squashinformr"; version="0.1.5"; sha256="0mj5xc9qsvzh08bxliipaj83wmxxgi6bgxl8x0bgink9s8s9g2ws"; depends=[dplyr Hmisc janitor lubridate naniar plyr polite rlang rvest stringr tibble tidyr xml2]; };
   squid = derive2 { name="squid"; version="0.1.2"; sha256="1sf7q9pp68inr4ikaxm51f31gwxq9ixrsismrnnsby3agq6nsmkb"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
   sra = derive2 { name="sra"; version="0.1.3"; sha256="0bdxgsz177szfqmvffidgkhl0lrdd7c1nzdvh7ijx99zmi5ww71n"; depends=[]; };
+  srcr = derive2 { name="srcr"; version="1.0.0"; sha256="1wk18a1c0pf6mq3k78qi7fhivahx2q22rcs2ajsdj73b0993wnbm"; depends=[DBI dplyr jsonlite]; };
   srm = derive2 { name="srm"; version="0.3-6"; sha256="0mc97pv1hsmia4v2wyb8yi37i3v1xypfv9xmhjb989xnnysf1lm3"; depends=[Rcpp RcppArmadillo]; };
   srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; };
-  srvyr = derive2 { name="srvyr"; version="0.4.0"; sha256="03r9swnsnfz401lvsa8951r6h8p2fvj7isd1gsh6dkkm9plvrqh8"; depends=[dplyr magrittr rlang survey tibble tidyselect]; };
+  srt = derive2 { name="srt"; version="1.0.0"; sha256="0mxmg0j1acfks6gdmb08jlf03qwmx7s5p5li4z7zq35g1wml8icf"; depends=[]; };
+  srvyr = derive2 { name="srvyr"; version="1.0.0"; sha256="1p0185svcc71s2c00ym2vkml4mk9blpki5z9s4c06nzm7ylb1dmq"; depends=[dplyr magrittr rlang survey tibble tidyr tidyselect]; };
   ss3sim = derive2 { name="ss3sim"; version="1.0.3"; sha256="0s2yajlhi07fvqc0rr4msd9g2jrswb83dx55wsxnw925vikqa5kz"; depends=[bbmle foreach ggplot2 gtools r4ss]; };
   ssMousetrack = derive2 { name="ssMousetrack"; version="1.1.5"; sha256="069jsp2l63jp4fv2hwadqxpkp89aqmbh439zy66rx55kws75b556"; depends=[BH CircStats cowplot dtw ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; };
   ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; };
   ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; };
   sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; };
   ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
-  ssdtools = derive2 { name="ssdtools"; version="0.3.0"; sha256="0dq2asr9dlxyb0bfinzc91l10clg4kb7fgckfqz9pd1mhiz41as8"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle Rcpp scales tibble VGAM]; };
+  ssdtools = derive2 { name="ssdtools"; version="0.3.2"; sha256="0m1qiba7byc5kvs4b57vkg6jr5ghllbpkg2pcybi9q3llhl4pxd3"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle Rcpp scales tibble VGAM]; };
   sse = derive2 { name="sse"; version="0.7-16"; sha256="1kxdgbskw7v48jnif4dpmwxpsdznfx8d9q5nkf3ynw9xl38rzv23"; depends=[lattice]; };
   ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; };
   ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; };
@@ -14704,10 +15328,10 @@ in with self; {
   sstModel = derive2 { name="sstModel"; version="1.0.0"; sha256="04dvj6dbxidn1df2rslppl2pw2ql09rag39jrzdbnv6z20szbbd9"; depends=[data_table MASS openxlsx readxl shiny shinydashboard]; };
   ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
   ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; };
-  st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
+  st = derive2 { name="st"; version="1.2.6"; sha256="0v2bii21c0dg25zbf2379q7jy6z4z93hpw3rd32gm77bvgr0fd40"; depends=[corpcor fdrtool sda]; };
   stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
   stUPscales = derive2 { name="stUPscales"; version="1.0.3.4"; sha256="0a6b38lhi1p0n2hjq2j8aw2vkasdv50cpgllxfxla7ddwbhbk3nk"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; };
-  staRdom = derive2 { name="staRdom"; version="1.1.14"; sha256="0byxkl6i3bbwk6h4g4z09aif87gmlvxy64jny4c5c5bdpf4k3zbc"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; };
+  staRdom = derive2 { name="staRdom"; version="1.1.18"; sha256="1ywc8mp0j8fl3ki18sqjh9x582wza3l0ydfpfbx3vyzwqb9gdl2s"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; };
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
   stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; };
   stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; };
@@ -14715,54 +15339,60 @@ in with self; {
   stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; };
   stablelearner = derive2 { name="stablelearner"; version="0.1-2"; sha256="18yrx2h71b857j0xyh68pj80p2xk6yhbfzhd3mdhiqw0irmc5755"; depends=[e1071 MASS party partykit randomForest ranger]; };
   stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; };
-  stabm = derive2 { name="stabm"; version="1.1.2"; sha256="01fg6zn6i710xfa9g15q4ca7vfgkfrk0iz6fvn8qp6y3dfrpm1sj"; depends=[BBmisc checkmate Matrix]; };
+  stabm = derive2 { name="stabm"; version="1.1.4"; sha256="1nav5v36q7fsqzqx61n1pfixwhkh12jxl9pfd4ssmsglxk8py0is"; depends=[checkmate Matrix]; };
   stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; };
   stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; };
   stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; };
+  stacks = derive2 { name="stacks"; version="0.1.0"; sha256="0ssc8l4cgwfz0h1aavak9gpy7g85pnwjdzvfr76hmnqn39k09cpi"; depends=[butcher cli dials digest dplyr foreach generics ggplot2 glmnet glue parsnip purrr recipes rlang rsample tibble tidyr tune workflows yardstick]; };
   stacomirtools = derive2 { name="stacomirtools"; version="0.5.3"; sha256="00zpsfrw0gcjbjr3xdxf2wacrr1zfw6wq7a2ycq32pbh2smbkz4k"; depends=[RODBC xtable]; };
   stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
-  stagedtrees = derive2 { name="stagedtrees"; version="1.0.2"; sha256="11s09r4bp3fd9nbfqmwbdkvlgkryf3n9awbffyk2rsd9cdva2lch"; depends=[]; };
+  stagedtrees = derive2 { name="stagedtrees"; version="2.0.1"; sha256="0mpcmmdq907zapk6swdqx0nak2ms292x85n634zilnqjysjiz8zx"; depends=[]; };
   stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
   stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
   standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; };
   stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; };
+  staplr = derive2 { name="staplr"; version="3.1.0"; sha256="1annzkyrps0z2d0z9zyf76d936g26ypwakwh9cshjvfa07fqgjvy"; depends=[assertthat glue rJava stringr XML]; };
   stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; };
   starm = derive2 { name="starm"; version="0.1.0"; sha256="0y580c6inmfix6agwd5nr340l3hjk2xxs95s468j5pghpjpb8rmv"; depends=[Matrix]; };
   starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; };
-  starnet = derive2 { name="starnet"; version="0.0.3"; sha256="1g43v35j9wy23gspahdhpwn7vzv4r8q9r7xgafar93yykx3s0gyl"; depends=[cornet glmnet joinet Matrix survival]; };
+  starnet = derive2 { name="starnet"; version="0.0.6"; sha256="0gbg8svyj4nh846q7986ap7jjry599kb1348k9lifz19kvyr4rn4"; depends=[cornet glmnet Matrix survival]; };
   stars = derive2 { name="stars"; version="0.4-3"; sha256="0yf2x8l3bybc91r9vih473qrsqf05p6gszsr41ms63hksig8vwx2"; depends=[abind classInt lwgeom rlang sf units]; };
-  starsExtra = derive2 { name="starsExtra"; version="0.1.0"; sha256="19v63vpcb5ikhmmjzsgaca1pr4n5yai40ligm4q1f9jfv48xwpkk"; depends=[mgcv nngeo sf stars units]; };
-  starschemar = derive2 { name="starschemar"; version="1.0.0"; sha256="04mg0d5zzdj1fnpsnjdy9ajh639vc47gpi1wf00v5j4s2x21x224"; depends=[dplyr pander purrr readr rlang snakecase tibble tidyr tidyselect]; };
-  startR = derive2 { name="startR"; version="2.0.0"; sha256="199wb16mrslhxj7lbkc4216khnwvj9hydnymh11vhwviawb9557k"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply s2dverification]; };
-  startup = derive2 { name="startup"; version="0.14.1"; sha256="0nvmhfar53yi3wsvhv4idx849psdj46qhkvkxjn52fa7yflkrwz8"; depends=[]; };
+  starsExtra = derive2 { name="starsExtra"; version="0.2.0"; sha256="07aw0f5jnhmz3zmcnyry1g2gxds7lghwzqfpmdzzid2wmdcd5raw"; depends=[mgcv nngeo sf stars units]; };
+  starschemar = derive2 { name="starschemar"; version="1.2.0"; sha256="0jjaic1zwdc3lvdlgs0vzkjjivjs2dskmhx4qg469ban34az0591"; depends=[dplyr generics pander purrr readr rlang snakecase tibble tidyr tidyselect]; };
+  startR = derive2 { name="startR"; version="2.1.0"; sha256="1cgn77jaiy7gfqbhh6w3x0bf57v32vzpp334mp50v827hgv439wy"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply s2dverification]; };
+  startup = derive2 { name="startup"; version="0.15.0"; sha256="05a5drjzmc969yn5y62gy1ja469nqrcbicycvjmlgrrfcj7918mi"; depends=[]; };
   startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; };
-  starvars = derive2 { name="starvars"; version="0.1.8"; sha256="1dr8dw7mj57hhz9147fj0mkscmq26ymvcd0czgdaig7vf4lljz6m"; depends=[data_table fGarch highfrequency ks lessR lubridate MASS matrixcalc maxLik nloptr quantmod R_utils rlist vars xts zoo]; };
-  stat_extend = derive2 { name="stat.extend"; version="0.1.1"; sha256="1jb8hqzs9jzbmksmc4aijv62sa5aylin73p9g1vgw6s513dx2bcl"; depends=[sets]; };
-  statGraph = derive2 { name="statGraph"; version="0.3.0"; sha256="1xc10pkv3dq7x98xjqkg7ily89qj2r637y5qlnfvk08n6mzhn8w0"; depends=[igraph MASS]; };
+  starvars = derive2 { name="starvars"; version="1.1.1"; sha256="0gam30mjppzq5pw7899ppc60ia47y0wh9y6j3p37511h691l45v5"; depends=[data_table fGarch ks lessR lubridate MASS matrixcalc maxLik quantmod rlist vars xts zoo]; };
+  starvz = derive2 { name="starvz"; version="0.4.0"; sha256="1nzfpvdvfsi4a4x667k74l9c8nbsvwdgyn6ipsdr7n30k2sxlm6k"; depends=[arrow BH car data_tree dplyr ggplot2 gtools lpSolve magrittr patchwork purrr RColorBrewer Rcpp readr rlang stringr tibble tidyr yaml zoo]; };
+  starwarsdb = derive2 { name="starwarsdb"; version="0.1.2"; sha256="00n9qqw4lbfk698qgvw8i42sy3dv5i5fiiqma3zks4rr9yspkldq"; depends=[DBI duckdb magrittr tibble]; };
+  stat_extend = derive2 { name="stat.extend"; version="0.1.4"; sha256="1m3bjwgb0g0c445xy9b29yibnf8ldjfnyd0i519dxnh31b6k8vy9"; depends=[sets]; };
+  statGraph = derive2 { name="statGraph"; version="0.4.1"; sha256="1svsjdh7w1gb37frn2y2rvkrldcm1nws6xhl18bxpx0g29z4915r"; depends=[cluster doParallel foreach igraph MASS rARPACK]; };
   statVisual = derive2 { name="statVisual"; version="1.2.1"; sha256="1cc9p9g8lzn0lgh793r977yhqbk89l74m443gnznjlfml69bfb21"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gridExtra knitr limma magrittr pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; };
-  statar = derive2 { name="statar"; version="0.7.2"; sha256="16bbpwnfa0ds04zbw87ayxvl8bfk2gk52w7lq32h1ny8f42hx9aq"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr tidyselect]; };
+  statar = derive2 { name="statar"; version="0.7.3"; sha256="17zg1g0ndsysrqj0alpx0sgmc69d3jkqr543l8m758mnm9bw83c9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyselect]; };
   statcanR = derive2 { name="statcanR"; version="0.1.0"; sha256="1pyax5lixbpdg99n525w9z44s0zp5xda6ad605c3id0arki9c8xq"; depends=[curl data_table]; };
   statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; };
   statcomp = derive2 { name="statcomp"; version="0.1.0"; sha256="0793k14rxiwq98zlrbsmbbkjn5z2ny5c90pia7cx3s77a3wdc96l"; depends=[Matrix zoo]; };
   statebins = derive2 { name="statebins"; version="1.4.0"; sha256="1v67da939qg672aqni2i37w70pgasgx6r55b4fjjc3zzviq8gipx"; depends=[ggplot2 scales]; };
-  states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; };
-  statespacer = derive2 { name="statespacer"; version="0.2.1"; sha256="02xfmwq89z5clh9w2c39vmi6h0lqkjdxgy6qlnz3fkj9lpv484i1"; depends=[Rcpp RcppArmadillo Rdpack]; };
-  statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.4"; sha256="0hmxjm6phgysdkv467nbdmkxfnz55ilaii4hmslsn5p6dl37mqp3"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; };
-  statgenSTA = derive2 { name="statgenSTA"; version="1.0.5"; sha256="1mbq2h32qm0v102lx70qdif6pm6zdcpj78mlhm59cy98w0lwbbrx"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; };
+  states = derive2 { name="states"; version="0.3.0"; sha256="1lajcp8y483kx6iaxydrjyi2ngvw91203901xs9ndqdwm1x2m5bd"; depends=[dplyr lifecycle rlang]; };
+  statespacer = derive2 { name="statespacer"; version="0.4.0"; sha256="06qjbnp40mkbjxq14cwzpwcqymafm14cli1kmjfqwl4g1v9bvsx3"; depends=[Rcpp RcppArmadillo Rdpack]; };
+  statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.5"; sha256="1faxc4nd4ldslb47vsz8aw31c8f9fvmaacbq1zwc23dvqnrvzawn"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; };
+  statgenGxE = derive2 { name="statgenGxE"; version="1.0.3"; sha256="05886glxnfmiqiz7aycjb9j20i6aqxam69nsamb3awy477cyjj3x"; depends=[emmeans ggplot2 gridExtra knitr lme4 statgenSTA xtable]; };
+  statgenSTA = derive2 { name="statgenSTA"; version="1.0.6"; sha256="1hbhy4x5mfrm8wdvzm2fw5ii8yi0iw0nmsfk8wbdx1c40sfm5k15"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; };
   stationaRy = derive2 { name="stationaRy"; version="0.5.1"; sha256="1620fdlybn3hr96yngnp802imr9b7n90835lyyd86r2wn6psdzvl"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; };
   stationery = derive2 { name="stationery"; version="0.98.30"; sha256="0gr4nja8xsajrx34m6cxpw3jc59flh7n5d3x111znajfwbym1b5n"; depends=[knitr kutils rmarkdown]; };
   statip = derive2 { name="statip"; version="0.2.3"; sha256="0kymc3ds1nx0h11ffmm3vmqr1w34gd0k788vf72x2v45h8c1ma2n"; depends=[clue rpart]; };
-  statmod = derive2 { name="statmod"; version="1.4.34"; sha256="0yklg64aw5y8kfq5piafnrj1v3jv563iwzzl75g3kllrw23c508s"; depends=[]; };
+  statmod = derive2 { name="statmod"; version="1.4.35"; sha256="1zpqnfslq5gi6hvqjqnsn5kf2m986s1yb6kvyjd881n3h67l4pny"; depends=[]; };
   statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; };
-  statnet_common = derive2 { name="statnet.common"; version="4.3.0"; sha256="0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3"; depends=[coda]; };
+  statnet_common = derive2 { name="statnet.common"; version="4.4.1"; sha256="1z89an46xcl1d7dacj4irhk6pkajdz7v85b2347vczwdf622pksf"; depends=[coda rle]; };
   statnetWeb = derive2 { name="statnetWeb"; version="0.5.6"; sha256="1haf2kr1mwvaz4hlwla2ysbcy3sbfcg3i4hyiy9y6lcffvy4w9w0"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
-  statnipokladna = derive2 { name="statnipokladna"; version="0.5.7"; sha256="0mj2dxianpd78127ggn0cml5nwwf6l26sds36qvfwbicaj7bk5jg"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; };
+  statnipokladna = derive2 { name="statnipokladna"; version="0.6.0"; sha256="01rh2ihh0cc7fnda1h3bk75n0f4939480l6d6vhl6x8nrfk4hhw4"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; };
   statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; };
   statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; };
-  stats19 = derive2 { name="stats19"; version="1.2.0"; sha256="0956s8z8qrkij52fq15ydl15zi3kg5czcx7kjcg20nmby5dqmd34"; depends=[readr sf]; };
-  statsExpressions = derive2 { name="statsExpressions"; version="0.4.2"; sha256="1nhqxw9cmzhd4bk60fgg7nklhlk6j7r7naslaj8c3wbq7xn1lldl"; depends=[broomExtra correlation dplyr effectsize ez ipmisc metafor metaplus rcompanion rlang tidyBF tidyr WRS2]; };
+  stats19 = derive2 { name="stats19"; version="1.3.0"; sha256="1h6sgbi23qq4shlbx7f4s2yk4hmwvnb1z198k02j9a3n6dbdz7r7"; depends=[readr sf]; };
+  statsExpressions = derive2 { name="statsExpressions"; version="0.6.2"; sha256="1rs86ncp1k4568rl8bxz0wzr571l6kx3f2l31a4xfhbp6mgg1fzm"; depends=[correlation dplyr effectsize ez ipmisc metafor metaplus parameters performance rcompanion rlang tidyBF tidyr WRS2]; };
   statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; };
   statsr = derive2 { name="statsr"; version="0.2.0"; sha256="0xqwg519vd06d541jl3k3d6svfd623xz1z2cnrczpm99ql20q83m"; depends=[broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tibble tidyr]; };
+  statswalesr = derive2 { name="statswalesr"; version="0.1.1"; sha256="0nawvavmi2d8ag8s6jhkdyykvrs3w5xnjrhk8rnlwcl1ms7ciw08"; depends=[curl dplyr httr jsonlite rlang]; };
   stcos = derive2 { name="stcos"; version="0.3.0"; sha256="0niy8inajs0vafbh47w5rajlp3bvgi9yakhyabjdrqhkjzs79lpx"; depends=[dplyr Matrix Rcpp RcppArmadillo sf]; };
   stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; };
   stdReg = derive2 { name="stdReg"; version="3.4.0"; sha256="003lp8yshjdql475hdpickwr0fngzn9qps1dzvx8zfy4x51xy8xl"; depends=[data_table drgee numDeriv survival]; };
@@ -14775,10 +15405,13 @@ in with self; {
   stemmatology = derive2 { name="stemmatology"; version="0.3.2"; sha256="1l2y4jlszz1dnafdl2wqqfgdjis07i3gzfnp1v1af32pvjy4zqhw"; depends=[cluster igraph xml2]; };
   stepPenal = derive2 { name="stepPenal"; version="0.2"; sha256="08gizl6c606ibbv7x2rdvfw37rghkrprwszha79yngkzpajw8gql"; depends=[caret dfoptim glmnet mvtnorm pROC]; };
   stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; };
-  stepR = derive2 { name="stepR"; version="2.1-0"; sha256="15ncr5j8bdzqfir08vpfz1cin4i3m78i6crpzwfra5fdsi49jfrk"; depends=[digest lowpassFilter R_cache Rcpp]; };
+  stepR = derive2 { name="stepR"; version="2.1-1"; sha256="0mz88d7214g59nvr40c4gf4grq9skjqqlfgydbdzmc4l315nr4zv"; depends=[digest lowpassFilter R_cache Rcpp]; };
   stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; };
   steps = derive2 { name="steps"; version="1.1.0"; sha256="1p01cmvh5rbgwaz0r73iry60jq0f8rp3z8ql57vhmnd9kyrzf53m"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; };
+  stevedata = derive2 { name="stevedata"; version="0.2.0"; sha256="0w8p4w2dr7bz3253n6an7a5dzj8wkw31qw0si3j3bb1jz64d3p97"; depends=[]; };
   stevedore = derive2 { name="stevedore"; version="0.9.3"; sha256="00zs2bl5h40rwbhnynjw2jbxlixjnk14rxn9chypqg5zgx9pqg2s"; depends=[crayon curl jsonlite yaml]; };
+  stevetemplates = derive2 { name="stevetemplates"; version="0.2.0"; sha256="1mdcjvasz385chsg27nq96621c5hiaisypf24xpy3q693r0bs0nd"; depends=[rmarkdown]; };
+  stfit = derive2 { name="stfit"; version="0.99.8"; sha256="0js09v04ik5m3d9iz9waq0yigvg2g6n75m4zm5dc0nz3yr1irb88"; depends=[abind doParallel fda foreach Matrix raster rasterVis RColorBrewer Rcpp]; };
   stickr = derive2 { name="stickr"; version="0.3.1"; sha256="0krz123vz4bdcdi4p27r637pgz4rcj6kmyiqdf5x69riddvfxx8r"; depends=[base64enc fs gh stringr]; };
   sticky = derive2 { name="sticky"; version="0.5.6.1"; sha256="1szfpay9cpdwq6v5fmnjyr00r4zhz6zd2rrl3h88v9l5xpfafi4w"; depends=[]; };
   stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; };
@@ -14787,7 +15420,7 @@ in with self; {
   stlcsb = derive2 { name="stlcsb"; version="0.1.2"; sha256="08pnj1yb4xcbhnrp2wny8lq9rvcvmsgaza07k4358csfksvmcira"; depends=[dplyr lubridate purrr readr readxl rlang rvest sf stringr tibble xml2]; };
   stlnpp = derive2 { name="stlnpp"; version="0.3.6"; sha256="1h17bnkg9lnjs1dskxid3bddj0509f8jwnwn3z5h5qfblk2yf06q"; depends=[spatstat]; };
   stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; };
-  stm = derive2 { name="stm"; version="1.3.5"; sha256="1yyfxaxqc6yq0yq68zhdnhpwpvsyp71dlmivn7zxixfmp932s6cn"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
+  stm = derive2 { name="stm"; version="1.3.6"; sha256="0qwq4nin2n9fjd06852r8k7arvcgh46kcfb3lm21swgx6j8bgrhb"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
   stmgp = derive2 { name="stmgp"; version="1.0.3"; sha256="0yg2ffvaylhxfclkixk9n1wxigasvirdzdywqg016hjg7w166bp1"; depends=[MASS]; };
   stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; };
@@ -14796,19 +15429,20 @@ in with self; {
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
   stochQN = derive2 { name="stochQN"; version="0.1.2"; sha256="1zwxw95jrpkqgbgwhwdy907v9gqmvn5as4v35a75wvy3nhawka9a"; depends=[]; };
   stochprofML = derive2 { name="stochprofML"; version="2.0.3"; sha256="0j6m2byh7w9kcbp3mfvmg6fm6z0dq8k4qabj1yfkl0d1y2ifd1zd"; depends=[MASS numDeriv]; };
-  stochvol = derive2 { name="stochvol"; version="2.0.4"; sha256="1hb2fgnyn8zxq1j74x00msq3j807y70yxx2s3fq4csrb1935vr85"; depends=[coda Rcpp RcppArmadillo]; };
+  stochvol = derive2 { name="stochvol"; version="3.0.3"; sha256="0ci8a1g5a76s8xnccy38qali5p08yhbji7ab2qhzm5h2a5fj5k07"; depends=[coda Rcpp RcppArmadillo]; };
+  stochvolTMB = derive2 { name="stochvolTMB"; version="0.1.2"; sha256="0m1b8jcrr8pxa2m9gzj7dljzr19j7n4w9i8m0p5mrb559ljbj0i0"; depends=[data_table ggplot2 RcppEigen sn TMB]; };
   stockR = derive2 { name="stockR"; version="1.0.74"; sha256="002i0bhyskwyjjczfa752ghn19hvqhdyzdfkpvci3hb66rh94x65"; depends=[gtools RColorBrewer]; };
   stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; };
   stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
   stokes = derive2 { name="stokes"; version="1.0-5"; sha256="0xbjkrm9g7r2xnj629i5cfmmqkw60iq4k6lk3skmkj3xh20lcd5x"; depends=[magrittr partitions permutations spray]; };
-  stopwords = derive2 { name="stopwords"; version="2.0"; sha256="155g00ansyqfpp1mzd2q6mn0k214xinf78nww2368h24kz761jjw"; depends=[desc ISOcodes usethis]; };
+  stopwords = derive2 { name="stopwords"; version="2.1"; sha256="1g2p8gsj7xjck7idcwczgc7fmv72lzwjw00qarrj0cv44kypmiq8"; depends=[desc ISOcodes usethis]; };
   stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.4"; sha256="1fwp5kazvx4q2yb9mjbbv36kkjli4prm7p4wihlq1pbw17q2mhrq"; depends=[dplyr ggplot2 lubridate maps plyr rlang stringr tidyr weathermetrics]; };
-  storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; };
+  storr = derive2 { name="storr"; version="1.2.5"; sha256="0qszdq16bf0dbss33zi63ciwmkgjsyc0c3akrr2kl14w3ncw6922"; depends=[digest R6]; };
   stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; };
-  stplanr = derive2 { name="stplanr"; version="0.6.2"; sha256="0cpxp5527ri55gxf7zf9k4c0qnkzjrkn2akzfdvngg3rdbhcf20g"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; };
-  stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; };
+  stplanr = derive2 { name="stplanr"; version="0.8.0"; sha256="1cx1ywddpgy5hpm7c5frs4yrizf6xw4s0pkgp87rm8n6c47m9c26"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; };
+  stpm = derive2 { name="stpm"; version="1.7.9"; sha256="0adcagngk3f8avdwyzqkjm0vzdxdv8h6jvzljm9xdapna2m40pr3"; depends=[MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stpp = derive2 { name="stpp"; version="2.0-4"; sha256="0y6k33qaqycw01288w36q82iq73nlsc2vkkaiamr3v312ja6gbxg"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; };
-  strand = derive2 { name="strand"; version="0.1.3"; sha256="1rnrrz54s16bw5ndhiw2dllzs8md263hgvf5mkx3jwm6vv5sd61x"; depends=[dplyr feather ggplot2 lubridate Matrix R6 Rglpk rlang tidyr yaml]; };
+  strand = derive2 { name="strand"; version="0.2.0"; sha256="0gd9nnbdilvk4bszg77bxilan6qpg1np7c38w1b7j5sr3r30y5in"; depends=[arrow dplyr ggplot2 lubridate Matrix R6 Rglpk rlang tibble tidyr yaml]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
   strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; };
   stratEst = derive2 { name="stratEst"; version="1.0.1"; sha256="1khbhx7mmmaxwsk5lyya9qqi6hvvi5psz1jfb5zdpmyykj09aa95"; depends=[Rcpp RcppArmadillo]; };
@@ -14821,36 +15455,37 @@ in with self; {
   stratvns = derive2 { name="stratvns"; version="1.1"; sha256="01s3p9mml04pqfd7fydkmqdk0qf5jmzz3b3q3x5vavlma6fv8nwi"; depends=[MultAlloc partitions purrr]; };
   straweib = derive2 { name="straweib"; version="1.1"; sha256="0hi59p580yg6rj72grq4jx6grv7lmpi2cimp0rbxhkjpj6i1hav9"; depends=[]; };
   stray = derive2 { name="stray"; version="0.1.1"; sha256="1pjw1bdkqsp085lrwca1psma95ncapfz8a5iampxgghydkhh3dm8"; depends=[colorspace FNN ggplot2 ks pcaPP]; };
-  stream = derive2 { name="stream"; version="1.3-2"; sha256="07fj3dzn8lhm7wkjgx2c6g2i7n6rkwl77issn14bh0v3c8a5q2hg"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
+  stream = derive2 { name="stream"; version="1.4-0"; sha256="0rn3xrsx9ysrh955k7jkjhrxsclr1iwwd7k4fsr6klshmjan9qcn"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamDepletr = derive2 { name="streamDepletr"; version="0.1.1"; sha256="0x7663xz9az8lq852923hr7chaif1iml8drb6ljg83rg55plmwir"; depends=[dplyr magrittr Rmpfr sp]; };
-  streamMOA = derive2 { name="streamMOA"; version="1.2-2"; sha256="1zm7bcdsyazqksizir5rqibgw6w1bz85gdga0ncirh2s1z0dhi79"; depends=[rJava stream]; };
+  streamMOA = derive2 { name="streamMOA"; version="1.2-3"; sha256="1rh9xplmmwg60v19c7qfjs9w0cv4n9wvcn3narqqq4ky4m7g1ask"; depends=[rJava stream]; };
   streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; };
-  streambugs = derive2 { name="streambugs"; version="1.1"; sha256="1r0fnvpmj2z34j3w2nbdvxlw9jnz8y3x1xx9ih3vxna50ldrg2z2"; depends=[deSolve]; };
-  stressaddition = derive2 { name="stressaddition"; version="3.0.1"; sha256="0d4w7vj07dqn63lim6jqcnrnml8qirsw4fq0ayj290m2c5bkw510"; depends=[drc plotrix]; };
+  streambugs = derive2 { name="streambugs"; version="1.2"; sha256="1363w0sf7lahcg3dhvl6l7hybgr71r21xbxs718a73zy5pnwm4s2"; depends=[deSolve]; };
+  stressaddition = derive2 { name="stressaddition"; version="3.1.0"; sha256="14ggy4ka9kll723jdir22g5l5xkwdckvd08gg6rxsmxryhznqd4a"; depends=[drc plotrix]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
-  strex = derive2 { name="strex"; version="1.2.0"; sha256="1vshbq83szgig93ljhnwqwdsdskayszdzwk85n1n650clriv0b85"; depends=[checkmate glue magrittr matrixStats ore processx Rcpp rlang stringi stringr tibble]; };
+  strex = derive2 { name="strex"; version="1.4.1"; sha256="0lngpf8pgvpf2d74rw9xw4bsxcg1n2dmn5zz6y492py8q674lfhh"; depends=[checkmate magrittr rlang stringi stringr]; };
   strider = derive2 { name="strider"; version="1.3"; sha256="114j0qpdyg8rrhj68zq596pgc4h7ja39n0rfxf0x9qg7imhaj1h6"; depends=[BH Rcpp]; };
   stringb = derive2 { name="stringb"; version="0.1.14"; sha256="0hhqqsc3fif14dy623h6y3gxjg8lhff9wlglkygccs5iyhdjyl12"; depends=[backports]; };
-  stringdist = derive2 { name="stringdist"; version="0.9.6"; sha256="0nb3iwpl4f3xxirns1frwvarpyrl4i5f74h8r6h80cg0a4mpdgcb"; depends=[]; };
-  stringfish = derive2 { name="stringfish"; version="0.13.3"; sha256="19qcd5xswr4fx2c4bx7vcawxg0s2k1x5b606asnnn26y35n20b8m"; depends=[Rcpp]; };
+  stringdist = derive2 { name="stringdist"; version="0.9.6.3"; sha256="06rzbgw43vzg496xca82pydf3g2rz6iw6h50ai0prbp9hbwrhvfd"; depends=[]; };
+  stringfish = derive2 { name="stringfish"; version="0.14.2"; sha256="1vaccbxr77si3siq5vy5v0crxrdqfxcl6y81s9zm58fd2p3wywwk"; depends=[Rcpp RcppParallel]; };
   stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; };
-  stringi = derive2 { name="stringi"; version="1.4.6"; sha256="1mkgxzf000zdgbbbvg2vf4md4l501n5lfksffq8vdg6pbgd6fgv3"; depends=[]; };
+  stringi = derive2 { name="stringi"; version="1.5.3"; sha256="0420f7zn5knyyvd3a3xa7059l4kadw0m67rfpivacqn9xn6iwkr2"; depends=[]; };
   stringr = derive2 { name="stringr"; version="1.4.0"; sha256="1p9ip7p87gbbg4s6d3d392svvzz2b5dqdq2c8ilgvn4s78nlsq47"; depends=[glue magrittr stringi]; };
   strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; };
   stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; };
   striprtf = derive2 { name="striprtf"; version="0.5.2"; sha256="1ra6aalalig6drsj26z9s24lmb10zssagqrvgqqi4358zbm8gwcd"; depends=[magrittr Rcpp stringr]; };
+  strm = derive2 { name="strm"; version="0.1.1"; sha256="0agl9x5g2y16aasrs4qaid0is5p602yksdwqk2xl8br4xlxdr9yx"; depends=[dplyr knitr magrittr purrr rgdal rlang rmarkdown spatialreg testthat tidyr]; };
   strucchange = derive2 { name="strucchange"; version="1.5-2"; sha256="1y022363a4pp0mnji91sjh1qiyspkh09sybqwj03r9pmwrd7q93x"; depends=[sandwich zoo]; };
   structree = derive2 { name="structree"; version="1.1.7"; sha256="178x6maghjaw9lkyjr84pq916vbq0ldh5gqia0r0vqs8k8dvna9i"; depends=[lme4 mgcv penalized]; };
   strvalidator = derive2 { name="strvalidator"; version="2.3.0"; sha256="0m1nxpvb7hbx9n00mc0ar7ay1sk8h819cmf0r0g323z23axq1kdx"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 MASS plyr scales]; };
   stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; };
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
-  stuart = derive2 { name="stuart"; version="0.9.0"; sha256="1qb6ky321mj2jrmdp7xsvmcnsqa1vhn5l5p6a95fhan3xrhk9225"; depends=[]; };
+  stuart = derive2 { name="stuart"; version="0.9.1"; sha256="1y58kxlcq4zynyb6fnpdv3ik9gza83kyaz73w033snhmj9dqihfm"; depends=[]; };
   stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; };
-  studentlife = derive2 { name="studentlife"; version="1.0.0"; sha256="1snrsaapjwvcifa91hg5xcbg7n70aqcdyyq69gg20168qg8abkws"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; };
+  studentlife = derive2 { name="studentlife"; version="1.1.0"; sha256="1xvlcwg7ckxsm5hb5ax8r3hzdqnx61ax59ini5xc5jrsmir13g67"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; };
   studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; };
   styler = derive2 { name="styler"; version="1.3.2"; sha256="1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz"; depends=[backports cli magrittr purrr R_cache rematch2 rlang rprojroot tibble withr xfun]; };
   stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; };
-  stylo = derive2 { name="stylo"; version="0.7.3"; sha256="0d5k0l6k9c82i0imf28y4wc4dpmnf0w5vr2nghf4pfd76spli411"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
+  stylo = derive2 { name="stylo"; version="0.7.4"; sha256="0vjfpz4bpdrsax7a0gsj9cwddbsayb4n5fr5xskz63lfrjg2ppcb"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
   suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
   subcopem2D = derive2 { name="subcopem2D"; version="1.3"; sha256="06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3"; depends=[]; };
   subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; };
@@ -14864,41 +15499,46 @@ in with self; {
   subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; };
   subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; };
   subscore = derive2 { name="subscore"; version="3.1"; sha256="1hb4ci62hxffz09sz0i27jfw7xn0pca87kiq6damz5zi418csa4v"; depends=[boot cocor CTT irtoys ltm sirt]; };
-  subscreen = derive2 { name="subscreen"; version="3.0.0"; sha256="1q87hshf97ipfyp7k2cdb4nk0rl1m2kl51pynlgvjxai2da8vmvv"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr purrr randomForestSRC shiny shinyjs shinyWidgets V8]; };
+  subscreen = derive2 { name="subscreen"; version="3.0.2"; sha256="0jmm6n06psi1f9pi3mdhxvfnhl3lpslv9r7sfcf9pjq9lhh7ich4"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr purrr randomForestSRC shiny shinyjs shinyWidgets]; };
   subselect = derive2 { name="subselect"; version="0.15.2"; sha256="0ggpm5bq4ncx4302855s8x1nj0afjizmi81cg6b7xc7rvpirw0fq"; depends=[corpcor ISwR MASS]; };
   subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; };
+  subtee = derive2 { name="subtee"; version="0.3-6"; sha256="08mq1y2q4zpv07iaq27dh6d6by1b5z67na0gddn54ng9x0yqgihy"; depends=[ggplot2 MASS matrixStats survival]; };
   subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
+  sudachir = derive2 { name="sudachir"; version="0.1.0"; sha256="09ry00c3yhrz8fiyxdxgj9r3x7kldsl6fv35mmi5ysc2549kbcfb"; depends=[cli dplyr glue magrittr purrr reticulate rlang tibble tidyselect]; };
   suddengains = derive2 { name="suddengains"; version="0.4.4"; sha256="160jna9imnpy91f6pa881w6wlrwy59db0nijrn1sf5ym1cmh5gz5"; depends=[dplyr forcats ggplot2 ggrepel magrittr naniar patchwork psych readr rlang scales stringr tibble tidyr]; };
   sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
   sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; };
-  sugrrants = derive2 { name="sugrrants"; version="0.2.7"; sha256="1clad4pafj3cf9ra48zf4bm6vvgb3ys7jg4m4qp5k3w4v81qdrnj"; depends=[dplyr ggplot2 gtable lubridate rlang]; };
-  sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; };
+  sugarbag = derive2 { name="sugarbag"; version="0.1.3"; sha256="05j2b9vbhpkfr3xkam9wgm0w4k8blnm1ssf9cd6l5f1y2rrqizsv"; depends=[dplyr geosphere lwgeom progress purrr rlang rmapshaper sf tibble tidyr utf8]; };
+  sugrrants = derive2 { name="sugrrants"; version="0.2.8"; sha256="08cs74afpkvjh32hlrwbl8sdsi3p0ga4ziw32r9pihs28a060fam"; depends=[dplyr ggplot2 gtable lubridate rlang]; };
+  sumFREGAT = derive2 { name="sumFREGAT"; version="1.2.0"; sha256="07vf5fyxca9vci4v5akw55f4qif8cdw5g980vbcg43vkk3q4i5h3"; depends=[GBJ Matrix seqminer]; };
   summariser = derive2 { name="summariser"; version="2.3.0"; sha256="0zliqy8dlcr2yy4ky8k68qn256xvpla8fcv7via19y40bmla37ic"; depends=[dplyr]; };
-  summarytools = derive2 { name="summarytools"; version="0.9.6"; sha256="03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; };
-  sunburstR = derive2 { name="sunburstR"; version="2.1.4"; sha256="1vnh2bylqzlp3av64x2b42ysw1s3i4jvk46wbc7231rapfl9aq41"; depends=[d3r dplyr htmltools htmlwidgets]; };
+  summarytools = derive2 { name="summarytools"; version="0.9.8"; sha256="0n7rad6bkfn9cb99wbfzbwl5qzch48r0gafhddfcqvyh4fbn2k0j"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; };
+  sunburstR = derive2 { name="sunburstR"; version="2.1.5"; sha256="133d5my4bazw5wkv31h3rsqw0d43nxw94bq2sg8c5n4bqkpsvrhm"; depends=[d3r dplyr htmltools htmlwidgets]; };
   suncalc = derive2 { name="suncalc"; version="0.5.0"; sha256="1chkl297km313m89h9mbp7vnpz188fhzz5dn8x5cjkqy0mm6c0qc"; depends=[data_table lubridate magrittr]; };
   sundialr = derive2 { name="sundialr"; version="0.1.4"; sha256="03gvcks5i8fh8x8p4zimn4xz3x8b0ai1wmjyx9zis82rdgaa0pg3"; depends=[Rcpp RcppArmadillo]; };
   supc = derive2 { name="supc"; version="0.2.2"; sha256="0b7safpg766mzi2qiwyyf9wn5pcpcb9w7dn5qb3kjalijvcqz7mp"; depends=[BH Rcpp]; };
-  supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
+  supclust = derive2 { name="supclust"; version="1.1-0"; sha256="08pdd8azvd5c7cs62dh3wp7jvcwcwcjyy73r4ki2a0pw68fhkn9y"; depends=[class rpart]; };
   supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
   superMDS = derive2 { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
   superbiclust = derive2 { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; };
-  superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; };
+  superdiag = derive2 { name="superdiag"; version="2.0"; sha256="0zfy9ain6agh276av0p66mks3rap42n8yma0dr6qbc14z3nh8w0m"; depends=[coda]; };
   superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; };
   superml = derive2 { name="superml"; version="0.5.3"; sha256="1k0hcjspv0q6wg0yarvgjs7ql7d587nijicmz3lfhpph2n3hghvb"; depends=[assertthat BH data_table Metrics R6 Rcpp RcppArmadillo]; };
-  supernova = derive2 { name="supernova"; version="2.1.1"; sha256="1vjx0mfnqksgvcgn8hfvpx8j3q8791yifdsaqjqkhc7h56r9gcc5"; depends=[magrittr stringr]; };
-  superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
+  supernova = derive2 { name="supernova"; version="2.2.3"; sha256="017dsmxk7a6szkgzmq9qfv5lzvxbkbz9dvhga5v0gmp2myiswji0"; depends=[lme4 magrittr purrr stringr vctrs]; };
+  superpc = derive2 { name="superpc"; version="1.12"; sha256="0n68qafsww00q0wx37ms3rimrlhbp085ywvv2k5vw951j4z8ivfb"; depends=[survival]; };
   supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; };
-  suppdata = derive2 { name="suppdata"; version="1.1-3"; sha256="0nckhab2f5s4kv6n96l3z7cgsa9v423vl0jhlf1pakr25x9n1x8q"; depends=[httr jsonlite rcrossref xml2]; };
-  support_BWS = derive2 { name="support.BWS"; version="0.4-1"; sha256="0lfjcwgq74zmgrzybrxj4prvdy2qjlflxsqli7kslymfc653g5qa"; depends=[]; };
+  suppdata = derive2 { name="suppdata"; version="1.1-6"; sha256="0iq3rghynqxljrw2lqp102qs3w4wizj7j8pp5rf1bki7m6y8h19k"; depends=[httr jsonlite rcrossref xml2]; };
+  support_BWS = derive2 { name="support.BWS"; version="0.4-2"; sha256="0kfl2ca8gd62k9ddiqf88c6g3a26g3mkf9kyk6bpgfck5lw7dpj8"; depends=[]; };
   support_BWS2 = derive2 { name="support.BWS2"; version="0.3-0"; sha256="0k9yvg0n4lzsq43r53r9f70hq1q3zfljjafj9ds2p3c6qzgs9chi"; depends=[]; };
   support_BWS3 = derive2 { name="support.BWS3"; version="0.2-0"; sha256="012kcvscz7m2is92r71731zc7xnp7pwyx30vivwjazrigp9bq1kl"; depends=[]; };
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
   supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; };
   supreme = derive2 { name="supreme"; version="1.1.0"; sha256="0y5kd911f7h754ppdpw94qw3r8vzz3yhyj5b99h3h96iifydlik6"; depends=[nomnoml shiny yaml]; };
-  sur = derive2 { name="sur"; version="1.0.3"; sha256="1ndk2csh1k7h1ydjq4i1vc9lghqij1z1xnqqrs0p5fj0xz1ycims"; depends=[learnr]; };
-  surbayes = derive2 { name="surbayes"; version="0.1.1"; sha256="0vkm8hfa3b7kwqasdy3v1kprr7j3pwv9cgn6bgdsswy110ly404r"; depends=[Matrix Rcpp RcppArmadillo rlist]; };
+  sur = derive2 { name="sur"; version="1.0.4"; sha256="0rp5pwx3m6nzcy73wzmxpsxp9pc7swj2w5b82m0zdxq5kv9hsjsl"; depends=[learnr]; };
+  surbayes = derive2 { name="surbayes"; version="0.1.2"; sha256="0n01g84cwq5aj4qafk1zf60ka7s9z3q2gkgzp5xw9dx5lgfh7dgb"; depends=[Matrix Rcpp RcppArmadillo rlist]; };
   sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; };
+  sureLDA = derive2 { name="sureLDA"; version="0.1.0-1"; sha256="09ls5gv9jip2pw38qw3v2ag91fgmmkq989pyr8c8j92nbwk6i3hr"; depends=[doParallel foreach glmnet MAP Matrix pROC Rcpp RcppArmadillo]; };
+  surface = derive2 { name="surface"; version="0.5"; sha256="1fw75543aa6yafldffh9cnpm6m0rif0fpcihwj56d7nfnkbslawz"; depends=[ape geiger MASS ouch]; };
   surrosurv = derive2 { name="surrosurv"; version="1.1.25"; sha256="05s1skjp1vzwai2nfw65ff4q2qhbj596lhfvzd1gdrbs39r90hxh"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; };
   surrosurvROC = derive2 { name="surrosurvROC"; version="0.1.0"; sha256="1dpqr9dqzckgvdfrb2ndxazra0lbp6db9wbjch4vig3kyz6nyw4y"; depends=[survival]; };
   surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; };
@@ -14908,37 +15548,40 @@ in with self; {
   survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
   survCurve = derive2 { name="survCurve"; version="1.0"; sha256="0zspyxzn99ljiqp1111202714rqs4vg6j2rv66qv8ilxajvdxxas"; depends=[survival]; };
   survELtest = derive2 { name="survELtest"; version="2.0.1"; sha256="03jnj88z45iw9v1628bz99608q2jwbqw6cfsvqal2jj4392fz428"; depends=[Iso nloptr plyr survival]; };
-  survHE = derive2 { name="survHE"; version="1.1"; sha256="0q8mjyms2bivxh59fgl86l3nzrgysysahfpiknqymhk32y80has6"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
+  survHE = derive2 { name="survHE"; version="1.1.1"; sha256="19qp4mmg4agidxwfyqmxd9j01zi3r4qn3z2ph4l45svjvf5bkk27"; depends=[BH dplyr flexsurv ggplot2 Rcpp RcppEigen rms rstan StanHeaders tibble xlsx]; };
   survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; };
   survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
   survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
   survMisc = derive2 { name="survMisc"; version="0.5.5"; sha256="00nvvl8gz4477ab24rd0xvfksm8msv8h021b9ld5c9cizc41n2bm"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; };
-  survParamSim = derive2 { name="survParamSim"; version="0.1.2"; sha256="06x98085phmlf9vbpx0nh6b03h42hxcv0jqlbszz65pvzalgjqfh"; depends=[dplyr forcats ggplot2 magrittr mvtnorm purrr rlang survival tibble tidyr]; };
-  survPen = derive2 { name="survPen"; version="1.5.0"; sha256="1cxjv0mf28dcv6zx0lj38gs7clkvmmd1h56jx0kmlrj9y62i6k7l"; depends=[Rcpp RcppEigen statmod]; };
+  survParamSim = derive2 { name="survParamSim"; version="0.1.4"; sha256="07imxng38r1wg9zb72cl2g7vgvawy5r0z9shqa2h6nrvjknp2ssp"; depends=[dplyr forcats ggplot2 magrittr mvtnorm purrr rlang survival tibble tidyr]; };
+  survPen = derive2 { name="survPen"; version="1.5.1"; sha256="0c1lnkl7sc1967y86g4y9an13bqiv62pxiwz496xdhbzvwliqh31"; depends=[Rcpp RcppEigen statmod]; };
   survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; };
   survRM2 = derive2 { name="survRM2"; version="1.0-3"; sha256="1x526ax39xx4zbhr6bdzphj4sljnl070vm0qh1479r1gj0vmmhif"; depends=[survival]; };
   survRM2adapt = derive2 { name="survRM2adapt"; version="1.0-1"; sha256="1r3jvjbc2sb7b00s95b3sdx4d99rmrnd573fx1n4914ydiggi9nn"; depends=[survival]; };
   survRM2perm = derive2 { name="survRM2perm"; version="0.1.0"; sha256="0js9sgslxzzs8k94k9kdmbmwp1ckk9mlr8sndk17dg24raks4zmz"; depends=[survival]; };
+  survRatio = derive2 { name="survRatio"; version="0.1"; sha256="1xrqin3q3b7r8ga4i71ci97rsm4lj5ffd0720n7s563jkpnpyb9l"; depends=[ggplot2 ggpubr gridExtra survival]; };
   survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; };
   survSens = derive2 { name="survSens"; version="0.1.0"; sha256="1s4s5l31yps93s2zdxpidkdg8kmmwj6vb3zfndmnxvc07arwhvbv"; depends=[directlabels ggplot2 survival]; };
   surveillance = derive2 { name="surveillance"; version="1.18.0"; sha256="01iy6dlkd5w9191vr3agm3fgl3vbh2yaan5rsgn0ki741gf2zdag"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
   survey = derive2 { name="survey"; version="4.0"; sha256="1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh"; depends=[lattice Matrix minqa mitools numDeriv survival]; };
   surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; };
-  surveydata = derive2 { name="surveydata"; version="0.2.5"; sha256="07k54282y69sl4z85v0in6v4f3dpk3i807n5ysyb54p6j1gy95al"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; };
+  surveydata = derive2 { name="surveydata"; version="0.2.6"; sha256="1z72l9dzdhg2r7wd284wa569f4bcnqhz6lha1lch1am7g2i3633d"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
   surveyplanning = derive2 { name="surveyplanning"; version="4.0"; sha256="19ydgcwyvkhknf4qmlw7j25skcj9a4rd6s8j5n7bdqpljl60zync"; depends=[data_table laeken]; };
-  surveysd = derive2 { name="surveysd"; version="1.2.0"; sha256="1w4cd52gdl65p16rza50n7pk2xfx3kxd1k16pr67j0pnyl7h2fqk"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; };
+  surveysd = derive2 { name="surveysd"; version="1.3.0"; sha256="0d5xjdlccqaa1h437rz5zq6a829rpz426m55jgprhfpcps1wfhbk"; depends=[data_table ggplot2 laeken Rcpp]; };
   survidm = derive2 { name="survidm"; version="1.2.0"; sha256="0dgcxhf8x1aavr4n4aqanfc23zd62dyk3h05sa04611h6n9l8j9c"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; };
-  survival = derive2 { name="survival"; version="3.2-3"; sha256="07h76r2y23w889257krlijcw4n4d7ssx92x7i5qb1xyv5gyvl3rx"; depends=[Matrix]; };
-  survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.3"; sha256="1jxlv0rcnrw4il17q632dsj1mxn71ql32cmcdhv4b7mywgcibqw5"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; };
+  survival = derive2 { name="survival"; version="3.2-7"; sha256="0ila864g5b9yhjhk3jirgdpi06sksc0axa78890dmkvyv9rwsmjk"; depends=[Matrix]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; };
+  survivalMPLdc = derive2 { name="survivalMPLdc"; version="0.1.1"; sha256="1wqlzpwm1p7nq19l3d7c93zv6fnn0b1w24kak9zwsgyhar3f5lv9"; depends=[copula matrixcalc splines2 survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
+  survivalmodels = derive2 { name="survivalmodels"; version="0.1.4"; sha256="0zphifvdpvs58f4z6nxi1w9ry480q98wvx7as7v13240gb7djvrr"; depends=[Rcpp]; };
   survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; };
   survminer = derive2 { name="survminer"; version="0.4.8"; sha256="1niysd89mxb2a6ncvzm1s6xgfvq3psba65af0whh2p56r2hwrwff"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr rlang scales survival survMisc tibble tidyr]; };
   survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; };
   survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; };
+  survxai = derive2 { name="survxai"; version="0.2.2"; sha256="09ig561754kjzpay2hy3n62zlk0bgwkjy8vnslrr428r8m1lj0qr"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; };
   sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; };
   svDialogs = derive2 { name="svDialogs"; version="1.0.0"; sha256="0xqppydfawnwk84kb5qiybwbcmv38vn4imgz01mz2pnq4xb80p97"; depends=[rstudioapi svGUI]; };
   svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
@@ -14947,42 +15590,46 @@ in with self; {
   svIDE = derive2 { name="svIDE"; version="0.9-54"; sha256="1a03xpjx22xhxfqkgcm1pmal0dlp544hvnckj0p6sy4y56hmsfik"; depends=[svMisc XML]; };
   svKomodo = derive2 { name="svKomodo"; version="0.9-63"; sha256="0x2774lhckhg8kw6plsn6dpks3b3fisb0psa03p7di7jx8vrkg5n"; depends=[svMisc]; };
   svMisc = derive2 { name="svMisc"; version="1.1.0"; sha256="01r2a73wx2sh1njky961fxabx5wgddqqjqba6vjg0f3h8r3abmn2"; depends=[]; };
-  svSocket = derive2 { name="svSocket"; version="1.0.0"; sha256="06zq5h3y0mln2gv51dk42kalf62fl6s9183zipq77r1b0yvyqv7w"; depends=[svMisc]; };
+  svSocket = derive2 { name="svSocket"; version="1.0.1"; sha256="1d4kp095r2vpdji2wji5al5ff1lzky817qh4id9fdbi1kiif97jz"; depends=[svMisc]; };
   svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; };
   svTools = derive2 { name="svTools"; version="0.9-5"; sha256="040wr8cr2p35x6pr515bprmsw8ysajx4df5f2njz3ily61xf9szi"; depends=[codetools svMisc]; };
   svUnit = derive2 { name="svUnit"; version="1.0.3"; sha256="0awz9ks0y1n98y9nq6rq65yj7y22z5q4a5w5qhkszkgc9669q1dw"; depends=[]; };
   svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; };
-  svars = derive2 { name="svars"; version="1.3.3"; sha256="1npjnxbxpidcpifgh2k6xs7drhc075cnzd7mb7wnxi9yz0v10fmr"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; };
-  svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
+  svars = derive2 { name="svars"; version="1.3.5"; sha256="0z6ii85q3bx8c6kbpz4k4apksmwnixzgn4s68d0py320il8sdaal"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; };
   svd = derive2 { name="svd"; version="0.5"; sha256="18bi42pgml9i8jflfk29ws0bfblkj3f69z9p9mkd0m8kcx4d8hnh"; depends=[]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
   svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; };
   svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.4"; sha256="1iglgwbyxf5q4716h9ba2cfmxh1qq16zwy54krnawg4580v8ydh2"; depends=[htmlwidgets]; };
-  svgViewR = derive2 { name="svgViewR"; version="1.4"; sha256="00nm2sdgil2kw6f19sy03m8452zia47bv1bkynxw3q7vck3vb3vx"; depends=[Rcpp rjson Rook]; };
+  svgViewR = derive2 { name="svgViewR"; version="1.4.1"; sha256="0xppvrfl7q3viahvwvmn498wli74ldwijapf6n432gvc4phmy7wi"; depends=[Rcpp rjson Rook]; };
   svglite = derive2 { name="svglite"; version="1.2.3.2"; sha256="00n8bg4iligl0h24v42cka417w26zmcxrr4r6k8wdal1riwhgmi5"; depends=[BH gdtools Rcpp]; };
+  svgtools = derive2 { name="svgtools"; version="1.0.0"; sha256="1d2vgczcp5q0ydhfvrq3sn6n21dr9gqh9bpiy35qbfhqvmahgwsp"; depends=[magick rsvg stringr xml2]; };
   svmpath = derive2 { name="svmpath"; version="0.970"; sha256="19b5hfqqsh072l5mbkafm5pjd6qhyj20qd2vq6zl5jjmc45r72w1"; depends=[kernlab]; };
   svmplus = derive2 { name="svmplus"; version="1.0.1"; sha256="08cfywrbaxyacqd3l75lysb23ahqbs80959iqkjbb125aafmhvni"; depends=[MASS Matrix quadprog]; };
   svrpath = derive2 { name="svrpath"; version="0.1.2"; sha256="18h40555jmqpbsnhlwkvc5fl7d0r2bgscdv8amjvhjxmx9y952a2"; depends=[quadprog svmpath]; };
-  svs = derive2 { name="svs"; version="2.0.0"; sha256="1kcrdgg0pw5ypjgl59wn66c3ipinamcnd4752hjnfrf62pkc6fgw"; depends=[gtools Matrix]; };
+  svs = derive2 { name="svs"; version="3.0.0"; sha256="1jn3dbaqpgydkwf9y7hq97nva26vvrpl9zmw2bw4ky1qgzgz1ypb"; depends=[gtools Matrix]; };
   svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
+  svyVGAM = derive2 { name="svyVGAM"; version="0.222-2"; sha256="1lr1hydxxjqc0wkppyr9km2aaq65azvx5spjkxxx1z41a1cjapah"; depends=[survey VGAM]; };
   svydiags = derive2 { name="svydiags"; version="0.3"; sha256="0xgizswdqs8cjac200sqv3ygvrnbcy74h92kgx4r6nv1fhlcljl3"; depends=[MASS Matrix survey]; };
   swCRTdesign = derive2 { name="swCRTdesign"; version="3.1"; sha256="18ln02fnxkpjqi8a36wr2qr427hxrghkhfjx0384grmdg1mmkbf5"; depends=[]; };
   swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; };
-  swagger = derive2 { name="swagger"; version="3.9.2"; sha256="13scbzv65qzxh7kfwlb2k47zgvv7fz085g5lki6zr5w6a33g45q9"; depends=[]; };
+  swag = derive2 { name="swag"; version="0.1.0"; sha256="1w6schbj5gw7278krjzkcwafz3wv7vp7cfsvy17c0i1b5g3qqkpd"; depends=[caret Rdpack]; };
+  swagger = derive2 { name="swagger"; version="3.33.1"; sha256="1ldgmy5vjzd11z5yl5a518wkw6y0l469b2zf0lp12hk19jq6k0sj"; depends=[]; };
   swamp = derive2 { name="swamp"; version="1.5.1"; sha256="1mj6cqrc19p07v051fg6ikhhbccsg2lvz7wjiakaswqqm0269843"; depends=[amap gplots impute MASS]; };
   swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; };
   swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; };
   swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; };
+  swdpwr = derive2 { name="swdpwr"; version="1.4"; sha256="0qwpkvxhkv9jf7n312jixf058h3l5hlpygr9cy6l2p148y79gcid"; depends=[]; };
   sweep = derive2 { name="sweep"; version="0.2.3"; sha256="1705mcp9p5h50ifqjjwx61z5wl5izv889nxcgdkx1i0dlcr61l2a"; depends=[broom dplyr forecast lubridate rlang tibble tidyr timetk]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.2"; sha256="0zzjvwd60w9b5ybsb72aqa42sx6al4ymr591j3zryxgpl6rms5rh"; depends=[checkmate lubridate stringr]; };
   swephR = derive2 { name="swephR"; version="0.3.0"; sha256="0fk5wih3i5vpkcc9y1n30xwc1hyqgfgnad9jkdgdx0m31pn1y9j5"; depends=[Rcpp]; };
+  swfscAirDAS = derive2 { name="swfscAirDAS"; version="0.2.1"; sha256="0z85gb9vxl0fn90axhdzdpvl00w5fxwl7hw9iv50bi1pjjbm830b"; depends=[dplyr lubridate magrittr readr rlang stringr swfscDAS swfscMisc tidyr]; };
   swfscDAS = derive2 { name="swfscDAS"; version="0.4.0"; sha256="0sjw3acf60yawmcwmql21im1q5lbn83jnblcxmj2az93abzbjqfl"; depends=[dplyr lubridate magrittr purrr readr rlang sf swfscMisc tidyr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.3"; sha256="03wzjricpgf55yfwmj4vjcvz59yxcipfp4bsjddzw65glasa9d1s"; depends=[dplyr ggplot2 ggrepel magrittr mapdata maps reshape2 rlang spatstat tibble tidyr]; };
   swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; };
   swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; };
   swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; };
-  swissdd = derive2 { name="swissdd"; version="1.0.3"; sha256="0kj466fp9i3yv8925wpy3vff8dnzdzhcjgk5ncp1vd13cxyfd38y"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; };
+  swissdd = derive2 { name="swissdd"; version="1.0.4"; sha256="19wv1vydxkd29s8ma01kgpf3p7msn00179h73qrxd7b1j9sniy97"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; };
   swissparl = derive2 { name="swissparl"; version="0.2.1"; sha256="0181ls1gw68kfz3yqf8m2nwhah87i9m164rlbycy1kxq9adi93cs"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; };
   switchcase = derive2 { name="switchcase"; version="0.1.1"; sha256="0h31nzyf7dzalgl65cw0k1fxylbmx78l45r5id2wcqdym23dv9a9"; depends=[]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
@@ -14994,8 +15641,8 @@ in with self; {
   sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.1"; sha256="1y94d6ajf0l492nrd8wsz3b6x724zcyhipasgyx65nx3sgha6yp8"; depends=[Matrix sybil]; };
   sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.1"; sha256="0j1qmf5apb6k0ga5ki7wxbbq1k8x7kv8wcnf85zcx0117fjkxfng"; depends=[MASS Matrix sybil]; };
   sylcount = derive2 { name="sylcount"; version="0.2-2"; sha256="0cncj0nszfw98i94sb3sqdzdxdqjs523kmbqxz6cvvph1s77aama"; depends=[]; };
-  syllabifyr = derive2 { name="syllabifyr"; version="0.1.0"; sha256="1pd5zjgcmpxg7xqhcljxck80pjs84ihhkr5bl4i8h2mc6xqmy1kf"; depends=[dplyr purrr stringr tibble tidyr]; };
-  sylly = derive2 { name="sylly"; version="0.1-5"; sha256="01c7mpsk32kcsjyzzv52bn8bj28lqbmyhhfa1cwhphva5c5nkqwx"; depends=[]; };
+  syllabifyr = derive2 { name="syllabifyr"; version="0.1.1"; sha256="1z61afxx2bm37hxvv1fl3x7ibhkp3h1ivl3k9prqzsaw4j592vfx"; depends=[dplyr purrr stringr tibble tidyr]; };
+  sylly = derive2 { name="sylly"; version="0.1-6"; sha256="0f03k9d15fkym14y94jb7rkh228blc76jlm7pk229b44hcbh3mmm"; depends=[]; };
   sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; };
   sym_arma = derive2 { name="sym.arma"; version="1.0"; sha256="13fhmgzd50mwlnz9m6nnn4arr4jdqf5h7dgli5lk08da9wx6cy69"; depends=[]; };
   symDMatrix = derive2 { name="symDMatrix"; version="2.1.1"; sha256="0xmpw37qkbadqp1idv8qmazdmmv0sd4fwgihg1b97hxzqhsxw0fh"; depends=[bit ff LinkedMatrix]; };
@@ -15011,53 +15658,55 @@ in with self; {
   synchrony = derive2 { name="synchrony"; version="0.3.8"; sha256="1zpxg4dkxnvafiyp0j00wig5ymj10bzfg2376x56rzpnabhg57hi"; depends=[]; };
   synfd = derive2 { name="synfd"; version="0.1.3"; sha256="1h8vfrfw00449vjbj6z4y7m5p7rxzvqjcykyxw5sb473f63gr5px"; depends=[L1pack Rdpack]; };
   synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; };
-  synoptReg = derive2 { name="synoptReg"; version="1.0.1"; sha256="16ncbxdyqyd0jrsshllv14pgdlkli1ymwjkh4sijnhzk9yhrbb28"; depends=[dplyr ggplot2 lubridate magrittr metR raster RNCEP stringr tibble tidyr]; };
+  synoptReg = derive2 { name="synoptReg"; version="1.1.0"; sha256="0sqkx0zzj2hk59bjf5ma12rqdxy2dyszybr47ii6qvsiyp63ywcr"; depends=[dplyr ggplot2 lubridate magrittr metR raster rnaturalearth rnaturalearthdata RNCEP sf stringr tibble tidyr]; };
   syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; };
   synthACS = derive2 { name="synthACS"; version="1.6.0"; sha256="0dwcx2c284fa9d0y7kpai3jpby3drriw9bxbjld8v6lz7af6d9mw"; depends=[acs data_table Rcpp]; };
+  synthesis = derive2 { name="synthesis"; version="1.2.0"; sha256="0jw10g1zrrzq2fmy2dvlfvk4sv3bhmv7czdsscqrp5ly7jkr2cca"; depends=[MASS]; };
   synthesisr = derive2 { name="synthesisr"; version="0.3.0"; sha256="0b50d5hfkscggn2f6h8wyljkar08r8cbc0a4l12f809w5hdnjc63"; depends=[stringdist]; };
-  synthpop = derive2 { name="synthpop"; version="1.5-1"; sha256="0cd9g0aa4598l3gyqpywalmkmvibhqkxhkm2qkln11rkwv12lcyv"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; };
+  synthpop = derive2 { name="synthpop"; version="1.6-0"; sha256="0yknpisl81r87afijnjz5za0j6nn135mhrbpa9dva3c0dzamnhms"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest ranger rpart]; };
   sys = derive2 { name="sys"; version="3.4"; sha256="11q4zmx62w44p1j34frwmrsp23mc7l4n354i0zyziw92yax8zy0p"; depends=[]; };
-  sysfonts = derive2 { name="sysfonts"; version="0.8.1"; sha256="1xp40hchjfif80a6jj210ghrjcvjjf66vqcssdy7a1j53nl1n994"; depends=[]; };
+  sysfonts = derive2 { name="sysfonts"; version="0.8.2"; sha256="1gapsiva0vjd2myxgm1avav6my5x00rmy2hx0qll7dm7v1isznbv"; depends=[]; };
   sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; };
   syslognet = derive2 { name="syslognet"; version="0.1.2.1"; sha256="0nwni2mn7w43pfasqa2dwy1l6r0ymlkwlsyd5q47fajdr8v1ir0q"; depends=[]; };
   systemfit = derive2 { name="systemfit"; version="1.1-24"; sha256="180ah91i98gjswpbkkdjgnc2c9rz3pl5bw035iks92nd5vl6w5wz"; depends=[car lmtest MASS Matrix sandwich]; };
-  systemfonts = derive2 { name="systemfonts"; version="0.2.3"; sha256="0wf62mfam5zlrck0wrdbyi4hi7pn5j0739rihgp8sj2cjypm2lnb"; depends=[]; };
+  systemfonts = derive2 { name="systemfonts"; version="0.3.2"; sha256="12hdvv66kkd3b4rs82blc3c4ifz2dw1048sqpkbz6vkk1zqpc53x"; depends=[cpp11]; };
   systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; };
   syt = derive2 { name="syt"; version="0.1.0"; sha256="1qagd67wznyc6sfvs22lw2lwnwap1hlpf92i0ck5aif514ysi886"; depends=[Matrix partitions]; };
-  syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; };
+  syuzhet = derive2 { name="syuzhet"; version="1.0.6"; sha256="16iccqdbw02iw82nah6kwz3gwfghi864j2y698n4b9dyc386ijzv"; depends=[dplyr dtt NLP rlang textshape tidyr zoo]; };
   tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.7"; sha256="1j06rc5s6jpz8i116m98ygc75sx6lk8jd9gw6fb8q342mbbmqh8h"; depends=[coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; };
   tTOlr = derive2 { name="tTOlr"; version="0.2"; sha256="1fk33vp6y65mls1iczjf63wzj1rl1knbdcbd4rnqqfdcqhibb3p3"; depends=[lattice latticeExtra]; };
   taRifx = derive2 { name="taRifx"; version="1.0.6.2"; sha256="05cvjsi65fvy9hg2v3fldzwn1yd2kfirl3ffg9yfajm903dk3l49"; depends=[plyr reshape2]; };
   tab = derive2 { name="tab"; version="4.1.1"; sha256="0ds8n6gncidb66in7hlqkcmil5yfsf7ihqvmls789hrm2iz9xlfm"; depends=[dplyr gee knitr MASS survey survival xtable]; };
-  taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
+  taber = derive2 { name="taber"; version="0.1.2"; sha256="0cib8fsib4q8nf18vcpailvkplf57cm8fshb09clxm3zcp8j9c17"; depends=[dplyr magrittr]; };
   tabit = derive2 { name="tabit"; version="0.2.1"; sha256="0jy95jpbzj4rgaxmm6ki9wr0cl1w13pygq3yavdccjr82mayfpvc"; depends=[]; };
-  tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; };
+  tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.4"; sha256="19yg8m264f1hjsi8b7zxjpbvlaz2jrxj2bd9nv95g52dvlysg4nk"; depends=[openxlsx]; };
   table_express = derive2 { name="table.express"; version="0.3.1"; sha256="00f5xi2dkx1h0mv8ld3ds15w30d9vgvmjrldg43z7zskprshqsxx"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; };
-  table1 = derive2 { name="table1"; version="1.2"; sha256="1ggf3qkm7zwfdn1y1mhf8ydbg41aiy26p6g9iskryrxg7hgs3ynb"; depends=[Formula htmltools knitr yaml]; };
+  table_glue = derive2 { name="table.glue"; version="0.0.2"; sha256="01yskmc604jdy6givddm0nhr9ylf7p68v2xz1p2mqylhws1lszph"; depends=[glue stringi]; };
+  table1 = derive2 { name="table1"; version="1.2.1"; sha256="0p671082fax91hcb063zvgm1r0xm82h0yb22z2y2s41wkha95y7v"; depends=[Formula htmltools knitr yaml]; };
   table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; };
   tableHTML = derive2 { name="tableHTML"; version="2.0.0"; sha256="19sa5sda4v5dr449ip9z9ah5hdph9q6vb6zbs93jn4rpkvyijny3"; depends=[htmltools jpeg magrittr png shiny webshot]; };
   tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; };
   tableone = derive2 { name="tableone"; version="0.12.0"; sha256="0pjpsdizpvqn7anyg95d4i7sf6qyqh7svp4a5gsch0r3gmpw2p3a"; depends=[e1071 gmodels labelled MASS nlme survey zoo]; };
   tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
   tablerDash = derive2 { name="tablerDash"; version="0.1.0"; sha256="1mnp6lxa7d669r325aynq1n3f35r9sy4v1fvdh4cymbf33s8mkmm"; depends=[htmltools knitr shiny]; };
-  tables = derive2 { name="tables"; version="0.9.3"; sha256="0wfn0jlyych6q2vdd2ldidbvdmizvk5vpkgpy4s97f3p42jsjmv2"; depends=[htmltools knitr]; };
+  tables = derive2 { name="tables"; version="0.9.6"; sha256="1y0gnqd2q0gn1dr2nxdlsvyl4g5jnj9y9lx18bhvhrfzb5038j5w"; depends=[htmltools knitr]; };
   tableschema_r = derive2 { name="tableschema.r"; version="1.1.1"; sha256="14cnbijxdhf7qbsiqbk8p516mfh9bgdbcg32vn5pycsp30k78b2h"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; };
-  tabr = derive2 { name="tabr"; version="0.4.3"; sha256="1vya8g0ajh0qsix9vsx0hz796gzfkck1k1kwjy41yb98sz9rbcnf"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; };
+  tablesgg = derive2 { name="tablesgg"; version="0.7-1"; sha256="0zzcml97a9q98a999sb9hjyrkickkymhsppkxhxax32yf1h5x2kr"; depends=[ggplot2 tables]; };
+  tabr = derive2 { name="tabr"; version="0.4.4"; sha256="00fnvifq8r4brygdvaawsb3yn8akiqmcd0pwbr48c1141q1n4h9j"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; };
   tabshiftr = derive2 { name="tabshiftr"; version="0.1.2"; sha256="1b5x9mmc0dcd1nl82wf45xvls685vbqz2qimhx23c4ra55kxpz8n"; depends=[checkmate crayon dplyr magrittr purrr rlang stringr testthat tibble tidyr tidyselect]; };
   tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; };
-  tabularaster = derive2 { name="tabularaster"; version="0.6.5"; sha256="1xx9y324kwyf3iw2r506wb5hpwvxj2z3i43lllqiy3d6ikz73496"; depends=[dplyr fasterize magrittr raster silicate spatstat tibble]; };
+  tabularaster = derive2 { name="tabularaster"; version="0.6.6"; sha256="1kj86h358a578c2cv7raks0fzk5kfxwbv8hrgrvq0gb07y6m4qa7"; depends=[dplyr fasterize magrittr raster silicate spatstat tibble]; };
   tabularmaps = derive2 { name="tabularmaps"; version="0.1.0"; sha256="07i76n2fpl2ma6jl3zdbay0zmmaaxrxhv1368xm2d575br42nri4"; depends=[ggforce ggplot2 purrr rlang]; };
   tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; };
   tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; };
   tabulog = derive2 { name="tabulog"; version="0.1.1"; sha256="0n6qjd7kmvxx5na71f358pw3bbwa69vh8qjkrs5mkb3izxabcq67"; depends=[yaml]; };
-  tacmagic = derive2 { name="tacmagic"; version="0.3.0"; sha256="114qxi2ks5v8p7lr2i7fn1wi5lwzw1dpvbbg515gc8yplccpxwny"; depends=[pracma R_matlab]; };
+  tacmagic = derive2 { name="tacmagic"; version="0.3.1"; sha256="1rayyavjppi5dbcmb4yb2nf85ch2li766sdllfsirb19bb3d4c2d"; depends=[pracma R_matlab]; };
   tactile = derive2 { name="tactile"; version="0.2.0"; sha256="0jjfbsadxbf9s6vzi82rw5qa6hdc8iz4jci9xpbzwrjkb90dzd08"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; };
   tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.17.0"; sha256="1mf6mzv84da7f87xy301xpb3rrjrhx1kximqi0310y291v4si13b"; depends=[broom car DescTools ggplot2 magrittr pixiedust viridis]; };
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
-  tailr = derive2 { name="tailr"; version="0.1.3"; sha256="0agm83zwj6f3bpicbn2pcwira05v2pbv0g7myc1x06jxbw1qbfwp"; depends=[foolbox glue rlang]; };
   taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; };
-  takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; };
+  takos = derive2 { name="takos"; version="0.2.0"; sha256="09w9lkqhxdb26fvrsb8n16601kqpr2smplipx3lj6cdgbyhb1hqz"; depends=[baseline broom colorRamps data_table deSolve devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; };
   tanaka = derive2 { name="tanaka"; version="0.1.3"; sha256="1x5czib9vqpxbr61if1rnlyrld6gx2zf22jz5rcagb8x3bxmd5g6"; depends=[isoband raster sf]; };
   tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; };
   tangram = derive2 { name="tangram"; version="0.7.1"; sha256="0p0hrn3jv1l00nsjqa0j9yv4982r08fwgsj01pc06vmipg87kjiy"; depends=[base64enc digest htmltools knitr magrittr R6 stringi stringr]; };
@@ -15066,32 +15715,33 @@ in with self; {
   tashu = derive2 { name="tashu"; version="0.1.0"; sha256="04xvmbcwi84zg1pqw21nmrbnkyx184wc200vl1vhmwxggq1i60np"; depends=[dplyr drat ggplot2 lubridate plyr randomForest RColorBrewer reshape2]; };
   tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; };
   tatoo = derive2 { name="tatoo"; version="1.1.1"; sha256="0w9rm6cnc1mpfyklb8njzjwph2c38niinzxiflrqjqfdp7nd8281"; depends=[assertthat colt crayon data_table magrittr openxlsx stringi withr]; };
-  tau = derive2 { name="tau"; version="0.0-21"; sha256="08wfl0pv865clpcvzmzb3rw3hl76f16n3j61fbmrzi50xf2diyx7"; depends=[]; };
+  tau = derive2 { name="tau"; version="0.0-23"; sha256="05qwvwmx631w19sxaw7jw5dgrdnj134f70l6rmfh3rpblpdy8509"; depends=[]; };
   tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; };
   taxa = derive2 { name="taxa"; version="0.3.4"; sha256="09mnszr8pdjxv680pbyp12wwvfb2iqpnqh3hmds05nisl8g5307x"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; };
   taxadb = derive2 { name="taxadb"; version="0.1.0"; sha256="0nns9jpjawla90f12gi90562llb2j0pdhwlvy62mgcg0ghr39fgr"; depends=[arkdb curl DBI dbplyr dplyr jsonlite magrittr memoise progress rappdirs readr rlang RSQLite stringi tibble]; };
-  taxize = derive2 { name="taxize"; version="0.9.97"; sha256="0f1js5jr0zxi0zmdc9sd658yl1ddnznzcsy64prvjx0cprw26lkj"; depends=[ape bold cli conditionz crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; };
-  taxizedb = derive2 { name="taxizedb"; version="0.2.0"; sha256="16cjmrjxswl2a29gq3ibjcf4zilwcymm93rvmvjjxkh9r0svgqaz"; depends=[curl DBI dbplyr dplyr hoardr magrittr readr rlang RSQLite tibble]; };
-  taxlist = derive2 { name="taxlist"; version="0.1.9"; sha256="15h8c3x1hri7dzxrm04lajh97i0wz6xvvasz1byfy2iy8mcfwrnz"; depends=[foreign stringdist taxa taxize vegdata]; };
+  taxize = derive2 { name="taxize"; version="0.9.99"; sha256="0738fzckbwkgf21vranxhcfjq487rp3kjdnz2gfvdd1dm21jfp8s"; depends=[ape bold cli conditionz crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; };
+  taxizedb = derive2 { name="taxizedb"; version="0.2.2"; sha256="005z4chlhbi5kai7yhy00r3mvvsr0y8d462z4lj7fa6vzcbbd9vw"; depends=[curl DBI dbplyr dplyr hoardr magrittr readr rlang RSQLite tibble]; };
+  taxlist = derive2 { name="taxlist"; version="0.2.0"; sha256="1x4s8b8x5jxx7h2ml06l8s7hsgr0jbqvjw4gbxkrczgg957nnrfz"; depends=[foreign stringdist taxa taxize vegdata]; };
   taxonomizr = derive2 { name="taxonomizr"; version="0.5.3"; sha256="0hxvcbyr5b3sxqy5kw1q17qx7c2q90a6x79r9bmjn6c2lnrqn83i"; depends=[data_table R_utils RSQLite]; };
   taxotools = derive2 { name="taxotools"; version="0.0.43"; sha256="0msaqkvyhb292bsv84bw55xxmxhs5nyk31ikjz229q3xhv0zmnzw"; depends=[plyr sqldf taxize wikitaxa]; };
   tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
   tbd = derive2 { name="tbd"; version="0.1.0"; sha256="1wmfy3p82gckhfsslxzapryfygmircii7x24j6ysfyx52gy8iwf5"; depends=[numDeriv]; };
   tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
   tbl2xts = derive2 { name="tbl2xts"; version="1.0.2"; sha256="0pqsrrv5qdwfrz3dd1b3idbk39gijwmm7k2xrakzdisswfxwggyd"; depends=[dplyr rlang tibble xts zoo]; };
-  tbm = derive2 { name="tbm"; version="0.3-2.1"; sha256="0srdcla6m5vlid27i793yynm3r2fg3nzr7zn6j923fcmnpdg2jcg"; depends=[basefun coneproj mboost mlt sandwich variables]; };
+  tbm = derive2 { name="tbm"; version="0.3-3"; sha256="16yqvjq6gq1k165zb9ldvdqz9wn9p6gp4y44z67iivg0klfmwmfz"; depends=[basefun coneproj mboost mlt sandwich variables]; };
   tbma = derive2 { name="tbma"; version="0.1.0"; sha256="066p3szfayyimwblghm1lipjf21xgscq1fzbzpqz16lqjpb99ni1"; depends=[data_table ranger RcppRoll zoo]; };
-  tboot = derive2 { name="tboot"; version="0.2.0"; sha256="06yliy77vi3ql7pyzr5czqa5fpqx696lqszn911snx1i32hmq6rm"; depends=[kernlab quadprog]; };
+  tboot = derive2 { name="tboot"; version="0.2.1"; sha256="0pijvs5k28ndnkyy4lwln6wlcag0pnbndg33c5djyaxhns77faz2"; depends=[kernlab quadprog]; };
   tbrf = derive2 { name="tbrf"; version="0.1.5"; sha256="1mxfvgb18a62igdh3af4m8x6fl69s25j4x7isd70w744w6jvch3h"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; };
   tcR = derive2 { name="tcR"; version="2.3.2"; sha256="0rsz6mbqjwin28p1pmal38v5jsgavbs0n362kng5zq8yg3l4z718"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
   tcensReg = derive2 { name="tcensReg"; version="0.1.7"; sha256="07wwn65c4q2ngafxhdd9vl0y1wambfy158mf38skxm295yidd05n"; depends=[maxLik Rdpack]; };
   tcftt = derive2 { name="tcftt"; version="0.1.0"; sha256="0p5ln0sl0fasdn49252g4lvwgwajgl7lh33a4r073ib54hxbj7bk"; depends=[]; };
-  tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; };
+  tcgsaseq = derive2 { name="tcgsaseq"; version="2.0.5"; sha256="1hfs3ppva7hi6h7965jfpgjp76ygaibmymkhxihrs8ag2pxp4skv"; depends=[CompQuadForm ggplot2 GSA KernSmooth pbapply statmod]; };
   tcl = derive2 { name="tcl"; version="0.1.0"; sha256="1ssqx50ii6j2y5n2nxn5ndp20nrjss0xf0fqp8aiwlgnm3d1zggn"; depends=[eRm lattice MASS Matrix numDeriv]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
-  tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; };
+  tclust = derive2 { name="tclust"; version="1.4-2"; sha256="1nb5iky4kc832627jf28lzj19wrvgwg5da6fyl3kyf0npmyx1p4m"; depends=[]; };
   tcpl = derive2 { name="tcpl"; version="2.0.2"; sha256="0xic4jy8ldawmkvvwckiyy57ai5wif9yn7hyfndbxr6mvjl3rbbc"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; };
   tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; };
+  tdaunif = derive2 { name="tdaunif"; version="0.1.0"; sha256="0a24lqiimp54fmj4zi7bakxral8ny60n25h9arwl6m00c7cn98pl"; depends=[]; };
   tdigest = derive2 { name="tdigest"; version="0.3.0"; sha256="17axsir4xig3vm3sc2gziy9n0p80b14vg52nwys23bzkfp0n63bm"; depends=[magrittr]; };
   tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; };
   tdsc = derive2 { name="tdsc"; version="1.0.3"; sha256="1h46cflxj27i9bkl7iqxn7kzccl9b8r3fa9f5ska3a9p57algfyv"; depends=[data_table moments]; };
@@ -15114,20 +15764,20 @@ in with self; {
   tempoR = derive2 { name="tempoR"; version="1.0.4.4"; sha256="0gn16j496833pvbjaf6wx26z9ilwssjp947mcyk6n2jb33x93rr2"; depends=[doParallel foreach pls]; };
   tenispolaR = derive2 { name="tenispolaR"; version="0.1.4"; sha256="0xpp1hi3xnkg55aixgy2bp5476i503h8gsiss9x7f15274kx0d7s"; depends=[stringr]; };
   tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
-  tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; };
+  tensorA = derive2 { name="tensorA"; version="0.36.2"; sha256="19wwh654qlja4z1n7afjpzsrrm53p8ddysa2vra5mdnkddb4g2cf"; depends=[]; };
   tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; };
-  tensorBSS = derive2 { name="tensorBSS"; version="0.3.6"; sha256="1ja4h5x1i4rqgq9k15zjy524ki2z2636fg0jcp352jzj87wl3443"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; };
+  tensorBSS = derive2 { name="tensorBSS"; version="0.3.7"; sha256="14c2c551k3x3lwjh4gf0pqqhjfb8v3f6chzq9kgjqrmy76ax185w"; depends=[fICA ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; };
   tensorflow = derive2 { name="tensorflow"; version="2.2.0"; sha256="0dz47npinbz198h1ps4wap7x9dvw2vrgiw867wj1h3xkjs2dfv5m"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
-  tensorordinal = derive2 { name="tensorordinal"; version="0.1.0"; sha256="0c54ppnxgmr7m9a3dr1a9i3z2vh5nnqp361lhaf081iib8shrxxv"; depends=[MASS pracma rTensor]; };
+  tensorordinal = derive2 { name="tensorordinal"; version="0.2.0"; sha256="03xnwq6v5vcvgxd9acsqplbh1qr261yc0hybfkzss4rfns0lc85l"; depends=[MASS pracma rTensor]; };
   tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; };
-  tensorregress = derive2 { name="tensorregress"; version="2.0"; sha256="0whw57rj2jfh4wh30lv7n05ddymzsnxv6137f03s8aa9dh89fiqy"; depends=[MASS pracma speedglm]; };
-  tensorsparse = derive2 { name="tensorsparse"; version="2.0"; sha256="0midaw95q2gmk7hdlh6zdbm8nx0lm9m3y5liq6xrb3ajlq76ncqw"; depends=[fields glmnet HDCI mvtnorm RColorBrewer reshape rgl viridis]; };
+  tensorregress = derive2 { name="tensorregress"; version="3.0"; sha256="1dlxdc5jgfqzs6jzgirxqdigmcr3yr20ikbvd2c9b3y41cpsl11d"; depends=[MASS pracma speedglm]; };
+  tensorsparse = derive2 { name="tensorsparse"; version="3.0"; sha256="0xx003nh5bi87cbsqb7ikpcs4yhjhphh7pybzzas44qkwbn4fn1k"; depends=[]; };
   tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; };
-  tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
+  tergm = derive2 { name="tergm"; version="3.7.0"; sha256="1prmqrns5cikx3w25rki7v08qs0zysplqz65ixzi54d6pmhb3lmg"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
   tergmLite = derive2 { name="tergmLite"; version="2.2.1"; sha256="1fi379vginmgry4yhzd43lzrkn6vh44hrfcgdzgyxrf16rj0v617"; depends=[ergm network Rcpp statnet_common tergm]; };
-  term = derive2 { name="term"; version="0.2.0"; sha256="1a9208nzapa9av24hhpcl8mkxky8ynh0n7fvxg331r0pmw8h6aql"; depends=[chk extras lifecycle rlang universals vctrs]; };
+  term = derive2 { name="term"; version="0.3.0"; sha256="1sbnx9bwrz27bmni44blpkh1qb7nhh5brj71g8xy4yxh47yzsw9f"; depends=[chk extras lifecycle purrr rlang universals vctrs]; };
   ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; };
-  terra = derive2 { name="terra"; version="0.8-6"; sha256="1ndh95ln0k82n7mnxw7nak9id23ia2vakxdw98ggkp460safi4a6"; depends=[raster Rcpp]; };
+  terra = derive2 { name="terra"; version="0.9-11"; sha256="0pkm09by7l8wlpgxzx6qj3jj2d2pmcdj1bl46f4f7459ydl3d51r"; depends=[raster Rcpp]; };
   terrainmeshr = derive2 { name="terrainmeshr"; version="0.1.0"; sha256="1xab6wzq2izzdvsss1rlgp5m3cn45naxhymq6cglipj0fd792jbr"; depends=[Rcpp]; };
   tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; };
   test2norm = derive2 { name="test2norm"; version="0.1.1"; sha256="11by5a1j6613akxj1nc16r07jfwxr1izkpvymr9yycnddiqyp42c"; depends=[mfp]; };
@@ -15138,18 +15788,20 @@ in with self; {
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
   testextra = derive2 { name="testextra"; version="0.1.0.1"; sha256="166lg012hgk5n4zp92dagx01bjhpkjgc5i40x9fc9nfjby0wrc0s"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
-  testit = derive2 { name="testit"; version="0.11"; sha256="13iq4p8xzng88miizf04yv6z8vk7zhg1c8kd2h6swcmhqzq29yqj"; depends=[]; };
-  testthat = derive2 { name="testthat"; version="2.3.2"; sha256="0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; };
+  testit = derive2 { name="testit"; version="0.12"; sha256="12af6n3bbqnsxmsr1qyjdhypn062n3mxaikrd9dqm9p7y09gkkcs"; depends=[]; };
+  testthat = derive2 { name="testthat"; version="3.0.1"; sha256="1l1s4jgmgbsf711ma5i58ssgkz98an7hijcxvwfz314nf5fc8zr9"; depends=[brio callr cli crayon desc digest ellipsis evaluate jsonlite lifecycle magrittr pkgload praise processx ps R6 rlang waldo withr]; };
   testthis = derive2 { name="testthis"; version="1.1.1"; sha256="0csragn695698dpkr9d3md0g81bzpy5mybd0jik669q9cs8sdzh2"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; };
+  testtwice = derive2 { name="testtwice"; version="1.0.3"; sha256="06fr13ww2wqk753p0cnl1ldn3nqrvdfnz0lgkpldcn0xwiwjh2x2"; depends=[mvtnorm]; };
   tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; };
-  texPreview = derive2 { name="texPreview"; version="1.4.4"; sha256="1a80ld5j7419nqxvg1nq0kiv7ls262n6bk6pkj3cyqjq6z2y01j0"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; };
-  texmex = derive2 { name="texmex"; version="2.4.7"; sha256="1lx916lan9cd3gb6sahx5vyppflb08zslh1877c2d39q16dwshg7"; depends=[ggplot2 mvtnorm Rcpp]; };
+  texPreview = derive2 { name="texPreview"; version="1.5"; sha256="11njmn29qq50iff30in9i0yfi6ypnpqsx3317smr9fiw3hgda3c5"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; };
+  texmex = derive2 { name="texmex"; version="2.4.8"; sha256="115x7j2kvifzsrmh8zy6xymm1p01sxk4c26zdmi0p51bsgvs46ih"; depends=[ggplot2 mvtnorm Rcpp]; };
   texreg = derive2 { name="texreg"; version="1.37.5"; sha256="0cb3kvxfi9k9g958fkb73cgqdxx3h9bz2cnaakic4wgrkv27mk2c"; depends=[httr]; };
-  text_alignment = derive2 { name="text.alignment"; version="0.1.1"; sha256="0gf4rpk6l77v9fl7pbmyzq1jmb9kmzzdrpr8bsq05n9vv5lhaqqf"; depends=[Rcpp]; };
+  text = derive2 { name="text"; version="0.9.10"; sha256="1ramsv2pbg57yyxp5qjkls82gl5icda6f5116hr0w5s0w3jpajmj"; depends=[cowplot dplyr furrr future ggplot2 ggrepel magrittr parsnip purrr recipes reticulate rlang rsample stringr tibble tidyr tokenizers tune workflows yardstick]; };
+  text_alignment = derive2 { name="text.alignment"; version="0.1.2"; sha256="0qjnzdm7savn2jqmm23cd3rszyihnhb5rfnygc36ccfd15vav79j"; depends=[Rcpp]; };
   text2speech = derive2 { name="text2speech"; version="0.2.13"; sha256="0c0h4yfp1gzaf4snav84iy5m0fx8az0pw1h2s33239dxkwcff893"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; };
   text2vec = derive2 { name="text2vec"; version="0.6"; sha256="0r75cv77x2zm1z66s95hic71dpbqmybz39n48q6mz7gfd3m7312y"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; };
   textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
-  textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; };
+  textcat = derive2 { name="textcat"; version="1.0-7"; sha256="1m31alkzy13acgf4ahnzpbyazflhpmry369vqdvn5f86wcsls833"; depends=[slam tau]; };
   textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
   textdata = derive2 { name="textdata"; version="0.4.1"; sha256="096gafbbh48yz4zbakv91cfd75kv8dg4p361s50rfqqjz57192fx"; depends=[fs rappdirs readr tibble]; };
   texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; };
@@ -15159,17 +15811,19 @@ in with self; {
   textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; };
   textmineR = derive2 { name="textmineR"; version="3.0.4"; sha256="1388blqxziqzjipys6icdifnnzgxvm0w3yr9jihl32ldd701rvvw"; depends=[gtools magrittr Matrix Rcpp RcppArmadillo RcppProgress RSpectra stopwords stringr text2vec]; };
   textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
-  textplot = derive2 { name="textplot"; version="0.1.3"; sha256="1nvc92b688pdm4fvvl56pd9liiql68nrsl136jj60q3yi9kpl21d"; depends=[data_table lattice Matrix]; };
-  textrank = derive2 { name="textrank"; version="0.3.0"; sha256="1sjzllz3ixxr043hbmbvwkwvj5wzh3m08x9z7h6hvy8ld8nzmn74"; depends=[data_table digest igraph]; };
+  textplot = derive2 { name="textplot"; version="0.1.4"; sha256="1sgkndy2cxk8c76h8hwajn6f78w5jj2n8vsmaxh9kj931crzn8cy"; depends=[data_table lattice Matrix]; };
+  textrank = derive2 { name="textrank"; version="0.3.1"; sha256="0a777wchiax0y8jprvz5xw8h1xh7yvad0wrqhkgbqy5p3cvlcih6"; depends=[data_table digest igraph]; };
   textreadr = derive2 { name="textreadr"; version="1.0.2"; sha256="0rcdgcgdn1lnnpjkvcsyfwcbpdlhcx35sbr8zlyapgmfglbnpjg3"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; };
-  textrecipes = derive2 { name="textrecipes"; version="0.3.0"; sha256="0acgrh8smf2fcj43cj5x3qy493wwhn10cfsssrba3grcg62kir2x"; depends=[dplyr generics magrittr Matrix purrr Rcpp recipes rlang SnowballC stringr tibble tidyr tokenizers vctrs]; };
+  textrecipes = derive2 { name="textrecipes"; version="0.4.0"; sha256="1krza6ym69xjj1zix4lb5d31lnik5pi43ycyvx2invhr9yqwyjd0"; depends=[dplyr generics magrittr Matrix purrr Rcpp recipes rlang SnowballC stringr tibble tidyr tokenizers vctrs]; };
   textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.5"; sha256="1mva0f6pk0kpfw0vf90qw3a25f1i3imdhk2s7hxyzans0z2237jd"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tibble tidyr]; };
   textshape = derive2 { name="textshape"; version="1.7.1"; sha256="02111kj3kka84mpx7s19bjna9cas8diw5fxz51v5ggz0ldswa5pa"; depends=[data_table slam stringi]; };
+  textshaping = derive2 { name="textshaping"; version="0.2.1"; sha256="0fv291fc97s0wjdzn126sbi7vcsp3yl0b501n2xlkgh5ijraxpq8"; depends=[cpp11 systemfonts]; };
   textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; };
   textutils = derive2 { name="textutils"; version="0.2-0"; sha256="06w0d12l7g4z3m278x5ap0jxm2y1h6ssj4igfcxk7j8k5hy89l80"; depends=[]; };
   tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; };
   tfaddons = derive2 { name="tfaddons"; version="0.10.0"; sha256="16adig97qmafval6i29pqdinsgbwjz2isajxdx1xvbf1mrawkmz0"; depends=[keras purrr reticulate rstudioapi tensorflow]; };
+  tfarima = derive2 { name="tfarima"; version="0.1.1"; sha256="1hj8xablhmq7mhwx5xj6m8m5zl53big1cp08x808180ihif2zhlk"; depends=[numDeriv Rcpp RcppArmadillo zoo]; };
   tfautograph = derive2 { name="tfautograph"; version="0.2.0"; sha256="1jpimmlsihr78v56v9mp51grmvwa198a1inahihk3yj02wzfqizj"; depends=[reticulate tensorflow]; };
   tfdatasets = derive2 { name="tfdatasets"; version="2.2.0"; sha256="0d85fdji2ip0h76vhax9z910vib2nilmpjk9y9525f4hc0bm7kss"; depends=[generics magrittr reticulate rlang tensorflow tfestimators tidyselect]; };
   tfdeploy = derive2 { name="tfdeploy"; version="0.6.1"; sha256="1vbxyvmzaafbwp1pmvzn16zyl4nz85787m79gn7iazh9zw9f7j34"; depends=[httpuv httr jsonlite magrittr reticulate swagger tensorflow]; };
@@ -15185,87 +15839,93 @@ in with self; {
   tfse = derive2 { name="tfse"; version="0.5.0"; sha256="05q75xsiy955xwgchagk7l7725y6mylp5lj5284xm7y2xh197zp3"; depends=[dapr magrittr]; };
   tgcd = derive2 { name="tgcd"; version="2.5"; sha256="1zsmard9vai0m4gz5mf5b9qqv6i7h5xhv1mbs2sc0kcznk28jirn"; depends=[]; };
   tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; };
-  tgp = derive2 { name="tgp"; version="2.4-14"; sha256="1l3kssjkh5sbrh75qdpmynjfnidgz8vmzq1jml1qm1yfwval8ak1"; depends=[maptree]; };
+  tgp = derive2 { name="tgp"; version="2.4-17"; sha256="0hl9nv2nayhq9jiy6lrgn702lb95allqiq8v221rj9pzxpc1230c"; depends=[maptree]; };
   tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; depends=[zoo]; };
+  tgstat = derive2 { name="tgstat"; version="2.3.16"; sha256="12apvcpdwfng0sp2v80xvpk7ynbadi2lvbfk14hlcsvw8h3rb268"; depends=[]; };
   thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; };
   thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; };
-  theiaR = derive2 { name="theiaR"; version="0.3.0"; sha256="0z3i6dgf2mv954llb6vk6g09gdk1hi0fjygk09jp8p9cygn7r941"; depends=[askpass httr R6 raster XML]; };
+  theiaR = derive2 { name="theiaR"; version="0.4.0"; sha256="07m532r67cil2ya2w9lfhycrm8n0ga0r3x7jwbp5jbd83hw4l1p6"; depends=[askpass httr R6 raster XML]; };
   themetagenomics = derive2 { name="themetagenomics"; version="1.0.2"; sha256="14i81cd9cyzhi3j2d9ygwlairkimhx8ffvva3pg3xwwvpywb6mla"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; };
-  themis = derive2 { name="themis"; version="0.1.2"; sha256="00yl9dbngbzpsqds28ffxyvaw25yvbdrrdsylrzxhjmj7fd2p49i"; depends=[dplyr generics purrr RANN recipes rlang ROSE tibble unbalanced withr]; };
+  themis = derive2 { name="themis"; version="0.1.3"; sha256="0vs5jraw0xsby0rkl474iliqa2hc9pgmgr7isygmmh455zrl4gsq"; depends=[dplyr generics purrr RANN recipes rlang ROSE tibble unbalanced withr]; };
   thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
   thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; };
   thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; };
   thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; };
   thinkr = derive2 { name="thinkr"; version="0.15"; sha256="17mfw067advk8vxlz8x0w0vww3718zp2fcs00sca8ivlh8yh9fcg"; depends=[assertthat crayon devtools dplyr ggplot2 lazyeval lubridate magrittr officer purrr readr rvg stringi stringr tidyr]; };
+  this_path = derive2 { name="this.path"; version="0.2.1"; sha256="002x6c351x4jzr2mw6idd4qczsx073flkv3h9zk04cqwr2n08p5a"; depends=[]; };
   thor = derive2 { name="thor"; version="1.1.2"; sha256="0r4kgzbydjb7z0j808g5zdkx5wmbqncqg453bqm4ylafpj5z79kv"; depends=[R6 storr]; };
+  thorn = derive2 { name="thorn"; version="0.2.0"; sha256="0sybjqwv9al5khkhhc7khbgr7n2vy6aggarh9n75mxpa8hn7j2qr"; depends=[htmlwidgets]; };
   threeBrain = derive2 { name="threeBrain"; version="0.1.8"; sha256="0finv8hk2nj1d0h7hb51vpfjnrr7xyxnilnj8hsxl60nbf1a9byg"; depends=[base64enc crayon digest dipsaus freesurferformats gifti htmltools htmlwidgets jsonlite oro_nifti R6 shiny stringr]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
   threejs = derive2 { name="threejs"; version="0.3.3"; sha256="1711h351nzxfkbbdwvfzyhciyvi9c6wx3jq1g97lzcqgnb45kivn"; depends=[base64enc crosstalk htmlwidgets igraph]; };
+  threesixtygiving = derive2 { name="threesixtygiving"; version="0.2.2"; sha256="0fnysgyq4gf23vqxwnzwb3f1cv1v1b2cb6z0kywb17mr57cbg7pv"; depends=[anytime curl dplyr httr janitor jsonlite purrr readr readxl tibble tidyr tidyselect]; };
   threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; };
   threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; };
   thregI = derive2 { name="thregI"; version="1.0.4"; sha256="0zddd32fnfi98zwq08akkvhkg3c66sj3jii6ap8p1m9a0wg2k2k3"; depends=[Formula survival]; };
-  threshr = derive2 { name="threshr"; version="1.0.1"; sha256="1v9aba5w1lrjy2ngx9kc2ih8sd4dhq45j8y6vn4mbs3y8f5dvhr0"; depends=[revdbayes rust]; };
+  threshr = derive2 { name="threshr"; version="1.0.3"; sha256="1vs2jfvh1pjzyfz1s4w92sw13yz2nhc28gc3iyqz8a82rrdm4mdq"; depends=[revdbayes rust]; };
   thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; };
   thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
   thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.11.1"; sha256="18xasg21w4sd32nhhs138fk70z9kpyv1l3jsrzzav2zwfb7246fk"; depends=[BH dplyr knitr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr]; };
-  tibble = derive2 { name="tibble"; version="3.0.3"; sha256="0f4yi87w6509lnaz1lhk9s8nm3bzx21ij3273s0zx7vpbp0qlxxz"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; };
+  tibble = derive2 { name="tibble"; version="3.0.4"; sha256="189yyl27mnswk1z51xw6gj3lyxgy6m332jq8xyvwskff57w2w692"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; };
   tibbletime = derive2 { name="tibbletime"; version="0.1.6"; sha256="0pfph4pyjxkxrir5ca1sh7xz07dylqnq40w0qyqiyaj5s23mbbmb"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs zoo]; };
+  tibblify = derive2 { name="tibblify"; version="0.1.0"; sha256="0mdi9x36nrlcbchl7b2rlf4j1k0y6c7657aznm7xa0396ciij5fk"; depends=[crayon purrr rlang tibble vctrs]; };
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
-  tidyBF = derive2 { name="tidyBF"; version="0.2.1"; sha256="1dp8v2dlskvr73c033h0ckrpfj7gav6l4rak29rmmzfn8pc1l5rj"; depends=[BayesFactor dplyr ipmisc metaBMA rlang tidyr]; };
-  tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.1.4"; sha256="16s3swxwf3yxqk1f6jzzdfbb03i0d7b83gnsrbyrni3c68pg2h5k"; depends=[circlize ComplexHeatmap dplyr lifecycle magrittr purrr RColorBrewer rlang tidyr viridis]; };
+  tidyBF = derive2 { name="tidyBF"; version="0.4.2"; sha256="1j5q9yd4bzbda75bs2hkgm9vnr697kb73gz5wq5i0hjsi3xr9z1a"; depends=[BayesFactor dplyr effectsize insight ipmisc metaBMA parameters performance rlang tidyr]; };
+  tidyCpp = derive2 { name="tidyCpp"; version="0.0.2"; sha256="178k2m0y5gv78l47x89ibra8gx81idmsi0fwn7rd3djna5fqld7l"; depends=[]; };
+  tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.1.5"; sha256="0knxhvccw7svnm63kahind7b0f00ri8qpriq5lk8g9nyhivzk55z"; depends=[circlize ComplexHeatmap dplyr lifecycle magrittr purrr RColorBrewer rlang tidyr viridis]; };
   tidyLPA = derive2 { name="tidyLPA"; version="1.0.8"; sha256="0jrvd92q20kzz83lid9vvdh0l3l1kbc4m77cim261gzra1p7w5y0"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; };
-  tidyMicro = derive2 { name="tidyMicro"; version="1.43"; sha256="1y399khg85979lh9s528y5qab711qybd1vfw5kvyy7253ikmcb3p"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; };
+  tidyMicro = derive2 { name="tidyMicro"; version="1.47"; sha256="02pc6rh0l7xdrqhihi53zp17x0walc0mpm70spm7yrwzkbc486lv"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; };
   tidyREDCap = derive2 { name="tidyREDCap"; version="0.2.0"; sha256="03kx91avw6zbmrcxvhkb7i3syw3ajkv9ypvgn2iq3ki887vbiwzw"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; };
-  tidyRSS = derive2 { name="tidyRSS"; version="2.0.2"; sha256="1w2nb1vngsgjv486w886r890zb85nhsjm9qy398kj5qyvh8gfr42"; depends=[anytime dplyr glue httr jsonlite magrittr purrr rlang tibble vctrs xml2]; };
-  tidySEM = derive2 { name="tidySEM"; version="0.1.2"; sha256="1f66lc65905v88bdg95mwq5qp6367j0xik1rbfdw1s321cr6yvj1"; depends=[ggplot2 igraph lavaan MplusAutomation psych]; };
-  tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.9"; sha256="01h3bm7vfx8df7c6b83fd94f7i7d2i7w986sjfj78bl8pxs0k6gf"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; };
-  tidybayes = derive2 { name="tidybayes"; version="2.1.1"; sha256="0wz7hf7a2c2x67rnlil4sqxzmiwy2rw2jma2hpwg025mnpasny3i"; depends=[arrayhelpers coda dplyr forcats ggdist ggplot2 HDInterval magrittr plyr purrr rlang scales tibble tidyr tidyselect]; };
+  tidyRSS = derive2 { name="tidyRSS"; version="2.0.3"; sha256="0jyaa4b92cwf1vgrpy6ixq1jq46im8mr63z7ncjyx59j88v4pn84"; depends=[anytime dplyr glue httr jsonlite magrittr purrr rlang tibble tidyselect vctrs xml2]; };
+  tidySEM = derive2 { name="tidySEM"; version="0.1.3"; sha256="0kh8hwskb5nw46cg5ia3m18a137g0gvgrmw30sfmvzjikq1air4p"; depends=[ggplot2 igraph lavaan MplusAutomation psych]; };
+  tidyUSDA = derive2 { name="tidyUSDA"; version="0.3.0"; sha256="1wy329wy9spzm9zpgbv4h2qgk1cqp3471yknky5sfxsklmdjhdn8"; depends=[brio crayon curl diffobj dplyr fuzzyjoin ggplot2 gitcreds httr jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis waldo]; };
+  tidybayes = derive2 { name="tidybayes"; version="2.3.1"; sha256="055146k63b0dgkj6s6d9rwmdszxnjs4l6l4chavip9zwhrjsl93y"; depends=[arrayhelpers coda dplyr forcats ggdist ggplot2 magrittr plyr purrr rlang tibble tidyr tidyselect]; };
   tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; };
   tidycat = derive2 { name="tidycat"; version="0.1.1"; sha256="04binzg0wijs173y8fr856935vdl80pid5d0zknb34fdaqa07kfh"; depends=[dplyr forcats magrittr stringr tibble tidyr]; };
-  tidycensus = derive2 { name="tidycensus"; version="0.9.9.5"; sha256="1dv57daiy9139dicj738am58k2dg66x0vphkfz1vfryqc57l1px6"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
+  tidycensus = derive2 { name="tidycensus"; version="0.11"; sha256="0hyx3zbi785mygqsq6zk38bf5x04i3rxjr1gsbnmsqc7v56blbys"; depends=[dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tigris units xml2]; };
   tidycode = derive2 { name="tidycode"; version="0.1.1"; sha256="0ahjhn1ar93xnd1snxnivdl43d1b6ica0pc30rgh8jpha87zbsay"; depends=[glue matahari pryr purrr rlang tibble]; };
   tidycomm = derive2 { name="tidycomm"; version="0.1.0"; sha256="0xas6nr7fy612r0b5h8ncvirxhzy099zvhdzxbnskm3sa21046ni"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; };
-  tidycwl = derive2 { name="tidycwl"; version="1.0.4"; sha256="1f3lrdl73lx0a0y6kz33i6s8nkcwdjdmc6mvnkqp3n8r851q46lg"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; };
+  tidycwl = derive2 { name="tidycwl"; version="1.0.5"; sha256="1ii23iamqmplsmnjnr6x9a1wjrbk82r0ywbskfifv26i66wyjqc3"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; };
   tidydice = derive2 { name="tidydice"; version="0.0.6"; sha256="1g0x426gri1s0fyn2srl7ni0zvrnx1wvg5zcr19fxgdw9m8rxxp2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; };
   tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; };
-  tidyfst = derive2 { name="tidyfst"; version="0.9.8"; sha256="1j5lwvd14jkg3dk4kajiq1sacdddmgj390q8118sh5gim8h2s5dq"; depends=[data_table fst stringr]; };
+  tidyfst = derive2 { name="tidyfst"; version="0.9.9"; sha256="1f90wld3nxnr8jyjl7l1agk2m2sbzw70mybax56z99zz28i87bba"; depends=[data_table fst stringr]; };
   tidyft = derive2 { name="tidyft"; version="0.4.5"; sha256="0l6ixaqj356q319ms0bf655f530cgiia9saqdx9lryaf0b6i2hxb"; depends=[data_table fst stringr]; };
   tidygapminder = derive2 { name="tidygapminder"; version="0.1.1"; sha256="1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d"; depends=[data_table dplyr readxl tidyr]; };
-  tidygate = derive2 { name="tidygate"; version="0.2.7"; sha256="1djslp2080sc2fagmgw4z0qaxz46n0a9rc22h4xrfc2660369dj1"; depends=[dplyr gatepoints lifecycle lme4 magrittr purrr RColorBrewer rlang scales stringr tibble tidyr tidyselect viridis]; };
+  tidygate = derive2 { name="tidygate"; version="0.3.2"; sha256="171mp31ac12j8i97rkl8wa35gaj22d926cibybq21kswf2904nf4"; depends=[dplyr gatepoints lifecycle lme4 magrittr purrr RColorBrewer rlang scales stringr tibble tidyr tidyselect viridis]; };
   tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; };
   tidygeoRSS = derive2 { name="tidygeoRSS"; version="0.0.1"; sha256="0bppkwbxmm8ps1cnrhzxkzm2pbi3s5bfiwx8fcrp31x81jl61w1x"; depends=[anytime dplyr httr jsonlite magrittr purrr rlang sf strex stringr tidyRSS xml2]; };
   tidygeocoder = derive2 { name="tidygeocoder"; version="1.0.1"; sha256="1djf7j3nzq6z2nnxxg9r495bx8sa7a1hd8bgkd7fw5pad8f83b7d"; depends=[dplyr httr jsonlite tibble]; };
   tidygraph = derive2 { name="tidygraph"; version="1.2.0"; sha256="17qjns33zcj82jcsl7bn7i4zxcm7ric50zyf7agi0i01zi16qz85"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; };
-  tidyhydat = derive2 { name="tidyhydat"; version="0.5.0"; sha256="0bf8rnk0yhdjjs79d4s833z9j165cwvg3xdmqg3kc5yzc31m4hsg"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; };
+  tidyhydat = derive2 { name="tidyhydat"; version="0.5.2"; sha256="0yrd4x17918v8nkm1y9r334b0kvrklj313w8sjcx6402435nvmwj"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; };
   tidyjson = derive2 { name="tidyjson"; version="0.3.1"; sha256="1rx5ncp20j9mhcziyqb0vgfq9061qylgvfwz27dsyz58r8fygwnq"; depends=[assertthat dplyr jsonlite magrittr purrr rlang tibble tidyr]; };
   tidylo = derive2 { name="tidylo"; version="0.1.0"; sha256="135aw7zqgxz7l3zgskhzy72lgm1xwl50566s0s45dq7h6ah0vi5d"; depends=[dplyr rlang]; };
   tidylog = derive2 { name="tidylog"; version="1.0.2"; sha256="076am30ayc16wm3bilznxqzd5806yi7dx5m9yv4w7q90i7imsqk7"; depends=[clisymbols dplyr glue tidyr]; };
-  tidymodels = derive2 { name="tidymodels"; version="0.1.1"; sha256="0w2xnr642klmqlflkw6rkvqcrgs01i8f34nk9wdax3fsl1yx2wi4"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr modeldata parsnip purrr recipes rlang rsample rstudioapi tibble tidyr tune workflows yardstick]; };
+  tidymodels = derive2 { name="tidymodels"; version="0.1.2"; sha256="09njrl655sh82xrzckgg56a6ndfrjla5fy8675wj4jsj14jpv0fw"; depends=[broom cli dials dplyr ggplot2 infer magrittr modeldata parsnip purrr recipes rlang rsample rstudioapi tibble tidyr tune workflows yardstick]; };
   tidymv = derive2 { name="tidymv"; version="3.0.0"; sha256="1ihgp9a0l2lrdcibglvsbcizqhq075lhxgsynjg2iqf03b47hqlg"; depends=[dplyr ggplot2 magrittr mgcv rlang tibble tidyr]; };
   tidync = derive2 { name="tidync"; version="0.2.4"; sha256="1nm3021m3xnn4xkprkxd9sj9bwvfbwhrdhfdkfhsc9azqy3rgg9f"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; };
   tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; };
   tidyposterior = derive2 { name="tidyposterior"; version="0.0.3"; sha256="0wsv800w056ziqbnwal7ncmdy4li8cn5yrdx07w35b7j8kl4mwhg"; depends=[dplyr generics ggplot2 lifecycle purrr rlang rsample rstanarm tibble tidyr vctrs]; };
-  tidypredict = derive2 { name="tidypredict"; version="0.4.6"; sha256="1fx1nr8fry3nwy2391g26zkqakdf8f3j7zyrihbc0qhscvbdskiy"; depends=[dplyr generics knitr purrr rlang tibble]; };
-  tidyquant = derive2 { name="tidyquant"; version="1.0.1"; sha256="0dr8y0w5kjfwchdnpm4dp2si7bj5wdzvihvlbbj56r3wzvn80kpb"; depends=[alphavantager cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod riingo rlang rstudioapi stringr tibble tidyr tidyselect timeDate timetk TTR xts]; };
+  tidypredict = derive2 { name="tidypredict"; version="0.4.8"; sha256="0fff349pkksss8h1k2qza78l81ha6avx63pxziv6dfa8h62qmrdy"; depends=[dplyr generics knitr purrr rlang stringr tibble tidyr]; };
+  tidyquant = derive2 { name="tidyquant"; version="1.0.2"; sha256="0wlhc4xw321g3jn3473fj4s9pgff3wyh9wfmrbqlbsngjq565541"; depends=[alphavantager cli crayon curl dplyr ggplot2 httr janitor lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr riingo rlang rstudioapi stringr tibble tidyr tidyselect timeDate timetk TTR xts]; };
   tidyquery = derive2 { name="tidyquery"; version="0.2.1"; sha256="1fy3szbkc5ymswxx3xi1rzd4gvxzsi5imvzf05i7xrh96adzl2f8"; depends=[dplyr lubridate queryparser rlang stringr]; };
   tidyqwi = derive2 { name="tidyqwi"; version="0.1.2"; sha256="16f0c2mdx6aiji6i7237kpc9awqdgrg6rhs408w6ag28dhxpgwlv"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; };
-  tidyr = derive2 { name="tidyr"; version="1.1.1"; sha256="05bv4086axk21gsszx9rvzlz6jq4bcqm462nys8g91gqw003zljh"; depends=[cpp11 dplyr ellipsis glue lifecycle magrittr purrr rlang tibble tidyselect vctrs]; };
+  tidyr = derive2 { name="tidyr"; version="1.1.2"; sha256="0v7x1pgmwmjypzdr4j2ig2klgrrgryi3qvw8hwqv65a5h9kwpz08"; depends=[cpp11 dplyr ellipsis glue lifecycle magrittr purrr rlang tibble tidyselect vctrs]; };
   tidyrules = derive2 { name="tidyrules"; version="0.1.5"; sha256="04y6pnrp132sckjpp9g8yl0z7glcsx9dcfdpa8r27wsc2g491i63"; depends=[assertthat magrittr partykit purrr stringr tibble]; };
   tidyselect = derive2 { name="tidyselect"; version="1.1.0"; sha256="14rqx4dq574hilmdwrr34wyjg8rlw4rvndpsqd9plgxm3wwfsdg6"; depends=[ellipsis glue purrr rlang vctrs]; };
-  tidystats = derive2 { name="tidystats"; version="0.4.1"; sha256="0njb2wjbca7l5kknlvhdpm655vv76khxyzdb80ha4fi1k13a31ka"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; };
+  tidyseurat = derive2 { name="tidyseurat"; version="0.1.17"; sha256="0b5mm5wd0bzqqhi4kqn28wi3gnaw5zr8dp5w9mqsrsz3aw8j0kd2"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang Seurat stringr tibble tidyr tidyselect]; };
+  tidystats = derive2 { name="tidystats"; version="0.5"; sha256="0shvrrqd5c89d4pncbqa80kzzf9v31drm170hiivjscldphkk43h"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; };
   tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; };
-  tidytable = derive2 { name="tidytable"; version="0.5.4"; sha256="02w5j0i44gad8yckiaavpnmy85l1x57vjhxqsvzx404f63mk56sy"; depends=[data_table glue lifecycle magrittr rlang tibble tidyselect vctrs]; };
-  tidytext = derive2 { name="tidytext"; version="0.2.5"; sha256="0kwbpffdnqrb6hgrrmrfnx890imbzvp5bs6sj1k72if28qijarm5"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stringr tibble tokenizers]; };
-  tidytidbits = derive2 { name="tidytidbits"; version="0.2.2"; sha256="1wy1bnfz7jkp357a2d916dmiw36jdqfnkvdg1fa19w8r7zzgrz7d"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; };
-  tidytransit = derive2 { name="tidytransit"; version="0.7.1"; sha256="1n1m67yvlk6fnls5hah43ycvwqvw3c4v6xhmmx06zr92r3lr7xql"; depends=[assertthat data_table digest dplyr hms httr lubridate readr rlang sf tibble tidyr zip]; };
+  tidytable = derive2 { name="tidytable"; version="0.5.7"; sha256="0220gcf3968smirym0fb1zfs731xf0jyxvn2qm2677mak4limn22"; depends=[data_table glue lifecycle magrittr rlang tibble tidyselect vctrs]; };
+  tidytext = derive2 { name="tidytext"; version="0.2.6"; sha256="0xmjkab7p13ncfglf3a9hvndf8fh96mmxw3l7hcpbnaq9qkiwk29"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stringr tibble tokenizers]; };
+  tidytransit = derive2 { name="tidytransit"; version="0.7.2"; sha256="143xk1ipj7ar9ydqsq3b9ja427sjx0dzvkhsllk2cw5kkpgmpqfi"; depends=[assertthat data_table digest dplyr hms httr lubridate readr rlang sf tibble tidyr zip]; };
   tidytree = derive2 { name="tidytree"; version="0.3.3"; sha256="05b53dap0f784kl6s1wgck6m7brwmy6ifqp7v5l06s1spfspagl6"; depends=[ape dplyr lazyeval magrittr rlang tibble]; };
   tidytuesdayR = derive2 { name="tidytuesdayR"; version="1.0.1"; sha256="0slpfajv5cxqxfb1sh98574zrcgihiazscpr0zga2i6kiwn3kgpy"; depends=[httr jsonlite lubridate magrittr purrr readr readxl rstudioapi rvest usethis xml2]; };
   tidyverse = derive2 { name="tidyverse"; version="1.3.0"; sha256="02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
-  tidyvpc = derive2 { name="tidyvpc"; version="1.0.0"; sha256="1f5ca0cbb3fwsdmb4zvgf8aglajmvks9jqidnx28ppy5w9qv1skc"; depends=[data_table magrittr quantreg rlang]; };
-  tidyxl = derive2 { name="tidyxl"; version="1.0.6"; sha256="0cqagm6bm6bj735hl02qv2anj895j9gywv10igxxh0p8cb40bm6d"; depends=[piton Rcpp]; };
-  tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
+  tidyvpc = derive2 { name="tidyvpc"; version="1.1.0"; sha256="09x684p2059by76b9ba9bxsyfjly0ykia43fhkpq63fbcbg7p8wg"; depends=[classInt data_table ggplot2 magrittr quantreg rlang]; };
+  tidyxl = derive2 { name="tidyxl"; version="1.0.7"; sha256="1wg8h5fd2hd8ilshrbcs99q18p15687dx8j51v5pyd30pg5cab7b"; depends=[piton Rcpp]; };
+  tiff = derive2 { name="tiff"; version="0.1-6"; sha256="1yy4im2lwzhjnnkfwxgkknsajvm83pcwaf370pkgfva2db0xjfv2"; depends=[]; };
   tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
   tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; };
   tigerstats = derive2 { name="tigerstats"; version="0.3.2"; sha256="0p5z4qh0aznj03rnhk4lpqfkwnsa5zgvj51rddkzligg9zx73xwl"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData rlang]; };
@@ -15274,86 +15934,92 @@ in with self; {
   tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; };
   tigris = derive2 { name="tigris"; version="1.0"; sha256="00s4cl3zgc2cqg845sxr2lcqqsvz72sa08zrrfmia1ngqxl6biwp"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
   tikzDevice = derive2 { name="tikzDevice"; version="0.12.3.1"; sha256="040yz6wi05151m9nal97symv66a133kk0a8c1h6nz058zk081vav"; depends=[filehash png]; };
+  tiledb = derive2 { name="tiledb"; version="0.8.2"; sha256="141wx8n8xmbh6mrr1hp1vvlcacsp8swwr38b6i3rdfzjckpq92fw"; depends=[nanotime Rcpp]; };
   tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; };
   tilemaps = derive2 { name="tilemaps"; version="0.2.0"; sha256="06pwwlndb7nvw2b0h0fak3vnpbi11mxsby43qm9ng3k3sqwrqjz2"; depends=[clue ggplot2 igraph lwgeom sf smoothr]; };
   tiler = derive2 { name="tiler"; version="0.2.4"; sha256="1j1952vp0gnx0pnhqydipj4qw3cm05im502jc77wb2r1vklwimgb"; depends=[png raster rgdal sp]; };
   tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; };
-  time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; };
   timeDate = derive2 { name="timeDate"; version="3043.102"; sha256="0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"; depends=[]; };
   timeR = derive2 { name="timeR"; version="1.2.0"; sha256="0lkx2ilbzq29w1c9ssya4f0za0sj7y30y9ml4v3zc21c1la0b6vi"; depends=[lubridate R6]; };
   timeROC = derive2 { name="timeROC"; version="0.4"; sha256="1qxijg7hazc8bifwj2254ig2p3cbrp9p0bsyhhh3aikf1rg113v1"; depends=[mvtnorm pec]; };
   timeSeq = derive2 { name="timeSeq"; version="1.0.4"; sha256="0m59g12dmnwpmwjmyb9x6z53x3gjmxcaxqva2dlbazsqkbzgaayp"; depends=[gss lattice mgcv pheatmap reshape]; };
   timeSeries = derive2 { name="timeSeries"; version="3062.100"; sha256="1ybm4jss8y3px172kfx3mhi68k32dmyb1f21kvgcz7992jpx590l"; depends=[timeDate]; };
-  timechange = derive2 { name="timechange"; version="0.0.1"; sha256="054zh151am6asadj39nz3l4s37kip0bcjwg8mw59s78s5gyjbwds"; depends=[Rcpp]; };
+  timechange = derive2 { name="timechange"; version="0.0.2"; sha256="15qyvhs96n2s5ply2dbs07i9mpvpvffd7ni5w668f10l3hixfhq8"; depends=[Rcpp]; };
   timedelay = derive2 { name="timedelay"; version="1.0.11"; sha256="0hr5a2m621ybvl4qyx1xgwzviszj4ccvb149yclds9z87r5h2gm4"; depends=[MASS mvtnorm]; };
-  timedeppar = derive2 { name="timedeppar"; version="1.0"; sha256="1ygaapc0fgivv69ycl7i13qd4qsjvvvpwdswvzv8hgbw6whjj6w8"; depends=[mvtnorm]; };
+  timedeppar = derive2 { name="timedeppar"; version="1.0.1"; sha256="061y836slhjfngnb8qk36v3favi8mp36nw3s7c1m9msvgy2z3xm0"; depends=[mvtnorm]; };
   timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
   timelineR = derive2 { name="timelineR"; version="1.0.0"; sha256="01bb4201p18l1l5yp622ml9zd8spc978hvhw1s7j57qki5rw4kdf"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR rlang stringr]; };
   timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; };
   timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; };
   timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.2"; sha256="09vwp04j7n176xs1lbdmbyi557byx6fdvqyjay1785hkb9ivws5q"; depends=[lubridate]; };
-  timereg = derive2 { name="timereg"; version="1.9.6"; sha256="0d7ifm2kynwzgyq4n56jx713vsi6q12fah8i6hb3qdkmz0336gh4"; depends=[lava numDeriv survival]; };
+  timereg = derive2 { name="timereg"; version="1.9.8"; sha256="065vlsgs5xm11w13837jdvi9jxfa6j2vxpcp2r6hgrs38xv01ch0"; depends=[lava numDeriv survival]; };
   timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
   timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; };
-  timetk = derive2 { name="timetk"; version="2.2.0"; sha256="001k1619fhb656qrxlixwjyv3drs7cj1kmscw5rn6xwmlixgxvrp"; depends=[anytime assertthat dplyr forcats forecast ggplot2 hms lazyeval lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr tidyselect timeDate xts zoo]; };
+  timetk = derive2 { name="timetk"; version="2.6.0"; sha256="0qi6x3hw7yamjpwabzq9kwg6xpqrgddg1j0xclycyc355p5c740x"; depends=[anytime assertthat dplyr forcats forecast generics ggplot2 hms lazyeval lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr tidyselect timeDate xts zoo]; };
   timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; };
   timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
-  timevis = derive2 { name="timevis"; version="0.5"; sha256="1psmnl6pkbizi2kjpaz9w32z2dkxlh4r229mfxsfqnjvf9sc34kj"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; };
+  timevis = derive2 { name="timevis"; version="1.0.0"; sha256="003kizf974xibj90n60ipzwnrbdwjb659yxwi2xfnvh067aibwsp"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; };
   timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; };
   timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; };
   tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; };
   tint = derive2 { name="tint"; version="0.1.3"; sha256="00830n5nl6p73v9w0yzsak56phz4w1fh5lhf1c42gg1i81x7swnx"; depends=[htmltools knitr rmarkdown]; };
   tinter = derive2 { name="tinter"; version="0.1.0"; sha256="02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3"; depends=[chk]; };
   tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; };
-  tinytest = derive2 { name="tinytest"; version="1.2.2"; sha256="1gy4jkwv84xkp1kpanq4jnzg2na97n0a5dh5bv6zp5l440kggrn6"; depends=[]; };
-  tinytex = derive2 { name="tinytex"; version="0.25"; sha256="0zbhzxxjlkdj9byxyab477p7cnws5y87nyg989lkzarxdc7dglza"; depends=[xfun]; };
+  tinylabels = derive2 { name="tinylabels"; version="0.1.0"; sha256="0iqf8z03bmcvw3a01m001zmkzykn2w7y310dgws6dvzsnjl3i7f9"; depends=[]; };
+  tinyscholar = derive2 { name="tinyscholar"; version="0.1.2"; sha256="0h21b35mxbpr7kn01994nlaxl7qag1ngiry1y7gd0i5q56vrl0zm"; depends=[curl dplyr ggplot2 gt jsonlite magrittr purrr R_utils rlang rvest stringr xml2]; };
+  tinytest = derive2 { name="tinytest"; version="1.2.4"; sha256="1asryjrah3fj39gg0c6yxgpr142j5bg2n990v7q8r0a5pb8gcr45"; depends=[]; };
+  tinytex = derive2 { name="tinytex"; version="0.28"; sha256="11pa1q7gl17ala74lz10qbghk2yqanl9pylwvi9b4kmhx856b83n"; depends=[xfun]; };
+  tipitaka = derive2 { name="tipitaka"; version="0.1.1"; sha256="0hkxbsrsy75zcnpy6lg9aj535gff9pk5qlv9kd532b24fff6hdny"; depends=[cpp11 dplyr magrittr stringi stringr]; };
   tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
   tippy = derive2 { name="tippy"; version="0.0.1"; sha256="0kkyi4s4ffpyjyfl89cd5y788ab1p253rx179k422y3y1z6w1md7"; depends=[htmltools htmlwidgets jsonlite shiny]; };
-  tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; };
+  tipr = derive2 { name="tipr"; version="0.2.0"; sha256="1gkdajyhpapfq531mdpc6jj12b1kmrzq5f6jlcm4lxinwf6jvsgq"; depends=[glue purrr tibble]; };
   tis = derive2 { name="tis"; version="1.38"; sha256="0mqnvjfncfr8zc5rz1qq8jr1kv63p7sva7fvr3adbs7lgjza0yvm"; depends=[]; };
-  titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; };
   titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; };
   titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; };
   titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; };
   tkRplotR = derive2 { name="tkRplotR"; version="0.1.3"; sha256="0cx1vnsdy9d545dyrjni4diq58mz49sw36bxhn99c1rvflp4npzh"; depends=[]; };
-  tkrgl = derive2 { name="tkrgl"; version="0.9"; sha256="00767mxsaqkp7wsazznx6pr9dw75xmnijjqncbpavqf67g0cjinp"; depends=[rgl]; };
   tkrplot = derive2 { name="tkrplot"; version="0.0-24"; sha256="04gk48vm8ilj1n3b3ir66pcfv504ra4rlgc0ll4ixbnp6w566wr8"; depends=[]; };
+  tktdjl2r = derive2 { name="tktdjl2r"; version="0.2.0"; sha256="0qp7qki9kgddiis64cm894kkk6770qjh8v1b2f91smmpk3m7l321"; depends=[JuliaCall stringr]; };
   tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
   tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; };
   tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
   tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.1.0"; sha256="0mi1261659qg0ym4nqk0w6gw68wx37fq43s899szyyx08dj46mbb"; depends=[BH Rcpp RcppEigen]; };
   tls = derive2 { name="tls"; version="0.1.0"; sha256="183b5m70s2whlgp9s1gb4xnylhlp4hnh3lw6b8f2vx4kahaid763"; depends=[]; };
-  tm = derive2 { name="tm"; version="0.7-7"; sha256="0pyics8j7a4wkh5gzin46l0qars5vgbb1886xqpdqjs1z0gy9nyh"; depends=[BH NLP Rcpp slam xml2]; };
+  tlsh = derive2 { name="tlsh"; version="0.1.0"; sha256="0106y17cr3hq09ahy3rxhxqzgc0655w2jr0s3iyr8zvxsdv5ahb5"; depends=[bit64 blink igraph plyr]; };
+  tm = derive2 { name="tm"; version="0.7-8"; sha256="0mk2lsplynms15nw92vbdgsafg4bw1m0ik31gch1mnsnv61idsxi"; depends=[BH NLP Rcpp slam xml2]; };
   tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
-  tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; };
+  tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-10"; sha256="0v14fj3r438pvs88k4zwlzkgax8r0k6cx4mqjnzzad15frqficij"; depends=[DSL NLP slam tm]; };
   tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; };
   tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.8"; sha256="1gdkflz2g1vmqzv4p65w6zfynnx0fls7xyvhzg4li4kjg2xf6l75"; depends=[NLP rvest tm xml2]; };
+  tm_plugin_koRpus = derive2 { name="tm.plugin.koRpus"; version="0.4-1"; sha256="09vp9qpdpfyq5z2qpx067a7ckygibbpwr79rn59664nflq3y01vi"; depends=[koRpus NLP sylly tm]; };
   tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.1"; sha256="0c094z83mcq8blc8w7kvy91d28qqcx6f6193p3frpviznlaq21xk"; depends=[ISOcodes NLP tm xml2]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
-  tm1r = derive2 { name="tm1r"; version="1.1.4"; sha256="165yn07nxywyxdd52g917rmzqyjpv6ai11fhl9g6dj163l4vcn5a"; depends=[httr jsonlite]; };
-  tmap = derive2 { name="tmap"; version="3.1"; sha256="18gq79s0gi1cdiqx47cdm0vwwvz5jg5y5jccr0i7drmjqmvyk232"; depends=[classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer rlang sf stars tmaptools units viridisLite widgetframe]; };
+  tm1r = derive2 { name="tm1r"; version="1.1.8"; sha256="15w703rd7mfm32b62yv9mpms2fjq9ifmc1n460vsrpqz1dkiavb9"; depends=[httr jsonlite]; };
+  tmap = derive2 { name="tmap"; version="3.2"; sha256="12dib30ifm4xmdii89g08c1h05q88823xsyjnbfh0bzzj4h3rhgl"; depends=[classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer rlang sf stars tmaptools units viridisLite widgetframe]; };
   tmaptools = derive2 { name="tmaptools"; version="3.1"; sha256="0hxcdgicy27jlnza4i0ckrlansjfc9z6wa17c2bfpdmdahbsnfj0"; depends=[classInt dichromat lwgeom magrittr RColorBrewer sf stars units viridisLite XML]; };
   tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; };
   tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
+  tmhmm = derive2 { name="tmhmm"; version="1.3"; sha256="1grlwflfljwhanzc1cy2jw5wxrzl36x4zpr1mkm1bm44ilqryqx0"; depends=[ggplot2 rappdirs stringr tibble]; };
   tmle = derive2 { name="tmle"; version="1.5.0-1"; sha256="14rxdsqrjqr1vl0qy4hjpp1mchyn58za673hjc9r3n20591zghcz"; depends=[glmnet SuperLearner]; };
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
-  tmod = derive2 { name="tmod"; version="0.44"; sha256="1xp0lhjqfaw3zgdd7binz3nd9pjmr1v7h6a76li8a4mhkwrls5yk"; depends=[beeswarm gplots plotwidgets RColorBrewer tagcloud XML]; };
+  tmod = derive2 { name="tmod"; version="0.46.2"; sha256="139znivmsm7hr5hiiq7f9vab5hm0bzqf2qfs69n340gf1dgpyrd2"; depends=[beeswarm colorDF gplots plotwidgets RColorBrewer tagcloud XML]; };
   tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; };
   tmt = derive2 { name="tmt"; version="0.2.1-0"; sha256="1drb0z9jk76ixn3qw7xb5rirfc9h0frkhl1krs681aiaspqkgswj"; depends=[ggplot2 Rcpp]; };
   tmuxr = derive2 { name="tmuxr"; version="0.2.4"; sha256="0wz33sgnmcsrd1z7nsskqjhngwjkyvqd7isxcrxzkwd33naa8144"; depends=[processx]; };
-  tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.1.0"; sha256="1vrdchj2h9dnia08i2184sqwj4rnppj6ya8qxb16hp6lfv5yblla"; depends=[MASS]; };
+  tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.1.1"; sha256="0i1g3598d43azyy1bsrvkjybqa5cd991fpmfqi5wv5703zaha2fj"; depends=[MASS]; };
   tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; };
   tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; };
   tnet = derive2 { name="tnet"; version="3.0.16"; sha256="0922y9zb64zazl2irwfxxbghkgcwi2q57gylpiaxgmj4q6lc62l9"; depends=[igraph survival]; };
   toOrdinal = derive2 { name="toOrdinal"; version="1.1-0.0"; sha256="0zg4zk7jx8s57g8nb0jw7r7gss00349jmkglf6sz26p7jldpgmff"; depends=[crayon testthat]; };
   todor = derive2 { name="todor"; version="0.1.1"; sha256="13idn5wq8r9m7yx4wnbazp5lnc3bpx4gh6chcq7abj53ms734pc3"; depends=[rex rstudioapi stringr]; };
   togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; };
-  tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.4"; sha256="09bhwqqw2nr5c985ml8d6ik19r8jvxcj1l7v4xhb3y6n9k6dqxwr"; depends=[Rcpp stringi]; };
+  tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.5"; sha256="17hbkcan74j4fkk4j1xcgikaanp3xhs5njjxkapg2yjdhmf2dng6"; depends=[Rcpp stringi]; };
   tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; };
   tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; };
   tolerance = derive2 { name="tolerance"; version="2.0.0"; sha256="001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd"; depends=[MASS rgl]; };
+  tongfen = derive2 { name="tongfen"; version="0.3"; sha256="14f7bw67yvp2g0ll5g39fjq744calkj5hkbm9q8k0y07arg8jsf0"; depends=[dplyr geojsonsf lifecycle lwgeom purrr readr rlang sf stringr tibble tidyr]; };
   toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; };
   tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; };
   topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; };
@@ -15361,16 +16027,18 @@ in with self; {
   topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; };
   topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; };
   topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; };
+  topsa = derive2 { name="topsa"; version="0.1.0"; sha256="1cndv05glqagakli9f1v2nhv5ryxx0pwr6ryflnqyv82a7qim54h"; depends=[ggplot2 scales sf TDA]; };
   topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
   tor = derive2 { name="tor"; version="1.1.2"; sha256="1s34hzw3a4cm9gk85fcxgxwmn2xc7njs1iw1snd91id3gdl6vppx"; depends=[fs readr rlang tibble]; };
-  torch = derive2 { name="torch"; version="0.0.1"; sha256="1fp362g6c4c7nc8gvcwsmrd8578kw1r3zk03wfaq9chr2858h4vh"; depends=[R6 Rcpp rlang withr]; };
+  torch = derive2 { name="torch"; version="0.2.0"; sha256="105ha4hgdg5dr9w6sj3mm5qhq4mybd9lnf0w39cb3m1js8rpsdlh"; depends=[bit64 callr cli coro magrittr R6 Rcpp rlang withr]; };
+  torchvision = derive2 { name="torchvision"; version="0.1.0"; sha256="1r3fydq71kpbxb5gz9ddv9cmnh8286zv23f8ziy8yncdc3kzlrbg"; depends=[abind fs jpeg png rappdirs rlang torch]; };
   tosca = derive2 { name="tosca"; version="0.2-0"; sha256="0sq6libv2vi5q3738fksjxabfhv63zc7nldgb4nh6k57yxqzwf3z"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; };
   tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
-  totalcensus = derive2 { name="totalcensus"; version="0.6.3"; sha256="0489bzc8y4zgs4rpd52xbc2hm7g0y46j40f5bmqp5h56aq259jsa"; depends=[data_table magrittr purrr stringr]; };
+  totalcensus = derive2 { name="totalcensus"; version="0.6.5"; sha256="1vddlx48fk4clw3hmax57nqwjccvaazv31nfr4kvrlmc3w4jxjpj"; depends=[data_table magrittr purrr stringr]; };
   touch = derive2 { name="touch"; version="0.1-5"; sha256="0dan4mlvc5lg9v4zj9w6gk3c4cy64kaa984y495xpc1bzmv5c6jd"; depends=[Rcpp]; };
   touchard = derive2 { name="touchard"; version="2.0.1"; sha256="06491r4x3ycmv3ddbqwig334wj9qvm395xlaifx4hjjyyi65xb3q"; depends=[MASS nleqslv numDeriv plotrix]; };
-  tourr = derive2 { name="tourr"; version="0.5.6"; sha256="028pbprq1hjfbzvybpdkwi49arsg9r7ayjb52flw33szfqdpcimw"; depends=[MASS]; };
-  toxEval = derive2 { name="toxEval"; version="1.1.0"; sha256="1zdgk91girmlxqq6zz3vzhj9m9q4r5ckn073cd7dpfdxl87444hh"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; };
+  tourr = derive2 { name="tourr"; version="0.6.0"; sha256="0mci0y6s851gh1b157mhpvz0p7hkq2f1ccq9jj22p5k7ipxwn8dh"; depends=[dplyr MASS tibble]; };
+  toxEval = derive2 { name="toxEval"; version="1.2.0"; sha256="11rw8vjnz3kzikd59vbyiv8vc7dijpi6znyxlc7c4rpi41gs6c0m"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; };
   toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
   tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; };
   tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
@@ -15384,18 +16052,18 @@ in with self; {
   trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; };
   trackeRapp = derive2 { name="trackeRapp"; version="1.1"; sha256="0pys5vw3268j90i2gg6b1sgbx917vvk0x9k2ryh3l3p96vkrqv87"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 zoo]; };
   trackr = derive2 { name="trackr"; version="0.10.6"; sha256="0p7i4cj5z1qis2a1mqqz3wrgwhhbcggyyfwj3zycm3xcig9f6d9b"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; };
-  tractor_base = derive2 { name="tractor.base"; version="3.3.2"; sha256="0y5gm0y4chl30f5qqq8qiiw4j8g32s4i9xrvyp3cwg902kf2p86i"; depends=[ore reportr RNifti shades]; };
+  tractor_base = derive2 { name="tractor.base"; version="3.3.3.1"; sha256="0w5jw7pf77npkgig7667yikpbwv4dfk1dcq63qm88l409ga2f95p"; depends=[ore reportr RNifti shades]; };
   trade = derive2 { name="trade"; version="0.5.5"; sha256="0brpvqj1zkic4ja6nbh2zxrlkmhj1ri4s04046pb9grycrxv93j1"; depends=[antitrust]; };
-  tradestatistics = derive2 { name="tradestatistics"; version="1.0"; sha256="09zbgf971gb1m5d1jfwkdrj78ckj3gq5i03p9wfxbljb7rqby6la"; depends=[crul data_table digest jsonlite memoise]; };
+  tradestatistics = derive2 { name="tradestatistics"; version="1.1"; sha256="0x2ikbkgsg4gridmsqwzb2mbsh5hc6gx1kq65pbh1s6zv1kx89rs"; depends=[crul data_table digest jsonlite memoise]; };
   trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; };
-  traineR = derive2 { name="traineR"; version="1.0.0"; sha256="0m0k9hxdpx8dzxdy8i0k2rqmibm78fkw8fykkm5r56g7zjh3b7g0"; depends=[ada dplyr dummies e1071 kknn neuralnet nnet randomForest rpart stringr xgboost]; };
-  traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; };
-  traitdataform = derive2 { name="traitdataform"; version="0.5.7"; sha256="1h01hkxx3xz1kaliq3arx8hb82k9jx19s755y6xbyji6jp6hwy3h"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; };
-  traits = derive2 { name="traits"; version="0.4.2"; sha256="1aiy7mdwji72rrmf8gwmnpkhfbqbqbblffxghniw5pfpv55j6mib"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
+  traineR = derive2 { name="traineR"; version="1.0.1"; sha256="122fhlmr2i6wlr65308fgcyhd8wvdqmp4cdyssxd57wq0dzsl3n5"; depends=[ada dplyr dummies e1071 kknn neuralnet nnet randomForest rpart stringr xgboost]; };
+  traipse = derive2 { name="traipse"; version="0.2.0"; sha256="1g6xnk4iz4vakvv0qc6vqammr3jf0a2iisp4f439pcm9kwn64jcr"; depends=[geodist geosphere magrittr]; };
+  traitdataform = derive2 { name="traitdataform"; version="0.6.1"; sha256="1lk1hrbjgdl14szwh1nn97vf30smfq34k797v0m6d72qckd6szcj"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; };
+  traits = derive2 { name="traits"; version="0.5.0"; sha256="04s2523wkbjqxpwllvcy7ikyfri5gldgnynjswsxdy0k945wacvz"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
   trajectories = derive2 { name="trajectories"; version="0.2-2"; sha256="064hyk8v8my8kr05bi8grv3p04a5i97vdky5i7z3zka64l2f3kqr"; depends=[lattice sp spacetime zoo]; };
-  trajr = derive2 { name="trajr"; version="1.3.0"; sha256="1p092kqvwg3ncbk9hh8dij2grl1hfs3j5j64cqn227nr5b3xn1rc"; depends=[plotrix signal]; };
-  tram = derive2 { name="tram"; version="0.4-0"; sha256="0fjdwzvqm14kx2fjryf3by1m44f22nwfy0jk7kd6v4rhxh22dlw3"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; };
+  trajr = derive2 { name="trajr"; version="1.4.0"; sha256="092hx27b6d0vy1pvmga1z3b245aa9gn9aw3hszbhhkkic5zfpgbq"; depends=[plotrix signal]; };
+  tram = derive2 { name="tram"; version="0.5-2"; sha256="0dmszy6251zzqszpcj3cn651a39bdyl8x0vg2lah6dwz59zmk9s8"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; };
   tramME = derive2 { name="tramME"; version="0.0.3"; sha256="1k7al49pgdr7bvsf8p6qrb1qz96lqfagvcnf59kxibi2rdixrqk1"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; };
   tramnet = derive2 { name="tramnet"; version="0.0-3"; sha256="1mii4dw244glq7yy0zmaicr8gpqdh0m3jxjv4sm2vn7w5bj7w44n"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; };
   tranSurv = derive2 { name="tranSurv"; version="1.2.1"; sha256="0fpfzq00va05y6hp4yy5h8rdmfqjcnqp69lyic9mrxkma4nhd4nd"; depends=[rootSolve SQUAREM survival truncSP]; };
@@ -15408,49 +16076,56 @@ in with self; {
   transmem = derive2 { name="transmem"; version="0.1.1"; sha256="1a3c5ddmh9k4f80rbk363s7rkx30qhk9ssmf7xg7rr0lwxphahf3"; depends=[cmna ggformula ggplot2 plot3D]; };
   transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; };
   transport = derive2 { name="transport"; version="0.12-2"; sha256="1d49gm5lwih7b7rav3c42brcp6xi3y55xw11r9n8illjwjayfcxd"; depends=[data_table Rcpp RcppEigen]; };
+  transx = derive2 { name="transx"; version="0.0.1"; sha256="1xx934w4fhk2nwm5h6lf4irj83wsfp8lbplzcha5rnc7aka8pn3v"; depends=[rlang]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
   tree = derive2 { name="tree"; version="1.0-40"; sha256="1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz"; depends=[]; };
   tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.1"; sha256="18p1x53q1hhhagglgsq2axnr9l5rpa08vxjayqqmb6rsjrkygn78"; depends=[Rcpp RcppArmadillo]; };
   treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; };
   treeDA = derive2 { name="treeDA"; version="0.0.4"; sha256="0zhzb21lvxk278ysl275g39y2r8dlgqdix5rfg2pwv3nzj2531rc"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
-  treeHMM = derive2 { name="treeHMM"; version="0.1.1"; sha256="1chg1y26x4nm2wm2nsqw51lx2w8b89wdq8ywh1l03xhw8lgdsv47"; depends=[future gtools Matrix matrixStats PRROC]; };
   treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; };
-  treeclim = derive2 { name="treeclim"; version="2.0.3"; sha256="03d734zxz4vjrx7xw9r8y8lcsacn0p92q09n05vqfx4p7wvpwp26"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
+  treeclim = derive2 { name="treeclim"; version="2.0.5.1"; sha256="1gwsprvr9yi67slrkxf34kbqvqkr4csaqkcdbdi1vwivn2nyb3py"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
   treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; };
+  treedata_table = derive2 { name="treedata.table"; version="0.1.0"; sha256="0dhnb8if5wq6hzhjg40cw80sacigqmlm7nplm1f1ay5cqx1ynfi7"; depends=[ape data_table geiger lazyeval]; };
   treedater = derive2 { name="treedater"; version="0.5.0"; sha256="007rdrbv3v1z3qbyasla22rck105sqlqh93yfmxklihdydl7smfd"; depends=[ape limSolve]; };
+  treeducken = derive2 { name="treeducken"; version="1.0.0"; sha256="0y6yz1iq8v8aa5xfc0fd5azmx4h5a73iscf15hgpcvsxcr50f0w6"; depends=[ape apTreeshape Rcpp RcppArmadillo]; };
   treefit = derive2 { name="treefit"; version="1.0.0"; sha256="10yf4bm26vgiy3ra0c5lpflp0xdijw9zwl4aq9bz89qhszzji1fa"; depends=[ggplot2 igraph patchwork pracma]; };
-  treeheatr = derive2 { name="treeheatr"; version="0.1.0"; sha256="08mvw4fw56y6vmzz0js7scbrac9w29b5rhfl0fnk8q00fn9vhy84"; depends=[cluster dplyr ggnewscale ggparty ggplot2 gtable partykit seriation tidyr yardstick]; };
+  treeheatr = derive2 { name="treeheatr"; version="0.2.1"; sha256="0618j5rlq0xik9vl2l8ircnh98wzdzf9bxnfgmiqrpywgmc8r5nk"; depends=[cluster dplyr ggnewscale ggparty ggplot2 gtable partykit seriation tidyr yardstick]; };
   treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
   treeman = derive2 { name="treeman"; version="1.1.4"; sha256="1rlq8sklvpj6an8x9wvs3501y6dpl2vhl5zfmz0yvmif04msf49v"; depends=[ape bigmemory plyr RJSONIO stringr]; };
   treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
-  treemapify = derive2 { name="treemapify"; version="2.5.3"; sha256="1y6fyzxk542fp4h975xfgajz7cjym3rjs6asal9arv94a9cqra33"; depends=[ggfittext ggplot2]; };
-  treenomial = derive2 { name="treenomial"; version="1.1.2"; sha256="0nn5vd23nxfpk8wm68m6sxnx495nb6bkgx2w9lgjy4s66sbnddp0"; depends=[ape Rcpp RcppArmadillo RcppThread]; };
+  treemapify = derive2 { name="treemapify"; version="2.5.4"; sha256="17z2xw6f93hzd1s0d9nmzmks5kzsjmn95nwhsrcw610djy2nxhxs"; depends=[ggfittext ggplot2]; };
+  treenomial = derive2 { name="treenomial"; version="1.1.3"; sha256="1cw17dnayh5pgcgh5wghskq3i0zc7ww8kb8flyqyqrb4za2w47b6"; depends=[ape Rcpp RcppArmadillo RcppThread]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
-  treespace = derive2 { name="treespace"; version="1.1.3.2"; sha256="18xqvqpcknvwdvl84jskcwmsw3alcwns0d35a8paalwjkix03175"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; };
+  treeplyr = derive2 { name="treeplyr"; version="0.1.10"; sha256="0k5hblnpbs8h2812blc6crx1j9w9r7lzkz3fraxkn4gdfpfi5100"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
+  treespace = derive2 { name="treespace"; version="1.1.4.0"; sha256="146g5jjgf2yx7vjkpsgi38ah6fccyn6xnsk6mgqjramgf490xgrh"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; };
   treestartr = derive2 { name="treestartr"; version="0.1.0"; sha256="05rxy9lmb77ng4266871sd881mlp4rd5qalvsd7ps2x2j4plaqf4"; depends=[ape phytools]; };
   treestructure = derive2 { name="treestructure"; version="0.1.0"; sha256="0514q53bdwv9fwd58srhr6lzw1j56fcd64hml8w4rv4wzcd6c01m"; depends=[ape Rcpp]; };
-  trekcolors = derive2 { name="trekcolors"; version="0.1.1"; sha256="1fw2wgkkky79vy9sc3cn42vmfcdnsjsnhb81wvalwi6ww64fzrkh"; depends=[ggplot2]; };
-  trekfont = derive2 { name="trekfont"; version="0.9.3"; sha256="15p1r5q36fbajhwidjhhvvldckvz5js08w4cnj47gqr4lpmmpbx7"; depends=[]; };
+  trekcolors = derive2 { name="trekcolors"; version="0.1.2"; sha256="0rya2g27afjvi44w0si96cj0x4p5hc0ydqvjwigk4rwa1vc2ax2q"; depends=[ggplot2]; };
+  trekfont = derive2 { name="trekfont"; version="0.9.4"; sha256="09r8hjh7xjagfp3cxjai0079gan5h0zxjgpcvs4cx83icj76axgh"; depends=[]; };
   trelliscopejs = derive2 { name="trelliscopejs"; version="0.2.5"; sha256="12yanm6p9ygb7z1cg526f70i2a6179icyals69vkf8rjkd0n6si5"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; };
   trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; };
-  trend = derive2 { name="trend"; version="1.1.2"; sha256="09b6ycyfgs4xlhx6kn6qm5rl2acp58hzhv8qclzn3kb1wjjyvxy5"; depends=[extraDistr]; };
+  trend = derive2 { name="trend"; version="1.1.4"; sha256="1mr5g5gaxiqj6x83ngcbwwh57vhrhcz0x9dh0rmvs9y2ivk29ccs"; depends=[extraDistr]; };
   trendchange = derive2 { name="trendchange"; version="1.1"; sha256="19r0kmwsim78ynssyh6j0zd99cz96cacy3hmyrjabwwvz0f8sk3h"; depends=[]; };
+  trendeval = derive2 { name="trendeval"; version="0.0.1"; sha256="1cpv7l26ia40s46wfi4jwhwzl0xxs0dgzv4ngg8frbv5l80fmvmr"; depends=[ellipsis rsample tibble tidyr trending yardstick]; };
+  trending = derive2 { name="trending"; version="0.0.2"; sha256="1ab5gm5v9s732ld7582bz32ygy2d5bndmbdw8xqnagcm03ab3yrz"; depends=[dplyr MASS tibble vctrs]; };
   trendsegmentR = derive2 { name="trendsegmentR"; version="1.0.0"; sha256="0zgm5nbm5azmz6x0xg4aphc80q6x1cvijry9pznyi0mg14743g86"; depends=[]; };
   trendyy = derive2 { name="trendyy"; version="0.1.1"; sha256="03n7qdfc197hds8bdwl20b0nn62nqnz9r35v1q315nm3ccdifl1p"; depends=[crayon dplyr gtrendsR magrittr purrr stringr tibble]; };
-  trialr = derive2 { name="trialr"; version="0.1.4"; sha256="1gd438j0r2x15xl8nbszz7kms20zw9s8j9nl1xf0vgkqwfcblkvg"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; };
+  trialr = derive2 { name="trialr"; version="0.1.5"; sha256="11b5wmyq4ki2n0cr2hp2lf219i8q5yh6biyyl8wnvajiaa8560ja"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes]; };
   triangle = derive2 { name="triangle"; version="0.12"; sha256="1cv3l97myhkyl0c4xjympqghlk0av8xfk00av8kj93ndgkv5bfj7"; depends=[]; };
   triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; };
+  triangulr = derive2 { name="triangulr"; version="1.1.0"; sha256="0n3kccn5ki0cprrj581i5fpzpa45dw6lwp86kkhvqnhpdwk6h9mv"; depends=[dqrng Rcpp rlang vctrs]; };
   tribe = derive2 { name="tribe"; version="0.1.8"; sha256="01z1b9k3j4xi5fp9pkpr991yr7x8vk8vysipy7iwdmdr7xg4w4p0"; depends=[dplyr lazyeval magrittr rlang rstudioapi]; };
   tricolore = derive2 { name="tricolore"; version="1.2.2"; sha256="0pxahddc3dah4n4xk4i0dkiwvh4wf03gcx8q3nfrsk07zzap1zh1"; depends=[assertthat ggplot2 ggtern shiny]; };
   triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; };
   trigpoints = derive2 { name="trigpoints"; version="1.0.0"; sha256="1hckjh2gb0fvd2c8x6mj0idpk3im7b831y7mbli1hqhry6qqdw15"; depends=[sf tibble]; };
   trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
   trimcluster = derive2 { name="trimcluster"; version="0.1-5"; sha256="12siv8yx8dcavsz8jk96lwscbj257ar8jpaxksl2zb06987g4fcj"; depends=[]; };
+  trimetStops = derive2 { name="trimetStops"; version="0.1.0"; sha256="068mya6zqiacs3nznwmz17srn90ar6wjnpkgqsznzmigzy7c4idk"; depends=[]; };
   trimmer = derive2 { name="trimmer"; version="0.8.1"; sha256="0hn5pignj5clg7wb3xd0mh9jqc480wqxxymzaas68lxzi6p5mng9"; depends=[cli crayon data_table pryr]; };
   trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; };
   trinROC = derive2 { name="trinROC"; version="0.4"; sha256="02civ3r14hr6gbw6bdh77y00kiki6cdcv85hxk5g6n2nfspdr67r"; depends=[ggplot2 gridExtra rgl]; };
   trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
-  trip = derive2 { name="trip"; version="1.7.1"; sha256="0arw4x4f8ccp26qg8nmqfsadks2wqjbdwacy8wq9wnyqmk1jdff9"; depends=[crsmeta geodist glue maptools MASS raster reproj sp spatstat traipse viridis]; };
+  trip = derive2 { name="trip"; version="1.8.0"; sha256="1fwvw2z1aig0w41lzdm7aqm5kghjfz4vyzpc6m398k5zsjqrdl8l"; depends=[crsmeta dplyr geodist glue maptools MASS raster reproj rlang sp spatstat traipse viridis]; };
   tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; };
   tripack = derive2 { name="tripack"; version="1.3-9.1"; sha256="1ghza4by6shalsnqybn5qgv076dxh59b6vycg9v6ii216zbgi0kz"; depends=[]; };
   triplot = derive2 { name="triplot"; version="1.3.0"; sha256="1apmdpxdnnmjyi7gcrjrqw44iqphr84nbgw0nfxcspzjgxhc81l1"; depends=[DALEX ggdendro ggplot2 glmnet patchwork]; };
@@ -15471,32 +16146,35 @@ in with self; {
   trust = derive2 { name="trust"; version="0.1-8"; sha256="1b6wsx4vybr5952ii3ska6jbcb3654iibz83n645khxfca5k8blm"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; };
   trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; };
-  tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.6"; sha256="0ik2y2ac771z9r0wb4av2xhr3xv36n4wcv8cqx0vid3wcmbl6prc"; depends=[]; };
-  tsBSS = derive2 { name="tsBSS"; version="0.5.5"; sha256="19i9raw3wiig66a84msqqwwxd9br4ayk108v7d9j78d0ynm6ki84"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; };
+  tryCatchLog = derive2 { name="tryCatchLog"; version="1.2.1"; sha256="13c8llyg48ll8hz4v6pfbng3ilipj86q20blwbvn0b0h3apb3v7p"; depends=[]; };
+  ts_extend = derive2 { name="ts.extend"; version="0.1.1"; sha256="03b358nywx0zynb6006886mzvz1mbbaim6b5m641drklh6k0l6r1"; depends=[]; };
+  tsBSS = derive2 { name="tsBSS"; version="0.5.6"; sha256="1rkr61ixi7xvx05yp65qp9j0j5vpr17cfw30gmx4hp9i212q1abr"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; };
   tsDyn = derive2 { name="tsDyn"; version="10-1.2"; sha256="0wwp18qaxljdy1zqww1qw9fa9ycvgwcf6j52cpx3v2f2177x7snc"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
   tsPI = derive2 { name="tsPI"; version="1.0.3"; sha256="00p7275iq8qn6c6dpqjr5s9fzc0a6njqqi9gvqnh5s9lfx9mbk1v"; depends=[KFAS]; };
   tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; };
   tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-3"; sha256="0mzqplsj2w4a7jnav43afyk8ymy6p444j7km6kc8c2g4aifpgxcb"; depends=[]; };
-  tsapp = derive2 { name="tsapp"; version="1.0.0"; sha256="0dakmzm65y6w3idfynnigcmyw0n28scfgklmmg7lg8ycsxh0x76l"; depends=[fftwtools Matrix vars]; };
+  tsapp = derive2 { name="tsapp"; version="1.0.3"; sha256="1k2r8nnqbkgrhgdqg45y0svzqj521wl6vbss23yypwh1gcbddzn9"; depends=[fftwtools Matrix vars]; };
   tsbox = derive2 { name="tsbox"; version="0.2.1"; sha256="0k5azdn4af6mwcx1lf8ns83nim34kfsb9m26h3yjm9mk9qixr6k1"; depends=[anytime data_table]; };
   tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
-  tscount = derive2 { name="tscount"; version="1.4.2"; sha256="15lvrglv4lq17g425s9lkcb3f04bk0322yl32648ysf7gp7lmdx5"; depends=[ltsa]; };
-  tsdb = derive2 { name="tsdb"; version="0.7-1"; sha256="0ngy897fmf48c7k54zq8lx2fyv45c0kzn3bxm5054ay2lkv02idz"; depends=[datetimeutils fastmatch zoo]; };
+  tscount = derive2 { name="tscount"; version="1.4.3"; sha256="087ncxy1q91yc5rr15d5h6m7kaqhw8yy5fbm22rkzp9dg2fhbzi3"; depends=[ltsa]; };
+  tsdb = derive2 { name="tsdb"; version="0.7-4"; sha256="0ya87a14g94whcmmng55pkr7ql4m2dgmw5izd5ggldm4k6z62jp0"; depends=[datetimeutils fastmatch zoo]; };
   tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; };
   tsdf = derive2 { name="tsdf"; version="1.1-8"; sha256="00s0aiis88611xsq9px61f9gwprp803wcvi5milvc7qckrh1kw0z"; depends=[]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
-  tseries = derive2 { name="tseries"; version="0.10-47"; sha256="0yzvc9djp3angvxdxqi60wi726y76ablsb71q88ycvw0avgpf8r0"; depends=[quadprog quantmod zoo]; };
+  tsensembler = derive2 { name="tsensembler"; version="0.1.0"; sha256="0amb3dn96hdgy5a0j6s43mf82cdjwbz8dhz3yrjlr07nknxzirzi"; depends=[Cubist doParallel earth foreach gbm glmnet kernlab monmlp pls ranger RcppRoll softImpute xgboost xts zoo]; };
+  tseries = derive2 { name="tseries"; version="0.10-48"; sha256="0wa4rcf0igayi1yrwc6wak6d491560p0z89rz32haqlkiiq25gak"; depends=[quadprog quantmod zoo]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; };
   tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
   tsfeatures = derive2 { name="tsfeatures"; version="1.0.2"; sha256="1zi7p7gdd9bg6rpdin88rq9qi43cpk663xmvffa7d5p1w45831kd"; depends=[forecast fracdiff furrr future purrr RcppRoll tibble tseries urca]; };
   tsfgrnn = derive2 { name="tsfgrnn"; version="0.1.0"; sha256="1kx4q1a12yrngg1jps4jk2k5svnmsl1lhybb6ziypza20hmmzral"; depends=[ggplot2]; };
   tsfknn = derive2 { name="tsfknn"; version="0.4.0"; sha256="1ji4y4khxzpk8k3m97p6j2li4khg17z9qzfgwjxijaxl4mwq54i2"; depends=[ggplot2 Rcpp]; };
-  tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
+  tsgui = derive2 { name="tsgui"; version="0.2.1"; sha256="0crm2ripxpjaz1cqz9lkj3y9xj4ia0hlq4lvz1rff0wq6d5w79dn"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
   tsiR = derive2 { name="tsiR"; version="0.4.2"; sha256="1yc9kcyj8yg7zsdkqsxkr7czv3i5gf2146z5h89qfqifrrzmjifa"; depends=[ggplot2 kernlab reshape2]; };
-  tsibble = derive2 { name="tsibble"; version="0.9.2"; sha256="15bdhwzrppnq96jzj6lkn8jlrqwja6qvxznk5xkym3hillyi0jfh"; depends=[anytime dplyr ellipsis lifecycle lubridate purrr rlang tibble tidyselect vctrs]; };
+  tsibble = derive2 { name="tsibble"; version="0.9.3"; sha256="065nnggd5m483pmn21pyyjbbgs2wdmzhrrq2bgnzv0ldlxkr2clj"; depends=[anytime dplyr ellipsis lifecycle lubridate purrr rlang tibble tidyselect vctrs]; };
   tsibbledata = derive2 { name="tsibbledata"; version="0.2.0"; sha256="0lkpxhahyglh8h9pwwi57gqyqxirw4m1cr5cryxzs6gfsrx7dpbf"; depends=[tsibble]; };
+  tsibbletalk = derive2 { name="tsibbletalk"; version="0.1.0"; sha256="14j1gpimvlz9cgxgl1n68ngkqx4w2ai92782ifrpvc57lqy9cs7v"; depends=[crosstalk dendextend dplyr glue lubridate plotly R6 rlang shiny tsibble vctrs]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsmp = derive2 { name="tsmp"; version="0.4.14"; sha256="1ahqdizygbs49xbgn35fdb5drxwyx2z9ima4fm83aqwaan7wrrja"; depends=[audio checkmate doSNOW foreach magrittr progress Rcpp RcppParallel RJSONIO]; };
   tsna = derive2 { name="tsna"; version="0.3.1"; sha256="15dx5inmlk05asakjv3jzlycid307xjpy4x2h52phix69ghbb95v"; depends=[network networkDynamic statnet_common]; };
@@ -15505,6 +16183,7 @@ in with self; {
   tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; };
   tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; };
   tsriadditive = derive2 { name="tsriadditive"; version="1.0.0"; sha256="1zk97vz5ag6j0r8w3b5kgl2cx628jmdy73spmwmsw7x5yc24901d"; depends=[survival]; };
+  tsrobprep = derive2 { name="tsrobprep"; version="0.0.0.2"; sha256="1mk6km4n9s9fbc3xgla54fr7h76s8kpiwj1b6dsy8d4r63ix7xcb"; depends=[Matrix quantreg]; };
   tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; };
   tsutils = derive2 { name="tsutils"; version="0.9.2"; sha256="0gp8f0a9dn3h4lv38xiw04j832igwhfralzc5vd74r952x7b6hbx"; depends=[forecast MAPA plotrix RColorBrewer]; };
   tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; };
@@ -15524,12 +16203,12 @@ in with self; {
   tuber = derive2 { name="tuber"; version="0.9.9"; sha256="1nnjwn3c0rr90jvkwlh9xs5vc2nl6qzjj958hbddfrkny0w88mnp"; depends=[dplyr httr jsonlite plyr purrr]; };
   tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; };
   tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.1"; sha256="0lrylh0np0kbl4xx3gmlvid0g11fh0ad39wdwbz6hrmf5pzsjdjq"; depends=[]; };
-  tufte = derive2 { name="tufte"; version="0.6"; sha256="1a0m5mii1hcr5w2jg3pv21c903042y96ippfqy4lsf0wsps77ywj"; depends=[htmltools knitr rmarkdown xfun]; };
+  tufte = derive2 { name="tufte"; version="0.9"; sha256="0kylvxbw3wbb5p7f09wav20l8gxbpvkcd3k70dimnqhrfbzw05qd"; depends=[htmltools knitr rmarkdown xfun]; };
   tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; };
   tukeytrend = derive2 { name="tukeytrend"; version="0.7"; sha256="15j7g0drb92rpxq7d0jl9h0hxpi9pbgpvfcxaicrcgypxap3721q"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; };
   tumblR = derive2 { name="tumblR"; version="1.2"; sha256="1qili2c9wb6hpjjf7m0gyvdymzls5w4pghjkyi3sbp0q7ayhbh12"; depends=[httr RCurl RJSONIO stringr]; };
   tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; };
-  tune = derive2 { name="tune"; version="0.1.1"; sha256="0293xkmv1nyvm72wxznnlm3qpf6475xzl2sf52mnrjxxr7i447p1"; depends=[cli crayon dials dplyr foreach ggplot2 glue GPfit hardhat lifecycle parsnip purrr recipes rlang rsample tibble tidyr vctrs workflows yardstick]; };
+  tune = derive2 { name="tune"; version="0.1.2"; sha256="0ja7rjkjj88v3ngrc6izcz2qh9qv4s8abgcafmvx2ihgz99hds37"; depends=[cli dials dplyr foreach generics ggplot2 glue GPfit hardhat parsnip purrr recipes rlang rsample tibble tidyr vctrs workflows yardstick]; };
   tuneR = derive2 { name="tuneR"; version="1.3.3"; sha256="0av978m4h2iqazyfq6n2cgkh4wpllihh7s29lah2nb8ngc0w5hxx"; depends=[signal]; };
   tuneRanger = derive2 { name="tuneRanger"; version="0.5"; sha256="1xf78q8f7sq6w2jjwcw8vz88bmbp8yivydmqygjag58abnhd0356"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; };
   tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
@@ -15541,83 +16220,88 @@ in with self; {
   tvR = derive2 { name="tvR"; version="0.3.1"; sha256="056a241m3c1jhf8idly1bm4xja349cg5yzz19l45zyggml82snin"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
   tvReg = derive2 { name="tvReg"; version="0.5.3"; sha256="12ln2mkhxhp6i2x928cz2y7i1xsqrr3840rvp7k4c4skj2mrb898"; depends=[bvarsv MASS Matrix plm systemfit vars]; };
   tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
+  tvem = derive2 { name="tvem"; version="1.0-0"; sha256="128md4y65cvl6ks9g39w9d1jd2fyw1y6wx0c0cwx9sqhc3jssba9"; depends=[mgcv]; };
   tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; };
   tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; };
-  tvthemes = derive2 { name="tvthemes"; version="1.1.0"; sha256="0bc9li8vgmm4r6dshm52ll2d69gcynv1xrv8n7jhbyn7xmx3q3kz"; depends=[extrafont ggplot2 glue magick scales]; };
+  tvthemes = derive2 { name="tvthemes"; version="1.1.1"; sha256="0j24hhpjab1220bmspd6a0pa2295gpyyrcxs1rxjnsr5vgn90fcq"; depends=[extrafont ggplot2 glue magick scales]; };
   twang = derive2 { name="twang"; version="1.6"; sha256="0d190420igm1ai3gv9fjqxw6z1g7zrc4q3yidkn083mj42asxn4v"; depends=[gbm lattice latticeExtra survey xtable]; };
   tweedie = derive2 { name="tweedie"; version="2.3.2"; sha256="10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls"; depends=[]; };
   tweenr = derive2 { name="tweenr"; version="1.0.1"; sha256="0sq90pbln6lkc2q3zflhkxxwpqdw5dd7igrxhdnlynkdrmi83mpg"; depends=[farver magrittr Rcpp rlang]; };
   tweet2r = derive2 { name="tweet2r"; version="1.1"; sha256="1ivzc05af3fbdxn99lcphm74qs64lz8577zzi6r52r9xjpsqpqzi"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; };
+  twenty48 = derive2 { name="twenty48"; version="0.1.0"; sha256="1ydxy6rwlyjq1bb9clkcknwn89j1p064g6jdc7s7zl7rsxrll6v2"; depends=[crayon R6]; };
   twfy = derive2 { name="twfy"; version="0.1.0"; sha256="14xxl9y8iagnn5jd06k6jyy4wk7crm64svz8h0zmzcvg47k8bwc7"; depends=[httr jsonlite]; };
   twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
   twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; };
   twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; };
   twitterwidget = derive2 { name="twitterwidget"; version="0.1.1"; sha256="1dlhydhy69284gg3jsxwa6h8cp1rlkg1j8h8z1fjz4fyy1p5xrpv"; depends=[htmlwidgets]; };
   twl = derive2 { name="twl"; version="1.0"; sha256="0n2r40ddsr5zpzi92k7f0lvq78k5cmfbqzjxvr78hwq6j13dhar3"; depends=[corrplot data_table MCMCpack Rfast]; };
-  twn = derive2 { name="twn"; version="0.1.0"; sha256="1mzd1563wq8j2kq1h3pgh04cgjg9lq3nn6zp3ka10aln012y0cxk"; depends=[crayon dplyr memoise rlang tibble]; };
+  twn = derive2 { name="twn"; version="0.1.1"; sha256="13q8bw6r61zdaw60b9hnlahjand43vc7l868igikn0ny3pqz3plp"; depends=[crayon dplyr rlang tibble]; };
   twosamples = derive2 { name="twosamples"; version="1.1.1"; sha256="0c2hk49zysjgkgm3pv9j1gnpg5hs5icdzn40ihyqj8aziynkripp"; depends=[Rcpp]; };
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
   twoway = derive2 { name="twoway"; version="0.6.3"; sha256="02z2syb0g92d97gjxfkarpil9b2n25s128606h071jl0s88cr4ar"; depends=[]; };
+  twowaytests = derive2 { name="twowaytests"; version="1.0"; sha256="1h8bypzfbv5ddam9zrqqb7abvv04n07hl459ippxbfk76qyp2rhg"; depends=[car ggplot2 nortest onewaytests]; };
+  txshift = derive2 { name="txshift"; version="0.3.4"; sha256="19adi96xh35vlsfsg3m2lm4szwhdb1m38ja3agdzwgryzh6xgzyc"; depends=[assertthat data_table ggplot2 hal9001 haldensify latex2exp lspline mvtnorm Rdpack stringr tibble]; };
   txtplot = derive2 { name="txtplot"; version="1.0-4"; sha256="00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4"; depends=[]; };
   txtq = derive2 { name="txtq"; version="0.2.3"; sha256="03pa5mj5ijzvyzzjr9l84xrz4kdam4w90l7apgjwxgnag3p3c0p8"; depends=[base64url filelock R6]; };
   types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
-  tzupdater = derive2 { name="tzupdater"; version="0.1.1"; sha256="056ssg1hi5i4qypacpy1q08l8awn4hj34jfriwv6x97l7cssw3bx"; depends=[]; };
+  tzupdater = derive2 { name="tzupdater"; version="0.1.2"; sha256="0s1simvn76m569iq24qb3w6xli0202cjf1jr3a4qy58fs4sda2kv"; depends=[]; };
   uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; };
   uFTIR = derive2 { name="uFTIR"; version="0.1.2"; sha256="1ds2ip02f4jh2i0n9f22v4c62xr82cak69w7yjf1k014rzq1yp60"; depends=[raster Rcpp RcppArmadillo rgdal sp]; };
-  uGMAR = derive2 { name="uGMAR"; version="3.2.5"; sha256="0dxi261qbnaqryqmbmja56wkj2h9nn5yk5pmz8axdyakbqgasfwp"; depends=[Brobdingnag pbapply]; };
+  uGMAR = derive2 { name="uGMAR"; version="3.2.6"; sha256="09v6hijky5dbn9bam1gq5qi56wk4mv09jjyg0srf3jdjcq2d8w6w"; depends=[Brobdingnag pbapply]; };
   uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; };
   uaparserjs = derive2 { name="uaparserjs"; version="0.3.5"; sha256="0v24smgsz1p2wa23mc2llx7dycwmgf7zyxdhwxgwplabpmy3xzhl"; depends=[progress V8]; };
   uavRmp = derive2 { name="uavRmp"; version="0.5.7"; sha256="04dv1a72b0v8lgdwl10n96953gfal6pmbbih45szdvk4zhks030j"; depends=[brew data_table exifr geosphere jsonlite link2GI log4r raster rgdal rgeos rlang rlist sf sp zoo]; };
-  ubiquity = derive2 { name="ubiquity"; version="1.0.2"; sha256="1xlxiyzzhsaamwf42gv2h50rchapw81gkf1v08almd1s6ds4vpgf"; depends=[deSolve digest doParallel flextable foreach gdata ggplot2 gridExtra knitr MASS officer optimx PKNCA pso rhandsontable rmarkdown rstudioapi shiny stringr]; };
+  ubiquity = derive2 { name="ubiquity"; version="1.0.3"; sha256="1k0l6ai8fgjqch1hic9nzmj8dnf91y83wfgw13q56r6lvnp3rhdi"; depends=[deSolve digest doParallel dplyr flextable foreach ggplot2 gridExtra knitr MASS officer optimx PKNCA pso readxl rhandsontable rmarkdown rstudioapi shiny stringr]; };
   ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
-  uchardet = derive2 { name="uchardet"; version="1.0.6"; sha256="02ys3x5gc42c4c9acnxj7j54x1i7xr82341hp2jq5mn6q65gdnyi"; depends=[Rcpp]; };
+  uchardet = derive2 { name="uchardet"; version="1.1.0"; sha256="1dnvi45npk7l7sqbv3c1mrg0m7vrrp7iya9kjndcg9x3h0iial9z"; depends=[]; };
   uclust = derive2 { name="uclust"; version="0.2.0"; sha256="1hvyrkah0yfia5wwr42q6axja56qwnils84pg25znq39fjly6hjf"; depends=[dendextend robcor]; };
   ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; };
   udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; };
-  udpipe = derive2 { name="udpipe"; version="0.8.3"; sha256="1ys4ss700h3xk4z72lsjavd6vic4ihm00b1mzidq41klrgpwzcb0"; depends=[data_table Matrix Rcpp]; };
+  udpipe = derive2 { name="udpipe"; version="0.8.5"; sha256="021n28jncfiv7492dj1ik6ylkhb3s2hpgjpc0y2zv4cdnl362zcx"; depends=[data_table Matrix Rcpp]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
-  ufs = derive2 { name="ufs"; version="0.3.1"; sha256="079azpicvimjq7qw1790j5f0vq5jis67lv4r28x3390r9fh04m6l"; depends=[digest diptest dplyr GGally ggplot2 ggrepel ggridges gridExtra gtable knitr pander plyr scales SuppDists viridis]; };
+  ufs = derive2 { name="ufs"; version="0.4.0"; sha256="07awbavaa07dph560q045hgimqwhs87a7bfqnlvgiqhbvjlb8wwm"; depends=[digest diptest dplyr ggplot2 ggrepel ggridges gridExtra gtable htmltools kableExtra knitr pander plyr rmdpartials scales SuppDists viridis]; };
   ui = derive2 { name="ui"; version="0.1.1"; sha256="15hcdzaj75ip6j7yglx8rqhp4y3yf3aw5cpbjgk1mjr4cya7lvzi"; depends=[Matrix maxLik mvtnorm numDeriv]; };
   uiucthemes = derive2 { name="uiucthemes"; version="0.3.1"; sha256="1faggg8hiqw4pblq5r3m9wi3x5m6kbjq0flf88mqa993v9rpdrf6"; depends=[rmarkdown xaringan]; };
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
   ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; };
-  ukgasapi = derive2 { name="ukgasapi"; version="0.17"; sha256="1jly1bzisvvx8pcsw0fb35xxvjgq7ydpxianf3dbxa88msdjr02d"; depends=[RCurl XML]; };
+  ukgasapi = derive2 { name="ukgasapi"; version="0.21"; sha256="1acl04bm8f2hgi26mpmzcwp44yv9zxarzw4r4k20b367k8g9rh8a"; depends=[httr XML]; };
   uklr = derive2 { name="uklr"; version="1.0.1"; sha256="0pr0qyf8zr8z1hzv8wziw9wddajja5dggs9cc9dw91v0kq5g5ris"; depends=[curl httr jsonlite tibble]; };
   ukpolice = derive2 { name="ukpolice"; version="0.2.2"; sha256="1dwwixhiarlpdss7rhiamzcsl1k2yphgmjzh7wn2my4vxj06817l"; depends=[httr jsonlite purrr snakecase tibble]; };
   ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; };
-  umap = derive2 { name="umap"; version="0.2.6.0"; sha256="0zajn2sk705sckljxl5vz4q2sxpsqim2grmjq2jwwc8ysr1h2s9f"; depends=[openssl Rcpp reticulate RSpectra]; };
+  umap = derive2 { name="umap"; version="0.2.7.0"; sha256="191vpy84s0bar06y9z1qx43x2kc4qp7lmrcmd0cvz2pnzq722jab"; depends=[openssl Rcpp reticulate RSpectra]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
-  umx = derive2 { name="umx"; version="4.0.0"; sha256="171zk1ahwlk5arhqwl9kwif7l59w7a6hjlp08ywybvd43r8js9bg"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl xtable]; };
+  umx = derive2 { name="umx"; version="4.2.5"; sha256="0kr1csakxfk9jz55i1hw3vxck1h1xkbppvk33zdhx0szc10xpz1l"; depends=[cowplot DiagrammeR ggplot2 kableExtra knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl scales xtable]; };
   unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
   unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
   uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; };
   uncmbb = derive2 { name="uncmbb"; version="0.2.1"; sha256="0ilbsl6hww613i6in9x4v8knx9vlv6hiycgl2879aiq456ghx91m"; depends=[dplyr rlang]; };
   understandBPMN = derive2 { name="understandBPMN"; version="1.1.1"; sha256="04wnyxplrn5c6jb76dw25pawwcvvn5xq80lqn5imsf31nbwybpm5"; depends=[devtools dplyr purrr R_utils Rcpp tibble tidyr usethis XML]; };
   unfoldr = derive2 { name="unfoldr"; version="0.7"; sha256="18qjsmlbqy9nhwyv288r9n3plv22fgb4g73jpyjyzy3hzfamcb17"; depends=[]; };
+  unga = derive2 { name="unga"; version="0.1.0"; sha256="09ibmdaifzhb61nkjpgigr6mhp2d4gk00l0fyqwsz3njwy3sqw0f"; depends=[]; };
   unglue = derive2 { name="unglue"; version="0.1.0"; sha256="0w8ld4xllx0lj1jz8i2sj92f8136hlwri1d8ldpg1ymxj7aw93vg"; depends=[]; };
-  ungroup = derive2 { name="ungroup"; version="1.1.5"; sha256="0247mzicghdy2s41dsf1f2yx9j0j4qnahmh1bjaiwl4q1541k3l0"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; };
-  unheadr = derive2 { name="unheadr"; version="0.2.1"; sha256="0pglf4sxq7f5rf1a87zz0nzjd4npdymazg4zpmmfiwc07lh8g7pr"; depends=[dplyr forcats magrittr readxl rlang stringr tibble tidyr tidyxl]; };
+  unheadr = derive2 { name="unheadr"; version="0.3.0"; sha256="1wrrmxndlqzn18dnkwcm3bc4mmxminxag27wclhviscaycybhy43"; depends=[dplyr forcats magrittr readxl rlang stringr tibble tidyr tidyxl]; };
   uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
   uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; };
   unifDAG = derive2 { name="unifDAG"; version="1.0.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; };
   unifed = derive2 { name="unifed"; version="1.1.3"; sha256="0krxw4hy93a9qq78hwsc39rscbz6j8rr5qhplca0ska1xp36p09f"; depends=[]; };
   uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; };
   uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
-  unikn = derive2 { name="unikn"; version="0.2.0"; sha256="1lw3wn93bb8y76phnqwhvgn14zrs68rq8xx9hl2wbngispvwpwn1"; depends=[ggplot2]; };
+  unikn = derive2 { name="unikn"; version="0.3.0"; sha256="06pyabyjwdyzn4fh04jg4lafricl5877rwvf3fxdv0ldp6nymq8v"; depends=[ggplot2]; };
   unine = derive2 { name="unine"; version="0.2.0"; sha256="051dk8fss19h4d9815a7994krr1s3n5q0pxq9gir6zns0vvn05pw"; depends=[Rcpp]; };
   uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
   unisensR = derive2 { name="unisensR"; version="0.3.3"; sha256="1pqfb8i3rj64l9hh1bn9mm78wlfqphgrlp7zrydznqy88f4jwgvy"; depends=[hexView vroom XML]; };
   unitedR = derive2 { name="unitedR"; version="0.4"; sha256="0h4i814awb8419693jz3x5cyhs2x6y5flmz339bg6ivmg13d9h3s"; depends=[plyr]; };
-  unitizer = derive2 { name="unitizer"; version="1.4.10"; sha256="0xp6js2w0c0j0prahc7ndlhaiaw17n7r69k71v2r1cfkpmvm0ivf"; depends=[crayon diffobj]; };
+  unitizer = derive2 { name="unitizer"; version="1.4.12"; sha256="0m8vyyr1gl33kvj20x0zvrr01qm1n5a2c2w6x58ndc3s2hsjlx3c"; depends=[crayon diffobj]; };
   units = derive2 { name="units"; version="0.6-7"; sha256="1rdpbkiqcabz00fqzzs98v89v4cgvcd4pb00pwxzkq6vmwmscwrz"; depends=[Rcpp]; };
   unittest = derive2 { name="unittest"; version="1.4-0"; sha256="1wyiikccnkw8fzrjrb2a80lw2xyiii4zb0hrbzfszy2bd6prqxx4"; depends=[]; };
   univOutl = derive2 { name="univOutl"; version="0.2"; sha256="0rlc3w7cx2hfxacpjs9kmjzv5p8v9wxnlpxi3rh276wiy5zdr91v"; depends=[Hmisc robustbase]; };
   unival = derive2 { name="unival"; version="1.0.2"; sha256="1sw0z7dmicmka3znrc1c5v0s9g8cpqapacdjzl5i4k5ak2qq35qp"; depends=[optimbase psych]; };
   univariateML = derive2 { name="univariateML"; version="1.1.0"; sha256="1bnpb1g6hm8p3q73kyb4mxijzj53cfp38ns98bq12m9yvsjq1c4n"; depends=[actuar assertthat extraDistr fGarch logitnorm nakagami tibble]; };
-  universals = derive2 { name="universals"; version="0.0.3"; sha256="0pf3hf3f46rj0h4054ha2cndwhcyv1zm52cmcqf95qy7r2kq8i5a"; depends=[]; };
-  unix = derive2 { name="unix"; version="1.5.1"; sha256="0kb54lgzqnp1nwl8lw2531qj3858szsv7wz17g6lqxkfxsww5vv8"; depends=[]; };
+  universals = derive2 { name="universals"; version="0.0.4"; sha256="1dx7xh5l2dkamskpwfc9qsjf7df1fj54ph6s3sxhnhdbppzckd4d"; depends=[]; };
+  unix = derive2 { name="unix"; version="1.5.2"; sha256="0rilc0cslwnzl5fpx8zszxsf7wkd3s7c6yza3gysw8kxw0yp36qj"; depends=[]; };
   unjoin = derive2 { name="unjoin"; version="0.1.0"; sha256="1hp9fxkb59z0cpnwxpaf5whglrljg2nrmsygdb98klxsama9gr5z"; depends=[dplyr rlang tibble]; };
   unmarked = derive2 { name="unmarked"; version="1.0.1"; sha256="1r60rr2670fwnfsfx56ql0r26279nv5ziwrd90wflyaagbf9pfx3"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo]; };
+  unnest = derive2 { name="unnest"; version="0.0.2"; sha256="01cx2w68rgkkh927fipxj6r1cq5xxay1wif6m2a4q9nm970nysvx"; depends=[]; };
   unpivotr = derive2 { name="unpivotr"; version="0.6.1"; sha256="1xh1m6f8gr37r14kbhnmb5a5dfammd4x9ci7p782b6r9ymnjq13p"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr tidyselect xml2]; };
   unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; };
   unrtf = derive2 { name="unrtf"; version="1.4"; sha256="0ri68vfhc0acizjsk62v4l1g6l773y955yhcbqgks0vbrk01yfxg"; depends=[sys]; };
@@ -15632,10 +16316,10 @@ in with self; {
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
   urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; };
-  urlshorteneR = derive2 { name="urlshorteneR"; version="1.1.2"; sha256="1gxyc9a81lsn72x7c29lz6k9k5ylqd0j65yhy2qj8lslnmg869vz"; depends=[assertthat httr jsonlite lubridate stringr]; };
+  urlshorteneR = derive2 { name="urlshorteneR"; version="1.4.3"; sha256="168y1mdxhn7lhhzmzw9a7h4g9xpwh294wl53aaqp23s486p46pdz"; depends=[assertthat cli clipr httr jsonlite lubridate miniUI shiny stringr]; };
   urltools = derive2 { name="urltools"; version="1.7.3"; sha256="04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"; depends=[Rcpp triebeard]; };
-  uroot = derive2 { name="uroot"; version="2.1-0"; sha256="1hhq7ns2pyiziwx6sx7sb6445p3nynv7l04rksjngai2vpdaj0iw"; depends=[]; };
-  ursa = derive2 { name="ursa"; version="3.8.20"; sha256="1jsvmxk1jncyc480a2zbrhd6r8b3nkibsx474q7a9wbr09nq9mdi"; depends=[jpeg png rgdal]; };
+  uroot = derive2 { name="uroot"; version="2.1-2"; sha256="0dsb1vdr2bwy64v889svhvkadg5jl9cl77mfiw79vl18b7ixjzxx"; depends=[]; };
+  ursa = derive2 { name="ursa"; version="3.9.2"; sha256="0q6hnyw0gl6qipyi7s461w1i49akdvhi8ijyd8raxdizhcsqyxla"; depends=[jpeg png rgdal]; };
   us_census_geoheader = derive2 { name="us.census.geoheader"; version="1.0.2"; sha256="17mss1ggaqkd0ac7g9chgqdrpi5xlbfkxsm1jvj48rp2jfwpp4jw"; depends=[tibble]; };
   usa = derive2 { name="usa"; version="0.1.0"; sha256="0scdrd6b48n019f7qp77rrkqgmapnrknalq0hml1cy7m43llqf6d"; depends=[tibble]; };
   usdampr = derive2 { name="usdampr"; version="1.0.0"; sha256="1kz4yaxhzpbyw1vjgfs4cps2s13w2m6fa0k81q8j89a3xl36wzhw"; depends=[dplyr httr jsonlite tidyr]; };
@@ -15644,14 +16328,15 @@ in with self; {
   usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; };
   usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; };
   useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
-  usefun = derive2 { name="usefun"; version="0.4.7"; sha256="0rklz4cdwgymis5ijlx9gzz01b9a35cg74clz42y1kbb86d8rcq4"; depends=[dplyr]; };
+  usefun = derive2 { name="usefun"; version="0.4.8"; sha256="0jbwfr04y65rlc2aa6483w9qcdqa4bmcx76j4rp9fracfszjb1hg"; depends=[dplyr]; };
+  usemodels = derive2 { name="usemodels"; version="0.1.0"; sha256="17cnjg7vw3f2jxkqlfvxh6kn891h49waf5k5a5vb4yaa2ay6nhp3"; depends=[cli dplyr purrr recipes rlang tidyr tune]; };
   userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; };
-  usethis = derive2 { name="usethis"; version="1.6.1"; sha256="0vwxsnq615mwc706a4a71gyy0hmvnllbh249gzm7vl3ym5cr0cv0"; depends=[cli clipr crayon curl desc fs gh git2r glue purrr rematch2 rlang rprojroot rstudioapi whisker withr yaml]; };
+  usethis = derive2 { name="usethis"; version="2.0.0"; sha256="0m4qnnkdiizsdvq33x502zwkn98hw2qcfm45cjj031vaydcjpai2"; depends=[cli clipr crayon curl desc fs gert gh glue jsonlite lifecycle purrr rappdirs rlang rprojroot rstudioapi whisker withr yaml]; };
   usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; };
   ushr = derive2 { name="ushr"; version="0.2.3"; sha256="1ygyqgxw849165lpk81f114kgx9015b9a9dngavjy3ffqzrbb41k"; depends=[dplyr ggplot2 tidyr]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
   usl = derive2 { name="usl"; version="3.0.0"; sha256="1ahry485kpzfc0pzi4zm039d5mpv1jycmhdpn0n0zn0drcrlhw0g"; depends=[nlsr]; };
-  usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; };
+  usmap = derive2 { name="usmap"; version="0.5.1"; sha256="1vbariw50h1l2225101zzrvpn5n2ih4f06v8d3x5n98qrzv8xhyr"; depends=[]; };
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
   utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; };
   utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; };
@@ -15663,8 +16348,11 @@ in with self; {
   utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; };
   utiml = derive2 { name="utiml"; version="0.1.6"; sha256="1djagxmsni685ps0nhbvwgncxj883qck0wfcwhrl5h714zq39a0j"; depends=[mldr ROCR]; };
   uuid = derive2 { name="uuid"; version="0.1-4"; sha256="0gm9ii7ncvllxbvyk6srsiinjmqyj7lmh84w43x4nhqpvafj9q4q"; depends=[]; };
-  uwot = derive2 { name="uwot"; version="0.1.8"; sha256="1jzh8r1h6f7pw7pb1fr32vn6ai9g10s56ahkq0vi77iznihy1rpd"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress RSpectra]; };
-  vader = derive2 { name="vader"; version="0.1.1"; sha256="1fpz4mz5jvb46vfm3zaqrgxpi7r95wcmjlimm8zfqrblcmbva84r"; depends=[tm]; };
+  uwo4419 = derive2 { name="uwo4419"; version="0.3.0"; sha256="0hk5qhyarjxz7ngj5ak37vx0rak6xv0hfb4sdrsbci3kv5fqijv7"; depends=[DescTools dplyr ggplot2 gmodels haven magrittr psych RColorBrewer rio tibble tidyr]; };
+  uwot = derive2 { name="uwot"; version="0.1.10"; sha256="08vxh085wnrxgwy35ksb4cr7ccjvd98pyr2zlgarqryfgc1bdqbf"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress RSpectra]; };
+  vICC = derive2 { name="vICC"; version="1.0.0"; sha256="13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv"; depends=[coda ggplot2 nlme Rdpack rjags]; };
+  vacuum = derive2 { name="vacuum"; version="0.1.0"; sha256="0cmlvlz83gyga05g71hrnq4kpck9flq0qlhjviqqz9zrmljzin0x"; depends=[dplyr magrittr]; };
+  vader = derive2 { name="vader"; version="0.2.1"; sha256="1xjak5xlgpk0ds4l825kq90dg6kk5i5al5zmjqjqn8b7xdgix8mf"; depends=[tm]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; };
   vagalumeR = derive2 { name="vagalumeR"; version="0.1.6"; sha256="0zakpg5p9kif61d35as08f2dac3wncyvhpc83rqjp96g99wjf701"; depends=[dplyr httr jsonlite magrittr purrr stringr]; };
@@ -15672,13 +16360,13 @@ in with self; {
   valaddin = derive2 { name="valaddin"; version="1.0.0"; sha256="0dws2mcjpyw0jn0h6badhlnxg88c6mgzvcp2fjjrpr5mpcgps1c8"; depends=[lazyeval]; };
   valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; };
   validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; };
-  validate = derive2 { name="validate"; version="0.9.3"; sha256="0ckr4i75w503jxwghkmc7mi9b9z54gjipxl6limz4sry0py3lyl4"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="1.0.1"; sha256="0x4ryrjlkbr776pam55a1j78qxw7djm9ly552ghsfcx7lqgcmgh4"; depends=[settings yaml]; };
   validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   validatetools = derive2 { name="validatetools"; version="0.5.0"; sha256="10wardp2c70zx5ii940sjql3xh5p3vqxv4ayyifhhlr8vzvr5cj0"; depends=[lpSolveAPI validate]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
-  valr = derive2 { name="valr"; version="0.6.1"; sha256="1qxw6h63i2vfb2w6q453zzwk0ypma3xdwwpj15i06669vzgyy3bb"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; };
-  valueEQ5D = derive2 { name="valueEQ5D"; version="0.5.2"; sha256="0k5jjia24xf9fpj6mfp9a1kh8lp9frqw6fp87wiixrxp0ggp088m"; depends=[rstudioapi testthat]; };
+  valr = derive2 { name="valr"; version="0.6.2"; sha256="1vbp89zfylgih5acvw7lcx3a0dbbd7dhq7yhywr7kq02737qykdx"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; };
+  valueEQ5D = derive2 { name="valueEQ5D"; version="0.6.1"; sha256="1djsm30nfcz2si29yb44y5h8dlp5cxf61ippbrka5v8r56l9zpls"; depends=[rstudioapi testthat]; };
   valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; };
   vamc = derive2 { name="vamc"; version="0.2.1"; sha256="04kkli4xzf3gzvs215lzch8bl877cdq3awh3mz1k321zhsa1d0jn"; depends=[Rdpack]; };
   vampyr = derive2 { name="vampyr"; version="1.0.6"; sha256="1iqlb948wvwxf69588qz0hmc1fsmbqp058qbvrzx817w3mhjcs63"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments optimbase PCovR psych semPlot]; };
@@ -15695,47 +16383,50 @@ in with self; {
   varbvs = derive2 { name="varbvs"; version="2.5-16"; sha256="0pji7vqpbih01y7n0q6zpxhfszznzig4z3hmmpr4jqpdplv13x8d"; depends=[lattice latticeExtra Matrix nor1mix Rcpp]; };
   varclust = derive2 { name="varclust"; version="0.9.4"; sha256="0knmfq3pn38j8p29j6sqapdv3g5335si3gwiw932ml5z49a8ga5m"; depends=[doParallel doRNG foreach pesel RcppEigen]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.20.0"; sha256="0yrbgfcv2j05g60ywsx4p963vjnf87079x4714q35sx8sacy6f7g"; depends=[data_table foreach laeken MASS stringr surveyplanning]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.20.1"; sha256="0jqls76xhhxc5hppy3pq5wkj9gjx3g3pzfbhnis7k10ysn76a1qj"; depends=[data_table foreach laeken MASS stringr surveyplanning]; };
   varhandle = derive2 { name="varhandle"; version="2.0.5"; sha256="1l42d0s6fbjjc9l28a2m3myxkrx2c0p0b9yj8wjjjgilw19yc3lv"; depends=[]; };
+  variability = derive2 { name="variability"; version="0.1.0"; sha256="1nwb6jlkgzmnhkfcfww3gci5p9g21wwg4z78n8xiq6r760byaz67"; depends=[]; };
   variables = derive2 { name="variables"; version="1.0-3"; sha256="1x4w6pqrl6lw5dalii7kiq5f7jbfj1mlwdq2f6bvyfpx8byrvkqc"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
   variantspark = derive2 { name="variantspark"; version="0.1.1"; sha256="13hkp6l64hi7xlll09gin7kdlkqrkn0lggrw8147zy9ivhknhk59"; depends=[sparklyr]; };
   variosig = derive2 { name="variosig"; version="0.3-1"; sha256="09cxigii0sj78yqd18p4mm9jjqvd1k2cgjy43pxpmqdhia0q2pmv"; depends=[gstat sp testthat]; };
+  varitas = derive2 { name="varitas"; version="0.0.2"; sha256="16y0fcisdf4pypwqshy9c45v57axa25k8cpp1pr2ij95zycs3g1k"; depends=[assertthat doParallel dplyr foreach magrittr openxlsx stringr tidyr VennDiagram yaml]; };
   varjmcm = derive2 { name="varjmcm"; version="0.1.1"; sha256="1xgy3n57pxhv6wrsw9h4dranxbw6hdpm1f9ra3kwlzrpz5c3289x"; depends=[expm jmcm MASS Matrix]; };
   varrank = derive2 { name="varrank"; version="0.3"; sha256="0k7hz61ymxf7w2hh1v2yfb6qdjn68a8ckjfiw0jqqhjx4wh5crn7"; depends=[FNN]; };
   vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; };
   varsExplore = derive2 { name="varsExplore"; version="0.3.0"; sha256="0d18wqq7fbs5ljdphsdgqmv8ab0wrzzykjhf4lqksi7n78s1fa2r"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; };
   varycoef = derive2 { name="varycoef"; version="0.2.12"; sha256="16wadla399zjbl8khvvwm60mrg6b0wixlmq6hanvyvaarw4zwa8d"; depends=[optimParallel RandomFields sp spam]; };
+  vasicek = derive2 { name="vasicek"; version="0.0.3"; sha256="04g5dfn8zlm8n8sxmdq9xgkf0qbvvznqx27nyan268s5wlnnabd6"; depends=[mvtnorm]; };
   vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; };
   vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
   vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
-  vcd = derive2 { name="vcd"; version="1.4-7"; sha256="16aj688nhlcvdxzfsqh4s375v8f8vl8997dl8h1xg29b42nv52gc"; depends=[colorspace lmtest MASS]; };
+  vcd = derive2 { name="vcd"; version="1.4-8"; sha256="030yyhpzsj4ivwrla7p9kgvmyjh6b8fr7czf678ykxjj64ccnvr3"; depends=[colorspace lmtest MASS]; };
   vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; };
+  vcfR = derive2 { name="vcfR"; version="1.12.0"; sha256="0lhxb3ac4fafwik9q3cds46svzf0hyca8k54chw3dpk50c0zz1yx"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; };
   vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
-  vcpen = derive2 { name="vcpen"; version="1.7"; sha256="10z3zcz1g0csjdp072r48rkn4c9hpnb341xdljv5038z2nbx18fy"; depends=[knitr Rcpp RcppArmadillo]; };
-  vcr = derive2 { name="vcr"; version="0.5.4"; sha256="1wilihibpvy9pvf50wi9r5sh1lfdz9ddfxxslcl3lz7g2b0hyxkv"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; };
-  vcrpart = derive2 { name="vcrpart"; version="1.0-3"; sha256="10898qp3sh2cjcfz4ac2q98f3z2wmwd3zvhhcdlxw7xy5a1x8gib"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
-  vctrs = derive2 { name="vctrs"; version="0.3.2"; sha256="05s8v3ms4jaim44c7m4y0dnv8mysj9b26cdfyrfgcjpllayrjib2"; depends=[digest ellipsis glue rlang]; };
-  vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; };
+  vcpen = derive2 { name="vcpen"; version="1.8"; sha256="0ccbk9mki8lsxc6y327rg3yg0fbhlx44xkcv8jaxahhsg4dp8krd"; depends=[knitr Rcpp RcppArmadillo]; };
+  vcr = derive2 { name="vcr"; version="0.6.0"; sha256="0gp9wxi8zmwixiq8agzhba3abmb7a8zyy2plpavn34pp6cnka0f7"; depends=[base64enc cpp11 crul httr R6 urltools webmockr yaml]; };
+  vctrs = derive2 { name="vctrs"; version="0.3.6"; sha256="09ddxgzyah7lw42hn6n8fynsixf43s10jamsf94d2aidky63czfz"; depends=[digest ellipsis glue rlang]; };
+  vcvComp = derive2 { name="vcvComp"; version="1.0.2"; sha256="0mip0v8gv358aadc3b4913dcz27kscx3dv15nwns20pan5jvyhv2"; depends=[]; };
   vdar = derive2 { name="vdar"; version="0.1.3"; sha256="1nji97rcxp4v8pypx3z1265v85rb0yhw47i9cvacqmfxwk3hgpxj"; depends=[compositions]; };
-  vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; };
-  vdiffr = derive2 { name="vdiffr"; version="0.3.2.2"; sha256="0yz6dcbvhh9n87b4a3nm085hf2xa4dqnch7liq5468dgldzjmg53"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; };
+  vdg = derive2 { name="vdg"; version="1.2.1"; sha256="1jxqwg7k8ibzzdx8axhn2dx27j60qj0dlmczbfalll841ggigb45"; depends=[ggplot2 gridExtra proxy quantreg]; };
+  vdiffr = derive2 { name="vdiffr"; version="0.3.3"; sha256="0i0xdr8dakbkkgrhp0zvlnv3rxhc8h5naqq416mr5zv9q8i4p8jc"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; };
   vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
   veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; };
   vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; depends=[]; };
-  vectools = derive2 { name="vectools"; version="0.1.1"; sha256="0aysld5pzs6z073zc3cli5xzv4w1kp6b06qi57gacz7g24pjrjl4"; depends=[]; };
+  vectools = derive2 { name="vectools"; version="0.2.0"; sha256="005cgndfdzaglr02avmn2cgf3zrwxfkb280di738icriihn1nvg2"; depends=[]; };
   vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; };
-  vegan = derive2 { name="vegan"; version="2.5-6"; sha256="0g60rgn1i7wqf9pf5m1yki1m45gcp7i5hmjic0ci0f6vng70mh5k"; depends=[cluster lattice MASS mgcv permute]; };
+  vegan = derive2 { name="vegan"; version="2.5-7"; sha256="0aj6m9l1vkh32sar6fyvq4p8j4h2f2f347w1300qnzgaa5lmhfz6"; depends=[cluster lattice MASS mgcv permute]; };
   vegan3d = derive2 { name="vegan3d"; version="1.1-2"; sha256="01yyhrapdvs6rr5hw1ij4jnpz7mq005s35pn96snpy8ngn6ir386"; depends=[cluster rgl scatterplot3d vegan]; };
   vegawidget = derive2 { name="vegawidget"; version="0.3.1"; sha256="154k5n3vg1fdjx6mbrlxvi9h17h651aqwr12wiknwmw0ikhcrnh0"; depends=[assertthat glue htmltools htmlwidgets jsonlite magrittr rlang]; };
   vegclust = derive2 { name="vegclust"; version="1.7.7"; sha256="0f81jw429ib601lvbzi4q23kb5n6lvavlgw56wfqdmvvkl68vwlc"; depends=[circular Kendall MASS Rcpp sp vegan]; };
   vegdata = derive2 { name="vegdata"; version="0.9.8"; sha256="05sgmas7hlhxx2j95b4r5y2m6hhxa2cswy80bhs8lmjmy3yqyig6"; depends=[foreign plyr xml2]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
-  vegperiod = derive2 { name="vegperiod"; version="0.2.7"; sha256="0gvfgxg5dfx20h5fqvxxxk12imyn52p6p51wvkvbjnh7fwf7il7k"; depends=[]; };
+  vegperiod = derive2 { name="vegperiod"; version="0.3.0"; sha256="06s53k99f6by39bi1lvi0y5jqbf5b364rri102d3qnzd2mq81ahs"; depends=[]; };
   vegtable = derive2 { name="vegtable"; version="0.1.6"; sha256="04bil2v9krylnak9vbl4fahv75ca695a4sb4y82f99qlylzbdqm0"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; };
-  vein = derive2 { name="vein"; version="0.8.9"; sha256="1rrv4rayrx3y2y37mlacl9q3b63wbcnak3m7sbasp6bpjxhg57ag"; depends=[data_table sf units]; };
+  vein = derive2 { name="vein"; version="0.9.0.1"; sha256="1al4bj6n7kramrvzyylqpz2xg93lanvkjv4cya4zqaq7f6v8w65w"; depends=[data_table sf units]; };
   velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; };
-  vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
+  vembedr = derive2 { name="vembedr"; version="0.1.4"; sha256="1dgzl67z0mjvd4l53zvqmcqfim6g7nrfmbh709a30f3nghkx059k"; depends=[assertthat glue htmltools httr magrittr rlang stringr]; };
   venn = derive2 { name="venn"; version="1.9"; sha256="0d2vwjc932q8n9hww8krj7nixg1dfkmcw1k1cry2d0xdvbbnrj8r"; depends=[admisc]; };
   vennLasso = derive2 { name="vennLasso"; version="0.1.6"; sha256="0maydvx0qhdn5alqzqxjn485y9hw9qdr1xvgkmgwnjq59vni6d31"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; };
   venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
@@ -15745,8 +16436,9 @@ in with self; {
   vertexenum = derive2 { name="vertexenum"; version="1.0.2"; sha256="16ywz3z1kzhb3knhhi2i5igm3djdaaxyyrw69wkc5saa7ayhdb4y"; depends=[numbers]; };
   vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; };
   vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
-  vetr = derive2 { name="vetr"; version="0.2.10"; sha256="0zfnfi29gkgy1yvwz1zdszxbb7mc5yrzqcic1s7wr76d67mdqzh3"; depends=[]; };
+  vetr = derive2 { name="vetr"; version="0.2.12"; sha256="11xd8p945brj32lscfamvhc926rdx2jg9n2v5y4n0wdls8m3ljdl"; depends=[]; };
   vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; };
+  vfinputs = derive2 { name="vfinputs"; version="0.1.0"; sha256="10fh6ybsqy9xm7gwl0kska0pgk810sgq9kvf86gmnm0pmrcqzsdh"; depends=[htmltools jsonlite scales shiny]; };
   vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; };
   vhcub = derive2 { name="vhcub"; version="1.0.0"; sha256="04a8hdm4pxl8fzwy9q2wqc9q0dl5r49xwbid70yj9qlflh683id0"; depends=[Biostrings coRdon ggplot2 seqinr stringr]; };
   vhica = derive2 { name="vhica"; version="0.2.7"; sha256="0zz4sffhrvh9raxygxma5a2jijq8nw8wqg8bc486sd2ahlv8g3s8"; depends=[]; };
@@ -15755,13 +16447,14 @@ in with self; {
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
   viewshed3d = derive2 { name="viewshed3d"; version="3.2.0"; sha256="1qs597wivvzkdlls9r2hm6rprm3ssvk81my2nj7acczdh07fxmsv"; depends=[data_table lidR nabor pracma raster rgl sp viridis]; };
   vimp = derive2 { name="vimp"; version="2.1.0"; sha256="16dhvr1vcm5yca8rsscivdnk9yv9nhhfi1nbkal4gf3dy46anzb5"; depends=[dplyr magrittr MASS rlang ROCR SuperLearner tibble]; };
-  vinereg = derive2 { name="vinereg"; version="0.7.0"; sha256="1fviqzs879n7rin3b0jks8dfvcxiay8jssqy7salslghpj7rkm84"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; };
+  vindecodr = derive2 { name="vindecodr"; version="0.1.1"; sha256="0yvchdf90l8lkzyba5wrpma6vjcgf19li159s8s79y8sgp5pyx7p"; depends=[httr]; };
+  vinereg = derive2 { name="vinereg"; version="0.7.2"; sha256="00w4j20rcwvkvpnhqjhwfqdnxij4zgmfrjj191hagdg51bmczgvd"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; };
   vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; };
   violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
   violinplotter = derive2 { name="violinplotter"; version="1.0.1"; sha256="16kcz99w9avx99y5cnc5rn3dx367v1fmc8mlavjvfp8sy7m9x3lp"; depends=[]; };
   vioplot = derive2 { name="vioplot"; version="0.3.5"; sha256="0aiy615kn9lpr2cs757g3pklg81n01yhqh0wrwv111fn3cy86r0v"; depends=[sm zoo]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-  vip = derive2 { name="vip"; version="0.2.2"; sha256="14wvadkpzismszqc4qi15jaky1qlf1l4g33cbvpnzdqxmhi61x4g"; depends=[ggplot2 gridExtra magrittr plyr tibble]; };
+  vip = derive2 { name="vip"; version="0.3.2"; sha256="1qsvyfms79sn46jdmq7q5r0d6gwjqhr9pll1y776rx0bj7vx1ax5"; depends=[ggplot2 gridExtra magrittr plyr tibble]; };
   vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
   viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; };
   viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; };
@@ -15769,9 +16462,11 @@ in with self; {
   virtualNicheR = derive2 { name="virtualNicheR"; version="1.0"; sha256="1ya1nd30vm7kjc4468ra8fjyxdwq2i1l1lmajhqjvw0nsj0mh1bl"; depends=[devtools diptest]; };
   virtualPollen = derive2 { name="virtualPollen"; version="1.0.0"; sha256="16q1smwh3ryids3pa7lb4i4pxmjjyl449w6fikkrm9ybj1k8gfcf"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; };
   virtualspecies = derive2 { name="virtualspecies"; version="1.5.1"; sha256="0l86awcjq6i1lqax596xy5qfmzwiz3cwp2rczvgg37fdrym97cm3"; depends=[ade4 raster rworldmap sp]; };
+  virtuoso = derive2 { name="virtuoso"; version="0.1.5"; sha256="188z5n4sxpda4slszvzmf62jc60bx3viyrqafii2fg02hqavgfpr"; depends=[curl DBI digest fs ini odbc processx ps rappdirs]; };
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
   visNetwork = derive2 { name="visNetwork"; version="2.0.9"; sha256="0854r9znpjd9iy6j5bgrn20vj13dhp606gs3b6iy0rhym71ks2sy"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
   visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; };
+  viscomplexr = derive2 { name="viscomplexr"; version="1.1.0"; sha256="0r1lhvpbckcbfj60i7l4kflvhxdbimkany7y1ranj4h2pl79vx9x"; depends=[doParallel foreach plotrix Rcpp Rdpack scales]; };
   visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; };
   visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; };
   visreg = derive2 { name="visreg"; version="2.7.0"; sha256="070yhyxxh3w16i54k790n47bgcjn4b10b6g1z553x6afjc3l3a6d"; depends=[lattice]; };
@@ -15779,44 +16474,45 @@ in with self; {
   vistributions = derive2 { name="vistributions"; version="0.1.1"; sha256="1s68dpcy55v6yw7ivh2xpshz6qc0qaifjd15h7rjg3zl1cx81mh3"; depends=[ggplot2 magrittr shiny]; };
   visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; };
   visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; };
-  visvow = derive2 { name="visvow"; version="0.9.0"; sha256="0vpigwjk11z5zg2vlajyddmg9dv31qhnihldb2d0xji0mba8s2sm"; depends=[Cairo DT formattable ggdendro ggplot2 ggrepel MASS PBSmapping plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite tidyr WriteXLS]; };
+  visualpred = derive2 { name="visualpred"; version="0.1.0"; sha256="19jq9h9kiv4vbzqz8zrv5gqb1bprq5jy7mcxvdwpfnna2rja6q4z"; depends=[data_table dplyr e1071 FactoMineR gbm ggplot2 ggrepel magrittr MASS MBA mltools nnet pROC randomForest]; };
+  visvow = derive2 { name="visvow"; version="1.1.0"; sha256="1xrwa009v1chzp338jbcyf9bdlf3s1i829qj8zpshybwl0xz6gj1"; depends=[Cairo DT formattable ggdendro ggplot2 ggrepel MASS PBSmapping plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite tidyr WriteXLS]; };
   vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
-  vitae = derive2 { name="vitae"; version="0.2.2"; sha256="1flcrwww47w02rcaw7h1wi9dmdnvcw3zsiyvqp5mz9qz7ks3r0vx"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown xfun]; };
+  vitae = derive2 { name="vitae"; version="0.3.0"; sha256="0z5frvhsf7mgj3pr25jk4w0jnlgry06359ammikdq20lwmcjvx5n"; depends=[dplyr glue knitr pillar rlang rmarkdown tibble vctrs xfun yaml]; };
   vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; };
-  vivo = derive2 { name="vivo"; version="0.2.0"; sha256="1633ffq3hf1jnzmyfzz9ww65f9394688rw69n33sk1hbmvnh9l2j"; depends=[DALEX ggplot2 ingredients]; };
+  vivo = derive2 { name="vivo"; version="0.2.1"; sha256="1cfval06byviw7himr5nql34h4jaway9gb6dzya3v994p7v851cg"; depends=[DALEX ggplot2]; };
   vizdraws = derive2 { name="vizdraws"; version="1.0.0"; sha256="0d97xmpz06h1g3rmnpamwnisyi5jrxa35r19i9z0glqxhla9l2d2"; depends=[dplyr glue htmlwidgets magrittr stringr tidyr]; };
-  vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
-  vlad = derive2 { name="vlad"; version="0.2.0"; sha256="0bq91n51f9cnvbqskk0vg6xn559z3a33csbvyhvcvhyjcws2yahp"; depends=[Rcpp RcppArmadillo]; };
+  vkR = derive2 { name="vkR"; version="0.2"; sha256="1pk444fcw4yyv2dnfrw9vynbpc4gwr5yv9jd41djp9yipdf6d53l"; depends=[httr jsonlite purrr XML]; };
+  vlad = derive2 { name="vlad"; version="0.2.1"; sha256="0rm8fasmrrk380v6mqn85gpsg4wml43qdlizq7lpnhs4qb50sr7f"; depends=[BH checkmate dplyr magrittr Rcpp RcppArmadillo tidyr]; };
   vlda = derive2 { name="vlda"; version="1.1.5"; sha256="17xn8qqh043dm05ib3h4l1qx07wxncf5d06x9l1wl6jbkvnsm2nq"; depends=[dplyr ggiraph ggplot2 ggrepel ggsci]; };
   vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; };
   vmsbase = derive2 { name="vmsbase"; version="2.2.1"; sha256="1xxn0vm9r8kiix6whlc12r0wanf6acrl9a86h44nwm019xfmlfyp"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets2 gWidgets2RGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
   vocaldia = derive2 { name="vocaldia"; version="0.8.3"; sha256="1r28f2bwkkxjjv3qysdvp5v9gjrd4rz8l1zqd80qjnj552viy86z"; depends=[]; };
   volcano3D = derive2 { name="volcano3D"; version="1.0.1"; sha256="1mk7fi72qp07wxffqkgn87r4ws3b3cy9xv52yds30q9h796l4f82"; depends=[ggplot2 ggpubr ggrepel plotly]; };
-  volesti = derive2 { name="volesti"; version="1.1.1"; sha256="148b706licj0q7sai3xmyidr3f8mp68wm5kn10nclafjf4bcdxd8"; depends=[BH Rcpp RcppEigen]; };
+  volesti = derive2 { name="volesti"; version="1.1.2"; sha256="1g8vi0yal1rd0swmjaalnnm0syjdw75p6bsa8n4j957zqa055pgc"; depends=[BH Rcpp RcppEigen]; };
   volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; };
   voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; };
   vortexR = derive2 { name="vortexR"; version="1.1.7"; sha256="06i2rqbc3h2kv8jjrdlrg03xrzb3yiyzpnv2rvlkjcnn46f84bgf"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
   vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; };
   vosonSML = derive2 { name="vosonSML"; version="0.29.13"; sha256="0xajffifapn0sfnp39p8iv6hdxindzi7vywcwhla9h2hmvraad6w"; depends=[data_table dplyr Hmisc httpuv httr igraph jsonlite lubridate magrittr purrr RCurl rlang rtweet stringr textutils tibble]; };
-  vote = derive2 { name="vote"; version="1.2-1"; sha256="14bqmamndq5l7mfij8kfzk2lyrn0b52jgafgy9qb93qvk1fr5raz"; depends=[formattable knitr]; };
+  vote = derive2 { name="vote"; version="2.0-2"; sha256="0b2v62whnqnkf7s9bjwa2yfvw7hqv5vgzls681vrjpcwh51hv6rc"; depends=[data_table fields formattable knitr]; };
   voteogram = derive2 { name="voteogram"; version="0.3.1"; sha256="12xv0c3g4vr23c8adkk8z7m7sx31w5mjvdg9h4qbvaimb99p2r7z"; depends=[dplyr ggplot2 jsonlite scales]; };
   votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; };
   vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; };
-  vov = derive2 { name="vov"; version="0.1.1"; sha256="02bhm4fwaqqjz1vki7yzzg4ybw0w84a7wf7qyfyvigmdyrqrngy0"; depends=[glue htmltools shiny]; };
+  vov = derive2 { name="vov"; version="0.1.2"; sha256="0hbb9zj33a98rv4grm644k650pq6kgmm6l01mkd4p0ic0mxa9fyh"; depends=[glue htmltools shiny]; };
   vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; depends=[]; };
   vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; };
   voxel = derive2 { name="voxel"; version="1.3.5"; sha256="1xlym8xc22dq67h0lylrr16z7b4zdidpgrkvbs7n9fnkh6vijw2j"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti purrr]; };
   vpc = derive2 { name="vpc"; version="1.2.1"; sha256="0w73p8i4yf3m9r13476w90303nr307dw2y78zq8ydrcqrhn2fm47"; depends=[classInt dplyr ggplot2 MASS readr stringr survival tidyr]; };
-  vqtl = derive2 { name="vqtl"; version="2.0.5"; sha256="1sby1wi1lczs5cx97phq8dh15z68517rnw2zn5rzqa1399nmkkhf"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools iterators knitr lazyeval purrr qtl stringr testthat tidyr]; };
+  vprr = derive2 { name="vprr"; version="0.1.0"; sha256="0wxcaw6r56wd8sxr5xc10xbhg9cbfz82z4cn4x0w8qhrzwl4v0zl"; depends=[dplyr ggplot2 gridExtra gsw interp lubridate magick metR oce stringr tidyr usethis]; };
   vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; };
   vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
-  vroom = derive2 { name="vroom"; version="1.3.0"; sha256="18ndp453hfwvfxd6xzy0xbw9ll8s4q46dnr1biiqzh5rw70gwwzp"; depends=[bit64 cpp11 crayon glue hms lifecycle progress rlang tibble tidyselect vctrs withr]; };
+  vroom = derive2 { name="vroom"; version="1.3.2"; sha256="1w42mvpfpwxqjb3i697gcwyvaz99kw5953x4a6vjcdb5j4fjdlnw"; depends=[bit64 cpp11 crayon glue hms lifecycle progress rlang tibble tidyselect vctrs withr]; };
   vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
   vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; };
-  vsgoftest = derive2 { name="vsgoftest"; version="0.3-2"; sha256="020kghcfv8h0i7fzq3p2grhhbwvqmc9ya9r7lc1kiqg1bfgljg91"; depends=[fitdistrplus Rcpp]; };
+  vsgoftest = derive2 { name="vsgoftest"; version="1.0-1"; sha256="0vypi4cf04bljmx3jwq3ixs86ivd6p7a825ik189y71fyqg9g70v"; depends=[fitdistrplus Rcpp]; };
   vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; };
-  vtable = derive2 { name="vtable"; version="1.2.1"; sha256="1hdsm3qnahm2d38skv5qwzwxl5h6lbxak3wdi7ac9w846yfwlii1"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; };
-  vtreat = derive2 { name="vtreat"; version="1.6.1"; sha256="059g0w2dlh5axclnrr1j128ma0q406gkrqxwhb8jr45kqppbjcc8"; depends=[digest wrapr]; };
+  vtable = derive2 { name="vtable"; version="1.2.6"; sha256="18ak1j98kbjxp3sy3nmn7avary3cn39xy1nh2xzm3lmhc8i5n3vw"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; };
+  vtreat = derive2 { name="vtreat"; version="1.6.2"; sha256="0vxwkrfbxfbqpjla96ksi9r96r4h381smh2w2jpp3hkdrw1j0k05"; depends=[digest wrapr]; };
   vtree = derive2 { name="vtree"; version="5.0.0"; sha256="1sflc9zk6rllxrirdmzj5nlkmf8gax1fvnhqaggpjd3pyhhvi3y0"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny]; };
   vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; };
   vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; };
@@ -15832,54 +16528,59 @@ in with self; {
   wactor = derive2 { name="wactor"; version="0.0.1"; sha256="0dc7413jb3yz0nns2lc93w32wv6m4sg17j2ip63gc12vis0nf855"; depends=[ggplot2 Matrix R6 text2vec tibble tokenizers xgboost]; };
   waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
-  waiter = derive2 { name="waiter"; version="0.1.2"; sha256="0pcqwlzvsjagfy8lz2dzjlynpxabaffh7hn1blmsbxnqirc5gc6d"; depends=[crayon htmltools magrittr R6 rstudioapi shiny]; };
-  wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; };
-  waldo = derive2 { name="waldo"; version="0.2.0"; sha256="1p4dvlvvh51n61sspxqzn7v03rgmzym0kas1wkvxx3nv9y4p8qhd"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; };
-  walker = derive2 { name="walker"; version="0.4.1-3"; sha256="114dfrz4say3j4i53fxs83px10dy1c2aian212aygjr9w3csmj38"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS Rcpp RcppArmadillo RcppEigen rlang rstan rstantools StanHeaders]; };
+  waiter = derive2 { name="waiter"; version="0.1.3"; sha256="18xfdlrgayf587big0gphvmw9nkg856bsh6k5rdjagq2y7dfipr3"; depends=[crayon htmltools magrittr R6 rstudioapi shiny]; };
+  wakefield = derive2 { name="wakefield"; version="0.3.6"; sha256="1rssh6v8m6fim2pvm4cjw8cbni77bv5qp0rwi6vwdl3jhi5zws7n"; depends=[chron dplyr ggplot2 stringi]; };
+  wal = derive2 { name="wal"; version="0.0.1"; sha256="1qg80879kffqb821lgsd5mxg2irgnhbszyr8dq06y2xz5aqyhbk7"; depends=[freesurferformats imager jpeg png spacesXYZ]; };
+  waldo = derive2 { name="waldo"; version="0.2.3"; sha256="0lsw8p4wiggqm9fvh5vgmf0ms0npcg3hcwyzlg5ahv5yx4pv5fhz"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; };
+  walker = derive2 { name="walker"; version="0.5.0"; sha256="1nclwll3w6vak5fx7izlxrac5i5wsbgrxlr2a2gfcv70q009hk9i"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS Rcpp RcppArmadillo RcppEigen rlang rstan rstantools StanHeaders]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
-  wallace = derive2 { name="wallace"; version="1.0.6.2"; sha256="0qhy1m9imwqmb6lzgx25xqqyrlja13g4l96c6q9mn008kmljpn0n"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; };
+  wallace = derive2 { name="wallace"; version="1.0.6.3"; sha256="0qrgq1d7l75q5zz7chcdz379kpiqfh3jlqdw2pqdcs4vvpy5bnzc"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgbif rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; };
   wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; depends=[data_table prodlim riskRegression]; };
   walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; };
   walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; };
   wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; };
   warbleR = derive2 { name="warbleR"; version="1.1.24"; sha256="1hrp9yd1ny5krkv1bfvzhw0jm6r6qy52mzf0vb72cb62bay6rgfp"; depends=[dtw fftw monitoR NatureSounds pbapply RCurl rjson seewave tuneR]; };
-  warp = derive2 { name="warp"; version="0.1.0"; sha256="16bmym91h0sbbh4iqasqs0f4kp3jqlm3sqgc356mznhxwnsm8dm2"; depends=[]; };
+  warp = derive2 { name="warp"; version="0.2.0"; sha256="0s0acddc5h14245hi1faycxp0fyvw6nlgaz2df7da4fpyd2f638f"; depends=[]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
-  washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; };
+  washdata = derive2 { name="washdata"; version="0.1.3"; sha256="0m7rwwi189sbsv3144x14jqmfax30f6ri1pisy47yggmmjpdplps"; depends=[]; };
   washeR = derive2 { name="washeR"; version="0.1.2"; sha256="0sb5sgwf7y9sd291qfj1az3x6h6gmznnnsdmqizkmv2xz9029rxz"; depends=[gplots]; };
-  wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
   waspr = derive2 { name="waspr"; version="1.0.0"; sha256="0rs7h9pjiqq7as5k7yrj3phn6lgdl7dzyirbmk2jjp7mw9iqhy9i"; depends=[BH Rcpp RcppArmadillo]; };
   water = derive2 { name="water"; version="0.8"; sha256="0qglf922dlgi41jzz3sivq7ckmzl8axqjfg4klcgnddycmm3ha5j"; depends=[raster rgdal sp]; };
   waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; };
   waterYearType = derive2 { name="waterYearType"; version="1.0.1"; sha256="09brbqcd41khycz9lhn84w68wpk8lsdnzb6lzc10gm5s5ambgj06"; depends=[]; };
   waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; };
   waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; };
-  waterquality = derive2 { name="waterquality"; version="0.2.2"; sha256="1hl0mndwbin026w9250llxmss5w9yykvrf1fgkslnyw1ln9pbqyn"; depends=[raster rgdal]; };
-  wavScalogram = derive2 { name="wavScalogram"; version="1.0.0"; sha256="0j3dj32rxqsrc4gwssj7n224j7q4c4pahixw8b0p9xakx93q54id"; depends=[abind colorRamps fields Matrix zoo]; };
-  waveband = derive2 { name="waveband"; version="4.7"; sha256="0b57g7jwvqgqjzd7x1pd4nqpx22rmiskvf8wjwrgplqzx4daxny2"; depends=[wavethresh]; };
+  waterquality = derive2 { name="waterquality"; version="0.2.6"; sha256="0386sd772l6vm5pdjj21i5byc6673hwbdixm0av6nc82pqf524xr"; depends=[caret dplyr magrittr pingr purrr raster rgdal vctrs]; };
+  wavScalogram = derive2 { name="wavScalogram"; version="1.1.0"; sha256="0gfzap17dzbqrilfdaphxzddpra5ss88vnl59s6jr55cg018d2xl"; depends=[abind colorRamps fields Matrix zoo]; };
+  waveband = derive2 { name="waveband"; version="4.7.1"; sha256="1ja8jfvv790s6ih50iz6zykpq06dbzqi28cp8vyqcd1iz2bkdixp"; depends=[wavethresh]; };
   waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; };
   waveformlidar = derive2 { name="waveformlidar"; version="1.2.0"; sha256="1dq8f9vafby3ay5qc1fvrw8h8qjjydk7fz7s5nbkm1bdhvj6smw2"; depends=[caTools data_table flux minpack_lm raster reshape2 rgdal rgeos sp splitstackshape sqldf]; };
   wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; };
   wavelets = derive2 { name="wavelets"; version="0.3-0.2"; sha256="07706rsjdmzj46ib2kfm5lfk4bnm2wfw7rby0ixs6x0myyzxdl92"; depends=[]; };
   wavemulcor = derive2 { name="wavemulcor"; version="3.1.0"; sha256="1f7idj8vjnssh6s2h4vji1jlpf55hp4zvv5wsi2c9w7iyxwlhs5n"; depends=[plot3D RColorBrewer waveslim]; };
   waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; };
+  waves = derive2 { name="waves"; version="0.1.0"; sha256="1piv4qyfsms2y8rz9q4fffwci2fvhzqz151pa1w6avd78rrjbj2b"; depends=[caret dplyr ggplot2 magrittr pls prospectr randomForest rlang spectacles stringr tidyr tidyselect wesanderson]; };
   waveslim = derive2 { name="waveslim"; version="1.8.2"; sha256="0ibivnhz0l06sss5rrrcvyiwg3qpbyk3qn4vx4pp90kj09x4yg0k"; depends=[]; };
   wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; };
+  wayback = derive2 { name="wayback"; version="0.2.4"; sha256="11h5bvalsdb3wwlybmplnd315y9jkb33pfhlc0231vhbcy9xkczz"; depends=[checkpoint]; };
   wbs = derive2 { name="wbs"; version="1.4"; sha256="0ibrf30riavy6shaxgiznwh4gmnkx92260gsl0d74jkys98mlxdj"; depends=[]; };
   wbsd = derive2 { name="wbsd"; version="1.0.0"; sha256="16jhimsq8symf6f2awczqkaqkdmlkzhmgk01iimhkvqlx8g2v219"; depends=[Rcpp RcppEigen]; };
-  wbstats = derive2 { name="wbstats"; version="1.0.1"; sha256="15wcd3f7cjjgksa0ryzbj7wyzwifimxn5c3gnyrks8pwlmbyvqkx"; depends=[dplyr httr jsonlite lifecycle lubridate readr stringr tibble tidyr]; };
+  wbstats = derive2 { name="wbstats"; version="1.0.4"; sha256="1va3lrksr5zg4k729xvbh176f8zcp9vfrvwxcp04znyh1rvmh6vz"; depends=[dplyr httr jsonlite lifecycle lubridate magrittr readr rlang stringr tibble tidyr]; };
   wbsts = derive2 { name="wbsts"; version="2.1"; sha256="07h3wqmb9ya878fwdj49r0npks0pnd3jlnzri1cmf27c691hwka4"; depends=[mvtnorm Rcpp wavelets]; };
+  wcep = derive2 { name="wcep"; version="1.0.0"; sha256="1hpakygvh3b64i5hwkriwq5g8vnvghvgdj0jn9m59j43050k32cy"; depends=[coin dplyr progress tidyr]; };
   wdm = derive2 { name="wdm"; version="0.2.2"; sha256="1pidlfp67x3wnmkp0qgna4vz29qx09xsy7gfbqzrjqkdi7q1dihi"; depends=[Rcpp]; };
   wdman = derive2 { name="wdman"; version="0.2.5"; sha256="1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02"; depends=[assertthat binman processx semver yaml]; };
-  wdpar = derive2 { name="wdpar"; version="1.0.3"; sha256="1kig7adsvvnhkvrhc5ij79vapcn31hb06v6vs3y6n8265n2nq0ac"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman xml2]; };
+  wdpar = derive2 { name="wdpar"; version="1.0.6"; sha256="1vsijgwr2ck304yldhw1n5szqfc26s4h072x6yk7nc1ivshfls5c"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman xml2]; };
+  weathercan = derive2 { name="weathercan"; version="0.4.0"; sha256="1fgc4sqg82jqs2zn1nj0ihsqyf7lp99jnxzdymgd1mglwbnq4b5d"; depends=[dplyr httr lubridate memoise purrr readr rlang rvest stringi stringr tidyr tidyselect xml2]; };
   weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; };
   weatherr = derive2 { name="weatherr"; version="0.1.3"; sha256="14w7kkja3a1zmdc7l084iprx1czqgdfjzjc29wdlwzmaiq02c4d3"; depends=[ggmap lubridate RJSONIO XML]; };
   webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; };
-  webchem = derive2 { name="webchem"; version="1.0.0"; sha256="1c4n0kx8fxxrz5263lkkdmgz24akg28mjhc0cmaqbwm6mllz48r6"; depends=[data_tree dplyr httr jsonlite purrr RCurl rvest stringr tibble xml2]; };
+  webchem = derive2 { name="webchem"; version="1.1.0"; sha256="1vaghhr9k9sq50882ga5dckgjspyqfsrp9n0dglm9cqdbk3gyl7i"; depends=[base64enc data_tree dplyr httr jsonlite purrr RCurl rlang rvest stringr tibble xml2]; };
   webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; };
   webex = derive2 { name="webex"; version="0.9.1"; sha256="0z85cfnjicy3q1n77ilrh43h6xh6bpr1f1iinzfk1r64031h90yl"; depends=[jsonlite knitr rmarkdown]; };
-  webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; };
-  webmockr = derive2 { name="webmockr"; version="0.6.2"; sha256="1mf0f1pb5dkk63m7a63k7pscax6dywz97d2ihsg10qkv0svn2sm6"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; };
+  webfakes = derive2 { name="webfakes"; version="1.1.1"; sha256="1d86aa5cgdbpj7vgvyghjsjjqjyfarnz0rh64i9r692j62yc45j0"; depends=[]; };
+  webglobe = derive2 { name="webglobe"; version="1.0.3"; sha256="0gbg4pai4cn7hdc1943aqpx4bn3vgc82zp93a1wl6bmmajv1da4b"; depends=[geojsonio httpuv jsonlite]; };
+  webmockr = derive2 { name="webmockr"; version="0.7.4"; sha256="0ya9j2c744glyx13vm2m86znlvwl0iy9zc5vhffr684b7wxw7y8g"; depends=[base64enc crul curl fauxpas jsonlite magrittr R6 urltools]; };
   webp = derive2 { name="webp"; version="1.0"; sha256="1h17g2zaq6ipsb1w6ix9m68ddmp7dspmaqflqkskylh2n8jhk8cd"; depends=[]; };
   webr = derive2 { name="webr"; version="0.1.5"; sha256="03yhlla74i71nphrfhr5sd57ykj7rjanh2a8nw3cq22rg9g668jk"; depends=[dplyr flextable ggforce ggplot2 magrittr moonBook psych purrr rlang rrtable scales shiny sjlabelled stringr tibble tidyr tidyselect vcd ztable]; };
   webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; };
@@ -15890,7 +16591,7 @@ in with self; {
   webutils = derive2 { name="webutils"; version="1.1"; sha256="16a6ds0fnb6y8i1r9ba1hf1ydb53am57s070b3hi5jmrs84b9qik"; depends=[curl jsonlite]; };
   wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; };
   weco = derive2 { name="weco"; version="1.2"; sha256="1prk8hn782pd8g2rbbaj7y10vjimqs9n8i4rab6aw6fc3k759d6b"; depends=[]; };
-  wedge = derive2 { name="wedge"; version="1.0-3"; sha256="17w6987b8yh6gxsfn5vchzha8fznyganqp92zxc96h9iv7b40kkj"; depends=[magrittr partitions permutations spray]; };
+  weibull4 = derive2 { name="weibull4"; version="0.1.0"; sha256="065rxwljgjfkxapin3yc1xvk102rl8hcwdqfnps1wbfmrb5yrgj4"; depends=[]; };
   weibullness = derive2 { name="weibullness"; version="1.19.8"; sha256="19s44mxxcnhngifxshsyjr3a9zvbwywmqgby5dxd73yid1p2k9mr"; depends=[]; };
   weibulltools = derive2 { name="weibulltools"; version="1.0.1"; sha256="06blip2dqaz2f3wnghp8yj0qj23s242k3r7bfcka1n52msc58xjz"; depends=[dplyr LearnBayes magrittr plotly Rcpp RcppArmadillo sandwich segmented SPREDA survival]; };
   weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; };
@@ -15900,22 +16601,23 @@ in with self; {
   weights = derive2 { name="weights"; version="1.0.1"; sha256="1ka2kvzg464vn80qziqy4mrciy9wwd3jfasgq0d33wbiblhmxkj5"; depends=[gdata Hmisc mice]; };
   weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; };
   welchADF = derive2 { name="welchADF"; version="0.3.2"; sha256="02a8w1dhc2nd74hml4z3cdlx0d2a9rcx47v341kgav620i8bn88g"; depends=[lme4]; };
-  wellknown = derive2 { name="wellknown"; version="0.6.0"; sha256="156kffa421d6k9wnab4pr22h4c9gnkw3i2fbk5jg03jl2rff090w"; depends=[jsonlite V8]; };
+  wellknown = derive2 { name="wellknown"; version="0.7.0"; sha256="1y185mrp1jk6nhw4w0vvav1llqgp2alwsmdzai711x7v2hyb8jpm"; depends=[BH jsonlite Rcpp wk]; };
   wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; };
   wevid = derive2 { name="wevid"; version="0.6.2"; sha256="1ranmqhgfkrky7r4qk563n9nlz2syn3vj85lmfajq01csadzjdpl"; depends=[ggplot2 mclust pROC reshape2 zoo]; };
   wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
   wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
-  wflo = derive2 { name="wflo"; version="1.5"; sha256="1k9iyyr15hzbsram1246zb415hgwg8kr15zp78q9b6yf3yr46kmb"; depends=[]; };
+  wflo = derive2 { name="wflo"; version="1.6"; sha256="04qxm1vvmgxbpj1wwj7n48klhsprkj774jnj4qfhqza33mhymydb"; depends=[emstreeR plotrix progress raster rgdal sp]; };
   wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; };
   wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; };
+  whSample = derive2 { name="whSample"; version="0.9.2"; sha256="1xyb0fa7c2haa1gpfq0zgx65igy235pnd6lcvclczysf72fd4vy3"; depends=[data_table dplyr magrittr openxlsx purrr]; };
   whatr = derive2 { name="whatr"; version="1.0.1"; sha256="1nnrirm0c5b053jk5l5gkrwmx4i7y2xgbwbs5qcba61s5w4n4h2x"; depends=[dplyr ggplot2 httr magrittr purrr rlang rvest scales stringr tibble tidyr xml2]; };
   wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; };
   whereami = derive2 { name="whereami"; version="0.1.9"; sha256="0mjq9haacsf0zkgh7xxx8dr67hnw5ijjdhaz8c69mfjmd2zfzfwq"; depends=[cli jsonlite rstudioapi]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
   whisker = derive2 { name="whisker"; version="0.4"; sha256="1a7vz0dk95xfjvi38wbpw8vmf5qn3g8p490msz2rw0piwidmk1ks"; depends=[]; };
   whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; };
-  whitening = derive2 { name="whitening"; version="1.1.1"; sha256="0madrdy2pvr7q4lhznw2kyhs7x927npwmpqwfwkv6v5c4zv7mbjp"; depends=[corpcor]; };
+  whitening = derive2 { name="whitening"; version="1.2.0"; sha256="08j49kpbybw8j25ckzvbzqxigqzdxb56lryi06kbzcja0mlzrhvb"; depends=[corpcor]; };
   whitestrap = derive2 { name="whitestrap"; version="0.0.1"; sha256="1jcnxqxvkhyz9j6jay5834ncv5fxb9qiyyyj3b8al75mqknmn8ra"; depends=[]; };
   whoami = derive2 { name="whoami"; version="1.3.0"; sha256="19fwl7z55s4kl2xzwqwh8iwg13kdrv222vyl3kibxgwrjcjwj2y2"; depends=[httr jsonlite]; };
   whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; };
@@ -15925,25 +16627,25 @@ in with self; {
   widyr = derive2 { name="widyr"; version="0.1.3"; sha256="1mkgkn5lf3q9i3fhkz6v9lxl68kwhjn6bwxi3ks1v3njbsacnkay"; depends=[broom dplyr Matrix purrr reshape2 rlang tidyr tidytext]; };
   wiesbaden = derive2 { name="wiesbaden"; version="1.2.3"; sha256="0bk73zfs97sk38c2wg83dp5n6ssy0fxzppvl16zb0fj798q8lvd7"; depends=[httr jsonlite keyring readr stringi stringr xml2]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-  wikifacts = derive2 { name="wikifacts"; version="0.4"; sha256="1ln0ffrsxlqmhnqfwk6rkss3spx6svpndm6vgxyhgjfhgk1qh293"; depends=[curl magrittr rvest xml2]; };
+  wikifacts = derive2 { name="wikifacts"; version="0.4.1"; sha256="0pj4fspcaamffkxmdv40xh6v1sfb2p5gds0mdi9dgw1xvclvh6lg"; depends=[curl magrittr rvest xml2]; };
   wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="2.1.6"; sha256="11ng7qsb4954mgsz55ix86z0ynh4xgflcp6dzl0y4zi6zdrj87i7"; depends=[ggplot2 glue hellno httr pageviews rvest stringr xml2]; };
-  wikisourcer = derive2 { name="wikisourcer"; version="0.1.5"; sha256="0a69p17fq1iw55vn1rc76xb9q5s60a4x0i7lyx6abz7wxi7gzbvi"; depends=[curl httr magrittr purrr rvest tibble urltools xml2]; };
   wikitaxa = derive2 { name="wikitaxa"; version="0.4.0"; sha256="1z7p7dwgl8x4ambwss5dqlp4zgz52mgj0vhx2bqwizarmx9ji1xs"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; };
   wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; };
   wildlifeDI = derive2 { name="wildlifeDI"; version="0.3.0"; sha256="1aqiazrr2sp76777m0isscainhdnn9qp87dwpr4cspk7grbsa53k"; depends=[adehabitatLT rgeos sp]; };
   wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; };
   wilson = derive2 { name="wilson"; version="2.4.0"; sha256="0cb9s7v2c0isp4z8rjxdyzn26k8h6h2z956lznl971hm786pq7z9"; depends=[circlize colourpicker ComplexHeatmap data_table DESeq2 DT factoextra FactoMineR ggplot2 ggrepel gplots heatmaply log4r openssl plotly plyr R6 RColorBrewer reshape rintrojs rje rjson RJSONIO scales shiny shinycssloaders shinydashboard shinyjs shinyWidgets viridis zip]; };
   winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; };
-  windAC = derive2 { name="windAC"; version="1.2.2"; sha256="0z8d1zqmrfsfj57gsc5znj8pzxqzs6cs4ygrns3qx5j8z6fwbr32"; depends=[mvtnorm sf]; };
-  windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
-  windfarmGA = derive2 { name="windfarmGA"; version="2.2.3"; sha256="13jdh0c8lkc3043mnqx23s06xxkf6dvk7w9kfvwhib58rlgy0p2n"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; };
+  winch = derive2 { name="winch"; version="0.0.6"; sha256="1mjkbji4618f4sf4hj2lsc6r62pjlvzsvncql9ihcjj52mih9j29"; depends=[procmaps]; };
+  windAC = derive2 { name="windAC"; version="1.2.4"; sha256="1b41jh1bl0kljr07pwg07cw6qxg5iawjhmj1001fl7jd7pxf90kn"; depends=[mvtnorm sf]; };
+  windex = derive2 { name="windex"; version="2.0"; sha256="1w9z7jykac9kb0d5q77hq553bv1da676rsk8928bzls5fwmvbqr3"; depends=[ape geiger phangorn scatterplot3d]; };
+  windfarmGA = derive2 { name="windfarmGA"; version="2.3.0"; sha256="0iw5r2q42i8lnjj92jwgpqlkspz82yh1rgkh2i11m3rpnddvkk22"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; };
   winfapReader = derive2 { name="winfapReader"; version="0.1-1"; sha256="027jqnb91xdrp3aibhfbjx0wb5lcfzsxi8ychjifzja5f22qd6zw"; depends=[lubridate]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiqid = derive2 { name="wiqid"; version="0.3.0"; sha256="0jqnlyw5iljpm7135fgnkwjvxmbjbqiqq6lchwnjmhbb5xd3kbvr"; depends=[coda HDInterval MASS mcmcOutput plotrix truncnorm]; };
   wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; };
-  withr = derive2 { name="withr"; version="2.2.0"; sha256="10mmfffjbnb2zq5x0kqhhb4z6va4micc6pjzvlfji34gyhffa8ac"; depends=[]; };
-  wk = derive2 { name="wk"; version="0.3.2"; sha256="18zswapxi1fncjx33xg8awwi853z52m08c45hza10pbzi02rsnwr"; depends=[Rcpp]; };
+  withr = derive2 { name="withr"; version="2.3.0"; sha256="1837vjp35npjrnis1im5xrwj1swpgnms00gkjiz7296l8yckrh1c"; depends=[]; };
+  wk = derive2 { name="wk"; version="0.3.3"; sha256="0myyzab808r1i2cdj1zpyrml8xvywak8f589b1yi337wc2q9x9cd"; depends=[Rcpp]; };
   wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; };
   wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; };
   wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; };
@@ -15951,26 +16653,27 @@ in with self; {
   wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
   wmm = derive2 { name="wmm"; version="1.0.0"; sha256="0f46a69vcz1cb4qmz68gf8h0hq5amilsp9h4gmacmprad49n702g"; depends=[]; };
   wmwpow = derive2 { name="wmwpow"; version="0.1.3"; sha256="03rd75r4wih1w7srhnwqxjkirisb43y1sd2f1wzixqj8lq0dmb25"; depends=[lamW MASS smoothmest]; };
-  wnl = derive2 { name="wnl"; version="0.6.0"; sha256="0mlwl63dr5mhhri628phcrhbv776pdhf7h3ag5jcxy9mqsc0i4xg"; depends=[numDeriv]; };
+  wnl = derive2 { name="wnl"; version="0.6.1"; sha256="0p9hhg6bd2q8li7npjyakl7sr74v9534cplqypp7jgy9pl3wi100"; depends=[numDeriv]; };
   wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; };
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
   woeBinning = derive2 { name="woeBinning"; version="0.1.6"; sha256="0x890h5fh59n54587adyzphr956fkg3px8i7c378aq1fs7k35gxs"; depends=[]; };
-  woeR = derive2 { name="woeR"; version="0.2.1"; sha256="1k918j19iiri22scg16hb28wymf2nsr8yyz7qfg6mfvnif7im2sm"; depends=[dplyr]; };
   womblR = derive2 { name="womblR"; version="1.0.4"; sha256="0yjz4nymhqq6aqvxf0a90bw3hi1zqz1zp3mxbv2ns5v5ygh2a10p"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
   wooldridge = derive2 { name="wooldridge"; version="1.3.1"; sha256="0471x3vszf1c4fj9pk5ix8bdmp2bnq1ghnqvwzad9chvvkpzmg3l"; depends=[]; };
-  worcs = derive2 { name="worcs"; version="0.1.3"; sha256="0w9nxdf40vmkqw0l5c293kbypa4wwhbhfvif8h8nqnz9ryznphkv"; depends=[digest gert prereg ranger rmarkdown rticles yaml]; };
+  worcs = derive2 { name="worcs"; version="0.1.6"; sha256="1d5qynq1g5qpnlcdlfiwda9sj7nvscc9ag4a5x0ndp1099a2zagv"; depends=[digest gert prereg ranger rmarkdown rticles yaml]; };
   word_alignment = derive2 { name="word.alignment"; version="1.1"; sha256="0inlq96j4zkjncz2v66amz91l5y3b5lx49qi2jg6jbqdldw7aa02"; depends=[data_table openxlsx]; };
-  word2vec = derive2 { name="word2vec"; version="0.2.1"; sha256="10kly2d6g0abxz8r81jah1bgbjigysmyyqhmwljkl1gkwkirrqf7"; depends=[Rcpp RcppProgress]; };
-  wordbankr = derive2 { name="wordbankr"; version="0.3.0"; sha256="0aa1gz3fg7h9wnk93ialwj0wjyk8wxani8galwkrms4fp7d5lmf4"; depends=[assertthat DBI dbplyr dplyr purrr rlang RMySQL robustbase stringr tidyr]; };
+  word2vec = derive2 { name="word2vec"; version="0.3.3"; sha256="0ljwxm825is91xkqk64p97xk61kzc8ahvsk31ycjim90rf77grlp"; depends=[Rcpp RcppProgress]; };
+  wordbankr = derive2 { name="wordbankr"; version="0.3.1"; sha256="14ryaa25abm24wi2gyp0prxsnx1n5f4298zmzjlr08pj0sp7lgv7"; depends=[assertthat DBI dbplyr dplyr purrr quantregGrowth rlang RMySQL robustbase stringr tidyr]; };
   wordcloud = derive2 { name="wordcloud"; version="2.6"; sha256="0j96yyvm6bcrrpbdx4w26piqx44a0vbsr3px9cb4zk8a8da6jwak"; depends=[RColorBrewer Rcpp]; };
   wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; };
   wordgraph = derive2 { name="wordgraph"; version="0.1.0"; sha256="06q42sjdj7i680zqx66hsvrpmkrlcyxnvsk1lygnqhlv97ycl3vv"; depends=[dplyr ggplot2 ggraph plyr purrr tibble tidygraph]; };
   wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
-  wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; };
+  wordnet = derive2 { name="wordnet"; version="0.1-15"; sha256="158c5fps4kvfd9mj1im8jb9rv7ipfshyagrv0q3b55ywnkrkvjqb"; depends=[rJava]; };
+  wordpressr = derive2 { name="wordpressr"; version="0.1.1"; sha256="1lfrlybakl1virrpb9za16pvadpjrqg2ch1wyw1b8blr165x83zx"; depends=[dplyr glue httr magrittr purrr tibble tidyr]; };
+  wordsalad = derive2 { name="wordsalad"; version="0.2.0"; sha256="18kgwq6f9ymm1bmbvpmxq9gz5fx0qj64439scr21kk1cvsfl4y88"; depends=[fastTextR text2vec tibble word2vec]; };
   wordspace = derive2 { name="wordspace"; version="0.2-6"; sha256="11y57mzd12klwd2xzr38nvlrxg9jsi33mxd8nnvc96hgrjsgwakl"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
   workflowr = derive2 { name="workflowr"; version="1.6.2"; sha256="0m3aq9xxbk4xmqsb59xil56610hgw53gm80z28mq594mhfdh0g3l"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker xfun yaml]; };
-  workflows = derive2 { name="workflows"; version="0.1.3"; sha256="1d5njd1xdl8kghlbar4acgl9hxq83p6k7yks592cvakmcz7f853m"; depends=[cli ellipsis generics glue hardhat parsnip rlang]; };
-  worldmet = derive2 { name="worldmet"; version="0.9.0"; sha256="0wzp3c58kig5r1p2bb6c47z90ldyp18y6cjrsjbxs34i2v4nb6jc"; depends=[doParallel dplyr foreach leaflet openair readr tidyr zoo]; };
+  workflows = derive2 { name="workflows"; version="0.2.1"; sha256="1mk0pnmpqlhf143mvj9rwvjrrshirz6s83s5hbfalhnyw7hzkfb9"; depends=[cli ellipsis generics glue hardhat parsnip rlang tidyselect]; };
+  worldmet = derive2 { name="worldmet"; version="0.9.2"; sha256="13b0apxmd2j7w8rqgyn61c7hvzv2yyqhkyd63rmhzdvnbpkbwaw2"; depends=[doParallel dplyr foreach leaflet openair purrr readr tidyr zoo]; };
   worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; };
   worrms = derive2 { name="worrms"; version="0.4.2"; sha256="1gpbyplfpcrapmci8axarrjjijsgh2dmhnsn79g1lhrafvm2ichs"; depends=[crul data_table jsonlite tibble]; };
   wosr = derive2 { name="wosr"; version="0.3.0"; sha256="0fl9mizrjg3r7n7gslsxgaw3k2v63scqmvnv6341q8sq7018hzln"; depends=[httr jsonlite pbapply xml2]; };
@@ -15983,18 +16686,20 @@ in with self; {
   wppExplorer = derive2 { name="wppExplorer"; version="2.3-4"; sha256="1pbmjg6y543aih8mxf9njfwpm090virhgqf8w0a5yx0jdfjwmz04"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; };
   wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
-  wrGraph = derive2 { name="wrGraph"; version="1.0.2"; sha256="1agi16ybn1nh0y2k8sfi3ns5iy0w5mmrp60vpk1k47z0859yg724"; depends=[RColorBrewer wrMisc]; };
-  wrMisc = derive2 { name="wrMisc"; version="1.3.0"; sha256="0fsrq7ypv2y637g7sqwg0xjdbqn97m71ff0h0b06wbpkr91z2wja"; depends=[MASS]; };
-  wrProteo = derive2 { name="wrProteo"; version="1.1.3"; sha256="1lyq650770xfhb4jkn14qshy45fy9j3vmqdbdss1g9v7d33hl21n"; depends=[knitr limma rmarkdown wrMisc]; };
+  wrGraph = derive2 { name="wrGraph"; version="1.1.1"; sha256="05zi0j1z30hrf8d2720x7qc87l50x3fyhy0admiz0gag1cv50ras"; depends=[RColorBrewer wrMisc]; };
+  wrMisc = derive2 { name="wrMisc"; version="1.5.0"; sha256="1gy0v5silqfndv9myzxvx2gwxj8c3asnqvf65szjyihdfbn75m3k"; depends=[MASS]; };
+  wrProteo = derive2 { name="wrProteo"; version="1.3.0"; sha256="1mcj2llkpph14z2kkl924hjs9rizf62fgzhbkd0s79kshhqcjq87"; depends=[knitr limma rmarkdown wrMisc]; };
+  wrTopDownFrag = derive2 { name="wrTopDownFrag"; version="1.0.2"; sha256="1rdg6rzjz2h514i3c8z89mvj2j3h1s7rr5fry2mq3xvrwrgd3738"; depends=[wrMisc wrProteo]; };
   wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="2.0.2"; sha256="01yjrzz7nkp3a4w3171lpmyysl3apb5fmwy3dg98l1f03mkhk5za"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="2.0.6"; sha256="161lwmbcc38abayl249cbghss24j6dff0i044w83nsnnq3g9kzn5"; depends=[]; };
   wrassp = derive2 { name="wrassp"; version="0.1.9"; sha256="09z8s0g6l9z4rwnf36w4bd734agd471swz3f24178b4j6m05kqhm"; depends=[tibble]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
-  writexl = derive2 { name="writexl"; version="1.3"; sha256="0lah0r2pd996s0vdbi614j3h52dbxmifha6f19v53p2b7fr32wjd"; depends=[]; };
+  writexl = derive2 { name="writexl"; version="1.3.1"; sha256="1njdhvh8605wd2j8glrbxfyc36p2n88prpq080jn44s9lgfmbgsb"; depends=[]; };
   wrswoR = derive2 { name="wrswoR"; version="1.1.1"; sha256="1q0nc08q8f3kl9yvcivzylykk1ar5j5dw3ian2y9nrzgzri5l10i"; depends=[logging Rcpp]; };
   wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.2.1"; sha256="0zr6x8d69n72xlad7fw3sa9rqqpii9lylm1rlccrmalhgmzl68ii"; depends=[curl lazyeval]; };
-  wru = derive2 { name="wru"; version="0.1-9"; sha256="0xrm3f1khggcvdzzk65mnbfcyji3kjz8hrk9d2n4y15nhpbw8p8h"; depends=[devtools]; };
+  wru = derive2 { name="wru"; version="0.1-10"; sha256="1ss5h7fk69cxd7k8aiw53ysn88n0s287c89yzyqsgs05a1mr9lwv"; depends=[devtools]; };
   wsbackfit = derive2 { name="wsbackfit"; version="1.0-3"; sha256="06y868c04sbcrfm6ba33j1y8yjri3yjblzl0cicjrkjk34mi9j4g"; depends=[]; };
+  wsjplot = derive2 { name="wsjplot"; version="0.1.0"; sha256="1vgf823j3ychdnvg4nq59ah4rkv5lpwbg0r7sijir2b18sgxsrbi"; depends=[dplyr ggplot2 magrittr scales stringr]; };
   wskm = derive2 { name="wskm"; version="1.4.40"; sha256="0x5nc3bwqawx0k95v088dsx83dm7lw5lkryjvq6bl57bgrcn7n0l"; depends=[fpc lattice latticeExtra]; };
   wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; };
   wsyn = derive2 { name="wsyn"; version="1.0.2"; sha256="0jl0wnw11yrbiygcpcnl1yi8xf5dd3sbh0c2yic8dc0p64k6iass"; depends=[fields MASS]; };
@@ -16008,7 +16713,7 @@ in with self; {
   wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.16"; sha256="1f8yd1pkk9aamsx2x59jpa5jgq03hnbf9zrs1ah010sn3l51v1yr"; depends=[crayon data_table digest R6 stringr tidyr wyz_code_offensiveProgramming]; };
   wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.17"; sha256="1hl6gqxpxa3fyzc01i37g9il4vc6z339iir4228yz7ky1x85xjna"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; };
   x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; };
-  x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; };
+  x12 = derive2 { name="x12"; version="1.9.3"; sha256="05dzf38vlf73bmwdjs6w32d0b91cs6zgdmg7afw9gs36qfi5fahn"; depends=[stringr x13binary]; };
   x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
   x13binary = derive2 { name="x13binary"; version="1.1.39-2"; sha256="1if8yayvn6rr98gwp0ypmlk3d9fjf0b9kxir2iwha506aslq70xp"; depends=[]; };
   x3ptools = derive2 { name="x3ptools"; version="0.0.2"; sha256="1a3vdljd51kvd70mq9cr84r536zmby7vkd36a02z2sxabq03cl9s"; depends=[assertthat digest png rgl xml2 zoo]; };
@@ -16016,31 +16721,31 @@ in with self; {
   xROI = derive2 { name="xROI"; version="0.9.17"; sha256="1yidrfqgz4sd8jpq7a4hvcjh7npbg54xnzxjmn8pdgrlzv71dyib"; depends=[colourpicker data_table jpeg lubridate moments raster RCurl rgdal rjson shiny shinyjs sp stringr tiff]; };
   xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; };
   xSub = derive2 { name="xSub"; version="3.0.1"; sha256="0c3jc801pn85wm17jj911spryg6p3gq19im1506zkv8lqwsy1nab"; depends=[countrycode haven RCurl]; };
-  xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; };
-  xaringan = derive2 { name="xaringan"; version="0.16"; sha256="1jdj8qkadb09x7kvf93h4mp8gxk6lda8aspldhdki9qqpdc78gc8"; depends=[htmltools knitr rmarkdown servr xfun]; };
+  xVA = derive2 { name="xVA"; version="0.8.5"; sha256="1scn7acp69k80q9ksygj7ns9937yim8iwhpi54ygm28h20jnfllr"; depends=[SACCR Trading]; };
+  xaringan = derive2 { name="xaringan"; version="0.19"; sha256="11jdr9iylxnq4gn9hp2i4zv0f89hkdhq3xdaw63a8pdg9znzn5ks"; depends=[htmltools knitr rmarkdown servr xfun]; };
   xaringanthemer = derive2 { name="xaringanthemer"; version="0.3.0"; sha256="0vb4z4w90fpdxxq46z089g4dh7r8jk73mcd63rxwnqaaqr09pxr4"; depends=[colorspace glue purrr whisker]; };
   xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; };
   xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; };
   xergm_common = derive2 { name="xergm.common"; version="1.7.8"; sha256="03mjpafwfkmyj5ba84jydap9rp0i602izjlbd511xbxcw6dx2k0b"; depends=[ergm network]; };
   xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; };
-  xfun = derive2 { name="xfun"; version="0.16"; sha256="1x7b71xhbl44fyccz69l24nbgyxawm2km90s4h1l3zr5z2vly0sg"; depends=[]; };
+  xfun = derive2 { name="xfun"; version="0.19"; sha256="15yyigkl1g9w9d7097hrm94dxn1af333ywr5xdw78qqrw6npn0iv"; depends=[]; };
   xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; };
-  xgboost = derive2 { name="xgboost"; version="1.1.1.1"; sha256="13njhcxljhbcs37ni6r5174fk8kx9b5p7rlw1an1ak3w92jn56cq"; depends=[data_table magrittr Matrix stringi]; };
+  xgboost = derive2 { name="xgboost"; version="1.2.0.1"; sha256="16hpvv2hwdzcyg90z7c1g5d2hj011qk8mivy4l2nqd2g7rkjwis4"; depends=[data_table magrittr Matrix stringi]; };
   xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
   xgxr = derive2 { name="xgxr"; version="1.0.9"; sha256="1hci16ly4wzrjyfa7chwn6nnwlfnq77ix2w3gwrvlgfcjisbcsq1"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; };
   xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; };
   xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; };
   xlink = derive2 { name="xlink"; version="1.0.1"; sha256="02ahgjampy92gcwhv269px5w8651a7j50dn1295zwqxj44lk4g9q"; depends=[survival]; };
   xlsimple = derive2 { name="xlsimple"; version="1.0.5"; sha256="1snamzq6yljiqakqd6492ylznr9kfl8w0lnaayfn14fk3w03skck"; depends=[XLConnect]; };
-  xlsx = derive2 { name="xlsx"; version="0.6.3"; sha256="0ph3bqngczm2h46s159s6cpxjkcrsi1di8a325x2wl5ls7mbiag5"; depends=[rJava xlsxjars]; };
+  xlsx = derive2 { name="xlsx"; version="0.6.5"; sha256="01r1ngdm51w18bdan8h94r91m731knkf04zal4g67mx3fpa5x31p"; depends=[rJava xlsxjars]; };
   xlsx2dfs = derive2 { name="xlsx2dfs"; version="0.1.0"; sha256="0bdawr80grks91sy221d33fsk75g20zh3wjg6gvd0zj0m1zvvwvd"; depends=[openxlsx]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
-  xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; };
   xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
-  xmeta = derive2 { name="xmeta"; version="1.1-5"; sha256="1r2mqrrcl7vmbyydw3kzpskinkiqr919bxgq69i1y6pbfim7jzag"; depends=[aod glmmML metafor mvmeta numDeriv]; };
+  xmeta = derive2 { name="xmeta"; version="1.2-1"; sha256="1clyf4jscr23zvj81i8vvyqdkpx3rd35apwj2i2yc7yzmfvqw92w"; depends=[aod glmmML MASS metafor mvmeta numDeriv plotrix]; };
   xml2 = derive2 { name="xml2"; version="1.3.2"; sha256="1kx400v62xkd5xal7rzz7jcarz94ac8g1sh4i2dqr78qwgkzj8nz"; depends=[]; };
   xml2relational = derive2 { name="xml2relational"; version="0.1.0"; sha256="03blvks4z7n4wxz5zbrn6c3a3l4hy9clcjpb834pc07ssz3c2v3g"; depends=[fs lubridate rlang stringr tidyr xml2]; };
-  xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; depends=[]; };
+  xmlconvert = derive2 { name="xmlconvert"; version="0.1.1"; sha256="18jr2666s7kjqrmvrwf82dkryzrw284cj993y3cgmxchb7w0fhir"; depends=[httr lubridate readr stringr tibble xml2]; };
+  xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.4"; sha256="177vfyjrqfi3wam8scpsradap1lv35yc25xq745dr7gabg116yrq"; depends=[]; };
   xmlr = derive2 { name="xmlr"; version="0.1.2"; sha256="00mxdb4899sx5py0ngzh3dvhz1sqsar2hmsrkm4jf0b3q9psc86w"; depends=[]; };
   xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; };
   xmrr = derive2 { name="xmrr"; version="1.1.1"; sha256="1kb4kzxb9rcx9fp1answln0sv9c3wdrk82gz79k0i9ypq7dls2ah"; depends=[dplyr ggplot2 purrr qpdf rlang tibble tidyr]; };
@@ -16051,12 +16756,11 @@ in with self; {
   xplain = derive2 { name="xplain"; version="0.2.2"; sha256="152a83ckmhns6yniy87mmjva5bkv5x3phv63l1kkcmrr9bclfgz0"; depends=[httr RCurl readr XML]; };
   xplorerr = derive2 { name="xplorerr"; version="0.1.1"; sha256="17h8z9rmqkmm6lm9gipa33mr7zxpzd5xbjk251592mwr79lwsh8n"; depends=[magrittr shiny]; };
   xpose = derive2 { name="xpose"; version="0.4.11"; sha256="1m5h7la7zr28q2610c7wadzwllyywya2vxa7pifjs3fml940lybj"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; };
-  xpose4 = derive2 { name="xpose4"; version="4.7.0"; sha256="0lpbk85d17spg6vwf7acqaz7fv2l0rv6qkczbgm4fw28qiaykci6"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; };
+  xpose4 = derive2 { name="xpose4"; version="4.7.1"; sha256="0y2ws8cq2waiikxw2y34s3qinaq5f832k5nglif3avd8gp2fpn3q"; depends=[dplyr gam Hmisc lattice lazyeval readr survival tibble]; };
   xptr = derive2 { name="xptr"; version="1.1.3"; sha256="0352vs8dz61hgpwnf3r9r9haz3adg2wk9qxzrv313p1fcyfjz91v"; depends=[]; };
   xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; };
   xrf = derive2 { name="xrf"; version="0.2.0"; sha256="0hzplp2rbsbnmqpvf7ycjzbyf59iabzsppf13xwypdjxyr7f910l"; depends=[dplyr fuzzyjoin glmnet Matrix rlang xgboost]; };
   xrnet = derive2 { name="xrnet"; version="0.1.7"; sha256="136aadrvsdg9hizjg4q12h56ih0s3w88j3jpfb54ajgdmqw3pldi"; depends=[BH bigmemory foreach Rcpp RcppEigen]; };
-  xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; };
   xslt = derive2 { name="xslt"; version="1.4.2"; sha256="08iw0s1b8fcsw3hqzxc4mxfbw121c7ajf05nr6gbj996sr033qqr"; depends=[Rcpp xml2]; };
   xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; };
   xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; };
@@ -16065,7 +16769,7 @@ in with self; {
   xtensor = derive2 { name="xtensor"; version="0.11.1-0"; sha256="1l9216z46m45vnc69j4qx336ln82qgpagi5m9qa5pabvcpz9b23p"; depends=[Rcpp]; };
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
   xtreg2way = derive2 { name="xtreg2way"; version="1.0.0"; sha256="0wllz0frakmadavgpqhd2b8fiw6wgwh5wzd270czc6cm5bq9gfng"; depends=[MASS Matrix pracma]; };
-  xts = derive2 { name="xts"; version="0.12-0"; sha256="0q4cc8ynp7ndmgll1jj3lxyl6wmgg89ad3wq09kjc2ngszdfc4fz"; depends=[zoo]; };
+  xts = derive2 { name="xts"; version="0.12.1"; sha256="0b6a7mpyk9aw6axas7nz01gadczprwwfhii01fz31z26z555i06n"; depends=[zoo]; };
   xtune = derive2 { name="xtune"; version="0.1.0"; sha256="0bpf1cx7v7q0a1jip04xd0bjg9ilagrf7wg7a9y0m6wgw7s2b9jn"; depends=[glmnet selectiveInference]; };
   xwf = derive2 { name="xwf"; version="0.2-3"; sha256="1byj6vjk2abm9j919107xsa3nd40zbsvxaldvv4ml3c47k1fg3kc"; depends=[mgcv]; };
   xxIRT = derive2 { name="xxIRT"; version="2.1.2"; sha256="0b8yv8ixmcjiv9hlvpfdknx815smy7df7f2ixifnvhxxafgf1fwq"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; };
@@ -16073,11 +16777,12 @@ in with self; {
   xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; };
   yaImpute = derive2 { name="yaImpute"; version="1.0-32"; sha256="1zvkrmlj48ahg9jq0fkbn7j603fmmld57yc0gjfas2mqa7cfbvh8"; depends=[]; };
   yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; };
-  yager = derive2 { name="yager"; version="0.1.0"; sha256="01gxpaf4wvii056xn84m9gkq46m7hxqgg5f2frakhgnlpm3afgfb"; depends=[lhs MLmetrics randtoolbox]; };
+  yager = derive2 { name="yager"; version="0.1.1"; sha256="178ypdr3f0w9rb4ci8q2hshr62b7993m8q6zxc4pf0msq175n1ml"; depends=[lhs MLmetrics randtoolbox]; };
   yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
   yaml = derive2 { name="yaml"; version="2.2.1"; sha256="10r7g26x73am45niigm3k466030nymnr3v3fjljafzrr5aybf58i"; depends=[]; };
-  yamlet = derive2 { name="yamlet"; version="0.4.8"; sha256="1p6p20lpagm62xfkvhy1fya3ypxbpza29gmls63a3ry2nir8zadp"; depends=[csv dplyr encode ggplot2 rlang spork units xtable yaml]; };
-  yap = derive2 { name="yap"; version="0.1.0"; sha256="12cagxisky7aq04ab9ycd4mp7xfs7z0v3rc2sczcngn2pc8pdjm7"; depends=[lhs randtoolbox]; };
+  yamlet = derive2 { name="yamlet"; version="0.5.2"; sha256="0vm87jp44myg118sc9712imrz83nhfwxabnjkzi8a36hdiyhpq80"; depends=[csv dplyr encode ggplot2 rlang spork units xtable yaml]; };
+  yamlme = derive2 { name="yamlme"; version="0.1.0"; sha256="0834rfc2d9awdvj9xirxywjhkh2nvp7fy68rd7l3yzz14rfv8c40"; depends=[knitr testthat]; };
+  yap = derive2 { name="yap"; version="0.1.1"; sha256="0m126vpfvlmwkpy14i9wbzr51hb8r6s3wcdm3vp9izfccpnxfxl2"; depends=[lhs randtoolbox]; };
   yardstick = derive2 { name="yardstick"; version="0.0.7"; sha256="1yrvlhn4gxyn9f20z5yv3xam0j0a8z362jwa32r33r0g0jk5z2fq"; depends=[dplyr generics pROC rlang tidyselect]; };
   yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; };
   yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; };
@@ -16091,7 +16796,8 @@ in with self; {
   yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; };
   ymlthis = derive2 { name="ymlthis"; version="0.1.2"; sha256="01jfkf9ymj8p0gvcd491i7rfaw3mj101jqbkbxmwhv7rl4r2vmql"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; };
   yonder = derive2 { name="yonder"; version="0.2.0"; sha256="1ilzn17w6skd0dhwxyrgnfzyazafp8hsi8q6pfxz6k16cd668mc0"; depends=[htmltools magrittr shiny]; };
-  yorkr = derive2 { name="yorkr"; version="0.0.9"; sha256="1yl6snk2qw8in4bd1gc32qzk10baqnwzxyamnyj7p39vqi8vr12p"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
+  yorkr = derive2 { name="yorkr"; version="0.0.12"; sha256="1kmwnhk2n8y2y7cynffkxl8ac4n4d4srwfsfblnyfn4r1g6l2wrl"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
+  yotover = derive2 { name="yotover"; version="0.3.2"; sha256="1alfw005k17830xgqa18hvyc1q058d9znjcc6kp2f6d0hc9mwjzb"; depends=[broom cli crayon DBI dbplyr dplyr duckdb ggplot2 httr lmtest magrittr Matrix msm purrr rappdirs rstudioapi sandwich tibble tidyr]; };
   youtubecaption = derive2 { name="youtubecaption"; version="1.0.0"; sha256="15cafl7b03xrql2y2ayy6ajf6v764wym3xqs4pbzlf6ncy8qwl5r"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; };
   ypr = derive2 { name="ypr"; version="0.5.1"; sha256="15544gyxzavbamjfjsiq662c9y2zkfxn14a481318358sdhln5vn"; depends=[chk ggplot2 lifecycle purrr scales yesno]; };
   yuima = derive2 { name="yuima"; version="1.9.6"; sha256="1iqcv6m2lbdnpkcmgbmjhdn233pq3b2g6s9naiq3ks0fyv04zpar"; depends=[boot cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; };
@@ -16099,40 +16805,41 @@ in with self; {
   yum = derive2 { name="yum"; version="0.0.1"; sha256="1q8yxn18nia7jh6g2016hxm81d2jak8pwylr6nai9kfynv9wri0g"; depends=[yaml]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
   zCompositions = derive2 { name="zCompositions"; version="1.3.4"; sha256="15cfqk1vzamz66y9idnrwxlrp2sirkp44gwkcmia4s13x5pwh8mf"; depends=[MASS NADA truncnorm]; };
-  zFactor = derive2 { name="zFactor"; version="0.1.9"; sha256="1x0cfcmnmpb8dq6wn6538ghlz9cm00grv54dj91hvb09i96cp95x"; depends=[covr data_table dplyr ggplot2 knitcitations logging rootSolve tibble tidyr]; };
+  zGPS_AO = derive2 { name="zGPS.AO"; version="0.1.0"; sha256="18dqssnj4gch1yg0qvrj4j2ry95sy6a9z8yz2zi8nzhhsj8dz1qq"; depends=[doParallel doRNG dplyr foreach ggplot2 hrbrthemes MASS plotly pscl questionr viridis]; };
   zTree = derive2 { name="zTree"; version="1.0.6"; sha256="1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv"; depends=[plyr]; };
   zalpha = derive2 { name="zalpha"; version="0.2.0"; sha256="0wyk4smrch5c0jnzi8z0in1hcbfsddgw4n28dljj917wyg5cnmqd"; depends=[]; };
   zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; };
-  zcurve = derive2 { name="zcurve"; version="1.0.0"; sha256="14a07yn4wjj29kx33g7mnlsky0jg8zj1hs9r9hn0i0yv4jfdl5jl"; depends=[evmix nleqslv Rcpp Rdpack]; };
+  zcurve = derive2 { name="zcurve"; version="1.0.7"; sha256="0v3lk11my8a8y9zbjb2ii35i5vfhlhvsh597zqlvq4div1a81rh4"; depends=[evmix nleqslv Rcpp Rdpack]; };
+  zdeskR = derive2 { name="zdeskR"; version="0.1.0"; sha256="1445bkngmv6zzw5vxd3jfwcp8hv5mjs6h9rignndznlax0szv80n"; depends=[dplyr httr jsonlite magrittr plyr purrr tibble tidyr tidyselect]; };
   zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; };
-  zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; };
+  zebu = derive2 { name="zebu"; version="0.1.3.0"; sha256="1rlcrvhic110h8r0mqwhkzq8w566jfymxpcwv63bvs7fd8j98vsv"; depends=[foreach ggplot2 iterators plyr reshape2]; };
   zeitgebr = derive2 { name="zeitgebr"; version="0.3.5"; sha256="1h2zx3ah1xdyyag40ragrv7gvpnlzqmappbnjp971dn9khqdxfqs"; depends=[behavr data_table lomb pracma WaveletComp]; };
-  zen4R = derive2 { name="zen4R"; version="0.3"; sha256="029wjw0bay9p4fgd4rnmqzhrpn5q2azx0w9fvlr4mcsnwzjk9kib"; depends=[httr jsonlite R6 rvest xml2]; };
+  zen4R = derive2 { name="zen4R"; version="0.4-2"; sha256="0wbh12frr75rcb4rjk6jymrjr6jaixik5br61bhmnax1hhwkp3k3"; depends=[httr jsonlite keyring R6 xml2]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
+  zenplots = derive2 { name="zenplots"; version="1.0.3"; sha256="0nazbivb3cz2ccswnffi31i8l32iqprpzrf5v7iazw9s40c6nxrq"; depends=[graph loon MASS PairViz]; };
   zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; };
   zetadiv = derive2 { name="zetadiv"; version="1.2.0"; sha256="0068k5i0dvii3dckgis5424xb7sqqq9s670vgfavc0vncnlycxqk"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
   zfit = derive2 { name="zfit"; version="0.1.0"; sha256="0r6qdygpqd06vmfvj68ksxm3bz0jgalczr6rngcr4xl2mkb1cn38"; depends=[magrittr]; };
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
-  zip = derive2 { name="zip"; version="2.1.0"; sha256="1dfsagb7bx35x4zx6f5xk2sk057fbyhskkpw3w72b805cjw920da"; depends=[]; };
+  zip = derive2 { name="zip"; version="2.1.1"; sha256="0b3wmbx5v0i1scylgk4nli2ljg4p12wx7a1sqljklv9969wl3p8i"; depends=[]; };
   zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; };
   zipangu = derive2 { name="zipangu"; version="0.2.1"; sha256="0jqr9byzdz6k0prdsr7d6yk0d8d412hplg9iclgfdx2cj1kk6w7r"; depends=[dplyr lifecycle lubridate magrittr purrr rlang stringi stringr tibble]; };
-  zipfR = derive2 { name="zipfR"; version="0.6-66"; sha256="0fjqa9a4z2p21ywy8h3pg0gwq4gwzjnrl78kn1nswly3w637574h"; depends=[]; };
+  zipcodeR = derive2 { name="zipcodeR"; version="0.2.0"; sha256="1zm5pikjdnw9n9dlxrnxkgn9j3ixpmbs46lf75ik98nck8ndkrr3"; depends=[dplyr rlang stringr]; };
+  zipfR = derive2 { name="zipfR"; version="0.6-70"; sha256="15ng7rj7qbgxajx8jb9kv04xmbidg9wwzxr2xaskmlaxrxlqac8c"; depends=[]; };
   zipfextR = derive2 { name="zipfextR"; version="1.0.2"; sha256="03rlvvw7rfbhsbwd5njmgkkkrxq1lgjdydmpkn6h1hi97pc0gbhh"; depends=[copula tolerance VGAM]; };
   ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; };
-  zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; };
+  zoeppritz = derive2 { name="zoeppritz"; version="1.0-8"; sha256="1711szx9zz17q6pfinyzlyrw7m9772c8ywlixqar2l165bkjalgm"; depends=[]; };
   zoib = derive2 { name="zoib"; version="1.5.4"; sha256="10hv5li1l9gm1bl3k3c9qcmzkqa4ri0kccrsgw1mn8ddn11g9m0a"; depends=[abind coda Formula matrixcalc rjags]; };
   zoltr = derive2 { name="zoltr"; version="0.5.1"; sha256="12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar"; depends=[base64url dplyr httr jsonlite magrittr MMWRweek mockery readr rlang webmockr]; };
   zonator = derive2 { name="zonator"; version="0.6.0"; sha256="1plxchpd4ypp36phl13pi9yvlrqi3lk83lv5rldrhdqynhcgfw2k"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; };
   zoo = derive2 { name="zoo"; version="1.8-8"; sha256="1rrw431jwaxd9xljp73f15rhcxvwc0xlyrmr0ghi5fj7a03c932f"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };
-  zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; };
-  zoocat = derive2 { name="zoocat"; version="0.2.0.1"; sha256="0rdjgf1gvnixqwxrnvzswb53yzcvjgvfkrms6d38bhfyw320kgdp"; depends=[plyr reshape2 scales zoo]; };
   zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; };
   zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
   zoon = derive2 { name="zoon"; version="0.6.5"; sha256="02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap sp testthat]; };
   zscorer = derive2 { name="zscorer"; version="0.3.1"; sha256="0aijhs0fyird5gq68x4dxchb02mxa7ijk10k9zjhngghxbjj7iqn"; depends=[shiny]; };
-  ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; };
+  ztable = derive2 { name="ztable"; version="0.2.2"; sha256="0wxcdb7yp2r6w5iznz1k49npp5sn4jiybfcj30s3198hkcnv0r8y"; depends=[flextable magrittr officer RColorBrewer rstudioapi scales stringr]; };
   ztpln = derive2 { name="ztpln"; version="0.1.1"; sha256="18rbfdp22jaxg4nkqzj2393nhjdl1gzv4xhmr6aci76ymdixsfnl"; depends=[DistributionUtils mixtools Rcpp RcppEigen RcppNumerical]; };
   ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; };
   zyp = derive2 { name="zyp"; version="0.10-1.1"; sha256="03cxpkfbhrx1fy8l0dl9a13ghz93cqq6877wa8rig09ksdiivaw9"; depends=[Kendall]; };
diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix
index 292653d75e51..e827c9b807fd 100644
--- a/nixpkgs/pkgs/development/r-modules/default.nix
+++ b/nixpkgs/pkgs/development/r-modules/default.nix
@@ -237,7 +237,7 @@ let
     BayesSAE = [ pkgs.gsl_1 ];
     BayesVarSel = [ pkgs.gsl_1 ];
     BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ];
-    bigGP = [ pkgs.openmpi ];
+    bigGP = [ pkgs.mpi ];
     bio3d = [ pkgs.zlib ];
     BiocCheck = [ pkgs.which ];
     Biostrings = [ pkgs.zlib ];
@@ -246,7 +246,7 @@ let
     Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
     Cardinal = [ pkgs.which ];
     chebpol = [ pkgs.fftw ];
-    ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
+    ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ];
     cit = [ pkgs.gsl_1 ];
     curl = [ pkgs.curl.dev ];
     data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
@@ -257,12 +257,13 @@ let
     fftwtools = [ pkgs.fftw.dev ];
     Formula = [ pkgs.gmp ];
     gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ];
-    git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ];
+    git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ];
     GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp.dev ];
     graphscan = [ pkgs.gsl_1 ];
     gsl = [ pkgs.gsl_1 ];
+    gert = [ pkgs.libgit2 ];
     haven = [ pkgs.libiconv pkgs.zlib.dev ];
     h5vc = [ pkgs.zlib.dev ];
     HiCseg = [ pkgs.gsl_1 ];
@@ -279,12 +280,12 @@ let
     mvabund = [ pkgs.gsl_1 ];
     mwaved = [ pkgs.fftw.dev ];
     ncdf4 = [ pkgs.netcdf ];
-    nloptr = [ pkgs.nlopt pkgs.pkgconfig ];
+    nloptr = [ pkgs.nlopt pkgs.pkg-config ];
+    n1qn1 = [ pkgs.gfortran ];
     odbc = [ pkgs.unixODBC ];
     pander = [ pkgs.pandoc pkgs.which ];
-    pbdMPI = [ pkgs.openmpi ];
-    pbdNCDF4 = [ pkgs.netcdf ];
-    pbdPROF = [ pkgs.openmpi ];
+    pbdMPI = [ pkgs.mpi ];
+    pbdPROF = [ pkgs.mpi ];
     pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ];
     pdftools = [ pkgs.poppler.dev ];
     phytools = [ pkgs.which ];
@@ -308,14 +309,14 @@ let
     RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
     Rhdf5lib = [ pkgs.zlib ];
-    Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
+    Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.mpi pkgs.pcre.dev ];
     Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.lzma.dev pkgs.curl.dev ];
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
     Rlibeemd = [ pkgs.gsl_1 ];
     rmatio = [ pkgs.zlib.dev ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
-    Rmpi = [ pkgs.openmpi ];
+    Rmpi = [ pkgs.mpi ];
     RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
     RNetCDF = [ pkgs.netcdf pkgs.udunits ];
     RODBC = [ pkgs.libiodbc ];
@@ -330,7 +331,8 @@ let
     rtiff = [ pkgs.libtiff.dev ];
     runjags = [ pkgs.jags ];
     RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ];
-    rzmq = [ pkgs.zeromq ];
+    rzmq = [ pkgs.zeromq pkgs.pkg-config ];
+    clustermq = [ pkgs.zeromq ];
     SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
     sdcTable = [ pkgs.gmp pkgs.glpk ];
     seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
@@ -380,40 +382,47 @@ let
     rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
     robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
     SparseM = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
+    hexbin = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
     svKomodo = [ pkgs.which ];
     nat = [ pkgs.which ];
     nat_templatebrains = [ pkgs.which ];
     pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
+    clustermq = [  pkgs.pkg-config ];
     RMark = [ pkgs.which ];
     RPushbullet = [ pkgs.which ];
     RcppEigen = [ pkgs.libiconv ];
     RCurl = [ pkgs.curl.dev ];
-    R2SWF = [ pkgs.pkgconfig ];
+    R2SWF = [ pkgs.pkg-config ];
     rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ];
-    RGtk2 = [ pkgs.pkgconfig ];
-    RProtoBuf = [ pkgs.pkgconfig ];
-    Rpoppler = [ pkgs.pkgconfig ];
-    XML = [ pkgs.pkgconfig ];
-    cairoDevice = [ pkgs.pkgconfig ];
-    chebpol = [ pkgs.pkgconfig ];
-    fftw = [ pkgs.pkgconfig ];
-    gdtools = [ pkgs.pkgconfig ];
+    RGtk2 = [ pkgs.pkg-config ];
+    RProtoBuf = [ pkgs.pkg-config ];
+    Rpoppler = [ pkgs.pkg-config ];
+    XML = [ pkgs.pkg-config ];
+    cairoDevice = [ pkgs.pkg-config ];
+    chebpol = [ pkgs.pkg-config ];
+    fftw = [ pkgs.pkg-config ];
+    gdtools = [ pkgs.pkg-config ];
     jqr = [ pkgs.jq.lib ];
-    kza = [ pkgs.pkgconfig ];
-    magick = [ pkgs.pkgconfig ];
-    mwaved = [ pkgs.pkgconfig ];
-    odbc = [ pkgs.pkgconfig ];
-    openssl = [ pkgs.pkgconfig ];
-    pdftools = [ pkgs.pkgconfig ];
-    sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ];
-    showtext = [ pkgs.pkgconfig ];
-    spate = [ pkgs.pkgconfig ];
-    stringi = [ pkgs.pkgconfig ];
-    sysfonts = [ pkgs.pkgconfig ];
-    systemfonts = [ pkgs.pkgconfig ];
-    tesseract = [ pkgs.pkgconfig ];
-    Cairo = [ pkgs.pkgconfig ];
-    Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ];
+    kza = [ pkgs.pkg-config ];
+    magick = [ pkgs.pkg-config ];
+    mwaved = [ pkgs.pkg-config ];
+    odbc = [ pkgs.pkg-config ];
+    openssl = [ pkgs.pkg-config ];
+    pdftools = [ pkgs.pkg-config ];
+    sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ];
+    showtext = [ pkgs.pkg-config ];
+    spate = [ pkgs.pkg-config ];
+    stringi = [ pkgs.pkg-config ];
+    sysfonts = [ pkgs.pkg-config ];
+    systemfonts = [ pkgs.pkg-config ];
+    tesseract = [ pkgs.pkg-config ];
+    Cairo = [ pkgs.pkg-config ];
+    CLVTools = [ pkgs.gsl ];
+    JMcmprsk = [ pkgs.gsl ];
+    mashr = [ pkgs.gsl ];
+    hadron = [ pkgs.gsl ];
+    AMOUNTAIN = [ pkgs.gsl ];
+    Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ];
     tcltk2 = [ pkgs.tcl pkgs.tk ];
     tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ];
     gridGraphics = [ pkgs.which ];
@@ -478,7 +487,6 @@ let
     "Demerelate"
     "detrendeR"
     "dgmb"
-    "DivMelt"
     "dpa"
     "DSpat"
     "dynamicGraph"
@@ -498,14 +506,12 @@ let
     "forensim"
     "FreeSortR"
     "fscaret"
-    "fSRM"
     "gcmr"
     "geomorph"
     "geoR"
     "georob"
     "GGEBiplotGUI"
     "gnm"
-    "GPCSIV"
     "GrapheR"
     "GroupSeq"
     "gsubfn"
@@ -580,7 +586,6 @@ let
     "RcmdrPlugin_orloca"
     "RcmdrPlugin_plotByGroup"
     "RcmdrPlugin_pointG"
-    "RcmdrPlugin_qual"
     "RcmdrPlugin_ROC"
     "RcmdrPlugin_sampling"
     "RcmdrPlugin_SCDA"
@@ -606,7 +611,6 @@ let
     "soundecology"
     "spatsurv"
     "sqldf"
-    "SRRS"
     "SSDforR"
     "statcheck"
     "StatDA"
@@ -623,8 +627,6 @@ let
     "tcltk2"
     "TestScorer"
     "TIMP"
-    "titan"
-    "tkrgl"
     "tkrplot"
     "tmap"
     "tspmeta"
@@ -670,6 +672,14 @@ let
         '';
     });
 
+    rzmq = old.rzmq.overrideDerivation (attrs: {
+      preConfigure = "patchShebangs configure";
+    });
+
+    clustermq = old.clustermq.overrideDerivation (attrs: {
+      preConfigure = "patchShebangs configure";
+    });
+
     Cairo = old.Cairo.overrideDerivation (attrs: {
       NIX_LDFLAGS = "-lfontconfig";
     });
@@ -698,7 +708,6 @@ let
     data_table = old.data_table.overrideDerivation (attrs: {
       NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + " -fopenmp";
       patchPhase = "patchShebangs configure";
-      postInstall = "mv $out/library/data.table/libs/{data.table,datatable}.so";
     });
 
     ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: {
@@ -800,7 +809,7 @@ let
     openssl = old.openssl.overrideDerivation (attrs: {
       preConfigure = ''
         patchShebangs configure
-        '';
+      '';
       PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
       PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";
     });
@@ -855,6 +864,12 @@ let
         '';
     });
 
+    libgeos = old.libgeos.overrideDerivation (attrs: {
+      preConfigure = ''
+        patchShebangs configure
+        '';
+    });
+
     protolite = old.protolite.overrideDerivation (attrs: {
       preConfigure = ''
         patchShebangs configure
diff --git a/nixpkgs/pkgs/development/r-modules/generate-r-packages.R b/nixpkgs/pkgs/development/r-modules/generate-r-packages.R
index df489cdcacb5..510eccd3f40a 100755
--- a/nixpkgs/pkgs/development/r-modules/generate-r-packages.R
+++ b/nixpkgs/pkgs/development/r-modules/generate-r-packages.R
@@ -43,8 +43,12 @@ nixPrefetch <- function(name, version) {
 
 }
 
+escapeName <- function(name) {
+    switch(name, "import" = "r_import", "assert" = "r_assert", name)
+}
+
 formatPackage <- function(name, version, sha256, depends, imports, linkingTo) {
-    name <- ifelse(name == "import", "r_import", name)
+    name <- escapeName(name)
     attr <- gsub(".", "_", name, fixed=TRUE)
     options(warn=5)
     depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends)
@@ -56,7 +60,7 @@ formatPackage <- function(name, version, sha256, depends, imports, linkingTo) {
     depends <- lapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1")
     depends <- lapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE)
     depends <- depends[depends %in% knownPackages]
-    depends <- lapply(depends, function(d) ifelse(d == "import", "r_import", d))
+    depends <- lapply(depends, escapeName)
     depends <- paste(depends)
     depends <- paste(sort(unique(depends)), collapse=" ")
     paste0("  ", attr, " = derive2 { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
diff --git a/nixpkgs/pkgs/development/r-modules/generic-builder.nix b/nixpkgs/pkgs/development/r-modules/generic-builder.nix
index 3adb84a0ba58..1e96a64a5e28 100644
--- a/nixpkgs/pkgs/development/r-modules/generic-builder.nix
+++ b/nixpkgs/pkgs/development/r-modules/generic-builder.nix
@@ -1,14 +1,14 @@
-{ stdenv, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
+{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
 
 { name, buildInputs ? [], requireX ? false, ... } @ attrs:
 
 stdenv.mkDerivation ({
   buildInputs = buildInputs ++ [R gettext] ++
-                stdenv.lib.optionals requireX [util-linux xvfb_run] ++
-                stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
+                lib.optionals requireX [util-linux xvfb_run] ++
+                lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
 
   NIX_CFLAGS_COMPILE =
-    stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+    lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   configurePhase = ''
     runHook preConfigure
diff --git a/nixpkgs/pkgs/development/r-modules/patches/qtbase.patch b/nixpkgs/pkgs/development/r-modules/patches/qtbase.patch
deleted file mode 100644
index 14427b72630e..000000000000
--- a/nixpkgs/pkgs/development/r-modules/patches/qtbase.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*~' qtbase_orig/src/Makefile qtbase/src/Makefile
---- qtbase_orig/src/Makefile	2012-03-03 03:57:47.000000000 +0900
-+++ qtbase/src/Makefile	2014-11-01 23:06:51.383876323 +0900
-@@ -10,6 +10,9 @@
- 	      -DR_INCLUDES=${R_INCLUDE_DIR} \
- 	      -DCMAKE_INSTALL_PREFIX=../src; \
- 	make install
-+# I could not control RPATH via CMake. HELP WANTED!
-+	patchelf --set-rpath ${CMAKE_LIBRARY_PATH} qtbase.so
-+	find ../inst/local/ -executable -type f -print0 | xargs -0 patchelf --set-rpath ${CMAKE_LIBRARY_PATH} 
- 
- clean:
- 	rm -rf ../kdebindings-build
diff --git a/nixpkgs/pkgs/development/r-modules/wrapper.nix b/nixpkgs/pkgs/development/r-modules/wrapper.nix
index 76e819501a57..12704149666c 100644
--- a/nixpkgs/pkgs/development/r-modules/wrapper.nix
+++ b/nixpkgs/pkgs/development/r-modules/wrapper.nix
@@ -1,21 +1,31 @@
-{ runCommand, R, makeWrapper, recommendedPackages, packages }:
-
-runCommand (R.name + "-wrapper") {
+{ symlinkJoin, R, makeWrapper, recommendedPackages, packages }:
+symlinkJoin {
+  name = R.name + "-wrapper";
   preferLocalBuild = true;
   allowSubstitutes = false;
 
   buildInputs = [R] ++ recommendedPackages ++ packages;
+  paths = [ R ];
 
   nativeBuildInputs = [makeWrapper];
 
+  postBuild = ''
+    cd ${R}/bin
+    for exe in *; do
+      rm "$out/bin/$exe"
+
+      makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \
+        --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
+    done
+  '';
+
   # Make the list of recommended R packages accessible to other packages such as rpy2
   passthru = { inherit recommendedPackages; };
+
+    meta = R.meta // {
+      # To prevent builds on hydra
+      hydraPlatforms = [];
+      # prefer wrapper over the package
+      priority = (R.meta.priority or 0) - 1;
+    };
 }
-''
-mkdir -p $out/bin
-cd ${R}/bin
-for exe in *; do
-  makeWrapper ${R}/bin/$exe $out/bin/$exe \
-    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
-done
-''
diff --git a/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
index 34114ad9a4f1..f3ac42b94062 100644
--- a/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
@@ -1,5 +1,5 @@
 { buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix,
-  nix-prefetch-git }:
+  nix-prefetch-git, fetchpatch }:
 
 buildRubyGem rec {
   inherit (bundler) ruby;
@@ -15,6 +15,15 @@ buildRubyGem rec {
     sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8";
   };
 
+  patches = [
+    # write trailing newline to gemset.nix
+    # https://github.com/nix-community/bundix/pull/78
+    (fetchpatch {
+      url = "https://github.com/nix-community/bundix/commit/02ca7a6c656a1e5e5465ad78b31040d82ae1a7e6.patch";
+      sha256 = "18r30icv7r79dlmxz1d1qlk5b6c7r257x23sqav55yhfail9hqrb";
+    })
+  ];
+
   buildInputs = [ ruby bundler ];
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix
index 83749bd21a5d..70cb7e3ca398 100644
--- a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,7 +19,7 @@
 
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick
-, pkgconfig , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
+, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
 , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
@@ -41,7 +41,7 @@ in
 {
   atk = attrs: {
     dependencies = attrs.dependencies ++ [ "gobject-introspection" ];
-    nativeBuildInputs = [ rake bundler pkgconfig ];
+    nativeBuildInputs = [ rake bundler pkg-config ];
     propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ];
   };
 
@@ -61,12 +61,12 @@ in
     };
 
   cairo = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
   };
 
   cairo-gobject = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ];
   };
 
@@ -75,7 +75,7 @@ in
   };
 
   cld3 = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ protobuf ];
   };
 
@@ -180,12 +180,12 @@ in
   };
 
   ffi = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ libffi ];
   };
 
   gdk_pixbuf2 = attrs: {
-    nativeBuildInputs = [ pkgconfig bundler rake ];
+    nativeBuildInputs = [ pkg-config bundler rake ];
     propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ];
   };
 
@@ -195,7 +195,7 @@ in
   };
 
   gio2 = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
   };
 
@@ -212,13 +212,13 @@ in
   };
 
   glib2 = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ gtk2 pcre ];
   };
 
   gtk2 = attrs: {
     nativeBuildInputs = [
-      binutils pkgconfig
+      binutils pkg-config
     ] ++ lib.optionals stdenv.isLinux [
       util-linux libselinux libsepol
     ];
@@ -238,12 +238,12 @@ in
   };
 
   gobject-introspection = attrs: {
-    nativeBuildInputs = [ pkgconfig pcre ];
+    nativeBuildInputs = [ pkg-config pcre ];
     propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ];
   };
 
   grpc = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ openssl ];
     hardeningDisable = [ "format" ];
     NIX_CFLAGS_COMPILE = toString [
@@ -265,7 +265,7 @@ in
 
   hitimes = attrs: {
     buildInputs =
-      stdenv.lib.optionals stdenv.isDarwin
+      lib.optionals stdenv.isDarwin
         [ darwin.apple_sdk.frameworks.CoreServices ];
   };
 
@@ -320,7 +320,7 @@ in
       cmake
       bison
       flex
-      pkgconfig
+      pkg-config
       python3
     ];
 
@@ -392,7 +392,8 @@ in
   nokogiri = attrs: {
     buildFlags = [
       "--use-system-libraries"
-      "--with-zlib-dir=${zlib.dev}"
+      "--with-zlib-lib=${zlib.out}/lib"
+      "--with-zlib-include=${zlib.dev}/include"
       "--with-xml2-lib=${libxml2.out}/lib"
       "--with-xml2-include=${libxml2.dev}/include/libxml2"
       "--with-xslt-lib=${libxslt.out}/lib"
@@ -417,7 +418,7 @@ in
 
   pango = attrs: {
     nativeBuildInputs = [
-      pkgconfig
+      pkg-config
       fribidi
       harfbuzz
       pcre
@@ -475,7 +476,7 @@ in
   };
 
   rmagick = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ imagemagick which ];
   };
 
@@ -484,7 +485,7 @@ in
   };
 
   ruby-libvirt = attrs: {
-    buildInputs = [ libvirt pkgconfig ];
+    buildInputs = [ libvirt pkg-config ];
     buildFlags = [
       "--with-libvirt-include=${libvirt}/include"
       "--with-libvirt-lib=${libvirt}/lib"
@@ -514,13 +515,13 @@ in
         --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"
 
       substituteInPlace lib/vips.rb \
-        --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
+        --replace "vips_libname = 'vips'" "vips_libname = '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
     '';
   };
 
   rugged = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ which cmake openssl libssh2 zlib ];
+    nativeBuildInputs = [ cmake pkg-config which ];
+    buildInputs = [ openssl libssh2 zlib ];
     dontUseCmakeConfigure = true;
   };
 
@@ -587,7 +588,7 @@ in
   };
 
   tiny_tds = attrs: {
-    nativeBuildInputs = [ pkgconfig openssl ];
+    nativeBuildInputs = [ pkg-config openssl ];
     buildInputs = [ freetds ];
   };
 
@@ -616,7 +617,7 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-    nativeBuildInputs = [ rake pkgconfig bundler ];
+    nativeBuildInputs = [ rake pkg-config bundler ];
     buildInputs = [ xapian zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
@@ -631,7 +632,7 @@ in
   };
 
   zookeeper = attrs: {
-    buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
     dontBuild = false;
     postPatch = ''
       sed -i ext/extconf.rb -e "4a \
diff --git a/nixpkgs/pkgs/development/ruby-modules/rbenv/default.nix b/nixpkgs/pkgs/development/ruby-modules/rbenv/default.nix
index dd6b1d95b4b6..c3c462332691 100644
--- a/nixpkgs/pkgs/development/ruby-modules/rbenv/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/rbenv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bash, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, bash, installShellFiles }:
 
 stdenv.mkDerivation rec {
   pname = "rbenv";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     installShellCompletion completions/rbenv.{bash,zsh}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Groom your app’s Ruby environment";
     longDescription = ''
       Use rbenv to pick a Ruby version for your application and guarantee that your development environment matches production.
diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index 2f455838c93c..f5e0b5a0a9ea 100644
--- a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -3,51 +3,56 @@ GEM
   specs:
     ast (2.4.1)
     backport (1.1.2)
-    benchmark (0.1.0)
+    benchmark (0.1.1)
     e2mmap (0.1.0)
     jaro_winkler (1.5.4)
-    maruku (0.7.3)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    mini_portile2 (2.5.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
+    racc (1.5.2)
     rainbow (3.0.0)
-    regexp_parser (1.8.1)
+    regexp_parser (2.0.3)
     reverse_markdown (2.0.0)
       nokogiri
     rexml (3.2.4)
-    rubocop (0.93.0)
+    rubocop (1.7.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
+    rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    solargraph (0.39.17)
+    ruby-progressbar (1.11.0)
+    solargraph (0.40.1)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
       e2mmap
       jaro_winkler (~> 1.5)
-      maruku (~> 0.7, >= 0.7.3)
-      nokogiri (~> 1.9, >= 1.9.1)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
       parser (~> 2.3)
       reverse_markdown (>= 1.0.5, < 3)
-      rubocop (~> 0.52)
+      rubocop (>= 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     thor (1.0.1)
     tilt (2.0.10)
     unicode-display_width (1.7.0)
-    yard (0.9.25)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
index eeaeecc264eb..e95fb1573dd2 100644
--- a/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
@@ -2,7 +2,7 @@
 
 bundlerApp {
   pname = "solargraph";
-  exes = ["solargraph"  "solargraph-runtime"];
+  exes = [ "solargraph" ];
   gemdir = ./.;
 
   passthru.updateScript = bundlerUpdateScript "solargraph";
diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
index a37018ac18d1..cd9575f12830 100644
--- a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -24,10 +24,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jadlpsl504ql436a6bx8ihp0bkg3rvxg7fbi4r1bmra3cqz0h88";
+      sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
       type = "gem";
     };
-    version = "0.1.0";
+    version = "0.1.1";
   };
   e2mmap = {
     groups = ["default"];
@@ -49,46 +49,58 @@
     };
     version = "1.5.4";
   };
-  maruku = {
+  kramdown = {
+    dependencies = ["rexml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  kramdown-parser-gfm = {
+    dependencies = ["kramdown"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r7bxpgnx2hp3g12bjrmdrpv663dfqxsdp0af69kjhxmaxpia56x";
+      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "1.1.0";
   };
   mini_portile2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+      sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.0";
   };
   nokogiri = {
-    dependencies = ["mini_portile2"];
+    dependencies = ["mini_portile2" "racc"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+      sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
       type = "gem";
     };
-    version = "1.10.10";
+    version = "1.11.1";
   };
   parallel = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
+      sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
       type = "gem";
     };
-    version = "1.19.2";
+    version = "1.20.1";
   };
   parser = {
     dependencies = ["ast"];
@@ -101,6 +113,16 @@
     };
     version = "2.7.2.0";
   };
+  racc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
   rainbow = {
     groups = ["default"];
     platforms = [];
@@ -116,10 +138,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
+      sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "2.0.3";
   };
   reverse_markdown = {
     dependencies = ["nokogiri"];
@@ -148,10 +170,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nrv7i81549addig09grw17qkab3l4319dcsf9y7psl7aa76ng3a";
+      sha256 = "12kkyzyzh30mi9xs52lc1pjki1al4x9acdaikj40wslhpwp1ng1l";
       type = "gem";
     };
-    version = "0.93.0";
+    version = "1.7.0";
   };
   rubocop-ast = {
     dependencies = ["parser"];
@@ -159,31 +181,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "129hgz4swc8n0g01715v7y00k0h4mlzkxh63q7z27q7mjp54rl74";
+      sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj";
       type = "gem";
     };
-    version = "0.7.1";
+    version = "1.4.0";
   };
   ruby-progressbar = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+      sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
       type = "gem";
     };
-    version = "1.10.1";
+    version = "1.11.0";
   };
   solargraph = {
-    dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
+    dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06fby6dpq1jcq30x8ladig4dvz8j2pxd08mkrad3d41jx33zd2hg";
+      sha256 = "0q0dh4da4qygn92vjwqz0w6m4pdhs2zdmrx3zlmxmghizh32ghk7";
       type = "gem";
     };
-    version = "0.39.17";
+    version = "0.40.1";
   };
   thor = {
     groups = ["default"];
@@ -220,9 +242,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd";
+      sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
       type = "gem";
     };
-    version = "0.9.25";
+    version = "0.9.26";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile b/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile
index 3454ce3df74b..dda0f69c35cc 100644
--- a/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -14,13 +14,9 @@ source 'https://rubygems.org' do
   gem 'cocoapods'
   gem 'cocoapods-acknowledgements'
   gem 'cocoapods-art'
-  gem 'cocoapods-bin'
   gem 'cocoapods-browser'
-  gem 'cocoapods-bugsnag'
-  gem 'cocoapods-check'
   gem 'cocoapods-clean'
   gem 'cocoapods-clean_build_phases_scripts'
-  gem 'cocoapods-core'
   gem 'cocoapods-coverage'
   gem 'cocoapods-deintegrate'
   gem 'cocoapods-dependencies'
@@ -31,18 +27,9 @@ source 'https://rubygems.org' do
   gem 'cocoapods-generate'
   gem 'cocoapods-git_url_rewriter'
   gem 'cocoapods-keys'
-  gem 'cocoapods-no-dev-schemes'
   gem 'cocoapods-open'
-  gem 'cocoapods-packager'
-  gem 'cocoapods-playgrounds'
   gem 'cocoapods-plugins'
-  gem 'cocoapods-prune-localizations'
-  gem 'cocoapods-rome'
   gem 'cocoapods-search'
-  gem 'cocoapods-sorted-search'
-  gem 'cocoapods-static-swift-framework'
-  gem 'cocoapods-stats'
-  gem 'cocoapods-tdfire-binary'
   gem 'cocoapods-testing'
   gem 'cocoapods-trunk'
   gem 'cocoapods-try'
diff --git a/nixpkgs/pkgs/development/tools/alloy/default.nix b/nixpkgs/pkgs/development/tools/alloy/default.nix
index 44a6d7329baa..1dade32ac64d 100644
--- a/nixpkgs/pkgs/development/tools/alloy/default.nix
+++ b/nixpkgs/pkgs/development/tools/alloy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }:
+{ lib, stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }:
 
 let generic = { major, version, src }:
 
@@ -30,7 +30,7 @@ let generic = { major, version, src }:
       cp -r ${desktopItem}/share/applications $out/share
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Language & tool for relational models";
       longDescription = ''
         Alloy is a language for describing structures and a tool for exploring
diff --git a/nixpkgs/pkgs/development/tools/ameba/default.nix b/nixpkgs/pkgs/development/tools/ameba/default.nix
index b46f6efd634c..f8cb74411161 100644
--- a/nixpkgs/pkgs/development/tools/ameba/default.nix
+++ b/nixpkgs/pkgs/development/tools/ameba/default.nix
@@ -11,7 +11,7 @@ crystal.buildCrystalPackage rec {
     sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A static code analysis tool for Crystal";
     homepage = "https://crystal-ameba.github.io";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix
index 20b26437e75f..eb827882b752 100644
--- a/nixpkgs/pkgs/development/tools/ammonite/default.nix
+++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git
+{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git
 , nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }:
 
-with stdenv.lib;
+with lib;
 
 let
   repo = "git@github.com:lihaoyi/Ammonite.git";
@@ -34,7 +34,7 @@ let
           #!${stdenv.shell}
           set -o errexit
           PATH=${
-            stdenv.lib.makeBinPath [
+            lib.makeBinPath [
               common-updater-scripts
               coreutils
               git
diff --git a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix
index 396a5817c672..884b511b8af1 100644
--- a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 with python3Packages;
 buildPythonApplication rec {
@@ -14,7 +14,7 @@ buildPythonApplication rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/myint/autoflake";
     description = "A simple program which removes unused imports and unused variables as reported by pyflakes";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
index 236669dc54f7..ae54723dda3b 100644
--- a/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "bingrep";
-  version = "0.8.2";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "m4b";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1qv41g7mblnq07145m03s2fhbrjfsc0924zb9z4cp159ygkggxcy";
+    sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w=";
   };
 
-  cargoSha256 = "1z53408mcmy698xb2sxj1s1p9xc9srlkj0v8wswhdp7nq27vwkdj";
+  cargoSha256 = "sha256-3eGYU5O7HSpawIL/8OVmROCzXfdnoMAnIujjrIp00xg=";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Greps through binaries from various OSs and architectures, and colors them";
     homepage = "https://github.com/m4b/bingrep";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index b4cfa356b277..a0f251bfe910 100644
--- a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }:
+{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tarpaulin";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
   ];
   buildInputs = [ openssl ];
 
diff --git a/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix b/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix
index 374331f3ac87..bcbda8ad7e60 100644
--- a/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   name = "cccc";
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
       complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura.
     '';
     homepage = "http://cccc.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.linquize ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.linquize ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
new file mode 100644
index 000000000000..6277b1d4239e
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, pkgs, lib, python3, fetchFromGitHub }:
+
+let
+  pname = "checkov";
+  version = "1.0.674";
+  src = fetchFromGitHub {
+    owner = "bridgecrewio";
+    repo = pname;
+    rev = version;
+    sha256 = "/S8ic5ZVxA2vd/rjRPX5gslbmnULL7BSx34vgWIsheQ=";
+  };
+
+  disabled = pkgs.python3Packages.pythonOlder "3.7";
+
+  # CheckOV only work with `dpath 1.5.0`
+  dpath = pkgs.python3Packages.buildPythonPackage rec {
+    pname = "dpath";
+    version = "1.5.0";
+
+    src = pkgs.python3Packages.fetchPypi {
+      inherit pname version;
+      sha256 = "SWYVtOqEI20Y4NKGEi3nSGmmDg+H4sfsZ4f/KGxINhs=";
+    };
+
+    doCheck = false;
+  };
+in
+python3.pkgs.buildPythonPackage rec {
+  inherit pname version disabled src;
+
+  nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pytest
+    coverage
+    bandit
+    bc-python-hcl2
+    deep_merge
+    tabulate
+    colorama
+    termcolor
+    junit-xml
+    dpath
+    pyyaml
+    boto3
+    GitPython
+    six
+    jmespath
+    tqdm
+    update_checker
+    semantic-version
+    packaging
+  ];
+
+  # Both of these tests are pulling from external srouces (https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml)
+  preCheck = ''
+    rm -rf integration_tests/*
+    rm -rf tests/terraform/*
+  '';
+
+  # Wrap the executable so that the python packages are available
+  # it's just a shebang script which calls `python -m checkov "$@"`
+  postFixup = ''
+    wrapProgram $out/bin/checkov \
+      --set PYTHONPATH $PYTHONPATH
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/bridgecrewio/checkov";
+    description = "Static code analysis tool for infrastructure-as-code";
+    longDescription = ''
+    Prevent cloud misconfigurations during build-time for Terraform, Cloudformation, Kubernetes, Serverless framework and other infrastructure-as-code-languages with Checkov by Bridgecrew.
+    '';
+    license = licenses.asl20;
+    maintainers = with maintainers; [ anhdle14 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
index 786ed360ef33..e5325f7da8c7 100644
--- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.38";
+  version = "8.39";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "1j4k75iv32fsp40ajdfm99zady5c0h0f39xvmv70frp8p58kq3rl";
+    sha256 = "sha256-CPPSJVKf01TA89Qk/uyvIU+ejo5JyT4Mc35KKJPv4IE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Checks Java source against a coding standard";
     longDescription = ''
       checkstyle is a development tool to help programmers write Java code that
diff --git a/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 43b32052bf3c..4752b31649d3 100644
--- a/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }:
+{ lib, stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "clang-analyzer";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Clang Static Analyzer";
     homepage    = "http://clang-analyzer.llvm.org";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.unix;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/coan/default.nix b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix
index 4c6e9f1a078c..1e0b79e0daa5 100644
--- a/nixpkgs/pkgs/development/tools/analysis/coan/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "6.0.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     mv -v $out/share/man/man1/coan.1.{1,gz}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The C preprocessor chainsaw";
     longDescription = ''
       A software engineering tool for analysing preprocessor-based
diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
index fc37324bc925..f3ad1d81e57d 100644
--- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 , zlib
 , xorg
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.4.0";
+  version = "2.4.1";
 
   dontConfigure = true;
   dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "1mplya2dyqqmm6gj4if2k4h2fra15rxf2yfnhphqhz40kz75sxk8";
+    sha256 = "sha256-UHH+nV62jHvEY6T5UKz5cm9zse9pWHPAjjsGHfpPoPY=";
   };
 
   nativeBuildInputs = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     ln -s $out/codeql/codeql $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Semantic code analysis engine";
     homepage = "https://semmle.com/codeql";
     maintainers = [ maintainers.dump_stack ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix
index bd8c5c37c864..93a4ffab388d 100644
--- a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile }:
+{ lib, stdenv, requireFile }:
 
 let
   message = ''
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Coverity Scan build tools";
     homepage    = "https://scan.coverity.com";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.unfreeRedistributable;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/coz/default.nix b/nixpkgs/pkgs/development/tools/analysis/coz/default.nix
index 42b47a9a8fd8..17968a466bf4 100644
--- a/nixpkgs/pkgs/development/tools/analysis/coz/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/coz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libelfin
 , ncurses
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/plasma-umass/coz";
     description = "Profiler based on casual profiling";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ zimbatm ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ zimbatm ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
index 91bcecbb43d1..30c0614446e6 100644
--- a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }:
+{ lib, stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }:
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3";
   };
 
-  buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ];
+  buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ];
   nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
 
   makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ]
-   ++ stdenv.lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ];
+   ++ lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ];
 
   outputs = [ "out" "man" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp cppcheck.1 $man/share/man/man1/cppcheck.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A static analysis tool for C/C++ code";
     longDescription = ''
       Check C/C++ code for memory leaks, mismatching allocation-deallocation,
diff --git a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
index 080b19bf163b..cfb974c86ddd 100644
--- a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages }:
+{ lib, stdenv, fetchurl, perlPackages }:
 
 perlPackages.buildPerlPackage rec {
   pname = "egypt";
@@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for making call graphs of C programmes";
     longDescription = ''
       Egypt is a simple tool for creating call graphs of C programs. It neither
diff --git a/nixpkgs/pkgs/development/tools/analysis/emma/default.nix b/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
index 3cc16c07ec59..97f93722a182 100644
--- a/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   name = "emma-2.0.5312";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/emma/emma-2.0.5312.zip";
     sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://emma.sourceforge.net/";
     description = "A code coverage tool for Java";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.cpl10;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.cpl10;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix
index 64a1c3173930..b8f3aa0ac1fb 100644
--- a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "evmdis-unstable";
@@ -12,7 +12,7 @@ buildGoPackage {
     sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Arachnid/evmdis";
     description = "Ethereum EVM disassembler";
     license = [ licenses.asl20 ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix b/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix
index d522b2b94227..265f62904530 100644
--- a/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "findbugs-3.0.1";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A static analysis tool to find bugs in Java programs automatically";
     homepage = "http://findbugs.sourceforge.net/";
     maintainers = with maintainers; [ pSub ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index 80731a2106e4..fc39e86007d4 100644
--- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:
+{ lib, stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.141.0";
+  version = "0.143.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1hbq55gi834zapmly0gmg3kpqa1zwxcw4gll4g6vgzr0pfa0bwb2";
+    sha256 = "sha256-j4vsuPs/xr/oy4ZWGBBCy+2mPMQtxE01gqpjsYITCa0=";
   };
 
   installPhase = ''
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ])
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A static type checker for JavaScript";
     homepage = "https://flow.org/";
     changelog = "https://github.com/facebook/flow/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix
index 94012ce7ff68..394bd6558fbf 100644
--- a/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An extensible and collaborative platform dedicated to source-code analysis of C software";
     homepage    = "http://frama-c.com/";
-    license     = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ];
-    platforms   = stdenv.lib.platforms.unix;
+    license     = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ thoughtpolice amiddelk ];
+    platforms   = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
index d0221e80b9bc..8984a395818b 100644
--- a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     cp -ar $src/Documentation/html $out/share/doc/${name}/.
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatically generate all types of basic memory management operations and write into trace files";
     homepage = "https://github.com/GarCoSim";
     maintainers = [ maintainers.cmcdragonkai ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
index 10f0d74c0dc7..3f97485cbfa4 100644
--- a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     cp ./traceFileSim "$out/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques";
     homepage = "https://github.com/GarCoSim";
     maintainers = [ maintainers.cmcdragonkai ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix b/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix
index 68f12dac70f5..b169877f5c1f 100644
--- a/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
       --replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.hopperapp.com/index.html";
     description = "A macOS and Linux Disassembler";
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix
index f04d060290f1..6ea079e3ec15 100644
--- a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv,
+{ lib, stdenv,
   mkDerivation,
   cmake,
   elfutils,
@@ -27,8 +27,8 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    cmake
     elfutils
     extra-cmake-modules
     kconfigwidgets
@@ -50,8 +50,6 @@ mkDerivation rec {
     mkdir -p 3rdparty/perfparser/.git
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "A GUI for Linux perf";
     longDescription = ''
@@ -60,8 +58,8 @@ mkDerivation rec {
       then displays the result in a graphical way.
     '';
     homepage = "https://github.com/KDAB/hotspot";
-    license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ nh2 ];
+    license = with lib.licenses; [ gpl2 gpl3 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nh2 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix b/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix
index 7108e9311b82..26c7b6dd0b70 100644
--- a/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f";
   };
 
-  buildInputs = [ cmake boost tbb gmp clang llvm sqlite python
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost tbb gmp clang llvm sqlite python
                   ocamlPackages.apron mpfr ppl doxygen graphviz ];
 
   cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 8bda0ac2223f..db1cf9c6ead5 100644
--- a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, llvmPackages, python2 }:
+{ lib, stdenv, fetchurl, cmake, llvmPackages, python2 }:
 
 stdenv.mkDerivation rec {
   pname = "include-what-you-use";
@@ -15,14 +15,12 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
     substituteInPlace $out/bin/iwyu_tool.py \
       --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Analyze #includes in C/C++ source files with clang";
     longDescription = ''
       For every symbol (type, function variable, or macro) that you use in
diff --git a/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix
index c903833a731a..faa68dadc3b4 100644
--- a/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }:
+{ lib, stdenv, fetchFromGitHub, ant, jdk, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "jdepend";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     chmod a+x $out/bin/jdepend
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Traverses Java class file directories and generates design quality metrics for each Java package";
     homepage = "http://www.clarkware.com/software/JDepend.html";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix
index bbea8a1dd65d..15891e74044a 100644
--- a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}:
+{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
 
 stdenv.mkDerivation rec {
   pname = "kcov";
@@ -12,13 +12,11 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = "patchShebangs src/bin-to-c-source.py";
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
index c6faeaa72f23..35c75d67da50 100644
--- a/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
@@ -1,4 +1,4 @@
- {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }:
+ {lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "lcov";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code coverage tool that enhances GNU gcov";
 
     longDescription =
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = "http://ltp.sourceforge.net/coverage/lcov.php";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = with maintainers; [ dezgeg ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
index 20fe74ecb74d..66f767f47028 100644
--- a/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
 
 stdenv.mkDerivation {
   name = "makefile2graph-2018-01-03";
@@ -19,10 +19,10 @@ stdenv.mkDerivation {
       --replace '/bin/sh' ${bash}/bin/bash \
       --replace 'make2graph' "$out/bin/make2graph"
     wrapProgram $out/bin/makefile2graph \
-      --set PATH ${stdenv.lib.makeBinPath [ gnumake ]}
+      --set PATH ${lib.makeBinPath [ gnumake ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lindenb/makefile2graph";
     description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
     maintainers = with maintainers; [ cmcdragonkai ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix
index 8cc0477ca592..72154e909b65 100644
--- a/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }:
 
 stdenv.mkDerivation rec {
   pname = "oclgrind";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenCL device simulator and debugger";
     homepage = "https://github.com/jrprice/oclgrind";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
index cbc736e1a26c..ff5014bd46a9 100644
--- a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
-, pkgconfig, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
+, pkg-config, makeWrapper }:
 
 rustPlatform.buildRustPackage rec {
   pname = "panopticon";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = with qt5; [
      qt5.qtbase
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     makeWrapper $out/share/${pname}/${pname} $out/bin/${pname}
      '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A libre cross-platform disassembler";
     longDescription = ''
       Panopticon is a cross platform disassembler for reverse
diff --git a/nixpkgs/pkgs/development/tools/analysis/pev/default.nix b/nixpkgs/pkgs/development/tools/analysis/pev/default.nix
index 42e382c8bcad..a46bc067f11b 100644
--- a/nixpkgs/pkgs/development/tools/analysis/pev/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/pev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, openssl, fetchFromGitHub }:
+{ lib, stdenv, openssl, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "pev";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   installFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries";
     homepage = "https://pev.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix
index 497a244f68b4..a75445c363b0 100644
--- a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, makeWrapper, openjdk }:
+{ lib, stdenv, fetchurl, unzip, makeWrapper, openjdk }:
 
 stdenv.mkDerivation rec {
   pname = "pmd";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An extensible cross-language static code analyzer";
     homepage = "https://pmd.github.io/";
     changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html";
diff --git a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix
index d9f39667ceff..0145e51ee262 100644
--- a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }:
+{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind }:
 
 let
-  name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
+  name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
 
 in stdenv.mkDerivation {
   inherit name;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
     install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
   '');
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Qt GUI to visualize profiling data";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix
index d4a102ac097b..6d9543e3836f 100644
--- a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, lib, mkDerivation
 # nativeBuildInputs
-, qmake, pkgconfig
+, qmake, pkg-config
 # Qt
 , qtbase, qtsvg, qtwebengine
 # buildInputs
@@ -30,12 +30,12 @@ mkDerivation rec {
       --replace "include(lib_radare2.pri)" ""
   '';
 
-  nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ];
+  nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ];
   propagatedBuildInputs = [ python3.pkgs.pyside2 ];
   buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
 
   qmakeFlags = with python3.pkgs; [
-    "CONFIG+=link_pkgconfig"
+    "CONFIG+=link_pkg-config"
     "PKGCONFIG+=r_core"
     # Leaving this enabled doesn't break build but generates errors
     # at runtime (to console) about being unable to load needed bits.
diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
index e86ef2532498..3623893ea63e 100644
--- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchFromGitHub
+{lib, stdenv, fetchFromGitHub
 , buildPackages
-, pkgconfig
+, pkg-config
 , libusb-compat-0_1, readline, libewf, perl, zlib, openssl
 , libuv, file, libzip, xxHash
 , gtk2 ? null, vte ? null, gtkdialog ? null
@@ -19,7 +19,7 @@ assert pythonBindings -> python3 != null;
 
 
 let
-  inherit (stdenv.lib) optional;
+  inherit (lib) optional;
 
   generic = {
     version_commit, # unused
@@ -56,11 +56,6 @@ let
         # radare 3.3 compat for radare2-cutter
         (cd shlr && ln -s ../capstone-${cs_ver} capstone)
         tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver}
-        # necessary because they broke the offline-build:
-        # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258
-        # https://github.com/radare/radare2/issues/13087#issuecomment-465159716
-        curl() { true; }
-        export -f curl
       '';
 
       postInstall = ''
@@ -83,7 +78,7 @@ let
       enableParallelBuilding = true;
       depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-      nativeBuildInputs = [ pkgconfig ];
+      nativeBuildInputs = [ pkg-config ];
       buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
         ++ optional useX11 [ gtkdialog vte gtk2 ]
         ++ optional rubyBindings [ ruby ]
@@ -100,9 +95,9 @@ let
       meta = {
         description = "unix-like reverse engineering framework and commandline tools";
         homepage = "http://radare.org/";
-        license = stdenv.lib.licenses.gpl2Plus;
-        maintainers = with stdenv.lib.maintainers; [ raskin makefu mic92 ];
-        platforms = with stdenv.lib.platforms; linux;
+        license = lib.licenses.gpl2Plus;
+        maintainers = with lib.maintainers; [ raskin makefu mic92 ];
+        platforms = with lib.platforms; linux;
         inherit version;
       };
   };
@@ -110,12 +105,12 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "24959";
-    gittap = "4.5.1";
-    gittip = "293cf5ae65ba4e28828095dcae212955593ba255";
-    rev = "4.5.1";
-    version = "4.5.1";
-    sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj";
+    version_commit = "25480";
+    gittap = "5.0.0";
+    gittip = "a476454c00f64acbb7425c178c98714ef76e26d7";
+    rev = "5.0.0";
+    version = "5.0.0";
+    sha256 = "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420";
     cs_ver = "4.0.2";
     cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
   };
diff --git a/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
index b51b26eab172..0d10d6d6b277 100644
--- a/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   version = "4.2.5";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp README.txt $out/doc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatic test generation for Java";
     homepage = "https://randoop.github.io/randoop/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix
index b0e5319df2d6..1701abeb25fd 100644
--- a/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix
@@ -9,7 +9,7 @@
 , autoconf
 , automake
 , libtool
-, pkgconfig
+, pkg-config
 , bison
 , flex
 , groff
@@ -145,7 +145,7 @@ in stdenv.mkDerivation rec {
     autoconf
     automake
     libtool
-    pkgconfig
+    pkg-config
     bison
     flex
     groff
@@ -216,8 +216,6 @@ in stdenv.mkDerivation rec {
     substituteInPlace scripts/retdec-unpacker.py --replace "'upx'" "'${upx}/bin/upx'"
   '';
 
-  enableParallelBuilding = true;
-
   doInstallCheck = true;
   installCheckPhase = ''
     ${python3.interpreter} "$out/bin/retdec-tests-runner.py"
diff --git a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix
index 5e80d5b096db..b63713f00073 100644
--- a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }:
+{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }:
 
 stdenv.mkDerivation rec {
   version = "5.4.0";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   # see https://github.com/mozilla/rr/issues/2269
   preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"'';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config which ];
   buildInputs = [
-    cmake libpfm zlib python3Packages.python python3Packages.pexpect which procps gdb capnproto
+    libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto
   ];
   propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
   cmakeFlags = [
@@ -37,8 +37,6 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "fortify" ];
 
-  enableParallelBuilding = true;
-
   # FIXME
   #doCheck = true;
 
@@ -54,8 +52,8 @@ stdenv.mkDerivation rec {
       time the same execution is replayed.
     '';
 
-    license = with stdenv.lib.licenses; [ mit bsd2 ];
-    maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
-    platforms = stdenv.lib.platforms.x86;
+    license = with lib.licenses; [ mit bsd2 ];
+    maintainers = with lib.maintainers; [ pierron thoughtpolice ];
+    platforms = lib.platforms.x86;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix
index 1443c31192df..4330ec3d7426 100644
--- a/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, sqlite, pkgconfig, perl
+{ lib, stdenv, fetchgit, sqlite, pkg-config, perl
 , buildllvmsparse ? true
 , buildc2xml ? true
 , llvm ? null, libxml2 ? null
@@ -16,10 +16,10 @@ stdenv.mkDerivation {
     sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [sqlite perl]
-   ++ stdenv.lib.optional buildllvmsparse llvm
-   ++ stdenv.lib.optional buildc2xml libxml2;
+   ++ lib.optional buildllvmsparse llvm
+   ++ lib.optional buildc2xml libxml2;
 
   preBuild =
     '' sed -i Makefile \
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A semantic analysis tool for C";
     homepage = "http://smatch.sourceforge.net/";
-    license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free; /* OSL, see http://www.opensource.org */
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix
index 2f7ff219081f..261645c062d3 100644
--- a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:
 
 mkDerivation rec {
   pname = "snowman";
@@ -19,9 +19,7 @@ mkDerivation rec {
     export sourceRoot=$sourceRoot/src
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Native code to C/C++ decompiler";
     homepage = "http://derevenets.com/";
 
diff --git a/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix
index 945f6c80af52..e0d9840472b4 100644
--- a/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, llvm }:
+{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm }:
 
 stdenv.mkDerivation rec {
   name = "sparse-0.5.0";
@@ -12,15 +12,15 @@ stdenv.mkDerivation rec {
     sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libxml2 llvm ];
   doCheck = true;
 
   meta = {
     description = "Semantic parser for C";
     homepage    = "https://git.kernel.org/cgit/devel/sparse/sparse.git/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/spin/default.nix b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix
index 73e88f9811c3..49e31f53a846 100644
--- a/nixpkgs/pkgs/development/tools/analysis/spin/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix
@@ -2,13 +2,13 @@
 , withISpin ? true, tk, swarm, graphviz }:
 
 let
-  binPath = stdenv.lib.makeBinPath [ gcc ];
-  ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ];
+  binPath = lib.makeBinPath [ gcc ];
+  ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ];
 
 in stdenv.mkDerivation rec {
   pname = "spin";
   version = "6.4.9";
-  url-version = stdenv.lib.replaceChars ["."] [""] version;
+  url-version = lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
     # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
       --prefix PATH ':' "$out/bin:${ibinPath}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Formal verification tool for distributed software systems";
     homepage = "http://spinroot.com/";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/tools/analysis/splint/default.nix b/nixpkgs/pkgs/development/tools/analysis/splint/default.nix
index 4dc93897e869..581ff56bb614 100644
--- a/nixpkgs/pkgs/development/tools/analysis/splint/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/splint/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, flex }:
+{ fetchurl, lib, stdenv, flex }:
 
 stdenv.mkDerivation rec {
   name = "splint-3.1.2";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7";
   };
 
-  patches = [ ./tmpdir.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
+  patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
 
   buildInputs = [ flex ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.splint.org/";
     description = "Annotation-assisted lightweight static analyzer for C";
 
diff --git a/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
index 03f218546ebf..894d9a2357ea 100644
--- a/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "swarm-2019-03-11";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     install -Dm644 Doc/swarm.1 $out/share/man/man1/swarm.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Verification script generator for Spin";
     homepage = "http://spinroot.com/";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
index 1011bcb5cc0c..617d255d7e51 100644
--- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.22.0";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wbxlh2lwgdhhw902lqy6p2vh8adfq4yaa507js8an3byy26ls3d";
+    sha256 = "19vgan743xsnglwva93fs4sqcbpqbyrxbgn5qff809ns8hj8ir94";
   };
 
-  vendorSha256 = "0yk9xsb0s4kymfb3p14irks6b30b53r0mz7irgcmx9jxz8vyffqg";
+  vendorSha256 = "1y6ra9bkp6wl0pikvyqywhg5w18v3glnyvwqrddkkkabspl05nqx";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
index 0ad042d74def..17f390714620 100644
--- a/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, fetchFromGitHub }:
+{ lib, stdenv, python3, fetchFromGitHub }:
 
 with python3.pkgs;
 
@@ -14,7 +14,7 @@ buildPythonApplication rec {
     sha256 = "1yn9vi91j1yxkn0icdnjhgl0qrqqkzyhccj39af4f19q1gdw995l";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/theopolis/uefi-firmware-parser/";
     description = "Parse BIOS/Intel ME/UEFI firmware related structures: Volumes, FileSystems, Files, etc";
     # MIT + license headers in some files
diff --git a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix
index 60d3a7c5ebc9..d99bbe1cae4b 100644
--- a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }:
+{ lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
   name = "valgrind-3.16.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # GDB is needed to provide a sane default for `--db-command'.
   # Perl is needed for `callgrind_{annotate,control}'.
-  buildInputs = [ gdb perl ]  ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
+  buildInputs = [ gdb perl ]  ++ lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
 
   # Perl is also a native build input.
   nativeBuildInputs = [ perl ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   separateDebugInfo = stdenv.isLinux;
 
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin (
+  preConfigure = lib.optionalString stdenv.isDarwin (
     let OSRELEASE = ''
       $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \
       <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)'';
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
   postPatch = "";
 
   configureFlags =
-    stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include";
+    lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"
+    ++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include";
 
   doCheck = false; # fails
 
@@ -76,10 +76,10 @@ stdenv.mkDerivation rec {
       Valgrind to build new tools.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.unix;
     badPlatforms = [
       "armv5tel-linux" "armv6l-linux" "armv6m-linux"
       "sparc-linux" "sparc64-linux"
diff --git a/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix b/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix
index 1c571fe6be0f..10b9f7291a22 100644
--- a/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "valkyrie-2.0.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ qmake4Hook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.valgrind.org/";
     description = "Qt4-based GUI for the Valgrind 3.6.x series";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/apktool/default.nix b/nixpkgs/pkgs/development/tools/apktool/default.nix
index 2ff9c58fb339..33721e60b0ed 100644
--- a/nixpkgs/pkgs/development/tools/apktool/default.nix
+++ b/nixpkgs/pkgs/development/tools/apktool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, build-tools }:
+{ lib, stdenv, fetchurl, makeWrapper, jre, build-tools }:
 
 stdenv.mkDerivation rec {
   pname = "apktool";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
         --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for reverse engineering Android apk files";
     homepage    = "https://ibotpeaches.github.io/Apktool/";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/asn2quickder/default.nix b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
index 68a0c0f6073e..b2432f7fefc6 100644
--- a/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
+++ b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake
 , pytestrunner, pytest, six, pyparsing, asn1ate }:
 
 buildPythonApplication rec {
@@ -23,7 +23,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ pyparsing asn1ate six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An ASN.1 compiler with a backend for Quick DER";
     homepage = "https://github.com/vanrein/asn2quickder";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/async/default.nix b/nixpkgs/pkgs/development/tools/async/default.nix
index e63f9a18a63a..54e16cb6faaf 100644
--- a/nixpkgs/pkgs/development/tools/async/default.nix
+++ b/nixpkgs/pkgs/development/tools/async/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "async";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1zgds5rjjikvaj0rxc7slyvkjn067s0v8vdnxn3vsv819q5yd707";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to parallelize shell commands";
     longDescription = ''
       `async` is a tool to run shell commands in parallel and is designed to be
diff --git a/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/nixpkgs/pkgs/development/tools/avro-tools/default.nix
index 5327ab354e91..5dd058614c10 100644
--- a/nixpkgs/pkgs/development/tools/avro-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/avro-tools/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     --add-flags "-jar $out/libexec/avro-tools/${pname}.jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://avro.apache.org/";
     description = "Avro command-line tools and utilities";
     license     = lib.licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix
index 52b1a26d8143..8a48b43312eb 100644
--- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix
@@ -15,6 +15,22 @@ let
         };
       });
 
+      aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec {
+        version = "1.27.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ=";
+        };
+      });
+
+      dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec {
+        version = "0.7.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y=";
+        };
+      });
+
       cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec {
         version = "1.6.0";
         src = oldAttrs.src.override {
@@ -68,7 +84,7 @@ buildPythonApplication rec {
   postPatch = ''
     substituteInPlace requirements/base.txt \
       --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \
-      --replace "docker~=4.2.0" "docker~=4.3.1" \
+      --replace "docker~=4.2.0" "docker~=4.3" \
       --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \
       --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \
       --replace "requests==2.23.0" "requests~=2.24" \
diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix
index 1c5bb899b69b..822480b1d3f3 100644
--- a/nixpkgs/pkgs/development/tools/azcopy/default.nix
+++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.7.0";
+  version = "10.8.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     rev = "v${version}";
-    sha256 = "0l2109r9a8fhd66zgsi56zdmy390fpnvy08rbxf6rfc0a55n96ka";
+    sha256 = "sha256-zA0/5lpVefZD0m7g7SfqSRAFkQm2b+g/F3doCl9oAn8=";
   };
 
   subPackages = [ "." ];
 
-  vendorSha256 = "032yzl8mmgmmxbpsymndp4ddgi572jh5drwql0bjjabp3yqwj1g1";
+  vendorSha256 = "sha256-t7PluxN6naDB35eC59Xus1hgZflgViWF2yFog9mkaOA=";
 
   doCheck = false;
 
@@ -21,7 +21,7 @@ buildGoModule rec {
     ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ colemickens ];
     license = licenses.mit;
     description = "The new Azure Storage data transfer utility - AzCopy v10";
diff --git a/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix
index c8127256a612..ba9412c286c4 100644
--- a/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix
+++ b/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "bazel-kazel";
-  version = "0.1.3";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "repo-infra";
     rev = "v${version}";
-    sha256 = "1mmla4j30ka368gsf4v8h23f32rsc4fpyrqswafw98x07xngmmqr";
+    sha256 = "sha256-YWTWw5vDkDvIHOTqZM2xH8VPaVRuB2oyynvwWNmvPXs=";
   };
 
-  vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf";
+  vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
index e0a7febb875f..94efcc9be063 100644
--- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
+++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
@@ -3,7 +3,7 @@
 , git
 , go
 , python
-, stdenv
+, lib, stdenv
 }:
 
 let
@@ -73,7 +73,7 @@ buildBazelPackage rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel-watcher";
     description = "Tools for building Bazel targets when source files change";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix
index 2a20888426d0..e4a6b3c2869e 100644
--- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix
+++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "bazelisk";
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A user-friendly launcher for Bazel";
     longDescription = ''
       BEWARE: This package does not work on NixOS.
diff --git a/nixpkgs/pkgs/development/tools/bloaty/default.nix b/nixpkgs/pkgs/development/tools/bloaty/default.nix
index 28df0aaa6963..ff24e7b7c1cd 100644
--- a/nixpkgs/pkgs/development/tools/bloaty/default.nix
+++ b/nixpkgs/pkgs/development/tools/bloaty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, zlib, fetchFromGitHub }:
+{ lib, stdenv, cmake, zlib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "1.1";
@@ -16,15 +16,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
 
   installPhase = ''
     install -Dm755 {.,$out/bin}/bloaty
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "a size profiler for binaries";
     homepage = "https://github.com/google/bloaty";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/boomerang/default.nix b/nixpkgs/pkgs/development/tools/boomerang/default.nix
index bec5357691f2..4ac9159520fb 100644
--- a/nixpkgs/pkgs/development/tools/boomerang/default.nix
+++ b/nixpkgs/pkgs/development/tools/boomerang/default.nix
@@ -14,8 +14,6 @@ mkDerivation rec {
   nativeBuildInputs = [ cmake bison flex ];
   buildInputs = [ qtbase capstone ];
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     homepage = "https://github.com/BoomerangDecompiler/boomerang";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/boost-build/default.nix b/nixpkgs/pkgs/development/tools/boost-build/default.nix
index 8ce475c893d5..8566edd2315f 100644
--- a/nixpkgs/pkgs/development/tools/boost-build/default.nix
+++ b/nixpkgs/pkgs/development/tools/boost-build/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "boost-build";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
     ./b2 install --prefix=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.boost.org/boost-build2/";
-    license = stdenv.lib.licenses.boost;
+    license = lib.licenses.boost;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ivan-tkatchev ];
   };
diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 49f8435b3773..182b8633aa01 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
index caa9bc3b9eb7..d88068c1c3ee 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
index 83260cbc1860..4658703f8b10 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix
index ef3062c6ca50..0af9e77acf57 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "arpa2cm";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     owner = "arpa2";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CMake Module library for the ARPA2 project";
     license = licenses.bsd2;
     maintainers = with maintainers; [ leenaars ];
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
index 969cd9879746..a828c57b8c00 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lua5_3, python }:
+{ lib, stdenv, fetchFromGitHub, lua5_3, python }:
 
 stdenv.mkDerivation rec {
   pname = "bam";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ lua5_3 python ];
 
-  buildPhase = ''${stdenv.shell} make_unix.sh'';
+  buildPhase = "${stdenv.shell} make_unix.sh";
 
-  checkPhase = ''${python.interpreter} scripts/test.py'';
+  checkPhase = "${python.interpreter} scripts/test.py";
 
   installPhase = ''
     mkdir -p "$out/share/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;
     [
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 0c9f4d7c50a0..ac03288f1485 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index 66560e768d23..436b681e0054 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
index 756e68b56781..74b1f7040205 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
@@ -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
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
index c1b3a7aa1560..12fd01e5e4ed 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
@@ -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";
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix
index 9bda4cde0449..e1e9b348503c 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix
index 09c1eada54b5..68a4d5f44eaa 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
index 41fc0940b9d0..0fbcb95704b0 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
@@ -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 ];
diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
index 804bdd76f673..9dabd7b35560 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index d38f42e4b338..67adc2438c7f 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig
+{ stdenv, lib, fetchurl, pkg-config
 , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
 , buildPackages
 # darwin attributes
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs = [ setupHook pkgconfig ];
+  nativeBuildInputs = [ setupHook pkg-config ];
 
   buildInputs = []
     ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
diff --git a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix
index 7eed88069557..251268a449d4 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
index e09277e498d2..c73b7149a361 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, fetchFromGitHub, git, pkgconfig }:
+{ lib, python3, fetchFromGitHub, git, pkg-config }:
 
 # Note:
 # Conan has specific dependency demands; check
@@ -72,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec {
   ];
 
   checkInputs = [
-    pkgconfig
+    pkg-config
     git
   ] ++ (with newPython.pkgs; [
     codecov
diff --git a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix
deleted file mode 100644
index b906d64f0af9..000000000000
--- a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, python3Packages }:
-
-let
-
-  name = "doit";
-  version = "0.32.0";
-
-in python3Packages.buildPythonApplication {
-  name = "${name}-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz";
-    sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j";
-  };
-
-  buildInputs = with python3Packages; [ mock pytest ];
-
-  propagatedBuildInputs = with python3Packages; [ cloudpickle ]
-    ++ stdenv.lib.optional stdenv.isLinux pyinotify
-    ++ stdenv.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; {
-    homepage = "https://pydoit.org/";
-    description = "A task management & automation tool";
-    license = licenses.mit;
-    longDescription = ''
-      doit is a modern open-source build-tool written in python
-      designed to be simple to use and flexible to deal with complex
-      work-flows. It is specially suitable for building and managing
-      custom work-flows where there is no out-of-the-box solution
-      available.
-    '';
-    maintainers = with maintainers; [ pSub ];
-    platforms = platforms.all;
-  };
-}
diff --git a/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix
index 061ed5d973ab..09b3bc7ec061 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "0.9.2.0.3.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
index 2668eca45691..2df829a02295 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix b/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix
index 8c41eb3ac51a..25450ceb6d9b 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix
@@ -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
     '';
diff --git a/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index a83281c4e961..387650e85ab7 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
+{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
 
-assert guileSupport -> ( pkgconfig != null && guile != null );
+assert guileSupport -> ( pkg-config != null && guile != null );
 
 let
   version = "4.2.1";
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
     ./glibc-2.27-glob.patch
   ];
 
-  nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
-  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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix
index f01f38ecd233..fb9dab54049a 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
+{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
 
-assert guileSupport -> ( pkgconfig != null && guile != null );
+assert guileSupport -> ( pkg-config != null && guile != null );
 
 let
   version = "4.3";
@@ -21,10 +21,10 @@ stdenv.mkDerivation {
     ./impure-dirs.patch
   ];
 
-  nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
-  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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index d06282739afe..638be6b02d83 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
@@ -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;
     };
   };
 
diff --git a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix
index 30c4d4ec4de0..dcc0c3aef90c 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix
index 89e2b8d0cc6e..6320646974ad 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix b/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix
index 7d7502fad4b7..6f5ecde8f88c 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix
@@ -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";
diff --git a/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix
index a7fced4482be..ed5923e74d0a 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
index f1445970f6a7..488697033d91 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -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 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix
index 6c9d8bfc8385..d8ccd3ad2fe0 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mage";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "magefile";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0c77xgz2bz4j9sh9v7f49iqyamc4lvvldcmn6v50hk98s9193gbf";
+    sha256 = "sha256-ghOk44VcQUAAYm9NCLsgYdky1KEpwOeChBNrgUKjnC8=";
   };
 
-  vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+  vendorSha256 = null;
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
index 890c457da059..74d96d4af002 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
@@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
 
   # 0.45 update enabled tests but they are failing
   doCheck = false;
-  # checkInputs = [ ninja pkgconfig ];
+  # checkInputs = [ ninja pkg-config ];
   # checkPhase = "python ./run_project_tests.py";
 
   postFixup = ''
diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
index a3865e2c52c9..5942e20ec920 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix
index 09028789daa6..1eaa51a5de0b 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
index 1b805df95a08..ce08986b3e17 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix
index 8fc81a1a979d..ddc61ca86d9c 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix
@@ -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";
diff --git a/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix
index 9757d8cda8d1..03eac2db5e38 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pythonPackages }:
+{ lib, stdenv, pythonPackages }:
 
-with stdenv.lib;
+with lib;
 with pythonPackages;
 
 buildPythonApplication rec {
diff --git a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix
index 359c942d189a..3bf7623ed04c 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix
index 05a59cff850f..534c5efcfb13 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "12.3.2";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix
index 1c5996c6b1cf..d3926beb3216 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
index bf28868d0e70..aa3af12c934b 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index c62fb0f2515d..638f10f01873 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -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"
diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix
index 1480f32a50f3..40708b7877a9 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
index 315b74b820e5..d22f4bc487f8 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, makeWrapper, coreutils }:
+{ lib, stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation {
-  version = "4.0.3";
+  version = "4.0.4";
   pname = "redo-sh";
 
   src = fetchurl {
     url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
-    sha256 = "1n84ld4fihqa7a6kn3f177dknz89qcvissfwz1m21bwdq950avia";
+    sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g";
   };
 
   buildInputs = [ makeWrapper ];
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix
index a735a05dc5b8..48fbffc39406 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix
index 7d44bc74df8a..f61a7e774583 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix
@@ -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 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 1dd931981dad..5b9a456ce75f 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix
index f8b649e04093..4360a3f3a308 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix
@@ -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
diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 24c2bdd2af31..f80d278c86df 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -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;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
index a9314cef0cc3..6bd0b83cec1d 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
@@ -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
diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix
index 7a15c193423c..1de2ecbbc8b8 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   # The release tarballs don't contain any tests (runtest.py and test/*):
   doCheck = lib.versionOlder version "4.0.0";
 
-  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
diff --git a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
index cf422fc2e075..868ea265f6f4 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
@@ -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 ];
diff --git a/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix
index 628e0c4797b3..f0e6efdca3e9 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }:
+{ lib, stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "tup";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse3 pcre ];
 
   configurePhase = ''
@@ -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
diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix
index 49aae7c30140..ae62ce539bab 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix
@@ -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;
diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix
index e69e35442b3f..5c80cbe096e4 100644
--- a/nixpkgs/pkgs/development/tools/buildah/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildah/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 , go-md2man
@@ -14,13 +14,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.18.0";
+  version = "1.19.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    sha256 = "0kn31y5g7269mjaw5ddfsiaan93s62i8zzxg4xl01dg3dkkadwc4";
+    sha256 = "1gak5m4n4bfji1hcv8y5lj1m8a39rars8igqxdr89d2i45dkpbx0";
   };
 
   outputs = [ "out" "man" ];
@@ -52,7 +52,7 @@ buildGoModule rec {
     make -C docs install PREFIX="$man"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool which facilitates building OCI images";
     homepage = "https://buildah.io/";
     changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/tools/buildkit/default.nix b/nixpkgs/pkgs/development/tools/buildkit/default.nix
index 00a285c67d02..558940587949 100644
--- a/nixpkgs/pkgs/development/tools/buildkit/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildkit/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   pname = "buildkit";
-  version = "0.8.0";
+  version = "0.8.1";
 
   goPackagePath = "github.com/moby/buildkit";
-  subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
+  subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    sha256 = "0qcgq93wj77i912xqhwrzkzaqz608ilczfn5kcsrf9jk2m1gnx7m";
+    sha256 = "0lqfz097nyb6q6bn5mmfg6vl1nmgb6k4lmwxc8anza6zp8qh7wif";
   };
 
   buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
     homepage = "https://github.com/moby/buildkit";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/buildpack/default.nix b/nixpkgs/pkgs/development/tools/buildpack/default.nix
index dbb45df40c25..68d0a53387a6 100644
--- a/nixpkgs/pkgs/development/tools/buildpack/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildpack/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = pname;
     rev = "v${version}";
-    sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c";
+    sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM=";
   };
 
-  vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
+  vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/nixpkgs/pkgs/development/tools/cadre/gemset.nix b/nixpkgs/pkgs/development/tools/cadre/gemset.nix
index 33fd428debf2..e98f5c5f3e69 100644
--- a/nixpkgs/pkgs/development/tools/cadre/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cadre/gemset.nix
@@ -32,4 +32,4 @@
     };
     version = "1.2.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/cargo-web/default.nix b/nixpkgs/pkgs/development/tools/cargo-web/default.nix
index 3008c15d848a..c85ef52564a4 100644
--- a/nixpkgs/pkgs/development/tools/cargo-web/default.nix
+++ b/nixpkgs/pkgs/development/tools/cargo-web/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform
+{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform
 , CoreServices, Security
 }:
 
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm";
 
-  nativeBuildInputs = [ openssl perl pkgconfig ];
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
+  nativeBuildInputs = [ openssl perl pkg-config ];
+  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Cargo subcommand for the client-side Web";
     homepage = "https://github.com/koute/cargo-web";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/nixpkgs/pkgs/development/tools/cask/default.nix b/nixpkgs/pkgs/development/tools/cask/default.nix
index 925d10b23b44..886d435b8114 100644
--- a/nixpkgs/pkgs/development/tools/cask/default.nix
+++ b/nixpkgs/pkgs/development/tools/cask/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, python, emacsPackages }:
+{ lib, stdenv, fetchurl, python, emacs }:
 
 stdenv.mkDerivation rec {
   pname = "cask";
 
-  inherit (emacsPackages.melpaStablePackages.cask) src version;
+  inherit (emacs.pkgs.melpaStablePackages.cask) src version;
 
   doCheck = true;
 
-  nativeBuildInputs = [ emacsPackages.emacs ];
-  buildInputs = with emacsPackages; [
+  nativeBuildInputs = [ emacs ];
+  buildInputs = with emacs.pkgs; [
     s f dash ansi ecukes servant ert-runner el-mock
     noflet ert-async shell-split-string git package-build
   ] ++ [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Project management for Emacs";
     longDescription = ''
       Cask is a project management tool for Emacs that helps automate the
diff --git a/nixpkgs/pkgs/development/tools/castxml/default.nix b/nixpkgs/pkgs/development/tools/castxml/default.nix
index 90be513bd50f..ff47bd0e9f36 100644
--- a/nixpkgs/pkgs/development/tools/castxml/default.nix
+++ b/nixpkgs/pkgs/development/tools/castxml/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
   };
 
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ];
+  nativeBuildInputs = [ cmake ] ++ lib.optionals withMan [ python3Packages.sphinx ];
 
   clangVersion = lib.getVersion llvmPackages.clang;
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/CastXML/CastXML";
     license = licenses.asl20;
     description = "Abstract syntax tree XML output tool";
diff --git a/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix b/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix
index 49de5b06f543..c3fa8f420693 100644
--- a/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix
@@ -51,4 +51,4 @@
     };
     version = "1.6.10";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/cddl/gemset.nix b/nixpkgs/pkgs/development/tools/cddl/gemset.nix
index a66833e27d9f..c1f1c64495e3 100644
--- a/nixpkgs/pkgs/development/tools/cddl/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cddl/gemset.nix
@@ -92,4 +92,4 @@
     };
     version = "1.6.10";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/cdecl/default.nix b/nixpkgs/pkgs/development/tools/cdecl/default.nix
index 7981681a6414..7e0a07ad834d 100644
--- a/nixpkgs/pkgs/development/tools/cdecl/default.nix
+++ b/nixpkgs/pkgs/development/tools/cdecl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}:
+{lib, stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}:
 
 stdenv.mkDerivation {
   name = "cdecl-2.5";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Translator English -- C/C++ declarations";
-    license = stdenv.lib.licenses.publicDomain;
-    maintainers = with stdenv.lib.maintainers; [joelteon];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [joelteon];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/chefdk/gemset.nix b/nixpkgs/pkgs/development/tools/chefdk/gemset.nix
index 326dfae79311..1f9522ba4c57 100644
--- a/nixpkgs/pkgs/development/tools/chefdk/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/chefdk/gemset.nix
@@ -2453,4 +2453,4 @@
     };
     version = "1.0.5";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/chit/default.nix b/nixpkgs/pkgs/development/tools/chit/default.nix
index 564c5dcbcb53..ac8f15a41588 100644
--- a/nixpkgs/pkgs/development/tools/chit/default.nix
+++ b/nixpkgs/pkgs/development/tools/chit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
 , darwin
 }:
 
@@ -17,13 +17,13 @@ buildRustPackage rec {
 
   cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m";
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
   buildInputs = []
-  ++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
-  ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ])
+  ++ lib.optionals stdenv.isLinux [ openssl ]
+  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ])
   ;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io";
     longDescription = ''
       Chit helps answer these questions:
diff --git a/nixpkgs/pkgs/development/tools/clang-tools/default.nix b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
index 2e8f48901aba..498310d4324f 100644
--- a/nixpkgs/pkgs/development/tools/clang-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, llvmPackages }:
+{ lib, stdenv, llvmPackages }:
 
 let
   clang = llvmPackages.clang-unwrapped;
 
 in stdenv.mkDerivation {
   pname = "clang-tools";
-  version = stdenv.lib.getVersion clang;
+  version = lib.getVersion clang;
 
   dontUnpack = true;
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     runHook preInstall
 
     mkdir -p $out/bin
-    export libc_includes="${stdenv.lib.getDev stdenv.cc.libc}/include"
+    export libc_includes="${lib.getDev stdenv.cc.libc}/include"
     export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1"
 
     export clang=${clang}
@@ -34,6 +34,6 @@ in stdenv.mkDerivation {
 
   meta = clang.meta // {
     description = "Standalone command line tools for C++ development";
-    maintainers = with stdenv.lib.maintainers; [ aherrmann ];
+    maintainers = with lib.maintainers; [ aherrmann ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/clog-cli/default.nix b/nixpkgs/pkgs/development/tools/clog-cli/default.nix
index 6d843ead24e0..182a7f98c4c2 100644
--- a/nixpkgs/pkgs/development/tools/clog-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/clog-cli/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, rustPlatform, stdenv }:
+{ fetchFromGitHub, rustPlatform, lib, stdenv }:
 
 with rustPlatform;
 
@@ -18,8 +18,8 @@ buildRustPackage rec {
   meta = {
     description = "Generate changelogs from local git metadata";
     homepage = "https://github.com/clog-tool/clog-cli";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [stdenv.lib.maintainers.nthorne];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = [lib.maintainers.nthorne];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix
index 642c42108aa5..4d7e226463fd 100644
--- a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }:
 
 buildGoPackage rec {
   pname = "cloudfoundry-cli";
@@ -45,7 +45,7 @@ buildGoPackage rec {
     installShellCompletion --bash $bashCompletionScript
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official command line client for Cloud Foundry";
     homepage = "https://github.com/cloudfoundry/cli";
     maintainers = with maintainers; [ ris ];
diff --git a/nixpkgs/pkgs/development/tools/clpm/default.nix b/nixpkgs/pkgs/development/tools/clpm/default.nix
new file mode 100644
index 000000000000..03174d6c4fcb
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/clpm/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv
+, fetchgit
+, wrapLisp
+, sbcl
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "clpm";
+  version = "0.3.5";
+
+  src = fetchgit {
+    url = "https://gitlab.common-lisp.net/clpm/clpm";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if";
+  };
+
+  buildInputs = [
+    (wrapLisp sbcl)
+    openssl
+  ];
+
+  buildPhase = ''
+    ln -s ${openssl.out}/lib/libcrypto.so.* .
+    ln -s ${openssl.out}/lib/libssl.so.* .
+    common-lisp.sh --script scripts/build.lisp
+  '';
+
+  installPhase = ''
+    INSTALL_ROOT=$out sh install.sh
+  '';
+
+  # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core`
+  dontFixup = true;
+
+  meta = with lib; {
+    description = "Common Lisp Package Manager";
+    homepage = "https://www.clpm.dev/";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.petterstorvik ];
+    platforms = platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix b/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix
index 628bb31fbe93..2c85890e70bf 100644
--- a/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub
 , poetry, pygls, pyparsing
 , cmake, pytest, pytest-datadir
 , fetchpatch
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   };
 
   # can be removed after v0.1.2
-  patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+  patches = lib.optional stdenv.isDarwin (fetchpatch {
     url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch";
     sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0";
   });
@@ -34,7 +34,7 @@ buildPythonApplication rec {
   dontUseCmakeConfigure = true;
   checkPhase = "pytest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/regen100/cmake-language-server";
     description = "CMake LSP Implementation";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/compass/gemset.nix b/nixpkgs/pkgs/development/tools/compass/gemset.nix
index 1beb3d3fec00..3e93f6e417ab 100644
--- a/nixpkgs/pkgs/development/tools/compass/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/compass/gemset.nix
@@ -93,4 +93,4 @@
     };
     version = "3.4.25";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
index 24aca0dada7b..ef08b2d58134 100644
--- a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
+++ b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "compile-daemon-unstable";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Very simple compile daemon for Go";
     license = licenses.bsd2;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/development/tools/conftest/default.nix b/nixpkgs/pkgs/development/tools/conftest/default.nix
index 1f12afe3f748..7f2e65fd9918 100644
--- a/nixpkgs/pkgs/development/tools/conftest/default.nix
+++ b/nixpkgs/pkgs/development/tools/conftest/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "conftest";
     rev = "v${version}";
-    sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1";
+    sha256 = "sha256-mSiZjpsFZfkM522f1WcJgBexiBS0o3uf1g94pjhgGVU=";
   };
 
-  vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn";
+  vendorSha256 = "sha256-iCIuEvwkbfBZ858yZZyVf5om6YLsGKRvzFmYzJBrRf4=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 82ac15565742..bd8608a91197 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, buildGoModule,
+{ fetchFromGitHub, lib, stdenv, buildGoModule,
   makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
 buildGoModule rec {
   name = "buildkite-agent-${version}";
@@ -27,10 +27,10 @@ buildGoModule rec {
 
     # These are runtime dependencies
     wrapProgram $out/bin/buildkite-agent \
-      --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
+      --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Build runner for buildkite.com";
     longDescription = ''
       The buildkite-agent is a small, reliable, and cross-platform build runner
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index 391782014561..232efe32a1a8 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -13,7 +13,7 @@ buildGoPackage {
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
-    ${stdenv.lib.optionalString hasBootstrapScript ''
+    ${lib.optionalString hasBootstrapScript ''
     # Install bootstrap.sh
     mkdir -p $out/libexec/buildkite-agent
     cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent
@@ -25,11 +25,11 @@ buildGoPackage {
 
     # These are runtime dependencies
     wrapProgram $out/bin/buildkite-agent \
-      ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
-      --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
+      ${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
+      --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Build runner for buildkite.com";
     longDescription = ''
       The buildkite-agent is a small, reliable, and cross-platform build runner
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index 2a8e10008c2b..b1ee5349a5c1 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 let version = "1.2.4";
 in buildGoModule rec {
@@ -21,7 +21,7 @@ in buildGoModule rec {
     sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ bricewge ];
     license = licenses.asl20;
     description = "Command line client for the Drone continuous integration server";
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
index 7a7f0d023d80..ffdf588895aa 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   name = "drone.io-${version}";
@@ -15,7 +15,7 @@ buildGoModule rec {
     sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ elohmeier vdemeester ];
     license = licenses.asl20;
     description = "Continuous Integration platform built on container technology";
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
index f993faf544d7..855fd879a8e2 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "6.7.2";
+  version = "6.7.3";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0";
+    sha256 = "sha256-XaoM/1YuHBl8ndPz3EByW1X0CzTuvJ5ju11mStbJnEU=";
   };
 
-  vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4";
+  vendorSha256 = "sha256-xeptlcJLj+R1BdC8Rdi3hsJVxdrmvfeTMsrhMNGrXi8=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 3d127591bd0f..20cb953edea0 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "13.7.0";
+  version = "13.8.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "0hbzvw6bdy31yqnri7379gpm8n5nv6ayr1idg02c9zqgcsgm34jf";
+    sha256 = "15pf6mxma8gkzyxkzm1rjwa514p7gzabn3c474lcvsjpmp76wv68";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "036drxlkmm35mdl0f5k79hnmwvf8gadgsxx71jprn1fjjzk3cxmz";
+    sha256 = "1c4lpy7nc62rqk8bfwiy5pcgvcwx70qkz3lv9w512fr3n5hjd4c0";
   };
 in
 buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0v2wcalvs7gsbi33jm35k01cqv2iqz3k3yfjjw08dssg358d0vfp";
+    sha256 = "0v0iqpllzaabkahlc5pidzzw0bjlli984pdna3f3bbg67lm5a421";
   };
 
   patches = [ ./fix-shell-path.patch ];
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
index 7cefd896f481..6e58b74654da 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "gocd-agent-${version}-${rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip";
     sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
     homepage = "http://www.go.cd";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
index d23bc9d8d8e9..90eb61dbff8d 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "gocd-server-${version}-${rev}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
     homepage = "http://www.go.cd";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 13a6d596599a..adfc6a2580a3 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt
+{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt
 , writeScript, nixosTests, jq, cacert, curl }:
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.263.1";
+  version = "2.263.2";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f";
+    sha256 = "13l7y1307iv54z2zsjy0slzv2hpqv9i35qb15xa8s6sl7lcm9l49";
   };
 
   buildCommand = ''
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       #!${stdenv.shell}
       set -o errexit
       PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
           cacert
           common-updater-scripts
           coreutils
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An extendable open source continuous integration server";
     homepage = "https://jenkins-ci.org";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix
index 5a326e94a544..f64cbd5e85fd 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
     rm -r $out/lib # it contains only systemd unit file
   '');
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight and modular continuous integration service";
     homepage = "https://laminar.ohwg.net";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/convco/default.nix b/nixpkgs/pkgs/development/tools/convco/default.nix
new file mode 100644
index 000000000000..d6be170bb8f6
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/convco/default.nix
@@ -0,0 +1,26 @@
+{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "convco";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "convco";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4";
+  };
+
+  cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z";
+
+  nativeBuildInputs = [ openssl perl pkg-config ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+
+  meta = with lib; {
+    description = "A Conventional commit cli";
+    homepage = "https://github.com/convco/convco";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ hoverbear ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/corgi/default.nix b/nixpkgs/pkgs/development/tools/corgi/default.nix
index a1549de18436..a7698ef4fb8e 100644
--- a/nixpkgs/pkgs/development/tools/corgi/default.nix
+++ b/nixpkgs/pkgs/development/tools/corgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "corgi-${rev}";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CLI workflow manager";
     longDescription = ''
       Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet.
diff --git a/nixpkgs/pkgs/development/tools/corundum/gemset.nix b/nixpkgs/pkgs/development/tools/corundum/gemset.nix
index e395e098e6d1..a6ec2f2b9b91 100644
--- a/nixpkgs/pkgs/development/tools/corundum/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/corundum/gemset.nix
@@ -151,4 +151,4 @@
     };
     version = "1.2.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix
index a0f69033923c..e016f0ef7c92 100644
--- a/nixpkgs/pkgs/development/tools/coursier/default.nix
+++ b/nixpkgs/pkgs/development/tools/coursier/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts
+{ lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts
 , coreutils, git, gnused, nix, nixfmt }:
 
 let
-  version = "2.0.8";
+  version = "2.0.9";
 
   zshCompletion = fetchurl {
     url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
       "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8=";
+    sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     #!${stdenv.shell}
     set -o errexit
     PATH=${
-      stdenv.lib.makeBinPath [
+      lib.makeBinPath [
         common-updater-scripts
         coreutils
         git
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://get-coursier.io/";
     description =
       "A Scala library to fetch dependencies from Maven / Ivy repositories";
diff --git a/nixpkgs/pkgs/development/tools/cppclean/default.nix b/nixpkgs/pkgs/development/tools/cppclean/default.nix
index 283d9845dfaa..4e00eb903ebe 100644
--- a/nixpkgs/pkgs/development/tools/cppclean/default.nix
+++ b/nixpkgs/pkgs/development/tools/cppclean/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ lib, stdenv, fetchFromGitHub, python3Packages }:
 
 with python3Packages;
 
@@ -21,7 +21,7 @@ buildPythonApplication rec {
     ./test.bash
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Finds problems in C++ source that slow development of large code bases";
     homepage    = "https://github.com/myint/cppclean";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix
index 99d519a83b68..d96d90718063 100644
--- a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix
@@ -111,4 +111,4 @@
     };
     version = "0.1.2";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/cue/default.nix b/nixpkgs/pkgs/development/tools/cue/default.nix
index cdd0f2ae1053..243be958b07d 100644
--- a/nixpkgs/pkgs/development/tools/cue/default.nix
+++ b/nixpkgs/pkgs/development/tools/cue/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchgit, stdenv }:
+{ buildGoModule, fetchgit, lib, stdenv }:
 
 buildGoModule rec {
   pname = "cue";
@@ -23,7 +23,7 @@ buildGoModule rec {
   meta = {
     description = "A data constraint language which aims to simplify tasks involving defining and using data";
     homepage = "https://cuelang.org/";
-    maintainers = with stdenv.lib.maintainers; [ solson ];
-    license = stdenv.lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ solson ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/dapper/default.nix b/nixpkgs/pkgs/development/tools/dapper/default.nix
index 664dd61246d6..c49870346cbf 100644
--- a/nixpkgs/pkgs/development/tools/dapper/default.nix
+++ b/nixpkgs/pkgs/development/tools/dapper/default.nix
@@ -5,7 +5,7 @@
 
 buildGoPackage rec {
   pname = "dapper";
-  version = "0.5.3";
+  version = "0.5.4";
 
   goPackagePath = "github.com/rancher/dapper";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "rancher";
     repo = "dapper";
     rev = "v${version}";
-    sha256 = "1h62jahrxpmqx6r3mlakzap8gisrymgkp5syyarpab05qm1inngd";
+    sha256 = "sha256-2KyDFiCxqoQt/m12vyHH8/L88+dOQGGsnI3l1G82NxQ=";
   };
    patchPhase = ''
      substituteInPlace main.go --replace 0.0.0 ${version}
diff --git a/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix
index ef61edcbb8dd..7a8243ece25d 100644
--- a/nixpkgs/pkgs/development/tools/dapr/cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv }:
+{ buildGoModule, fetchFromGitHub, lib, stdenv }:
 
 let
   pname = "dapr";
@@ -22,7 +22,7 @@ in buildGoModule {
     mv $out/bin/cli $out/bin/dapr
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://dapr.io";
     description = "A CLI for managing Dapr, the distributed application runtime";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix
index fe7721f5ed4c..9c01c1e9d2d1 100644
--- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dbmate";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database migration tool";
     homepage = "https://github.com/amacneil/dbmate";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix b/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix
deleted file mode 100644
index 97bfc10b20af..000000000000
--- a/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-sql-driver/mysql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev =  "2cc627ac8defc45d65066ae98f898166f580f9a4";
-      sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww";
-    };
-  }
-  {
-    goPackagePath  = "github.com/joho/godotenv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/joho/godotenv";
-      rev =  "a79fa1e548e2c689c241d10173efd51e5d689d5b";
-      sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev =  "19c8e9ad00952ce0c64489b60e8df88bb16dd514";
-      sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-sqlite3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-sqlite3";
-      rev =  "6c771bb9887719704b210e87e934f08be014bdb1";
-      sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c";
-      sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
-      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "150dc57a1b433e64154302bdc40b6bb8aefa313a";
-      sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
-    };
-  }
-]
diff --git a/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
index b2599cce4307..ae10c402945f 100644
--- a/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, postgresql, getopt, makeWrapper }:
+{ lib, stdenv, fetchurl, postgresql, getopt, makeWrapper }:
 stdenv.mkDerivation rec {
   pname = "ephemeralpg";
   version = "3.1";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     PREFIX=$out make install
-    wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]}
+    wrapProgram $out/bin/pg_tmp --prefix PATH : ${lib.makeBinPath [ postgresql getopt ]}
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Run tests on an isolated, temporary PostgreSQL database";
     license = licenses.isc;
     homepage = "http://ephemeralpg.org/";
diff --git a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
index 6eb24a812aaa..16e5fce1ebc0 100644
--- a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, jre, makeWrapper
-, mysqlSupport ? true, mysql_jdbc ? null }:
+{ lib, stdenv, fetchurl, jre, makeWrapper
+, mysqlSupport ? true, mysql_jdbc
+, postgresqlSupport ? true, postgresql_jdbc }:
 
-assert mysqlSupport -> mysql_jdbc != null;
-
-with stdenv.lib;
 let
-  extraJars = optional mysqlSupport mysql_jdbc;
+  extraJars =
+    lib.optional mysqlSupport mysql_jdbc
+    ++ lib.optional postgresqlSupport postgresql_jdbc;
 in
 
 stdenv.mkDerivation rec {
@@ -47,15 +47,15 @@ stdenv.mkDerivation rec {
       # taken from the executable script in the source
       CP="$out/liquibase.jar"
       ${addJars "$out/lib"}
-      ${concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
+      ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
 
-      ${getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
+      ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
         liquibase.integration.commandline.Main \''${1+"\$@"}
       EOF
       chmod +x $out/bin/liquibase
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Version Control for your database";
     homepage = "https://www.liquibase.org/";
     changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt";
diff --git a/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix b/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix
index f440e550a897..65e7c06b1402 100644
--- a/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }:
+{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }:
 
 stdenv.mkDerivation rec {
   pname = "pg_checksums";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Activate/deactivate/verify checksums in offline PostgreSQL clusters";
     homepage = "https://github.com/credativ/pg_checksums";
     maintainers = [ maintainers.marsam ];
diff --git a/nixpkgs/pkgs/development/tools/database/pgcli/default.nix b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
index b4c26d6fb5c2..cc7524e3a437 100644
--- a/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonApplication
 , fetchPypi
 , isPy3k
@@ -46,9 +46,9 @@ buildPythonApplication rec {
 
   checkInputs = [ pytestCheckHook mock ];
 
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line interface for PostgreSQL";
     longDescription = ''
       Rich command-line interface for PostgreSQL with auto-completion and
diff --git a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix
index c86a0f6df8bd..119aa2eb8f81 100644
--- a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ lib, stdenv, pythonPackages, fetchFromGitHub }:
 
 let
   pgdbconn = pythonPackages.buildPythonPackage {
@@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication {
   meta = {
     description = "A declarative language to describe PostgreSQL databases";
     homepage = "https://perseas.github.io/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ pmeunier ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pmeunier ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/database/shmig/default.nix b/nixpkgs/pkgs/development/tools/database/shmig/default.nix
index ca07a0569407..447dbc23fdf1 100644
--- a/nixpkgs/pkgs/development/tools/database/shmig/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/shmig/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support";
     homepage = "https://github.com/mbucc/shmig";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix
index 33b2abce277b..2afd004f4d73 100644
--- a/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "sqlcheck";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Automatically identify anti-patterns in SQL queries";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
index 49cc7b42b3da..6017d704fc17 100644
--- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
+{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
 
 let
   version = "20.2.0.175.1842";
@@ -65,7 +65,7 @@ in
       --run "cd $out/libexec/sqldeveloper/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Oracle's Oracle DB GUI client";
     longDescription = ''
       Oracle SQL Developer is a free integrated development environment that
diff --git a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix
index 924a82bfd85e..5aca6d55bc81 100644
--- a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -1,6 +1,6 @@
 # To enable specific database drivers, override this derivation and pass the
 # driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc).
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip
+{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip
 , jre
 , drivers ? []
 }:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/share/squirrel-sql
     cp -r . $out/share/squirrel-sql
 
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/share/squirrel-sql/icons/acorn.png \
       $out/share/icons/hicolor/32x32/apps/squirrel-sql.png
     ln -s ${desktopItem}/share/applications $out/share
-    
+
     runHook postInstall
   '';
 
@@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
     icon = "squirrel-sql";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Universal SQL Client";
     homepage = "http://squirrel-sql.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
index a0e05bf4ae57..2b8a6f7cca02 100644
--- a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "timescaledb-parallel-copy";
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bulk, parallel insert of CSV records into PostgreSQL";
     homepage = "https://github.com/timescale/timescaledb-parallel-copy";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
index 2079925049dd..cec374ccb3a9 100644
--- a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "timescaledb-tune";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx";
+    sha256 = "0vrbbswmg6z3n012mqd1jasqk01navypzv5m00r6c9bxj72hgcxl";
   };
 
   vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for tuning your TimescaleDB for better performance";
     homepage = "https://github.com/timescale/timescaledb-tune";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/nixpkgs/pkgs/development/tools/database/webdis/default.nix
index ec22252cbe02..5de8296299fb 100644
--- a/nixpkgs/pkgs/development/tools/database/webdis/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/webdis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "webdis";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "CONFDIR=${placeholder "out"}/share/webdis"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Redis HTTP interface with JSON output";
     homepage = "https://webd.is/";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/dcadec/default.nix b/nixpkgs/pkgs/development/tools/dcadec/default.nix
index 55f888056cf7..9f5f4f0a3b52 100644
--- a/nixpkgs/pkgs/development/tools/dcadec/default.nix
+++ b/nixpkgs/pkgs/development/tools/dcadec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "dcadec";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first."
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DTS Coherent Acoustics decoder with support for HD extensions";
     maintainers = with maintainers; [ edwtjo ];
     homepage = "https://github.com/foo86/dcadec";
diff --git a/nixpkgs/pkgs/development/tools/deis/default.nix b/nixpkgs/pkgs/development/tools/deis/default.nix
index 4a07a05a6368..c8e20d42063f 100644
--- a/nixpkgs/pkgs/development/tools/deis/default.nix
+++ b/nixpkgs/pkgs/development/tools/deis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "deis";
@@ -25,7 +25,7 @@ buildGoPackage rec {
     export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://deis.io";
     description = "A command line utility used to interact with the Deis open source PaaS";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/deisctl/default.nix b/nixpkgs/pkgs/development/tools/deisctl/default.nix
index a245a06afe16..0f5df40d92c7 100644
--- a/nixpkgs/pkgs/development/tools/deisctl/default.nix
+++ b/nixpkgs/pkgs/development/tools/deisctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "deis";
@@ -19,7 +19,7 @@ buildGoPackage rec {
     export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://deis.io";
     description = "A command-line utility used to provision and operate a Deis cluster";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/delve/default.nix b/nixpkgs/pkgs/development/tools/delve/default.nix
index e81a1273af87..62fb32c85163 100644
--- a/nixpkgs/pkgs/development/tools/delve/default.nix
+++ b/nixpkgs/pkgs/development/tools/delve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "delve";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "debugger for the Go programming language";
     homepage = "https://github.com/derekparker/delve";
     maintainers = with maintainers; [ vdemeester ];
diff --git a/nixpkgs/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix
index 8b7c54832e28..ff7f370b0d44 100644
--- a/nixpkgs/pkgs/development/tools/dep/default.nix
+++ b/nixpkgs/pkgs/development/tools/dep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "dep";
@@ -17,7 +17,7 @@ buildGoPackage rec {
 
   buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/golang/dep";
     description = "Go dependency management tool";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/dep2nix/default.nix b/nixpkgs/pkgs/development/tools/dep2nix/default.nix
index 9d14f7c1c1e3..daa68b1b9311 100644
--- a/nixpkgs/pkgs/development/tools/dep2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/dep2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage
+{ lib, stdenv, fetchFromGitHub, buildGoPackage
 , makeWrapper, nix-prefetch-scripts }:
 
 buildGoPackage rec {
@@ -25,7 +25,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`";
     license = licenses.bsd3;
     homepage = "https://github.com/nixcloud/dep2nix";
diff --git a/nixpkgs/pkgs/development/tools/detect-secrets/default.nix b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix
index 1e42a32f7caa..f0dddf66ff40 100644
--- a/nixpkgs/pkgs/development/tools/detect-secrets/default.nix
+++ b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix
@@ -1,29 +1,53 @@
-{ lib, buildPythonApplication, fetchFromGitHub, isPy27, pyyaml, unidiff, configparser, enum34, future, functools32, mock, pytest }:
+{ lib
+, buildPythonApplication
+, configparser
+, enum34
+, fetchFromGitHub
+, functools32
+, future
+, isPy27
+, mock
+, pyahocorasick
+, pytestCheckHook
+, pyyaml
+, requests
+, responses
+, unidiff
+}:
 
 buildPythonApplication rec {
   pname = "detect-secrets";
-  version = "0.12.4";
+  version = "0.14.3";
+  disabled = isPy27;
 
   # PyPI tarball doesn't ship tests
   src = fetchFromGitHub {
     owner = "Yelp";
-    repo = "detect-secrets";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "01y5xd0irxxib4wnf5834gwa7ibb81h5y4dl8b26gyzgvm5zfpk1";
+    sha256 = "0c4hxih9ljmv0d3izq5idyspk5zci26gdb6lv9klwcshwrfkvxj0";
   };
 
-  propagatedBuildInputs = [ pyyaml ]
-    ++ lib.optionals isPy27 [ configparser enum34 future functools32 ];
+  propagatedBuildInputs = [
+    pyyaml
+    requests
+  ];
 
-  checkInputs = [ mock pytest unidiff ];
+  checkInputs = [
+    mock
+    pyahocorasick
+    pytestCheckHook
+    responses
+    unidiff
+  ];
 
-  # deselect tests which require git setup
-  checkPhase = ''
-    PYTHONPATH=$PWD:$PYTHONPATH pytest \
-      --deselect tests/main_test.py::TestMain \
-      --deselect tests/pre_commit_hook_test.py::TestPreCommitHook \
-      --deselect tests/core/baseline_test.py::TestInitializeBaseline
-  '';
+  disabledTests = [
+    "TestMain"
+    "TestPreCommitHook"
+    "TestInitializeBaseline"
+  ];
+
+  pythonImportsCheck = [ "detect_secrets" ];
 
   meta = with lib; {
     description = "An enterprise friendly way of detecting and preventing secrets in code";
diff --git a/nixpkgs/pkgs/development/tools/devd/default.nix b/nixpkgs/pkgs/development/tools/devd/default.nix
index 2d5a38458d3a..32f29f7e128c 100644
--- a/nixpkgs/pkgs/development/tools/devd/default.nix
+++ b/nixpkgs/pkgs/development/tools/devd/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, stdenv }:
+{ buildGoPackage, fetchFromGitHub, lib, stdenv }:
 
 buildGoPackage rec {
   pname = "devd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
   };
   goPackagePath = "github.com/cortesi/devd";
   subPackages = [ "cmd/devd" ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A local webserver for developers";
     homepage = "https://github.com/cortesi/devd";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/nixpkgs/pkgs/development/tools/devpi-client/default.nix
index 1a0fdf403082..766f3f2b7292 100644
--- a/nixpkgs/pkgs/development/tools/devpi-client/default.nix
+++ b/nixpkgs/pkgs/development/tools/devpi-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonApplication
 , fetchPypi
 # buildInputs
@@ -25,11 +25,11 @@
 
 buildPythonApplication rec {
   pname = "devpi-client";
-  version = "5.2.0";
+  version = "5.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1y8r1pjav0gyrbnyqjnc202sa962n1gasi8233xj7jc39lv3iq40";
+    sha256 = "74ff365efeaa7b78c9eb7f6d7bd349ccd6252a6cdf879bcb4137ee5ff0fb127a";
   };
 
   buildInputs = [ glibcLocales pkginfo check-manifest ];
@@ -49,7 +49,7 @@ buildPythonApplication rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://doc.devpi.net";
     description = "Client for devpi, a pypi index server and packaging meta tool";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
index 7ddff92402cb..3d8cb16bb478 100644
--- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages, nginx }:
+{ lib, stdenv, fetchFromGitHub, python3Packages, nginx }:
 
 python3Packages.buildPythonApplication rec {
   pname = "devpi-server";
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
     pytest-flake8
     webtest
-  ] ++ stdenv.lib.optionals isPy27 [ mock ];
+  ] ++ lib.optionals isPy27 [ mock ];
 
   # root_passwd_hash tries to write to store
   # TestMirrorIndexThings tries to write to /var through ngnix
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec {
     "TestMirrorIndexThings"
   ];
 
-  meta = with stdenv.lib;{
+  meta = with lib;{
     homepage = "http://doc.devpi.net";
     description = "Github-style pypi index server and packaging meta tool";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/devtodo/default.nix b/nixpkgs/pkgs/development/tools/devtodo/default.nix
index f4a974da3476..34fdd2c794e5 100644
--- a/nixpkgs/pkgs/development/tools/devtodo/default.nix
+++ b/nixpkgs/pkgs/development/tools/devtodo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, ncurses }:
+{ lib, stdenv, fetchurl, readline, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "devtodo";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://swapoff.org/devtodo1.html";
     description = "A hierarchical command-line task manager";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
index 6a447dd57c92..bd8e71090c53 100644
--- a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security
+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security
 , sqliteSupport ? true, sqlite
 , postgresqlSupport ? true, postgresql
 , mysqlSupport ? true, mysql, zlib, libiconv
@@ -8,7 +8,7 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq
   "support for at least one database must be enabled";
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
   features = ''
     ${optionalString sqliteSupport "sqlite"} \
     ${optionalString postgresqlSupport "postgres"} \
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
   cargoPatches = [ ./cargo-lock.patch ];
   cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]
     ++ optional stdenv.isDarwin Security
     ++ optional (stdenv.isDarwin && mysqlSupport) libiconv
diff --git a/nixpkgs/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix
index 3cb050df0363..07ca12cc9cc9 100644
--- a/nixpkgs/pkgs/development/tools/dive/default.nix
+++ b/nixpkgs/pkgs/development/tools/dive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
 
 buildGoModule rec {
   pname = "dive";
@@ -17,11 +17,11 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
+  buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for exploring each layer in a docker image";
     homepage = "https://github.com/wagoodman/dive";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/doctl/default.nix b/nixpkgs/pkgs/development/tools/doctl/default.nix
index 2b4bf66a0158..4d05bd3ed114 100644
--- a/nixpkgs/pkgs/development/tools/doctl/default.nix
+++ b/nixpkgs/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.54.0";
+  version = "1.55.0";
 
   vendorSha256 = null;
 
@@ -32,7 +32,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "163n3d07vv9d4356ql6hbw2vg6n5c834axz7y4gk8gm9badbna82";
+    sha256 = "sha256-vhg5X8H4VegSDORtj1rgNKlWQo1H1e/vvO01LJkVK+A=";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/tools/documentation/antora/default.nix b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix
index 781fee2bb266..d553df59446a 100644
--- a/nixpkgs/pkgs/development/tools/documentation/antora/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, nodePackages }:
+{ lib, stdenv, nodePackages }:
 
 let
   linkNodeDeps = ({ pkg, deps, name ? "" }:
     let
-      targetModule = if name != "" then name else stdenv.lib.getName pkg;
+      targetModule = if name != "" then name else lib.getName pkg;
     in nodePackages.${pkg}.override (oldAttrs: {
       postInstall = ''
         mkdir -p $out/lib/node_modules/${targetModule}/node_modules
-        ${stdenv.lib.concatStringsSep "\n" (map (dep: ''
-          ln -s ${nodePackages.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \
-            $out/lib/node_modules/${targetModule}/node_modules/${stdenv.lib.getName dep}
+        ${lib.concatStringsSep "\n" (map (dep: ''
+          ln -s ${nodePackages.${dep}}/lib/node_modules/${lib.getName dep} \
+            $out/lib/node_modules/${targetModule}/node_modules/${lib.getName dep}
         '') deps
         )}
       '';
diff --git a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix
index 613dec86d7cd..a4a70dabd69d 100644
--- a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }:
+{ lib, stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "doxygen";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "doxygen";
     repo = "doxygen";
-    rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
+    rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}";
     sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh";
   };
 
@@ -19,21 +19,21 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-       stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
-    ++ stdenv.lib.optional stdenv.isSunOS libiconv
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
+       lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
+    ++ lib.optional stdenv.isSunOS libiconv
+    ++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
 
   cmakeFlags =
     [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++
-    stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES";
+    lib.optional (qt5 != null) "-Dbuild_wizard=YES";
 
   NIX_CFLAGS_COMPILE =
-    stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
+    lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
 
   enableParallelBuilding = false;
 
   meta = {
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     homepage = "http://doxygen.nl/";
     description = "Source code documentation generator tool";
 
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
       manual (in LaTeX) from a set of documented source files.
     '';
 
-    platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+    platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 54c37fa61837..2e04d3dd365e 100644
--- a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3
+{ lib, stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
 , python2Packages }:
 
 python2Packages.buildPythonApplication rec {
@@ -8,11 +8,11 @@ python2Packages.buildPythonApplication rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
   };
 
-  nativeBuildInputs = [ intltool pkgconfig libxslt.dev ];
+  nativeBuildInputs = [ intltool pkg-config libxslt.dev ];
   buildInputs = [ libxslt ];
 
   configureFlags = [ "--disable-scrollkeeper" ];
@@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec {
     rm $out/nix-support/propagated-build-inputs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of documentation utilities for the GNOME project";
     homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils";
     license = with licenses; [ gpl2Plus lgpl2Plus ];
diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
index 10b48d511918..b1ea6a0634b5 100644
--- a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec {
     docbook_xml_dtd_43
     docbook_xsl
     libxslt
-  ] ++ stdenv.lib.optionals withDblatex [
+  ] ++ lib.optionals withDblatex [
     dblatex
   ];
 
@@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools to extract documentation embedded in GTK and GNOME source code";
     homepage = "https://www.gtk.org/gtk-doc";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
index 5ab74a4b95ff..d2e555a4550d 100644
--- a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "mdsh";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Markdown shell pre-processor";
     homepage = "https://github.com/zimbatm/mdsh";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix
index 8d4480945bda..bee22856eb10 100644
--- a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -35,13 +35,13 @@ buildPythonApplication rec {
     backports_tempfile
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Project documentation with Markdown / static website generator";
     longDescription = ''
       MkDocs is a fast, simple and downright gorgeous static site generator that's
       geared towards building project documentation. Documentation source files
       are written in Markdown, and configured with a single YAML configuration file.
-      
+
       MkDocs can also be used to generate general-purpose Websites.
     '';
     homepage = "http://mkdocs.org/";
diff --git a/nixpkgs/pkgs/development/tools/dot-http/default.nix b/nixpkgs/pkgs/development/tools/dot-http/default.nix
index 1c81a4145d29..b156847870d8 100644
--- a/nixpkgs/pkgs/development/tools/dot-http/default.nix
+++ b/nixpkgs/pkgs/development/tools/dot-http/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "dot-http";
@@ -15,11 +15,11 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
     libiconv Security
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Text-based scriptable HTTP client";
     homepage = "https://github.com/bayne/dot-http";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/drip/default.nix b/nixpkgs/pkgs/development/tools/drip/default.nix
index b4edf8ec081b..2724e41e8e61 100644
--- a/nixpkgs/pkgs/development/tools/drip/default.nix
+++ b/nixpkgs/pkgs/development/tools/drip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, jdk8, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "drip";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
     license = licenses.epl10;
     homepage = "https://github.com/ninjudd/drip";
diff --git a/nixpkgs/pkgs/development/tools/drm_info/default.nix b/nixpkgs/pkgs/development/tools/drm_info/default.nix
index c052db92e0c7..86d55ab07804 100644
--- a/nixpkgs/pkgs/development/tools/drm_info/default.nix
+++ b/nixpkgs/pkgs/development/tools/drm_info/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , libdrm, json_c, pciutils
-, meson, ninja, pkgconfig
+, meson, ninja, pkg-config
 }:
 
 stdenv.mkDerivation rec {
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ libdrm json_c pciutils ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small utility to dump info about DRM devices";
     homepage = "https://github.com/ascent12/drm_info";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/dtools/default.nix b/nixpkgs/pkgs/development/tools/dtools/default.nix
index 5efa579ec5a1..1c1604db654a 100644
--- a/nixpkgs/pkgs/development/tools/dtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/dtools/default.nix
@@ -49,13 +49,13 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
       $makeCmd INSTALL_DIR=$out install
-	'';
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ancillary tools for the D programming language compiler";
     homepage = "https://github.com/dlang/tools";
     license = lib.licenses.boost;
     maintainers = with maintainers; [ ThomasMader ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/easyjson/default.nix b/nixpkgs/pkgs/development/tools/easyjson/default.nix
index ef99bbd01c31..a458f0dbfceb 100644
--- a/nixpkgs/pkgs/development/tools/easyjson/default.nix
+++ b/nixpkgs/pkgs/development/tools/easyjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "easyjson";
@@ -12,7 +12,7 @@ buildGoPackage {
     sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mailru/easyjson";
     description = "Fast JSON serializer for golang";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
index 600b2b0e56ce..633e13d25f77 100644
--- a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
+++ b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
@@ -21,7 +21,7 @@
 
 with lib;
 let
-  pVersion = "1.10.0.20200225";
+  pVersion = "1.11.0.20201202";
   pVersionTriple = splitVersion pVersion;
   majorVersion = elemAt pVersionTriple 0;
   minorVersion = elemAt pVersionTriple 1;
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip";
-    sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx";
+    sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI=";
   };
 
   desktopItem = makeDesktopItem {
@@ -62,13 +62,13 @@ stdenv.mkDerivation rec {
     libCairo=$out/eclipse/libcairo-swt.so
     patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer
     [ -f $libCairo ] && patchelf --set-rpath ${
-      stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]
+      lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]
     } $libCairo
 
     # Create wrapper script.  Pass -configuration to store settings in ~/.eclipse-mat/<version>
     makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \
       --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration"
 
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontConfigure = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast and feature-rich Java heap analyzer";
     longDescription = ''
       The Eclipse Memory Analyzer is a tool that helps you find memory
diff --git a/nixpkgs/pkgs/development/tools/ejson/gemset.nix b/nixpkgs/pkgs/development/tools/ejson/gemset.nix
index 70c61be984c6..93fa1131f2a7 100644
--- a/nixpkgs/pkgs/development/tools/ejson/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/ejson/gemset.nix
@@ -185,4 +185,4 @@
     };
     version = "0.0.23";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix
index 29d00a159ab1..2e60885111d9 100644
--- a/nixpkgs/pkgs/development/tools/electron/default.nix
+++ b/nixpkgs/pkgs/development/tools/electron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , libXScrnSaver
 , makeWrapper
 , fetchurl
@@ -76,30 +76,30 @@ rec {
     headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5";
   };
 
-  electron_9 = mkElectron "9.4.0" {
-    x86_64-linux = "2a81ef31fc4b1e1ea450f2c145179ad7c4b6fc752a7b9f3e27abd2461e908ea6";
-    x86_64-darwin = "38fa3d93b74c425008d17712daa7676a0f4eb1a70b92da6d7a5c66bb078546cd";
-    i686-linux = "629caa459e2fdf31e82501dfd194358d14112152c9d719be579850605ddd929a";
-    armv7l-linux = "f46ae7a45d89007cec1c3f45e8e059f2d0e0b73dcadc009b96589ce8bb5e0e21";
-    aarch64-linux = "7ebb9cebfa32add20f56b9b414a473f1cb55c90d55735b133f353a23ad76becd";
-    headers = "17729m93a387v1sc0ayzfjpvbl1wr9vhlf8y11wyr4704iyimr72";
+  electron_9 = mkElectron "9.4.1" {
+    x86_64-linux = "36c6c33e2702f591c34a7e6ebd7d0828d554a4ce2eafb319a0cd16ffd4cc4b28";
+    x86_64-darwin = "3e2f87d899be684eab226c572c566e89c05114059c9add1a33d2be63100b18fd";
+    i686-linux = "be5f8d18f11ad7c0655faec4040a8af6239f29f1155210024a01826a30b0dbbe";
+    armv7l-linux = "b710a0e3b80ef265760d49c9210f78a6410007521b0ed73c8b868b05d22a0a60";
+    aarch64-linux = "e2fc73309780fc0e9b5abebcb8256b2bc389672f0bcc261269da5891a3df66dc";
+    headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q";
   };
 
-  electron_10 = mkElectron "10.2.0" {
-    x86_64-linux = "71e6f27433c7a098d0d0d4f2b624bc05cc81614d4e8cd0df71a78a6f9f4e4d5a";
-    x86_64-darwin = "c6c32fa6b59d33f79e2f5cc317d7c61f0e1b8d7ab22c46a7a4e3fc3233785d7c";
-    i686-linux = "d18208292cc5b64fed42b7ed21740b20f31c92b7612eb54ea1b71f8058a7439d";
-    armv7l-linux = "b588b1d14b6f13b1e705180c52fae85113033efa630417a97555a085d7442ec4";
-    aarch64-linux = "6cd8172939005cd12705d3c30be57e02e8b5271362ad60fb7378cc99a21db1e0";
-    headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr";
+  electron_10 = mkElectron "10.3.0" {
+    x86_64-linux = "1a4afb659400c7acca0734df1b981b867e5dfdd15d4d3b73fd276d87b682f089";
+    x86_64-darwin = "9c5cca484b28dc5cca89a7f1c77e65b3a04251f4eee740265c358efae351cb94";
+    i686-linux = "fcb298bca0ab229e92b92c418d3e352885ff4291f735a35c7822b3ca17ae8a86";
+    armv7l-linux = "48accf0fbef1f2d1a81e12c2e66b9280f871029b16947d0bebe036cf1fb71b1c";
+    aarch64-linux = "2c99b4ec87ba657c33efb3a7e907e3f3e315e87347954231cb8bae393c1c96fd";
+    headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj";
   };
 
-  electron_11 = mkElectron "11.1.0" {
-    x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538";
-    x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0";
-    i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6";
-    armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd";
-    aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777";
-    headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr";
+  electron_11 = mkElectron "11.2.1" {
+    x86_64-linux = "607d9d58c9a3b5c36461acc6bbe473bc604eee42a55c2c617ac46d095cf98abb";
+    x86_64-darwin = "39d95668a3ea04bdc652ff9e2889c7a88f638534420e8e256679cbf4b7658a65";
+    i686-linux = "59f226133d01fb6acf86fe98907964f79dcf2902054e5c4c9c4ff84a3ea88f4a";
+    armv7l-linux = "85051d8eacf04aeec3dd74e46e7888d01bd4e6caf7ec2001122a1f3e11db44ee";
+    aarch64-linux = "8aa9be5d6c139386390bad64f78b95756206a40fe4982fc9f199b67a7d06bec5";
+    headers = "12sy8zzb0z654b85c5l1j8762nhwmkim1pbz1y3qzgbzvpbd5arq";
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/electron/generic.nix b/nixpkgs/pkgs/development/tools/electron/generic.nix
index 6d0dbc8cace2..e29064e673ad 100644
--- a/nixpkgs/pkgs/development/tools/electron/generic.nix
+++ b/nixpkgs/pkgs/development/tools/electron/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , libXScrnSaver
 , makeWrapper
 , fetchurl
@@ -20,7 +20,7 @@ version: hashes:
 let
   name = "electron-${version}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross platform desktop application shell";
     homepage = "https://github.com/electron/electron";
     license = licenses.mit;
@@ -56,7 +56,7 @@ let
     passthru.headers = headersFetcher version hashes.headers;
   };
 
-  electronLibPath = with stdenv.lib; makeLibraryPath (
+  electronLibPath = with lib; makeLibraryPath (
     [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
     ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
     ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
@@ -89,7 +89,7 @@ let
         $out/lib/electron/electron
 
       wrapProgram $out/lib/electron/electron \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
+        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
         "''${gappsWrapperArgs[@]}"
     '';
   };
diff --git a/nixpkgs/pkgs/development/tools/eliot-tree/default.nix b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix
index 95108c21bb9c..e60642c5fe60 100644
--- a/nixpkgs/pkgs/development/tools/eliot-tree/default.nix
+++ b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "eliot-tree";
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
     pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jonathanj/eliottree";
     description = "Render Eliot logs as an ASCII tree";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix
index f9d63cc86d8d..44ed61ac1d5f 100644
--- a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix
+++ b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang
+{ lib, stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang
 , z3, python }:
 
 stdenv.mkDerivation rec {
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A concolic testing tool for the Erlang functional programming language";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
     homepage = "https://github.com/aggelgian/cuter";
-    maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ ericbmerritt ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/errcheck/default.nix b/nixpkgs/pkgs/development/tools/errcheck/default.nix
index 3c42c1437a47..eb9589f723da 100644
--- a/nixpkgs/pkgs/development/tools/errcheck/default.nix
+++ b/nixpkgs/pkgs/development/tools/errcheck/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "errcheck";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "kisielk";
     repo = "errcheck";
     rev = "v${version}";
-    sha256 = "00skyvy31yliw0f395j5h3gichi5n2q1m24izjidxvyc2av7pjn6";
+    sha256 = "sha256-ZmocFXtg+Thdup+RqDYC/Td3+m1nS0FydZecfsWXIzI=";
   };
 
-  vendorSha256 = "0mx506qb5sy6p4zqjs1n0w7dg8pz2wf982qi9v7nrhxysl2rlnxf";
+  vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc=";
 
   meta = with lib; {
     description = "Program for checking for unchecked errors in go programs";
diff --git a/nixpkgs/pkgs/development/tools/fac/default.nix b/nixpkgs/pkgs/development/tools/fac/default.nix
index 6a23f84f2366..ef3298c54780 100644
--- a/nixpkgs/pkgs/development/tools/fac/default.nix
+++ b/nixpkgs/pkgs/development/tools/fac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
 
 buildGoPackage rec {
   pname = "fac";
@@ -25,7 +25,7 @@ buildGoPackage rec {
     install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CUI for fixing git conflicts";
     inherit (src.meta) homepage;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/fac/deps.nix b/nixpkgs/pkgs/development/tools/fac/deps.nix
index 65335497e5ff..8545bae7e22d 100644
--- a/nixpkgs/pkgs/development/tools/fac/deps.nix
+++ b/nixpkgs/pkgs/development/tools/fac/deps.nix
@@ -63,4 +63,4 @@
       sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
index b53b03d26e36..d50491692ef3 100644
--- a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
+++ b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 buildGoModule rec {
   pname = "fcct";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "fcct";
     rev = "v${version}";
-    sha256 = "0w3vhfjpmpahb08fp6czixhlqhk6izglmwdpj2l19ksz8fc8aq54";
+    sha256 = "0kdsnsp9nzkkfwakcx64md66yz2k7cpw8bkhdv798yirbrqprgp6";
   };
 
   vendorSha256 = null;
diff --git a/nixpkgs/pkgs/development/tools/fedpkg/default.nix b/nixpkgs/pkgs/development/tools/fedpkg/default.nix
index 4fbecc2d58d0..285e71707fd5 100644
--- a/nixpkgs/pkgs/development/tools/fedpkg/default.nix
+++ b/nixpkgs/pkgs/development/tools/fedpkg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
+{ lib, stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
 
 let
   fedora_cert = buildPythonPackage rec {
@@ -26,7 +26,7 @@ in buildPythonApplication rec {
   patches = [ ./fix-paths.patch ];
   propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Subclass of the rpkg project for dealing with rpm packaging";
     homepage = "https://pagure.io/fedpkg";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/flamegraph/default.nix b/nixpkgs/pkgs/development/tools/flamegraph/default.nix
index 23ada99eac0f..3a64d741de5c 100644
--- a/nixpkgs/pkgs/development/tools/flamegraph/default.nix
+++ b/nixpkgs/pkgs/development/tools/flamegraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
   pname = "FlameGraph";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = with licenses; [ asl20 cddl gpl2Plus ];
     homepage = "http://www.brendangregg.com/flamegraphs.html";
     description = "Visualization for profiled code";
diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
index 79c8236a065d..dd9282c68961 100644
--- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , nixosTests
@@ -11,7 +11,7 @@
 , gettext
 , libxml2
 , libxslt
-, pkgconfig
+, pkg-config
 , xmlto
 
 , acl
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
     gettext
     libxml2
     libxslt
-    pkgconfig
+    pkg-config
     xmlto
   ];
 
@@ -145,7 +145,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to build flatpaks from source";
     homepage = "https://github.com/flatpak/flatpak-builder";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/tools/flootty/default.nix b/nixpkgs/pkgs/development/tools/flootty/default.nix
index 1baddb52259c..4867b9c2cb99 100644
--- a/nixpkgs/pkgs/development/tools/flootty/default.nix
+++ b/nixpkgs/pkgs/development/tools/flootty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "Flootty";
@@ -9,10 +9,10 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session";
     homepage = "https://floobits.com/help/flootty";
     license = licenses.asl20;
-    maintainers = with maintainers; [ sellout enzime ];
+    maintainers = with maintainers; [ sellout ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix
index af58da175100..bcad4ffb4e94 100644
--- a/nixpkgs/pkgs/development/tools/flyway/default.nix
+++ b/nixpkgs/pkgs/development/tools/flyway/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre_headless, makeWrapper }:
+{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
   let
     version = "7.3.1";
   in
@@ -22,7 +22,7 @@
           --add-flags "org.flywaydb.commandline.Main" \
           --add-flags "-jarDirs='$out/share/flyway/jars'"
       '';
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Evolve your Database Schema easily and reliably across all your instances";
         longDescription = ''
           The Flyway command-line tool is a standalone Flyway distribution.
diff --git a/nixpkgs/pkgs/development/tools/fmbt/default.nix b/nixpkgs/pkgs/development/tools/fmbt/default.nix
index 71365c01bfdd..e6bb20327415 100644
--- a/nixpkgs/pkgs/development/tools/fmbt/default.nix
+++ b/nixpkgs/pkgs/development/tools/fmbt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper
+{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
 , flex
 , gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
 , tesseract, gts, libXtst
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper
+  nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper
     python.pkgs.wrapPython ];
 
   buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
-    gnuplot graphviz tesseract gts 
+    gnuplot graphviz tesseract gts
     ];
 
   propagatedBuildInputs = with python.pkgs; [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages"
     export PATH="$PATH:$out/bin"
-    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [libXtst]}"
+    export LD_LIBRARY_PATH="${lib.makeLibraryPath [libXtst]}"
   '';
 
   postInstall = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free Model-Based Testing tool";
     homepage = "https://github.com/intel/fMBT";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix
index 077dc8b87f99..08cf6caae3ef 100644
--- a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix
+++ b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python3Packages
 , python3
 , fetchFromGitHub
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   buildInputs = [ python3 python3Packages.pyusb ];
   pythonPath = with python3Packages; [ pyusb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Cease-and-DeSwitch/fusee-launcher";
     description = "Work-in-progress launcher for one of the Tegra X1 bootROM exploits";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/galen/default.nix b/nixpkgs/pkgs/development/tools/galen/default.nix
index 89d6b700018d..00831c05691a 100644
--- a/nixpkgs/pkgs/development/tools/galen/default.nix
+++ b/nixpkgs/pkgs/development/tools/galen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre8, unzip }:
+{ lib, stdenv, fetchurl, jre8, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "galen";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   cp galen.jar $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://galenframework.com";
     description = "Automated layout testing for websites";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix
index 7c31f691b4e8..2f7c088cd486 100644
--- a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , freeimage, libGL }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for gamecube/wii projects";
     homepage = "https://github.com/devkitPro/gamecube-tools/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/gauge/default.nix b/nixpkgs/pkgs/development/tools/gauge/default.nix
index dd48998c7410..a0eb7370bee0 100644
--- a/nixpkgs/pkgs/development/tools/gauge/default.nix
+++ b/nixpkgs/pkgs/development/tools/gauge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gauge";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "02yrk4d5mm4j2grlhqkf4grxawx91kd2vhdn7k5wd2dl6wsnlgcl";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Light weight cross-platform test automation";
    homepage    = "https://gauge.org";
    license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/gdm/default.nix b/nixpkgs/pkgs/development/tools/gdm/default.nix
index 2f26a1c35f85..7c7f73af1e0f 100644
--- a/nixpkgs/pkgs/development/tools/gdm/default.nix
+++ b/nixpkgs/pkgs/development/tools/gdm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gdm";
@@ -15,7 +15,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimalist dependency manager for Go written in Go";
     homepage = "https://github.com/sparrc/gdm";
     license = licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/nixpkgs/pkgs/development/tools/ginkgo/default.nix
index 4670c13a63ab..b65e7c6a5eef 100644
--- a/nixpkgs/pkgs/development/tools/ginkgo/default.nix
+++ b/nixpkgs/pkgs/development/tools/ginkgo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ginkgo";
@@ -13,7 +13,7 @@ buildGoModule rec {
   vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx";
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "BDD Testing Framework for Go";
     homepage = "https://github.com/onsi/ginkgo";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/gir/default.nix b/nixpkgs/pkgs/development/tools/gir/default.nix
index 02a3c13afb3d..8f38b41f7ae2 100644
--- a/nixpkgs/pkgs/development/tools/gir/default.nix
+++ b/nixpkgs/pkgs/development/tools/gir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gir";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to generate rust bindings and user API for glib-based libraries";
     homepage = "https://github.com/gtk-rs/gir/";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/tools/git-ftp/default.nix b/nixpkgs/pkgs/development/tools/git-ftp/default.nix
index 0c107ecc5031..25295ad0062d 100644
--- a/nixpkgs/pkgs/development/tools/git-ftp/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-ftp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pandoc, man }:
+{ lib, stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   pname = "git-ftp";
   version = "1.6.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pandoc man];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Git powered FTP client written as shell script";
     homepage = "https://git-ftp.github.io/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
index 500c9a55c1d8..ed9205ee2516 100644
--- a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , makeWrapper
 , coreutils
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-quick-stats";
-  version = "2.1.4";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     repo = "git-quick-stats";
     owner = "arzzen";
     rev = version;
-    sha256 = "0fg0fijghcz7hvbc9y8dfksz0qmsz700kc2mfb03y90kja99v68y";
+    sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     let
-      path = stdenv.lib.makeBinPath [
+      path = lib.makeBinPath [
         coreutils
         gawk
         git
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       wrapProgram $out/bin/git-quick-stats --suffix PATH : ${path}
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/arzzen/git-quick-stats";
     description = "A simple and efficient way to access various statistics in git repository";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/tools/git-series/default.nix b/nixpkgs/pkgs/development/tools/git-series/default.nix
index 3507131082e8..4f13c3de40bb 100644
--- a/nixpkgs/pkgs/development/tools/git-series/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-series/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform
-, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2
+{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform
+, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2
 }:
 
 with rustPlatform;
@@ -36,14 +36,14 @@ buildRustPackage rec {
 
   LIBGIT2_SYS_USE_PKG_CONFIG = true;
   LIBSSH2_SYS_USE_PKG_CONFIG = true;
-  nativeBuildInputs = [ cmake pkgconfig perl ];
+  nativeBuildInputs = [ cmake pkg-config perl ];
   buildInputs = [ openssl zlib curl libgit2 libssh2 ];
 
   postBuild = ''
     install -D "$src/git-series.1" "$out/man/man1/git-series.1"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to help with formatting git patches for review on mailing lists";
     longDescription = ''
           git series tracks changes to a patch series over time. git
diff --git a/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix b/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix
index 3382557aaa57..173ee55b6e7c 100644
--- a/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix
@@ -152,4 +152,4 @@
     };
     version = "1.2.5";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/github/cligh/default.nix b/nixpkgs/pkgs/development/tools/github/cligh/default.nix
index 5eb65dc4fbdf..dfe66c789ca4 100644
--- a/nixpkgs/pkgs/development/tools/github/cligh/default.nix
+++ b/nixpkgs/pkgs/development/tools/github/cligh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
+{ lib, stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
 
 buildPythonApplication rec {
   pname = "cligh";
@@ -15,7 +15,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ pyxdg PyGithub ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://the-brannons.com/software/cligh.html";
     description = "A simple command-line interface to the facilities of Github";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/github/github-release/default.nix b/nixpkgs/pkgs/development/tools/github/github-release/default.nix
index 8b68426d4b5e..81b125ac0585 100644
--- a/nixpkgs/pkgs/development/tools/github/github-release/default.nix
+++ b/nixpkgs/pkgs/development/tools/github/github-release/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, system, fetchurl }:
+{ lib, stdenv, system, fetchurl }:
 
 let
   linuxPredicate = system == "x86_64-linux";
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
     cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Commandline app to create and edit releases on Github (and upload artifacts)";
     longDescription = ''
       A small commandline app written in Go that allows you to easily create and
diff --git a/nixpkgs/pkgs/development/tools/glade/default.nix b/nixpkgs/pkgs/development/tools/glade/default.nix
index 363e429b6baa..d77772c32db6 100644
--- a/nixpkgs/pkgs/development/tools/glade/default.nix
+++ b/nixpkgs/pkgs/development/tools/glade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , gettext
 , fetchurl
 , python3
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   version = "3.38.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q";
   };
 
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Apps/Glade";
     description = "User interface designer for GTK applications";
     maintainers = teams.gnome.members;
diff --git a/nixpkgs/pkgs/development/tools/glide/default.nix b/nixpkgs/pkgs/development/tools/glide/default.nix
index 4f511813ad0b..f8abde7e00a7 100644
--- a/nixpkgs/pkgs/development/tools/glide/default.nix
+++ b/nixpkgs/pkgs/development/tools/glide/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "glide";
@@ -18,7 +18,7 @@ buildGoPackage rec {
     sha256 = "1wskg1cxqy9sp0738qiiagdw09dbs3swxsk4z6w5hsfiq2h44a54";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://glide.sh";
     description = "Package management for Go";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/gllvm/default.nix b/nixpkgs/pkgs/development/tools/gllvm/default.nix
index efa7ae21c3a5..f2c552252fb2 100644
--- a/nixpkgs/pkgs/development/tools/gllvm/default.nix
+++ b/nixpkgs/pkgs/development/tools/gllvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gllvm";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/SRI-CSL/gllvm";
     description = "Whole Program LLVM: wllvm ported to go";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix
index 2f125d3ea8a3..4d80010f71ea 100644
--- a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix
+++ b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:
+{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:
 
 let jdk = jdk8; jre_headless = jre8_headless; in
 # TODO: This is quite a bit of duplicated logic with gephi. Factor it out?
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line utility for managing applets and keys on Java Cards";
     longDescription = ''
       This command-line utility can be used to manage applets and keys
diff --git a/nixpkgs/pkgs/development/tools/glock/default.nix b/nixpkgs/pkgs/development/tools/glock/default.nix
index 0ffa521f38ff..c00478c9fb6a 100644
--- a/nixpkgs/pkgs/development/tools/glock/default.nix
+++ b/nixpkgs/pkgs/development/tools/glock/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "glock";
-  version = "20160816-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20160816-${lib.strings.substring 0 7 rev}";
   rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276";
 
   goPackagePath = "github.com/robfig/glock";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/robfig/glock";
     description = "A command-line tool to lock Go dependencies to specific revisions";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/glpaper/default.nix b/nixpkgs/pkgs/development/tools/glpaper/default.nix
index 94d140552a10..9ad85e840bad 100644
--- a/nixpkgs/pkgs/development/tools/glpaper/default.nix
+++ b/nixpkgs/pkgs/development/tools/glpaper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols
+{ lib, stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols
 , libX11, libGL }:
 
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     libGL
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper";
     homepage = "https://hg.sr.ht/~scoopta/glpaper";
diff --git a/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/nixpkgs/pkgs/development/tools/glslviewer/default.nix
index 84b3d2a6b1ee..3f83e1fcb02f 100644
--- a/nixpkgs/pkgs/development/tools/glslviewer/default.nix
+++ b/nixpkgs/pkgs/development/tools/glslviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
+{ lib, stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage
 , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
 , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook
 , Cocoa
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7";
   };
 
-  nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ];
+  nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ];
   buildInputs = [
     glfw libGLU glfw libXrandr libXdamage
     libXext libXrender libXinerama libXcursor libXxf86vm
     libXi libX11
   ] ++ (with python3Packages; [ python setuptools wrapPython ])
-    ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+    ++ lib.optional stdenv.isDarwin Cocoa;
   pythonPath = with python3Packages; [ pyyaml requests ];
 
   # Makefile has /usr/local/bin hard-coded for 'make install'
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Live GLSL coding renderer";
     homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix
index e0dc9ecda80a..5f01881958fe 100644
--- a/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , glib
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , systemd
 , fetchFromGitLab
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNOME test runner for installed tests";
     homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests";
     license = licenses.lgpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/gnulib/default.nix b/nixpkgs/pkgs/development/tools/gnulib/default.nix
index 81e4d8793752..2a2ce1b190ff 100644
--- a/nixpkgs/pkgs/development/tools/gnulib/default.nix
+++ b/nixpkgs/pkgs/development/tools/gnulib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   pname = "gnulib";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.gnu.org/software/gnulib/";
     description = "Central location for code to be shared among GNU packages";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix
index 30344a52e065..57d0e93a9b0c 100644
--- a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-bindata-assetfs";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Serve embedded files from jteeuwen/go-bindata";
     license = licenses.bsd2;
     maintainers = with maintainers; [ avnik ];
diff --git a/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/nixpkgs/pkgs/development/tools/go-bindata/default.nix
index 9256fab43bf8..5d257bbf9982 100644
--- a/nixpkgs/pkgs/development/tools/go-bindata/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-bindata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "go-bindata";
@@ -15,7 +15,7 @@ buildGoPackage {
 
   excludedPackages = "testdata";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jteeuwen/go-bindata";
     description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program";
     maintainers = with maintainers; [ cstrahan ];
diff --git a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix
index 96ebce0eaca6..f1e822e3633f 100644
--- a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-junit-report-unstable";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)";
     homepage    = "https://${goPackagePath}";
     maintainers = with maintainers; [ cryptix ];
diff --git a/nixpkgs/pkgs/development/tools/go-langserver/default.nix b/nixpkgs/pkgs/development/tools/go-langserver/default.nix
index c6a0dcc0d9da..fdefd6b0178b 100644
--- a/nixpkgs/pkgs/development/tools/go-langserver/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-langserver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-langserver";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Go language server protocol server";
     homepage = "https://github.com/sourcegraph/go-langserver";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/nixpkgs/pkgs/development/tools/go-migrate/default.nix
index 3a424014ec33..1786bfe5f0f9 100644
--- a/nixpkgs/pkgs/development/tools/go-migrate/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-migrate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go-migrate";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   subPackages = [ "cmd/migrate" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/golang-migrate/migrate";
     description = "Database migrations. CLI and Golang library";
     maintainers = with maintainers; [ offline ];
diff --git a/nixpkgs/pkgs/development/tools/go-minimock/default.nix b/nixpkgs/pkgs/development/tools/go-minimock/default.nix
index ed4374e77640..3131fc59b414 100644
--- a/nixpkgs/pkgs/development/tools/go-minimock/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-minimock/default.nix
@@ -11,6 +11,10 @@ buildGoModule rec {
     sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h";
   };
 
+  buildFlagsArray = [
+    "-ldflags=-s -w -X main.version=${version}"
+  ];
+
   vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc";
 
   doCheck = true;
diff --git a/nixpkgs/pkgs/development/tools/go-motion/default.nix b/nixpkgs/pkgs/development/tools/go-motion/default.nix
index 824668055b1d..9ece650f0cb2 100644
--- a/nixpkgs/pkgs/development/tools/go-motion/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-motion/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
   rev = "218875ebe23806e7af82f3b5b14bb3355534f679";
 
   goPackagePath = "github.com/fatih/motion";
-  excludedPackages = ''testdata'';
+  excludedPackages = "testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/nixpkgs/pkgs/development/tools/go-outline/default.nix b/nixpkgs/pkgs/development/tools/go-outline/default.nix
index f10ee426c080..d30d5c30f3a1 100644
--- a/nixpkgs/pkgs/development/tools/go-outline/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-outline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-outline";
@@ -18,7 +18,7 @@ buildGoPackage rec {
   meta = {
     description = "Utility to extract JSON representation of declarations from a Go source file";
     homepage = "https://github.com/ramya-rao-a/go-outline";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix
index c5e9af3e7bbf..0187552d8445 100644
--- a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go-protobuf";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/golang/protobuf";
     description = " Go bindings for protocol buffer";
     maintainers = with maintainers; [ lewo ];
diff --git a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix
index 3392a19b6360..25fc87f8985d 100644
--- a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "go-repo-root";
-  version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20140911-${lib.strings.substring 0 7 rev}";
   rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
 
   goPackagePath = "github.com/cstrahan/go-repo-root";
diff --git a/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/nixpkgs/pkgs/development/tools/go-swagger/default.nix
index 7f0a1a50b6d5..1515dae3391d 100644
--- a/nixpkgs/pkgs/development/tools/go-swagger/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-swagger/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "go-swagger";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "go-swagger";
     repo = pname;
     rev = "v${version}";
-    sha256 = "05zyja58ff0k4fsfmb1j8q5p7lysi78m7jklrzz2xv8ianifkfbg";
+    sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4=";
   };
 
-  vendorSha256 = "0vvr167spwk7whqzdp5vd8sm0qwc5g3namm4iqw3vff2pifjgs40";
+  vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/go-symbols/default.nix b/nixpkgs/pkgs/development/tools/go-symbols/default.nix
index 1e2b63ba154f..3f41007716e7 100644
--- a/nixpkgs/pkgs/development/tools/go-symbols/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-symbols/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-symbols";
@@ -17,7 +17,7 @@ buildGoPackage rec {
   meta = {
     description = "A utility for extracting a JSON representation of the package symbols from a go source tree";
     homepage = "https://github.com/acroca/go-symbols";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/go-tools/default.nix b/nixpkgs/pkgs/development/tools/go-tools/default.nix
index 3d3c9db9a1eb..57e836d8f4ed 100644
--- a/nixpkgs/pkgs/development/tools/go-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-tools/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "go-tools";
-  version = "2020.2";
+  version = "2020.2.1";
 
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "go-tools";
     rev = version;
-    sha256 = "1qqpr481rx6n75xp1racsjjyn2fa8f28pcb0r9kd56qq890h3qgj";
+    sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh";
   };
 
-  vendorSha256 = "1axci0l7pymy66j6lilm49ksrwp7dvnj5krai2kvy96n3arcnsvq";
+  vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/go2nix/default.nix b/nixpkgs/pkgs/development/tools/go2nix/default.nix
index 300f82ee5486..bcd1f56f5256 100644
--- a/nixpkgs/pkgs/development/tools/go2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/go2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
+{ lib, stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
   fetchFromGitHub }:
 
 buildGoPackage rec {
@@ -21,7 +21,7 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ go-bindata gotools makeWrapper ];
 
-  preBuild = ''go generate ./...'';
+  preBuild = "go generate ./...";
 
   postInstall = ''
     wrapProgram $out/bin/go2nix \
@@ -36,7 +36,7 @@ buildGoPackage rec {
 
   doCheck = false; # tries to access the net
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Go apps packaging for Nix";
     homepage = "https://github.com/kamilchm/go2nix";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix
index 6a373099a01b..63322b6d3639 100644
--- a/nixpkgs/pkgs/development/tools/goa/default.nix
+++ b/nixpkgs/pkgs/development/tools/goa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "goa";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://goa.design";
     description = "A framework for building microservices in Go using a unique design-first approach";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix
index 01ee2931c998..995bd3102cc0 100644
--- a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix
+++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gocode-gomod";
@@ -9,7 +9,7 @@ buildGoModule rec {
   # standard packages.
   allowGoReference = true;
 
-  excludedPackages = ''internal/suggest/testdata'';
+  excludedPackages = "internal/suggest/testdata";
 
   src = fetchFromGitHub {
     owner = "stamblerre";
@@ -24,7 +24,7 @@ buildGoModule rec {
     mv $out/bin/gocode $out/bin/gocode-gomod
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An autocompletion daemon for the Go programming language";
     longDescription = ''
       Gocode is a helper tool which is intended to be integrated with your
diff --git a/nixpkgs/pkgs/development/tools/gocode/default.nix b/nixpkgs/pkgs/development/tools/gocode/default.nix
index f38d06b34c61..9bed4073b2b3 100644
--- a/nixpkgs/pkgs/development/tools/gocode/default.nix
+++ b/nixpkgs/pkgs/development/tools/gocode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gocode-unstable";
@@ -6,7 +6,7 @@ buildGoPackage rec {
   rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c";
 
   goPackagePath = "github.com/mdempsky/gocode";
-  excludedPackages = ''internal/suggest/testdata'';
+  excludedPackages = "internal/suggest/testdata";
 
   # we must allow references to the original `go` package,
   # because `gocode` needs to dig into $GOROOT to provide completions for the
@@ -23,7 +23,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An autocompletion daemon for the Go programming language";
     longDescription = ''
       Gocode is a helper tool which is intended to be integrated with your
diff --git a/nixpkgs/pkgs/development/tools/goconvey/default.nix b/nixpkgs/pkgs/development/tools/goconvey/default.nix
index 173da3ff29dc..dcec045e5ebc 100644
--- a/nixpkgs/pkgs/development/tools/goconvey/default.nix
+++ b/nixpkgs/pkgs/development/tools/goconvey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "goconvey";
@@ -19,7 +19,7 @@ buildGoPackage rec {
   meta = {
     description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go";
     homepage = "https://github.com/smartystreets/goconvey";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/godef/default.nix b/nixpkgs/pkgs/development/tools/godef/default.nix
index c8149ecc82dd..6d4f40ba6bca 100644
--- a/nixpkgs/pkgs/development/tools/godef/default.nix
+++ b/nixpkgs/pkgs/development/tools/godef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "godef";
@@ -21,7 +21,7 @@ buildGoModule rec {
   meta = {
     description = "Print where symbols are defined in Go source code";
     homepage = "https://github.com/rogpeppe/godef/";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ];
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vdemeester rvolosatovs ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix
index 492430cc7c70..217717d3e7d7 100644
--- a/nixpkgs/pkgs/development/tools/godot/default.nix
+++ b/nixpkgs/pkgs/development/tools/godot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor
+{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor
 , libXinerama, libXrandr, libXrender, libpulseaudio ? null
 , libXi ? null, libXext, libXfixes, freetype, openssl
 , alsaLib, libGLU, zlib, yasm ? null }:
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     scons libX11 libXcursor libXinerama libXrandr libXrender
     libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
@@ -61,8 +61,8 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage    = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
-    license     = stdenv.lib.licenses.mit;
+    license     = lib.licenses.mit;
     platforms   = [ "i686-linux" "x86_64-linux" ];
-    maintainers = [ stdenv.lib.maintainers.twey ];
+    maintainers = [ lib.maintainers.twey ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/godot/headless.nix b/nixpkgs/pkgs/development/tools/godot/headless.nix
index 0ae28b774fbc..20d3b48f2fd5 100644
--- a/nixpkgs/pkgs/development/tools/godot/headless.nix
+++ b/nixpkgs/pkgs/development/tools/godot/headless.nix
@@ -1,4 +1,4 @@
-{ godot, stdenv }:
+{ godot, lib, stdenv }:
 godot.overrideAttrs (oldAttrs: rec {
   pname = "godot-headless";
   sconsFlags = "target=release_debug platform=server tools=yes";
@@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec {
   '';
   meta.description =
     "Free and Open Source 2D and 3D game engine (headless build)";
-  meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ];
+  meta.maintainers = with lib.maintainers; [ twey yusdacra ];
 })
diff --git a/nixpkgs/pkgs/development/tools/godot/server.nix b/nixpkgs/pkgs/development/tools/godot/server.nix
index 48f21b796c36..6ce347355e3b 100644
--- a/nixpkgs/pkgs/development/tools/godot/server.nix
+++ b/nixpkgs/pkgs/development/tools/godot/server.nix
@@ -1,4 +1,4 @@
-{ godot, stdenv }:
+{ godot, lib, stdenv }:
 godot.overrideAttrs (oldAttrs: rec {
   pname = "godot-server";
   sconsFlags = "target=release platform=server tools=no";
@@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec {
   '';
   meta.description =
     "Free and Open Source 2D and 3D game engine (server build)";
-  meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ];
+  meta.maintainers = with lib.maintainers; [ twey yusdacra ];
 })
diff --git a/nixpkgs/pkgs/development/tools/gofumpt/default.nix b/nixpkgs/pkgs/development/tools/gofumpt/default.nix
index 82ae3d4bb7b8..e55cea0895be 100644
--- a/nixpkgs/pkgs/development/tools/gofumpt/default.nix
+++ b/nixpkgs/pkgs/development/tools/gofumpt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gofumpt";
-  version = "2020-10-27";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = pname;
-    rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0";
-    sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy";
+    rev = "v${version}";
+    sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558";
   };
 
-  vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz";
+  vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix b/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix
index ed8cc3587c17..0f772134a0e2 100644
--- a/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix
+++ b/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gojsontoyaml";
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   vendorSha256 = null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simply tool to convert json to yaml written in Go";
     homepage = "https://github.com/brancz/gojsontoyaml";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
index ddcbbb127585..2679d56ec64d 100644
--- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.33.0";
+  version = "1.35.2";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin";
+    sha256 = "sha256-UntDMiznrHZsaBFTcnNhnh59j+yY1zdpWrFNlalxTDA=";
   };
 
-  vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj";
+  vendorSha256 = "sha256-6YacyQqTq9WQk8PgvoIxflh6HRmv5xgxtWq6HrprJis=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/golint/default.nix b/nixpkgs/pkgs/development/tools/golint/default.nix
index 284bb32f89e8..1f75384f3387 100644
--- a/nixpkgs/pkgs/development/tools/golint/default.nix
+++ b/nixpkgs/pkgs/development/tools/golint/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "lint";
-  version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20181026-${lib.strings.substring 0 7 rev}";
   rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
 
   goPackagePath = "golang.org/x/lint";
@@ -20,7 +20,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://golang.org";
     description = "Linter for Go source code";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix
index 70bbc635cc1a..650f1b89f30e 100644
--- a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix
+++ b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gomodifytags";
@@ -18,7 +18,7 @@ buildGoModule rec {
   meta = {
     description = "Go tool to modify struct field tags";
     homepage = "https://github.com/fatih/gomodifytags";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/gomplate/default.nix b/nixpkgs/pkgs/development/tools/gomplate/default.nix
index 2bef9d53ff9e..f8d6553f74d8 100644
--- a/nixpkgs/pkgs/development/tools/gomplate/default.nix
+++ b/nixpkgs/pkgs/development/tools/gomplate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gomplate";
@@ -26,7 +26,7 @@ buildGoModule rec {
     "-X github.com/${owner}/${pname}/v3/version.Version=${rev}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A flexible commandline tool for template rendering";
     homepage = "https://gomplate.ca/";
     maintainers = with maintainers; [ ris jlesquembre ];
diff --git a/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index 485b2c3625fb..4d572e070e76 100644
--- a/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, python3Packages, makeWrapper }:
+{ lib, stdenv, fetchzip, python3Packages, makeWrapper }:
 
 with python3Packages;
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google App Engine SDK for Go";
     version = version;
     homepage = "https://cloud.google.com/appengine/docs/go/";
diff --git a/nixpkgs/pkgs/development/tools/gopkgs/default.nix b/nixpkgs/pkgs/development/tools/gopkgs/default.nix
index 8d26ca7eb448..e4a72cb27a17 100644
--- a/nixpkgs/pkgs/development/tools/gopkgs/default.nix
+++ b/nixpkgs/pkgs/development/tools/gopkgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gopkgs";
@@ -20,7 +20,7 @@ buildGoModule rec {
   meta = {
     description = "Tool to get list available Go packages";
     homepage = "https://github.com/uudashr/gopkgs";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/gopkgs/deps.nix b/nixpkgs/pkgs/development/tools/gopkgs/deps.nix
index 715c7bbbc824..e813a5b22564 100644
--- a/nixpkgs/pkgs/development/tools/gopkgs/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gopkgs/deps.nix
@@ -18,4 +18,4 @@
       sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/nixpkgs/pkgs/development/tools/gopls/default.nix b/nixpkgs/pkgs/development/tools/gopls/default.nix
index 49b8c8a3306f..7a7c98e28940 100644
--- a/nixpkgs/pkgs/development/tools/gopls/default.nix
+++ b/nixpkgs/pkgs/development/tools/gopls/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, buildGoModule, fetchgit }:
+{ lib, stdenv, buildGoModule, fetchgit }:
 
 buildGoModule rec {
   pname = "gopls";
-  version = "0.5.3";
+  version = "0.6.2";
 
   src = fetchgit {
     rev = "gopls/v${version}";
     url = "https://go.googlesource.com/tools";
-    sha256 = "04dkrvk5190kyfa9swxpl0m3xq9g90qp8j7yxhi87wyb8giqbll2";
+    sha256 = "0hbfxdsbfz044vw8zp223ni6m7gcwqpff4xpjiqmihhgga5849lf";
   };
 
   modRoot = "gopls";
-  vendorSha256 = "0ml8n6qnq9nprn7kv138qy0i2q8qawzd0lhh3v2qw39j0aj5fb7z";
+  vendorSha256 = "0r9bffgi9ainqrl4kraqy71rgwdfcbqmv3srs12h3xvj0w5ya5rz";
 
   doCheck = false;
 
   # Only build gopls, and not the integration tests or documentation generator.
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official language server for the Go language";
     homepage = "https://github.com/golang/tools/tree/master/gopls";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/gore/default.nix b/nixpkgs/pkgs/development/tools/gore/default.nix
index ca9c8d9eec0f..30d7cd1ef336 100644
--- a/nixpkgs/pkgs/development/tools/gore/default.nix
+++ b/nixpkgs/pkgs/development/tools/gore/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gore";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "motemen";
     repo = pname;
     rev = "v${version}";
-    sha256 = "61Hn3Vs4BZtAX8WNJlUeodvEWvwLo+lXKsc8JxRwOE4=";
+    sha256 = "sha256-oiaZvoCxA69slNb3LArLJfaqzfQ1YImxLuQHzW5tibo=";
   };
 
-  vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY=";
+  vendorSha256 = "sha256-vJG7sc+ngagtrYvTwO3OrCSFUgAA7zhaXHkU97nIhcY=";
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yet another Go REPL that works nicely";
     homepage = "https://github.com/motemen/gore";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix
index 44862bb3311d..69d74496e615 100644
--- a/nixpkgs/pkgs/development/tools/gosec/default.nix
+++ b/nixpkgs/pkgs/development/tools/gosec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gosec";
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/securego/gosec";
     description = "Golang security checker";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/gotags/default.nix b/nixpkgs/pkgs/development/tools/gotags/default.nix
index 5499a22ec01b..ea40bd0e6fe1 100644
--- a/nixpkgs/pkgs/development/tools/gotags/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotags/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "gotags";
-  version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20150803-${lib.strings.substring 0 7 rev}";
   rev = "be986a34e20634775ac73e11a5b55916085c48e7";
 
   goPackagePath = "github.com/jstemmer/gotags";
diff --git a/nixpkgs/pkgs/development/tools/gotests/default.nix b/nixpkgs/pkgs/development/tools/gotests/default.nix
index 43f221bd3241..87a93abee8ef 100644
--- a/nixpkgs/pkgs/development/tools/gotests/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gotests";
@@ -19,7 +19,7 @@ buildGoPackage rec {
   meta = {
     description = "Generate Go tests from your source code";
     homepage = "https://github.com/cweill/gotests";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix
index 8ccc1b593fd7..ece194f00030 100644
--- a/nixpkgs/pkgs/development/tools/gotestsum/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "gotestsum";
-  version = "0.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "gotestyourself";
     repo = "gotestsum";
     rev = "v${version}";
-    sha256 = "0w0s2qvwnb69s18gvkkbwsx9zh7yi8ksnnrfpl8az8sybk6m1iaz";
+    sha256 = "sha256-eJxrdR3JYqF+GexcwnyHV4xO75stEDNFzxDtky7PVc8=";
   };
 
-  vendorSha256 = "09cifc69z1ashjw1mqgbi0gh90h2sypqyl0jswxxcqk89ibgy3am";
+  vendorSha256 = "sha256-VQ3/VkxoYtY71xJQj6/XAoIEH4jr4Rq4hFqFnwxzkSU=";
 
   doCheck = false;
 
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gotestyourself/gotestsum";
     description = "A human friendly `go test` runner";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix
index 606092e8cdcb..7ca3486a503a 100644
--- a/nixpkgs/pkgs/development/tools/gotools/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotools/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, go, buildGoModule, fetchgit }:
+{ lib, stdenv, buildGoModule, fetchgit }:
 
 buildGoModule rec {
   pname = "gotools-unstable";
-  version = "2020-10-27";
-  rev = "eafbe7b904eb2418efc832e36ac634dc09084f10";
+  version = "2021-01-13";
+  rev = "8b4aab62c064010e8e875d2e5a8e63a96fefc87d";
 
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
-    sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg";
+    sha256 = "1cmnm9fl2a6hiplj8s6x0l3czcw4xh3j3lvzbgccnp1l8kz8q2vm";
   };
 
   # The gopls folder contains a Go submodule which causes a build failure.
@@ -40,7 +40,7 @@ buildGoModule rec {
   '';
 
   excludedPackages = "\\("
-    + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+    + lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ])
     + "\\)";
 
   # Set GOTOOLDIR for derivations adding this to buildInputs
diff --git a/nixpkgs/pkgs/development/tools/govendor/default.nix b/nixpkgs/pkgs/development/tools/govendor/default.nix
index 804a9bf043ed..edd9b577be4c 100644
--- a/nixpkgs/pkgs/development/tools/govendor/default.nix
+++ b/nixpkgs/pkgs/development/tools/govendor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "govendor";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kardianos/govendor";
     description = "Go vendor tool that works with the standard vendor file";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/govers/default.nix b/nixpkgs/pkgs/development/tools/govers/default.nix
index ebce368ea9f8..cac76daa6fc3 100644
--- a/nixpkgs/pkgs/development/tools/govers/default.nix
+++ b/nixpkgs/pkgs/development/tools/govers/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "govers";
-  version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20160623-${lib.strings.substring 0 7 rev}";
   rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
 
   goPackagePath = "github.com/rogpeppe/govers";
diff --git a/nixpkgs/pkgs/development/tools/gox/default.nix b/nixpkgs/pkgs/development/tools/gox/default.nix
index 34e7d338318c..3deb73acb441 100644
--- a/nixpkgs/pkgs/development/tools/gox/default.nix
+++ b/nixpkgs/pkgs/development/tools/gox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gox";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mitchellh/gox";
     description = "A dead simple, no frills Go cross compile tool";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/tools/gpp/default.nix b/nixpkgs/pkgs/development/tools/gpp/default.nix
index ee15df1a9f6f..9e49b0c0284f 100644
--- a/nixpkgs/pkgs/development/tools/gpp/default.nix
+++ b/nixpkgs/pkgs/development/tools/gpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation {
   pname = "gpp";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   installCheckPhase = "$out/bin/gpp --help";
   doInstallCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "General-purpose preprocessor with customizable syntax";
     homepage = "https://logological.org/gpp";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/tools/gron/default.nix b/nixpkgs/pkgs/development/tools/gron/default.nix
index e0d2d3d1498f..6d182b0b5f50 100644
--- a/nixpkgs/pkgs/development/tools/gron/default.nix
+++ b/nixpkgs/pkgs/development/tools/gron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gron";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Make JSON greppable!";
     longDescription = ''
       gron transforms JSON into discrete assignments to make it easier to grep
diff --git a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix
index df21f414ecb8..c4ac76f46123 100644
--- a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-  	mkdir -p $out/bin
+    mkdir -p $out/bin
     substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
       --subst-var-by PATH $out/share
     chmod a+x $out/bin/gtk-mac-bundler
diff --git a/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix
index 15233979e158..6bb80306e68e 100644
--- a/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }:
+{ fetchurl, lib, stdenv, guile, guile-lib, libffi, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   pname = "g-wrap";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   # Note: Glib support is optional, but it's quite useful (e.g., it's used by
   # Guile-GNOME).
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper generator for Guile";
     longDescription = ''
       G-Wrap is a tool (and Guile library) for generating function wrappers for
diff --git a/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix
index b8efb30f5f17..6de9e48ae667 100644
--- a/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guile }:
+{ lib, stdenv, fetchurl, guile }:
 
 stdenv.mkDerivation rec {
   pname = "guile-lint";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Checks syntax and semantics in a Guile program or module";
     homepage = "https://user42.tuxfamily.org/guile-lint/index.html";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/halfempty/default.nix b/nixpkgs/pkgs/development/tools/halfempty/default.nix
index c8c267f91872..5b96d338f52f 100644
--- a/nixpkgs/pkgs/development/tools/halfempty/default.nix
+++ b/nixpkgs/pkgs/development/tools/halfempty/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, util-linux, scowl }:
 
 stdenv.mkDerivation rec {
   pname = "halfempty";
-  version = "0.30";
+  version = "0.40";
 
   src = fetchFromGitHub {
     owner = "googleprojectzero";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc";
+    sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY=";
   };
 
-  nativeBuildInputs = [ pkgconfig util-linux ];
+  nativeBuildInputs = [ pkg-config util-linux ];
   buildInputs = [ glib ];
 
   enableParallelBuilding = true;
diff --git a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
index 4d7dca12f8fc..02c4c96bd8e7 100644
--- a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
@@ -1,5 +1,5 @@
 { mkDerivation, base, containers, fetchgit, hedgehog
-, optparse-applicative, parsec, stdenv, template-haskell, text
+, optparse-applicative, parsec, lib, stdenv, template-haskell, text
 }:
 mkDerivation {
   pname = "dconf2nix";
@@ -20,5 +20,5 @@ mkDerivation {
     base containers hedgehog parsec template-haskell text
   ];
   description = "Convert dconf files to Nix, as expected by Home Manager";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix
index e33d731dae43..512aec84eead 100644
--- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -2,21 +2,23 @@
 , bytestring, containers, data-default, deepseq, directory, extra
 , fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
 , ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
-, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api
-, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec
-, hspec-core, lens, lsp-test, mtl, optparse-applicative
+, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin
+, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin
+, hls-tactics-plugin, hslogger, hspec, hspec-core
+, hspec-expectations, lens, lsp-test, mtl, optparse-applicative
 , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
-, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
+, shake, lib, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
 , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
-, temporary, text, time, transformers, unordered-containers, yaml
+, temporary, text, transformers, unordered-containers, with-utf8
+, yaml
 }:
 mkDerivation {
   pname = "haskell-language-server";
-  version = "0.7.1.0";
+  version = "0.8.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
-    rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
+    sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
+    rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -29,22 +31,23 @@ mkDerivation {
   executableHaskellDepends = [
     aeson base binary brittany bytestring containers deepseq directory
     extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
-    gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin
-    hls-hlint-plugin hls-plugin-api hls-retrie-plugin
-    hls-tactics-plugin hslogger lens mtl optparse-applicative
-    optparse-simple ormolu process regex-tdfa safe-exceptions shake
-    stylish-haskell temporary text time transformers
-    unordered-containers
+    gitrev hashable haskell-lsp hie-bios hls-class-plugin
+    hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin
+    hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens
+    mtl optparse-applicative optparse-simple ormolu process regex-tdfa
+    safe-exceptions shake stylish-haskell temporary text transformers
+    unordered-containers with-utf8
   ];
   testHaskellDepends = [
     aeson base blaze-markup bytestring containers data-default
     directory extra filepath haskell-lsp hie-bios hls-plugin-api
-    hslogger hspec hspec-core lens lsp-test process stm tasty
-    tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit
-    tasty-rerun temporary text transformers unordered-containers yaml
+    hslogger hspec hspec-core hspec-expectations lens lsp-test process
+    stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
+    tasty-hunit tasty-rerun temporary text transformers
+    unordered-containers yaml
   ];
   testToolDepends = [ ghcide ];
   homepage = "https://github.com/haskell/haskell-language-server#readme";
   description = "LSP server for GHC";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
new file mode 100644
index 000000000000..c51689343903
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, aeson, base, containers, fetchgit, ghc
+, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake
+, lib, stdenv, text, transformers, unordered-containers
+}:
+mkDerivation {
+  pname = "hls-class-plugin";
+  version = "0.1.0.0";
+  src = fetchgit {
+    url = "https://github.com/haskell/haskell-language-server.git";
+    sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
+    rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot";
+  libraryHaskellDepends = [
+    aeson base containers ghc ghc-exactprint ghcide haskell-lsp
+    hls-plugin-api lens shake text transformers unordered-containers
+  ];
+  description = "Explicit imports plugin for Haskell Language Server";
+  license = lib.licenses.asl20;
+}
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
new file mode 100644
index 000000000000..b5774ddcbfd3
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, aeson, base, containers, deepseq, Diff, directory
+, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
+, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api
+, parser-combinators, pretty-simple, QuickCheck, safe-exceptions
+, shake, lib, stdenv, temporary, text, time, transformers
+, unordered-containers
+}:
+mkDerivation {
+  pname = "hls-eval-plugin";
+  version = "0.1.0.0";
+  src = fetchgit {
+    url = "https://github.com/haskell/haskell-language-server.git";
+    sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
+    rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot";
+  libraryHaskellDepends = [
+    aeson base containers deepseq Diff directory extra filepath ghc
+    ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
+    hls-plugin-api parser-combinators pretty-simple QuickCheck
+    safe-exceptions shake temporary text time transformers
+    unordered-containers
+  ];
+  description = "Eval plugin for Haskell Language Server";
+  license = lib.licenses.asl20;
+}
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
index 7c3b22cf1d0a..1c7d31004b6a 100644
--- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc
-, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text
+, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, stdenv, text
 , unordered-containers
 }:
 mkDerivation {
@@ -7,8 +7,8 @@ mkDerivation {
   version = "0.1.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
-    rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
+    sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
+    rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot";
@@ -17,5 +17,5 @@ mkDerivation {
     hls-plugin-api shake text unordered-containers
   ];
   description = "Explicit imports plugin for Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
index 8bfcf034bd2b..4a90933d1e7f 100644
--- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
@@ -2,7 +2,7 @@
 , containers, data-default, deepseq, Diff, directory, extra
 , fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide
 , hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens
-, regex-tdfa, shake, stdenv, temporary, text, transformers
+, regex-tdfa, shake, lib, stdenv, temporary, text, transformers
 , unordered-containers
 }:
 mkDerivation {
@@ -10,8 +10,8 @@ mkDerivation {
   version = "0.1.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
-    rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
+    sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
+    rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";
@@ -22,5 +22,5 @@ mkDerivation {
     regex-tdfa shake temporary text transformers unordered-containers
   ];
   description = "Hlint integration plugin with Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
index 7a44903f9870..311a26633a5c 100644
--- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, containers, deepseq, directory, extra
 , fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
-, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text
+, hls-plugin-api, retrie, safe-exceptions, shake, lib, stdenv, text
 , transformers, unordered-containers
 }:
 mkDerivation {
@@ -8,8 +8,8 @@ mkDerivation {
   version = "0.1.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
-    rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
+    sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
+    rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot";
@@ -19,5 +19,5 @@ mkDerivation {
     shake text transformers unordered-containers
   ];
   description = "Retrie integration plugin for Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
index 326e8ce0cdf9..4f476431d9b7 100644
--- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
@@ -2,7 +2,7 @@
 , directory, extra, fetchgit, filepath, fingertree, generic-lens
 , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
 , haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover
-, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text
+, lens, mtl, QuickCheck, refinery, retrie, shake, lib, stdenv, syb, text
 , transformers
 }:
 mkDerivation {
@@ -10,8 +10,8 @@ mkDerivation {
   version = "0.5.1.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
-    rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
+    sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
+    rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";
@@ -28,5 +28,5 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   description = "Tactics plugin for Haskell Language Server";
   license = "unknown";
-  hydraPlatforms = stdenv.lib.platforms.none;
+  hydraPlatforms = lib.platforms.none;
 }
diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh
index f14a97221ff8..aaccf8b9b9fe 100755
--- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh
+++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh
@@ -41,11 +41,10 @@ hls_new_version=$hls_latest_release
 
 echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version."
 echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
-
 cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
 cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
-cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix"
-cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix"
-cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix"
+for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do
+   cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix"
+done
 
 echo "Finished."
diff --git a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix
index df889d43d463..6b1399046166 100644
--- a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, jshon, electron_3
+{ lib, stdenv, fetchFromGitHub, jshon, electron_3
 , runtimeShell, hyper-haskell-server, extra-packages ? [] }:
 
 let
-  binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
+  binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
   electron = electron_3;
 in stdenv.mkDerivation rec {
   pname = "hyper-haskell";
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     chmod 755 $out/bin/hyper-haskell
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The strongly hyped graphical interpreter for the Haskell programming language";
     homepage = "https://github.com/HeinrichApfelmus/hyper-haskell";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 60f8c2ecb252..875d5a8a4a8d 100644
--- a/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }:
+{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }:
 let
   ihaskellEnv = ghcWithPackages (self: [
     self.ihaskell
@@ -9,7 +9,7 @@ let
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
     #! ${stdenv.shell}
     export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
-    export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH"
+    export PATH="${lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH"
     ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
   '';
 in
diff --git a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
index 1d901cb723cf..42cf33224201 100644
--- a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, async, base, bytestring, connection, containers
 , directory, hpack, hspec, hspec-discover, hspec-expectations
 , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl
-, optparse-applicative, parser-combinators, retry, stdenv, text
+, optparse-applicative, parser-combinators, retry, lib, stdenv, text
 , unix, unordered-containers, utf8-string, fetchzip, dotenv
 }:
 mkDerivation rec {
@@ -37,6 +37,6 @@ mkDerivation rec {
   preConfigure = "hpack";
   homepage = "https://github.com/channable/vaultenv#readme";
   description = "Runs processes with secrets from HashiCorp Vault";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ lnl7 manveru ];
+  license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ lnl7 manveru ];
 }
diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix
index edaaa9c3a68e..5c4fe48f60fb 100644
--- a/nixpkgs/pkgs/development/tools/hcloud/default.nix
+++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "hcloud";
@@ -29,7 +29,7 @@ buildGoModule rec {
   meta = {
     description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
     homepage = "https://github.com/hetznercloud/cli";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.zauberpony ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.zauberpony ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/hexio/default.nix b/nixpkgs/pkgs/development/tools/hexio/default.nix
index 116e7c3a5ced..5b3fca815e6a 100644
--- a/nixpkgs/pkgs/development/tools/hexio/default.nix
+++ b/nixpkgs/pkgs/development/tools/hexio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, pcsclite, pth }:
+{ lib, stdenv, fetchFromGitHub, python, pcsclite, pth }:
 
 stdenv.mkDerivation rec {
   pname = "hexio";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace Makefile \
-      --replace '-I/usr/local/include/PCSC/' '-I${stdenv.lib.getDev pcsclite}/include/PCSC/' \
+      --replace '-I/usr/local/include/PCSC/' '-I${lib.getDev pcsclite}/include/PCSC/' \
       --replace '-L/usr/local/lib/pth' '-I${pth}/lib/'
     '';
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     make DESTDIR=$out PREFIX=/ install
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on";
     homepage = "https://github.com/vanrein/hexio";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/hobbes/default.nix b/nixpkgs/pkgs/development/tools/hobbes/default.nix
index 5fd9d314c5e0..667997ddff4d 100644
--- a/nixpkgs/pkgs/development/tools/hobbes/default.nix
+++ b/nixpkgs/pkgs/development/tools/hobbes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }:
 
 stdenv.mkDerivation {
   name = "hobbes";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R.
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A language and an embedded JIT compiler";
     longDescription = ''
       Hobbes is a a language, embedded compiler, and runtime for efficient
diff --git a/nixpkgs/pkgs/development/tools/iaca/2.1.nix b/nixpkgs/pkgs/development/tools/iaca/2.1.nix
index f36e2e48fdfb..6170cbb4318b 100644
--- a/nixpkgs/pkgs/development/tools/iaca/2.1.nix
+++ b/nixpkgs/pkgs/development/tools/iaca/2.1.nix
@@ -1,5 +1,5 @@
-{ stdenv, makeWrapper, requireFile, gcc, unzip }:
-with stdenv.lib;
+{ lib, stdenv, makeWrapper, requireFile, gcc, unzip }:
+with lib;
 
 # v2.1: last version with NHM/WSM arch support
 stdenv.mkDerivation {
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
         --set-rpath $out/lib:"${libPath}" \
         $out/bin/iaca
   '';
-  postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib'';
+  postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib";
   meta = {
     description = "Intel Architecture Code Analyzer";
     homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/";
diff --git a/nixpkgs/pkgs/development/tools/iaca/3.0.nix b/nixpkgs/pkgs/development/tools/iaca/3.0.nix
index f03f53544223..731b64317172 100644
--- a/nixpkgs/pkgs/development/tools/iaca/3.0.nix
+++ b/nixpkgs/pkgs/development/tools/iaca/3.0.nix
@@ -1,5 +1,5 @@
-{ stdenv, requireFile, unzip }:
-with stdenv.lib;
+{ lib, stdenv, requireFile, unzip }:
+with lib;
 
 stdenv.mkDerivation {
   name = "iaca-3.0";
diff --git a/nixpkgs/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix
index feaea18be18b..2644821529b7 100644
--- a/nixpkgs/pkgs/development/tools/icestorm/default.nix
+++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub
-, pkgconfig, libftdi1
+{ lib, stdenv, fetchFromGitHub
+, pkg-config, libftdi1
 , python3, pypy3
 
 # PyPy yields large improvements in build time and runtime performance, and
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ passthru.pythonPkg libftdi1 ];
   makeFlags = [ "PREFIX=$(out)" ];
 
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
       creating bitstream files.
     '';
     homepage    = "http://www.clifford.at/icestorm/";
-    license     = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ shell thoughtpolice emily ];
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/icr/default.nix b/nixpkgs/pkgs/development/tools/icr/default.nix
index 50a349d8ff71..13c4cbe37db8 100644
--- a/nixpkgs/pkgs/development/tools/icr/default.nix
+++ b/nixpkgs/pkgs/development/tools/icr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which
+{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which
 , openssl, readline, libyaml, zlib }:
 
 crystal.buildCrystalPackage rec {
@@ -16,7 +16,7 @@ crystal.buildCrystalPackage rec {
 
   buildInputs = [ libyaml openssl readline zlib ];
 
-  nativeBuildInputs = [ makeWrapper pkgconfig which ];
+  nativeBuildInputs = [ makeWrapper pkg-config which ];
 
   # tests are failing due to our sandbox
   doCheck = false;
@@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec {
       --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interactive console for the Crystal programming language";
     homepage = "https://github.com/crystal-community/icr";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix
index edba0d686dbb..ad729923d67a 100644
--- a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix
+++ b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pcre } :
+{ lib, stdenv, fetchFromGitHub, pcre } :
 
 stdenv.mkDerivation {
   pname = "imatix_gsl";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   preBuild = "cd src";
   installFlags = [ "DESTDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl3Plus;
     homepage = "https://github.com/imatix/gsl/";
     description = "A universal code generator";
diff --git a/nixpkgs/pkgs/development/tools/ineffassign/default.nix b/nixpkgs/pkgs/development/tools/ineffassign/default.nix
index 85c643537af8..215809577523 100644
--- a/nixpkgs/pkgs/development/tools/ineffassign/default.nix
+++ b/nixpkgs/pkgs/development/tools/ineffassign/default.nix
@@ -6,10 +6,10 @@
 buildGoPackage rec {
   pname = "ineffassign-unstable";
   version = "2018-09-09";
-	rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
+  rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
 
   goPackagePath = "github.com/gordonklaus/ineffassign";
-  excludedPackages = ''testdata'';
+  excludedPackages = "testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/nixpkgs/pkgs/development/tools/interfacer/default.nix b/nixpkgs/pkgs/development/tools/interfacer/default.nix
index b7f568f4d2b8..4358ee244896 100644
--- a/nixpkgs/pkgs/development/tools/interfacer/default.nix
+++ b/nixpkgs/pkgs/development/tools/interfacer/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
   rev = "c20040233aedb03da82d460eca6130fcd91c629a";
 
   goPackagePath = "mvdan.cc/interfacer";
-  excludedPackages = ''check/testdata'';
+  excludedPackages = "check/testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/nixpkgs/pkgs/development/tools/irony-server/default.nix b/nixpkgs/pkgs/development/tools/irony-server/default.nix
index cc56b27ca2df..2f8afb176e6e 100644
--- a/nixpkgs/pkgs/development/tools/irony-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/irony-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, llvmPackages, irony }:
+{ lib, stdenv, cmake, llvmPackages, irony }:
 
 stdenv.mkDerivation {
   pname = "irony-server";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The server part of irony";
     homepage = "https://melpa.org/#/irony";
     maintainers = [ maintainers.deepfire ];
diff --git a/nixpkgs/pkgs/development/tools/java/cfr/default.nix b/nixpkgs/pkgs/development/tools/java/cfr/default.nix
index ce1501fa4dd5..35ac0dbc6a51 100644
--- a/nixpkgs/pkgs/development/tools/java/cfr/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/cfr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchurl, jre }:
+{ lib, stdenv, makeWrapper, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
   pname = "cfr";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Another java decompiler";
     longDescription = ''
       CFR will decompile modern Java features - Java 8 lambdas (pre and post
diff --git a/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix b/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix
index c1f7f1329854..b20a80355a02 100644
--- a/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://sourceforge.net/projects/dex2jar/;
     description = "Tools to work with android .dex and java .class files";
     maintainers = with maintainers; [ makefu ];
diff --git a/nixpkgs/pkgs/development/tools/java/fastjar/default.nix b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix
index 04fe7c2f46df..52211e302dd9 100644
--- a/nixpkgs/pkgs/development/tools/java/fastjar/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib }:
+{ fetchurl, lib, stdenv, zlib }:
 
 let version = "0.98"; in
   stdenv.mkDerivation {
@@ -25,8 +25,8 @@ let version = "0.98"; in
 
       homepage = "https://savannah.nongnu.org/projects/fastjar/";
 
-      license = stdenv.lib.licenses.gpl2Plus;
-      platforms = stdenv.lib.platforms.linux;
+      license = lib.licenses.gpl2Plus;
+      platforms = lib.platforms.linux;
       maintainers = [ ];
     };
   }
diff --git a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
index 1b235e354855..c2d1a33a49d9 100644
--- a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
   pname = "jhiccup";
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Measure JVM application stalls and GC pauses";
     homepage    = "https://www.azul.com/jhiccup/";
-    license     = stdenv.lib.licenses.cc0;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    license     = lib.licenses.cc0;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix
index 4c0ec3bc29d2..52ccc3d91509 100644
--- a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     cp -r . $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A visual interface for viewing information about Java applications";
     longDescription = ''
       VisualVM is a visual tool integrating several commandline JDK
diff --git a/nixpkgs/pkgs/development/tools/jazzy/gemset.nix b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix
index aa4492560b81..6e2b873d4fd3 100644
--- a/nixpkgs/pkgs/development/tools/jazzy/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix
@@ -431,4 +431,4 @@
     };
     version = "1.17.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/jbake/default.nix b/nixpkgs/pkgs/development/tools/jbake/default.nix
index 44d537f97626..97d1c7536821 100644
--- a/nixpkgs/pkgs/development/tools/jbake/default.nix
+++ b/nixpkgs/pkgs/development/tools/jbake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, makeWrapper, jre }:
+{ lib, stdenv, fetchzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   version = "2.6.5";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Java based, open source, static site/blog generator for developers & designers";
     homepage = "https://jbake.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix
new file mode 100644
index 000000000000..b161b1d137c3
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/jbang/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
+
+stdenv.mkDerivation rec {
+  version = "0.62.0";
+  pname = "jbang";
+
+  src = fetchzip {
+    url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
+    sha256 = "sha256-Ffh08477Wc4yEUo2YBM2yxC288Kq05ZkKXf/XSW2iXc=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    rm bin/jbang.{cmd,ps1}
+    rmdir tmp
+    cp -r . $out
+    wrapProgram $out/bin/jbang \
+      --set JAVA_HOME ${jdk} \
+      --set PATH ${lib.makeBinPath [ coreutils jdk curl ]}
+    runHook postInstall
+  '';
+
+  installCheckPhase = ''
+    $out/bin/jbang --version 2>&1 | grep -q "${version}"
+  '';
+
+  meta = with lib; {
+    description = "Run java as scripts anywhere";
+    longDescription = ''
+      jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically
+      downloaded and the java code runs.
+    '';
+    homepage = "https://https://www.jbang.dev/";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ moaxcp ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/jd/default.nix b/nixpkgs/pkgs/development/tools/jd/default.nix
index b03fd7a0028a..772e2802ff57 100644
--- a/nixpkgs/pkgs/development/tools/jd/default.nix
+++ b/nixpkgs/pkgs/development/tools/jd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "jd";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interactive JSON Editor";
     license = licenses.mit;
     maintainers = [ maintainers.np ];
diff --git a/nixpkgs/pkgs/development/tools/jid/default.nix b/nixpkgs/pkgs/development/tools/jid/default.nix
index e6eef68ec6cf..5e4e3df69427 100644
--- a/nixpkgs/pkgs/development/tools/jid/default.nix
+++ b/nixpkgs/pkgs/development/tools/jid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jid";
@@ -18,7 +18,7 @@ buildGoPackage rec {
   meta = {
     description = "A command-line tool to incrementally drill down JSON";
     homepage = "https://github.com/simeji/jid";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ stesie ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ stesie ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/jira_cli/default.nix b/nixpkgs/pkgs/development/tools/jira_cli/default.nix
index 4040debf15ea..7b7647da033e 100644
--- a/nixpkgs/pkgs/development/tools/jira_cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/jira_cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libffi, openssl, python3Packages }:
+{ lib, stdenv, libffi, openssl, python3Packages }:
 let
   inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro;
 in
@@ -23,7 +23,7 @@ in
       jira  keyrings-alt
     ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "A command line interface to Jira";
       homepage = "https://github.com/alisaifee/jira-cli";
       maintainers = with maintainers; [ nyarly ];
diff --git a/nixpkgs/pkgs/development/tools/jl/default.nix b/nixpkgs/pkgs/development/tools/jl/default.nix
index 9a1314a60835..e0bf896c149f 100644
--- a/nixpkgs/pkgs/development/tools/jl/default.nix
+++ b/nixpkgs/pkgs/development/tools/jl/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, fetchFromGitHub, fetchpatch
 , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra
-, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv
+, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib, stdenv
 , text, unordered-containers, vector
 }:
 mkDerivation rec {
@@ -30,8 +30,8 @@ mkDerivation rec {
     aeson aeson-pretty base bytestring conduit conduit-extra containers
     mtl optparse-simple text vector
   ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
   description = "Functional sed for JSON";
-  maintainers = with stdenv.lib.maintainers; [ fgaz ];
+  maintainers = with lib.maintainers; [ fgaz ];
   homepage = "https://github.com/chrisdone/jl";
 }
diff --git a/nixpkgs/pkgs/development/tools/jmespath/default.nix b/nixpkgs/pkgs/development/tools/jmespath/default.nix
index 5414c51a00c7..f5a7092e60f9 100644
--- a/nixpkgs/pkgs/development/tools/jmespath/default.nix
+++ b/nixpkgs/pkgs/development/tools/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jmespath";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     repo = "go-jmespath";
     sha256 = "0f4j0m44limnjd6q5fk152g6jq2a5cshcdms4p3a1br8pl9wp5fb";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JMESPath implementation in Go";
     homepage = "https://github.com/jmespath/go-jmespath";
     maintainers = with maintainers; [ cransom ];
diff --git a/nixpkgs/pkgs/development/tools/jo/default.nix b/nixpkgs/pkgs/development/tools/jo/default.nix
index 8592e38de7f7..653867956ff1 100644
--- a/nixpkgs/pkgs/development/tools/jo/default.nix
+++ b/nixpkgs/pkgs/development/tools/jo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}:
+{lib, stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}:
 
 stdenv.mkDerivation rec {
   pname = "jo";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pandoc pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small utility to create JSON objects";
     homepage = "https://github.com/jpmens/jo";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/jp/default.nix b/nixpkgs/pkgs/development/tools/jp/default.nix
index f05c788dabe1..d8d703feed30 100644
--- a/nixpkgs/pkgs/development/tools/jp/default.nix
+++ b/nixpkgs/pkgs/development/tools/jp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jp";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     repo = "jp";
     sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command line interface to the JMESPath expression language for JSON";
     homepage = "https://github.com/jmespath/jp";
     maintainers = with maintainers; [ cransom ];
diff --git a/nixpkgs/pkgs/development/tools/jpexs/default.nix b/nixpkgs/pkgs/development/tools/jpexs/default.nix
index 87bba3847b55..24aa43cdeba3 100644
--- a/nixpkgs/pkgs/development/tools/jpexs/default.nix
+++ b/nixpkgs/pkgs/development/tools/jpexs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }:
+{ lib, stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }:
 
 stdenv.mkDerivation rec {
   pname = "jpexs";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flash SWF decompiler and editor";
     longDescription = ''
       Open-source Flash SWF decompiler and editor. Extract resources,
diff --git a/nixpkgs/pkgs/development/tools/jq/default.nix b/nixpkgs/pkgs/development/tools/jq/default.nix
index 63c7e01a4b8d..e8fe27aae099 100644
--- a/nixpkgs/pkgs/development/tools/jq/default.nix
+++ b/nixpkgs/pkgs/development/tools/jq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, nixosTests, fetchurl, oniguruma }:
+{ lib, stdenv, nixosTests, fetchurl, oniguruma }:
 
 stdenv.mkDerivation rec {
   pname = "jq";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "--mandir=\${man}/share/man"
   ]
   # jq is linked to libjq:
-    ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
+    ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
 
   doInstallCheck = true;
   installCheckTarget = "check";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) jq; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight and flexible command-line JSON processor";
     license = licenses.mit;
     maintainers = with maintainers; [ raskin globin ];
diff --git a/nixpkgs/pkgs/development/tools/jtc/default.nix b/nixpkgs/pkgs/development/tools/jtc/default.nix
index f0e708d58aa5..947dee9ee3c0 100644
--- a/nixpkgs/pkgs/development/tools/jtc/default.nix
+++ b/nixpkgs/pkgs/development/tools/jtc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "jtc";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JSON manipulation and transformation tool";
     homepage = "https://github.com/ldn-softdev/jtc";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix
index 05b2b50f26f6..bbdd1bd016d5 100644
--- a/nixpkgs/pkgs/development/tools/just/default.nix
+++ b/nixpkgs/pkgs/development/tools/just/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "just";
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
   # Skip "choose" when running "cargo test", since this test case needs "fzf".
   checkFlags = [ "--skip=choose" "--skip=edit" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A handy way to save and run project-specific commands";
     homepage = "https://github.com/casey/just";
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/development/tools/k6/default.nix b/nixpkgs/pkgs/development/tools/k6/default.nix
index 35972f9cce53..6a8fe4caf01b 100644
--- a/nixpkgs/pkgs/development/tools/k6/default.nix
+++ b/nixpkgs/pkgs/development/tools/k6/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "k6";
-  version = "0.29.0";
+  version = "0.30.0";
 
   goPackagePath = "github.com/loadimpact/k6";
 
@@ -10,12 +10,12 @@ buildGoPackage rec {
     owner = "loadimpact";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711";
+    sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As=";
   };
 
   subPackages = [ "./" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern load testing tool, using Go and JavaScript";
     homepage = "https://k6.io/";
     changelog = "https://github.com/loadimpact/k6/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/tools/kafkacat/default.nix b/nixpkgs/pkgs/development/tools/kafkacat/default.nix
index 6e7db6b35c6b..e297de7a0db0 100644
--- a/nixpkgs/pkgs/development/tools/kafkacat/default.nix
+++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }:
 
 stdenv.mkDerivation rec {
   pname = "kafkacat";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ zlib rdkafka yajl ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A generic non-JVM producer and consumer for Apache Kafka";
     homepage = "https://github.com/edenhill/kafkacat";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/kcli/default.nix b/nixpkgs/pkgs/development/tools/kcli/default.nix
index 3a0fff71dc79..6c9f62c6f72d 100644
--- a/nixpkgs/pkgs/development/tools/kcli/default.nix
+++ b/nixpkgs/pkgs/development/tools/kcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kcli";
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A kafka command line browser";
     homepage = "https://github.com/cswank/kcli";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/kind/default.nix b/nixpkgs/pkgs/development/tools/kind/default.nix
index 55f0a0e9f305..3fff2aae1f4d 100644
--- a/nixpkgs/pkgs/development/tools/kind/default.nix
+++ b/nixpkgs/pkgs/development/tools/kind/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
-with stdenv.lib;
+with lib;
 
 buildGoModule rec {
   pname = "kind";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     rev    = "v${version}";
     owner  = "kubernetes-sigs";
     repo   = "kind";
-    sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr";
+    sha256 = "1pp2x4bfqsd15siahyv9xkdyswsipmp9n86iwavrd0xhliqxlsa7";
   };
 
-  vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d";
+  vendorSha256 = "0c0j4s8kfzk2b3hy0d2g5bp1zr60l6vnwnpynsg6ksv8spwnpl5m";
 
   doCheck = false;
 
@@ -31,7 +31,7 @@ buildGoModule rec {
     description = "Kubernetes IN Docker - local clusters for testing Kubernetes";
     homepage    = "https://github.com/kubernetes-sigs/kind";
     maintainers = with maintainers; [ offline rawkode ];
-    license     = stdenv.lib.licenses.asl20;
+    license     = lib.licenses.asl20;
     platforms   = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix b/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix
index b826c1a58b99..9f553aa6bae3 100644
--- a/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc }:
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "genkfs";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "Utility to write a KFS filesystem into a ROM file";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix
index 364d46de56d9..5f047d79a138 100644
--- a/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }:
+{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, boost }:
 
 stdenv.mkDerivation rec {
   pname = "kcc";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "KnightOS C compiler";
     license     = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix
index 3f3f698693df..33ec5b8bbb2a 100644
--- a/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc }:
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "kimg";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "Converts image formats supported by stb_image to the KnightOS image format";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix
index 657a1712ed24..43a8e4eddfa8 100644
--- a/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }:
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   pname = "kpack";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "fortify" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "A tool to create or extract KnightOS packages";
     license     = licenses.lgpl2Only;
diff --git a/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix
index 46482a849134..b1ee36ac2dab 100644
--- a/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc }:
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "mkrom";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "Packages KnightOS distribution files into a ROM";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix b/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix
index 171c1671b332..a91d1e5beda8 100644
--- a/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc }:
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "mktiupgrade";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "Makes TI calculator upgrade files from ROM dumps";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix b/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix
index 9feab36ec822..33ed8d38c63d 100644
--- a/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }:
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }:
 
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "Patches jumptables into TI calculator ROM files and generates an include file";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/nixpkgs/pkgs/development/tools/knightos/scas/default.nix
index b87650d5bf95..573d261306a6 100644
--- a/nixpkgs/pkgs/development/tools/knightos/scas/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/scas/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, cmake }:
+{ fetchFromGitHub, lib, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "scas";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "Assembler and linker for the Z80";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix
index d8f6a1274032..a089511fb684 100644
--- a/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix
+++ b/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }:
+{ lib, stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }:
 
 stdenv.mkDerivation rec {
   pname = "z80e";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-Denable-sdl=YES" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://knightos.org/";
     description = "A Z80 calculator emulator and debugger";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/krew/default.nix b/nixpkgs/pkgs/development/tools/krew/default.nix
index b5fc91b62dda..7449d6df38eb 100644
--- a/nixpkgs/pkgs/development/tools/krew/default.nix
+++ b/nixpkgs/pkgs/development/tools/krew/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "krew";
@@ -15,11 +15,11 @@ buildGoModule rec {
 
   subPackages = [ "cmd/krew" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Package manager for kubectl plugins";
     homepage = "https://github.com/kubernetes-sigs/krew";
     maintainers = with maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix
index 7e71c08ec4b1..4abe6b6d17fa 100644
--- a/nixpkgs/pkgs/development/tools/ktlint/default.nix
+++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre_headless }:
+{ lib, stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
   pname = "ktlint";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An anti-bikeshedding Kotlin linter with built-in formatter";
     homepage = "https://ktlint.github.io/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix
index e2391789a41c..b8d9e200a8ca 100644
--- a/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix
+++ b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix
@@ -306,4 +306,4 @@
       sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/nixpkgs/pkgs/development/tools/kubectx/default.nix b/nixpkgs/pkgs/development/tools/kubectx/default.nix
index 59a7c8300e2e..f2186709e835 100644
--- a/nixpkgs/pkgs/development/tools/kubectx/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubectx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "kubectx";
@@ -21,7 +21,7 @@ buildGoModule rec {
     installShellCompletion completion/*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast way to switch between clusters and namespaces in kubectl!";
     license = licenses.asl20;
     homepage = "https://github.com/ahmetb/kubectx";
diff --git a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix
index 51369bc1f91e..4fc8f3253429 100644
--- a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kubeprompt";
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Kubernetes prompt";
     homepage = "https://github.com/jlesquembre/kubeprompt";
     license = licenses.epl20;
diff --git a/nixpkgs/pkgs/development/tools/kubicorn/default.nix b/nixpkgs/pkgs/development/tools/kubicorn/default.nix
index 67e170f6e25c..f0985277a25e 100644
--- a/nixpkgs/pkgs/development/tools/kubicorn/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubicorn/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
-with stdenv.lib;
+with lib;
 
 buildGoPackage rec {
   pname = "kubicorn";
-  version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "2018-10-13-${lib.strings.substring 0 7 rev}";
   rev = "4c7f3623e9188fba43778271afe161a4facfb657";
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildGoPackage rec {
   meta = {
     description = "Simple, cloud native infrastructure for Kubernetes";
     homepage = "http://kubicorn.io/";
-    maintainers = with stdenv.lib.maintainers; [ offline ];
-    license = stdenv.lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ offline ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/kubie/default.nix b/nixpkgs/pkgs/development/tools/kubie/default.nix
index cae76669ab42..8a199f9191c0 100644
--- a/nixpkgs/pkgs/development/tools/kubie/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "kubie";
@@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   postInstall = ''
     installShellCompletion completion/kubie.bash
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shell independent context and namespace switcher for kubectl";
     homepage = "https://github.com/sbstp/kubie";
     license = with licenses; [ zlib ];
diff --git a/nixpkgs/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix
index 79c484586111..6ff123bb2be3 100644
--- a/nixpkgs/pkgs/development/tools/kustomize/default.nix
+++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix
@@ -2,9 +2,9 @@
 
 buildGoModule rec {
   pname = "kustomize";
-  version = "3.8.7";
-  # rev is the 3.8.7 commit, mainly for kustomize version command output
-  rev = "ad092cc7a91c07fdf63a2e4b7f13fa588a39af4f";
+  version = "3.9.2";
+  # rev is the 3.9.2 commit, mainly for kustomize version command output
+  rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd";
 
   buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in
     ''
@@ -17,13 +17,13 @@ buildGoModule rec {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "kustomize/v${version}";
-    sha256 = "1942cyaj6knf8mc3q2vcz6rqqc6lxdd6nikry9m0idk5l1b09x1m";
+    sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn";
   };
 
   # avoid finding test and development commands
   sourceRoot = "source/kustomize";
 
-  vendorSha256 = "0y77ykfcbn4l0x85c3hb1lgjpy64kimx3s1qkn38gpmi4lphvkkl";
+  vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9";
 
   meta = with lib; {
     description = "Customization of kubernetes YAML configurations";
@@ -34,6 +34,6 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/kubernetes-sigs/kustomize";
     license = licenses.asl20;
-    maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ];
+    maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/kythe/default.nix b/nixpkgs/pkgs/development/tools/kythe/default.nix
index 601634b31842..f6a4c2e6c1e6 100644
--- a/nixpkgs/pkgs/development/tools/kythe/default.nix
+++ b/nixpkgs/pkgs/development/tools/kythe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, binutils , fetchurl, ncurses5 }:
+{ lib, stdenv, binutils , fetchurl, ncurses5 }:
 
 stdenv.mkDerivation rec {
   version = "0.0.30";
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
                 write_entries write_tables entrystream; do
       echo "Patching:" $exe
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
-      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe
+      patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe
     done
     cd ../
     cp -R ./ $out
     ln -s $out/tools $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code";
     longDescription = ''
     The Kythe project was founded to provide and support tools and standards
diff --git a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix
index 6720603b2e5f..4c94ff1e6e27 100644
--- a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix
+++ b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, 
+{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, 
     freetype, fontconfig, xorg, libusb-compat-0_1 }:
 
 stdenv.mkDerivation {
@@ -95,7 +95,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = lib.makeLibraryPath [
     glib zlib freetype fontconfig
     xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt
     libusb-compat-0_1
@@ -109,8 +109,8 @@ stdenv.mkDerivation {
       next-generation replacement for ispLEVER.
     '';
     homepage = "http://www.latticesemi.com/latticediamond";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ q3k ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ q3k ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/lazygit/default.nix b/nixpkgs/pkgs/development/tools/lazygit/default.nix
index 1ede21609b44..1e8ebb0d0879 100644
--- a/nixpkgs/pkgs/development/tools/lazygit/default.nix
+++ b/nixpkgs/pkgs/development/tools/lazygit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "lazygit";
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple terminal UI for git commands";
     homepage = "https://github.com/jesseduffield/lazygit";
     changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/tools/lc3tools/default.nix b/nixpkgs/pkgs/development/tools/lc3tools/default.nix
index 122271c34a4d..3e7f81bb4e7b 100644
--- a/nixpkgs/pkgs/development/tools/lc3tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/lc3tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, flex, tk, ncurses, readline }:
+{ lib, stdenv, fetchurl, unzip, flex, tk, ncurses, readline }:
 
 stdenv.mkDerivation {
   pname = "lc3tools";
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     mv -t $out/bin $out/lc3*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Toolchain and emulator for the LC-3 architecture";
     license = licenses.gpl2;
     maintainers = with maintainers; [ anna328p ];
diff --git a/nixpkgs/pkgs/development/tools/leaps/default.nix b/nixpkgs/pkgs/development/tools/leaps/default.nix
index bb8673d4d56b..e68542e584f2 100644
--- a/nixpkgs/pkgs/development/tools/leaps/default.nix
+++ b/nixpkgs/pkgs/development/tools/leaps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "leaps";
@@ -19,7 +19,7 @@ buildGoPackage rec {
     description = "A pair programming tool and library written in Golang";
     homepage = "https://github.com/jeffail/leaps/";
     license = "MIT";
-    maintainers = with stdenv.lib.maintainers; [ qknight ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [ qknight ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/libsigrok/default.nix b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
index 4e104a79d5d2..7f32b0bd7162 100644
--- a/nixpkgs/pkgs/development/tools/libsigrok/default.nix
+++ b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check
+{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
 , libserialport, librevisa, doxygen, glibmm, python
 , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libzip glib libusb1 libftdi1 check libserialport
     librevisa doxygen glibmm python
   ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core library of the sigrok signal analysis software suite";
     homepage = "https://sigrok.org/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix b/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix
index e78afc1a8614..cb3b30405962 100644
--- a/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
+{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
 
 stdenv.mkDerivation rec {
   name = "libsigrokdecode-0.5.3";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib python3 libsigrok check ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Protocol decoding library for the sigrok signal analysis software suite";
     homepage = "https://sigrok.org/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
index 428e6e444a21..87213b911a96 100644
--- a/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, dmd, dub }:
+{ lib, stdenv, fetchgit, dmd, dub }:
 
 stdenv.mkDerivation {
   pname = "Literate";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   installPhase = "install -D bin/lit $out/bin/lit";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A literate programming tool for any language";
     homepage    = "http://literate.zbyedidia.webfactional.com/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix
index 82805af5804f..caacc04903e6 100644
--- a/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, asciidoc }:
+{ lib, stdenv, fetchurl, python3, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "eweb";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp etangle.w etangle.html $out/share/doc/${pname}-${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://eweb.sourceforge.net/";
     description = "An Asciidoc-based literate programming tool, written in Python";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix
index 9d27351f15d4..53b7f208e812 100644
--- a/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     install fw $out/bin/fw
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     version = "3.20";
     description = "A simple, reliable literate-programming macro preprocessor";
     homepage = "http://www.ross.net/funnelweb/";
diff --git a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix
index 52586939c1df..5d4441ecfbb6 100644
--- a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }:
+{ lib, stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }:
 
 let noweb = stdenv.mkDerivation rec {
   pname = "noweb";
@@ -13,17 +13,17 @@ let noweb = stdenv.mkDerivation rec {
 
   patches = [ ./no-FAQ.patch ];
 
-  nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ];
+  nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ];
 
   preBuild = ''
     mkdir -p "$out/lib/noweb"
     cd src
   '';
 
-  makeFlags = stdenv.lib.optionals (!isNull icon-lang) [
+  makeFlags = lib.optionals (!isNull icon-lang) [
     "LIBSRC=icon"
     "ICONC=icont"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "CC=clang"
   ];
 
@@ -70,7 +70,7 @@ let noweb = stdenv.mkDerivation rec {
   tlType = "run";
   passthru.pkgs = [ noweb.tex ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple, extensible literate-programming tool";
     homepage = "https://www.cs.tufts.edu/~nr/noweb";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix
index 1f4fba681c35..37deaacb216c 100644
--- a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, tex}:
+{lib, stdenv, fetchurl, tex}:
 
 stdenv.mkDerivation rec {
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple literate programming tool";
     homepage = "http://nuweb.sourceforge.net";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/tools/makerpm/default.nix b/nixpkgs/pkgs/development/tools/makerpm/default.nix
index a05615a22d9e..5b7fc83df407 100644
--- a/nixpkgs/pkgs/development/tools/makerpm/default.nix
+++ b/nixpkgs/pkgs/development/tools/makerpm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: 
+{ lib, stdenv, fetchFromGitHub, zlib, libarchive, openssl }:
 
-stdenv.mkDerivation rec { 
+stdenv.mkDerivation rec {
   version = "1.0";
   pname = "makerpm";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ivan-tkatchev/makerpm/";
     description = "A clean, simple RPM packager reimplemented completely from scratch";
     license = licenses.free;
diff --git a/nixpkgs/pkgs/development/tools/manul/default.nix b/nixpkgs/pkgs/development/tools/manul/default.nix
index 71010149a921..4265c2a74501 100644
--- a/nixpkgs/pkgs/development/tools/manul/default.nix
+++ b/nixpkgs/pkgs/development/tools/manul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   name = "manul-unstable-2016-09-30";
@@ -16,7 +16,7 @@ buildGoPackage {
   deleteVendor = true;
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The madness vendoring utility for Golang programs";
     homepage = "https://github.com/kovetskiy/manul";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/mdk/default.nix b/nixpkgs/pkgs/development/tools/mdk/default.nix
index 5c8924ee21be..6db4395a14f5 100644
--- a/nixpkgs/pkgs/development/tools/mdk/default.nix
+++ b/nixpkgs/pkgs/development/tools/mdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib }:
+{ lib, stdenv, fetchurl, intltool, pkg-config, glib }:
 
 stdenv.mkDerivation {
   name = "gnu-mdk-1.3.0";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz";
     sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ intltool glib ];
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   meta = {
     description = "GNU MIX Development Kit (MDK)";
     homepage = "https://www.gnu.org/software/mdk/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/metals/default.nix b/nixpkgs/pkgs/development/tools/metals/default.nix
index 951e9a0ac2e8..729ab88c680b 100644
--- a/nixpkgs/pkgs/development/tools/metals/default.nix
+++ b/nixpkgs/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.9.8";
+  version = "0.9.10";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk";
+    outputHash     = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://scalameta.org/metals/";
     license = licenses.asl20;
     description = "Work-in-progress language server for Scala";
diff --git a/nixpkgs/pkgs/development/tools/micronaut/default.nix b/nixpkgs/pkgs/development/tools/micronaut/default.nix
index 5d032d42108f..1139215fbf85 100644
--- a/nixpkgs/pkgs/development/tools/micronaut/default.nix
+++ b/nixpkgs/pkgs/development/tools/micronaut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }:
+{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles }:
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
@@ -16,19 +16,19 @@ stdenv.mkDerivation rec {
     rm bin/mn.bat
     cp -r . $out
     wrapProgram $out/bin/mn \
-      --prefix JAVA_HOME : ${jdk} 
+      --prefix JAVA_HOME : ${jdk}
     installShellCompletion --bash --name mn.bash bin/mn_completion
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Modern, JVM-based, full-stack framework for building microservice applications";
     longDescription = ''
       Micronaut is a modern, JVM-based, full stack microservices framework
       designed for building modular, easily testable microservice applications.
-      Reflection-based IoC frameworks load and cache reflection data for 
-      every single field, method, and constructor in your code, whereas with 
-      Micronaut, your application startup time and memory consumption are 
+      Reflection-based IoC frameworks load and cache reflection data for
+      every single field, method, and constructor in your code, whereas with
+      Micronaut, your application startup time and memory consumption are
       not bound to the size of your codebase.
     '';
     homepage = "https://micronaut.io/";
diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix
index 1d01ef97f401..4e5f39472626 100644
--- a/nixpkgs/pkgs/development/tools/minizinc/default.nix
+++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }:
 let
   version = "2.4.3";
 in
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   pname = "minizinc";
   inherit version;
 
-  buildInputs = [ cmake flex bison ];
+  nativeBuildInputs = [ cmake flex bison ];
 
   src = fetchFromGitHub {
     owner = "MiniZinc";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.minizinc.org/";
     description = "A medium-level constraint modelling language";
 
diff --git a/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/nixpkgs/pkgs/development/tools/minizinc/ide.nix
index aedf2ab881dc..7709423e676f 100644
--- a/nixpkgs/pkgs/development/tools/minizinc/ide.nix
+++ b/nixpkgs/pkgs/development/tools/minizinc/ide.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
+{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
 let
   version = "2.4.3";
 in
@@ -21,10 +21,10 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   postInstall = ''
-    wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${stdenv.lib.makeBinPath [ minizinc ]}
+    wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.minizinc.org/";
     description = "IDE for MiniZinc, a medium-level constraint modelling language";
 
diff --git a/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix
index c95a340181c0..c4dda95a7f25 100644
--- a/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
+{ lib, stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
 
 stdenv.mkDerivation rec {
   pname = "abi-compliance-checker";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lvc.github.io/abi-compliance-checker";
     description = "A tool for checking backward API/ABI compatibility of a C/C++ library";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix
index dc2a6d00b5f0..6dd2bf41ba6f 100644
--- a/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
+{ lib, stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
 
 stdenv.mkDerivation rec {
   pname = "abi-dumper";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   preBuild = "mkdir -p $out";
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lvc/abi-dumper";
     description = "Dump ABI of an ELF object containing DWARF debug info";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix
index 4bb2d3d62456..6bf13ce7ec65 100644
--- a/nixpkgs/pkgs/development/tools/misc/act/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "act";
-  version = "0.2.17";
+  version = "0.2.18";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183";
+    sha256 = "16c5qxxi37pdcqrf8aliad6lkqx9jk57yc2q6gpw9ffar49km4qi";
   };
 
-  vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h";
+  vendorSha256 = "1xw80vb49bd0n620yaxwcvyf9glkscc42i847blan4hw6k957hii";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix
index 14ef09ee7ed0..a5a9d724a79e 100644
--- a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , flex
 , php
-, stdenv
+, lib, stdenv
 }:
 
 # Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   };
   buildInputs = [ bison flex php ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+  postPatch = lib.optionalString stdenv.isAarch64 ''
     substituteInPlace support/xhpast/Makefile \
       --replace "-minline-all-stringops" ""
   '';
@@ -60,8 +60,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Command line interface to Phabricator";
     homepage = "http://phabricator.org";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/argbash/default.nix b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix
index 3efff5009439..571050508146 100644
--- a/nixpkgs/pkgs/development/tools/misc/argbash/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "argbash";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       --prefix PATH : '${autoconf}/bin'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bash argument parsing code generator";
     homepage = "https://argbash.io/";
     license = licenses.free; # custom license.  See LICENSE in source repo.
diff --git a/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/nixpkgs/pkgs/development/tools/misc/asls/default.nix
index 0e08acdeb450..bccda0185036 100644
--- a/nixpkgs/pkgs/development/tools/misc/asls/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/asls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , erlangR22
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ erlangR22 ];
   installPhase = "install -Dm755 -t $out/bin asls";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AssemblyScript Language Server";
     homepage = "https://github.com/saulecabrera/asls";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
index 05afa379f99a..da387105cef5 100644
--- a/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeWrapper, perl, openssh, rsync }:
+{ fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }:
 
 stdenv.mkDerivation rec {
   name = "autobuild-5.3";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "https://josefsson.org/autobuild/";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
index f002346c9949..e0d558b18800 100644
--- a/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz }:
+{ lib, stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
   pname = "autoconf-archive";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ xz ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Archive of autoconf m4 macros";
     homepage = "https://www.gnu.org/software/autoconf-archive/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix
index 424dff8541bc..e5280d46b598 100644
--- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4, perl, lzma}:
+{lib, stdenv, fetchurl, m4, perl, lzma}:
 
 stdenv.mkDerivation rec {
   name = "autoconf-2.13";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix
index 1fd18bcb12af..6976a291ae72 100644
--- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ lib, stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
   name = "autoconf-2.64";
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix
index 500d80d4bb8f..f2f8ca0a858c 100644
--- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ lib, stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
   name = "autoconf-2.69";
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix
index 57a92cee737b..ae8fc2d90619 100644
--- a/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ lib, stdenv, fetchurl, m4, perl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix
index 23235499cfbd..c6eb6916d1ec 100644
--- a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }:
+{ lib, stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
 
 stdenv.mkDerivation rec {
   pname = "autogen";
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "lib" "out" "man" "info" ];
 
   nativeBuildInputs = [
-    which pkgconfig perl autoreconfHook/*patches applied*/
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    which pkg-config perl autoreconfHook/*patches applied*/
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # autogen needs a build autogen when cross-compiling
     buildPackages.buildPackages.autogen buildPackages.texinfo
   ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21
       "--enable-timeout=78"
     ]
-    ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       "--with-libxml2=${libxml2.dev}"
       "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"
       # the configure check for regcomp wants to run a host program
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
       sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f
     done
 
-  '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+  '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     # remove /build/** from RPATHs
     for f in "$bin"/bin/*; do
       local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')"
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automated text and program generation tool";
     license = with licenses; [ gpl3Plus lgpl3Plus ];
     homepage = "https://www.gnu.org/software/autogen/";
diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index b79f30478890..5e3167d182dc 100644
--- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf }:
+{ lib, stdenv, fetchurl, perl, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.11.6";
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix
index bf0967e9ddb4..0088eb74cc48 100644
--- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf }:
+{ lib, stdenv, fetchurl, perl, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.15.1";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     branch = "1.15";
     homepage = "https://www.gnu.org/software/automake/";
     description = "GNU standard-compliant makefile generator";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     longDescription = ''
       GNU Automake is a tool for automatically generating
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
index 58c559fcc566..48f01f8d0f67 100644
--- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf }:
+{ lib, stdenv, fetchurl, perl, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.16.3";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     branch = "1.16";
     homepage = "https://www.gnu.org/software/automake/";
     description = "GNU standard-compliant makefile generator";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     longDescription = ''
       GNU Automake is a tool for automatically generating
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix b/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix
index 1cabb1f0223e..ac027ec45301 100644
--- a/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, cmake, qt4 }:
+{ lib, stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "automoc4-0.9.88";
-  
+  pname = "automoc4";
+  version = "0.9.88";
+
   src = fetchurl {
-    url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2";
+    url = "mirror://kde/stable/automoc4/0.9.88/${pname}.tar.bz2";
     sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93";
   };
-  
-  buildInputs = [ cmake qt4 ];
-  
-  meta = with stdenv.lib; {
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
+
+  meta = with lib; {
     homepage = "https://techbase.kde.org/Development/Tools/Automoc4";
     description = "KDE Meta Object Compiler";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix b/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix
index bb0520cf28ef..4d95310c342f 100644
--- a/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
+{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
 # docSupport is a big dependency, disabled by default
 , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
 }:
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg";
   };
 
-  configureFlags = stdenv.lib.optionals docSupport "--enable-doc";
+  configureFlags = lib.optionals docSupport "--enable-doc";
 
   buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ]
-    ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ];
+    ++ lib.optionals docSupport [ texLive texinfo texi2html ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line tool for programming Atmel AVR microcontrollers";
     longDescription = ''
       AVRDUDE (AVR Downloader/UploaDEr) is an utility to
diff --git a/nixpkgs/pkgs/development/tools/misc/awf/default.nix b/nixpkgs/pkgs/development/tools/misc/awf/default.nix
index b1e627e7aa8c..b73f1dc04502 100644
--- a/nixpkgs/pkgs/development/tools/misc/awf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/awf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
 
   buildInputs = [ gtk2 gtk3 ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Widget Factory";
     longDescription = ''
       A widget factory is a theme preview application for gtk2 and
diff --git a/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix b/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix
index 03539eb2cc84..26c484017d2b 100644
--- a/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
 
 stdenv.mkDerivation rec {
   name = "babeltrace-1.5.8";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib libuuid popt elfutils ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line tool and library to read and convert LTTng tracefiles";
     homepage = "https://www.efficios.com/babeltrace";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix
index 0897960f6aa9..72ec8c96be34 100644
--- a/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python3Packages }:
+{ lib, stdenv, fetchurl, makeWrapper, python3Packages }:
 
 stdenv.mkDerivation rec {
   pname = "bashdb";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Bash script debugger";
     homepage = "http://bashdb.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix
index 8fc809f0f0cf..a732d6e732c5 100644
--- a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libelf, txt2man }:
+{ lib, stdenv, fetchurl, libelf, txt2man }:
 
 stdenv.mkDerivation {
   pname = "bin_replace_string";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Edit precompiled binaries";
     longDescription = ''
       bin_replace_string edits C-style strings in precompiled binaries. This is
diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
index 559268521460..5022f8a7f8cc 100644
--- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
@@ -4,7 +4,7 @@
 , withAllTargets ? false, libbfd, libopcodes
 , enableShared ? !stdenv.hostPlatform.isStatic
 , noSysDirs
-, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform
+, gold ? true
 , bison ? null
 , flex
 , texinfo
@@ -19,7 +19,7 @@
 let
   reuseLibs = enableShared && withAllTargets;
 
-  version = "2.34";
+  version = "2.35.1";
   basename = "binutils";
   # The targetPrefix prepended to binary names to allow multiple binuntils on the
   # PATH to both be usable.
@@ -34,7 +34,7 @@ let
   # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
   normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
     url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
-    sha256 = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49";
+    sha256 = "sha256-Mg56HQ9G/Nn0E/EEbiFsviO7K85t62xqYzBEJeSLGUI=";
   });
 in
 
@@ -48,12 +48,6 @@ stdenv.mkDerivation {
     # Make binutils output deterministic by default.
     ./deterministic.patch
 
-    # Bfd looks in BINDIR/../lib for some plugins that don't
-    # exist. This is pointless (since users can't install plugins
-    # there) and causes a cycle between the lib and bin outputs, so
-    # get rid of it.
-    ./no-plugins.patch
-
     # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and
     # elf32-littlearm-vxworks in favor of the first.
     # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766
diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch b/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch
deleted file mode 100644
index 68cf51b7dd3c..000000000000
--- a/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/bfd/plugin.c b/bfd/plugin.c
-index 537ab60311..bfe7957f96 100644
---- a/bfd/plugin.c
-+++ b/bfd/plugin.c
-@@ -386,6 +386,7 @@ load_plugin (bfd *abfd)
-   if (plugin_program_name == NULL)
-     return found;
- 
-+#if 0
-   /* Try not to search the same dir twice, by looking at st_dev and
-      st_ino for the dir.  If we are on a file system that always sets
-      st_ino to zero or the actual st_ino is zero we might waste some
-@@ -437,7 +438,7 @@ load_plugin (bfd *abfd)
-       if (found)
- 	break;
-     }
--
-+#endif
-   return found;
- }
- 
diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
index 48ae364a26eb..c49187273c46 100644
--- a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig
+, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
 , python, pythonPackages
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gcc-arm-embedded pkgconfig
+    gcc-arm-embedded pkg-config
   ];
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
index 38cc2867650c..74073722857f 100644
--- a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, wxGTK, libX11, readline }:
+{ lib, stdenv, fetchgit, wxGTK, libX11, readline }:
 
 let
   # BOSSA needs a "bin2c" program to embed images.
@@ -8,8 +8,8 @@ let
     name = "bossa-bin2c";
     src = ./bin2c.c;
     dontUnpack = true;
-    buildPhase = ''cc $src -o bin2c'';
-    installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/'';
+    buildPhase = "cc $src -o bin2c";
+    installPhase = "mkdir -p $out/bin; cp bin2c $out/bin/";
   };
 
 in
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     cp bin/bossa{c,sh,} $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers";
     longDescription = ''
       BOSSA is a flash programming utility for Atmel's SAM family of
diff --git a/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix
index 6ba8064c094d..e3bfc958437a 100644
--- a/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
+{ lib, stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }:
 
 stdenv.mkDerivation rec {
   pname = "bsdbuild";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ perl mandoc ed ];
-  nativeBuildInputs = [ pkgconfig libtool gettext ];
+  nativeBuildInputs = [ pkg-config libtool gettext ];
 
   prePatch = ''
     #ignore unfamiliar flags
@@ -62,7 +62,7 @@ EOF
       directory, BSDBuild will produce the required Makefiles in place).
     '';
 
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix b/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
index f3ba4b3a70d7..0f7edeea812f 100644
--- a/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, tk, makeWrapper }:
+{ fetchurl, lib, stdenv, tk, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "cbrowser-0.8";
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Tcl/Tk GUI front-end to cscope";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     homepage = "https://sourceforge.net/projects/cbrowser/";
 
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [viric];
 
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix b/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix
index 6be0ab2acb50..e2a511a0e328 100644
--- a/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     install -D udev/90-cc-debugger.rules $out/lib/udev/rules.d/90-cc-debugger.rules
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line tool for the Texas Instruments CC Debugger";
     longDescription = ''
       cc-tool provides support for Texas Instruments CC Debugger
diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
index f9254b2cf15e..655807d95069 100644
--- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
@@ -60,7 +60,7 @@ let ccache = stdenv.mkDerivation rec {
           local cname="$1"
           if [ -x "${unwrappedCC}/bin/$cname" ]; then
             makeWrapper ${ccache}/bin/ccache $out/bin/$cname \
-              --run ${stdenv.lib.escapeShellArg extraConfig} \
+              --run ${lib.escapeShellArg extraConfig} \
               --add-flags ${unwrappedCC}/bin/$cname
           fi
         }
@@ -84,7 +84,7 @@ let ccache = stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = "https://ccache.dev";
     downloadPage = "https://ccache.dev/download.html";
diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
index 16365a462a94..40b53ca6934a 100644
--- a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, llvmPackages, rapidjson, runtimeShell }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # We need to tell ccls where to find the standard library headers.
 
-    standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\""
+    standard_library_includes="\\\"-isystem\\\", \\\"${lib.getDev stdenv.cc.libc}/include\\\""
     standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\""
     export standard_library_includes
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     chmod --reference=$out/bin/$wrapped $out/bin/ccls
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A c/c++ language server powered by clang";
     homepage    = "https://github.com/MaskRay/ccls";
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/misc/cflow/default.nix b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix
index 1215c29c4776..b9e75d7cb2a3 100644
--- a/nixpkgs/pkgs/development/tools/misc/cflow/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, emacs }:
+{ lib, stdenv, fetchurl, gettext, emacs }:
 
 stdenv.mkDerivation rec {
   name = "cflow-1.6";
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext ] ++
     # We don't have Emacs/GTK/etc. on {Dar,Cyg}win.
-    stdenv.lib.optional
-      (! (stdenv.lib.lists.any (x: stdenv.hostPlatform.system == x)
+    lib.optional
+      (! (lib.lists.any (x: stdenv.hostPlatform.system == x)
               [ "i686-cygwin" ]))
       emacs;
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to analyze the control flow of C programs";
 
     longDescription = ''
@@ -45,13 +45,6 @@ stdenv.mkDerivation rec {
 
     maintainers = [ maintainers.vrthra ];
 
-    /* On Darwin, build fails with:
-
-       Undefined symbols:
-         "_argp_program_version", referenced from:
-             _argp_program_version$non_lazy_ptr in libcflow.a(argp-parse.o)
-       ld: symbol(s) not found
-     */
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
index a863cec1d4c5..0e92d373c0b3 100644
--- a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, readline, flex, texinfo }:
+{ lib, stdenv, fetchurl, ncurses, readline, flex, texinfo }:
 
 stdenv.mkDerivation rec {
   pname = "cgdb";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses readline flex texinfo ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A curses interface to gdb";
 
     homepage = "https://cgdb.github.io/";
diff --git a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
index 86ac37ee4913..524abbfdc909 100644
--- a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
   version = "2.0.0.2";
   pname = "checkbashisms";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sourceforge.net/projects/checkbaskisms/";
     description = "Check shell scripts for non-portable syntax";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix
index 7e08157d7bd4..ff804f897d1e 100644
--- a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "chrpath-0.16";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries";
     longDescription = ''
       chrpath changes, lists or removes the rpath or runpath setting in a
diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
index ef04e78da609..73ea64f1d62c 100644
--- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.11540";
+  version = "0.1.11924";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "QtD+H59AlXp+3mXtUA44Dl+3xEvWdO8FybuBnL9sjBA=";
+    sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354=";
   };
 
-  vendorSha256 = "fIk443TD4W0hhNuvFSZiV+fdxjelNsxh1+3qtw9yiZY=";
+  vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs=";
 
   doCheck = false;
 
@@ -26,7 +26,7 @@ buildGoModule rec {
     install -Dm644 -t $out/share/circleci-cli _data/data.yml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # Box blurb edited from the AUR package circleci-cli
     description = ''
       Command to enable you to reproduce the CircleCI environment locally and
diff --git a/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix
index c245a32a06d9..4fe93694ab77 100644
--- a/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 let
   s = # Generated upstream information
   rec {
@@ -30,9 +30,9 @@ stdenv.mkDerivation {
 
   meta = {
     inherit (s) version;
-    description = ''Common Lisp launcher script'';
-    license = stdenv.lib.licenses.llgpl21 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    description = "Common Lisp launcher script";
+    license = lib.licenses.llgpl21 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
index 5694693615dd..03c3e51cb89b 100644
--- a/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   fetchFromGitHub,
   cmake,
   gtest,
@@ -30,9 +30,7 @@ stdenv.mkDerivation rec {
     sed -i '/TrueFalseTest/d' tests/CMakeLists.txt
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line parser for C++11";
     homepage = "https://github.com/CLIUtils/CLI11";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
index 7f6a4eddcab0..af435d417cef 100644
--- a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "clojure-lsp";
-  version = "20201228T020543";
+  version = "2021.01.20-01.39.32";
 
   src = fetchurl {
-    url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/release-${version}/${pname}.jar";
-    sha256 = "0jkpw7dx7976p63c08bp43fiwk6f2h2nxj9vv1zr103hgywpplri";
+    url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar";
+    sha256 = "sha256-DqvAIM5YHtcUNZHoH+fcZym6EaPX5a/vgphTFfTO6bU=";
   };
 
   dontUnpack = true;
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm644 $src $out/share/java/${pname}.jar
     makeWrapper ${jre}/bin/java $out/bin/${pname} \
-      --add-flags "-jar $out/share/java/${pname}.jar" \
       --add-flags "-Xmx2g" \
-      --add-flags "-server"
+      --add-flags "-server" \
+      --add-flags "-jar $out/share/java/${pname}.jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Language Server Protocol (LSP) for Clojure";
     homepage = "https://github.com/snoe/clojure-lsp";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix
index f8cad56f0995..40a22f18203b 100644
--- a/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
+{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "coccinelle";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = with ocamlPackages; [
     ocaml findlib menhir
     ocaml_pcre pycaml
-    python ncurses pkgconfig
+    python ncurses pkg-config
   ];
 
   doCheck = !stdenv.isDarwin;
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://coccinelle.lip6.fr/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/complexity/default.nix b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix
index 71ed762df040..6e70fbcfcde5 100644
--- a/nixpkgs/pkgs/development/tools/misc/complexity/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autogen }:
+{ fetchurl, lib, stdenv, autogen }:
 
 stdenv.mkDerivation rec {
   pname = "complexity";
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
          addresses several issues not considered in that scoring scheme.
       '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     homepage = "https://www.gnu.org/software/complexity/";
 
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/cppi/default.nix b/nixpkgs/pkgs/development/tools/misc/cppi/default.nix
index 8de7391b9ec6..9fe5ed966724 100644
--- a/nixpkgs/pkgs/development/tools/misc/cppi/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cppi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "cppi-1.18";
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
          to the level of nesting of that directive.
       '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
index e18196fe595f..5ee1a64f2c23 100644
--- a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison }:
+{ lib, stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
   pname = "cproto";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     [ "$("$out/bin/cproto" -V 2>&1)" = '${version}' ]
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to generate C function prototypes from C source code";
     homepage = "https://invisible-island.net/cproto/";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/tools/misc/creduce/default.nix b/nixpkgs/pkgs/development/tools/misc/creduce/default.nix
index fc6f7156a81b..75234fde6ca5 100644
--- a/nixpkgs/pkgs/development/tools/misc/creduce/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/creduce/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, makeWrapper
+{ lib, stdenv, fetchurl, cmake, makeWrapper
 , llvm, clang-unwrapped
 , flex
 , zlib
@@ -27,19 +27,16 @@ stdenv.mkDerivation rec {
   # On Linux, c-reduce's preferred way to reason about
   # the cpu architecture/topology is to use 'lscpu',
   # so let's make sure it knows where to find it:
-  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = lib.optionalString stdenv.isLinux ''
     substituteInPlace creduce/creduce_utils.pm --replace \
       lscpu ${util-linux}/bin/lscpu
   '';
 
-
-  enableParallelBuilding = true;
-
   postInstall = ''
     wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C program reducer";
     homepage = "https://embed.cs.utah.edu/creduce";
     # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING
diff --git a/nixpkgs/pkgs/development/tools/misc/cscope/default.nix b/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
index 31d4e83663be..7eb38e385e8f 100644
--- a/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 , emacsSupport ? true, emacs
 }:
 
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-ncurses=${ncurses.dev}" ];
 
   buildInputs = [ ncurses ];
-  nativeBuildInputs = stdenv.lib.optional emacsSupport emacs;
+  nativeBuildInputs = lib.optional emacsSupport emacs;
 
-  postInstall = stdenv.lib.optionalString emacsSupport ''
+  postInstall = lib.optionalString emacsSupport ''
     cd "contrib/xcscope"
 
     sed -i "cscope-indexer" \
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
 
     homepage = "http://cscope.sourceforge.net/";
 
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [viric];
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/csmith/default.nix b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix
index 253dd4065e40..0643e81edf99 100644
--- a/nixpkgs/pkgs/development/tools/misc/csmith/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
+{ lib, stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
 
 stdenv.mkDerivation rec {
   pname = "csmith";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A random generator of C programs";
     homepage = "https://embed.cs.utah.edu/csmith";
     # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING
diff --git a/nixpkgs/pkgs/development/tools/misc/ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/ctags/default.nix
index 3adca34a5bbc..90825db2a549 100644
--- a/nixpkgs/pkgs/development/tools/misc/ctags/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ctags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, autoreconfHook }:
+{ lib, stdenv, fetchsvn, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "ctags-${revision}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # don't use $T(E)MP which is set to the build directory
   configureFlags= [ "--enable-tmpdir=/tmp" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for fast source code browsing (exuberant ctags)";
     longDescription = ''
       Ctags generates an index (or tag) file of language objects found
diff --git a/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
index 08f8049aa8a1..f658e78d5db0 100644
--- a/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -1,6 +1,6 @@
 { pkgs, ctags }:
 
-with pkgs.stdenv.lib;
+with pkgs.lib;
 
 # define some ctags wrappers adding support for some not that common languages
 # customization:
diff --git a/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
index 0b89156d71aa..3ab8800f3c4e 100644
--- a/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, tie }:
+{ lib, stdenv, fetchFromGitHub, fetchurl, tie }:
 
 stdenv.mkDerivation rec {
   pname = "cwebbin";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     make -f Makefile.unix install $makeFlags
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Literate Programming in C/C++";
     platforms = with platforms; unix;
diff --git a/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix
index 53ba94c7e81e..60d3c5c45394 100644
--- a/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,5 +1,5 @@
-{ stdenv
-, pkgconfig
+{ lib, stdenv
+, pkg-config
 , fetchurl
 , meson
 , ninja
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/d-feet/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1cgxgpj546jgpyns6z9nkm5k48lid8s36mvzj8ydkjqws2d19zqz";
   };
 
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     itstool
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     wrapGAppsHook
   ];
@@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Feet is an easy to use D-Bus debugger";
     longDescription = ''
       D-Feet can be used to inspect D-Bus interfaces of running programs
diff --git a/nixpkgs/pkgs/development/tools/misc/dbench/default.nix b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix
index 49fb1efbd4a9..9565eaa36262 100644
--- a/nixpkgs/pkgs/development/tools/misc/dbench/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }:
+{ lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }:
 
 stdenv.mkDerivation {
   name = "dbench-2013-01-01";
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Filesystem benchmark tool based on load patterns";
     homepage = "https://dbench.samba.org/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/misc/ddd/default.nix b/nixpkgs/pkgs/development/tools/misc/ddd/default.nix
index 174168b7db7d..74eb9fcb2936 100644
--- a/nixpkgs/pkgs/development/tools/misc/ddd/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ddd/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, motif, ncurses, libX11, libXt}:
+{lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}:
 
 stdenv.mkDerivation rec {
   name = "ddd-3.3.12";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/ddd";
     description = "Graphical front-end for command-line debuggers";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix b/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
index 73e2ab8ef92d..285805ccb02c 100644
--- a/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, expect, makeWrapper }:
+{ fetchurl, lib, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "dejagnu-1.6.2";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" "${expect}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Framework for testing other programs";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix
index 1aaf113d0b95..f0a3a9b76006 100644
--- a/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1 }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
 let
   version = "0.7.2";
 in
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-libusb_1_0" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2;
     description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
     homepage = "http://dfu-programmer.sourceforge.net/";
diff --git a/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix
index 9af9ddc0df7c..85917a114c0f 100644
--- a/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "dfu-util";
   version = "0.10";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb1 ];
 
   src = fetchurl {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Device firmware update (DFU) USB programmer";
     longDescription = ''
       dfu-util is a program that implements the host (PC) side of the USB
diff --git a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
index ead105779788..97db1b5b7e81 100644
--- a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, ncurses
+{ lib, stdenv, fetchurl
+, ncurses
 , withLibrary ? false, libtool
 , unicodeSupport ? true
 , enableShared ? !stdenv.isDarwin
@@ -9,32 +10,32 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
   pname = "dialog";
-  version = "1.3-20190211";
+  version = "1.3-20201126";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"
       "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz"
     ];
-    sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29";
+    sha256 = "sha256-ySM6bI6jOlniN45RRq4r0TtRl0TP22R690IK2sWtOGY=";
   };
 
   buildInputs = [ ncurses ];
 
   configureFlags = [
     "--disable-rpath-hacks"
-    (stdenv.lib.withFeature withLibrary "libtool")
-    "--with-ncurses${stdenv.lib.optionalString unicodeSupport "w"}"
-    "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}"
+    (lib.withFeature withLibrary "libtool")
+    "--with-ncurses${lib.optionalString unicodeSupport "w"}"
+    "--with-libtool-opts=${lib.optionalString enableShared "-shared"}"
   ];
 
-  installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ];
+  installTargets = [ "install${lib.optionalString withLibrary "-full"}" ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://invisible-island.net/dialog/dialog.html";
     description = "Display dialog boxes from shell";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.spacefrogg ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ AndersonTorres spacefrogg ];
+    platforms = ncurses.meta.platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/direvent/default.nix b/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
index 0ae1884646d9..3477d60b7849 100644
--- a/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Directory event monitoring daemon";
     homepage = "https://www.gnu.org.ua/software/direvent/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/distcc/default.nix b/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
index 3894ed58728d..cad9fe0960b5 100644
--- a/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand
+{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
 , gcc, autoconf, automake, which, procps, libiberty_static
 , runtimeShell
 , sysconfDir ? ""   # set this parameter to override the default value $out/etc
@@ -17,8 +17,8 @@ let
       sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
     };
 
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static];
+  nativeBuildInputs = [ pkg-config ];
+    buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static];
     preConfigure =
     ''
       export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
@@ -76,8 +76,8 @@ let
       homepage = "http://distcc.org";
       license = "GPL";
 
-      platforms = stdenv.lib.platforms.linux;
-      maintainers = with stdenv.lib.maintainers; [ anderspapitto ];
+      platforms = lib.platforms.linux;
+      maintainers = with lib.maintainers; [ anderspapitto ];
     };
   };
 in
diff --git a/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix b/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix
index f3bccde81606..2387ab1bd418 100644
--- a/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix
+++ b/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix
@@ -1,4 +1,4 @@
-{ stdenv, gccRaw, binutils }:
+{ lib, stdenv, gccRaw, binutils }:
 
 stdenv.mkDerivation {
   name = "distcc-masq-${gccRaw.name}";
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
index 3c6fa76616fc..8b7717881119 100644
--- a/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python}:
+{lib, stdenv, fetchurl, python}:
 
 stdenv.mkDerivation {
   name = "doclifter-2.19";
@@ -7,20 +7,20 @@ stdenv.mkDerivation {
     sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2";
   };
   buildInputs = [ python ];
-  
+
   makeFlags = [ "PREFIX=$(out)" ];
-  
+
   preInstall = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1
     cp manlifter $out/bin
     cp manlifter.1 $out/share/man/man1
   '';
-  
+
   meta = {
     description = "Lift documents in nroff markups to XML-DocBook";
     homepage = "http://www.catb.org/esr/doclifter";
     license = "BSD";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/docopts/default.nix b/nixpkgs/pkgs/development/tools/misc/docopts/default.nix
index 98a24ca5ebe4..3614270574e4 100644
--- a/nixpkgs/pkgs/development/tools/misc/docopts/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/docopts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "docopts";
@@ -21,7 +21,7 @@ buildGoPackage rec {
     install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/docopt/${pname}";
     description = "docopt CLI tool for shell scripting";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/drush/default.nix b/nixpkgs/pkgs/development/tools/misc/drush/default.nix
index d5c345d9d22b..32d9975e332b 100644
--- a/nixpkgs/pkgs/development/tools/misc/drush/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/drush/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }:
+{ lib, stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "drush-6.1.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line shell and Unix scripting interface for Drupal";
     homepage    = "https://github.com/drush-ops/drush";
     license     = licenses.gpl2;
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"
     cp -r . "$out/src"
     mkdir "$out/bin"
-    wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php73 bash coreutils ncurses ]}"
+    wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php73 bash coreutils ncurses ]}"
     ln -s "$out/src/drush" "$out/bin/drush"
   '';
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 401bbdbee6ef..5edbdba4141e 100644
--- a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "editorconfig-checker";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "editorconfig-checker";
     repo = "editorconfig-checker";
     rev = version;
-    sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32";
+    sha256 = "0c7mainlwn3pd9q6i1f82m5znv8m6fs15zq7nrbm04fy554h0pzz";
   };
 
   vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h";
diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index e563ff203a23..de5c1e070fdb 100644
--- a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, pcre, doxygen }:
+{ lib, stdenv, fetchgit, cmake, pcre, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "editorconfig-core-c-${meta.version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153
   enableParallelBuilding = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://editorconfig.org/";
     description = "EditorConfig core library written in C";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix b/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix
index d1211c9fcecd..5a5267510d7d 100644
--- a/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }:
 
 stdenv.mkDerivation rec {
   name = "eggdbus-0.6";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib dbus dbus-glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://hal.freedesktop.org/releases/";
     description = "D-Bus bindings for GObject";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
index 3778793b71cd..cd19e263f0a5 100644
--- a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "elfinfo";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     sha256 = "1n8bg0rcq9fqa6rdnk6x9ngvm59hcayblkpjv9j5myn2vmm6fv8m";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small utility for showing information about ELF files";
     homepage = "https://elfinfo.roboticoverlords.org/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix
index e8992b62665f..e60b40c7fd4c 100644
--- a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "elfkickers";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html";
     description = "A collection of programs that access and manipulate ELF files";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/misc/epm/default.nix b/nixpkgs/pkgs/development/tools/misc/epm/default.nix
index 8caa33c20d1b..8f5921783e24 100644
--- a/nixpkgs/pkgs/development/tools/misc/epm/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/epm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, rpm}:
+{lib, stdenv, fetchFromGitHub, rpm}:
 
 stdenv.mkDerivation rec {
   pname = "epm";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i 's/README/README.md/' Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The ESP Package Manager generates distribution archives for a variety of platforms";
     homepage = "https://www.msweet.org/projects.php?Z2";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix b/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix
index b289c16b7a6e..6773e9bc0bd4 100644
--- a/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "findnewest";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/0-wiz-0/findnewest";
     description = "Recursively find newest file in a hierarchy and print its timestamp";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix
index 69d7c6b3919f..132ddf2eacfd 100644
--- a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "fsatrace";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ln -s $out/$installDir/fsatrace $out/bin/fsatrace
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jacereda/fsatrace";
     description = "filesystem access tracer";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
index e32da3e67b71..6f9f5e113c06 100644
--- a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
                      # for xargs
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk";
   };
 
-  nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+  nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
   buildInputs = [ gettext libtool makeWrapper texinfo ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform file change monitor with multiple backends";
     homepage = "https://github.com/emcrisostomo/fswatch";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix b/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix
index e5cd2e0e2ddf..db1f42e3a266 100644
--- a/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
-, pkgconfig
+, pkg-config
 , IOKit
 , libftdi1
 , libusb-compat-0_1
@@ -20,15 +20,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
     libftdi1
     libusb-compat-0_1
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
+  ] ++ lib.optionals stdenv.isDarwin [ IOKit ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards";
     homepage = "https://github.com/kost/fujprog";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
index d9bac6e3c83c..2ce779be5680 100644
--- a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, targetPackages
+{ lib, stdenv, targetPackages
 
 # Build time
-, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
+, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
 
 # Run time
 , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu
@@ -18,7 +18,7 @@
 
 let
   basename = "gdb";
-  targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
                  "${stdenv.targetPlatform.config}-";
 in
 
@@ -40,15 +40,15 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./debug-info-from-env.patch
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     ./darwin-target-match.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ];
+  nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ];
 
   buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ]
-    ++ stdenv.lib.optional pythonSupport python3
-    ++ stdenv.lib.optional doCheck dejagnu;
+    ++ lib.optional pythonSupport python3
+    ++ lib.optional doCheck dejagnu;
 
   propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
 
@@ -57,12 +57,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # darwin build fails with format hardening since v7.12
-  hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ];
+  hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ];
 
   NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
 
   # GDB have to be built out of tree.
   preConfigure = ''
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   '';
   configureScript = "../configure";
 
-  configureFlags = with stdenv.lib; [
+  configureFlags = with lib; [
     "--enable-targets=all" "--enable-64-bit-bfd"
     "--disable-install-libbfd"
     "--disable-shared" "--enable-static"
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     "--with-mpfr=${mpfr.dev}"
     "--with-expat" "--with-libexpat-prefix=${expat.dev}"
     "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
-  ] ++ stdenv.lib.optional (!pythonSupport) "--without-python";
+  ] ++ lib.optional (!pythonSupport) "--without-python";
 
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
   # TODO: Investigate & fix the test failures.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Project debugger";
 
     longDescription = ''
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.gnu.org/software/gdb/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     platforms = with platforms; linux ++ cygwin ++ darwin;
     maintainers = with maintainers; [ pierron globin lsix ];
diff --git a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix
index ecbfc2ae7569..c01bb61f4f69 100644
--- a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonApplication
 , fetchPypi
 , gdb
@@ -41,13 +41,13 @@ buildPythonApplication rec {
 
   postInstall = ''
     wrapProgram $out/bin/gdbgui \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]}
+      --prefix PATH : ${lib.makeBinPath [ gdb ]}
   '';
 
   # tests do not work without stdout/stdin
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A browser-based frontend for GDB";
     homepage = "https://www.gdbgui.com/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/misc/gede/default.nix b/nixpkgs/pkgs/development/tools/misc/gede/default.nix
index b27c3a515bbe..39954b458b4d 100644
--- a/nixpkgs/pkgs/development/tools/misc/gede/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gede/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   installPhase = ''
     python build.py install --verbose --prefix="$out"
     wrapProgram $out/bin/gede \
-      --prefix PATH : ${lib.makeBinPath [ ctags gdb ]} 
+      --prefix PATH : ${lib.makeBinPath [ ctags gdb ]}
   '';
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix b/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix
index 0a3b0b1c7508..2c09f925d3d8 100644
--- a/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, texinfo, help2man }:
+{ fetchurl, lib, stdenv, texinfo, help2man }:
 
 stdenv.mkDerivation rec {
   pname = "gengetopt";
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.gnu.org/software/gengetopt/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/global/default.nix b/nixpkgs/pkgs/development/tools/misc/global/default.nix
index 36798fe4fc1a..fb3ddfcb29b3 100644
--- a/nixpkgs/pkgs/development/tools/misc/global/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/global/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libtool, makeWrapper
+{ fetchurl, lib, stdenv, libtool, makeWrapper
 , coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
 }:
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Source code tag system";
     longDescription = ''
       GNU GLOBAL is a source code tagging system that works the same way
diff --git a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix
index 2e3e4acfdc1b..512989a14462 100644
--- a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
         sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk";
       })
     ]
-    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch;
+    ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch;
 
   meta = {
     homepage = "https://www.gnu.org/software/m4/";
@@ -49,8 +49,8 @@ stdenv.mkDerivation {
       compiler or as a macro processor in its own right.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix ++ stdenv.lib.platforms.windows;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/gob2/default.nix b/nixpkgs/pkgs/development/tools/misc/gob2/default.nix
index b1e107368ba7..b78c111ccbf8 100644
--- a/nixpkgs/pkgs/development/tools/misc/gob2/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gob2/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gob2";
   version = "2.0.20";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428";
   };
 
   # configure script looks for d-bus but it is only needed for tests
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib bison flex ];
 
   passthru = {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Preprocessor for making GObjects with inline C code";
     homepage = "https://www.jirka.org/gob.html";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix b/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix
index e013428a6f7f..339511f2cc02 100644
--- a/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, autoreconfHook }:
+{lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "gperf-3.0.4";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
       employed by gperf.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     homepage = "https://www.gnu.org/software/gperf/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/gperf/default.nix b/nixpkgs/pkgs/development/tools/misc/gperf/default.nix
index bf85cd91380e..e998f09683ae 100644
--- a/nixpkgs/pkgs/development/tools/misc/gperf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gperf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "gperf-3.1";
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
       employed by gperf.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     homepage = "https://www.gnu.org/software/gperf/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
index 182d28375b61..13437b719536 100644
--- a/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin
+{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
 , makeWrapper
 }:
 
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ globalplatform pcsclite makeWrapper ];
 
   postFixup = ''
     wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
     description = "Smartcard management application";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix
index 2ad496bfb887..c07949e80968 100644
--- a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "gputils";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gputils.sourceforge.io";
     description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix
new file mode 100644
index 000000000000..3e06f10cbf1e
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, cmake
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "grpc-tools";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "grpc";
+    repo = "grpc-node";
+    rev = "3a094f01711942f79abd8a536c45a91b574d626f"; # version 1.10.0 was not tagged
+    sha256 = "1a7l91kxc3g7mqfqvhc3nb7zy0n21ifs5ck0qqg09qh3f44q04xm";
+    fetchSubmodules = true;
+  };
+
+  sourceRoot = "source/packages/grpc-tools";
+
+  nativeBuildInputs = [ cmake ];
+
+  installPhase = ''
+    install -Dm755 -t $out/bin grpc_node_plugin
+    install -Dm755 -t $out/bin deps/protobuf/protoc
+  '';
+
+  meta = with lib; {
+    description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm";
+    longDescription = ''
+      This package distributes the Protocol Buffers compiler protoc along with
+      the plugin for generating client and service objects for use with the Node
+      gRPC libraries.
+    '';
+    homepage = "https://github.com/grpc/grpc-node/tree/master/packages/grpc-tools";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.nzhang-zh ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix b/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix
index 6cdcce77ffdc..6651bbb03845 100644
--- a/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk2, pkgconfig }:
+{lib, stdenv, fetchurl, gtk2, pkg-config }:
 
 stdenv.mkDerivation {
   name = "gtkdialog-0.8.3";
@@ -8,14 +8,14 @@ stdenv.mkDerivation {
     sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk2 ];
 
   meta = {
     homepage = "https://code.google.com/archive/p/gtkdialog/";
     # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog
     description = "Small utility for fast and easy GUI building from many scripted and compiled languages";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix
index 82ee29172778..4b7f7985a673 100644
--- a/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, pkgconfig, libintl }:
+{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }:
 
 stdenv.mkDerivation {
   name = "gtkperf-0.40.0";
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk2 libintl ];
 
   # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db
   patches = [ ./bench.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Application designed to test GTK performance";
     homepage = "http://gtkperf.sourceforge.net/";
     license = with licenses; [ gpl2 ];
diff --git a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
index f23b5a9c8fdd..6afc4415e113 100644
--- a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, gettext }:
+{ lib, stdenv, fetchurl, perlPackages, gettext }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
     cat > $out/bin/help2man <<EOF
     #! $SHELL -e
     export PERL5LIB=\''${PERL5LIB:+:}${perlPackages.LocaleGettext}/${perlPackages.perl.libPrefix}
-    ${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin
+    ${lib.optionalString stdenv.hostPlatform.isCygwin
         ''export PATH=\''${PATH:+:}${gettext}/bin''}
     exec -a \$0 $out/bin/.help2man-wrapped "\$@"
     EOF
     chmod +x $out/bin/help2man
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate man pages from `--help' output";
 
     longDescription =
diff --git a/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/nixpkgs/pkgs/development/tools/misc/hound/default.nix
index 4e817251bffe..476179ac8e7a 100644
--- a/nixpkgs/pkgs/development/tools/misc/hound/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildGoPackage
 , fetchFromGitHub
 , makeWrapper
@@ -32,8 +32,8 @@ buildGoPackage rec {
     inherit (src.meta) homepage;
 
     description = "Lightning fast code searching made easy";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ grahamc ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ grahamc ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
index 10ecd8174af4..9160a3366811 100644
--- a/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
+{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "hydra-cli";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec {
                 ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client for the Hydra CI";
     homepage = "https://github.com/nlewo/hydra-cli";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/nixpkgs/pkgs/development/tools/misc/hydra/common.nix
index 4af9fe045874..cf56e6c1a9c9 100644
--- a/nixpkgs/pkgs/development/tools/misc/hydra/common.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hydra/common.nix
@@ -1,6 +1,6 @@
 { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
-, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
-, gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
+, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
+, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
 , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
 , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
@@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs =
     [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
-      gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt
+      top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt
       perlDeps perl nix
       postgresql # for running the tests
       nlohmann_json
@@ -89,10 +89,10 @@ in stdenv.mkDerivation rec {
 
   hydraPath = lib.makeBinPath (
     [ sqlite subversion openssh nix coreutils findutils pixz
-      gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy
+      gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
     ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
 
@@ -128,7 +128,7 @@ in stdenv.mkDerivation rec {
 
   passthru = { inherit perlDeps migration tests; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Nix-based continuous build system";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
index 7aa1e05a88e4..1636ad6dd71f 100644
--- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
@@ -9,6 +9,9 @@
       rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c";
       sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj";
     };
+    patches = [
+      ./hydra-nix-receiveContents.patch
+    ];
     nix = nixFlakes;
 
     tests = {
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch b/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch
new file mode 100644
index 000000000000..61957e2190cd
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch
@@ -0,0 +1,18 @@
+Update for https://github.com/NixOS/nix/commit/faa31f40
+
+--- a/src/hydra-queue-runner/nar-extractor.cc
++++ b/src/hydra-queue-runner/nar-extractor.cc
+@@ -48,9 +48,9 @@
+-    void receiveContents(unsigned char * data, size_t len) override
++    void receiveContents(std::string_view data) override
+     {
+         assert(expectedSize);
+         assert(curMember);
+         assert(hashSink);
+-        *curMember->fileSize += len;
+-        (*hashSink)(data, len);
++        *curMember->fileSize += data.size();
++        (*hashSink)(data);
+         if (curMember->contents) {
+-            curMember->contents->append((char *) data, len);
++            curMember->contents->append(data);
diff --git a/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix b/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix
index 0905ce484634..8fdc448ee91e 100644
--- a/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perlPackages, librsvg}:
+{lib, stdenv, fetchurl, perlPackages, librsvg}:
 
 stdenv.mkDerivation rec {
   name = "icon-naming-utils-0.8.90";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
           --replace '/bin/perl' '/bin/perl -I${perlPackages.XMLSimple}/${perlPackages.perl.libPrefix}'
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification";
     platforms = with platforms; linux ++ darwin;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/igprof/default.nix b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix
index 0780672cc020..47f41f130bef 100644
--- a/nixpkgs/pkgs/development/tools/misc/igprof/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}:
+{lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}:
 
 stdenv.mkDerivation rec {
   version = "5.9.16";
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
       details and see the big picture from combined workloads.
     '';
 
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
 
     homepage = "https://igprof.org/";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ ktf ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ktf ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/indent/default.nix b/nixpkgs/pkgs/development/tools/misc/indent/default.nix
index c4b5fecca741..8c5ec6af1c7f 100644
--- a/nixpkgs/pkgs/development/tools/misc/indent/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/indent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo }:
+{ lib, stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "indent-2.2.12";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ texinfo ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
     "-Wno-implicit-function-declaration";
 
   hardeningDisable = [ "format" ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/indent/";
     description = "A source code reformatter";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.mmahut ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.mmahut ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix
index a9d642f48f0f..e085d3dd259e 100644
--- a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "inotify-tools";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rvoicilas/inotify-tools/wiki";
     license = licenses.gpl2;
     maintainers = with maintainers; [ marcweber pSub ];
diff --git a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 19556aeafc01..62d350593b16 100644
--- a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
+{ lib, stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
 , procps, utilmacros, gtk-doc, openssl, peg, elfutils
 }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0";
   };
 
-  nativeBuildInputs = [ pkgconfig utilmacros ];
+  nativeBuildInputs = [ pkg-config utilmacros ];
   buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
     libXext libXv libXrandr glib bison libunwind python3 procps
     gtk-doc openssl peg elfutils ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxgraphics/";
     description = "Tools for development and testing of the Intel DRM driver";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix
index 20f880938c66..7a3379d59217 100644
--- a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }:
+{ lib, stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "intltool";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = with perlPackages; [ perl XMLParser ];
   propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]);
 
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     for f in $out/bin/*; do
       substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}"
     done
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Translation helper tool";
     homepage = "https://launchpad.net/intltool/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/iozone/default.nix b/nixpkgs/pkgs/development/tools/misc/iozone/default.nix
index 93e2673be63a..ad62d1048732 100644
--- a/nixpkgs/pkgs/development/tools/misc/iozone/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/iozone/default.nix
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "IOzone Filesystem Benchmark";
     homepage    = "http://www.iozone.org/";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
+    license     = lib.licenses.unfreeRedistributable;
     platforms   = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
-    maintainers = with stdenv.lib.maintainers; [ Baughn makefu ];
+    maintainers = with lib.maintainers; [ Baughn makefu ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix
index a121cc670993..992b76bd62da 100644
--- a/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config }:
 
 rustPlatform.buildRustPackage rec {
   pname = "itm-tools";
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for analyzing ITM traces";
     homepage = "https://github.com/japaric/itm-tools";
     license = with licenses; [ asl20 mit ];
diff --git a/nixpkgs/pkgs/development/tools/misc/itstool/default.nix b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix
index d46256f039aa..55e62a2dcaee 100644
--- a/nixpkgs/pkgs/development/tools/misc/itstool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://itstool.org/";
     description = "XML to PO and back again";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix b/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
index 6ed66c8d3cc0..a978c31c34d1 100644
--- a/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
@@ -1,4 +1,4 @@
-{ autoconf, fetchurl, makedepend, perl, python, stdenv, unzip, zip }:
+{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }:
 
 stdenv.mkDerivation rec {
   name = "jscoverage-0.5.1";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://siliconforks.com/jscoverage/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix b/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix
index fa413511dc01..3b355b6218a5 100644
--- a/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }:
+{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
 
 stdenv.mkDerivation rec {
   basename = "kconfig-frontends";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
 
   configureFlags = [
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Out of Linux tree packaging of the kconfig infrastructure";
     longDescription = ''
       Configuration language and system for the Linux kernel and other
diff --git a/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix
index 6b7369a0558f..dad7d41c1f68 100644
--- a/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, qt5,
+{ lib, stdenv, fetchurl, cmake, extra-cmake-modules, qt5,
   ki18n, kconfig, kiconthemes, kxmlgui, kwindowsystem,
   qtbase, makeWrapper,
 }:
@@ -14,14 +14,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
   buildInputs = [ qt5.qtbase ki18n kconfig kiconthemes kxmlgui kwindowsystem ];
 
-  enableParallelBuilding = true;
-
-
   postInstall = ''
     wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.kdbg.org/";
     description = ''
       A graphical user interface to gdb, the GNU debugger. It provides an
diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
index 354f77d0fb97..3fa2d219fe3a 100644
--- a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
@@ -1,6 +1,6 @@
 { elk6Version
 , enableUnfree ? true
-, stdenv
+, lib, stdenv
 , makeWrapper
 , fetchurl
 , nodejs-10_x
@@ -8,7 +8,7 @@
 , which
 }:
 
-with stdenv.lib;
+with lib;
 let
   nodejs = nodejs-10_x;
   inherit (builtins) elemAt;
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     mv * $out/libexec/kibana/
     rm -r $out/libexec/kibana/node
     makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
+      --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}"
     sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
   '';
 
diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
index dc3beb9866c0..7f46d6f65120 100644
--- a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
@@ -1,6 +1,6 @@
 { elk7Version
 , enableUnfree ? true
-, stdenv
+, lib, stdenv
 , makeWrapper
 , fetchurl
 , nodejs-10_x
@@ -8,7 +8,7 @@
 , which
 }:
 
-with stdenv.lib;
+with lib;
 let
   nodejs = nodejs-10_x;
   inherit (builtins) elemAt;
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     mv * $out/libexec/kibana/
     rm -r $out/libexec/kibana/node
     makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
+      --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}"
     sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
   '';
 
diff --git a/nixpkgs/pkgs/development/tools/misc/libtool/default.nix b/nixpkgs/pkgs/development/tools/misc/libtool/default.nix
index 199c6504f392..2b0089e89f64 100644
--- a/nixpkgs/pkgs/development/tools/misc/libtool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libtool/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4, perl}:
+{lib, stdenv, fetchurl, m4, perl}:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.gnu.org/software/libtool/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix
index fbe49dc68b2a..6d7c4a9087f4 100644
--- a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, help2man
+{ lib, stdenv, fetchurl, m4, perl, help2man
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU Libtool, a generic library support script";
     longDescription = ''
       GNU libtool is a generic library support script.  Libtool hides
diff --git a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
index 59bbb99bd46e..aeda5271142a 100644
--- a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libwhich";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     install -Dm755 -t $out/bin libwhich
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Like `which`, for dynamic libraries";
     homepage = "https://github.com/vtjnash/libwhich";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix
index ace34f350599..59bab3742a26 100644
--- a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitLab }:
+{ lib, stdenv, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
   pname = "loccount";
   version = "1.2";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Re-implementation of sloccount in Go";
     longDescription = ''
       loccount is a re-implementation of David A. Wheeler's sloccount tool
diff --git a/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix
index e5988b1d5a9a..94e3722598b0 100644
--- a/nixpkgs/pkgs/development/tools/misc/lsof/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildPackages, ncurses }:
+{ lib, stdenv, fetchFromGitHub, buildPackages, ncurses }:
 
-let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in
+let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in
 
 stdenv.mkDerivation rec {
   pname = "lsof";
@@ -18,14 +18,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./no-build-info.patch ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's|lcurses|lncurses|g' Configure
   '';
 
   # Stop build scripts from searching global include paths
-  LSOF_INCLUDE = "${stdenv.lib.getDev stdenv.cc.libc}/include";
+  LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include";
   configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}";
   preBuild = ''
     for filepath in $(find dialects/${dialect} -type f); do
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     cp lsof $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lsof-org/lsof";
     description = "A tool to list open files";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
index d88d9d7a7be5..e1d9ae6b5513 100644
--- a/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, elfutils, libunwind }:
+{ lib, stdenv, fetchurl, elfutils, libunwind }:
 
 stdenv.mkDerivation {
   name = "ltrace-0.7.3";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library call tracer";
     homepage = "https://www.ltrace.org/";
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix
index 03e370aeeb4b..223e10d04ab5 100644
--- a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
+{ lib, stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
 
 stdenv.mkDerivation rec {
   pname = "lttng-tools";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tracing tools (kernel + user space) for Linux";
     homepage = "https://lttng.org/";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix
index 1b59045c6fd2..94d2e4a33f29 100644
--- a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, liburcu, python }:
+{ lib, stdenv, fetchurl, liburcu, python3 }:
 
 # NOTE:
 #   ./configure ...
@@ -20,15 +20,15 @@ stdenv.mkDerivation rec {
     sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python3 ];
 
   preConfigure = ''
     patchShebangs .
   '';
-  
+
   propagatedBuildInputs = [ liburcu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "LTTng Userspace Tracer libraries";
     homepage = "https://lttng.org/";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/lttv/default.nix b/nixpkgs/pkgs/development/tools/misc/lttv/default.nix
index abcc476d5947..a196c5f45288 100644
--- a/nixpkgs/pkgs/development/tools/misc/lttv/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lttv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
+{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }:
 
 stdenv.mkDerivation rec {
   name = "lttv-1.5";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib gtk2 popt babeltrace ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graphical trace viewer for LTTng trace files";
     homepage = "https://lttng.org/";
     # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
index fa19b2494076..77f34cca7dec 100644
--- a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub
+{lib, stdenv, fetchFromGitHub
 , curl, makeWrapper, which, unzip
 , lua
 # for 'luarocks pack'
@@ -62,9 +62,9 @@ stdenv.mkDerivation rec {
     export LUA_PATH="src/?.lua;''${LUA_PATH:-}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
-    description = ''A package manager for Lua'';
+    description = "A package manager for Lua";
     license = licenses.mit ;
     maintainers = with maintainers; [raskin teto];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 57f200fd0fcb..30e02a3623fa 100644
--- a/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -1,14 +1,11 @@
 { luarocks, fetchFromGitHub }:
 luarocks.overrideAttrs(old: {
   pname = "luarocks-nix";
-  version = "2019-09-07";
+  version = "2021-01-22";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "luarocks-nix";
-    rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde";
-    sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y";
+    rev = "v3.5.0_nix";
+    sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk=";
   };
-  patches = [
-    ./darwin-3.1.3.patch
-  ];
 })
diff --git a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
index 5008175363cb..c92d7b077983 100644
--- a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchFromGitHub, cctools }:
+{ lib, stdenv, makeWrapper, fetchFromGitHub, cctools }:
 
 stdenv.mkDerivation {
   pname = "macdylibbundler";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       --prefix PATH ":" "${cctools}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility to ease bundling libraries into executables for OSX";
     longDescription = ''
       dylibbundler is a small command-line programs that aims to make bundling
diff --git a/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix b/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix
index f2d332a95bb8..eaaa7bed5a5e 100644
--- a/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix
@@ -94,4 +94,4 @@
     };
     version = "2.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix b/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix
index 890439adc6e9..2999b741888a 100644
--- a/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    };
 
    buildInputs = [ libusb-compat-0_1 ];
-   makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
+   makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
 
    installPhase = ''
      mkdir -p $out/bin
diff --git a/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
index 0e28f729fe9d..f444f86dbfbe 100644
--- a/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }:
+{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "msitools";
   version = "0.98";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
   };
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkg-config ];
   buildInputs = [ glib libgsf libuuid gcab bzip2 ];
 
   passthru = {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of programs to inspect and build Windows Installer (.MSI) files";
     homepage = "https://wiki.gnome.org/msitools";
     license = [ licenses.gpl2 licenses.lgpl21 ];
diff --git a/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix b/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix
new file mode 100644
index 000000000000..1919e26ddec4
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix
@@ -0,0 +1,48 @@
+{ lib, stdenv, fetchFromGitHub, srcOnly, nim }:
+let
+  astpatternmatching = fetchFromGitHub {
+    owner = "krux02";
+    repo = "ast-pattern-matching";
+    rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96";
+    sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq";
+  };
+
+  jsonschema = fetchFromGitHub {
+    owner = "PMunch";
+    repo = "jsonschema";
+    rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf";
+    sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "nimlsp";
+  version = "0.2.6";
+
+  src = fetchFromGitHub {
+    owner = "PMunch";
+    repo = "nimlsp";
+    rev = "v${version}";
+    sha256 = "13kw3zjh0iqymwqxwhyj8jz6hgswwahf1rjd6iad7c6gcwrrg6yl";
+  };
+
+  nativeBuildInputs = [ nim ];
+
+  buildPhase = ''
+    export HOME=$TMPDIR
+    nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \
+      c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \
+      -d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp
+  '';
+
+  installPhase = ''
+    install -Dt $out/bin src/nimlsp
+  '';
+
+  meta = with lib; {
+    description = "Language Server Protocol implementation for Nim";
+    homepage = "https://github.com/PMunch/nimlsp";
+    license = licenses.mit;
+    platforms = nim.meta.platforms;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
index e683bef7b060..8e8fb6bb5972 100644
--- a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, perlPackages }:
+{ lib, stdenv, fetchFromGitHub, perl, perlPackages }:
 
 assert stdenv ? glibc;
 
@@ -26,7 +26,7 @@ perlPackages.buildPerlPackage {
     perl Makefile.PL
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A sentence based license detector";
     homepage = "http://ninka.turingmachine.org/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix
index eeb9100a4c8f..a8a18b254b98 100644
--- a/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python37Packages, fetchFromGitHub }:
+{ lib, stdenv, python37Packages, fetchFromGitHub }:
 
 with python37Packages; buildPythonApplication rec {
   pname = "nrfutil";
@@ -20,7 +20,7 @@ with python37Packages; buildPythonApplication rec {
     mkdir test-reports
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Device Firmware Update tool for nRF chips";
     homepage = "https://github.com/NordicSemiconductor/pc-nrfutil";
     license = licenses.unfreeRedistributable;
diff --git a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
index e9259b7156b9..74309a33f22f 100644
--- a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "echo ${version} > .tarball-version";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Freescale/NXP I.MX chip image deploy tools";
     longDescription = ''
       UUU (Universal Update Utility) is a command line tool, evolved out of
diff --git a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix
index 52cc1b2d5c58..55147e9a16db 100644
--- a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "objconv";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     mv objconv-instructions.pdf $out/doc/objconv
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Object and executable file converter, modifier and disassembler";
     homepage = "https://www.agner.org/optimize/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix
index 26507a26e915..89425f805b43 100644
--- a/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix
@@ -31,4 +31,4 @@
     };
     version = "1.7.2";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
index 79fa383300e1..01f2ced1f4bb 100644
--- a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:
+{ lib, stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "opengrok";
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname"
     substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}"
     wrapProgram $out/bin/OpenGrok \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \
+      --prefix PATH : "${lib.makeBinPath [ ctags git ]}" \
       --set JAVA_HOME "${jre}" \
       --set OPENGROK_TOMCAT_BASE "/var/tomcat"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Source code search and cross reference engine";
     homepage = "https://opengrok.github.io/OpenGrok/";
     license = licenses.cddl;
diff --git a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
index bb88862a8e8e..c39ef5e00516 100644
--- a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, elfutils, zlib }:
+{ lib, stdenv, fetchgit, cmake, elfutils, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "pahole";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # Put libraries in "lib" subdirectory, not top level of $out
   cmakeFlags = [ "-D__LIB=lib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/";
     description = "Pahole and other DWARF utils";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix
index 1d31709ccf0c..a0c002d8a8c5 100644
--- a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   # fails 8 out of 24 tests, problems when loading libc.so.6
   doCheck = stdenv.name == "stdenv-linux";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/NixOS/patchelf/blob/master/README";
     license = licenses.gpl3;
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix
index 0d9eeb84bfb4..1d790740e697 100644
--- a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
+{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "patchelf-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   # Drop test that fails on musl (?)
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace tests/Makefile.am \
       --replace "set-rpath-library.sh" ""
   '';
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/NixOS/patchelf/blob/master/README";
     license = licenses.gpl3;
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
diff --git a/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix b/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix
index 4e405413e3ae..7447bf660226 100644
--- a/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, fetchFromGitHub }:
+{ lib, stdenv, python3, fetchFromGitHub }:
 python3.pkgs.buildPythonApplication rec {
   pname = "perfect-hash";
   version = "0.4.1";
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
     cp -r examples $out/share/doc/perfect-hash
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimal perfect hash function generator";
     longDescription = ''
       Generate a minimal perfect hash function for a given set of keys.
diff --git a/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix
index 84f6c330f8c5..b0b3115700fb 100644
--- a/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, libiconv, vanilla ? false }:
+{ lib, stdenv, fetchurl, libiconv, vanilla ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "pkg-config";
   version = "0.29.2";
 
   src = fetchurl {
-    url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz";
+    url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz";
     sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
   };
 
diff --git a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
index 6fca02ad788b..c6c984f9699f 100644
--- a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, removeReferencesTo }:
+{ lib, stdenv, fetchurl, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
   pname = "pkgconf";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     mv ${placeholder "dev"}/share ${placeholder "out"}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Package compiler and linker metadata toolkit";
     homepage = "https://git.dereferenced.org/pkgconf/pkgconf";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix
index 81a88f20ad20..1fd58fd14a2f 100644
--- a/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "pmccabe";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "McCabe-style function complexity and line counting for C and C++";
     homepage = "https://people.debian.org/~bame/pmccabe/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix
index 5d7ca75de322..63fc7c8e64a5 100644
--- a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libelf }:
+{ lib, stdenv, fetchurl, libelf }:
 
 let
   version = "20130503";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   inherit version;
 
   buildInputs = [
-    libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc)
+    libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc)
   ];
 
   src = fetchurl {
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
     homepage = "https://people.redhat.com/jakub/prelink/";
     license = "GPL";
     description = "ELF prelinking utility to speed up dynamic linking";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/premake/3.nix b/nixpkgs/pkgs/development/tools/misc/premake/3.nix
index a630c0ced9e7..9176842d75d0 100644
--- a/nixpkgs/pkgs/development/tools/misc/premake/3.nix
+++ b/nixpkgs/pkgs/development/tools/misc/premake/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 let baseName = "premake";
   version  = "3.7";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://industriousone.com/premake";
     description = "A simple build configuration and project generation tool using lua";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/premake/5.nix b/nixpkgs/pkgs/development/tools/misc/premake/5.nix
index 5e8606833d31..bb0269d0cc3b 100644
--- a/nixpkgs/pkgs/development/tools/misc/premake/5.nix
+++ b/nixpkgs/pkgs/development/tools/misc/premake/5.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, Foundation, readline }:
+{ lib, stdenv, fetchFromGitHub, Foundation, readline }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "premake5";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://premake.github.io";
     description = "A simple build configuration and project generation tool using lua";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = platforms.darwin ++ platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/premake/default.nix b/nixpkgs/pkgs/development/tools/misc/premake/default.nix
index 92445abbba9b..ccd8a4574a1f 100644
--- a/nixpkgs/pkgs/development/tools/misc/premake/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/premake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 let baseName = "premake";
   version  = "4.3";
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
   premake_cmd = "premake4";
   setupHook = ./setup-hook.sh;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://industriousone.com/premake";
     description = "A simple build configuration and project generation tool using lua";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/nixpkgs/pkgs/development/tools/misc/ptags/default.nix b/nixpkgs/pkgs/development/tools/misc/ptags/default.nix
index 93014af3f620..0ef7a2aa73a4 100644
--- a/nixpkgs/pkgs/development/tools/misc/ptags/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ptags/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     $releaseDir/ptags --help > /dev/null
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A parallel universal-ctags wrapper for git repository";
     homepage = "https://github.com/dalance/ptags";
     maintainers = with maintainers; [ pamplemousse ];
diff --git a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix
index f9d792d185f8..69ed17ab4b9e 100644
--- a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python3
 , fetchFromGitHub
 , makeWrapper
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
       --set NIX_PYTHONPATH ${pythonPath}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Exploit Development and Reverse Engineering with GDB Made Easy";
     homepage = "https://github.com/pwndbg/pwndbg";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
index d259721353b1..643e28e82b27 100644
--- a/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libarchive, python, file, which }:
+{ lib, stdenv, fetchurl, libarchive, python, file, which }:
 
 stdenv.mkDerivation rec {
   pname = "remarkable-toolchain";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     ENVCLEANED=1 $src -y -d $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A toolchain for cross-compiling to reMarkable tablets";
     homepage = "https://remarkable.engineering/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
new file mode 100644
index 000000000000..7b4df5df1647
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchurl, libarchive, python3, file }:
+
+stdenv.mkDerivation rec {
+  pname = "remarkable2-toolchain";
+  version = "2.5.2";
+
+  src = fetchurl {
+    url = "https://storage.googleapis.com/codex-public-bucket/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh";
+    sha256 = "1v410q1jn8flisdpkrymxd4pa1ylawd0rh3rljjpkqw1bp8a5vw1";
+  };
+
+  nativeBuildInputs = [
+    libarchive
+    python3
+    file
+  ];
+
+  unpackCmd = ''
+    mkdir src
+    install $curSrc src/install-toolchain.sh
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    patchShebangs install-toolchain.sh
+    sed -i -e '3,9d' install-toolchain.sh # breaks PATH
+    sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh
+    ./install-toolchain.sh -D -y -d $out
+  '';
+
+  meta = with lib; {
+    description = "A toolchain for cross-compiling to reMarkable 2 tablets";
+    homepage = "https://remarkable.engineering/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ tadfisher ];
+    platforms = platforms.x86_64;
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/rman/default.nix b/nixpkgs/pkgs/development/tools/misc/rman/default.nix
index 09769d5c5912..1f7de915c974 100644
--- a/nixpkgs/pkgs/development/tools/misc/rman/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/rman/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "rman-3.2";
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats";
     license = "artistic";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
index 6eb13bb242da..d86277993caa 100644
--- a/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nickjj/rolespec";
     description = "A test library for testing Ansible roles";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
index b9f84edc964a..c26e834ee0f7 100644
--- a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -6,7 +6,7 @@
 #
 # In NixOS, simply add this package to services.udev.packages.
 
-{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
+{ lib, stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
 , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor
 , freetype, libXinerama, libxcb, zlib, pciutils
 , makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL
@@ -14,7 +14,7 @@
 
 let
 
-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = lib.makeLibraryPath [
     glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11
     libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib
     dbus libGL
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software for Saleae logic analyzers";
     homepage = "https://www.saleae.com/";
     license = licenses.unfree;
diff --git a/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/nixpkgs/pkgs/development/tools/misc/scc/default.nix
index 5fc23547615a..49052c141a1a 100644
--- a/nixpkgs/pkgs/development/tools/misc/scc/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/scc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "scc";
@@ -16,7 +16,7 @@ buildGoModule rec {
   # scc has a scripts/ sub-package that's for testing.
   excludedPackages = [ "scripts" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/boyter/scc";
     description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go";
     maintainers = with maintainers; [ sigma Br1ght0ne ];
diff --git a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
index 843059b33562..c68a1c1547cc 100644
--- a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
@@ -1,4 +1,14 @@
-{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, cargo
+, rustc
+, rustPlatform
+, pkg-config
+, glib
+, openssl
+, darwin
+}:
 
 rustPlatform.buildRustPackage rec {
   version = "0.2.14";
@@ -14,16 +24,16 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--features=all" ];
   nativeBuildInputs = [
-    pkgconfig cargo rustc
+    pkg-config cargo rustc
   ];
   buildInputs = [
     openssl
-  ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+  ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   # Tests fail because of client server setup which is not possible inside the pure environment,
   # see https://github.com/mozilla/sccache/issues/460
   checkPhase = null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ccache with Cloud Storage";
     homepage = "https://github.com/mozilla/sccache";
     maintainers = with maintainers; [ doronbehar ];
diff --git a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix
index 610e66a2b9cc..22bf244662b3 100644
--- a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, libpcap }:
+{lib, stdenv, fetchurl, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
   version = "3.6.0";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses libpcap];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://sipp.sf.net";
     description = "The SIPp testing tool";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix b/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix
index b2b83aa79b16..fc041f2ee8d6 100644
--- a/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, perl, makeWrapper }:
+{ fetchurl, lib, stdenv, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "sloccount-2.26";
@@ -62,11 +62,11 @@ stdenv.mkDerivation rec {
       the Perl CPAN library using this tool suite.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     homepage = "https://www.dwheeler.com/sloccount/";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/srecord/default.nix b/nixpkgs/pkgs/development/tools/misc/srecord/default.nix
index f978d4d4e120..a18dcd85255a 100644
--- a/nixpkgs/pkgs/development/tools/misc/srecord/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/srecord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }:
+{ lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }:
 
 stdenv.mkDerivation rec {
   name = "srecord-1.64";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost libtool groff ghostscript libgcrypt ];
 
-  configureFlags = stdenv.lib.optional (libgcrypt == null) "--without-gcrypt";
+  configureFlags = lib.optional (libgcrypt == null) "--without-gcrypt";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of powerful tools for manipulating EPROM load files";
     homepage = "http://srecord.sourceforge.net/";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.bjornfor ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix
index 7595b84721cf..e67fd9ca7a85 100644
--- a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libusb1 }:
+{ lib, stdenv, fetchFromGitHub, cmake, libusb1 }:
 
 let
   # The Darwin build of stlink explicitly refers to static libusb.
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/etc/modprobe.d
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "In-circuit debug and programming for ST-Link devices";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix
index 9fe34aecade2..3b754e4c91bb 100644
--- a/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }:
+{ lib, stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }:
 
 let
   version = "6.0.1";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     ln -s ${desktopItem}/share/applications/* $out/share/applications
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A graphical tool for configuring STM32 microcontrollers and microprocessors";
     longDescription = ''
       A graphical tool that allows a very easy configuration of STM32
diff --git a/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix
index 0c2cb96a9d6c..bc7d4b1b3dc8 100644
--- a/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "stm32flash-0.5";
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     cp stm32flash $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source flash program for the STM32 ARM processors using the ST bootloader";
     homepage = "https://sourceforge.net/projects/stm32flash/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = platforms.all; # Should work on all platforms
     maintainers = with maintainers; [ elitak ];
   };
diff --git a/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix
index 6b797481799e..004e1527d352 100644
--- a/nixpkgs/pkgs/development/tools/misc/strace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libunwind, buildPackages }:
+{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "strace";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl ];
 
-  buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
+  buildInputs = [ perl.out ] ++ lib.optional libunwind.supportsHost libunwind; # support -k
 
   postPatch = "patchShebangs --host strace-graph";
 
-  configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";
+  configureFlags = [ "--enable-mpers=check" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://strace.io/";
     description = "A system call tracer for Linux";
     license =  with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
diff --git a/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix
index 745cc9a2e783..1068b3e2ad9d 100644
--- a/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix
index 853a240ffc35..109243b54ba1 100644
--- a/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/nixpkgs/pkgs/development/tools/misc/swig/4.nix b/nixpkgs/pkgs/development/tools/misc/swig/4.nix
index 4096b7353fa4..56106143027f 100644
--- a/nixpkgs/pkgs/development/tools/misc/swig/4.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/nixpkgs/pkgs/development/tools/misc/swig/default.nix b/nixpkgs/pkgs/development/tools/misc/swig/default.nix
index cf0880855db6..3c1a5b82dc2a 100644
--- a/nixpkgs/pkgs/development/tools/misc/swig/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, tcl }:
+{ lib, stdenv, fetchurl, boost, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isCygwin;
   # 'make check' uses boost and tcl
-  buildInputs = stdenv.lib.optionals doCheck [ boost tcl ];
+  buildInputs = lib.optionals doCheck [ boost tcl ];
 
   configureFlags = [ "--disable-ccache" ];
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix
index 616a1cbc3fbd..2cf8c91d3bf9 100644
--- a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , libmysqlclient, libaio
 }:
 
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   pname = "sysbench";
   version = "1.0.20";
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libmysqlclient libaio ];
 
   src = fetchFromGitHub {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Modular, cross-platform and multi-threaded benchmark tool";
     homepage = "https://github.com/akopytov/sysbench";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix
index 9872c91ac4ba..5b1fd72a7f51 100644
--- a/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, libpcap }:
+{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
   pname = "tcptrack";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "libpcap based program for live TCP connection monitoring";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 40f3921ec705..156e3f7f895d 100644
--- a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }:
+{ lib, stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }:
 
 stdenv.mkDerivation rec {
   pname = "teensy-loader-cli";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     installManPage *.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Firmware uploader for the Teensy microcontroller boards";
     homepage = "https://www.pjrc.com/teensy/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
index 220042079fd4..498508d091fc 100644
--- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "terraform-ls";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "XOKaNpYR31lKpA33+7WU2KYjgEx4g6gpp3IAjWtb3Zk=";
+    sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18=";
   };
-  vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI=";
+  vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU=";
 
   # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
   doCheck = false;
diff --git a/nixpkgs/pkgs/development/tools/misc/tet/default.nix b/nixpkgs/pkgs/development/tools/misc/tet/default.nix
index acc42d61423b..6bfcb3129236 100644
--- a/nixpkgs/pkgs/development/tools/misc/tet/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tet/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation ({
   version = "3.8";
@@ -11,19 +11,19 @@ stdenv.mkDerivation ({
 
   buildInputs = [ ];
 
-  patchPhase = ''chmod +x configure'';
+  patchPhase = "chmod +x configure";
 
-  configurePhase = ''./configure -t lite'';
+  configurePhase = "./configure -t lite";
 
-  buildPhase = ''cd src; make; cd -'';
+  buildPhase = "cd src; make; cd -";
 
-  installPhase = ''cd src; make install; cd -; cp -vr $PWD $out'';
+  installPhase = "cd src; make install; cd -; cp -vr $PWD $out";
 
   meta = {
     description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program";
     homepage = "http://tetworks.opengroup.org/Products/tet.htm";
-    license = stdenv.lib.licenses.artistic1;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.artistic1;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 })
diff --git a/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix b/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix
index 755bfcd7274b..98f846b7c2f7 100644
--- a/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gettext }:
+{ lib, stdenv, fetchurl, perl, gettext, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "texi2html";
@@ -9,15 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8";
   };
 
-  nativeBuildInputs = [ gettext ];
+  strictDeps = true;
+
+  nativeBuildInputs = [ gettext perl ];
   buildInputs = [ perl ];
 
-  preBuild = ''
-    substituteInPlace separated_to_hash.pl \
-      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  postPatch = ''
+    patchShebangs separated_to_hash.pl
+  '';
+
+  postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    for f in $out/bin/*; do
+      substituteInPlace $f --replace "${buildPackages.perl}" "${perl}"
+    done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Perl script which converts Texinfo source files to HTML output";
     homepage = "https://www.nongnu.org/texi2html/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
index 057e52615ac7..1c5de083bc0d 100644
--- a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
@@ -1,6 +1,6 @@
 { version, sha256 }:
 
-{ stdenv, buildPackages, fetchurl, perl, xz, gettext
+{ lib, stdenv, buildPackages, fetchurl, perl, xz, gettext
 
 # we are a dependency of gcc, this simplifies bootstraping
 , interactive ? false, ncurses, procps
@@ -15,7 +15,7 @@ let
   crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
 in
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "texinfo-${optionalString interactive "interactive-"}${version}";
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     ++ optional interactive ncurses;
 
   configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
-    ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
+    ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];
   installTargets = [ "install" "install-tex" ];
diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix
index 8b734bdd1c18..480c7cfd5561 100644
--- a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , rustPlatform
 , fetchFromGitHub
 , installShellFiles
@@ -7,28 +8,28 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "2.2.0";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0iydkbmx9z7xpwaif0han5jvy9xh1afmfyldl7fcyy4r906dsmhx";
+    sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m";
   };
 
-  cargoSha256 = "0iibjh2ll181j69vld1awvjgyv3xwmq0abh10651la4k4jpppx46";
+  cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky";
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   postInstall = ''
     installManPage texlab.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of the Language Server Protocol for LaTeX";
-    homepage = "https://texlab.netlify.com/";
+    homepage = "https://texlab.netlify.app";
     license = licenses.mit;
     maintainers = with maintainers; [ doronbehar metadark ];
   };
diff --git a/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/nixpkgs/pkgs/development/tools/misc/tie/default.nix
index 074523309b67..e75248aa8673 100644
--- a/nixpkgs/pkgs/development/tools/misc/tie/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "tie";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp tie $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.ctan.org/tex-archive/web/tie";
     description = "Allow multiple web change files";
     platforms = with platforms; unix;
diff --git a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
index 0c366668c5c4..47966dcc1336 100644
--- a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tokei";
-  version = "12.1.1";
+  version = "12.1.2";
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1n5n7lxlw6zhrdf4jbmqpyn9k02dpn4wqm93qgiin4i8j8bxwjw8";
+    sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI=";
   };
 
-  cargoSha256 = "0bph6n8i5dfy5ryr3nyd3pxyrl1032vvg63s4s44g01qjm9rfdvf";
+  cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994=";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isDarwin [
     libiconv darwin.apple_sdk.frameworks.Security
   ];
 
   # enable all output formats
   cargoBuildFlags = [ "--features" "all" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A program that allows you to count your code, quickly";
     longDescription = ''
       Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language.
diff --git a/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix
index e10475a916b1..02b39bfca947 100644
--- a/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix
@@ -266,4 +266,4 @@
     };
     version = "1.2.8";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/uisp/default.nix b/nixpkgs/pkgs/development/tools/misc/uisp/default.nix
index ca51e0897337..1fb255073ed8 100644
--- a/nixpkgs/pkgs/development/tools/misc/uisp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/uisp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "uisp-20050207";
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = "https://savannah.nongnu.org/projects/uisp";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix
index 587896fce680..f6b51a969b27 100644
--- a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
@@ -14,9 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
     homepage = "http://uncrustify.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix b/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix
index 19dd907b73b9..53e2b2762d31 100644
--- a/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "unifdef-2.6";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     export DESTDIR=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://dotat.at/prog/unifdef/";
     description = "Selectively remove C preprocessor conditionals";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix
index 0bf902eccff8..bd362e8d1a45 100644
--- a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }:
 
 stdenv.mkDerivation {
   pname = "universal-ctags";
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
     sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
-  buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+  nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ];
+  buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv;
 
   # to generate makefile.in
   autoreconfPhase = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   checkFlags = [ "units" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A maintained ctags implementation";
     homepage = "https://ctags.io/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/nixpkgs/pkgs/development/tools/misc/unused/default.nix
index 3e5f9c319ef8..6487c3fc2c0c 100644
--- a/nixpkgs/pkgs/development/tools/misc/unused/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/unused/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cmake }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake }:
 rustPlatform.buildRustPackage rec {
   pname = "unused";
   version = "0.2.1";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1c0gj2wp0nydv0binxj3ikm5sm6y5z3pklp5b06dgvq02licz57a";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to identify potentially unused code";
     homepage = "https://unused.codes";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 6280b103ab60..7bb9fc69c58a 100644
--- a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, usb-modeswitch }:
+{ lib, stdenv, fetchurl, tcl, usb-modeswitch }:
 
 stdenv.mkDerivation rec {
   pname = "usb-modeswitch-data";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # the usb_modeswitch.d directory
   nativeBuildInputs = [ tcl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Device database and the rules file for 'multi-mode' USB devices";
     inherit (usb-modeswitch.meta) license maintainers platforms;
   };
diff --git a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 18926a85528c..4f9dbe92d2b7 100644
--- a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, makeWrapper
+{ stdenv, lib, fetchurl, pkg-config, makeWrapper
 , libusb1, tcl, util-linux, coreutils, bash }:
 
 stdenv.mkDerivation rec {
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ libusb1 tcl ];
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ pkg-config makeWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A mode switching tool for controlling 'multi-mode' USB devices";
     license = licenses.gpl2;
     maintainers = with maintainers; [ marcweber peterhoeg ];
diff --git a/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix
index a44140c1445f..1bd59aa9944a 100644
--- a/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libelf }:
+{ lib, stdenv, fetchFromGitHub, libelf }:
 
 stdenv.mkDerivation rec {
   pname = "vtable-dumper";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libelf ];
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lvc/vtable-dumper";
     description = "A tool to list content of virtual tables in a C++ shared library";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix
index 81f5430371a0..23ec0643d77d 100644
--- a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
+{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "watson-ruby";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = bundlerUpdateScript "watson-ruby";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An inline issue manager";
     homepage    = "https://goosecode.com/watson/";
     license     = with licenses; mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix
index a3bb144899c7..2f865820f5aa 100644
--- a/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix
@@ -15,4 +15,4 @@
     };
     version = "1.6.3";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix
index c882d6243fa0..6afcfe871a47 100644
--- a/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, fetchFromGitHub, clang-unwrapped }:
+{ lib, stdenv, python3, fetchFromGitHub, clang-unwrapped }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "whatstyle";
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
 
   doCheck = false; # 3 or 4 failures depending on version, haven't investigated.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Find a code format style that fits given source files";
     homepage = "https://github.com/mikr/whatstyle";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix
index 1ccd6c2ec4f2..b9785bac7c5c 100644
--- a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }:
+{ lib, stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }:
 
 # The xc3sprog project doesn't seem to make proper releases, they only put out
 # prebuilt binary subversion snapshots on sourceforge.
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
     rev = version;
   };
 
-  buildInputs = [ cmake libusb-compat-0_1 libftdi ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libusb-compat-0_1 libftdi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG";
     homepage = "http://xc3sprog.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
index 4bbff3ca33f8..cf4fe39754fc 100644
--- a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ boost llvmPackages.libclang ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa;
+    ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
                 "'$out/lib/ycmd/ycmd/__main__.py'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A code-completion and comprehension server";
     homepage = "https://github.com/Valloric/ycmd";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/misc/yodl/default.nix b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix
index 6bb7e1377af3..a8b48e9fa53f 100644
--- a/nixpkgs/pkgs/development/tools/misc/yodl/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, perl, icmake, util-linux }:
+{ lib, stdenv, fetchFromGitLab, perl, icmake, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "yodl";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     ./build install man
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package that implements a pre-document language and tools to process it";
     homepage = "https://fbb-git.gitlab.io/yodl/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/mmixware/default.nix b/nixpkgs/pkgs/development/tools/mmixware/default.nix
index 0b0d394b4e1e..b6d03f456712 100644
--- a/nixpkgs/pkgs/development/tools/mmixware/default.nix
+++ b/nixpkgs/pkgs/development/tools/mmixware/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, tetex }:
+{ lib, stdenv, fetchFromGitLab, tetex }:
 
 stdenv.mkDerivation {
   pname = "mmixware";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description  = "MMIX simulator and assembler";
     homepage     = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html";
     maintainers  = with maintainers; [ siraben ];
diff --git a/nixpkgs/pkgs/development/tools/mod/default.nix b/nixpkgs/pkgs/development/tools/mod/default.nix
index 32fd2258daaf..c1d17bba57b9 100644
--- a/nixpkgs/pkgs/development/tools/mod/default.nix
+++ b/nixpkgs/pkgs/development/tools/mod/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mod";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "marwan-at-work";
     repo = "mod";
     rev = "v${version}";
-    sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl";
+    sha256 = "sha256-IPdZ2PSS4rYVoMxrunse8Z2NHXLjXAoBcDvB6D70ki0=";
   };
 
-  vendorSha256 = "032s62rjjq7bqiz5fg17yfkq4j4dsbl6vhvs1wf2sg8jvbqmvdwn";
+  vendorSha256 = "sha256-1+06/yXi07iWZhcCEGNnoL2DpeVRYMW/NdyEhZQePbk=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/modd/default.nix b/nixpkgs/pkgs/development/tools/modd/default.nix
index 5c63447fdc5f..efe4c9605668 100644
--- a/nixpkgs/pkgs/development/tools/modd/default.nix
+++ b/nixpkgs/pkgs/development/tools/modd/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, stdenv }:
+{ buildGoPackage, fetchFromGitHub, lib, stdenv }:
 
 buildGoPackage rec {
   pname = "modd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
   };
   goPackagePath = "github.com/cortesi/modd";
   subPackages = [ "cmd/modd" ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A flexible developer tool that runs processes and responds to filesystem changes";
     homepage = "https://github.com/cortesi/modd";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix
index 65bc8feab6b4..a7b3c36d87b2 100644
--- a/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }:
+{ lib, stdenv, fetchurl, fetchFromGitHub, cmake }:
+
 stdenv.mkDerivation rec {
   pname = "msgpack-tools";
   version = "0.6";
@@ -32,10 +33,9 @@ stdenv.mkDerivation rec {
     cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
   '';
 
+  nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ cmake unzip ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line tools for converting between MessagePack and JSON";
     homepage = "https://github.com/ludocode/msgpack-tools";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/nixpkgs/pkgs/development/tools/mustache-go/default.nix
index 7bcf72df55ce..99e4eb621564 100644
--- a/nixpkgs/pkgs/development/tools/mustache-go/default.nix
+++ b/nixpkgs/pkgs/development/tools/mustache-go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mustache-go";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0mnh5zbpfwymddm1dppg9i9d1r8jqyg03z2gl6c5a8fgbrnxpjvc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cbroglie/mustache";
     description = "The mustache template language in Go";
     license = [ licenses.mit ];
diff --git a/nixpkgs/pkgs/development/tools/nailgun/default.nix b/nixpkgs/pkgs/development/tools/nailgun/default.nix
index 84e5a6b1d9fc..9832de15140a 100644
--- a/nixpkgs/pkgs/development/tools/nailgun/default.nix
+++ b/nixpkgs/pkgs/development/tools/nailgun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }:
+{ lib, stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }:
 
 let
   version = "1.0.0";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
       --add-flags '-classpath ${nailgun-server.jar}:$CLASSPATH com.facebook.nailgun.NGServer'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead";
     homepage = "http://www.martiansoftware.com/nailgun/";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/nemiver/default.nix b/nixpkgs/pkgs/development/tools/nemiver/default.nix
index 8890ceca9d39..58c0f2ed28b1 100644
--- a/nixpkgs/pkgs/development/tools/nemiver/default.nix
+++ b/nixpkgs/pkgs/development/tools/nemiver/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
-, pkgconfig
+, pkg-config
 , gnome3
 , gtk3
 , libxml2
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   version = "0.9.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/nemiver/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
   };
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     libxml2
     intltool
     itstool
-    pkgconfig
+    pkg-config
     wrapGAppsHook
   ];
 
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Apps/Nemiver";
     description = "Easy to use standalone C/C++ debugger";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/neoload/default.nix b/nixpkgs/pkgs/development/tools/neoload/default.nix
index be772f60492a..fb85aa80dc35 100644
--- a/nixpkgs/pkgs/development/tools/neoload/default.nix
+++ b/nixpkgs/pkgs/development/tools/neoload/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }:
+{ lib, stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }:
 
 # If you happen to use this software on the XMonad window manager, you will have issues with
 # grey windows, no resizing, menus not showing and other glitches.
@@ -87,9 +87,9 @@ in stdenv.mkDerivation {
     homepage = "https://www.neotys.com/product/overview-neoload.html";
 
     # https://www.neotys.com/documents/legal/eula/neoload/eula_en.html
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
index ffd2a78f5094..31358129821e 100644
--- a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
+++ b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
 
     ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0
 
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
 
     mkdir -p $out/bin
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An app runtime based on Chromium and node.js";
     homepage = "https://nwjs.io/";
     platforms = ["i686-linux" "x86_64-linux"];
diff --git a/nixpkgs/pkgs/development/tools/nrpl/default.nix b/nixpkgs/pkgs/development/tools/nrpl/default.nix
index a1c9bfd53e33..72177582919a 100644
--- a/nixpkgs/pkgs/development/tools/nrpl/default.nix
+++ b/nixpkgs/pkgs/development/tools/nrpl/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       --prefix PATH : ${lib.makeBinPath [ nim tinycc ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "REPL for the Nim programming language";
     homepage = "https://github.com/wheineman/nrpl";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/nsis/default.nix b/nixpkgs/pkgs/development/tools/nsis/default.nix
index 303ea6a00fe8..2d3f54bbf75b 100644
--- a/nixpkgs/pkgs/development/tools/nsis/default.nix
+++ b/nixpkgs/pkgs/development/tools/nsis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchzip
 , sconsPackages
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   prefixKey = "PREFIX=";
   installTargets = [ "install-compiler" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";
     homepage = "https://nsis.sourceforge.io/";
     license = licenses.zlib;
diff --git a/nixpkgs/pkgs/development/tools/nwjs/default.nix b/nixpkgs/pkgs/development/tools/nwjs/default.nix
index 4eedc003272c..d3490b2b9c99 100644
--- a/nixpkgs/pkgs/development/tools/nwjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/nwjs/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   installPhase =
-    let ccPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
+    let ccPath = lib.makeLibraryPath [ stdenv.cc.cc ];
     in ''
       mkdir -p $out/share/nwjs
       cp -R * $out/share/nwjs
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An app runtime based on Chromium and node.js";
     homepage = "https://nwjs.io/";
     platforms = ["i686-linux" "x86_64-linux"];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix
index 309c44d6d463..a464996ff381 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, writeText }:
+{ lib, stdenv, fetchurl, ocaml, writeText }:
 
 let
   pname = "camlidl";
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     description = "A stub code generator and COM binding for Objective Caml";
     homepage = webpage;
     license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    maintainers = [ lib.maintainers.roconnor ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix
index 73228655cca0..fffa426ba4c9 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, which, ocaml, ocamlbuild }:
+{ lib, stdenv, fetchzip, which, ocaml, ocamlbuild }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.09"
+if lib.versionAtLeast ocaml.version "4.09"
 then throw "camlp4 is not available for OCaml ${ocaml.version}"
 else
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A software system for writing extensible parsers for programming languages";
     homepage = "https://github.com/ocaml/camlp4";
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
index 5fb76a526016..fc79cafdc42a 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -1,26 +1,32 @@
-{ stdenv, fetchzip, ocaml }:
+{ lib, stdenv, fetchzip, ocaml, perl }:
+
+if lib.versionOlder ocaml.version "4.02"
+then throw "camlp5 is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation {
 
-  name = "camlp5-7.13";
+  name = "camlp5-7.14";
 
   src = fetchzip {
-    url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz";
-    sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp";
+    url = "https://github.com/camlp5/camlp5/archive/rel714.tar.gz";
+    sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
   };
 
-  buildInputs = [ ocaml ];
+  buildInputs = [ ocaml perl ];
 
   prefixKey = "-prefix ";
 
-  preConfigure = "configureFlagsArray=(--strict" +
-                  " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
+  preConfigure = ''
+    configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
+    patchShebangs ./config/find_stuffversion.pl
+  '';
 
   buildFlags = [ "world.opt" ];
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Preprocessor-pretty-printer for OCaml";
     longDescription = ''
       Camlp5 is a preprocessor and pretty-printer for OCaml programs.
diff --git a/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix
index a0215fa81471..032f346bf9c3 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild
+{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild
 , buildDunePackage
 }:
 
 let
   pname = "cppo";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The C preprocessor for OCaml";
     longDescription = ''
       Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.
@@ -17,7 +17,7 @@ let
 
 in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.02" then
+if lib.versionAtLeast ocaml.version "4.02" then
 
 buildDunePackage rec {
   inherit pname;
diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix
index c267b2757a43..60a9bfba58fe 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix
@@ -32,9 +32,14 @@ in buildDunePackage rec {
     # to have a fixed path to the binary in nix store
     sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml
 
-    # set bogus user info in git so git commit doesn't fail
-    sed -i '/git init/ a \    $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \
-      tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t
+    # fix problems with git invocations in tests
+    for f in tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t; do
+      # set bogus user info in git so git commit doesn't fail
+      sed -i '/git init/ a \    $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' "$f"
+      # surpress hint to set default branch name
+      substituteInPlace "$f" --replace "git init" "git init -b main"
+    done
+
     # ignore weird yes error message
     sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t
   '';
diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix
index 177fa96f5b96..f2fe3693ed7a 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchurl, ocaml, findlib, fetchpatch }:
+{ lib, stdenv, fetchurl, ocaml, findlib }:
 
-if stdenv.lib.versionOlder ocaml.version "4.08"
+if lib.versionOlder ocaml.version "4.08"
 then throw "dune is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "2.7.1";
+  version = "2.8.2";
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3";
+    sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72";
   };
 
   buildInputs = [ ocaml findlib ];
 
   buildFlags = "release";
 
-  patches = [
-    # Fix setup.ml configure path. Remove with the next release.
-    (fetchpatch {
-      url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch";
-      sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28";
-    })
-  ];
-
   dontAddPrefix = true;
 
   installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
@@ -32,9 +24,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://dune.build/";
     description = "A composable build system";
-    changelog = "https://github.com/ocaml/dune/releases/tag/${version}";
-    maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
-    license = stdenv.lib.licenses.mit;
+    changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md";
+    maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ];
+    license = lib.licenses.mit;
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
index ef0f5c4fabd4..bbdbc45270d0 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib, opaline }:
+{ stdenv, lib, fetchurl, ocaml, findlib }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "dune is not available for OCaml ${ocaml.version}"
 else
 
@@ -15,20 +15,18 @@ stdenv.mkDerivation rec {
   buildInputs = [ ocaml findlib ];
 
   buildFlags = [ "release" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "LIBDIR=$(OCAMLFIND_DESTDIR)"
+  ];
 
   dontAddPrefix = true;
 
-  installPhase = ''
-    runHook preInstall
-    ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
-    runHook postInstall
-  '';
-
-  meta = {
+  meta = with lib; {
     homepage = "https://dune.build/";
     description = "A composable build system";
-    maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ maintainers.vbgl maintainers.marsam ];
+    license = licenses.mit;
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix
index 1354e158a8e6..8752b2edb66e 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
+{ lib, stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
 stdenv.mkDerivation rec {
   pname = "ocaml-findlib";
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://projects.camlcity.org/projects/findlib.html";
     description = "O'Caml library manager";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
-      stdenv.lib.maintainers.vbmithr
+      lib.maintainers.maggesi
+      lib.maintainers.vbmithr
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix
index a0932d919c08..6854c7c20ca3 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
 
 stdenv.mkDerivation {
   version = "0.4.10";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://oasis.forge.ocamlcore.org/";
     description = "Configure, build and install system for OCaml projects";
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix
index 483e9c45df01..d5e9d33d5db6 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -1,20 +1,20 @@
 { lib, fetchurl, ocamlPackages }:
 
 ocamlPackages.buildDunePackage rec {
-	pname = "obelisk";
-	version = "0.5.2";
-	useDune2 = true;
-	src = fetchurl {
-		url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
-		sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
-	};
+  pname = "obelisk";
+  version = "0.5.2";
+  useDune2 = true;
+  src = fetchurl {
+    url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
+    sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
+  };
 
-	buildInputs = with ocamlPackages; [ menhir re ];
+  buildInputs = with ocamlPackages; [ menhir re ];
 
-	meta = {
-		description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
-		license = lib.licenses.mit;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/Lelio-Brun/Obelisk";
-	};
+  meta = {
+    description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/Lelio-Brun/Obelisk";
+  };
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
index 5e851a93205b..e31334000da0 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml }:
+{ lib, stdenv, fetchzip, ocaml }:
 
 let version = "0.1.10"; in
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/ocaml-obuild/obuild";
     platforms = ocaml.meta.platforms or [];
     description = "Simple package build system for OCaml";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ volth ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ volth ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 7270386972de..c74794b35c95 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
 let
   version = "0.14.0";
 in
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ocaml/ocamlbuild/";
     description = "A build system with builtin rules to easily build most OCaml projects";
     license = licenses.lgpl2;
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
index 1de95187af2f..57061cfe126c 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
@@ -40,5 +40,13 @@ rec {
     version = "0.15.0";
   };
 
-  ocamlformat = ocamlformat_0_15_0;
+  ocamlformat_0_15_1 = mkOCamlformat {
+    version = "0.15.1";
+  };
+
+  ocamlformat_0_16_0 = mkOCamlformat {
+    version = "0.16.0";
+  };
+
+  ocamlformat = ocamlformat_0_16_0;
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix
index 8fac26c2b3e8..24527fcf41af 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix
@@ -18,6 +18,8 @@ let src =
       "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz";
       "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl";
       "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
+      "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
+      "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
     }."${version}";
   }
 ; in
@@ -39,7 +41,23 @@ buildDunePackage rec {
   useDune2 = true;
 
   buildInputs =
-    if lib.versionAtLeast version "0.14"
+    if lib.versionAtLeast version "0.15.1"
+    then [
+      base
+      cmdliner
+      fpath
+      odoc
+      re
+      stdio
+      uuseg
+      uutf
+      fix
+      menhir
+      (ppxlib.override { version = "0.18.0"; })
+      dune-build-info # lib.versionAtLeast version "0.16.0"
+      ocaml-version # lib.versionAtLeast version "0.16.0"
+    ]
+    else if lib.versionAtLeast version "0.14"
     then [
       base
       cmdliner
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix
index 9b06a55f07d0..a43903c34d38 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation {
   name = "ocamlify-0.0.2";
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
     homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
     description = "Generate OCaml modules from source files";
     platforms = ocaml.meta.platforms or [];
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [
       maggesi
     ];
   };
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 49342d7b8485..77d390295512 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
 
 stdenv.mkDerivation {
   pname = "ocamlmod";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
     description = "Generate OCaml modules from source files";
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [
+    maintainers = with lib.maintainers; [
       maggesi
     ];
   };
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix
index 2172c7f6161a..4518e7a22e41 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4}:
+{lib, stdenv, fetchurl, ocaml, findlib, camlp4}:
 stdenv.mkDerivation {
   name = "ocamlscript-2.0.3";
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   preInstall = "mkdir $out/bin";
   createFindlibDestdir = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://martin.jambon.free.fr/ocamlscript.html";
     license = licenses.boost;
     platforms = ocaml.meta.platforms or [];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix
index 57db51612245..655f7b4d4c2f 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }:
 let
   version = "1.99.21";
 in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   export configureFlags="$configureFlags --with-metadir=$OCAMLFIND_DESTDIR"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.typerex.org/ocp-build.html";
     description = "A build tool for OCaml";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index 476c98ce5bc6..b12aa2e6d6de 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocamlPackages }:
+{ lib, stdenv, fetchzip, ocamlPackages }:
 
 stdenv.mkDerivation rec
 {
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec
   meta = {
     homepage = "https://github.com/besport/ocsigen-i18n";
     description = "I18n made easy for web sites written with eliom";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.gal_bolle ];
   };
 
 }
diff --git a/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
index 6a3c0c20d85f..047246cd0a0d 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+{lib, stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
 let
   pname = "omake";
   version = "0.9.8.6-0.rc1";
   webpage = "http://omake.metaprl.org";
 in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
 else
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 #
 #  configureFlags = if transitional then "--transitional" else "--strict";
 #
-#  buildFlags = [ "world.opt" ];		
+#  buildFlags = [ "world.opt" ];
 
   meta = {
     description = "Omake build system";
diff --git a/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix
index 2afe0d1e9f52..bcfd86a2d4de 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, ncurses }:
+{ lib, stdenv, fetchurl, ocaml, ncurses }:
 
 stdenv.mkDerivation rec {
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A build system designed for scalability and portability";
     homepage = "http://projects.camlcity.org/projects/omake.html";
-    license = with stdenv.lib.licenses; [
+    license = with lib.licenses; [
       mit /* scripts */
       gpl2 /* program */
     ];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix
index a49749ad716f..9cdacd289d49 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocamlPackages }:
+{ lib, stdenv, fetchFromGitHub, ocamlPackages }:
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OPAm Light INstaller Engine";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
     inherit (ocamlPackages.ocaml.meta) platforms;
   };
diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
index e6c08b97aca4..a128f2144e9f 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -82,7 +82,7 @@ in stdenv.mkDerivation {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package manager for OCaml";
     homepage = "http://opam.ocamlpro.com/";
     maintainers = [ maintainers.henrytill ];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
index 9e95db79dd0b..4fe408fb77f0 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
@@ -110,7 +110,7 @@ in stdenv.mkDerivation {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package manager for OCaml";
     homepage = "https://opam.ocaml.org/";
     maintainers = [ maintainers.henrytill maintainers.marsam ];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
index 828e209fac61..1cbad6f5f44e 100755
--- a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -120,7 +120,7 @@ print <<'EOF';
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package manager for OCaml";
     homepage = "https://opam.ocaml.org/";
     maintainers = [ maintainers.henrytill maintainers.marsam ];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix
index ac7cd4f4dbbc..622ac80306f7 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, ocaml, findlib, dune
+{ lib, stdenv, fetchurl, ocaml, findlib
 , lambdaTerm, cppo, makeWrapper, buildDunePackage
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "utop is not available for OCaml ${ocaml.version}"
 else
 
 buildDunePackage rec {
   pname = "utop";
-  version = "2.4.3";
+  version = "2.6.0";
+
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
-    sha256 = "107al0l3x4a5kkjka7glmhsqlm7pwzzc6shspiv5gsjb49pblc2f";
+    sha256 = "17n9igl74xcvj0mzdh2ybda29f2m48a5lj4yf8lrdqr7vg0982jd";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -56,7 +58,7 @@ buildDunePackage rec {
       --prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \
       --prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \
       --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") \
-      --add-flags "-I ${findlib}/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib"
+      --add-flags "-I ${findlib}/lib/ocaml/${lib.getVersion ocaml}/site-lib"
    done
    '';
 
@@ -68,10 +70,10 @@ buildDunePackage rec {
     It integrates with the tuareg mode in Emacs.
     '';
     homepage = "https://github.com/diml/utop";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+      lib.maintainers.gal_bolle
     ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix
index e651c7cfab50..82ed82a67bdc 100644
--- a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , mkDerivation
 , fetchgit
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , qtbase
 }:
 
@@ -18,7 +18,7 @@ mkDerivation {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -30,7 +30,7 @@ mkDerivation {
     "UIC=${qtbase.dev}/bin/uic"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Phone Simulator for modem testing";
     homepage = "https://01.org/ofono";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/omniorb/default.nix b/nixpkgs/pkgs/development/tools/omniorb/default.nix
index 2ab8fa23dde0..74341c0a7b49 100644
--- a/nixpkgs/pkgs/development/tools/omniorb/default.nix
+++ b/nixpkgs/pkgs/development/tools/omniorb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2 }:
+{ lib, stdenv, fetchurl, python2 }:
 stdenv.mkDerivation rec {
 
   pname = "omniorb";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
     homepage    = "http://omniorb.sourceforge.net/";
     license     = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
index 9dd085b421fe..ac5ab022ef12 100644
--- a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , mono5
 , makeWrapper
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     --add-flags "$out/src/OmniSharp.exe"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OmniSharp based on roslyn workspaces";
     homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
index 98e966cbf537..96cae21a5b73 100644
--- a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
+++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "open-policy-agent";
-  version = "0.25.2";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     rev = "v${version}";
-    sha256 = "0y4jd1dpq7cy9nfacpf5jbh705gmky44j78q32kq5v566lzrsvvp";
+    sha256 = "sha256-bkWfRmcUPNYeUucrbh9xAqmLg7RxEEQGa2DQdN2S6Po=";
   };
 
   vendorSha256 = null;
diff --git a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
index f97611c77853..c09331de5980 100644
--- a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
+++ b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8";
+    sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4=";
   };
 
-  vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv";
+  vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
index ef673ed018f2..e9dd2f08d3ae 100644
--- a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
+++ b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , libgsf
-, pkgconfig
+, pkg-config
 , openssl
 , curl
 }:
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
     sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3";
   };
 
-  nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ];
+  nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mtrojnar/osslsigncode";
     description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
index b902dd2cc406..9ab69d1d5d85 100644
--- a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
+++ b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }:
+{ lib, stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }:
 
 buildGoModule rec {
   pname = "out-of-tree";
@@ -18,10 +18,10 @@ buildGoModule rec {
 
   postFixup = ''
     wrapProgram $out/bin/out-of-tree \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}"
+      --prefix PATH : "${lib.makeBinPath [ qemu docker which ]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "kernel {module, exploit} development tool";
     homepage = "https://out-of-tree.io";
     maintainers = [ maintainers.dump_stack ];
diff --git a/nixpkgs/pkgs/development/tools/overcommit/gemset.nix b/nixpkgs/pkgs/development/tools/overcommit/gemset.nix
index b7d58c0ea708..95244c1afe6d 100644
--- a/nixpkgs/pkgs/development/tools/overcommit/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/overcommit/gemset.nix
@@ -30,4 +30,4 @@
     };
     version = "0.51.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix
index 8570e10a07c3..d4dd46cdcb5c 100644
--- a/nixpkgs/pkgs/development/tools/packer/default.nix
+++ b/nixpkgs/pkgs/development/tools/packer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   pname = "packer";
   version = "1.6.6";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
     homepage    = "https://www.packer.io";
     license     = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/tools/packet-cli/default.nix b/nixpkgs/pkgs/development/tools/packet-cli/default.nix
index 4c4cb6a28d42..ec07e4b058ee 100644
--- a/nixpkgs/pkgs/development/tools/packet-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/packet-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "packet-cli";
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official Packet CLI";
     homepage = "https://github.com/packethost/packet-cli";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/packet/default.nix b/nixpkgs/pkgs/development/tools/packet/default.nix
index 9bca1ec75b67..31ccf19bb05f 100644
--- a/nixpkgs/pkgs/development/tools/packet/default.nix
+++ b/nixpkgs/pkgs/development/tools/packet/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "packet";
@@ -18,8 +18,8 @@ buildGoPackage rec {
   meta = {
     description = "a CLI tool to manage packet.net services";
     homepage = "https://github.com/ebsarr/packet";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.grahamc ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.grahamc ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
index f697e00b56a4..79c8f3791880 100644
--- a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
+++ b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages }:
 
 rustPlatform.buildRustPackage rec {
   pname = "parinfer-rust";
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Infer parentheses for Clojure, Lisp, and Scheme";
     homepage = "https://github.com/eraserhd/parinfer-rust";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix
index 0f8ead579d0a..7cda74db5ef6 100644
--- a/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix
+++ b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "parse-cli-bin";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1iyfizbbxmr87wjgqiwqds51irgw6l3vm9wn89pc3zpj2zkyvf5h";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parse Command Line Interface";
     homepage    = "https://parse.com";
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix
index 55800a800984..fed96e954751 100644
--- a/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, python2 }:
+{ lib, stdenv, fetchurl, jdk, python2 }:
 
 stdenv.mkDerivation {
   name = "antlr-2.7.7";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   buildInputs = [ jdk ];
   nativeBuildInputs = [ python2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Powerful parser generator";
     longDescription = ''
       ANTLR (ANother Tool for Language Recognition) is a powerful parser
diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
index 1263e7934be7..962cd079a8e9 100644
--- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre}:
+{lib, stdenv, fetchurl, jre}:
 
 stdenv.mkDerivation rec {
   pname = "antlr";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   inherit jre;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Powerful parser generator";
     longDescription = ''
       ANTLR (ANother Tool for Language Recognition) is a powerful parser
diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
index 6fa6323d3e87..2efe752c3635 100644
--- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub, jre}:
+{lib, stdenv, fetchurl, fetchFromGitHub, jre}:
 
 stdenv.mkDerivation rec {
   pname = "antlr";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   inherit jre;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Powerful parser generator";
     longDescription = ''
       ANTLR (ANother Tool for Language Recognition) is a powerful parser
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.antlr.org/";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.farlion ];
+    maintainers = [ lib.maintainers.farlion ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix
index 1c88c82e16ae..0708ba754b2a 100644
--- a/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, jre
-, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
+{ lib, stdenv, fetchurl, jre
+, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, darwin }:
 
 let
   version = "4.8";
@@ -18,15 +18,15 @@ let
 
       outputs = [ "out" "dev" "doc" ];
 
-      nativeBuildInputs = [ cmake ninja pkgconfig ];
-      buildInputs = stdenv.lib.optional stdenv.isLinux libuuid
-        ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
+      nativeBuildInputs = [ cmake ninja pkg-config ];
+      buildInputs = lib.optional stdenv.isLinux libuuid
+        ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
 
       postUnpack = ''
         export sourceRoot=$sourceRoot/runtime/Cpp
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "C++ target for ANTLR 4";
         homepage = "https://www.antlr.org/";
         license = licenses.bsd3;
@@ -67,7 +67,7 @@ let
       jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Powerful parser generator";
       longDescription = ''
         ANTLR (ANother Tool for Language Recognition) is a powerful parser
diff --git a/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
index aa8d8df2c1d1..662961ae46aa 100644
--- a/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, help2man }:
+{ lib, stdenv, fetchurl, m4, perl, help2man }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv";
   };
 
-  nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
+  nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
   doCheck = false; # fails
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/bison/";
     description = "Yacc-compatible parser generator";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       Bison is a general-purpose parser generator that converts an
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       to use Bison.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
   passthru = { glrSupport = true; };
diff --git a/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix b/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix
index c6a4fc1a068d..5710500a18f7 100644
--- a/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitLab
+{lib, stdenv, fetchurl, fetchFromGitLab
 , yodl, icmake, flexcpp, bobcat
 }:
 stdenv.mkDerivation rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     ./build install x
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "A parser generator like bison, but it generates C++ code";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
index 60e6796850c2..4f6f00e968ef 100644
--- a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "byacc";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/byacc $out/bin/yacc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Berkeley YACC";
     homepage = "https://invisible-island.net/byacc/byacc.html";
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix
index 504e5b090497..b2245ff9c9b9 100644
--- a/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
+{ lib, stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
 
 stdenv.mkDerivation {
   name = "flex-2.5.35";
@@ -16,14 +16,14 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ m4 ];
 
-  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
   doCheck = false; # fails 2 out of 46 tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "2.5.35";
     homepage = "http://flex.sourceforge.net/";
     description = "A fast lexical analyser generator";
diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix
index 2562b3c26134..cc0ecb148c44 100644
--- a/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, m4 }:
+{ lib, stdenv, fetchurl, bison, m4 }:
 
 stdenv.mkDerivation {
   name = "flex-2.6.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   postPatch = ''
     patchShebangs tests
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     substituteInPlace Makefile.in --replace "tests" " ";
   '';
 
@@ -18,16 +18,16 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ m4 ];
 
-  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
+  postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
     sed -i Makefile -e 's/-no-undefined//;'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/westes/flex";
     description = "A fast lexical analyser generator";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/default.nix b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix
index 51373f4a4fd7..42b007300a95 100644
--- a/nixpkgs/pkgs/development/tools/parsing/flex/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, bison, m4
+{ lib, stdenv, buildPackages, fetchurl, bison, m4
 , fetchpatch, autoreconfHook, help2man
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs tests
-  '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     substituteInPlace Makefile.in --replace "tests" " "
 
     substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: '
@@ -33,18 +33,18 @@ stdenv.mkDerivation rec {
   buildInputs = [ bison ];
   propagatedBuildInputs = [ m4 ];
 
-  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
+  postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
     sed -i Makefile -e 's/-no-undefined//;'
   '';
 
   dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/westes/flex";
     description = "A fast lexical analyser generator";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix
index a9482f9fd493..e4db5631e7fe 100644
--- a/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
+{ lib, stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
 
 stdenv.mkDerivation rec {
   pname = "flexc++";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     ./build install x
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ tool for generating lexical scanners";
     longDescription = ''
       Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design
diff --git a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix
index d36dfa9219d4..0a9dfdec0163 100644
--- a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, glib, pkgconfig, python, scons }:
+{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }:
 
 stdenv.mkDerivation {
   pname = "hammer";
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
     rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib python scons ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A bit-oriented parser combinator library";
     longDescription = ''
       Hammer is a parsing library. Like many modern parsing libraries,
diff --git a/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix b/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix
index 18dd531e4b14..34e628866838 100644
--- a/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "jikespg-1.3";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       cp jikespg $out/bin
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://jikes.sourceforge.net/";
     description = "The Jikes Parser Generator";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix
index b10e98909517..3db9e0f6d9ed 100644
--- a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
 
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
     install -Dvm644 ${srcs.lempar} $out/bin/lempar.c
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An LALR(1) parser generator";
     longDescription = ''
       The Lemon program is an LALR(1) parser generator that takes a
diff --git a/nixpkgs/pkgs/development/tools/parsing/peg/default.nix b/nixpkgs/pkgs/development/tools/parsing/peg/default.nix
index 458ddc007f5e..a7ffeb697459 100644
--- a/nixpkgs/pkgs/development/tools/parsing/peg/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/peg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "peg-0.1.18";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   preBuild="makeFlagsArray+=( PREFIX=$out )";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://piumarta.com/software/peg/";
     description = "Tools for generating recursive-descent parsers: programs that perform pattern matching on text";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix
index dddddba129c9..6bbcf36cd2c2 100644
--- a/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, transfig, tex, ghostscript, colm
+{ lib, stdenv, fetchurl, transfig, tex, ghostscript, colm
 , build-manual ? false
 }:
 
@@ -13,19 +13,19 @@ let
         inherit sha256;
       };
 
-      buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
+      buildInputs = lib.optional build-manual [ transfig ghostscript tex ];
 
-      preConfigure = stdenv.lib.optional build-manual ''
+      preConfigure = lib.optional build-manual ''
         sed -i "s/build_manual=no/build_manual=yes/g" DIST
       '';
 
       configureFlags = [ "--with-colm=${colm}" ];
 
-      NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=gnu++98";
+      NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu++98";
 
       doCheck = true;
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "https://www.colm.net/open-source/ragel/";
         description = "State machine compiler";
         inherit license;
@@ -40,12 +40,12 @@ in
   ragelStable = generic {
     version = "6.10";
     sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
   };
 
   ragelDev = generic {
     version = "7.0.0.12";
     sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
index 482beeff1221..665609fe90af 100644
--- a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "re2c";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     patchShebangs run_tests.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for writing very fast and very flexible scanners";
     homepage    = "http://re2c.org";
     license     = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index e1648b84be5e..6d8c9237bd0f 100644
--- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -16,6 +16,7 @@
   tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));
   tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json));
   tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json));
+  tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json));
   tree-sitter-ocaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-ocaml.json));
   tree-sitter-php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json));
   tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json));
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index 6498e40497eb..81ccf5a84726 100644
--- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
-  "rev": "b8bff2a389ecc098dbb7e8abee492816a5eb42db",
-  "date": "2020-11-15T07:54:17+00:00",
-  "path": "/nix/store/h5p71g661hbyzcdcj6xff8y5pcsivpa4-tree-sitter-c-sharp",
-  "sha256": "0x78s2wgd8b6pwjzbmc9fgp0ivdmxv39wikig1m55slai6yq51wh",
+  "rev": "aae8ab2b681082ce7a35d8d5fdf75ffcf7f994e5",
+  "date": "2021-01-08T13:18:05+00:00",
+  "path": "/nix/store/fpx44l1j2dz3drnvfb7746d8zxn37gwi-tree-sitter-c-sharp",
+  "sha256": "107bxz9bhyixdla3xli06ism8rnkha7pa79hi7lyx00sfnjmgcc8",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
new file mode 100644
index 000000000000..6d055ca0ae93
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -0,0 +1,10 @@
+{
+  "url": "https://github.com/cstrahan/tree-sitter-nix",
+  "rev": "791b5ff0e4f0da358cbb941788b78d436a2ca621",
+  "date": "2019-05-10T15:57:43-05:00",
+  "path": "/nix/store/5gcddcxf6jfr4f0p203jnbjc0zxk207d-tree-sitter-nix",
+  "sha256": "1y5b3wh3fcmbgq8r2i97likzfp1zp02m58zacw5a1cjqs5raqz66",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 86551acbee09..ff60ff80101e 100644
--- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "65b486b42fe0188e4be344092151042bf1bc6d9a",
-  "date": "2020-12-15T09:33:20-08:00",
-  "path": "/nix/store/k9jziqzyxq2bv55pwl03jcmmca83fjyp-tree-sitter-python",
-  "sha256": "1yxqdlmp0jybm7vvza1ni5a320vrviqkd14pnpcrg9ilzq23mlsh",
+  "rev": "f568dfabf7c4611077467a9cd13297fa0658abb6",
+  "date": "2021-01-06T13:32:39-08:00",
+  "path": "/nix/store/5g256n8ym3ll2kp9jlmnkaxpnyf6rpk3-tree-sitter-python",
+  "sha256": "1lxmzrkw4k9pba4xywnbd1pk2x5s99qa4skgqvgy3imgbhy7ilkh",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index 027478e99f88..d5a1767a23ce 100644
--- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ruby",
-  "rev": "bb572f60e9538bd11fbde95a54f97522073f1e06",
-  "date": "2020-12-20T12:25:50-08:00",
-  "path": "/nix/store/hkjgvxh8l4drk1z4zkhmd0wcj876x5y1-tree-sitter-ruby",
-  "sha256": "198sfmrb3mxvpfmlwmwfmb3qs075ih0bjmr0ffrdy4nqm4a00cb8",
+  "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0",
+  "date": "2020-11-02T20:49:49-08:00",
+  "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby",
+  "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 38c9e44f2f6a..c02d03d11d94 100644
--- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "8746bd4b584b8063ee8e445bf31015e887417d33",
-  "date": "2020-11-23T17:16:42-08:00",
-  "path": "/nix/store/1zzxvza23wsdyazw47lhjvrs0za6wjpn-tree-sitter-rust",
-  "sha256": "0bhxfyq8ycnp90pqvr6cf3gpq1vax8a34kaq85dmbrc6ar8a7ap6",
+  "rev": "2beedf23bedbd7b02b416518693e8eed3944d4a0",
+  "date": "2021-01-05T10:00:48-08:00",
+  "path": "/nix/store/2igv1zlnl535b86zj8s9s3ir4q85933x-tree-sitter-rust",
+  "sha256": "0iicwhxf1f56zqpsagbm8nr30fpssi970mi9i47az206dbs506ly",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index a875232eab6d..fda72fc99c6e 100644
--- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-typescript",
-  "rev": "a3a4becef889692724bb1c2191f8fc4bce6573f9",
-  "date": "2020-12-15T13:34:55-08:00",
-  "path": "/nix/store/dra5wbhgxkkhphm1mhgv87hsfw0g18nw-tree-sitter-typescript",
-  "sha256": "0ir7lmzwnbf1zwbl4bfsib1jilg8pvfc1nabaq2n2rixvghlvf3d",
+  "rev": "2d1c7d5c10c33cb444d1781fa76f2936810afec4",
+  "date": "2021-01-07T09:49:56-08:00",
+  "path": "/nix/store/s65bv25523lwa9yrqbj9hsh0k4ig6pbx-tree-sitter-typescript",
+  "sha256": "09bv44n181az5rqjd43wngj9bghwy0237gpvs6xkjf9j19kvy0yi",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix
index 7b0b16b403f4..631944cb67a0 100644
--- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -63,6 +63,10 @@ let
   # If you need a grammar that already exists in the official orga,
   # make sure to give it a different name.
   otherGrammars = {
+    "tree-sitter-nix" = {
+      orga = "cstrahan";
+      repo = "tree-sitter-nix";
+    };
     "tree-sitter-lua" = {
       orga = "nvim-treesitter";
       repo = "tree-sitter-lua";
diff --git a/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/nixpkgs/pkgs/development/tools/pax-rs/default.nix
index 6aa38104bcac..cda3ba5e8a8b 100644
--- a/nixpkgs/pkgs/development/tools/pax-rs/default.nix
+++ b/nixpkgs/pkgs/development/tools/pax-rs/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } :
+{ lib, stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } :
 with rustPlatform;
 
 buildRustPackage rec {
   pname = "pax-rs";
   version = "0.4.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The fastest JavaScript bundler in the galaxy";
     longDescription = ''
       The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(<string>).
diff --git a/nixpkgs/pkgs/development/tools/pew/default.nix b/nixpkgs/pkgs/development/tools/pew/default.nix
index a7fabb783951..6ca94041bb50 100644
--- a/nixpkgs/pkgs/development/tools/pew/default.nix
+++ b/nixpkgs/pkgs/development/tools/pew/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3 }:
+{ lib, stdenv, python3 }:
 
 with python3.pkgs;
 
@@ -20,7 +20,7 @@ buildPythonApplication rec {
 
   pythonImportsCheck = [ "pew" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/berdario/pew";
     description = "Tools to manage multiple virtualenvs written in pure python";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/nixpkgs/pkgs/development/tools/pgformatter/default.nix
index 1cd9f9ea17ba..d5c6872cd7dc 100644
--- a/nixpkgs/pkgs/development/tools/pgformatter/default.nix
+++ b/nixpkgs/pkgs/development/tools/pgformatter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }:
+{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }:
 
 perlPackages.buildPerlPackage rec {
   pname = "pgformatter";
@@ -24,14 +24,14 @@ perlPackages.buildPerlPackage rec {
       --replace "'INSTALLDIRS'  => \$INSTALLDIRS," "'INSTALLDIRS'  => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3',"
   '';
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
+  postInstall = lib.optionalString stdenv.isDarwin ''
     shortenPerlShebang $out/bin/pg_format
   '';
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
     homepage = "https://github.com/darold/pgFormatter";
     changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}";
diff --git a/nixpkgs/pkgs/development/tools/pgloader/default.nix b/nixpkgs/pkgs/development/tools/pgloader/default.nix
index 6d4bcaadd118..94217a765e28 100644
--- a/nixpkgs/pkgs/development/tools/pgloader/default.nix
+++ b/nixpkgs/pkgs/development/tools/pgloader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }:
+{ lib, stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }:
 stdenv.mkDerivation rec {
   pname = "pgloader";
   version = "3.6.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ git makeWrapper ];
   buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ];
 
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
 
   buildPhase = ''
     export PATH=$PATH:$out/bin
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pgloader.io/";
     description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL";
     maintainers = with maintainers; [ mguentner ];
diff --git a/nixpkgs/pkgs/development/tools/phantomjs/default.nix b/nixpkgs/pkgs/development/tools/phantomjs/default.nix
index f042aa35b6f6..66cdb09cf15a 100644
--- a/nixpkgs/pkgs/development/tools/phantomjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/phantomjs/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   buildPhase = lib.optionalString (!stdenv.isDarwin) ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \
+      --set-rpath "${lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \
       bin/phantomjs
   '';
 
diff --git a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
index d565a70798ae..594deeb1c730 100644
--- a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
+++ b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ lib, stdenv, fetchFromGitHub, fetchpatch
 , bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg
 , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase
 , darwin, writeScriptBin, cups, makeWrapper
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
     bison flex fontconfig freetype gperf icu openssl
     libjpeg libpng perl python ruby sqlite qtwebkit qtbase
     makeWrapper
-  ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     AGL ApplicationServices AppKit Cocoa OpenGL
     darwin.libobjc fakeClang cups
   ]);
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
   # invalid suffix on literal; C++11 requires a space between litend identifier
   NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal";
 
-  __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
+  __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
 
   enableParallelBuilding = true;
 
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/share/doc/phantomjs
     cp -a bin $out
     cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -change \
         ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
         /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
@@ -92,10 +92,10 @@ in stdenv.mkDerivation rec {
   '' + ''
     wrapProgram $out/bin/phantomjs \
     --set QT_QPA_PLATFORM offscreen \
-    --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]}
+    --prefix PATH : ${lib.makeBinPath [ qtbase ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Headless WebKit with JavaScript API";
     longDescription = ''
       PhantomJS2 is a headless WebKit with JavaScript API.
diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 16d66c48af8b..5810d6d2a749 100644
--- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -56,7 +56,7 @@ self: super:
   av = super.av.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [
-        pkgs.pkgconfig
+        pkgs.pkg-config
       ];
       buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
     }
@@ -127,7 +127,7 @@ self: super:
   cryptography = super.cryptography.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs or [ ]
-        ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
+        ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
       buildInputs = old.buildInputs ++ [ pkgs.openssl ];
     }
   );
@@ -234,8 +234,8 @@ self: super:
   h5py = super.h5py.overridePythonAttrs (
     old:
     if old.format != "wheel" then rec {
-      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
-      buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
+      buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ];
       configure_flags = "--hdf5=${pkgs.hdf5}";
       postConfigure = ''
         ${self.python.executable} setup.py configure ${configure_flags}
@@ -245,7 +245,7 @@ self: super:
 
   horovod = super.horovod.overridePythonAttrs (
     old: {
-      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
+      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ];
     }
   );
 
@@ -386,7 +386,7 @@ self: super:
   );
 
   libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: {
-    nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ];
+    nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ];
     propagatedBuildInputs = [ pkgs.libvirt ];
   });
 
@@ -407,7 +407,7 @@ self: super:
         export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
       '';
 
-      __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+      __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
 
       passthru = old.passthru // { llvm = pkgs.llvm; };
     }
@@ -421,7 +421,7 @@ self: super:
 
   lxml = super.lxml.overridePythonAttrs (
     old: {
-      nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
+      nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ];
       buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
     }
   );
@@ -443,7 +443,7 @@ self: super:
       inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
     in
     {
-      NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
+      NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
 
       XDG_RUNTIME_DIR = "/tmp";
 
@@ -452,7 +452,7 @@ self: super:
         ++ lib.optional stdenv.isDarwin [ Cocoa ];
 
       nativeBuildInputs = old.nativeBuildInputs ++ [
-        pkgs.pkgconfig
+        pkgs.pkg-config
       ];
 
       postPatch = ''
@@ -466,9 +466,9 @@ self: super:
         pkgs.libpng
         pkgs.freetype
       ]
-        ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
-        ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
-        ++ stdenv.lib.optionals enableQt [ self.pyqt5 ]
+        ++ lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
+        ++ lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
+        ++ lib.optionals enableQt [ self.pyqt5 ]
       ;
 
       inherit (super.matplotlib) patches;
@@ -528,14 +528,14 @@ self: super:
             { }
             {
               mpi = {
-                mpicc = "${pkgs.openmpi.outPath}/bin/mpicc";
+                mpicc = "${pkgs.mpi.outPath}/bin/mpicc";
               };
             }
         );
       };
     in
     {
-      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
+      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ];
       enableParallelBuilding = true;
       preBuild = ''
         ln -sf ${cfg} mpi.cfg
@@ -637,7 +637,7 @@ self: super:
 
   pillow = super.pillow.overridePythonAttrs (
     old: {
-      nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
+      nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs;
       buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
     }
   );
@@ -706,7 +706,7 @@ self: super:
 
             nativeBuildInputs = old.nativeBuildInputs ++ [
               self.cython
-              pkgs.pkgconfig
+              pkgs.pkg-config
               pkgs.cmake
             ];
 
@@ -755,7 +755,7 @@ self: super:
         nativeBuildInputs = old.nativeBuildInputs ++ [
           pkgs.meson
           pkgs.ninja
-          pkgs.pkgconfig
+          pkgs.pkg-config
         ];
 
         propagatedBuildInputs = old.propagatedBuildInputs ++ [
@@ -822,7 +822,7 @@ self: super:
 
   pygobject = super.pygobject.overridePythonAttrs (
     old: {
-      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
       buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
     }
   );
@@ -873,7 +873,7 @@ self: super:
         format = "other";
 
         nativeBuildInputs = old.nativeBuildInputs ++ [
-          pkgs.pkgconfig
+          pkgs.pkg-config
           pkgs.qt5.qmake
           pkgs.xorg.lndir
           pkgs.qt5.qtbase
@@ -1012,7 +1012,7 @@ self: super:
 
   pyzmq = super.pyzmq.overridePythonAttrs (
     old: {
-      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
       propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
     }
   );
@@ -1117,7 +1117,7 @@ self: super:
   tables = super.tables.overridePythonAttrs (
     old: {
       HDF5_DIR = "${pkgs.hdf5}";
-      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
       propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ];
     }
   );
diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index e333bd497184..edf556377b33 100644
--- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -73,9 +73,9 @@ let
         if isLinux
         then
           (
-            x: x.platform == "manylinux1_${stdenv.platform.kernelArch}"
-              || x.platform == "manylinux2010_${stdenv.platform.kernelArch}"
-              || x.platform == "manylinux2014_${stdenv.platform.kernelArch}"
+            x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}"
+              || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}"
+              || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}"
               || x.platform == "any"
           )
         else (x: hasInfix "macosx" x.platform || x.platform == "any");
diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index ba8145398f5d..e8d4159deeee 100644
--- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -95,7 +95,7 @@ let
           else if stdenv.isDarwin then "darwin"
           else throw "Unsupported platform"
         );
-        platform_machine = stdenv.platform.kernelArch;
+        platform_machine = stdenv.hostPlatform.linuxArch;
         platform_python_implementation =
           let
             impl = python.passthru.implementation;
@@ -132,7 +132,7 @@ let
               mVal = ''[a-zA-Z0-9\'"_\. ]+'';
               mOp = "in|[!=<>]+";
               e = stripStr exprs.value;
-              m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
+              m = builtins.map stripStr (builtins.match "^(${mVal}) *(${mOp}) *(${mVal})$" e);
               m0 = processVar (builtins.elemAt m 0);
               m2 = processVar (builtins.elemAt m 2);
             in
diff --git a/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
index 4b6d230becd6..b9ca9ae57814 100644
--- a/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
+++ b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, python3Packages }:
+{ lib, stdenv, fetchurl, python3, python3Packages }:
 
 stdenv.mkDerivation {
   name = "postiats-utilities-2.0.1";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Hibou57/PostiATS-Utilities";
     license = licenses.bsd2;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
index e856c1f718a4..e057fc8ebe18 100644
--- a/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, autoconf, gfortran
 , libelf, libiberty, zlib, libbfd, libopcodes
 , buildPackages
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = lib.licenses.cecill-b;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix b/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix
index ca346cd1f149..6cd3ea800278 100644
--- a/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPackages
-, fetchurl, pkgconfig
+{ lib, stdenv, buildPackages
+, fetchurl, pkg-config
 , libbfd, popt, zlib, linuxHeaders, libiberty_static
 , withGUI ? false, qt4 ? null
 }:
@@ -21,15 +21,15 @@ stdenv.mkDerivation rec {
       --replace "/bin/cp" "${buildPackages.coreutils}/bin/cp"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ]
-    ++ stdenv.lib.optionals withGUI [ qt4 ];
+    ++ lib.optionals withGUI [ qt4 ];
 
   configureFlags = [
       "--with-kernel=${linuxHeaders}"
       "--disable-shared"   # needed because only the static libbfd is available
     ]
-    ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
+    ++ lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
 
   meta = {
     description = "System-wide profiler for Linux";
@@ -45,10 +45,10 @@ stdenv.mkDerivation rec {
       is profiled: hardware and software interrupt handlers, kernel
       modules, the kernel, shared libraries, and applications.
     '';
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = "http://oprofile.sourceforge.net/";
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix
index 2618dd3ef1ec..dd2345378d43 100644
--- a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix
@@ -1,5 +1,5 @@
 # This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "pprof-unstable";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for visualization and analysis of profiling data";
     homepage = "https://github.com/google/pprof";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix
index a1f5d00332c4..a9443eeadf6e 100644
--- a/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , meson
 , ninja
 , sysprof
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = sysprof.meta // {
     description = "Static library for Sysprof capture data generation";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix
index 49b8e88486ca..9e749adea209 100644
--- a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix
@@ -10,7 +10,7 @@
 , libxml2
 , meson, ninja
 , pango
-, pkgconfig
+, pkg-config
 , polkit
 , shared-mime-info
 , systemd
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0";
   };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libxml2
     meson
     ninja
-    pkgconfig
+    pkg-config
     shared-mime-info
     wrapGAppsHook
     gnome3.adwaita-icon-theme
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "System-wide profiler for Linux";
     homepage = "https://wiki.gnome.org/Apps/Sysprof";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
index c1f38a624184..c978d8bd96a7 100644
--- a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper
+{ fetchgit, pkg-config, gettext, runCommand, makeWrapper
 , elfutils, kernel, gnumake, python2, python2Packages
 }:
 
@@ -17,7 +17,7 @@ let
     pname = "systemtap";
     inherit version;
     src = fetchgit { inherit url rev sha256; };
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
     enableParallelBuilding = true;
   };
diff --git a/nixpkgs/pkgs/development/tools/pry/Gemfile.lock b/nixpkgs/pkgs/development/tools/pry/Gemfile.lock
index d76845bc05a7..87f7e81fbe3a 100644
--- a/nixpkgs/pkgs/development/tools/pry/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/pry/Gemfile.lock
@@ -1,11 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    coderay (1.1.3)
+    method_source (1.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
 
 PLATFORMS
   ruby
diff --git a/nixpkgs/pkgs/development/tools/pry/gemset.nix b/nixpkgs/pkgs/development/tools/pry/gemset.nix
index e779c48aebfc..c3f42889e1ff 100644
--- a/nixpkgs/pkgs/development/tools/pry/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/pry/gemset.nix
@@ -4,20 +4,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+      sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.1.3";
   };
   method_source = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+      sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
       type = "gem";
     };
-    version = "0.9.2";
+    version = "1.0.0";
   };
   pry = {
     dependencies = ["coderay" "method_source"];
@@ -25,9 +25,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
+      sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
       type = "gem";
     };
-    version = "0.12.2";
+    version = "0.13.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix
index 86d18b0c554c..d42626f1cd59 100644
--- a/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix
@@ -7,4 +7,4 @@
     };
     version = "2.3.6";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
index 43f8e66d8704..3f54a4f9c0ee 100644
--- a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
+++ b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
@@ -1,35 +1,36 @@
 { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
-, base, bower-json, bytestring, Cabal, containers, dhall, directory
-, either, exceptions, extra, fetchgit, file-embed, filepath, foldl
-, fsnotify, generic-lens, github, Glob, hpack, hspec
-, hspec-discover, hspec-megaparsec, http-client, http-conduit
-, http-types, lens-family-core, megaparsec, mtl, network-uri
-, open-browser, optparse-applicative, prettyprinter, process
-, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv
-, stm, stringsearch, tar, template-haskell, temporary, text, time
-, transformers, turtle, unliftio, unordered-containers, utf8-string
-, vector, versions, with-utf8, zlib
+, base, bower-json, bytestring, Cabal, containers, cryptonite
+, dhall, directory, either, exceptions, extra, fetchgit, file-embed
+, filepath, foldl, fsnotify, generic-lens, github, Glob, hpack
+, hspec, hspec-discover, hspec-megaparsec, http-client
+, http-conduit, http-types, lens-family-core, megaparsec, mtl
+, network-uri, open-browser, optparse-applicative, prettyprinter
+, process, QuickCheck, retry, rio, rio-orphans, safe, semver-range
+, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text
+, time, transformers, turtle, unliftio, unordered-containers
+, utf8-string, vector, versions, with-utf8, zlib
 }:
 mkDerivation {
   pname = "spago";
-  version = "0.18.0";
+  version = "0.19.0";
   src = fetchgit {
     url = "https://github.com/purescript/spago.git";
-    sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38";
-    rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2";
+    sha256 = "182a9pkv64rbyqrig470cmql4ingf5vpxh11xkxqq2baxym3vwip";
+    rev = "960a310d6efca3bb40009eb06d88382e4670ccef";
     fetchSubmodules = true;
   };
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
     aeson aeson-pretty ansi-terminal async-pool base bower-json
-    bytestring Cabal containers dhall directory either exceptions
-    file-embed filepath foldl fsnotify generic-lens github Glob
-    http-client http-conduit http-types lens-family-core megaparsec mtl
-    network-uri open-browser optparse-applicative prettyprinter process
-    retry rio rio-orphans safe semver-range stm stringsearch tar
-    template-haskell temporary text time transformers turtle unliftio
-    unordered-containers utf8-string vector versions with-utf8 zlib
+    bytestring Cabal containers cryptonite dhall directory either
+    exceptions file-embed filepath foldl fsnotify generic-lens github
+    Glob http-client http-conduit http-types lens-family-core
+    megaparsec mtl network-uri open-browser optparse-applicative
+    prettyprinter process retry rio rio-orphans safe semver-range stm
+    stringsearch tar template-haskell temporary text time transformers
+    turtle unliftio unordered-containers utf8-string vector versions
+    with-utf8 zlib
   ];
   libraryToolDepends = [ hpack ];
   executableHaskellDepends = [ base text turtle with-utf8 ];
@@ -40,5 +41,5 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   prePatch = "hpack";
   homepage = "https://github.com/purescript/spago#readme";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/nixpkgs/pkgs/development/tools/pxview/default.nix b/nixpkgs/pkgs/development/tools/pxview/default.nix
index 6b11071b6fa3..20049215a70d 100644
--- a/nixpkgs/pkgs/development/tools/pxview/default.nix
+++ b/nixpkgs/pkgs/development/tools/pxview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }:
+{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }:
 
 stdenv.mkDerivation rec {
   pname = "pxview";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]);
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   configureFlags = [ "--with-pxlib=${pxlib.out}" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   LDFLAGS = "-lm";
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Program to convert Paradox databases";
     homepage = "http://pxlib.sourceforge.net/pxview/";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/py-spy/default.nix b/nixpkgs/pkgs/development/tools/py-spy/default.nix
index 5e1dcbfa6fce..a9634ec53c72 100644
--- a/nixpkgs/pkgs/development/tools/py-spy/default.nix
+++ b/nixpkgs/pkgs/development/tools/py-spy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }:
+{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "py-spy";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   NIX_CFLAGS_COMPILE = "-L${libunwind}/lib";
 
   # error: linker `arm-linux-gnueabihf-gcc` not found
-  preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     export RUSTFLAGS="-Clinker=$CC"
   '';
 
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sampling profiler for Python programs";
     license = licenses.mit;
     maintainers = [ maintainers.lnl7 ];
diff --git a/nixpkgs/pkgs/development/tools/pydb/default.nix b/nixpkgs/pkgs/development/tools/pydb/default.nix
index 67e7a879d883..eaaa057dc0a2 100644
--- a/nixpkgs/pkgs/development/tools/pydb/default.nix
+++ b/nixpkgs/pkgs/development/tools/pydb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, emacs }:
+{ lib, stdenv, fetchurl, python2, emacs }:
 
 stdenv.mkDerivation {
   name = "pydb-1.26";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Python debugger with GDB-like commands and Emacs bindings";
     homepage = "http://bashdb.sourceforge.net/pydb/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
index a750a21c1b4c..40e3e42d84cc 100644
--- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix
+++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, lib, fetchurl, fetchgit, fetchpatch
 , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
-, withDocumentation ? false, withClangPlugins ? true 
+, withDocumentation ? false, withClangPlugins ? true
 }:
 
 with lib;
@@ -28,9 +28,9 @@ mkDerivation rec {
     sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
   };
 
-  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ 
-    optionals withClangPlugins [ llvmPackages_8.libclang 
-                                 clang_qt_vendor 
+  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
+    optionals withClangPlugins [ llvmPackages_8.libclang
+                                 clang_qt_vendor
                                  llvmPackages_8.llvm ];
 
   nativeBuildInputs = [ qmake ];
@@ -38,7 +38,7 @@ mkDerivation rec {
   # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to
   # find clang libc++ library include paths. By default it's not covering paths
   # like libc++-version, which is default name for libc++ folder in nixos.
-  # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not 
+  # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not
   # remove system clang include paths.
   patches = [ ./0001-Fix-clang-libcpp-regexp.patch
               ./0002-Dont-remove-clang-header-paths.patch ];
@@ -53,7 +53,7 @@ mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace src/plugins/plugins.pro \
-      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' 
+      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
     '' + optionalString withClangPlugins ''
     # Fix paths for llvm/clang includes directories.
     substituteInPlace src/shared/clang/clang_defines.pri \
diff --git a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix
index cb9b4f950c92..4edb60d11a15 100644
--- a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix
+++ b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "quicktemplate";
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   vendorSha256 = null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/valyala/quicktemplate";
     description = "Fast, powerful, yet easy to use template engine for Go";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/quilt/default.nix b/nixpkgs/pkgs/development/tools/quilt/default.nix
index dece0a7b44ba..71cf10e63b91 100644
--- a/nixpkgs/pkgs/development/tools/quilt/default.nix
+++ b/nixpkgs/pkgs/development/tools/quilt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }:
+{ lib, stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }:
 
 stdenv.mkDerivation rec {
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
       and more.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/tools/rdbtools/default.nix b/nixpkgs/pkgs/development/tools/rdbtools/default.nix
index 624434101d99..5674876daba6 100644
--- a/nixpkgs/pkgs/development/tools/rdbtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/rdbtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python }:
+{ lib, stdenv, python }:
 
 with python.pkgs;
 
@@ -16,7 +16,7 @@ buildPythonApplication rec {
   # No tests in published package
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parse Redis dump.rdb files, Analyze Memory, and Export Data to JSON";
     homepage = "https://github.com/sripathikrishnan/redis-rdb-tools";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/rdocker/default.nix b/nixpkgs/pkgs/development/tools/rdocker/default.nix
index 60df0df10031..098d7a593148 100644
--- a/nixpkgs/pkgs/development/tools/rdocker/default.nix
+++ b/nixpkgs/pkgs/development/tools/rdocker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, openssh }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, openssh }:
 
 stdenv.mkDerivation {
   pname = "rdocker";
@@ -19,13 +19,13 @@ stdenv.mkDerivation {
 
   postInstall = ''
     wrapProgram $out/bin/rdocker \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ openssh ]}
+      --prefix PATH : ${lib.makeBinPath [ openssh ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed";
     homepage = "https://github.com/dvddarias/rdocker";
-    maintainers = [ stdenv.lib.maintainers.pneumaticat ];
+    maintainers = [ lib.maintainers.pneumaticat ];
     license = licenses.mit;
     platforms = platforms.unix;
   };
diff --git a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
index 6ee5e884ea2d..06b5dd794015 100644
--- a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
+++ b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core
+{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core
 , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
 }:
 
 let
-  rpath = stdenv.lib.makeLibraryPath [
+  rpath = lib.makeLibraryPath [
     cairo
     stdenv.cc.cc
     gdk-pixbuf
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
     categories = "Development;Debugger;";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jhen0409/react-native-debugger";
     license = licenses.mit;
     description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools";
diff --git a/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix
index 2bfaa1fb9529..74e6d4e1b324 100644
--- a/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix
@@ -50,4 +50,4 @@
     };
     version = "1.4.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/remarshal/default.nix b/nixpkgs/pkgs/development/tools/remarshal/default.nix
index d28ca286f086..c37779a5293b 100644
--- a/nixpkgs/pkgs/development/tools/remarshal/default.nix
+++ b/nixpkgs/pkgs/development/tools/remarshal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "remarshal";
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
     pyyaml cbor2 dateutil tomlkit u-msgpack-python
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convert between TOML, YAML and JSON";
     license = licenses.mit;
     homepage = "https://github.com/dbohdan/remarshal";
diff --git a/nixpkgs/pkgs/development/tools/renderizer/default.nix b/nixpkgs/pkgs/development/tools/renderizer/default.nix
index 2b2c57135cb0..747e80adf4f2 100644
--- a/nixpkgs/pkgs/development/tools/renderizer/default.nix
+++ b/nixpkgs/pkgs/development/tools/renderizer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "renderizer";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CLI to render Go template text files";
     inherit (src.meta) homepage;
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/reno/default.nix b/nixpkgs/pkgs/development/tools/reno/default.nix
index b05bb2cd26a3..17a334aba205 100644
--- a/nixpkgs/pkgs/development/tools/reno/default.nix
+++ b/nixpkgs/pkgs/development/tools/reno/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , git
 , gnupg1
 , python3Packages
@@ -49,7 +49,7 @@ with python3Packages; buildPythonApplication rec {
     $out/bin/reno -h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Release Notes Manager";
     homepage = "https://docs.openstack.org/reno/latest";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/rep/default.nix b/nixpkgs/pkgs/development/tools/rep/default.nix
index d24056f1d02b..bc73c3927771 100644
--- a/nixpkgs/pkgs/development/tools/rep/default.nix
+++ b/nixpkgs/pkgs/development/tools/rep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, asciidoc-full }:
+{ lib, stdenv, fetchFromGitHub, asciidoc-full }:
 
 stdenv.mkDerivation rec {
   pname = "rep";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Single-shot nREPL client";
     homepage = "https://github.com/eraserhd/rep";
     license = licenses.epl10;
diff --git a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
index 1b4509a4057b..828b8e5b1cd6 100644
--- a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, makeWrapper, jre_headless, gawk }:
+{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gawk }:
 
 stdenv.mkDerivation rec {
   pname = "nexus";
-  version = "3.29.0-02";
+  version = "3.29.2-02";
 
   src = fetchurl {
     url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
-    sha256 = "0yxk3yy9vllxc9v4dn3fs8hh389lrw2g8gg24rx1w8bg05rrrr8z";
+    sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c=";
   };
 
   preferLocalBuild = true;
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/nexus \
       --set JAVA_HOME ${jre_headless} \
       --set ALTERNATIVE_NAME "nexus" \
-      --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}"
+      --prefix PATH "${lib.makeBinPath [ gawk ]}"
 
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Repository manager for binary software components";
     homepage = "http://www.sonatype.org/nexus";
     license = licenses.epl10;
diff --git a/nixpkgs/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix
index 441c0d8bdf1d..1013c4aa8b43 100644
--- a/nixpkgs/pkgs/development/tools/richgo/default.nix
+++ b/nixpkgs/pkgs/development/tools/richgo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "richgo";
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Enrich `go test` outputs with text decorations";
     homepage = "https://github.com/kyoh86/richgo";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/ronn/gemset.nix b/nixpkgs/pkgs/development/tools/ronn/gemset.nix
index ce804e1f9f5b..534741a69938 100644
--- a/nixpkgs/pkgs/development/tools/ronn/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/ronn/gemset.nix
@@ -31,4 +31,4 @@
     };
     version = "0.7.3";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/rtags/default.nix b/nixpkgs/pkgs/development/tools/rtags/default.nix
index 0ebeab72df3f..e5da0ddf59ac 100644
--- a/nixpkgs/pkgs/development/tools/rtags/default.nix
+++ b/nixpkgs/pkgs/development/tools/rtags/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
+{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "rtags";
   version = "2.38";
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ llvmPackages.llvm openssl emacs ]
     ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
     ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
@@ -25,12 +25,10 @@ stdenv.mkDerivation rec {
            LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "C/C++ client-server indexer based on clang";
     homepage = "https://github.com/andersbakken/rtags";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = with stdenv.lib.platforms; x86_64 ++ aarch64;
+    license = lib.licenses.gpl3;
+    platforms = with lib.platforms; x86_64 ++ aarch64;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
index 6b6a3a995918..74ae51427a95 100644
--- a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
@@ -2,25 +2,25 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    regexp_parser (1.8.2)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rubocop (1.1.0)
+    rubocop (1.8.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.0.1)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
diff --git a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
index c1f55f7aca27..4fc468a177d1 100644
--- a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
@@ -14,10 +14,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
+      sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
       type = "gem";
     };
-    version = "1.19.2";
+    version = "1.20.1";
   };
   parser = {
     dependencies = ["ast"];
@@ -25,10 +25,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
+      sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml";
       type = "gem";
     };
-    version = "2.7.2.0";
+    version = "3.0.0.0";
   };
   rainbow = {
     groups = ["default"];
@@ -45,10 +45,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";
+      sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "2.0.3";
   };
   rexml = {
     groups = ["default"];
@@ -66,10 +66,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nw87ngw4a9r3dpgykb872zcm640m7k0nk17qv537fmss2hl8shl";
+      sha256 = "12arfnsj32126ps6mxbn7dwrw43cy70sq45rm0ib7qfrmhp5qyid";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.8.0";
   };
   rubocop-ast = {
     dependencies = ["parser"];
@@ -77,29 +77,29 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ami6n3vnpm9y5z6wd4c6y2infijajizjjwv8fq0wrcjvr3zivzz";
+      sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.4.0";
   };
   ruby-progressbar = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+      sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
       type = "gem";
     };
-    version = "1.10.1";
+    version = "1.11.0";
   };
   unicode-display_width = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+      sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "2.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/rucksack/default.nix b/nixpkgs/pkgs/development/tools/rucksack/default.nix
index 2734cdd3596e..1aad7a5c8da1 100644
--- a/nixpkgs/pkgs/development/tools/rucksack/default.nix
+++ b/nixpkgs/pkgs/development/tools/rucksack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }:
+{ lib, stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }:
 
 stdenv.mkDerivation rec {
   version = "3.1.0";
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv";
   };
 
-  buildInputs = [ cmake liblaxjson freeimage ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ liblaxjson freeimage ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Texture packer and resource bundler";
     platforms = [ "i686-linux" "x86_64-linux" ]; # fails on Darwin and AArch64
     homepage = "https://github.com/andrewrk/rucksack";
diff --git a/nixpkgs/pkgs/development/tools/rufo/gemset.nix b/nixpkgs/pkgs/development/tools/rufo/gemset.nix
index cd5c2c462a98..1c63c3f3b796 100644
--- a/nixpkgs/pkgs/development/tools/rufo/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/rufo/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "0.12.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/run/default.nix b/nixpkgs/pkgs/development/tools/run/default.nix
index 7ec08d02020a..a0c169d84661 100644
--- a/nixpkgs/pkgs/development/tools/run/default.nix
+++ b/nixpkgs/pkgs/development/tools/run/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "run";
   version = "0.7.2";
@@ -14,7 +14,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easily manage and invoke small scripts and wrappers";
     homepage    = "https://github.com/TekWizely/run";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/rund/default.nix b/nixpkgs/pkgs/development/tools/rund/default.nix
index 9a7ac0b63244..186e044318e0 100644
--- a/nixpkgs/pkgs/development/tools/rund/default.nix
+++ b/nixpkgs/pkgs/development/tools/rund/default.nix
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
     mv $NIX_BUILD_TOP/rund $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A compiler-wrapper that runs and caches D programs";
     homepage = "https://github.com/dragon-lang/rund";
     license = lib.licenses.boost;
     maintainers = with maintainers; [ jonathanmarler ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix
index 01e29036dbc7..eef8a5e41fd2 100644
--- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin,
-  runtimeShell }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
+, runtimeShell
+, bash
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen";
@@ -16,7 +18,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w";
 
-  libclang = llvmPackages.libclang.lib; #for substituteAll
+  #for substituteAll
+  libclang = llvmPackages.libclang.lib;
+  inherit bash;
 
   buildInputs = [ libclang ];
 
@@ -50,7 +54,7 @@ rustPlatform.buildRustPackage rec {
     patchShebangs .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatically generates Rust FFI bindings to C (and some C++) libraries";
     longDescription = ''
       Bindgen takes a c or c++ header file and turns them into
diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh b/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh
index 95cd0901cec8..0b3e3cd4c1e0 100755
--- a/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh
+++ b/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!@bash@/bin/bash
 sep='--'   # whether to add -- before new options
 cxx=0      # whether cxx was explicitly requested
 lastWasx=0 # whether the last argument passed was -x
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
index 76b49056a3f2..f453955a5c71 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-asm";
@@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j";
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   # Test checks against machine code output, which fails with some
   # LLVM/compiler versions.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Display the assembly or LLVM-IR generated for Rust source code";
     homepage = "https://github.com/gnzlbg/cargo-asm";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binutils/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/Cargo.lock
new file mode 100644
index 000000000000..a1e4cdde3b87
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/Cargo.lock
@@ -0,0 +1,419 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "addr2line"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "backtrace"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "cargo-binutils"
+version = "0.3.3"
+dependencies = [
+ "anyhow",
+ "cargo_metadata",
+ "clap",
+ "regex",
+ "rustc-cfg",
+ "rustc-demangle",
+ "rustc_version",
+ "serde",
+ "toml",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3a567c24b86754d629addc2db89e340ac9398d07b5875efcff837e3878e17ec"
+dependencies = [
+ "semver 0.10.0",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
+dependencies = [
+ "backtrace",
+ "failure_derive",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "gimli"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+dependencies = [
+ "adler",
+ "autocfg",
+]
+
+[[package]]
+name = "object"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+
+[[package]]
+name = "rustc-cfg"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ad221fe7cd09334f8735dcc157b1178e343f43dfaefcd1b09d7fd4fc0921b6f"
+dependencies = [
+ "failure",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
+dependencies = [
+ "semver-parser",
+ "serde",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "syn"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-xid",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix
new file mode 100644
index 000000000000..b79611ff5ecb
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform, runCommand }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-binutils";
+  version = "0.3.3";
+
+  # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99
+  src = let
+    repo = fetchFromGitHub {
+      owner = "rust-embedded";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo=";
+    };
+  in runCommand "source" { } ''
+    cp -R ${repo} $out
+    chmod -R +w $out
+    cp ${./Cargo.lock} $out/Cargo.lock
+  '';
+
+  cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw=";
+
+  meta = with lib; {
+    description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain";
+    homepage = "https://github.com/rust-embedded/cargo-binutils";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ stupremee ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix
index ce57194bc49b..7b9aa5cf6101 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix
@@ -5,7 +5,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = stdenv.mkDerivation rec {
     name = "${pname}-source-${version}";
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
       owner = "lu-zero";
       repo = pname;
       rev = "v${version}";
-      sha256 = "0pd1vnpy29fxmf47pvkyxd6bydar8cykfjx0f1bbw3gfk7vychbj";
+      sha256 = "1a348ys4lbgsr23px81kw985i5bp8z75wgzl9l2jv9sdzirpb8k4";
     };
     cargoLock = fetchurl {
       url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock";
-      sha256 = "10xhd5m63r928gfvr4djmis30mra8wdsx55kgin9kiig2kylx69h";
+      sha256 = "1f78wlid8jx26pqybmafzcl1656nnp87hdiib0v1p5k73mk4ymvy";
     };
 
     installPhase = ''
@@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "1axg0kr8xsb5fm3r8qgc7s3g70pa8g9vc68d6icm7ms77phczx4r";
+  cargoSha256 = "1nj54igm57h9d8hhqdgkay2nnblcdxhpnha68jqvjazd8a0bq3la";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
+  ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
 
   meta = with lib; {
     description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries";
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix
index 3271e7951fac..021e19b9cd97 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-cache";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "matthiaskrgr";
     repo = pname;
     rev = version;
-    sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi";
+    sha256 = "sha256-SqhGwm2VZW6ZUYyxN940fi/YLJGAZikjJCIq0GbljtY=";
   };
 
-  cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw";
+  cargoSha256 = "sha256-sZxkEQBZ2PJXSvwcA+IL7uW/gcnzuzRcDklNW5vpzWg=";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 
   checkFlagsArray = [ "offline_tests" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively";
     homepage = "https://github.com/matthiaskrgr/cargo-cache";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
index 6c85a5238039..e3c16b09ef34 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , rustPlatform
 , perl
@@ -11,22 +11,22 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-crev";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "crev-dev";
     repo = "cargo-crev";
     rev = "v${version}";
-    sha256 = "1ccwa44hpmpd57ff6w02rvrs63wxwmgls2i1rn285rxypmbysrp0";
+    sha256 = "sha256-qoN9pTpmXfwaJ37MqAggiPsH4cPr+nsT6NhAUOVclSw=";
   };
 
-  cargoSha256 = "1sffivpgrn4my57pcrg46b2yg6fmhxj61d2sqvg60fjljrg595zn";
+  cargoSha256 = "sha256-mmd9Ds37ST+OuCt506/YbdpOOJBp7WIVZBq+bQ2SR3U=";
 
   nativeBuildInputs = [ perl pkg-config ];
 
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cryptographically verifiable code review system for the cargo (Rust) package manager";
     homepage = "https://github.com/crev-dev/cargo-crev";
     license = with licenses; [ asl20 mit mpl20 ];
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix
index 34126a7713ff..ba126e57a145 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix
@@ -2,26 +2,28 @@
 , lib
 , rustPlatform
 , fetchFromGitHub
-, perl, pkgconfig, openssl, Security, libiconv, curl
+, perl, pkg-config, openssl, Security, libiconv, curl
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deny";
-  version = "0.7.0";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = pname;
     rev = version;
-    sha256 = "0mfccjcll7dxrhdi2bhfbggmkqdp8cmq5vf8vbb05qzpvlswvkf7";
+    sha256 = "01czsnhlvs78fpx1kpi75386657jmlrqpsj4474nxmgcs75igncx";
   };
 
-  cargoSha256 = "1gp5m432273mr0zwq1kdswdjgp0kajr0imymqyc4yj9i931by1xv";
+  cargoSha256 = "1d5vh6cifkvqxmbgc2z9259q8879fjw016z959hfivv38rragqbr";
 
-  nativeBuildInputs = [ perl pkgconfig ];
+  doCheck = false;
+
+  nativeBuildInputs = [ perl pkg-config ];
 
   buildInputs = [ openssl  ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+    ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
   meta = with lib; {
     description = "Cargo plugin to generate list of all licenses for a crate";
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix
index 06f99268d0b7..70a2e6feca64 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-fund";
@@ -18,9 +18,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Discover funding links for your project's dependencies";
     homepage = "https://github.com/acfoltzer/cargo-fund";
     license = with licenses; [ mit /* or */ asl20 ];
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
index 14c849ac0afe..904ba6efb52b 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-fuzz";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line helpers for fuzzing";
     homepage = "https://github.com/rust-fuzz/cargo-fuzz";
     license = with licenses; [ mit asl20 ];
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix
index 1a5273feeca5..3b2702c66f64 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, rustPlatform, pkgconfig, openssl
+, rustPlatform, pkg-config, openssl
 # testing packages
 , cargo-insta
 # darwin dependencies
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec {
   '';
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   # FIXME: Use impure version of CoreFoundation because of missing symbols.
   # CFURLSetResourcePropertyForKey is defined in the headers but there's no
   # corresponding implementation in the sources from opensource.apple.com.
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
   '';
 
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix
index 5f803635dd2e..635f36ee834c 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-generate";
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl  ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+    ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
   preCheck = ''
     export HOME=$(mktemp -d) USER=nixbld
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     git config --global user.email nixbld@localhost.localnet
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "cargo, make me a project";
     homepage = "https://github.com/ashleygwilliams/cargo-generate";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
index 5a8c9150279a..9339660388b5 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw";
 
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
index 881a53872c96..e393184aebda 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config
+{ lib, stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config
 , SystemConfiguration
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.32.9";
+  version = "0.32.10";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf";
+    sha256 = "sha256-cDpEFw9uICB/4aZheTWwDqYGjLz+C6gLie/S3ehhifg=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
+    ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
 
-  cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih";
+  cargoSha256 = "sha256-Qh14lks72bsetwyv0ALF7nZo3m3FDEmVxzFkHJoEuzE=";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   #   https://travis-ci.org/sagiegurari/cargo-make
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Rust task runner and build tool";
     homepage = "https://github.com/sagiegurari/cargo-make";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix
index 8df03a4bd15c..11a52e6ea08f 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, rustPlatform
-, pkgconfig, curl, libgit2, openssl, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform
+, pkg-config, curl, libgit2, openssl, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-raze";
@@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ curl libgit2 openssl ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+    ++ lib.optional stdenv.isDarwin Security;
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate Bazel BUILD files from Cargo dependencies";
     homepage = "https://github.com/google/cargo-raze";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix
new file mode 100644
index 000000000000..ae638cac8a9a
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-readme";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner = "livioribeiro";
+    repo = pname;
+    # Git tag is missing, see upstream issue:
+    # https://github.com/livioribeiro/cargo-readme/issues/61
+    rev = "cf66017c0120ae198210ebaf58a0be6a78372974";
+    sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw=";
+  };
+
+  cargoSha256 = "sha256-QVRl6xCvztWi5zAs3PXYR4saTqO5nTBPIjdlMiMXFTM=";
+
+  patches = [
+    (fetchpatch {
+      # Fixup warning thrown at build when running test-suite
+      # unused return, see upstream PR:
+      # https://github.com/livioribeiro/cargo-readme/pull/62
+      url = "https://github.com/livioribeiro/cargo-readme/commit/060f2daaa2b2cf981bf490dc36bcc6527545ea03.patch";
+      sha256 = "sha256-wlAIgTI9OqtA/Jnswoqp7iOj+1zjrUZA7JpHUiF/n+s=";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Generate README.md from docstrings";
+    homepage = "https://github.com/livioribeiro/cargo-readme";
+    license = with licenses; [ mit asl20 ];
+    maintainers = with maintainers; [ baloo ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
index 72883ab4508e..210449a72300 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-sweep";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1sxjc64g8h77a3dvzb99f1f72zrak1nh4jgfjfkw4yc4dhkpyrmz";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Cargo subcommand for cleaning up unused build files generated by Cargo";
     homepage = "https://github.com/holmgr/cargo-sweep";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix
index f42868826d55..45ea6c430d15 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-sync-readme";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";
     homepage = "https://github.com/phaazon/cargo-sync-readme";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
index 840f2ae27c3c..dcbf539c1c14 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
@@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
 
   # Requires network access
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Find unused dependencies in Cargo.toml";
     homepage = "https://github.com/est31/cargo-udeps";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix
index 1ad0fbbb4b01..6c73b245e047 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , rustPlatform
 , fetchFromGitHub
 , nix-update-script
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-wipe";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "mihai-dinculescu";
     repo = "cargo-wipe";
     rev = "v${version}";
-    sha256 = "1kwkifdp98zsinh7xcsz2va252wxbw73xlrv0r7h3m0bn51d52vw";
+    sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ=";
   };
 
-  cargoSha256 = "15snr1b1pybwcjzwddxybvry3jyllcmrp8dyfm9yiagks3wrcfb4";
+  cargoSha256 = "sha256-IzEurJcPoM/JMQlSL7N84wzZddNpynrsjQEOUNms2YQ=";
 
   passthru = {
     updateScript = nix-update-script {
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders'';
     homepage = "https://github.com/mihai-dinculescu/cargo-wipe";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 477f26e8b819..2e800402c1dd 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1gcixzxca1yi4rvy55s986my6j0vx7n6fm1g5r4v4w0zgzlz4d89";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
     homepage = "https://github.com/rust-osdev/cargo-xbuild";
     license = with licenses; [ mit asl20 ];
diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
index 0b557af42585..508090553375 100644
--- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-cbindgen";
@@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx";
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   checkFlags = [
     # https://github.com/eqrion/cbindgen/issues/338
     "--skip test_expand"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A project for generating C bindings from Rust code";
     homepage = "https://github.com/eqrion/cbindgen";
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
index 723ea94152ca..d40145f163b2 100644
--- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig
+{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config
 , darwin }:
 
 let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
   name = "maturin-${version}";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z";
+    sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs=";
   };
 
-  cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n";
+  cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI=";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ gmp openssl ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security
-    ++ stdenv.lib.optional stdenv.isLinux dbus;
+    ++ lib.optional stdenv.isDarwin Security
+    ++ lib.optional stdenv.isLinux dbus;
 
   # Requires network access, fails in sandbox.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Build and publish crates with pyo3 bindings as python packages";
     homepage = "https://github.com/PyO3/maturin";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/rust/racer/default.nix b/nixpkgs/pkgs/development/tools/rust/racer/default.nix
index 86f1989729eb..3ad4b54b47a0 100644
--- a/nixpkgs/pkgs/development/tools/rust/racer/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/racer/default.nix
@@ -1,46 +1,45 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "racer";
-  version = "2.1.35";
+  version = "2.1.40";
 
   src = fetchFromGitHub {
     owner = "racer-rust";
     repo = "racer";
     rev = "v${version}";
-    sha256 = "0c00b81s7abnadjbf4i39lhdkipx7z44sr8p78jd1fl61yyrspli";
+    sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8=";
   };
 
-  cargoSha256 = "1nbp2jp65fqwsq9i04iyi4pbszs035w6id50p5ypw234cqxznikm";
+  cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE=";
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   # a nightly compiler is required unless we use this cheat code.
   RUSTC_BOOTSTRAP = 1;
 
-  RUST_SRC_PATH = rustPlatform.rustcSrc;
+  RUST_SRC_PATH = rustPlatform.rustLibSrc;
   postInstall = ''
-    wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc}
+    wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc}
   '';
 
-  checkPhase = ''
-    cargo test -- \
-      --skip nameres::test_do_file_search_std \
-      --skip util::test_get_rust_src_path_rustup_ok \
-      --skip util::test_get_rust_src_path_not_rust_source_tree \
-      --skip extern --skip completes_pub_fn --skip find_crate_doc \
-      --skip follows_use_local_package --skip follows_use_for_reexport \
-      --skip follows_rand_crate --skip get_completion_in_example_dir \
-      --skip test_resolve_global_path_in_modules
-  '';
+  checkFlags = [
+    "--skip nameres::test_do_file_search_std"
+    "--skip util::test_get_rust_src_path_rustup_ok"
+    "--skip util::test_get_rust_src_path_not_rust_source_tree"
+    "--skip extern --skip completes_pub_fn --skip find_crate_doc"
+    "--skip follows_use_local_package --skip follows_use_for_reexport"
+    "--skip follows_rand_crate --skip get_completion_in_example_dir"
+    "--skip test_resolve_global_path_in_modules"
+  ];
 
   doInstallCheck = true;
   installCheckPhase = ''
     $out/bin/racer --version
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A utility intended to provide Rust code completion for editors and IDEs";
     homepage = "https://github.com/racer-rust/racer";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix
index 26e2a5ba50e3..33d6721610e9 100644
--- a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "racerd";
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   RUST_SRC_PATH = rustPlatform.rustcSrc;
 
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     broken = true;
     description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs";
     homepage = "https://github.com/jwilm/racerd";
diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
index a398b7e504df..8ff596d475c8 100644
--- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -2,10 +2,10 @@
 
 {
   rust-analyzer-unwrapped = callPackage ./generic.nix rec {
-    rev = "2020-11-09";
+    rev = "2021-01-18";
     version = "unstable-${rev}";
-    sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs=";
-    cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI=";
+    sha256 = "sha256-eFiZdFBJZuBfwH8tqZTayNaWiq8fWUzlzBRRvdPbmW8=";
+    cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w=";
   };
 
   rust-analyzer = callPackage ./wrapper.nix {} {
diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
index 1bab5b951837..10f0c6b26ad7 100644
--- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
+++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage {
     runHook postInstallCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An experimental modular compiler frontend for the Rust language";
     homepage = "https://github.com/rust-analyzer/rust-analyzer";
     license = with licenses; [ mit asl20 ];
diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh
index f08ea67cf22d..1bd46862692f 100755
--- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh
+++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh
@@ -26,7 +26,7 @@ sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev")
 # Clear cargoSha256 to avoid inconsistency.
 sed -e "s#rev = \".*\"#rev = \"$rev\"#" \
     -e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \
-    -e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \
+    -e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \
     --in-place ./default.nix
 node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code"
 
diff --git a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
index f846ed5f02e1..56097f9b98c3 100644
--- a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, runCommand, patchelf
 , fetchFromGitHub, rustPlatform, makeWrapper
-, pkgconfig, curl, zlib, Security, CoreServices }:
+, pkg-config, curl, zlib, Security, CoreServices }:
 
 let
   libPath = lib.makeLibraryPath [
@@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig";
 
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  nativeBuildInputs = [ makeWrapper pkg-config ];
 
   buildInputs = [
     curl zlib
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
+  ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   cargoBuildFlags = [ "--features no-self-update" ];
 
@@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec {
     $out/bin/rustup completions zsh cargo >  "$out/share/zsh/site-functions/_cargo"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Rust toolchain installer";
     homepage = "https://www.rustup.rs/";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix
index 348fe6d9c71f..97da80562905 100644
--- a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
@@ -19,7 +19,7 @@ buildRustPackage rec {
   # doc tests fail due to missing dependency
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate Rust register maps (`struct`s) from SVD files";
     homepage = "https://github.com/rust-embedded/svd2rust";
     license = with licenses; [ mit asl20 ];
diff --git a/nixpkgs/pkgs/development/tools/sass/gemset.nix b/nixpkgs/pkgs/development/tools/sass/gemset.nix
index f4fdc899abf8..c0c5937b15a4 100644
--- a/nixpkgs/pkgs/development/tools/sass/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/sass/gemset.nix
@@ -52,4 +52,4 @@
     };
     version = "4.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/sassc/default.nix b/nixpkgs/pkgs/development/tools/sassc/default.nix
index 373a7ea66658..d9662cd7ddb9 100644
--- a/nixpkgs/pkgs/development/tools/sassc/default.nix
+++ b/nixpkgs/pkgs/development/tools/sassc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libsass }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsass }:
 
 stdenv.mkDerivation rec {
   pname = "sassc";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libsass ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A front-end for libsass";
     homepage = "https://github.com/sass/sassc/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/sauce-connect/default.nix b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
index 9560d45d6815..12082de98422 100644
--- a/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
+++ b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \
diff --git a/nixpkgs/pkgs/development/tools/scaff/default.nix b/nixpkgs/pkgs/development/tools/scaff/default.nix
index 97f94e2d61b5..2449769e07f3 100644
--- a/nixpkgs/pkgs/development/tools/scaff/default.nix
+++ b/nixpkgs/pkgs/development/tools/scaff/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }:
+{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "scaff";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/tools/scalafix/default.nix b/nixpkgs/pkgs/development/tools/scalafix/default.nix
index aa3a6cfb0dcf..00fda8bfc368 100644
--- a/nixpkgs/pkgs/development/tools/scalafix/default.nix
+++ b/nixpkgs/pkgs/development/tools/scalafix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, jdk, jre, coursier, makeWrapper }:
+{ lib, stdenv, jdk, jre, coursier, makeWrapper }:
 
 let
   baseName = "scalafix";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     $out/bin/${baseName} --version | grep -q "${version}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Refactoring and linting tool for Scala";
     homepage = "https://scalacenter.github.io/scalafix/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/nixpkgs/pkgs/development/tools/scalafmt/default.nix
index 0f14f52295e8..45efd813a38b 100644
--- a/nixpkgs/pkgs/development/tools/scalafmt/default.nix
+++ b/nixpkgs/pkgs/development/tools/scalafmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, jdk, jre, coursier, makeWrapper }:
+{ lib, stdenv, jdk, jre, coursier, makeWrapper }:
 
 let
   baseName = "scalafmt";
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     $out/bin/${baseName} --version | grep -q "${version}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Opinionated code formatter for Scala";
     homepage = "http://scalameta.org/scalafmt";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix b/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix
index 46747f049396..027522e58f8b 100644
--- a/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix
@@ -59,4 +59,4 @@
     };
     version = "0.57.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix
index de1c9c9c11aa..d777d788aec6 100644
--- a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, unzip, makeWrapper
+{ lib, stdenv, fetchurl, unzip, makeWrapper
 , cairo, fontconfig, freetype, gdk-pixbuf, glib
 , glibc, gtk2, libX11, nspr, nss, pango, gconf
 , libxcb, libXi, libXrender, libXext
 }:
 
 let
-  upstream-info = (stdenv.lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver;
+  upstream-info = (lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver;
   allSpecs = {
     x86_64-linux = {
       system = "linux64";
@@ -21,7 +21,7 @@ let
   spec = allSpecs.${stdenv.hostPlatform.system}
     or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
 
-  libs = stdenv.lib.makeLibraryPath [
+  libs = lib.makeLibraryPath [
     stdenv.cc.cc.lib
     cairo fontconfig freetype
     gdk-pixbuf glib gtk2 gconf
@@ -44,12 +44,12 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     install -m755 -D chromedriver $out/bin/chromedriver
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
     wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://chromedriver.chromium.org/";
     description = "A WebDriver server for running Selenium tests on Chrome";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
index 400cf24012a9..be3048cca25b 100644
--- a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "htmlunit-driver-standalone";
diff --git a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
index bf9eabec53c0..c25190cab74e 100644
--- a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }:
+{ lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }:
 
-with stdenv.lib;
+with lib;
 let
     name = "selendroid-standalone-${version}";
     pluginName = "selendroid-grid-plugin-${version}";
diff --git a/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/nixpkgs/pkgs/development/tools/selenium/server/default.nix
index a6d60e33ee36..10893a9d1700 100644
--- a/nixpkgs/pkgs/development/tools/selenium/server/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/server/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, jre
+{ lib, stdenv, fetchurl, makeWrapper, jre
 , htmlunit-driver, chromedriver, chromeSupport ? true }:
 
-with stdenv.lib;
+with lib;
 
 let
   minorVersion = "3.141";
diff --git a/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix b/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix
index 6b65632bf7d1..17e888fee416 100644
--- a/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix
+++ b/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix
@@ -1,7 +1,7 @@
 {
-  pname = ''setupcfg2nix'';
-  version = ''2.0.1'';
+  pname = "setupcfg2nix";
+  version = "2.0.1";
   install_requires = [
-    ''setuptools''
+    "setuptools"
   ];
 }
diff --git a/nixpkgs/pkgs/development/tools/shadered/default.nix b/nixpkgs/pkgs/development/tools/shadered/default.nix
new file mode 100644
index 000000000000..01c16b139468
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/shadered/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, sfml
+, glm
+, python3
+, glew
+, pkg-config
+, SDL2 }:
+
+stdenv.mkDerivation rec {
+  pname = "SHADERed";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "dfranx";
+    repo = pname;
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "ivOd4NJgx5KWSDnXSBQLMrdvBuOm8NRzcb2S4lvOrms=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    SDL2
+    glew
+    glm
+    python3
+    sfml
+  ];
+
+  NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
+
+  meta = with lib; {
+    description = "Lightweight, cross-platform & full-featured shader IDE";
+    homepage = "https://github.com/dfranx/SHADERed";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ Scriptkiddi ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix b/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix
index b71e9fb3a99c..b4173c7aebb0 100644
--- a/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }:
 
 stdenv.mkDerivation rec {
   name = "sigrok-cli-0.7.1";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib libsigrok libsigrokdecode ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line frontend for the sigrok signal analysis software suite";
     homepage = "https://sigrok.org/";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/simavr/default.nix b/nixpkgs/pkgs/development/tools/simavr/default.nix
index 83ae00ce7b66..1d47b3251010 100644
--- a/nixpkgs/pkgs/development/tools/simavr/default.nix
+++ b/nixpkgs/pkgs/development/tools/simavr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut
+{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut
 , avrgcc, avrlibc
 , libGLU, libGL
 , GLUT }:
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
 
-  nativeBuildInputs = [ which pkgconfig avrgcc ];
+  nativeBuildInputs = [ which pkg-config avrgcc ];
   buildInputs = [ libelf freeglut libGLU libGL ]
-    ++ stdenv.lib.optional stdenv.isDarwin GLUT;
+    ++ lib.optional stdenv.isDarwin GLUT;
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "-C tests run_tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lean and mean Atmel AVR simulator";
     homepage    = "https://github.com/buserror/simavr";
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix
index db5f392b2ce6..5b1d8b0794d8 100644
--- a/nixpkgs/pkgs/development/tools/skopeo/default.nix
+++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildGoModule
 , fetchFromGitHub
 , gpgme
@@ -13,13 +14,13 @@
 
 buildGoModule rec {
   pname = "skopeo";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
-    sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd";
+    sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg";
   };
 
   outputs = [ "out" "man" ];
@@ -31,7 +32,7 @@ buildGoModule rec {
   nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ];
 
   buildInputs = [ gpgme ]
-  ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ];
+  ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ];
 
   buildPhase = ''
     patchShebangs .
@@ -42,12 +43,12 @@ buildGoModule rec {
     install -Dm755 bin/skopeo -t $out/bin
     installManPage docs/*.[1-9]
     installShellCompletion --bash completions/bash/skopeo
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     wrapProgram $out/bin/skopeo \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]}
+      --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command line utility for various operations on container images and image repositories";
     homepage = "https://github.com/containers/skopeo";
     maintainers = with maintainers; [ lewo ] ++ teams.podman.members;
diff --git a/nixpkgs/pkgs/development/tools/slimerjs/default.nix b/nixpkgs/pkgs/development/tools/slimerjs/default.nix
index 49eea7213bd8..76728c5f2d80 100644
--- a/nixpkgs/pkgs/development/tools/slimerjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/slimerjs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}:
+{lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash}:
 let
   s = # Generated upstream information
   rec {
@@ -42,9 +42,9 @@ stdenv.mkDerivation {
   '';
   meta = {
     inherit (s) version;
-    description = ''Gecko-based programmatically-driven browser'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Gecko-based programmatically-driven browser";
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/so/default.nix b/nixpkgs/pkgs/development/tools/so/default.nix
index 0ee2359c8413..99f9cdcd936f 100644
--- a/nixpkgs/pkgs/development/tools/so/default.nix
+++ b/nixpkgs/pkgs/development/tools/so/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "so";
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
     libiconv Security
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A TUI interface to the StackExchange network";
     homepage = "https://github.com/samtay/so";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix
index d44622e7e595..159fe3d99eb7 100644
--- a/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -1,7 +1,7 @@
-{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
-  SDL2, SDL2_image, SDL2_ttf, physfs,
-  openal, libmodplug, libvorbis, solarus,
-  qtbase, qttools, glm }:
+{ lib, mkDerivation, fetchFromGitLab, cmake, luajit
+, SDL2, SDL2_image, SDL2_ttf, physfs, fetchpatch
+, openal, libmodplug, libvorbis, solarus
+, qtbase, qttools, glm }:
 
 mkDerivation rec {
   pname = "solarus-quest-editor";
@@ -13,11 +13,18 @@ mkDerivation rec {
     rev = "v${version}";
     sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn";
   };
-  
-  buildInputs = [ cmake luajit SDL2
-    SDL2_image SDL2_ttf physfs
-    openal libmodplug libvorbis
-    solarus qtbase qttools glm ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch";
+      sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE=";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ luajit SDL2 SDL2_image SDL2_ttf physfs openal
+    libmodplug libvorbis solarus qtbase qttools glm ];
 
   meta = with lib; {
     description = "The editor for the Zelda-like ARPG game engine, Solarus";
@@ -31,5 +38,5 @@ mkDerivation rec {
     maintainers = [ maintainers.Nate-Devv ];
     platforms = platforms.linux;
   };
-  
+
 }
diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
index 91653d3773e1..46f097e5b60a 100644
--- a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
+++ b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook
+{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook
 , boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils
 , shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }:
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     imagemagick
     javaIndexer # the resulting jar file is copied by our install script
-  ] ++ stdenv.lib.optionals doCheck testBinPath;
+  ] ++ lib.optionals doCheck testBinPath;
   buildInputs = [
     boost pythonIndexer shared-mime-info
   ] ++ (with qt5; [ qtbase qtsvg ])
@@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = let
-    major = stdenv.lib.versions.major version;
-    minor = stdenv.lib.versions.minor version;
-    patch = stdenv.lib.versions.patch version;
+    major = lib.versions.major version;
+    minor = lib.versions.minor version;
+    patch = lib.versions.patch version;
   in ''
     # Upstream script obtains it's version from git:
     # https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \
-      --prefix PATH : ${stdenv.lib.makeBinPath binPath}
+      --prefix PATH : ${lib.makeBinPath binPath}
   '';
 
   checkPhase = ''
@@ -188,7 +188,7 @@ stdenv.mkDerivation rec {
     # shorten PATH to prevent build failures
     wrapQtApp ./Sourcetrail_test \
       --set PATH "" \
-      --prefix PATH : ${stdenv.lib.makeBinPath testBinPath} \
+      --prefix PATH : ${lib.makeBinPath testBinPath} \
       --set MAVEN_OPTS "-Dmaven.repo.local=$TMPDIR/m2repo"
     ./Sourcetrail_test
     popd
@@ -203,7 +203,7 @@ stdenv.mkDerivation rec {
   # FIXME: some test cases are disabled in the patch phase
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.sourcetrail.com";
     description = "A cross-platform source explorer for C/C++ and Java";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix b/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix
index 14a40a6e6db4..fa25604f9fc5 100644
--- a/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix
+++ b/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix
@@ -1,6 +1,6 @@
 # Taken from a past commit of nixpkgs
 
-{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
 
 buildPythonPackage rec {
   pname = "jedi";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   # tox required for tests: https://github.com/davidhalter/jedi/issues/808
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/davidhalter/jedi";
     description = "An autocompletion tool for Python that can be used for text editors";
     license = licenses.lgpl3Plus;
diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix
index bac10d244422..57f04b00c0d2 100644
--- a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
 let
   # Update spirv-headers rev in lockstep according to DEPs file
   version = "2020.2";
@@ -14,13 +14,12 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
   };
-  enableParallelBuilding = true;
 
   nativeBuildInputs = [ cmake python3 ];
 
   cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix
index 38573e075146..5bc89e839e92 100644
--- a/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }:
+{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }:
 
 stdenv.mkDerivation rec {
   pname = "spring-boot-cli";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       CLI which makes it easy to create spring-based applications
     '';
diff --git a/nixpkgs/pkgs/development/tools/sqlint/gemset.nix b/nixpkgs/pkgs/development/tools/sqlint/gemset.nix
index a86277363fbc..aeffdccffa13 100644
--- a/nixpkgs/pkgs/development/tools/sqlint/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/sqlint/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "0.1.10";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/sqsh/default.nix b/nixpkgs/pkgs/development/tools/sqsh/default.nix
index d6087cd02244..9c56efcb59fb 100644
--- a/nixpkgs/pkgs/development/tools/sqsh/default.nix
+++ b/nixpkgs/pkgs/development/tools/sqsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }:
+{ lib, stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }:
 
 let
   mainVersion = "2.5";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace src/cmd_connect.c \
       --replace CS_TDS_80 CS_TDS_73
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace "libct.so" "libct.dylib"
   '';
 
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line tool for querying Sybase/MSSQL databases";
     longDescription = ''
       Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell),
diff --git a/nixpkgs/pkgs/development/tools/sslmate/default.nix b/nixpkgs/pkgs/development/tools/sslmate/default.nix
index a6d1ce55fdb7..cdf2242bdbaa 100644
--- a/nixpkgs/pkgs/development/tools/sslmate/default.nix
+++ b/nixpkgs/pkgs/development/tools/sslmate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, makeWrapper, openssl }:
+{ lib, stdenv, fetchurl, perlPackages, makeWrapper, openssl }:
 
 stdenv.mkDerivation rec {
   name = "sslmate-1.7.1";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       --prefix PATH : "${openssl.bin}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sslmate.com";
     maintainers = [ maintainers.domenkozar ];
     description = "Easy to buy, deploy, and manage your SSL certs";
diff --git a/nixpkgs/pkgs/development/tools/stagit/default.nix b/nixpkgs/pkgs/development/tools/stagit/default.nix
index dacee9aa78e1..1cabcfe044f3 100644
--- a/nixpkgs/pkgs/development/tools/stagit/default.nix
+++ b/nixpkgs/pkgs/development/tools/stagit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libgit2, fetchgit }:
+{ lib, stdenv, libgit2, fetchgit }:
 
 stdenv.mkDerivation rec {
   pname = "stagit";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libgit2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "git static site generator";
     homepage = "https://git.codemadness.org/stagit/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/summon/default.nix b/nixpkgs/pkgs/development/tools/summon/default.nix
index e01c60e3a89c..5d851adc5abc 100644
--- a/nixpkgs/pkgs/development/tools/summon/default.nix
+++ b/nixpkgs/pkgs/development/tools/summon/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }:
 
-with stdenv.lib;
+with lib;
 
 buildGoModule rec {
   pname = "summon";
diff --git a/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix
new file mode 100644
index 000000000000..d63493ba7a1e
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix
@@ -0,0 +1,52 @@
+{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "sumneko-lua-language-server";
+  version = "1.11.2";
+
+  src = fetchFromGitHub {
+    owner = "sumneko";
+    repo = "lua-language-server";
+    rev = version;
+    sha256 = "1cnzwfqmzlzi6797l37arhhx2l6wsvs3jjgxdxwdbgq3rfz1ncr8";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    ninja
+    makeWrapper
+  ];
+
+  preBuild = ''
+    cd 3rd/luamake
+  '';
+
+  ninjaFlags = [
+    "-f ninja/linux.ninja"
+    ];
+
+  postBuild = ''
+    cd ../..
+    ./3rd/luamake/luamake rebuild
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/extras
+    cp -r ./{locale,meta,script,*.lua} $out/extras/
+    cp ./bin/Linux/{bee.so,lpeglabel.so} $out/extras
+    cp ./bin/Linux/lua-language-server $out/extras/.lua-language-server-unwrapped
+    makeWrapper $out/extras/.lua-language-server-unwrapped \
+      $out/bin/lua-language-server \
+      --add-flags "-E $out/extras/main.lua \
+      --logpath='~/.cache/sumneko_lua/log' \
+      --metapath='~/.cache/sumneko_lua/meta'"
+  '';
+
+  meta = with lib; {
+    description = "Lua Language Server coded by Lua ";
+    homepage = "https://github.com/sumneko/lua-language-server";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mjlbach ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix b/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix
index 5a530c6e9f18..ae9c7c833928 100644
--- a/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }:
 
 stdenv.mkDerivation {
   name = "sunxi-tools-20181113";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb1 zlib ];
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   installTargets = [ "install-tools" "install-misc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for Allwinner SoC devices";
     homepage = "http://linux-sunxi.org/";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/development/tools/swiftformat/default.nix b/nixpkgs/pkgs/development/tools/swiftformat/default.nix
index cb3ed5217f08..823496693f25 100644
--- a/nixpkgs/pkgs/development/tools/swiftformat/default.nix
+++ b/nixpkgs/pkgs/development/tools/swiftformat/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swiftformat";
-  version = "0.44.9";
+  version = "0.47.10";
 
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
     rev = version;
-    sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6";
+    sha256 = "1gqxpymbhpmap0i2blg9akarlql4mkzv45l4i212gsxcs991b939";
   };
 
   preConfigure = "LD=$CC";
diff --git a/nixpkgs/pkgs/development/tools/tabnine/default.nix b/nixpkgs/pkgs/development/tools/tabnine/default.nix
index 6c54e8f3c405..f18be619f267 100644
--- a/nixpkgs/pkgs/development/tools/tabnine/default.nix
+++ b/nixpkgs/pkgs/development/tools/tabnine/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchurl, unzip }:
 
 let
-  version = "3.1.1";
+  version = "3.2.63";
   src =
     if stdenv.hostPlatform.system == "x86_64-darwin" then
       fetchurl {
-        url = "https://update.tabnine.com/${version}/x86_64-apple-darwin/TabNine";
-        sha256 = "w+Ufy4pICfQmseKCeohEQIP0VD6YrkYTEn41HX40Zlw=";
+        url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip";
+        sha256 = "0y0wb3jdr2qk4k21c11w8c9a5fl0h2rm1wm7m8hqdywy4lz9ppgy";
       }
     else if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
-        url = "https://update.tabnine.com/${version}/x86_64-unknown-linux-musl/TabNine";
-        sha256 = "hSltZWQz2BRFut0NDI4fS/N8XxFJaYGHRtV3llBVOY4=";
+        url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip";
+        sha256 = "0zzk2w5azk5f0svjxlj2774x01xdflb767xxvbglj4223dgyx2x5";
       }
     else throw "Not supported on ${stdenv.hostPlatform.system}";
 in stdenv.mkDerivation rec {
@@ -20,10 +20,15 @@ in stdenv.mkDerivation rec {
   inherit version src;
 
   dontBuild = true;
-  dontUnpack = true;
+
+  # Work around the "unpacker appears to have produced no directories"
+  # case that happens when the archive doesn't have a subdirectory.
+  setSourceRoot = "sourceRoot=`pwd`";
+
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
-    install -Dm755 $src $out/bin/TabNine
+    install -Dm755 TabNine $out/bin/TabNine
   '';
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/tools/textql/default.nix b/nixpkgs/pkgs/development/tools/textql/default.nix
index 4cdb5b8dd163..7dc899c4fc46 100644
--- a/nixpkgs/pkgs/development/tools/textql/default.nix
+++ b/nixpkgs/pkgs/development/tools/textql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
 
 buildGoPackage rec {
   pname = "textql";
@@ -24,7 +24,7 @@ buildGoPackage rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Execute SQL against structured text like CSV or TSV";
     homepage = "https://github.com/dinedal/textql";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/the-way/default.nix b/nixpkgs/pkgs/development/tools/the-way/default.nix
index 5506201b7427..1e88cfcdcc11 100644
--- a/nixpkgs/pkgs/development/tools/the-way/default.nix
+++ b/nixpkgs/pkgs/development/tools/the-way/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "the-way";
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin  [ AppKit Security ];
+  buildInputs = lib.optionals stdenv.isDarwin  [ AppKit Security ];
 
   cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr";
-  checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ];
+  checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ];
   cargoParallelTestThreads = false;
 
   postInstall = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Terminal code snippets manager";
     homepage = "https://github.com/out-of-cheese-error/the-way";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/tools/thrust/default.nix b/nixpkgs/pkgs/development/tools/thrust/default.nix
index a0bc39f2816d..44dfa1a4ba11 100644
--- a/nixpkgs/pkgs/development/tools/thrust/default.nix
+++ b/nixpkgs/pkgs/development/tools/thrust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk
+{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk
 , pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss
 , xorg, libcap, unzip
 }:
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/libexec/thrust/thrust_shell $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Chromium-based cross-platform / cross-language application framework";
     homepage = "https://github.com/breach/thrust";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/toluapp/default.nix b/nixpkgs/pkgs/development/tools/toluapp/default.nix
index 8f4e66703478..5f938547cdd8 100644
--- a/nixpkgs/pkgs/development/tools/toluapp/default.nix
+++ b/nixpkgs/pkgs/development/tools/toluapp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, sconsPackages, lua }:
+{ lib, stdenv, fetchFromGitHub, sconsPackages, lua }:
 
 stdenv.mkDerivation rec {
   version = "1.0.93";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       --replace /usr/local $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to integrate C/Cpp code with Lua";
     homepage = "http://www.codenix.com/~tolua/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/tracy/default.nix b/nixpkgs/pkgs/development/tools/tracy/default.nix
index 4efef71f6ad0..2dcc32e7389d 100644
--- a/nixpkgs/pkgs/development/tools/tracy/default.nix
+++ b/nixpkgs/pkgs/development/tools/tracy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }:
+{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }:
 
 stdenv.mkDerivation rec {
   pname = "tracy";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ glfw capstone ]
     ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ]
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications";
     homepage = "https://github.com/wolfpld/tracy";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/nixpkgs/pkgs/development/tools/tradcpp/default.nix b/nixpkgs/pkgs/development/tools/tradcpp/default.nix
index ddcdc38a4fb9..dc7156febe98 100644
--- a/nixpkgs/pkgs/development/tools/tradcpp/default.nix
+++ b/nixpkgs/pkgs/development/tools/tradcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf }:
+{ lib, stdenv, fetchurl, autoconf }:
 
 stdenv.mkDerivation {
   name = "tradcpp-0.5.2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     ./aarch64.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A traditional (K&R-style) C macro preprocessor";
     platforms = platforms.all;
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix
index dead1dac2a51..6ce1ad9a38aa 100644
--- a/nixpkgs/pkgs/development/tools/trellis/default.nix
+++ b/nixpkgs/pkgs/development/tools/trellis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , python3, boost
 , cmake
 }:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2021.01.02";
 
   # git describe --tags
-  realVersion = with stdenv.lib; with builtins;
+  realVersion = with lib; with builtins;
     "1.0-482-g${substring 0 7 (elemAt srcs 0).rev}";
 
   srcs = [
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
     # TODO: should this be in stdenv instead?
     "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
   ];
-  enableParallelBuilding = true;
 
   preConfigure = with builtins; ''
     rmdir database && ln -sfv ${elemAt srcs 1} ./database
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
     cd libtrellis
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description     = "Documentation and bitstream tools for Lattice ECP5 FPGAs";
     longDescription = ''
       Project Trellis documents the Lattice ECP5 architecture
@@ -55,8 +54,8 @@ stdenv.mkDerivation rec {
       open Verilog to bitstream toolchain for these devices.
     '';
     homepage    = "https://github.com/SymbiFlow/prjtrellis";
-    license     = stdenv.lib.licenses.isc;
+    license     = lib.licenses.isc;
     maintainers = with maintainers; [ q3k thoughtpolice emily ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/turbogit/default.nix b/nixpkgs/pkgs/development/tools/turbogit/default.nix
new file mode 100644
index 000000000000..68bd10683547
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/turbogit/default.nix
@@ -0,0 +1,42 @@
+{ fetchFromGitHub, buildGoModule, lib, installShellFiles }:
+buildGoModule rec {
+  pname = "turbogit";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "b4nst";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-alVgXnsoC2nmUe6i/l0ttUjoXpKLHr0n/7p6WbIIGBU=";
+  };
+
+  vendorSha256 = "sha256-6fxbxpROYiNw5SYdQAIdy5NfqzOcFfAlJ+vTQyFtink=";
+
+  subPackages = [ "." ];
+
+  nativeBuildInputs = [ installShellFiles ];
+  postInstall = ''
+    # Move turbogit binary to tug
+    ln -s $out/bin/turbogit $out/bin/tug
+
+    # Generate completion files
+    mkdir -p share/completions
+    $out/bin/tug completion bash > share/completions/tug.bash
+    $out/bin/tug completion fish > share/completions/tug.fish
+    $out/bin/tug completion zsh > share/completions/tug.zsh
+
+    installShellCompletion share/completions/tug.{bash,fish,zsh}
+  '';
+
+  meta = with lib; {
+    description = "Keep your git workflow clean without headache.";
+    longDescription = ''
+      turbogit (tug) is a cli tool built to help you deal with your day-to-day git work.
+      turbogit enforces convention (e.g. The Conventional Commits) but tries to keep things simple and invisible for you.
+      turbogit is your friend.
+    '';
+    homepage = "https://b4nst.github.io/turbogit";
+    license = licenses.mit;
+    maintainers = [ maintainers.yusdacra ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/tychus/default.nix b/nixpkgs/pkgs/development/tools/tychus/default.nix
index edd428480a00..8b330b36ea99 100644
--- a/nixpkgs/pkgs/development/tools/tychus/default.nix
+++ b/nixpkgs/pkgs/development/tools/tychus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
+{ lib, stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
 
 buildGoPackage rec {
   pname = "tychus";
@@ -15,13 +15,13 @@ buildGoPackage rec {
     sha256 = "02ybxjsfga89gpg0k21zmykhhnpx1vy3ny8fcwj0qsg73i11alvw";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ];
 
   buildFlags = [ "--tags" "release" ];
 
   meta = {
     description = "Command line utility to live-reload your application";
     homepage = "https://github.com/devlocker/tychus";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/tychus/deps.nix b/nixpkgs/pkgs/development/tools/tychus/deps.nix
index 194aa96ae3ce..e8897efffc95 100644
--- a/nixpkgs/pkgs/development/tools/tychus/deps.nix
+++ b/nixpkgs/pkgs/development/tools/tychus/deps.nix
@@ -27,4 +27,4 @@
       sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/nixpkgs/pkgs/development/tools/udis86/default.nix b/nixpkgs/pkgs/development/tools/udis86/default.nix
index 6996d5bf13fa..22977d6ea954 100644
--- a/nixpkgs/pkgs/development/tools/udis86/default.nix
+++ b/nixpkgs/pkgs/development/tools/udis86/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, python }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }:
 
 stdenv.mkDerivation rec {
   pname = "udis86";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "out" "dev" "lib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://udis86.sourceforge.net";
     license = licenses.bsd2;
     maintainers = with maintainers; [ timor ];
diff --git a/nixpkgs/pkgs/development/tools/uftrace/default.nix b/nixpkgs/pkgs/development/tools/uftrace/default.nix
index 2fbf73665382..03ee72289014 100644
--- a/nixpkgs/pkgs/development/tools/uftrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/uftrace/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub}:
+{lib, stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
   pname = "uftrace";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Function (graph) tracer for user-space";
     homepage = "https://github.com/namhyung/uftrace";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [stdenv.lib.maintainers.nthorne];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [lib.maintainers.nthorne];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/unity3d/default.nix b/nixpkgs/pkgs/development/tools/unity3d/default.nix
index dfb5f6abf481..5c41a1dac931 100644
--- a/nixpkgs/pkgs/development/tools/unity3d/default.nix
+++ b/nixpkgs/pkgs/development/tools/unity3d/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
   version = "${ver}x${build}";
 
   src = fetchurl {
-  	url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
+    url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
     sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv";
   };
 
@@ -129,7 +129,7 @@ in stdenv.mkDerivation {
   dontStrip = true;
   dontPatchELF = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://unity3d.com/";
     description = "Game development tool";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/unityhub/default.nix b/nixpkgs/pkgs/development/tools/unityhub/default.nix
index 85b7a704b9cc..9a2c1d72caa3 100644
--- a/nixpkgs/pkgs/development/tools/unityhub/default.nix
+++ b/nixpkgs/pkgs/development/tools/unityhub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
+{ lib, stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
 
 let
   version = "2.3.2";
@@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec {
     libX11 libXcursor libXdamage libXfixes libXrender libXi
     libXcomposite libXext libXrandr libXtst libSM libICE libxcb
 
-    libselinux pciutils libpulseaudio libxml2
+    libselinux pciutils libpulseaudio libxml2 icu clang
   ]);
 
   profile = ''
@@ -26,7 +26,7 @@ in appimageTools.wrapType2 rec {
     sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://unity3d.com/";
     description = "Game development tool";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix
index b3f1bf1a5b8f..701b973ad4f7 100644
--- a/nixpkgs/pkgs/development/tools/vagrant/default.nix
+++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix
@@ -34,7 +34,7 @@ let
       for gem in "$out"/lib/ruby/gems/*/gems/*; do
         cp -a "$gem/" "$gem.new"
         rm "$gem"
-        # needed on macOS, otherwise the mv yields permission denied 
+        # needed on macOS, otherwise the mv yields permission denied
         chmod +w "$gem.new"
         mv "$gem.new" "$gem"
       done
diff --git a/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix
index 169c3533efcb..e617e1a58729 100644
--- a/nixpkgs/pkgs/development/tools/vagrant/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix
@@ -363,4 +363,4 @@
     };
     version = "1.3.5";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix b/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix
index df6b6c40496b..f50f4438f50d 100644
--- a/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix
+++ b/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix
@@ -156,4 +156,4 @@
     };
     version = "0.2.1";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
index f26615e26b7a..696776a69720 100644
--- a/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , nix-update-script
 , meson
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     vala
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code Intelligence for Vala & Genie";
     homepage = "https://github.com/benwaffle/vala-language-server";
     license = licenses.lgpl21Plus;
diff --git a/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/nixpkgs/pkgs/development/tools/vala-lint/default.nix
index 378bc935e22a..a45ced8a4922 100644
--- a/nixpkgs/pkgs/development/tools/vala-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/vala-lint/default.nix
@@ -1,10 +1,10 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , glib
 , meson
 , ninja
 , pantheon
-, pkgconfig
+, pkg-config
 , vala
 , gettext
 , wrapGAppsHook
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     gettext
     meson
     ninja
-    pkgconfig
+    pkg-config
     vala
     wrapGAppsHook
   ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   # See https://github.com/vala-lang/vala-lint/issues/133
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/vala-lang/vala-lint";
     description = "Check Vala code files for code-style errors";
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix
index e99f7dca9bf5..65f91b3324f5 100644
--- a/nixpkgs/pkgs/development/tools/vcstool/default.nix
+++ b/nixpkgs/pkgs/development/tools/vcstool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages
+{ lib, stdenv, python3Packages
 , git, breezy, subversion }:
 
 with python3Packages;
@@ -14,11 +14,11 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ pyyaml setuptools ];
 
-  makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])];
+  makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ git breezy subversion ])];
 
   doCheck = false; # requires network
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a command line tool to invoke vcs commands on multiple repositories";
     homepage = "https://github.com/dirk-thomas/vcstool";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/vend/default.nix b/nixpkgs/pkgs/development/tools/vend/default.nix
index ef59ea8dd65c..cfadf694320e 100644
--- a/nixpkgs/pkgs/development/tools/vend/default.nix
+++ b/nixpkgs/pkgs/development/tools/vend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "vend";
@@ -28,7 +28,7 @@ buildGoModule rec {
 
   vendorSha256 = null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nomad-software/vend";
     description = "A utility which vendors go code including c dependencies";
     maintainers = with maintainers; [ c00w mic92 zowoq ];
diff --git a/nixpkgs/pkgs/development/tools/vogl/default.nix b/nixpkgs/pkgs/development/tools/vogl/default.nix
index 5c3b2abe4a47..315a896929dc 100644
--- a/nixpkgs/pkgs/development/tools/vogl/default.nix
+++ b/nixpkgs/pkgs/development/tools/vogl/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib, fetchFromGitHub
-, cmake, git, pkgconfig, wget, zip
+, cmake, git, pkg-config, wget, zip
 , qtbase, qtx11extras
 , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
@@ -26,7 +26,7 @@ mkDerivation {
     })
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [
     git wget zip
diff --git a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
index 25fb4077abc4..fdf66004deb3 100644
--- a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , writeText
@@ -8,7 +8,7 @@
 , vulkan-headers
 , vulkan-loader
 , glslang
-, pkgconfig
+, pkg-config
 , xlibsWrapper
 , libxcb
 , libXrandr
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     cmake
     python3
   ];
@@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
     wayland
   ];
 
-  enableParallelBuilding = true;
-
   cmakeFlags = [
     "-DGLSLANG_INSTALL_DIR=${localGlslang}"
     "-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}"
@@ -99,7 +97,7 @@ stdenv.mkDerivation rec {
     sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$<TARGET_FILE_NAME:\''${TARGET_NAME}>\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official Khronos Vulkan validation layers";
     homepage    = "https://github.com/KhronosGroup/Vulkan-ValidationLayers";
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
index 58ee064ad552..23dda32b7232 100644
--- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "vultr-cli";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official command line tool for Vultr services";
     homepage = "https://github.com/vultr/vultr-cli";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/tools/vultr/default.nix b/nixpkgs/pkgs/development/tools/vultr/default.nix
index 7c396f69f259..b9ca0febf971 100644
--- a/nixpkgs/pkgs/development/tools/vultr/default.nix
+++ b/nixpkgs/pkgs/development/tools/vultr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "vultr";
@@ -15,7 +15,7 @@ buildGoPackage rec {
   meta = {
     description = "A command line tool for Vultr services, a provider for cloud virtual private servers";
     homepage = "https://github.com/JamesClonk/vultr";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.zauberpony ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.zauberpony ];
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/wabt/default.nix b/nixpkgs/pkgs/development/tools/wabt/default.nix
index b910a31e1552..27b11870a899 100644
--- a/nixpkgs/pkgs/development/tools/wabt/default.nix
+++ b/nixpkgs/pkgs/development/tools/wabt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }:
+{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "wabt";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ];
   buildInputs = [ python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The WebAssembly Binary Toolkit";
     longDescription = ''
       WABT (pronounced "wabbit") is a suite of tools for WebAssembly, including:
diff --git a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 5794f5cc335e..0024c43e05df 100644
--- a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -1,4 +1,4 @@
-{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security
+{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security
 , runCommand
 }:
 
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     '';
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6";
   cargoBuildFlags = [ "-p" pname ];
diff --git a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
index 93bda0b81807..94ee6d3a1bac 100644
--- a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
+++ b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , rustPlatform
-, pkgconfig
+, pkg-config
 , libressl
 , curl
 , Security
@@ -20,20 +20,20 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     # LibreSSL works around segfault issues caused by OpenSSL being unable to
     # gracefully exit while doing work.
     # See: https://github.com/rustwasm/wasm-pack/issues/650
     libressl
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
+  ] ++ lib.optionals stdenv.isDarwin [ curl Security ];
 
   # Most tests rely on external resources and build artifacts.
   # Disabling check here to work with build sandboxing.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A utility that builds rust-generated WebAssembly package";
     homepage = "https://github.com/rustwasm/wasm-pack";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/nixpkgs/pkgs/development/tools/watchman/default.nix b/nixpkgs/pkgs/development/tools/watchman/default.nix
index 63f2b0e4933d..2acbf13e2789 100644
--- a/nixpkgs/pkgs/development/tools/watchman/default.nix
+++ b/nixpkgs/pkgs/development/tools/watchman/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre
-, libtool, pkgconfig, openssl
+, libtool, pkg-config, openssl
 , confFile ? config.watchman.confFile or null
 , withApple ? stdenv.isDarwin, CoreServices
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
   };
 
-  nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
+  nativeBuildInputs = [ autoconf automake pkg-config libtool ];
   buildInputs = [ pcre openssl ]
     ++ lib.optionals withApple [ CoreServices ];
 
diff --git a/nixpkgs/pkgs/development/tools/wiggle/default.nix b/nixpkgs/pkgs/development/tools/wiggle/default.nix
index b89d36273f86..e861f20a9194 100644
--- a/nixpkgs/pkgs/development/tools/wiggle/default.nix
+++ b/nixpkgs/pkgs/development/tools/wiggle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, groff }:
+{ lib, stdenv, fetchurl, ncurses, groff }:
 
 stdenv.mkDerivation {
 
@@ -37,8 +37,8 @@ stdenv.mkDerivation {
        already been applied, and will ignore them.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/tools/wiiload/default.nix b/nixpkgs/pkgs/development/tools/wiiload/default.nix
index 37d909461d07..2f2fe174d14e 100644
--- a/nixpkgs/pkgs/development/tools/wiiload/default.nix
+++ b/nixpkgs/pkgs/development/tools/wiiload/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, zlib }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }:
 stdenv.mkDerivation rec {
   version = "0.5.1";
   pname = "wiiload";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Load homebrew apps over network/usbgecko to your Wii";
     homepage = "https://wiibrew.org/wiki/Wiiload";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/winpdb/default.nix b/nixpkgs/pkgs/development/tools/winpdb/default.nix
index 8db0b719c67b..b7eaabe8693f 100644
--- a/nixpkgs/pkgs/development/tools/winpdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/winpdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, makeDesktopItem }:
+{ lib, stdenv, fetchurl, pythonPackages, makeDesktopItem }:
 
 pythonPackages.buildPythonApplication rec {
   name = "winpdb-1.4.8";
@@ -36,7 +36,10 @@ pythonPackages.buildPythonApplication rec {
     cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg
   '';
 
-  meta = with stdenv.lib; {
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
     description = "Platform independent Python debugger";
     longDescription = ''
       Winpdb is a platform independent GPL Python debugger with support for
diff --git a/nixpkgs/pkgs/development/tools/wllvm/default.nix b/nixpkgs/pkgs/development/tools/wllvm/default.nix
index cd002bd2ef61..a3702f2e3e65 100644
--- a/nixpkgs/pkgs/development/tools/wllvm/default.nix
+++ b/nixpkgs/pkgs/development/tools/wllvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   version = "1.2.8";
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/travitch/whole-program-llvm";
     description = "A wrapper script to build whole-program LLVM bitcode files";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/wrangler/default.nix b/nixpkgs/pkgs/development/tools/wrangler/default.nix
index 6b85e20612bf..c7b1c0329f3a 100644
--- a/nixpkgs/pkgs/development/tools/wrangler/default.nix
+++ b/nixpkgs/pkgs/development/tools/wrangler/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wrangler";
-  version = "1.12.3";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h9020yf5jsbilzn94h7qyxw9qnz3vw43g8a2415wvjqq6ihzfvm";
+    sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q";
   };
 
-  cargoSha256 = "12azc41y2yx936ax9b1yylc0gy91k0m7ih6p0bkw7m928f762hpx";
+  cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
 
-  nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [
       curl
       darwin.apple_sdk.frameworks.Security
       darwin.apple_sdk.frameworks.CoreServices
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   # tries to use "/homeless-shelter" and fails
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A CLI tool designed for folks who are interested in using Cloudflare Workers";
     homepage = "https://github.com/cloudflare/wrangler";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/nixpkgs/pkgs/development/tools/ws/default.nix b/nixpkgs/pkgs/development/tools/ws/default.nix
index 4a6d8892208d..3026289fec1e 100644
--- a/nixpkgs/pkgs/development/tools/ws/default.nix
+++ b/nixpkgs/pkgs/development/tools/ws/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "ws";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "websocket command line tool";
     homepage    = "https://github.com/hashrocket/ws";
     license     = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix b/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix
index a3f8196b124b..5c78d730d203 100644
--- a/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix
+++ b/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , wxGTK31
 , meson
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     wxGTK31
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RAD tool for wxWidgets GUI design";
     homepage = "https://github.com/wxFormBuilder/wxFormBuilder";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/tools/xcbuild/default.nix b/nixpkgs/pkgs/development/tools/xcbuild/default.nix
index cb2e6edd0e10..1f38e49daee5 100644
--- a/nixpkgs/pkgs/development/tools/xcbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/xcbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng
+{ lib, stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng
 , CoreServices, CoreGraphics, ImageIO, ninja }:
 
 let
@@ -36,19 +36,17 @@ in stdenv.mkDerivation {
     cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
   '';
 
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
     sed 1i'#include <sys/sysmacros.h>' \
       -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # Apple Open Sourced LZFSE, but not libcompression, and it isn't
     # part of an impure framework we can add
     substituteInPlace Libraries/libcar/Sources/Rendition.cpp \
       --replace "#if HAVE_LIBCOMPRESSION" "#if 0"
   '';
 
-  enableParallelBuilding = true;
-
   # TODO: instruct cmake not to put it in /usr, rather than cleaning up
   postInstall = ''
     mv $out/usr/* $out
@@ -59,10 +57,11 @@ in stdenv.mkDerivation {
 
   cmakeFlags = [ "-GNinja" ];
 
-  buildInputs = [ cmake zlib libxml2 libpng ninja ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
+  nativeBuildInputs = [ cmake ninja ];
+  buildInputs = [ zlib libxml2 libpng ]
+    ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Xcode-compatible build tool";
     homepage = "https://github.com/facebook/xcbuild";
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix b/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix
index 30c68a93c13f..ef5591c30cf3 100644
--- a/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix
@@ -16,4 +16,4 @@
     };
     version = "0.3.0";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/tools/xib2nib/default.nix b/nixpkgs/pkgs/development/tools/xib2nib/default.nix
index 4d62f5b85714..67900dda1406 100644
--- a/nixpkgs/pkgs/development/tools/xib2nib/default.nix
+++ b/nixpkgs/pkgs/development/tools/xib2nib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }:
+{ lib, stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }:
 
 stdenv.mkDerivation {
   name = "xib2nib-730e177";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildInputs = [ PlistCpp pugixml boost ];
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ matthewbauer ];
     description = "Compiles CocoaTouch .xib files into .nib";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/tools/xqilla/default.nix b/nixpkgs/pkgs/development/tools/xqilla/default.nix
index e97a6f1cdb78..033d18608ac8 100644
--- a/nixpkgs/pkgs/development/tools/xqilla/default.nix
+++ b/nixpkgs/pkgs/development/tools/xqilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xercesc }:
+{ lib, stdenv, fetchurl, xercesc }:
 
 stdenv.mkDerivation rec {
   pname = "xqilla";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-xerces=${xercesc}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library";
     license     = licenses.asl20 ;
     maintainers = with maintainers; [ obadz ];
diff --git a/nixpkgs/pkgs/development/tools/yaml2json/default.nix b/nixpkgs/pkgs/development/tools/yaml2json/default.nix
index e1427476dd8c..d707caaec5a7 100644
--- a/nixpkgs/pkgs/development/tools/yaml2json/default.nix
+++ b/nixpkgs/pkgs/development/tools/yaml2json/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 
 buildGoPackage {
@@ -15,7 +15,7 @@ buildGoPackage {
     sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bronze1man/yaml2json";
     description = "Convert yaml to json";
     license = with licenses; [ mit ];
diff --git a/nixpkgs/pkgs/development/tools/yarn/default.nix b/nixpkgs/pkgs/development/tools/yarn/default.nix
index 7151c872e4d0..1868bdaf2c32 100644
--- a/nixpkgs/pkgs/development/tools/yarn/default.nix
+++ b/nixpkgs/pkgs/development/tools/yarn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, nodejs, fetchzip }:
+{ lib, stdenv, nodejs, fetchzip }:
 
 stdenv.mkDerivation rec {
   pname = "yarn";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://yarnpkg.com/";
     description = "Fast, reliable, and secure dependency management for javascript";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/tools/ydiff/default.nix b/nixpkgs/pkgs/development/tools/ydiff/default.nix
deleted file mode 100644
index 510808fc4127..000000000000
--- a/nixpkgs/pkgs/development/tools/ydiff/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git
-, subversion, coreutils, which }:
-
-with pythonPackages;
-
-buildPythonApplication rec {
-  pname = "ydiff";
-  version = "1.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121";
-  };
-
-  patchPhase = ''
-    substituteInPlace tests/test_ydiff.py \
-      --replace /bin/rm ${coreutils}/bin/rm \
-      --replace /bin/sh ${stdenv.shell}
-    substituteInPlace Makefile \
-      --replace "pep8 --ignore" "# pep8 --ignore" \
-      --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \
-      --replace /bin/sh ${stdenv.shell} \
-      --replace tests/regression.sh "${stdenv.shell} tests/regression.sh"
-    patchShebangs tests/*.sh
-  '';
-
-  buildInputs = [ docutils pygments ];
-  propagatedBuildInputs = [ less patchutils ];
-  checkInputs = [ coverage coreutils git subversion which ];
-
-  checkTarget = if isPy3k then "test3" else "test";
-
-  meta = {
-    homepage = "https://github.com/ymattw/ydiff";
-    description = "View colored, incremental diff in workspace or from stdin";
-    longDescription = ''
-      Term based tool to view colored, incremental diff in a version
-      controlled workspace (supports Git, Mercurial, Perforce and Svn
-      so far) or from stdin, with side by side (similar to diff -y)
-      and auto pager support.
-    '';
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ leenaars ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/tools/yj/default.nix b/nixpkgs/pkgs/development/tools/yj/default.nix
index 43771e4b6798..68ecaf6479eb 100644
--- a/nixpkgs/pkgs/development/tools/yj/default.nix
+++ b/nixpkgs/pkgs/development/tools/yj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "yj";
@@ -15,8 +15,8 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
 
-  meta = with stdenv.lib; {
-    description = ''Convert YAML <=> TOML <=> JSON <=> HCL'';
+  meta = with lib; {
+    description = "Convert YAML <=> TOML <=> JSON <=> HCL";
     license = licenses.asl20;
     maintainers = with maintainers; [ Profpatsch ];
     homepage = "https://github.com/sclevine/yj";
diff --git a/nixpkgs/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix
index 479494e515d7..878661e74ce0 100644
--- a/nixpkgs/pkgs/development/tools/yq-go/default.nix
+++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "yq-go";
-  version = "3.4.1";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "mikefarah";
-    rev = version;
+    rev = "v${version}";
     repo = "yq";
-    sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b";
+    sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus=";
   };
 
-  vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd";
+  vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g=";
 
   doCheck = false;
 
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   postInstall = ''
     for shell in bash fish zsh; do
-      $out/bin/yq shell-completion --variation $shell > yq.$shell
+      $out/bin/yq shell-completion $shell > yq.$shell
       installShellCompletion yq.$shell
     done
   '';
diff --git a/nixpkgs/pkgs/development/tools/yuicompressor/default.nix b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix
index 70160c1ce664..05c1b62477b0 100644
--- a/nixpkgs/pkgs/development/tools/yuicompressor/default.nix
+++ b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   pname = "yuicompressor";
   version = "2.4.8";
-  
+
   src = fetchurl {
     url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \
      "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
-  
-  meta = with stdenv.lib; {
+
+  meta = with lib; {
     description = "A JavaScript and CSS minifier";
     homepage = "http://yui.github.io/yuicompressor/";
     license = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/web/cog/default.nix b/nixpkgs/pkgs/development/web/cog/default.nix
new file mode 100644
index 000000000000..f1ddaea80d79
--- /dev/null
+++ b/nixpkgs/pkgs/development/web/cog/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, lib
+, fetchpatch
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wayland
+, wayland-protocols
+, libwpe
+, libwpe-fdo
+, glib
+, glib-networking
+, webkitgtk
+, makeWrapper
+, wrapGAppsHook
+, gnome3
+, gdk-pixbuf
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cog";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "igalia";
+    repo = "cog";
+    rev = "v${version}";
+    sha256 = "0a0zpdki1whm5gb6ycbazvwmm1fz094mkfwjfy4a7zz0pk54h1jw";
+  };
+
+  buildInputs = [
+    wayland-protocols
+    wayland
+    libwpe
+    libwpe-fdo
+    webkitgtk
+    glib-networking
+    gdk-pixbuf
+    gnome3.adwaita-icon-theme
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wayland
+    makeWrapper
+    wrapGAppsHook
+  ];
+
+  depsBuildsBuild = [
+    pkg-config
+  ];
+
+  cmakeFlags = [
+    "-DCOG_USE_WEBKITGTK=ON"
+  ];
+
+  # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59
+  preFixup = ''
+    wrapProgram $out/bin/cog \
+      --prefix LD_LIBRARY_PATH : ${libwpe-fdo}/lib
+  '';
+
+  meta = with lib; {
+    description = "A small single “window” launcher for the WebKit WPE port";
+    license = licenses.mit;
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/web/csslint/default.nix b/nixpkgs/pkgs/development/web/csslint/default.nix
index a1c656fb766e..9a8169429791 100644
--- a/nixpkgs/pkgs/development/web/csslint/default.nix
+++ b/nixpkgs/pkgs/development/web/csslint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nodejs }:
+{ lib, stdenv, fetchurl, nodejs }:
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     mv $out/bin/cli.js $out/bin/csslint
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Checks CSS for syntax errors and other problems";
     longDescription = ''
       CSSLint is a tool to help point out problems with your CSS
diff --git a/nixpkgs/pkgs/development/web/cypress/default.nix b/nixpkgs/pkgs/development/web/cypress/default.nix
index 7802bd6ebcbf..927414993231 100644
--- a/nixpkgs/pkgs/development/web/cypress/default.nix
+++ b/nixpkgs/pkgs/development/web/cypress/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ln -s $out/opt/cypress/Cypress $out/bin/Cypress
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast, easy and reliable testing for anything that runs in a browser";
     homepage = "https://www.cypress.io";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/web/deno/default.nix b/nixpkgs/pkgs/development/web/deno/default.nix
index 12bd54852a0b..013b365bce8d 100644
--- a/nixpkgs/pkgs/development/web/deno/default.nix
+++ b/nixpkgs/pkgs/development/web/deno/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchFromGitHub
 , rust
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   # Install completions post-install
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ];
 
   # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
   # To avoid this we pre-download the file and place it in the locations it will require it in advance
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = ./update/update.ts;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://deno.land/";
     changelog = "${src.meta.homepage}/releases/tag/v${version}";
     description = "A secure runtime for JavaScript and TypeScript";
diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix
index 63d60547bec0..96893870fa9c 100644
--- a/nixpkgs/pkgs/development/web/flyctl/default.nix
+++ b/nixpkgs/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.154";
+  version = "0.0.161";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "0hf33jm0ph4a79jg9irz0ynvdyah942cm5hb6j04hmg24x1037jm";
+    sha256 = "sha256-mM+jo1zKfA8u0IxtruQp4va0f7PldJQJV1/ypF1K0fI=";
   };
 
   preBuild = ''
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  vendorSha256 = "0fmbwk0j2aayvi3cx8cfp4b3h89v88qm4kslbmhlj8mny9rd7lys";
+  vendorSha256 = "sha256-8rzXltsAXF9qIX1BrBwwi+145nQcXjrEBdIXgSgVYRw=";
 
   doCheck = false;
 
diff --git a/nixpkgs/pkgs/development/web/grails/default.nix b/nixpkgs/pkgs/development/web/grails/default.nix
index 55ec74eb1735..944520b47e2f 100644
--- a/nixpkgs/pkgs/development/web/grails/default.nix
+++ b/nixpkgs/pkgs/development/web/grails/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip
+{ lib, stdenv, fetchurl, unzip
 # If jdk is null, require JAVA_HOME in runtime environment, else store
 # JAVA_HOME=${jdk.home} into grails.
 , jdk ? null
@@ -6,8 +6,8 @@
 }:
 
 let
-  binpath = stdenv.lib.makeBinPath
-    ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
+  binpath = lib.makeBinPath
+    ([ coreutils ncurses gnused gnugrep ] ++ lib.optional (jdk != null) jdk);
 in
 stdenv.mkDerivation rec {
   pname = "grails";
@@ -29,14 +29,14 @@ stdenv.mkDerivation rec {
     rm -f "$out"/bin/*.bat
     # Improve purity
     sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
-  '' + stdenv.lib.optionalString (jdk != null) ''
+  '' + lib.optionalString (jdk != null) ''
     # Inject JDK path into grails
     sed -i -e '2iJAVA_HOME=${jdk.home}' "$out"/bin/grails
   '';
 
   preferLocalBuild = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Full stack, web application framework for the JVM";
     longDescription = ''
       Grails is an Open Source, full stack, web application framework for the
diff --git a/nixpkgs/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix
index 15dc040dc571..b3a9ac0ce715 100644
--- a/nixpkgs/pkgs/development/web/insomnia/default.nix
+++ b/nixpkgs/pkgs/development/web/insomnia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat
+{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat
 , fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, gtk2
 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
@@ -6,7 +6,7 @@
 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook }:
 
 let
-  runtimeLibs = stdenv.lib.makeLibraryPath [
+  runtimeLibs = lib.makeLibraryPath [
     curl
     glibc
     libudev0-shim
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
     wrapProgram "$out/bin/insomnia" --prefix LD_LIBRARY_PATH : ${runtimeLibs}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://insomnia.rest/";
     description = "The most intuitive cross-platform REST API Client";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/web/kcgi/default.nix b/nixpkgs/pkgs/development/web/kcgi/default.nix
index 0ba764ddbfda..95765be46fde 100644
--- a/nixpkgs/pkgs/development/web/kcgi/default.nix
+++ b/nixpkgs/pkgs/development/web/kcgi/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, pkgconfig, fetchFromGitHub, libbsd }:
+{ lib, stdenv, pkg-config, fetchFromGitHub, libbsd }:
 
 stdenv.mkDerivation rec {
   pname = "kcgi";
   version = "0.10.8";
-  underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
+  underscoreVersion = lib.replaceChars ["."] ["_"] version;
 
   src = fetchFromGitHub {
     owner = "kristapsdz";
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
   patchPhase = ''substituteInPlace configure \
     --replace /usr/local /
   '';
-  
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libbsd ] ;
 
   dontAddPrefix = true;
 
   installFlags = [ "DESTDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://kristaps.bsd.lv/kcgi";
     description = "Minimal CGI and FastCGI library for C/C++";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/web/kore/default.nix b/nixpkgs/pkgs/development/web/kore/default.nix
index 5a6b9930d21e..bc8113fc6a1d 100644
--- a/nixpkgs/pkgs/development/web/kore/default.nix
+++ b/nixpkgs/pkgs/development/web/kore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }:
+{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }:
 
 stdenv.mkDerivation rec {
   pname = "kore";
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
   '';
 
   # added to fix build w/gcc7 and clang5
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
-    + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
+    + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An easy to use web application framework for C";
     homepage = "https://kore.io";
     license = licenses.isc;
diff --git a/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix b/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix
index 7603e8ff2ef1..96d07e2dfce5 100644
--- a/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix
+++ b/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix
@@ -125,4 +125,4 @@
     };
     version = "2.0.9";
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/web/newman/node-composition.nix b/nixpkgs/pkgs/development/web/newman/node-composition.nix
index 17879f381d57..027a981ea57f 100644
--- a/nixpkgs/pkgs/development/web/newman/node-composition.nix
+++ b/nixpkgs/pkgs/development/web/newman/node-composition.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/web/newman/node-packages.nix b/nixpkgs/pkgs/development/web/newman/node-packages.nix
index a7c29ca49c76..680be3d499c0 100644
--- a/nixpkgs/pkgs/development/web/newman/node-packages.nix
+++ b/nixpkgs/pkgs/development/web/newman/node-packages.nix
@@ -5727,4 +5727,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
index 4358d6134e82..1af4024400a0 100644
--- a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
-, pkgconfig, which
+{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
+, pkg-config, which
 # Updater dependencies
 , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
 , gnupg
@@ -7,7 +7,7 @@
 , procps, icu
 }:
 
-with stdenv.lib;
+with lib;
 
 { enableNpm ? true, version, sha256, patches ? [] } @args:
 
@@ -28,7 +28,7 @@ let
     "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib"
     /** Closure notes: we explicitly avoid specifying --shared-*-includes,
      *  as that would put the paths into bin/nodejs.
-     *  Including pkgconfig in build inputs would also have the same effect!
+     *  Including pkg-config in build inputs would also have the same effect!
      */
   ]) (builtins.attrNames sharedLibDeps) ++ [
     "--with-intl=system-icu"
@@ -55,23 +55,22 @@ in
     buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
       ++ [ zlib libuv openssl http-parser icu ];
 
-    nativeBuildInputs = [ which util-linux pkgconfig python ]
+    nativeBuildInputs = [ which util-linux pkg-config python ]
       ++ optionals stdenv.isDarwin [ xcbuild ];
 
     configureFlags = let
       isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-      host = stdenv.hostPlatform.platform;
-      isAarch32 = stdenv.hostPlatform.isAarch32;
+      inherit (stdenv.hostPlatform) gcc isArch32;
     in sharedConfigureFlags ++ [
       "--without-dtrace"
     ] ++ (optionals isCross [
       "--cross-compiling"
       "--without-intl"
       "--without-snapshot"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
-      "--with-arm-fpu=${host.gcc.fpu}"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
-      "--with-arm-float-abi=${host.gcc.float-abi}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [
+      "--with-arm-fpu=${gcc.fpu}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [
+      "--with-arm-float-abi=${gcc.float-abi}"
     ]) ++ (optionals (isCross && isAarch32) [
       "--dest-cpu=arm"
     ]) ++ extraConfigFlags;
diff --git a/nixpkgs/pkgs/development/web/nodejs/v10.nix b/nixpkgs/pkgs/development/web/nodejs/v10.nix
index a1df5ddd741e..fd1127028bcf 100644
--- a/nixpkgs/pkgs/development/web/nodejs/v10.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v10.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
+{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -8,7 +8,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "10.23.0";
-    sha256 = "07vlqr0493a569i0npwgkxk5wa4vc7j68jsivchg08y2slwn0dgx";
-    patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
+    version = "10.23.1";
+    sha256 = "1ypddif8jc8qrw9n1f8zbpknjcbnjc9xhpm57hc5nqbrmzsidal8";
+    patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }
diff --git a/nixpkgs/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix
index 184585f12d43..7afa3bfb6b5b 100644
--- a/nixpkgs/pkgs/development/web/nodejs/v12.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
+{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -8,7 +8,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.20.0";
-    sha256 = "12s2vjrlhgap2r12s7rqf0r2wzh9q2r5dkh3ak9fhrgmk9fgvqv1";
-    patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
+    version = "12.20.1";
+    sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0";
+    patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }
diff --git a/nixpkgs/pkgs/development/web/nodejs/v14.nix b/nixpkgs/pkgs/development/web/nodejs/v14.nix
index 14833bb042f4..410be6a2495d 100644
--- a/nixpkgs/pkgs/development/web/nodejs/v14.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v14.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, python3, stdenv, enableNpm ? true }:
+{ callPackage, openssl, python3, lib, stdenv, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -8,7 +8,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "14.15.3";
-    sha256 = "1zplrfhsrqblvq2wxf5386wc9hf11k42jaw4mzgwy5dxx6dv3krj";
-    patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
+    version = "14.15.4";
+    sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd";
+    patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }
diff --git a/nixpkgs/pkgs/development/web/nodejs/v15.nix b/nixpkgs/pkgs/development/web/nodejs/v15.nix
index 3569ad3a1024..5f69cd59f541 100644
--- a/nixpkgs/pkgs/development/web/nodejs/v15.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "15.5.0";
-    sha256 = "1wzcypb1kawc6m5q36cd31qjg7ljby8py9qg555m4bqm5gpvvfjg";
+    version = "15.6.0";
+    sha256 = "1liqkh1gz1h37fln8xr5krbs2mqjn38n3sws2ydvk84wrpfq3prr";
   }
diff --git a/nixpkgs/pkgs/development/web/now-cli/default.nix b/nixpkgs/pkgs/development/web/now-cli/default.nix
index 3016ba4cb84b..3b1d2b4be4b5 100644
--- a/nixpkgs/pkgs/development/web/now-cli/default.nix
+++ b/nixpkgs/pkgs/development/web/now-cli/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zeit.co/now";
     description = "The Command Line Interface for Now - Global Serverless Deployments";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/web/postman/default.nix b/nixpkgs/pkgs/development/web/postman/default.nix
index 924f44936958..02376c0bfe7c 100644
--- a/nixpkgs/pkgs/development/web/postman/default.nix
+++ b/nixpkgs/pkgs/development/web/postman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
+{ lib, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
 , atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3
 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi
 , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "postman";
-  version = "7.36.0";
+  version = "7.36.1";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "1wdbwlli9lzxxcwbc94fybfq6ipzvsv0waqcr1mjqzlfjqaqgrsb";
+    sha256 = "sha256-6brThKTAQI3cu3SSqvEIT1nwlQ/jPTP+d/Q/m/Ez5nQ=";
     name = "${pname}.tar.gz";
   };
 
@@ -88,12 +88,12 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman
     for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do
       ORIGIN=$(patchelf --print-rpath $file); \
-      patchelf --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$ORIGIN" $file
+      patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
     done
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.getpostman.com";
     description = "API Development Environment";
     license = licenses.postman;
diff --git a/nixpkgs/pkgs/development/web/remarkjs/default.nix b/nixpkgs/pkgs/development/web/remarkjs/default.nix
index d9cc433fd847..e3dea600b437 100644
--- a/nixpkgs/pkgs/development/web/remarkjs/default.nix
+++ b/nixpkgs/pkgs/development/web/remarkjs/default.nix
@@ -10,7 +10,7 @@ let
     rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c";
     sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0";
   };
-  
+
   nodePackages = import ./nodepkgs.nix {
     inherit pkgs;
     inherit (stdenv.hostPlatform) system;
@@ -63,8 +63,8 @@ in stdenv.mkDerivation rec {
     homepage = "https://remarkjs.com";
     description = "A simple, in-browser, markdown-driven slideshow tool";
     maintainers = [];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
     broken = true;
   };
 }
diff --git a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix
index be260edb643a..b565c6d2f5d9 100644
--- a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/development/web/shopify-themekit/default.nix b/nixpkgs/pkgs/development/web/shopify-themekit/default.nix
index a50140c15327..60a3d330ab82 100644
--- a/nixpkgs/pkgs/development/web/shopify-themekit/default.nix
+++ b/nixpkgs/pkgs/development/web/shopify-themekit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "shopify-themekit";
@@ -15,7 +15,7 @@ buildGoPackage rec {
     sha256 = "1780h33mf2h2lv6mr4xx3shfvsabr7w138yb59vvdgvjng9wjkg0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command line tool for shopify themes";
     homepage = "https://shopify.github.io/themekit/";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
index 14fd9a219ec1..ca211ccf2d9b 100644
--- a/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "bootstrap";
-  version = "4.5.3";
+  version = "4.6.0";
 
   src = fetchurl {
     url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
-    sha256 = "0w87b0vbwsdb4ag359y5pppxjvqnxk1949mszzn8ay2i5h47mjq6";
+    sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM=";
   };
 
   buildInputs = [ unzip ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Front-end framework for faster and easier web development";
     homepage = "https://getbootstrap.com/";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/web/valum/default.nix b/nixpkgs/pkgs/development/web/valum/default.nix
index e4407b9f556b..847943d83bcf 100644
--- a/nixpkgs/pkgs/development/web/valum/default.nix
+++ b/nixpkgs/pkgs/development/web/valum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl
+{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl
 , libgee, libsoup, fcgi }:
 
 stdenv.mkDerivation rec {
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ glib vala ctpl libgee libsoup fcgi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/valum-framework/valum";
     description = "Web micro-framework written in Vala";
     license = licenses.lgpl3;
diff --git a/nixpkgs/pkgs/development/web/wml/default.nix b/nixpkgs/pkgs/development/web/wml/default.nix
index 6208bff15bc4..2b882ccc8418 100644
--- a/nixpkgs/pkgs/development/web/wml/default.nix
+++ b/nixpkgs/pkgs/development/web/wml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:
+{ lib, stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:
 
 perlPackages.buildPerlPackage {
   pname = "wml";
@@ -55,7 +55,7 @@ perlPackages.buildPerlPackage {
 
   installTargets = [ "install" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/";
     description = "Off-line HTML generation toolkit for Unix";
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/development/web/woff2/default.nix b/nixpkgs/pkgs/development/web/woff2/default.nix
index d770fb627536..2f1863444980 100644
--- a/nixpkgs/pkgs/development/web/woff2/default.nix
+++ b/nixpkgs/pkgs/development/web/woff2/default.nix
@@ -1,4 +1,6 @@
-{ brotli, cmake, pkgconfig, fetchFromGitHub, stdenv, static ? false }:
+{ brotli, cmake, pkg-config, fetchFromGitHub, lib, stdenv
+, static ? stdenv.hostPlatform.isStatic
+}:
 
 stdenv.mkDerivation rec {
   pname = "woff2";
@@ -14,14 +16,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "lib" ];
 
   # Need to explicitly link to brotlicommon
-  patches = stdenv.lib.optional static ./brotli-static.patch;
+  patches = lib.optional static ./brotli-static.patch;
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   cmakeFlags = [
     "-DCANONICAL_PREFIXES=ON"
     "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
-  ] ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
+  ] ++ lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
 
   propagatedBuildInputs = [ brotli ];
 
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
     sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Webfont compression reference code";
     homepage = "https://github.com/google/woff2";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/web/xmlindent/default.nix b/nixpkgs/pkgs/development/web/xmlindent/default.nix
index b093a8008da6..f6df21d57660 100644
--- a/nixpkgs/pkgs/development/web/xmlindent/default.nix
+++ b/nixpkgs/pkgs/development/web/xmlindent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex }:
+{ lib, stdenv, fetchurl, flex }:
 
 stdenv.mkDerivation rec {
   pname = "xmlindent";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "XML stream reformatter";
     homepage = "http://xmlindent.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }